From 09544d99df6e92a260739409cb7c9e223db8712d Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Mon, 24 Aug 2015 09:05:13 -0400
Subject: [PATCH 01/85] Clean up HorizontalSpaceForDuration().

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

diff --git a/src/aligner.cpp b/src/aligner.cpp
index 51dd1d3a122..8466e30c8e5 100644
--- a/src/aligner.cpp
+++ b/src/aligner.cpp
@@ -365,13 +365,11 @@ notation (CMN), this is a function of the interval; for short intervals, it may
 be enough to keep consecutive symbols from overlapping. For mensural notation, ideal
 spacing is as tight as possible without overlapping and with just a bit of space
 between symbols. */
-int Alignment::HorizontalSpaceForDuration(double intervalTime, bool isMensural)
+int Alignment::HorizontalSpaceForDuration(double intervalTime, bool fixedSpacing)
 {
     int intervalXRel = 0;
-    if (isMensural)
-        intervalXRel = 20;           // ??EXPERIMENTAL! A very small value => space as tightly as possible
-    else
-        intervalXRel = pow( intervalTime, 0.60 ) * 2.5; // 2.5 is an arbitrary value; so is 0.60
+    if (!fixedSpacing)
+         intervalXRel = pow( intervalTime, 0.60 ) * 2.5; // 2.5 is an arbitrary value; so is 0.60
     return intervalXRel;
 }
 

From c99cf29d068862fec245ed660b236f894729a788 Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Tue, 1 Sep 2015 10:47:13 -0400
Subject: [PATCH 02/85] Correct typos in comments.

---
 src/page.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/page.cpp b/src/page.cpp
index 52ba21cbd49..f28f28f0a48 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -122,11 +122,11 @@ void Page::LayOutHorizontally( )
     params.push_back( &previousXRel );
     params.push_back( &minMeasureWidth );
     Functor setAlignmentX( &Object::SetAligmentXPos );
-    // Special case: because we redirect the functor, pass is a parameter to itself (!)
+    // Special case: because we redirect the functor, pass it a parameter to itself (!)
     params.push_back( &setAlignmentX );
     this->Process( &setAlignmentX, &params );
     
-    // Render it for filling the bounding boxing
+    // Render it for filling the bounding box
     View view;
     BBoxDeviceContext bb_dc( &view, 0, 0 );
     view.SetDoc(doc);
@@ -147,12 +147,12 @@ void Page::LayOutHorizontally( )
     // Once the m_xShift have been calculated, move all positions accordingly
     params.clear();
     Functor integrateBoundingBoxGraceXShift( &Object::IntegrateBoundingBoxGraceXShift );
-    // special case: because we redirect the functor, pass is a parameter to itself (!)
+    // Special case: because we redirect the functor, pass it a parameter to itself (!)
     params.push_back( &integrateBoundingBoxGraceXShift );
     this->Process( &integrateBoundingBoxGraceXShift, &params );
     
     // Adjust the X shift of the Alignment looking at the bounding boxes
-    // Look at each LayerElement and changes the m_xShift if the bouding box is overlapping
+    // Look at each LayerElement and changes the m_xShift if the bounding box is overlapping
     params.clear();
     int min_pos = 0;
     int measure_width = 0;
@@ -171,7 +171,7 @@ void Page::LayOutHorizontally( )
     params.push_back( &shift );
     params.push_back( &justifiable_shift );
     Functor integrateBoundingBoxXShift( &Object::IntegrateBoundingBoxXShift );
-    // special case: because we redirect the functor, pass is a parameter to itself (!)
+    // Special case: because we redirect the functor, pass it a parameter to itself (!)
     params.push_back( &integrateBoundingBoxXShift );
     this->Process( &integrateBoundingBoxXShift, &params );
     
@@ -205,7 +205,7 @@ void Page::LayOutVertically( )
     Functor alignVertically( &Object::AlignVertically );
     this->Process( &alignVertically, &params );
     
-    // Render it for filling the bounding boxing
+    // Render it for filling the bounding box
     View view;
     BBoxDeviceContext bb_dc( &view, 0, 0 );
     view.SetDoc(doc);
@@ -234,7 +234,7 @@ void Page::LayOutVertically( )
     params.push_back( &staffMargin );
     params.push_back( &interlineSize );
     Functor setAlignmentY( &Object::SetAligmentYPos );
-    // special case: because we redirect the functor, pass is a parameter to itself (!)
+    // Special case: because we redirect the functor, pass it a parameter to itself (!)
     params.push_back( &setAlignmentY );
     this->Process( &setAlignmentY, &params );
     
@@ -244,7 +244,7 @@ void Page::LayOutVertically( )
     int shift = 0;
     params.push_back( &shift );
     Functor integrateBoundingBoxYShift( &Object::IntegrateBoundingBoxYShift );
-    // special case: because we redirect the functor, pass is a parameter to itself (!)
+    // Special case: because we redirect the functor, pass it a parameter to itself (!)
     params.push_back( &integrateBoundingBoxYShift );
     this->Process( &integrateBoundingBoxYShift, &params );
     
@@ -285,7 +285,7 @@ void Page::JustifyHorizontally( )
     params.push_back( &margin );
     params.push_back( &systemFullWidth );
     Functor justifyX( &Object::JustifyX );
-    // special case: because we redirect the functor, pass is a parameter to itself (!)
+    // Special case: because we redirect the functor, pass it a parameter to itself (!)
     params.push_back( &justifyX );
     this->Process( &justifyX, &params );
 }

From 431d411112fa1af453ee8f07d190379d1aaa7dfe Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Thu, 3 Sep 2015 13:31:53 -0400
Subject: [PATCH 03/85] Make explicit that the standard stem length is 7/2
 staff spaces.

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

diff --git a/src/view_element.cpp b/src/view_element.cpp
index 5b8e4732123..c23bca54594 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -436,6 +436,8 @@ void View::DrawNote ( DeviceContext *dc, LayerElement *element, Layer *layer, St
 	return;
 }
     
+#define STANDARD_STEMLENGTH 7       // in half staff spaces ??BUT SHOULD BE 6 IF 2-VOICE NOTATION!
+    
 void View::DrawStem( DeviceContext *dc, LayerElement *object, Staff *staff, data_STEMDIRECTION dir, int radius, int xn, int originY, int heightY)
 {
     assert(dynamic_cast<DurationInterface*>(object));
@@ -447,7 +449,7 @@ void View::DrawStem( DeviceContext *dc, LayerElement *object, Staff *staff, data
     bool drawingCueSize = object->IsCueSize();
     int verticalCenter = staffY - m_doc->GetDrawingDoubleUnit(staffSize)*2;
     
-    baseStem = m_doc->GetDrawingUnit(staffSize)*7;
+    baseStem = m_doc->GetDrawingUnit(staffSize)*STANDARD_STEMLENGTH;
     flagStemHeight = m_doc->GetDrawingDoubleUnit(staffSize);
     if (drawingCueSize) {
         baseStem = m_doc->GetGraceSize(baseStem);

From 6318498d133c561f710f7d50e17a023c8978b113 Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Thu, 3 Sep 2015 13:32:38 -0400
Subject: [PATCH 04/85] Clarify comments on HorizontalSpaceForDuration()

---
 src/aligner.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/aligner.cpp b/src/aligner.cpp
index 264c0e38852..62fd945c98a 100644
--- a/src/aligner.cpp
+++ b/src/aligner.cpp
@@ -433,11 +433,11 @@ int MeasureAligner::SetAligmentXPos( ArrayPtrVoid *params )
 }
 
     
-/* Compute "ideal" horizontal space to allow for a given time interval. For modern
-notation (CMN), this is a function of the interval; for short intervals, it may not
-be enough to keep consecutive symbols from overlapping. For mensural notation, ideal
-spacing is as tight as possible without overlapping and with just a bit of space
-between symbols. */
+/* Compute "ideal" horizontal space to allow for a given time interval, ignoring the need
+to keep consecutive symbols from overlapping or nearly overlapping: we assume spacing
+will be increased as necessary later to avoid that. For modern notation (CMN), ideal space
+is a function of time interval. For mensural notation, we set ideal spacing to zero so we'll
+always end up with spacing as tight as possible. */
 int Alignment::HorizontalSpaceForDuration(double intervalTime, bool fixedSpacing)
 {
     int intervalXRel = 0;
@@ -458,7 +458,7 @@ int Alignment::SetAligmentXPos( ArrayPtrVoid *params )
     
     int intervalXRel = 0;
     double intervalTime = (m_time - (*previousTime));
-    if ( intervalTime > 0.0 ) intervalXRel = HorizontalSpaceForDuration(intervalTime, true);   // ??2ND PARAM = IS MENSURAL!
+    if ( intervalTime > 0.0 ) intervalXRel = HorizontalSpaceForDuration(intervalTime, true);   // ??2ND PARAM SHOULD BE true IFF MENSURAL!
     
     m_xRel = (*previousXRel) + (intervalXRel) * DEFINITON_FACTOR;
     (*previousTime) = m_time;

From db7153f9933553bd50918adc3386c04ca3bda7f5 Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Tue, 8 Sep 2015 16:17:06 -0400
Subject: [PATCH 05/85] Add "even-note-spacing" command-line option, intended
 for use with mensural notation; fix typos & clarify some comments

---
 include/vrv/doc.h     | 29 +++++++++++++++++++++--------
 include/vrv/toolkit.h |  7 +++++++
 src/aligner.cpp       | 14 +++++++++-----
 src/doc.cpp           |  1 +
 src/page.cpp          | 28 +++++++++++++++-------------
 src/toolkit.cpp       |  6 ++++++
 tools/main.cpp        | 17 +++++++++++------
 7 files changed, 70 insertions(+), 32 deletions(-)

diff --git a/include/vrv/doc.h b/include/vrv/doc.h
index 1b7bec84790..430982ddeb7 100644
--- a/include/vrv/doc.h
+++ b/include/vrv/doc.h
@@ -119,9 +119,9 @@ class Doc: public Object
     ///@}
     
     /**
-     * @name Getters for the object margins (left and right)
-     * The margin are given in x / PARAM_DENOMINATOR * UNIT
-     * With PARAM_DENOMINATOR == 10, a margin of 25 is 2.5 UNIT
+     * @name Getters for the object margins (left and right).
+     * The margins are given in x / PARAM_DENOMINATOR * UNIT
+     * With PARAM_DENOMINATOR == 10, a margin of 25 is 2.5 UNIT.
      * These should eventually be set at parameters.
      */
     ///@{
@@ -131,16 +131,27 @@ class Doc: public Object
 
     /*
      * @name Setter and getter for the justification (x-axis) flag.
-     * Justification is enabled by default. It need to be disable
-     * for drawing all the document on one single system.
+     * Justification is enabled by default. It needs to be disabled
+     * for drawing the entire document on one single system.
      */
     ///@{
     void SetJustificationX( bool drawingJustifyX ) { m_drawingJustifyX = drawingJustifyX; };
     bool GetJustificationX( ) { return m_drawingJustifyX; };
     ///@}
 
+    /*
+     * @name Setter and getter for the duration-based-spacing flag.
+     * Spacing by duration is always used with CMN, and it's enabled by default.
+     * It should be disabled (so we get "even" note spacing) for mensural notation.
+     */
+    ///@{
+    void SetEvenSpacing( bool drawingEvenSpacing ) { m_drawingEvenSpacing = drawingEvenSpacing; };
+    bool GetEvenSpacing( ) { return m_drawingEvenSpacing; };
+
+    ///@}
+
     /**
-     * Set the initial scoreDef of each page
+     * Set the initial scoreDef of each page.
      * This is necessary for integrating changes that occur within a page.
      * It uses the MusObject::SetPageScoreDef functor method for parsing the file.
      * This will be done only if m_currentScoreDefDone is false or force is true.
@@ -250,6 +261,8 @@ class Doc: public Object
     float m_drawingBeamMaxSlope;
     /** flag for disabling justification */
     bool m_drawingJustifyX;
+    /** flag for disabling spacing by duration */
+    bool m_drawingEvenSpacing;
     /** minimum measure width */
     int m_drawingMinMeasureWidth;
     
@@ -305,14 +318,14 @@ class Doc: public Object
     FontInfo m_drawingLyricFont;
     
     /**
-     * A flag for indicating whether the currentScoreDef has been set or not
+     * A flag to indicate whether the currentScoreDef has been set or not.
      * If yes, SetCurrentScoreDef will not parse the document (again) unless
      * the force parameter is set.
      */
     bool m_currentScoreDefDone;
     
     /**
-     * A flag for indicating if the drawing preparation has been done. If yes,
+     * A flag to indicate if the drawing preparation has been done. If yes,
      * drawing preparation will be reset before being done again.
      */
     bool m_drawingPreparationDone;
diff --git a/include/vrv/toolkit.h b/include/vrv/toolkit.h
index debac7e3094..905daf3675d 100644
--- a/include/vrv/toolkit.h
+++ b/include/vrv/toolkit.h
@@ -214,6 +214,12 @@ class Toolkit
     int GetAdjustPageHeight() { return m_adjustPageHeight; };
     ///@}
     
+    
+    /**
+     * @name Space notes equally and close together (normally for mensural notation) */
+    void SetEvenNoteSpacing( bool even ) { m_evenNoteSpacing = even; };
+    int GetEvenNoteSpacing() { return m_evenNoteSpacing; };
+    
     /**
      * @name Do not justify the system (for debugging purposes) 
      */
@@ -318,6 +324,7 @@ class Toolkit
     bool m_adjustPageHeight;
     std::string m_rdgXPathQuery;
     bool m_scoreBasedMei;
+    bool m_evenNoteSpacing;
     // for debugging
     bool m_noJustification;
     bool m_showBoundingBoxes;
diff --git a/src/aligner.cpp b/src/aligner.cpp
index 62fd945c98a..3453fd6eedb 100644
--- a/src/aligner.cpp
+++ b/src/aligner.cpp
@@ -436,12 +436,16 @@ int MeasureAligner::SetAligmentXPos( ArrayPtrVoid *params )
 /* Compute "ideal" horizontal space to allow for a given time interval, ignoring the need
 to keep consecutive symbols from overlapping or nearly overlapping: we assume spacing
 will be increased as necessary later to avoid that. For modern notation (CMN), ideal space
-is a function of time interval. For mensural notation, we set ideal spacing to zero so we'll
-always end up with spacing as tight as possible. */
-int Alignment::HorizontalSpaceForDuration(double intervalTime, bool fixedSpacing)
+is a function of time interval. For mensural notation, we'd want ideal spacing to be zero
+so as to end up with spacing as tight as possible.
+ 
+This function needs more flexibility: for example, for some purposes, spacing propoortional
+to duration is desirable. The best solution is probably to get ideal spacing from a user-
+definable table. */
+int Alignment::HorizontalSpaceForDuration(double intervalTime, bool evenSpacing)
 {
     int intervalXRel = 0;
-    if (!fixedSpacing)
+    if (!evenSpacing)
          intervalXRel = pow( intervalTime, 0.60 ) * 2.5; // 2.5 is an arbitrary value; so is 0.60
     return intervalXRel;
 }
@@ -458,7 +462,7 @@ int Alignment::SetAligmentXPos( ArrayPtrVoid *params )
     
     int intervalXRel = 0;
     double intervalTime = (m_time - (*previousTime));
-    if ( intervalTime > 0.0 ) intervalXRel = HorizontalSpaceForDuration(intervalTime, true);   // ??2ND PARAM SHOULD BE true IFF MENSURAL!
+    if ( intervalTime > 0.0 ) intervalXRel = HorizontalSpaceForDuration(intervalTime, false);
     
     m_xRel = (*previousXRel) + (intervalXRel) * DEFINITON_FACTOR;
     (*previousTime) = m_time;
diff --git a/src/doc.cpp b/src/doc.cpp
index d4962bb1dd4..4b364b60857 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -71,6 +71,7 @@ void Doc::Reset( DocType type )
     
     m_drawingPage = NULL;
     m_drawingJustifyX = true;
+    m_drawingEvenSpacing = true;
     m_currentScoreDefDone = false;
     m_drawingPreparationDone = false;
     
diff --git a/src/page.cpp b/src/page.cpp
index f28f28f0a48..543fb7c70c5 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -112,19 +112,21 @@ void Page::LayOutHorizontally( )
     Functor alignHorizontallyEnd( &Object::AlignHorizontallyEnd );
     this->Process( &alignHorizontally, &params, &alignHorizontallyEnd );
     
-    // Set the X position of each Alignment
-    // Does a duration-based non linear spacing looking at the duration space between two Alignment objects
-    params.clear();
-    double previousTime = 0.0;
-    int previousXRel = 0;
-    int minMeasureWidth = doc->m_drawingMinMeasureWidth;
-    params.push_back( &previousTime );
-    params.push_back( &previousXRel );
-    params.push_back( &minMeasureWidth );
-    Functor setAlignmentX( &Object::SetAligmentXPos );
-    // Special case: because we redirect the functor, pass it a parameter to itself (!)
-    params.push_back( &setAlignmentX );
-    this->Process( &setAlignmentX, &params );
+    // Unless duration-based spacing is disabled, get the X position of each Alignment.
+    // Does non-linear spacing based on the duration space between two Alignment objects.
+    if (!doc->GetEvenSpacing()) {
+        params.clear();
+        double previousTime = 0.0;
+        int previousXRel = 0;
+        int minMeasureWidth = doc->m_drawingMinMeasureWidth;
+        params.push_back( &previousTime );
+        params.push_back( &previousXRel );
+        params.push_back( &minMeasureWidth );
+        Functor setAlignmentX( &Object::SetAligmentXPos );
+        // Special case: because we redirect the functor, pass it a parameter to itself (!)
+        params.push_back( &setAlignmentX );
+        this->Process( &setAlignmentX, &params );
+    }
     
     // Render it for filling the bounding box
     View view;
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index 1933d539c1d..2169101378f 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -52,6 +52,7 @@ Toolkit::Toolkit( bool initFont )
     m_ignoreLayout = false;
     m_adjustPageHeight = false;
     m_noJustification = false;
+    m_evenNoteSpacing = true;
     m_showBoundingBoxes = false;
     m_scoreBasedMei = false;
     
@@ -303,6 +304,11 @@ bool Toolkit::LoadString( const std::string &data )
         m_doc.SetJustificationX(false);
     }
     
+    // disable duration-based spacing if requested
+    if (!m_evenNoteSpacing) {
+        m_doc.SetEvenSpacing(false);
+    }
+    
     delete input;
     m_view.SetDoc( &m_doc );
     
diff --git a/tools/main.cpp b/tools/main.cpp
index 0633168dc5b..5273f4bbc62 100644
--- a/tools/main.cpp
+++ b/tools/main.cpp
@@ -73,11 +73,11 @@ void display_usage() {
     cerr << " verovio [-f format] [-s scale] [-t type] [-r resources] [-o outfile] infile" << endl << endl;
     
     // These need to be kept in alphabetical order:
-    // -short options first
-    // -then long options only
+    // -options with both short and long forms first
+    // -then options with long forms only
     // -then debugging options
 
-    // Options
+    // Options with both short and long forms
     cerr << "Options" << endl;
     
     
@@ -101,13 +101,15 @@ void display_usage() {
 
     cerr << " -w, --page-width=WIDTH     Specify the page width (default is " << DEFAULT_PAGE_WIDTH << ")" << endl;
     
-    // long options only
+    // Options with long forms only
     cerr << endl << "Additional options" << endl;
     
     cerr << " --adjust-page-height       Crop the page height to the height of the content" << endl;
     
     cerr << " --all-pages                Output all pages with one output file per page" << endl;
     
+    cerr << " --even-note-spacing        Space notes evenly and close together regardless of their durations" << endl;
+
     cerr << " --font=FONT                Select the music font to use (default is Leipzig; Bravura and Gootville are also available)" << endl;
     
     cerr << " --help                     Display this message" << endl;
@@ -152,6 +154,7 @@ int main(int argc, char** argv)
     int no_layout = 0;
     int ignore_layout = 0;
     int no_justification = 0;
+    int even_note_spacing = 0;
     int show_bounding_boxes = 0;
     int page = 1;
     int show_help = 0;
@@ -166,7 +169,7 @@ int main(int argc, char** argv)
     type = pae_file;
     
     if (argc < 2) {
-        cerr << "Expecting one input file." << endl << endl;
+        cerr << "Expected one input file but found none." << endl << endl;
         display_usage();
         exit(1);
     }
@@ -178,6 +181,7 @@ int main(int argc, char** argv)
         {"adjust-page-height",  no_argument,        &adjust_page_height, 1},
         {"all-pages",           no_argument,        &all_pages, 1},
         {"border",              required_argument,  0, 'b'},
+        {"even-note-spacing",   no_argument,        &even_note_spacing, 1},
         {"font",                required_argument,  0, 0},
         {"format",              required_argument,  0, 'f'},
         {"help",                no_argument,        &show_help, 1},
@@ -301,13 +305,14 @@ int main(int argc, char** argv)
     toolkit.SetNoLayout(no_layout);
     toolkit.SetIgnoreLayout(ignore_layout);
     toolkit.SetNoJustification(no_justification);
+    toolkit.SetEvenNoteSpacing(even_note_spacing);
     toolkit.SetShowBoundingBoxes(show_bounding_boxes);
     
     if (optind <= argc - 1) {
         infile = string(argv[optind]);
     }
     else {
-        cerr << "Incorrect number of arguments: expecting one input file." << endl << endl;
+        cerr << "Incorrect number of arguments: expected one input file but found none." << endl << endl;
         display_usage();
         exit(1);
     }

From 8c48690bb8bcf687930b8b7fc780e1b076d6560f Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Tue, 8 Sep 2015 16:26:21 -0400
Subject: [PATCH 06/85] Fix recently-introduced bugs in mensural notation: dots
 in mensuration signs are too low and much too large; in mensural notation,
 make noteheads smaller relative to staff size; fix vertical position of half
 circle in mensuration sign; make proports much smaller; move proport-drawing
 functions from view_element.cp to view_mensural.cp.

---
 include/vrv/view.h    |   3 +-
 src/view_element.cpp  |  37 ---------
 src/view_mensural.cpp | 183 ++++++++++++++++++++++++++++++------------
 src/view_page.cpp     |   5 +-
 4 files changed, 137 insertions(+), 91 deletions(-)

diff --git a/include/vrv/view.h b/include/vrv/view.h
index ad895604b00..5fe440f2033 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -217,7 +217,6 @@ class View
     void DrawMRest( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawMultiRest( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawNote( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
-    void DrawProport( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawRest( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawSpace( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawSyl( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
@@ -274,6 +273,7 @@ class View
     ///@{
     void DrawMensur( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure  );
     void DrawMensuralNote ( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
+    void DrawProport( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     
     /**
      * @name Methods for drawing parts of mensural LayerElement child classes.
@@ -288,6 +288,7 @@ class View
     void DrawMaximaToBrevis( DeviceContext *dc, int y, LayerElement *element, Layer *layer, Staff *staff );
     void DrawLigature( DeviceContext *dc, int y, LayerElement *element, Layer *layer, Staff *staff );
     void CalculateLigaturePosX ( LayerElement *element, Layer *layer, Staff *staff);
+    void DrawProportFigures( DeviceContext *dc, int x, int y, int num, int numBase, Staff *staff);
     ///@}
     
     /**
diff --git a/src/view_element.cpp b/src/view_element.cpp
index c23bca54594..bc03c87df6f 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -1593,43 +1593,6 @@ void View::DrawDot( DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     dc->EndGraphic(element, this );
 
 }
-
-    
-void View::DrawProport( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
-{
-    assert(layer); // Pointer to layer cannot be NULL"
-    assert(staff); // Pointer to staff cannot be NULL"
-    assert(dynamic_cast<Proport*>(element)); // Element must be a Mensur"
-    
-	int x1, x2, y1, y2;
-    
-    Proport *proport = dynamic_cast<Proport*>(element);
-    
-    dc->StartGraphic( element, "", element->GetUuid() );
-    
-    int y = staff->GetDrawingY() - (m_doc->GetDrawingUnit(staff->m_drawingStaffSize)*4);
-    int x = element->GetDrawingX();
-    
-    x1 = x+120;  x2 = x1+150;					// ??TEST: JUST DRAW AN ARBITRARY RECTANGLE
-    y1 = y;	y2 = y+50+(50*proport->GetNum());
-	//DrawFullRectangle( dc,x1,y1,x2,y2);
-	DrawPartFullRectangle( dc,x1,y1,x2,y2, 0);
-
-    if (proport->HasNum())
-    {
-        x = element->GetDrawingX();
-        //if (proport->GetSign() || proport->HasTempus())           // ??WHAT SHOULD THIS BE?
-        {
-            x += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 5; // step forward because we have a sign or a meter symbol
-        }
-        int numbase = proport->HasNumbase() ? proport->GetNumbase() : 0;
-        DrawMeterSigFigures ( dc, x, staff->GetDrawingY(), proport->GetNum(), numbase, staff);
-    }
-
-    
-    dc->EndGraphic(element, this );
-}
-
     
 int View::GetSylY( Syl *syl, Staff *staff )
 {
diff --git a/src/view_mensural.cpp b/src/view_mensural.cpp
index 1cf21e1cb16..bb8f4279f15 100644
--- a/src/view_mensural.cpp
+++ b/src/view_mensural.cpp
@@ -19,12 +19,26 @@
 #include "layer.h"
 #include "mensur.h"
 #include "note.h"
+#include "proport.h"
 #include "smufl.h"
 #include "staff.h"
 #include "style.h"
 
 namespace vrv {    
 
+/* ??THESE #defines PROBABLY BELONG IN style.h . */
+    
+/* Set ratio of mensural notehead size to CMN notehead size for the same staff size */
+#define MENSUR_NOTEHEAD_FACTOR 0.60
+/* Set size of mensuration sign circle relative to space between staff lines. The entire mensuration sign fits
+     easily between two staff lines, so the radius is considerably less than half the distance between them. */
+#define MCIRCLE_RADIUS_FACTOR 0.32
+/* Set vertical position of center of mensuration sign as distance below top of the staff */
+#define MENSURSIGN_STAFFLINES_BELOW_TOP 1.5
+/* Set size rel. to dist. between staff lines of mensural-notation dot, e.g., within mensuration signs */
+#define MENSURSIGN_DOTSIZE 0.15
+    
+    
 int View::s_drawingLigX[2], View::s_drawingLigY[2];	// pour garder coord. des ligatures
 bool View::s_drawingLigObliqua = false;	// marque le 1e passage pour une oblique
 
@@ -44,12 +58,13 @@ void View::DrawMensuralNote ( DeviceContext *dc, LayerElement *element, Layer *l
     assert( note );
     
     int staffSize = staff->m_drawingStaffSize;
+    // Mensural noteheads are quite a bit smaller than CMN noteheads; use _pseudoStaffSize_ to force this.
+    int pseudoStaffSize = (int)(MENSUR_NOTEHEAD_FACTOR * staff->m_drawingStaffSize);
     int noteY = element->GetDrawingY();
     int xLedger, xNote, xStem;
     int drawingDur;
-    bool drawingCueSize;
     int staffY = staff->GetDrawingY();
-    wchar_t fontNo;
+    wchar_t charCode;
     int ledge;
     int verticalCenter = 0;
 
@@ -57,15 +72,14 @@ void View::DrawMensuralNote ( DeviceContext *dc, LayerElement *element, Layer *l
     xLedger = xStem;
     
     drawingDur = note->GetDrawingDur();
-    drawingCueSize = note->HasGrace();
     
-    int radius = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staffSize, drawingCueSize);
+    int radius = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, pseudoStaffSize, false) / 2;
     
     if (drawingDur > DUR_1 || (drawingDur == DUR_1 && staff->notAnc)) {	// annuler provisoirement la modif. des lignes addit.
-        ledge = m_doc->GetDrawingLedgerLineLength(staffSize, drawingCueSize);
+        ledge = m_doc->GetDrawingLedgerLineLength(pseudoStaffSize, false);
     }
     else {
-        ledge = m_doc->GetDrawingLedgerLineLength(staffSize, drawingCueSize);
+        ledge = m_doc->GetDrawingLedgerLineLength(pseudoStaffSize, false);
         radius += radius/3;
     }
     
@@ -87,7 +101,7 @@ void View::DrawMensuralNote ( DeviceContext *dc, LayerElement *element, Layer *l
     
     /************** Noteheads: **************/
     
-    // Long, breve and ligatures
+    // Ligature, maxima,longa, brevis, and semibrevis
     if ((note->GetLig()!=LIGATURE_NONE) && (drawingDur <= DUR_1)) {
         DrawLigature ( dc, noteY, element, layer, staff);
     }
@@ -96,24 +110,24 @@ void View::DrawMensuralNote ( DeviceContext *dc, LayerElement *element, Layer *l
     }
     else if (drawingDur == DUR_1) {
         if (note->GetColored())
-            fontNo = SMUFL_E938_mensuralNoteheadSemibrevisBlack;
+            charCode = SMUFL_E938_mensuralNoteheadSemibrevisBlack;
         else
-            fontNo = SMUFL_E939_mensuralNoteheadSemibrevisVoid;
+            charCode = SMUFL_E939_mensuralNoteheadSemibrevisVoid;
         
-        DrawSmuflCode( dc, xNote, noteY, fontNo, staff->m_drawingStaffSize, drawingCueSize );
+        DrawSmuflCode( dc, xNote, noteY, charCode, pseudoStaffSize, false );
     }
-    // Other values ??WE WANT MENSURAL NOTEHEADS, NOT CMN!!!!!!!!
+    // Shorter values ??WE WANT MENSURAL NOTEHEADS, NOT CMN!!!!!!!!
    else {
         if (note->GetColored()) {
-            if (drawingDur == DUR_2) fontNo = SMUFL_E0A4_noteheadBlack;
-            else fontNo = SMUFL_E0A3_noteheadHalf;
+            if (drawingDur == DUR_2) charCode = SMUFL_E0A3_noteheadHalf;
+            else charCode = SMUFL_E0A4_noteheadBlack;
         }
         else {
-            if (drawingDur > DUR_2) fontNo = SMUFL_E0A4_noteheadBlack;
-            else fontNo = SMUFL_E0A3_noteheadHalf;
+            if (drawingDur > DUR_2) charCode = SMUFL_E93C_mensuralNoteheadMinimaWhite;
+            else charCode = SMUFL_E0A3_noteheadHalf;
         }
 
-        DrawSmuflCode( dc, xNote, noteY, fontNo,  staff->m_drawingStaffSize, drawingCueSize );
+        DrawSmuflCode( dc, xNote, noteY, charCode,  pseudoStaffSize, false );
         
         DrawStem(dc, note, staff, note->GetDrawingStemDir(), radius, xStem, noteY);
     }
@@ -140,11 +154,12 @@ void View::DrawMensuralNote ( DeviceContext *dc, LayerElement *element, Layer *l
     /************** dots **************/
     
     if (note->GetDots()) {
+        int mensDrawingUnit = (int)(MENSUR_NOTEHEAD_FACTOR * m_doc->GetDrawingUnit(staffSize));
         int xDot;
         if (note->GetDur() < DUR_2 || (note->GetDur() > DUR_8 && (note->GetDrawingStemDir() == STEMDIRECTION_up)))
-            xDot = xStem + m_doc->GetDrawingUnit(staffSize)*7/2;
+            xDot = xStem + mensDrawingUnit*7/2;
         else
-            xDot = xStem + m_doc->GetDrawingUnit(staffSize)*5/2;
+            xDot = xStem + mensDrawingUnit*5/2;
         
         DrawDots( dc, xDot, noteY, note->GetDots(), staff );
     }
@@ -196,29 +211,19 @@ void View::DrawMensur( DeviceContext *dc, LayerElement *element, Layer *layer, S
             x += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 5; // step forward because we have a sign or a meter symbol
         }
         int numbase = mensur->HasNumbase() ? mensur->GetNumbase() : 0;
-        DrawMeterSigFigures ( dc, x, staff->GetDrawingY(), mensur->GetNum(), numbase, staff);
+        DrawProportFigures ( dc, x, staff->GetDrawingY(), mensur->GetNum(), numbase, staff);
     }
     
     dc->EndGraphic(element, this );
     
 }
 
-/* Set size of mensuration sign circle relative to space between staff lines. The entire mensuration sign fits easily between two staff lines, so the radius is considerably less than half the distance between them.
-    ??THESE #defines PROBABLY BELONG IN style.h . */
-#define MCIRCLE_RADIUS_FACTOR 0.32
-/* Set default vertical position of mensuration sign circle as distance below the top of the staff for center
- of the circle */
-#define MCIRCLE_STAFFLINES_BELOW_TOP 1.5
-/* Set size rel. to dist. between staff lines of mensural-notation dot, e.g., within mensuration signs */
-#define MENSUR_DOTSIZE 0.15
-
-    
 void View::DrawMensurCircle( DeviceContext *dc, int x, int yy, Staff *staff )
 {
     assert( dc );
     assert( staff );
     
-    int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MCIRCLE_STAFFLINES_BELOW_TOP);
+    int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MENSURSIGN_STAFFLINES_BELOW_TOP);
     int r = ToDeviceContextX( m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ));
     r = (int)(MCIRCLE_RADIUS_FACTOR*r);
     
@@ -241,13 +246,16 @@ void View::DrawMensurHalfCircle( DeviceContext *dc, int x, int yy, Staff *staff
     dc->SetPen( m_currentColour, m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize), AxSOLID );
     dc->SetBrush( m_currentColour, AxTRANSPARENT );
     
-    int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MCIRCLE_STAFFLINES_BELOW_TOP);
+    int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MENSURSIGN_STAFFLINES_BELOW_TOP);
     int r = ToDeviceContextX( m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ));
     r = (int)(MCIRCLE_RADIUS_FACTOR*r);
     
     x = ToDeviceContextX (x);
     x -= 3*r/3;
     
+    /* DrawEllipticArc expects x and y to specify the coordinates of the upper-left corner of the
+    rectangle that contains the ellipse; y is not the center of the circle it's an arc of. */
+    y -= staff->m_drawingStaffSize / 2;
     dc->DrawEllipticArc( x, y, 2*r, 2*r, 45, 315 );
     
     dc->ResetPen();
@@ -284,10 +292,8 @@ void View::DrawMensurDot ( DeviceContext *dc, int x, int yy, Staff *staff )
     assert( dc );
     assert( staff );
     
-    //int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MCIRCLE_STAFFLINES_BELOW_TOP);
-    //int r = m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * MENSUR_DOTSIZE;
-    int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * 2);
-    int r = m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2 / 3;
+    int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MENSURSIGN_STAFFLINES_BELOW_TOP);
+    int r = m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * MENSURSIGN_DOTSIZE;
     
     dc->SetPen( m_currentColour, 1, AxSOLID );
     dc->SetBrush( m_currentColour, AxSOLID );
@@ -348,24 +354,27 @@ void View::DrawMaximaToBrevis( DeviceContext *dc, int y, LayerElement *element,
     Note *note = dynamic_cast<Note*>(element);
     assert( note );
     
+    // Mensural noteheads are quite a bit smaller than CMN noteheads; use _pseudoStaffSize_ to force this.
+    int pseudoStaffSize = (int)(MENSUR_NOTEHEAD_FACTOR * staff->m_drawingStaffSize);
     int xn, x1, x2, y1, y2, y3, y4;
     // int yy2, y5; // unused
     int verticalCenter, up, height;
     
-    height = m_doc->GetDrawingBeamWidth(staff->m_drawingStaffSize, false) / 2 ;
+    height = m_doc->GetDrawingBeamWidth(pseudoStaffSize, false) / 2 ;
     xn = element->GetDrawingX();
     
-    // calcul des dimensions du rectangle
-    x1 = xn - m_doc->GetDrawingBrevisWidth( staff->m_drawingStaffSize );
-    x2 = xn +  m_doc->GetDrawingBrevisWidth( staff->m_drawingStaffSize );
+    // Calculate size of the rectangle
+    x1 = xn - m_doc->GetDrawingBrevisWidth( pseudoStaffSize );
+    x2 = xn +  m_doc->GetDrawingBrevisWidth( pseudoStaffSize );
     if (note->GetActualDur() == DUR_MX) {
-        x1 -= m_doc->GetDrawingBrevisWidth( staff->m_drawingStaffSize );
-        x2 += m_doc->GetDrawingBrevisWidth( staff->m_drawingStaffSize );
+        // Maxima is three times the width of brevis
+        x1 -= m_doc->GetDrawingBrevisWidth( pseudoStaffSize );
+        x2 += m_doc->GetDrawingBrevisWidth( pseudoStaffSize );
     }
-    y1 = y + m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-    y2 = y - m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-    y3 = (int)(y1 + m_doc->GetDrawingUnit(staff->m_drawingStaffSize)/2);	// partie d'encadrement qui depasse
-    y4 = (int)(y2 - m_doc->GetDrawingUnit(staff->m_drawingStaffSize)/2);
+    y1 = y + m_doc->GetDrawingUnit(pseudoStaffSize);
+    y2 = y - m_doc->GetDrawingUnit(pseudoStaffSize);
+    y3 = (int)(y1 + m_doc->GetDrawingUnit(pseudoStaffSize)/2);	// partie d'encadrement qui depasse
+    y4 = (int)(y2 - m_doc->GetDrawingUnit(pseudoStaffSize)/2);
     
     if (note->GetColored()!=BOOLEAN_true) {
         //	double base des carrees
@@ -376,13 +385,13 @@ void View::DrawMaximaToBrevis( DeviceContext *dc, int y, LayerElement *element,
         DrawFullRectangle( dc,x1,y1,x2,y2);
     }
     
-    DrawVerticalLine ( dc, y3, y4, x1, m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) );	// corset lateral
-    DrawVerticalLine ( dc, y3, y4, x2, m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) );
+    DrawVerticalLine ( dc, y3, y4, x1, m_doc->GetDrawingStemWidth(pseudoStaffSize) );	// corset lateral
+    DrawVerticalLine ( dc, y3, y4, x2, m_doc->GetDrawingStemWidth(pseudoStaffSize) );
 
     // stem
     if (note->GetActualDur() < DUR_BR)
     {
-        verticalCenter = staff->GetDrawingY() - m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)*2;
+        verticalCenter = staff->GetDrawingY() - m_doc->GetDrawingDoubleUnit(pseudoStaffSize)*2;
         up = (y < verticalCenter) ? true : false;
         if ( note->GetDrawingStemDir() != STEMDIRECTION_NONE ) {
             if ( note->GetDrawingStemDir() == STEMDIRECTION_up) {
@@ -394,14 +403,14 @@ void View::DrawMaximaToBrevis( DeviceContext *dc, int y, LayerElement *element,
         }
         
         if (!up) {
-            y3 = y1 - m_doc->GetDrawingUnit(staff->m_drawingStaffSize)*8;
+            y3 = y1 - m_doc->GetDrawingUnit(pseudoStaffSize)*8;
             y2 = y1;
         }
         else {
-            y3 = y1 + m_doc->GetDrawingUnit(staff->m_drawingStaffSize)*6;
+            y3 = y1 + m_doc->GetDrawingUnit(pseudoStaffSize)*6;
             y2 = y1;
         }
-        DrawVerticalLine ( dc, y2,y3,x2, m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) );
+        DrawVerticalLine ( dc, y2,y3,x2, m_doc->GetDrawingStemWidth(pseudoStaffSize) );
     }
     
     return;
@@ -549,7 +558,79 @@ void View::DrawLigature ( DeviceContext *dc, int y, LayerElement *element, Layer
     return;
 }
 
+
+void View::DrawProportFigures( DeviceContext *dc, int x, int y, int num, int numBase, Staff *staff)
+{
+        assert( dc );
+        assert( staff );
+        
+        int ynum, yden;
+        int textSize = (1.0/2.0)*staff->m_drawingStaffSize;
+        std::wstring wtext;
+        
+        if (numBase)
+        {
+            ynum = y - (m_doc->GetDrawingUnit(textSize)*2);
+            yden = ynum - (m_doc->GetDrawingDoubleUnit(textSize)*2);
+        }
+        else
+            ynum = y - (m_doc->GetDrawingUnit(textSize)*4);
+        
+        if (numBase > 9 || num > 9)	{
+            x += m_doc->GetDrawingUnit(textSize) * 2;
+        }
+        
+        dc->SetFont(m_doc->GetDrawingSmuflFont(textSize, false));
+        
+        wtext = IntToTimeSigFigures(num);
+        DrawSmuflString ( dc, x, ynum, wtext, true, textSize);	// true = center
+        
+        if (numBase)
+        {
+            wtext = IntToTimeSigFigures(numBase);
+            DrawSmuflString ( dc, x, yden, wtext, true, textSize);	// '1' = center
+        }
+        
+        dc->ResetFont();
+        
+        return;
+}
+    
     
+void View::DrawProport( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
+{
+        assert(layer); // Pointer to layer cannot be NULL"
+        assert(staff); // Pointer to staff cannot be NULL"
+        assert(dynamic_cast<Proport*>(element)); // Element must be a Mensur"
+        
+        int x1, x2, y1, y2;
+        
+        Proport *proport = dynamic_cast<Proport*>(element);
+        
+        dc->StartGraphic( element, "", element->GetUuid() );
+        
+        int y = staff->GetDrawingY() - (m_doc->GetDrawingUnit(staff->m_drawingStaffSize)*4);
+        int x = element->GetDrawingX();
+        
+        x1 = x+120;  x2 = x1+150;					// ??TEST: JUST DRAW AN ARBITRARY RECTANGLE
+        y1 = y;	y2 = y+50+(50*proport->GetNum());
+        //DrawFullRectangle( dc,x1,y1,x2,y2);
+        DrawPartFullRectangle( dc,x1,y1,x2,y2, 0);
+        
+        if (proport->HasNum())
+        {
+            x = element->GetDrawingX();
+            //if (proport->GetSign() || proport->HasTempus())           // ??WHAT SHOULD THIS BE?
+            {
+                x += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 5; // step forward because we have a sign or a meter symbol
+            }
+            int numbase = proport->HasNumbase() ? proport->GetNumbase() : 0;
+            DrawProportFigures ( dc, x, staff->GetDrawingY(), proport->GetNum(), numbase, staff);
+        }
+        
+        
+        dc->EndGraphic(element, this );
+}
     
 } // namespace vrv    
     
diff --git a/src/view_page.cpp b/src/view_page.cpp
index 687271afeb4..265b66336a3 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -742,9 +742,10 @@ void View::DrawStaffLines( DeviceContext *dc, Staff *staff, Measure *measure, Sy
     x2 = x1 + measure->GetWidth();
     
     //dc->SetPen( m_currentColour, ToDeviceContextX( m_doc->m_style->m_staffLineWidth ), AxSOLID );
-    int lineWidth = (int)(m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize) * MENSURAL_LINEWIDTH_FACTOR);
+    int lineWidth = (int)(m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize));
+    if (true) lineWidth = lineWidth * MENSURAL_LINEWIDTH_FACTOR;            // ??DON'T DO IF NOT MENSURAL NOTATION!
     dc->SetPen( m_currentColour, ToDeviceContextX( lineWidth ), AxSOLID );
-    dc->SetPen( m_currentColour, ToDeviceContextX( m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize) ), AxSOLID );
+    //dc->SetPen( m_currentColour, ToDeviceContextX( m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize) ), AxSOLID );
     dc->SetBrush( m_currentColour , AxSOLID );
     
     for(j = 0;j < staff->m_drawingLines; j++)

From 118eee5976725451ab6565165471c8c3ffd9977c Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 9 Sep 2015 23:08:33 +0200
Subject: [PATCH 07/85] Minor adjustments

---
 src/view_floating.cpp | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/view_floating.cpp b/src/view_floating.cpp
index 7ef3eb4bb98..f38784467cb 100644
--- a/src/view_floating.cpp
+++ b/src/view_floating.cpp
@@ -183,7 +183,8 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
     
     bool up = true;
     data_STEMDIRECTION noteStemDir = STEMDIRECTION_NONE;
-    int y1, y2;
+    int y1 = staff->GetDrawingY();
+    int y2 = staff->GetDrawingY();
     
     /************** parent layers **************/
     
@@ -222,26 +223,23 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
         LogWarning("Slurs between different layers may not be fully supported.");
     }
     
-    /************** y positions **************/
+    /************** note stem dir **************/
     
     // the normal case
-    if ( spanningType == SPANNING_START_END ) {
+    if (spanningType == SPANNING_START_END) {
         noteStemDir = start->GetDrawingStemDir();
     }
     // This is the case when the tie is split over two system of two pages.
     // In this case, we are now drawing its beginning to the end of the measure (i.e., the last aligner)
-    else if ( spanningType == SPANNING_START ) {
+    else if (spanningType == SPANNING_START) {
         noteStemDir = start->GetDrawingStemDir();
     }
     // Now this is the case when the tie is split but we are drawing the end of it
-    else if ( spanningType == SPANNING_END ) {
+    else if (spanningType == SPANNING_END) {
         noteStemDir = end->GetDrawingStemDir();
     }
     // Finally, slur accross an entire system; use the staff position and up (see below)
     else {
-        // To be adjusted
-        y1 = staff->GetDrawingY();
-        y2 = y1;
         noteStemDir = STEMDIRECTION_down;
     }
     
@@ -268,7 +266,7 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
     else if (noteStemDir == STEMDIRECTION_NONE) {
         // no information from the note stem directions, look at the position in the notes
         int center = staff->GetDrawingY() - m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * 2;
-        up = (y1 > center) ? true : false;
+        up = (start->GetDrawingY() > center) ? true : false;
     }
     
     /************** adjusting y position **************/
@@ -321,7 +319,7 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
             // (^)P
             if (endStemDir == STEMDIRECTION_down) y2 = end->GetDrawingY();
             // d(^)d
-            else if ((parentBeam = end->IsInBeam()) && !parentBeam->IsLastInBeam(end)) {
+            else if ((parentBeam = end->IsInBeam()) && !parentBeam->IsFirstInBeam(end)) {
                 y2 = end->m_drawingStemEnd.y;
             }
             // (^)d
@@ -335,7 +333,7 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
             // (_)d
             if (endStemDir == STEMDIRECTION_up) y2 = end->GetDrawingY();
             // P(_)P
-            else if ((parentBeam = end->IsInBeam()) && !parentBeam->IsLastInBeam(end)) {
+            else if ((parentBeam = end->IsInBeam()) && !parentBeam->IsFirstInBeam(end)) {
                 y2 = end->m_drawingStemEnd.y;
             }
             // (_)P
@@ -346,6 +344,23 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
             }
         }
     }
+    
+    if (spanningType == SPANNING_START) {
+        if (up) y2 = std::max(staff->GetDrawingY(), y1);
+        else y2 = std::min(staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize), y1);
+    }
+    // Now this is the case when the tie is split but we are drawing the end of it
+    else if (spanningType == SPANNING_END) {
+        if (up) y1 = std::max(staff->GetDrawingY(), y2);
+        else y1 = std::min(staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize), y2);
+    }
+    // Finally, slur accross an entire system; use the staff position and up (see below)
+    else if (spanningType != SPANNING_START_END) {
+        // To be adjusted
+        if (up) y1 = staff->GetDrawingY();
+        else y1 = staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize);
+        y2 = y1;
+    }
 
     /************** y position **************/
     

From 1d660b95da04b5137ab28948d007b19a9c8050e9 Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Wed, 9 Sep 2015 21:06:19 -0400
Subject: [PATCH 08/85] Correct bad typo in comment ("get" should be "set"!)

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

diff --git a/src/page.cpp b/src/page.cpp
index b9f1115d172..0dc47e34029 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -112,7 +112,7 @@ void Page::LayOutHorizontally( )
     Functor alignHorizontallyEnd( &Object::AlignHorizontallyEnd );
     this->Process( &alignHorizontally, &params, &alignHorizontallyEnd );
     
-    // Unless duration-based spacing is disabled, get the X position of each Alignment.
+    // 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->GetEvenSpacing()) {
         params.clear();

From 38ad7febe01a9f1c1944a9eed33d9cb2dfac8885 Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Wed, 9 Sep 2015 21:08:41 -0400
Subject: [PATCH 09/85] Rename #define'd constants for clarity; add a #define;
 clarify comments

---
 src/view_mensural.cpp | 44 ++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/view_mensural.cpp b/src/view_mensural.cpp
index bb8f4279f15..269ba384827 100644
--- a/src/view_mensural.cpp
+++ b/src/view_mensural.cpp
@@ -29,15 +29,17 @@ namespace vrv {
 /* ??THESE #defines PROBABLY BELONG IN style.h . */
     
 /* Set ratio of mensural notehead size to CMN notehead size for the same staff size */
-#define MENSUR_NOTEHEAD_FACTOR 0.60
-/* Set size of mensuration sign circle relative to space between staff lines. The entire mensuration sign fits
-     easily between two staff lines, so the radius is considerably less than half the distance between them. */
-#define MCIRCLE_RADIUS_FACTOR 0.32
+#define MNOTEHEAD_SIZE_FACTOR 0.60
+/* Set size of mensuration sign circle relative to space between staff lines. (In early manuscripts,
+the entire mensuration sign fits easily between two staff lines, so the radius is considerably less
+than half the distance between them.) */
+#define MSIGN_CIRCLE_RADIUS_FACTOR 0.32
 /* Set vertical position of center of mensuration sign as distance below top of the staff */
-#define MENSURSIGN_STAFFLINES_BELOW_TOP 1.5
-/* Set size rel. to dist. between staff lines of mensural-notation dot, e.g., within mensuration signs */
-#define MENSURSIGN_DOTSIZE 0.15
-    
+#define MSIGN_STAFFLINES_BELOW_TOP 1.5
+/* Set size rel. to dist. between staff lines of dot inside mensuration signs */
+#define MSIGN_DOTSIZE 0.15
+/* Set relative size of figures in proportions */
+#define PROPRT_SIZE_FACTOR 0.50
     
 int View::s_drawingLigX[2], View::s_drawingLigY[2];	// pour garder coord. des ligatures
 bool View::s_drawingLigObliqua = false;	// marque le 1e passage pour une oblique
@@ -59,7 +61,7 @@ void View::DrawMensuralNote ( DeviceContext *dc, LayerElement *element, Layer *l
     
     int staffSize = staff->m_drawingStaffSize;
     // Mensural noteheads are quite a bit smaller than CMN noteheads; use _pseudoStaffSize_ to force this.
-    int pseudoStaffSize = (int)(MENSUR_NOTEHEAD_FACTOR * staff->m_drawingStaffSize);
+    int pseudoStaffSize = (int)(MNOTEHEAD_SIZE_FACTOR * staff->m_drawingStaffSize);
     int noteY = element->GetDrawingY();
     int xLedger, xNote, xStem;
     int drawingDur;
@@ -154,7 +156,7 @@ void View::DrawMensuralNote ( DeviceContext *dc, LayerElement *element, Layer *l
     /************** dots **************/
     
     if (note->GetDots()) {
-        int mensDrawingUnit = (int)(MENSUR_NOTEHEAD_FACTOR * m_doc->GetDrawingUnit(staffSize));
+        int mensDrawingUnit = (int)(MNOTEHEAD_SIZE_FACTOR * m_doc->GetDrawingUnit(staffSize));
         int xDot;
         if (note->GetDur() < DUR_2 || (note->GetDur() > DUR_8 && (note->GetDrawingStemDir() == STEMDIRECTION_up)))
             xDot = xStem + mensDrawingUnit*7/2;
@@ -223,9 +225,9 @@ void View::DrawMensurCircle( DeviceContext *dc, int x, int yy, Staff *staff )
     assert( dc );
     assert( staff );
     
-    int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MENSURSIGN_STAFFLINES_BELOW_TOP);
+    int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MSIGN_STAFFLINES_BELOW_TOP);
     int r = ToDeviceContextX( m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ));
-    r = (int)(MCIRCLE_RADIUS_FACTOR*r);
+    r = (int)(MSIGN_CIRCLE_RADIUS_FACTOR*r);
     
     int lineWidth = (int)(m_doc->GetDrawingStaffLineWidth( staff->m_drawingStaffSize ) * 0.5);
     dc->SetPen( m_currentColour, lineWidth, AxSOLID );
@@ -246,9 +248,9 @@ void View::DrawMensurHalfCircle( DeviceContext *dc, int x, int yy, Staff *staff
     dc->SetPen( m_currentColour, m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize), AxSOLID );
     dc->SetBrush( m_currentColour, AxTRANSPARENT );
     
-    int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MENSURSIGN_STAFFLINES_BELOW_TOP);
+    int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MSIGN_STAFFLINES_BELOW_TOP);
     int r = ToDeviceContextX( m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ));
-    r = (int)(MCIRCLE_RADIUS_FACTOR*r);
+    r = (int)(MSIGN_CIRCLE_RADIUS_FACTOR*r);
     
     x = ToDeviceContextX (x);
     x -= 3*r/3;
@@ -292,8 +294,8 @@ void View::DrawMensurDot ( DeviceContext *dc, int x, int yy, Staff *staff )
     assert( dc );
     assert( staff );
     
-    int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MENSURSIGN_STAFFLINES_BELOW_TOP);
-    int r = m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * MENSURSIGN_DOTSIZE;
+    int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MSIGN_STAFFLINES_BELOW_TOP);
+    int r = m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * MSIGN_DOTSIZE;
     
     dc->SetPen( m_currentColour, 1, AxSOLID );
     dc->SetBrush( m_currentColour, AxSOLID );
@@ -355,7 +357,7 @@ void View::DrawMaximaToBrevis( DeviceContext *dc, int y, LayerElement *element,
     assert( note );
     
     // Mensural noteheads are quite a bit smaller than CMN noteheads; use _pseudoStaffSize_ to force this.
-    int pseudoStaffSize = (int)(MENSUR_NOTEHEAD_FACTOR * staff->m_drawingStaffSize);
+    int pseudoStaffSize = (int)(MNOTEHEAD_SIZE_FACTOR * staff->m_drawingStaffSize);
     int xn, x1, x2, y1, y2, y3, y4;
     // int yy2, y5; // unused
     int verticalCenter, up, height;
@@ -565,7 +567,7 @@ void View::DrawProportFigures( DeviceContext *dc, int x, int y, int num, int num
         assert( staff );
         
         int ynum, yden;
-        int textSize = (1.0/2.0)*staff->m_drawingStaffSize;
+        int textSize = PROPRT_SIZE_FACTOR*staff->m_drawingStaffSize;
         std::wstring wtext;
         
         if (numBase)
@@ -599,9 +601,9 @@ void View::DrawProportFigures( DeviceContext *dc, int x, int y, int num, int num
     
 void View::DrawProport( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
 {
-        assert(layer); // Pointer to layer cannot be NULL"
-        assert(staff); // Pointer to staff cannot be NULL"
-        assert(dynamic_cast<Proport*>(element)); // Element must be a Mensur"
+        assert( layer );
+        assert( staff );
+        assert( dynamic_cast<Proport*>(element) ); // Element must be a Proport"
         
         int x1, x2, y1, y2;
         

From 109c5af5cdbfd129603031e7430f636c63470cb3 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 10 Sep 2015 22:04:24 +0200
Subject: [PATCH 10/85] Adjusting slurs (WIP)

---
 include/vrv/layerelement.h |   6 ++
 include/vrv/view.h         |   2 +
 include/vrv/vrvdef.h       |   4 +
 src/layerelement.cpp       |  23 ++++-
 src/view_floating.cpp      | 172 +++++++++++++++++++++++++++++++------
 5 files changed, 181 insertions(+), 26 deletions(-)

diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 89005691c1b..61a10fe66f7 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -91,6 +91,12 @@ class LayerElement: public DocObject
      * (Could one day go in a drawing stem interface)
      */
     data_STEMDIRECTION GetDrawingStemDir();
+    
+    /**
+     * Returns the drawing top and bottom taking into accound stem, etc.
+     */
+    int GetDrawingTop();
+    int GetDrawingBottom();
 
     /**
      * Alignment getter
diff --git a/include/vrv/view.h b/include/vrv/view.h
index a9274b296da..6f8532ed0de 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -333,6 +333,8 @@ class View
     ///@}
     
     float AdjustSlurPosition(Slur *slur, Staff *staff, int layerN, bool up,  Point points[]);
+    bool AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2,
+                         bool up, float angle );
     
     /**
      * @name Used for calculating clustered information/dot position
diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index 5622d063e3f..2cca0b4e73d 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -23,8 +23,10 @@ namespace vrv {
  
 class AttComparison;
 class BeamElementCoord;
+class LayerElement;
 class Note;
 class Object;
+class Point;
 class Staff;
 
 typedef std::vector<Object*> ArrayOfObjects;
@@ -40,6 +42,8 @@ typedef std::vector<Note*> ChordCluster;
 typedef std::vector<BeamElementCoord*> ArrayOfBeamElementCoords;
     
 typedef std::map<Staff*, std::vector<char> > MapOfLedgerLineFlags;
+    
+typedef std::vector<std::pair<LayerElement*, Point> > ArrayOfLayerElementPointPairs;
 
 //----------------------------------------------------------------------------
 // Object defines
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 063820b1024..24b4775433b 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -129,6 +129,25 @@ data_STEMDIRECTION LayerElement::GetDrawingStemDir()
     return STEMDIRECTION_NONE;
 }
     
+int LayerElement::GetDrawingTop()
+{
+    if ((this->Is() == NOTE) || (this->Is() == CHORD)){
+        if (this->GetDrawingStemDir() == STEMDIRECTION_up) return this->m_drawingStemEnd.y;
+        else return this->m_drawingStemStart.y;
+    }
+    return this->GetDrawingY();
+}
+
+
+int LayerElement::GetDrawingBottom()
+{
+    if ((this->Is() == NOTE) || (this->Is() == CHORD)){
+        if (this->GetDrawingStemDir() == STEMDIRECTION_up) return this->m_drawingStemStart.y;
+        else return this->m_drawingStemEnd.y;
+    }
+    return this->GetDrawingY();
+}
+    
 bool LayerElement::IsCueSize()
 {
     if ( this->Is() == NOTE ) {
@@ -437,8 +456,8 @@ int LayerElement::TimeSpanningLayerElements( ArrayPtrVoid *params )
     int *min_pos = static_cast<int*>((*params).at(1));
     int *max_pos = static_cast<int*>((*params).at(2));
     
-    if (this->GetDrawingX() >= (*min_pos) && this->GetDrawingX() <= (*max_pos)) {
-        if (this->Is() == NOTE) spanningContent->push_back(this);
+    if (this->GetDrawingX() > (*min_pos) && this->GetDrawingX() < (*max_pos)) {
+        if ((this->Is() == NOTE) || (this->Is() == CHORD)) spanningContent->push_back(this);
     }
     else if (this->GetDrawingX() > (*max_pos) ) {
         return FUNCTOR_STOP;
diff --git a/src/view_floating.cpp b/src/view_floating.cpp
index f38784467cb..634ecd9d303 100644
--- a/src/view_floating.cpp
+++ b/src/view_floating.cpp
@@ -271,6 +271,9 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
     
     /************** adjusting y position **************/
     
+    bool isShortSlur = false;
+    if (x2 - x1 < 3 * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)) isShortSlur = true;
+    
     int yChordMax, yChordMin;
     if ((spanningType == SPANNING_START_END) || (spanningType == SPANNING_START)) {
         // first get the min max of the chord (if any)
@@ -279,14 +282,15 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
         // slur is up
         if (up) {
             // P(^)
-            if (noteStemDir == STEMDIRECTION_down) y1 = start->GetDrawingY();
+            if (noteStemDir == STEMDIRECTION_down) y1 = start->GetDrawingTop();
             //  d(^)d
-            else if ((parentBeam = start->IsInBeam()) && !parentBeam->IsLastInBeam(start)) {
-                y1 = start->m_drawingStemEnd.y;
+            else if (isShortSlur || ((parentBeam = start->IsInBeam()) && !parentBeam->IsLastInBeam(start))) {
+                y1 = start->GetDrawingTop();
             }
             // d(^)
             else {
-                x1 += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3 / 2;
+                // put it on the side, move it left
+                x1 += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 4 / 2;
                 if (startChord || startParentChord) y1 = yChordMin + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
                 else y1 = start->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
             }
@@ -294,14 +298,14 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
         // slur is down
         else {
             // d(_)
-            if (noteStemDir == STEMDIRECTION_up) y1 = start->GetDrawingY();
+            if (noteStemDir == STEMDIRECTION_up) y1 = start->GetDrawingBottom();
             // P(_)P
-            else if ((parentBeam = start->IsInBeam()) && !parentBeam->IsLastInBeam(start)) {
-                y1 = start->m_drawingStemEnd.y;
+            else if (isShortSlur || ((parentBeam = start->IsInBeam()) && !parentBeam->IsLastInBeam(start))) {
+                y1 = start->GetDrawingBottom();
             }
             // P(_)
             else {
-                //x1 += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3 / 2;
+                // put it on the side, but no need to move it left
                 y1 = start->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
                 if (startChord || startParentChord) y1 = yChordMin + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
                 else y1 = start->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
@@ -317,27 +321,28 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
         // slur is up
         if (up) {
             // (^)P
-            if (endStemDir == STEMDIRECTION_down) y2 = end->GetDrawingY();
+            if (endStemDir == STEMDIRECTION_down) y2 = end->GetDrawingTop();
             // d(^)d
-            else if ((parentBeam = end->IsInBeam()) && !parentBeam->IsFirstInBeam(end)) {
-                y2 = end->m_drawingStemEnd.y;
+            else if (isShortSlur || ((parentBeam = end->IsInBeam()) && !parentBeam->IsFirstInBeam(end))) {
+                y2 = end->GetDrawingTop();
             }
             // (^)d
             else {
-                //x1 += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3 / 2;
+                // put it on the side, no need to move it right
                 if (endChord || endParentChord) y2 = yChordMin + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
                 else y2 = end->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
             }
         }
         else {
             // (_)d
-            if (endStemDir == STEMDIRECTION_up) y2 = end->GetDrawingY();
+            if (endStemDir == STEMDIRECTION_up) y2 = end->GetDrawingBottom();
             // P(_)P
-            else if ((parentBeam = end->IsInBeam()) && !parentBeam->IsFirstInBeam(end)) {
-                y2 = end->m_drawingStemEnd.y;
+            else if (isShortSlur || ((parentBeam = end->IsInBeam()) && !parentBeam->IsFirstInBeam(end))) {
+                y2 = end->GetDrawingBottom();
             }
             // (_)P
             else {
+                // put it on the side, move it right
                 x2 -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
                 if (endChord || endParentChord) y2 = yChordMin + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
                 else y2 = end->GetDrawingY() - m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
@@ -345,16 +350,16 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
         }
     }
     
+    // Positions not attached to a note
     if (spanningType == SPANNING_START) {
         if (up) y2 = std::max(staff->GetDrawingY(), y1);
         else y2 = std::min(staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize), y1);
     }
-    // Now this is the case when the tie is split but we are drawing the end of it
     else if (spanningType == SPANNING_END) {
         if (up) y1 = std::max(staff->GetDrawingY(), y2);
         else y1 = std::min(staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize), y2);
     }
-    // Finally, slur accross an entire system; use the staff position and up (see below)
+    // slur accross an entire system; use the staff position
     else if (spanningType != SPANNING_START_END) {
         // To be adjusted
         if (up) y1 = staff->GetDrawingY();
@@ -377,7 +382,9 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
     points[0] = Point(x1, y1);
     points[1] = Point(x2, y2);
     
-    float angle = AdjustSlurPosition(slur, staff, layer1->GetN(), up, points);
+    float angle = 0.0;
+    // We do not want to ajdust the position when calculating bounding boxes (at least for now)
+    if (dynamic_cast<BBoxDeviceContext*>(dc) == NULL) angle = AdjustSlurPosition(slur, staff, layer1->GetN(), up, points);
     
     int thickness =  m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * m_doc->GetSlurThickness() / DEFINITON_FACTOR ;
     
@@ -386,7 +393,6 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
     dc->DeactivateGraphic();
     DrawThickBezierCurve(dc, points[0], points[1], points[2], points[3], thickness, staff->m_drawingStaffSize, angle);
     dc->ReactivateGraphic();
-    
     if ( graphic ) dc->EndResumedGraphic(graphic, this);
     else dc->EndGraphic(slur, this);
 }
@@ -438,17 +444,17 @@ float View::AdjustSlurPosition(Slur *slur, Staff *staff, int layerN, bool up,  P
     /************** rotation **************/
     
     // control points
-    Point rotatecC1, rotatedC2;
+    Point rotatedC1, rotatedC2;
     
     int cPos = std::min((rotatedP2.x - p1->x) / TEMP_STYLE_SLUR_CONTROL_POINT_FACTOR, m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize));
-    rotatecC1.x = p1->x + cPos; // point at 1/4
+    rotatedC1.x = p1->x + cPos; // point at 1/4
     rotatedC2.x = rotatedP2.x - cPos;; // point at 3/4
     
     if (up) {
-        rotatecC1.y = p1->y + height;
+        rotatedC1.y = p1->y + height;
         rotatedC2.y = rotatedP2.y + height;
     } else {
-        rotatecC1.y = p1->y - height;
+        rotatedC1.y = p1->y - height;
         rotatedC2.y = rotatedP2.y - height;
     }
     
@@ -475,9 +481,36 @@ float View::AdjustSlurPosition(Slur *slur, Staff *staff, int layerN, bool up,  P
     system->Process( &timeSpanningLayerElements, &params, NULL, &filters );
     if (spanningContent.size() > 12) LogDebug("### %d %s", spanningContent.size(), slur->GetUuid().c_str());
     
+    LogDebug("--------" ) ;
+    
+    ArrayOfLayerElementPointPairs spanningContentPoints;
+    std::vector<LayerElement*>::iterator it;
+    for (it = spanningContent.begin(); it != spanningContent.end(); it++)
+    {
+        Note *note = NULL;
+        if (((*it)->Is() != NOTE) && ((*it)->Is() != CHORD)) continue;
+        if ((note = dynamic_cast<Note*>(*it)) && note->IsChordTone()) continue;
+        Point p;
+        if (up) {
+            p.y = (*it)->GetDrawingTop();
+        }
+        else {
+            p.y = (*it)->GetDrawingBottom();
+        }
+        p.x = (*it)->GetDrawingX();
+        p = View::CalcPositionAfterRotation(p, -slurAngle, *p1);
+        if (up) p.y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3;
+        else p.y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3;
+        spanningContentPoints.push_back(std::make_pair((*it), p));
+    }
+    
+    bool maxHeight = false;
+    while (!spanningContentPoints.empty() && !maxHeight) {
+        maxHeight = AdjustSlurCurve(slur, &spanningContentPoints, p1, &rotatedP2, &rotatedC1, &rotatedC2, up, slurAngle );
+    }
     
     points[1] = View::CalcPositionAfterRotation(rotatedP2, slurAngle, *p1);
-    points[2] = View::CalcPositionAfterRotation(rotatecC1, slurAngle, *p1);
+    points[2] = View::CalcPositionAfterRotation(rotatedC1, slurAngle, *p1);
     points[3] = View::CalcPositionAfterRotation(rotatedC2, slurAngle, *p1);
     
     
@@ -499,6 +532,97 @@ float View::AdjustSlurPosition(Slur *slur, Staff *staff, int layerN, bool up,  P
     return slurAngle;
 }
     
+/*
+bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2, bool up, float angle)
+{
+    Point bezier[4];
+    bezier[0] = *p1;
+    bezier[1] = *c1;
+    bezier[2] = *c2;
+    bezier[3] = *p2;
+    
+    int dist = abs(p2->x - p1->x);
+    int maxHeight = 0;
+    int step =  m_doc->GetDrawingUnit(100) * 4 / 3;
+    
+    float maxHeightFactor = std::max(0.2, fabs(angle));
+    maxHeight = dist / (maxHeightFactor * 5);
+    
+    ArrayOfLayerElementPointPairs::iterator itPoint;
+    for (itPoint = spanningPoints->begin(); itPoint != spanningPoints->end();) {
+        if (up && (View::CalcBezierAtPosition(bezier, itPoint->second.x) > itPoint->second.y)) {
+            //LogDebug("Removing %d - %d", itPoint->first->GetDrawingX(), itPoint->first->GetDrawingY() ) ;
+            itPoint = spanningPoints->erase( itPoint );
+        }
+        else {
+            //LogDebug("KEEPING %d - %d", itPoint->first->GetDrawingX(), itPoint->first->GetDrawingY() ) ;
+            itPoint++;
+        }
+    }
+    
+    if (abs(c1->y - p1->y) + step > maxHeight) return true;
+    
+    if (!spanningPoints->empty()) {
+        if (up) {
+            c1->y += step;
+            c2->y = c1->y;
+        }
+        else {
+            c1->y -= step;
+            c2->y = c1->y;
+        }
+    }
+    return false;
+}
+*/
+    
+bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2, bool up, float angle)
+{
+    Point bezier[4];
+    bezier[0] = *p1;
+    bezier[1] = *c1;
+    bezier[2] = *c2;
+    bezier[3] = *p2;
+    
+    int dist = abs(p2->x - p1->x);
+    int currentHeight = abs(c1->y - p1->y);
+    int maxHeight = 0;
+    int step =  m_doc->GetDrawingUnit(100) * 4 / 3;
+    
+    float maxHeightFactor = std::max(0.2, fabs(angle));
+    maxHeight = dist / (maxHeightFactor * 5);
+    
+    int y;
+    float maxRatio = 1.0;
+    ArrayOfLayerElementPointPairs::iterator itPoint;
+    for (itPoint = spanningPoints->begin(); itPoint != spanningPoints->end(); itPoint++) {
+        y = View::CalcBezierAtPosition(bezier, itPoint->second.x);
+        if (up) {
+            if (y < itPoint->second.y) {
+                float ratio = (float)(p1->y - itPoint->second.y) / (float)(p1->y - y);
+                maxRatio = ratio > maxRatio ? ratio : maxRatio;
+            }
+        }
+    }
+    
+    int desiredHeight = currentHeight * maxRatio;
+    if (desiredHeight > maxHeight) {
+        maxRatio = (float)maxHeight / (float)currentHeight;
+    }
+    
+    if (!spanningPoints->empty()) {
+        if (up) {
+            c1->y = p1->y + currentHeight * maxRatio;
+            c2->y = c1->y;
+        }
+        else {
+            c1->y = p1->y - currentHeight * maxRatio;
+            c2->y = c1->y;
+        }
+    }
+    return true;
+}
+    
 void View::DrawTie( DeviceContext *dc, Tie *tie, int x1, int x2, Staff *staff,
                          char spanningType, DocObject *graphic )
 {

From 66d7d69ab04b1f358ff4ff78351a11e3b2bafb73 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 10 Sep 2015 22:11:21 +0200
Subject: [PATCH 11/85] Fixing bug introduced in a merge - needs investigation

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

diff --git a/src/page.cpp b/src/page.cpp
index 0dc47e34029..aebb1fd8e99 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -121,7 +121,7 @@ void Page::LayOutHorizontally( )
         int minMeasureWidth = doc->m_drawingMinMeasureWidth;
         params.push_back( &previousTime );
         params.push_back( &previousXRel );
-        params.push_back( &minMeasureWidth );
+        //params.push_back( &minMeasureWidth );
         Functor setAlignmentX( &Object::SetAligmentXPos );
         // Special case: because we redirect the functor, pass it a parameter to itself (!)
         params.push_back( &setAlignmentX );

From 8dbbdf511d0c6ce660c359f03d22b351072cd06b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 11 Sep 2015 11:44:10 +0200
Subject: [PATCH 12/85] More adjustments

---
 include/vrv/layerelement.h |   5 +-
 include/vrv/view.h         |   4 +-
 src/layerelement.cpp       |  12 +--
 src/view_floating.cpp      | 156 ++++++++++++++++++++++---------------
 4 files changed, 108 insertions(+), 69 deletions(-)

diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 61a10fe66f7..ebab918fc29 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -94,9 +94,10 @@ class LayerElement: public DocObject
     
     /**
      * Returns the drawing top and bottom taking into accound stem, etc.
+     * We pass the doc as parameter in order to have access to the current drawing parameters.
      */
-    int GetDrawingTop();
-    int GetDrawingBottom();
+    int GetDrawingTop(Doc* doc, int staffSize);
+    int GetDrawingBottom(Doc* doc, int staffSize);
 
     /**
      * Alignment getter
diff --git a/include/vrv/view.h b/include/vrv/view.h
index 6f8532ed0de..c0078ead0f9 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -332,9 +332,11 @@ class View
     int GetSylY( Syl* syl, Staff *staff );
     ///@}
     
-    float AdjustSlurPosition(Slur *slur, Staff *staff, int layerN, bool up,  Point points[]);
+    float AdjustSlur(Slur *slur, Staff *staff, int layerN, bool up,  Point points[]);
     bool AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2,
                          bool up, float angle );
+    bool AdjustSlurPosition(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2,
+                         bool up, float angle );
     
     /**
      * @name Used for calculating clustered information/dot position
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 24b4775433b..2dc0c471972 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -129,20 +129,22 @@ data_STEMDIRECTION LayerElement::GetDrawingStemDir()
     return STEMDIRECTION_NONE;
 }
     
-int LayerElement::GetDrawingTop()
+int LayerElement::GetDrawingTop(Doc *doc, int staffSize)
 {
     if ((this->Is() == NOTE) || (this->Is() == CHORD)){
+        // We should also take into accound the stem shift to the right
         if (this->GetDrawingStemDir() == STEMDIRECTION_up) return this->m_drawingStemEnd.y;
-        else return this->m_drawingStemStart.y;
+        else return this->m_drawingStemStart.y + doc->GetDrawingUnit(staffSize);
     }
     return this->GetDrawingY();
 }
 
 
-int LayerElement::GetDrawingBottom()
+int LayerElement::GetDrawingBottom(Doc *doc, int staffSize)
 {
     if ((this->Is() == NOTE) || (this->Is() == CHORD)){
-        if (this->GetDrawingStemDir() == STEMDIRECTION_up) return this->m_drawingStemStart.y;
+        if (this->GetDrawingStemDir() == STEMDIRECTION_up) return this->m_drawingStemStart.y - doc->GetDrawingUnit(staffSize);
+        // We should also take into accound the stem shift to the left
         else return this->m_drawingStemEnd.y;
     }
     return this->GetDrawingY();
@@ -457,7 +459,7 @@ int LayerElement::TimeSpanningLayerElements( ArrayPtrVoid *params )
     int *max_pos = static_cast<int*>((*params).at(2));
     
     if (this->GetDrawingX() > (*min_pos) && this->GetDrawingX() < (*max_pos)) {
-        if ((this->Is() == NOTE) || (this->Is() == CHORD)) spanningContent->push_back(this);
+        spanningContent->push_back(this);
     }
     else if (this->GetDrawingX() > (*max_pos) ) {
         return FUNCTOR_STOP;
diff --git a/src/view_floating.cpp b/src/view_floating.cpp
index 634ecd9d303..d0e9be85c30 100644
--- a/src/view_floating.cpp
+++ b/src/view_floating.cpp
@@ -282,33 +282,33 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
         // slur is up
         if (up) {
             // P(^)
-            if (noteStemDir == STEMDIRECTION_down) y1 = start->GetDrawingTop();
+            if (noteStemDir == STEMDIRECTION_down) y1 = start->GetDrawingTop(m_doc, staff->m_drawingStaffSize);
             //  d(^)d
             else if (isShortSlur || ((parentBeam = start->IsInBeam()) && !parentBeam->IsLastInBeam(start))) {
-                y1 = start->GetDrawingTop();
+                y1 = start->GetDrawingTop(m_doc, staff->m_drawingStaffSize);
             }
             // d(^)
             else {
                 // put it on the side, move it left
                 x1 += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 4 / 2;
-                if (startChord || startParentChord) y1 = yChordMin + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
-                else y1 = start->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
+                if (startChord || startParentChord) y1 = yChordMin + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3;
+                else y1 = start->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3;
             }
         }
         // slur is down
         else {
             // d(_)
-            if (noteStemDir == STEMDIRECTION_up) y1 = start->GetDrawingBottom();
+            if (noteStemDir == STEMDIRECTION_up) y1 = start->GetDrawingBottom(m_doc, staff->m_drawingStaffSize);
             // P(_)P
             else if (isShortSlur || ((parentBeam = start->IsInBeam()) && !parentBeam->IsLastInBeam(start))) {
-                y1 = start->GetDrawingBottom();
+                y1 = start->GetDrawingBottom(m_doc, staff->m_drawingStaffSize);
             }
             // P(_)
             else {
                 // put it on the side, but no need to move it left
                 y1 = start->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
-                if (startChord || startParentChord) y1 = yChordMin + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
-                else y1 = start->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
+                if (startChord || startParentChord) y1 = yChordMin - m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3;
+                else y1 = start->GetDrawingY() - m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3;
             }
         }
     }
@@ -321,31 +321,31 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
         // slur is up
         if (up) {
             // (^)P
-            if (endStemDir == STEMDIRECTION_down) y2 = end->GetDrawingTop();
+            if (endStemDir == STEMDIRECTION_down) y2 = end->GetDrawingTop(m_doc, staff->m_drawingStaffSize);
             // d(^)d
             else if (isShortSlur || ((parentBeam = end->IsInBeam()) && !parentBeam->IsFirstInBeam(end))) {
-                y2 = end->GetDrawingTop();
+                y2 = end->GetDrawingTop(m_doc, staff->m_drawingStaffSize);
             }
             // (^)d
             else {
                 // put it on the side, no need to move it right
-                if (endChord || endParentChord) y2 = yChordMin + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
-                else y2 = end->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
+                if (endChord || endParentChord) y2 = yChordMin + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3;
+                else y2 = end->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3;
             }
         }
         else {
             // (_)d
-            if (endStemDir == STEMDIRECTION_up) y2 = end->GetDrawingBottom();
+            if (endStemDir == STEMDIRECTION_up) y2 = end->GetDrawingBottom(m_doc, staff->m_drawingStaffSize);
             // P(_)P
             else if (isShortSlur || ((parentBeam = end->IsInBeam()) && !parentBeam->IsFirstInBeam(end))) {
-                y2 = end->GetDrawingBottom();
+                y2 = end->GetDrawingBottom(m_doc, staff->m_drawingStaffSize);
             }
             // (_)P
             else {
                 // put it on the side, move it right
                 x2 -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
-                if (endChord || endParentChord) y2 = yChordMin + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
-                else y2 = end->GetDrawingY() - m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
+                if (endChord || endParentChord) y2 = yChordMin - m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3;
+                else y2 = end->GetDrawingY() - m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3;
             }
         }
     }
@@ -370,12 +370,12 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
     /************** y position **************/
     
     if (up) {
-        y1 += 2 * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-        y2 += 2 * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+        y1 += 1 * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+        y2 += 1 * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
     }
     else {
-        y1 -= 2 * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-        y2 -= 2 * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+        y1 -= 1 * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+        y2 -= 1 * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
     }
     
     Point points[4];
@@ -384,7 +384,7 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
     
     float angle = 0.0;
     // We do not want to ajdust the position when calculating bounding boxes (at least for now)
-    if (dynamic_cast<BBoxDeviceContext*>(dc) == NULL) angle = AdjustSlurPosition(slur, staff, layer1->GetN(), up, points);
+    if (dynamic_cast<BBoxDeviceContext*>(dc) == NULL) angle = AdjustSlur(slur, staff, layer1->GetN(), up, points);
     
     int thickness =  m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * m_doc->GetSlurThickness() / DEFINITON_FACTOR ;
     
@@ -397,7 +397,7 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
     else dc->EndGraphic(slur, this);
 }
     
-float View::AdjustSlurPosition(Slur *slur, Staff *staff, int layerN, bool up,  Point points[])
+float View::AdjustSlur(Slur *slur, Staff *staff, int layerN, bool up,  Point points[])
 {
     // For readability makes them p1 and p2
     Point *p1 = &points[0];
@@ -441,14 +441,14 @@ float View::AdjustSlurPosition(Slur *slur, Staff *staff, int layerN, bool up,  P
     // the height of the control points
     height = height * 4 / 3;
     
-    /************** rotation **************/
+    /************** control points **************/
     
-    // control points
     Point rotatedC1, rotatedC2;
     
+    // Set the x position of the control points
     int cPos = std::min((rotatedP2.x - p1->x) / TEMP_STYLE_SLUR_CONTROL_POINT_FACTOR, m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize));
-    rotatedC1.x = p1->x + cPos; // point at 1/4
-    rotatedC2.x = rotatedP2.x - cPos;; // point at 3/4
+    rotatedC1.x = p1->x + cPos;
+    rotatedC2.x = rotatedP2.x - cPos;
     
     if (up) {
         rotatedC1.y = p1->y + height;
@@ -460,7 +460,6 @@ float View::AdjustSlurPosition(Slur *slur, Staff *staff, int layerN, bool up,  P
     
     /************** content **************/
     
-    
     System *system = dynamic_cast<System*>(staff->GetFirstParent(SYSTEM));
     assert(system);
     std::vector<LayerElement*>spanningContent;
@@ -477,36 +476,38 @@ float View::AdjustSlurPosition(Slur *slur, Staff *staff, int layerN, bool up,  P
     filters.push_back( &matchLayer );
     
     Functor timeSpanningLayerElements( &Object::TimeSpanningLayerElements );
-    //LogDebug("*** %d - %d", note1->GetDrawingX(), note2->GetDrawingX() ) ;
     system->Process( &timeSpanningLayerElements, &params, NULL, &filters );
-    if (spanningContent.size() > 12) LogDebug("### %d %s", spanningContent.size(), slur->GetUuid().c_str());
-    
-    LogDebug("--------" ) ;
+    //if (spanningContent.size() > 12) LogDebug("### %d %s", spanningContent.size(), slur->GetUuid().c_str());
     
     ArrayOfLayerElementPointPairs spanningContentPoints;
     std::vector<LayerElement*>::iterator it;
     for (it = spanningContent.begin(); it != spanningContent.end(); it++)
     {
         Note *note = NULL;
+        // We keep only notes and chords for now
         if (((*it)->Is() != NOTE) && ((*it)->Is() != CHORD)) continue;
+        // Also skip notes that are part of a chords since we already have the chord
         if ((note = dynamic_cast<Note*>(*it)) && note->IsChordTone()) continue;
         Point p;
         if (up) {
-            p.y = (*it)->GetDrawingTop();
+            p.y = (*it)->GetDrawingTop(m_doc, staff->m_drawingStaffSize);
         }
         else {
-            p.y = (*it)->GetDrawingBottom();
+            p.y = (*it)->GetDrawingBottom(m_doc, staff->m_drawingStaffSize);
         }
         p.x = (*it)->GetDrawingX();
         p = View::CalcPositionAfterRotation(p, -slurAngle, *p1);
-        if (up) p.y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3;
-        else p.y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 3;
+        if (up) p.y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
+        else p.y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
         spanningContentPoints.push_back(std::make_pair((*it), p));
     }
     
-    bool maxHeight = false;
-    while (!spanningContentPoints.empty() && !maxHeight) {
-        maxHeight = AdjustSlurCurve(slur, &spanningContentPoints, p1, &rotatedP2, &rotatedC1, &rotatedC2, up, slurAngle );
+    bool needPositionAdjustment = false;
+    if (!spanningContentPoints.empty()) {
+        needPositionAdjustment = AdjustSlurCurve(slur, &spanningContentPoints, p1, &rotatedP2, &rotatedC1, &rotatedC2, up, slurAngle );
+    }
+    if (needPositionAdjustment) {
+        LogDebug("### %d notes for %s will need position adjustment", spanningContentPoints.size(), slur->GetUuid().c_str());
     }
     
     points[1] = View::CalcPositionAfterRotation(rotatedP2, slurAngle, *p1);
@@ -584,43 +585,76 @@ bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPo
     bezier[2] = *c2;
     bezier[3] = *p2;
     
+    ArrayOfLayerElementPointPairs::iterator itPoint;
+    int y;
+    
     int dist = abs(p2->x - p1->x);
     int currentHeight = abs(c1->y - p1->y);
     int maxHeight = 0;
-    int step =  m_doc->GetDrawingUnit(100) * 4 / 3;
     
     float maxHeightFactor = std::max(0.2, fabs(angle));
-    maxHeight = dist / (maxHeightFactor * 5);
-    
-    int y;
-    float maxRatio = 1.0;
-    ArrayOfLayerElementPointPairs::iterator itPoint;
-    for (itPoint = spanningPoints->begin(); itPoint != spanningPoints->end(); itPoint++) {
-        y = View::CalcBezierAtPosition(bezier, itPoint->second.x);
-        if (up) {
-            if (y < itPoint->second.y) {
-                float ratio = (float)(p1->y - itPoint->second.y) / (float)(p1->y - y);
-                maxRatio = ratio > maxRatio ? ratio : maxRatio;
+    maxHeight = dist / (maxHeightFactor * 5); // 5 is the minimum - can be increased for limiting curvature
+    
+    if (maxHeight > currentHeight) {
+        float maxRatio = 1.0;
+        float posXRatio = 1.0;
+        int posX;
+        for (itPoint = spanningPoints->begin(); itPoint != spanningPoints->end(); itPoint++) {
+            y = View::CalcBezierAtPosition(bezier, itPoint->second.x);
+            // Weight the desired height according to the x position
+            posXRatio = 0.0;
+            posX = itPoint->second.x - p1->x;
+            if (posX > dist / 2) posX = p2->x - itPoint->second.x;
+            if (dist != 0) posXRatio = (float)posX / ((float)dist / 2.0);
+            // Keep the maximum desired ratio
+            if (up) {
+                if (y < itPoint->second.y) {
+                    float ratio = (float)(p1->y - itPoint->second.y) / (float)(p1->y - y) * posXRatio;
+                    maxRatio = ratio > maxRatio ? ratio : maxRatio;
+                }
+            }
+            else {
+                if (y > itPoint->second.y) {
+                    float ratio = (float)(p1->y - itPoint->second.y) / (float)(p1->y - y);
+                    maxRatio = ratio > maxRatio ? ratio : maxRatio;
+                }
+            }
+        }
+        
+        int desiredHeight = currentHeight * maxRatio;
+        if (desiredHeight > maxHeight) {
+            maxRatio = (float)maxHeight / (float)currentHeight;
+        }
+        
+        if (maxRatio > 1.0) {
+            if (up) {
+                c1->y = p1->y + currentHeight * maxRatio;
+                c2->y = c1->y;
+            }
+            else {
+                c1->y = p1->y - currentHeight * maxRatio;
+                c2->y = c1->y;
             }
         }
     }
     
-    int desiredHeight = currentHeight * maxRatio;
-    if (desiredHeight > maxHeight) {
-        maxRatio = (float)maxHeight / (float)currentHeight;
-    }
-    
-    if (!spanningPoints->empty()) {
+    // filter the points
+    bezier[1] = *c1;
+    bezier[2] = *c2;
+    for (itPoint = spanningPoints->begin(); itPoint != spanningPoints->end();) {
+        y = View::CalcBezierAtPosition(bezier, itPoint->second.x);
         if (up) {
-            c1->y = p1->y + currentHeight * maxRatio;
-            c2->y = c1->y;
+            if (y > itPoint->second.y) itPoint = spanningPoints->erase( itPoint );
+            else itPoint++;
         }
         else {
-            c1->y = p1->y - currentHeight * maxRatio;
-            c2->y = c1->y;
+            if (y < itPoint->second.y) itPoint = spanningPoints->erase( itPoint );
+            else itPoint++;
         }
     }
-    return true;
+    
+    // We will need to adjust the further if the list is not empty
+    return (!spanningPoints->empty());
 }
     
 void View::DrawTie( DeviceContext *dc, Tie *tie, int x1, int x2, Staff *staff,

From 1cee371086301c70a5a0def8a52e02a7d124af60 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 11 Sep 2015 14:51:13 +0200
Subject: [PATCH 13/85] WIP

---
 include/vrv/view.h    |   6 +-
 src/view_floating.cpp | 205 +++++++++++++++++++++++++++++++-----------
 2 files changed, 156 insertions(+), 55 deletions(-)

diff --git a/include/vrv/view.h b/include/vrv/view.h
index c0078ead0f9..e4587d43689 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -334,9 +334,11 @@ class View
     
     float AdjustSlur(Slur *slur, Staff *staff, int layerN, bool up,  Point points[]);
     bool AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2,
-                         bool up, float angle );
+                         bool up, float angle, bool posRatio = true );
     bool AdjustSlurPosition(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2,
-                         bool up, float angle );
+                         bool up, float *angle );
+    float GetAdjustedSlurAngle(Point *p1, Point *p2, bool up);
+    void GetControlPoints(Point *p1, Point *p2, Point *c1, Point *c2, bool up, int height, int staffSize);
     
     /**
      * @name Used for calculating clustered information/dot position
diff --git a/src/view_floating.cpp b/src/view_floating.cpp
index d0e9be85c30..260c49dfafd 100644
--- a/src/view_floating.cpp
+++ b/src/view_floating.cpp
@@ -405,22 +405,7 @@ float View::AdjustSlur(Slur *slur, Staff *staff, int layerN, bool up,  Point poi
     
     /************** angle **************/
     
-    float slurAngle = atan2(p2->y - p1->y, p2->x - p1->x);
-    
-    // the slope of the slur is high and needs to be corrected
-    if (fabs(slurAngle) > TEMP_STYLE_MAX_SLUR_SLOPE) {
-        int side = (p2->x - p1->x) * sin(TEMP_STYLE_MAX_SLUR_SLOPE) / sin(M_PI / 2 - TEMP_STYLE_MAX_SLUR_SLOPE);
-        if (p2->y > p1->y) {
-            if (up) p1->y = p2->y - side;
-            else p2->y = p1->y + side;
-            slurAngle = TEMP_STYLE_MAX_SLUR_SLOPE;
-        }
-        else {
-            if (up) p2->y = p1->y - side;
-            else p1->y = p2->y + side;
-            slurAngle = -TEMP_STYLE_MAX_SLUR_SLOPE;
-        }
-    }
+    float slurAngle = GetAdjustedSlurAngle(p1, p2, up);
     
     Point rotatedP2 = View::CalcPositionAfterRotation(*p2, -slurAngle, *p1);
     //LogDebug("P1 %d %d, P2 %d %d, Angle %f, Pres %d %d", x1, y1, x2, y2, slurAnge, rotadedP2.x, rotatedP2.y);
@@ -444,19 +429,7 @@ float View::AdjustSlur(Slur *slur, Staff *staff, int layerN, bool up,  Point poi
     /************** control points **************/
     
     Point rotatedC1, rotatedC2;
-    
-    // Set the x position of the control points
-    int cPos = std::min((rotatedP2.x - p1->x) / TEMP_STYLE_SLUR_CONTROL_POINT_FACTOR, m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize));
-    rotatedC1.x = p1->x + cPos;
-    rotatedC2.x = rotatedP2.x - cPos;
-    
-    if (up) {
-        rotatedC1.y = p1->y + height;
-        rotatedC2.y = rotatedP2.y + height;
-    } else {
-        rotatedC1.y = p1->y - height;
-        rotatedC2.y = rotatedP2.y - height;
-    }
+    GetControlPoints(p1, &rotatedP2, &rotatedC1, &rotatedC2, up, height, staff->m_drawingStaffSize);
     
     /************** content **************/
     
@@ -502,37 +475,75 @@ float View::AdjustSlur(Slur *slur, Staff *staff, int layerN, bool up,  Point poi
         spanningContentPoints.push_back(std::make_pair((*it), p));
     }
     
+    // We need to keep the original control points
+    Point adjustedRotatedC1 = rotatedC1;
+    Point adjustedRotatedC2 = rotatedC2;
+    
     bool needPositionAdjustment = false;
     if (!spanningContentPoints.empty()) {
-        needPositionAdjustment = AdjustSlurCurve(slur, &spanningContentPoints, p1, &rotatedP2, &rotatedC1, &rotatedC2, up, slurAngle );
+        needPositionAdjustment = AdjustSlurCurve(slur, &spanningContentPoints, p1, &rotatedP2, &adjustedRotatedC1, &adjustedRotatedC2, up, slurAngle );
     }
     if (needPositionAdjustment) {
-        LogDebug("### %d notes for %s will need position adjustment", spanningContentPoints.size(), slur->GetUuid().c_str());
+        // Use the adjusted control points for ajusting the position (p1, p2 and angle will be updated)
+        AdjustSlurPosition(slur, &spanningContentPoints, p1, &rotatedP2, &adjustedRotatedC1, &adjustedRotatedC2, up, &slurAngle );
+        // Now readjust the curvature with the new p1 and p2 with the original control points
+        GetControlPoints(p1, &rotatedP2, &rotatedC1, &rotatedC2, up, height, staff->m_drawingStaffSize);
+        AdjustSlurCurve(slur, &spanningContentPoints, p1, &rotatedP2, &rotatedC1, &rotatedC2, up, slurAngle, false );
+        if (!spanningContentPoints.empty()) {
+            // Something went wrong since now all spanning points should be gone...
+            LogDebug("### %d notes for %s will need position adjustment", spanningContentPoints.size(), slur->GetUuid().c_str());
+        }
+    }
+    else {
+        rotatedC1 = adjustedRotatedC1;
+        rotatedC2 = adjustedRotatedC2;
     }
     
     points[1] = View::CalcPositionAfterRotation(rotatedP2, slurAngle, *p1);
     points[2] = View::CalcPositionAfterRotation(rotatedC1, slurAngle, *p1);
     points[3] = View::CalcPositionAfterRotation(rotatedC2, slurAngle, *p1);
     
+    return slurAngle;
+}
     
-    /*
-     Point bezier[4];
-     bezier[0].x = 100;
-     bezier[1].x = 200;
-     bezier[2].x = 300;
-     bezier[3].x = 400;
-     bezier[0].y = 000;
-     bezier[1].y = 100;
-     bezier[2].y = 100;
-     bezier[3].y = 000;
-     
-     int p = View::CalcBezierAtPosition(bezier, 24550);
-     p;
-     */
+float View::GetAdjustedSlurAngle(Point *p1, Point *p2, bool up)
+{
+    float slurAngle = atan2(p2->y - p1->y, p2->x - p1->x);
+    
+    // the slope of the slur is high and needs to be corrected
+    if (fabs(slurAngle) > TEMP_STYLE_MAX_SLUR_SLOPE) {
+        int side = (p2->x - p1->x) * sin(TEMP_STYLE_MAX_SLUR_SLOPE) / sin(M_PI / 2 - TEMP_STYLE_MAX_SLUR_SLOPE);
+        if (p2->y > p1->y) {
+            if (up) p1->y = p2->y - side;
+            else p2->y = p1->y + side;
+            slurAngle = TEMP_STYLE_MAX_SLUR_SLOPE;
+        }
+        else {
+            if (up) p2->y = p1->y - side;
+            else p1->y = p2->y + side;
+            slurAngle = -TEMP_STYLE_MAX_SLUR_SLOPE;
+        }
+    }
     
     return slurAngle;
 }
     
+void View::GetControlPoints(Point *p1, Point *p2, Point *c1, Point *c2, bool up, int height, int staffSize)
+{
+    // Set the x position of the control points
+    int cPos = std::min((p2->x - p1->x) / TEMP_STYLE_SLUR_CONTROL_POINT_FACTOR, m_doc->GetDrawingStaffSize(staffSize));
+    c1->x = p1->x + cPos;
+    c2->x = p2->x - cPos;
+    
+    if (up) {
+        c1->y = p1->y + height;
+        c2->y = p2->y + height;
+    } else {
+        c1->y = p1->y - height;
+        c2->y = p2->y - height;
+    }
+}
+    
 /*
 bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2, bool up, float angle)
 {
@@ -577,7 +588,7 @@ bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPo
 }
 */
     
-bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2, bool up, float angle)
+bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2, bool up, float angle, bool posRatio)
 {
     Point bezier[4];
     bezier[0] = *p1;
@@ -599,24 +610,36 @@ bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPo
         float maxRatio = 1.0;
         float posXRatio = 1.0;
         int posX;
-        for (itPoint = spanningPoints->begin(); itPoint != spanningPoints->end(); itPoint++) {
+        for (itPoint = spanningPoints->begin(); itPoint != spanningPoints->end();) {
             y = View::CalcBezierAtPosition(bezier, itPoint->second.x);
-            // Weight the desired height according to the x position
-            posXRatio = 0.0;
-            posX = itPoint->second.x - p1->x;
-            if (posX > dist / 2) posX = p2->x - itPoint->second.x;
-            if (dist != 0) posXRatio = (float)posX / ((float)dist / 2.0);
+            
+            // Weight the desired height according to the x position if wanted
+            posXRatio = 1.0;
+            if (posRatio && (dist != 0)) {
+                posX = itPoint->second.x - p1->x;
+                if (posX > dist / 2) posX = p2->x - itPoint->second.x;
+                if (dist != 0) posXRatio = (float)posX / ((float)dist / 2.0);
+            }
+            
             // Keep the maximum desired ratio
             if (up) {
                 if (y < itPoint->second.y) {
                     float ratio = (float)(p1->y - itPoint->second.y) / (float)(p1->y - y) * posXRatio;
                     maxRatio = ratio > maxRatio ? ratio : maxRatio;
+                    itPoint++;
+                }
+                else {
+                    itPoint = spanningPoints->erase(itPoint);
                 }
             }
-            else {
+            else  {
                 if (y > itPoint->second.y) {
                     float ratio = (float)(p1->y - itPoint->second.y) / (float)(p1->y - y);
                     maxRatio = ratio > maxRatio ? ratio : maxRatio;
+                    itPoint++;
+                }
+                else {
+                    itPoint = spanningPoints->erase(itPoint);
                 }
             }
         }
@@ -657,6 +680,82 @@ bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPo
     return (!spanningPoints->empty());
 }
     
+bool View::AdjustSlurPosition(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2, bool up, float *angle)
+{
+    Point bezier[4];
+    bezier[0] = *p1;
+    bezier[1] = *c1;
+    bezier[2] = *c2;
+    bezier[3] = *p2;
+    
+    int maxShiftLeft = 0;
+    int maxShiftRight = 0;
+    int shift, leftShift, rightShift;
+    
+    int dist = abs(p2->x - p1->x);
+    float posXRatio = 1.0;
+    int posX;
+    
+    ArrayOfLayerElementPointPairs::iterator itPoint;
+    int y;
+
+    for (itPoint = spanningPoints->begin(); itPoint != spanningPoints->end();) {
+        y = View::CalcBezierAtPosition(bezier, itPoint->second.x);
+        
+        // Weight the desired height according to the x position on the other side
+        posXRatio = 1.0;
+        bool leftPoint = true;
+        posX = itPoint->second.x - p1->x;
+        if (posX > dist / 2) {
+            posX = p2->x - itPoint->second.x;
+            leftPoint = false;
+        }
+        if (dist != 0) posXRatio = (float)posX / ((float)dist / 2.0);
+        
+        // Keep the maximum shift on the left and right
+        if (up) {
+            if (y < itPoint->second.y) {
+                shift = (itPoint->second.y - p1->y) - (y - p1->y);
+            }
+        }
+        else {
+            if (y > itPoint->second.y) {
+                shift = (p1->y - itPoint->second.y) - (p1->y - y);
+            }
+        }
+        if (shift > 0) {
+            leftShift = leftPoint ? shift : shift * posXRatio;
+            rightShift = !leftPoint ? shift : shift * posXRatio;
+            maxShiftLeft = leftShift > maxShiftLeft ? leftShift : maxShiftLeft;
+            maxShiftRight = rightShift > maxShiftRight ? rightShift : maxShiftRight;
+            itPoint++;
+        }
+        else {
+            itPoint = spanningPoints->erase(itPoint);
+        }
+    }
+    
+    // Actually nothing to do
+    if (spanningPoints->empty()) return true;
+    
+    // Unrotated the slur
+    *p2 = View::CalcPositionAfterRotation(*p2, (*angle), *p1);
+    
+    if (up) {
+        p1->y += maxShiftLeft;
+        p2->y += maxShiftRight;
+    }
+    else {
+        p1->y -= maxShiftLeft;
+        p2->y -= maxShiftRight;
+    }
+
+    *angle = GetAdjustedSlurAngle(p1, p2, up);
+    *p2 = View::CalcPositionAfterRotation(*p2, -(*angle), *p1);
+    
+    return false;
+}
+    
 void View::DrawTie( DeviceContext *dc, Tie *tie, int x1, int x2, Staff *staff,
                          char spanningType, DocObject *graphic )
 {

From 2f80b5a1daeee179c7b9697a990bb432158a38a4 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 11 Sep 2015 22:38:03 +0200
Subject: [PATCH 14/85] Fixing bug with grace notes at the beginning of a
 measure

---
 src/aligner.cpp | 7 +++++--
 src/measure.cpp | 5 +++--
 src/object.cpp  | 2 +-
 src/page.cpp    | 1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/aligner.cpp b/src/aligner.cpp
index 3b3f941de58..db90c92d1e9 100644
--- a/src/aligner.cpp
+++ b/src/aligner.cpp
@@ -15,6 +15,7 @@
 
 //----------------------------------------------------------------------------
 
+#include "doc.h"
 #include "note.h"
 #include "style.h"
 #include "vrv.h"
@@ -352,13 +353,15 @@ int MeasureAligner::IntegrateBoundingBoxXShift( ArrayPtrVoid *params )
     // param 0: the accumulated shift
     // param 1: the accumulated justifiable shift
     // param 2: the minimum measure with (unused)
-    // param 3: the functor to be redirected to the MeasureAligner (unused)
+    // param 3: the doc for accessing drawing parameters
+    // param 4: the functor to be redirected to the MeasureAligner (unused)
     int *shift = static_cast<int*>((*params).at(0));
     int *justifiable_shift = static_cast<int*>((*params).at(1));
+    Doc *doc = static_cast<Doc*>((*params).at(3));
     
     // We start a new MeasureAligner
     // Reset the accumulated shift to 0;
-    (*shift) = 0;
+    (*shift) = doc->GetLeftPosition() * doc->GetDrawingUnit(100) / PARAM_DENOMINATOR;;
     (*justifiable_shift) = -1;
     
     return FUNCTOR_CONTINUE;
diff --git a/src/measure.cpp b/src/measure.cpp
index adfd8281ab4..bf2df13f51c 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -203,8 +203,9 @@ int Measure::IntegrateBoundingBoxXShift( ArrayPtrVoid *params )
     // param 0: the cumulated shift (unused)
     // param 1: the cumulated justifiable shift (unused)
     // param 2: the minimum measure with (unused)
-    // param 3: the functor to be redirected to Aligner
-    Functor *integrateBoundingBoxShift = static_cast<Functor*>((*params).at(3));
+    // param 3: the doc for accessing drawing parameters (unused)
+    // param 4: the functor to be redirected to Aligner
+    Functor *integrateBoundingBoxShift = static_cast<Functor*>((*params).at(4));
     
     m_measureAligner.Process( integrateBoundingBoxShift, params );
     
diff --git a/src/object.cpp b/src/object.cpp
index eb336829dd1..7d7f69ee61d 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1128,7 +1128,7 @@ int Object::SetBoundingBoxXShift( ArrayPtrVoid *params )
     if (this->Is() == LAYER) {
         Layer *current_layer = dynamic_cast<Layer*>(this);
         assert( current_layer );
-        (*min_pos) = doc->GetLeftPosition() * doc->GetDrawingUnit(100) / PARAM_DENOMINATOR;
+        (*min_pos) = 0;
         // set scoreDef attr
         if (current_layer->GetDrawingClef()) {
             current_layer->GetDrawingClef()->SetBoundingBoxXShift( params );
diff --git a/src/page.cpp b/src/page.cpp
index b66c94cc6c9..1a41a275823 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -170,6 +170,7 @@ void Page::LayOutHorizontally( )
     params.push_back( &shift );
     params.push_back( &justifiable_shift );
     params.push_back( &minMeasureWidth );
+    params.push_back( doc );
     Functor integrateBoundingBoxXShift( &Object::IntegrateBoundingBoxXShift );
     // special case: because we redirect the functor, pass is a parameter to itself (!)
     params.push_back( &integrateBoundingBoxXShift );

From 7aeff991434f35a5234f76480ccbcc2e94b05959 Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Sun, 13 Sep 2015 11:20:10 -0400
Subject: [PATCH 15/85] Remove the _fixedSpacing_ parameter to
 HorizontalSpaceForDuration(); it's no longer needed.

---
 include/vrv/aligner.h |  2 +-
 src/aligner.cpp       | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/include/vrv/aligner.h b/include/vrv/aligner.h
index 8ff753aa9da..e446ad4b719 100644
--- a/include/vrv/aligner.h
+++ b/include/vrv/aligner.h
@@ -226,7 +226,7 @@ class Alignment: public Object
     virtual int IntegrateBoundingBoxXShift( ArrayPtrVoid *params );
     
 
-    virtual int HorizontalSpaceForDuration(double intervalTime, bool isMensural);
+    virtual int HorizontalSpaceForDuration(double intervalTime);
 
     /**
      * Set the position of the Alignment.
diff --git a/src/aligner.cpp b/src/aligner.cpp
index 4ab9cb289e5..f3e4228f6e6 100644
--- a/src/aligner.cpp
+++ b/src/aligner.cpp
@@ -449,17 +449,16 @@ int MeasureAligner::SetAligmentXPos( ArrayPtrVoid *params )
 /* Compute "ideal" horizontal space to allow for a given time interval, ignoring the need
 to keep consecutive symbols from overlapping or nearly overlapping: we assume spacing
 will be increased as necessary later to avoid that. For modern notation (CMN), ideal space
-is a function of time interval. For mensural notation, we'd want ideal spacing to be zero
-so as to end up with spacing as tight as possible.
+is a function of time interval.
  
-This function needs more flexibility: for example, for some purposes, spacing propoortional
-to duration is desirable. The best solution is probably to get ideal spacing from a user-
-definable table. */
-int Alignment::HorizontalSpaceForDuration(double intervalTime, bool evenSpacing)
+??The power function we currently use is all wrong; see _Behind Bars_, p. 39. We also need more
+flexibility: for example, for some purposes, spacing propoortional to duration is desirable.
+The best solution is probably to get ideal spacing from a user-definable table. */
+
+int Alignment::HorizontalSpaceForDuration(double intervalTime)
 {
-    int intervalXRel = 0;
-    if (!evenSpacing)
-         intervalXRel = pow( intervalTime, 0.60 ) * 2.5; // 2.5 is an arbitrary value; so is 0.60
+    int intervalXRel;
+    intervalXRel = pow( intervalTime, 0.60 ) * 2.5; // 2.5 is an arbitrary value; so is 0.60
     return intervalXRel;
 }
 
@@ -474,7 +473,7 @@ int Alignment::SetAligmentXPos( ArrayPtrVoid *params )
     int intervalXRel = 0;
     double intervalTime = (m_time - (*previousTime));
     // HARDCODED parameter for HorizontalSpaceForDuration
-    if ( intervalTime > 0.0 ) intervalXRel = HorizontalSpaceForDuration(intervalTime, false);
+    if ( intervalTime > 0.0 ) intervalXRel = HorizontalSpaceForDuration(intervalTime);
     
     m_xRel = (*previousXRel) + (intervalXRel) * DEFINITON_FACTOR;
     (*previousTime) = m_time;

From 8bd0755fb08ba0b291d9c25750df18c6c1e050bc Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Sun, 13 Sep 2015 11:23:00 -0400
Subject: [PATCH 16/85] Rename & rewrite comments on some #define's for
 clarity; change values of #define's for size of noteheads & for size &
 position of mensuration signs.

---
 src/view_mensural.cpp | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/view_mensural.cpp b/src/view_mensural.cpp
index 269ba384827..4be08c3b532 100644
--- a/src/view_mensural.cpp
+++ b/src/view_mensural.cpp
@@ -29,15 +29,13 @@ namespace vrv {
 /* ??THESE #defines PROBABLY BELONG IN style.h . */
     
 /* Set ratio of mensural notehead size to CMN notehead size for the same staff size */
-#define MNOTEHEAD_SIZE_FACTOR 0.60
-/* Set size of mensuration sign circle relative to space between staff lines. (In early manuscripts,
-the entire mensuration sign fits easily between two staff lines, so the radius is considerably less
-than half the distance between them.) */
-#define MSIGN_CIRCLE_RADIUS_FACTOR 0.32
+#define MNOTEHEAD_SIZE_FACTOR 0.90
+/* Set size of mensuration sign circle relative to space between staff lines */
+#define MSIGN_CIRCLE_DIAM 1.7
 /* Set vertical position of center of mensuration sign as distance below top of the staff */
-#define MSIGN_STAFFLINES_BELOW_TOP 1.5
-/* Set size rel. to dist. between staff lines of dot inside mensuration signs */
-#define MSIGN_DOTSIZE 0.15
+#define MSIGN_STAFFLINES_BELOW_TOP 2.0
+/* Set size of dot inside mensuration signs relative to space between staff lines */
+#define MSIGN_DOT_DIAM 0.5
 /* Set relative size of figures in proportions */
 #define PROPRT_SIZE_FACTOR 0.50
     
@@ -227,9 +225,10 @@ void View::DrawMensurCircle( DeviceContext *dc, int x, int yy, Staff *staff )
     
     int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MSIGN_STAFFLINES_BELOW_TOP);
     int r = ToDeviceContextX( m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ));
-    r = (int)(MSIGN_CIRCLE_RADIUS_FACTOR*r);
+    r = (int)(MSIGN_CIRCLE_DIAM/2.0*r);
     
-    int lineWidth = (int)(m_doc->GetDrawingStaffLineWidth( staff->m_drawingStaffSize ) * 0.5);
+    int lineWidth = m_doc->GetDrawingStaffLineWidth( staff->m_drawingStaffSize );
+    lineWidth = lineWidth * 1.0;
     dc->SetPen( m_currentColour, lineWidth, AxSOLID );
     dc->SetPen( m_currentColour, m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize), AxSOLID );
     dc->SetBrush( m_currentColour, AxTRANSPARENT );
@@ -248,16 +247,16 @@ void View::DrawMensurHalfCircle( DeviceContext *dc, int x, int yy, Staff *staff
     dc->SetPen( m_currentColour, m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize), AxSOLID );
     dc->SetBrush( m_currentColour, AxTRANSPARENT );
     
-    int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MSIGN_STAFFLINES_BELOW_TOP);
+    /* DrawEllipticArc expects x and y to specify the coordinates of the upper-left corner of the
+     rectangle that contains the ellipse; y is not the center of the circle it's an arc of. */
+    double halfDistBelowTop = MSIGN_STAFFLINES_BELOW_TOP - (MSIGN_CIRCLE_DIAM/2.0);
+    int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * halfDistBelowTop);
     int r = ToDeviceContextX( m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ));
-    r = (int)(MSIGN_CIRCLE_RADIUS_FACTOR*r);
+    r = (int)(MSIGN_CIRCLE_DIAM/2.0*r);
     
     x = ToDeviceContextX (x);
     x -= 3*r/3;
     
-    /* DrawEllipticArc expects x and y to specify the coordinates of the upper-left corner of the
-    rectangle that contains the ellipse; y is not the center of the circle it's an arc of. */
-    y -= staff->m_drawingStaffSize / 2;
     dc->DrawEllipticArc( x, y, 2*r, 2*r, 45, 315 );
     
     dc->ResetPen();
@@ -295,7 +294,7 @@ void View::DrawMensurDot ( DeviceContext *dc, int x, int yy, Staff *staff )
     assert( staff );
     
     int y =  ToDeviceContextY (yy - m_doc->GetDrawingDoubleUnit( staff->m_drawingStaffSize ) * MSIGN_STAFFLINES_BELOW_TOP);
-    int r = m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * MSIGN_DOTSIZE;
+    int r = m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * MSIGN_DOT_DIAM;
     
     dc->SetPen( m_currentColour, 1, AxSOLID );
     dc->SetBrush( m_currentColour, AxSOLID );
@@ -590,7 +589,7 @@ void View::DrawProportFigures( DeviceContext *dc, int x, int y, int num, int num
         if (numBase)
         {
             wtext = IntToTimeSigFigures(numBase);
-            DrawSmuflString ( dc, x, yden, wtext, true, textSize);	// '1' = center
+            DrawSmuflString ( dc, x, yden, wtext, true, textSize);	// true = center
         }
         
         dc->ResetFont();

From f12be9518b9563760fbb9458bfeddc1eeca53f56 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 14 Sep 2015 17:07:17 +0200
Subject: [PATCH 17/85] More adjustments

---
 include/vrv/view.h    |  1 +
 src/view_floating.cpp | 40 +++++++++++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/include/vrv/view.h b/include/vrv/view.h
index e4587d43689..cdf0610e81b 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -339,6 +339,7 @@ class View
                          bool up, float *angle );
     float GetAdjustedSlurAngle(Point *p1, Point *p2, bool up);
     void GetControlPoints(Point *p1, Point *p2, Point *c1, Point *c2, bool up, int height, int staffSize);
+    void GetSpanningPointPositions( ArrayOfLayerElementPointPairs *spanningPoints, Point p1, float angle, bool up, int staffSize);
     
     /**
      * @name Used for calculating clustered information/dot position
diff --git a/src/view_floating.cpp b/src/view_floating.cpp
index 260c49dfafd..81c72405f82 100644
--- a/src/view_floating.cpp
+++ b/src/view_floating.cpp
@@ -396,6 +396,7 @@ void View::DrawSlur( DeviceContext *dc, Slur *slur, int x1, int x2, Staff *staff
     if ( graphic ) dc->EndResumedGraphic(graphic, this);
     else dc->EndGraphic(slur, this);
 }
+
     
 float View::AdjustSlur(Slur *slur, Staff *staff, int layerN, bool up,  Point points[])
 {
@@ -462,19 +463,11 @@ float View::AdjustSlur(Slur *slur, Staff *staff, int layerN, bool up,  Point poi
         // Also skip notes that are part of a chords since we already have the chord
         if ((note = dynamic_cast<Note*>(*it)) && note->IsChordTone()) continue;
         Point p;
-        if (up) {
-            p.y = (*it)->GetDrawingTop(m_doc, staff->m_drawingStaffSize);
-        }
-        else {
-            p.y = (*it)->GetDrawingBottom(m_doc, staff->m_drawingStaffSize);
-        }
-        p.x = (*it)->GetDrawingX();
-        p = View::CalcPositionAfterRotation(p, -slurAngle, *p1);
-        if (up) p.y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
-        else p.y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
         spanningContentPoints.push_back(std::make_pair((*it), p));
     }
     
+    GetSpanningPointPositions( &spanningContentPoints, *p1, slurAngle, up, staff->m_drawingStaffSize);
+    
     // We need to keep the original control points
     Point adjustedRotatedC1 = rotatedC1;
     Point adjustedRotatedC2 = rotatedC2;
@@ -488,6 +481,7 @@ float View::AdjustSlur(Slur *slur, Staff *staff, int layerN, bool up,  Point poi
         AdjustSlurPosition(slur, &spanningContentPoints, p1, &rotatedP2, &adjustedRotatedC1, &adjustedRotatedC2, up, &slurAngle );
         // Now readjust the curvature with the new p1 and p2 with the original control points
         GetControlPoints(p1, &rotatedP2, &rotatedC1, &rotatedC2, up, height, staff->m_drawingStaffSize);
+        GetSpanningPointPositions( &spanningContentPoints, *p1, slurAngle, up, staff->m_drawingStaffSize);
         AdjustSlurCurve(slur, &spanningContentPoints, p1, &rotatedP2, &rotatedC1, &rotatedC2, up, slurAngle, false );
         if (!spanningContentPoints.empty()) {
             // Something went wrong since now all spanning points should be gone...
@@ -544,6 +538,26 @@ void View::GetControlPoints(Point *p1, Point *p2, Point *c1, Point *c2, bool up,
     }
 }
     
+    
+
+void View::GetSpanningPointPositions( ArrayOfLayerElementPointPairs *spanningPoints, Point p1, float angle, bool up, int staffSize)
+{
+    ArrayOfLayerElementPointPairs::iterator itPoint;
+    for (itPoint = spanningPoints->begin(); itPoint != spanningPoints->end(); itPoint++) {
+        Point p;
+        if (up) {
+            p.y = itPoint->first->GetDrawingTop(m_doc, staffSize);
+        }
+        else {
+            p.y = itPoint->first->GetDrawingBottom(m_doc, staffSize);
+        }
+        p.x = itPoint->first->GetDrawingX();
+        itPoint->second = View::CalcPositionAfterRotation(p, -angle, p1);
+        if (up) itPoint->second.y += m_doc->GetDrawingUnit(staffSize) * 3;
+        else itPoint->second.y -= m_doc->GetDrawingUnit(staffSize) * 3;
+    }
+}
+
 /*
 bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2, bool up, float angle)
 {
@@ -604,7 +618,10 @@ bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPo
     int maxHeight = 0;
     
     float maxHeightFactor = std::max(0.2, fabs(angle));
-    maxHeight = dist / (maxHeightFactor * 5); // 5 is the minimum - can be increased for limiting curvature
+    maxHeight = dist / (maxHeightFactor * 15); // 5 is the minimum - can be increased for limiting curvature
+    if (posRatio) {
+        //maxHeight = std::min( maxHeight, m_doc->GetDrawingStaffSize(100) );
+    }
     
     if (maxHeight > currentHeight) {
         float maxRatio = 1.0;
@@ -712,6 +729,7 @@ bool View::AdjustSlurPosition(Slur *slur, ArrayOfLayerElementPointPairs *spannin
         }
         if (dist != 0) posXRatio = (float)posX / ((float)dist / 2.0);
         
+        shift = 0;
         // Keep the maximum shift on the left and right
         if (up) {
             if (y < itPoint->second.y) {

From e72bc2a4861db9e853d3ca3250c3d459a44d2a78 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 15 Sep 2015 09:55:29 +0200
Subject: [PATCH 18/85] Adjusting position of slurs

---
 include/vrv/style.h   |  3 +-
 include/vrv/view.h    |  4 +++
 src/view_floating.cpp | 69 +++++++++++--------------------------------
 3 files changed, 23 insertions(+), 53 deletions(-)

diff --git a/include/vrv/style.h b/include/vrv/style.h
index 842d0e190b0..0b8db8b54cd 100644
--- a/include/vrv/style.h
+++ b/include/vrv/style.h
@@ -137,7 +137,8 @@ namespace vrv {
 #define TEMP_STYLE_LYIRC_LINE_SPACE 5.0 * PARAM_DENOMINATOR
     
 // the maximum angle of a slur
-#define TEMP_STYLE_MAX_SLUR_SLOPE (45 * M_PI / 180)
+#define TEMP_STYLE_SLUR_MAX_SLOPE (45 * M_PI / 180)
+#define TEMP_STYLE_SLUR_CURVE_FACTOR 10 // a factor for allow more (0) or less (100) curved slurs
 #define TEMP_STYLE_SLUR_HEIGHT_FACTOR 8 // high value means flatter slurs
 #define TEMP_STYLE_SLUR_CONTROL_POINT_FACTOR 5 // higher value means more curved at the end
     
diff --git a/include/vrv/view.h b/include/vrv/view.h
index cdf0610e81b..0566a0df5a9 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -332,6 +332,9 @@ class View
     int GetSylY( Syl* syl, Staff *staff );
     ///@}
     
+    /**
+     * @name Internal methods used for calculating slurs
+     */
     float AdjustSlur(Slur *slur, Staff *staff, int layerN, bool up,  Point points[]);
     bool AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2,
                          bool up, float angle, bool posRatio = true );
@@ -340,6 +343,7 @@ class View
     float GetAdjustedSlurAngle(Point *p1, Point *p2, bool up);
     void GetControlPoints(Point *p1, Point *p2, Point *c1, Point *c2, bool up, int height, int staffSize);
     void GetSpanningPointPositions( ArrayOfLayerElementPointPairs *spanningPoints, Point p1, float angle, bool up, int staffSize);
+    ///@}
     
     /**
      * @name Used for calculating clustered information/dot position
diff --git a/src/view_floating.cpp b/src/view_floating.cpp
index 81c72405f82..8bbfad8a0ce 100644
--- a/src/view_floating.cpp
+++ b/src/view_floating.cpp
@@ -505,17 +505,17 @@ float View::GetAdjustedSlurAngle(Point *p1, Point *p2, bool up)
     float slurAngle = atan2(p2->y - p1->y, p2->x - p1->x);
     
     // the slope of the slur is high and needs to be corrected
-    if (fabs(slurAngle) > TEMP_STYLE_MAX_SLUR_SLOPE) {
-        int side = (p2->x - p1->x) * sin(TEMP_STYLE_MAX_SLUR_SLOPE) / sin(M_PI / 2 - TEMP_STYLE_MAX_SLUR_SLOPE);
+    if (fabs(slurAngle) > TEMP_STYLE_SLUR_MAX_SLOPE) {
+        int side = (p2->x - p1->x) * sin(TEMP_STYLE_SLUR_MAX_SLOPE) / sin(M_PI / 2 - TEMP_STYLE_SLUR_MAX_SLOPE);
         if (p2->y > p1->y) {
             if (up) p1->y = p2->y - side;
             else p2->y = p1->y + side;
-            slurAngle = TEMP_STYLE_MAX_SLUR_SLOPE;
+            slurAngle = TEMP_STYLE_SLUR_MAX_SLOPE;
         }
         else {
             if (up) p2->y = p1->y - side;
             else p1->y = p2->y + side;
-            slurAngle = -TEMP_STYLE_MAX_SLUR_SLOPE;
+            slurAngle = -TEMP_STYLE_SLUR_MAX_SLOPE;
         }
     }
     
@@ -552,56 +552,16 @@ void View::GetSpanningPointPositions( ArrayOfLayerElementPointPairs *spanningPoi
             p.y = itPoint->first->GetDrawingBottom(m_doc, staffSize);
         }
         p.x = itPoint->first->GetDrawingX();
+        // Not sure if it is better to add the margin before or after the rotation...
+        if (up) p.y += m_doc->GetDrawingUnit(staffSize) * 3;
+        else p.y -= m_doc->GetDrawingUnit(staffSize) * 3;
         itPoint->second = View::CalcPositionAfterRotation(p, -angle, p1);
-        if (up) itPoint->second.y += m_doc->GetDrawingUnit(staffSize) * 3;
-        else itPoint->second.y -= m_doc->GetDrawingUnit(staffSize) * 3;
+        // This would add it after
+        //if (up) itPoint->second.y += m_doc->GetDrawingUnit(staffSize) * 3;
+        //else itPoint->second.y -= m_doc->GetDrawingUnit(staffSize) * 3;
     }
 }
 
-/*
-bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2, bool up, float angle)
-{
-    Point bezier[4];
-    bezier[0] = *p1;
-    bezier[1] = *c1;
-    bezier[2] = *c2;
-    bezier[3] = *p2;
-    
-    int dist = abs(p2->x - p1->x);
-    int maxHeight = 0;
-    int step =  m_doc->GetDrawingUnit(100) * 4 / 3;
-    
-    float maxHeightFactor = std::max(0.2, fabs(angle));
-    maxHeight = dist / (maxHeightFactor * 5);
-    
-    ArrayOfLayerElementPointPairs::iterator itPoint;
-    for (itPoint = spanningPoints->begin(); itPoint != spanningPoints->end();) {
-        if (up && (View::CalcBezierAtPosition(bezier, itPoint->second.x) > itPoint->second.y)) {
-            //LogDebug("Removing %d - %d", itPoint->first->GetDrawingX(), itPoint->first->GetDrawingY() ) ;
-            itPoint = spanningPoints->erase( itPoint );
-        }
-        else {
-            //LogDebug("KEEPING %d - %d", itPoint->first->GetDrawingX(), itPoint->first->GetDrawingY() ) ;
-            itPoint++;
-        }
-    }
-    
-    if (abs(c1->y - p1->y) + step > maxHeight) return true;
-    
-    if (!spanningPoints->empty()) {
-        if (up) {
-            c1->y += step;
-            c2->y = c1->y;
-        }
-        else {
-            c1->y -= step;
-            c2->y = c1->y;
-        }
-    }
-    return false;
-}
-*/
-    
 bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2, bool up, float angle, bool posRatio)
 {
     Point bezier[4];
@@ -617,9 +577,11 @@ bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPo
     int currentHeight = abs(c1->y - p1->y);
     int maxHeight = 0;
     
+    // 0.2 for avoiding / by 0 (below)
     float maxHeightFactor = std::max(0.2, fabs(angle));
-    maxHeight = dist / (maxHeightFactor * 15); // 5 is the minimum - can be increased for limiting curvature
+    maxHeight = dist / (maxHeightFactor * (TEMP_STYLE_SLUR_CURVE_FACTOR + 5)); // 5 is the minimum - can be increased for limiting curvature
     if (posRatio) {
+        // Do we want to set a max height?
         //maxHeight = std::min( maxHeight, m_doc->GetDrawingStaffSize(100) );
     }
     
@@ -645,6 +607,7 @@ bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPo
                     maxRatio = ratio > maxRatio ? ratio : maxRatio;
                     itPoint++;
                 }
+                // The point is below, we can drop it
                 else {
                     itPoint = spanningPoints->erase(itPoint);
                 }
@@ -655,12 +618,14 @@ bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPo
                     maxRatio = ratio > maxRatio ? ratio : maxRatio;
                     itPoint++;
                 }
+                // the point is above, we can drop it
                 else {
                     itPoint = spanningPoints->erase(itPoint);
                 }
             }
         }
         
+        // We should not adjust it more than the maximum height
         int desiredHeight = currentHeight * maxRatio;
         if (desiredHeight > maxHeight) {
             maxRatio = (float)maxHeight / (float)currentHeight;
@@ -678,7 +643,7 @@ bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPo
         }
     }
     
-    // filter the points
+    // filter the points with the adjusted curve
     bezier[1] = *c1;
     bezier[2] = *c2;
     for (itPoint = spanningPoints->begin(); itPoint != spanningPoints->end();) {

From 1b693d4bf8452e18af2b31c7ddfba6118ca7babe Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 15 Sep 2015 10:03:24 +0200
Subject: [PATCH 19/85] Adding storing of scoreDef width for improving
 justification (WIP)

---
 include/vrv/scoredef.h | 10 ++++++
 include/vrv/style.h    |  3 ++
 include/vrv/system.h   |  8 +++--
 include/vrv/view.h     |  6 ++++
 src/doc.cpp            |  2 +-
 src/scoredef.cpp       |  6 ++++
 src/system.cpp         | 12 +++++++-
 src/view_element.cpp   |  2 +-
 src/view_page.cpp      | 69 +++++++++++++++++++++++++++++++++++++-----
 9 files changed, 105 insertions(+), 13 deletions(-)

diff --git a/include/vrv/scoredef.h b/include/vrv/scoredef.h
index c2c6533213c..673be52ae4d 100644
--- a/include/vrv/scoredef.h
+++ b/include/vrv/scoredef.h
@@ -157,6 +157,14 @@ class ScoreDef: public ScoreDefElement, public ObjectListInterface
     void SetDrawLabels( bool drawLabels ) { m_drawLabels = drawLabels; };
     ///@}
     
+    /**
+     * @name Set and get the scoreDef drawing width.
+     */
+    ///@{
+    bool GetDrawingWidth() const { return m_drawingWidth; };
+    void SetDrawingWidth( int drawingWidth );
+    ///@}
+    
     //----------//
     // Functors //
     //----------//
@@ -182,6 +190,8 @@ class ScoreDef: public ScoreDefElement, public ObjectListInterface
 private:
     /** Flags for indicating whether lables needs to be drawn or not */
     bool m_drawLabels;
+    /** Store the drawing width (clef and key sig) of the scoreDef */
+    int m_drawingWidth;
     
 };
 
diff --git a/include/vrv/style.h b/include/vrv/style.h
index 842d0e190b0..4532e7370af 100644
--- a/include/vrv/style.h
+++ b/include/vrv/style.h
@@ -136,6 +136,9 @@ namespace vrv {
 // the space between each lyric line in units
 #define TEMP_STYLE_LYIRC_LINE_SPACE 5.0 * PARAM_DENOMINATOR
     
+// the key signature spacing factor
+#define TEMP_STYLE_KEYSIG_STEP 1.3
+    
 // the maximum angle of a slur
 #define TEMP_STYLE_MAX_SLUR_SLOPE (45 * M_PI / 180)
 #define TEMP_STYLE_SLUR_HEIGHT_FACTOR 8 // high value means flatter slurs
diff --git a/include/vrv/system.h b/include/vrv/system.h
index 568dc5bdcfa..8755b495581 100644
--- a/include/vrv/system.h
+++ b/include/vrv/system.h
@@ -61,11 +61,13 @@ class System: public DocObject, public DrawingListInterface
     ///@}
     
     /**
-     * @name Set and get the labels drawing width.
+     * @name Set and get the labels drawing width (normal and abbreviated)
      */
     ///@{
     int GetDrawingLabelsWidth() const { return m_drawingLabelsWidth; };
     void SetDrawingLabelsWidth( int width );
+    int GetDrawingAbbrLabelsWidth() const { return m_drawingAbbrLabelsWidth; };
+    void SetDrawingAbbrLabelsWidth( int width );
     ///@}
 
     /**
@@ -157,7 +159,7 @@ class System: public DocObject, public DrawingListInterface
     int m_systemLeftMar;
     /** System right margin (MEI scoredef@system.rightmar). Saved if != 0 */
     int m_systemRightMar;
-	/** 
+    /**
      * The Y absolute position of the staff for facsimile (transcription) encodings.
      * This is the top left corner of the system.
      */
@@ -182,6 +184,8 @@ class System: public DocObject, public DrawingListInterface
      * It is used internally when calculating the layout andd it is not stored in the file.
      */
     int m_drawingLabelsWidth;
+    /** The width used by the abbreviated labels */
+    int m_drawingAbbrLabelsWidth;
     /**
      * @name The total width of the system.
      * It is computed during the layout processed and used for calculating the justification ratio.
diff --git a/include/vrv/view.h b/include/vrv/view.h
index c0078ead0f9..8ff476ac295 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -319,6 +319,12 @@ class View
 	void DrawDot ( DeviceContext *dc, int x, int y, int staffSize );
     ///@}
     
+    /**
+     * Calculate the ScoreDef width by taking into account its widest key signature
+     * This is used in justifiation for anticipating the width of initial scoreDefs that are not drawn in the un-casted system
+     */
+    void SetScoreDefDrawingWidth(DeviceContext *dc, ScoreDef *scoreDef);
+    
 private:    
     /**
      * @name Internal methods used for calculating tuplets
diff --git a/src/doc.cpp b/src/doc.cpp
index 45a3b999f9c..77aee9896dc 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -343,7 +343,7 @@ void Doc::CastOff( )
     
     System *currentSystem = new System();
     contentPage->AddSystem( currentSystem );
-    int shift = 0;
+    int shift = -contentSystem->GetDrawingLabelsWidth();
     int systemFullWidth = this->m_drawingPageWidth - this->m_drawingPageLeftMar - this->m_drawingPageRightMar
         - currentSystem->m_systemLeftMar - currentSystem->m_systemRightMar;
     ArrayPtrVoid params;
diff --git a/src/scoredef.cpp b/src/scoredef.cpp
index aa2ddf25914..10334032529 100644
--- a/src/scoredef.cpp
+++ b/src/scoredef.cpp
@@ -196,6 +196,7 @@ void ScoreDef::Reset()
 {
     ScoreDefElement::Reset();
     m_drawLabels = false;
+    m_drawingWidth = 0;
 }
 
 void ScoreDef::AddStaffGrp( StaffGrp *staffGrp )
@@ -337,6 +338,11 @@ void ScoreDef::SetRedrawFlags( bool clef, bool keySig, bool mensur, bool meterSi
     Functor setStaffDefDraw( &Object::SetStaffDefRedrawFlags );
     this->Process( &setStaffDefDraw, &params );
 }
+    
+void ScoreDef::SetDrawingWidth(int drawingWidth)
+{
+    m_drawingWidth = drawingWidth;
+}
 
 //----------------------------------------------------------------------------
 // StaffGrp
diff --git a/src/system.cpp b/src/system.cpp
index 399b520405e..00b9958d9a9 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -52,6 +52,8 @@ void System::Reset()
     m_drawingYRel = 0;
     m_drawingY = 0;
     m_drawingTotalWidth = 0;
+    m_drawingLabelsWidth = 0;
+    m_drawingAbbrLabelsWidth = 0;
 }
 
 void System::AddMeasure( Measure *measure )
@@ -78,6 +80,7 @@ void System::ResetHorizontalAlignment()
     m_drawingXRel = 0;
 	m_drawingX = 0;
     m_drawingLabelsWidth = 0;
+    m_drawingAbbrLabelsWidth = 0;
 }
 
     
@@ -101,7 +104,14 @@ void System::SetDrawingLabelsWidth( int width )
         m_drawingLabelsWidth = width;
     }
 }
-
+    
+void System::SetDrawingAbbrLabelsWidth( int width )
+{
+    if ( m_drawingAbbrLabelsWidth < width ) {
+        m_drawingAbbrLabelsWidth = width;
+    }
+}
+    
 //----------------------------------------------------------------------------
 // System functor methods
 //----------------------------------------------------------------------------
diff --git a/src/view_element.cpp b/src/view_element.cpp
index d8fd4fa0bf7..50d581701f7 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -1866,7 +1866,7 @@ void View::DrawKeySig( DeviceContext *dc, LayerElement *element, Layer *layer, S
     
     x = element->GetDrawingX();
     // HARDCODED
-    int step = m_doc->GetGlyphWidth(SMUFL_E262_accidentalSharp, staff->m_drawingStaffSize, false) * 1.3;
+    int step = m_doc->GetGlyphWidth(SMUFL_E262_accidentalSharp, staff->m_drawingStaffSize, false) * TEMP_STYLE_KEYSIG_STEP;
     
     // Show cancellation if C major (0) or if any cancellation and show cancellation (showchange) is true (false by default)
     if ( (keySig->GetAlterationNumber() == 0) || (layer->DrawKeySigCancellation() && keySig->m_drawingShowchange) ) {
diff --git a/src/view_page.cpp b/src/view_page.cpp
index 3577573fa87..1310b806bed 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -70,11 +70,14 @@ void View::DrawCurrentPage( DeviceContext *dc, bool background )
     processLayerElement = true;
     m_currentPage->Process( &setDrawingXY, &params );
     
+    // Keep the width of the initial scoreDef
+    SetScoreDefDrawingWidth(dc, &m_currentPage->m_drawingScoreDef);
+    
     // Set the current score def to the page one
     // The page one has previously been set by Object::SetCurrentScoreDef
     m_drawingScoreDef = m_currentPage->m_drawingScoreDef;
 
-    if ( background ) dc->DrawRectangle( 0, 0, m_doc->m_drawingPageWidth, m_doc->m_drawingPageHeight );
+    if ( background ) dc->DrawRectangle(0, 0, m_doc->m_drawingPageWidth, m_doc->m_drawingPageHeight);
     
     dc->DrawBackgroundImage( );
     
@@ -92,14 +95,41 @@ void View::DrawCurrentPage( DeviceContext *dc, bool background )
     
     dc->EndPage();
 }
+    
+void View::SetScoreDefDrawingWidth(DeviceContext *dc, ScoreDef *scoreDef)
+{
+    assert(dc);
+    assert(scoreDef);
+    
+    char numAlteration = 0;
+    
+    // key signature of the scoreDef
+    if (scoreDef->HasKeySigInfo()) {
+        KeySig *keySig = scoreDef->GetKeySigCopy();
+        assert(keySig);
+        numAlteration = (keySig->GetAlterationNumber() > numAlteration) ? keySig->GetAlterationNumber() : numAlteration;
+        delete keySig;
+    }
+    
+    // longest key signature of the staffDefs
+    ListOfObjects* scoreDefList = scoreDef->GetList(scoreDef); //make sure it's initialized
+    for (ListOfObjects::iterator it = scoreDefList->begin(); it != scoreDefList->end(); it++) {
+        StaffDef *staffDef = dynamic_cast<StaffDef*>(*it);
+        assert( staffDef) ;
+        if (!staffDef->HasKeySigInfo()) continue;
+        KeySig *keySig = staffDef->GetKeySigCopy();
+        assert(keySig);
+        numAlteration = (keySig->GetAlterationNumber() > numAlteration) ? keySig->GetAlterationNumber() : numAlteration;
+        delete keySig;
+    }
+    
+    scoreDef->SetDrawingWidth(100);
+}
 
 //----------------------------------------------------------------------------
 // View - System
 //----------------------------------------------------------------------------
 
-
-// drawing
-
 void View::DrawSystem( DeviceContext *dc, System *system ) 
 {
     assert( dc );
@@ -238,10 +268,15 @@ void View::DrawStaffGrp( DeviceContext *dc, Measure *measure, StaffGrp *staffGrp
     y_bottom -= m_doc->GetDrawingStaffLineWidth(100) / 2;
     
     if (staffGrp->HasLabel()) {
+        std::string abbrLabel;
         std::string label = staffGrp->GetLabel();
-        if ( abbreviations ) {
+        if (abbreviations) {
             label = staffGrp->GetLabelAbbr();
         }
+        // We still store the abbreviated label for calculating max width with abbreviations (see below)
+        else {
+            abbrLabel = staffGrp->GetLabelAbbr();
+        }
         
         if ( label.length() != 0) {
             // HARDCODED
@@ -266,6 +301,12 @@ void View::DrawStaffGrp( DeviceContext *dc, Measure *measure, StaffGrp *staffGrp
             dc->StartText( ToDeviceContextX( x_label ), ToDeviceContextY( y_label ), RIGHT );
             dc->DrawText( label );
             dc->EndText( );
+            
+            // also store in the system the maximum width with abbreviations
+            if (!abbreviations && (abbrLabel.length() > 0)) {
+                dc->GetTextExtent( abbrLabel, &w, &h);
+                system->SetDrawingAbbrLabelsWidth( w + space );
+            }
         
             dc->ResetFont();
             dc->ResetBrush();
@@ -328,10 +369,15 @@ void View::DrawStaffDefLabels( DeviceContext *dc, Measure *measure, ScoreDef *sc
             continue;
         }
         
+        std::string abbrLabel;
         std::string label = staffDef->GetLabel();
-        if ( abbreviations ) {
+        if (abbreviations) {
             label = staffDef->GetLabelAbbr();
         }
+        // We still store the abbreviated label for calculating max width with abbreviations (see below)
+        else {
+            abbrLabel = staffDef->GetLabelAbbr();
+        }
         
         if ( label.length() == 0) {
             ++iter;
@@ -354,6 +400,12 @@ void View::DrawStaffDefLabels( DeviceContext *dc, Measure *measure, ScoreDef *sc
         dc->DrawText( label );
         dc->EndText( );
         
+        // also store in the system the maximum width with abbreviations
+        if (!abbreviations && (abbrLabel.length() > 0)) {
+            dc->GetTextExtent( abbrLabel, &w, &h);
+            system->SetDrawingAbbrLabelsWidth( w + space );
+        }
+        
         dc->ResetFont();
         dc->ResetBrush();
         
@@ -945,8 +997,9 @@ void View::DrawSystemChildren( DeviceContext *dc, Object *parent, System *system
         // scoreDef are not drawn directly, but anything else should not be possible
         else if (current->Is() == SCOREDEF) {
             // nothing to do, then
-            // ScoreDef *scoreDef = dynamic_cast<ScoreDef*>(current);
-            // assert( scoreDef );
+            ScoreDef *scoreDef = dynamic_cast<ScoreDef*>(current);
+            assert( scoreDef );
+            SetScoreDefDrawingWidth(dc, scoreDef);
         }
         else {
             assert(false);

From 196bbddf629509e417c07ab3e29f27d483a4cfe7 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 15 Sep 2015 13:11:14 +0200
Subject: [PATCH 20/85] Fixing bugs with ClassId in Annot and App

---
 include/vrv/editorial.h | 1 +
 src/view_page.cpp       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/vrv/editorial.h b/include/vrv/editorial.h
index 585a7132e7a..1124cacf155 100644
--- a/include/vrv/editorial.h
+++ b/include/vrv/editorial.h
@@ -242,6 +242,7 @@ class Annot: public EditorialElement,
     virtual ~Annot();
     virtual void Reset();
     virtual std::string GetClassName( ) { return "Annot"; };
+    virtual ClassId Is() { return ANNOT; };
     ///@}
     
 protected:
diff --git a/src/view_page.cpp b/src/view_page.cpp
index 1310b806bed..4fe408be589 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -1106,7 +1106,7 @@ void View::DrawSystemEditorialElement( DeviceContext *dc, EditorialElement *elem
 void View::DrawMeasureEditorialElement( DeviceContext *dc, EditorialElement *element, Measure *measure, System *system )
 {
     assert( element );
-    if ( element->Object::Is() == APP ) {
+    if ( element->Is() == APP ) {
         assert( dynamic_cast<App*>(element)->GetLevel() == EDITORIAL_MEASURE );
     }
     

From 38bcfceb051447a73f7aa95de91cb7aa9bf79bdf Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 16 Sep 2015 07:29:32 +0200
Subject: [PATCH 21/85] Improved justification (finalized)

---
 include/vrv/scoredef.h |  2 +-
 src/doc.cpp            |  3 +++
 src/editorial.cpp      |  1 +
 src/measure.cpp        |  4 +++-
 src/scoredef.cpp       |  7 +++++++
 src/view_page.cpp      | 11 +++++++++--
 6 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/include/vrv/scoredef.h b/include/vrv/scoredef.h
index 673be52ae4d..d48f73deeb4 100644
--- a/include/vrv/scoredef.h
+++ b/include/vrv/scoredef.h
@@ -161,7 +161,7 @@ class ScoreDef: public ScoreDefElement, public ObjectListInterface
      * @name Set and get the scoreDef drawing width.
      */
     ///@{
-    bool GetDrawingWidth() const { return m_drawingWidth; };
+    int GetDrawingWidth() const { return m_drawingWidth; };
     void SetDrawingWidth( int drawingWidth );
     ///@}
     
diff --git a/src/doc.cpp b/src/doc.cpp
index 77aee9896dc..ad036ae161a 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -346,12 +346,15 @@ void Doc::CastOff( )
     int shift = -contentSystem->GetDrawingLabelsWidth();
     int systemFullWidth = this->m_drawingPageWidth - this->m_drawingPageLeftMar - this->m_drawingPageRightMar
         - currentSystem->m_systemLeftMar - currentSystem->m_systemRightMar;
+    // The width of the initial scoreDef is stored in the page scoreDef
+    int scoreDefWidth = contentPage->m_drawingScoreDef.GetDrawingWidth() + contentSystem->GetDrawingAbbrLabelsWidth();
     ArrayPtrVoid params;
     params.push_back( contentSystem );
     params.push_back( contentPage );
     params.push_back( &currentSystem );
     params.push_back( &shift );
     params.push_back( &systemFullWidth );
+    params.push_back( &scoreDefWidth );
     Functor castOffSystems( &Object::CastOffSystems );
     contentSystem->Process( &castOffSystems, &params );
     delete contentSystem;
diff --git a/src/editorial.cpp b/src/editorial.cpp
index aec177a4de2..e13badf9688 100644
--- a/src/editorial.cpp
+++ b/src/editorial.cpp
@@ -256,6 +256,7 @@ int EditorialElement::CastOffSystems( ArrayPtrVoid *params )
     // param 2: a pointer to the current system
     // param 3: the cummulated shift (m_drawingXRel of the first measure of the current system) (unused)
     // param 4: the system width (unused)
+    // param 5: the current scoreDef width (unused)
     System *contentSystem = static_cast<System*>((*params).at(0));
     System **currentSystem = static_cast<System**>((*params).at(2));
     
diff --git a/src/measure.cpp b/src/measure.cpp
index adfd8281ab4..315da0a51b9 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -268,13 +268,15 @@ int Measure::CastOffSystems( ArrayPtrVoid *params )
     // param 2: a pointer to the current system
     // param 3: the cummulated shift (m_drawingXRel of the first measure of the current system)
     // param 4: the system width
+    // param 5: the current scoreDef width
     System *contentSystem = static_cast<System*>((*params).at(0));
     Page *page = static_cast<Page*>((*params).at(1));
     System **currentSystem = static_cast<System**>((*params).at(2));
     int *shift = static_cast<int*>((*params).at(3));
     int *systemWidth = static_cast<int*>((*params).at(4));
+    int *currentScoreDefWidth = static_cast<int*>((*params).at(5));
     
-    if ( ( (*currentSystem)->GetChildCount() > 0 ) && ( this->m_drawingXRel + this->GetWidth() - (*shift) > (*systemWidth) ) ) {
+    if ( ( (*currentSystem)->GetChildCount() > 0 ) && ( this->m_drawingXRel + this->GetWidth() + (*currentScoreDefWidth) - (*shift) > (*systemWidth) ) ) {
         (*currentSystem) = new System();
         page->AddSystem( *currentSystem );
         (*shift) = this->m_drawingXRel;;
diff --git a/src/scoredef.cpp b/src/scoredef.cpp
index 10334032529..5c87fa50483 100644
--- a/src/scoredef.cpp
+++ b/src/scoredef.cpp
@@ -447,8 +447,10 @@ int ScoreDef::CastOffSystems( ArrayPtrVoid *params )
     // param 2: a pointer to the current system
     // param 3: the cummulated shift (m_drawingXRel of the first measure of the current system) (unused)
     // param 4: the system width (unused)
+    // param 5: the current scoreDef width
     System *contentSystem = static_cast<System*>((*params).at(0));
     System **currentSystem = static_cast<System**>((*params).at(2));
+    int *currentScoreDefWidth = static_cast<int*>((*params).at(5));
     
     // Since the functor returns FUNCTOR_SIBLINGS we should never go lower than the system children
     assert( dynamic_cast<System*>(this->m_parent));
@@ -459,6 +461,11 @@ int ScoreDef::CastOffSystems( ArrayPtrVoid *params )
     // the ownership of the Measure - the contentSystem will be deleted afterwards.
     ScoreDef *scoreDef = dynamic_cast<ScoreDef*>( contentSystem->Relinquish( this->GetIdx()) );
     (*currentSystem)->AddScoreDef( scoreDef );
+    // This is not perfect since now the scoreDefWith is the one of the intermediate scoreDef (and not
+    // the initial one - for this to be corrected, we would need to 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
+    (*currentScoreDefWidth) = this->GetDrawingWidth() + contentSystem->GetDrawingAbbrLabelsWidth();;
     
     return FUNCTOR_SIBLINGS;
 }
diff --git a/src/view_page.cpp b/src/view_page.cpp
index 4fe408be589..3d2ae7c6345 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -123,7 +123,14 @@ void View::SetScoreDefDrawingWidth(DeviceContext *dc, ScoreDef *scoreDef)
         delete keySig;
     }
     
-    scoreDef->SetDrawingWidth(100);
+    int width = 0;
+    // G-clef as default width
+    width += m_doc->GetLeftMargin(CLEF) + m_doc->GetGlyphWidth(SMUFL_E050_gClef, 100, false) + m_doc->GetRightMargin(CLEF);
+    if (numAlteration > 0) {
+        width += m_doc->GetLeftMargin(KEYSIG) + m_doc->GetGlyphWidth(SMUFL_E262_accidentalSharp, 100, false) * TEMP_STYLE_KEYSIG_STEP + m_doc->GetRightMargin(KEYSIG);
+    }
+    
+    scoreDef->SetDrawingWidth(width);
 }
 
 //----------------------------------------------------------------------------
@@ -400,7 +407,7 @@ void View::DrawStaffDefLabels( DeviceContext *dc, Measure *measure, ScoreDef *sc
         dc->DrawText( label );
         dc->EndText( );
         
-        // also store in the system the maximum width with abbreviations
+        // also store in the system the maximum width with abbreviations for justification
         if (!abbreviations && (abbrLabel.length() > 0)) {
             dc->GetTextExtent( abbrLabel, &w, &h);
             system->SetDrawingAbbrLabelsWidth( w + space );

From 1abcd389f9dd40062e16860445a4ac7c94e58f2d Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 16 Sep 2015 16:45:57 +0200
Subject: [PATCH 22/85] WIP on stem drawing

---
 include/vrv/chord.h            |  3 +-
 include/vrv/drawinginterface.h | 48 ++++++++++++++++++++++++++++++++
 include/vrv/layerelement.h     | 10 -------
 include/vrv/note.h             |  2 +-
 src/chord.cpp                  |  5 ++--
 src/drawinginterface.cpp       | 22 +++++++++++++++
 src/layerelement.cpp           | 23 ++++++++++++----
 src/note.cpp                   |  3 +-
 src/view_beam.cpp              | 35 +++++++++++-------------
 src/view_element.cpp           | 50 ++++++++++++++++------------------
 src/view_tuplet.cpp            | 21 +++++++++-----
 11 files changed, 149 insertions(+), 73 deletions(-)

diff --git a/include/vrv/chord.h b/include/vrv/chord.h
index 8769df47468..4b1574a63ac 100644
--- a/include/vrv/chord.h
+++ b/include/vrv/chord.h
@@ -10,6 +10,7 @@
 #define __VRV_CHORD_H__
 
 #include "atts_shared.h"
+#include "drawinginterface.h"
 #include "durationinterface.h"
 #include "layerelement.h"
 
@@ -29,7 +30,7 @@ namespace vrv {
  * It contains notes.
  */
     
-class Chord: public LayerElement, public ObjectListInterface, public DurationInterface, 
+class Chord: public LayerElement, public ObjectListInterface, public StemmedDrawingInterface, public DurationInterface,
     public AttCommon,
     public AttStemmed,
     public AttTiepresent
diff --git a/include/vrv/drawinginterface.h b/include/vrv/drawinginterface.h
index 445b164e80d..bf10ac23f7d 100644
--- a/include/vrv/drawinginterface.h
+++ b/include/vrv/drawinginterface.h
@@ -9,6 +9,7 @@
 #ifndef __VRV_DRAWING_INTERFACE_H__
 #define __VRV_DRAWING_INTERFACE_H__
 
+#include "devicecontextbase.h"
 #include "vrvdef.h"
 
 namespace vrv {
@@ -167,6 +168,53 @@ class StaffDefDrawingInterface
     
 };
     
+
+//----------------------------------------------------------------------------
+// StemmedDrawingInterface
+//----------------------------------------------------------------------------
+
+/**
+ * This class is an interface for MEI stemmed element.
+ * It stores stem drawing values for notes and chords.
+ */
+class StemmedDrawingInterface
+{
+public:
+    /**
+     * @name Constructors, destructors, and other standard methods
+     */
+    ///@{
+    StemmedDrawingInterface();
+    virtual ~StemmedDrawingInterface();
+    virtual void Reset();
+    ///@}
+    
+    /**
+     * @name Set and get the stem direction and stem positions
+     * The methods are virtual because they need to be overriden for Chords.
+     */
+    ///@{
+    virtual void SetDrawingStemDir(data_STEMDIRECTION stemDir);
+    virtual data_STEMDIRECTION GetDrawingStemDir();
+    virtual void SetDrawingStemStart(Point stemStart);
+    virtual Point GetDrawingStemStart();
+    virtual void SetDrawingStemEnd(Point stemEnd);
+    virtual Point GetDrawingStemEnd();
+    ///@}
+    
+protected:
+    /**
+     * If this is a note, store here the stem coordinates (useful for ex. tuplets)
+     */
+    Point m_drawingStemStart; // beginning point, the one near the note
+    Point m_drawingStemEnd; // end point (!), near beam or stem
+    /**
+     * Stem direction as drawn
+     */
+    data_STEMDIRECTION m_drawingStemDir;
+    
+};
+    
 } // namespace vrv 
 
 #endif
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index ebab918fc29..bd8271abad7 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -9,7 +9,6 @@
 #ifndef __VRV_LAYER_ELEMENT_H__
 #define __VRV_LAYER_ELEMENT_H__
 
-#include "devicecontextbase.h"
 #include "object.h"
 
 namespace vrv {
@@ -138,15 +137,6 @@ class LayerElement: public DocObject
 public:
 	/** Absolute position X. This is used for facsimile (transcription) encoding */
     int m_xAbs;
-    /** 
-     * If this is a note, store here the stem coordinates (useful for ex. tuplets) 
-     */
-    Point m_drawingStemStart; // beginning point, the one near the note
-    Point m_drawingStemEnd; // end point (!), near beam or stem
-    /** 
-     * Stem direction as drawn 
-     */
-    data_STEMDIRECTION m_drawingStemDir;
     /**
      * This store a pointer to the corresponding BeamElementCoord(currentDur > DUR_4)
      */
diff --git a/include/vrv/note.h b/include/vrv/note.h
index 98e8174b83e..aa8cd4d64bf 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -42,7 +42,7 @@ typedef std::vector<Note*> ChordCluster;
 #define EMB_TRILL 1
 #define EMB_MORDENT 2
 
-class Note: public LayerElement, public DurationInterface, public PitchInterface,
+class Note: public LayerElement, public StemmedDrawingInterface, public DurationInterface, public PitchInterface,
     public AttColoration,
     public AttGraced,
     public AttNoteLogMensural,
diff --git a/src/chord.cpp b/src/chord.cpp
index dc91a5c8490..d12a2c901c4 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -23,7 +23,7 @@ namespace vrv {
 //----------------------------------------------------------------------------
 
 Chord::Chord( ):
-    LayerElement("chord-"), ObjectListInterface(), DurationInterface(),
+    LayerElement("chord-"), StemmedDrawingInterface(), ObjectListInterface(), DurationInterface(),
     AttCommon(),
     AttStemmed(),
     AttTiepresent()
@@ -48,7 +48,8 @@ Chord::~Chord()
 void Chord::Reset()
 {
     ClearClusters();
-    DocObject::Reset();
+    LayerElement::Reset();
+    StemmedDrawingInterface::Reset();
     DurationInterface::Reset();
     ResetCommon();
     ResetStemmed();
diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index 7bde16d591f..e24044ba049 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -175,4 +175,26 @@ StaffDefDrawingInterface& StaffDefDrawingInterface::operator=( const StaffDefDra
     return *this;
 }
 
+    
+//----------------------------------------------------------------------------
+// StemmedDrawingInterface
+//----------------------------------------------------------------------------
+
+StemmedDrawingInterface::StemmedDrawingInterface()
+{
+    Reset();
+}
+
+StemmedDrawingInterface::~StemmedDrawingInterface()
+{
+}
+
+void StemmedDrawingInterface::Reset()
+{
+    m_drawingStemDir = STEMDIRECTION_NONE;
+    m_drawingStemStart = Point(0, 0);
+    m_drawingStemEnd = Point(0, 0);
+}
+
+    
 } // namespace vrv
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 2dc0c471972..fe7ce14cea2 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -71,7 +71,6 @@ void LayerElement::Reset()
     
     m_isScoreOrStaffDefAttr = false;
     m_alignment = NULL;
-    m_drawingStemDir = STEMDIRECTION_NONE;
     m_beamElementCoord = NULL;
 }
     
@@ -133,8 +132,14 @@ int LayerElement::GetDrawingTop(Doc *doc, int staffSize)
 {
     if ((this->Is() == NOTE) || (this->Is() == CHORD)){
         // We should also take into accound the stem shift to the right
-        if (this->GetDrawingStemDir() == STEMDIRECTION_up) return this->m_drawingStemEnd.y;
-        else return this->m_drawingStemStart.y + doc->GetDrawingUnit(staffSize);
+        StemmedDrawingInterface *stemmedDrawingInterface = dynamic_cast<StemmedDrawingInterface*>(this);
+        assert(stemmedDrawingInterface);
+        if (stemmedDrawingInterface->GetDrawingStemDir() == STEMDIRECTION_up) {
+            return stemmedDrawingInterface->GetDrawingStemEnd().y;
+        }
+        else {
+            return stemmedDrawingInterface->GetDrawingStemStart().y + doc->GetDrawingUnit(staffSize);
+        }
     }
     return this->GetDrawingY();
 }
@@ -143,9 +148,15 @@ int LayerElement::GetDrawingTop(Doc *doc, int staffSize)
 int LayerElement::GetDrawingBottom(Doc *doc, int staffSize)
 {
     if ((this->Is() == NOTE) || (this->Is() == CHORD)){
-        if (this->GetDrawingStemDir() == STEMDIRECTION_up) return this->m_drawingStemStart.y - doc->GetDrawingUnit(staffSize);
-        // We should also take into accound the stem shift to the left
-        else return this->m_drawingStemEnd.y;
+        // We should also take into accound the stem shift to the right
+        StemmedDrawingInterface *stemmedDrawingInterface = dynamic_cast<StemmedDrawingInterface*>(this);
+        assert(stemmedDrawingInterface);
+        if (stemmedDrawingInterface->GetDrawingStemDir() == STEMDIRECTION_up) {
+            return stemmedDrawingInterface->GetDrawingStemStart().y + doc->GetDrawingUnit(staffSize);
+        }
+        else {
+            return stemmedDrawingInterface->GetDrawingStemEnd().y;
+        }
     }
     return this->GetDrawingY();
 }
diff --git a/src/note.cpp b/src/note.cpp
index b8455e70cbd..452d3fb70ca 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -27,7 +27,7 @@ namespace vrv {
 //----------------------------------------------------------------------------
 
 Note::Note():
-	LayerElement("note-"), DurationInterface(), PitchInterface(),
+	LayerElement("note-"), StemmedDrawingInterface(), DurationInterface(), PitchInterface(),
     AttColoration(),
     AttGraced(),
     AttNoteLogMensural(),
@@ -67,6 +67,7 @@ Note::~Note()
 void Note::Reset()
 {
     LayerElement::Reset();
+    StemmedDrawingInterface::Reset();
     DurationInterface::Reset();
     PitchInterface::Reset();
     
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 9c7e871fc4c..c8300244c45 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -359,25 +359,18 @@ void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
             fy2 = (*beamElementCoords).at(i)->m_yTop - m_doc->GetDrawingUnit(staff->m_drawingStaffSize)/4;
         }
         
-        // All notes and chords, including notes within chords, get their stem value stored
-        LayerElement *el = (*beamElementCoords).at(i)->m_element;
-        el->m_drawingStemStart.x = el->m_drawingStemEnd.x = (*beamElementCoords).at(i)->m_x;
-        el->m_drawingStemStart.y = fy2;
-        el->m_drawingStemEnd.y = fy1;
-        el->m_drawingStemDir = stemDir;
-        
-        if ( (*beamElementCoords).at(i)->m_element->Is() == CHORD ) {
-            Chord *chord = (Chord*)(*beamElementCoords).at(i)->m_element;
-            for (ListOfObjects::iterator it = chord->GetList(chord)->begin(); it != chord->GetList(chord)->end(); it++)
-            {
-                Note *note = dynamic_cast<Note*>(*it);
-                assert(note);
-                note->m_drawingStemStart.x = el->m_drawingStemEnd.x = (*beamElementCoords).at(i)->m_x;
-                note->m_drawingStemStart.y = fy2;
-                note->m_drawingStemEnd.y = fy1;
-                note->SetDrawingStemDir(stemDir);
-            }
+        // All notes and chords get their stem value stored
+        if ( (current->Is() == NOTE) || (current->Is() == CHORD) ) {
+            StemmedDrawingInterface *interface = dynamic_cast<StemmedDrawingInterface*>(current);
+            assert(interface);
+            
+            interface->SetDrawingStemDir(stemDir);
+            interface->SetDrawingStemStart(Point((*beamElementCoords).at(i)->m_x, fy2));
+            interface->SetDrawingStemEnd(Point((*beamElementCoords).at(i)->m_x, fy1));
+
         }
+        
+
 	}
     
     
@@ -393,7 +386,11 @@ void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     {
         LayerElement *el = (*beamElementCoords).at(i)->m_element;
         if( ( (el->Is() == NOTE) && !dynamic_cast<Note*>(el)->IsChordTone()) || (el->Is() == CHORD) ) {
-            DrawVerticalLine (dc, el->m_drawingStemStart.y, el->m_drawingStemEnd.y, el->m_drawingStemStart.x, m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize));
+            StemmedDrawingInterface *interface = dynamic_cast<StemmedDrawingInterface*>(current);
+            assert(interface);
+            
+            DrawVerticalLine (dc, interface->GetDrawingStemStart().y, interface->GetDrawingStemEnd().y,
+                              interface->GetDrawingStemStart().x, m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize));
         }
     }
     
diff --git a/src/view_element.cpp b/src/view_element.cpp
index 50d581701f7..f19a7a6448b 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -501,11 +501,6 @@ void View::DrawStem( DeviceContext *dc, LayerElement *object, Staff *staff, data
     if (dir == STEMDIRECTION_up) {
         DrawFullRectangle( dc, x2 - m_doc->GetDrawingStemWidth(staffSize), stemY1, x2, stemY2);
         
-        object->m_drawingStemStart.x = object->m_drawingStemEnd.x = x2 - (m_doc->GetDrawingStemWidth(staffSize) / 2);
-        object->m_drawingStemStart.y = y1;
-        object->m_drawingStemEnd.y = y2;
-        object->m_drawingStemDir = STEMDIRECTION_up;
-        
         if (drawingDur > DUR_4) {
             DrawSmuflCode( dc, x2 - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize), y2, SMUFL_E240_flag8thUp, staff->m_drawingStaffSize, drawingCueSize );
             for (int i=0; i < nbFlags; i++)
@@ -515,11 +510,6 @@ void View::DrawStem( DeviceContext *dc, LayerElement *object, Staff *staff, data
     else {
         DrawFullRectangle( dc, x2, stemY1, x2 + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize), stemY2);
         
-        object->m_drawingStemStart.x = object->m_drawingStemEnd.x = x2 - (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2);
-        object->m_drawingStemStart.y = y1;
-        object->m_drawingStemEnd.y = y2;
-        object->m_drawingStemDir = STEMDIRECTION_down;
-        
         if (drawingDur > DUR_4) {
             DrawSmuflCode( dc, x2 , y2, SMUFL_E241_flag8thDown , staff->m_drawingStaffSize, drawingCueSize );
             for (int i=0; i < nbFlags; i++)
@@ -527,6 +517,13 @@ void View::DrawStem( DeviceContext *dc, LayerElement *object, Staff *staff, data
         }
     }
     
+    // Store the start and end values
+    StemmedDrawingInterface *interface = dynamic_cast<StemmedDrawingInterface*>(object);
+    assert(interface);
+    interface->SetDrawingStemStart(Point(x2 - (m_doc->GetDrawingStemWidth(staffSize) / 2), y1));
+    interface->SetDrawingStemEnd(Point(x2 - (m_doc->GetDrawingStemWidth(staffSize) / 2), y2));
+    interface->SetDrawingStemDir(dir);
+    
     // cast to note is check when setting drawingCueSize value
     if ( drawingCueSize && ( dynamic_cast<Note*>(object)->GetGrace() == GRACE_acc ) ) {
         DrawAcciaccaturaSlash(dc, object);
@@ -607,9 +604,9 @@ void View::DrawRest ( DeviceContext *dc, LayerElement *element, Layer *layer, St
     int y = element->GetDrawingY();
     
     // Temporary fix for rest within tuplet because drawing tuplet requires m_drawingStemXXX to be set
-    element->m_drawingStemStart.x = element->m_drawingStemEnd.x = element->GetDrawingX() - (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2);
-    element->m_drawingStemEnd.y = element->GetDrawingY();
-    element->m_drawingStemStart.y = element->GetDrawingY();
+    //element->m_drawingStemStart.x = element->m_drawingStemEnd.x = element->GetDrawingX() - (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2);
+    //element->m_drawingStemEnd.y = element->GetDrawingY();
+    //element->m_drawingStemStart.y = element->GetDrawingY();
 
     if (drawingDur > DUR_2)
     {
@@ -1311,8 +1308,8 @@ void View::DrawClef( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     // force cue size for intermediate clefs
     if (clef->GetFirstParent( LAYER )) cueSize = true;
     
-    if (!cueSize)
-        a -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
+    //if (!cueSize)
+    //    a -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
     
     DrawSmuflCode ( dc, a, b, sym, staff->m_drawingStaffSize, cueSize );
    
@@ -1593,8 +1590,8 @@ void View::DrawAccid( DeviceContext *dc, LayerElement *element, Layer *layer, St
             if ( note->GetDrawingY() > y ) {
                 y = note->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
             }
-            if ( (note->GetDrawingStemDir() == STEMDIRECTION_up) && (note->m_drawingStemEnd.y > y )) {
-                y = note->m_drawingStemEnd.y;
+            if ( (note->GetDrawingStemDir() == STEMDIRECTION_up) && (note->GetDrawingStemEnd().y > y )) {
+                y = note->GetDrawingStemEnd().y;
             }
             
             // adjust the x position so it is centered
@@ -1928,19 +1925,20 @@ void View::DrawAcciaccaturaSlash(DeviceContext *dc, LayerElement *element)
     int positionShiftY1 = positionShift * 2;
     int positionShiftX2 = positionShift * 3;
     int positionShiftY2 = positionShift * 6;
+    Point startPoint = note->GetDrawingStemStart();
     
     // HARDCODED
-    if (element->m_drawingStemDir == STEMDIRECTION_up) {
+    if (note->GetDrawingStemDir() == STEMDIRECTION_up) {
         dc->DrawLine(
-                     ToDeviceContextX(element->m_drawingStemStart.x - positionShiftX1 ),
-                     ToDeviceContextY(element->m_drawingStemStart.y + positionShiftY1),
-                     ToDeviceContextX(element->m_drawingStemStart.x + positionShiftX2),
-                     ToDeviceContextY(element->m_drawingStemStart.y + positionShiftY2));
+                     ToDeviceContextX(startPoint.x - positionShiftX1 ),
+                     ToDeviceContextY(startPoint.y + positionShiftY1),
+                     ToDeviceContextX(startPoint.x + positionShiftX2),
+                     ToDeviceContextY(note->GetDrawingStemStart().y + positionShiftY2));
     } else {
-        dc->DrawLine(ToDeviceContextX(element->m_drawingStemStart.x - positionShiftX1),
-                     ToDeviceContextY(element->m_drawingStemStart.y - positionShiftY1),
-                     ToDeviceContextX(element->m_drawingStemStart.x + positionShiftX2),
-                     ToDeviceContextY(element->m_drawingStemStart.y - positionShiftY2));
+        dc->DrawLine(ToDeviceContextX(startPoint.x - positionShiftX1),
+                     ToDeviceContextY(startPoint.y - positionShiftY1),
+                     ToDeviceContextX(startPoint.x + positionShiftX2),
+                     ToDeviceContextY(startPoint.y - positionShiftY2));
     }
     
     dc->ResetPen();
diff --git a/src/view_tuplet.cpp b/src/view_tuplet.cpp
index 92482d9481c..a5987c457a2 100644
--- a/src/view_tuplet.cpp
+++ b/src/view_tuplet.cpp
@@ -17,6 +17,7 @@
 #include "beam.h"
 #include "devicecontext.h"
 #include "doc.h"
+#include "note.h"
 #include "smufl.h"
 #include "staff.h"
 #include "style.h"
@@ -96,20 +97,26 @@ data_STEMDIRECTION View::GetTupletCoordinates(Tuplet* tuplet, Layer *layer, Poin
     LayerElement *firstNote = dynamic_cast<LayerElement*>(tupletChildren->front());
     LayerElement *lastNote = dynamic_cast<LayerElement*>(tupletChildren->back());
     
+    
+    
     // AllNotesBeamed tries to figure out if all the notes are in the same beam
     if (OneBeamInTuplet(tuplet)) {
 
         // yes they are in a beam
-        // get the x position centered from the STEM so it looks better
-        // NOTE start and end are left to 0, this is the signal that no bracket has to be drawn
-        x = firstNote->m_drawingStemStart.x + (lastNote->m_drawingStemStart.x - firstNote->m_drawingStemStart.x) / 2;
+        x = firstNote->GetDrawingX() + (lastNote->GetDrawingX() - firstNote->GetDrawingX() + lastNote->m_selfBB_x2) / 2;
         
         // align the center point at the exact center of the first an last stem
         // TUPLET_OFFSET is summed so it does not collide with the stem
-        if (firstNote->m_drawingStemDir == STEMDIRECTION_up)
-            y = lastNote->m_drawingStemEnd.y + (firstNote->m_drawingStemEnd.y - lastNote->m_drawingStemEnd.y) / 2 + TUPLET_OFFSET;
-        else 
-            y = lastNote->m_drawingStemEnd.y + (firstNote->m_drawingStemEnd.y - lastNote->m_drawingStemEnd.y) / 2 - TUPLET_OFFSET;
+        Note* note = dynamic_cast<Note*>(tuplet->GetFirstChild(NOTE));
+        Note* lastNote = dynamic_cast<Note*>(tuplet->GetLastChild(NOTE));
+        
+        y = firstNote->GetDrawingY();
+        if (note) {
+            if (note->GetDrawingStemDir() == STEMDIRECTION_up)
+                y = note->GetDrawingStemEnd().y + (firstNote->note->GetDrawingStemEnd().y - lastNote->m_drawingStemEnd.y) / 2 + TUPLET_OFFSET;
+            else 
+                y = lastNote->m_drawingStemEnd.y + (firstNote->m_drawingStemEnd.y - lastNote->m_drawingStemEnd.y) / 2 - TUPLET_OFFSET;
+        }
         
         // Copy the generated coordinates
         center->x = x;

From 5a8a9761a57a049b49159d3d1890a3397007a9bc Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 17 Sep 2015 14:27:32 +0200
Subject: [PATCH 23/85] Fixing minor bugs

---
 include/vrv/view.h    |  6 ++---
 src/view_floating.cpp | 63 +++++++++++++++++++++++++------------------
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/include/vrv/view.h b/include/vrv/view.h
index 5f31b5e9e22..5bd0177e477 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -342,10 +342,10 @@ class View
      * @name Internal methods used for calculating slurs
      */
     float AdjustSlur(Slur *slur, Staff *staff, int layerN, bool up,  Point points[]);
-    bool AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2,
+    int AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2,
                          bool up, float angle, bool posRatio = true );
-    bool AdjustSlurPosition(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2,
-                         bool up, float *angle );
+    void AdjustSlurPosition(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2,
+                         bool up, float *angle, bool forceBothSides );
     float GetAdjustedSlurAngle(Point *p1, Point *p2, bool up);
     void GetControlPoints(Point *p1, Point *p2, Point *c1, Point *c2, bool up, int height, int staffSize);
     void GetSpanningPointPositions( ArrayOfLayerElementPointPairs *spanningPoints, Point p1, float angle, bool up, int staffSize);
diff --git a/src/view_floating.cpp b/src/view_floating.cpp
index 8bbfad8a0ce..ad0547143d2 100644
--- a/src/view_floating.cpp
+++ b/src/view_floating.cpp
@@ -472,20 +472,23 @@ float View::AdjustSlur(Slur *slur, Staff *staff, int layerN, bool up,  Point poi
     Point adjustedRotatedC1 = rotatedC1;
     Point adjustedRotatedC2 = rotatedC2;
     
-    bool needPositionAdjustment = false;
     if (!spanningContentPoints.empty()) {
-        needPositionAdjustment = AdjustSlurCurve(slur, &spanningContentPoints, p1, &rotatedP2, &adjustedRotatedC1, &adjustedRotatedC2, up, slurAngle );
-    }
-    if (needPositionAdjustment) {
+        AdjustSlurCurve(slur, &spanningContentPoints, p1, &rotatedP2, &adjustedRotatedC1, &adjustedRotatedC2, up, slurAngle );
         // Use the adjusted control points for ajusting the position (p1, p2 and angle will be updated)
-        AdjustSlurPosition(slur, &spanningContentPoints, p1, &rotatedP2, &adjustedRotatedC1, &adjustedRotatedC2, up, &slurAngle );
+        AdjustSlurPosition(slur, &spanningContentPoints, p1, &rotatedP2, &adjustedRotatedC1, &adjustedRotatedC2, up, &slurAngle, false );
         // Now readjust the curvature with the new p1 and p2 with the original control points
         GetControlPoints(p1, &rotatedP2, &rotatedC1, &rotatedC2, up, height, staff->m_drawingStaffSize);
+        
         GetSpanningPointPositions( &spanningContentPoints, *p1, slurAngle, up, staff->m_drawingStaffSize);
-        AdjustSlurCurve(slur, &spanningContentPoints, p1, &rotatedP2, &rotatedC1, &rotatedC2, up, slurAngle, false );
-        if (!spanningContentPoints.empty()) {
+        int maxHeight = AdjustSlurCurve(slur, &spanningContentPoints, p1, &rotatedP2, &rotatedC1, &rotatedC2, up, slurAngle, false );
+        
+        if (maxHeight) {
             // Something went wrong since now all spanning points should be gone...
-            LogDebug("### %d notes for %s will need position adjustment", spanningContentPoints.size(), slur->GetUuid().c_str());
+            //LogDebug("### %d notes for %s will need position adjustment", spanningContentPoints.size(), slur->GetUuid().c_str());
+            // Use the normal control points for ajusting the position (p1, p2 and angle will be updated)
+            // Move it and forcing both side to move
+            AdjustSlurPosition(slur, &spanningContentPoints, p1, &rotatedP2, &rotatedC1, &rotatedC2, up, &slurAngle, true );
+            GetControlPoints(p1, &rotatedP2, &rotatedC1, &rotatedC2, up, maxHeight, staff->m_drawingStaffSize);
         }
     }
     else {
@@ -553,16 +556,16 @@ void View::GetSpanningPointPositions( ArrayOfLayerElementPointPairs *spanningPoi
         }
         p.x = itPoint->first->GetDrawingX();
         // Not sure if it is better to add the margin before or after the rotation...
-        if (up) p.y += m_doc->GetDrawingUnit(staffSize) * 3;
-        else p.y -= m_doc->GetDrawingUnit(staffSize) * 3;
+        //if (up) p.y += m_doc->GetDrawingUnit(staffSize) * 2;
+        //else p.y -= m_doc->GetDrawingUnit(staffSize) * 2;
         itPoint->second = View::CalcPositionAfterRotation(p, -angle, p1);
         // This would add it after
-        //if (up) itPoint->second.y += m_doc->GetDrawingUnit(staffSize) * 3;
-        //else itPoint->second.y -= m_doc->GetDrawingUnit(staffSize) * 3;
+        if (up) itPoint->second.y += m_doc->GetDrawingUnit(staffSize) * 2;
+        else itPoint->second.y -= m_doc->GetDrawingUnit(staffSize) * 2;
     }
 }
 
-bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2, bool up, float angle, bool posRatio)
+int View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2, bool up, float angle, bool posRatio)
 {
     Point bezier[4];
     bezier[0] = *p1;
@@ -585,6 +588,8 @@ bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPo
         //maxHeight = std::min( maxHeight, m_doc->GetDrawingStaffSize(100) );
     }
     
+    bool hasReachedMaxHeight = false;
+    
     if (maxHeight > currentHeight) {
         float maxRatio = 1.0;
         float posXRatio = 1.0;
@@ -614,7 +619,7 @@ bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPo
             }
             else  {
                 if (y > itPoint->second.y) {
-                    float ratio = (float)(p1->y - itPoint->second.y) / (float)(p1->y - y);
+                    float ratio = (float)(p1->y - itPoint->second.y) / (float)(p1->y - y) * posXRatio;
                     maxRatio = ratio > maxRatio ? ratio : maxRatio;
                     itPoint++;
                 }
@@ -628,6 +633,7 @@ bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPo
         // We should not adjust it more than the maximum height
         int desiredHeight = currentHeight * maxRatio;
         if (desiredHeight > maxHeight) {
+            hasReachedMaxHeight = true;
             maxRatio = (float)maxHeight / (float)currentHeight;
         }
         
@@ -643,26 +649,32 @@ bool View::AdjustSlurCurve(Slur *slur, ArrayOfLayerElementPointPairs *spanningPo
         }
     }
     
-    // filter the points with the adjusted curve
+    // Check if we need further adjustment the points with the adjusted curve
+    /*
     bezier[1] = *c1;
     bezier[2] = *c2;
     for (itPoint = spanningPoints->begin(); itPoint != spanningPoints->end();) {
         y = View::CalcBezierAtPosition(bezier, itPoint->second.x);
         if (up) {
-            if (y > itPoint->second.y) itPoint = spanningPoints->erase( itPoint );
-            else itPoint++;
+            //if (y > itPoint->second.y) itPoint = spanningPoints->erase( itPoint );
+            //else itPoint++;
         }
         else {
-            if (y < itPoint->second.y) itPoint = spanningPoints->erase( itPoint );
-            else itPoint++;
+            //if (y < itPoint->second.y) itPoint = spanningPoints->erase( itPoint );
+            //else itPoint++;
         }
+        itPoint++;
     }
     
     // We will need to adjust the further if the list is not empty
     return (!spanningPoints->empty());
+    */
+    
+    if (hasReachedMaxHeight) return maxHeight;
+    else return 0;
 }
     
-bool View::AdjustSlurPosition(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2, bool up, float *angle)
+void View::AdjustSlurPosition(Slur *slur, ArrayOfLayerElementPointPairs *spanningPoints, Point *p1, Point *p2, Point *c1, Point *c2, bool up, float *angle, bool forceBothSides)
 {
     Point bezier[4];
     bezier[0] = *p1;
@@ -707,19 +719,20 @@ bool View::AdjustSlurPosition(Slur *slur, ArrayOfLayerElementPointPairs *spannin
             }
         }
         if (shift > 0) {
-            leftShift = leftPoint ? shift : shift * posXRatio;
-            rightShift = !leftPoint ? shift : shift * posXRatio;
+            leftShift = (forceBothSides || leftPoint) ? shift : shift * posXRatio;
+            rightShift = (forceBothSides || !leftPoint) ? shift : shift * posXRatio;
             maxShiftLeft = leftShift > maxShiftLeft ? leftShift : maxShiftLeft;
             maxShiftRight = rightShift > maxShiftRight ? rightShift : maxShiftRight;
             itPoint++;
         }
         else {
-            itPoint = spanningPoints->erase(itPoint);
+            //itPoint = spanningPoints->erase(itPoint);
+            itPoint++;
         }
     }
     
     // Actually nothing to do
-    if (spanningPoints->empty()) return true;
+    if (spanningPoints->empty()) return;
     
     // Unrotated the slur
     *p2 = View::CalcPositionAfterRotation(*p2, (*angle), *p1);
@@ -735,8 +748,6 @@ bool View::AdjustSlurPosition(Slur *slur, ArrayOfLayerElementPointPairs *spannin
 
     *angle = GetAdjustedSlurAngle(p1, p2, up);
     *p2 = View::CalcPositionAfterRotation(*p2, -(*angle), *p1);
-    
-    return false;
 }
     
 void View::DrawTie( DeviceContext *dc, Tie *tie, int x1, int x2, Staff *staff,

From 826e04c270e37d18dbc6122f151fb92b130510f8 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 17 Sep 2015 14:45:56 +0200
Subject: [PATCH 24/85] Adding mensural clef (E901, 904, 909)

---
 data/Bravura.xml                              |   3 +
 data/Bravura/E901-mensuralGclefPetrucci.xml   |   8 +
 data/Bravura/E904-mensuralFclefPetrucci.xml   |   8 +
 .../E909-mensuralCclefPetrucciPosMiddle.xml   |   8 +
 data/Gootville.xml                            |   3 +
 data/Gootville/E901-mensuralGclefPetrucci.xml |   8 +
 data/Gootville/E904-mensuralFclefPetrucci.xml |   8 +
 .../E909-mensuralCclefPetrucciPosMiddle.xml   |   8 +
 data/Leipzig.xml                              |   3 +
 .../E4A8-articStaccatissimoWedgeAbove.xml     |   2 +-
 .../E4A9-articStaccatissimoWedgeBelow.xml     |   2 +-
 data/Leipzig/E500-repeat1Bar.xml              |   2 +-
 data/Leipzig/E501-repeat2Bars.xml             |   2 +-
 data/Leipzig/E502-repeat4Bars.xml             |   2 +-
 data/Leipzig/E521-dynamicMezzo.xml            |   2 +-
 data/Leipzig/E522-dynamicForte.xml            |   2 +-
 data/Leipzig/E52F-dynamicFF.xml               |   2 +-
 data/Leipzig/E531-dynamicFFFF.xml             |   2 +-
 data/Leipzig/E532-dynamicFFFFF.xml            |   2 +-
 data/Leipzig/E567-ornamentTurn.xml            |   2 +-
 data/Leipzig/E568-ornamentTurnInverted.xml    |   2 +-
 data/Leipzig/E56A-ornamentTurnUp.xml          |   2 +-
 data/Leipzig/E56B-ornamentTurnUpS.xml         |   2 +-
 data/Leipzig/E56E-ornamentTremblement.xml     |   2 +-
 data/Leipzig/E901-mensuralGclefPetrucci.xml   |   8 +
 data/Leipzig/E904-mensuralFclefPetrucci.xml   |   8 +
 .../E909-mensuralCclefPetrucciPosMiddle.xml   |   8 +
 fonts/Leipzig-5.2.sfd                         | 239 +++++++++++++++++-
 fonts/Leipzig.svg                             | 163 ++++++------
 fonts/supported.xsl                           |   6 +-
 include/vrv/smufl.h                           |   5 +-
 31 files changed, 425 insertions(+), 99 deletions(-)
 create mode 100644 data/Bravura/E901-mensuralGclefPetrucci.xml
 create mode 100644 data/Bravura/E904-mensuralFclefPetrucci.xml
 create mode 100644 data/Bravura/E909-mensuralCclefPetrucciPosMiddle.xml
 create mode 100644 data/Gootville/E901-mensuralGclefPetrucci.xml
 create mode 100644 data/Gootville/E904-mensuralFclefPetrucci.xml
 create mode 100644 data/Gootville/E909-mensuralCclefPetrucciPosMiddle.xml
 create mode 100644 data/Leipzig/E901-mensuralGclefPetrucci.xml
 create mode 100644 data/Leipzig/E904-mensuralFclefPetrucci.xml
 create mode 100644 data/Leipzig/E909-mensuralCclefPetrucciPosMiddle.xml

diff --git a/data/Bravura.xml b/data/Bravura.xml
index 023eb2ac331..0b139bb697d 100644
--- a/data/Bravura.xml
+++ b/data/Bravura.xml
@@ -103,6 +103,9 @@
    <glyph glyph-code="E888" x="0.0" y="0.0" width="639.0" height="772.0" />
    <glyph glyph-code="E889" x="0.0" y="2.0" width="590.0" height="780.0" />
    <glyph glyph-code="E88A" x="16.0" y="164.0" width="230.0" height="406.0" />
+   <glyph glyph-code="E901" x="0.0" y="-346.0" width="694.0" height="2234.0" />
+   <glyph glyph-code="E904" x="0.0" y="-2189.0" width="999.0" height="3399.0" />
+   <glyph glyph-code="E909" x="0.0" y="-1638.0" width="500.0" height="3276.0" />
    <glyph glyph-code="E938" x="0.0" y="-289.0" width="578.0" height="578.0" />
    <glyph glyph-code="E939" x="2.0" y="-289.0" width="579.0" height="578.0" />
    <glyph glyph-code="E93C" x="0.0" y="-377.0" width="655.0" height="755.1" />
diff --git a/data/Bravura/E901-mensuralGclefPetrucci.xml b/data/Bravura/E901-mensuralGclefPetrucci.xml
new file mode 100644
index 00000000000..72026ec8be3
--- /dev/null
+++ b/data/Bravura/E901-mensuralGclefPetrucci.xml
@@ -0,0 +1,8 @@
+<symbol id="E901"
+        viewBox="0 0 2048 2048"
+        overflow="inherit"
+        horiz-adv-x="694">
+   <g transform="scale(1,-1)">
+      <path d="M412 37q0 74 18 147q-78 -4 -125 -51v-39q0 -191 84 -255q68 -52 148 -52q29 0 49 4q10 0 10 52t-10 77q-2 8 -39 8l-74 -2q-20 0 -24 2q-37 35 -37 109zM555 1585q0 101 -43 159q-42 58 -110 58t-99 -30q-51 -52 -51 -160t29 -219t60 -161t49 -78t32 -56l24 43 q66 141 88 270t21 174zM469 172q0 -53 31 -131q12 12 17 15t50 3l115 -6q12 -49 12 -96q0 -125 -72 -211t-159 -92h-12q-63 0 -127 41q-63 41 -84 96q-35 95 -35 187t82 198t184 137l18 43q78 176 29 338q-27 100 -139 283q-29 -33 -117 -116t-141 -159t-58 -170 q1 -74 49 -131t78 -57q12 -8 12 -12t-10 -27t-26 -40t-27 -17q-23 10 -29 12q-5 2 -27 18q-78 55 -83 191v10q0 68 39 150q47 88 176 224t145 155l-59 100q-119 223 -119 387q0 88 22 146q22 59 50 110q66 115 199 135q10 2 30 2q135 0 135 -205q0 -141 -65 -360 q-59 -176 -111 -260q166 -293 166 -430q0 -100 -88 -291l-10 -20l25 2q66 0 122 -41q14 -14 -25 -71q-38 -58 -63 -58l-2 2h-4q-41 25 -94 26v-10z"/>
+   </g>
+</symbol>
diff --git a/data/Bravura/E904-mensuralFclefPetrucci.xml b/data/Bravura/E904-mensuralFclefPetrucci.xml
new file mode 100644
index 00000000000..f5ee6368076
--- /dev/null
+++ b/data/Bravura/E904-mensuralFclefPetrucci.xml
@@ -0,0 +1,8 @@
+<symbol id="E904"
+        viewBox="0 0 2048 2048"
+        overflow="inherit"
+        horiz-adv-x="999">
+   <g transform="scale(1,-1)">
+      <path d="M797 -422l82 139l-127 213l-80 -135zM672 276l125 -217l82 140l-127 213zM774 1190q0 20 21 20h26q20 0 21 -20v-631q19 -25 77 -126t69 -124t11 -36t-6 -25l-114 -195q-6 -11 -6 -19t41 -82t61 -108q20 -33 20 -59l-4 -25q-156 -299 -213 -344v-1585q0 -20 -20 -20h-27 q-20 0 -20 20v1596q-20 29 -81 135q-62 107 -72 118t-9 26q0 15 8 36l113 201q8 10 8 17t-8 17q-6 10 -64 112t-57 114l12 33l164 286q23 47 49 60v608zM117 -109h239q53 0 62 76v78q-16 47 -56 47h-247q-39 0 -47 -47v-86q8 -68 49 -68zM459 369q25 0 24 -39v-2263 q0 -25 -6 -31t-18 -6h-17q-16 0 -20 9t-4 28v1609q-16 47 -56 48h-247q-39 0 -47 -48v-36q0 -20 -25 -21h-18q-25 0 -25 21v708q0 20 25 21h18q25 0 25 -21v-20q8 -68 49 -68h239q53 0 62 80q2 29 24 29h17z"/>
+   </g>
+</symbol>
diff --git a/data/Bravura/E909-mensuralCclefPetrucciPosMiddle.xml b/data/Bravura/E909-mensuralCclefPetrucciPosMiddle.xml
new file mode 100644
index 00000000000..ea11f5ace3e
--- /dev/null
+++ b/data/Bravura/E909-mensuralCclefPetrucciPosMiddle.xml
@@ -0,0 +1,8 @@
+<symbol id="E909"
+        viewBox="0 0 2048 2048"
+        overflow="inherit"
+        horiz-adv-x="499">
+   <g transform="scale(1,-1)">
+      <path d="M119 356q-37 0 -49 -47v-73q8 -76 61 -76h248q37 0 47 47q4 16 4 24v78q-14 47 -55 47h-256zM131 -346h248q43 0 51 67v54q-5 75 -55 75h-260q-41 -10 -45 -75v-45q8 -76 61 -76zM51 1638q19 0 19 -34v-971q8 -68 51 -68h248q35 -1 46 19t15 57v465q0 23 6 29t21 6h18 q25 0 25 -35v-2220q0 -23 -6 -29t-19 -6h-26q-19 0 -19 35v485q-8 78 -61 78h-238q-53 0 -61 -78v-975q0 -22 -6 -28t-20 -6h-26q-18 0 -18 34v3208q0 22 6 28t20 6h25z"/>
+   </g>
+</symbol>
diff --git a/data/Gootville.xml b/data/Gootville.xml
index 0c8dde65e05..262bbd1de2b 100644
--- a/data/Gootville.xml
+++ b/data/Gootville.xml
@@ -103,6 +103,9 @@
    <glyph glyph-code="E888" x="0.0" y="0.0" width="200.0" height="400.0" />
    <glyph glyph-code="E889" x="0.0" y="0.0" width="200.0" height="400.0" />
    <glyph glyph-code="E88A" x="0.0" y="0.0" width="200.0" height="400.0" />
+   <glyph glyph-code="E901" x="0.0" y="0.0" width="200.0" height="400.0" />
+   <glyph glyph-code="E904" x="0.0" y="0.0" width="200.0" height="400.0" />
+   <glyph glyph-code="E909" x="0.0" y="0.0" width="200.0" height="400.0" />
    <glyph glyph-code="E938" x="0.0" y="0.0" width="200.0" height="400.0" />
    <glyph glyph-code="E939" x="0.0" y="0.0" width="200.0" height="400.0" />
    <glyph glyph-code="E93C" x="0.0" y="0.0" width="200.0" height="400.0" />
diff --git a/data/Gootville/E901-mensuralGclefPetrucci.xml b/data/Gootville/E901-mensuralGclefPetrucci.xml
new file mode 100644
index 00000000000..b11f8f63c1c
--- /dev/null
+++ b/data/Gootville/E901-mensuralGclefPetrucci.xml
@@ -0,0 +1,8 @@
+<symbol id="E901"
+        viewBox="0 0 1000 1000"
+        overflow="inherit"
+        horiz-adv-x="">
+   <g transform="scale(1,-1)">
+      <path d="M0 0v400h200v-400h-200zM10 10h180v380h-180v-380z"/>
+   </g>
+</symbol>
diff --git a/data/Gootville/E904-mensuralFclefPetrucci.xml b/data/Gootville/E904-mensuralFclefPetrucci.xml
new file mode 100644
index 00000000000..36a690e8ae2
--- /dev/null
+++ b/data/Gootville/E904-mensuralFclefPetrucci.xml
@@ -0,0 +1,8 @@
+<symbol id="E904"
+        viewBox="0 0 1000 1000"
+        overflow="inherit"
+        horiz-adv-x="">
+   <g transform="scale(1,-1)">
+      <path d="M0 0v400h200v-400h-200zM10 10h180v380h-180v-380z"/>
+   </g>
+</symbol>
diff --git a/data/Gootville/E909-mensuralCclefPetrucciPosMiddle.xml b/data/Gootville/E909-mensuralCclefPetrucciPosMiddle.xml
new file mode 100644
index 00000000000..d1574e34255
--- /dev/null
+++ b/data/Gootville/E909-mensuralCclefPetrucciPosMiddle.xml
@@ -0,0 +1,8 @@
+<symbol id="E909"
+        viewBox="0 0 1000 1000"
+        overflow="inherit"
+        horiz-adv-x="">
+   <g transform="scale(1,-1)">
+      <path d="M0 0v400h200v-400h-200zM10 10h180v380h-180v-380z"/>
+   </g>
+</symbol>
diff --git a/data/Leipzig.xml b/data/Leipzig.xml
index b4908963b42..3d1540bbeb8 100644
--- a/data/Leipzig.xml
+++ b/data/Leipzig.xml
@@ -107,4 +107,7 @@
    <glyph glyph-code="E101" x="0.0" y="-242.0" width="508.0" height="484.0" />
    <glyph glyph-code="E501" x="0.0" y="-242.0" width="750.0" height="484.0" />
    <glyph glyph-code="E502" x="0.0" y="-242.0" width="1234.0" height="484.0" />
+   <glyph glyph-code="E901" x="-12.1" y="-176.3" width="461.1" height="935.5" />
+   <glyph glyph-code="E904" x="0.0" y="-883.0" width="677.0" height="1208.0" />
+   <glyph glyph-code="E909" x="0.0" y="-602.0" width="309.0" height="1197.0" />
 </bounding-boxes>
diff --git a/data/Leipzig/E4A8-articStaccatissimoWedgeAbove.xml b/data/Leipzig/E4A8-articStaccatissimoWedgeAbove.xml
index 67247e91415..2e4eb2534ae 100644
--- a/data/Leipzig/E4A8-articStaccatissimoWedgeAbove.xml
+++ b/data/Leipzig/E4A8-articStaccatissimoWedgeAbove.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="153">
    <g transform="scale(1,-1)">
-      <path d="M153 214h-37c-10 -4 -18.667 -14 -26 -30c-3.33301 -7.33301 -8 -12 -14 -14c-4 1.33301 -10.667 10 -20 26c-4.66699 8.66699 -11.333 14.667 -20 18h-36l76 -214z"/>
+      <path d="M153 214h-37c-10 -4 -18.667 -14 -26 -30c-3.333 -7.33299 -8 -12 -14 -14c-4 1.33299 -10.667 10 -20 26c-4.667 8.66701 -11.333 14.667 -20 18h-36l76 -214z"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E4A9-articStaccatissimoWedgeBelow.xml b/data/Leipzig/E4A9-articStaccatissimoWedgeBelow.xml
index 939e754fa81..20cd3c2010a 100644
--- a/data/Leipzig/E4A9-articStaccatissimoWedgeBelow.xml
+++ b/data/Leipzig/E4A9-articStaccatissimoWedgeBelow.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="153">
    <g transform="scale(1,-1)">
-      <path d="M153 -214h-37c-10 4 -18.667 14 -26 30c-3.33301 7.33301 -8 12 -14 14c-4 -1.33301 -10.667 -10 -20 -26c-4.66699 -8.66699 -11.333 -14.667 -20 -18h-36l76 214z"/>
+      <path d="M153 -214h-37c-10 4 -18.667 14 -26 30c-3.333 7.33299 -8 12 -14 14c-4 -1.33299 -10.667 -10 -20 -26c-4.667 -8.66701 -11.333 -14.667 -20 -18h-36l76 214z"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E500-repeat1Bar.xml b/data/Leipzig/E500-repeat1Bar.xml
index 537d9e14db0..10ad368c74f 100644
--- a/data/Leipzig/E500-repeat1Bar.xml
+++ b/data/Leipzig/E500-repeat1Bar.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="508">
    <g transform="scale(1,-1)">
-      <path d="M508 242l-362 -484h-146l362 484h146zM52 118c0 13.333 4.33301 24.667 13 34s19.333 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33c0 -13.333 -4.33301 -24.667 -13 -34s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33zM361 -121 c0 13.333 4.33301 24.667 13 34s19.334 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33c0 -13.333 -4.33301 -24.667 -13 -34s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33z"/>
+      <path d="M508 242l-362 -484h-146l362 484h146zM52 118c0 13.333 4.333 24.667 13 34s19.333 14.333 32 15c14 0 25.667 -4 35 -12c9.33299 -8 14.333 -19 15 -33c0 -13.333 -4.33299 -24.667 -13 -34c-8.667 -9.333 -19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12 s-14.333 19 -15 33zM361 -121c0 13.333 4.33301 24.667 13 34s19.334 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33c0 -13.333 -4.33301 -24.667 -13 -34s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33z"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E501-repeat2Bars.xml b/data/Leipzig/E501-repeat2Bars.xml
index 04ea5ab7981..1f1f45be1ee 100644
--- a/data/Leipzig/E501-repeat2Bars.xml
+++ b/data/Leipzig/E501-repeat2Bars.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="751">
    <g transform="scale(1,-1)">
-      <path d="M750 242l-362 -484h-146l362 484h146zM508 242l-362 -484h-146l362 484h146zM52 118c0 13.333 4.33301 24.667 13 34s19.333 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33c0 -13.333 -4.33301 -24.667 -13 -34s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12 s-14.333 19 -15 33zM603 -121c0 13.333 4.33301 24.667 13 34s19.334 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33c0 -13.333 -4.33301 -24.667 -13 -34s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33z"/>
+      <path d="M750 242l-362 -484h-146l362 484h146zM508 242l-362 -484h-146l362 484h146zM52 118c0 13.333 4.333 24.667 13 34s19.333 14.333 32 15c14 0 25.667 -4 35 -12c9.33299 -8 14.333 -19 15 -33c0 -13.333 -4.33299 -24.667 -13 -34c-8.667 -9.333 -19.333 -14.333 -32 -15 c-14 0 -25.667 4 -35 12s-14.333 19 -15 33zM603 -121c0 13.333 4.33301 24.667 13 34s19.334 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33c0 -13.333 -4.33301 -24.667 -13 -34s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33z"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E502-repeat4Bars.xml b/data/Leipzig/E502-repeat4Bars.xml
index 8245027e5df..2c508da2ced 100644
--- a/data/Leipzig/E502-repeat4Bars.xml
+++ b/data/Leipzig/E502-repeat4Bars.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="1234">
    <g transform="scale(1,-1)">
-      <path d="M1234 242l-362 -484h-146l362 484h146zM992 242l-362 -484h-146l362 484h146zM750 242l-362 -484h-146l362 484h146zM508 242l-362 -484h-146l362 484h146zM52 118c0 13.333 4.33301 24.667 13 34s19.333 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33 c0 -13.333 -4.33301 -24.667 -13 -34s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33zM1087 -121c0 13.333 4.33301 24.667 13 34s19.334 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33c0 -13.333 -4.33301 -24.667 -13 -34 s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33z"/>
+      <path d="M1234 242l-362 -484h-146l362 484h146zM992 242l-362 -484h-146l362 484h146zM750 242l-362 -484h-146l362 484h146zM508 242l-362 -484h-146l362 484h146zM52 118c0 13.333 4.333 24.667 13 34s19.333 14.333 32 15c14 0 25.667 -4 35 -12c9.33299 -8 14.333 -19 15 -33 c0 -13.333 -4.33299 -24.667 -13 -34c-8.667 -9.333 -19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33zM1087 -121c0 13.333 4.32996 24.667 13 34s19.33 14.333 32 15c14 0 25.67 -4 35 -12s14.33 -19 15 -33c0 -13.333 -4.32996 -24.667 -13 -34 s-19.33 -14.333 -32 -15c-14 0 -25.67 4 -35 12s-14.33 19 -15 33z"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E521-dynamicMezzo.xml b/data/Leipzig/E521-dynamicMezzo.xml
index 00ae427e3d4..00430b7d11e 100644
--- a/data/Leipzig/E521-dynamicMezzo.xml
+++ b/data/Leipzig/E521-dynamicMezzo.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="405">
    <g transform="scale(1,-1)">
-      <path 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 18.6328 31.6631 20 35l14 41h23l-24 -63c-8.30371 -21.7969 -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 186 c0 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 107c21 27 47 40 79 40 c21 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"/>
+      <path 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 18.633 31.6631 20 35l14 41h23l-24 -63c-8.30399 -21.7969 -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 186 c0 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 107c21 27 47 40 79 40 c21 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"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E522-dynamicForte.xml b/data/Leipzig/E522-dynamicForte.xml
index a285762bd96..bc40b716211 100644
--- a/data/Leipzig/E522-dynamicForte.xml
+++ b/data/Leipzig/E522-dynamicForte.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="232">
    <g transform="scale(1,-1)">
-      <path d="M-91 -179c-2 -2.66699 -2.66699 -5 -2 -7s4.33301 -3.33301 11 -4c18.667 0 34.333 13.667 47 41c6.66699 14 13.333 30 20 48s11.667 35.333 15 52l14 61l44 208h-58v38h70c7.33301 20.667 13.333 36.333 18 47c7.33301 18 14.667 32.667 22 44 c20.666 30 42.333 53 65 69s47.667 24 75 24c9.33301 0 17 -1 23 -3s12.333 -7.33301 19 -16c4.66699 -6.66699 7.66699 -13 9 -19l4 -16c0 -14.667 -0.666992 -25.334 -2 -32c-1.33301 -6.66699 -5 -16 -11 -28c-2.66699 -6 -8.66699 -13 -18 -21 c-4 -3.33301 -8.33301 -5.33301 -13 -6s-10.333 -0.666992 -17 0c-6 1.33301 -10.333 5 -13 11s-4.66699 12.667 -6 20c0 12 2.33301 22.667 7 32s12 17.333 22 24l14 10c0 8.66699 -6 14 -18 16c-13.333 1.33008 -24.667 -1.33691 -34 -8 c-9.33301 -6.66699 -19 -21 -29 -43c-4.66699 -12 -10.333 -29.667 -17 -53s-11.333 -40 -14 -50h77v-40h-85c-12 -68.667 -29 -137.333 -51 -206c-18 -55.333 -35.333 -99 -52 -131c-13.333 -26 -27 -47 -41 -63c-24.667 -28.667 -50 -43 -76 -43 c-24.666 0 -43.333 9.66699 -56 29c-10 15.333 -15 33.333 -15 54c0 16.667 4 32.667 12 48c4.66699 7.33301 10.333 13 17 17s13.333 6 20 6c8.66699 0 15.667 -4 21 -12s9 -15.333 11 -22s3 -12.333 3 -17c0 -9.33301 -2.33301 -17.333 -7 -24 c-4.66406 -6.66699 -9.33008 -13.667 -14 -21c-4.66406 -7.33301 -8.33008 -12 -11 -14z"/>
+      <path d="M-91 -179c-2 -2.66701 -2.667 -5 -2 -7s4.333 -3.33299 11 -4c18.667 0 34.333 13.667 47 41c6.667 14 13.333 30 20 48c6.66699 18 11.667 35.333 15 52l14 61l44 208h-58v38h70c7.333 20.667 13.333 36.333 18 47c7.333 18 14.667 32.667 22 44 c20.666 30 42.333 53 65 69s47.667 24 75 24c9.33301 0 17 -1 23 -3s12.333 -7.33301 19 -16c4.66699 -6.66699 7.66699 -13 9 -19l4 -16c0 -14.667 -0.666992 -25.334 -2 -32c-1.33301 -6.66699 -5 -16 -11 -28c-2.66699 -6 -8.66699 -13 -18 -21 c-4 -3.33301 -8.33301 -5.33301 -13 -6s-10.333 -0.666992 -17 0c-6 1.33301 -10.333 5 -13 11s-4.66701 12.667 -6 20c0 12 2.33299 22.667 7 32s12 17.333 22 24l14 10c0 8.66699 -6 14 -18 16c-13.333 1.32999 -24.667 -1.33701 -34 -8 c-9.33299 -6.66699 -19 -21 -29 -43c-4.66701 -12 -10.333 -29.667 -17 -53s-11.333 -40 -14 -50h77v-40h-85c-12 -68.667 -29 -137.333 -51 -206c-18 -55.333 -35.333 -99 -52 -131c-13.333 -26 -27 -47 -41 -63c-24.667 -28.667 -50 -43 -76 -43 c-24.666 0 -43.333 9.66701 -56 29c-10 15.333 -15 33.333 -15 54c0 16.667 4 32.667 12 48c4.667 7.333 10.333 13 17 17s13.333 6 20 6c8.667 0 15.667 -4 21 -12s9 -15.333 11 -22s3 -12.333 3 -17c0 -9.33299 -2.333 -17.333 -7 -24 c-4.6641 -6.66701 -9.3301 -13.667 -14 -21c-4.6641 -7.33299 -8.3301 -12 -11 -14z"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E52F-dynamicFF.xml b/data/Leipzig/E52F-dynamicFF.xml
index 606acdbe7c0..c1c14b906e1 100644
--- a/data/Leipzig/E52F-dynamicFF.xml
+++ b/data/Leipzig/E52F-dynamicFF.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="479">
    <g transform="scale(1,-1)">
-      <path d="M481 220h-83c-8.66699 -55.333 -22.333 -114.333 -41 -177s-35.667 -109.667 -51 -141s-32 -58 -50 -80c-16 -21.333 -37 -35.666 -63 -43l-19 -2c-21.333 0 -37.333 8.66699 -48 26c-4 5.33301 -7 10.333 -9 15c-2 4.66602 -4 10.333 -6 17c-2 6.66602 -3 16.333 -3 29 c0 18.667 4 32.667 12 42s18.667 17.667 32 25c5.33301 0 10 -1 14 -3s8.33301 -6 13 -12c7.33301 -9.33301 11 -20.667 11 -34c0 -14.667 -10.667 -36.333 -32 -65c0 -4.66699 3 -7 9 -7c34 0 61.333 46.333 82 139l7 29l13 60l22 102l17 80h-161 c-8 -53.333 -22.333 -113.333 -43 -180c-12 -39.333 -20.667 -66 -26 -80c-8 -21.333 -16.333 -40.667 -25 -58c-32.667 -72 -69.333 -113 -110 -123l-18 -2c-21.3311 0 -37.6641 8.66699 -49 26c-5.33301 6 -10.333 15.333 -15 28c-0.666992 5.33301 -1.33301 10.333 -2 15 s-1.33301 10.667 -2 18c1.33301 11.333 2.66699 20.333 4 27s4.33301 13 9 19c6.66699 8.66699 17.667 15.667 33 21c10.6621 0 19.3281 -5 26 -15c6.65723 -10 10.3242 -21.333 11 -34c0 -7.33301 -0.666992 -12.667 -2 -16c-1.33301 -3.33203 -2.33301 -5.66602 -3 -7 l-14 -23l-15 -19c0 -4.66699 3.33301 -7 10 -7c11.333 0 21.667 5 31 15c3.33301 3.33301 7 8 11 14s8 13 12 21l14 36l15 53l19 86l22 105l17 80h-57v38h70c9.33301 31.334 22 60.667 38 88s37.667 51 65 71c24.667 16.667 52.333 25 83 25 c15.333 0 27.333 -6.33301 36 -19s13 -28.334 13 -47c0 -18.667 -4.33301 -35.334 -13 -50c-8.66602 -14.668 -21.333 -23.335 -38 -26c-16.667 0 -26 10.667 -28 32c0 11.335 3.33301 23.668 10 37c6.66699 11.335 15.667 19.668 27 25c3.33301 2.66699 5 4.66699 5 6 c-3.33301 4.66699 -5.66699 7.66699 -7 9c-4.66699 3.33301 -10.667 5 -18 5c-22 0 -40 -15.667 -54 -47s-25 -67 -33 -107h164c13.333 49.333 36.667 92 70 128s72 54 116 54c8 0 15 -1.33301 21 -4s11 -8 15 -16c2.66699 -3.33301 5.33301 -9 8 -17s4.33301 -17.667 5 -29 c0 -18.667 -4.33301 -35 -13 -49s-21 -23 -37 -27c-18 0 -28 10.667 -30 32c0 6 1 12 3 18s4.66699 12 8 18s7 11 11 15s9 7.66699 15 11c3.33301 2.66699 5 4.66699 5 6l-6 9c-4.66699 3.33301 -10.333 5 -17 5c-37.333 0 -66.667 -52 -88 -156h75v-38z"/>
+      <path d="M481 220h-83c-8.66699 -55.333 -22.333 -114.333 -41 -177s-35.667 -109.667 -51 -141c-15.333 -31.333 -32 -58 -50 -80c-16 -21.333 -37 -35.666 -63 -43l-19 -2c-21.333 0 -37.333 8.66701 -48 26c-4 5.33299 -7 10.333 -9 15c-2 4.666 -4 10.333 -6 17 c-2 6.666 -3 16.333 -3 29c0 18.667 4 32.667 12 42s18.667 17.667 32 25c5.33299 0 10 -1 14 -3s8.33299 -6 13 -12c7.33299 -9.333 11 -20.667 11 -34c0 -14.667 -10.667 -36.333 -32 -65c0 -4.66701 3 -7 9 -7c34 0 61.333 46.333 82 139l7 29l13 60l22 102l17 80h-161 c-8 -53.333 -22.333 -113.333 -43 -180c-12 -39.333 -20.667 -66 -26 -80c-8 -21.333 -16.333 -40.667 -25 -58c-32.667 -72 -69.333 -113 -110 -123l-18 -2c-21.3311 0 -37.664 8.66701 -49 26c-5.33299 6 -10.333 15.333 -15 28c-0.667007 5.33299 -1.33299 10.333 -2 15 s-1.33299 10.667 -2 18c1.33299 11.333 2.66701 20.333 4 27s4.33299 13 9 19c6.667 8.667 17.667 15.667 33 21c10.6621 0 19.3281 -5 26 -15c6.6572 -10 10.3242 -21.333 11 -34c0 -7.333 -0.667 -12.667 -2 -16c-1.333 -3.332 -2.333 -5.666 -3 -7l-14 -23l-15 -19 c0 -4.66701 3.333 -7 10 -7c11.333 0 21.667 5 31 15c3.333 3.33299 7 8 11 14s8 13 12 21l14 36l15 53l19 86l22 105l17 80h-57v38h70c9.333 31.334 22 60.667 38 88s37.667 51 65 71c24.667 16.667 52.333 25 83 25c15.333 0 27.333 -6.33301 36 -19s13 -28.334 13 -47 c0 -18.667 -4.33301 -35.334 -13 -50c-8.66599 -14.668 -21.333 -23.335 -38 -26c-16.667 0 -26 10.667 -28 32c0 11.335 3.33299 23.668 10 37c6.66701 11.335 15.667 19.668 27 25c3.33301 2.66699 5 4.66699 5 6c-3.33301 4.66699 -5.66699 7.66699 -7 9 c-4.66699 3.33301 -10.667 5 -18 5c-22 0 -40 -15.667 -54 -47s-25 -67 -33 -107h164c13.333 49.333 36.667 92 70 128s72 54 116 54c8 0 15 -1.33301 21 -4s11 -8 15 -16c2.66699 -3.33301 5.33301 -9 8 -17s4.33301 -17.667 5 -29c0 -18.667 -4.33301 -35 -13 -49 s-21 -23 -37 -27c-18 0 -28 10.667 -30 32c0 6 1 12 3 18s4.66699 12 8 18s7 11 11 15s9 7.66699 15 11c3.33301 2.66699 5 4.66699 5 6l-6 9c-4.66699 3.33301 -10.333 5 -17 5c-37.333 0 -66.667 -52 -88 -156h75v-38z"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E531-dynamicFFFF.xml b/data/Leipzig/E531-dynamicFFFF.xml
index b769b0d2966..9a614b8b5d3 100644
--- a/data/Leipzig/E531-dynamicFFFF.xml
+++ b/data/Leipzig/E531-dynamicFFFF.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="925">
    <g transform="scale(1,-1)">
-      <path d="M597 -69c21.3857 0 35 -30.9219 35 -51c0 -20.1133 -12.6016 -31.8135 -21 -45c-4.66406 -7.33301 -8.33008 -12 -11 -14c-5.52148 -7.3623 -1.33789 -9.96582 9 -11c35.0752 0 54.2207 54.5 67 89c6.66699 18 11.667 35.333 15 52 c20.7061 88.2939 38.6641 179.336 58 269h-143c-7 -44 -15 -84 -26 -121c-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 67c23 0 35 -23 36 -47c0 -8 -4 -23 -9 -31l-10 -15 c-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 87c0 39 18 53 45 67c6 0 11 -1 14 -4 c14.8457 -5.93848 23 -25.0508 23 -45c0 -15 -11 -36 -32 -65c0 -5 3 -7 9 -7c34 0 61 46 82 139c21.4238 88.7559 39.7725 180.774 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 -156h146 c13.4287 37.8467 22.957 64.6611 40 91c20.666 30 42.333 53 65 69s47.667 24 75 24c28.3184 0 45.5996 -13.6738 51 -38l4 -16c0 -33.1387 -1 -36.0068 -13 -60c-3.1377 -7.05957 -17.3828 -25.0537 -31 -27c-4.66699 -0.666992 -10.333 -0.666992 -17 0 c-12.6064 2.80078 -16.5664 17.6123 -19 31c0 27.2803 11.3252 44.2158 29 56l14 10c0 8.66699 -6 14 -18 16c-13.333 1.33008 -24.667 -1.33691 -34 -8c-9.33301 -6.66699 -19 -21 -29 -43c-6.91406 -17.7783 -25.9004 -83.8789 -31 -103h77v-40h-85 c-19.0137 -108.805 -60.0605 -254.559 -103 -337c-23.6572 -46.1318 -64.3018 -106 -117 -106c-44.6172 0 -71 36.6826 -71 83c0 31.8223 15.3096 71 49 71z"/>
+      <path d="M597 -69c21.386 0 35 -30.9219 35 -51c0 -20.113 -12.602 -31.813 -21 -45c-4.664 -7.33299 -8.33002 -12 -11 -14c-5.521 -7.362 -1.33801 -9.966 9 -11c35.075 0 54.221 54.5 67 89c6.66699 18 11.667 35.333 15 52c20.706 88.2939 38.664 179.336 58 269h-143 c-7 -44 -15 -84 -26 -121c-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 67c23 0 35 -23 36 -47c0 -8 -4 -23 -9 -31l-10 -15c-7 -10 -8 -12 -13 -21c0 -5 3 -7 10 -7 c19 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 87c0 39 18 53 45 67c6 0 11 -1 14 -4c14.846 -5.9385 23 -25.0508 23 -45c0 -15 -11 -36 -32 -65 c0 -5 3 -7 9 -7c34 0 61 46 82 139c21.424 88.7559 39.772 180.774 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 -23l-14 -23l-14 -19c0 -5 3 -7 10 -7 c11 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 -76c-17 0 -27 11 -29 32c0 27 17 53 37 62c3 0 5 2 5 6l-6 9c-5 3 -11 5 -18 5 c-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 -156h144c15 49 39 93 72 132 c31 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.429 37.847 22.957 64.661 40 91c20.666 30 42.333 53 65 69s47.667 24 75 24 c28.318 0 45.6 -13.674 51 -38l4 -16c0 -33.139 -1 -36.007 -13 -60c-3.138 -7.06 -17.383 -25.054 -31 -27c-4.66699 -0.666992 -10.333 -0.666992 -17 0c-12.606 2.80099 -16.566 17.612 -19 31c0 27.28 11.325 44.216 29 56l14 10c0 8.66699 -6 14 -18 16 c-13.333 1.32999 -24.667 -1.33701 -34 -8c-9.33301 -6.66699 -19 -21 -29 -43c-6.914 -17.778 -25.9 -83.879 -31 -103h77v-40h-85c-19.014 -108.805 -60.061 -254.559 -103 -337c-23.657 -46.132 -64.302 -106 -117 -106c-44.617 0 -71 36.683 -71 83 c0 31.822 15.31 71 49 71z"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E532-dynamicFFFFF.xml b/data/Leipzig/E532-dynamicFFFFF.xml
index cce0a5e65ff..a89b39938eb 100644
--- a/data/Leipzig/E532-dynamicFFFFF.xml
+++ b/data/Leipzig/E532-dynamicFFFFF.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="1158">
    <g transform="scale(1,-1)">
-      <path d="M983 220l-44 -208l-14 -61c-3.33301 -16.667 -8.33301 -34 -15 -52s-13.333 -34 -20 -48c-12.667 -27.333 -28.333 -41 -47 -41c-6.66699 0.666992 -10.333 2 -11 4s0 4.33301 2 7c2.66992 2 6.33594 6.66699 11 14c4.66992 7.33301 9.33594 14.333 14 21 c4.66699 6.66699 7 14.667 7 24c0 4.66699 -1 10.333 -3 17s-5.66699 14 -11 22s-12.333 12 -21 12c-6.66699 0 -13.333 -2 -20 -6s-12.333 -9.66699 -17 -17c-8 -15.333 -12 -31.333 -12 -48c0 -20.667 5 -38.667 15 -54c12.667 -19.333 31.334 -29 56 -29 c26 0 51.333 14.333 76 43c14 16 27.667 37 41 63c16.6699 32 34 75.667 52 131c22 68.667 39 137.333 51 206h85v40h-77c2.66992 10 7.33008 26.667 14 50s12.3301 41 17 53c10 22 19.6699 36.333 29 43c9.33008 6.66309 20.6699 9.33008 34 8c12 -2 18 -7.33301 18 -16 l-14 -10c-10 -6.66699 -17.3301 -14.667 -22 -24s-7 -20 -7 -32c1.33008 -7.33301 3.33008 -14 6 -20s7 -9.66699 13 -11c6.66992 -0.666992 12.3301 -0.666992 17 0s9 2.66699 13 6c9.33008 8 15.3301 15 18 21c6 12 9.66992 21.333 11 28c1.33008 6.66602 2 17.333 2 32 l-4 16c-1.33008 6 -4.33008 12.333 -9 19c-6.66992 8.66699 -13 14 -19 16s-13.6699 3 -23 3c-27.3301 0 -52.3301 -8 -75 -24s-44.3301 -39 -65 -69c-7.33008 -11.333 -14.6699 -26 -22 -44c-4.66992 -10.667 -10.6699 -26.333 -18 -47h-148 c5.09961 19.1211 24.0859 87.2217 31 105c10 22 19.667 36.333 29 43c9.33301 6.66309 20.667 9.33008 34 8c12 -2 18 -7.33301 18 -16l-14 -10c-17.6748 -11.7842 -29 -28.7197 -29 -56c2.43359 -13.3877 6.39355 -28.1992 19 -31c6.66699 -0.666992 12.333 -0.666992 17 0 c13.6172 1.94629 27.8623 19.9404 31 27c12 23.9932 13 26.8613 13 60l-4 16c-5.40039 24.3262 -22.6816 38 -51 38c-27.333 0 -52.333 -8 -75 -24s-44.334 -39 -65 -69c-17.043 -26.3389 -26.5713 -53.1533 -40 -91h-146c21 104 51 156 88 156c13 0 19 -5 24 -14 c0 -4 -2 -6 -6 -6c-17 -10 -35 -36 -35 -62c2 -21 11 -32 27 -32c32 6 51 37 51 74c0 34 -15 70 -49 70c-45 0 -83 -18 -114 -54c-33 -39 -57 -83 -72 -132h-144c21 104 51 156 88 156c12 0 19 -4 23 -14c0 -4 -2 -6 -5 -6c-19 -11 -37 -33 -37 -62c2 -21 12 -32 30 -32 c17 5 29 13 37 25c9 16 13 33 13 51c-2 35 -13 66 -49 66c-100 0 -162 -98 -185 -182h-144c7 39 18 74 32 106s32 48 55 48c7 0 13 -2 18 -5l6 -9c0 -4 -2 -6 -5 -6c-20 -9 -37 -35 -37 -62c2 -21 12 -32 29 -32c31 6 50 38 50 76c0 36 -16 66 -49 66c-30 0 -58 -8 -83 -25 c-25 -19 -46 -42 -63 -70c-17 -27 -31 -56 -40 -89h-69v-38h57c-3 -12 -6 -25 -9 -38c-16 -78 -33 -156 -50 -233l-15 -53c-11 -25 -19 -56 -37 -71c-9 -10 -19 -15 -30 -15c-7 0 -10 2 -10 7l14 19l14 23c4 7 6 15 6 23c0 23 -15 49 -38 49c-33 -12 -41 -28 -46 -67l5 -33 c12 -30 28 -54 63 -54l19 2c40 10 77 51 110 123c31 63 80 233 93 318h141c-19.2275 -90.2256 -37.5762 -182.244 -59 -271c-21 -93 -48 -139 -82 -139c-6 0 -9 2 -9 7c21 29 32 50 32 65c0 19.9492 -8.1543 39.0615 -23 45c-3 3 -8 4 -14 4c-27 -14 -45 -28 -45 -67 c0 -47 23 -87 67 -87l18 2c27 7 48 22 65 44s32 48 47 79c33 62 79 229 93 318h140l-18 -86c-14 -62 -27 -123 -41 -185c-10 -37 -20 -65 -33 -97c-13 -28 -29 -42 -48 -42c-7 0 -10 2 -10 7c5 9 6 11 13 21l10 15c5 8 9 23 9 31c-1 24 -13 47 -36 47 c-31 -10 -42 -30 -46 -67c0 -12 2 -23 6 -33c9 -31 27 -54 62 -54l18 2c25 8 45 23 61 44c19 24 35 51 50 79c27 56 48 122 66 197c11 37 19 77 26 121h143c-19.3359 -89.6641 -37.2939 -180.706 -58 -269c-3.33301 -16.667 -8.33301 -34 -15 -52 c-12.7793 -34.5 -31.9248 -89 -67 -89c-10.3379 1.03418 -14.5215 3.6377 -9 11c2.66992 2 6.33594 6.66699 11 14c8.39844 13.1865 21 24.8867 21 45c0 20.0781 -13.6143 51 -35 51c-33.6904 0 -49 -39.1777 -49 -71c0 -46.3174 26.3828 -83 71 -83 c52.6982 0 93.3428 59.8682 117 106c42.9395 82.4414 83.9863 228.195 103 337h144z"/>
+      <path d="M983 220l-44 -208l-14 -61c-3.33301 -16.667 -8.33301 -34 -15 -52s-13.333 -34 -20 -48c-12.667 -27.333 -28.333 -41 -47 -41c-6.66699 0.667007 -10.333 2 -11 4s0 4.33299 2 7c2.66998 2 6.336 6.66701 11 14c4.66998 7.33299 9.336 14.333 14 21 c4.66699 6.66701 7 14.667 7 24c0 4.667 -1 10.333 -3 17s-5.66699 14 -11 22s-12.333 12 -21 12c-6.66699 0 -13.333 -2 -20 -6s-12.333 -9.667 -17 -17c-8 -15.333 -12 -31.333 -12 -48c0 -20.667 5 -38.667 15 -54c12.667 -19.333 31.334 -29 56 -29 c26 0 51.333 14.333 76 43c14 16 27.667 37 41 63c16.67 32 34 75.667 52 131c22 68.667 39 137.333 51 206h85v40h-77c2.67004 10 7.32996 26.667 14 50s12.33 41 17 53c10 22 19.67 36.333 29 43c9.32996 6.66299 20.67 9.32999 34 8c12 -2 18 -7.33301 18 -16l-14 -10 c-10 -6.66699 -17.33 -14.667 -22 -24s-7 -20 -7 -32c1.32996 -7.33301 3.32996 -14 6 -20s7 -9.66699 13 -11c6.67004 -0.666992 12.33 -0.666992 17 0s9 2.66699 13 6c9.32996 8 15.33 15 18 21c6 12 9.67004 21.333 11 28c1.32996 6.66599 2 17.333 2 32l-4 16 c-1.32996 6 -4.32996 12.333 -9 19c-6.67004 8.66699 -13 14 -19 16s-13.67 3 -23 3c-27.33 0 -52.33 -8 -75 -24s-44.33 -39 -65 -69c-7.32996 -11.333 -14.67 -26 -22 -44c-4.66998 -10.667 -10.67 -26.333 -18 -47h-148c5.09998 19.121 24.086 87.222 31 105 c10 22 19.667 36.333 29 43c9.33301 6.66299 20.667 9.32999 34 8c12 -2 18 -7.33301 18 -16l-14 -10c-17.675 -11.784 -29 -28.72 -29 -56c2.43402 -13.388 6.39398 -28.199 19 -31c6.66699 -0.666992 12.333 -0.666992 17 0c13.617 1.94601 27.862 19.94 31 27 c12 23.993 13 26.861 13 60l-4 16c-5.40002 24.326 -22.682 38 -51 38c-27.333 0 -52.333 -8 -75 -24s-44.334 -39 -65 -69c-17.043 -26.339 -26.571 -53.153 -40 -91h-146c21 104 51 156 88 156c13 0 19 -5 24 -14c0 -4 -2 -6 -6 -6c-17 -10 -35 -36 -35 -62 c2 -21 11 -32 27 -32c32 6 51 37 51 74c0 34 -15 70 -49 70c-45 0 -83 -18 -114 -54c-33 -39 -57 -83 -72 -132h-144c21 104 51 156 88 156c12 0 19 -4 23 -14c0 -4 -2 -6 -5 -6c-19 -11 -37 -33 -37 -62c2 -21 12 -32 30 -32c17 5 29 13 37 25c9 16 13 33 13 51 c-2 35 -13 66 -49 66c-100 0 -162 -98 -185 -182h-144c7 39 18 74 32 106s32 48 55 48c7 0 13 -2 18 -5l6 -9c0 -4 -2 -6 -5 -6c-20 -9 -37 -35 -37 -62c2 -21 12 -32 29 -32c31 6 50 38 50 76c0 36 -16 66 -49 66c-30 0 -58 -8 -83 -25c-25 -19 -46 -42 -63 -70 c-17 -27 -31 -56 -40 -89h-69v-38h57c-3 -12 -6 -25 -9 -38c-16 -78 -33 -156 -50 -233l-15 -53c-11 -25 -19 -56 -37 -71c-9 -10 -19 -15 -30 -15c-7 0 -10 2 -10 7l14 19l14 23c4 7 6 15 6 23c0 23 -15 49 -38 49c-33 -12 -41 -28 -46 -67l5 -33c12 -30 28 -54 63 -54 l19 2c40 10 77 51 110 123c31 63 80 233 93 318h141c-19.228 -90.226 -37.576 -182.244 -59 -271c-21 -93 -48 -139 -82 -139c-6 0 -9 2 -9 7c21 29 32 50 32 65c0 19.9492 -8.15401 39.0615 -23 45c-3 3 -8 4 -14 4c-27 -14 -45 -28 -45 -67c0 -47 23 -87 67 -87l18 2 c27 7 48 22 65 44s32 48 47 79c33 62 79 229 93 318h140l-18 -86c-14 -62 -27 -123 -41 -185c-10 -37 -20 -65 -33 -97c-13 -28 -29 -42 -48 -42c-7 0 -10 2 -10 7c5 9 6 11 13 21l10 15c5 8 9 23 9 31c-1 24 -13 47 -36 47c-31 -10 -42 -30 -46 -67c0 -12 2 -23 6 -33 c9 -31 27 -54 62 -54l18 2c25 8 45 23 61 44c19 24 35 51 50 79c27 56 48 122 66 197c11 37 19 77 26 121h143c-19.336 -89.664 -37.294 -180.706 -58 -269c-3.33301 -16.667 -8.33301 -34 -15 -52c-12.779 -34.5 -31.925 -89 -67 -89c-10.338 1.034 -14.521 3.638 -9 11 c2.66998 2 6.336 6.66701 11 14c8.39801 13.187 21 24.887 21 45c0 20.0781 -13.614 51 -35 51c-33.69 0 -49 -39.178 -49 -71c0 -46.317 26.383 -83 71 -83c52.698 0 93.343 59.868 117 106c42.939 82.4414 83.986 228.195 103 337h144z"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E567-ornamentTurn.xml b/data/Leipzig/E567-ornamentTurn.xml
index 409fcfa968c..8fc2883485e 100644
--- a/data/Leipzig/E567-ornamentTurn.xml
+++ b/data/Leipzig/E567-ornamentTurn.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="468">
    <g transform="scale(1,-1)">
-      <path d="M468 118c0 -69.3555 -37.5137 -116.042 -106 -118c-22.667 0 -43.667 5 -63 15c-20.6025 12.6768 -44.791 32.0508 -64 49c-22.5615 23.7725 -45.8135 46.8535 -69 70c-16 14 -31 25 -45 33s-26.333 12.333 -37 13c-19.7578 0 -27.7188 -13.5625 -37 -28l-12 -26 c-3.33301 -9.33301 -5 -15.667 -5 -19v-8c0 -28.667 13.333 -43 40 -43l9 2l11 9l7 7c6.44727 4.0293 14.1514 8 24 8c17.333 0 28.333 -9.33301 33 -28c0 -34.1875 -26.7715 -52.5801 -58 -54c-22.8301 0 -25.7109 -0.339844 -41 8c-32.9814 13.582 -55 53.5781 -55 97 c0 50.4512 20.6279 86.7627 49 114c18 14.667 36.333 23 55 25c26 0 51 -7 75 -21c8.66699 -5.33301 14.667 -9 18 -11l18 -15c8.6377 -7.19727 25.2402 -22.1328 33 -31l65 -67l10 -9l22 -16c13.333 -7.33301 25.667 -11 37 -11c37.1016 0 55 35.8711 55 70 c0 27.96 -11.9707 55 -39 55c-6.35352 -2.11914 -10.6914 -4.79395 -17 -9l-18 -13c-3.33301 -2.66699 -9.33301 -4 -18 -4c-19.4512 0 -29.6758 17.2402 -32 37c0 28.0508 28.2852 41.7129 58 44c43.4932 0 69.7324 -31.4678 85 -62c8.66699 -17.333 12.667 -38.333 12 -63 z"/>
+      <path d="M468 118c0 -69.3555 -37.514 -116.042 -106 -118c-22.667 0 -43.667 5 -63 15c-20.603 12.6768 -44.791 32.0508 -64 49c-22.562 23.7725 -45.813 46.854 -69 70c-16 14 -31 25 -45 33s-26.333 12.333 -37 13c-19.7578 0 -27.7188 -13.562 -37 -28l-12 -26 c-3.333 -9.333 -5 -15.667 -5 -19v-8c0 -28.667 13.333 -43 40 -43l9 2l11 9l7 7c6.447 4.0293 14.151 8 24 8c17.333 0 28.333 -9.333 33 -28c0 -34.1875 -26.771 -52.5801 -58 -54c-22.8301 0 -25.7109 -0.339844 -41 8c-32.9814 13.582 -55 53.5781 -55 97 c0 50.451 20.6279 86.763 49 114c18 14.667 36.333 23 55 25c26 0 51 -7 75 -21c8.66701 -5.33299 14.667 -9 18 -11l18 -15c8.638 -7.19701 25.24 -22.133 33 -31l65 -67l10 -9l22 -16c13.333 -7.333 25.667 -11 37 -11c37.102 0 55 35.8711 55 70 c0 27.96 -11.971 55 -39 55c-6.354 -2.119 -10.691 -4.79401 -17 -9l-18 -13c-3.33301 -2.66701 -9.33301 -4 -18 -4c-19.451 0 -29.676 17.24 -32 37c0 28.051 28.285 41.713 58 44c43.493 0 69.732 -31.468 85 -62c8.66699 -17.333 12.667 -38.333 12 -63z"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E568-ornamentTurnInverted.xml b/data/Leipzig/E568-ornamentTurnInverted.xml
index 6f6550210fb..fbd88327cf2 100644
--- a/data/Leipzig/E568-ornamentTurnInverted.xml
+++ b/data/Leipzig/E568-ornamentTurnInverted.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="468">
    <g transform="scale(1,-1)">
-      <path d="M468 126c0 69.3552 -37.5141 116.042 -106 118c-22.667 0 -43.667 -5 -63 -15c-20.6022 -12.677 -44.7915 -32.0508 -64 -49c-22.5612 -23.7722 -45.8135 -46.8532 -69 -70c-16 -14 -31 -25 -45 -33s-26.333 -12.333 -37 -13c-19.7583 0 -27.7186 13.5628 -37 28l-12 26 c-3.33301 9.33301 -5 15.667 -5 19v8c0 28.667 13.333 43 40 43l9 -2l11 -9l7 -7c6.44738 -4.02962 14.1511 -8 24 -8c17.333 0 28.333 9.33301 33 28c0 34.1871 -26.7713 52.5798 -58 54c-22.8296 0 -25.7106 0.340012 -41 -8c-32.9816 -13.582 -55 -53.5782 -55 -97 c0 -50.4509 20.6276 -86.763 49 -114c18 -14.667 36.333 -23 55 -25c26 0 51 7 75 21c8.66699 5.33301 14.667 9 18 11l18 15c8.6378 7.19746 25.2402 22.1328 33 31l65 67l10 9l22 16c13.333 7.33301 25.667 11 37 11c37.1011 0 55 -35.8714 55 -70 c0 -27.9599 -11.9702 -55 -39 -55c-6.35306 2.11872 -10.691 4.79351 -17 9l-18 13c-3.33301 2.66699 -9.33301 4 -18 4c-19.4508 0 -29.6758 -17.2405 -32 -37c0 -28.051 28.2854 -41.7132 58 -44c43.4935 0 69.7328 31.4674 85 62c8.66699 17.333 12.667 38.333 12 63z "/>
+      <path d="M468 126c0 69.355 -37.514 116.042 -106 118c-22.667 0 -43.667 -5 -63 -15c-20.602 -12.677 -44.791 -32.051 -64 -49c-22.561 -23.772 -45.814 -46.853 -69 -70c-16 -14 -31 -25 -45 -33s-26.333 -12.333 -37 -13c-19.7583 0 -27.7186 13.5628 -37 28l-12 26 c-3.333 9.333 -5 15.667 -5 19v8c0 28.667 13.333 43 40 43l9 -2l11 -9l7 -7c6.447 -4.03 14.151 -8 24 -8c17.333 0 28.333 9.33299 33 28c0 34.187 -26.771 52.58 -58 54c-22.8296 0 -25.7106 0.339996 -41 -8c-32.9816 -13.582 -55 -53.578 -55 -97 c0 -50.4509 20.6276 -86.763 49 -114c18 -14.667 36.333 -23 55 -25c26 0 51 7 75 21c8.66701 5.333 14.667 9 18 11l18 15c8.638 7.1975 25.24 22.1328 33 31l65 67l10 9l22 16c13.333 7.33299 25.667 11 37 11c37.101 0 55 -35.871 55 -70c0 -27.9599 -11.97 -55 -39 -55 c-6.353 2.1187 -10.691 4.7935 -17 9l-18 13c-3.33301 2.667 -9.33301 4 -18 4c-19.451 0 -29.676 -17.2405 -32 -37c0 -28.051 28.285 -41.7132 58 -44c43.494 0 69.733 31.4674 85 62c8.66699 17.333 12.667 38.333 12 63z"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E56A-ornamentTurnUp.xml b/data/Leipzig/E56A-ornamentTurnUp.xml
index 5080ed5688a..0757374e0f7 100644
--- a/data/Leipzig/E56A-ornamentTurnUp.xml
+++ b/data/Leipzig/E56A-ornamentTurnUp.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="248">
    <g transform="scale(1,-1)">
-      <path d="M126 468c69.3555 0 116.042 -37.5137 118 -106c0 -22.667 -5 -43.667 -15 -63c-12.6768 -20.6025 -32.0508 -44.791 -49 -64c-23.7725 -22.5615 -46.8535 -45.8135 -70 -69c-14 -16 -25 -31 -33 -45s-12.333 -26.333 -13 -37c0 -19.7578 13.5625 -27.7188 28 -37l26 -12 c9.33301 -3.33301 15.667 -5 19 -5h8c28.667 0 43 13.333 43 40l-2 9l-9 11l-7 7c-4.0293 6.44727 -8 14.1514 -8 24c0 17.333 9.33301 28.333 28 33c34.1875 0 52.5801 -26.7715 54 -58c0 -22.8301 0.339844 -25.7109 -8 -41c-13.582 -32.9814 -53.5781 -55 -97 -55 c-50.4512 0 -86.7627 20.6279 -114 49c-14.667 18 -23 36.333 -25 55c0 26 7 51 21 75c5.33301 8.66699 9 14.667 11 18l15 18c7.19727 8.6377 22.1328 25.2402 31 33l67 65l9 10l16 22c7.33301 13.333 11 25.667 11 37c0 37.1016 -35.8711 55 -70 55 c-27.96 0 -55 -11.9707 -55 -39c2.11914 -6.35352 4.79395 -10.6914 9 -17l13 -18c2.66699 -3.33301 4 -9.33301 4 -18c0 -19.4512 -17.2402 -29.6758 -37 -32c-28.0508 0 -41.7129 28.2852 -44 58c0 43.4932 31.4678 69.7324 62 85c17.333 8.66699 38.333 12.667 63 12z "/>
+      <path d="M126 468c69.355 0 116.042 -37.514 118 -106c0 -22.667 -5 -43.667 -15 -63c-12.677 -20.603 -32.051 -44.791 -49 -64c-23.772 -22.562 -46.854 -45.813 -70 -69c-14 -16 -25 -31 -33 -45s-12.333 -26.333 -13 -37c0 -19.7578 13.5625 -27.7188 28 -37l26 -12 c9.333 -3.333 15.667 -5 19 -5h8c28.667 0 43 13.333 43 40l-2 9l-9 11l-7 7c-4.02901 6.447 -8 14.151 -8 24c0 17.333 9.33299 28.333 28 33c34.188 0 52.58 -26.771 54 -58c0 -22.8301 0.339996 -25.7109 -8 -41c-13.582 -32.9814 -53.578 -55 -97 -55 c-50.4512 0 -86.7627 20.6279 -114 49c-14.667 18 -23 36.333 -25 55c0 26 7 51 21 75c5.333 8.66701 9 14.667 11 18l15 18c7.1973 8.638 22.1328 25.24 31 33l67 65l9 10l16 22c7.33299 13.333 11 25.667 11 37c0 37.102 -35.871 55 -70 55c-27.96 0 -55 -11.971 -55 -39 c2.1191 -6.354 4.7939 -10.691 9 -17l13 -18c2.667 -3.33301 4 -9.33301 4 -18c0 -19.451 -17.2402 -29.676 -37 -32c-28.0508 0 -41.7129 28.285 -44 58c0 43.493 31.4678 69.732 62 85c17.333 8.66699 38.333 12.667 63 12z"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E56B-ornamentTurnUpS.xml b/data/Leipzig/E56B-ornamentTurnUpS.xml
index 2e7912f4e19..01b3c36be21 100644
--- a/data/Leipzig/E56B-ornamentTurnUpS.xml
+++ b/data/Leipzig/E56B-ornamentTurnUpS.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="248">
    <g transform="scale(1,-1)">
-      <path d="M118 468c-69.3555 0 -116.042 -37.5137 -118 -106c0 -22.667 5 -43.667 15 -63c12.6768 -20.6025 32.0508 -44.791 49 -64c23.7725 -22.5615 46.8535 -45.8135 70 -69c14 -16 25 -31 33 -45s12.333 -26.333 13 -37c0 -19.7578 -13.5625 -27.7188 -28 -37l-26 -12 c-9.33301 -3.33301 -15.667 -5 -19 -5h-8c-28.667 0 -43 13.333 -43 40l2 9l9 11l7 7c4.0293 6.44727 8 14.1514 8 24c0 17.333 -9.33301 28.333 -28 33c-34.1875 0 -52.5801 -26.7715 -54 -58c0 -22.8301 -0.339844 -25.7109 8 -41c13.582 -32.9814 53.5781 -55 97 -55 c50.4512 0 86.7627 20.6279 114 49c14.667 18 23 36.333 25 55c0 26 -7 51 -21 75c-5.33301 8.66699 -9 14.667 -11 18l-15 18c-7.19727 8.6377 -22.1328 25.2402 -31 33l-67 65l-9 10l-16 22c-7.33301 13.333 -11 25.667 -11 37c0 37.1016 35.8711 55 70 55 c27.96 0 55 -11.9707 55 -39c-2.11914 -6.35352 -4.79395 -10.6914 -9 -17l-13 -18c-2.66699 -3.33301 -4 -9.33301 -4 -18c0 -19.4512 17.2402 -29.6758 37 -32c28.0508 0 41.7129 28.2852 44 58c0 43.4932 -31.4678 69.7324 -62 85c-17.333 8.66699 -38.333 12.667 -63 12 z"/>
+      <path d="M118 468c-69.3555 0 -116.042 -37.514 -118 -106c0 -22.667 5 -43.667 15 -63c12.6768 -20.603 32.0508 -44.791 49 -64c23.7725 -22.562 46.854 -45.813 70 -69c14 -16 25 -31 33 -45s12.333 -26.333 13 -37c0 -19.7578 -13.562 -27.7188 -28 -37l-26 -12 c-9.333 -3.333 -15.667 -5 -19 -5h-8c-28.667 0 -43 13.333 -43 40l2 9l9 11l7 7c4.0293 6.447 8 14.151 8 24c0 17.333 -9.333 28.333 -28 33c-34.1875 0 -52.5801 -26.771 -54 -58c0 -22.8301 -0.339844 -25.7109 8 -41c13.582 -32.9814 53.5781 -55 97 -55 c50.451 0 86.763 20.6279 114 49c14.667 18 23 36.333 25 55c0 26 -7 51 -21 75c-5.33299 8.66701 -9 14.667 -11 18l-15 18c-7.19701 8.638 -22.133 25.24 -31 33l-67 65l-9 10l-16 22c-7.333 13.333 -11 25.667 -11 37c0 37.102 35.8711 55 70 55 c27.96 0 55 -11.971 55 -39c-2.119 -6.354 -4.79401 -10.691 -9 -17l-13 -18c-2.66701 -3.33301 -4 -9.33301 -4 -18c0 -19.451 17.24 -29.676 37 -32c28.051 0 41.713 28.285 44 58c0 43.493 -31.468 69.732 -62 85c-17.333 8.66699 -38.333 12.667 -63 12z"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E56E-ornamentTremblement.xml b/data/Leipzig/E56E-ornamentTremblement.xml
index 3665869dfe4..93b0ffb1499 100644
--- a/data/Leipzig/E56E-ornamentTremblement.xml
+++ b/data/Leipzig/E56E-ornamentTremblement.xml
@@ -3,6 +3,6 @@
         overflow="inherit"
         horiz-adv-x="711">
    <g transform="scale(1,-1)">
-      <path d="M710 134l-109 -127c-2.66669 -3.33333 -5 -5.33333 -7 -6l-6 -2c-5.35107 2 -8.68439 3.66667 -10 5l-89 78c-4.67035 4.66666 -10.337 7.33334 -17 8c-4 -1.33334 -6.66666 -2.66666 -8 -4l-66 -79c-3.33334 -5.33333 -7.66666 -8 -13 -8l-11 5l-89 78 c-6 4.66666 -11.3333 7.33334 -16 8c-4 -1.33334 -6.66666 -2.66666 -8 -4l-67 -79c-5.33333 -5.33333 -10 -8 -14 -8c-2 0 -5.33333 1.66667 -10 5l-88 78c-5.33334 4.66666 -11 7.33334 -17 8c-4.66667 -1.33334 -7.33333 -2.66666 -8 -4l-57 -68v49l108 127l10 4 c0.666664 0 2 -0.333328 4 -1s6 -3 12 -7l88 -78l10 -5c4 0 8.66667 2.66666 14 8l67 79c3.33334 2.66667 6 4 8 4c4.66666 0 10 -2.66667 16 -8l89 -78l11 -5l6 1l7 7l67 79c3.33331 2.66667 5.66669 4 7 4c4 -1.33371 6.66669 -2.66704 8 -4l7 -6l89 -77 c3.33331 -3.33334 7 -5 11 -5s8.33331 2.66666 13 8l58 67v-47z"/>
+      <path d="M710 134l-109 -127c-2.66699 -3.33333 -5 -5.33333 -7 -6l-6 -2c-5.35101 2 -8.68402 3.66667 -10 5l-89 78c-4.67001 4.6667 -10.337 7.3333 -17 8c-4 -1.3333 -6.66699 -2.6667 -8 -4l-66 -79c-3.33301 -5.33333 -7.66699 -8 -13 -8l-11 5l-89 78 c-6 4.6667 -11.333 7.3333 -16 8c-4 -1.3333 -6.66699 -2.6667 -8 -4l-67 -79c-5.33299 -5.33333 -10 -8 -14 -8c-2 0 -5.33299 1.66667 -10 5l-88 78c-5.3333 4.6667 -11 7.3333 -17 8c-4.6667 -1.3333 -7.3333 -2.6667 -8 -4l-57 -68v49l108 127l10 4 c0.667 0 2 -0.332993 4 -1s6 -3 12 -7l88 -78l10 -5c4 0 8.66701 2.667 14 8l67 79c3.33301 2.66701 6 4 8 4c4.66699 0 10 -2.66701 16 -8l89 -78l11 -5l6 1l7 7l67 79c3.33301 2.66701 5.66699 4 7 4c4 -1.334 6.66699 -2.66701 8 -4l7 -6l89 -77 c3.33301 -3.333 7 -5 11 -5s8.33301 2.667 13 8l58 67v-47z"/>
    </g>
 </symbol>
diff --git a/data/Leipzig/E901-mensuralGclefPetrucci.xml b/data/Leipzig/E901-mensuralGclefPetrucci.xml
new file mode 100644
index 00000000000..d9d8c956684
--- /dev/null
+++ b/data/Leipzig/E901-mensuralGclefPetrucci.xml
@@ -0,0 +1,8 @@
+<symbol id="E901"
+        viewBox="0 0 1000 1000"
+        overflow="inherit"
+        horiz-adv-x="596">
+   <g transform="scale(1,-1)">
+      <path d="M183 747c13.334 7.33301 27.667 11.333 43 12c15.334 0.666992 29.667 -1.33301 43 -6s24.333 -12.667 33 -24c8.66699 -11.3389 14.333 -23.6719 17 -37c2.66699 -16 -1.66699 -36 -13 -60s-25 -42 -41 -54c-8.66699 -6.66699 -14.667 -12.667 -18 -18 s-5.33301 -12 -6 -20c0 -5.33301 1 -10 3 -14s4.33301 -6.66699 7 -8c2.66699 -1.33691 7.66699 -6.00391 15 -14c7.33496 -8 14.668 -17 22 -27c13.333 -16.668 21.333 -29.334 24 -38c2.66699 -8.66699 5.33301 -24.667 8 -48c2 -30.667 1.33301 -52.334 -2 -65 c-3.33301 -12.667 -12.667 -27.334 -28 -44c-8.66797 -10 -14.335 -18.333 -17 -25c-2.66699 -6.66699 -4 -13.333 -4 -20c1.33301 -12.667 8.33301 -21.667 21 -27s34.667 -8 66 -8c22 0 37.333 1 46 3c8.66699 1.33301 17.667 5 27 11l20 14l-12 -17 c-8 -11.333 -10.667 -22.667 -8 -34l3 -17h-136c-32.667 0 -57.667 -0.333008 -75 -1s-33.667 -1.33301 -49 -2s-27.333 -3 -36 -7c-8.66797 -4 -16.334 -8 -23 -12c-6.66797 -4 -14.334 -10.667 -23 -20c-21.333 -20 -35.333 -45.667 -42 -77s-5.66699 -63 3 -95 c4.66699 -17.333 13.334 -33.333 26 -48c12.667 -14.667 27.333 -26.667 44 -36s35 -17 55 -23s40.333 -8 61 -6s40.333 6.66699 59 14c20.667 8.66602 35.333 19.333 44 32s14.667 32 18 58c2 18 2.33301 31.333 1 40s-5 19.667 -11 33c-8 16 -17.667 28.667 -29 38 s-21 12.667 -29 10c-4 -2 -6.33301 -5.33301 -7 -10s-0.666992 -12.333 0 -23c2.66699 -17.333 0.333008 -35.333 -7 -54s-17.333 -32.333 -30 -41s-26 -13 -40 -13c-12 0 -27.333 5 -46 15s-31.667 22 -39 36c-12 24 -12.667 47.667 -2 71s30.333 41.667 59 55 c16 8 32 12 48 12s38.667 -3.33301 68 -10c26.667 -6 47 -15 61 -27s26 -31.667 36 -59c5.33301 -13.333 8.33301 -24 9 -32c0.658203 -8 -0.674805 -21 -4 -39c-3.33301 -18 -7 -30.667 -11 -38s-11.333 -15.667 -22 -25c-16.667 -14.667 -36.667 -27.667 -60 -39 c-16 -8 -29 -12.667 -39 -14c-10 -1.33105 -28 -1.66406 -54 -1c-51.333 2.66699 -93.333 13 -126 31s-58.667 46 -78 84c-11.333 22.667 -17.333 43.667 -18 63s4 42.333 14 69c13.333 35.333 29.333 62 48 80s46 32.667 82 44c16.667 5.33301 34.333 13.333 53 24 s32 21 40 31c10 10.667 22 28 36 52c10 16.667 16 29 18 37s2.33301 23.333 1 46c-2 30.667 -8.33301 54 -19 70c-9.33301 14 -21.667 26.333 -37 37s-29 16 -41 16s-26 -9.33301 -42 -28s-27 -37.667 -33 -57c-4 -14.667 -5.33301 -27.667 -4 -39 c1.33301 -15.333 6.33301 -34 15 -56c0.666992 -2.66699 0 -6.66699 -2 -12s-4.66699 -10.333 -8 -15c-8.66797 -10 -16.668 -13.333 -24 -10c-7.33398 3.33301 -16.667 15 -28 35c-16.667 28.667 -19.333 57.667 -8 87c4 10 16 24.667 36 44s37.333 33 52 41 c6.66699 4 11.333 8.33301 14 13s4 11.333 4 20c0 14.6709 -2 23.3379 -6 26c-6 3.33301 -13 15.667 -21 37s-12.333 38 -13 50c0 22.667 5.33301 42.334 16 59c10.667 16.6699 28 31.3359 52 44zM277 715c-8.66699 8.66699 -21.667 13.667 -39 15s-33.333 -0.333008 -48 -5 c-11.333 -5.33301 -20.667 -13.333 -28 -24s-11.333 -22 -12 -34s0 -24 2 -36s7.33301 -22.333 16 -31s19 -14 31 -16c17.334 -3.31543 31.667 -2.64941 43 2c11.333 4.66699 22.333 14.667 33 30c8.66699 12 14 21.333 16 28c2 6.67188 2.33301 16.3379 1 29 c-0.680664 8.66699 -2.34668 17 -5 25c-2.66699 8 -6 13.667 -10 17zM233 59c-7.33301 5.33301 -19 8.33301 -35 9s-27.333 -0.666992 -34 -4c-6.66699 -4.66699 -12 -12.667 -16 -24s-6 -24 -6 -38c0 -11.333 1.33301 -20 4 -26c0.666992 -2.66699 6 -9.66699 16 -21 c8.66699 -10 20.667 -16.333 36 -19c12.667 -2 24 0.333008 34 7s16.667 16.667 20 30c3.33301 14 3 30.333 -1 49s-10 31 -18 37z"/>
+   </g>
+</symbol>
diff --git a/data/Leipzig/E904-mensuralFclefPetrucci.xml b/data/Leipzig/E904-mensuralFclefPetrucci.xml
new file mode 100644
index 00000000000..00ae58f9e5f
--- /dev/null
+++ b/data/Leipzig/E904-mensuralFclefPetrucci.xml
@@ -0,0 +1,8 @@
+<symbol id="E904"
+        viewBox="0 0 1000 1000"
+        overflow="inherit"
+        horiz-adv-x="677">
+   <g transform="scale(1,-1)">
+      <path d="M337 -808h-25v693h-287v-93h-25v417h25v-86h287v86h25v-1017zM312 -50v108h-287v-108h287zM518 -290l30 10v-603h-30v593zM535 325l142 -178l-142 -178l-144 178zM508 249l-54 -67l112 -138l52 66zM535 37l142 -178l-142 -178l-144 178zM508 -39l-54 -67l112 -138l52 66z "/>
+   </g>
+</symbol>
diff --git a/data/Leipzig/E909-mensuralCclefPetrucciPosMiddle.xml b/data/Leipzig/E909-mensuralCclefPetrucciPosMiddle.xml
new file mode 100644
index 00000000000..87ec6d99729
--- /dev/null
+++ b/data/Leipzig/E909-mensuralCclefPetrucciPosMiddle.xml
@@ -0,0 +1,8 @@
+<symbol id="E909"
+        viewBox="0 0 1000 1000"
+        overflow="inherit"
+        horiz-adv-x="309">
+   <g transform="scale(1,-1)">
+      <path d="M0 595h28v-242h252v242h29v-531h-281v-128h281v-538h-29v247h-252v-247h-28v1197zM280 255h-252v-91h252v91zM280 -172h-252v-91h252v91z"/>
+   </g>
+</symbol>
diff --git a/fonts/Leipzig-5.2.sfd b/fonts/Leipzig-5.2.sfd
index 5f040880a9a..467efa0d2eb 100644
--- a/fonts/Leipzig-5.2.sfd
+++ b/fonts/Leipzig-5.2.sfd
@@ -4,7 +4,7 @@ FullName: Leipzig
 FamilyName: Leipzig
 Weight: Regular
 Copyright: Created by Etienne Darbellay, Jean-Francois Marti and Laurent Pugin. \nThis font is licensed under the SIL Open Font License \\(http://scripts.sil.org/OFL\\).\nVersion 5.2.1
-UComments: "2014-03-21: Created.+AAoA-Version 5.2.0 - adding glyphs (dynamics, ornaments, mensural note heads, etc)+AAoA-Version 5.2.1 - adding repeats+AAoA-Version 5.2.2 - fixing size of some glpyhs+AAoA" 
+UComments: "2014-03-21: Created.+AAoA-Version 5.2.0 - adding glyphs (dynamics, ornaments, mensural note heads, etc)+AAoA-Version 5.2.1 - adding repeats+AAoA-Version 5.2.2 - fixing size of some glpyhs+AAoA-Version 5.2.3 - adding mensural clefs" 
 Version: 5.2.1
 ItalicAngle: 0
 UnderlinePosition: -50
@@ -20,7 +20,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1395388130
-ModificationTime: 1440762871
+ModificationTime: 1442493779
 PfmFamily: 17
 TTFWeight: 500
 TTFWidth: 5
@@ -49,11 +49,11 @@ NameList: Adobe Glyph List
 DisplaySize: -72
 AntiAlias: 1
 FitToEm: 1
-WinInfo: 57510 18 9
+WinInfo: 59580 18 9
 BeginPrivate: 0
 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: 1114115 114
+BeginChars: 1114115 117
 
 StartChar: uniE0A3
 Encoding: 57507 57507 0
@@ -4302,7 +4302,7 @@ StartChar: uniE500
 Encoding: 58624 58624 79
 Width: 508
 VWidth: 2048
-Flags: HWO
+Flags: HW
 LayerCount: 2
 Fore
 SplineSet
@@ -5504,7 +5504,7 @@ StartChar: uniE101
 Encoding: 57601 57601 111
 Width: 508
 VWidth: 2048
-Flags: HWO
+Flags: HW
 LayerCount: 2
 Fore
 SplineSet
@@ -5603,5 +5603,232 @@ SplineSet
  1092.67 -146 1087.67 -135 1087 -121 c 0
 EndSplineSet
 EndChar
+
+StartChar: uniE901
+Encoding: 59649 59649 114
+Width: 596
+VWidth: 2048
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+183 747 m 4
+ 196.334 754.333 210.667 758.333 226 759 c 132
+ 241.334 759.667 255.667 757.667 269 753 c 132
+ 282.333 748.333 293.333 740.333 302 729 c 132
+ 310.667 717.661 316.333 705.328 319 692 c 4
+ 321.667 676 317.333 656 306 632 c 132
+ 294.667 608 281 590 265 578 c 4
+ 256.333 571.333 250.333 565.333 247 560 c 132
+ 243.667 554.667 241.667 548 241 540 c 4
+ 241 534.667 242 530 244 526 c 132
+ 246 522 248.333 519.333 251 518 c 132
+ 253.667 516.663 258.667 511.996 266 504 c 132
+ 273.335 496 280.668 487 288 477 c 4
+ 301.333 460.332 309.333 447.666 312 439 c 132
+ 314.667 430.333 317.333 414.333 320 391 c 5
+ 322 360.333 321.333 338.666 318 326 c 132
+ 314.667 313.333 305.333 298.666 290 282 c 4
+ 281.332 272 275.665 263.667 273 257 c 132
+ 270.333 250.333 269 243.667 269 237 c 5
+ 270.333 224.333 277.333 215.333 290 210 c 132
+ 302.667 204.667 324.667 202 356 202 c 4
+ 378 202 393.333 203 402 205 c 4
+ 410.667 206.333 419.667 210 429 216 c 6
+ 449 230 l 5
+ 437 213 l 6
+ 429 201.667 426.333 190.333 429 179 c 6
+ 432 162 l 5
+ 296 162 l 6
+ 263.333 162 238.333 161.667 221 161 c 132
+ 203.667 160.333 187.333 159.667 172 159 c 132
+ 156.667 158.333 144.667 156 136 152 c 132
+ 127.332 148 119.666 144 113 140 c 132
+ 106.332 136 98.666 129.333 90 120 c 5
+ 68.667 100 54.667 74.333 48 43 c 132
+ 41.333 11.667 42.333 -20 51 -52 c 4
+ 55.667 -69.333 64.334 -85.333 77 -100 c 132
+ 89.667 -114.667 104.333 -126.667 121 -136 c 132
+ 137.667 -145.333 156 -153 176 -159 c 132
+ 196 -165 216.333 -167 237 -165 c 132
+ 257.667 -163 277.333 -158.333 296 -151 c 4
+ 316.667 -142.334 331.333 -131.667 340 -119 c 132
+ 348.667 -106.333 354.667 -87 358 -61 c 4
+ 360 -43 360.333 -29.667 359 -21 c 132
+ 357.667 -12.333 354 -1.33301 348 12 c 4
+ 340 28 330.333 40.667 319 50 c 132
+ 307.667 59.333 298 62.667 290 60 c 4
+ 286 58 283.667 54.667 283 50 c 132
+ 282.333 45.333 282.333 37.667 283 27 c 5
+ 285.667 9.66699 283.333 -8.33301 276 -27 c 132
+ 268.667 -45.667 258.667 -59.333 246 -68 c 132
+ 233.333 -76.667 220 -81 206 -81 c 4
+ 194 -81 178.667 -76 160 -66 c 132
+ 141.333 -56 128.333 -44 121 -30 c 4
+ 109 -6 108.333 17.667 119 41 c 132
+ 129.667 64.333 149.333 82.667 178 96 c 4
+ 194 104 210 108 226 108 c 132
+ 242 108 264.667 104.667 294 98 c 4
+ 320.667 92 341 83 355 71 c 132
+ 369 59 381 39.333 391 12 c 4
+ 396.333 -1.33301 399.333 -12 400 -20 c 132
+ 400.658 -28 399.325 -41 396 -59 c 132
+ 392.667 -77 389 -89.667 385 -97 c 132
+ 381 -104.333 373.667 -112.667 363 -122 c 4
+ 346.333 -136.667 326.333 -149.667 303 -161 c 4
+ 287 -169 274 -173.667 264 -175 c 132
+ 254 -176.331 236 -176.664 210 -176 c 5
+ 158.667 -173.333 116.667 -163 84 -145 c 132
+ 51.333 -127 25.333 -99 6 -61 c 4
+ -5.33301 -38.333 -11.333 -17.333 -12 2 c 132
+ -12.667 21.333 -8 44.333 2 71 c 4
+ 15.333 106.333 31.333 133 50 151 c 132
+ 68.667 169 96 183.667 132 195 c 4
+ 148.667 200.333 166.333 208.333 185 219 c 132
+ 203.667 229.667 217 240 225 250 c 5
+ 235 260.667 247 278 261 302 c 4
+ 271 318.667 277 331 279 339 c 132
+ 281 347 281.333 362.333 280 385 c 4
+ 278 415.667 271.667 439 261 455 c 4
+ 251.667 469 239.333 481.333 224 492 c 132
+ 208.667 502.667 195 508 183 508 c 132
+ 171 508 157 498.667 141 480 c 132
+ 125 461.333 114 442.333 108 423 c 4
+ 104 408.333 102.667 395.333 104 384 c 4
+ 105.333 368.667 110.333 350 119 328 c 4
+ 119.667 325.333 119 321.333 117 316 c 132
+ 115 310.667 112.333 305.667 109 301 c 4
+ 100.332 291 92.332 287.667 85 291 c 132
+ 77.666 294.333 68.333 306 57 326 c 4
+ 40.333 354.667 37.667 383.667 49 413 c 4
+ 53 423 65 437.667 85 457 c 132
+ 105 476.333 122.333 490 137 498 c 4
+ 143.667 502 148.333 506.333 151 511 c 132
+ 153.667 515.667 155 522.333 155 531 c 4
+ 155 545.671 153 554.338 149 557 c 4
+ 143 560.333 136 572.667 128 594 c 132
+ 120 615.333 115.667 632 115 644 c 5
+ 115 666.667 120.333 686.334 131 703 c 132
+ 141.667 719.67 159 734.336 183 747 c 4
+277 715 m 4
+ 268.333 723.667 255.333 728.667 238 730 c 132
+ 220.667 731.333 204.667 729.667 190 725 c 5
+ 178.667 719.667 169.333 711.667 162 701 c 132
+ 154.667 690.333 150.667 679 150 667 c 132
+ 149.333 655 150 643 152 631 c 132
+ 154 619 159.333 608.667 168 600 c 132
+ 176.667 591.333 187 586 199 584 c 4
+ 216.334 580.685 230.667 581.351 242 586 c 132
+ 253.333 590.667 264.333 600.667 275 616 c 4
+ 283.667 628 289 637.333 291 644 c 132
+ 293 650.672 293.333 660.338 292 673 c 4
+ 291.319 681.667 289.653 690 287 698 c 132
+ 284.333 706 281 711.667 277 715 c 4
+233 59 m 4
+ 225.667 64.333 214 67.333 198 68 c 132
+ 182 68.667 170.667 67.333 164 64 c 5
+ 157.333 59.333 152 51.333 148 40 c 132
+ 144 28.667 142 16 142 2 c 4
+ 142 -9.33301 143.333 -18 146 -24 c 4
+ 146.667 -26.667 152 -33.667 162 -45 c 4
+ 170.667 -55 182.667 -61.333 198 -64 c 4
+ 210.667 -66 222 -63.667 232 -57 c 132
+ 242 -50.333 248.667 -40.333 252 -27 c 4
+ 255.333 -13 255 3.33301 251 22 c 132
+ 247 40.667 241 53 233 59 c 4
+EndSplineSet
+EndChar
+
+StartChar: uniE904
+Encoding: 59652 59652 115
+Width: 677
+VWidth: 2048
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+337 -808 m 1
+ 312 -808 l 1
+ 312 -115 l 1
+ 25 -115 l 1
+ 25 -208 l 1
+ 0 -208 l 1
+ 0 209 l 1
+ 25 209 l 1
+ 25 123 l 1
+ 312 123 l 1
+ 312 209 l 1
+ 337 209 l 1
+ 337 -808 l 1
+312 -50 m 1
+ 312 58 l 1
+ 25 58 l 1
+ 25 -50 l 1
+ 312 -50 l 1
+518 -290 m 1
+ 548 -280 l 1
+ 548 -883 l 1
+ 518 -883 l 1
+ 518 -290 l 1
+535 325 m 1
+ 677 147 l 1
+ 535 -31 l 1
+ 391 147 l 1
+ 535 325 l 1
+508 249 m 1
+ 454 182 l 1
+ 566 44 l 1
+ 618 110 l 1
+ 508 249 l 1
+535 37 m 1
+ 677 -141 l 1
+ 535 -319 l 1
+ 391 -141 l 1
+ 535 37 l 1
+508 -39 m 1
+ 454 -106 l 1
+ 566 -244 l 1
+ 618 -178 l 1
+ 508 -39 l 1
+EndSplineSet
+EndChar
+
+StartChar: uniE909
+Encoding: 59657 59657 116
+Width: 309
+VWidth: 2048
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+0 595 m 1
+ 28 595 l 1
+ 28 353 l 1
+ 280 353 l 1
+ 280 595 l 1
+ 309 595 l 1
+ 309 64 l 1
+ 28 64 l 1
+ 28 -64 l 1
+ 309 -64 l 1
+ 309 -602 l 1
+ 280 -602 l 1
+ 280 -355 l 1
+ 28 -355 l 1
+ 28 -602 l 1
+ 0 -602 l 1
+ 0 595 l 1
+280 255 m 1
+ 28 255 l 1
+ 28 164 l 1
+ 280 164 l 1
+ 280 255 l 1
+280 -172 m 1
+ 28 -172 l 1
+ 28 -263 l 1
+ 280 -263 l 1
+ 280 -172 l 1
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont
diff --git a/fonts/Leipzig.svg b/fonts/Leipzig.svg
index 49f630b76ff..71ab0f2ac33 100644
--- a/fonts/Leipzig.svg
+++ b/fonts/Leipzig.svg
@@ -5,11 +5,11 @@
 Version 5.2.0 - adding glyphs (dynamics, ornaments, mensural note heads, etc)
 Version 5.2.1 - adding repeats
 Version 5.2.2 - fixing size of some glpyhs
-
+Version 5.2.3 - adding mensural clefs
 -->
 <svg>
 <metadata>
-Created by FontForge 20120731 at Fri Aug 28 13:54:39 2015
+Created by FontForge 20120731 at Thu Sep 17 14:43:38 2015
  By laurent
 Created by Etienne Darbellay, Jean-Francois Marti and Laurent Pugin. 
 This font is licensed under the SIL Open Font License \(http://scripts.sil.org/OFL\).
@@ -279,14 +279,14 @@ d="M0 -0c49 0 97.5 -2.26367 135.5 4.73633c206 95 258.5 264.264 263.5 271.264c0 1
     <glyph glyph-name="uniE88A" unicode="&#xe88a;" horiz-adv-x="144" 
 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" />
     <glyph glyph-name="uniE522" unicode="&#xe522;" horiz-adv-x="232" 
-d="M-91 -179c-2 -2.66699 -2.66699 -5 -2 -7s4.33301 -3.33301 11 -4c18.667 0 34.333 13.667 47 41c6.66699 14 13.333 30 20 48s11.667 35.333 15 52l14 61l44 208h-58v38h70c7.33301 20.667 13.333 36.333 18 47c7.33301 18 14.667 32.667 22 44
+d="M-91 -179c-2 -2.66701 -2.667 -5 -2 -7s4.333 -3.33299 11 -4c18.667 0 34.333 13.667 47 41c6.667 14 13.333 30 20 48c6.66699 18 11.667 35.333 15 52l14 61l44 208h-58v38h70c7.333 20.667 13.333 36.333 18 47c7.333 18 14.667 32.667 22 44
 c20.666 30 42.333 53 65 69s47.667 24 75 24c9.33301 0 17 -1 23 -3s12.333 -7.33301 19 -16c4.66699 -6.66699 7.66699 -13 9 -19l4 -16c0 -14.667 -0.666992 -25.334 -2 -32c-1.33301 -6.66699 -5 -16 -11 -28c-2.66699 -6 -8.66699 -13 -18 -21
-c-4 -3.33301 -8.33301 -5.33301 -13 -6s-10.333 -0.666992 -17 0c-6 1.33301 -10.333 5 -13 11s-4.66699 12.667 -6 20c0 12 2.33301 22.667 7 32s12 17.333 22 24l14 10c0 8.66699 -6 14 -18 16c-13.333 1.33008 -24.667 -1.33691 -34 -8
-c-9.33301 -6.66699 -19 -21 -29 -43c-4.66699 -12 -10.333 -29.667 -17 -53s-11.333 -40 -14 -50h77v-40h-85c-12 -68.667 -29 -137.333 -51 -206c-18 -55.333 -35.333 -99 -52 -131c-13.333 -26 -27 -47 -41 -63c-24.667 -28.667 -50 -43 -76 -43
-c-24.666 0 -43.333 9.66699 -56 29c-10 15.333 -15 33.333 -15 54c0 16.667 4 32.667 12 48c4.66699 7.33301 10.333 13 17 17s13.333 6 20 6c8.66699 0 15.667 -4 21 -12s9 -15.333 11 -22s3 -12.333 3 -17c0 -9.33301 -2.33301 -17.333 -7 -24
-c-4.66406 -6.66699 -9.33008 -13.667 -14 -21c-4.66406 -7.33301 -8.33008 -12 -11 -14z" />
+c-4 -3.33301 -8.33301 -5.33301 -13 -6s-10.333 -0.666992 -17 0c-6 1.33301 -10.333 5 -13 11s-4.66701 12.667 -6 20c0 12 2.33299 22.667 7 32s12 17.333 22 24l14 10c0 8.66699 -6 14 -18 16c-13.333 1.32999 -24.667 -1.33701 -34 -8
+c-9.33299 -6.66699 -19 -21 -29 -43c-4.66701 -12 -10.333 -29.667 -17 -53s-11.333 -40 -14 -50h77v-40h-85c-12 -68.667 -29 -137.333 -51 -206c-18 -55.333 -35.333 -99 -52 -131c-13.333 -26 -27 -47 -41 -63c-24.667 -28.667 -50 -43 -76 -43
+c-24.666 0 -43.333 9.66701 -56 29c-10 15.333 -15 33.333 -15 54c0 16.667 4 32.667 12 48c4.667 7.333 10.333 13 17 17s13.333 6 20 6c8.667 0 15.667 -4 21 -12s9 -15.333 11 -22s3 -12.333 3 -17c0 -9.33299 -2.333 -17.333 -7 -24
+c-4.6641 -6.66701 -9.3301 -13.667 -14 -21c-4.6641 -7.33299 -8.3301 -12 -11 -14z" />
     <glyph glyph-name="uniE521" unicode="&#xe521;" horiz-adv-x="405" 
-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 18.6328 31.6631 20 35l14 41h23l-24 -63c-8.30371 -21.7969 -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 186
+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 18.633 31.6631 20 35l14 41h23l-24 -63c-8.30399 -21.7969 -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 186
 c0 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 107c21 27 47 40 79 40
 c21 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" />
     <glyph glyph-name="uniE520" unicode="&#xe520;" horiz-adv-x="306" 
@@ -355,8 +355,8 @@ 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
 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 -30c0 -23 -1 -26 9 -40c7 -11 15 -20 23 -25z" />
     <glyph glyph-name="uniE500" unicode="&#xe500;" horiz-adv-x="508" 
-d="M508 242l-362 -484h-146l362 484h146zM52 118c0 13.333 4.33301 24.667 13 34s19.333 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33c0 -13.333 -4.33301 -24.667 -13 -34s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33zM361 -121
-c0 13.333 4.33301 24.667 13 34s19.334 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33c0 -13.333 -4.33301 -24.667 -13 -34s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33z" />
+d="M508 242l-362 -484h-146l362 484h146zM52 118c0 13.333 4.333 24.667 13 34s19.333 14.333 32 15c14 0 25.667 -4 35 -12c9.33299 -8 14.333 -19 15 -33c0 -13.333 -4.33299 -24.667 -13 -34c-8.667 -9.333 -19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12
+s-14.333 19 -15 33zM361 -121c0 13.333 4.33301 24.667 13 34s19.334 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33c0 -13.333 -4.33301 -24.667 -13 -34s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33z" />
     <glyph glyph-name="uniE220" unicode="&#xe220;" horiz-adv-x="163" 
 d="M-163 -124v83l326 166v-86z" />
     <glyph glyph-name="uniE222" unicode="&#xe222;" horiz-adv-x="162" 
@@ -375,41 +375,40 @@ c0 -38 -19 -70 -50 -76c-17 0 -27 11 -29 32c0 27 17 53 37 62c3 0 5 2 5 6l-6 9c-5
 c0 29 18 51 37 62c3 0 5 2 5 6c-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-38
 h-85c-7 -44 -15 -84 -26 -121c-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" />
     <glyph glyph-name="uniE52F" unicode="&#xe52f;" horiz-adv-x="479" 
-d="M481 220h-83c-8.66699 -55.333 -22.333 -114.333 -41 -177s-35.667 -109.667 -51 -141s-32 -58 -50 -80c-16 -21.333 -37 -35.666 -63 -43l-19 -2c-21.333 0 -37.333 8.66699 -48 26c-4 5.33301 -7 10.333 -9 15c-2 4.66602 -4 10.333 -6 17c-2 6.66602 -3 16.333 -3 29
-c0 18.667 4 32.667 12 42s18.667 17.667 32 25c5.33301 0 10 -1 14 -3s8.33301 -6 13 -12c7.33301 -9.33301 11 -20.667 11 -34c0 -14.667 -10.667 -36.333 -32 -65c0 -4.66699 3 -7 9 -7c34 0 61.333 46.333 82 139l7 29l13 60l22 102l17 80h-161
-c-8 -53.333 -22.333 -113.333 -43 -180c-12 -39.333 -20.667 -66 -26 -80c-8 -21.333 -16.333 -40.667 -25 -58c-32.667 -72 -69.333 -113 -110 -123l-18 -2c-21.3311 0 -37.6641 8.66699 -49 26c-5.33301 6 -10.333 15.333 -15 28c-0.666992 5.33301 -1.33301 10.333 -2 15
-s-1.33301 10.667 -2 18c1.33301 11.333 2.66699 20.333 4 27s4.33301 13 9 19c6.66699 8.66699 17.667 15.667 33 21c10.6621 0 19.3281 -5 26 -15c6.65723 -10 10.3242 -21.333 11 -34c0 -7.33301 -0.666992 -12.667 -2 -16c-1.33301 -3.33203 -2.33301 -5.66602 -3 -7
-l-14 -23l-15 -19c0 -4.66699 3.33301 -7 10 -7c11.333 0 21.667 5 31 15c3.33301 3.33301 7 8 11 14s8 13 12 21l14 36l15 53l19 86l22 105l17 80h-57v38h70c9.33301 31.334 22 60.667 38 88s37.667 51 65 71c24.667 16.667 52.333 25 83 25
-c15.333 0 27.333 -6.33301 36 -19s13 -28.334 13 -47c0 -18.667 -4.33301 -35.334 -13 -50c-8.66602 -14.668 -21.333 -23.335 -38 -26c-16.667 0 -26 10.667 -28 32c0 11.335 3.33301 23.668 10 37c6.66699 11.335 15.667 19.668 27 25c3.33301 2.66699 5 4.66699 5 6
-c-3.33301 4.66699 -5.66699 7.66699 -7 9c-4.66699 3.33301 -10.667 5 -18 5c-22 0 -40 -15.667 -54 -47s-25 -67 -33 -107h164c13.333 49.333 36.667 92 70 128s72 54 116 54c8 0 15 -1.33301 21 -4s11 -8 15 -16c2.66699 -3.33301 5.33301 -9 8 -17s4.33301 -17.667 5 -29
-c0 -18.667 -4.33301 -35 -13 -49s-21 -23 -37 -27c-18 0 -28 10.667 -30 32c0 6 1 12 3 18s4.66699 12 8 18s7 11 11 15s9 7.66699 15 11c3.33301 2.66699 5 4.66699 5 6l-6 9c-4.66699 3.33301 -10.333 5 -17 5c-37.333 0 -66.667 -52 -88 -156h75v-38z" />
+d="M481 220h-83c-8.66699 -55.333 -22.333 -114.333 -41 -177s-35.667 -109.667 -51 -141c-15.333 -31.333 -32 -58 -50 -80c-16 -21.333 -37 -35.666 -63 -43l-19 -2c-21.333 0 -37.333 8.66701 -48 26c-4 5.33299 -7 10.333 -9 15c-2 4.666 -4 10.333 -6 17
+c-2 6.666 -3 16.333 -3 29c0 18.667 4 32.667 12 42s18.667 17.667 32 25c5.33299 0 10 -1 14 -3s8.33299 -6 13 -12c7.33299 -9.333 11 -20.667 11 -34c0 -14.667 -10.667 -36.333 -32 -65c0 -4.66701 3 -7 9 -7c34 0 61.333 46.333 82 139l7 29l13 60l22 102l17 80h-161
+c-8 -53.333 -22.333 -113.333 -43 -180c-12 -39.333 -20.667 -66 -26 -80c-8 -21.333 -16.333 -40.667 -25 -58c-32.667 -72 -69.333 -113 -110 -123l-18 -2c-21.3311 0 -37.664 8.66701 -49 26c-5.33299 6 -10.333 15.333 -15 28c-0.667007 5.33299 -1.33299 10.333 -2 15
+s-1.33299 10.667 -2 18c1.33299 11.333 2.66701 20.333 4 27s4.33299 13 9 19c6.667 8.667 17.667 15.667 33 21c10.6621 0 19.3281 -5 26 -15c6.6572 -10 10.3242 -21.333 11 -34c0 -7.333 -0.667 -12.667 -2 -16c-1.333 -3.332 -2.333 -5.666 -3 -7l-14 -23l-15 -19
+c0 -4.66701 3.333 -7 10 -7c11.333 0 21.667 5 31 15c3.333 3.33299 7 8 11 14s8 13 12 21l14 36l15 53l19 86l22 105l17 80h-57v38h70c9.333 31.334 22 60.667 38 88s37.667 51 65 71c24.667 16.667 52.333 25 83 25c15.333 0 27.333 -6.33301 36 -19s13 -28.334 13 -47
+c0 -18.667 -4.33301 -35.334 -13 -50c-8.66599 -14.668 -21.333 -23.335 -38 -26c-16.667 0 -26 10.667 -28 32c0 11.335 3.33299 23.668 10 37c6.66701 11.335 15.667 19.668 27 25c3.33301 2.66699 5 4.66699 5 6c-3.33301 4.66699 -5.66699 7.66699 -7 9
+c-4.66699 3.33301 -10.667 5 -18 5c-22 0 -40 -15.667 -54 -47s-25 -67 -33 -107h164c13.333 49.333 36.667 92 70 128s72 54 116 54c8 0 15 -1.33301 21 -4s11 -8 15 -16c2.66699 -3.33301 5.33301 -9 8 -17s4.33301 -17.667 5 -29c0 -18.667 -4.33301 -35 -13 -49
+s-21 -23 -37 -27c-18 0 -28 10.667 -30 32c0 6 1 12 3 18s4.66699 12 8 18s7 11 11 15s9 7.66699 15 11c3.33301 2.66699 5 4.66699 5 6l-6 9c-4.66699 3.33301 -10.333 5 -17 5c-37.333 0 -66.667 -52 -88 -156h75v-38z" />
     <glyph glyph-name="uniE531" unicode="&#xe531;" horiz-adv-x="925" 
-d="M597 -69c21.3857 0 35 -30.9219 35 -51c0 -20.1133 -12.6016 -31.8135 -21 -45c-4.66406 -7.33301 -8.33008 -12 -11 -14c-5.52148 -7.3623 -1.33789 -9.96582 9 -11c35.0752 0 54.2207 54.5 67 89c6.66699 18 11.667 35.333 15 52
-c20.7061 88.2939 38.6641 179.336 58 269h-143c-7 -44 -15 -84 -26 -121c-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 67c23 0 35 -23 36 -47c0 -8 -4 -23 -9 -31l-10 -15
-c-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 87c0 39 18 53 45 67c6 0 11 -1 14 -4
-c14.8457 -5.93848 23 -25.0508 23 -45c0 -15 -11 -36 -32 -65c0 -5 3 -7 9 -7c34 0 61 46 82 139c21.4238 88.7559 39.7725 180.774 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 -156h146
-c13.4287 37.8467 22.957 64.6611 40 91c20.666 30 42.333 53 65 69s47.667 24 75 24c28.3184 0 45.5996 -13.6738 51 -38l4 -16c0 -33.1387 -1 -36.0068 -13 -60c-3.1377 -7.05957 -17.3828 -25.0537 -31 -27c-4.66699 -0.666992 -10.333 -0.666992 -17 0
-c-12.6064 2.80078 -16.5664 17.6123 -19 31c0 27.2803 11.3252 44.2158 29 56l14 10c0 8.66699 -6 14 -18 16c-13.333 1.33008 -24.667 -1.33691 -34 -8c-9.33301 -6.66699 -19 -21 -29 -43c-6.91406 -17.7783 -25.9004 -83.8789 -31 -103h77v-40h-85
-c-19.0137 -108.805 -60.0605 -254.559 -103 -337c-23.6572 -46.1318 -64.3018 -106 -117 -106c-44.6172 0 -71 36.6826 -71 83c0 31.8223 15.3096 71 49 71z" />
+d="M597 -69c21.386 0 35 -30.9219 35 -51c0 -20.113 -12.602 -31.813 -21 -45c-4.664 -7.33299 -8.33002 -12 -11 -14c-5.521 -7.362 -1.33801 -9.966 9 -11c35.075 0 54.221 54.5 67 89c6.66699 18 11.667 35.333 15 52c20.706 88.2939 38.664 179.336 58 269h-143
+c-7 -44 -15 -84 -26 -121c-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 67c23 0 35 -23 36 -47c0 -8 -4 -23 -9 -31l-10 -15c-7 -10 -8 -12 -13 -21c0 -5 3 -7 10 -7
+c19 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 87c0 39 18 53 45 67c6 0 11 -1 14 -4c14.846 -5.9385 23 -25.0508 23 -45c0 -15 -11 -36 -32 -65
+c0 -5 3 -7 9 -7c34 0 61 46 82 139c21.424 88.7559 39.772 180.774 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 -23l-14 -23l-14 -19c0 -5 3 -7 10 -7
+c11 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 -76c-17 0 -27 11 -29 32c0 27 17 53 37 62c3 0 5 2 5 6l-6 9c-5 3 -11 5 -18 5
+c-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 -156h144c15 49 39 93 72 132
+c31 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.429 37.847 22.957 64.661 40 91c20.666 30 42.333 53 65 69s47.667 24 75 24
+c28.318 0 45.6 -13.674 51 -38l4 -16c0 -33.139 -1 -36.007 -13 -60c-3.138 -7.06 -17.383 -25.054 -31 -27c-4.66699 -0.666992 -10.333 -0.666992 -17 0c-12.606 2.80099 -16.566 17.612 -19 31c0 27.28 11.325 44.216 29 56l14 10c0 8.66699 -6 14 -18 16
+c-13.333 1.32999 -24.667 -1.33701 -34 -8c-9.33301 -6.66699 -19 -21 -29 -43c-6.914 -17.778 -25.9 -83.879 -31 -103h77v-40h-85c-19.014 -108.805 -60.061 -254.559 -103 -337c-23.657 -46.132 -64.302 -106 -117 -106c-44.617 0 -71 36.683 -71 83
+c0 31.822 15.31 71 49 71z" />
     <glyph glyph-name="uniE532" unicode="&#xe532;" horiz-adv-x="1158" 
-d="M983 220l-44 -208l-14 -61c-3.33301 -16.667 -8.33301 -34 -15 -52s-13.333 -34 -20 -48c-12.667 -27.333 -28.333 -41 -47 -41c-6.66699 0.666992 -10.333 2 -11 4s0 4.33301 2 7c2.66992 2 6.33594 6.66699 11 14c4.66992 7.33301 9.33594 14.333 14 21
-c4.66699 6.66699 7 14.667 7 24c0 4.66699 -1 10.333 -3 17s-5.66699 14 -11 22s-12.333 12 -21 12c-6.66699 0 -13.333 -2 -20 -6s-12.333 -9.66699 -17 -17c-8 -15.333 -12 -31.333 -12 -48c0 -20.667 5 -38.667 15 -54c12.667 -19.333 31.334 -29 56 -29
-c26 0 51.333 14.333 76 43c14 16 27.667 37 41 63c16.6699 32 34 75.667 52 131c22 68.667 39 137.333 51 206h85v40h-77c2.66992 10 7.33008 26.667 14 50s12.3301 41 17 53c10 22 19.6699 36.333 29 43c9.33008 6.66309 20.6699 9.33008 34 8c12 -2 18 -7.33301 18 -16
-l-14 -10c-10 -6.66699 -17.3301 -14.667 -22 -24s-7 -20 -7 -32c1.33008 -7.33301 3.33008 -14 6 -20s7 -9.66699 13 -11c6.66992 -0.666992 12.3301 -0.666992 17 0s9 2.66699 13 6c9.33008 8 15.3301 15 18 21c6 12 9.66992 21.333 11 28c1.33008 6.66602 2 17.333 2 32
-l-4 16c-1.33008 6 -4.33008 12.333 -9 19c-6.66992 8.66699 -13 14 -19 16s-13.6699 3 -23 3c-27.3301 0 -52.3301 -8 -75 -24s-44.3301 -39 -65 -69c-7.33008 -11.333 -14.6699 -26 -22 -44c-4.66992 -10.667 -10.6699 -26.333 -18 -47h-148
-c5.09961 19.1211 24.0859 87.2217 31 105c10 22 19.667 36.333 29 43c9.33301 6.66309 20.667 9.33008 34 8c12 -2 18 -7.33301 18 -16l-14 -10c-17.6748 -11.7842 -29 -28.7197 -29 -56c2.43359 -13.3877 6.39355 -28.1992 19 -31c6.66699 -0.666992 12.333 -0.666992 17 0
-c13.6172 1.94629 27.8623 19.9404 31 27c12 23.9932 13 26.8613 13 60l-4 16c-5.40039 24.3262 -22.6816 38 -51 38c-27.333 0 -52.333 -8 -75 -24s-44.334 -39 -65 -69c-17.043 -26.3389 -26.5713 -53.1533 -40 -91h-146c21 104 51 156 88 156c13 0 19 -5 24 -14
-c0 -4 -2 -6 -6 -6c-17 -10 -35 -36 -35 -62c2 -21 11 -32 27 -32c32 6 51 37 51 74c0 34 -15 70 -49 70c-45 0 -83 -18 -114 -54c-33 -39 -57 -83 -72 -132h-144c21 104 51 156 88 156c12 0 19 -4 23 -14c0 -4 -2 -6 -5 -6c-19 -11 -37 -33 -37 -62c2 -21 12 -32 30 -32
-c17 5 29 13 37 25c9 16 13 33 13 51c-2 35 -13 66 -49 66c-100 0 -162 -98 -185 -182h-144c7 39 18 74 32 106s32 48 55 48c7 0 13 -2 18 -5l6 -9c0 -4 -2 -6 -5 -6c-20 -9 -37 -35 -37 -62c2 -21 12 -32 29 -32c31 6 50 38 50 76c0 36 -16 66 -49 66c-30 0 -58 -8 -83 -25
-c-25 -19 -46 -42 -63 -70c-17 -27 -31 -56 -40 -89h-69v-38h57c-3 -12 -6 -25 -9 -38c-16 -78 -33 -156 -50 -233l-15 -53c-11 -25 -19 -56 -37 -71c-9 -10 -19 -15 -30 -15c-7 0 -10 2 -10 7l14 19l14 23c4 7 6 15 6 23c0 23 -15 49 -38 49c-33 -12 -41 -28 -46 -67l5 -33
-c12 -30 28 -54 63 -54l19 2c40 10 77 51 110 123c31 63 80 233 93 318h141c-19.2275 -90.2256 -37.5762 -182.244 -59 -271c-21 -93 -48 -139 -82 -139c-6 0 -9 2 -9 7c21 29 32 50 32 65c0 19.9492 -8.1543 39.0615 -23 45c-3 3 -8 4 -14 4c-27 -14 -45 -28 -45 -67
-c0 -47 23 -87 67 -87l18 2c27 7 48 22 65 44s32 48 47 79c33 62 79 229 93 318h140l-18 -86c-14 -62 -27 -123 -41 -185c-10 -37 -20 -65 -33 -97c-13 -28 -29 -42 -48 -42c-7 0 -10 2 -10 7c5 9 6 11 13 21l10 15c5 8 9 23 9 31c-1 24 -13 47 -36 47
-c-31 -10 -42 -30 -46 -67c0 -12 2 -23 6 -33c9 -31 27 -54 62 -54l18 2c25 8 45 23 61 44c19 24 35 51 50 79c27 56 48 122 66 197c11 37 19 77 26 121h143c-19.3359 -89.6641 -37.2939 -180.706 -58 -269c-3.33301 -16.667 -8.33301 -34 -15 -52
-c-12.7793 -34.5 -31.9248 -89 -67 -89c-10.3379 1.03418 -14.5215 3.6377 -9 11c2.66992 2 6.33594 6.66699 11 14c8.39844 13.1865 21 24.8867 21 45c0 20.0781 -13.6143 51 -35 51c-33.6904 0 -49 -39.1777 -49 -71c0 -46.3174 26.3828 -83 71 -83
-c52.6982 0 93.3428 59.8682 117 106c42.9395 82.4414 83.9863 228.195 103 337h144z" />
+d="M983 220l-44 -208l-14 -61c-3.33301 -16.667 -8.33301 -34 -15 -52s-13.333 -34 -20 -48c-12.667 -27.333 -28.333 -41 -47 -41c-6.66699 0.667007 -10.333 2 -11 4s0 4.33299 2 7c2.66998 2 6.336 6.66701 11 14c4.66998 7.33299 9.336 14.333 14 21
+c4.66699 6.66701 7 14.667 7 24c0 4.667 -1 10.333 -3 17s-5.66699 14 -11 22s-12.333 12 -21 12c-6.66699 0 -13.333 -2 -20 -6s-12.333 -9.667 -17 -17c-8 -15.333 -12 -31.333 -12 -48c0 -20.667 5 -38.667 15 -54c12.667 -19.333 31.334 -29 56 -29
+c26 0 51.333 14.333 76 43c14 16 27.667 37 41 63c16.67 32 34 75.667 52 131c22 68.667 39 137.333 51 206h85v40h-77c2.67004 10 7.32996 26.667 14 50s12.33 41 17 53c10 22 19.67 36.333 29 43c9.32996 6.66299 20.67 9.32999 34 8c12 -2 18 -7.33301 18 -16l-14 -10
+c-10 -6.66699 -17.33 -14.667 -22 -24s-7 -20 -7 -32c1.32996 -7.33301 3.32996 -14 6 -20s7 -9.66699 13 -11c6.67004 -0.666992 12.33 -0.666992 17 0s9 2.66699 13 6c9.32996 8 15.33 15 18 21c6 12 9.67004 21.333 11 28c1.32996 6.66599 2 17.333 2 32l-4 16
+c-1.32996 6 -4.32996 12.333 -9 19c-6.67004 8.66699 -13 14 -19 16s-13.67 3 -23 3c-27.33 0 -52.33 -8 -75 -24s-44.33 -39 -65 -69c-7.32996 -11.333 -14.67 -26 -22 -44c-4.66998 -10.667 -10.67 -26.333 -18 -47h-148c5.09998 19.121 24.086 87.222 31 105
+c10 22 19.667 36.333 29 43c9.33301 6.66299 20.667 9.32999 34 8c12 -2 18 -7.33301 18 -16l-14 -10c-17.675 -11.784 -29 -28.72 -29 -56c2.43402 -13.388 6.39398 -28.199 19 -31c6.66699 -0.666992 12.333 -0.666992 17 0c13.617 1.94601 27.862 19.94 31 27
+c12 23.993 13 26.861 13 60l-4 16c-5.40002 24.326 -22.682 38 -51 38c-27.333 0 -52.333 -8 -75 -24s-44.334 -39 -65 -69c-17.043 -26.339 -26.571 -53.153 -40 -91h-146c21 104 51 156 88 156c13 0 19 -5 24 -14c0 -4 -2 -6 -6 -6c-17 -10 -35 -36 -35 -62
+c2 -21 11 -32 27 -32c32 6 51 37 51 74c0 34 -15 70 -49 70c-45 0 -83 -18 -114 -54c-33 -39 -57 -83 -72 -132h-144c21 104 51 156 88 156c12 0 19 -4 23 -14c0 -4 -2 -6 -5 -6c-19 -11 -37 -33 -37 -62c2 -21 12 -32 30 -32c17 5 29 13 37 25c9 16 13 33 13 51
+c-2 35 -13 66 -49 66c-100 0 -162 -98 -185 -182h-144c7 39 18 74 32 106s32 48 55 48c7 0 13 -2 18 -5l6 -9c0 -4 -2 -6 -5 -6c-20 -9 -37 -35 -37 -62c2 -21 12 -32 29 -32c31 6 50 38 50 76c0 36 -16 66 -49 66c-30 0 -58 -8 -83 -25c-25 -19 -46 -42 -63 -70
+c-17 -27 -31 -56 -40 -89h-69v-38h57c-3 -12 -6 -25 -9 -38c-16 -78 -33 -156 -50 -233l-15 -53c-11 -25 -19 -56 -37 -71c-9 -10 -19 -15 -30 -15c-7 0 -10 2 -10 7l14 19l14 23c4 7 6 15 6 23c0 23 -15 49 -38 49c-33 -12 -41 -28 -46 -67l5 -33c12 -30 28 -54 63 -54
+l19 2c40 10 77 51 110 123c31 63 80 233 93 318h141c-19.228 -90.226 -37.576 -182.244 -59 -271c-21 -93 -48 -139 -82 -139c-6 0 -9 2 -9 7c21 29 32 50 32 65c0 19.9492 -8.15401 39.0615 -23 45c-3 3 -8 4 -14 4c-27 -14 -45 -28 -45 -67c0 -47 23 -87 67 -87l18 2
+c27 7 48 22 65 44s32 48 47 79c33 62 79 229 93 318h140l-18 -86c-14 -62 -27 -123 -41 -185c-10 -37 -20 -65 -33 -97c-13 -28 -29 -42 -48 -42c-7 0 -10 2 -10 7c5 9 6 11 13 21l10 15c5 8 9 23 9 31c-1 24 -13 47 -36 47c-31 -10 -42 -30 -46 -67c0 -12 2 -23 6 -33
+c9 -31 27 -54 62 -54l18 2c25 8 45 23 61 44c19 24 35 51 50 79c27 56 48 122 66 197c11 37 19 77 26 121h143c-19.336 -89.664 -37.294 -180.706 -58 -269c-3.33301 -16.667 -8.33301 -34 -15 -52c-12.779 -34.5 -31.925 -89 -67 -89c-10.338 1.034 -14.521 3.638 -9 11
+c2.66998 2 6.336 6.66701 11 14c8.39801 13.187 21 24.887 21 45c0 20.0781 -13.614 51 -35 51c-33.69 0 -49 -39.178 -49 -71c0 -46.317 26.383 -83 71 -83c52.698 0 93.343 59.868 117 106c42.939 82.4414 83.986 228.195 103 337h144z" />
     <glyph glyph-name="u" unicode="u" horiz-adv-x="322" 
 d="M0 265h322v-267h-52v191h-218v-191h-52v267z" />
     <glyph glyph-name="NameMe.58897" horiz-adv-x="322" 
@@ -423,36 +422,33 @@ d="M0 236l347 -119l-347 -117v28l257 89l-257 91v28z" />
     <glyph glyph-name="uniE4A1" unicode="&#xe4a1;" horiz-adv-x="347" 
 d="M0 -236l347 119l-347 117v-28l257 -89l-257 -91v-28z" />
     <glyph glyph-name="uniE4A8" unicode="&#xe4a8;" horiz-adv-x="153" 
-d="M153 214h-37c-10 -4 -18.667 -14 -26 -30c-3.33301 -7.33301 -8 -12 -14 -14c-4 1.33301 -10.667 10 -20 26c-4.66699 8.66699 -11.333 14.667 -20 18h-36l76 -214z" />
+d="M153 214h-37c-10 -4 -18.667 -14 -26 -30c-3.333 -7.33299 -8 -12 -14 -14c-4 1.33299 -10.667 10 -20 26c-4.667 8.66701 -11.333 14.667 -20 18h-36l76 -214z" />
     <glyph glyph-name="uniE4A9" unicode="&#xe4a9;" horiz-adv-x="153" 
-d="M153 -214h-37c-10 4 -18.667 14 -26 30c-3.33301 7.33301 -8 12 -14 14c-4 -1.33301 -10.667 -10 -20 -26c-4.66699 -8.66699 -11.333 -14.667 -20 -18h-36l76 214z" />
+d="M153 -214h-37c-10 4 -18.667 14 -26 30c-3.333 7.33299 -8 12 -14 14c-4 -1.33299 -10.667 -10 -20 -26c-4.667 -8.66701 -11.333 -14.667 -20 -18h-36l76 214z" />
     <glyph glyph-name="uniE4AA" unicode="&#xe4aa;" horiz-adv-x="1000" 
  />
     <glyph glyph-name="uniE4AB" unicode="&#xe4ab;" 
  />
     <glyph glyph-name="uniE568" unicode="&#xe568;" horiz-adv-x="468" 
-d="M468 126c0 69.3552 -37.5141 116.042 -106 118c-22.667 0 -43.667 -5 -63 -15c-20.6022 -12.677 -44.7915 -32.0508 -64 -49c-22.5612 -23.7722 -45.8135 -46.8532 -69 -70c-16 -14 -31 -25 -45 -33s-26.333 -12.333 -37 -13c-19.7583 0 -27.7186 13.5628 -37 28l-12 26
-c-3.33301 9.33301 -5 15.667 -5 19v8c0 28.667 13.333 43 40 43l9 -2l11 -9l7 -7c6.44738 -4.02962 14.1511 -8 24 -8c17.333 0 28.333 9.33301 33 28c0 34.1871 -26.7713 52.5798 -58 54c-22.8296 0 -25.7106 0.340012 -41 -8c-32.9816 -13.582 -55 -53.5782 -55 -97
-c0 -50.4509 20.6276 -86.763 49 -114c18 -14.667 36.333 -23 55 -25c26 0 51 7 75 21c8.66699 5.33301 14.667 9 18 11l18 15c8.6378 7.19746 25.2402 22.1328 33 31l65 67l10 9l22 16c13.333 7.33301 25.667 11 37 11c37.1011 0 55 -35.8714 55 -70
-c0 -27.9599 -11.9702 -55 -39 -55c-6.35306 2.11872 -10.691 4.79351 -17 9l-18 13c-3.33301 2.66699 -9.33301 4 -18 4c-19.4508 0 -29.6758 -17.2405 -32 -37c0 -28.051 28.2854 -41.7132 58 -44c43.4935 0 69.7328 31.4674 85 62c8.66699 17.333 12.667 38.333 12 63z
-" />
+d="M468 126c0 69.355 -37.514 116.042 -106 118c-22.667 0 -43.667 -5 -63 -15c-20.602 -12.677 -44.791 -32.051 -64 -49c-22.561 -23.772 -45.814 -46.853 -69 -70c-16 -14 -31 -25 -45 -33s-26.333 -12.333 -37 -13c-19.7583 0 -27.7186 13.5628 -37 28l-12 26
+c-3.333 9.333 -5 15.667 -5 19v8c0 28.667 13.333 43 40 43l9 -2l11 -9l7 -7c6.447 -4.03 14.151 -8 24 -8c17.333 0 28.333 9.33299 33 28c0 34.187 -26.771 52.58 -58 54c-22.8296 0 -25.7106 0.339996 -41 -8c-32.9816 -13.582 -55 -53.578 -55 -97
+c0 -50.4509 20.6276 -86.763 49 -114c18 -14.667 36.333 -23 55 -25c26 0 51 7 75 21c8.66701 5.333 14.667 9 18 11l18 15c8.638 7.1975 25.24 22.1328 33 31l65 67l10 9l22 16c13.333 7.33299 25.667 11 37 11c37.101 0 55 -35.871 55 -70c0 -27.9599 -11.97 -55 -39 -55
+c-6.353 2.1187 -10.691 4.7935 -17 9l-18 13c-3.33301 2.667 -9.33301 4 -18 4c-19.451 0 -29.676 -17.2405 -32 -37c0 -28.051 28.285 -41.7132 58 -44c43.494 0 69.733 31.4674 85 62c8.66699 17.333 12.667 38.333 12 63z" />
     <glyph glyph-name="uniE567" unicode="&#xe567;" horiz-adv-x="468" 
-d="M468 118c0 -69.3555 -37.5137 -116.042 -106 -118c-22.667 0 -43.667 5 -63 15c-20.6025 12.6768 -44.791 32.0508 -64 49c-22.5615 23.7725 -45.8135 46.8535 -69 70c-16 14 -31 25 -45 33s-26.333 12.333 -37 13c-19.7578 0 -27.7188 -13.5625 -37 -28l-12 -26
-c-3.33301 -9.33301 -5 -15.667 -5 -19v-8c0 -28.667 13.333 -43 40 -43l9 2l11 9l7 7c6.44727 4.0293 14.1514 8 24 8c17.333 0 28.333 -9.33301 33 -28c0 -34.1875 -26.7715 -52.5801 -58 -54c-22.8301 0 -25.7109 -0.339844 -41 8c-32.9814 13.582 -55 53.5781 -55 97
-c0 50.4512 20.6279 86.7627 49 114c18 14.667 36.333 23 55 25c26 0 51 -7 75 -21c8.66699 -5.33301 14.667 -9 18 -11l18 -15c8.6377 -7.19727 25.2402 -22.1328 33 -31l65 -67l10 -9l22 -16c13.333 -7.33301 25.667 -11 37 -11c37.1016 0 55 35.8711 55 70
-c0 27.96 -11.9707 55 -39 55c-6.35352 -2.11914 -10.6914 -4.79395 -17 -9l-18 -13c-3.33301 -2.66699 -9.33301 -4 -18 -4c-19.4512 0 -29.6758 17.2402 -32 37c0 28.0508 28.2852 41.7129 58 44c43.4932 0 69.7324 -31.4678 85 -62c8.66699 -17.333 12.667 -38.333 12 -63
-z" />
+d="M468 118c0 -69.3555 -37.514 -116.042 -106 -118c-22.667 0 -43.667 5 -63 15c-20.603 12.6768 -44.791 32.0508 -64 49c-22.562 23.7725 -45.813 46.854 -69 70c-16 14 -31 25 -45 33s-26.333 12.333 -37 13c-19.7578 0 -27.7188 -13.562 -37 -28l-12 -26
+c-3.333 -9.333 -5 -15.667 -5 -19v-8c0 -28.667 13.333 -43 40 -43l9 2l11 9l7 7c6.447 4.0293 14.151 8 24 8c17.333 0 28.333 -9.333 33 -28c0 -34.1875 -26.771 -52.5801 -58 -54c-22.8301 0 -25.7109 -0.339844 -41 8c-32.9814 13.582 -55 53.5781 -55 97
+c0 50.451 20.6279 86.763 49 114c18 14.667 36.333 23 55 25c26 0 51 -7 75 -21c8.66701 -5.33299 14.667 -9 18 -11l18 -15c8.638 -7.19701 25.24 -22.133 33 -31l65 -67l10 -9l22 -16c13.333 -7.333 25.667 -11 37 -11c37.102 0 55 35.8711 55 70
+c0 27.96 -11.971 55 -39 55c-6.354 -2.119 -10.691 -4.79401 -17 -9l-18 -13c-3.33301 -2.66701 -9.33301 -4 -18 -4c-19.451 0 -29.676 17.24 -32 37c0 28.051 28.285 41.713 58 44c43.493 0 69.732 -31.468 85 -62c8.66699 -17.333 12.667 -38.333 12 -63z" />
     <glyph glyph-name="uniE56E" unicode="&#xe56e;" horiz-adv-x="711" 
-d="M710 134l-109 -127c-2.66669 -3.33333 -5 -5.33333 -7 -6l-6 -2c-5.35107 2 -8.68439 3.66667 -10 5l-89 78c-4.67035 4.66666 -10.337 7.33334 -17 8c-4 -1.33334 -6.66666 -2.66666 -8 -4l-66 -79c-3.33334 -5.33333 -7.66666 -8 -13 -8l-11 5l-89 78
-c-6 4.66666 -11.3333 7.33334 -16 8c-4 -1.33334 -6.66666 -2.66666 -8 -4l-67 -79c-5.33333 -5.33333 -10 -8 -14 -8c-2 0 -5.33333 1.66667 -10 5l-88 78c-5.33334 4.66666 -11 7.33334 -17 8c-4.66667 -1.33334 -7.33333 -2.66666 -8 -4l-57 -68v49l108 127l10 4
-c0.666664 0 2 -0.333328 4 -1s6 -3 12 -7l88 -78l10 -5c4 0 8.66667 2.66666 14 8l67 79c3.33334 2.66667 6 4 8 4c4.66666 0 10 -2.66667 16 -8l89 -78l11 -5l6 1l7 7l67 79c3.33331 2.66667 5.66669 4 7 4c4 -1.33371 6.66669 -2.66704 8 -4l7 -6l89 -77
-c3.33331 -3.33334 7 -5 11 -5s8.33331 2.66666 13 8l58 67v-47z" />
+d="M710 134l-109 -127c-2.66699 -3.33333 -5 -5.33333 -7 -6l-6 -2c-5.35101 2 -8.68402 3.66667 -10 5l-89 78c-4.67001 4.6667 -10.337 7.3333 -17 8c-4 -1.3333 -6.66699 -2.6667 -8 -4l-66 -79c-3.33301 -5.33333 -7.66699 -8 -13 -8l-11 5l-89 78
+c-6 4.6667 -11.333 7.3333 -16 8c-4 -1.3333 -6.66699 -2.6667 -8 -4l-67 -79c-5.33299 -5.33333 -10 -8 -14 -8c-2 0 -5.33299 1.66667 -10 5l-88 78c-5.3333 4.6667 -11 7.3333 -17 8c-4.6667 -1.3333 -7.3333 -2.6667 -8 -4l-57 -68v49l108 127l10 4
+c0.667 0 2 -0.332993 4 -1s6 -3 12 -7l88 -78l10 -5c4 0 8.66701 2.667 14 8l67 79c3.33301 2.66701 6 4 8 4c4.66699 0 10 -2.66701 16 -8l89 -78l11 -5l6 1l7 7l67 79c3.33301 2.66701 5.66699 4 7 4c4 -1.334 6.66699 -2.66701 8 -4l7 -6l89 -77
+c3.33301 -3.333 7 -5 11 -5s8.33301 2.667 13 8l58 67v-47z" />
     <glyph glyph-name="uniE56A" unicode="&#xe56a;" horiz-adv-x="248" 
-d="M126 468c69.3555 0 116.042 -37.5137 118 -106c0 -22.667 -5 -43.667 -15 -63c-12.6768 -20.6025 -32.0508 -44.791 -49 -64c-23.7725 -22.5615 -46.8535 -45.8135 -70 -69c-14 -16 -25 -31 -33 -45s-12.333 -26.333 -13 -37c0 -19.7578 13.5625 -27.7188 28 -37l26 -12
-c9.33301 -3.33301 15.667 -5 19 -5h8c28.667 0 43 13.333 43 40l-2 9l-9 11l-7 7c-4.0293 6.44727 -8 14.1514 -8 24c0 17.333 9.33301 28.333 28 33c34.1875 0 52.5801 -26.7715 54 -58c0 -22.8301 0.339844 -25.7109 -8 -41c-13.582 -32.9814 -53.5781 -55 -97 -55
-c-50.4512 0 -86.7627 20.6279 -114 49c-14.667 18 -23 36.333 -25 55c0 26 7 51 21 75c5.33301 8.66699 9 14.667 11 18l15 18c7.19727 8.6377 22.1328 25.2402 31 33l67 65l9 10l16 22c7.33301 13.333 11 25.667 11 37c0 37.1016 -35.8711 55 -70 55
-c-27.96 0 -55 -11.9707 -55 -39c2.11914 -6.35352 4.79395 -10.6914 9 -17l13 -18c2.66699 -3.33301 4 -9.33301 4 -18c0 -19.4512 -17.2402 -29.6758 -37 -32c-28.0508 0 -41.7129 28.2852 -44 58c0 43.4932 31.4678 69.7324 62 85c17.333 8.66699 38.333 12.667 63 12z
-" />
+d="M126 468c69.355 0 116.042 -37.514 118 -106c0 -22.667 -5 -43.667 -15 -63c-12.677 -20.603 -32.051 -44.791 -49 -64c-23.772 -22.562 -46.854 -45.813 -70 -69c-14 -16 -25 -31 -33 -45s-12.333 -26.333 -13 -37c0 -19.7578 13.5625 -27.7188 28 -37l26 -12
+c9.333 -3.333 15.667 -5 19 -5h8c28.667 0 43 13.333 43 40l-2 9l-9 11l-7 7c-4.02901 6.447 -8 14.151 -8 24c0 17.333 9.33299 28.333 28 33c34.188 0 52.58 -26.771 54 -58c0 -22.8301 0.339996 -25.7109 -8 -41c-13.582 -32.9814 -53.578 -55 -97 -55
+c-50.4512 0 -86.7627 20.6279 -114 49c-14.667 18 -23 36.333 -25 55c0 26 7 51 21 75c5.333 8.66701 9 14.667 11 18l15 18c7.1973 8.638 22.1328 25.24 31 33l67 65l9 10l16 22c7.33299 13.333 11 25.667 11 37c0 37.102 -35.871 55 -70 55c-27.96 0 -55 -11.971 -55 -39
+c2.1191 -6.354 4.7939 -10.691 9 -17l13 -18c2.667 -3.33301 4 -9.33301 4 -18c0 -19.451 -17.2402 -29.676 -37 -32c-28.0508 0 -41.7129 28.285 -44 58c0 43.493 31.4678 69.732 62 85c17.333 8.66699 38.333 12.667 63 12z" />
     <glyph glyph-name="uniE569" unicode="&#xe569;" horiz-adv-x="248" 
  />
     <glyph glyph-name="uniE4AC" unicode="&#xe4ac;" 
@@ -460,11 +456,10 @@ d="M273 0h-59l-108 180l-82 -180h-24l114 265z" />
     <glyph glyph-name="uniE4AD" unicode="&#xe4ad;" 
 d="M273 0h-59l-108 -180l-82 180h-24l114 -265z" />
     <glyph glyph-name="uniE56B" unicode="&#xe56b;" horiz-adv-x="248" 
-d="M118 468c-69.3555 0 -116.042 -37.5137 -118 -106c0 -22.667 5 -43.667 15 -63c12.6768 -20.6025 32.0508 -44.791 49 -64c23.7725 -22.5615 46.8535 -45.8135 70 -69c14 -16 25 -31 33 -45s12.333 -26.333 13 -37c0 -19.7578 -13.5625 -27.7188 -28 -37l-26 -12
-c-9.33301 -3.33301 -15.667 -5 -19 -5h-8c-28.667 0 -43 13.333 -43 40l2 9l9 11l7 7c4.0293 6.44727 8 14.1514 8 24c0 17.333 -9.33301 28.333 -28 33c-34.1875 0 -52.5801 -26.7715 -54 -58c0 -22.8301 -0.339844 -25.7109 8 -41c13.582 -32.9814 53.5781 -55 97 -55
-c50.4512 0 86.7627 20.6279 114 49c14.667 18 23 36.333 25 55c0 26 -7 51 -21 75c-5.33301 8.66699 -9 14.667 -11 18l-15 18c-7.19727 8.6377 -22.1328 25.2402 -31 33l-67 65l-9 10l-16 22c-7.33301 13.333 -11 25.667 -11 37c0 37.1016 35.8711 55 70 55
-c27.96 0 55 -11.9707 55 -39c-2.11914 -6.35352 -4.79395 -10.6914 -9 -17l-13 -18c-2.66699 -3.33301 -4 -9.33301 -4 -18c0 -19.4512 17.2402 -29.6758 37 -32c28.0508 0 41.7129 28.2852 44 58c0 43.4932 -31.4678 69.7324 -62 85c-17.333 8.66699 -38.333 12.667 -63 12
-z" />
+d="M118 468c-69.3555 0 -116.042 -37.514 -118 -106c0 -22.667 5 -43.667 15 -63c12.6768 -20.603 32.0508 -44.791 49 -64c23.7725 -22.562 46.854 -45.813 70 -69c14 -16 25 -31 33 -45s12.333 -26.333 13 -37c0 -19.7578 -13.562 -27.7188 -28 -37l-26 -12
+c-9.333 -3.333 -15.667 -5 -19 -5h-8c-28.667 0 -43 13.333 -43 40l2 9l9 11l7 7c4.0293 6.447 8 14.151 8 24c0 17.333 -9.333 28.333 -28 33c-34.1875 0 -52.5801 -26.771 -54 -58c0 -22.8301 -0.339844 -25.7109 8 -41c13.582 -32.9814 53.5781 -55 97 -55
+c50.451 0 86.763 20.6279 114 49c14.667 18 23 36.333 25 55c0 26 -7 51 -21 75c-5.33299 8.66701 -9 14.667 -11 18l-15 18c-7.19701 8.638 -22.133 25.24 -31 33l-67 65l-9 10l-16 22c-7.333 13.333 -11 25.667 -11 37c0 37.102 35.8711 55 70 55
+c27.96 0 55 -11.971 55 -39c-2.119 -6.354 -4.79401 -10.691 -9 -17l-13 -18c-2.66701 -3.33301 -4 -9.33301 -4 -18c0 -19.451 17.24 -29.676 37 -32c28.051 0 41.713 28.285 44 58c0 43.493 -31.468 69.732 -62 85c-17.333 8.66699 -38.333 12.667 -63 12z" />
     <glyph glyph-name="uniE938" unicode="&#xe938;" horiz-adv-x="312" 
 d="M155 194l157 -194l-157 -192l-155 192z" />
     <glyph glyph-name="uniE939" unicode="&#xe939;" horiz-adv-x="312" 
@@ -476,11 +471,31 @@ d="M155 194l157 -194l-157 -192l-155 192z" />
     <glyph glyph-name="uniE101" unicode="&#xe101;" horiz-adv-x="508" 
 d="M508 242l-362 -484h-146l362 484h146z" />
     <glyph glyph-name="uniE501" unicode="&#xe501;" horiz-adv-x="751" 
-d="M750 242l-362 -484h-146l362 484h146zM508 242l-362 -484h-146l362 484h146zM52 118c0 13.333 4.33301 24.667 13 34s19.333 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33c0 -13.333 -4.33301 -24.667 -13 -34s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12
-s-14.333 19 -15 33zM603 -121c0 13.333 4.33301 24.667 13 34s19.334 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33c0 -13.333 -4.33301 -24.667 -13 -34s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33z" />
+d="M750 242l-362 -484h-146l362 484h146zM508 242l-362 -484h-146l362 484h146zM52 118c0 13.333 4.333 24.667 13 34s19.333 14.333 32 15c14 0 25.667 -4 35 -12c9.33299 -8 14.333 -19 15 -33c0 -13.333 -4.33299 -24.667 -13 -34c-8.667 -9.333 -19.333 -14.333 -32 -15
+c-14 0 -25.667 4 -35 12s-14.333 19 -15 33zM603 -121c0 13.333 4.33301 24.667 13 34s19.334 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33c0 -13.333 -4.33301 -24.667 -13 -34s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33z" />
     <glyph glyph-name="uniE502" unicode="&#xe502;" horiz-adv-x="1234" 
-d="M1234 242l-362 -484h-146l362 484h146zM992 242l-362 -484h-146l362 484h146zM750 242l-362 -484h-146l362 484h146zM508 242l-362 -484h-146l362 484h146zM52 118c0 13.333 4.33301 24.667 13 34s19.333 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33
-c0 -13.333 -4.33301 -24.667 -13 -34s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33zM1087 -121c0 13.333 4.33301 24.667 13 34s19.334 14.333 32 15c14 0 25.667 -4 35 -12s14.333 -19 15 -33c0 -13.333 -4.33301 -24.667 -13 -34
-s-19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33z" />
+d="M1234 242l-362 -484h-146l362 484h146zM992 242l-362 -484h-146l362 484h146zM750 242l-362 -484h-146l362 484h146zM508 242l-362 -484h-146l362 484h146zM52 118c0 13.333 4.333 24.667 13 34s19.333 14.333 32 15c14 0 25.667 -4 35 -12c9.33299 -8 14.333 -19 15 -33
+c0 -13.333 -4.33299 -24.667 -13 -34c-8.667 -9.333 -19.333 -14.333 -32 -15c-14 0 -25.667 4 -35 12s-14.333 19 -15 33zM1087 -121c0 13.333 4.32996 24.667 13 34s19.33 14.333 32 15c14 0 25.67 -4 35 -12s14.33 -19 15 -33c0 -13.333 -4.32996 -24.667 -13 -34
+s-19.33 -14.333 -32 -15c-14 0 -25.67 4 -35 12s-14.33 19 -15 33z" />
+    <glyph glyph-name="uniE901" unicode="&#xe901;" horiz-adv-x="596" 
+d="M183 747c13.334 7.33301 27.667 11.333 43 12c15.334 0.666992 29.667 -1.33301 43 -6s24.333 -12.667 33 -24c8.66699 -11.3389 14.333 -23.6719 17 -37c2.66699 -16 -1.66699 -36 -13 -60s-25 -42 -41 -54c-8.66699 -6.66699 -14.667 -12.667 -18 -18
+s-5.33301 -12 -6 -20c0 -5.33301 1 -10 3 -14s4.33301 -6.66699 7 -8c2.66699 -1.33691 7.66699 -6.00391 15 -14c7.33496 -8 14.668 -17 22 -27c13.333 -16.668 21.333 -29.334 24 -38c2.66699 -8.66699 5.33301 -24.667 8 -48c2 -30.667 1.33301 -52.334 -2 -65
+c-3.33301 -12.667 -12.667 -27.334 -28 -44c-8.66797 -10 -14.335 -18.333 -17 -25c-2.66699 -6.66699 -4 -13.333 -4 -20c1.33301 -12.667 8.33301 -21.667 21 -27s34.667 -8 66 -8c22 0 37.333 1 46 3c8.66699 1.33301 17.667 5 27 11l20 14l-12 -17
+c-8 -11.333 -10.667 -22.667 -8 -34l3 -17h-136c-32.667 0 -57.667 -0.333008 -75 -1s-33.667 -1.33301 -49 -2s-27.333 -3 -36 -7c-8.66797 -4 -16.334 -8 -23 -12c-6.66797 -4 -14.334 -10.667 -23 -20c-21.333 -20 -35.333 -45.667 -42 -77s-5.66699 -63 3 -95
+c4.66699 -17.333 13.334 -33.333 26 -48c12.667 -14.667 27.333 -26.667 44 -36s35 -17 55 -23s40.333 -8 61 -6s40.333 6.66699 59 14c20.667 8.66602 35.333 19.333 44 32s14.667 32 18 58c2 18 2.33301 31.333 1 40s-5 19.667 -11 33c-8 16 -17.667 28.667 -29 38
+s-21 12.667 -29 10c-4 -2 -6.33301 -5.33301 -7 -10s-0.666992 -12.333 0 -23c2.66699 -17.333 0.333008 -35.333 -7 -54s-17.333 -32.333 -30 -41s-26 -13 -40 -13c-12 0 -27.333 5 -46 15s-31.667 22 -39 36c-12 24 -12.667 47.667 -2 71s30.333 41.667 59 55
+c16 8 32 12 48 12s38.667 -3.33301 68 -10c26.667 -6 47 -15 61 -27s26 -31.667 36 -59c5.33301 -13.333 8.33301 -24 9 -32c0.658203 -8 -0.674805 -21 -4 -39c-3.33301 -18 -7 -30.667 -11 -38s-11.333 -15.667 -22 -25c-16.667 -14.667 -36.667 -27.667 -60 -39
+c-16 -8 -29 -12.667 -39 -14c-10 -1.33105 -28 -1.66406 -54 -1c-51.333 2.66699 -93.333 13 -126 31s-58.667 46 -78 84c-11.333 22.667 -17.333 43.667 -18 63s4 42.333 14 69c13.333 35.333 29.333 62 48 80s46 32.667 82 44c16.667 5.33301 34.333 13.333 53 24
+s32 21 40 31c10 10.667 22 28 36 52c10 16.667 16 29 18 37s2.33301 23.333 1 46c-2 30.667 -8.33301 54 -19 70c-9.33301 14 -21.667 26.333 -37 37s-29 16 -41 16s-26 -9.33301 -42 -28s-27 -37.667 -33 -57c-4 -14.667 -5.33301 -27.667 -4 -39
+c1.33301 -15.333 6.33301 -34 15 -56c0.666992 -2.66699 0 -6.66699 -2 -12s-4.66699 -10.333 -8 -15c-8.66797 -10 -16.668 -13.333 -24 -10c-7.33398 3.33301 -16.667 15 -28 35c-16.667 28.667 -19.333 57.667 -8 87c4 10 16 24.667 36 44s37.333 33 52 41
+c6.66699 4 11.333 8.33301 14 13s4 11.333 4 20c0 14.6709 -2 23.3379 -6 26c-6 3.33301 -13 15.667 -21 37s-12.333 38 -13 50c0 22.667 5.33301 42.334 16 59c10.667 16.6699 28 31.3359 52 44zM277 715c-8.66699 8.66699 -21.667 13.667 -39 15s-33.333 -0.333008 -48 -5
+c-11.333 -5.33301 -20.667 -13.333 -28 -24s-11.333 -22 -12 -34s0 -24 2 -36s7.33301 -22.333 16 -31s19 -14 31 -16c17.334 -3.31543 31.667 -2.64941 43 2c11.333 4.66699 22.333 14.667 33 30c8.66699 12 14 21.333 16 28c2 6.67188 2.33301 16.3379 1 29
+c-0.680664 8.66699 -2.34668 17 -5 25c-2.66699 8 -6 13.667 -10 17zM233 59c-7.33301 5.33301 -19 8.33301 -35 9s-27.333 -0.666992 -34 -4c-6.66699 -4.66699 -12 -12.667 -16 -24s-6 -24 -6 -38c0 -11.333 1.33301 -20 4 -26c0.666992 -2.66699 6 -9.66699 16 -21
+c8.66699 -10 20.667 -16.333 36 -19c12.667 -2 24 0.333008 34 7s16.667 16.667 20 30c3.33301 14 3 30.333 -1 49s-10 31 -18 37z" />
+    <glyph glyph-name="uniE904" unicode="&#xe904;" horiz-adv-x="677" 
+d="M337 -808h-25v693h-287v-93h-25v417h25v-86h287v86h25v-1017zM312 -50v108h-287v-108h287zM518 -290l30 10v-603h-30v593zM535 325l142 -178l-142 -178l-144 178zM508 249l-54 -67l112 -138l52 66zM535 37l142 -178l-142 -178l-144 178zM508 -39l-54 -67l112 -138l52 66z
+" />
+    <glyph glyph-name="uniE909" unicode="&#xe909;" horiz-adv-x="309" 
+d="M0 595h28v-242h252v242h29v-531h-281v-128h281v-538h-29v247h-252v-247h-28v1197zM280 255h-252v-91h252v91zM280 -172h-252v-91h252v91z" />
   </font>
 </defs></svg>
diff --git a/fonts/supported.xsl b/fonts/supported.xsl
index 38373b1a7ae..6a07aa094ab 100644
--- a/fonts/supported.xsl
+++ b/fonts/supported.xsl
@@ -2124,15 +2124,15 @@
         <medievalAndRenaissanceClefs>
             <description>Medieval and Renaissance clefs</description>
             <!--<glyph glyph-code="E900" smufl-name="mensuralGclef"/>-->
-            <!--<glyph glyph-code="E901" smufl-name="mensuralGclefPetrucci"/>-->
+            <glyph glyph-code="E901" smufl-name="mensuralGclefPetrucci"/>
             <!--<glyph glyph-code="E902" smufl-name="chantFclef"/>-->
             <!--<glyph glyph-code="E903" smufl-name="mensuralFclef"/>-->
-            <!--<glyph glyph-code="E904" smufl-name="mensuralFclefPetrucci"/>-->
+            <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="E909" smufl-name="mensuralCclefPetrucciPosMiddle"/>-->
+            <glyph glyph-code="E909" smufl-name="mensuralCclefPetrucciPosMiddle"/>
             <!--<glyph glyph-code="E90A" smufl-name="mensuralCclefPetrucciPosHigh"/>-->
             <!--<glyph glyph-code="E90B" smufl-name="mensuralCclefPetrucciPosHighest"/>-->
             <range_end>U+E90F</range_end>
diff --git a/include/vrv/smufl.h b/include/vrv/smufl.h
index 8cdc759e804..7a0f6b8e1f1 100644
--- a/include/vrv/smufl.h
+++ b/include/vrv/smufl.h
@@ -125,6 +125,9 @@ enum {
   SMUFL_E888_tuplet8 = 0xE888,
   SMUFL_E889_tuplet9 = 0xE889,
   SMUFL_E88A_tupletColon = 0xE88A,
+  SMUFL_E901_mensuralGclefPetrucci = 0xE901,
+  SMUFL_E904_mensuralFclefPetrucci = 0xE904,
+  SMUFL_E909_mensuralCclefPetrucciPosMiddle = 0xE909,
   SMUFL_E938_mensuralNoteheadSemibrevisBlack = 0xE938,
   SMUFL_E939_mensuralNoteheadSemibrevisVoid = 0xE939,
   SMUFL_E93C_mensuralNoteheadMinimaWhite = 0xE93C,
@@ -132,7 +135,7 @@ enum {
 };
 
 /** The number of glyphs for verification **/
-#define SMUFL_COUNT 107
+#define SMUFL_COUNT 110
 
 } // vrv namespace
 

From 6d7362e55b14c4d8279a9431133ebf40a00dc5ee Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 17 Sep 2015 14:45:56 +0200
Subject: [PATCH 25/85] Finalizing

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

diff --git a/include/vrv/style.h b/include/vrv/style.h
index f6bc0a177c9..47904b85b2c 100644
--- a/include/vrv/style.h
+++ b/include/vrv/style.h
@@ -141,7 +141,7 @@ namespace vrv {
     
 // the maximum angle of a slur
 #define TEMP_STYLE_SLUR_MAX_SLOPE (45 * M_PI / 180)
-#define TEMP_STYLE_SLUR_CURVE_FACTOR 10 // a factor for allow more (0) or less (100) curved slurs
+#define TEMP_STYLE_SLUR_CURVE_FACTOR 5 // a factor for allow more (0) or less (100) curved slurs
 #define TEMP_STYLE_SLUR_HEIGHT_FACTOR 8 // high value means flatter slurs
 #define TEMP_STYLE_SLUR_CONTROL_POINT_FACTOR 5 // higher value means more curved at the end
     
diff --git a/src/view_floating.cpp b/src/view_floating.cpp
index ad0547143d2..d44b8107be4 100644
--- a/src/view_floating.cpp
+++ b/src/view_floating.cpp
@@ -475,7 +475,7 @@ float View::AdjustSlur(Slur *slur, Staff *staff, int layerN, bool up,  Point poi
     if (!spanningContentPoints.empty()) {
         AdjustSlurCurve(slur, &spanningContentPoints, p1, &rotatedP2, &adjustedRotatedC1, &adjustedRotatedC2, up, slurAngle );
         // Use the adjusted control points for ajusting the position (p1, p2 and angle will be updated)
-        AdjustSlurPosition(slur, &spanningContentPoints, p1, &rotatedP2, &adjustedRotatedC1, &adjustedRotatedC2, up, &slurAngle, false );
+        AdjustSlurPosition(slur, &spanningContentPoints, p1, &rotatedP2, &adjustedRotatedC1, &adjustedRotatedC2, up, &slurAngle, true );
         // Now readjust the curvature with the new p1 and p2 with the original control points
         GetControlPoints(p1, &rotatedP2, &rotatedC1, &rotatedC2, up, height, staff->m_drawingStaffSize);
         

From 44941c9138200bc336b7ff979b509caf08896c1f Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 17 Sep 2015 22:43:53 +0200
Subject: [PATCH 26/85] Fixing keySig and meterSig element alignment and grace
 notes within beams

---
 src/layerelement.cpp | 10 ++++++++--
 src/note.cpp         |  8 ++++++--
 src/view_element.cpp |  8 +++-----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index fc460b3819f..d10691e0471 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -256,7 +256,10 @@ int LayerElement::AlignHorizontally( ArrayPtrVoid *params )
             type = ALIGNMENT_KEYSIG_ATTR;
         }
         else {
-            type = ALIGNMENT_KEYSIG;
+            //type = ALIGNMENT_KEYSIG;
+            // We force this because they should appear only at the beginning of a measure and should be non justifiable
+            // We also need it because the PAE importer creates keySig (and not staffDef @key.sig)
+            type = ALIGNMENT_KEYSIG_ATTR;
         }
     }
     else if (this->Is() == MENSUR) {
@@ -278,7 +281,10 @@ int LayerElement::AlignHorizontally( ArrayPtrVoid *params )
             // replace the current meter signature
             (*currentMeterSig) = dynamic_cast<MeterSig*>(this);
             assert( *currentMeterSig );
-            type = ALIGNMENT_METERSIG;
+            //type = ALIGNMENT_METERSIG
+            // We force this because they should appear only at the beginning of a measure and should be non justifiable
+            // We also need it because the PAE importer creates meterSig (and not staffDef @meter)
+            type = ALIGNMENT_METERSIG_ATTR;
         }
     }
     else if ( (this->Is() == MULTIREST) || (this->Is() == MREST) || (this->Is() == MRPT) ) {
diff --git a/src/note.cpp b/src/note.cpp
index 319e765293c..2dfc2a31d3c 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -168,10 +168,14 @@ bool Note::IsClusterExtreme()
 bool Note::HasDrawingStemDir()
 {
     // In chord, the value is set in Chord::SetDrawingStemDir
-    // In beam, the value is tet in View::DrawBeam
     Chord* chordParent = dynamic_cast<Chord*>(this->GetFirstParent( CHORD, MAX_CHORD_DEPTH));
+    if(chordParent) {
+        return true;
+    }
+    // In beam, the value is tet in View::DrawBeam - however, we need to check that the note is part of the beam
+    // It is not necessary the case with grace notes
     Beam* beamParent = dynamic_cast<Beam*>(this->GetFirstParent( BEAM, MAX_BEAM_DEPTH));
-    if(chordParent || beamParent) {
+    if (beamParent && (beamParent->GetListIndex(this) > -1)) {
         return true;
     }
     else if (this->HasStemDir()) {
diff --git a/src/view_element.cpp b/src/view_element.cpp
index dda50d30c53..33b53072386 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -226,8 +226,8 @@ void View::DrawNote ( DeviceContext *dc, LayerElement *element, Layer *layer, St
     // to see if beamed or not
     Beam *beam_parent = dynamic_cast<Beam*>(note->GetFirstParent( BEAM ));
     
-    // This note is beamed and cue sized
     if (beam_parent != NULL) {
+        // This note is beamed and cue sized
         if (drawingCueSize == true) {
             // Get the Parent of the parent
             // we want to see if we are in a group of
@@ -235,7 +235,6 @@ void View::DrawNote ( DeviceContext *dc, LayerElement *element, Layer *layer, St
             if (beam_parent->GetListIndex(note) > -1) {
                 inBeam = true;
             }
-                        
         }
         else {
             // the note is just in a beam
@@ -667,8 +666,7 @@ void View::DrawMultiRest(DeviceContext *dc, LayerElement *element, Layer *layer,
     
     int width = measure->GetRightBarlineX() - measure->GetNonJustifiableLeftMargin();
     int xCentered = measure->GetDrawingX() + measure->GetNonJustifiableLeftMargin() + (width / 2);
-
-    
+  
     // We do not support more than three chars
     int num = std::min( multiRest->GetNum(), 999);
     
@@ -1931,7 +1929,7 @@ void View::DrawAcciaccaturaSlash(DeviceContext *dc, LayerElement *element)
                      ToDeviceContextX(startPoint.x - positionShiftX1 ),
                      ToDeviceContextY(startPoint.y + positionShiftY1),
                      ToDeviceContextX(startPoint.x + positionShiftX2),
-                     ToDeviceContextY(note->GetDrawingStemStart().y + positionShiftY2));
+                     ToDeviceContextY(startPoint.y + positionShiftY2));
     } else {
         dc->DrawLine(ToDeviceContextX(startPoint.x - positionShiftX1),
                      ToDeviceContextY(startPoint.y - positionShiftY1),

From 0a8b1fdd4dbfb8fa876032564d4db6cc2dcf881a Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Thu, 17 Sep 2015 17:06:23 -0400
Subject: [PATCH 27/85] In mensural notation, always use mensural noteheads
 instead of CMN noteheads for durations shorter than semibrevis.

---
 src/view_mensural.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/view_mensural.cpp b/src/view_mensural.cpp
index 4be08c3b532..406e16b2099 100644
--- a/src/view_mensural.cpp
+++ b/src/view_mensural.cpp
@@ -73,7 +73,7 @@ void View::DrawMensuralNote ( DeviceContext *dc, LayerElement *element, Layer *l
     
     drawingDur = note->GetDrawingDur();
     
-    int radius = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, pseudoStaffSize, false) / 2;
+    int radius = m_doc->GetGlyphWidth(SMUFL_E93C_mensuralNoteheadMinimaWhite, pseudoStaffSize, false) / 2;
     
     if (drawingDur > DUR_1 || (drawingDur == DUR_1 && staff->notAnc)) {	// annuler provisoirement la modif. des lignes addit.
         ledge = m_doc->GetDrawingLedgerLineLength(pseudoStaffSize, false);
@@ -116,15 +116,15 @@ void View::DrawMensuralNote ( DeviceContext *dc, LayerElement *element, Layer *l
         
         DrawSmuflCode( dc, xNote, noteY, charCode, pseudoStaffSize, false );
     }
-    // Shorter values ??WE WANT MENSURAL NOTEHEADS, NOT CMN!!!!!!!!
+    // Shorter values
    else {
         if (note->GetColored()) {
-            if (drawingDur == DUR_2) charCode = SMUFL_E0A3_noteheadHalf;
-            else charCode = SMUFL_E0A4_noteheadBlack;
+            if (drawingDur == DUR_2) charCode = SMUFL_E93D_mensuralNoteheadSemiminimaWhite;
+            else charCode = SMUFL_E93C_mensuralNoteheadMinimaWhite;
         }
         else {
-            if (drawingDur > DUR_2) charCode = SMUFL_E93C_mensuralNoteheadMinimaWhite;
-            else charCode = SMUFL_E0A3_noteheadHalf;
+            if (drawingDur == DUR_2) charCode = SMUFL_E93C_mensuralNoteheadMinimaWhite;
+            else charCode = SMUFL_E93D_mensuralNoteheadSemiminimaWhite;
         }
 
         DrawSmuflCode( dc, xNote, noteY, charCode,  pseudoStaffSize, false );

From ec667eeadb4565fd4960d543e50e93d0ba39fc28 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 18 Sep 2015 09:15:19 +0200
Subject: [PATCH 28/85] Adding functor for retrieving longest (or shortest)
 duration in the tree

---
 include/vrv/att_comparison.h | 54 ++++++++++++++++++++++++++++++++++++
 include/vrv/object.h         | 15 ++++++++++
 src/object.cpp               | 27 +++++++++++++++++-
 src/page.cpp                 | 11 ++++++++
 4 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/include/vrv/att_comparison.h b/include/vrv/att_comparison.h
index 300324dd2c2..45b97edb4bb 100644
--- a/include/vrv/att_comparison.h
+++ b/include/vrv/att_comparison.h
@@ -9,13 +9,22 @@
 #define __VRV_ATT_COMPARISON_H__
 
 #include "atts_shared.h"
+#include "durationinterface.h"
 
 namespace vrv {
     
+enum DurExtreme {
+    LONGEST = 0,
+    SHORTEST
+};
+    
 //----------------------------------------------------------------------------
 // AttCommonNComparison
 //----------------------------------------------------------------------------
 
+/**
+ * This class evaluates if the object is of a certain ClassId and has a @n of value n.
+ */
 class AttCommonNComparison: public AttComparison
 {
 
@@ -43,6 +52,51 @@ class AttCommonNComparison: public AttComparison
     
 };
     
+//----------------------------------------------------------------------------
+// AttDurExtreme
+//----------------------------------------------------------------------------
+
+/**
+ * This class evaluates if the object the extreme duration so far
+ * The object has to have a DurationInterface and to have a @dur.
+ * The class can look for LONGEST or SHORTEST duration (Constructor)
+ */
+class AttDurExtreme: public AttComparison
+{
+    
+public:
+    AttDurExtreme(DurExtreme extremeType):
+        AttComparison(OBJECT)
+    {
+        m_extremeType = extremeType;
+        if (m_extremeType == LONGEST) m_extremeDur = -VRV_UNSET;
+        else m_extremeDur = VRV_UNSET;
+    };
+    
+    virtual bool operator() (Object *object)
+    {
+        if (!object->HasInterface(INTERFACE_DURATION)) return false;
+        DurationInterface *interface = dynamic_cast<DurationInterface*>(object);
+        assert( interface );
+        if (interface->HasDur()) {
+            if ((m_extremeType == LONGEST) && (interface->GetActualDur() < m_extremeDur)) {
+                m_extremeDur = interface->GetActualDur();
+                return true;
+            }
+            else if ((m_extremeType == SHORTEST) && (interface->GetActualDur() > m_extremeDur)) {
+                m_extremeDur = interface->GetActualDur();
+                return true;
+            }
+        }
+        return false;
+    }
+    
+private:
+    int m_extremeDur;
+    DurExtreme m_extremeType;
+    
+};
+    
 } // namespace vrv
 
 #endif
diff --git a/include/vrv/object.h b/include/vrv/object.h
index 94ab598d00d..5cc84db11a7 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -237,6 +237,13 @@ class Object
     Object *FindChildByAttComparison( AttComparison *attComparison,
                                      int deepness = UNLIMITED_DEPTH, bool direction = FORWARD );
     
+    /**
+     * Return the element matching the extreme value with an AttComparison functor
+     * Deepness allow to limit the depth search (EditorialElements are not count)
+     */
+    Object *FindChildExtremeByAttComparison( AttComparison *attComparison,
+                                     int deepness = UNLIMITED_DEPTH, bool direction = FORWARD );
+    
     /**
      * Give up ownership of the child at the idx position (NULL if not found)
      * This is a method to used only in very particular case where the child
@@ -364,6 +371,14 @@ class Object
      * param 1: the pointer to pointer to the Object retrieved (if found).
      */
     virtual int FindByAttComparison( ArrayPtrVoid *params );
+
+    /**
+     * Find a Object with the extreme value with a AttComparison functor .
+     * param 0: the pointer to the AttComparsion we are evaluating.
+     * param 1: the pointer to pointer to the Object retrieved (if found).
+     */
+    virtual int FindExtremeByAttComparison( ArrayPtrVoid *params );
+
     
     /**
      * Save the content of and object by calling the appropriate FileOutputStream method
diff --git a/src/object.cpp b/src/object.cpp
index eb336829dd1..28a5b9929fb 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -275,6 +275,17 @@ Object *Object::FindChildByAttComparison( AttComparison *attComparison, int deep
     return element;
 }
     
+Object *Object::FindChildExtremeByAttComparison( AttComparison *attComparison, int deepness, bool direction )
+{
+    Functor findExtremeByAttComparison( &Object::FindExtremeByAttComparison );
+    Object *element = NULL;
+    ArrayPtrVoid params;
+    params.push_back( attComparison );
+    params.push_back( &element );
+    this->Process( &findExtremeByAttComparison, &params, NULL, NULL, deepness, direction );
+    return element;
+}
+    
 Object* Object::GetChild( int idx )
 {
     if ( (idx < 0) || (idx >= (int)m_children.size()) ) {
@@ -918,7 +929,21 @@ int Object::FindByAttComparison( ArrayPtrVoid *params )
     //LogDebug("Still looking for the object matching the AttComparison...");
     return FUNCTOR_CONTINUE;
 }
-
+    
+int Object::FindExtremeByAttComparison( ArrayPtrVoid *params )
+{
+    // param 0: the type we are looking for
+    // param 1: the pointer to pointer to the Object
+    AttComparison *test = static_cast<AttComparison*>((*params).at(0));
+    Object **element = static_cast<Object**>((*params).at(1));
+    
+    // evaluate by applying the AttComparison operator()
+    if ((*test)(this)) {
+        (*element) = this;
+    }
+    // continue until the end
+    return FUNCTOR_CONTINUE;
+}
     
 int Object::SetCurrentScoreDef( ArrayPtrVoid *params )
 {
diff --git a/src/page.cpp b/src/page.cpp
index aebb1fd8e99..f62bc5d2dcc 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -14,10 +14,12 @@
 
 //----------------------------------------------------------------------------
 
+#include "att_comparison.h"
 #include "bboxdevicecontext.h"
 #include "doc.h"
 #include "system.h"
 #include "view.h"
+#include "vrv.h"
 
 namespace vrv {
 
@@ -115,6 +117,15 @@ void Page::LayOutHorizontally( )
     // 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->GetEvenSpacing()) {
+        // Get the longest duration in the piece
+        AttDurExtreme durExtremeComparison(LONGEST);
+        Object *longestDur = this->FindChildExtremeByAttComparison(&durExtremeComparison);
+        if (longestDur) {
+            DurationInterface *interface = dynamic_cast<DurationInterface*>(longestDur);
+            assert(interface);
+            LogDebug("Longest duration is %d", interface->GetActualDur());
+        }
+
         params.clear();
         double previousTime = 0.0;
         int previousXRel = 0;

From 0e1f2ffc82baad3d5d80dac452a00c6fddf0fee2 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 18 Sep 2015 09:58:06 +0200
Subject: [PATCH 29/85] Starting 0.9.10-dev

---
 include/vrv/vrvdef.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index bd37ccb006b..97e5cc715cf 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -27,9 +27,9 @@ namespace vrv {
 
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 9
-#define VERSION_REVISION 9
+#define VERSION_REVISION 10
 // Adds "-dev" in the version number - should be set to false for releases
-#define VERSION_DEV false
+#define VERSION_DEV true
 
 //----------------------------------------------------------------------------
 // Typedefs

From bf43e562c3a7d23b7bd04e268d6de04ef5d18932 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 19 Sep 2015 09:38:42 +0200
Subject: [PATCH 30/85] Bug fix for tie direction in chords

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

diff --git a/src/view_floating.cpp b/src/view_floating.cpp
index ae0951cef72..a5c74a8f20e 100644
--- a/src/view_floating.cpp
+++ b/src/view_floating.cpp
@@ -764,7 +764,7 @@ void View::DrawTie( DeviceContext *dc, Tie *tie, int x1, int x2, Staff *staff,
     
     Note *note1 = NULL;
     Note *note2 = NULL;
-    Chord *parentChord = NULL;
+    Chord *parentChord1 = NULL;
     
     bool up = true;
     data_STEMDIRECTION noteStemDir = STEMDIRECTION_NONE;
@@ -780,7 +780,7 @@ void View::DrawTie( DeviceContext *dc, Tie *tie, int x1, int x2, Staff *staff,
         return;
     }
     
-    Chord *chordParent1 = note1->IsChordTone();
+    parentChord1 = note1->IsChordTone();
     
     Layer* layer1 = dynamic_cast<Layer*>(note1->GetFirstParent( LAYER ) );
     Layer* layer2 = dynamic_cast<Layer*>(note2->GetFirstParent( LAYER ) );
@@ -794,7 +794,7 @@ void View::DrawTie( DeviceContext *dc, Tie *tie, int x1, int x2, Staff *staff,
     
     bool isShortTie = false;
     // shortTie correction cannot be applied for chords
-    if (!chordParent1 && (x2 - x1 < 3 * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize))) isShortTie = true;
+    if (!parentChord1 && (x2 - x1 < 3 * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize))) isShortTie = true;
     
     // the normal case
     if ( spanningType == SPANNING_START_END ) {
@@ -806,8 +806,8 @@ void View::DrawTie( DeviceContext *dc, Tie *tie, int x1, int x2, Staff *staff,
             if (note1->HasDots()) {
                 x1 += m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * note1->GetDots();
             }
-            else if (chordParent1 && chordParent1->HasDots()) {
-                x1 += m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * chordParent1->GetDots();
+            else if (parentChord1 && parentChord1->HasDots()) {
+                x1 += m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * parentChord1->GetDots();
             }
         }
         noteStemDir = note1->GetDrawingStemDir();
@@ -848,9 +848,9 @@ void View::DrawTie( DeviceContext *dc, Tie *tie, int x1, int x2, Staff *staff,
         up = layer1->GetDrawingStemDir() == STEMDIRECTION_up ? true : false;
     }
     //  the look if in a chord
-    else if (parentChord) {
-        if (parentChord->PositionInChord(note1) < 0) up = false;
-        else if (parentChord->PositionInChord(note1) > 0) up = true;
+    else if (parentChord1) {
+        if (parentChord1->PositionInChord(note1) < 0) up = false;
+        else if (parentChord1->PositionInChord(note1) > 0) up = true;
         // away from the stem if odd number (center note)
         else up = (noteStemDir != STEMDIRECTION_up);
     }

From c47058263fd9f73710363d9e2a4c87dd2a182eca Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 22 Sep 2015 07:43:55 +0200
Subject: [PATCH 31/85] Fixing fermatas

---
 include/vrv/view.h   |  2 +-
 src/view_element.cpp | 82 +++++++++++++++++++++++---------------------
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/include/vrv/view.h b/include/vrv/view.h
index 5bd0177e477..393b2a7ef17 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -238,7 +238,7 @@ class View
     void DrawAcciaccaturaSlash(DeviceContext *dc, LayerElement *element);
     void DrawBreveRest ( DeviceContext *dc, int x, int y, Staff *staff );
     void DrawDots ( DeviceContext *dc, int x, int y, unsigned char dots, Staff *staff );
-    void DrawFermata(DeviceContext *dc, LayerElement *element, Staff *staff);
+    void DrawFermata(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff);
     void DrawLedgerLines ( DeviceContext *dc, LayerElement *element, Staff *staff, bool aboveStaff, bool doubleLength, int skip, int n);
     void DrawLongRest ( DeviceContext *dc, int x, int y, Staff *staff);
     void DrawMeterSigFigures( DeviceContext *dc, int x, int y, int num, int numBase, Staff *staff);
diff --git a/src/view_element.cpp b/src/view_element.cpp
index 33b53072386..35351ffb514 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -434,7 +434,7 @@ void View::DrawNote ( DeviceContext *dc, LayerElement *element, Layer *layer, St
     if (!inChord) DrawLayerChildren(dc, note, layer, staff, measure);
 
     if (note->GetFermata() != PLACE_NONE) {
-        DrawFermata(dc, element, staff);
+        DrawFermata(dc, element, layer, staff);
     }
 
     if (note->m_embellishment == EMB_TRILL) {
@@ -620,7 +620,7 @@ void View::DrawRest ( DeviceContext *dc, LayerElement *element, Layer *layer, St
     }
     
     if(rest->GetFermata() != PLACE_NONE) {
-        DrawFermata(dc, element, staff);
+        DrawFermata(dc, element, layer, staff);
     }
 }
     
@@ -1941,12 +1941,7 @@ void View::DrawAcciaccaturaSlash(DeviceContext *dc, LayerElement *element)
     dc->ResetBrush();
 }
 
-/** Draws a fermata
- rest - the fermata is always above the stavv
- note - for breves and semibreves, only above the staff
-      - for flagged notes, the fermata is on the side of the notehead
- */
-void View::DrawFermata(DeviceContext *dc, LayerElement *element, Staff *staff)
+void View::DrawFermata(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff)
 {
     int x, y;
     int emb_offset = 0; // if there is and embellishment, offset the note up
@@ -1954,50 +1949,57 @@ void View::DrawFermata(DeviceContext *dc, LayerElement *element, Staff *staff)
     // We move the fermata position of half of the fermata size
     x = element->GetDrawingX() - m_doc->GetGlyphWidth(SMUFL_E4C0_fermataAbove, staff->m_drawingStaffSize, false) / 2;
     
+    data_PLACE place = PLACE_above;
+    if (layer->GetDrawingStemDir() != STEMDIRECTION_NONE) {
+        place = (layer->GetDrawingStemDir() == STEMDIRECTION_up) ? PLACE_above : PLACE_above;
+    }
+    
     // First case, notes
-    if (element->Is() == NOTE) {
-        Note *note = dynamic_cast<Note*>(element);
-        assert( note );
-        
-        /*
-        // stem down or semibreve/longa, fermata up!
-        if (!element->m_drawingStemDir && (note->m_dur != DUR_1 || note->m_dur != DUR_BR)) {
-        */
-            // only for up-fermatas, if there is a trill on the same note
-            if (note->m_embellishment)
+    if ((element->Is() == NOTE) || (element->Is() == CHORD)) {
+        // To be fix once m_embellishment is removed
+        if (element->Is() == NOTE)  {
+            Note *note = dynamic_cast<Note*>(element);
+            assert( note );
+            if (note->m_embellishment) {
                 emb_offset = m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-            
+            }
+        }
+        
+        if (place == PLACE_above) {
             // check that the notehead is in the staff.
-            if ((element->GetDrawingY()) < staff->GetDrawingY())
+            if (element->GetDrawingTop(m_doc, staff->m_drawingStaffSize) < staff->GetDrawingY()) {
                 // in the staff, set the fermata 20 pixels above the last line (+ embellishment offset)
                 y = staff->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) + emb_offset;
-            else
+            }
+            else {
                 // out of the staff, place the trill above the notehead
-                y = (element->GetDrawingY()) + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) + emb_offset;
-            
-            // draw the up-fermata
+                y = element->GetDrawingTop(m_doc, staff->m_drawingStaffSize) + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) + emb_offset;
+            }
+            // draw the up-fermata - need cue size support
             DrawSmuflCode ( dc, x, y, SMUFL_E4C0_fermataAbove, staff->m_drawingStaffSize, false );
-        /*
-        } else { // stem up fermata down
-            
+        }
+        else {
             // This works as above, only we check that the note head is not
-            // UNDER the staff
-            if ((element->GetDrawingY()) > (staff->GetDrawingY() - m_doc->m_drawingStaffSize.at(staff->m_drawingStaffSize)))
+            if (element->GetDrawingBottom(m_doc, staff->m_drawingStaffSize) > (staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize))) {
                 // notehead in staff, set  under
-                y = staff->GetDrawingY() - m_doc->m_drawingStaffSize.at(staff->m_drawingStaffSize) - m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-            else
+                y = staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize) - m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            }
+            else {
                 // notehead under staff, set under notehead
-                y = (element->GetDrawingY()) - m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-            
-            DrawSmuflCode ( dc, x, y, LEIPZIG_FERMATA_DOWN, staff, false );
+                y = element->GetDrawingBottom(m_doc, staff->m_drawingStaffSize) - m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            }
+            // draw the down-fermata - need cue size support
+            DrawSmuflCode ( dc, x, y, SMUFL_E4C1_fermataBelow, staff->m_drawingStaffSize, false );
         }
-        */
     } else if (element->Is() == REST) {
-        // this is a rest
-        // rests for the moment are always in the staff
-        // so just place the fermata above the staff
-        y = staff->GetDrawingY() + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-        DrawSmuflCode ( dc, x, y, SMUFL_E4C0_fermataAbove, staff->m_drawingStaffSize, false );
+        if (place == PLACE_above) {
+            y = staff->GetDrawingY() + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+            DrawSmuflCode ( dc, x, y, SMUFL_E4C0_fermataAbove, staff->m_drawingStaffSize, false );
+        }
+        else {
+            y = staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize) - m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            DrawSmuflCode ( dc, x, y, SMUFL_E4C1_fermataBelow, staff->m_drawingStaffSize, false );
+        }
     }
 }
 

From dfc6e084c9880fdc59cc15953f46eb9c0aa704b2 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 23 Sep 2015 18:12:53 +0200
Subject: [PATCH 32/85] Adding namespace for local Plain and Easy classes (note
 and measure)

---
 include/vrv/iopae.h | 54 ++++++++++++++++++++++-----------------------
 src/iopae.cpp       | 37 ++++++++++++++-----------------
 2 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/include/vrv/iopae.h b/include/vrv/iopae.h
index 2445cf88c83..6233601473f 100644
--- a/include/vrv/iopae.h
+++ b/include/vrv/iopae.h
@@ -31,11 +31,17 @@ class Tie;
 class Tuplet;
 class KeySig;
 class Barline;
+    
+//----------------------------------------------------------------------------
+// namespace for local Plain and Easy classes
+//----------------------------------------------------------------------------
+
+namespace pae {
 
+class Note {
 
-class NoteObject {
 public:
-    NoteObject(const NoteObject &old) { // for STL vector
+    Note(const pae::Note &old) { // for STL vector
         //mnote = old.mnote;
         //mrest = old.mrest;         
         tie = old.tie;
@@ -59,7 +65,7 @@ class NoteObject {
         tuplet_notes = old.tuplet_notes;
         tuplet_note = old.tuplet_note;
     }
-    NoteObject(void) { clear(); };
+    Note(void) { clear(); };
     void   clear(void) {
         appoggiatura = 0;
         acciaccatura = fermata = trill = false;
@@ -81,7 +87,7 @@ class NoteObject {
         key = NULL;
     };
     
-    NoteObject& operator=(const NoteObject& d){ // for STL vector
+    Note& operator=(const Note& d){ // for STL vector
         //mnote = d.mnote;
         //mrest = d.mrest;         
         tie = d.tie;
@@ -136,10 +142,11 @@ class NoteObject {
 };
 
 
-class MeasureObject {
+class Measure {
+
 public:
     
-    MeasureObject(const MeasureObject& d){ // for STL vector
+    Measure(const Measure& d){ // for STL vector
         clef = d.clef;
         meter = d.meter;
         notes = d.notes;
@@ -153,9 +160,9 @@ class MeasureObject {
         abbreviation_offset = d.abbreviation_offset;  
         wholerest = d.wholerest;
     } 
-    MeasureObject(void) { clear(); };
+    Measure(void) { clear(); };
     
-    MeasureObject& operator=(const MeasureObject& d){ // for STL vector
+    Measure& operator=(const Measure& d){ // for STL vector
         clef = d.clef;
         meter = d.meter;
         notes = d.notes;
@@ -191,7 +198,7 @@ class MeasureObject {
     MeterSig *meter;
     KeySig *key;
     
-    std::vector<NoteObject> notes;
+    std::vector<pae::Note> notes;
     
     std::vector<data_DURATION> durations;
     std::vector<int> dots; // use the same offset as durations, they are used in parallel
@@ -200,17 +207,8 @@ class MeasureObject {
     int    abbreviation_offset;  
     int    wholerest;   // number of whole rests to process
 };
-
-
-//////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-
+    
+} // namespace pae
 
 //----------------------------------------------------------------------------
 // PaeInput
@@ -241,22 +239,22 @@ class PaeInput: public FileInputStream
      int       getBarline          (const char *incipit, data_BARRENDITION *output, int index );
      int       getAccidental       (const char* incipit, data_ACCIDENTAL_EXPLICIT *accident, int index = 0);
      int       getOctave           (const char* incipit, char *octave, int index = 0 );
-     int       getDurations        (const char* incipit, MeasureObject *measure, int index = 0);
+     int       getDurations        (const char* incipit, pae::Measure *measure, int index = 0);
      int       getDuration         (const char* incipit, data_DURATION *duration, int *dot, int index );
-     int       getTupletFermata    (const char* incipit, NoteObject *note, int index = 0);
-     int       getTupletFermataEnd (const char* incipit, NoteObject *note, int index = 0);
-     int       getGraceNote        (const char* incipit, NoteObject *note, int index = 0);
+     int       getTupletFermata    (const char* incipit, pae::Note *note, int index = 0);
+     int       getTupletFermataEnd (const char* incipit, pae::Note *note, int index = 0);
+     int       getGraceNote        (const char* incipit, pae::Note *note, int index = 0);
      int       getWholeRest        (const char* incipit, int *wholerest, int index );
-     int       getAbbreviation     (const char* incipit, MeasureObject *measure, int index = 0 ); 
-     int       getNote             (const char* incipit, NoteObject *note, MeasureObject *measure, int index = 0 );
+     int       getAbbreviation     (const char* incipit, pae::Measure *measure, int index = 0 ); 
+     int       getNote             (const char* incipit, pae::Note *note, pae::Measure *measure, int index = 0 );
      
      data_PITCHNAME       getPitch            (char c_note );
      
      // output functions
      void      addLayerElement     (LayerElement *element);
-     void      parseNote           (NoteObject note);
+     void      parseNote           (pae::Note note);
      void      popContainer        ();
-     void      convertMeasure        (MeasureObject *measure);
+     void      convertMeasure        (pae::Measure *measure);
      void      pushContainer       (LayerElement *container);
 
 
diff --git a/src/iopae.cpp b/src/iopae.cpp
index 3e76d7e6d4b..d5414198896 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -59,16 +59,13 @@ char data_line[10001] = {0};
 char data_key[MAX_DATA_LEN]; 
 char data_value[MAX_DATA_LEN]; //ditto as above
 
-
-//////////////////////////////////////////////////////////////////////////
-
 //----------------------------------------------------------------------------
 // PaeInput
 //----------------------------------------------------------------------------
 
 PaeInput::PaeInput( Doc *doc, std::string filename ) :
-// This is pretty bad. We open a bad fileoinputstream as we don't use it
-FileInputStream( doc )
+    // This is pretty bad. We open a bad fileoinputstream as we don't use it
+    FileInputStream( doc )
 {
     m_filename = filename;
 	m_staff = NULL;
@@ -127,11 +124,11 @@ void PaeInput::parsePlainAndEasy(std::istream &infile) {
     int in_beam = 0;
     
     std::string s_key;
-    MeasureObject current_measure;
-    NoteObject current_note;
+    pae::Measure current_measure;
+    pae::Note current_note;
     Clef *staffDefClef = NULL;
     
-    std::vector<MeasureObject> staff;
+    std::vector<pae::Measure> staff;
     
     // read values
     while (!infile.eof()) {
@@ -265,7 +262,7 @@ void PaeInput::parsePlainAndEasy(std::istream &infile) {
         
         // measure repetition
         else if ((incipit[i] == 'i') && staff.size() > 0) {
-            MeasureObject last_measure = staff[staff.size() - 1];
+            pae::Measure last_measure = staff[staff.size() - 1];
             current_measure.notes = last_measure.notes;
             current_measure.wholerest = last_measure.wholerest;
             
@@ -361,7 +358,7 @@ void PaeInput::parsePlainAndEasy(std::istream &infile) {
     
     int measure_count = 1;
     
-    std::vector<MeasureObject>::iterator it;
+    std::vector<pae::Measure>::iterator it;
     for ( it = staff.begin() ; it < staff.end(); it++ ) {
         
         m_staff = new Staff( 1 );
@@ -373,7 +370,7 @@ void PaeInput::parsePlainAndEasy(std::istream &infile) {
         m_measure->AddStaff( m_staff );
         system->AddMeasure( m_measure );
         
-        MeasureObject obj = *it;
+        pae::Measure obj = *it;
         convertMeasure( &obj );
         measure_count++;
     }
@@ -480,7 +477,7 @@ int PaeInput::getDuration(const char* incipit, data_DURATION *duration, int *dot
 // getDurations --
 //
 
-int PaeInput::getDurations(const char* incipit, MeasureObject* measure, int index ) {
+int PaeInput::getDurations(const char* incipit, pae::Measure* measure, int index ) {
     
     int i = index;
     size_t length = strlen(incipit);
@@ -545,7 +542,7 @@ int PaeInput::getAccidental(const char* incipit, data_ACCIDENTAL_EXPLICIT *accid
 // getTupletOrFermata --
 //
 
-int PaeInput::getTupletFermata(const char* incipit, NoteObject* note, int index ) {
+int PaeInput::getTupletFermata(const char* incipit, pae::Note* note, int index ) {
     
     int i = index;
     size_t length = strlen(incipit);
@@ -633,7 +630,7 @@ int PaeInput::getTupletFermata(const char* incipit, NoteObject* note, int index
 // getTupletFermataEnd --
 //
 // this can be deleted in the future?
-int PaeInput::getTupletFermataEnd(const char* incipit, NoteObject *note, int index ) {
+int PaeInput::getTupletFermataEnd(const char* incipit, pae::Note *note, int index ) {
     
     int i = index;
     //int length = strlen(incipit);
@@ -651,7 +648,7 @@ int PaeInput::getTupletFermataEnd(const char* incipit, NoteObject *note, int ind
 // getGraceNote --
 //
 
-int PaeInput::getGraceNote(const char* incipit, NoteObject *note, int index ) {
+int PaeInput::getGraceNote(const char* incipit, pae::Note *note, int index ) {
     
     int i = index;
     size_t length = strlen(incipit);
@@ -925,7 +922,7 @@ int PaeInput::getBarline( const char *incipit, data_BARRENDITION *output, int in
 // getAbbreviation -- read abbreviation
 //
 
-int PaeInput::getAbbreviation(const char* incipit, MeasureObject *measure, int index ) {
+int PaeInput::getAbbreviation(const char* incipit, pae::Measure *measure, int index ) {
     
     size_t length = strlen(incipit);
     int i = index;
@@ -998,7 +995,7 @@ int PaeInput::getKeyInfo(const char *incipit, KeySig *key, int index ) {
 // getNote --
 //
 
-int PaeInput::getNote( const char* incipit, NoteObject *note, MeasureObject *measure, int index ) {
+int PaeInput::getNote( const char* incipit, pae::Note *note, pae::Measure *measure, int index ) {
     
     regex_t re;
     int oct;
@@ -1090,7 +1087,7 @@ int PaeInput::getNote( const char* incipit, NoteObject *note, MeasureObject *mea
 // convertMeasure --
 //
 
-void PaeInput::convertMeasure(MeasureObject *measure ) {
+void PaeInput::convertMeasure(pae::Measure *measure ) {
     
     if ( measure->clef != NULL ) {
         m_layer->AddLayerElement(measure->clef);
@@ -1113,7 +1110,7 @@ void PaeInput::convertMeasure(MeasureObject *measure ) {
     m_nested_objects.clear();
 
     for (unsigned int i=0; i<measure->notes.size(); i++) {
-        NoteObject note = measure->notes[i];
+        pae::Note note = measure->notes[i];
         parseNote(note);
     }
     
@@ -1124,7 +1121,7 @@ void PaeInput::convertMeasure(MeasureObject *measure ) {
 
 }
 
-void PaeInput::parseNote(NoteObject note) {
+void PaeInput::parseNote(pae::Note note) {
     
     LayerElement *element;
     

From eb98a5be5eb150483ceb94b3d6b3f590a3cc246b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 24 Sep 2015 07:49:09 +0200
Subject: [PATCH 33/85] Making parseNote in PAE take a reference

---
 include/vrv/iopae.h |  3 +-
 src/iopae.cpp       | 74 ++++++++++++++++++++++-----------------------
 2 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/include/vrv/iopae.h b/include/vrv/iopae.h
index 6233601473f..1c5b914ede1 100644
--- a/include/vrv/iopae.h
+++ b/include/vrv/iopae.h
@@ -138,7 +138,6 @@ class Note {
     Clef *clef;
     MeterSig *meter;
     KeySig *key;
-    
 };
 
 
@@ -252,7 +251,7 @@ class PaeInput: public FileInputStream
      
      // output functions
      void      addLayerElement     (LayerElement *element);
-     void      parseNote           (pae::Note note);
+     void      parseNote           (pae::Note *note);
      void      popContainer        ();
      void      convertMeasure        (pae::Measure *measure);
      void      pushContainer       (LayerElement *container);
diff --git a/src/iopae.cpp b/src/iopae.cpp
index d5414198896..25e0d99593a 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -1110,7 +1110,7 @@ void PaeInput::convertMeasure(pae::Measure *measure ) {
     m_nested_objects.clear();
 
     for (unsigned int i=0; i<measure->notes.size(); i++) {
-        pae::Note note = measure->notes[i];
+        pae::Note *note = &measure->notes[i];
         parseNote(note);
     }
     
@@ -1121,17 +1121,17 @@ void PaeInput::convertMeasure(pae::Measure *measure ) {
 
 }
 
-void PaeInput::parseNote(pae::Note note) {
+void PaeInput::parseNote(pae::Note *note) {
     
     LayerElement *element;
     
-    if (note.rest) {
+    if (note->rest) {
         Rest *rest =  new Rest();
         
-        rest->SetDots( note.dots );
-        rest->SetDur(note.duration);
+        rest->SetDots( note->dots );
+        rest->SetDur(note->duration);
 
-        if (note.fermata) {
+        if (note->fermata) {
             rest->SetFermata(PLACE_above); // always above for now
         }
         
@@ -1139,18 +1139,18 @@ void PaeInput::parseNote(pae::Note note) {
     } else {
         Note *mnote = new Note();
         
-        mnote->SetPname(note.pitch);
-        mnote->SetOct(note.octave);
-        mnote->SetAccid(note.accidental);
+        mnote->SetPname(note->pitch);
+        mnote->SetOct(note->octave);
+        mnote->SetAccid(note->accidental);
         
-        mnote->SetDots( note.dots );
-        mnote->SetDur(note.duration);
+        mnote->SetDots( note->dots );
+        mnote->SetDur(note->duration);
         
-        if (note.fermata) {
+        if (note->fermata) {
             mnote->SetFermata(PLACE_above); // always above for now
         }
         
-        if (note.trill == true)
+        if (note->trill == true)
             mnote->m_embellishment = EMB_TRILL;
         
         if (m_last_tied_note != NULL) {
@@ -1158,7 +1158,7 @@ void PaeInput::parseNote(pae::Note note) {
             m_last_tied_note = NULL;
         }
         
-        if (note.tie) {
+        if (note->tie) {
             if (mnote->GetTie()==TIE_t) mnote->SetTie(TIE_m);
             else mnote->SetTie(TIE_i);
             m_last_tied_note = mnote;
@@ -1168,46 +1168,46 @@ void PaeInput::parseNote(pae::Note note) {
     }
     
     // Does this note have a clef change? push it before everyting else
-    if (note.clef)
-        addLayerElement(note.clef);
+    if (note->clef)
+        addLayerElement(note->clef);
 
     // Same thing for time changes
     // You can find this sometimes
-    if (note.meter)
-        addLayerElement(note.meter);
+    if (note->meter)
+        addLayerElement(note->meter);
     
     // Handle key change. Evil if done in a beam
-    if (note.key)
-        addLayerElement(note.key);
+    if (note->key)
+        addLayerElement(note->key);
     
     // Acciaccaturas are similar but do not get beamed (do they)
     // this case is simpler. NOTE a note can not be acciacctura AND appoggiatura
     // Acciaccatura rests do not exist
-    if (note.acciaccatura && (element->Is() == NOTE) ) {
-        Note *note = dynamic_cast<Note*>(element);
-        assert( note );
-        note->SetDur(DURATION_8);
-        note->SetGrace(GRACE_acc);
-        note->SetStemDir(STEMDIRECTION_up);
+    if (note->acciaccatura && (element->Is() == NOTE) ) {
+        Note *mnote = dynamic_cast<Note*>(element);
+        assert( mnote );
+        mnote->SetDur(DURATION_8);
+        mnote->SetGrace(GRACE_acc);
+        mnote->SetStemDir(STEMDIRECTION_up);
     }
     
-    if ( (note.appoggiatura > 0) && (element->Is() == NOTE) ) {
-        Note *note = dynamic_cast<Note*>(element);
-        assert( note );
-        note->SetGrace(GRACE_unacc);
-        note->SetStemDir(STEMDIRECTION_up);
+    if ( (note->appoggiatura > 0) && (element->Is() == NOTE) ) {
+        Note *mnote = dynamic_cast<Note*>(element);
+        assert( mnote );
+        mnote->SetGrace(GRACE_unacc);
+        mnote->SetStemDir(STEMDIRECTION_up);
     }
 
-    if (note.beam == BEAM_INITIAL) {
+    if (note->beam == BEAM_INITIAL) {
         pushContainer(new Beam());
     }
     
     // we have a tuplet, the tuplet_note is > 0
     // which means we are counting a tuplet
-    if (note.tuplet_note > 0 && note.tuplet_notes == note.tuplet_note) { // first elem in tuplet
+    if (note->tuplet_note > 0 && note->tuplet_notes == note->tuplet_note) { // first elem in tuplet
         Tuplet *newTuplet = new Tuplet();
-        newTuplet->SetNum(note.tuplet_notes);
-        newTuplet->SetNumbase(note.tuplet_notes);
+        newTuplet->SetNum(note->tuplet_notes);
+        newTuplet->SetNumbase(note->tuplet_notes);
         pushContainer(newTuplet);
     }
     
@@ -1218,10 +1218,10 @@ void PaeInput::parseNote(pae::Note note) {
     // the last note counts always '1'
     // insert the tuplet elem
     // and reset the tuplet counter
-    if (note.tuplet_note == 1)
+    if (note->tuplet_note == 1)
         popContainer();
     
-    if (note.beam == BEAM_TERMINAL)
+    if (note->beam == BEAM_TERMINAL)
         popContainer();
 }
 

From 0605d104e1b4c7a4a9898a70e4e847df8e411095 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 24 Sep 2015 07:49:47 +0200
Subject: [PATCH 34/85] Fixing tie being removed bug in PAE measure repetition

---
 src/iopae.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/iopae.cpp b/src/iopae.cpp
index 25e0d99593a..2d4131c216c 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -265,12 +265,6 @@ void PaeInput::parsePlainAndEasy(std::istream &infile) {
             pae::Measure last_measure = staff[staff.size() - 1];
             current_measure.notes = last_measure.notes;
             current_measure.wholerest = last_measure.wholerest;
-            
-            // if old measure does not end with a tie
-            // force the first note of the newly copied measure to be without tie
-            // this is to prevent copying tie closes which are invalid
-            if (last_measure.notes.size() > 0 && last_measure.notes[last_measure.notes.capacity() - 1].tie == 0)
-                current_measure.notes[0].tie = 0;
         }
         
         //barLine

From bc5babe49c834fbf0f51c7cbb0a8604506c9d154 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 24 Sep 2015 08:41:57 +0200
Subject: [PATCH 35/85] Adding PAE chord support (limited)

---
 include/vrv/iopae.h |   6 +-
 src/iopae.cpp       | 167 +++++++++++++++++++++++++++++++-------------
 2 files changed, 125 insertions(+), 48 deletions(-)

diff --git a/include/vrv/iopae.h b/include/vrv/iopae.h
index 1c5b914ede1..4a66a0afc10 100644
--- a/include/vrv/iopae.h
+++ b/include/vrv/iopae.h
@@ -49,6 +49,7 @@ class Note {
         appoggiatura = old.appoggiatura;
         fermata = old.fermata;
         trill = old.trill;
+        chord = old.chord;
         
         octave = old.octave;
         beam = old.beam;
@@ -68,7 +69,7 @@ class Note {
     Note(void) { clear(); };
     void   clear(void) {
         appoggiatura = 0;
-        acciaccatura = fermata = trill = false;
+        acciaccatura = fermata = trill = chord = false;
         tie = 0;
         
         octave = 4;
@@ -95,6 +96,7 @@ class Note {
         appoggiatura = d.appoggiatura;
         fermata = d.fermata;
         trill = d.trill;
+        chord = d.chord;
         
         octave = d.octave;
         beam = d.beam;
@@ -126,6 +128,7 @@ class Note {
     int    appoggiatura;
     bool   fermata;
     bool   trill;
+    bool   chord;
     
     char octave;
     unsigned char beam;
@@ -270,6 +273,7 @@ class PaeInput: public FileInputStream
     Measure *m_measure;
 	Layer *m_layer;
     Note *m_last_tied_note;
+    bool m_is_in_chord;
 
     std::vector<LayerElement *> m_nested_objects;
 };
diff --git a/src/iopae.cpp b/src/iopae.cpp
index 2d4131c216c..8c0dbaf4863 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -16,6 +16,7 @@
 //----------------------------------------------------------------------------
 
 #include "beam.h"
+#include "chord.h"
 #include "doc.h"
 #include "keysig.h"
 #include "layer.h"
@@ -72,6 +73,7 @@ PaeInput::PaeInput( Doc *doc, std::string filename ) :
     m_measure = NULL;
 	m_layer = NULL;
     m_last_tied_note = NULL;
+    m_is_in_chord = false;
 }
 
 PaeInput::~PaeInput()
@@ -140,17 +142,23 @@ void PaeInput::parsePlainAndEasy(std::istream &infile) {
         getAtRecordKeyValue(data_key, data_value, data_line);
         if (strcmp(data_key,"end")==0) {   
             break;
-        } else if (strcmp(data_key,"clef")==0) { 
+        }
+        else if (strcmp(data_key,"clef")==0) {
             strcpy( c_clef, data_value );
-        } else if (strcmp(data_key,"key")==0) { 
+        }
+        else if (strcmp(data_key,"key")==0) {
             strcpy( c_key, data_value );
-        } else if (strcmp(data_key,"keysig")==0) { 
+        }
+        else if (strcmp(data_key,"keysig")==0) {
             strcpy( c_keysig, data_value );
-        } else if (strcmp(data_key,"timesig")==0) { 
+        }
+        else if (strcmp(data_key,"timesig")==0) {
             strcpy( c_timesig, data_value );
-        } else if (strcmp(data_key,"alttimesig")==0) { 
+        }
+        else if (strcmp(data_key,"alttimesig")==0) {
             strcpy( c_alttimesig, data_value );
-        } else if (strcmp(data_key,"data")==0) { 
+        }
+        else if (strcmp(data_key,"data")==0) {
             strcpy( incipit, data_value );
         }
     }
@@ -513,13 +521,15 @@ int PaeInput::getAccidental(const char* incipit, data_ACCIDENTAL_EXPLICIT *accid
     
     if (incipit[i] == 'n') {
         *accident = ACCIDENTAL_EXPLICIT_n;
-    } else if (incipit[i] == 'x') {
+    }
+    else if (incipit[i] == 'x') {
         *accident = ACCIDENTAL_EXPLICIT_s;
         if ((i+1 < length) && (incipit[i+1] == 'x')) {
             *accident = ACCIDENTAL_EXPLICIT_ss;
             i++;
         }
-    } else if (incipit[i] == 'b') {
+    }
+    else if (incipit[i] == 'b') {
         *accident = ACCIDENTAL_EXPLICIT_f;
         if ((i+1 < length) && (incipit[i+1] == 'b')) {
             *accident = ACCIDENTAL_EXPLICIT_ff;
@@ -596,7 +606,8 @@ int PaeInput::getTupletFermata(const char* incipit, pae::Note* note, int index )
             tuplet_val = atoi(buf);
             free(buf); // dispose of the buffer
         
-        } else { // it is a triplet
+        }
+        else { // it is a triplet
             // don't care to parse all the stuff
             tuplet_val = 3;
         }
@@ -606,7 +617,8 @@ int PaeInput::getTupletFermata(const char* incipit, pae::Note* note, int index )
         // but also the note counter
         note->tuplet_note =  tuplet_val;
         
-    } else {
+    }
+    else {
         if ( note->tuplet_notes > 0 ) {
             LogWarning("Fermata within a tuplet. Won't be handled correctly");
         }
@@ -719,8 +731,9 @@ int PaeInput::getTimeInfo( const char* incipit, MeterSig *meter, int index) {
     int i = index;
     size_t length = strlen(incipit);
     
-    if (!isdigit(incipit[i]) && (incipit[i] != 'c') && (incipit[i] != 'o'))
+    if (!isdigit(incipit[i]) && (incipit[i] != 'c') && (incipit[i] != 'o')) {
         return 0;
+    }
     
     // find the end of time signature end
     i++; // the time signature length is a least 1
@@ -755,25 +768,31 @@ int PaeInput::getTimeInfo( const char* incipit, MeterSig *meter, int index) {
         int note_value = atoi(strtok(NULL, "/")); 
         meter->SetCount(beats);
         meter->SetUnit(note_value);
-    } else if ( is_one_number == 0) {
+    }
+    else if ( is_one_number == 0) {
         int beats = atoi(timesig_str);
         meter->SetCount(beats);
-    } else if (strcmp(timesig_str, "c") == 0) {
+    }
+    else if (strcmp(timesig_str, "c") == 0) {
         // C
         meter->SetSym(METERSIGN_common);
-    } else if (strcmp(timesig_str, "c/") == 0) {
+    }
+    else if (strcmp(timesig_str, "c/") == 0) {
         // C|
         meter->SetSym(METERSIGN_cut);
-    } else if (strcmp(timesig_str, "c3") == 0) {
+    }
+    else if (strcmp(timesig_str, "c3") == 0) {
         // C3
         meter->SetSym(METERSIGN_common);
         meter->SetCount(3);
-    } else if (strcmp(timesig_str, "c3/2") == 0) {
+    }
+    else if (strcmp(timesig_str, "c3/2") == 0) {
         // C3/2
         meter->SetSym(METERSIGN_common); // ??
         meter->SetCount(3);
         meter->SetUnit(2);
-    } else {
+    }
+    else {
         LogWarning("Unknown time signature: %s", timesig_str);
     }
     
@@ -811,18 +830,22 @@ int PaeInput::getClefInfo( const char *incipit, Clef *mclef, int index ) {
     if (clef == 'C' || clef == 'c') {
         mclef->SetShape(CLEFSHAPE_C);
         mclef->SetLine(line - 48);
-    } else if (clef == 'G') {
+    }
+    else if (clef == 'G') {
         mclef->SetShape(CLEFSHAPE_G);
         mclef->SetLine(line - 48);
-    } else if (clef == 'g') {
+    }
+    else if (clef == 'g') {
         mclef->SetShape(CLEFSHAPE_G);
         mclef->SetLine(line - 48);
         mclef->SetDis(OCTAVE_DIS_8);
         mclef->SetDisPlace(PLACE_below);
-    } else if (clef == 'F' || clef == 'f') {
+    }
+    else if (clef == 'F' || clef == 'f') {
         mclef->SetShape(CLEFSHAPE_F);
         mclef->SetLine(line - 48);
-    } else {
+    }
+    else {
         // what the...
         LogDebug("Clef %c is Undefined", clef);
     }
@@ -893,16 +916,20 @@ int PaeInput::getBarline( const char *incipit, data_BARRENDITION *output, int in
     if (is_barline_rptboth == 0) {
         *output = BARRENDITION_rptboth;
         i = 3;
-    } else if (is_barline_rptstart == 0) {
+    }
+    else if (is_barline_rptstart == 0) {
         *output = BARRENDITION_rptstart;
         i = 2;
-    } else if (is_barline_rptend == 0) {
+    }
+    else if (is_barline_rptend == 0) {
         *output = BARRENDITION_rptend;
         i = 2;
-    } else if (is_barline_dbl == 0) {
+    }
+    else if (is_barline_dbl == 0) {
         *output = BARRENDITION_dbl;
         i = 1;
-    } else {
+    }
+    else {
         *output = BARRENDITION_single;
         i = 0;
     }
@@ -924,7 +951,8 @@ int PaeInput::getAbbreviation(const char* incipit, pae::Measure *measure, int in
     
     if (measure->abbreviation_offset == -1) { // start
         measure->abbreviation_offset = (int)measure->notes.size();
-    } else { //
+    }
+    else { //
         int abbreviation_stop = (int)measure->notes.size();
         while ((i+1 < length) && (incipit[i+1]=='f')) {
             i++;
@@ -1002,12 +1030,14 @@ int PaeInput::getNote( const char* incipit, pae::Note *note, pae::Measure *measu
         // acciaccaturas are always eights regardless
         // and have no dots
         note->duration = DURATION_8;
-    } else {
+    }
+    else {
         if (measure->durations.size() == 0) {
             note->duration = DURATION_4;
             note->dots = 0;
             LogWarning("Got a note before a duration was specified");
-        } else {
+        }
+        else {
             note->duration = measure->durations[measure->durations_offset];
             note->dots = measure->dots[measure->durations_offset];
         }
@@ -1016,8 +1046,9 @@ int PaeInput::getNote( const char* incipit, pae::Note *note, pae::Measure *measu
     
     // lookout, hack. If it is a rest (PITCHNAME_NONE val) then create the rest object.
     // it will be added instead of the note
-    if (note->pitch == PITCHNAME_NONE)
+    if (note->pitch == PITCHNAME_NONE) {
         note->rest = true;
+    }
     
     // trills
     regcomp(&re, "^[^ABCDEFG]*t", REG_EXTENDED);
@@ -1036,6 +1067,14 @@ int PaeInput::getNote( const char* incipit, pae::Note *note, pae::Measure *measu
             note->tie = 1; // reset 1 for the first note, >1 for next ones is incremented under
     }
     
+    // chord
+    regcomp(&re, "^[^ABCDEFG]*\\^", REG_EXTENDED);
+    int is_chord = regexec(&re, incipit + i + 1, 0, NULL, 0);
+    regfree(&re);
+    if ( is_chord == 0) {
+        note->chord = true;
+    }
+    
     oct = note->octave;
     measure->notes.push_back( *note );
     
@@ -1047,14 +1086,14 @@ int PaeInput::getNote( const char* incipit, pae::Note *note, pae::Measure *measu
     note->clear();
     
     // write back the values we need to save
-
     note->octave = oct; // save octave
     
     // tuplets. Decrease the current number is we are in a tuplet
     // i.e. tuplet_num > 0
     // al the other values just need to be in the first note
-    if (tuplet_num > 0)
+    if (tuplet_num > 0) {
         note->tuplet_note = --tuplet_num;
+    }
     
     // grace notes
     note->acciaccatura = false;
@@ -1130,7 +1169,8 @@ void PaeInput::parseNote(pae::Note *note) {
         }
         
         element = rest;
-    } else {
+    }
+    else {
         Note *mnote = new Note();
         
         mnote->SetPname(note->pitch);
@@ -1144,8 +1184,9 @@ void PaeInput::parseNote(pae::Note *note) {
             mnote->SetFermata(PLACE_above); // always above for now
         }
         
-        if (note->trill == true)
+        if (note->trill == true) {
             mnote->m_embellishment = EMB_TRILL;
+        }
         
         if (m_last_tied_note != NULL) {
             mnote->SetTie(TIE_t);
@@ -1162,17 +1203,20 @@ void PaeInput::parseNote(pae::Note *note) {
     }
     
     // Does this note have a clef change? push it before everyting else
-    if (note->clef)
+    if (note->clef) {
         addLayerElement(note->clef);
+    }
 
     // Same thing for time changes
     // You can find this sometimes
-    if (note->meter)
+    if (note->meter) {
         addLayerElement(note->meter);
+    }
     
     // Handle key change. Evil if done in a beam
-    if (note->key)
+    if (note->key) {
         addLayerElement(note->key);
+    }
     
     // Acciaccaturas are similar but do not get beamed (do they)
     // this case is simpler. NOTE a note can not be acciacctura AND appoggiatura
@@ -1205,18 +1249,38 @@ void PaeInput::parseNote(pae::Note *note) {
         pushContainer(newTuplet);
     }
     
-    
+    // note in a chord
+    if ( (note->chord) ) {
+        Note *mnote = dynamic_cast<Note*>(element);
+        assert( mnote );
+        // first note?
+        if (!m_is_in_chord) {
+            Chord *chord = new Chord();
+            chord->SetDur(mnote->GetDur());
+            pushContainer(chord);
+            m_is_in_chord = true;
+        }
+    }
+
     // Add the note to the current container
     addLayerElement(element);
     
     // the last note counts always '1'
     // insert the tuplet elem
     // and reset the tuplet counter
-    if (note->tuplet_note == 1)
+    if (note->tuplet_note == 1) {
         popContainer();
+    }
     
-    if (note->beam == BEAM_TERMINAL)
+    if (note->beam == BEAM_TERMINAL) {
         popContainer();
+    }
+    
+    // last note of a chord
+    if (!note->chord && m_is_in_chord) {
+        popContainer();
+        m_is_in_chord = false;
+    }
 }
 
 void PaeInput::pushContainer(LayerElement *container) {
@@ -1226,10 +1290,13 @@ void PaeInput::pushContainer(LayerElement *container) {
 
 void PaeInput::popContainer() {
     //assert(m_nested_objects.size() > 0);
-    if (m_nested_objects.size() == 0)
+    if (m_nested_objects.size() == 0) {
         LogError("PaeInput::popContainer: tried to pop an object from empty stack. Cross-measure objects (tuplets, beams) are not supported.");
-    else
+    
+    }
+    else {
         m_nested_objects.pop_back();
+    }
 }
 
 void PaeInput::addLayerElement(LayerElement *element) {
@@ -1247,8 +1314,14 @@ void PaeInput::addLayerElement(LayerElement *element) {
             assert( tuplet );
             tuplet->AddLayerElement( element );
         }
+        else if ( bottom->Is() == CHORD ) {
+            Chord *chord = dynamic_cast<Chord*>( bottom );
+            assert( chord );
+            chord->AddLayerElement( element );
+        }
         
-    } else {
+    }
+    else {
         m_layer->AddLayerElement(element);
     }
 }
@@ -1282,8 +1355,9 @@ void PaeInput::getAtRecordKeyValue(char *key, char* value,
     memset(value, EMPTY, MAX_DATA_LEN);
 
     
-    if (length == 0)
+    if (length == 0) {
         return;
+    }
     
     char ch;
     int index = 0;
@@ -1305,8 +1379,7 @@ void PaeInput::getAtRecordKeyValue(char *key, char* value,
         ch = input[index]; 
         
         // Should never happen
-        if (count >= MAX_DATA_LEN)
-            return;
+        if (count >= MAX_DATA_LEN) return;
         
         key[count] = ch;
         count++;
@@ -1321,8 +1394,8 @@ void PaeInput::getAtRecordKeyValue(char *key, char* value,
     SKIPSPACE
     
     // Also should never happen
-    if (strlen(&input[index]) > MAX_DATA_LEN)
-        return;
+    if (strlen(&input[index]) > MAX_DATA_LEN) return;
+    
     strcpy(value, &input[index]);
     
     // Thruncate string to first space

From 8376d315ef83e7319d94558abbd0bb68ac6da4a8 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 24 Sep 2015 20:27:30 +0200
Subject: [PATCH 36/85] Basics for reading musicxml

---
 include/vrv/iomusxml.h |  56 +---
 include/vrv/toolkit.h  |   3 +-
 src/iomusxml.cpp       | 641 ++---------------------------------------
 src/toolkit.cpp        |   8 +-
 tools/main.cpp         |   4 +-
 5 files changed, 54 insertions(+), 658 deletions(-)

diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index b55cd84afa5..8acb9c738ef 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -9,6 +9,11 @@
 #ifndef __VRV_IOMUSXML_H__
 #define __VRV_IOMUSXML_H__
 
+#include <string>
+#include <vector>
+
+//----------------------------------------------------------------------------
+
 #include "io.h"
 #include "pugixml.hpp"
 
@@ -35,58 +40,23 @@ class Tuplet;
 // This class is not up-to-date
 //----------------------------------------------------------------------------
 
-class XMLOutput: public FileOutputStream
+class XmlInput: public FileInputStream
 {
 public:
     // constructors and destructors
-    XMLOutput( Doc *doc, std::string filename );
-    virtual ~XMLOutput();
+    XmlInput(Doc *doc, std::string filename);
+    virtual ~XmlInput();
     
-    virtual bool ExportFile( );
+    virtual bool ImportFile( );
+    virtual bool ImportString(std::string musicxml);
     
 private:
-
-    virtual bool WriteDoc( Doc *doc );
-    // logical
-    bool WriteStaff( Staff *staff );
-    bool WriteLayer( Layer *layer );
-    bool WriteLayerElement( LayerElement *element );
-    // layout
-    bool WriteLayout( Doc *layout );
-    bool WritePage( Page *page );
-    bool WriteSystem( System *system );
-    bool WriteLaidOutStaff( Staff *laidOutStaff );
-    bool WriteLaidOutLayer( Layer *laidOutLayer );
-    bool WriteLaidOutLayerElement( LayerElement *laidOutLayerElement );
-    
-    void WriteClef(LayerElement *element);
-    void WriteKey(LayerElement *element);
-    void WriteTime(LayerElement *element);
-    void WriteNoteOrRest(LayerElement *element);
-    void WriteMultiMeasureRest(Rest *r);
-    void CreateAttributes();
-    void SetTie(pugi::xml_node xml_note, bool last);
-    void CreateRestsForMultiMeasure();
+    bool ReadXml(pugi::xml_node root);
     
 private:
     std::string m_filename;
-    
-    pugi::xml_node m_xml_score;
-    pugi::xml_node m_xml_part;
-    pugi::xml_node m_xml_measure;
-    pugi::xml_node m_xml_attributes;
-    pugi::xml_node m_xml_measure_style;
-    pugi::xml_node m_xml_last_note;
-    pugi::xml_document m_xml_doc;
-    pugi::xml_node m_xml_current_clef;
-    
-    MeterSig *m_current_time;
-    Beam *m_current_beam;
-    bool m_in_beam;
-    bool m_tied;
-    int m_multimeasure_rests;
-    
-    int m_measure_count;
+    /** The parts are read as a vector of systems */
+    std::vector<System*> m_parts;
 };
 
 } // namespace vrv {
diff --git a/include/vrv/toolkit.h b/include/vrv/toolkit.h
index debac7e3094..d558977ddd3 100644
--- a/include/vrv/toolkit.h
+++ b/include/vrv/toolkit.h
@@ -27,7 +27,8 @@ namespace vrv {
 typedef enum _file_formats {
     mei_file = 0,
     pae_file,
-    darms_file
+    darms_file,
+    xml_file
 } ConvertFileFormat;
 
 
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 436ac0096f0..a0ac1a3cdfd 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -28,639 +28,58 @@
 namespace vrv {
 
 //----------------------------------------------------------------------------
-// XMLOutput
+// XmlInput
 //----------------------------------------------------------------------------
 
-XMLOutput::XMLOutput( Doc *doc, std::string filename ) :
+XmlInput::XmlInput(Doc *doc, std::string filename) :
 // This is pretty bad. We open a bad fileoutputstream as we don't use it
-FileOutputStream( doc )
+    FileInputStream(doc)
 {
     m_filename = filename;
-    m_measure_count = 0;
-/*    m_xml_attributes = NULL;
-    m_xml_current_clef = NULL;
-    m_xml_measure_style = NULL;
-    m_xml_last_note = NULL;
-*/   
 
-    m_current_time = NULL;
-    m_current_beam = NULL;
-    m_in_beam = false;
-    m_tied = false;
-    m_multimeasure_rests = 0;
-
-}
-
-XMLOutput::~XMLOutput()
-{
-}
-
-bool XMLOutput::ExportFile( )
-{
-    /*
-    // do this or finale will barf, versione 3.0 for now
-    TiXmlUnknown *unk = new TiXmlUnknown;
-    //unk->SetValue("!DOCTYPE score-partwise PUBLIC \"-//Recordare//DTD MusicXML 3.0 Partwise//EN\" \"http://www.musicxml.org/dtds/partwise.dtd\"");
-    unk->SetValue("!DOCTYPE score-timewise PUBLIC \"-//Recordare//DTD MusicXML 2.0 Timewise//EN\" \"http://www.musicxml.org/dtds/timewise.dtd\"");
-    m_xml_doc->LinkEndChild(unk);
-    */
-    
-    // this starts the call of all the functors
-    m_doc->Save( this );
-        
-    m_xml_doc.save_file( m_filename.c_str() );
-    
-	return true;    
-}
-
-bool XMLOutput::WriteDoc( Doc *doc )
-{
-    LogDebug("Doc");
-    
-    // Write the partwise declaration
-    // the MusicXML "score-partwise" does not map to our MusScore
-    
-    m_xml_score = m_xml_doc.append_child("score-timewise");
-    
-    // hardcode a voice for noew
-    pugi::xml_node plist =  m_xml_score.append_child("part-list");
-    pugi::xml_node spart = plist.append_child("score-part");
-    spart.append_attribute("id") = "P1";
-    
-    pugi::xml_node pname = spart.append_child("part-name");
-    pname.append_child(pugi::node_pcdata).set_value("Example Music");
-    
-    /*
-    spart->LinkEndChild(pname);
-    plist->LinkEndChild(spart);
-    
-    m_xml_score->LinkEndChild(plist);
-    m_xml_doc->LinkEndChild(m_xml_score);
-    */
-    
-    return true;
-}
-
-
-/*
-bool XMLOutput::WriteMeasure( Measure *measure )
-//bool XMLOutput::WriteMeiMeasure( Measure *meiMeasure, Measure *measure )
-{
-    std::string num;
-
-    // Create multimeasure rests
-    if (m_multimeasure_rests > 0 )
-        CreateRestsForMultiMeasure();
-    
-    m_measure_count++;
-    num << m_measure_count;
-    LogDebug("Measure %i", m_measure_count);
-    
-    // go on and create this measure
-    m_xml_measure = new TiXmlElement("measure");
-    m_xml_measure->SetAttribute("number", num);
-    m_xml_score->LinkEndChild(m_xml_measure);
-    
-        
-    // reset clef
-    m_xml_current_clef = NULL;
-    
-    //m_xml_part->LinkEndChild(m_xml_measure);
-    
-    return true;
-}
-*/ // ax2.3
-
-bool XMLOutput::WriteStaff( Staff *staff )
-//bool XMLOutput::WriteMeiStaff( Staff *meiStaff, Staff *staff )
-{
-    LogDebug("Staff");
-    
-    m_xml_part = m_xml_measure.append_child("part");
-    m_xml_part.append_attribute("id") = "P1";
-        
-    // in first measure set the divisions value in <attributes>
-    if (m_measure_count == 1) {
-        m_xml_attributes = m_xml_part.append_child("attributes");
-        pugi::xml_node divisions = m_xml_attributes.append_child("divisions");
-        //TiXmlText *divval = new TiXmlText("4"); // no more than sixteenths for now
-        divisions.append_child(pugi::node_pcdata).set_value("4");
-        /*
-        divisions->LinkEndChild(divval);
-        m_xml_attributes->LinkEndChild(divisions);
-        m_xml_part->LinkEndChild(m_xml_attributes);
-        */
-    }
-    
-    return true;
 }
 
-bool XMLOutput::WriteLayer( Layer *layer )
-//bool XMLOutput::WriteMeiLayer( Layer *meiLayer, Layer *layer )
+XmlInput::~XmlInput()
 {
-    LogDebug("Layer");
-    return true;
 }
-
-bool XMLOutput::WriteLayerElement( LayerElement *element )
-{
-    LogDebug("Layer Elem");
-        
-    if (dynamic_cast<Clef*>(element)) {
-        WriteClef(element);
-    } else if (dynamic_cast<KeySig*>(element)) {
-        WriteKey(element);
-    } else if (dynamic_cast<Mensur*>(element)) {
-        WriteTime(element);
-    } else if (dynamic_cast<Note*>(element) || dynamic_cast<Rest*>(element)) {
-        WriteNoteOrRest(element);
-    } else if (dynamic_cast<Beam*>(element)) {
-        m_current_beam = dynamic_cast<Beam*>(element);
-    } else if (dynamic_cast<Tie*>(element)) {
-        // add tie to last note
-        // continuation of ties is made with a <start> and <stop>
-        // in the same note
-        SetTie(m_xml_last_note, false);
-    }
     
- //   LogDebug("---- %s", element->GetClassName().c_str());
-    
-    return true;
- }
-
-
-
-
-bool XMLOutput::WriteLayout( Doc *layout )
-{
-    LogDebug("Layout");
-    return true;
-}
-
-bool XMLOutput::WritePage( Page *page )
-{
-    LogDebug("Page");
-    return true;
-}
-
-bool XMLOutput::WriteSystem( System *system )
-{
-    LogDebug("System");
-    return true;
-}
-
-bool XMLOutput::WriteLaidOutStaff( Staff *laidOutStaff )
-{
-    LogDebug("Laid staff");
-    return true;
-}
-
-bool XMLOutput::WriteLaidOutLayer( Layer *laidOutLayer )
-{    LogDebug("Laid layer");
-    return true;
-
-}
-
-bool XMLOutput::WriteLaidOutLayerElement( LayerElement *laidOutLayerElement )
+bool XmlInput::ImportFile()
 {
-    LogDebug("Laid Layer Elem");
-    return true;
-}
-
-
-void XMLOutput::WriteClef(LayerElement *element) {
-    std::string sign, line;
-    
-    // Create the attributes elem
-    // or use existing one, all the attribute changes
-    // go in the same <attributes>
-    CreateAttributes();
-    
-    //Clef *clef = dynamic_cast<Clef*>(element);
-    
-    /*
-    switch (clef->m_clefId) {
-        case SOL1: sign = "G"; line = "1"; break;
-        case SOL2: sign = "G"; line = "2"; break;
-        case UT1: sign = "C"; line = "1"; break;
-        case UT2: sign = "C"; line = "2"; break;
-        case UT3: sign = "C"; line = "3"; break;
-        case UT4: sign = "C"; line = "4"; break;
-        case UT5: sign = "C"; line = "5"; break;
-        case FA3: sign = "F"; line = "3"; break;
-        case FA4: sign = "F"; line = "4"; break;
-        case FA5: sign = "F"; line = "5"; break;
-        default: break;
-    }
-    */
-    
-    //Create the <clef> element
-    pugi::xml_node xclef = m_xml_attributes.append_child("clef");
-    
-    // Create the <sign> element and link to it it's text
-    pugi::xml_node xsign = xclef.append_child("sign");
-    xsign.append_child(pugi::node_pcdata).set_value(sign.c_str());
-    //TiXmlText *xsignt = new TiXmlText(sign.c_str());
-    //xsign->LinkEndChild(xsignt);
-    // Insert it into the <clef>
-    //xclef->LinkEndChild(xsign);
-    
-    // Create the <line> element and link to it it's text
-    pugi::xml_node xline = xclef.append_child("line");
-    xline.append_child(pugi::node_pcdata).set_value(line.c_str());
-    //TiXmlText *xlinet = new TiXmlText(line.c_str());
-    //xline->LinkEndChild(xlinet);
-    // Insert it into the <clef>
-    //xclef->LinkEndChild(xline); 
-    
-    // place clef into <attribute>
-    //m_xml_attributes->LinkEndChild(xclef);
-    m_xml_current_clef = xclef;
-    
-}
-
-void XMLOutput::WriteKey(LayerElement *element) {
-    KeySig* key = dynamic_cast<KeySig*>(element);
-    
-    // Check for attrib element as above
-    // or use existing one, all the attribute changes
-    // go in the same <attributes>
-    CreateAttributes();
-    
-    // create tompost <key> elem
-    pugi::xml_node xkey = m_xml_attributes.append_child("key");
-    
-    // Convert the number of alterations to string
-    std::stringstream n_alter;
-    if (key->GetAlterationType() == ACCIDENTAL_EXPLICIT_f)
-        // flats are negative numbers
-        n_alter << -key->GetAlterationNumber();
-    else
-        n_alter << key->GetAlterationNumber();
-    
-    //create <fifths> node with the number of alterations
-    pugi::xml_node xfifths = xkey.append_child("fifths");
-    xfifths.append_child(pugi::node_pcdata).set_value(n_alter.str().c_str());
-    //TiXmlText *xftxt = new TiXmlText(n_alter.str().c_str());
-    //xfifths->LinkEndChild(xftxt);
-    // add it to the key elem
-    //xkey->LinkEndChild(xfifths);
-    
-    //I dont know what musicxml does with the <mode> tag
-    //bmaybe it is just to annoy programmers using tinyxml
-    //finale sets this always to major
-    pugi::xml_node mode = xkey.append_child("mode");
-    mode.append_child(pugi::node_pcdata).set_value("major");
-    //TiXmlText *major = new TiXmlText("major");
-    //mode->LinkEndChild(major);
-    // add it to the key elem
-    //xkey->LinkEndChild(mode);
-    
-    // Obviously the order in which <key> <clef> and <time>
-    // are fixed. If in music notation practice we have CLEF then KEY
-    // why should MusicXML follow? the genious architect decided to
-    // force the order of <attributes> REVERSED, <key> BEFORE <clef>
-    // wow.
-    /*
-    if (!m_xml_current_clef) // no clef
-        m_xml_attributes->LinkEndChild(xkey);
-    else // insert before the clef
-        m_xml_attributes->InsertBeforeChild(m_xml_current_clef, *xkey);
-    */
-}
-
-void XMLOutput::WriteTime(LayerElement *element) {
-    MeterSig *timesig = dynamic_cast<MeterSig*>(element);
-    std::stringstream number;
-    
-    CreateAttributes();
-    
-    pugi::xml_node xtime = m_xml_attributes.append_child("time");
-    
-    // add symbol attribute if necessay
-    if (timesig->GetSym() == METERSIGN_common) {
-        xtime.append_attribute("symbol") = "common";
-        // if the number of beats was not specified, approximate it
-        if (timesig->GetCount() == 0){
-            timesig->SetCount(4);
-            timesig->SetUnit(4);
-        }
-    } else if (timesig->GetSym() == METERSIGN_cut) {
-        xtime.append_attribute("symbol") = "cut";
-        if (timesig->GetCount() == 0){
-            timesig->SetCount(2);
-            timesig->SetUnit(2);
+    try {
+        m_doc->Reset(Raw);
+        pugi::xml_document doc;
+        pugi::xml_parse_result result = doc.load_file(m_filename.c_str());
+        if (!result)
+        {
+            return false;
         }
+        pugi::xml_node root = doc.first_child();
+        return ReadXml(root);
     }
-    
-    // Create beat and beat type attribsb
-    pugi::xml_node xbeats = xtime.append_child("beats");
-    pugi::xml_node xbtype = xtime.append_child("beat-type");
-    
-    // convert number to text for beats
-    number << timesig->GetCount();
-    xbeats.append_child(pugi::node_pcdata).set_value(number.str().c_str());
-    //TiXmlText *beat_text = new TiXmlText(number.str().c_str());
-    //xbeats->LinkEndChild(beat_text);
-    
-    // ditto as above
-    number.clear();
-    number << timesig->GetUnit();
-    xbtype.append_child(pugi::node_pcdata).set_value(number.str().c_str());
-    //TiXmlText *base_text = new TiXmlText(number.str().c_str());
-    //xbtype->LinkEndChild(base_text);
-    
-    /*
-    // push it to xtime
-    xtime->LinkEndChild(xbeats);
-    xtime->LinkEndChild(xbtype);
-    
-    if (!m_xml_current_clef) // no clef
-        m_xml_attributes->LinkEndChild(xtime);
-    else // insert before the clef
-        m_xml_attributes->InsertBeforeChild(m_xml_current_clef, *xtime);
-    */
-    
-    // save the current timesig in case we need to create mm rests
-    m_current_time = timesig;
-}
-
-void XMLOutput::WriteMultiMeasureRest(Rest *r) {
-    std::stringstream num;
-    num << 1; //r->m_multimeasure_dur;
-
-    
-    // chech that <attributes> exists
-    CreateAttributes();
-    
-    if (m_xml_measure_style.empty()) {
-        m_xml_measure_style = m_xml_attributes.append_child("measure-style");
-        // link it into the current attributes
-        //m_xml_attributes->LinkEndChild(m_xml_measure_style);
+    catch(char * str) {
+        LogError("%s", str);
+        return false;
     }
-    
-    // put the multiple measure thing into the measure style
-    pugi::xml_node xmrest = m_xml_measure_style.append_child("multiple-rest");
-    xmrest.append_child(pugi::node_pcdata).set_value(num.str().c_str());
-    //TiXmlText *mdur = new TiXmlText(num.str().c_str());
-    //xmrest->LinkEndChild(mdur);
-    
-    // save the quantity of measures to create
-    //m_multimeasure_rests = r->m_multimeasure_dur;
-    
-}
-
-void XMLOutput::CreateRestsForMultiMeasure() {
-    
-    // unbox all the measures we need
-    for (int i = 0; i < m_multimeasure_rests; i++) {
-        std::stringstream mstring;
-        
-        m_measure_count++;
-        
-        // create a fresh new rest
-        pugi::xml_node note = m_xml_part.append_child("note");
-        //pugi::xml_node rest = note.append_child("rest");
-        
-        //note->LinkEndChild(rest);
-        
-        pugi::xml_node duration = note.append_child("duration");
-        duration.append_child(pugi::node_pcdata).set_value("4");
-        
-        //TiXmlText *dur_name = new TiXmlText("4");
-        //duration->LinkEndChild(dur_name);
-        
-        //note->LinkEndChild(duration);
-        
-        // add it to the current part
-        //m_xml_part->LinkEndChild(note);
-        
-        // first time is already linked
-        /*
-        if (i > 0)
-            m_xml_measure->LinkEndChild(m_xml_part);
-        // and to the measure
-        m_xml_score->LinkEndChild(m_xml_measure);
-        */
-         
-        // create a new part
-        m_xml_part = m_xml_measure.append_child("part");
-        m_xml_part.append_attribute("id") = "P1";
-        
-        m_xml_measure = m_xml_score.append_child("measure");
-        mstring << m_measure_count;
-        m_xml_measure.append_attribute("number") =  mstring.str().c_str();
-        
-    }
-    LogDebug("Measures incremented to %i.", m_measure_count);
-    m_multimeasure_rests = 0;
-    //m_measure_count--;
-    // we do not want to increment this two times
-    // a new measure is generated after the call to this function
-    m_measure_count--;
 }
 
-void XMLOutput::WriteNoteOrRest(LayerElement *element) {
-    char steps[] = {'C', 'D', 'E', 'F', 'G', 'A', 'B'};
-    std::stringstream number;
-    std::string t;
-    std::string dur;
-    std::string num_of_beams;
-    
-    DurationInterface *di = dynamic_cast<DurationInterface*>(element);
-    
-    // toplevel note element
-    pugi::xml_node note = m_xml_part.append_child("note");
-    
-    // duration is common in notes and rests
-    pugi::xml_node duration = note.append_child("duration");
-    
-    switch (di->GetActualDur()) {
-        case DUR_LG: dur = "64"; t = "long"; break;
-        case DUR_BR: dur = "32"; t = "breve"; break;
-        case DUR_1: dur = "16"; t = "whole"; break;
-        case DUR_2: dur = "8"; t = "half"; break;
-        case DUR_4: dur = "4"; t = "quarter"; break;
-        case DUR_8: dur = "2"; t = "eighth"; num_of_beams = "1"; break;
-        case DUR_16: dur = "1"; t = "16th"; num_of_beams = "2"; break;
-        case DUR_32: dur = "1"; t = "32nd"; num_of_beams = "3"; break;
-        case DUR_64: dur = "1"; t = "64th"; num_of_beams = "4"; break;
-        case DUR_128: dur = "1"; t = "128th"; num_of_beams = "5"; break;
-            
-        default:
-            break;
-    }
-    
-    // if note we need the <pitch> too
-    if (dynamic_cast<Note*>(element)) {
-        Note *n = dynamic_cast<Note*>(element);
-        // make pitch
-        pugi::xml_node pitch = note.append_child("pitch");
-        pugi::xml_node step = pitch.append_child("step");
-        pugi::xml_node octave = pitch.append_child("octave");
-        
-        number << steps[n->GetPname() - 1];
-        step.append_child(pugi::node_pcdata).set_value(number.str().c_str());
-        //TiXmlText *step_name = new TiXmlText(number.str().c_str());
-        //step->LinkEndChild(step_name);
-        
-        number.clear();
-        number << (int)n->GetOct();
-        octave.append_child(pugi::node_pcdata).set_value(number.str().c_str());
-        //TiXmlText *octave_name = new TiXmlText(number.str().c_str());
-        //octave->LinkEndChild(octave_name);
-        
-        // do we have an alteration?
-        if (n->GetAccid() != ACCIDENTAL_EXPLICIT_NONE) {
-            number.clear();
-            number << 1;
-            pugi::xml_node xalter = pitch.append_child("alter");
-            xalter.append_child(pugi::node_pcdata).set_value(number.str().c_str());
-            //TiXmlText *altnr = new TiXmlText(number.str().c_str());
-            
-            //xalter->LinkEndChild(altnr);
-            //pitch->LinkEndChild(xalter);
-        }
-        
-        //pitch->LinkEndChild(step);
-        //pitch->LinkEndChild(octave);
-        //note->LinkEndChild(pitch);
-        
-        
-    } else if (dynamic_cast<Rest*>(element)) {
-        //Rest *r = dynamic_cast<Rest*>(element);
-        // rests just link a <rest /> item
-        //pugi::xml_node rest = note.append_child("rest");
-        
-        //note->LinkEndChild(rest);
-        
-        // handle multi measure rest
-        // break from the generation of this element
-        //if (r->GetActualDur() == VALSilSpec) {
-        //    WriteMultiMeasureRest(r);
-        //    return;
-        //}
-    }
-    
-    // put the duration
-    //TiXmlText *dur_name = new TiXmlText(dur.c_str());
-    //duration->LinkEndChild(dur_name);
-    duration.append_child(pugi::node_pcdata).set_value(dur.c_str());
-    //link it to <note>
-    //note->LinkEndChild(duration);
-    
-    // was the prevous note the last one in a tie?
-    // always close it, ties do not <continue>
-    if (m_tied)
-        SetTie(note, true);
-    // ties go between <duration> and <beam>
-    
-    if (t != "") {
-        pugi::xml_node xtype = note.append_child("type");
-        xtype.append_child(pugi::node_pcdata).set_value(t.c_str());
-        //TiXmlText *xtext = new TiXmlText(t.c_str());
-        //xtype->LinkEndChild(xtext);
-        //note->LinkEndChild(xtype);
-    }
-    
-    // add eventual dots to note/rest
-    // they go after <tie> and before <beam>
-    for (unsigned int i = 1; i == di->GetDots(); i++) {
-        // a <dot /> for every dot
-        note.append_child("dot");
-        //note->LinkEndChild(dot);
+bool XmlInput::ImportString(const std::string musicxml)
+{
+    try {
+        m_doc->Reset( Raw );
+        pugi::xml_document doc;
+        doc.load(musicxml.c_str());
+        pugi::xml_node root = doc.first_child();
+        return ReadXml(root);
     }
-    
-    // Do beaming
-    if (m_current_beam) {
-        std::string btype;
-        
-        int position = m_current_beam->GetChildIndex( element );
-        
-        // if position == -1, the note is not into the current beam
-        if (position >= 0) {
-            
-            // this flas is set so we know if we are "into" a beam
-            if (!m_in_beam) {
-                // not set, note is begining
-                btype = "begin";
-                m_in_beam = true;
-            } else {
-                // if this note is the last in the beam, end the beaming
-                if (position == m_current_beam->GetNoteCount() - 1) {
-                    btype = "end";
-                    m_current_beam = NULL;
-                    m_in_beam = false;
-                } else {
-                    // note in the middle, do nothing special (continue)
-                    btype = "continue";
-                }
-            }
-            
-            // write the xml for the beam
-            pugi::xml_node xbeam = note.append_child("beam");
-            // set the number of beams attribute (!!! couldn't they do this automatically???)
-            // seems to work even if left as 1
-            // num_of_beams is set above when parsing durations
-            xbeam.append_attribute("number")  = num_of_beams.c_str();
-            
-            // write the arribute and attach it to beam
-            //pugi::xml_node xtype = xbeam.append_child(btype.c_str());
-            //xbeam->LinkEndChild(xtype);
-            
-            // attach the beam to the note
-            //note->LinkEndChild(xbeam);
-        } else {
-            LogDebug("Beam with no notes");
-        }
+    catch(char * str) {
+        LogError("%s", str);
+        return false;
     }
-    
-    // measure in partwise
-    // link to part
-    //m_xml_part->LinkEndChild(note);
-    
-    // save to current note pointer
-    m_xml_last_note = note;
 }
-
-void XMLOutput::SetTie(pugi::xml_node xml_note, bool last) {
-    pugi::xml_node xtie =  xml_note.append_child("tie");
-    std::string tie_type;
-    
-    if (!last) {
-        tie_type = "start";
-        m_tied = true;
-
-    } else {
-        // end tie, reset tied flag
-        tie_type = "stop";
-        m_tied = false;
-    }
     
-    // add text to tie
-    xtie.append_attribute("type") = tie_type.c_str();
+bool XmlInput::ReadXml(pugi::xml_node root)
+{
     
-    /*
-    // add to note
-    // it has to be immediately after <duration>
-    // so search for it
-    TiXmlNode *duration = xml_note->LastChild("duration");
-    // if exists, add it before
-    if (duration)
-        xml_note->InsertAfterChild(duration, *xtie);
-    else
-        // else just at the end
-        xml_note->LinkEndChild(xtie);
-    */
-}
-               
-void XMLOutput::CreateAttributes() {
-    // Make new attributes as necessary
-    if (m_xml_attributes.empty()) {
-        m_xml_attributes = m_xml_part.append_child("attributes");
-        // put it into the current part
-        //m_xml_part->LinkEndChild(m_xml_attributes);
-    }
 }
 
 } // namespace vrv
\ No newline at end of file
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index 1933d539c1d..a01746da18a 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -17,6 +17,7 @@
 #include "iodarms.h"
 #include "iomei.h"
 #include "iopae.h"
+#include "iomusxml.h"
 #include "layer.h"
 #include "page.h"
 #include "measure.h"
@@ -147,8 +148,10 @@ bool Toolkit::SetFormat( std::string const &informat )
         m_format = darms_file;
     else if(informat == "mei")
         m_format = mei_file;
+    else if(informat == "xml")
+        m_format = xml_file;
     else {
-        LogError("Input format can only be: pae mei or darms");
+        LogError("Input format can only be: mei, pae, xml or darms");
         return false;
     }
     return true;
@@ -244,6 +247,9 @@ bool Toolkit::LoadString( const std::string &data )
     } else if (m_format == mei_file) {
         input = new MeiInput( &m_doc, "" );
     }
+    else if (m_format == xml_file) {
+        input = new XmlInput( &m_doc, "" );
+    }
     else {
         LogError( "Unknown format" );
         return false;
diff --git a/tools/main.cpp b/tools/main.cpp
index 0633168dc5b..abe2b4ddfc8 100644
--- a/tools/main.cpp
+++ b/tools/main.cpp
@@ -85,7 +85,7 @@ void display_usage() {
     
     cerr << " -b, --border=BORDER        Add border (default is " << DEFAULT_PAGE_LEFT_MAR << ")" << endl;
     
-    cerr << " -f, --format=INPUT_FORMAT  Select input format: darms, mei, pae (default is pae)" << endl;
+    cerr << " -f, --format=INPUT_FORMAT  Select input format: darms, mei, pae, xml (default is pae)" << endl;
     
     cerr << " -h, --page-height=HEIGHT   Specify the page height (default is " << DEFAULT_PAGE_HEIGHT << ")" << endl;
     
@@ -163,7 +163,7 @@ int main(int argc, char** argv)
     Toolkit toolkit( false );
     
     // read pae by default
-    type = pae_file;
+    type = mei_file;
     
     if (argc < 2) {
         cerr << "Expecting one input file." << endl << endl;

From c5f1b3886b2fd1c4030e487200ca755ee2b88d84 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 25 Sep 2015 14:09:53 +0200
Subject: [PATCH 37/85] Creating scoreDef and staffGrp/staffDef (WIP)

---
 include/vrv/iomusxml.h |  39 +++++---
 src/iomusxml.cpp       | 201 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 218 insertions(+), 22 deletions(-)

diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index 8acb9c738ef..6d0d7e9ac55 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -19,21 +19,23 @@
 
 namespace vrv {
 
-class Barline;
-class Beam;
-class Clef;
-class Doc;
-class Layer;
-class LayerElement;
-class MeterSig;
-class MRest;
-class MultiRest;
-class Note;
-class Page;
-class Rest;
-class Staff;
+//class Barline;
+//class Beam;
+//class Clef;
+//class Doc;
+//class Layer;
+//class LayerElement;
+class Measure;
+//class MeterSig;
+//class MRest;
+//class MultiRest;
+//class Note;
+//class Page;
+//class Rest;
+//class Staff;
+class StaffGrp;
 class System;
-class Tuplet;
+///class Tuplet;
 
 
 //----------------------------------------------------------------------------
@@ -53,6 +55,15 @@ class XmlInput: public FileInputStream
 private:
     bool ReadXml(pugi::xml_node root);
     
+    bool ReadXmlPart(pugi::xml_node node, System *system);
+    bool ReadXmlMeasure(pugi::xml_node node, Measure *measure);
+
+    bool ReadXmlPartAttributesAsStaffDef(pugi::xml_node node, StaffGrp *staffGrp);
+    
+    bool HasAttributeWithValue(pugi::xml_node node, std::string attribute, std::string value);
+    bool IsElement(pugi::xml_node node, std::string name);
+    bool HasContent(pugi::xml_node node, std::string content);
+    
 private:
     std::string m_filename;
     /** The parts are read as a vector of systems */
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index a0ac1a3cdfd..aab2a6e01e2 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -10,19 +10,22 @@
 
 //----------------------------------------------------------------------------
 
+#include <assert.h>
 #include <sstream>
 
 //----------------------------------------------------------------------------
 
-#include "beam.h"
-#include "clef.h"
+//#include "beam.h"
+//#include "clef.h"
 #include "doc.h"
-#include "keysig.h"
-#include "mensur.h"
-#include "metersig.h"
-#include "note.h"
-#include "rest.h"
-#include "tie.h"
+//#include "keysig.h"
+#include "measure.h"
+//#include "mensur.h"
+//#include "metersig.h"
+//#include "note.h"
+//#include "rest.h"
+#include "system.h"
+//#include "tie.h"
 #include "vrv.h"
 
 namespace vrv {
@@ -77,9 +80,191 @@ bool XmlInput::ImportString(const std::string musicxml)
     }
 }
     
+bool XmlInput::HasAttributeWithValue(pugi::xml_node node, std::string attribute, std::string value)
+{
+    assert(node);
+    
+    if (node.attribute(attribute.c_str()) && (std::string(node.attribute(attribute.c_str()).value()) == value)) {
+        return true;
+    }
+    return false;
+}
+
+bool XmlInput::IsElement(pugi::xml_node node, std::string name)
+{
+    assert(node);
+    
+    if (std::string(node.name()) == name) {
+        return true;
+    }
+    return false;
+}
+    
+bool XmlInput::HasContent(pugi::xml_node node, std::string content)
+{
+    assert(node);
+    
+    if (node.text() && (std::string(node.text().as_string()) == content)) {
+        return true;
+    }
+    return false;
+}
+
 bool XmlInput::ReadXml(pugi::xml_node root)
 {
+    assert(root);
+    
+    std::vector<StaffGrp*> m_staffGrpStack;
+    StaffGrp *staffGrp = new StaffGrp();
+    m_doc->m_scoreDef.AddStaffGrp(staffGrp);
+    m_staffGrpStack.push_back(staffGrp);
+    
+    pugi::xpath_node_set part_list_children = root.select_nodes("part-list/*");
+    for (pugi::xpath_node_set::const_iterator it = part_list_children.begin(); it != part_list_children.end(); ++it)
+    {
+        pugi::xpath_node xpath_node = *it;
+        if (IsElement(xpath_node.node(), "part-group")) {
+            if (HasAttributeWithValue(xpath_node.node(), "type", "start")) {
+                StaffGrp *staffGrp = new StaffGrp();
+                pugi::xpath_node group_symbol = xpath_node.node().select_single_node("group-symbol");
+                if (group_symbol) {
+                    if (HasContent(group_symbol.node(), "bracket")) staffGrp->SetSymbol(SYMBOL_bracket);
+                    else if (HasContent(group_symbol.node(), "brace")) staffGrp->SetSymbol(SYMBOL_brace);
+                    else if (HasContent(group_symbol.node(), "line")) staffGrp->SetSymbol(SYMBOL_line);
+                }
+                m_staffGrpStack.back()->AddStaffGrp(staffGrp);
+                m_staffGrpStack.push_back(staffGrp);
+            }
+            // this is the end of a part-group - we assume each opened part-group to be closed
+            else {
+                m_staffGrpStack.pop_back();
+            }
+        }
+        else if (IsElement(xpath_node.node(), "score-part")) {
+            std::string part = xpath_node.node().attribute("id").as_string();
+            std::string xpath = StringFormat("/score-partwise/part[@id='%s']/measure[@number='1']/attributes", part.c_str());
+            pugi::xpath_node part_first_measure_attributes = root.select_single_node(xpath.c_str());
+            // create the staffDef(s)
+            if (part_first_measure_attributes) ReadXmlPartAttributesAsStaffDef(part_first_measure_attributes.node(), m_staffGrpStack.back());
+        }
+    }
+    // here we could check that we have that there is only one staffGrp left in m_staffGrpStack
     
+    pugi::xpath_node_set parts = root.select_nodes("part");
+    if (parts.size() == 0) {
+        LogError("No parts to load");
+        return false;
+    }
+    for (pugi::xpath_node_set::const_iterator it = parts.begin(); it != parts.end(); ++it)
+    {
+        pugi::xpath_node xmlPart = *it;
+        System *system = new System();
+        ReadXmlPart(xmlPart.node(), system);
+    }
+    return false;
 }
+    
+    
+bool XmlInput::ReadXmlPartAttributesAsStaffDef(pugi::xml_node node, StaffGrp *staffGrp)
+{
+    assert(node);
+    assert(staffGrp);
+    
+    // First get the number of staves in the part
+    int numberOfStaves = 1;
+    pugi::xpath_node staves = node.select_single_node("staves");
+    if (staves) {
+        if (staves.node().text()) {
+            int values = atoi(staves.node().text().as_string());
+            numberOfStaves = (values > 0) ? values : 1;
+        }
+    }
+    
+    int i;
+    std::string xpath;
+    // Create as many staffDef
+    for (i = 0; i < numberOfStaves; i++) {
+        StaffDef *staffDef = new StaffDef();
+        // clef sign - first look if we have a clef-sign with the corresponding staff @number
+        pugi::xpath_node clef_sign;
+        xpath = StringFormat("clef[@number='%d']/sign", i+1);
+        clef_sign = node.select_single_node(xpath.c_str());
+        // if not, look at a common one
+        if (!clef_sign) {
+            clef_sign = node.select_single_node("clef/sign");
+        }
+        if (clef_sign && clef_sign.node().text()) {
+            staffDef->SetClefShape(staffDef->AttCleffingLog::StrToClefShape(clef_sign.node().text().as_string()));
+        }
+        // clef line
+        pugi::xpath_node clef_line;
+        xpath = StringFormat("clef[@number='%d']/line", i+1);
+        clef_line = node.select_single_node(xpath.c_str());
+        if (!clef_line) {
+            clef_line = node.select_single_node("clef/line");
+        }
+        if (clef_line && clef_line.node().text()) {
+            staffDef->SetClefLine(staffDef->AttCleffingLog::StrToInt(clef_line.node().text().as_string()));
+        }
+        // key sig
+        pugi::xpath_node key_fifths;
+        xpath = StringFormat("key[@number='%d']/fifths", i+1);
+        key_fifths = node.select_single_node(xpath.c_str());
+        if (!key_fifths) {
+            key_fifths = node.select_single_node("key/fifths");
+        }
+        if (key_fifths && key_fifths.node().text()) {
+            int key = atoi(key_fifths.node().text().as_string());
+            std::string value;
+            if (key < 0) value = StringFormat("%df", abs(key));
+            else value = StringFormat("%ds", key);
+            staffDef->SetKeySig(staffDef->AttKeySigDefaultLog::StrToKeySignature(value));
+        }
+        // time
+        pugi::xpath_node time;
+        xpath = StringFormat("time[@number='%d']", i+1);
+        time = node.select_single_node(xpath.c_str());
+        if (!time) {
+            time = node.select_single_node("time");
+        }
+        if (time) {
+            pugi::xpath_node symbol = time.node().select_single_node("symbol");
+            if (symbol && symbol.node().text()) {
+                staffDef->SetMeterSym(staffDef->AttMeterSigDefaultVis::StrToMeterSign(symbol.node().text().as_string()));
+            }
+            pugi::xpath_node beats = time.node().select_single_node("beats");
+            if (beats && beats.node().text()) {
+                staffDef->SetMeterCount(staffDef->AttMeterSigDefaultLog::StrToInt(beats.node().text().as_string()));
+            }
+            pugi::xpath_node beat_type = time.node().select_single_node("beat-type");
+            if (beat_type && beat_type.node().text()) {
+                staffDef->SetMeterUnit(staffDef->AttMeterSigDefaultLog::StrToInt(beat_type.node().text().as_string()));
+            }
+        }
+        staffGrp->AddStaffDef(staffDef);
+    }
+}
+    
+bool XmlInput::ReadXmlPart(pugi::xml_node node, System *system)
+{
+    pugi::xpath_node_set measures = node.select_nodes("measure");
+    if (measures.size() == 0) {
+        LogWarning("No measure to load");
+        return false;
+    }
+    for (pugi::xpath_node_set::const_iterator it = measures.begin(); it != measures.end(); ++it)
+    {
+        pugi::xpath_node xmlMeasure = *it;
+        Measure *measure = new Measure();
+        ReadXmlMeasure(xmlMeasure.node(), measure);
+    }
+    return false;
+}
+    
+    bool XmlInput::ReadXmlMeasure(pugi::xml_node node, Measure *measure)
+    {
+        LogDebug("Reading measure!");
+        return false;
+    }
 
 } // namespace vrv
\ No newline at end of file

From 8ee551cac49ab6de81c23584ad05bca0320418ca Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Fri, 25 Sep 2015 17:11:19 -0400
Subject: [PATCH 38/85] Pass the longest duration in the score to
 Alignment::SetAligmentXPos so it can be used to calculate horizontal spacing;
 this is important for mensural notation, where durations much longer than any
 CMN often occur. Unfortunately, my current code always crashes on the
 statement   functor->Call( this, params )   in   Object::Process . Why?

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

diff --git a/include/vrv/aligner.h b/include/vrv/aligner.h
index e446ad4b719..1793bdc5e2f 100644
--- a/include/vrv/aligner.h
+++ b/include/vrv/aligner.h
@@ -226,7 +226,7 @@ class Alignment: public Object
     virtual int IntegrateBoundingBoxXShift( ArrayPtrVoid *params );
     
 
-    virtual int HorizontalSpaceForDuration(double intervalTime);
+    virtual int HorizontalSpaceForDuration(double intervalTime, int maxActualDur);
 
     /**
      * Set the position of the Alignment.
diff --git a/src/aligner.cpp b/src/aligner.cpp
index f3e4228f6e6..4d25f48edda 100644
--- a/src/aligner.cpp
+++ b/src/aligner.cpp
@@ -455,7 +455,7 @@ is a function of time interval.
 flexibility: for example, for some purposes, spacing propoortional to duration is desirable.
 The best solution is probably to get ideal spacing from a user-definable table. */
 
-int Alignment::HorizontalSpaceForDuration(double intervalTime)
+int Alignment::HorizontalSpaceForDuration(double intervalTime, int maxActualDur)
 {
     int intervalXRel;
     intervalXRel = pow( intervalTime, 0.60 ) * 2.5; // 2.5 is an arbitrary value; so is 0.60
@@ -466,14 +466,16 @@ int Alignment::SetAligmentXPos( ArrayPtrVoid *params )
 {
     // param 0: the previous time position
     // param 1: the previous x rel position
-    // param 2: the functor to be redirected to the MeasureAligner (unused)
+    // param 2: duration of the longest note
+    // param 3: the functor to be redirected to the MeasureAligner (unused)
     double *previousTime = static_cast<double*>((*params).at(0));
     int *previousXRel = static_cast<int*>((*params).at(1));
+    int *maxActualDur = static_cast<int*>((*params).at(2));
     
     int intervalXRel = 0;
     double intervalTime = (m_time - (*previousTime));
     // HARDCODED parameter for HorizontalSpaceForDuration
-    if ( intervalTime > 0.0 ) intervalXRel = HorizontalSpaceForDuration(intervalTime);
+    if ( intervalTime > 0.0 ) intervalXRel = HorizontalSpaceForDuration(intervalTime, *maxActualDur);
     
     m_xRel = (*previousXRel) + (intervalXRel) * DEFINITON_FACTOR;
     (*previousTime) = m_time;
diff --git a/src/page.cpp b/src/page.cpp
index f62bc5d2dcc..93be235e27e 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -117,13 +117,15 @@ void Page::LayOutHorizontally( )
     // 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->GetEvenSpacing()) {
+        int longestActualDur;
         // Get the longest duration in the piece
         AttDurExtreme durExtremeComparison(LONGEST);
         Object *longestDur = this->FindChildExtremeByAttComparison(&durExtremeComparison);
         if (longestDur) {
             DurationInterface *interface = dynamic_cast<DurationInterface*>(longestDur);
             assert(interface);
-            LogDebug("Longest duration is %d", interface->GetActualDur());
+            longestActualDur = interface->GetActualDur();
+            LogDebug("Longest duration is %d", longestActualDur);
         }
 
         params.clear();
@@ -133,6 +135,7 @@ void Page::LayOutHorizontally( )
         params.push_back( &previousTime );
         params.push_back( &previousXRel );
         //params.push_back( &minMeasureWidth );
+        params.push_back( &longestActualDur );
         Functor setAlignmentX( &Object::SetAligmentXPos );
         // Special case: because we redirect the functor, pass it a parameter to itself (!)
         params.push_back( &setAlignmentX );

From a772fb317770b41006c6d47662fa7037cdbbb95b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sun, 27 Sep 2015 08:21:37 +0200
Subject: [PATCH 39/85] More musicxml import and renaming file format enum

---
 include/vrv/iomusxml.h |  31 ++--
 include/vrv/toolkit.h  |  22 +--
 src/iomusxml.cpp       | 316 ++++++++++++++++++++++++++++++-----------
 src/toolkit.cpp        |  20 +--
 tools/main.cpp         |   4 +-
 5 files changed, 276 insertions(+), 117 deletions(-)

diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index 6d0d7e9ac55..6a36729bb35 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -42,32 +42,43 @@ class System;
 // This class is not up-to-date
 //----------------------------------------------------------------------------
 
-class XmlInput: public FileInputStream
+class MusicXmlInput: public FileInputStream
 {
 public:
     // constructors and destructors
-    XmlInput(Doc *doc, std::string filename);
-    virtual ~XmlInput();
+    MusicXmlInput(Doc *doc, std::string filename);
+    virtual ~MusicXmlInput();
     
     virtual bool ImportFile( );
     virtual bool ImportString(std::string musicxml);
     
 private:
-    bool ReadXml(pugi::xml_node root);
+    bool ReadMusicXml(pugi::xml_node root);
     
-    bool ReadXmlPart(pugi::xml_node node, System *system);
-    bool ReadXmlMeasure(pugi::xml_node node, Measure *measure);
+    bool ReadMusicXmlPart(pugi::xml_node node, System *system,  int nbStaves, int staffOffset);
+    bool ReadMusicXmlMeasure(pugi::xml_node node, Measure *measure, int nbStaves, int staffOffset);
 
-    bool ReadXmlPartAttributesAsStaffDef(pugi::xml_node node, StaffGrp *staffGrp);
+    /** return the number of staves in the part */
+    int ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, StaffGrp *staffGrp, int staffOffset);
+    
+    void ReadMusicXmlAttributes(pugi::xml_node, Measure *measure);
+    void ReadMusicXmlBackup(pugi::xml_node, Measure *measure);
+    void ReadMusicXmlBarline(pugi::xml_node, Measure *measure);
+    void ReadMusicXmlForward(pugi::xml_node, Measure *measure);
+    void ReadMusicXmlNote(pugi::xml_node, Measure *measure);
     
     bool HasAttributeWithValue(pugi::xml_node node, std::string attribute, std::string value);
     bool IsElement(pugi::xml_node node, std::string name);
-    bool HasContent(pugi::xml_node node, std::string content);
+    bool HasContentWithValue(pugi::xml_node node, std::string value);
+    bool HasContent(pugi::xml_node);
+    
+    std::string GetAttributeValue(pugi::xml_node node, std::string attribute);
+    std::string GetContent(pugi::xml_node node);
+    
+    void AddMeasure(System *system, Measure *measure, int i);
     
 private:
     std::string m_filename;
-    /** The parts are read as a vector of systems */
-    std::vector<System*> m_parts;
 };
 
 } // namespace vrv {
diff --git a/include/vrv/toolkit.h b/include/vrv/toolkit.h
index d558977ddd3..4833e43660e 100644
--- a/include/vrv/toolkit.h
+++ b/include/vrv/toolkit.h
@@ -24,12 +24,12 @@
 
 namespace vrv {
 
-typedef enum _file_formats {
-    mei_file = 0,
-    pae_file,
-    darms_file,
-    xml_file
-} ConvertFileFormat;
+typedef enum {
+    MEI = 0,
+    PAE,
+    DARMS,
+    MUSICXML
+} FileFormat;
 
 
 //----------------------------------------------------------------------------
@@ -232,12 +232,12 @@ class Toolkit
     ///@}
     
     /**
-     * @name Get the input file format (defined as ConvertFileFormat)
-     * The SetFormat with ConvertFileFormat does not perform any validation
+     * @name Get the input file format (defined as FileFormat)
+     * The SetFormat with FileFormat does not perform any validation
      */
     ///@{
     bool SetFormat( std::string const &informat );
-    void SetFormat( ConvertFileFormat format ) { m_format = format; };
+    void SetFormat( FileFormat format ) { m_format = format; };
     int GetFormat() { return m_format; };
     ///@}
     
@@ -266,7 +266,7 @@ class Toolkit
     
     /**
      * @name Get the pages for a loaded file
-     * The SetFormat with ConvertFileFormat does not perform any validation
+     * The SetFormat with FileFormat does not perform any validation
      */
     ///@{
     int GetPageCount( );
@@ -304,7 +304,7 @@ class Toolkit
     Doc m_doc;
     View m_view;
     int m_scale;
-    ConvertFileFormat m_format;
+    FileFormat m_format;
     
     int m_pageHeight;
     int m_pageWidth;
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index aab2a6e01e2..1fad462b7b1 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -18,12 +18,10 @@
 //#include "beam.h"
 //#include "clef.h"
 #include "doc.h"
-//#include "keysig.h"
+#include "layer.h"
 #include "measure.h"
-//#include "mensur.h"
-//#include "metersig.h"
-//#include "note.h"
-//#include "rest.h"
+#include "page.h"
+#include "staff.h"
 #include "system.h"
 //#include "tie.h"
 #include "vrv.h"
@@ -31,10 +29,10 @@
 namespace vrv {
 
 //----------------------------------------------------------------------------
-// XmlInput
+// MusicXmlInput
 //----------------------------------------------------------------------------
 
-XmlInput::XmlInput(Doc *doc, std::string filename) :
+MusicXmlInput::MusicXmlInput(Doc *doc, std::string filename) :
 // This is pretty bad. We open a bad fileoutputstream as we don't use it
     FileInputStream(doc)
 {
@@ -42,22 +40,22 @@ XmlInput::XmlInput(Doc *doc, std::string filename) :
 
 }
 
-XmlInput::~XmlInput()
+MusicXmlInput::~MusicXmlInput()
 {
 }
     
-bool XmlInput::ImportFile()
+bool MusicXmlInput::ImportFile()
 {
     try {
         m_doc->Reset(Raw);
-        pugi::xml_document doc;
-        pugi::xml_parse_result result = doc.load_file(m_filename.c_str());
+        pugi::xml_document xmlDoc;
+        pugi::xml_parse_result result = xmlDoc.load_file(m_filename.c_str());
         if (!result)
         {
             return false;
         }
-        pugi::xml_node root = doc.first_child();
-        return ReadXml(root);
+        pugi::xml_node root = xmlDoc.first_child();
+        return ReadMusicXml(root);
     }
     catch(char * str) {
         LogError("%s", str);
@@ -65,14 +63,14 @@ bool XmlInput::ImportFile()
     }
 }
 
-bool XmlInput::ImportString(const std::string musicxml)
+bool MusicXmlInput::ImportString(const std::string musicxml)
 {
     try {
         m_doc->Reset( Raw );
-        pugi::xml_document doc;
-        doc.load(musicxml.c_str());
-        pugi::xml_node root = doc.first_child();
-        return ReadXml(root);
+        pugi::xml_document xmlDoc;
+        xmlDoc.load(musicxml.c_str());
+        pugi::xml_node root = xmlDoc.first_child();
+        return ReadMusicXml(root);
     }
     catch(char * str) {
         LogError("%s", str);
@@ -80,17 +78,17 @@ bool XmlInput::ImportString(const std::string musicxml)
     }
 }
     
-bool XmlInput::HasAttributeWithValue(pugi::xml_node node, std::string attribute, std::string value)
+bool MusicXmlInput::HasAttributeWithValue(pugi::xml_node node, std::string attribute, std::string value)
 {
     assert(node);
     
-    if (node.attribute(attribute.c_str()) && (std::string(node.attribute(attribute.c_str()).value()) == value)) {
+    if (GetAttributeValue(node, attribute) == value) {
         return true;
     }
     return false;
 }
 
-bool XmlInput::IsElement(pugi::xml_node node, std::string name)
+bool MusicXmlInput::IsElement(pugi::xml_node node, std::string name)
 {
     assert(node);
     
@@ -100,17 +98,71 @@ bool XmlInput::IsElement(pugi::xml_node node, std::string name)
     return false;
 }
     
-bool XmlInput::HasContent(pugi::xml_node node, std::string content)
+bool MusicXmlInput::HasContentWithValue(pugi::xml_node node, std::string value)
 {
     assert(node);
     
-    if (node.text() && (std::string(node.text().as_string()) == content)) {
+    if (GetContent(node) == value) {
         return true;
     }
     return false;
 }
+    
+bool MusicXmlInput::HasContent(pugi::xml_node node)
+{
+    assert(node);
+    
+    return (node.text());
+}
+    
+std::string MusicXmlInput::GetAttributeValue(pugi::xml_node node, std::string attribute)
+{
+    assert(node);
+    
+    if (node.attribute(attribute.c_str())) {
+        return std::string(node.attribute(attribute.c_str()).value());
+    }
+    return "";
+}
+    
+std::string MusicXmlInput::GetContent(pugi::xml_node node)
+{
+    assert(node);
+    
+    if (node.text()) {
+        return std::string(node.text().as_string());
+    }
+    return "";
+}
+    
+void MusicXmlInput::AddMeasure(System *system, Measure *measure, int i)
+{
+    assert(system);
+    assert(i >= 0);
+    
+    // we just need to add a measure
+    if (i == system->GetChildCount()) {
+        system->AddMeasure(measure);
+    }
+    // otherwise copy the content to the corresponding existing measure
+    else if (system->GetChildCount() > i) {
+        Measure *existingMeasure = dynamic_cast<Measure*>(system->m_children[i]);
+        assert(existingMeasure);
+        ArrayOfObjects::iterator sIter = measure->m_children.begin();
+        for (sIter = measure->m_children.begin(); sIter != measure->m_children.end(); sIter++) {
+            Staff *staff = dynamic_cast<Staff*>( measure->Relinquish( (*sIter)->GetIdx()) );
+            assert(staff);
+            existingMeasure->AddStaff(staff);
+        }
+    }
+    // there is a gap, this should not happen
+    else {
+        LogWarning("measures should be added in the right order");
+    }
+}
+    
 
-bool XmlInput::ReadXml(pugi::xml_node root)
+bool MusicXmlInput::ReadMusicXml(pugi::xml_node root)
 {
     assert(root);
     
@@ -119,18 +171,22 @@ bool XmlInput::ReadXml(pugi::xml_node root)
     m_doc->m_scoreDef.AddStaffGrp(staffGrp);
     m_staffGrpStack.push_back(staffGrp);
     
-    pugi::xpath_node_set part_list_children = root.select_nodes("part-list/*");
-    for (pugi::xpath_node_set::const_iterator it = part_list_children.begin(); it != part_list_children.end(); ++it)
+    int staffOffset = 0;
+    Page *page = new Page();
+    System *system = new System();
+    
+    pugi::xpath_node_set partListChildren = root.select_nodes("part-list/*");
+    for (pugi::xpath_node_set::const_iterator it = partListChildren.begin(); it != partListChildren.end(); ++it)
     {
-        pugi::xpath_node xpath_node = *it;
-        if (IsElement(xpath_node.node(), "part-group")) {
-            if (HasAttributeWithValue(xpath_node.node(), "type", "start")) {
+        pugi::xpath_node xpathNode = *it;
+        if (IsElement(xpathNode.node(), "part-group")) {
+            if (HasAttributeWithValue(xpathNode.node(), "type", "start")) {
                 StaffGrp *staffGrp = new StaffGrp();
-                pugi::xpath_node group_symbol = xpath_node.node().select_single_node("group-symbol");
-                if (group_symbol) {
-                    if (HasContent(group_symbol.node(), "bracket")) staffGrp->SetSymbol(SYMBOL_bracket);
-                    else if (HasContent(group_symbol.node(), "brace")) staffGrp->SetSymbol(SYMBOL_brace);
-                    else if (HasContent(group_symbol.node(), "line")) staffGrp->SetSymbol(SYMBOL_line);
+                pugi::xpath_node groupGymbol = xpathNode.node().select_single_node("group-symbol");
+                if (groupGymbol) {
+                    if (HasContentWithValue(groupGymbol.node(), "bracket")) staffGrp->SetSymbol(SYMBOL_bracket);
+                    else if (HasContentWithValue(groupGymbol.node(), "brace")) staffGrp->SetSymbol(SYMBOL_brace);
+                    else if (HasContentWithValue(groupGymbol.node(), "line")) staffGrp->SetSymbol(SYMBOL_line);
                 }
                 m_staffGrpStack.back()->AddStaffGrp(staffGrp);
                 m_staffGrpStack.push_back(staffGrp);
@@ -140,81 +196,92 @@ bool XmlInput::ReadXml(pugi::xml_node root)
                 m_staffGrpStack.pop_back();
             }
         }
-        else if (IsElement(xpath_node.node(), "score-part")) {
-            std::string part = xpath_node.node().attribute("id").as_string();
-            std::string xpath = StringFormat("/score-partwise/part[@id='%s']/measure[@number='1']/attributes", part.c_str());
-            pugi::xpath_node part_first_measure_attributes = root.select_single_node(xpath.c_str());
+        else if (IsElement(xpathNode.node(), "score-part")) {
+            // get the attributes element of the first measure of the part
+            std::string partId = xpathNode.node().attribute("id").as_string();
+            std::string xpath = StringFormat("/score-partwise/part[@id='%s']/measure[@number='1']/attributes", partId.c_str());
+            pugi::xpath_node partFirstMeasureAttributes = root.select_single_node(xpath.c_str());
+            if (!partFirstMeasureAttributes) {
+                LogWarning("Could not find the 'attributes' element in the first measure of part '%s'", partId.c_str());
+                continue;
+            }
             // create the staffDef(s)
-            if (part_first_measure_attributes) ReadXmlPartAttributesAsStaffDef(part_first_measure_attributes.node(), m_staffGrpStack.back());
+            int nbStaves = ReadMusicXmlPartAttributesAsStaffDef(partFirstMeasureAttributes.node(), m_staffGrpStack.back(), staffOffset);
+            // find the part and read it
+            xpath = StringFormat("/score-partwise/part[@id='%s']", partId.c_str());
+            pugi::xpath_node part = root.select_single_node(xpath.c_str());
+            if (!part) {
+                LogWarning("Could not find the part '%s'", partId.c_str());
+                continue;
+            }
+            ReadMusicXmlPart(part.node(), system, nbStaves, staffOffset);
+            // increment the staffOffset for reading the next part
+            staffOffset += nbStaves;
         }
     }
     // here we could check that we have that there is only one staffGrp left in m_staffGrpStack
     
-    pugi::xpath_node_set parts = root.select_nodes("part");
-    if (parts.size() == 0) {
-        LogError("No parts to load");
-        return false;
-    }
-    for (pugi::xpath_node_set::const_iterator it = parts.begin(); it != parts.end(); ++it)
-    {
-        pugi::xpath_node xmlPart = *it;
-        System *system = new System();
-        ReadXmlPart(xmlPart.node(), system);
-    }
-    return false;
+    page->AddSystem( system );
+    m_doc->AddPage( page );
+    
+    return true;
 }
     
     
-bool XmlInput::ReadXmlPartAttributesAsStaffDef(pugi::xml_node node, StaffGrp *staffGrp)
+int MusicXmlInput::ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, StaffGrp *staffGrp, int staffOffset)
 {
     assert(node);
     assert(staffGrp);
     
     // First get the number of staves in the part
-    int numberOfStaves = 1;
+    int nbStaves = 1;
     pugi::xpath_node staves = node.select_single_node("staves");
     if (staves) {
         if (staves.node().text()) {
             int values = atoi(staves.node().text().as_string());
-            numberOfStaves = (values > 0) ? values : 1;
+            nbStaves = (values > 0) ? values : 1;
         }
     }
     
     int i;
     std::string xpath;
     // Create as many staffDef
-    for (i = 0; i < numberOfStaves; i++) {
+    for (i = 0; i < nbStaves; i++) {
         StaffDef *staffDef = new StaffDef();
+        staffDef->SetN(i + 1 + staffOffset);
+        // by default five line staves
+        staffDef->SetLines(5);
+        
         // clef sign - first look if we have a clef-sign with the corresponding staff @number
-        pugi::xpath_node clef_sign;
+        pugi::xpath_node clefSign;
         xpath = StringFormat("clef[@number='%d']/sign", i+1);
-        clef_sign = node.select_single_node(xpath.c_str());
+        clefSign = node.select_single_node(xpath.c_str());
         // if not, look at a common one
-        if (!clef_sign) {
-            clef_sign = node.select_single_node("clef/sign");
+        if (!clefSign) {
+            clefSign = node.select_single_node("clef/sign");
         }
-        if (clef_sign && clef_sign.node().text()) {
-            staffDef->SetClefShape(staffDef->AttCleffingLog::StrToClefShape(clef_sign.node().text().as_string()));
+        if (clefSign && HasContent(clefSign.node())) {
+            staffDef->SetClefShape(staffDef->AttCleffingLog::StrToClefShape(GetContent(clefSign.node())));
         }
         // clef line
-        pugi::xpath_node clef_line;
+        pugi::xpath_node clefLine;
         xpath = StringFormat("clef[@number='%d']/line", i+1);
-        clef_line = node.select_single_node(xpath.c_str());
-        if (!clef_line) {
-            clef_line = node.select_single_node("clef/line");
+        clefLine = node.select_single_node(xpath.c_str());
+        if (!clefLine) {
+            clefLine = node.select_single_node("clef/line");
         }
-        if (clef_line && clef_line.node().text()) {
-            staffDef->SetClefLine(staffDef->AttCleffingLog::StrToInt(clef_line.node().text().as_string()));
+        if (clefLine && HasContent(clefLine.node())) {
+            staffDef->SetClefLine(staffDef->AttCleffingLog::StrToInt(clefLine.node().text().as_string()));
         }
         // key sig
-        pugi::xpath_node key_fifths;
+        pugi::xpath_node keyFifths;
         xpath = StringFormat("key[@number='%d']/fifths", i+1);
-        key_fifths = node.select_single_node(xpath.c_str());
-        if (!key_fifths) {
-            key_fifths = node.select_single_node("key/fifths");
+        keyFifths = node.select_single_node(xpath.c_str());
+        if (!keyFifths) {
+            keyFifths = node.select_single_node("key/fifths");
         }
-        if (key_fifths && key_fifths.node().text()) {
-            int key = atoi(key_fifths.node().text().as_string());
+        if (keyFifths && HasContent(keyFifths.node())) {
+            int key = atoi(keyFifths.node().text().as_string());
             std::string value;
             if (key < 0) value = StringFormat("%df", abs(key));
             else value = StringFormat("%ds", key);
@@ -229,42 +296,123 @@ bool XmlInput::ReadXmlPartAttributesAsStaffDef(pugi::xml_node node, StaffGrp *st
         }
         if (time) {
             pugi::xpath_node symbol = time.node().select_single_node("symbol");
-            if (symbol && symbol.node().text()) {
+            if (symbol && HasContent(symbol.node())) {
                 staffDef->SetMeterSym(staffDef->AttMeterSigDefaultVis::StrToMeterSign(symbol.node().text().as_string()));
             }
             pugi::xpath_node beats = time.node().select_single_node("beats");
-            if (beats && beats.node().text()) {
+            if (beats && HasContent(beats.node())) {
                 staffDef->SetMeterCount(staffDef->AttMeterSigDefaultLog::StrToInt(beats.node().text().as_string()));
             }
-            pugi::xpath_node beat_type = time.node().select_single_node("beat-type");
-            if (beat_type && beat_type.node().text()) {
-                staffDef->SetMeterUnit(staffDef->AttMeterSigDefaultLog::StrToInt(beat_type.node().text().as_string()));
+            pugi::xpath_node beatType = time.node().select_single_node("beat-type");
+            if (beatType && HasContent(beatType.node())) {
+                staffDef->SetMeterUnit(staffDef->AttMeterSigDefaultLog::StrToInt(beatType.node().text().as_string()));
             }
         }
         staffGrp->AddStaffDef(staffDef);
     }
+    return nbStaves;
 }
     
-bool XmlInput::ReadXmlPart(pugi::xml_node node, System *system)
+bool MusicXmlInput::ReadMusicXmlPart(pugi::xml_node node, System *system, int nbStaves, int staffOffset)
 {
+    assert(node);
+    assert(system);
+    
     pugi::xpath_node_set measures = node.select_nodes("measure");
     if (measures.size() == 0) {
         LogWarning("No measure to load");
         return false;
     }
+
+    int i = 0;
     for (pugi::xpath_node_set::const_iterator it = measures.begin(); it != measures.end(); ++it)
     {
         pugi::xpath_node xmlMeasure = *it;
         Measure *measure = new Measure();
-        ReadXmlMeasure(xmlMeasure.node(), measure);
+        ReadMusicXmlMeasure(xmlMeasure.node(), measure, nbStaves, staffOffset);
+        // Add the measure to the system - if already there from a previous part will just merge the content
+        AddMeasure(system, measure, i);
+        i++;
     }
     return false;
 }
     
-    bool XmlInput::ReadXmlMeasure(pugi::xml_node node, Measure *measure)
-    {
-        LogDebug("Reading measure!");
-        return false;
+bool MusicXmlInput::ReadMusicXmlMeasure(pugi::xml_node node, Measure *measure, int nbStaves, int staffOffset)
+{
+    assert(node);
+    assert(measure);
+    
+    int measureNb = atoi(GetAttributeValue(node, "number").c_str());
+    if (measure > 0) measure->SetN(measureNb);
+    
+    int i = 0;
+    for (i = 0; i < nbStaves; i++) {
+        // the staff @n must take into account the staffOffset
+        Staff *staff = new Staff();
+        staff->SetN(i + 1 + staffOffset);
+        
+        // add at least one layer
+        Layer *layer = new Layer();
+        layer->SetN(1);
+        staff->AddLayer(layer);
+        measure->AddStaff(staff);
+
+        // read the content of the measure
+        for (pugi::xml_node::iterator it = node.begin(); it != node.end(); ++it)
+        {
+            if (IsElement(*it, "barline")) {
+                ReadMusicXmlBarline(*it, measure);
+            }
+            else if (IsElement(*it, "note")) {
+                ReadMusicXmlNote(*it, measure);
+            }
+        }
+        
+    }
+    
+    //LogDebug("Reading measure!");
+    return true;
+}
+    
+void MusicXmlInput::ReadMusicXmlAttributes(pugi::xml_node node, Measure *measure)
+{
+}
+
+void MusicXmlInput::ReadMusicXmlBackup(pugi::xml_node node, Measure *measure)
+{
+}
+
+void MusicXmlInput::ReadMusicXmlBarline(pugi::xml_node node, Measure *measure)
+{
+    data_BARRENDITION barRendition = BARRENDITION_NONE;
+    pugi::xpath_node barStyle = node.select_single_node("bar-style");
+    if (barStyle) {
+        if (HasContentWithValue(barStyle.node(), "light-light")) {
+            barRendition = BARRENDITION_dbl;
+        }
+        else if (HasContentWithValue(barStyle.node(), "light-heavy")) {
+           barRendition = BARRENDITION_end;
+        }
+        // we need to handle more style
+        else {
+            barRendition = BARRENDITION_single;
+        }
     }
+    // only left or right can be supported
+    if (HasAttributeWithValue(node, "location", "left")) {
+        measure->SetLeft(barRendition);
+    }
+    else {
+        measure->SetRight(barRendition);
+    }
+}
 
+void MusicXmlInput::ReadMusicXmlForward(pugi::xml_node node, Measure *measure)
+{
+}
+    
+void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure)
+{
+}
+    
 } // namespace vrv
\ No newline at end of file
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index a01746da18a..e8d9e6f2c41 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -40,7 +40,7 @@ Toolkit::Toolkit( bool initFont )
 {
     
     m_scale = DEFAULT_SCALE;
-    m_format = mei_file;
+    m_format = MEI;
     
     // default page size
     m_pageHeight = DEFAULT_PAGE_HEIGHT;
@@ -143,13 +143,13 @@ bool Toolkit::SetSpacingSystem( int spacingSystem )
 bool Toolkit::SetFormat( std::string const &informat )
 {
     if (informat == "pae")
-        m_format = pae_file;
+        m_format = PAE;
     else if(informat == "darms")
-        m_format = darms_file;
+        m_format = DARMS;
     else if(informat == "mei")
-        m_format = mei_file;
+        m_format = MEI;
     else if(informat == "xml")
-        m_format = xml_file;
+        m_format = MUSICXML;
     else {
         LogError("Input format can only be: mei, pae, xml or darms");
         return false;
@@ -240,15 +240,15 @@ bool Toolkit::LoadUTF16File( const std::string &filename )
 bool Toolkit::LoadString( const std::string &data )
 {
     FileInputStream *input = NULL;
-    if (m_format == pae_file) {
+    if (m_format == PAE) {
         input = new PaeInput( &m_doc, "" );
-    } else if (m_format == darms_file) {
+    } else if (m_format == DARMS) {
         input = new DarmsInput( &m_doc, "" );
-    } else if (m_format == mei_file) {
+    } else if (m_format == MEI) {
         input = new MeiInput( &m_doc, "" );
     }
-    else if (m_format == xml_file) {
-        input = new XmlInput( &m_doc, "" );
+    else if (m_format == MUSICXML) {
+        input = new MusicXmlInput( &m_doc, "" );
     }
     else {
         LogError( "Unknown format" );
diff --git a/tools/main.cpp b/tools/main.cpp
index abe2b4ddfc8..2614490f240 100644
--- a/tools/main.cpp
+++ b/tools/main.cpp
@@ -145,7 +145,7 @@ int main(int argc, char** argv)
     // Init random number generator for uuids
     std::srand((unsigned int)std::time(0));
     
-    ConvertFileFormat type;
+    FileFormat type;
     int no_mei_hdr = 0;
     int adjust_page_height = 0;
     int all_pages = 0;
@@ -163,7 +163,7 @@ int main(int argc, char** argv)
     Toolkit toolkit( false );
     
     // read pae by default
-    type = mei_file;
+    type = MEI;
     
     if (argc < 2) {
         cerr << "Expecting one input file." << endl << endl;

From d6718f7c7ef614f1b643a79bee60dac5d15ec3b0 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sun, 27 Sep 2015 08:27:29 +0200
Subject: [PATCH 40/85] Fixing the functor SetAlignmentPosX by adding the new
 parameter to all overriding methods (Measure and MeasureAligner)

---
 src/aligner.cpp | 3 ++-
 src/measure.cpp | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/aligner.cpp b/src/aligner.cpp
index 4d25f48edda..84c8a94e370 100644
--- a/src/aligner.cpp
+++ b/src/aligner.cpp
@@ -433,7 +433,8 @@ int MeasureAligner::SetAligmentXPos( ArrayPtrVoid *params )
 {
     // param 0: the previous time position
     // param 1: the previous x rel position
-    // param 2: the functor to be redirected to the MeasureAligner (unused)
+    // param 2: duration of the longest note (unused)
+    // param 3: the functor to be redirected to the MeasureAligner (unused)
     double *previousTime = static_cast<double*>((*params).at(0));
     int *previousXRel = static_cast<int*>((*params).at(1));
     
diff --git a/src/measure.cpp b/src/measure.cpp
index adfd8281ab4..eb9e31c4f3e 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -215,8 +215,9 @@ int Measure::SetAligmentXPos( ArrayPtrVoid *params )
 {
     // param 0: the previous time position (unused)
     // param 1: the previous x rel position (unused)
-    // param 2: the functor to be redirected to Aligner
-    Functor *setAligmnentPosX = static_cast<Functor*>((*params).at(2));
+    // param 2: duration of the longest note (unused)
+    // param 3: the functor to be redirected to Aligner
+    Functor *setAligmnentPosX = static_cast<Functor*>((*params).at(3));
     
     m_measureAligner.Process( setAligmnentPosX, params);
     

From 571cf5b3f9879bed28bd9dd69715cd8aac5fccba Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sun, 27 Sep 2015 22:44:40 +0200
Subject: [PATCH 41/85] Reading notes, rests, chords and beams

---
 include/vrv/iomusxml.h |  24 +++-
 src/iomusxml.cpp       | 300 +++++++++++++++++++++++++++++++++++++----
 src/toolkit.cpp        |   2 +-
 3 files changed, 292 insertions(+), 34 deletions(-)

diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index 6a36729bb35..8c0cb7d420c 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        iomusxml.h
-// Author:      Rodolfo Zitellini
-// Created:     10/08/2012
+// Author:      Laurent Pugin
+// Created:     22/09/2015
 // Copyright (c) Authors and others. All rights reserved.
 /////////////////////////////////////////////////////////////////////////////
 
@@ -14,8 +14,10 @@
 
 //----------------------------------------------------------------------------
 
+#include "attdef.h"
 #include "io.h"
 #include "pugixml.hpp"
+#include "vrvdef.h"
 
 namespace vrv {
 
@@ -23,8 +25,8 @@ namespace vrv {
 //class Beam;
 //class Clef;
 //class Doc;
-//class Layer;
-//class LayerElement;
+class Layer;
+class LayerElement;
 class Measure;
 //class MeterSig;
 //class MRest;
@@ -32,6 +34,7 @@ class Measure;
 //class Note;
 //class Page;
 //class Rest;
+class Slur;
 //class Staff;
 class StaffGrp;
 class System;
@@ -74,11 +77,24 @@ class MusicXmlInput: public FileInputStream
     
     std::string GetAttributeValue(pugi::xml_node node, std::string attribute);
     std::string GetContent(pugi::xml_node node);
+    std::string GetContentOfChild(pugi::xml_node node, std::string child);
     
     void AddMeasure(System *system, Measure *measure, int i);
+    void AddLayerElement(Layer *layer, LayerElement *element);
+    Layer *SelectLayer(pugi::xml_node node, Measure *measure);
+    void RemoveLastFromStack(ClassId classId);
+    
+    data_ACCIDENTAL_EXPLICIT ConvertAccidentalToAccid(std::string value);
+    data_ACCIDENTAL_EXPLICIT ConvertAlterToAccid(std::string value);
+    data_DURATION ConvertTypeToDur(std::string value);
+    data_PITCHNAME ConvertStepToPitchName(std::string value);
     
 private:
     std::string m_filename;
+    
+    std::vector<LayerElement*> m_elementStack;
+    
+    std::vector<std::pair<Slur*, int> > m_slurStack;
 };
 
 } // namespace vrv {
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 1fad462b7b1..0427e275b78 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        musiomusxml.cpp
-// Author:      Rodolfo Zitellini
-// Created:     10/08/2012
+// Name:        iomusxml.cpp
+// Author:      Laurent Pugin
+// Created:     22/09/2015
 // Copyright (c) Authors and others. All rights reserved.
 /////////////////////////////////////////////////////////////////////////////
 
@@ -16,11 +16,15 @@
 //----------------------------------------------------------------------------
 
 //#include "beam.h"
+#include "chord.h"
 //#include "clef.h"
 #include "doc.h"
 #include "layer.h"
 #include "measure.h"
+#include "note.h"
+#include "mrest.h"
 #include "page.h"
+#include "rest.h"
 #include "staff.h"
 #include "system.h"
 //#include "tie.h"
@@ -135,6 +139,15 @@ std::string MusicXmlInput::GetContent(pugi::xml_node node)
     return "";
 }
     
+std::string MusicXmlInput::GetContentOfChild(pugi::xml_node node, std::string child)
+{
+    pugi::xpath_node childNode = node.select_single_node(child.c_str());
+    if (childNode && HasContent(childNode.node())) {
+        return GetContent(childNode.node());
+    }
+    return "";
+    }
+    
 void MusicXmlInput::AddMeasure(System *system, Measure *measure, int i)
 {
     assert(system);
@@ -161,6 +174,54 @@ void MusicXmlInput::AddMeasure(System *system, Measure *measure, int i)
     }
 }
     
+void MusicXmlInput::AddLayerElement(Layer *layer, LayerElement *element)
+{
+    assert(layer);
+    assert(element);
+    
+    if (m_elementStack.empty()) {
+        layer->AddLayerElement(element);
+    }
+    else if (m_elementStack.back()->Is() == CHORD) {
+        Chord *chord = dynamic_cast<Chord*>(m_elementStack.back());
+        assert(chord);
+        chord->AddLayerElement(element);
+    }
+    else if (m_elementStack.back()->Is() == BEAM) {
+        Beam *beam = dynamic_cast<Beam*>(m_elementStack.back());
+        assert(beam);
+        beam->AddLayerElement(element);
+    }
+}
+    
+Layer *MusicXmlInput::SelectLayer(pugi::xml_node node, vrv::Measure *measure)
+{
+    int staffNb = 1;
+    std::string staffNbStr = GetContentOfChild(node, "staff");
+    if (!staffNbStr.empty()) {
+        staffNb = atoi(staffNbStr.c_str());
+    }
+    if ((staffNb < 1) || (staffNb > measure->m_children.size())) {
+        LogWarning("Staff %d cannot be found", staffNb);
+        staffNb = 1;
+    }
+    staffNb--;
+    Staff *staff = dynamic_cast<Staff*>(measure->m_children.at(staffNb));
+    assert(staff);
+    Layer *layer = dynamic_cast<Layer*>(staff->m_children.at(0));
+    return layer;
+}
+    
+void MusicXmlInput::RemoveLastFromStack(ClassId classId)
+{
+    std::vector<LayerElement*>::reverse_iterator riter;
+    for (riter = m_elementStack.rbegin(); riter != m_elementStack.rend(); riter++) {
+        if ((*riter)->Is() == classId) {
+            m_elementStack.erase((riter+1).base());
+            return;
+        }
+    }
+}
 
 bool MusicXmlInput::ReadMusicXml(pugi::xml_node root)
 {
@@ -175,19 +236,19 @@ bool MusicXmlInput::ReadMusicXml(pugi::xml_node root)
     Page *page = new Page();
     System *system = new System();
     
-    pugi::xpath_node_set partListChildren = root.select_nodes("part-list/*");
+    pugi::xpath_node_set partListChildren = root.select_nodes("/score-partwise/part-list/*");
     for (pugi::xpath_node_set::const_iterator it = partListChildren.begin(); it != partListChildren.end(); ++it)
     {
         pugi::xpath_node xpathNode = *it;
         if (IsElement(xpathNode.node(), "part-group")) {
             if (HasAttributeWithValue(xpathNode.node(), "type", "start")) {
                 StaffGrp *staffGrp = new StaffGrp();
-                pugi::xpath_node groupGymbol = xpathNode.node().select_single_node("group-symbol");
-                if (groupGymbol) {
-                    if (HasContentWithValue(groupGymbol.node(), "bracket")) staffGrp->SetSymbol(SYMBOL_bracket);
-                    else if (HasContentWithValue(groupGymbol.node(), "brace")) staffGrp->SetSymbol(SYMBOL_brace);
-                    else if (HasContentWithValue(groupGymbol.node(), "line")) staffGrp->SetSymbol(SYMBOL_line);
-                }
+                // read the group-symbol (MEI @symbol)
+                std::string groupGymbol = GetContentOfChild(xpathNode.node(), "group-symbol");
+                if (groupGymbol == "bracket") staffGrp->SetSymbol(SYMBOL_bracket);
+                else if (groupGymbol == "brace") staffGrp->SetSymbol(SYMBOL_brace);
+                else if (groupGymbol == "line") staffGrp->SetSymbol(SYMBOL_line);
+                // now stack it
                 m_staffGrpStack.back()->AddStaffGrp(staffGrp);
                 m_staffGrpStack.push_back(staffGrp);
             }
@@ -356,18 +417,22 @@ bool MusicXmlInput::ReadMusicXmlMeasure(pugi::xml_node node, Measure *measure, i
         layer->SetN(1);
         staff->AddLayer(layer);
         measure->AddStaff(staff);
-
-        // read the content of the measure
-        for (pugi::xml_node::iterator it = node.begin(); it != node.end(); ++it)
-        {
-            if (IsElement(*it, "barline")) {
-                ReadMusicXmlBarline(*it, measure);
-            }
-            else if (IsElement(*it, "note")) {
-                ReadMusicXmlNote(*it, measure);
-            }
+    }
+    
+    //Normally the stack should be empty
+    //LogDebug("Measure %s", GetAttributeValue(node, "number").c_str());
+    //assert(m_elementStack.empty());
+    m_elementStack.clear();
+    
+    // read the content of the measure
+    for (pugi::xml_node::iterator it = node.begin(); it != node.end(); ++it)
+    {
+        if (IsElement(*it, "barline")) {
+            ReadMusicXmlBarline(*it, measure);
+        }
+        else if (IsElement(*it, "note")) {
+            ReadMusicXmlNote(*it, measure);
         }
-        
     }
     
     //LogDebug("Reading measure!");
@@ -385,14 +450,10 @@ void MusicXmlInput::ReadMusicXmlBackup(pugi::xml_node node, Measure *measure)
 void MusicXmlInput::ReadMusicXmlBarline(pugi::xml_node node, Measure *measure)
 {
     data_BARRENDITION barRendition = BARRENDITION_NONE;
-    pugi::xpath_node barStyle = node.select_single_node("bar-style");
-    if (barStyle) {
-        if (HasContentWithValue(barStyle.node(), "light-light")) {
-            barRendition = BARRENDITION_dbl;
-        }
-        else if (HasContentWithValue(barStyle.node(), "light-heavy")) {
-           barRendition = BARRENDITION_end;
-        }
+    std::string barStyle = GetContentOfChild(node, "bar-style");
+    if (!barStyle.empty()) {
+        if (barStyle == "light-light") barRendition = BARRENDITION_dbl;
+        else if (barStyle ==  "light-heavy") barRendition = BARRENDITION_end;
         // we need to handle more style
         else {
             barRendition = BARRENDITION_single;
@@ -413,6 +474,187 @@ void MusicXmlInput::ReadMusicXmlForward(pugi::xml_node node, Measure *measure)
     
 void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure)
 {
+    Layer *layer = SelectLayer(node, measure);
+    
+    // duration string and dots
+    std::string typeStr = GetContentOfChild(node, "type");
+    int dots = (int)node.select_nodes("dot").size();
+    
+    // beam start
+    bool beamStart = node.select_single_node("beam[@number='1'][text()='begin']");
+    if (beamStart) {
+        Beam *beam = new Beam();
+        AddLayerElement(layer, beam);
+        m_elementStack.push_back(beam);
+    }
+    
+    if (node.select_single_node("rest")) {
+        // we assume /note without /type to be mRest
+        if (typeStr.empty()) {
+            MRest *mRest = new MRest();
+            layer->AddLayerElement(mRest);
+        }
+        else {
+            Rest *rest = new Rest();
+            rest->SetDur(ConvertTypeToDur(typeStr));
+            if (dots > 0) rest->SetDots(dots);
+            layer->AddLayerElement(rest);
+        }
+    }
+    else {
+        Note *note = new Note();
+        
+        // Pitch and octave
+        pugi::xpath_node pitch = node.select_single_node("pitch");
+        if (pitch) {
+            std::string stepStr = GetContentOfChild(pitch.node(), "step");
+            if (!stepStr.empty()) note->SetPname(ConvertStepToPitchName(stepStr));
+            std::string octaveStr = GetContentOfChild(pitch.node(), "octave");
+            if (!octaveStr.empty()) note->SetOct(atoi(octaveStr.c_str()));
+        }
+        
+        // Look at the next note to see if we are starting or ending a chord
+        pugi::xpath_node nextNote = node.select_single_node("./following-sibling::note");
+        bool nextIsChord = false;
+        if (nextNote.node().select_single_node("chord")) nextIsChord = true;
+        // Create the chord if we are starting a new chord
+        if (nextIsChord) {
+            if (m_elementStack.empty() || m_elementStack.back()->Is() != CHORD) {
+                Chord *chord = new Chord();
+                chord->SetDur(ConvertTypeToDur(typeStr));
+                if (dots > 0) chord->SetDots(dots);
+                AddLayerElement(layer, chord);
+                m_elementStack.push_back(chord);
+            }
+        }
+        
+        // Set the duration to the note if we are not in a chord
+        if (m_elementStack.empty() || m_elementStack.back()->Is() != CHORD) {
+            note->SetDur(ConvertTypeToDur(typeStr));
+            if (dots > 0) note->SetDots(dots);
+        }
+        
+        // Add the note to the layer or to the current container
+        AddLayerElement(layer, note);
+        
+        // If we are ending a chord remove it from the stack
+        if (!nextIsChord) {
+            if (!m_elementStack.empty() && m_elementStack.back()->Is() == CHORD) {
+                RemoveLastFromStack(CHORD);
+            }
+        }
+    }
+    
+    // beam end
+    bool beamEnd =  node.select_single_node("beam[@number='1'][text()='end']");
+    if (beamEnd) {
+        RemoveLastFromStack(BEAM);
+    }
+
+     /*
+     else:
+     pname = self._get_text(n.xpath("pitch/step"))
+     oct = self._get_text(n.xpath("pitch/octave"))
+     accid = None
+     if n.xpath("boolean(pitch/alter)"):
+     alter = self._get_text(n.xpath("pitch/alter"))
+     accid = MusicXMLtoMei.accidentals[int(alter)]
+     sx = n.xpath("notations/technical/string")
+     string = None
+     if len(sx):
+     string = self._get_text(sx)
+     fret = None
+     fx = n.xpath("notations/technical/fret")
+     if len(fx):
+     fret = self._get_text(fx)
+     
+     next_chord_tag = False
+     # look ahead to next note
+     if i+1 < len(notes):
+     next_chord_tag = notes[i+1].xpath("boolean(chord)")
+     
+     if next_chord_tag:
+     # a chord is beginning or continuing
+     if cur_chord is None:
+     # a chord is beginning
+     cur_chord = self._create_chord(dur, dur_ges)
+     layer.addChild(cur_chord)
+     
+     if cur_chord is not None:
+     note = self._create_note(pname, oct, string, fret, accid)
+     cur_chord.addChild(note)
+     else:
+     note = self._create_note(pname, oct, string, fret, accid, dur=dur, dur_ges=dur_ges)
+     layer.addChild(note)
+     
+     if not next_chord_tag:
+     cur_chord = None
+     */
+}
+    
+data_ACCIDENTAL_EXPLICIT MusicXmlInput::ConvertAccidentalToAccid(std::string value)
+{
+    if (value == "sharp") return ACCIDENTAL_EXPLICIT_s;
+    else if (value == "flat") return ACCIDENTAL_EXPLICIT_f;
+    else if (value == "sharp-sharp") return ACCIDENTAL_EXPLICIT_ss;
+    else if (value == "double-sharp") return ACCIDENTAL_EXPLICIT_ss;
+    else if (value == "flat-flat") return ACCIDENTAL_EXPLICIT_ff;
+    else if (value == "double-flat") return ACCIDENTAL_EXPLICIT_ff;
+    else if (value == "natural") return ACCIDENTAL_EXPLICIT_n;
+    else {
+        LogWarning("Unsupported accidental value '%s'", value.c_str() );
+    }
+    return ACCIDENTAL_EXPLICIT_NONE;
+}
+    
+data_ACCIDENTAL_EXPLICIT MusicXmlInput::ConvertAlterToAccid(std::string value)
+{
+    if (value == "1") return ACCIDENTAL_EXPLICIT_s;
+    else if (value == "-1") return ACCIDENTAL_EXPLICIT_f;
+    else if (value == "2") return ACCIDENTAL_EXPLICIT_ss;
+    else if (value == "-2") return ACCIDENTAL_EXPLICIT_ff;
+    else if (value == "0") return ACCIDENTAL_EXPLICIT_n;
+    else {
+        LogWarning("Unsupported alter value '%s'", value.c_str() );
+    }
+    return ACCIDENTAL_EXPLICIT_NONE;
 }
     
+data_DURATION MusicXmlInput::ConvertTypeToDur(std::string value)
+{
+    if (value == "maxima") return DURATION_maxima; // this is a mensural MEI value
+    else if (value == "longa") return DURATION_long;
+    else if (value == "breve") return DURATION_breve;
+    else if (value == "whole") return DURATION_1;
+    else if (value == "half") return DURATION_2;
+    else if (value == "quarter") return DURATION_4;
+    else if (value == "eighth") return DURATION_8;
+    else if (value == "16th") return DURATION_16;
+    else if (value == "32nd") return DURATION_32;
+    else if (value == "64th") return DURATION_64;
+    else if (value == "128th") return DURATION_128;
+    else if (value == "256th") return DURATION_256;
+    else {
+        LogWarning("Unsupported type '%s'", value.c_str());
+    }
+    return DURATION_NONE;
+}
+
+data_PITCHNAME MusicXmlInput::ConvertStepToPitchName(std::string value)
+{
+    if (value == "C") return PITCHNAME_c;
+    else if (value == "D") return PITCHNAME_d;
+    else if (value == "E") return PITCHNAME_e;
+    else if (value == "F") return PITCHNAME_f;
+    else if (value == "G") return PITCHNAME_g;
+    else if (value == "A") return PITCHNAME_a;
+    else if (value == "B") return PITCHNAME_b;
+    else {
+        LogWarning("Unsupported pitch name '%s'", value.c_str() );
+    }
+    // default
+    return PITCHNAME_NONE;
+}
+        
+    
 } // namespace vrv
\ No newline at end of file
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index e8d9e6f2c41..a6b6f1befd5 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -148,7 +148,7 @@ bool Toolkit::SetFormat( std::string const &informat )
         m_format = DARMS;
     else if(informat == "mei")
         m_format = MEI;
-    else if(informat == "xml")
+    else if(informat == "musicxml")
         m_format = MUSICXML;
     else {
         LogError("Input format can only be: mei, pae, xml or darms");

From 8f0b0339269b33a52b1ea3f5d767235f26b3482b Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Sun, 27 Sep 2015 20:06:17 -0400
Subject: [PATCH 42/85] Correct typos in code (including renaming
 "SetAligmentXPos" to "SetAlignmentXPos") and in comments.

---
 Verovio.xcodeproj/project.pbxproj | 12 ++++++------
 include/vrv/aligner.h             | 22 +++++++++++-----------
 include/vrv/measure.h             |  2 +-
 include/vrv/object.h              |  4 ++--
 src/aligner.cpp                   |  4 ++--
 src/measure.cpp                   |  2 +-
 src/page.cpp                      |  2 +-
 src/view_mensural.cpp             |  2 +-
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Verovio.xcodeproj/project.pbxproj b/Verovio.xcodeproj/project.pbxproj
index b33f69a4ac4..2f9edee28b0 100644
--- a/Verovio.xcodeproj/project.pbxproj
+++ b/Verovio.xcodeproj/project.pbxproj
@@ -313,7 +313,7 @@
 		4DF28A041A754DF000BA9F7D /* floatingelement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = floatingelement.cpp; path = src/floatingelement.cpp; sourceTree = "<group>"; };
 		4DF2AF7D1A62F6A50016F869 /* drawinginterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = drawinginterface.h; path = include/vrv/drawinginterface.h; sourceTree = "<group>"; };
 		8F086EA9188534680037FD8E /* Verovio */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Verovio; sourceTree = BUILT_PRODUCTS_DIR; };
-		8F086EB6188539540037FD8E /* aligner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aligner.cpp; path = src/aligner.cpp; sourceTree = "<group>"; };
+		8F086EB6188539540037FD8E /* aligner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = aligner.cpp; path = src/aligner.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		8F086EB8188539540037FD8E /* barline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = barline.cpp; path = src/barline.cpp; sourceTree = "<group>"; };
 		8F086EB9188539540037FD8E /* bboxdevicecontext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bboxdevicecontext.cpp; path = src/bboxdevicecontext.cpp; sourceTree = "<group>"; };
 		8F086EBA188539540037FD8E /* beam.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = beam.cpp; path = src/beam.cpp; sourceTree = "<group>"; };
@@ -330,12 +330,12 @@
 		8F086EC5188539540037FD8E /* keysig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = keysig.cpp; path = src/keysig.cpp; sourceTree = "<group>"; };
 		8F086EC6188539540037FD8E /* layer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = layer.cpp; path = src/layer.cpp; sourceTree = "<group>"; };
 		8F086EC7188539540037FD8E /* layerelement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = layerelement.cpp; path = src/layerelement.cpp; sourceTree = "<group>"; };
-		8F086EC9188539540037FD8E /* measure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = measure.cpp; path = src/measure.cpp; sourceTree = "<group>"; };
+		8F086EC9188539540037FD8E /* measure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = measure.cpp; path = src/measure.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		8F086ECA188539540037FD8E /* mensur.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mensur.cpp; path = src/mensur.cpp; sourceTree = "<group>"; };
 		8F086ECB188539540037FD8E /* multirest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = multirest.cpp; path = src/multirest.cpp; sourceTree = "<group>"; };
 		8F086ECC188539540037FD8E /* note.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = note.cpp; path = src/note.cpp; sourceTree = "<group>"; };
 		8F086ECD188539540037FD8E /* object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = object.cpp; path = src/object.cpp; sourceTree = "<group>"; };
-		8F086ECE188539540037FD8E /* page.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = page.cpp; path = src/page.cpp; sourceTree = "<group>"; };
+		8F086ECE188539540037FD8E /* page.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = page.cpp; path = src/page.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		8F086ECF188539540037FD8E /* pitchinterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pitchinterface.cpp; path = src/pitchinterface.cpp; sourceTree = "<group>"; };
 		8F086ED0188539540037FD8E /* positioninterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = positioninterface.cpp; path = src/positioninterface.cpp; sourceTree = "<group>"; };
 		8F086ED1188539540037FD8E /* rest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rest.cpp; path = src/rest.cpp; sourceTree = "<group>"; };
@@ -354,7 +354,7 @@
 		8F086EE0188539540037FD8E /* view.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = view.cpp; path = src/view.cpp; sourceTree = "<group>"; };
 		8F086EE1188539540037FD8E /* vrv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vrv.cpp; path = src/vrv.cpp; sourceTree = "<group>"; };
 		8F086F4D18853CA90037FD8E /* liblibverovio.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = liblibverovio.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		8F59290D18854BF800FE51AD /* aligner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aligner.h; path = include/vrv/aligner.h; sourceTree = "<group>"; };
+		8F59290D18854BF800FE51AD /* aligner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = aligner.h; path = include/vrv/aligner.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		8F59290F18854BF800FE51AD /* barline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = barline.h; path = include/vrv/barline.h; sourceTree = "<group>"; };
 		8F59291018854BF800FE51AD /* bboxdevicecontext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bboxdevicecontext.h; path = include/vrv/bboxdevicecontext.h; sourceTree = "<group>"; };
 		8F59291118854BF800FE51AD /* beam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = beam.h; path = include/vrv/beam.h; sourceTree = "<group>"; };
@@ -371,11 +371,11 @@
 		8F59291C18854BF800FE51AD /* keysig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keysig.h; path = include/vrv/keysig.h; sourceTree = "<group>"; };
 		8F59291D18854BF800FE51AD /* layer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = layer.h; path = include/vrv/layer.h; sourceTree = "<group>"; };
 		8F59291E18854BF800FE51AD /* layerelement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = layerelement.h; path = include/vrv/layerelement.h; sourceTree = "<group>"; };
-		8F59292018854BF800FE51AD /* measure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = measure.h; path = include/vrv/measure.h; sourceTree = "<group>"; };
+		8F59292018854BF800FE51AD /* measure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = measure.h; path = include/vrv/measure.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		8F59292118854BF800FE51AD /* mensur.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mensur.h; path = include/vrv/mensur.h; sourceTree = "<group>"; };
 		8F59292218854BF800FE51AD /* multirest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = multirest.h; path = include/vrv/multirest.h; sourceTree = "<group>"; };
 		8F59292318854BF800FE51AD /* note.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = note.h; path = include/vrv/note.h; sourceTree = "<group>"; };
-		8F59292418854BF800FE51AD /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = object.h; path = include/vrv/object.h; sourceTree = "<group>"; };
+		8F59292418854BF800FE51AD /* object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = object.h; path = include/vrv/object.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		8F59292518854BF800FE51AD /* page.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = page.h; path = include/vrv/page.h; sourceTree = "<group>"; };
 		8F59292618854BF800FE51AD /* pitchinterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pitchinterface.h; path = include/vrv/pitchinterface.h; sourceTree = "<group>"; };
 		8F59292718854BF800FE51AD /* positioninterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = positioninterface.h; path = include/vrv/positioninterface.h; sourceTree = "<group>"; };
diff --git a/include/vrv/aligner.h b/include/vrv/aligner.h
index 1793bdc5e2f..963b84c1ef5 100644
--- a/include/vrv/aligner.h
+++ b/include/vrv/aligner.h
@@ -21,8 +21,8 @@ class SystemAligner;
 
 /**
  * Alignment types for aligning types together.
- * For example, we align notes and rests (default) together, clef separately, etc.
- * The container is a generic alignment for tuplet, chords, beams, etc.; we needs
+ * For example, we align notes and rests (default) together, clefs separately, etc.
+ * The container is a generic alignment for tuplet, chords, beams, etc.; we need
  * this to avoid notes aligning to it
  */
 enum AlignmentType {
@@ -232,7 +232,7 @@ class Alignment: public Object
      * Set the position of the Alignment.
      * Looks at the time different with the previous Alignment.
      */
-    virtual int SetAligmentXPos( ArrayPtrVoid *params );
+    virtual int SetAlignmentXPos( ArrayPtrVoid *params );
     
     /**
      * Justify the X positions
@@ -247,7 +247,7 @@ class Alignment: public Object
 private:
     /**
      * Stores the position relative to the measure.
-     * This is instanciated the Object::SetAligmentXPos functor.
+     * This is instanciated by the Object::SetAlignmentXPos functor.
      * It takes into account a non-linear according to the time interval with
      * the previous Alignement
      */
@@ -255,7 +255,7 @@ class Alignment: public Object
     /**
      * Stores temporally the maximum amount we need to shift the element pointing to it for 
      * avoiding collisions. This is set in Object::SetBoundingBoxXShift and then
-     * integrated for all aligment in Aligment::IntegrateBoundingBoxXShift.
+     * integrated for all alignment in Alignment::IntegrateBoundingBoxXShift.
      */
     int m_xShift;
     /**
@@ -271,15 +271,15 @@ class Alignment: public Object
     double m_time;
     /**
      * Defines the type of alignment (see the AlignmentType enum).
-     * We have different types because we want events occuring at the same
-     * time to be alignnemt separately. Example: the clef needs to be aligned
-     * togeter, but key signature together and then the notes, even if all
-     * of them occur at time 0.
+     * We have different types because we want some events occuring at the same
+     * time to be aligned separately. Examples: the clefs needs to be aligned
+     * together, key signatures together, and then the notes, even if all of them
+     * occur at time 0.
      */
     AlignmentType m_type;
     /**
      * A pointer to a GraceAligner if any.
-     * The Algnment owns it.
+     * The Alignment owns it.
      */
     GraceAligner *m_graceAligner;
     
@@ -350,7 +350,7 @@ class MeasureAligner: public Object
      * Looks at the time different with the previous Alignment.
      * For each MeasureAlignment, we need to reset the previous time position.
      */
-    virtual int SetAligmentXPos( ArrayPtrVoid *params );
+    virtual int SetAlignmentXPos( ArrayPtrVoid *params );
     
     /**
      * Justify the X positions
diff --git a/include/vrv/measure.h b/include/vrv/measure.h
index 509d49becfa..d8be18c4a05 100644
--- a/include/vrv/measure.h
+++ b/include/vrv/measure.h
@@ -144,7 +144,7 @@ class Measure: public DocObject,
      * Set the position of the Alignment.
      * Special case that redirects the functor to the MeasureAligner.
      */
-    virtual int SetAligmentXPos( ArrayPtrVoid *params );
+    virtual int SetAlignmentXPos( ArrayPtrVoid *params );
     
     /**
      * Align the measures by adjusting the m_drawingXRel position looking at the MeasureAligner.
diff --git a/include/vrv/object.h b/include/vrv/object.h
index 5cc84db11a7..839096c8f06 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -436,9 +436,9 @@ class Object
     
     /**
      * Set the position of the Alignment.
-     * Looks at the time different with the previous Alignment.
+     * Looks at the time difference from the previous Alignment.
      */
-    virtual int SetAligmentXPos( ArrayPtrVoid *params ) { return FUNCTOR_CONTINUE; };
+    virtual int SetAlignmentXPos( ArrayPtrVoid *params ) { return FUNCTOR_CONTINUE; };
     
     /**
      * Lay out the X positions of the grace notes looking that the bounding boxes.
diff --git a/src/aligner.cpp b/src/aligner.cpp
index 84c8a94e370..74df6722c79 100644
--- a/src/aligner.cpp
+++ b/src/aligner.cpp
@@ -429,7 +429,7 @@ int Alignment::IntegrateBoundingBoxXShift( ArrayPtrVoid *params )
     return FUNCTOR_CONTINUE;
 }
 
-int MeasureAligner::SetAligmentXPos( ArrayPtrVoid *params )
+int MeasureAligner::SetAlignmentXPos( ArrayPtrVoid *params )
 {
     // param 0: the previous time position
     // param 1: the previous x rel position
@@ -463,7 +463,7 @@ int Alignment::HorizontalSpaceForDuration(double intervalTime, int maxActualDur)
     return intervalXRel;
 }
 
-int Alignment::SetAligmentXPos( ArrayPtrVoid *params )
+int Alignment::SetAlignmentXPos( ArrayPtrVoid *params )
 {
     // param 0: the previous time position
     // param 1: the previous x rel position
diff --git a/src/measure.cpp b/src/measure.cpp
index eb9e31c4f3e..102de021fe8 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -211,7 +211,7 @@ int Measure::IntegrateBoundingBoxXShift( ArrayPtrVoid *params )
     return FUNCTOR_SIBLINGS;
 }
 
-int Measure::SetAligmentXPos( ArrayPtrVoid *params )
+int Measure::SetAlignmentXPos( ArrayPtrVoid *params )
 {
     // param 0: the previous time position (unused)
     // param 1: the previous x rel position (unused)
diff --git a/src/page.cpp b/src/page.cpp
index 93be235e27e..ee945e1fafc 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -136,7 +136,7 @@ void Page::LayOutHorizontally( )
         params.push_back( &previousXRel );
         //params.push_back( &minMeasureWidth );
         params.push_back( &longestActualDur );
-        Functor setAlignmentX( &Object::SetAligmentXPos );
+        Functor setAlignmentX( &Object::SetAlignmentXPos );
         // Special case: because we redirect the functor, pass it a parameter to itself (!)
         params.push_back( &setAlignmentX );
         this->Process( &setAlignmentX, &params );
diff --git a/src/view_mensural.cpp b/src/view_mensural.cpp
index 406e16b2099..86a02c3ac8b 100644
--- a/src/view_mensural.cpp
+++ b/src/view_mensural.cpp
@@ -1,4 +1,4 @@
-/////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////
 // Name:        view_mensural.cpp
 // Author:      Laurent Pugin
 // Created:     2015

From 388e61bde7b113d1dcbe9660e3f58bd9b99fbc8f Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 28 Sep 2015 09:43:37 +0200
Subject: [PATCH 43/85] Removing tab

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

diff --git a/src/view_mensural.cpp b/src/view_mensural.cpp
index 86a02c3ac8b..406e16b2099 100644
--- a/src/view_mensural.cpp
+++ b/src/view_mensural.cpp
@@ -1,4 +1,4 @@
-    /////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 // Name:        view_mensural.cpp
 // Author:      Laurent Pugin
 // Created:     2015

From c8c1066e8ae35ffd7a9bd6406ba64527021fad76 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 29 Sep 2015 08:54:18 +0200
Subject: [PATCH 44/85] Reading ties

---
 include/vrv/att_comparison.h |   1 +
 include/vrv/iomusxml.h       |  41 +++++++--
 src/iomusxml.cpp             | 160 +++++++++++++++++++++++------------
 3 files changed, 144 insertions(+), 58 deletions(-)

diff --git a/include/vrv/att_comparison.h b/include/vrv/att_comparison.h
index 300324dd2c2..52a6795424d 100644
--- a/include/vrv/att_comparison.h
+++ b/include/vrv/att_comparison.h
@@ -9,6 +9,7 @@
 #define __VRV_ATT_COMPARISON_H__
 
 #include "atts_shared.h"
+#include "object.h"
 
 namespace vrv {
     
diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index 8c0cb7d420c..b1cc313bee4 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -25,6 +25,7 @@ namespace vrv {
 //class Beam;
 //class Clef;
 //class Doc;
+class FloatingElement;
 class Layer;
 class LayerElement;
 class Measure;
@@ -38,8 +39,32 @@ class Slur;
 //class Staff;
 class StaffGrp;
 class System;
+class Tie;
 ///class Tuplet;
+    
+//----------------------------------------------------------------------------
+// namespace for local MusicXml classes
+//----------------------------------------------------------------------------
+    
+namespace musicxml {
 
+class OpenTie
+{
+public:
+    OpenTie(int staffN, int layerN, data_PITCHNAME pname, char oct) {
+        m_staffN = staffN;
+        m_layerN = layerN;
+        m_pname = pname;
+        m_oct = oct;
+    }
+    
+    int m_staffN;
+    int m_layerN;
+    data_PITCHNAME m_pname;
+    char m_oct;
+};
+    
+} // namespace musicxml
 
 //----------------------------------------------------------------------------
 // This class is not up-to-date
@@ -64,11 +89,11 @@ class MusicXmlInput: public FileInputStream
     /** return the number of staves in the part */
     int ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, StaffGrp *staffGrp, int staffOffset);
     
-    void ReadMusicXmlAttributes(pugi::xml_node, Measure *measure);
-    void ReadMusicXmlBackup(pugi::xml_node, Measure *measure);
-    void ReadMusicXmlBarline(pugi::xml_node, Measure *measure);
-    void ReadMusicXmlForward(pugi::xml_node, Measure *measure);
-    void ReadMusicXmlNote(pugi::xml_node, Measure *measure);
+    void ReadMusicXmlAttributes(pugi::xml_node, Measure *measure, int measureNb);
+    void ReadMusicXmlBackup(pugi::xml_node, Measure *measure, int measureNb);
+    void ReadMusicXmlBarline(pugi::xml_node, Measure *measure, int measureNb);
+    void ReadMusicXmlForward(pugi::xml_node, Measure *measure, int measureNb);
+    void ReadMusicXmlNote(pugi::xml_node, Measure *measure, int measureNb);
     
     bool HasAttributeWithValue(pugi::xml_node node, std::string attribute, std::string value);
     bool IsElement(pugi::xml_node node, std::string name);
@@ -83,6 +108,8 @@ class MusicXmlInput: public FileInputStream
     void AddLayerElement(Layer *layer, LayerElement *element);
     Layer *SelectLayer(pugi::xml_node node, Measure *measure);
     void RemoveLastFromStack(ClassId classId);
+    void OpenTie(Staff *staff, Layer *layer, Note *note, Tie *tie);
+    void CloseTie(Staff *staff, Layer *layer, Note *note, bool isClosingTie);
     
     data_ACCIDENTAL_EXPLICIT ConvertAccidentalToAccid(std::string value);
     data_ACCIDENTAL_EXPLICIT ConvertAlterToAccid(std::string value);
@@ -95,6 +122,10 @@ class MusicXmlInput: public FileInputStream
     std::vector<LayerElement*> m_elementStack;
     
     std::vector<std::pair<Slur*, int> > m_slurStack;
+    
+    std::vector<std::pair<Tie*, musicxml::OpenTie> > m_tieStack;
+    
+    std::vector<std::pair<int, FloatingElement*> > m_floatingElements;
 };
 
 } // namespace vrv {
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 0427e275b78..bdb895c76c2 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -15,9 +15,9 @@
 
 //----------------------------------------------------------------------------
 
-//#include "beam.h"
+#include "att_comparison.h"
+#include "beam.h"
 #include "chord.h"
-//#include "clef.h"
 #include "doc.h"
 #include "layer.h"
 #include "measure.h"
@@ -27,7 +27,7 @@
 #include "rest.h"
 #include "staff.h"
 #include "system.h"
-//#include "tie.h"
+#include "tie.h"
 #include "vrv.h"
 
 namespace vrv {
@@ -222,6 +222,29 @@ void MusicXmlInput::RemoveLastFromStack(ClassId classId)
         }
     }
 }
+    
+void MusicXmlInput::OpenTie(Staff *staff, Layer *layer, Note *note, Tie *tie)
+{
+    tie->SetStartid(note->GetUuid());
+    musicxml::OpenTie openTie(staff->GetN(), layer->GetN(), note->GetPname(), note->GetOct());
+    m_tieStack.push_back(std::make_pair(tie, openTie));
+}
+    
+void MusicXmlInput::CloseTie(Staff *staff, Layer *layer, Note *note, bool isClosingTie)
+{
+    std::vector<std::pair<Tie*, musicxml::OpenTie> >::iterator iter;
+    for (iter = m_tieStack.begin(); iter != m_tieStack.end(); iter++) {
+        if ((iter->second.m_staffN == staff->GetN()) && (iter->second.m_layerN == layer->GetN()) &&
+            (iter->second.m_pname == note->GetPname()) && iter->second.m_oct == note->GetOct()) {
+            iter->first->SetEndid(note->GetUuid());
+            m_tieStack.erase(iter);
+            if (!isClosingTie) {
+                LogWarning("Closing tie for note '%s' even thought tie /tie@[type='stop'] is missing in the MusicXML", note->GetUuid().c_str());
+            }
+            return;
+        }
+    }
+}
 
 bool MusicXmlInput::ReadMusicXml(pugi::xml_node root)
 {
@@ -282,6 +305,23 @@ bool MusicXmlInput::ReadMusicXml(pugi::xml_node root)
     }
     // here we could check that we have that there is only one staffGrp left in m_staffGrpStack
     
+    Measure *measure = NULL;
+    std::vector<std::pair<int, FloatingElement*> >::iterator iter;
+    for(iter = m_floatingElements.begin(); iter != m_floatingElements.end(); iter++) {
+        if (!measure || (measure->GetN() != iter->first)) {
+            AttCommonNComparison comparisonMeasure(MEASURE, iter->first);
+            measure = dynamic_cast<Measure*>(system->FindChildByAttComparison(&comparisonMeasure, 1));
+        }
+        if (!measure) {
+            LogWarning("Element '%s' could not be added to measure '%d'",
+                       iter->second->GetClassName().c_str(), iter->first);
+            continue;
+        }
+        measure->AddFloatingElement(iter->second);
+    }
+    
+    //assert(m_tieStack.empty());
+    
     page->AddSystem( system );
     m_doc->AddPage( page );
     
@@ -398,7 +438,8 @@ bool MusicXmlInput::ReadMusicXmlPart(pugi::xml_node node, System *system, int nb
     return false;
 }
     
-bool MusicXmlInput::ReadMusicXmlMeasure(pugi::xml_node node, Measure *measure, int nbStaves, int staffOffset)
+bool MusicXmlInput::ReadMusicXmlMeasure(pugi::xml_node node, Measure *measure,
+                                        int nbStaves, int staffOffset)
 {
     assert(node);
     assert(measure);
@@ -425,13 +466,12 @@ bool MusicXmlInput::ReadMusicXmlMeasure(pugi::xml_node node, Measure *measure, i
     m_elementStack.clear();
     
     // read the content of the measure
-    for (pugi::xml_node::iterator it = node.begin(); it != node.end(); ++it)
-    {
+    for (pugi::xml_node::iterator it = node.begin(); it != node.end(); ++it) {
         if (IsElement(*it, "barline")) {
-            ReadMusicXmlBarline(*it, measure);
+            ReadMusicXmlBarline(*it, measure, measureNb);
         }
         else if (IsElement(*it, "note")) {
-            ReadMusicXmlNote(*it, measure);
+            ReadMusicXmlNote(*it, measure, measureNb);
         }
     }
     
@@ -439,15 +479,15 @@ bool MusicXmlInput::ReadMusicXmlMeasure(pugi::xml_node node, Measure *measure, i
     return true;
 }
     
-void MusicXmlInput::ReadMusicXmlAttributes(pugi::xml_node node, Measure *measure)
+void MusicXmlInput::ReadMusicXmlAttributes(pugi::xml_node node, Measure *measure, int measureNb)
 {
 }
 
-void MusicXmlInput::ReadMusicXmlBackup(pugi::xml_node node, Measure *measure)
+void MusicXmlInput::ReadMusicXmlBackup(pugi::xml_node node, Measure *measure, int measureNb)
 {
 }
 
-void MusicXmlInput::ReadMusicXmlBarline(pugi::xml_node node, Measure *measure)
+void MusicXmlInput::ReadMusicXmlBarline(pugi::xml_node node, Measure *measure, int measureNb)
 {
     data_BARRENDITION barRendition = BARRENDITION_NONE;
     std::string barStyle = GetContentOfChild(node, "bar-style");
@@ -468,13 +508,20 @@ void MusicXmlInput::ReadMusicXmlBarline(pugi::xml_node node, Measure *measure)
     }
 }
 
-void MusicXmlInput::ReadMusicXmlForward(pugi::xml_node node, Measure *measure)
+void MusicXmlInput::ReadMusicXmlForward(pugi::xml_node node, Measure *measure, int measureNb)
 {
 }
     
-void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure)
+void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure, int measureNb)
 {
+    assert(node);
+    assert(measure);
+    
     Layer *layer = SelectLayer(node, measure);
+    assert(layer);
+    
+    Staff *staff = dynamic_cast<Staff*>(layer->GetFirstParent(STAFF));
+    assert(staff);
     
     // duration string and dots
     std::string typeStr = GetContentOfChild(node, "type");
@@ -504,6 +551,20 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure)
     else {
         Note *note = new Note();
         
+        // Accidental
+        std::string accidentalStr = GetContentOfChild(node, "accidental");
+        if (!accidentalStr.empty()) {
+            Accid *accid = new Accid();
+            accid->SetAccid(ConvertAccidentalToAccid(accidentalStr));
+            note->AddLayerElement(accid);
+        }
+        
+        // Stem direction - taken into account below for the chord or the note
+        data_STEMDIRECTION stemDir = STEMDIRECTION_NONE;
+        std::string stemDirStr = GetContentOfChild(node, "stem");
+        if (stemDirStr == "down") stemDir = STEMDIRECTION_down;
+        else if (stemDirStr == "up") stemDir = STEMDIRECTION_up;
+        
         // Pitch and octave
         pugi::xpath_node pitch = node.select_single_node("pitch");
         if (pitch) {
@@ -511,6 +572,12 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure)
             if (!stepStr.empty()) note->SetPname(ConvertStepToPitchName(stepStr));
             std::string octaveStr = GetContentOfChild(pitch.node(), "octave");
             if (!octaveStr.empty()) note->SetOct(atoi(octaveStr.c_str()));
+            std::string alterStr = GetContentOfChild(node, "atler");
+            //
+            if (accidentalStr.empty() && !alterStr.empty()) {
+                // add accid.ges once supported
+                //note->SetAccidGes(ConvertAlterToAccid(alterStr));
+            }
         }
         
         // Look at the next note to see if we are starting or ending a chord
@@ -523,17 +590,44 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure)
                 Chord *chord = new Chord();
                 chord->SetDur(ConvertTypeToDur(typeStr));
                 if (dots > 0) chord->SetDots(dots);
+                chord->SetStemDir(stemDir);
                 AddLayerElement(layer, chord);
                 m_elementStack.push_back(chord);
             }
         }
         
+        // Grace notes
+        pugi::xpath_node grace = node.select_single_node("grace");
+        if (grace) {
+            std::string slashStr = GetAttributeValue(grace.node(), "slash");
+            if (slashStr == "yes") note->SetGrace(GRACE_acc);
+            else if (slashStr == "no") note->SetGrace(GRACE_unacc);
+            else note->SetGrace(GRACE_unknown);
+        }
+        
         // Set the duration to the note if we are not in a chord
         if (m_elementStack.empty() || m_elementStack.back()->Is() != CHORD) {
             note->SetDur(ConvertTypeToDur(typeStr));
             if (dots > 0) note->SetDots(dots);
+            note->SetStemDir(stemDir);
         }
         
+        // Ties
+        pugi::xpath_node tie1 = node.select_single_node("tie[1]");
+        pugi::xpath_node tie2 = node.select_single_node("tie[2]");
+        std::string tieStr1, tieStr2;
+        if (tie1) tieStr1 = GetAttributeValue(tie1.node(), "type");
+        if (tie2) tieStr2 = GetAttributeValue(tie2.node(), "type");
+        // First close tie
+        bool isClosingTie = ((tieStr1 == "stop") || (tieStr2 == "stop"));
+        CloseTie(staff, layer, note, isClosingTie);
+        // Then open a new tie
+        if ((tieStr1 == "start") || (tieStr2 == "start")) {
+            Tie *tie = new Tie();
+            m_floatingElements.push_back(std::make_pair(measureNb, tie));
+            OpenTie(staff, layer, note, tie);
+        }
+
         // Add the note to the layer or to the current container
         AddLayerElement(layer, note);
         
@@ -550,46 +644,6 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure)
     if (beamEnd) {
         RemoveLastFromStack(BEAM);
     }
-
-     /*
-     else:
-     pname = self._get_text(n.xpath("pitch/step"))
-     oct = self._get_text(n.xpath("pitch/octave"))
-     accid = None
-     if n.xpath("boolean(pitch/alter)"):
-     alter = self._get_text(n.xpath("pitch/alter"))
-     accid = MusicXMLtoMei.accidentals[int(alter)]
-     sx = n.xpath("notations/technical/string")
-     string = None
-     if len(sx):
-     string = self._get_text(sx)
-     fret = None
-     fx = n.xpath("notations/technical/fret")
-     if len(fx):
-     fret = self._get_text(fx)
-     
-     next_chord_tag = False
-     # look ahead to next note
-     if i+1 < len(notes):
-     next_chord_tag = notes[i+1].xpath("boolean(chord)")
-     
-     if next_chord_tag:
-     # a chord is beginning or continuing
-     if cur_chord is None:
-     # a chord is beginning
-     cur_chord = self._create_chord(dur, dur_ges)
-     layer.addChild(cur_chord)
-     
-     if cur_chord is not None:
-     note = self._create_note(pname, oct, string, fret, accid)
-     cur_chord.addChild(note)
-     else:
-     note = self._create_note(pname, oct, string, fret, accid, dur=dur, dur_ges=dur_ges)
-     layer.addChild(note)
-     
-     if not next_chord_tag:
-     cur_chord = None
-     */
 }
     
 data_ACCIDENTAL_EXPLICIT MusicXmlInput::ConvertAccidentalToAccid(std::string value)

From 0d1f682bc073a29f27c63c1df9a1bd8b1a31e2f8 Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Mon, 5 Oct 2015 17:31:30 -0400
Subject: [PATCH 45/85] Clarify a log message; first pass at code to adjust
 spacing so "normal" long durations (mostly whole notes and breves) don't get
 quite so much space and long mensural durations (longa and maxima) get far
 less space.

---
 src/aligner.cpp | 19 ++++++++++++-------
 src/page.cpp    |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/aligner.cpp b/src/aligner.cpp
index 7703f0d9e0a..50c05dbc4e6 100644
--- a/src/aligner.cpp
+++ b/src/aligner.cpp
@@ -455,14 +455,18 @@ to keep consecutive symbols from overlapping or nearly overlapping: we assume sp
 will be increased as necessary later to avoid that. For modern notation (CMN), ideal space
 is a function of time interval.
  
-??The power function we currently use is all wrong; see _Behind Bars_, p. 39. We also need more
-flexibility: for example, for some purposes, spacing propoortional to duration is desirable.
-The best solution is probably to get ideal spacing from a user-definable table. */
+The power function we currently use is isn't quite right; see _Behind Bars_, p. 39. We also
+need more flexibility: for example, for some purposes, spacing propoortional to duration is
+desirable. The best solution is probably to get ideal spacing from a user-definable table. */
 
 int Alignment::HorizontalSpaceForDuration(double intervalTime, int maxActualDur)
 {
+    /* If the longest duration interval in the score is longer than semibreve, adjust spacing so
+       that interval gets the space a semibreve would ordinarily get. (maxActualDur is in our
+       internal code format: cf. attdef.h). ??TO BE DONE */
+    if (maxActualDur<DUR_1) intervalTime /= pow( 2.0, DUR_1-maxActualDur);
     int intervalXRel;
-    intervalXRel = pow( intervalTime, 0.60 ) * 2.5; // 2.5 is an arbitrary value; so is 0.60
+    intervalXRel = pow( intervalTime, 0.50 ) * 3.8;     // numbers are experimental constants
     return intervalXRel;
 }
 
@@ -478,9 +482,10 @@ int Alignment::SetAlignmentXPos( ArrayPtrVoid *params )
     
     int intervalXRel = 0;
     double intervalTime = (m_time - (*previousTime));
-    // HARDCODED parameter for HorizontalSpaceForDuration
-    if ( intervalTime > 0.0 ) intervalXRel = HorizontalSpaceForDuration(intervalTime, *maxActualDur);
-    
+    if ( intervalTime > 0.0 ) {
+        intervalXRel = HorizontalSpaceForDuration(intervalTime, *maxActualDur);
+        LogDebug("SetAlignmentXPos: intervalTime=%.2f intervalXRel=%d", intervalTime, intervalXRel);
+    }
     m_xRel = (*previousXRel) + (intervalXRel) * DEFINITON_FACTOR;
     (*previousTime) = m_time;
     (*previousXRel) = m_xRel;
diff --git a/src/page.cpp b/src/page.cpp
index fc8628086ff..ca8aac54b53 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -125,7 +125,7 @@ void Page::LayOutHorizontally( )
             DurationInterface *interface = dynamic_cast<DurationInterface*>(longestDur);
             assert(interface);
             longestActualDur = interface->GetActualDur();
-            LogDebug("Longest duration is %d", longestActualDur);
+            LogDebug("Longest duration is DUR_* code %d", longestActualDur);
         }
 
         params.clear();

From b6d54122c6138d684a90f971fb71413f90a7d124 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 7 Oct 2015 10:59:32 +0200
Subject: [PATCH 46/85] Reading slur and more attributes in first measure

---
 include/vrv/iomusxml.h |  54 ++++++++---
 src/iomusxml.cpp       | 215 +++++++++++++++++++++++++++--------------
 2 files changed, 182 insertions(+), 87 deletions(-)

diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index b1cc313bee4..0a1ba02a4f5 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -21,22 +21,11 @@
 
 namespace vrv {
 
-//class Barline;
-//class Beam;
-//class Clef;
-//class Doc;
 class FloatingElement;
 class Layer;
 class LayerElement;
 class Measure;
-//class MeterSig;
-//class MRest;
-//class MultiRest;
-//class Note;
-//class Page;
-//class Rest;
 class Slur;
-//class Staff;
 class StaffGrp;
 class System;
 class Tie;
@@ -64,10 +53,24 @@ class OpenTie
     char m_oct;
 };
     
+class OpenSlur
+{
+public:
+    OpenSlur(int staffN, int layerN, int number) {
+        m_staffN = staffN;
+        m_layerN = layerN;
+        m_number = number;
+    }
+    
+    int m_staffN;
+    int m_layerN;
+    int m_number;
+};
+    
 } // namespace musicxml
 
 //----------------------------------------------------------------------------
-// This class is not up-to-date
+// MusicXmlInput
 //----------------------------------------------------------------------------
 
 class MusicXmlInput: public FileInputStream
@@ -108,23 +111,44 @@ class MusicXmlInput: public FileInputStream
     void AddLayerElement(Layer *layer, LayerElement *element);
     Layer *SelectLayer(pugi::xml_node node, Measure *measure);
     void RemoveLastFromStack(ClassId classId);
+    
+    /**
+     * @name Methods for openning and closing tie and slurs.
+     * Openned ties and slurs are stacks together with a musicxml::OpenTie
+     * and musicxml::OpenSlur objects.
+     * For now: only slur starting and ending on the same staff/voice are
+     * supported
+     */
+    ///@{
     void OpenTie(Staff *staff, Layer *layer, Note *note, Tie *tie);
     void CloseTie(Staff *staff, Layer *layer, Note *note, bool isClosingTie);
+    void OpenSlur(Staff *staff, Layer *layer, int number, LayerElement *element, Slur *slur);
+    void CloseSlur(Staff *staff, Layer *layer, int number, LayerElement *element);
     
+    /**
+     * @name Methods for converting MusicXML string values to MEI attributes.
+     */
+    ///@{
     data_ACCIDENTAL_EXPLICIT ConvertAccidentalToAccid(std::string value);
     data_ACCIDENTAL_EXPLICIT ConvertAlterToAccid(std::string value);
     data_DURATION ConvertTypeToDur(std::string value);
     data_PITCHNAME ConvertStepToPitchName(std::string value);
+    ///@}
     
 private:
     std::string m_filename;
     
+    /** The stack for piling open LayerElements (beams, tuplets, chords, etc.)  */
     std::vector<LayerElement*> m_elementStack;
-    
-    std::vector<std::pair<Slur*, int> > m_slurStack;
-    
+    /** The stack for open slurs */
+    std::vector<std::pair<Slur*, musicxml::OpenSlur> > m_slurStack;
+    /** The stack for open ties */
     std::vector<std::pair<Tie*, musicxml::OpenTie> > m_tieStack;
     
+    /** 
+     * The stack of floating elements (tie, slur, etc.) to be added at the
+     * end of each measure
+     */
     std::vector<std::pair<int, FloatingElement*> > m_floatingElements;
 };
 
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index bdb895c76c2..ec7a47f1aba 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -25,6 +25,7 @@
 #include "mrest.h"
 #include "page.h"
 #include "rest.h"
+#include "slur.h"
 #include "staff.h"
 #include "system.h"
 #include "tie.h"
@@ -37,7 +38,6 @@ namespace vrv {
 //----------------------------------------------------------------------------
 
 MusicXmlInput::MusicXmlInput(Doc *doc, std::string filename) :
-// This is pretty bad. We open a bad fileoutputstream as we don't use it
     FileInputStream(doc)
 {
     m_filename = filename;
@@ -81,6 +81,9 @@ bool MusicXmlInput::ImportString(const std::string musicxml)
         return false;
     }
 }
+  
+//////////////////////////////////////////////////////////////////////////////
+// XML helpers
     
 bool MusicXmlInput::HasAttributeWithValue(pugi::xml_node node, std::string attribute, std::string value)
 {
@@ -223,6 +226,9 @@ void MusicXmlInput::RemoveLastFromStack(ClassId classId)
     }
 }
     
+//////////////////////////////////////////////////////////////////////////////
+// Tie and slurs stack management
+    
 void MusicXmlInput::OpenTie(Staff *staff, Layer *layer, Note *note, Tie *tie)
 {
     tie->SetStartid(note->GetUuid());
@@ -245,6 +251,31 @@ void MusicXmlInput::CloseTie(Staff *staff, Layer *layer, Note *note, bool isClos
         }
     }
 }
+    
+void MusicXmlInput::OpenSlur(Staff *staff, Layer *layer, int number, LayerElement *element, Slur *slur)
+{
+    slur->SetStartid(element->GetUuid());
+    musicxml::OpenSlur openSlur(staff->GetN(), layer->GetN(), number);
+    m_slurStack.push_back(std::make_pair(slur, openSlur));
+}
+
+void MusicXmlInput::CloseSlur(Staff *staff, Layer *layer, int number, LayerElement *element)
+{
+    std::vector<std::pair<Slur*, musicxml::OpenSlur> >::iterator iter;
+    for (iter = m_slurStack.begin(); iter != m_slurStack.end(); iter++) {
+        if ((iter->second.m_staffN == staff->GetN()) && (iter->second.m_layerN == layer->GetN()) &&
+            (iter->second.m_number == number)) {
+            iter->first->SetEndid(element->GetUuid());
+            m_slurStack.erase(iter);
+            return;
+        }
+    }
+    LogWarning("Closing slur for element '%s' could not be matched", element->GetUuid().c_str());
+
+}
+    
+//////////////////////////////////////////////////////////////////////////////
+// Parsing methods
 
 bool MusicXmlInput::ReadMusicXml(pugi::xml_node root)
 {
@@ -283,7 +314,7 @@ bool MusicXmlInput::ReadMusicXml(pugi::xml_node root)
         else if (IsElement(xpathNode.node(), "score-part")) {
             // get the attributes element of the first measure of the part
             std::string partId = xpathNode.node().attribute("id").as_string();
-            std::string xpath = StringFormat("/score-partwise/part[@id='%s']/measure[@number='1']/attributes", partId.c_str());
+            std::string xpath = StringFormat("/score-partwise/part[@id='%s']/measure[@number='1']", partId.c_str());
             pugi::xpath_node partFirstMeasureAttributes = root.select_single_node(xpath.c_str());
             if (!partFirstMeasureAttributes) {
                 LogWarning("Could not find the 'attributes' element in the first measure of part '%s'", partId.c_str());
@@ -334,83 +365,91 @@ int MusicXmlInput::ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, Sta
     assert(node);
     assert(staffGrp);
     
-    // First get the number of staves in the part
     int nbStaves = 1;
-    pugi::xpath_node staves = node.select_single_node("staves");
-    if (staves) {
-        if (staves.node().text()) {
-            int values = atoi(staves.node().text().as_string());
-            nbStaves = (values > 0) ? values : 1;
-        }
-    }
     
-    int i;
-    std::string xpath;
-    // Create as many staffDef
-    for (i = 0; i < nbStaves; i++) {
-        StaffDef *staffDef = new StaffDef();
-        staffDef->SetN(i + 1 + staffOffset);
-        // by default five line staves
-        staffDef->SetLines(5);
+    for (pugi::xml_node::iterator it = node.begin(); it != node.end(); ++it)
+    {
+        // We read all attribute elements until we reach something else
+        if (!IsElement(*it, "attributes")) break;
         
-        // clef sign - first look if we have a clef-sign with the corresponding staff @number
-        pugi::xpath_node clefSign;
-        xpath = StringFormat("clef[@number='%d']/sign", i+1);
-        clefSign = node.select_single_node(xpath.c_str());
-        // if not, look at a common one
-        if (!clefSign) {
-            clefSign = node.select_single_node("clef/sign");
-        }
-        if (clefSign && HasContent(clefSign.node())) {
-            staffDef->SetClefShape(staffDef->AttCleffingLog::StrToClefShape(GetContent(clefSign.node())));
-        }
-        // clef line
-        pugi::xpath_node clefLine;
-        xpath = StringFormat("clef[@number='%d']/line", i+1);
-        clefLine = node.select_single_node(xpath.c_str());
-        if (!clefLine) {
-            clefLine = node.select_single_node("clef/line");
-        }
-        if (clefLine && HasContent(clefLine.node())) {
-            staffDef->SetClefLine(staffDef->AttCleffingLog::StrToInt(clefLine.node().text().as_string()));
-        }
-        // key sig
-        pugi::xpath_node keyFifths;
-        xpath = StringFormat("key[@number='%d']/fifths", i+1);
-        keyFifths = node.select_single_node(xpath.c_str());
-        if (!keyFifths) {
-            keyFifths = node.select_single_node("key/fifths");
-        }
-        if (keyFifths && HasContent(keyFifths.node())) {
-            int key = atoi(keyFifths.node().text().as_string());
-            std::string value;
-            if (key < 0) value = StringFormat("%df", abs(key));
-            else value = StringFormat("%ds", key);
-            staffDef->SetKeySig(staffDef->AttKeySigDefaultLog::StrToKeySignature(value));
-        }
-        // time
-        pugi::xpath_node time;
-        xpath = StringFormat("time[@number='%d']", i+1);
-        time = node.select_single_node(xpath.c_str());
-        if (!time) {
-            time = node.select_single_node("time");
+        // First get the number of staves in the part
+        pugi::xpath_node staves = it->select_single_node("staves");
+        if (staves) {
+            if (staves.node().text()) {
+                int values = atoi(staves.node().text().as_string());
+                nbStaves = (values > 0) ? values : 1;
+            }
         }
-        if (time) {
-            pugi::xpath_node symbol = time.node().select_single_node("symbol");
-            if (symbol && HasContent(symbol.node())) {
-                staffDef->SetMeterSym(staffDef->AttMeterSigDefaultVis::StrToMeterSign(symbol.node().text().as_string()));
+        
+        int i;
+        std::string xpath;
+        // Create as many staffDef
+        for (i = 0; i < nbStaves; i++) {
+            StaffDef *staffDef = new StaffDef();
+            staffDef->SetN(i + 1 + staffOffset);
+            // by default five line staves
+            staffDef->SetLines(5);
+            
+            // clef sign - first look if we have a clef-sign with the corresponding staff @number
+            pugi::xpath_node clefSign;
+            xpath = StringFormat("clef[@number='%d']/sign", i+1);
+            clefSign = it->select_single_node(xpath.c_str());
+            // if not, look at a common one
+            if (!clefSign) {
+                clefSign = it->select_single_node("clef/sign");
+            }
+            if (clefSign && HasContent(clefSign.node())) {
+                staffDef->SetClefShape(staffDef->AttCleffingLog::StrToClefShape(GetContent(clefSign.node())));
+            }
+            // clef line
+            pugi::xpath_node clefLine;
+            xpath = StringFormat("clef[@number='%d']/line", i+1);
+            clefLine = it->select_single_node(xpath.c_str());
+            if (!clefLine) {
+                clefLine = it->select_single_node("clef/line");
             }
-            pugi::xpath_node beats = time.node().select_single_node("beats");
-            if (beats && HasContent(beats.node())) {
-                staffDef->SetMeterCount(staffDef->AttMeterSigDefaultLog::StrToInt(beats.node().text().as_string()));
+            if (clefLine && HasContent(clefLine.node())) {
+                staffDef->SetClefLine(staffDef->AttCleffingLog::StrToInt(clefLine.node().text().as_string()));
             }
-            pugi::xpath_node beatType = time.node().select_single_node("beat-type");
-            if (beatType && HasContent(beatType.node())) {
-                staffDef->SetMeterUnit(staffDef->AttMeterSigDefaultLog::StrToInt(beatType.node().text().as_string()));
+            // key sig
+            pugi::xpath_node keyFifths;
+            xpath = StringFormat("key[@number='%d']/fifths", i+1);
+            keyFifths = it->select_single_node(xpath.c_str());
+            if (!keyFifths) {
+                keyFifths = it->select_single_node("key/fifths");
             }
+            if (keyFifths && HasContent(keyFifths.node())) {
+                int key = atoi(keyFifths.node().text().as_string());
+                std::string value;
+                if (key < 0) value = StringFormat("%df", abs(key));
+                else value = StringFormat("%ds", key);
+                staffDef->SetKeySig(staffDef->AttKeySigDefaultLog::StrToKeySignature(value));
+            }
+            // time
+            pugi::xpath_node time;
+            xpath = StringFormat("time[@number='%d']", i+1);
+            time = it->select_single_node(xpath.c_str());
+            if (!time) {
+                time = it->select_single_node("time");
+            }
+            if (time) {
+                pugi::xpath_node symbol = time.node().select_single_node("symbol");
+                if (symbol && HasContent(symbol.node())) {
+                    staffDef->SetMeterSym(staffDef->AttMeterSigDefaultVis::StrToMeterSign(symbol.node().text().as_string()));
+                }
+                pugi::xpath_node beats = time.node().select_single_node("beats");
+                if (beats && HasContent(beats.node())) {
+                    staffDef->SetMeterCount(staffDef->AttMeterSigDefaultLog::StrToInt(beats.node().text().as_string()));
+                }
+                pugi::xpath_node beatType = time.node().select_single_node("beat-type");
+                if (beatType && HasContent(beatType.node())) {
+                    staffDef->SetMeterUnit(staffDef->AttMeterSigDefaultLog::StrToInt(beatType.node().text().as_string()));
+                }
+            }
+            staffGrp->AddStaffDef(staffDef);
         }
-        staffGrp->AddStaffDef(staffDef);
     }
+        
     return nbStaves;
 }
     
@@ -474,8 +513,7 @@ bool MusicXmlInput::ReadMusicXmlMeasure(pugi::xml_node node, Measure *measure,
             ReadMusicXmlNote(*it, measure, measureNb);
         }
     }
-    
-    //LogDebug("Reading measure!");
+
     return true;
 }
     
@@ -523,6 +561,10 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure, int
     Staff *staff = dynamic_cast<Staff*>(layer->GetFirstParent(STAFF));
     assert(staff);
     
+    LayerElement *element = NULL;
+    
+    pugi::xpath_node notations = node.select_single_node("notations");
+    
     // duration string and dots
     std::string typeStr = GetContentOfChild(node, "type");
     int dots = (int)node.select_nodes("dot").size();
@@ -543,6 +585,7 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure, int
         }
         else {
             Rest *rest = new Rest();
+            element = rest;
             rest->SetDur(ConvertTypeToDur(typeStr));
             if (dots > 0) rest->SetDots(dots);
             layer->AddLayerElement(rest);
@@ -550,6 +593,7 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure, int
     }
     else {
         Note *note = new Note();
+        element = note;
         
         // Accidental
         std::string accidentalStr = GetContentOfChild(node, "accidental");
@@ -639,6 +683,30 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure, int
         }
     }
     
+    // element will be NULL in case of mRest
+    if (!element) return;
+    
+    // slur
+    pugi::xpath_node_set slurs = notations.node().select_nodes("slur");
+    for (pugi::xpath_node_set::const_iterator it = slurs.begin(); it != slurs.end(); ++it)
+    {
+        pugi::xml_node slur = it->node();
+        int slurNumber = atoi(GetAttributeValue(slur, "number").c_str());
+        slurNumber = (slurNumber < 1) ? 1 : slurNumber;
+        if (HasAttributeWithValue(slur, "type", "start")) {
+            Slur *meiSlur = new Slur();
+            // placement
+            if (HasAttributeWithValue(slur, "placement", "above")) meiSlur->SetCurvedir(CURVEDIR_above);
+            else if (HasAttributeWithValue(slur, "placement", "below")) meiSlur->SetCurvedir(CURVEDIR_below);
+            // add it to the stack
+            m_floatingElements.push_back(std::make_pair(measureNb, meiSlur));
+            OpenSlur(staff, layer, slurNumber, element, meiSlur);
+        }
+        else if (HasAttributeWithValue(slur, "type", "stop")) {
+            CloseSlur(staff, layer, slurNumber, element);
+        }
+    }
+    
     // beam end
     bool beamEnd =  node.select_single_node("beam[@number='1'][text()='end']");
     if (beamEnd) {
@@ -646,6 +714,9 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure, int
     }
 }
     
+//////////////////////////////////////////////////////////////////////////////
+// String to attribute converters
+    
 data_ACCIDENTAL_EXPLICIT MusicXmlInput::ConvertAccidentalToAccid(std::string value)
 {
     if (value == "sharp") return ACCIDENTAL_EXPLICIT_s;

From 39de68656d25c585d59881eab797ee01622aa31e Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 7 Oct 2015 11:19:55 +0200
Subject: [PATCH 47/85] Adding code comments

---
 include/vrv/iomusxml.h | 61 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 53 insertions(+), 8 deletions(-)

diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index 0a1ba02a4f5..16af3ca6b14 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -84,33 +84,78 @@ class MusicXmlInput: public FileInputStream
     virtual bool ImportString(std::string musicxml);
     
 private:
+    /**
+     * Top level method called from ImportFile or ImportString
+     */
     bool ReadMusicXml(pugi::xml_node root);
     
+    /**
+     * @name Top level methods for reading MusicXml part and measure elements.
+     */
+    ///@{
     bool ReadMusicXmlPart(pugi::xml_node node, System *system,  int nbStaves, int staffOffset);
     bool ReadMusicXmlMeasure(pugi::xml_node node, Measure *measure, int nbStaves, int staffOffset);
+    ///@}
 
-    /** return the number of staves in the part */
+    /** 
+     * 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);
     
+    /**
+     * @name Methods for reading the content of a MusicXml measure.
+     */
+    ///@{
     void ReadMusicXmlAttributes(pugi::xml_node, Measure *measure, int measureNb);
     void ReadMusicXmlBackup(pugi::xml_node, Measure *measure, int measureNb);
     void ReadMusicXmlBarline(pugi::xml_node, Measure *measure, int measureNb);
     void ReadMusicXmlForward(pugi::xml_node, Measure *measure, int measureNb);
     void ReadMusicXmlNote(pugi::xml_node, Measure *measure, int measureNb);
+    ///@}
+    
+    /**
+     * Add a Measure to the system.
+     * If the measure i already exists if will move all the its content.
+     * The measure can contain only staves. Other elements must be stacked on m_floatingElements.
+     */
+    void AddMeasure(System *system, Measure *measure, int i);
     
+    /**
+     * Add a Layer element to the layer or to the LayerElement at the top of m_elementStack.
+     */
+    void AddLayerElement(Layer *layer, LayerElement *element);
+    
+    /*
+     * Returns the appropriate layer for a node looking at its MusicXml staff and voice elements.
+     */
+    Layer *SelectLayer(pugi::xml_node node, Measure *measure);
+    
+    /**
+     * Remove the last ClassId element on top of m_elementStack.
+     * For example, when closing a beam, we need to remove it from the stack, but it is not
+     * necessary the top one (for example we can have an opened chord there).
+     */
+    void RemoveLastFromStack(ClassId classId);
+    
+    /**
+     * @name Helper methods for checking presence of values of attributes or elements
+     */
+    ///@{
     bool HasAttributeWithValue(pugi::xml_node node, std::string attribute, std::string value);
     bool IsElement(pugi::xml_node node, std::string name);
     bool HasContentWithValue(pugi::xml_node node, std::string value);
     bool HasContent(pugi::xml_node);
-    
+    ///@}
+
+    /**
+     * @name Helper methods for retrieving attribute values or element content
+     */
+    ///@{
     std::string GetAttributeValue(pugi::xml_node node, std::string attribute);
     std::string GetContent(pugi::xml_node node);
     std::string GetContentOfChild(pugi::xml_node node, std::string child);
-    
-    void AddMeasure(System *system, Measure *measure, int i);
-    void AddLayerElement(Layer *layer, LayerElement *element);
-    Layer *SelectLayer(pugi::xml_node node, Measure *measure);
-    void RemoveLastFromStack(ClassId classId);
+    ///@}
     
     /**
      * @name Methods for openning and closing tie and slurs.
@@ -136,8 +181,8 @@ class MusicXmlInput: public FileInputStream
     ///@}
     
 private:
+    /** The filename */
     std::string m_filename;
-    
     /** The stack for piling open LayerElements (beams, tuplets, chords, etc.)  */
     std::vector<LayerElement*> m_elementStack;
     /** The stack for open slurs */

From 4e1e56abfe89c8666dd7ed6373a44e79b77e67fc Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 7 Oct 2015 15:26:33 +0200
Subject: [PATCH 48/85] Basic tuplets

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

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index ec7a47f1aba..fd13566d6ab 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -29,6 +29,7 @@
 #include "staff.h"
 #include "system.h"
 #include "tie.h"
+#include "tuplet.h"
 #include "vrv.h"
 
 namespace vrv {
@@ -185,16 +186,22 @@ void MusicXmlInput::AddLayerElement(Layer *layer, LayerElement *element)
     if (m_elementStack.empty()) {
         layer->AddLayerElement(element);
     }
+    else if (m_elementStack.back()->Is() == BEAM) {
+        Beam *beam = dynamic_cast<Beam*>(m_elementStack.back());
+        assert(beam);
+        beam->AddLayerElement(element);
+    }
     else if (m_elementStack.back()->Is() == CHORD) {
         Chord *chord = dynamic_cast<Chord*>(m_elementStack.back());
         assert(chord);
         chord->AddLayerElement(element);
     }
-    else if (m_elementStack.back()->Is() == BEAM) {
-        Beam *beam = dynamic_cast<Beam*>(m_elementStack.back());
-        assert(beam);
-        beam->AddLayerElement(element);
+    else if (m_elementStack.back()->Is() == TUPLET) {
+        Tuplet *tuplet = dynamic_cast<Tuplet*>(m_elementStack.back());
+        assert(tuplet);
+        tuplet->AddLayerElement(element);
     }
+
 }
     
 Layer *MusicXmlInput::SelectLayer(pugi::xml_node node, vrv::Measure *measure)
@@ -577,6 +584,20 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure, int
         m_elementStack.push_back(beam);
     }
     
+    // tuplet start
+    pugi::xpath_node tupletStart = notations.node().select_single_node("tuplet[@type='start']");
+    if (tupletStart) {
+        Tuplet  *tuplet = new Tuplet();
+        AddLayerElement(layer, tuplet);
+        m_elementStack.push_back(tuplet);
+        pugi::xpath_node actualNotes = node.select_single_node("time-modification/actual-notes");
+        pugi::xpath_node normalNotes = node.select_single_node("time-modification/normal-notes");
+        if (actualNotes && normalNotes) {
+            tuplet->SetNum(atoi(GetContent(actualNotes.node()).c_str()));
+            tuplet->SetNumbase(atoi(GetContent(normalNotes.node()).c_str()));
+        }
+    }
+    
     if (node.select_single_node("rest")) {
         // we assume /note without /type to be mRest
         if (typeStr.empty()) {
@@ -707,6 +728,12 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure, int
         }
     }
     
+    // tuplet end
+    pugi::xpath_node tupletEnd = notations.node().select_single_node("tuplet[@type='stop']");
+    if (tupletEnd) {
+        RemoveLastFromStack(TUPLET);
+    }
+    
     // beam end
     bool beamEnd =  node.select_single_node("beam[@number='1'][text()='end']");
     if (beamEnd) {

From 80730651fb393c85eb12bd1010afebf95ca212ea Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 7 Oct 2015 15:51:58 +0200
Subject: [PATCH 49/85] More on attributes and tuplet

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

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index fd13566d6ab..5bfa75d1fe7 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -377,7 +377,9 @@ int MusicXmlInput::ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, Sta
     for (pugi::xml_node::iterator it = node.begin(); it != node.end(); ++it)
     {
         // We read all attribute elements until we reach something else
-        if (!IsElement(*it, "attributes")) break;
+        // However, print might be present too. What else? This is not clear
+        // and not robust.
+        if (!IsElement(*it, "attributes") && !IsElement(*it, "print")) break;
         
         // First get the number of staves in the part
         pugi::xpath_node staves = it->select_single_node("staves");
@@ -585,6 +587,10 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure, int
     }
     
     // tuplet start
+    // For now tuplet with beam if starting at the same time. However, this will quite likely not
+    // work if we have a tuplet over serveral beams. We would need to check which one is ending first
+    // in order to determin which one is on top of the hierarchy. Also, it is not 100% sure that we
+    // can represent them as tuplet and beam elements. 
     pugi::xpath_node tupletStart = notations.node().select_single_node("tuplet[@type='start']");
     if (tupletStart) {
         Tuplet  *tuplet = new Tuplet();

From 0a0423dd765ebbb37b3b0602943fdd98f238da20 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 7 Oct 2015 18:59:19 +0200
Subject: [PATCH 50/85] Clef changes

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

diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index 16af3ca6b14..93efb1552c4 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -131,6 +131,11 @@ class MusicXmlInput: public FileInputStream
      */
     Layer *SelectLayer(pugi::xml_node node, Measure *measure);
     
+    /*
+     * Returns the appropriate first layer of a staff.
+     */
+    Layer *SelectLayer(int staffNb, Measure *measure);
+    
     /**
      * Remove the last ClassId element on top of m_elementStack.
      * For example, when closing a beam, we need to remove it from the stack, but it is not
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 5bfa75d1fe7..a7a11e47135 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -221,6 +221,16 @@ Layer *MusicXmlInput::SelectLayer(pugi::xml_node node, vrv::Measure *measure)
     Layer *layer = dynamic_cast<Layer*>(staff->m_children.at(0));
     return layer;
 }
+
+    
+Layer *MusicXmlInput::SelectLayer(int staffNb, vrv::Measure *measure)
+{
+    staffNb--;
+    Staff *staff = dynamic_cast<Staff*>(measure->m_children.at(staffNb));
+    assert(staff);
+    Layer *layer = dynamic_cast<Layer*>(staff->m_children.at(0));
+    return layer;
+}
     
 void MusicXmlInput::RemoveLastFromStack(ClassId classId)
 {
@@ -381,6 +391,9 @@ int MusicXmlInput::ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, Sta
         // and not robust.
         if (!IsElement(*it, "attributes") && !IsElement(*it, "print")) break;
         
+        // we do not want to read it again, just change the name
+        it->set_name("mei-read");
+        
         // First get the number of staves in the part
         pugi::xpath_node staves = it->select_single_node("staves");
         if (staves) {
@@ -515,7 +528,10 @@ bool MusicXmlInput::ReadMusicXmlMeasure(pugi::xml_node node, Measure *measure,
     
     // read the content of the measure
     for (pugi::xml_node::iterator it = node.begin(); it != node.end(); ++it) {
-        if (IsElement(*it, "barline")) {
+        if (IsElement(*it, "attributes")) {
+            ReadMusicXmlAttributes(*it, measure, measureNb);
+        }
+        else if (IsElement(*it, "barline")) {
             ReadMusicXmlBarline(*it, measure, measureNb);
         }
         else if (IsElement(*it, "note")) {
@@ -528,6 +544,22 @@ bool MusicXmlInput::ReadMusicXmlMeasure(pugi::xml_node node, Measure *measure,
     
 void MusicXmlInput::ReadMusicXmlAttributes(pugi::xml_node node, Measure *measure, int measureNb)
 {
+    // read clef changes as MEI clef
+    pugi::xpath_node clef = node.select_single_node("clef");
+    if (clef) {
+        // check if we have a staff number
+        std::string numberStr = GetAttributeValue(clef.node(), "number");
+        int staffNb = (numberStr.empty()) ? 1 : atoi(numberStr.c_str());
+        Layer *layer = SelectLayer(staffNb, measure);
+        pugi::xpath_node clefSign = clef.node().select_single_node("sign");
+        pugi::xpath_node clefLine = clef.node().select_single_node("line");
+        if (clefSign && clefLine) {
+            Clef *meiClef = new Clef();
+            meiClef->SetShape(meiClef->AttClefshape::StrToClefShape(GetContent(clefSign.node())));
+            meiClef->SetLine(meiClef->AttClefshape::StrToInt(clefLine.node().text().as_string()));
+            AddLayerElement(layer, meiClef);
+        }
+    }
 }
 
 void MusicXmlInput::ReadMusicXmlBackup(pugi::xml_node node, Measure *measure, int measureNb)
@@ -590,7 +622,7 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure, int
     // For now tuplet with beam if starting at the same time. However, this will quite likely not
     // work if we have a tuplet over serveral beams. We would need to check which one is ending first
     // in order to determin which one is on top of the hierarchy. Also, it is not 100% sure that we
-    // can represent them as tuplet and beam elements. 
+    // can represent them as tuplet and beam elements.
     pugi::xpath_node tupletStart = notations.node().select_single_node("tuplet[@type='start']");
     if (tupletStart) {
         Tuplet  *tuplet = new Tuplet();

From 3e2fcbafb9d68d96b9bc2f2967e1290f7908d582 Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Wed, 7 Oct 2015 16:13:28 -0400
Subject: [PATCH 51/85] Move #defines for mensural-notation style from
 view_mensural.cpp to style.h

---
 include/vrv/style.h   | 12 ++++++++++++
 src/view_mensural.cpp | 13 -------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/include/vrv/style.h b/include/vrv/style.h
index 47904b85b2c..225ae596f7a 100644
--- a/include/vrv/style.h
+++ b/include/vrv/style.h
@@ -145,6 +145,18 @@ namespace vrv {
 #define TEMP_STYLE_SLUR_HEIGHT_FACTOR 8 // high value means flatter slurs
 #define TEMP_STYLE_SLUR_CONTROL_POINT_FACTOR 5 // higher value means more curved at the end
     
+/* Style parameters for mensural notation */
+// Ratio of mensural notehead size to CMN notehead size for the same staff size
+#define MNOTEHEAD_SIZE_FACTOR 0.90
+// Size of mensuration sign circle relative to space between staff lines
+#define MSIGN_CIRCLE_DIAM 1.7
+// Vertical position of center of mensuration sign as distance below top of the staff
+#define MSIGN_STAFFLINES_BELOW_TOP 2.0
+// Size of dot inside mensuration signs relative to space between staff lines
+#define MSIGN_DOT_DIAM 0.5
+// Relative size of figures in proportions
+#define PROPRT_SIZE_FACTOR 0.50
+
 
 /**
  * This class contains the document default environment variables.
diff --git a/src/view_mensural.cpp b/src/view_mensural.cpp
index fe04459afd5..4ddd84af603 100644
--- a/src/view_mensural.cpp
+++ b/src/view_mensural.cpp
@@ -26,19 +26,6 @@
 
 namespace vrv {    
 
-/* ??THESE #defines PROBABLY BELONG IN style.h . */
-    
-/* Set ratio of mensural notehead size to CMN notehead size for the same staff size */
-#define MNOTEHEAD_SIZE_FACTOR 0.90
-/* Set size of mensuration sign circle relative to space between staff lines */
-#define MSIGN_CIRCLE_DIAM 1.7
-/* Set vertical position of center of mensuration sign as distance below top of the staff */
-#define MSIGN_STAFFLINES_BELOW_TOP 2.0
-/* Set size of dot inside mensuration signs relative to space between staff lines */
-#define MSIGN_DOT_DIAM 0.5
-/* Set relative size of figures in proportions */
-#define PROPRT_SIZE_FACTOR 0.50
-    
 int View::s_drawingLigX[2], View::s_drawingLigY[2];	// pour garder coord. des ligatures
 bool View::s_drawingLigObliqua = false;	// marque le 1e passage pour une oblique
 

From 879a2cb1e5062fcd75f12fa30be3360dc9834d2e Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 8 Oct 2015 08:26:57 +0100
Subject: [PATCH 52/85] Correct layer selection (support of backup element)

---
 include/vrv/iomusxml.h | 10 ++++++++--
 src/iomusxml.cpp       | 33 +++++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index 93efb1552c4..9670d97a1da 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -126,16 +126,22 @@ class MusicXmlInput: public FileInputStream
      */
     void AddLayerElement(Layer *layer, LayerElement *element);
     
-    /*
+    /**
      * Returns the appropriate layer for a node looking at its MusicXml staff and voice elements.
      */
     Layer *SelectLayer(pugi::xml_node node, Measure *measure);
     
-    /*
+    /**
      * Returns the appropriate first layer of a staff.
      */
     Layer *SelectLayer(int staffNb, Measure *measure);
     
+    /**
+     * Returns the layer with @n=layerNb on the staff.
+     * Creates lhe layer if not found.
+     */
+    Layer *SelectLayer(int layerNb, Staff *staff);
+    
     /**
      * Remove the last ClassId element on top of m_elementStack.
      * For example, when closing a beam, we need to remove it from the stack, but it is not
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index a7a11e47135..42d88eee5de 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -218,8 +218,17 @@ Layer *MusicXmlInput::SelectLayer(pugi::xml_node node, vrv::Measure *measure)
     staffNb--;
     Staff *staff = dynamic_cast<Staff*>(measure->m_children.at(staffNb));
     assert(staff);
-    Layer *layer = dynamic_cast<Layer*>(staff->m_children.at(0));
-    return layer;
+    // Now look for the layer with the correpsonding voice
+    int layerNb = 1;
+    std::string layerNbStr = GetContentOfChild(node, "voice");
+    if (!layerNbStr.empty()) {
+        layerNb = atoi(layerNbStr.c_str());
+    }
+    if (layerNb < 1) {
+        LogWarning("Staff %d cannot be found", staffNb);
+        layerNb = 1;
+    }
+    return SelectLayer(layerNb, staff);
 }
 
     
@@ -228,7 +237,19 @@ Layer *MusicXmlInput::SelectLayer(int staffNb, vrv::Measure *measure)
     staffNb--;
     Staff *staff = dynamic_cast<Staff*>(measure->m_children.at(staffNb));
     assert(staff);
-    Layer *layer = dynamic_cast<Layer*>(staff->m_children.at(0));
+    return SelectLayer(1, staff);
+}
+    
+Layer *MusicXmlInput::SelectLayer(int layerNb, Staff *staff)
+{
+    AttCommonNComparison comparisonLayer(LAYER, layerNb);
+    Layer *layer = dynamic_cast<Layer*>(staff->FindChildByAttComparison(&comparisonLayer, 1));
+    if (layer) return layer;
+    // else add it
+    // add at least one layer
+    layer = new Layer();
+    layer->SetN(layerNb);
+    staff->AddLayer(layer);
     return layer;
 }
     
@@ -513,12 +534,8 @@ bool MusicXmlInput::ReadMusicXmlMeasure(pugi::xml_node node, Measure *measure,
         // the staff @n must take into account the staffOffset
         Staff *staff = new Staff();
         staff->SetN(i + 1 + staffOffset);
-        
-        // add at least one layer
-        Layer *layer = new Layer();
-        layer->SetN(1);
-        staff->AddLayer(layer);
         measure->AddStaff(staff);
+        // layers will be added in SelectLayer
     }
     
     //Normally the stack should be empty

From c37e1d9c61b9ffe33ebfa6e6a80e6283d039fc80 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Thu, 8 Oct 2015 15:03:31 +0100
Subject: [PATCH 53/85] Avoiding staffDef duplication

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

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 42d88eee5de..11c8cfa554d 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -428,10 +428,17 @@ int MusicXmlInput::ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, Sta
         std::string xpath;
         // Create as many staffDef
         for (i = 0; i < nbStaves; i++) {
-            StaffDef *staffDef = new StaffDef();
-            staffDef->SetN(i + 1 + staffOffset);
-            // by default five line staves
-            staffDef->SetLines(5);
+            // Find or create the staffDef
+            StaffDef *staffDef = NULL;
+            AttCommonNComparison comparisonStaffDef(STAFFDEF, i + 1 + staffOffset);
+            staffDef = dynamic_cast<StaffDef*>(staffGrp->FindChildByAttComparison(&comparisonStaffDef, 1));
+            if (!staffDef) {
+                StaffDef *staffDef = new StaffDef();
+                staffDef->SetN(i + 1 + staffOffset);
+                // by default five line staves
+                staffDef->SetLines(5);
+                staffGrp->AddStaffDef(staffDef);
+            }
             
             // clef sign - first look if we have a clef-sign with the corresponding staff @number
             pugi::xpath_node clefSign;
@@ -489,7 +496,6 @@ int MusicXmlInput::ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, Sta
                     staffDef->SetMeterUnit(staffDef->AttMeterSigDefaultLog::StrToInt(beatType.node().text().as_string()));
                 }
             }
-            staffGrp->AddStaffDef(staffDef);
         }
     }
         

From 0f77f68be0b767efd37885634cfffe57315774b7 Mon Sep 17 00:00:00 2001
From: Don Byrd <donbyrd@indiana.edu>
Date: Thu, 8 Oct 2015 17:06:34 -0400
Subject: [PATCH 54/85] Correct typo in name of ResetDrawing() method.

---
 include/vrv/dot.h             | 2 +-
 include/vrv/floatingelement.h | 2 +-
 include/vrv/note.h            | 2 +-
 include/vrv/object.h          | 2 +-
 include/vrv/staff.h           | 2 +-
 include/vrv/syl.h             | 2 +-
 src/doc.cpp                   | 2 +-
 src/dot.cpp                   | 2 +-
 src/floatingelement.cpp       | 2 +-
 src/note.cpp                  | 3 ++-
 src/staff.cpp                 | 2 +-
 src/syl.cpp                   | 2 +-
 12 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/include/vrv/dot.h b/include/vrv/dot.h
index 726911adbad..770d04e615d 100644
--- a/include/vrv/dot.h
+++ b/include/vrv/dot.h
@@ -50,7 +50,7 @@ class Dot: public LayerElement, public PositionInterface
     /**
      * Reset the drawing values before calling PrepareDrawing after changes.
      */
-    virtual int ResetDarwing( ArrayPtrVoid *params );
+    virtual int ResetDrawing( ArrayPtrVoid *params );
     
 protected:
 
diff --git a/include/vrv/floatingelement.h b/include/vrv/floatingelement.h
index f8ee26d4f10..a3191d2f33f 100644
--- a/include/vrv/floatingelement.h
+++ b/include/vrv/floatingelement.h
@@ -53,7 +53,7 @@ class FloatingElement: public DocObject
     /**
      * Reset the drawing values before calling PrepareDrawing after changes.
      */
-    virtual int ResetDarwing( ArrayPtrVoid *params );
+    virtual int ResetDrawing( ArrayPtrVoid *params );
     ///@}
     
 private:
diff --git a/include/vrv/note.h b/include/vrv/note.h
index 7b927379394..51128d4405f 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -137,7 +137,7 @@ class Note: public LayerElement, public StemmedDrawingInterface, public Duration
     /**
      * Reset the drawing values before calling PrepareDrawing after changes.
      */
-    virtual int ResetDarwing( ArrayPtrVoid *params );
+    virtual int ResetDrawing( ArrayPtrVoid *params );
     
 private:
     
diff --git a/include/vrv/object.h b/include/vrv/object.h
index ad21a9ea02d..0ade3bf9add 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -595,7 +595,7 @@ class Object
     /**
      * Reset the drawing values before calling PrepareDrawing after changes.
      */
-    virtual int ResetDarwing( ArrayPtrVoid *params ) { return FUNCTOR_CONTINUE; };    
+    virtual int ResetDrawing( ArrayPtrVoid *params ) { return FUNCTOR_CONTINUE; };    
     
     /**
      * Set the drawing position (m_drawingX and m_drawingY) values for objects
diff --git a/include/vrv/staff.h b/include/vrv/staff.h
index 233a73fa815..4b9f33e21a0 100644
--- a/include/vrv/staff.h
+++ b/include/vrv/staff.h
@@ -104,7 +104,7 @@ class Staff: public DocObject,
     /**
      * Reset the drawing values before calling PrepareDrawing after changes.
      */
-    virtual int ResetDarwing( ArrayPtrVoid *params );
+    virtual int ResetDrawing( ArrayPtrVoid *params );
     
     /**
      * Set the drawing position (m_drawingX and m_drawingY) values for objects
diff --git a/include/vrv/syl.h b/include/vrv/syl.h
index a7f4c392ff7..055f50269cd 100644
--- a/include/vrv/syl.h
+++ b/include/vrv/syl.h
@@ -63,7 +63,7 @@ class Syl: public LayerElement, public TimeSpanningInterface,
     /**
      * Reset the drawing values before calling PrepareDrawing after changes.
      */
-    virtual int ResetDarwing( ArrayPtrVoid *params );
+    virtual int ResetDrawing( ArrayPtrVoid *params );
     
 private:
     
diff --git a/src/doc.cpp b/src/doc.cpp
index d99a15d6f77..56ae2e4a430 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -99,7 +99,7 @@ void Doc::PrepareDrawing()
     ArrayPtrVoid params;
     
     if (m_drawingPreparationDone) {
-        Functor resetDrawing( &Object::ResetDarwing );
+        Functor resetDrawing( &Object::ResetDrawing );
         this->Process( &resetDrawing, &params );
     }
     
diff --git a/src/dot.cpp b/src/dot.cpp
index 945a6d18137..e2961bee70c 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -54,7 +54,7 @@ int Dot::PreparePointersByLayer( ArrayPtrVoid *params )
     return FUNCTOR_CONTINUE;
 }
     
-int Dot::ResetDarwing( ArrayPtrVoid *params )
+int Dot::ResetDrawing( ArrayPtrVoid *params )
 {
     this->m_drawingNote = NULL;
     return FUNCTOR_CONTINUE;
diff --git a/src/floatingelement.cpp b/src/floatingelement.cpp
index d017485241d..bd0515ba410 100644
--- a/src/floatingelement.cpp
+++ b/src/floatingelement.cpp
@@ -70,7 +70,7 @@ int FloatingElement::FillStaffCurrentTimeSpanning( ArrayPtrVoid *params )
     return FUNCTOR_CONTINUE;
 }
 
-int FloatingElement::ResetDarwing( ArrayPtrVoid *params )
+int FloatingElement::ResetDrawing( ArrayPtrVoid *params )
 {
     // Pass it to the pseudo functor of the interface
     if (this->HasInterface(INTERFACE_TIME_SPANNING)) {
diff --git a/src/note.cpp b/src/note.cpp
index 2dfc2a31d3c..25568281a11 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -261,6 +261,7 @@ int Note::PreparePointersByLayer( ArrayPtrVoid *params )
     Note **currentNote = static_cast<Note**>((*params).at(0));
     
     this->ResetDrawingAccid();
+    //LogDebug("PreparePointersByLayer: accid=%d ACC_EXP_NONE=%d", this->GetAccid(), ACCIDENTAL_EXPLICIT_NONE);
     if (this->GetAccid() != ACCIDENTAL_EXPLICIT_NONE) {
         this->m_isDrawingAccidAttr = true;
         this->m_drawingAccid = new Accid();
@@ -276,7 +277,7 @@ int Note::PreparePointersByLayer( ArrayPtrVoid *params )
     return FUNCTOR_CONTINUE;
 }
     
-int Note::ResetDarwing( ArrayPtrVoid *params )
+int Note::ResetDrawing( ArrayPtrVoid *params )
 {
     this->ResetDrawingTieAttr();
     return FUNCTOR_CONTINUE;
diff --git a/src/staff.cpp b/src/staff.cpp
index 7d8eb1394a4..17373d79fce 100644
--- a/src/staff.cpp
+++ b/src/staff.cpp
@@ -184,7 +184,7 @@ int Staff::FillStaffCurrentLyrics( ArrayPtrVoid *params )
     return FUNCTOR_CONTINUE;
 }
     
-int Staff::ResetDarwing( ArrayPtrVoid *params )
+int Staff::ResetDrawing( ArrayPtrVoid *params )
 {
     // Pass it to the pseudo functor of the interface
     this->m_timeSpanningElements.clear();
diff --git a/src/syl.cpp b/src/syl.cpp
index ee2d2739b42..f4ca020d865 100644
--- a/src/syl.cpp
+++ b/src/syl.cpp
@@ -104,7 +104,7 @@ int Syl::FillStaffCurrentTimeSpanning( ArrayPtrVoid *params )
     return  TimeSpanningInterface::InterfaceFillStaffCurrentTimeSpanning(params, this);
 }
     
-int Syl::ResetDarwing( ArrayPtrVoid *params )
+int Syl::ResetDrawing( ArrayPtrVoid *params )
 {
     // Pass it to the pseudo functor of the interface
     return  TimeSpanningInterface::InterfaceResetDrawing(params, this);

From 4a257ed75d31f40728a8824d33823f82e6f242f3 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 9 Oct 2015 13:23:44 +0100
Subject: [PATCH 55/85] Fixing moving object method (removing type info use)

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

diff --git a/src/object.cpp b/src/object.cpp
index d7f27cd5564..f194ac3c72b 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -126,7 +126,7 @@ void Object::MoveChildren(  Object *object )
     if ( this == object ){
         assert( "Object cannot be copied to itself");
     }
-    if ( &typeid(*this) != &typeid(*object) ) {
+    if ( this->Is() != object->Is() ) {
         assert( "Object must be of the same type");
     }
     

From 090e651e9ab55416b9ee811c1f7e375be888a0f9 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 9 Oct 2015 13:24:31 +0100
Subject: [PATCH 56/85] Removing unused variable

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

diff --git a/src/page.cpp b/src/page.cpp
index ca8aac54b53..79c4a8c71c6 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -131,10 +131,8 @@ void Page::LayOutHorizontally( )
         params.clear();
         double previousTime = 0.0;
         int previousXRel = 0;
-        int minMeasureWidth = doc->m_drawingMinMeasureWidth;
         params.push_back( &previousTime );
         params.push_back( &previousXRel );
-        //params.push_back( &minMeasureWidth );
         params.push_back( &longestActualDur );
         Functor setAlignmentX( &Object::SetAlignmentXPos );
         // Special case: because we redirect the functor, pass it a parameter to itself (!)

From 2bab16a81362226c0240ac819ac305c9af546478 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 9 Oct 2015 18:40:37 +0200
Subject: [PATCH 57/85] Adding spacing parameters

---
 include/vrv/aligner.h |  2 +-
 include/vrv/doc.h     | 15 ++++++++++++++-
 include/vrv/style.h   |  8 ++++++++
 include/vrv/toolkit.h | 27 ++++++++++++++++++++++++---
 src/aligner.cpp       | 11 +++++++----
 src/doc.cpp           |  3 +++
 src/measure.cpp       |  5 +++--
 src/page.cpp          |  1 +
 src/toolkit.cpp       | 24 ++++++++++++++++++++++--
 tools/main.cpp        | 20 ++++++++++++++++++++
 10 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/include/vrv/aligner.h b/include/vrv/aligner.h
index 963b84c1ef5..85f477b0046 100644
--- a/include/vrv/aligner.h
+++ b/include/vrv/aligner.h
@@ -226,7 +226,7 @@ class Alignment: public Object
     virtual int IntegrateBoundingBoxXShift( ArrayPtrVoid *params );
     
 
-    virtual int HorizontalSpaceForDuration(double intervalTime, int maxActualDur);
+    virtual int HorizontalSpaceForDuration(double intervalTime, int maxActualDur, float spacingLinear, float spacingNonLinear);
 
     /**
      * Set the position of the Alignment.
diff --git a/include/vrv/doc.h b/include/vrv/doc.h
index ef6bc2f5083..4fc7a91e3b5 100644
--- a/include/vrv/doc.h
+++ b/include/vrv/doc.h
@@ -159,7 +159,16 @@ class Doc: public Object
     ///@{
     void SetEvenSpacing( bool drawingEvenSpacing ) { m_drawingEvenSpacing = drawingEvenSpacing; };
     bool GetEvenSpacing( ) { return m_drawingEvenSpacing; };
-
+    ///@}
+    
+    /*
+     * @name Setter and getter linear and non linear spacing parameters
+     */
+    ///@{
+    void SetSpacingLinear( float drawingSpacingLinear ) { m_drawingSpacingLinear = drawingSpacingLinear; };
+    float GetSpacingLinear( ) { return m_drawingSpacingLinear; };
+    void SetSpacingNonLinear( float drawingSpacingNonLinear ) { m_drawingSpacingNonLinear = drawingSpacingNonLinear; };
+    float GetSpacingNonLinear( ) { return m_drawingSpacingNonLinear; };
     ///@}
 
     /**
@@ -275,6 +284,10 @@ class Doc: public Object
     bool m_drawingJustifyX;
     /** flag for disabling spacing by duration */
     bool m_drawingEvenSpacing;
+    /** value of the linear spacing factor */
+    float m_drawingSpacingLinear;
+    /** value of the non linear spacing factor */
+    float m_drawingSpacingNonLinear;
     /** minimum measure width */
     int m_drawingMinMeasureWidth;
     
diff --git a/include/vrv/style.h b/include/vrv/style.h
index 225ae596f7a..c82c15bd574 100644
--- a/include/vrv/style.h
+++ b/include/vrv/style.h
@@ -50,6 +50,14 @@ namespace vrv {
 #define DEFAULT_STEM_WITDH 2.0
 #define MIN_STEM_WIDTH 1.0
 #define MAX_STEM_WIDTH 5.0
+
+#define DEFAULT_SPACING_LINEAR 0.3
+#define MIN_SPACING_LINEAR 0.0
+#define MAX_SPACING_LINEAR 1.0
+    
+#define DEFAULT_SPACING_NON_LINEAR 0.6
+#define MIN_SPACING_NON_LINEAR 0.0
+#define MAX_SPACING_NON_LINEAR 1.0
     
 //----------------------------------------------------------------------------
 // Default scaling (%) and spacing (units) values
diff --git a/include/vrv/toolkit.h b/include/vrv/toolkit.h
index 905daf3675d..99840c8060a 100644
--- a/include/vrv/toolkit.h
+++ b/include/vrv/toolkit.h
@@ -188,6 +188,23 @@ class Toolkit
     int GetSpacingSystem() { return m_spacingSystem; };
     ///@}
     
+    /**
+     * @name Space notes equally and close together (normally for mensural notation)
+     */
+    ///@{
+    bool SetSpacingLinear( float spacingLinear );
+    float GetSpacingLinear() { return m_spacingLinear; };
+    ///@}
+    
+    /**
+     * @name Space notes equally and close together (normally for mensural notation)
+     */
+    ///@{
+    bool SetSpacingNonLinear( float spacingNonLinear );
+    float GetSpacingNonLinear() { return m_spacingNonLinear; };
+    ///@}
+    
+    
     /**
      * @name Ignore all encoded layout information (if any) 
      * and output one single page with one single system
@@ -214,12 +231,14 @@ class Toolkit
     int GetAdjustPageHeight() { return m_adjustPageHeight; };
     ///@}
     
-    
     /**
-     * @name Space notes equally and close together (normally for mensural notation) */
+     * @name Space notes equally and close together (normally for mensural notation) 
+     */
+    ///@{
     void SetEvenNoteSpacing( bool even ) { m_evenNoteSpacing = even; };
     int GetEvenNoteSpacing() { return m_evenNoteSpacing; };
-    
+    ///@}
+
     /**
      * @name Do not justify the system (for debugging purposes) 
      */
@@ -325,6 +344,8 @@ class Toolkit
     std::string m_rdgXPathQuery;
     bool m_scoreBasedMei;
     bool m_evenNoteSpacing;
+    float m_spacingLinear;
+    float m_spacingNonLinear;
     // for debugging
     bool m_noJustification;
     bool m_showBoundingBoxes;
diff --git a/src/aligner.cpp b/src/aligner.cpp
index 50c05dbc4e6..7182edc4a00 100644
--- a/src/aligner.cpp
+++ b/src/aligner.cpp
@@ -437,7 +437,8 @@ int MeasureAligner::SetAlignmentXPos( ArrayPtrVoid *params )
     // param 0: the previous time position
     // param 1: the previous x rel position
     // param 2: duration of the longest note (unused)
-    // param 3: the functor to be redirected to the MeasureAligner (unused)
+    // param 3: the doc (unused)
+    // param 4: the functor to be redirected to the MeasureAligner (unused)
     double *previousTime = static_cast<double*>((*params).at(0));
     int *previousXRel = static_cast<int*>((*params).at(1));
     
@@ -459,7 +460,7 @@ The power function we currently use is isn't quite right; see _Behind Bars_, p.
 need more flexibility: for example, for some purposes, spacing propoortional to duration is
 desirable. The best solution is probably to get ideal spacing from a user-definable table. */
 
-int Alignment::HorizontalSpaceForDuration(double intervalTime, int maxActualDur)
+int Alignment::HorizontalSpaceForDuration(double intervalTime, int maxActualDur, float spacingLinear, float spacingNonLinear)
 {
     /* If the longest duration interval in the score is longer than semibreve, adjust spacing so
        that interval gets the space a semibreve would ordinarily get. (maxActualDur is in our
@@ -475,15 +476,17 @@ int Alignment::SetAlignmentXPos( ArrayPtrVoid *params )
     // param 0: the previous time position
     // param 1: the previous x rel position
     // param 2: duration of the longest note
-    // param 3: the functor to be redirected to the MeasureAligner (unused)
+    // param 3: the doc (unused)
+    // param 4: the functor to be redirected to the MeasureAligner (unused)
     double *previousTime = static_cast<double*>((*params).at(0));
     int *previousXRel = static_cast<int*>((*params).at(1));
     int *maxActualDur = static_cast<int*>((*params).at(2));
+    Doc *doc = static_cast<Doc*>((*params).at(3));
     
     int intervalXRel = 0;
     double intervalTime = (m_time - (*previousTime));
     if ( intervalTime > 0.0 ) {
-        intervalXRel = HorizontalSpaceForDuration(intervalTime, *maxActualDur);
+        intervalXRel = HorizontalSpaceForDuration(intervalTime, *maxActualDur, doc->GetSpacingLinear(), doc->GetSpacingNonLinear());
         LogDebug("SetAlignmentXPos: intervalTime=%.2f intervalXRel=%d", intervalTime, intervalXRel);
     }
     m_xRel = (*previousXRel) + (intervalXRel) * DEFINITON_FACTOR;
diff --git a/src/doc.cpp b/src/doc.cpp
index 56ae2e4a430..39efa21f4a8 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -66,6 +66,9 @@ void Doc::Reset( DocType type )
     m_pageLeftMar = 0;
     m_pageTopMar = 0;
     
+    m_drawingSpacingLinear = DEFAULT_SPACING_LINEAR;
+    m_drawingSpacingNonLinear = DEFAULT_SPACING_NON_LINEAR;
+    
     m_spacingStaff = m_style->m_spacingStaff;
     m_spacingSystem = m_style->m_spacingSystem;
     
diff --git a/src/measure.cpp b/src/measure.cpp
index d23b383a1fe..a1bb1a1bc43 100644
--- a/src/measure.cpp
+++ b/src/measure.cpp
@@ -217,8 +217,9 @@ int Measure::SetAlignmentXPos( ArrayPtrVoid *params )
     // param 0: the previous time position (unused)
     // param 1: the previous x rel position (unused)
     // param 2: duration of the longest note (unused)
-    // param 3: the functor to be redirected to Aligner
-    Functor *setAligmnentPosX = static_cast<Functor*>((*params).at(3));
+    // param 3: the doc (unused)
+    // param 4: the functor to be redirected to Aligner
+    Functor *setAligmnentPosX = static_cast<Functor*>((*params).at(4));
     
     m_measureAligner.Process( setAligmnentPosX, params);
     
diff --git a/src/page.cpp b/src/page.cpp
index 79c4a8c71c6..77cab10bad5 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -134,6 +134,7 @@ void Page::LayOutHorizontally( )
         params.push_back( &previousTime );
         params.push_back( &previousXRel );
         params.push_back( &longestActualDur );
+        params.push_back( &m_doc );
         Functor setAlignmentX( &Object::SetAlignmentXPos );
         // Special case: because we redirect the functor, pass it a parameter to itself (!)
         params.push_back( &setAlignmentX );
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index 2169101378f..92c9d032a2d 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -45,6 +45,8 @@ Toolkit::Toolkit( bool initFont )
     m_pageHeight = DEFAULT_PAGE_HEIGHT;
     m_pageWidth = DEFAULT_PAGE_WIDTH;
     m_border = DEFAULT_PAGE_LEFT_MAR;
+    m_spacingLinear = DEFAULT_SPACING_LINEAR;
+    m_spacingNonLinear = DEFAULT_SPACING_NON_LINEAR;
     m_spacingStaff = DEFAULT_SPACING_STAFF;
     m_spacingSystem = DEFAULT_SPACING_SYSTEM;
     
@@ -128,7 +130,6 @@ bool Toolkit::SetSpacingStaff( int spacingStaff )
     return true;
 }
 
-
 bool Toolkit::SetSpacingSystem( int spacingSystem )
 {
     if (spacingSystem < MIN_SPACING_SYSTEM || spacingSystem > MAX_SPACING_SYSTEM) {
@@ -138,7 +139,26 @@ bool Toolkit::SetSpacingSystem( int spacingSystem )
     m_spacingSystem = spacingSystem;
     return true;
 }
-
+    
+bool Toolkit::SetSpacingLinear( float spacingLinear )
+{
+    if (spacingLinear < MIN_SPACING_LINEAR || spacingLinear > MAX_SPACING_LINEAR) {
+        LogError( "Spacing (linear) out of bounds; default is %d, minimun is %d, and maximum is %d", DEFAULT_SPACING_LINEAR, MIN_SPACING_LINEAR, MAX_SPACING_LINEAR );
+        return false;
+    }
+    m_spacingLinear = spacingLinear;
+    return true;
+}
+    
+bool Toolkit::SetSpacingNonLinear( float spacingNonLinear )
+{
+    if (spacingNonLinear < MIN_SPACING_NON_LINEAR || spacingNonLinear > MAX_SPACING_NON_LINEAR) {
+        LogError( "Spacing (non linear) out of bounds; default is %d, minimun is %d, and maximum is %d", DEFAULT_SPACING_NON_LINEAR, MIN_SPACING_NON_LINEAR, MAX_SPACING_NON_LINEAR );
+        return false;
+    }
+    m_spacingNonLinear = spacingNonLinear;
+    return true;
+}
 
 bool Toolkit::SetFormat( std::string const &informat )
 {
diff --git a/tools/main.cpp b/tools/main.cpp
index 5273f4bbc62..96be357971e 100644
--- a/tools/main.cpp
+++ b/tools/main.cpp
@@ -124,6 +124,14 @@ void display_usage() {
     
     cerr << " --rdg-xpath-query=QUERY    Set the xPath query for selecting <rdg> elements," << endl;
     cerr << "                            for example: \"./rdg[contains(@source, 'source-id')]\"" << endl;
+    
+    cerr << " --spacing-linear=SP        Specify the linear spacing factor (default is " << DEFAULT_SPACING_LINEAR << ")" << endl;
+    
+    cerr << " --spacing-non-linear=SP    Specify the non linear spacing factor (default is " << DEFAULT_SPACING_NON_LINEAR << ")" << endl;
+    
+    cerr << " --spacing-staff=SP         Specify the spacing above each staff (in MEI vu)," << endl;
+    
+    cerr << " --spacing-system=SP        Specify the spacing above each system (in MEI vu)," << endl;
 
     // Debugging options
     cerr << endl << "Debugging options" << endl;
@@ -197,6 +205,8 @@ int main(int argc, char** argv)
         {"resources",           required_argument,  0, 'r'},
         {"scale",               required_argument,  0, 's'},
         {"show-bounding-boxes", no_argument,        &show_bounding_boxes, 1},
+        {"spacing-linear",      required_argument,  0, 0},
+        {"spacing-non-linear",  required_argument,  0, 0},
         {"spacing-staff",       required_argument,  0, 0},
         {"spacing-system",      required_argument,  0, 0},
         {"type",                required_argument,  0, 't'},
@@ -222,6 +232,16 @@ int main(int argc, char** argv)
                     cout << string(optarg) << endl;
                     toolkit.SetRdgXPathQuery( string(optarg) );
                 }
+                else if (strcmp(long_options[option_index].name,"spacing-linear") == 0) {
+                    if ( !toolkit.SetSpacingLinear( atof(optarg) ) ) {
+                        exit(1);
+                    }
+                }
+                else if (strcmp(long_options[option_index].name,"spacing-non-linear") == 0) {
+                    if ( !toolkit.SetSpacingNonLinear( atof(optarg) ) ) {
+                        exit(1);
+                    }
+                }
                 else if (strcmp(long_options[option_index].name,"spacing-staff") == 0) {
                     if ( !toolkit.SetSpacingStaff( atoi(optarg) ) ) {
                         exit(1);

From 58fcb9182562322a327a40fbb7d61e5cdcfd1125 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 9 Oct 2015 21:44:19 +0200
Subject: [PATCH 58/85] Finalizing new spacing options (toolkit, JS missing)

---
 include/vrv/aligner.h |  2 +-
 include/vrv/doc.h     | 12 ++++++------
 src/aligner.cpp       |  9 ++++-----
 src/doc.cpp           |  2 +-
 src/toolkit.cpp       |  8 +++-----
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/include/vrv/aligner.h b/include/vrv/aligner.h
index 85f477b0046..65f7dd026fa 100644
--- a/include/vrv/aligner.h
+++ b/include/vrv/aligner.h
@@ -226,7 +226,7 @@ class Alignment: public Object
     virtual int IntegrateBoundingBoxXShift( ArrayPtrVoid *params );
     
 
-    virtual int HorizontalSpaceForDuration(double intervalTime, int maxActualDur, float spacingLinear, float spacingNonLinear);
+    virtual int HorizontalSpaceForDuration(double intervalTime, int maxActualDur, double spacingLinear, double spacingNonLinear);
 
     /**
      * Set the position of the Alignment.
diff --git a/include/vrv/doc.h b/include/vrv/doc.h
index 4fc7a91e3b5..4c0740b69a1 100644
--- a/include/vrv/doc.h
+++ b/include/vrv/doc.h
@@ -165,10 +165,10 @@ class Doc: public Object
      * @name Setter and getter linear and non linear spacing parameters
      */
     ///@{
-    void SetSpacingLinear( float drawingSpacingLinear ) { m_drawingSpacingLinear = drawingSpacingLinear; };
-    float GetSpacingLinear( ) { return m_drawingSpacingLinear; };
-    void SetSpacingNonLinear( float drawingSpacingNonLinear ) { m_drawingSpacingNonLinear = drawingSpacingNonLinear; };
-    float GetSpacingNonLinear( ) { return m_drawingSpacingNonLinear; };
+    void SetSpacingLinear( double drawingSpacingLinear ) { m_drawingSpacingLinear = drawingSpacingLinear; };
+    double GetSpacingLinear( ) { return m_drawingSpacingLinear; };
+    void SetSpacingNonLinear( double drawingSpacingNonLinear ) { m_drawingSpacingNonLinear = drawingSpacingNonLinear; };
+    double GetSpacingNonLinear( ) { return m_drawingSpacingNonLinear; };
     ///@}
 
     /**
@@ -285,9 +285,9 @@ class Doc: public Object
     /** flag for disabling spacing by duration */
     bool m_drawingEvenSpacing;
     /** value of the linear spacing factor */
-    float m_drawingSpacingLinear;
+    double m_drawingSpacingLinear;
     /** value of the non linear spacing factor */
-    float m_drawingSpacingNonLinear;
+    double m_drawingSpacingNonLinear;
     /** minimum measure width */
     int m_drawingMinMeasureWidth;
     
diff --git a/src/aligner.cpp b/src/aligner.cpp
index 7182edc4a00..c85667f69ee 100644
--- a/src/aligner.cpp
+++ b/src/aligner.cpp
@@ -460,14 +460,13 @@ The power function we currently use is isn't quite right; see _Behind Bars_, p.
 need more flexibility: for example, for some purposes, spacing propoortional to duration is
 desirable. The best solution is probably to get ideal spacing from a user-definable table. */
 
-int Alignment::HorizontalSpaceForDuration(double intervalTime, int maxActualDur, float spacingLinear, float spacingNonLinear)
+int Alignment::HorizontalSpaceForDuration(double intervalTime, int maxActualDur, double spacingLinear, double spacingNonLinear)
 {
     /* If the longest duration interval in the score is longer than semibreve, adjust spacing so
        that interval gets the space a semibreve would ordinarily get. (maxActualDur is in our
        internal code format: cf. attdef.h). ??TO BE DONE */
-    if (maxActualDur<DUR_1) intervalTime /= pow( 2.0, DUR_1-maxActualDur);
-    int intervalXRel;
-    intervalXRel = pow( intervalTime, 0.50 ) * 3.8;     // numbers are experimental constants
+    if (maxActualDur < DUR_1) intervalTime /= pow(2.0, DUR_1 - maxActualDur);
+    int intervalXRel = pow( intervalTime, spacingNonLinear ) * pow( spacingLinear * 5.0, 2 );
     return intervalXRel;
 }
 
@@ -487,7 +486,7 @@ int Alignment::SetAlignmentXPos( ArrayPtrVoid *params )
     double intervalTime = (m_time - (*previousTime));
     if ( intervalTime > 0.0 ) {
         intervalXRel = HorizontalSpaceForDuration(intervalTime, *maxActualDur, doc->GetSpacingLinear(), doc->GetSpacingNonLinear());
-        LogDebug("SetAlignmentXPos: intervalTime=%.2f intervalXRel=%d", intervalTime, intervalXRel);
+        //LogDebug("SetAlignmentXPos: intervalTime=%.2f intervalXRel=%d", intervalTime, intervalXRel);
     }
     m_xRel = (*previousXRel) + (intervalXRel) * DEFINITON_FACTOR;
     (*previousTime) = m_time;
diff --git a/src/doc.cpp b/src/doc.cpp
index 39efa21f4a8..04e98099446 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -74,7 +74,7 @@ void Doc::Reset( DocType type )
     
     m_drawingPage = NULL;
     m_drawingJustifyX = true;
-    m_drawingEvenSpacing = true;
+    m_drawingEvenSpacing = false;
     m_currentScoreDefDone = false;
     m_drawingPreparationDone = false;
     
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index 92c9d032a2d..d2398a0ec46 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -298,8 +298,11 @@ bool Toolkit::LoadString( const std::string &data )
     m_doc.SetPageRightMar( this->GetBorder() );
     m_doc.SetPageLeftMar( this->GetBorder() );
     m_doc.SetPageTopMar( this->GetBorder() );
+    m_doc.SetSpacingLinear( this->GetSpacingLinear() );
+    m_doc.SetSpacingNonLinear( this->GetSpacingNonLinear() );
     m_doc.SetSpacingStaff( this->GetSpacingStaff() );
     m_doc.SetSpacingSystem( this->GetSpacingSystem() );
+    m_doc.SetEvenSpacing( this->GetEvenNoteSpacing() );
     
     m_doc.PrepareDrawing();
     
@@ -324,11 +327,6 @@ bool Toolkit::LoadString( const std::string &data )
         m_doc.SetJustificationX(false);
     }
     
-    // disable duration-based spacing if requested
-    if (!m_evenNoteSpacing) {
-        m_doc.SetEvenSpacing(false);
-    }
-    
     delete input;
     m_view.SetDoc( &m_doc );
     

From 721f0f25af443ceefe5896f663d6af7c7bc8dae8 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 9 Oct 2015 21:44:42 +0200
Subject: [PATCH 59/85] Removing unused member

---
 include/vrv/object.h | 3 ---
 src/object.cpp       | 1 -
 src/page.cpp         | 2 +-
 src/staff.cpp        | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/vrv/object.h b/include/vrv/object.h
index 0ade3bf9add..22a916d9fe8 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -669,9 +669,6 @@ class Object
     std::string m_uuid;
     std::string m_classid;
     std::wstring m_text;
-    
-    /** A pointer to the parent doc for accessing environment variables when drawing */
-    Doc *m_doc;
 
 private:
     
diff --git a/src/object.cpp b/src/object.cpp
index f194ac3c72b..172b1ad25ab 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -103,7 +103,6 @@ void Object::Init(std::string classid)
 {
     m_parent = NULL;
     m_isModified = true;
-    m_doc = NULL;
     m_classid = classid;
     this->GenerateUuid();
 }
diff --git a/src/page.cpp b/src/page.cpp
index 77cab10bad5..24ec3167db1 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -134,7 +134,7 @@ void Page::LayOutHorizontally( )
         params.push_back( &previousTime );
         params.push_back( &previousXRel );
         params.push_back( &longestActualDur );
-        params.push_back( &m_doc );
+        params.push_back( doc );
         Functor setAlignmentX( &Object::SetAlignmentXPos );
         // Special case: because we redirect the functor, pass it a parameter to itself (!)
         params.push_back( &setAlignmentX );
diff --git a/src/staff.cpp b/src/staff.cpp
index 17373d79fce..30519861d05 100644
--- a/src/staff.cpp
+++ b/src/staff.cpp
@@ -220,7 +220,7 @@ int Staff::SetDrawingXY( ArrayPtrVoid *params )
     }
     else
     {
-        assert( m_doc->GetType() == Transcription );
+        assert( doc->GetType() == Transcription );
         this->SetDrawingY( this->m_yAbs );
     }
     

From 8254251013e23ea8f42818d37c6d5f6bf5567d39 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 9 Oct 2015 22:38:40 +0200
Subject: [PATCH 60/85] Changing even note spacing default value

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

diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index d2398a0ec46..3515089e108 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -54,7 +54,7 @@ Toolkit::Toolkit( bool initFont )
     m_ignoreLayout = false;
     m_adjustPageHeight = false;
     m_noJustification = false;
-    m_evenNoteSpacing = true;
+    m_evenNoteSpacing = false;
     m_showBoundingBoxes = false;
     m_scoreBasedMei = false;
     

From f5f863076a084176b77668f2e76c6737c1177f6a Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Fri, 9 Oct 2015 22:41:03 +0200
Subject: [PATCH 61/85] Adding spacing parameter to the JavaScript option
 parsing method

---
 src/toolkit.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index 3515089e108..7106b3fe75f 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -385,9 +385,15 @@ bool Toolkit::ParseOptions( const std::string &json_options ) {
     if (json.has<jsonxx::Number>("pageHeight"))
         SetPageHeight( json.get<jsonxx::Number>("pageHeight") );
     
+    if (json.has<jsonxx::Number>("spacingLinear"))
+        SetSpacingLinear( json.get<jsonxx::Number>("spacingLinear" ) );
+    
+    if (json.has<jsonxx::Number>("spacingNonLinear"))
+        SetSpacingNonLinear( json.get<jsonxx::Number>("spacingNonLinear") );
+    
     if (json.has<jsonxx::Number>("spacingStaff"))
         SetSpacingStaff( json.get<jsonxx::Number>("spacingStaff") );
-    
+
     if (json.has<jsonxx::Number>("spacingSystem"))
         SetSpacingSystem( json.get<jsonxx::Number>("spacingSystem") );
     

From 1c9531ab95f5713508e63c0bcbba6dfd9e6c63b0 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 12 Oct 2015 17:51:40 +0200
Subject: [PATCH 62/85] Basic lyric reading

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

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 11c8cfa554d..cb70098d52a 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -27,9 +27,11 @@
 #include "rest.h"
 #include "slur.h"
 #include "staff.h"
+#include "syl.h"
 #include "system.h"
 #include "tie.h"
 #include "tuplet.h"
+#include "verse.h"
 #include "vrv.h"
 
 namespace vrv {
@@ -433,7 +435,7 @@ int MusicXmlInput::ReadMusicXmlPartAttributesAsStaffDef(pugi::xml_node node, Sta
             AttCommonNComparison comparisonStaffDef(STAFFDEF, i + 1 + staffOffset);
             staffDef = dynamic_cast<StaffDef*>(staffGrp->FindChildByAttComparison(&comparisonStaffDef, 1));
             if (!staffDef) {
-                StaffDef *staffDef = new StaffDef();
+                staffDef = new StaffDef();
                 staffDef->SetN(i + 1 + staffOffset);
                 // by default five line staves
                 staffDef->SetLines(5);
@@ -738,6 +740,23 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure, int
             note->SetStemDir(stemDir);
         }
         
+        // Verse / syl
+        pugi::xpath_node_set lyrics = node.select_nodes("lyric");
+        for (pugi::xpath_node_set::const_iterator it = lyrics.begin(); it != lyrics.end(); ++it)
+        {
+            pugi::xml_node lyric = it->node();
+            int lyricNumber = atoi(GetAttributeValue(lyric, "number").c_str());
+            lyricNumber = (lyricNumber < 1) ? 1 : lyricNumber;
+            std::string textStr = GetContentOfChild(lyric, "text");
+            LogDebug(textStr.c_str());
+            Verse *verse = new Verse();
+            verse->SetN(lyricNumber);
+            Syl *syl = new Syl();
+            syl->SetText(UTF8to16(textStr.c_str()));
+            verse->AddLayerElement(syl);
+            note->AddLayerElement(verse);
+        }
+        
         // Ties
         pugi::xpath_node tie1 = node.select_single_node("tie[1]");
         pugi::xpath_node tie2 = node.select_single_node("tie[2]");

From 8c0fed2d975a260ab3930712873c60eadd696149 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 13 Oct 2015 16:48:50 +0200
Subject: [PATCH 63/85] Adding lyric connectors support and various fixes

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

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index cb70098d52a..93d1f7e6183 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -239,13 +239,25 @@ Layer *MusicXmlInput::SelectLayer(int staffNb, vrv::Measure *measure)
     staffNb--;
     Staff *staff = dynamic_cast<Staff*>(measure->m_children.at(staffNb));
     assert(staff);
-    return SelectLayer(1, staff);
+    // layer -1 means the first one
+    return SelectLayer(-1, staff);
 }
     
 Layer *MusicXmlInput::SelectLayer(int layerNb, Staff *staff)
 {
-    AttCommonNComparison comparisonLayer(LAYER, layerNb);
-    Layer *layer = dynamic_cast<Layer*>(staff->FindChildByAttComparison(&comparisonLayer, 1));
+    Layer *layer = NULL;
+    // no layer specified, return the first one (if any)
+    if (layerNb == -1) {
+        if (staff->m_children.size() > 0) {
+            layer = dynamic_cast<Layer*>(staff->m_children.at(0));
+        }
+        // otherwise set @n to 1
+        layerNb = 1;
+    }
+    else {
+        AttCommonNComparison comparisonLayer(LAYER, layerNb);
+        layer = dynamic_cast<Layer*>(staff->FindChildByAttComparison(&comparisonLayer, 1));
+    }
     if (layer) return layer;
     // else add it
     // add at least one layer
@@ -672,7 +684,7 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure, int
             element = rest;
             rest->SetDur(ConvertTypeToDur(typeStr));
             if (dots > 0) rest->SetDots(dots);
-            layer->AddLayerElement(rest);
+            AddLayerElement(layer, rest);
         }
     }
     else {
@@ -748,10 +760,20 @@ void MusicXmlInput::ReadMusicXmlNote(pugi::xml_node node, Measure *measure, int
             int lyricNumber = atoi(GetAttributeValue(lyric, "number").c_str());
             lyricNumber = (lyricNumber < 1) ? 1 : lyricNumber;
             std::string textStr = GetContentOfChild(lyric, "text");
-            LogDebug(textStr.c_str());
             Verse *verse = new Verse();
             verse->SetN(lyricNumber);
             Syl *syl = new Syl();
+            if (lyric.select_single_node("extend")) {
+                syl->SetCon(CON_u);
+            }
+            if (GetContentOfChild(lyric, "syllabic") == "begin") {
+                syl->SetCon(CON_d);
+                syl->SetWordpos(WORDPOS_i);
+            }
+            else if (GetContentOfChild(lyric, "syllabic") == "end") {
+                syl->SetWordpos(WORDPOS_t);
+            }
+            
             syl->SetText(UTF8to16(textStr.c_str()));
             verse->AddLayerElement(syl);
             note->AddLayerElement(verse);

From 9c5fde19ce7e84947063c932bacec9f1e3ed5ce9 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 13 Oct 2015 17:23:33 +0200
Subject: [PATCH 64/85] StaffDef / staffGrp support

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

diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 93d1f7e6183..42b618dc0ee 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -372,8 +372,26 @@ bool MusicXmlInput::ReadMusicXml(pugi::xml_node root)
                 LogWarning("Could not find the 'attributes' element in the first measure of part '%s'", partId.c_str());
                 continue;
             }
+            std::string partName = GetContentOfChild(xpathNode.node(), "part-name");
             // create the staffDef(s)
-            int nbStaves = ReadMusicXmlPartAttributesAsStaffDef(partFirstMeasureAttributes.node(), m_staffGrpStack.back(), staffOffset);
+            StaffGrp *partStaffGrp = new StaffGrp();
+            int nbStaves = ReadMusicXmlPartAttributesAsStaffDef(partFirstMeasureAttributes.node(), partStaffGrp, staffOffset);
+            // if we have more than one staff in the part we create a new staffGrp
+            if (nbStaves > 1) {
+                partStaffGrp->SetLabel(partName);
+                partStaffGrp->SetSymbol(SYMBOL_brace);
+                partStaffGrp->SetBarthru(BOOLEAN_true);
+                m_staffGrpStack.back()->AddStaffGrp(partStaffGrp);
+            }
+            else {
+                StaffDef *staffDef = dynamic_cast<StaffDef*>(partStaffGrp->FindChildByType(STAFFDEF));
+                if (staffDef) {
+                    staffDef->SetLabel(partName);
+                }
+                m_staffGrpStack.back()->MoveChildren(partStaffGrp);
+                delete partStaffGrp;
+            }
+            
             // find the part and read it
             xpath = StringFormat("/score-partwise/part[@id='%s']", partId.c_str());
             pugi::xpath_node part = root.select_single_node(xpath.c_str());

From d3ee93e55d27c5b37c4eadb0ae2324ed016c8aef Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 13 Oct 2015 17:26:22 +0200
Subject: [PATCH 65/85] Fix (lost in merge?)

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

diff --git a/include/vrv/att_comparison.h b/include/vrv/att_comparison.h
index e27e66bce1e..feb26bf3dbf 100644
--- a/include/vrv/att_comparison.h
+++ b/include/vrv/att_comparison.h
@@ -9,6 +9,7 @@
 #define __VRV_ATT_COMPARISON_H__
 
 #include "atts_shared.h"
+#include "durationinterface.h"
 #include "object.h"
 
 namespace vrv {

From 15e04494364490223b2fe3da0caf967a3b285d43 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 14 Oct 2015 14:16:14 +0200
Subject: [PATCH 66/85] Adding schema and schematron processing instruction

---
 src/iomei.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/iomei.cpp b/src/iomei.cpp
index 04becf40643..6d4b05dd6dc 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -70,6 +70,24 @@ bool MeiOutput::ExportFile( )
         pugi::xml_document meiDoc;
         
         if ( m_page < 0 ) {
+            pugi::xml_node decl = meiDoc.prepend_child(pugi::node_declaration);
+            decl.append_attribute("version") = "1.0";
+            decl.append_attribute("encoding") = "UTF-8";
+
+            // schema processing instruction
+            decl = meiDoc.append_child(pugi::node_declaration);
+            decl.set_name("xml-model");
+            decl.append_attribute("href") = "http://music-encoding.org/schema/2.1.1/mei-all.rng";
+            decl.append_attribute("type") = "application/xml";
+            decl.append_attribute("schematypens") = "http://relaxng.org/ns/structure/1.0";
+            
+            // schematron processing instruction
+            decl = meiDoc.append_child(pugi::node_declaration);
+            decl.set_name("xml-model");
+            decl.append_attribute("href") = "http://music-encoding.org/schema/2.1.1/mei-all.rng";
+            decl.append_attribute("type") = "application/xml";
+            decl.append_attribute("schematypens") = "http://purl.oclc.org/dsdl/schematron";
+            
             m_mei = meiDoc.append_child("mei");
             m_mei.append_attribute( "xmlns" ) = "http://www.music-encoding.org/ns/mei";
             m_mei.append_attribute( "meiversion" ) = "2013";

From 8a635ad93245f76b8f78c8ce94717bfea71ab5bf Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 14 Oct 2015 14:49:50 +0200
Subject: [PATCH 67/85] Adding minimal header for validation

---
 src/iomei.cpp | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/iomei.cpp b/src/iomei.cpp
index 6d4b05dd6dc..b1802b7100c 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -345,7 +345,7 @@ std::string MeiOutput::UuidToMeiStr( Object *element )
     //LogDebug("uuid: %s", out.c_str());
     return out;
 }
-
+    
 bool MeiOutput::WriteMeiDoc( Doc *doc )
 {
     assert( doc );
@@ -355,27 +355,31 @@ bool MeiOutput::WriteMeiDoc( Doc *doc )
     
     pugi::xml_node meiHead = m_mei.append_child("meiHead");
     
-    for (pugi::xml_node child = m_doc->m_header.first_child(); child; child = child.next_sibling())
-    {
-        meiHead.append_copy(child);
+    if (m_doc->m_header.first_child()) {
+        for (pugi::xml_node child = m_doc->m_header.first_child(); child; child = child.next_sibling())
+        {
+            meiHead.append_copy(child);
+        }
+    }
+    else {
+        pugi::xml_node fileDesc = meiHead.append_child("fileDesc");
+        pugi::xml_node titleStmt = fileDesc.append_child("titleStmt");
+        titleStmt.append_child("title");
+        pugi::xml_node pubStmt = fileDesc.append_child("pubStmt");
+        pugi::xml_node date = pubStmt.append_child("date");
+        
+        pugi::xml_node encodingDesc = meiHead.append_child("encodingDesc");
+        pugi::xml_node projectDesc = encodingDesc.append_child("projectDesc");
+        pugi::xml_node p1 = projectDesc.append_child("p");
+        p1.append_child(pugi::node_pcdata).set_value( StringFormat( "Encoded with Verovio version %s",  GetVersion().c_str() ).c_str() );
+        
+        // date
+        time_t t = time(0); // get time now
+        struct tm *now = localtime(&t);
+        std::string dateStr = StringFormat("%d-%02d-%02d %02d:%02d:%02d", now->tm_year + 1900, now->tm_mon + 1,
+                                           now->tm_mday, now->tm_hour, now->tm_min, now->tm_sec);
+        date.append_child(pugi::node_pcdata).set_value(dateStr.c_str());
     }
-    
-    /*
-    pugi::xml_node fileDesc = meiHead.append_child("fileDesc");
-    pugi::xml_node titleStmt = fileDesc.append_child("titleStmt");
-    titleStmt.append_child("title");
-    pugi::xml_node pubStmt = fileDesc.append_child("pubStmt");
-    pugi::xml_node date = pubStmt.append_child("date");
-    
-    pugi::xml_node encodingDesc = meiHead.append_child("encodingDesc");
-    pugi::xml_node projectDesc = encodingDesc.append_child("projectDesc");
-    pugi::xml_node p1 = projectDesc.append_child("p");
-    p1.append_child(pugi::node_pcdata).set_value( StringFormat( "Encoded with Verovio version %s",  GetVersion().c_str() ).c_str() );
-    
-    // date
-    time_t now = time(0);
-    date.append_child(pugi::node_pcdata).set_value( ctime( &now ) );
-    */
     
     // ---- music ----
    

From 444967e6eb11de30dd5a1e0e16713bdf704d2216 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 26 Oct 2015 15:48:12 +0100
Subject: [PATCH 68/85] Adding BTrem and FTrem classes

---
 include/vrv/rpt.h    | 60 ++++++++++++++++++++++++++++++++++++++++++++
 include/vrv/vrvdef.h |  2 ++
 src/rpt.cpp          | 40 +++++++++++++++++++++++++++--
 3 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/include/vrv/rpt.h b/include/vrv/rpt.h
index 54163056d18..e8383f13185 100644
--- a/include/vrv/rpt.h
+++ b/include/vrv/rpt.h
@@ -55,6 +55,66 @@ class BeatRpt: public LayerElement,
     
 };
     
+//----------------------------------------------------------------------------
+// BTrem
+//----------------------------------------------------------------------------
+
+/**
+ * This class models the MEI <bTrem>
+ */
+class BTrem: public LayerElement
+{
+public:
+    /**
+     * @name Constructors, destructors, reset and class name methods
+     * Reset method reset all attribute classes
+     */
+    ///@{
+    BTrem( );
+    virtual ~BTrem();
+    virtual void Reset();
+    virtual std::string GetClassName( ){ return "BTrem"; }; ;
+    virtual ClassId Is() { return BTREM; };
+    ///@}
+    
+private:
+    
+public:
+    
+private:
+    
+};
+    
+//----------------------------------------------------------------------------
+// FTrem
+//----------------------------------------------------------------------------
+
+/**
+ * This class models the MEI <fTrem>
+ */
+class FTrem: public LayerElement
+{
+public:
+    /**
+     * @name Constructors, destructors, reset and class name methods
+     * Reset method reset all attribute classes
+     */
+    ///@{
+    FTrem( );
+    virtual ~FTrem();
+    virtual void Reset();
+    virtual std::string GetClassName( ){ return "FTrem"; }; ;
+    virtual ClassId Is() { return FTREM; };
+    ///@}
+    
+private:
+    
+public:
+    
+private:
+    
+};
+    
 //----------------------------------------------------------------------------
 // MRpt
 //----------------------------------------------------------------------------
diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index 97e5cc715cf..36f71cb1eee 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -106,10 +106,12 @@ enum ClassId {
     BARLINE_ATTR,
     BEAM,
     BEATRPT,
+    BTREM,
     CHORD,
     CLEF,
     CUSTOS,
     DOT,
+    FTREM,
     KEYSIG,
     MENSUR,
     METERSIG,
diff --git a/src/rpt.cpp b/src/rpt.cpp
index d1bfbaa99fd..ea92e97ee38 100644
--- a/src/rpt.cpp
+++ b/src/rpt.cpp
@@ -43,6 +43,44 @@ double BeatRpt::GetAlignmentDuration( int meterUnit )
     return  DUR_MAX / meterUnit;
 }
 
+//----------------------------------------------------------------------------
+// BTrem
+//----------------------------------------------------------------------------
+
+BTrem::BTrem( ):
+LayerElement("btrem-")
+{
+    Reset();
+}
+
+BTrem::~BTrem()
+{
+}
+
+void BTrem::Reset()
+{
+    LayerElement::Reset();
+}
+    
+//----------------------------------------------------------------------------
+// FTrem
+//----------------------------------------------------------------------------
+
+FTrem::FTrem( ):
+LayerElement("ftrem-")
+{
+    Reset();
+}
+
+FTrem::~FTrem()
+{
+}
+
+void FTrem::Reset()
+{
+    LayerElement::Reset();
+}
+    
 //----------------------------------------------------------------------------
 // MRpt
 //----------------------------------------------------------------------------
@@ -64,7 +102,6 @@ void MRpt::Reset()
     m_drawingMeasureCount = 0;
 }
     
-
 //----------------------------------------------------------------------------
 // MRpt2
 //----------------------------------------------------------------------------
@@ -84,7 +121,6 @@ void MRpt2::Reset()
     LayerElement::Reset();
 }
     
-    
 //----------------------------------------------------------------------------
 // MultiRpt
 //----------------------------------------------------------------------------

From ca43a171d32eb2d27697388fe72d1bb53e259b7d Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 26 Oct 2015 17:27:00 +0100
Subject: [PATCH 69/85] Adding stem.mod to chord and note

---
 include/vrv/att.h    |  3 +++
 include/vrv/attdef.h | 15 +++++++++++++++
 include/vrv/chord.h  |  1 +
 include/vrv/note.h   |  1 +
 libmei/atts_cmn.cpp  | 12 ++++++------
 libmei/atts_cmn.h    |  6 +++---
 src/att.cpp          | 37 +++++++++++++++++++++++++++++++++++++
 src/chord.cpp        |  3 +++
 src/iomei.cpp        |  4 ++++
 src/note.cpp         |  3 +++
 10 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/include/vrv/att.h b/include/vrv/att.h
index a12558ddf5d..a803c40f5d6 100644
--- a/include/vrv/att.h
+++ b/include/vrv/att.h
@@ -191,6 +191,9 @@ class Att
     std::string StemDirectionToStr(data_STEMDIRECTION data);
     data_STEMDIRECTION StrToStemDirection(std::string value);
     
+    std::string StemModifierToStr(data_STEMMODIFIER data);
+    data_STEMMODIFIER StrToStemModifier(std::string value);
+    
     std::string StemPositionToStr(data_STEMPOSITION data);
     data_STEMPOSITION StrToStemPosition(std::string value);
     
diff --git a/include/vrv/attdef.h b/include/vrv/attdef.h
index 85238119c3a..8c213e43bf6 100644
--- a/include/vrv/attdef.h
+++ b/include/vrv/attdef.h
@@ -445,6 +445,21 @@ enum data_STEMPOSITION {
     STEMPOSITION_center
 };
     
+/**
+ * MEI data.STEMPOSITION
+ */
+enum data_STEMMODIFIER {
+    STEMMODIFIER_NONE = 0,
+    STEMMODIFIER_1slash,
+    STEMMODIFIER_2slash,
+    STEMMODIFIER_3slash,
+    STEMMODIFIER_4slash,
+    STEMMODIFIER_5slash,
+    STEMMODIFIER_6slash,
+    STEMMODIFIER_sprech,
+    STEMMODIFIER_z,
+};
+    
 /**
  * MEI data.TEMPUS
  * NONE is -3 for perfect value (abs) by default
diff --git a/include/vrv/chord.h b/include/vrv/chord.h
index 1de2ab69547..23a7b7dbc28 100644
--- a/include/vrv/chord.h
+++ b/include/vrv/chord.h
@@ -33,6 +33,7 @@ namespace vrv {
 class Chord: public LayerElement, public ObjectListInterface, public StemmedDrawingInterface, public DurationInterface,
     public AttCommon,
     public AttStemmed,
+    public AttStemmedCmn,
     public AttTiepresent
 {
 public:
diff --git a/include/vrv/note.h b/include/vrv/note.h
index 51128d4405f..a375d9c851c 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -47,6 +47,7 @@ class Note: public LayerElement, public StemmedDrawingInterface, public Duration
     public AttGraced,
     public AttNoteLogMensural,
     public AttStemmed,
+    public AttStemmedCmn,
     public AttTiepresent
 {
 public:
diff --git a/libmei/atts_cmn.cpp b/libmei/atts_cmn.cpp
index 896e883f4c1..e286f5f718b 100644
--- a/libmei/atts_cmn.cpp
+++ b/libmei/atts_cmn.cpp
@@ -1537,14 +1537,14 @@ AttStemmedCmn::~AttStemmedCmn() {
 }
 
 void AttStemmedCmn::ResetStemmedCmn() {
-    m_stemMod = "";
+    m_stemMod = STEMMODIFIER_NONE;
     m_stemWith = "";
 }
 
 bool AttStemmedCmn::ReadStemmedCmn(  pugi::xml_node element ) {
     bool hasAttribute = false;
     if (element.attribute("stem.mod")) {
-        this->SetStemMod(StrToStr(element.attribute("stem.mod").value()));
+        this->SetStemMod(StrToStemModifier(element.attribute("stem.mod").value()));
         element.remove_attribute("stem.mod");
         hasAttribute = true;
     }
@@ -1559,7 +1559,7 @@ bool AttStemmedCmn::ReadStemmedCmn(  pugi::xml_node element ) {
 bool AttStemmedCmn::WriteStemmedCmn(  pugi::xml_node element ) {
     bool wroteAttribute = false;
     if (this->HasStemMod()) {
-        element.append_attribute("stem.mod") = StrToStr(this->GetStemMod()).c_str();
+        element.append_attribute("stem.mod") = StemModifierToStr(this->GetStemMod()).c_str();
         wroteAttribute = true;
     }
     if (this->HasStemWith()) {
@@ -1571,7 +1571,7 @@ bool AttStemmedCmn::WriteStemmedCmn(  pugi::xml_node element ) {
 
 bool AttStemmedCmn::HasStemMod( )
 {
-    return (m_stemMod != "");
+    return (m_stemMod != STEMMODIFIER_NONE);
 }
 
 bool AttStemmedCmn::HasStemWith( )
@@ -2053,7 +2053,7 @@ bool Att::SetCmn( Object *element, std::string attrType, std::string attrValue )
         AttStemmedCmn *att = dynamic_cast<AttStemmedCmn*>(element);
         assert( att );
         if (attrType == "stemMod") {
-            att->SetStemMod(att->StrToStr(attrValue));
+            att->SetStemMod(att->StrToStemModifier(attrValue));
             return true;
         }
         if (attrType == "stemWith") {
@@ -2356,7 +2356,7 @@ void Att::GetCmn( Object *element, ArrayOfStrAttr *attributes ) {
         AttStemmedCmn *att = dynamic_cast<AttStemmedCmn*>(element);
         assert( att );
         if (att->HasStemMod()) {
-            attributes->push_back(std::make_pair("stemMod", att->StrToStr(att->GetStemMod())));
+            attributes->push_back(std::make_pair("stemMod", att->StemModifierToStr(att->GetStemMod())));
         }
         if (att->HasStemWith()) {
             attributes->push_back(std::make_pair("stemWith", att->StrToStr(att->GetStemWith())));
diff --git a/libmei/atts_cmn.h b/libmei/atts_cmn.h
index 231a1640b3f..b365457df81 100644
--- a/libmei/atts_cmn.h
+++ b/libmei/atts_cmn.h
@@ -1351,8 +1351,8 @@ class AttStemmedCmn: public Att
      * to the default value)
      **/
     ///@{
-    void SetStemMod(std::string stemMod_) { m_stemMod = stemMod_; };
-    std::string GetStemMod() const { return m_stemMod; };    
+    void SetStemMod(data_STEMMODIFIER stemMod_) { m_stemMod = stemMod_; };
+    data_STEMMODIFIER GetStemMod() const { return m_stemMod; };    
     bool HasStemMod( );
     
     //
@@ -1367,7 +1367,7 @@ class AttStemmedCmn: public Att
      * Encodes any stem "modifiers"; that is, symbols rendered on the stem, such as
      * tremolo or Sprechstimme indicators.
      **/
-    std::string m_stemMod;
+    data_STEMMODIFIER m_stemMod;
     /**
      * Contains an indication of which staff a note or chord that logically belongs to
      * the current staff should be visually placed on; that is, the one above or the
diff --git a/src/att.cpp b/src/att.cpp
index d0b7e7d06ea..ab0d19e947f 100644
--- a/src/att.cpp
+++ b/src/att.cpp
@@ -1011,6 +1011,43 @@ data_STEMDIRECTION Att::StrToStemDirection(std::string value)
         LogWarning("Unsupported stem direction '%s'", value.c_str() );
     }
     return STEMDIRECTION_NONE;
+}    
+
+std::string Att::StemModifierToStr(data_STEMMODIFIER data)
+{
+    std::string value;
+    switch(data)
+    {
+        case STEMMODIFIER_1slash : value = "1slash"; break;
+        case STEMMODIFIER_2slash : value = "2slash"; break;
+        case STEMMODIFIER_3slash : value = "3slash"; break;
+        case STEMMODIFIER_4slash : value = "4slash"; break;
+        case STEMMODIFIER_5slash : value = "5slash"; break;
+        case STEMMODIFIER_6slash : value = "6slash"; break;
+        case STEMMODIFIER_sprech : value = "sprech"; break;
+        case STEMMODIFIER_z : value = "z"; break;
+        default:
+            LogWarning("Unknown mode '%d'", data);
+            value = "";
+            break;
+    }
+    return value;
+}
+
+data_STEMMODIFIER Att::StrToStemModifier(std::string value)
+{
+    if (value == "1slash") return STEMMODIFIER_1slash;
+    else if (value == "2slash") return STEMMODIFIER_2slash;
+    else if (value == "3slash") return STEMMODIFIER_3slash;
+    else if (value == "4slash") return STEMMODIFIER_4slash;
+    else if (value == "5slash") return STEMMODIFIER_5slash;
+    else if (value == "6slash") return STEMMODIFIER_6slash;
+    else if (value == "sprech") return STEMMODIFIER_sprech;
+    else if (value == "z") return STEMMODIFIER_z;
+    else {
+        LogWarning("Unsupported pitch name '%s'", value.c_str() );
+    }
+    return STEMMODIFIER_NONE;
 }
 
 std::string Att::StemPositionToStr(data_STEMPOSITION data)
diff --git a/src/chord.cpp b/src/chord.cpp
index f3d3cb789ae..f093c786aec 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -26,10 +26,12 @@ Chord::Chord( ):
     LayerElement("chord-"), StemmedDrawingInterface(), ObjectListInterface(), DurationInterface(),
     AttCommon(),
     AttStemmed(),
+    AttStemmedCmn(),
     AttTiepresent()
 {
     RegisterAttClass(ATT_COMMON);
     RegisterAttClass(ATT_STEMMED);
+    RegisterAttClass(ATT_STEMMEDCMN);
     RegisterAttClass(ATT_TIEPRESENT);
     
     RegisterInterface( DurationInterface::GetAttClasses(), DurationInterface::IsInterface() );
@@ -53,6 +55,7 @@ void Chord::Reset()
     DurationInterface::Reset();
     ResetCommon();
     ResetStemmed();
+    ResetStemmedCmn();
     ResetTiepresent();
 }
     
diff --git a/src/iomei.cpp b/src/iomei.cpp
index b1802b7100c..959e917985a 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -603,6 +603,7 @@ void MeiOutput::WriteMeiChord( pugi::xml_node currentNode, Chord *chord )
     WriteDurationInterface( currentNode, chord);
     chord->WriteCommon(currentNode);
     chord->WriteStemmed(currentNode);
+    chord->WriteStemmedCmn(currentNode);
     chord->WriteTiepresent(currentNode);
 
     return;
@@ -718,6 +719,7 @@ void MeiOutput::WriteMeiNote( pugi::xml_node currentNode, Note *note )
     note->WriteGraced(currentNode);
     note->WriteNoteLogMensural(currentNode);
     note->WriteStemmed(currentNode);
+    note->WriteStemmedCmn(currentNode);
     note->WriteTiepresent(currentNode);
     
     return;
@@ -1758,6 +1760,7 @@ bool MeiInput::ReadMeiChord( Object *parent, pugi::xml_node chord)
     ReadDurationInterface(chord, vrvChord);
     vrvChord->ReadCommon(chord);
     vrvChord->ReadStemmed(chord);
+    vrvChord->ReadStemmedCmn(chord);
     vrvChord->ReadTiepresent(chord);
     
     AddLayerElement(parent, vrvChord);
@@ -1903,6 +1906,7 @@ bool MeiInput::ReadMeiNote( Object *parent, pugi::xml_node note )
     vrvNote->ReadGraced(note);
     vrvNote->ReadNoteLogMensural(note);
     vrvNote->ReadStemmed(note);
+    vrvNote->ReadStemmedCmn(note);
     vrvNote->ReadTiepresent(note);
     
     AddLayerElement(parent, vrvNote);
diff --git a/src/note.cpp b/src/note.cpp
index 25568281a11..3bf291e7f33 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -32,12 +32,14 @@ Note::Note():
     AttGraced(),
     AttNoteLogMensural(),
     AttStemmed(),
+    AttStemmedCmn(),
     AttTiepresent()
 {
     RegisterAttClass(ATT_COLORATION);
     RegisterAttClass(ATT_GRACED);
     RegisterAttClass(ATT_NOTELOGMENSURAL);
     RegisterAttClass(ATT_STEMMED);
+    RegisterAttClass(ATT_STEMMEDCMN);
     RegisterAttClass(ATT_TIEPRESENT);
     
     RegisterInterface( DurationInterface::GetAttClasses(), DurationInterface::IsInterface() );
@@ -75,6 +77,7 @@ void Note::Reset()
     ResetGraced();
     ResetNoteLogMensural();
     ResetStemmed();
+    ResetStemmedCmn();
     ResetTiepresent();
     
     // TO BE REMOVED

From 4f9e1feedda526d9114678ca6ef2f7e5b262fcd7 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 26 Oct 2015 17:38:14 +0100
Subject: [PATCH 70/85] Reading and writing bTrem and fTrem

---
 include/vrv/iomei.h |  6 +++++
 src/iomei.cpp       | 62 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/include/vrv/iomei.h b/include/vrv/iomei.h
index 128d8aa7b1c..04490cf472b 100644
--- a/include/vrv/iomei.h
+++ b/include/vrv/iomei.h
@@ -24,12 +24,14 @@ class Annot;
 class Barline;
 class Beam;
 class BeatRpt;
+class BTrem;
 class Chord;
 class Clef;
 class Custos;
 class Dot;
 class DurationInterface;
 class FloatingElement;
+class FTrem;
 class Layer;
 class LayerElement;
 class Lem;
@@ -133,10 +135,12 @@ class MeiOutput: public FileOutputStream
     void WriteMeiBarline( pugi::xml_node currentNode, Barline *barLine );
     void WriteMeiBeam( pugi::xml_node currentNode, Beam *beam );
     void WriteMeiBeatRpt( pugi::xml_node currentNode, BeatRpt *beatRpt );
+    void WriteMeiBTrem( pugi::xml_node currentNode, BTrem *bTrem );
     void WriteMeiChord( pugi::xml_node currentNode, Chord *chord );
     void WriteMeiClef( pugi::xml_node currentNode, Clef *clef );
     void WriteMeiCustos( pugi::xml_node currentNode, Custos *custos );
     void WriteMeiDot( pugi::xml_node currentNode, Dot *dot );
+    void WriteMeiFTrem( pugi::xml_node currentNode, FTrem *fTrem );
     void WriteMeiKeySig( pugi::xml_node currentNode, KeySig *keySig );
     void WriteMeiMensur( pugi::xml_node currentNode, Mensur *mensur );
     void WriteMeiMeterSig( pugi::xml_node currentNode, MeterSig *meterSig );
@@ -300,10 +304,12 @@ class MeiInput: public FileInputStream
     bool ReadMeiBarline( Object *parent, pugi::xml_node barLine );
     bool ReadMeiBeam( Object *parent, pugi::xml_node beam );
     bool ReadMeiBeatRpt( Object *parent, pugi::xml_node beatRpt );
+    bool ReadMeiBTrem( Object *parent, pugi::xml_node bTrem );
     bool ReadMeiChord( Object* parent, pugi::xml_node chord );
     bool ReadMeiClef( Object *parent, pugi::xml_node clef );
     bool ReadMeiCustos( Object *parent, pugi::xml_node custos );
     bool ReadMeiDot( Object *parent, pugi::xml_node dot );
+    bool ReadMeiFTrem( Object *parent, pugi::xml_node fTrem );
     bool ReadMeiKeySig( Object *parent, pugi::xml_node keySig );
     bool ReadMeiMensur( Object *parent, pugi::xml_node mensur );
     bool ReadMeiMeterSig( Object *parent, pugi::xml_node meterSig );
diff --git a/src/iomei.cpp b/src/iomei.cpp
index 959e917985a..1163d97dd25 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -217,6 +217,10 @@ bool MeiOutput::WriteObject( Object *object )
         m_currentNode = m_currentNode.append_child("beatRpt");
         WriteMeiBeatRpt( m_currentNode, dynamic_cast<BeatRpt*>(object) );
     }
+    else if (object->Is() == BTREM) {
+        m_currentNode = m_currentNode.append_child("bTrem");
+        WriteMeiBTrem( m_currentNode, dynamic_cast<BTrem*>(object) );
+    }
     else if (object->Is() == CHORD) {
         m_currentNode = m_currentNode.append_child( "chord" );
         WriteMeiChord( m_currentNode, dynamic_cast<Chord*>(object) );
@@ -233,6 +237,10 @@ bool MeiOutput::WriteObject( Object *object )
         m_currentNode = m_currentNode.append_child( "dot" );
         WriteMeiDot( m_currentNode, dynamic_cast<Dot*>(object) );
     }
+    else if (object->Is() == FTREM) {
+        m_currentNode = m_currentNode.append_child("fTrem");
+        WriteMeiFTrem( m_currentNode, dynamic_cast<FTrem*>(object) );
+    }
     else if (object->Is() == KEYSIG) {
         m_currentNode = m_currentNode.append_child("keySig");
         WriteMeiKeySig( m_currentNode, dynamic_cast<KeySig*>(object) );
@@ -595,6 +603,13 @@ void MeiOutput::WriteMeiBeatRpt( pugi::xml_node currentNode, BeatRpt *beatRpt )
     beatRpt->WriteBeatRptVis(currentNode);
 }
 
+void MeiOutput::WriteMeiBTrem( pugi::xml_node currentNode, BTrem *bTrem )
+{
+    assert( bTrem );
+    
+    WriteLayerElement( currentNode, bTrem );
+}
+    
 void MeiOutput::WriteMeiChord( pugi::xml_node currentNode, Chord *chord )
 {
     assert( chord );
@@ -635,6 +650,13 @@ void MeiOutput::WriteMeiDot( pugi::xml_node currentNode, Dot *dot )
     WriteLayerElement( currentNode, dot );
     WritePositionInterface(currentNode, dot);
 }
+
+void MeiOutput::WriteMeiFTrem( pugi::xml_node currentNode, FTrem *fTrem )
+{
+    assert( fTrem );
+    
+    WriteLayerElement( currentNode, fTrem );
+}
     
 void MeiOutput::WriteMeiKeySig( pugi::xml_node currentNode, KeySig *keySig )
 {
@@ -1020,6 +1042,20 @@ bool MeiInput::IsAllowed(std::string element, Object *filterParent)
     else if ( element == "supplied" ) {
         return true;
     }
+    // filter for bTrem
+    else if (filterParent->Is() == BTREM)
+    {
+        if ( element == "chord" ) return true;
+        else if ( element == "note" ) return true;
+        else return false;
+    }
+    // filter for fTrem
+    else if (filterParent->Is() == FTREM)
+    {
+        if ( element == "chord" ) return true;
+        else if ( element == "note" ) return true;
+        else return false;
+    }
     // filter for notes
     else if (filterParent->Is()  == NOTE)
     {
@@ -1620,6 +1656,9 @@ bool MeiInput::ReadMeiLayerChildren( Object *parent, pugi::xml_node parentNode,
         else if ( elementName == "beatRpt" ) {
             success = ReadMeiBeatRpt( parent, xmlElement);
         }
+        else if ( elementName == "bTrem" ) {
+            success = ReadMeiBTrem( parent, xmlElement );
+        }
         else if ( elementName == "chord" ) {
             success = ReadMeiChord( parent, xmlElement);
         }
@@ -1632,6 +1671,9 @@ bool MeiInput::ReadMeiLayerChildren( Object *parent, pugi::xml_node parentNode,
         else if ( elementName == "dot" ) {
             success = ReadMeiDot( parent, xmlElement );
         }
+        else if ( elementName == "fTrem" ) {
+            success = ReadMeiFTrem( parent, xmlElement );
+        }
         else if ( elementName == "keySig" ) {
             success = ReadMeiKeySig( parent, xmlElement );
         }
@@ -1752,6 +1794,16 @@ bool MeiInput::ReadMeiBeatRpt( Object *parent, pugi::xml_node beatRpt )
     return true;
 }
     
+bool MeiInput::ReadMeiBTrem( Object *parent, pugi::xml_node bTrem )
+{
+    BTrem *vrvBTrem = new BTrem();
+    ReadLayerElement(bTrem, vrvBTrem);
+    
+    AddLayerElement(parent, vrvBTrem);
+    
+    return ReadMeiLayerChildren(vrvBTrem, bTrem, vrvBTrem);
+}
+    
 bool MeiInput::ReadMeiChord( Object *parent, pugi::xml_node chord)
 {
     Chord *vrvChord = new Chord();
@@ -1805,6 +1857,16 @@ bool MeiInput::ReadMeiDot( Object *parent, pugi::xml_node dot )
     
     return true;
 }
+
+bool MeiInput::ReadMeiFTrem( Object *parent, pugi::xml_node fTrem )
+{
+    FTrem *vrvFTrem = new FTrem();
+    ReadLayerElement(fTrem, vrvFTrem);
+    
+    AddLayerElement(parent, vrvFTrem);
+    
+    return ReadMeiLayerChildren(vrvFTrem, fTrem, vrvFTrem);
+}
     
 bool MeiInput::ReadMeiKeySig( Object *parent, pugi::xml_node keySig )
 {

From 6656c4d5c009999f04915a977ea83d286c6699ad Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 26 Oct 2015 17:52:47 +0100
Subject: [PATCH 71/85] Adding drawing methods

---
 include/vrv/view.h   |  2 ++
 src/view_element.cpp | 45 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/include/vrv/view.h b/include/vrv/view.h
index d1c56972d6c..7c1f5b0c11c 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -206,12 +206,14 @@ class View
     void DrawAccid( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure, Accid* prevAccid = NULL );
     void DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawBeatRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
+    void DrawBTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawBarline( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawChord( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawClef( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawCustos( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawDot( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawDurationElement( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
+    void DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawKeySig( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure  );
     void DrawMeterSig( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure  );
     void DrawMRpt( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
diff --git a/src/view_element.cpp b/src/view_element.cpp
index e1bc70b84b3..f3af3453e09 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -80,6 +80,9 @@ void View::DrawLayerElement( DeviceContext *dc, LayerElement *element, Layer *la
     else if (element->Is() == BEATRPT) {
         DrawBeatRpt(dc, element, layer, staff, measure);
     }
+    else if (element->Is() == BTREM) {
+        DrawBTrem(dc, element, layer, staff, measure);
+    }
     else if (element->Is() == CHORD) {
         DrawDurationElement(dc, element, layer, staff, measure);
     }
@@ -92,6 +95,9 @@ void View::DrawLayerElement( DeviceContext *dc, LayerElement *element, Layer *la
     else if (element->Is() == DOT) {
         DrawDot(dc, element, layer, staff, measure);
     }
+    else if (element->Is() == FTREM) {
+        DrawFTrem(dc, element, layer, staff, measure);
+    }
     else if (element->Is() == KEYSIG) {
         DrawKeySig(dc, element, layer, staff, measure);
     }
@@ -841,7 +847,44 @@ void View::DrawMRptPart(DeviceContext *dc, int x, wchar_t smuflCode, int num, bo
         dc->ResetFont();
     }
 }
-
+    
+    
+void View::DrawBTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
+{
+    assert( dc );
+    assert( element );
+    assert( layer );
+    assert( staff );
+    assert( measure );
+    
+    BTrem *bTrem = dynamic_cast<BTrem*>(element);
+    assert( bTrem );
+    
+    dc->StartGraphic( element, "", element->GetUuid() );
+    
+    DrawLayerChildren(dc, bTrem, layer, staff, measure);
+    
+    dc->EndGraphic(element, this);
+}
+    
+void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
+{
+    assert( dc );
+    assert( element );
+    assert( layer );
+    assert( staff );
+    assert( measure );
+    
+    FTrem *fTrem = dynamic_cast<FTrem*>(element);
+    assert( fTrem );
+    
+    dc->StartGraphic( element, "", element->GetUuid() );
+    
+    DrawLayerChildren(dc, fTrem, layer, staff, measure);
+    
+    dc->EndGraphic(element, this);
+}
+    
 void View::DrawLongRest ( DeviceContext *dc, int x, int y, Staff *staff)
 {
     int x1, x2, y1, y2;

From 44c520373f63ca0e02336e47334a3f49ba2c4229 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 26 Oct 2015 18:22:28 +0100
Subject: [PATCH 72/85] Moving drawing methods

---
 include/vrv/view.h   | 17 ++++++++++++-----
 src/view_beam.cpp    | 19 +++++++++++++++++++
 src/view_element.cpp | 18 ------------------
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/include/vrv/view.h b/include/vrv/view.h
index 7c1f5b0c11c..5808a3a893a 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -204,7 +204,6 @@ class View
      */
     ///@{
     void DrawAccid( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure, Accid* prevAccid = NULL );
-    void DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawBeatRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawBTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawBarline( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
@@ -213,7 +212,6 @@ class View
     void DrawCustos( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawDot( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawDurationElement( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
-    void DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawKeySig( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure  );
     void DrawMeterSig( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure  );
     void DrawMRpt( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
@@ -250,11 +248,20 @@ class View
     void DrawWholeRest ( DeviceContext *dc, int x, int y, int valeur, unsigned char dots, bool cueSize, Staff *staff);
     ///@}
     
+    /**
+     * @name Method for drawing Beam and FTrem.
+     * Defined in view_beam.cpp
+     */
+    ///@{
+    void DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
+    void DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
+    ///@}
+    
     /**
      * @name Methods for drawing Floating child classes.
      * They are base drawing methods that are called directly from DrawFloatingElement
      * Call appropriate method of child classes (Slur, Tempo, Tie, etc).
-     * Defined in floating_element.cpp
+     * Defined in view_floating.cpp
      */
     ///@{
     void DrawFloatingElement( DeviceContext *dc, FloatingElement *element, Measure *measure, System *system );
@@ -296,9 +303,9 @@ class View
     void CalculateLigaturePosX ( LayerElement *element, Layer *layer, Staff *staff);
     void DrawProportFigures( DeviceContext *dc, int x, int y, int num, int numBase, Staff *staff);
     ///@}
-    
+
     /**
-     * @name Method for drawing Beam.
+     * @name Method for drawing Tuplet.
      * Called from the the layer postponed drawing list.
      * Defined in view_tuplet.cpp
      */
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index f1b71897949..1ed2d2758a8 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -23,6 +23,7 @@
 #include "layer.h"
 #include "layerelement.h"
 #include "note.h"
+#include "rpt.h"
 #include "smufl.h"
 #include "staff.h"
 #include "style.h"
@@ -529,5 +530,23 @@ void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     
     dc->EndGraphic(element, this );
 }
+
+void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
+{
+    assert( dc );
+    assert( element );
+    assert( layer );
+    assert( staff );
+    assert( measure );
+    
+    FTrem *fTrem = dynamic_cast<FTrem*>(element);
+    assert( fTrem );
+    
+    dc->StartGraphic( element, "", element->GetUuid() );
+    
+    DrawLayerChildren(dc, fTrem, layer, staff, measure);
+    
+    dc->EndGraphic(element, this);
+}
     
 } // namespace vrv
diff --git a/src/view_element.cpp b/src/view_element.cpp
index f3af3453e09..414998c6602 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -867,24 +867,6 @@ void View::DrawBTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     dc->EndGraphic(element, this);
 }
     
-void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
-{
-    assert( dc );
-    assert( element );
-    assert( layer );
-    assert( staff );
-    assert( measure );
-    
-    FTrem *fTrem = dynamic_cast<FTrem*>(element);
-    assert( fTrem );
-    
-    dc->StartGraphic( element, "", element->GetUuid() );
-    
-    DrawLayerChildren(dc, fTrem, layer, staff, measure);
-    
-    dc->EndGraphic(element, this);
-}
-    
 void View::DrawLongRest ( DeviceContext *dc, int x, int y, Staff *staff)
 {
     int x1, x2, y1, y2;

From 712aeec9278f0850d6bda51855191a6ad6086765 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 27 Oct 2015 08:24:07 +0100
Subject: [PATCH 73/85] Tidying up IsInBeam

---
 include/vrv/durationinterface.h | 11 ++------
 include/vrv/layerelement.h      | 11 +++++---
 src/durationinterface.cpp       | 13 ++--------
 src/layerelement.cpp            | 15 ++++++++++-
 src/view_element.cpp            | 45 ++-------------------------------
 5 files changed, 28 insertions(+), 67 deletions(-)

diff --git a/include/vrv/durationinterface.h b/include/vrv/durationinterface.h
index 2d178e8bd55..c6ef15bec68 100644
--- a/include/vrv/durationinterface.h
+++ b/include/vrv/durationinterface.h
@@ -61,22 +61,15 @@ class DurationInterface: public Interface,
      */
     virtual double GetAlignmentMensuralDuration( int num, int numbase, Mensur *currentMensur );
     
-    /**
-     * Look if the note or rest is in a beam.
-     * Look for the fist beam parent and check is the note is in is content list.
-     * Looking in the content list is necessary for grace notes or imbricated beams.
-     */
-    bool IsInBeam( Object *noteOrRest );
-    
     /**
      * Return true if the note or rest is the first of a beam.
      */
-    bool IsFirstInBeam( Object *noteOrRest );
+    bool IsFirstInBeam( LayerElement *noteOrRest );
     
     /**
      * Return true if the note or rest is the last of a beam.
      */
-    bool IsLastInBeam( Object *noteOrRest );
+    bool IsLastInBeam( LayerElement *noteOrRest );
 
     
     /**
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 63d88e42dfa..935da5e62d4 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -75,13 +75,18 @@ class LayerElement: public DocObject
      * @name Child type checkers.
      */
     ///@{
-    /** Returns true if the element is a grace note */
+    /** Return true if the element is a grace note */
     bool IsGraceNote();
-    /** Returns true if the element is a note or a note child and the note has a @grace */
+    /** Return true if the element is a note or a note child and the note has a @grace */
     bool IsCueSize();
     /** Return true if the element has to be aligned horizontally */
     virtual bool HasToBeAligned() { return false; };
-    /** Returns the beam parent if in beam */
+    /** 
+     * Return the beam parent if in beam
+     * Look if the note or rest is in a beam.
+     * Look for the fist beam parent and check is the note is in is content list.
+     * Looking in the content list is necessary for grace notes or imbricated beams.
+     */
     Beam *IsInBeam();
     ///@}
     
diff --git a/src/durationinterface.cpp b/src/durationinterface.cpp
index 7a7b6ab3ca4..96553d32339 100644
--- a/src/durationinterface.cpp
+++ b/src/durationinterface.cpp
@@ -109,16 +109,7 @@ double DurationInterface::GetAlignmentMensuralDuration( int num, int numbase, Me
     return duration;
 }
 
-bool DurationInterface::IsInBeam( Object *noteOrRest )
-{
-    Object *beam = noteOrRest->GetFirstParent( BEAM, MAX_BEAM_DEPTH );
-    if ( !beam ) {
-        return false;
-    }
-    return true;
-}
-
-bool DurationInterface::IsFirstInBeam( Object *noteOrRest )
+bool DurationInterface::IsFirstInBeam( LayerElement *noteOrRest )
 {
     Beam *beam = dynamic_cast<Beam*>( noteOrRest->GetFirstParent( BEAM, MAX_BEAM_DEPTH ) );
     if ( !beam ) {
@@ -132,7 +123,7 @@ bool DurationInterface::IsFirstInBeam( Object *noteOrRest )
     return false;    
 }
 
-bool DurationInterface::IsLastInBeam( Object *noteOrRest )
+bool DurationInterface::IsLastInBeam( LayerElement *noteOrRest )
 {
     Beam *beam = dynamic_cast<Beam*>( noteOrRest->GetFirstParent( BEAM, MAX_BEAM_DEPTH ) );
     if ( !beam ) {
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index d10691e0471..f98a9e01ce7 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -110,7 +110,20 @@ bool LayerElement::IsGraceNote()
 Beam* LayerElement::IsInBeam()
 {
     if ((this->Is() != NOTE) || (this->Is() == CHORD)) return NULL;
-    return dynamic_cast<Beam*>(this->GetFirstParent( BEAM, MAX_BEAM_DEPTH) );
+    Beam *beamParent = dynamic_cast<Beam*>(this->GetFirstParent( BEAM, MAX_BEAM_DEPTH) );
+    if (beamParent != NULL) {
+        // This note is beamed and cue sized
+        if (this->IsCueSize()) {
+            // If the note is part of the beam parent, this means we
+            // have a beam of graced notes
+            if (beamParent->GetListIndex(this) > -1) return beamParent;
+            // otherwise it is a non-beamed grace note within a beam - will return false
+        }
+        else {
+            return beamParent;
+        }
+    }
+    return NULL;
 }
     
 int LayerElement::GetDrawingTop(Doc *doc, int staffSize)
diff --git a/src/view_element.cpp b/src/view_element.cpp
index 414998c6602..f0a80314a45 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -223,31 +223,9 @@ void View::DrawNote ( DeviceContext *dc, LayerElement *element, Layer *layer, St
     if (note->m_crossStaff) staff = note->m_crossStaff;
     
     Chord *inChord = note->IsChordTone();
-    
+    Beam *inBeam = note->IsInBeam();
     bool drawingCueSize = note->HasGrace();
     
-    bool inBeam = false;
-    
-    // Get the immediate parent of the note
-    // to see if beamed or not
-    Beam *beam_parent = dynamic_cast<Beam*>(note->GetFirstParent( BEAM ));
-    
-    if (beam_parent != NULL) {
-        // This note is beamed and cue sized
-        if (drawingCueSize == true) {
-            // Get the Parent of the parent
-            // we want to see if we are in a group of
-            // beamed cue notes
-            if (beam_parent->GetListIndex(note) > -1) {
-                inBeam = true;
-            }
-        }
-        else {
-            // the note is just in a beam
-            inBeam = true;
-        }
-    }
-    
 	int staffSize = staff->m_drawingStaffSize;
     int noteY = element->GetDrawingY();
     int xLedger, xNote, xAccid, xStem;
@@ -1056,26 +1034,7 @@ void View::DrawChord( DeviceContext *dc, LayerElement *element, Layer *layer, St
     int radius = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staffSize, drawingCueSize) / 2;
     int fullUnit = m_doc->GetDrawingUnit(staffSize);
     
-    bool inBeam = false;
-    // Get the immadiate parent of the note
-    // to see if beamed or not
-    Beam *beam_parent = dynamic_cast<Beam*>(chord->GetFirstParent( BEAM ));
-    
-    // This note is beamed and cue sized
-    if (beam_parent != NULL) {
-        if (drawingCueSize == true) {
-            // Get the Parent of the parent
-            // we want to see if we are in a group of
-            // beamed cue notes
-            if (beam_parent->GetListIndex(chord) > -1) {
-                inBeam = true;
-            }
-        }
-        else {
-            // the note is just in a beam
-            inBeam = true;
-        }
-    }
+    Beam *inBeam = chord->IsInBeam();
     
     /************ Ledger line reset ************/
     

From a980213cedf432370f05f63a04d08ae16c61daf1 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 27 Oct 2015 13:54:40 +0100
Subject: [PATCH 74/85] Reading fTrem and bTrem (fix)

---
 include/vrv/layerelement.h |  2 ++
 include/vrv/rpt.h          | 20 +++++++++++++++++-
 include/vrv/vrvdef.h       |  3 +++
 src/iomei.cpp              | 19 +++++++++++++----
 src/layerelement.cpp       | 18 ++++++++++++++--
 src/rpt.cpp                | 43 +++++++++++++++++++++++++++++++++++++-
 src/view_beam.cpp          | 24 +++++++++++++++++++++
 7 files changed, 121 insertions(+), 8 deletions(-)

diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 935da5e62d4..1648b2081b6 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -79,6 +79,8 @@ class LayerElement: public DocObject
     bool IsGraceNote();
     /** Return true if the element is a note or a note child and the note has a @grace */
     bool IsCueSize();
+    /** Return true if the element is a note or a chord within a fTrem */
+    bool IsInfTrem();
     /** Return true if the element has to be aligned horizontally */
     virtual bool HasToBeAligned() { return false; };
     /** 
diff --git a/include/vrv/rpt.h b/include/vrv/rpt.h
index e8383f13185..cf934bfd13d 100644
--- a/include/vrv/rpt.h
+++ b/include/vrv/rpt.h
@@ -77,6 +77,12 @@ class BTrem: public LayerElement
     virtual ClassId Is() { return BTREM; };
     ///@}
     
+    /**
+     * Add an element (a note or a chord) to a fTrem.
+     * Only Note or Chord elements will be actually added to the fTrem.
+     */
+    void AddLayerElement(LayerElement *element);
+    
 private:
     
 public:
@@ -92,7 +98,7 @@ class BTrem: public LayerElement
 /**
  * This class models the MEI <fTrem>
  */
-class FTrem: public LayerElement
+class FTrem: public LayerElement, public ObjectListInterface
 {
 public:
     /**
@@ -107,8 +113,20 @@ class FTrem: public LayerElement
     virtual ClassId Is() { return FTREM; };
     ///@}
     
+    /**
+     * Add an element (a note or a chord) to a fTrem.
+     * Only Note or Chord elements will be actually added to the fTrem.
+     */
+    void AddLayerElement(LayerElement *element);
+    
 private:
     
+protected:
+    /**
+     * Filter the list for a specific fTrem;
+     */
+    virtual void FilterList( ListOfObjects *childList );
+    
 public:
     
 private:
diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index 36f71cb1eee..06d7225c27d 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -193,6 +193,9 @@ enum FunctorCode {
 /** Define the maximum levels between a beam and its notes **/
 #define MAX_CHORD_DEPTH -1
     
+/** Define the maximum levels between a fTrem and its notes **/
+#define MAX_FTREM_DEPTH -1
+    
 /** Define the maximum levels between a tuplet and its notes **/
 #define MAX_TUPLET_DEPTH -1
     
diff --git a/src/iomei.cpp b/src/iomei.cpp
index 1163d97dd25..2d12aa14091 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -2382,6 +2382,17 @@ void MeiInput::AddLayerElement( Object *parent, LayerElement *element )
         assert( layer );
         layer->AddLayerElement( element );
     }
+    // LayerElements
+    else if ( parent->Is() == BEAM ) {
+        Beam * beam = dynamic_cast<Beam*>( parent );
+        assert( beam );
+        beam->AddLayerElement( element );
+    }
+    else if ( parent->Is() == BTREM ) {
+        BTrem *bTrem = dynamic_cast<BTrem*>( parent );
+        assert( bTrem );
+        bTrem->AddLayerElement( element );
+    }
     else if ( parent->Is() == CHORD ) {
         Chord *chord = dynamic_cast<Chord*>( parent );
         assert( chord );
@@ -2392,10 +2403,10 @@ void MeiInput::AddLayerElement( Object *parent, LayerElement *element )
         assert( note );
         note->AddLayerElement( element );
     }
-    else if ( parent->Is() == BEAM ) {
-        Beam * beam = dynamic_cast<Beam*>( parent );
-        assert( beam );
-        beam->AddLayerElement( element );
+    else if ( parent->Is() == FTREM ) {
+        FTrem *fTrem = dynamic_cast<FTrem*>( parent );
+        assert( fTrem );
+        fTrem->AddLayerElement( element );
     }
     else if ( parent->Is() == TUPLET ) {
         Tuplet *tuplet = dynamic_cast<Tuplet*>( parent );
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index f98a9e01ce7..94daf2c75bc 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -107,6 +107,12 @@ bool LayerElement::IsGraceNote()
     return (note && note->HasGrace());
 }
     
+bool LayerElement::IsInfTrem()
+{
+    if ((this->Is() != NOTE) || (this->Is() == CHORD)) return false;
+    return (this->GetFirstParent( FTREM, MAX_FTREM_DEPTH));
+}
+    
 Beam* LayerElement::IsInBeam()
 {
     if ((this->Is() != NOTE) || (this->Is() == CHORD)) return NULL;
@@ -203,8 +209,16 @@ double LayerElement::GetAlignmentDuration( Mensur *mensur, MeterSig *meterSig, b
         }
         DurationInterface *duration = dynamic_cast<DurationInterface*>(this);
         assert( duration );
-        if (duration->IsMensural()) return duration->GetAlignmentMensuralDuration( num, numbase, mensur );
-        else return duration->GetAlignmentDuration( num, numbase );
+        if (duration->IsMensural()) {
+            return duration->GetAlignmentMensuralDuration( num, numbase, mensur );
+        }
+        double durationValue = duration->GetAlignmentDuration( num, numbase );
+        // With fTrem we need to divide the duration by two
+        FTrem *fTrem = dynamic_cast<FTrem*>(this->GetFirstParent(FTREM, MAX_FTREM_DEPTH));
+        if (fTrem) {
+            durationValue /= 2.0;
+        }
+        return durationValue;
     }
     else if (this->Is() == BEATRPT) {
         BeatRpt *beatRpt = dynamic_cast<BeatRpt*>(this);
diff --git a/src/rpt.cpp b/src/rpt.cpp
index ea92e97ee38..fb40d53ab55 100644
--- a/src/rpt.cpp
+++ b/src/rpt.cpp
@@ -13,6 +13,12 @@
 #include <assert.h>
 #include <math.h>
 
+//----------------------------------------------------------------------------
+
+#include "chord.h"
+#include "editorial.h"
+#include "note.h"
+
 namespace vrv {
     
 
@@ -61,13 +67,23 @@ void BTrem::Reset()
 {
     LayerElement::Reset();
 }
+
+void BTrem::AddLayerElement(LayerElement *element)
+{
+    assert(dynamic_cast<Note*>(element)
+           || dynamic_cast<Chord*>(element)
+           || dynamic_cast<EditorialElement*>(element) );
+    element->SetParent( this );
+    m_children.push_back(element);
+    Modify();
+}
     
 //----------------------------------------------------------------------------
 // FTrem
 //----------------------------------------------------------------------------
 
 FTrem::FTrem( ):
-LayerElement("ftrem-")
+    LayerElement("ftrem-"), ObjectListInterface()
 {
     Reset();
 }
@@ -81,6 +97,31 @@ void FTrem::Reset()
     LayerElement::Reset();
 }
     
+void FTrem::AddLayerElement(LayerElement *element)
+{
+    assert(dynamic_cast<Note*>(element)
+           || dynamic_cast<Chord*>(element)
+           || dynamic_cast<EditorialElement*>(element) );
+    element->SetParent( this );
+    m_children.push_back(element);
+    Modify();
+}
+
+void FTrem::FilterList( ListOfObjects *childList )
+{
+    ListOfObjects::iterator iter = childList->begin();
+    
+    while ( iter != childList->end()) {
+        if ( ((*iter)->Is() != NOTE) && ((*iter)->Is() != CHORD) ) {
+            // remove anything that is not an LayerElement (e.g. Verse, Syl, etc)
+            iter = childList->erase( iter );
+            continue;
+        }
+        iter++;
+    }
+}
+
+    
 //----------------------------------------------------------------------------
 // MRpt
 //----------------------------------------------------------------------------
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 1ed2d2758a8..86df0e7a8cc 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -542,6 +542,30 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     FTrem *fTrem = dynamic_cast<FTrem*>(element);
     assert( fTrem );
     
+    BeamElementCoord firstElement;
+    BeamElementCoord secondElement;
+    
+    ListOfObjects* fTremChildren = fTrem->GetList(fTrem);
+    
+    // Should we assert this at the beginning?
+    if (fTremChildren->empty()) {
+        return;
+    }
+    // current point to the first Note in the layed out layer
+    firstElement.m_element = dynamic_cast<LayerElement*>(fTremChildren->front());
+    // fTrem list should contain only DurationInterface objects
+    assert( dynamic_cast<DurationInterface*>(firstElement.m_element) );
+    // current point to the first Note in the layed out layer
+    secondElement.m_element = dynamic_cast<LayerElement*>(fTremChildren->back());
+    // fTrem list should contain only DurationInterface objects
+    assert( dynamic_cast<DurationInterface*>(secondElement.m_element) );
+        // Should we assert this at the beginning?
+    if (firstElement.m_element == secondElement.m_element) {
+        return;
+    }
+    
+    
+    
     dc->StartGraphic( element, "", element->GetUuid() );
     
     DrawLayerChildren(dc, fTrem, layer, staff, measure);

From 8c2d4dd99beca4a57b0783fccc5ae3e1ca403c24 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 27 Oct 2015 15:53:28 +0100
Subject: [PATCH 75/85] Drawing bTrems

---
 src/layerelement.cpp |  2 +-
 src/view_element.cpp | 88 ++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 82 insertions(+), 8 deletions(-)

diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 94daf2c75bc..2a1f4b88e17 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -115,7 +115,7 @@ bool LayerElement::IsInfTrem()
     
 Beam* LayerElement::IsInBeam()
 {
-    if ((this->Is() != NOTE) || (this->Is() == CHORD)) return NULL;
+    if ((this->Is() != NOTE) && (this->Is() != CHORD)) return NULL;
     Beam *beamParent = dynamic_cast<Beam*>(this->GetFirstParent( BEAM, MAX_BEAM_DEPTH) );
     if (beamParent != NULL) {
         // This note is beamed and cue sized
diff --git a/src/view_element.cpp b/src/view_element.cpp
index f0a80314a45..22abbfbf86e 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -837,11 +837,83 @@ void View::DrawBTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     
     BTrem *bTrem = dynamic_cast<BTrem*>(element);
     assert( bTrem );
+
     
     dc->StartGraphic( element, "", element->GetUuid() );
     
     DrawLayerChildren(dc, bTrem, layer, staff, measure);
     
+    data_STEMDIRECTION stemDir = STEMDIRECTION_NONE;
+    data_STEMMODIFIER stemMod;
+    int drawingDur;
+    LayerElement *childElement = NULL;
+    Point stemPoint;
+    bool drawingCueSize = false;
+    int x, y, yUnused;
+    
+    Chord *childChord = dynamic_cast<Chord*>(bTrem->FindChildByType(CHORD));
+    // Get from the chord or note child
+    if (childChord) {
+        stemDir = childChord->GetDrawingStemDir();
+        stemMod = childChord->GetStemMod();
+        stemPoint = childChord->GetDrawingStemStart();
+        drawingDur = childChord->GetDur();
+        childElement = childChord;
+    }
+    else {
+        Note *childNote = dynamic_cast<Note*>(bTrem->FindChildByType(NOTE));
+        if (childNote) {
+            drawingCueSize = childNote->IsCueSize();
+            stemDir = childNote->GetDrawingStemDir();
+            stemMod = childNote->GetStemMod();
+            stemPoint = childNote->GetDrawingStemStart();
+            drawingDur = childNote->GetDur();
+            childElement = childNote;
+        }
+    }
+
+    // nothing we can do...
+    if (stemDir == STEMDIRECTION_NONE) {
+        return;
+    }
+    
+    
+    int width = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, drawingCueSize);
+    int height = m_doc->GetDrawingBeamWidth(staff->m_drawingStaffSize, drawingCueSize) * 7 / 10;
+    int step = height + m_doc->GetDrawingBeamWhiteWidth(staff->m_drawingStaffSize, drawingCueSize);
+
+    if (stemDir == STEMDIRECTION_up) {
+        if (drawingDur > DUR_1) {
+            y = childElement->GetDrawingTop(m_doc, staff->m_drawingStaffSize) - 3 * height;
+            x = stemPoint.x;
+        }
+        else {
+            if (childElement->Is() == NOTE) y = childElement->GetDrawingY();
+            else childChord->GetYExtremes(&y, &yUnused);
+            y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6;
+            x = childElement->GetDrawingX();
+        }
+        step = -step;
+    }
+    else {
+        if (drawingDur > DUR_1) {
+            y = childElement->GetDrawingBottom(m_doc, staff->m_drawingStaffSize) + 1 * height;
+            x = stemPoint.x + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+        }
+        else {
+            if (childElement->Is() == NOTE) y = childElement->GetDrawingY();
+            else childChord->GetYExtremes(&yUnused, &y);
+            y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6;
+            x = childElement->GetDrawingX();
+        }
+    }
+    
+    int s;
+    for (s = 0; s < stemMod; s++) {
+        DrawObliquePolygon (dc, x - width / 2, y, x + width / 2, y + height, height);
+        y += step;
+    }
+    
     dc->EndGraphic(element, this);
 }
     
@@ -1045,8 +1117,8 @@ void View::DrawChord( DeviceContext *dc, LayerElement *element, Layer *layer, St
     
     int drawingDur = chord->GetDur();
     
-    //(unless we're in a beam or whole notes)
-    if (!inBeam && (drawingDur > DUR_1)) {
+    // (unless we're in a beam)
+    if (!inBeam) {
         int yMax, yMin;
         chord->GetYExtremes(&yMax, &yMin);
         
@@ -1060,11 +1132,13 @@ void View::DrawChord( DeviceContext *dc, LayerElement *element, Layer *layer, St
             chord->SetDrawingStemDir(yMax - verticalCenter >= verticalCenter - yMin ? STEMDIRECTION_down : STEMDIRECTION_up);
         }
         
-        int beamX = chord->GetDrawingX();
-        int originY = ( chord->GetDrawingStemDir() == STEMDIRECTION_down ? yMax : yMin );
-        int heightY = yMax - yMin;
-        
-        DrawStem(dc, chord, staff, chord->GetDrawingStemDir(), radius, beamX, originY, heightY);
+        // (only shorter than whole notes)
+        if (drawingDur > DUR_1) {
+            int beamX = chord->GetDrawingX();
+            int originY = ( chord->GetDrawingStemDir() == STEMDIRECTION_down ? yMax : yMin );
+            int heightY = yMax - yMin;
+            DrawStem(dc, chord, staff, chord->GetDrawingStemDir(), radius, beamX, originY, heightY);
+        }
     }
     
     /************ Draw children (notes) ************/

From 5f1a51f5f024d2102e5d5747e1b04ae867955884 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Tue, 27 Oct 2015 16:53:12 +0100
Subject: [PATCH 76/85] Basic fTrems drawing

---
 include/vrv/rpt.h |   4 +-
 src/iomei.cpp     |   3 ++
 src/rpt.cpp       |   6 ++-
 src/view_beam.cpp | 130 +++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 139 insertions(+), 4 deletions(-)

diff --git a/include/vrv/rpt.h b/include/vrv/rpt.h
index cf934bfd13d..5b5ef387a30 100644
--- a/include/vrv/rpt.h
+++ b/include/vrv/rpt.h
@@ -10,6 +10,7 @@
 #define __VRV_RPT_H__
 
 #include "atts_cmn.h"
+#include "atts_shared.h"
 #include "layerelement.h"
 
 namespace vrv {
@@ -98,7 +99,8 @@ class BTrem: public LayerElement
 /**
  * This class models the MEI <fTrem>
  */
-class FTrem: public LayerElement, public ObjectListInterface
+class FTrem: public LayerElement, public ObjectListInterface,
+    public AttSlashcount
 {
 public:
     /**
diff --git a/src/iomei.cpp b/src/iomei.cpp
index 2d12aa14091..e33d6dc2278 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -656,6 +656,7 @@ void MeiOutput::WriteMeiFTrem( pugi::xml_node currentNode, FTrem *fTrem )
     assert( fTrem );
     
     WriteLayerElement( currentNode, fTrem );
+    fTrem->WriteSlashcount(currentNode);
 }
     
 void MeiOutput::WriteMeiKeySig( pugi::xml_node currentNode, KeySig *keySig )
@@ -1863,6 +1864,8 @@ bool MeiInput::ReadMeiFTrem( Object *parent, pugi::xml_node fTrem )
     FTrem *vrvFTrem = new FTrem();
     ReadLayerElement(fTrem, vrvFTrem);
     
+    vrvFTrem->ReadSlashcount(fTrem);
+    
     AddLayerElement(parent, vrvFTrem);
     
     return ReadMeiLayerChildren(vrvFTrem, fTrem, vrvFTrem);
diff --git a/src/rpt.cpp b/src/rpt.cpp
index fb40d53ab55..7db980ae84c 100644
--- a/src/rpt.cpp
+++ b/src/rpt.cpp
@@ -83,8 +83,11 @@ void BTrem::AddLayerElement(LayerElement *element)
 //----------------------------------------------------------------------------
 
 FTrem::FTrem( ):
-    LayerElement("ftrem-"), ObjectListInterface()
+    LayerElement("ftrem-"), ObjectListInterface(),
+    AttSlashcount()
 {
+    RegisterAttClass(ATT_SLASHCOUNT);
+    
     Reset();
 }
 
@@ -95,6 +98,7 @@ FTrem::~FTrem()
 void FTrem::Reset()
 {
     LayerElement::Reset();
+    ResetSlashcount();
 }
     
 void FTrem::AddLayerElement(LayerElement *element)
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 86df0e7a8cc..6e63f713f84 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -564,12 +564,138 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
         return;
     }
     
-    
-    
     dc->StartGraphic( element, "", element->GetUuid() );
     
     DrawLayerChildren(dc, fTrem, layer, staff, measure);
     
+    data_STEMDIRECTION stemDir1 = STEMDIRECTION_NONE;
+    data_STEMDIRECTION stemDir2 = STEMDIRECTION_NONE;
+    Point stemPoint1, stemPoint2;
+    // for these we look only at the first one since we assume both to be the same
+    int drawingDur;
+    bool drawingCueSize = false;
+    //
+    char slashCount;
+    int x1, y1, x2, y2, yUnused;
+    
+    Chord *childChord1 = NULL;
+    Note *childNote1 = NULL;
+    LayerElement *childElement1 = NULL;
+    Chord *childChord2 = NULL;
+    Note *childNote2 = NULL;
+    LayerElement *childElement2 = NULL;
+    
+    if (firstElement.m_element->Is() == CHORD) {
+        childChord1 = dynamic_cast<Chord*>(firstElement.m_element);
+        childElement1 = childChord1;
+    }
+    else {
+        childNote1 = dynamic_cast<Note*>(firstElement.m_element);
+        childElement1 = childNote1;
+    }
+    assert(childChord1 || childNote1);
+    // end
+    if (secondElement.m_element->Is() == CHORD) {
+        childChord2 = dynamic_cast<Chord*>(secondElement.m_element);
+        childElement2 = childChord2;
+    }
+    else {
+        childNote2 = dynamic_cast<Note*>(secondElement.m_element);
+        childElement2 = childNote2;
+    }
+    assert(childChord2 || childNote2);
+    
+    slashCount = fTrem->GetSlash();
+    
+    // Get from the first chord or note child
+    if (childChord1) {
+        stemDir1 = childChord1->GetDrawingStemDir();
+        stemPoint1 = childChord1->GetDrawingStemStart();
+        // duration of the first note/chord only
+        drawingDur = childChord1->GetDur();
+    }
+    else {
+        drawingCueSize = childNote1->IsCueSize();
+        stemDir1 = childNote1->GetDrawingStemDir();
+        stemPoint1 = childNote1->GetDrawingStemStart();
+        drawingDur = childNote1->GetDur();
+    }
+    
+    // Get from the second chord or note child
+    if (childChord2) {
+        stemDir2 = childChord2->GetDrawingStemDir();
+        stemPoint2 = childChord2->GetDrawingStemStart();
+    }
+    else {
+        stemDir2 = childNote2->GetDrawingStemDir();
+        stemPoint2 = childNote2->GetDrawingStemStart();
+    }
+    
+    int space = m_doc->GetDrawingBeamWhiteWidth(staff->m_drawingStaffSize, drawingCueSize);
+    int height = m_doc->GetDrawingBeamWidth(staff->m_drawingStaffSize, drawingCueSize);
+    int step = height + space;
+    
+    if (stemDir1 == STEMDIRECTION_up) {
+        if (drawingDur > DUR_1) {
+            y1 = childElement1->GetDrawingTop(m_doc, staff->m_drawingStaffSize) - 1 * height;
+            x1 = stemPoint1.x;
+        }
+        else {
+            if (childNote1) y1 = childNote1->GetDrawingY();
+            else childChord1->GetYExtremes(&y1, &yUnused);
+            y1 += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6;
+            x1 = childElement1->GetDrawingX();
+        }
+        step = -step;
+    }
+    else {
+        if (drawingDur > DUR_1) {
+            y1 = childElement1->GetDrawingBottom(m_doc, staff->m_drawingStaffSize);
+            x1 = stemPoint1.x + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+        }
+        else {
+            if (childNote1) y1 = childNote1->GetDrawingY();
+            else childChord1->GetYExtremes(&yUnused, &y1);
+            y1 -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6;
+            x1 = childElement1->GetDrawingX();
+        }
+    }
+    
+    if (stemDir2 == STEMDIRECTION_up) {
+        if (drawingDur > DUR_1) {
+            y2 = childElement2->GetDrawingTop(m_doc, staff->m_drawingStaffSize) - 1 * height;
+            x2 = stemPoint2.x;
+        }
+        else {
+            if (childNote2) y2 = childNote2->GetDrawingY();
+            else childChord2->GetYExtremes(&y2, &yUnused);
+            y2 += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6;
+            x2 = childElement2->GetDrawingX();
+        }
+    }
+    else {
+        if (drawingDur > DUR_1) {
+            y2 = childElement2->GetDrawingBottom(m_doc, staff->m_drawingStaffSize);
+            x2 = stemPoint2.x + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+        }
+        else {
+            if (childNote2) y2 = childNote2->GetDrawingY();
+            else childChord2->GetYExtremes(&yUnused, &y2);
+            y2 -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6;
+            x2 = childElement2->GetDrawingX();
+        }
+    }
+    
+    x1 += height;
+    x2 -= height;
+    
+    int s;
+    for (s = 0; s < slashCount; s++) {
+        DrawObliquePolygon (dc, x1, y1, x2, y2, height);
+        y1 += step;
+        y2 += step;
+    }
+    
     dc->EndGraphic(element, this);
 }
     

From 5fa5709f4c8b0b57a2480b2f309554cb3219697b Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 28 Oct 2015 10:29:03 +0100
Subject: [PATCH 77/85] Refactoring DrawBeam methods for bTrem

---
 include/vrv/beam.h |  37 +++-
 include/vrv/view.h |   2 +
 src/view_beam.cpp  | 531 +++++++++++++++++++++++----------------------
 3 files changed, 313 insertions(+), 257 deletions(-)

diff --git a/include/vrv/beam.h b/include/vrv/beam.h
index 76552870dc5..4fe189f5256 100644
--- a/include/vrv/beam.h
+++ b/include/vrv/beam.h
@@ -99,7 +99,6 @@ class Beam: public LayerElement, public ObjectListInterface, public DrawingListI
 // BeamElementCoord
 //----------------------------------------------------------------------------
 
-
 class BeamElementCoord
 {
 public:
@@ -120,8 +119,44 @@ class BeamElementCoord
     char m_partialFlags[MAX_DURATION_PARTIALS];
     LayerElement *m_element;
 };
+
     
+//----------------------------------------------------------------------------
+// BeamParams
+//----------------------------------------------------------------------------
+
+/**
+ * Class for storing drawing parameters when calculating beams.
+ * See View::DrawBeam and View::CalcBeam
+ */
     
+class BeamParams
+{
+public:
+    /**
+     * @name Constructors, destructors, and other standard methods
+     */
+    ///@{
+    BeamParams() {};
+    virtual ~BeamParams() {};
+    
+    // values to be set before calling CalcBeam
+    bool m_changingDur;
+    bool m_beamHasChord;
+    bool m_hasMultipleStemDir;
+    bool m_cueSize;
+    int m_shortestDur;
+    data_STEMDIRECTION m_stemDir;
+    
+    // values set by CalcBeam
+    int m_beamWidth;
+    int m_beamWidthBlack;
+    int m_beamWidthWhite;
+    double m_startingY; // the initial position of the beam
+    double m_beamSlope; // the slope of the beam
+    double m_verticalBoost; //extra height to ensure the beam clears all the noteheads
+};
+
 } // namespace vrv
 
 #endif
diff --git a/include/vrv/view.h b/include/vrv/view.h
index 5808a3a893a..f1defb98fcc 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -17,6 +17,7 @@ namespace vrv {
 
 class Accid;
 class Beam;
+class BeamParams;
 class Barline;
 class Chord;
 class DeviceContext;
@@ -255,6 +256,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 CalcBeam(Layer *layer, Staff *staff, const ArrayOfBeamElementCoords *beamElementCoords, int elementCount, BeamParams *params);
     ///@}
     
     /**
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 6e63f713f84..99307a49276 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -31,6 +31,7 @@
 
 namespace vrv {
 
+
 void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
 {
     assert( dc );
@@ -43,59 +44,36 @@ void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     
     LayerElement *current;
 
-	bool changingDur = OFF;
-    bool beamHasChord = OFF;
-    bool hasMultipleStemDir = OFF;
-    data_STEMDIRECTION stemDir = STEMDIRECTION_NONE;
-    
-    // position variables
-    int high, low, yExtreme;
-    int verticalCenter;
-    
-    double verticalShiftFactor = 3.0;
-    
-    // For slope calculation and linear regression
-    double verticalBoost = 0.0; //extra height to ensure the beam clears all the noteheads
-    double s_x=0.0; //sum of all x(n) for n in beamElementCoord
-    double s_y=0.0; //sum of all y(n)
-    double s_xy=0.0; //sum of (x(n) * y(n))
-    double s_x2=0.0; //sum of all x(n)^2
-    double s_y2=0.0; //sum of all y(n)^2
-    double startingY, beamSlope; //startingY is the initial position of the beam, beamSlope is the slope
+    BeamParams params;
+	params.m_changingDur = OFF;
+    params.m_beamHasChord = OFF;
+    params.m_hasMultipleStemDir = OFF;
+    params.m_cueSize = OFF;
+    params.m_shortestDur = 0;
+    params.m_stemDir = STEMDIRECTION_NONE;
     
     // position in the beam element list
 	int elementCount, last;
     
     // duration variables
-	int shortestDur, lastDur, currentDur, testDur;
-
-    // position x for the stem (normal and cue size)
-	int dx[2];
+	int lastDur, currentDur, testDur;
     
     // temporary coordinates
-    int fx1,fx2,fy1,fy2;
+    int x1, x2, y1, y2;
     
     // temporary variables
-	int avgY, shiftY, barY, verticalShift, y1, fullBars, polygonHeight;
-    double xr;
+    int shiftY;
+    int barY, fullBars, polygonHeight;
+    double dy1, dy2;
 
     // loops
 	int i, j;
     
-    // beam bar sizes
-	int beamWidth, beamWidthBlack, beamWidthWhite;
-
-    
     /******************************************************************/
     // initialization
     
-    shortestDur = 0;
     lastDur = elementCount = 0;
-    high = avgY = verticalBoost = 0.0;
     
-    verticalCenter = staff->GetDrawingY() - (m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * 2); //center point of the staff
-    yExtreme = verticalCenter; //value of farthest y point on the staff from verticalCenter minus verticalCenter; used if beamHasChord = ON
-
     ListOfObjects* beamChildren = beam->GetList(beam);
     
     // Should we assert this at the beginning?
@@ -109,14 +87,8 @@ void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     // Beam list should contain only DurationInterface objects
     assert( dynamic_cast<DurationInterface*>(current) );
     
-	low = current->GetDrawingY();
     lastDur = dynamic_cast<DurationInterface*>(current)->GetActualDur();
-    
-    // x-offset values for stem bases, dx[y] where y = element->m_cueSize
-    dx[0] =  m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, false) / 2 -
-        (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize))/2;
-    dx[1] =  m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, true) / 2 -
-        (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize))/2;
+
     
     /******************************************************************/
     // Populate BeamElementCoord for each element in the beam
@@ -132,7 +104,7 @@ void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
         currentDur = dynamic_cast<DurationInterface*>(current)->GetActualDur();
         
         if (current->Is() == CHORD) {
-            beamHasChord = true;
+            params.m_beamHasChord = true;
         }
 
         // Can it happen? With rests?
@@ -146,27 +118,27 @@ void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
             (*beamElementCoords).at(elementCount)->m_breaksec = 0;
             AttBeamsecondary *beamsecondary = dynamic_cast<AttBeamsecondary*>(current);
             if ( elementCount && beamsecondary && beamsecondary->HasBreaksec()) {
-                if (!changingDur) changingDur = ON;
+                if (!params.m_changingDur) params.m_changingDur = ON;
                 (*beamElementCoords).at(elementCount)->m_breaksec = beamsecondary->GetBreaksec();
             }
             
             // Skip rests
             if ( (current->Is() == NOTE) || (current->Is() == CHORD) ) {
                 // look at the stemDir to see if we have multiple stem Dir
-                if (!hasMultipleStemDir) {
+                if (!params.m_hasMultipleStemDir) {
                     assert( dynamic_cast<AttStemmed*>(current) );
                     currentStemDir = dynamic_cast<AttStemmed*>(current)->GetStemDir();
                     if (currentStemDir != STEMDIRECTION_NONE) {
-                        if ((stemDir != STEMDIRECTION_NONE) && (stemDir != currentStemDir)) {
-                            hasMultipleStemDir = ON;
+                        if ((params.m_stemDir != STEMDIRECTION_NONE) && (params.m_stemDir != currentStemDir)) {
+                            params.m_hasMultipleStemDir = ON;
                         }
                     }
-                    stemDir = currentStemDir;
+                    params.m_stemDir = currentStemDir;
                 }
                 // keep the shortest dur in the beam
-                shortestDur = std::max(currentDur,shortestDur);
+                params.m_shortestDur = std::max(currentDur,params.m_shortestDur);
                 // check if we have more than duration in the beam
-                if (!changingDur && currentDur != lastDur) changingDur = ON;
+                if (!params.m_changingDur && currentDur != lastDur) params.m_changingDur = ON;
                 lastDur = currentDur;
             }
 			elementCount++;
@@ -186,189 +158,24 @@ void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
 
     //elementCount must be greater than 0 here
     if (elementCount == 0){
-        LogDebug("Beam with no notes of duration > 8 detected. Exiting DrawBeamPostponed gracefully.");
+        LogDebug("Beam with no notes of duration > 8 detected. Exiting DrawBeam.");
         return;
     }
 
 	last = elementCount - 1;
     
-    /******************************************************************/
-    // Calculate the extreme values
-    
-    int yMax = 0, yMin = 0;
-    int curY;
-    // elementCount holds the last one
-	for (i = 0; i < elementCount; i++) {
-
-    
-        if ((*beamElementCoords).at(i)->m_element->Is() == CHORD) {
-            Chord *chord = dynamic_cast<Chord*>((*beamElementCoords).at(i)->m_element);
-            assert( chord );
-            chord->GetYExtremes(&yMax, &yMin);
-            (*beamElementCoords).at(i)->m_yTop = yMax;
-            (*beamElementCoords).at(i)->m_yBottom = yMin;
-            
-            avgY += (*beamElementCoords).at(i)->m_y + ((yMax - yMin) / 2);
-            
-            // highest and lowest value;
-            high= std::max(yMax, high);
-            low = std::min(yMin, low);
-        }
-        else {
-            (*beamElementCoords).at(i)->m_y = (*beamElementCoords).at(i)->m_element->GetDrawingY();
-            
-            // highest and lowest value;
-            high= std::max((*beamElementCoords).at(i)->m_y, high);
-            low = std::min((*beamElementCoords).at(i)->m_y, low);
-            
-            curY = (*beamElementCoords).at(i)->m_element->GetDrawingY();
-            (*beamElementCoords).at(i)->m_y = curY;
-            (*beamElementCoords).at(i)->m_yTop = curY;
-            (*beamElementCoords).at(i)->m_yBottom = curY;
-            avgY += (*beamElementCoords).at(i)->m_y;
-        }
-	}
-
-    /******************************************************************/
-    // Set the stem direction
-    
-    yExtreme = (abs(high - verticalCenter) > abs(low - verticalCenter) ? high : low);
-    avgY /= elementCount;
-    
-    // If we have one stem direction in the beam, then don't look at the layer
-    if (stemDir == STEMDIRECTION_NONE) stemDir = layer->GetDrawingStemDir(); // force layer direction if it exists
-    
-    // Automatic stem direction if nothing in the notes or in the layer
-    if (stemDir == STEMDIRECTION_NONE) {
-        if (beamHasChord) stemDir = (yExtreme < verticalCenter) ?  STEMDIRECTION_up : STEMDIRECTION_down; //if it has a chord, go by the most extreme position
-        else stemDir = (avgY <  verticalCenter) ? STEMDIRECTION_up : STEMDIRECTION_down; //otherwise go by average
-    }
-    
-    if (stemDir == STEMDIRECTION_up) { //set stem direction for all the notes
-        for (i = 0; i < elementCount; i++) {
-            (*beamElementCoords).at(i)->m_y = (*beamElementCoords).at(i)->m_yTop;
-        }
-    }
-    else {
-        for (i = 0; i < elementCount; i++) {
-            (*beamElementCoords).at(i)->m_y = (*beamElementCoords).at(i)->m_yBottom;
-        }
-    }
-
     // We look only at the last note for checking if cuesized. Somehow arbitrarily
-    beamWidthBlack = m_doc->GetDrawingBeamWidth(staff->m_drawingStaffSize, (*beamElementCoords).at(last)->m_element->IsCueSize());
-    beamWidthWhite = m_doc->GetDrawingBeamWhiteWidth(staff->m_drawingStaffSize, (*beamElementCoords).at(last)->m_element->IsCueSize());
-    
-	beamWidth = beamWidthBlack + beamWidthWhite;
+    params.m_cueSize = (*beamElementCoords).at(last)->m_element->IsCueSize();
 
     /******************************************************************/
-    // Calculate the slope doing a linear regression
-    
-    // The vertical shift depends on the shortestDur value we have in the beam
-    verticalShift = ((shortestDur-DUR_8)*(beamWidth));
-
-    //if the beam has smaller-size notes
-    if ((*beamElementCoords).at(last)->m_element->IsCueSize()) {
-        verticalShift += m_doc->GetDrawingUnit(staff->m_drawingStaffSize)*5;
-    }
-    else {
-        verticalShift += (shortestDur > DUR_8) ?
-            m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * verticalShiftFactor :
-            m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * (verticalShiftFactor + 0.5);
-    }
-    
-    // swap x position and verticalShift direction with stem down
-    if (stemDir == STEMDIRECTION_down) {
-        dx[0] = -dx[0];
-        dx[1] = -dx[1];
-        verticalShift = -verticalShift;
-    }
-    
-    for (i=0; i<elementCount; i++)
-    {
-        //change the stem dir for all objects
-        if ( (*beamElementCoords).at(i)->m_element->Is() == NOTE ) {
-            ((Note*)(*beamElementCoords).at(i)->m_element)->SetDrawingStemDir( stemDir );
-        }
-        else if ( (*beamElementCoords).at(i)->m_element->Is() == CHORD ) {
-            ((Chord*)(*beamElementCoords).at(i)->m_element)->SetDrawingStemDir(stemDir);
-        }
-
-        (*beamElementCoords).at(i)->m_yBeam = (*beamElementCoords).at(i)->m_y + verticalShift;
-        (*beamElementCoords).at(i)->m_x +=  dx[(*beamElementCoords).at(i)->m_element->IsCueSize()];
-        
-        s_y += (*beamElementCoords).at(i)->m_yBeam;
-        s_y2 += (*beamElementCoords).at(i)->m_yBeam * (*beamElementCoords).at(i)->m_yBeam;
-        s_x += (*beamElementCoords).at(i)->m_x;
-        s_x2 += (*beamElementCoords).at(i)->m_x * (*beamElementCoords).at(i)->m_x;
-        s_xy += (*beamElementCoords).at(i)->m_x * (*beamElementCoords).at(i)->m_yBeam;
-    }
-
-	y1 = elementCount * s_xy - s_x * s_y;
-	xr = elementCount * s_x2 - s_x * s_x;
-
-    // Prevent division by 0
-    if (y1 && xr) {
-		beamSlope = y1 / xr;
-    }
-    else {
-		beamSlope = 0.0;
-    }
-    
-	/* Correction esthetique : */
-	if (fabs(beamSlope) < m_doc->m_drawingBeamMinSlope ) beamSlope = 0.0;
-	if (fabs(beamSlope) > m_doc->m_drawingBeamMaxSlope ) beamSlope = (beamSlope > 0) ? m_doc->m_drawingBeamMaxSlope : - m_doc->m_drawingBeamMaxSlope;
-	/* pente correcte: entre 0 et env 0.4 (0.2 a 0.4) */
+    // Calculate the beam slope
     
-	startingY = (s_y - beamSlope * s_x) / elementCount;
+    CalcBeam(layer, staff, beamElementCoords, elementCount, &params);
     
     /******************************************************************/
     // Start the Beam graphic and draw the children
     
     dc->StartGraphic( element, "", element->GetUuid() );
-
-    /******************************************************************/
-    // Calculate the stem lengths
-
-    double oldYPos; //holds y position before calculation to determine if beam needs extra height
-    double expectedY;
-	for ( i=0; i<elementCount; i++ ) {
-        oldYPos = (*beamElementCoords).at(i)->m_yBeam;
-		expectedY = startingY + verticalBoost + beamSlope * (*beamElementCoords).at(i)->m_x;
-        
-        //if the stem is not long enough, add extra stem length needed to all members of the beam
-        if ((stemDir == STEMDIRECTION_up && (oldYPos > expectedY)) || (stemDir == STEMDIRECTION_down && (oldYPos < expectedY))) {
-            verticalBoost += oldYPos - expectedY;
-        }
-	}
-    
-    for (i=0; i<elementCount; i++)
-    {
-		(*beamElementCoords).at(i)->m_yBeam = startingY + verticalBoost + beamSlope * (*beamElementCoords).at(i)->m_x;
-    }
-        
-	for (i=0; i<elementCount; i++)
-	{
-        if (stemDir == STEMDIRECTION_up) {
-            fy1 = (*beamElementCoords).at(i)->m_yBeam - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-            fy2 = (*beamElementCoords).at(i)->m_yBottom + m_doc->GetDrawingUnit(staff->m_drawingStaffSize)/4;
-        }
-        else {
-            fy1 = (*beamElementCoords).at(i)->m_yBeam + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-            fy2 = (*beamElementCoords).at(i)->m_yTop - m_doc->GetDrawingUnit(staff->m_drawingStaffSize)/4;
-        }
-        
-        // All notes and chords get their stem value stored
-        LayerElement *el = (*beamElementCoords).at(i)->m_element;
-        if ( (el->Is() == NOTE) || (el->Is() == CHORD) ) {
-            StemmedDrawingInterface *interface = dynamic_cast<StemmedDrawingInterface*>(el);
-            assert(interface);
-            
-            interface->SetDrawingStemDir(stemDir);
-            interface->SetDrawingStemStart(Point((*beamElementCoords).at(i)->m_x, fy2));
-            interface->SetDrawingStemEnd(Point((*beamElementCoords).at(i)->m_x, fy1));
-        }
-	}
     
     
     /******************************************************************/
@@ -394,40 +201,39 @@ void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     // Number of bars to draw - if we do not have changing values, draw
     // the number of bars according to the shortestDur value. Otherwise draw
     // only one bar and the others will be drawn separately.
-    fullBars =  !changingDur ? (shortestDur - DUR_4) : 1;
+    fullBars =  !params.m_changingDur ? (params.m_shortestDur - DUR_4) : 1;
     
     // 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 = (stemDir == STEMDIRECTION_down) ? 1.0 : -1.0;
+	shiftY = (params.m_stemDir == STEMDIRECTION_down) ? 1.0 : -1.0;
 
-	fy1 = (*beamElementCoords).at(0)->m_yBeam;
-    fy2 = (*beamElementCoords).at(last)->m_yBeam;
+	y1 = (*beamElementCoords).at(0)->m_yBeam;
+    y2 = (*beamElementCoords).at(last)->m_yBeam;
 
-    fx1 = (*beamElementCoords).at(0)->m_x;
-    fx2 = (*beamElementCoords).at(last)->m_x;
+    x1 = (*beamElementCoords).at(0)->m_x;
+    x2 = (*beamElementCoords).at(last)->m_x;
 
-	s_y = shiftY;
-	s_y2 = shiftY;
+	dy1 = shiftY;
+	dy2 = shiftY;
     
     // For acc and rit beam (see AttBeamingVis set
     // s_y = 0 and s_y2 = 0 respectively
 
-	for (j=0; j<fullBars ; j++)
-	{
-		polygonHeight = beamWidthBlack*shiftY;
-        DrawObliquePolygon (dc,fx1,fy1,fx2,fy2, polygonHeight);
-		fy1 += polygonHeight; fy2 += polygonHeight;
+	for (j = 0; j < fullBars ; j++) {
+		polygonHeight = params.m_beamWidthBlack * shiftY;
+        DrawObliquePolygon (dc, x1, y1, x2, y2, polygonHeight);
+		y1 += polygonHeight; y2 += polygonHeight;
 
         // s_y must == 0 for accelerando beams
-		if (!s_y) fy1 += (beamWidthBlack * shiftY) * -1;
-		else fy1 += s_y*beamWidthWhite;
+		if (!dy1) y1 += (params.m_beamWidthBlack * shiftY) * -1;
+		else y1 += dy1 * params.m_beamWidthWhite;
         
         // reverse for retardendo beam
-		if (!s_y2) fy2 += (beamWidthBlack * shiftY) * -1;
-		else fy2 += s_y2*beamWidthWhite;
+		if (!dy2) y2 += (params.m_beamWidthBlack * shiftY) * -1;
+		else y2 += dy2 * params.m_beamWidthWhite;
 	}
     
     /******************************************************************/
@@ -443,16 +249,18 @@ void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
 	pilotee par l'indice de l'array; elle dessine horizontalement les barres 
 	de chaque sous-groupe en suivant les marqueurs */
 
-    if (changingDur) {
+    if (params.m_changingDur) {
         testDur = DUR_8 + fullBars;
-        barY = beamWidth;
+        barY = params.m_beamWidth;
 
-        if (stemDir == STEMDIRECTION_up) {
+        if (params.m_stemDir == STEMDIRECTION_up) {
             barY = -barY;
         }
+        
+        int fractBeamWidth = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, params.m_cueSize);
 
         // loop
-        while (testDur <= shortestDur) {
+        while (testDur <= params.m_shortestDur) {
             // true at the beginning of a beam or after a breakSec
             bool start = true;
             
@@ -497,34 +305,34 @@ void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
             }
             
             // draw them
-            for (i=0; i<elementCount; i++) {
+            for (i = 0; i < elementCount; i++) {
                 if ((*beamElementCoords).at(i)->m_partialFlags[testDur-DUR_8] == PARTIAL_THROUGH) {
                     // through should never be set on the last one
                     assert( i < elementCount - 1);
                     if (i >= elementCount - 1) continue; // assert for debug and skip otherwise
-                    fy1 = (*beamElementCoords).at(i)->m_yBeam + barY;
-                    fy2 = (*beamElementCoords).at(i+1)->m_yBeam + barY;
-                    polygonHeight = beamWidthBlack * shiftY;
-                    DrawObliquePolygon (dc, (*beamElementCoords).at(i)->m_x, fy1,(*beamElementCoords).at(i+1)->m_x, fy2, polygonHeight);
+                    y1 = (*beamElementCoords).at(i)->m_yBeam + barY;
+                    y2 = (*beamElementCoords).at(i+1)->m_yBeam + barY;
+                    polygonHeight = params.m_beamWidthBlack * shiftY;
+                    DrawObliquePolygon (dc, (*beamElementCoords).at(i)->m_x, y1,(*beamElementCoords).at(i+1)->m_x, y2, polygonHeight);
                 }
                 else if ((*beamElementCoords).at(i)->m_partialFlags[testDur-DUR_8] == PARTIAL_RIGHT) {
-                    fy1 = (*beamElementCoords).at(i)->m_yBeam + barY;
-                    int x2 = (*beamElementCoords).at(i)->m_x + m_doc->GetDrawingLedgerLineLength(staff->m_drawingStaffSize, false);
-                    fy2 = startingY + verticalBoost + barY + beamSlope * x2;
-                    polygonHeight= beamWidthBlack*shiftY;
-                    DrawObliquePolygon (dc, (*beamElementCoords).at(i)->m_x, fy1, x2, fy2, polygonHeight);
+                    y1 = (*beamElementCoords).at(i)->m_yBeam + barY;
+                    int x2 = (*beamElementCoords).at(i)->m_x + fractBeamWidth;
+                    y2 = params.m_startingY + params.m_verticalBoost + barY + params.m_beamSlope * x2;
+                    polygonHeight= params.m_beamWidthBlack * shiftY;
+                    DrawObliquePolygon (dc, (*beamElementCoords).at(i)->m_x, y1, x2, y2, polygonHeight);
                 }
                 else if ((*beamElementCoords).at(i)->m_partialFlags[testDur-DUR_8] == PARTIAL_LEFT) {
-                    fy2 = (*beamElementCoords).at(i)->m_yBeam + barY;
-                    int x1 = (*beamElementCoords).at(i)->m_x - m_doc->GetDrawingLedgerLineLength(staff->m_drawingStaffSize, false);
-                    fy1 = startingY + verticalBoost + barY + beamSlope * x1;
-                    polygonHeight = beamWidthBlack*shiftY;
-                    DrawObliquePolygon (dc, x1, fy1, (*beamElementCoords).at(i)->m_x, fy2, polygonHeight);
+                    y2 = (*beamElementCoords).at(i)->m_yBeam + barY;
+                    int x1 = (*beamElementCoords).at(i)->m_x - fractBeamWidth;
+                    y1 = params.m_startingY + params.m_verticalBoost + barY + params.m_beamSlope * x1;
+                    polygonHeight = params.m_beamWidthBlack * shiftY;
+                    DrawObliquePolygon (dc, x1, y1, (*beamElementCoords).at(i)->m_x, y2, polygonHeight);
                 }
             }
 
             testDur += 1;
-            barY += shiftY * beamWidth;
+            barY += shiftY * params.m_beamWidth;
         } // end of while
     } // end of drawing partial bars
     
@@ -699,4 +507,215 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     dc->EndGraphic(element, this);
 }
     
+void View::CalcBeam(Layer *layer, Staff *staff, const ArrayOfBeamElementCoords *beamElementCoords, int elementCount, BeamParams *params)
+{
+    assert(layer);
+    assert(staff);
+    assert(beamElementCoords);
+    
+    int y1, y2, avgY, yExtreme, high, low, verticalCenter, verticalShift;
+    double xr, verticalShiftFactor;
+    
+    // loop
+    int i;
+    
+    // position x for the stem (normal and cue size)
+    int stemX[2];
+    
+    // For slope calculation and linear regression
+    double s_x = 0.0; // sum of all x(n) for n in beamElementCoord
+    double s_y = 0.0; // sum of all y(n)
+    double s_xy = 0.0; // sum of (x(n) * y(n))
+    double s_x2 = 0.0; // sum of all x(n)^2
+    double s_y2 = 0.0; // sum of all y(n)^2
+    
+    /******************************************************************/
+    // initialization
+    
+    high = avgY = 0.0;
+    low = -VRV_UNSET;
+    params->m_verticalBoost = 0.0;
+    
+    verticalShiftFactor = 3.0;
+    verticalCenter = staff->GetDrawingY() - (m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * 2); //center point of the staff
+    yExtreme = verticalCenter; //value of farthest y point on the staff from verticalCenter minus verticalCenter; used if beamHasChord = ON
+    
+    int last = elementCount - 1;
+    
+    // x-offset values for stem bases, dx[y] where y = element->m_cueSize
+    stemX[0] =  m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, false) / 2 - (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
+    stemX[1] =  m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, true) / 2 - (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
+    
+    /******************************************************************/
+    // Calculate the extreme values
+    
+    int yMax = 0, yMin = 0;
+    int curY;
+    // elementCount holds the last one
+    for (i = 0; i < elementCount; i++) {
+        
+        
+        if ((*beamElementCoords).at(i)->m_element->Is() == CHORD) {
+            Chord *chord = dynamic_cast<Chord*>((*beamElementCoords).at(i)->m_element);
+            assert( chord );
+            chord->GetYExtremes(&yMax, &yMin);
+            (*beamElementCoords).at(i)->m_yTop = yMax;
+            (*beamElementCoords).at(i)->m_yBottom = yMin;
+            
+            avgY += (*beamElementCoords).at(i)->m_y + ((yMax - yMin) / 2);
+            
+            // highest and lowest value;
+            high= std::max(yMax, high);
+            low = std::min(yMin, low);
+        }
+        else {
+            (*beamElementCoords).at(i)->m_y = (*beamElementCoords).at(i)->m_element->GetDrawingY();
+            
+            // highest and lowest value;
+            high= std::max((*beamElementCoords).at(i)->m_y, high);
+            low = std::min((*beamElementCoords).at(i)->m_y, low);
+            
+            curY = (*beamElementCoords).at(i)->m_element->GetDrawingY();
+            (*beamElementCoords).at(i)->m_y = curY;
+            (*beamElementCoords).at(i)->m_yTop = curY;
+            (*beamElementCoords).at(i)->m_yBottom = curY;
+            avgY += (*beamElementCoords).at(i)->m_y;
+        }
+    }
+    
+    /******************************************************************/
+    // Set the stem direction
+    
+    yExtreme = (abs(high - verticalCenter) > abs(low - verticalCenter) ? high : low);
+    avgY /= elementCount;
+    
+    // If we have one stem direction in the beam, then don't look at the layer
+    if (params->m_stemDir == STEMDIRECTION_NONE) params->m_stemDir = layer->GetDrawingStemDir(); // force layer direction if it exists
+    
+    // Automatic stem direction if nothing in the notes or in the layer
+    if (params->m_stemDir == STEMDIRECTION_NONE) {
+        if (params->m_beamHasChord) params->m_stemDir = (yExtreme < verticalCenter) ?  STEMDIRECTION_up : STEMDIRECTION_down; //if it has a chord, go by the most extreme position
+        else params->m_stemDir = (avgY <  verticalCenter) ? STEMDIRECTION_up : STEMDIRECTION_down; //otherwise go by average
+    }
+    
+    if (params->m_stemDir == STEMDIRECTION_up) { //set stem direction for all the notes
+        for (i = 0; i < elementCount; i++) {
+            (*beamElementCoords).at(i)->m_y = (*beamElementCoords).at(i)->m_yTop;
+        }
+    }
+    else {
+        for (i = 0; i < elementCount; i++) {
+            (*beamElementCoords).at(i)->m_y = (*beamElementCoords).at(i)->m_yBottom;
+        }
+    }
+    
+    params->m_beamWidthBlack = m_doc->GetDrawingBeamWidth(staff->m_drawingStaffSize, params->m_cueSize);
+    params->m_beamWidthWhite = m_doc->GetDrawingBeamWhiteWidth(staff->m_drawingStaffSize, params->m_cueSize);
+    params->m_beamWidth = params->m_beamWidthBlack + params->m_beamWidthWhite;
+    
+    /******************************************************************/
+    // Calculate the slope doing a linear regression
+    
+    // The vertical shift depends on the shortestDur value we have in the beam
+    verticalShift = ((params->m_shortestDur-DUR_8)*(params->m_beamWidth));
+    
+    //if the beam has smaller-size notes
+    if ((*beamElementCoords).at(last)->m_element->IsCueSize()) {
+        verticalShift += m_doc->GetDrawingUnit(staff->m_drawingStaffSize)*5;
+    }
+    else {
+        verticalShift += (params->m_shortestDur > DUR_8) ?
+        m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * verticalShiftFactor :
+        m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * (verticalShiftFactor + 0.5);
+    }
+    
+    // swap x position and verticalShift direction with stem down
+    if (params->m_stemDir == STEMDIRECTION_down) {
+        stemX[0] = -stemX[0];
+        stemX[1] = -stemX[1];
+        verticalShift = -verticalShift;
+    }
+    
+    for (i=0; i<elementCount; i++)
+    {
+        //change the stem dir for all objects
+        if ( (*beamElementCoords).at(i)->m_element->Is() == NOTE ) {
+            ((Note*)(*beamElementCoords).at(i)->m_element)->SetDrawingStemDir(params->m_stemDir);
+        }
+        else if ( (*beamElementCoords).at(i)->m_element->Is() == CHORD ) {
+            ((Chord*)(*beamElementCoords).at(i)->m_element)->SetDrawingStemDir(params->m_stemDir);
+        }
+        
+        (*beamElementCoords).at(i)->m_yBeam = (*beamElementCoords).at(i)->m_y + verticalShift;
+        (*beamElementCoords).at(i)->m_x +=  stemX[params->m_cueSize];
+        
+        s_y += (*beamElementCoords).at(i)->m_yBeam;
+        s_y2 += (*beamElementCoords).at(i)->m_yBeam * (*beamElementCoords).at(i)->m_yBeam;
+        s_x += (*beamElementCoords).at(i)->m_x;
+        s_x2 += (*beamElementCoords).at(i)->m_x * (*beamElementCoords).at(i)->m_x;
+        s_xy += (*beamElementCoords).at(i)->m_x * (*beamElementCoords).at(i)->m_yBeam;
+    }
+    
+    y1 = elementCount * s_xy - s_x * s_y;
+    xr = elementCount * s_x2 - s_x * s_x;
+    
+    // Prevent division by 0
+    if (y1 && xr) {
+        params->m_beamSlope = y1 / xr;
+    }
+    else {
+        params->m_beamSlope = 0.0;
+    }
+    
+    /* Correction esthetique : */
+    if (fabs(params->m_beamSlope) < m_doc->m_drawingBeamMinSlope ) params->m_beamSlope = 0.0;
+    if (fabs(params->m_beamSlope) > m_doc->m_drawingBeamMaxSlope ) params->m_beamSlope = (params->m_beamSlope > 0) ? m_doc->m_drawingBeamMaxSlope : - m_doc->m_drawingBeamMaxSlope;
+    /* pente correcte: entre 0 et env 0.4 (0.2 a 0.4) */
+    
+    params->m_startingY = (s_y - params->m_beamSlope * s_x) / elementCount;
+    
+    /******************************************************************/
+    // Calculate the stem lengths
+    
+    double oldYPos; //holds y position before calculation to determine if beam needs extra height
+    double expectedY;
+    for ( i=0; i<elementCount; i++ ) {
+        oldYPos = (*beamElementCoords).at(i)->m_yBeam;
+        expectedY = params->m_startingY + params->m_verticalBoost + params->m_beamSlope * (*beamElementCoords).at(i)->m_x;
+        
+        //if the stem is not long enough, add extra stem length needed to all members of the beam
+        if ((params->m_stemDir == STEMDIRECTION_up && (oldYPos > expectedY)) || (params->m_stemDir == STEMDIRECTION_down && (oldYPos < expectedY))) {
+            params->m_verticalBoost += oldYPos - expectedY;
+        }
+    }
+    
+    for (i=0; i<elementCount; i++)
+    {
+        (*beamElementCoords).at(i)->m_yBeam = params->m_startingY + params->m_verticalBoost + params->m_beamSlope * (*beamElementCoords).at(i)->m_x;
+    }
+    
+    for (i=0; i<elementCount; i++)
+    {
+        if (params->m_stemDir == STEMDIRECTION_up) {
+            y1 = (*beamElementCoords).at(i)->m_yBeam - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+            y2 = (*beamElementCoords).at(i)->m_yBottom + m_doc->GetDrawingUnit(staff->m_drawingStaffSize)/4;
+        }
+        else {
+            y1 = (*beamElementCoords).at(i)->m_yBeam + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
+            y2 = (*beamElementCoords).at(i)->m_yTop - m_doc->GetDrawingUnit(staff->m_drawingStaffSize)/4;
+        }
+        
+        // All notes and chords get their stem value stored
+        LayerElement *el = (*beamElementCoords).at(i)->m_element;
+        if ( (el->Is() == NOTE) || (el->Is() == CHORD) ) {
+            StemmedDrawingInterface *interface = dynamic_cast<StemmedDrawingInterface*>(el);
+            assert(interface);
+            
+            interface->SetDrawingStemDir(params->m_stemDir);
+            interface->SetDrawingStemStart(Point((*beamElementCoords).at(i)->m_x, y2));
+            interface->SetDrawingStemEnd(Point((*beamElementCoords).at(i)->m_x, y1));
+        }
+    }
+}
+    
 } // namespace vrv

From 0d61d34d65787240ea024cb938819c672878a247 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 28 Oct 2015 11:10:17 +0100
Subject: [PATCH 78/85] Beamed fTrem (WIP)

---
 include/vrv/layerelement.h |   2 +-
 src/layerelement.cpp       |   2 +-
 src/view_beam.cpp          | 141 +++++++++++++++++++++++++++++--------
 src/view_element.cpp       |   6 +-
 4 files changed, 116 insertions(+), 35 deletions(-)

diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index 1648b2081b6..3556e49cfe2 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -80,7 +80,7 @@ class LayerElement: public DocObject
     /** Return true if the element is a note or a note child and the note has a @grace */
     bool IsCueSize();
     /** Return true if the element is a note or a chord within a fTrem */
-    bool IsInfTrem();
+    bool IsInFTrem();
     /** Return true if the element has to be aligned horizontally */
     virtual bool HasToBeAligned() { return false; };
     /** 
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 2a1f4b88e17..8fbe576c0fe 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -107,7 +107,7 @@ bool LayerElement::IsGraceNote()
     return (note && note->HasGrace());
 }
     
-bool LayerElement::IsInfTrem()
+bool LayerElement::IsInFTrem()
 {
     if ((this->Is() != NOTE) || (this->Is() == CHORD)) return false;
     return (this->GetFirstParent( FTREM, MAX_FTREM_DEPTH));
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 99307a49276..01bf3c41263 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -227,7 +227,7 @@ void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
         DrawObliquePolygon (dc, x1, y1, x2, y2, polygonHeight);
 		y1 += polygonHeight; y2 += polygonHeight;
 
-        // s_y must == 0 for accelerando beams
+        // dy1 must == 0 for accelerando beams
 		if (!dy1) y1 += (params.m_beamWidthBlack * shiftY) * -1;
 		else y1 += dy1 * params.m_beamWidthWhite;
         
@@ -347,11 +347,28 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     assert( staff );
     assert( measure );
     
+    
+    // temporary coordinates
+    int x1, x2, y1, y2;
+    
+    // temporary variables
+    int shiftY;
+    int fullBars, polygonHeight;
+    double dy1, dy2;
+    
+    // loop
+    int i, j;
+    
     FTrem *fTrem = dynamic_cast<FTrem*>(element);
     assert( fTrem );
     
+    ArrayOfBeamElementCoords beamElementCoords;
     BeamElementCoord firstElement;
     BeamElementCoord secondElement;
+    beamElementCoords.push_back(&firstElement);
+    beamElementCoords.push_back(&secondElement);
+    
+    int elementCount = 2;
     
     ListOfObjects* fTremChildren = fTrem->GetList(fTrem);
     
@@ -367,15 +384,103 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     secondElement.m_element = dynamic_cast<LayerElement*>(fTremChildren->back());
     // fTrem list should contain only DurationInterface objects
     assert( dynamic_cast<DurationInterface*>(secondElement.m_element) );
-        // Should we assert this at the beginning?
+    // Should we assert this at the beginning?
     if (firstElement.m_element == secondElement.m_element) {
         return;
     }
     
+    BeamParams params;
+    params.m_changingDur = OFF;
+    params.m_beamHasChord = OFF;
+    params.m_hasMultipleStemDir = OFF;
+    params.m_cueSize = OFF;
+    params.m_shortestDur = DUR_8;
+    params.m_stemDir = STEMDIRECTION_NONE;
+    
+    Chord *childChord1 = NULL;
+    Chord *childChord2 = NULL;
+    
+    if (firstElement.m_element->Is() == CHORD) {
+        childChord1 = dynamic_cast<Chord*>(firstElement.m_element);
+        params.m_beamHasChord = ON;
+    }
+    if (secondElement.m_element->Is() == CHORD) {
+        childChord2 = dynamic_cast<Chord*>(secondElement.m_element);
+        params.m_beamHasChord = ON;
+    }
+    
+    firstElement.m_x = firstElement.m_element->GetDrawingX();
+    secondElement.m_x = secondElement.m_element->GetDrawingX();
+    
+    // For now look at the stemDir only on the first note
+    assert( dynamic_cast<AttStemmed*>(firstElement.m_element) );
+    params.m_stemDir =  dynamic_cast<AttStemmed*>(firstElement.m_element)->GetStemDir();
+    
+    // We look only at the first note for checking if cuesized. Somehow arbitrarily
+    params.m_cueSize = firstElement.m_element->IsCueSize();
+    
+    /******************************************************************/
+    // Calculate the beam slope
+    
+    CalcBeam(layer, staff, &beamElementCoords, elementCount, &params);
+    
+    
     dc->StartGraphic( element, "", element->GetUuid() );
     
     DrawLayerChildren(dc, fTrem, layer, staff, measure);
     
+    
+    /******************************************************************/
+    // Draw the stems and the beam full bars
+    
+    for (i=0; i<elementCount; i++)
+    {
+        LayerElement *el = beamElementCoords.at(i)->m_element;
+        if( ( (el->Is() == NOTE) && !dynamic_cast<Note*>(el)->IsChordTone()) || (el->Is() == CHORD) ) {
+            StemmedDrawingInterface *interface = dynamic_cast<StemmedDrawingInterface*>(el);
+            assert(interface);
+            
+            DrawVerticalLine (dc, interface->GetDrawingStemStart().y, interface->GetDrawingStemEnd().y,
+                              interface->GetDrawingStemStart().x, m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize));
+        }
+    }
+    
+    // Number of bars to draw - if we do not have changing values, draw
+    // the number of bars according to the shortestDur value. Otherwise draw
+    // only one bar and the others will be drawn separately.
+    fullBars =  1;
+    
+    // Adjust the x position of the first and last element for taking into account the stem width
+    firstElement.m_x -= (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
+    secondElement.m_x += (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
+    
+    // Shift direction
+    shiftY = (params.m_stemDir == STEMDIRECTION_down) ? 1.0 : -1.0;
+    
+    y1 = firstElement.m_yBeam;
+    y2 = secondElement.m_yBeam;
+    
+    x1 = firstElement.m_x;
+    x2 = secondElement.m_x;
+    
+    dy1 = shiftY;
+    dy2 = shiftY;
+    
+    // For acc and rit beam (see AttBeamingVis set
+    // s_y = 0 and s_y2 = 0 respectively
+    
+    for (j = 0; j < fullBars ; j++) {
+        polygonHeight = params.m_beamWidthBlack * shiftY;
+        DrawObliquePolygon (dc, x1, y1, x2, y2, polygonHeight);
+        y1 += polygonHeight;
+        y2 += polygonHeight;
+        y1 += dy1 * params.m_beamWidthWhite;
+        y2 += dy2 * params.m_beamWidthWhite;
+    }
+
+    
+    /*
+    
     data_STEMDIRECTION stemDir1 = STEMDIRECTION_NONE;
     data_STEMDIRECTION stemDir2 = STEMDIRECTION_NONE;
     Point stemPoint1, stemPoint2;
@@ -386,33 +491,6 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     char slashCount;
     int x1, y1, x2, y2, yUnused;
     
-    Chord *childChord1 = NULL;
-    Note *childNote1 = NULL;
-    LayerElement *childElement1 = NULL;
-    Chord *childChord2 = NULL;
-    Note *childNote2 = NULL;
-    LayerElement *childElement2 = NULL;
-    
-    if (firstElement.m_element->Is() == CHORD) {
-        childChord1 = dynamic_cast<Chord*>(firstElement.m_element);
-        childElement1 = childChord1;
-    }
-    else {
-        childNote1 = dynamic_cast<Note*>(firstElement.m_element);
-        childElement1 = childNote1;
-    }
-    assert(childChord1 || childNote1);
-    // end
-    if (secondElement.m_element->Is() == CHORD) {
-        childChord2 = dynamic_cast<Chord*>(secondElement.m_element);
-        childElement2 = childChord2;
-    }
-    else {
-        childNote2 = dynamic_cast<Note*>(secondElement.m_element);
-        childElement2 = childNote2;
-    }
-    assert(childChord2 || childNote2);
-    
     slashCount = fTrem->GetSlash();
     
     // Get from the first chord or note child
@@ -503,6 +581,7 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
         y1 += step;
         y2 += step;
     }
+    */
     
     dc->EndGraphic(element, this);
 }
@@ -617,11 +696,11 @@ void View::CalcBeam(Layer *layer, Staff *staff, const ArrayOfBeamElementCoords *
     // Calculate the slope doing a linear regression
     
     // The vertical shift depends on the shortestDur value we have in the beam
-    verticalShift = ((params->m_shortestDur-DUR_8)*(params->m_beamWidth));
+    verticalShift = ((params->m_shortestDur - DUR_8) * (params->m_beamWidth));
     
     //if the beam has smaller-size notes
     if ((*beamElementCoords).at(last)->m_element->IsCueSize()) {
-        verticalShift += m_doc->GetDrawingUnit(staff->m_drawingStaffSize)*5;
+        verticalShift += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 5;
     }
     else {
         verticalShift += (params->m_shortestDur > DUR_8) ?
diff --git a/src/view_element.cpp b/src/view_element.cpp
index 22abbfbf86e..ecfa184575b 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -224,6 +224,7 @@ void View::DrawNote ( DeviceContext *dc, LayerElement *element, Layer *layer, St
     
     Chord *inChord = note->IsChordTone();
     Beam *inBeam = note->IsInBeam();
+    bool inFTrem = note->IsInFTrem();
     bool drawingCueSize = note->HasGrace();
     
 	int staffSize = staff->m_drawingStaffSize;
@@ -342,7 +343,7 @@ void View::DrawNote ( DeviceContext *dc, LayerElement *element, Layer *layer, St
         
 		DrawSmuflCode( dc, xNote, noteY, fontNo,  staff->m_drawingStaffSize, drawingCueSize );
 
-		if (!(inBeam && drawingDur > DUR_4) && !inChord) {
+		if (!(inBeam && drawingDur > DUR_4) && !inFTrem && !inChord) {
             DrawStem(dc, note, staff, note->GetDrawingStemDir(), radius, xStem, noteY);
         }
 
@@ -1107,6 +1108,7 @@ void View::DrawChord( DeviceContext *dc, LayerElement *element, Layer *layer, St
     int fullUnit = m_doc->GetDrawingUnit(staffSize);
     
     Beam *inBeam = chord->IsInBeam();
+    bool inFTrem = chord->IsInFTrem();
     
     /************ Ledger line reset ************/
     
@@ -1118,7 +1120,7 @@ void View::DrawChord( DeviceContext *dc, LayerElement *element, Layer *layer, St
     int drawingDur = chord->GetDur();
     
     // (unless we're in a beam)
-    if (!inBeam) {
+    if (!inBeam && !inFTrem) {
         int yMax, yMin;
         chord->GetYExtremes(&yMax, &yMin);
         

From 48e3c839291bdd7db302fee3b4c932e09908adbe Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 28 Oct 2015 12:56:26 +0100
Subject: [PATCH 79/85] Take fTrem slash number into account

---
 include/vrv/note.h    |   5 --
 src/note.cpp          |  22 +-----
 src/view_beam.cpp     | 170 +++++++++++-------------------------------
 src/view_element.cpp  |  13 ++--
 src/view_mensural.cpp |  15 ++--
 5 files changed, 61 insertions(+), 164 deletions(-)

diff --git a/include/vrv/note.h b/include/vrv/note.h
index a375d9c851c..f05e5872ade 100644
--- a/include/vrv/note.h
+++ b/include/vrv/note.h
@@ -100,11 +100,6 @@ class Note: public LayerElement, public StemmedDrawingInterface, public Duration
     int GetDrawingDur( );
     bool IsClusterExtreme( ); //used to find if is the highest or lowest note in a cluster
     ///@}
-    
-    /**
-     * Calculate the drawing stem direction looking a potential beam or chord parents or the @stem.dir
-     */
-    bool HasDrawingStemDir();
 
     /**
      * Returns a single integer representing pitch and octave.
diff --git a/src/note.cpp b/src/note.cpp
index 3bf291e7f33..68e8b7ab68c 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -167,27 +167,7 @@ bool Note::IsClusterExtreme()
     if (this == cluster->at(cluster->size() - 1)) return true;
     else return false;
 }
-
-bool Note::HasDrawingStemDir()
-{
-    // In chord, the value is set in Chord::SetDrawingStemDir
-    Chord* chordParent = dynamic_cast<Chord*>(this->GetFirstParent( CHORD, MAX_CHORD_DEPTH));
-    if(chordParent) {
-        return true;
-    }
-    // In beam, the value is tet in View::DrawBeam - however, we need to check that the note is part of the beam
-    // It is not necessary the case with grace notes
-    Beam* beamParent = dynamic_cast<Beam*>(this->GetFirstParent( BEAM, MAX_BEAM_DEPTH));
-    if (beamParent && (beamParent->GetListIndex(this) > -1)) {
-        return true;
-    }
-    else if (this->HasStemDir()) {
-        this->SetDrawingStemDir(this->GetStemDir());
-        return true;
-    }
-    return false;
-}
-    
+ 
 //----------------------------------------------------------------------------
 // Functors methods
 //----------------------------------------------------------------------------
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 01bf3c41263..c27b2af4c1b 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -168,7 +168,7 @@ void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     params.m_cueSize = (*beamElementCoords).at(last)->m_element->IsCueSize();
 
     /******************************************************************/
-    // Calculate the beam slope
+    // Calculate the beam slope and position
     
     CalcBeam(layer, staff, beamElementCoords, elementCount, &params);
     
@@ -397,6 +397,12 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     params.m_shortestDur = DUR_8;
     params.m_stemDir = STEMDIRECTION_NONE;
     
+    // We look only at the first one for the duration since both are expected to be the same
+    assert( dynamic_cast<AttDurationMusical*>(firstElement.m_element) );
+    int dur =  dynamic_cast<AttDurationMusical*>(firstElement.m_element)->GetDur();
+    // We should adjust params.m_shortestDur depending on the number of slashes and if we want the
+    // bars to be closer or further away from the note heads
+    
     Chord *childChord1 = NULL;
     Chord *childChord2 = NULL;
     
@@ -408,10 +414,7 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
         childChord2 = dynamic_cast<Chord*>(secondElement.m_element);
         params.m_beamHasChord = ON;
     }
-    
-    firstElement.m_x = firstElement.m_element->GetDrawingX();
-    secondElement.m_x = secondElement.m_element->GetDrawingX();
-    
+
     // For now look at the stemDir only on the first note
     assert( dynamic_cast<AttStemmed*>(firstElement.m_element) );
     params.m_stemDir =  dynamic_cast<AttStemmed*>(firstElement.m_element)->GetStemDir();
@@ -419,36 +422,46 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     // We look only at the first note for checking if cuesized. Somehow arbitrarily
     params.m_cueSize = firstElement.m_element->IsCueSize();
     
+    // x positions
+    firstElement.m_x = firstElement.m_element->GetDrawingX();
+    secondElement.m_x = secondElement.m_element->GetDrawingX();
+    
     /******************************************************************/
-    // Calculate the beam slope
+    // Calculate the beam slope and position
     
     CalcBeam(layer, staff, &beamElementCoords, elementCount, &params);
     
     
+    /******************************************************************/
+    // Start the grahic
+    
     dc->StartGraphic( element, "", element->GetUuid() );
     
-    DrawLayerChildren(dc, fTrem, layer, staff, measure);
+    /******************************************************************/
+    // Draw the children
     
+    DrawLayerChildren(dc, fTrem, layer, staff, measure);
     
     /******************************************************************/
-    // Draw the stems and the beam full bars
-    
-    for (i=0; i<elementCount; i++)
-    {
-        LayerElement *el = beamElementCoords.at(i)->m_element;
-        if( ( (el->Is() == NOTE) && !dynamic_cast<Note*>(el)->IsChordTone()) || (el->Is() == CHORD) ) {
-            StemmedDrawingInterface *interface = dynamic_cast<StemmedDrawingInterface*>(el);
-            assert(interface);
-            
-            DrawVerticalLine (dc, interface->GetDrawingStemStart().y, interface->GetDrawingStemEnd().y,
-                              interface->GetDrawingStemStart().x, m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize));
+    // Draw the stems and the bars
+    
+    if (dur > DUR_1) {
+        for (i=0; i<elementCount; i++)
+        {
+            LayerElement *el = beamElementCoords.at(i)->m_element;
+            if( ( (el->Is() == NOTE) && !dynamic_cast<Note*>(el)->IsChordTone()) || (el->Is() == CHORD) ) {
+                StemmedDrawingInterface *interface = dynamic_cast<StemmedDrawingInterface*>(el);
+                assert(interface);
+                DrawVerticalLine (dc, interface->GetDrawingStemStart().y, interface->GetDrawingStemEnd().y,
+                                  interface->GetDrawingStemStart().x, m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize));
+            }
         }
     }
     
     // Number of bars to draw - if we do not have changing values, draw
     // the number of bars according to the shortestDur value. Otherwise draw
     // only one bar and the others will be drawn separately.
-    fullBars =  1;
+    fullBars = fTrem->GetSlash();
     
     // Adjust the x position of the first and last element for taking into account the stem width
     firstElement.m_x -= (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize)) / 2;
@@ -456,6 +469,7 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     
     // Shift direction
     shiftY = (params.m_stemDir == STEMDIRECTION_down) ? 1.0 : -1.0;
+    polygonHeight = params.m_beamWidthBlack * shiftY;
     
     y1 = firstElement.m_yBeam;
     y2 = secondElement.m_yBeam;
@@ -466,123 +480,27 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     dy1 = shiftY;
     dy2 = shiftY;
     
-    // For acc and rit beam (see AttBeamingVis set
-    // s_y = 0 and s_y2 = 0 respectively
+    int space = m_doc->GetDrawingBeamWidth(staff->m_drawingStaffSize, params.m_cueSize);
+    // for non stem notes the bar should be shortenend
+    if (dur < DUR_2) {
+        x1 += 2 * space;
+        x2 -= 2 * space;
+    }
     
     for (j = 0; j < fullBars ; j++) {
-        polygonHeight = params.m_beamWidthBlack * shiftY;
         DrawObliquePolygon (dc, x1, y1, x2, y2, polygonHeight);
         y1 += polygonHeight;
         y2 += polygonHeight;
         y1 += dy1 * params.m_beamWidthWhite;
         y2 += dy2 * params.m_beamWidthWhite;
-    }
-
-    
-    /*
-    
-    data_STEMDIRECTION stemDir1 = STEMDIRECTION_NONE;
-    data_STEMDIRECTION stemDir2 = STEMDIRECTION_NONE;
-    Point stemPoint1, stemPoint2;
-    // for these we look only at the first one since we assume both to be the same
-    int drawingDur;
-    bool drawingCueSize = false;
-    //
-    char slashCount;
-    int x1, y1, x2, y2, yUnused;
-    
-    slashCount = fTrem->GetSlash();
-    
-    // Get from the first chord or note child
-    if (childChord1) {
-        stemDir1 = childChord1->GetDrawingStemDir();
-        stemPoint1 = childChord1->GetDrawingStemStart();
-        // duration of the first note/chord only
-        drawingDur = childChord1->GetDur();
-    }
-    else {
-        drawingCueSize = childNote1->IsCueSize();
-        stemDir1 = childNote1->GetDrawingStemDir();
-        stemPoint1 = childNote1->GetDrawingStemStart();
-        drawingDur = childNote1->GetDur();
-    }
-    
-    // Get from the second chord or note child
-    if (childChord2) {
-        stemDir2 = childChord2->GetDrawingStemDir();
-        stemPoint2 = childChord2->GetDrawingStemStart();
-    }
-    else {
-        stemDir2 = childNote2->GetDrawingStemDir();
-        stemPoint2 = childNote2->GetDrawingStemStart();
-    }
-    
-    int space = m_doc->GetDrawingBeamWhiteWidth(staff->m_drawingStaffSize, drawingCueSize);
-    int height = m_doc->GetDrawingBeamWidth(staff->m_drawingStaffSize, drawingCueSize);
-    int step = height + space;
-    
-    if (stemDir1 == STEMDIRECTION_up) {
-        if (drawingDur > DUR_1) {
-            y1 = childElement1->GetDrawingTop(m_doc, staff->m_drawingStaffSize) - 1 * height;
-            x1 = stemPoint1.x;
-        }
-        else {
-            if (childNote1) y1 = childNote1->GetDrawingY();
-            else childChord1->GetYExtremes(&y1, &yUnused);
-            y1 += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6;
-            x1 = childElement1->GetDrawingX();
-        }
-        step = -step;
-    }
-    else {
-        if (drawingDur > DUR_1) {
-            y1 = childElement1->GetDrawingBottom(m_doc, staff->m_drawingStaffSize);
-            x1 = stemPoint1.x + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-        }
-        else {
-            if (childNote1) y1 = childNote1->GetDrawingY();
-            else childChord1->GetYExtremes(&yUnused, &y1);
-            y1 -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6;
-            x1 = childElement1->GetDrawingX();
-        }
-    }
-    
-    if (stemDir2 == STEMDIRECTION_up) {
-        if (drawingDur > DUR_1) {
-            y2 = childElement2->GetDrawingTop(m_doc, staff->m_drawingStaffSize) - 1 * height;
-            x2 = stemPoint2.x;
-        }
-        else {
-            if (childNote2) y2 = childNote2->GetDrawingY();
-            else childChord2->GetYExtremes(&y2, &yUnused);
-            y2 += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6;
-            x2 = childElement2->GetDrawingX();
-        }
-    }
-    else {
-        if (drawingDur > DUR_1) {
-            y2 = childElement2->GetDrawingBottom(m_doc, staff->m_drawingStaffSize);
-            x2 = stemPoint2.x + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-        }
-        else {
-            if (childNote2) y2 = childNote2->GetDrawingY();
-            else childChord2->GetYExtremes(&yUnused, &y2);
-            y2 -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6;
-            x2 = childElement2->GetDrawingX();
+        
+        // shorten the bar after having drawn the first one (but the first one)
+        if ((j == 0) && (dur > DUR_1)) {
+            x1 += space;
+            x2 -= space;
         }
     }
     
-    x1 += height;
-    x2 -= height;
-    
-    int s;
-    for (s = 0; s < slashCount; s++) {
-        DrawObliquePolygon (dc, x1, y1, x2, y2, height);
-        y1 += step;
-        y2 += step;
-    }
-    */
-    
     dc->EndGraphic(element, this);
 }
     
diff --git a/src/view_element.cpp b/src/view_element.cpp
index ecfa184575b..00b12cf0dbf 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -257,8 +257,11 @@ void View::DrawNote ( DeviceContext *dc, LayerElement *element, Layer *layer, St
     /************** Stem/notehead direction: **************/
     
     verticalCenter = staffY - m_doc->GetDrawingDoubleUnit(staffSize)*2;
-    if (!note->HasDrawingStemDir()) {
-        if ( layer->GetDrawingStemDir() != STEMDIRECTION_NONE) {
+    if (!inChord && !inBeam && !inFTrem) {
+        if (note->HasStemDir()) {
+            note->SetDrawingStemDir(note->GetStemDir());
+        }
+        else if ( layer->GetDrawingStemDir() != STEMDIRECTION_NONE) {
             note->SetDrawingStemDir( layer->GetDrawingStemDir() );
         }
         else {
@@ -1119,15 +1122,15 @@ void View::DrawChord( DeviceContext *dc, LayerElement *element, Layer *layer, St
     
     int drawingDur = chord->GetDur();
     
-    // (unless we're in a beam)
+    // (unless we're in a beam or in an fTrem)
     if (!inBeam && !inFTrem) {
         int yMax, yMin;
         chord->GetYExtremes(&yMax, &yMin);
         
-        if ( chord->HasStemDir() ) {
+        if (chord->HasStemDir()) {
             chord->SetDrawingStemDir(chord->GetStemDir());
         }
-        else if ( layer->GetDrawingStemDir() != STEMDIRECTION_NONE) {
+        else if (layer->GetDrawingStemDir() != STEMDIRECTION_NONE) {
             chord->SetDrawingStemDir(layer->GetDrawingStemDir());
         }
         else {
diff --git a/src/view_mensural.cpp b/src/view_mensural.cpp
index 4ddd84af603..86090600be1 100644
--- a/src/view_mensural.cpp
+++ b/src/view_mensural.cpp
@@ -73,13 +73,14 @@ void View::DrawMensuralNote ( DeviceContext *dc, LayerElement *element, Layer *l
     /************** Stem/notehead direction: **************/
     
     verticalCenter = staffY - m_doc->GetDrawingDoubleUnit(staffSize)*2;
-    if  (!note->HasDrawingStemDir()) {
-        if ( layer->GetDrawingStemDir() != STEMDIRECTION_NONE) {
-            note->SetDrawingStemDir( layer->GetDrawingStemDir() );
-        }
-        else {
-            note->SetDrawingStemDir((noteY >= verticalCenter) ? STEMDIRECTION_down : STEMDIRECTION_up);
-        }
+    if  (note->HasStemDir()) {
+        note->SetDrawingStemDir(note->GetStemDir());
+    }
+    else if ( layer->GetDrawingStemDir() != STEMDIRECTION_NONE) {
+        note->SetDrawingStemDir( layer->GetDrawingStemDir() );
+    }
+    else {
+        note->SetDrawingStemDir((noteY >= verticalCenter) ? STEMDIRECTION_down : STEMDIRECTION_up);
     }
     
     xNote = xStem - radius;

From 215f725f5c41facfb666d309453cfc160f2a7a2f Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 28 Oct 2015 13:46:28 +0100
Subject: [PATCH 80/85] Fixing bug with beam stem not connecting with the staff
 center

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

diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index c27b2af4c1b..83a464f146a 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -633,7 +633,7 @@ void View::CalcBeam(Layer *layer, Staff *staff, const ArrayOfBeamElementCoords *
         verticalShift = -verticalShift;
     }
     
-    for (i=0; i<elementCount; i++)
+    for (i = 0; i < elementCount; i++)
     {
         //change the stem dir for all objects
         if ( (*beamElementCoords).at(i)->m_element->Is() == NOTE ) {
@@ -674,9 +674,10 @@ void View::CalcBeam(Layer *layer, Staff *staff, const ArrayOfBeamElementCoords *
     /******************************************************************/
     // Calculate the stem lengths
     
+    // first check that the stem length is long enough (to be improved?)
     double oldYPos; //holds y position before calculation to determine if beam needs extra height
     double expectedY;
-    for ( i=0; i<elementCount; i++ ) {
+    for (i = 0; i < elementCount; i++ ) {
         oldYPos = (*beamElementCoords).at(i)->m_yBeam;
         expectedY = params->m_startingY + params->m_verticalBoost + params->m_beamSlope * (*beamElementCoords).at(i)->m_x;
         
@@ -685,21 +686,35 @@ void View::CalcBeam(Layer *layer, Staff *staff, const ArrayOfBeamElementCoords *
             params->m_verticalBoost += oldYPos - expectedY;
         }
     }
-    
-    for (i=0; i<elementCount; i++)
-    {
-        (*beamElementCoords).at(i)->m_yBeam = params->m_startingY + params->m_verticalBoost + params->m_beamSlope * (*beamElementCoords).at(i)->m_x;
+    for (i = 0; i < elementCount; i++) {
+        (*beamElementCoords).at(i)->m_yBeam =  params->m_startingY + params->m_verticalBoost + params->m_beamSlope * (*beamElementCoords).at(i)->m_x;
+    }
+
+    // then check that the stem length reaches the center for the staff
+    double minDistToCenter = -VRV_UNSET;
+    for (i = 0; i < elementCount; i++ ) {
+        if ((params->m_stemDir == STEMDIRECTION_up) && ((*beamElementCoords).at(i)->m_yBeam - verticalCenter < minDistToCenter) ) {
+            minDistToCenter = (*beamElementCoords).at(i)->m_yBeam - verticalCenter;
+        }
+        else if ((params->m_stemDir == STEMDIRECTION_down) && (verticalCenter - (*beamElementCoords).at(i)->m_yBeam < minDistToCenter) ) {
+            minDistToCenter = verticalCenter - (*beamElementCoords).at(i)->m_yBeam;
+        }
+    }
+    minDistToCenter += (params->m_beamWidthBlack / 2) + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) / 4;
+    if (minDistToCenter < 0) {
+        for (i = 0; i < elementCount; i++) {
+            (*beamElementCoords).at(i)->m_yBeam +=  (params->m_stemDir == STEMDIRECTION_down) ? minDistToCenter : -minDistToCenter;
+        }
     }
     
-    for (i=0; i<elementCount; i++)
-    {
+    for (i=0; i<elementCount; i++) {
         if (params->m_stemDir == STEMDIRECTION_up) {
             y1 = (*beamElementCoords).at(i)->m_yBeam - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-            y2 = (*beamElementCoords).at(i)->m_yBottom + m_doc->GetDrawingUnit(staff->m_drawingStaffSize)/4;
+            y2 = (*beamElementCoords).at(i)->m_yBottom + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) / 4;
         }
         else {
             y1 = (*beamElementCoords).at(i)->m_yBeam + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-            y2 = (*beamElementCoords).at(i)->m_yTop - m_doc->GetDrawingUnit(staff->m_drawingStaffSize)/4;
+            y2 = (*beamElementCoords).at(i)->m_yTop - m_doc->GetDrawingUnit(staff->m_drawingStaffSize) / 4;
         }
         
         // All notes and chords get their stem value stored

From a907fd05db1da1e24b21c74e97918be6fdead5c9 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 28 Oct 2015 16:14:43 +0100
Subject: [PATCH 81/85] Removing orphan define

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

diff --git a/src/view_element.cpp b/src/view_element.cpp
index 00b12cf0dbf..4f3c18e95fb 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -430,8 +430,6 @@ void View::DrawNote ( DeviceContext *dc, LayerElement *element, Layer *layer, St
     }
 }
     
-#define STANDARD_STEMLENGTH 7       // in half staff spaces ??BUT SHOULD BE 6 IF 2-VOICE NOTATION!
-    
 void View::DrawStem( DeviceContext *dc, LayerElement *object, Staff *staff, data_STEMDIRECTION dir, int radius, int xn, int originY, int heightY)
 {
     assert(dynamic_cast<DurationInterface*>(object));
@@ -443,7 +441,8 @@ void View::DrawStem( DeviceContext *dc, LayerElement *object, Staff *staff, data
     bool drawingCueSize = object->IsCueSize();
     int verticalCenter = staffY - m_doc->GetDrawingDoubleUnit(staffSize)*2;
     
-    baseStem = m_doc->GetDrawingUnit(staffSize)*STANDARD_STEMLENGTH;
+    // baseStem is one octave for now (7 unit) - however, it should be 6 with 2-voice notation
+    baseStem = m_doc->GetDrawingOctaveSize(staffSize);
     flagStemHeight = m_doc->GetDrawingDoubleUnit(staffSize);
     if (drawingCueSize) {
         baseStem = m_doc->GetGraceSize(baseStem);

From 9e4aa58003d9d61720370c3dcb33ba8492809731 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Wed, 28 Oct 2015 19:16:25 +0100
Subject: [PATCH 82/85] Tidying up view_element.cpp (reordering methods)

---
 include/vrv/view.h   |   16 +-
 src/view_element.cpp | 2970 +++++++++++++++++++++---------------------
 2 files changed, 1492 insertions(+), 1494 deletions(-)

diff --git a/include/vrv/view.h b/include/vrv/view.h
index f1defb98fcc..4c7a16d9c4c 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -205,9 +205,9 @@ class View
      */
     ///@{
     void DrawAccid( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure, Accid* prevAccid = NULL );
+    void DrawBarline( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawBeatRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawBTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
-    void DrawBarline( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawChord( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawClef( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawCustos( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
@@ -215,9 +215,9 @@ class View
     void DrawDurationElement( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawKeySig( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure  );
     void DrawMeterSig( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure  );
+    void DrawMRest( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawMRpt( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawMRpt2( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
-    void DrawMRest( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawMultiRest( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawMultiRpt( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
     void DrawNote( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure );
@@ -236,17 +236,17 @@ class View
      */
     ///@{
     void DrawAcciaccaturaSlash(DeviceContext *dc, LayerElement *element);
-    void DrawBreveRest ( DeviceContext *dc, int x, int y, Staff *staff );
-    void DrawDots ( DeviceContext *dc, int x, int y, unsigned char dots, Staff *staff );
+    void DrawDots( DeviceContext *dc, int x, int y, unsigned char dots, Staff *staff );
     void DrawFermata(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff);
-    void DrawLedgerLines ( DeviceContext *dc, LayerElement *element, Staff *staff, bool aboveStaff, bool doubleLength, int skip, int n);
-    void DrawLongRest ( DeviceContext *dc, int x, int y, Staff *staff);
+    void DrawLedgerLines( DeviceContext *dc, LayerElement *element, Staff *staff, bool aboveStaff, bool doubleLength, int skip, int n);
     void DrawMeterSigFigures( DeviceContext *dc, int x, int y, int num, int numBase, Staff *staff);
     void DrawMRptPart(DeviceContext *dc, int x, wchar_t smulfCode, int num, bool line, Staff *staff, Measure *measure );
-    void DrawQuarterRest ( DeviceContext *dc, int x, int y, int valeur, unsigned char dots, bool cueSize, Staff *staff);
+    void DrawRestBreve( DeviceContext *dc, int x, int y, Staff *staff );
+    void DrawRestLong( DeviceContext *dc, int x, int y, Staff *staff);
+    void DrawRestQuarter( DeviceContext *dc, int x, int y, int valeur, unsigned char dots, bool cueSize, Staff *staff);
+    void DrawRestWhole( DeviceContext *dc, int x, int y, int valeur, unsigned char dots, bool cueSize, Staff *staff);
     void DrawStem( DeviceContext *dc, LayerElement *object, Staff *staff, data_STEMDIRECTION dir, int radius, int xn, int originY, int heightY = 0);
     void DrawTrill(DeviceContext *dc, LayerElement *element, Staff *staff );
-    void DrawWholeRest ( DeviceContext *dc, int x, int y, int valeur, unsigned char dots, bool cueSize, Staff *staff);
     ///@}
     
     /**
diff --git a/src/view_element.cpp b/src/view_element.cpp
index 4f3c18e95fb..d8ab07860a7 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -47,10 +47,6 @@
 
 namespace vrv {
 
-//----------------------------------------------------------------------------
-// View - LayerElement
-//----------------------------------------------------------------------------
-
 void View::DrawLayerElement( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
 {
     assert( dc );
@@ -151,7 +147,11 @@ void View::DrawLayerElement( DeviceContext *dc, LayerElement *element, Layer *la
     m_currentColour = previousColor;
 }
 
-void View::DrawDurationElement( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
+//----------------------------------------------------------------------------
+// View - LayerElement
+//----------------------------------------------------------------------------
+
+void View::DrawAccid( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure, Accid *prevAccid )
 {
     assert( dc );
     assert( element );
@@ -159,24 +159,85 @@ void View::DrawDurationElement( DeviceContext *dc, LayerElement *element, Layer
     assert( staff );
     assert( measure );
     
-	if (dynamic_cast<Chord*>(element)) {
-        dc->StartGraphic( element, "", element->GetUuid() );
-        DrawChord(dc, element, layer, staff, measure);
-        dc->EndGraphic(element, this );
+    Accid *accid = dynamic_cast<Accid*>(element);
+    assert( accid );
+    
+    dc->StartGraphic( element, "", element->GetUuid() );
+
+    // Parent will be NULL if we are drawing a note @accid (see DrawNote) - the y value is already set
+    if ( accid->m_parent ) {
+        accid->SetDrawingY( accid->GetDrawingY() + CalculatePitchPosY( staff, accid->GetPloc(), layer->GetClefOffset( accid ), accid->GetOloc()) );
+        accid->m_drawingCueSize = accid->IsCueSize();
     }
-    else if (dynamic_cast<Note*>(element)) {
-        dc->StartGraphic( element, "", element->GetUuid() );
-        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 );
-        dc->EndGraphic(element, this );
-	}
+    
+    /************** editorial accidental **************/
+    
+    if ( accid->GetFunc() == FUNC_edit ) {
+        // position is currently only above the staff
+        int y = staff->GetDrawingY();
+        // look at the note position and adjust it if necessary
+        Note *note = dynamic_cast<Note*>( accid->GetFirstParent( NOTE, MAX_ACCID_DEPTH ) );
+        if ( note ) {
+            if ( note->GetDrawingY() > y ) {
+                y = note->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            }
+            if ( (note->GetDrawingStemDir() == STEMDIRECTION_up) && (note->GetDrawingStemEnd().y > y )) {
+                y = note->GetDrawingStemEnd().y;
+            }
+            
+            // adjust the x position so it is centered
+            int radius = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, accid->m_drawingCueSize);
+            if ( note->GetActualDur() < DUR_2 ) radius += radius/3;
+            accid->SetDrawingX( accid->GetDrawingX() + radius / 2 );
+        }
+        accid->SetDrawingY( y + TEMP_STYLE_ACCID_EDIT_SPACE * m_doc->GetDrawingUnit(staff->m_drawingStaffSize) / PARAM_DENOMINATOR );
+    }
+    
+    int x = accid->GetDrawingX();
+    int y = accid->GetDrawingY();
+    
+    int symc = SMUFL_E261_accidentalNatural;
+    switch (accid->GetAccid())
+    {
+        case ACCIDENTAL_EXPLICIT_n :  symc = SMUFL_E261_accidentalNatural; break;
+        
+        /* The ACCID_DOUBLE_SHARP definition is used in two ways:
+         * 1) Antique notation (notAnc == true): it displays the two
+         *    stacked sharps used in key signatures;
+         * 2) Modern notation: is display a double flat
+         *    this poses no particular rendering problems;
+         * Case 1) on the other hand requires that the sharp
+         * is printed two times, the second time shifting it up
+         * (hence no break in the case statement)
+         * Same thing applies to LEIPZIG_ACCID_FLAT, but in this
+         * case it is used ONLY ad stacked flats (no double flat
+         * glyph).
+         */
+        case ACCIDENTAL_EXPLICIT_ss :
+            // This needs to be fixed because it is the old Wolfgang way to handle
+            // mensural notation
+            if (staff->notAnc) {
+                    symc = SMUFL_E262_accidentalSharp;
+                    DrawSmuflCode ( dc, x, y, symc,  staff->m_drawingStaffSize, accid->m_drawingCueSize );
+                    y += 7*m_doc->GetDrawingUnit(staff->m_drawingStaffSize); // LP
+            } else {
+                symc = SMUFL_E263_accidentalDoubleSharp;
+                break;
+            }
+        case ACCIDENTAL_EXPLICIT_s : symc = SMUFL_E262_accidentalSharp; break;
+        case ACCIDENTAL_EXPLICIT_ff : symc = SMUFL_E264_accidentalDoubleFlat;
+        case ACCIDENTAL_EXPLICIT_f : symc = SMUFL_E260_accidentalFlat; break;
+        case ACCIDENTAL_EXPLICIT_su : symc = SMUFL_E268_accidentalNaturalSharp; break; // Not sure this is correct...
+        case ACCIDENTAL_EXPLICIT_fu : symc= SMUFL_E267_accidentalNaturalFlat; break; // Same
+        default : break;
+    }
+    
+    DrawSmuflCode ( dc, x, y, symc, staff->m_drawingStaffSize, accid->m_drawingCueSize );
+
+    dc->EndGraphic(element, this );
 }
 
-void View::DrawTuplet(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
+void View::DrawBarline( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
 {
     assert( dc );
     assert( element );
@@ -184,27 +245,23 @@ void View::DrawTuplet(DeviceContext *dc, LayerElement *element, Layer *layer, St
     assert( staff );
     assert( measure );
     
-    Tuplet *tuplet = dynamic_cast<Tuplet*>(element);
-    assert( tuplet );
+    Barline *barLine = dynamic_cast<Barline*>(element);
+    assert( barLine );
     
-    dc->StartGraphic( element, "", element->GetUuid() );
+    if (barLine->GetRend() == BARRENDITION_invis) {
+        barLine->SetEmptyBB();
+        return;
+    }
     
-    // Draw the inner elements
-    DrawLayerChildren(dc, tuplet, layer, staff, measure);
+    dc->StartGraphic( element, "", element->GetUuid() );
     
-    // Add to the list of postponed element
-    layer->AddToDrawingList( tuplet );
+    int y = staff->GetDrawingY();
+    DrawBarline( dc, y, y - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize), barLine );
     
     dc->EndGraphic(element, this );
 }
-
-// dessine la note en a,b+by. Calcule et dessine lignes addit. avec by=m_drawingY
-// b = decalage en fonction oct., clef, a partir du curseur; by = pos. curs.
-// Accords: note doit connaitre le x non modifie par accord(), la fin de 
-// l'accord (ptr_n->fchord), la valeur y extreme opposee au sommet de la
-// queue: le ptr *testchord extern peut garder le x et l'y.
     
-void View::DrawNote ( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
+void View::DrawBeatRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
 {
     assert( dc );
     assert( element );
@@ -212,407 +269,599 @@ void View::DrawNote ( DeviceContext *dc, LayerElement *element, Layer *layer, St
     assert( staff );
     assert( measure );
     
-    Note *note = dynamic_cast<Note*>(element);
-    assert( note );
+    BeatRpt *beatRpt = dynamic_cast<BeatRpt*>(element);
+    assert( beatRpt );
     
-    if (note->IsMensural()){
-        DrawMensuralNote(dc, element, layer, staff, measure);
-        return;
-    }
+    dc->StartGraphic( element, "", element->GetUuid() );
     
-    if (note->m_crossStaff) staff = note->m_crossStaff;
+    int x = element->GetDrawingX();
+    int xSymbol = x;
+    int y = element->GetDrawingY();
+    y -= staff->m_drawingLines / 2 * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
     
-    Chord *inChord = note->IsChordTone();
-    Beam *inBeam = note->IsInBeam();
-    bool inFTrem = note->IsInFTrem();
-    bool drawingCueSize = note->HasGrace();
+    if (beatRpt->GetRend() == BEATRPT_REND_mixed) {
+        DrawSmuflCode( dc, xSymbol, y, SMUFL_E501_repeat2Bars, staff->m_drawingStaffSize, false );
+    }
+    else {
+        DrawSmuflCode( dc, xSymbol, y, SMUFL_E101_noteheadSlashHorizontalEnds, staff->m_drawingStaffSize, false );
+        int additionalSlash = beatRpt->GetRend() - BEATRPT_REND_8;
+        int halfWidth = m_doc->GetGlyphWidth(SMUFL_E101_noteheadSlashHorizontalEnds, staff->m_drawingStaffSize, false) / 2;
+        int i;
+        for (i = 0; i < additionalSlash; i++) {
+            xSymbol += halfWidth;
+            DrawSmuflCode( dc, xSymbol, y, SMUFL_E101_noteheadSlashHorizontalEnds, staff->m_drawingStaffSize, false );
+        }
+    }
+
+    dc->EndGraphic(element, this);
+}
     
-	int staffSize = staff->m_drawingStaffSize;
-    int noteY = element->GetDrawingY();
-    int xLedger, xNote, xAccid, xStem;
-    int drawingDur;
-    int staffY = staff->GetDrawingY();
-    wchar_t fontNo;
-	int ledge;
-	int verticalCenter = 0;
-    bool flippedNotehead = false;
-    bool doubleLengthLedger = false;
+void View::DrawBTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
+{
+    assert( dc );
+    assert( element );
+    assert( layer );
+    assert( staff );
+    assert( measure );
+    
+    BTrem *bTrem = dynamic_cast<BTrem*>(element);
+    assert( bTrem );
 
-	xStem = inChord ? inChord->GetDrawingX() : element->GetDrawingX();
-    xLedger = xStem;
     
-    drawingDur = note->GetDrawingDur();
-    drawingDur = ((note->GetColored()==BOOLEAN_true) && drawingDur > DUR_1) ? (drawingDur+1) : drawingDur;
+    dc->StartGraphic( element, "", element->GetUuid() );
     
-    int radius = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staffSize, drawingCueSize) / 2;
+    DrawLayerChildren(dc, bTrem, layer, staff, measure);
     
-    if (drawingDur > DUR_1 || (drawingDur == DUR_1 && staff->notAnc)) {	// annuler provisoirement la modif. des lignes addit.
-		ledge = m_doc->GetDrawingLedgerLineLength(staffSize, drawingCueSize);
-	}
+    data_STEMDIRECTION stemDir = STEMDIRECTION_NONE;
+    data_STEMMODIFIER stemMod;
+    int drawingDur;
+    LayerElement *childElement = NULL;
+    Point stemPoint;
+    bool drawingCueSize = false;
+    int x, y, yUnused;
+    
+    Chord *childChord = dynamic_cast<Chord*>(bTrem->FindChildByType(CHORD));
+    // Get from the chord or note child
+    if (childChord) {
+        stemDir = childChord->GetDrawingStemDir();
+        stemMod = childChord->GetStemMod();
+        stemPoint = childChord->GetDrawingStemStart();
+        drawingDur = childChord->GetDur();
+        childElement = childChord;
+    }
     else {
-        ledge = m_doc->GetDrawingLedgerLineLength(staffSize, drawingCueSize);
-		radius += radius/3;
-	}
+        Note *childNote = dynamic_cast<Note*>(bTrem->FindChildByType(NOTE));
+        if (childNote) {
+            drawingCueSize = childNote->IsCueSize();
+            stemDir = childNote->GetDrawingStemDir();
+            stemMod = childNote->GetStemMod();
+            stemPoint = childNote->GetDrawingStemStart();
+            drawingDur = childNote->GetDur();
+            childElement = childNote;
+        }
+    }
+
+    // nothing we can do...
+    if (stemDir == STEMDIRECTION_NONE) {
+        return;
+    }
     
-    /************** Stem/notehead direction: **************/
     
-    verticalCenter = staffY - m_doc->GetDrawingDoubleUnit(staffSize)*2;
-    if (!inChord && !inBeam && !inFTrem) {
-        if (note->HasStemDir()) {
-            note->SetDrawingStemDir(note->GetStemDir());
+    int width = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, drawingCueSize);
+    int height = m_doc->GetDrawingBeamWidth(staff->m_drawingStaffSize, drawingCueSize) * 7 / 10;
+    int step = height + m_doc->GetDrawingBeamWhiteWidth(staff->m_drawingStaffSize, drawingCueSize);
+
+    if (stemDir == STEMDIRECTION_up) {
+        if (drawingDur > DUR_1) {
+            y = childElement->GetDrawingTop(m_doc, staff->m_drawingStaffSize) - 3 * height;
+            x = stemPoint.x;
         }
-        else if ( layer->GetDrawingStemDir() != STEMDIRECTION_NONE) {
-            note->SetDrawingStemDir( layer->GetDrawingStemDir() );
+        else {
+            if (childElement->Is() == NOTE) y = childElement->GetDrawingY();
+            else childChord->GetYExtremes(&y, &yUnused);
+            y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6;
+            x = childElement->GetDrawingX();
+        }
+        step = -step;
+    }
+    else {
+        if (drawingDur > DUR_1) {
+            y = childElement->GetDrawingBottom(m_doc, staff->m_drawingStaffSize) + 1 * height;
+            x = stemPoint.x + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
         }
         else {
-            note->SetDrawingStemDir( (noteY >= verticalCenter) ? STEMDIRECTION_down : STEMDIRECTION_up );
+            if (childElement->Is() == NOTE) y = childElement->GetDrawingY();
+            else childChord->GetYExtremes(&yUnused, &y);
+            y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6;
+            x = childElement->GetDrawingX();
         }
     }
     
-    //if the note is clustered, calculations are different
-    if (note->m_cluster) {
-        if (note->GetDrawingStemDir() == STEMDIRECTION_down) {
-            //stem down/even cluster = noteheads start on left (incorrect side)
-            if (note->m_cluster->size() % 2 == 0) {
-                flippedNotehead = (note->m_clusterPosition % 2 != 0);
-            }
-            //else they start on normal side
-            else {
-                flippedNotehead = (note->m_clusterPosition % 2 == 0);
-            }
-            
-            //if stem goes down, move ledger start to the left and expand it a full radius
-            if(!(note->IsClusterExtreme() && IsOnStaffLine(noteY, staff))) {
-                xLedger -= radius;
-                doubleLengthLedger = true;
-            }
+    int s;
+    for (s = 0; s < stemMod; s++) {
+        DrawObliquePolygon (dc, x - width / 2, y, x + width / 2, y + height, height);
+        y += step;
+    }
+    
+    dc->EndGraphic(element, this);
+}
+    
+void View::DrawChord( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
+{
+    assert( dc );
+    assert( element );
+    assert( layer );
+    assert( staff );
+    assert( measure );
+    
+    Chord* chord = dynamic_cast<Chord*>(element);
+    assert( chord );
+    
+    int staffSize = staff->m_drawingStaffSize;
+    int staffY = staff->GetDrawingY();
+	int verticalCenter = staffY - m_doc->GetDrawingDoubleUnit(staffSize)*2;
+    bool drawingCueSize = chord->IsCueSize();
+    int radius = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staffSize, drawingCueSize) / 2;
+    int fullUnit = m_doc->GetDrawingUnit(staffSize);
+    
+    Beam *inBeam = chord->IsInBeam();
+    bool inFTrem = chord->IsInFTrem();
+    
+    /************ Ledger line reset ************/
+    
+    //if there are double-length lines, we only need to draw single-length after they've been drawn
+    chord->m_drawingLedgerLines.clear();
+    
+    /************ Stems ************/
+    
+    int drawingDur = chord->GetDur();
+    
+    // (unless we're in a beam or in an fTrem)
+    if (!inBeam && !inFTrem) {
+        int yMax, yMin;
+        chord->GetYExtremes(&yMax, &yMin);
+        
+        if (chord->HasStemDir()) {
+            chord->SetDrawingStemDir(chord->GetStemDir());
+        }
+        else if (layer->GetDrawingStemDir() != STEMDIRECTION_NONE) {
+            chord->SetDrawingStemDir(layer->GetDrawingStemDir());
         }
         else {
-            //flipped noteheads start on normal side no matter what
-            flippedNotehead = (note->m_clusterPosition % 2 == 0);
-            
-            //if stem goes up, move ledger start to the right and expand it a full radius
-            if(!(note->IsClusterExtreme() && IsOnStaffLine(noteY, staff))) {
-                xLedger += radius;
-                doubleLengthLedger = true;
-            }
+            chord->SetDrawingStemDir(yMax - verticalCenter >= verticalCenter - yMin ? STEMDIRECTION_down : STEMDIRECTION_up);
         }
         
-        //positions notehead
-        if (!flippedNotehead) {
-            xNote = xStem - radius;
-        }
-        else {
-            //if we have a flipped notehead, we need to be in a chord
-            assert(inChord);
-            if (note->GetDrawingStemDir() == STEMDIRECTION_up) {
-                xNote = xStem + radius - m_doc->GetDrawingStemWidth(staffSize);
-            }
-            else if (note->GetDrawingStemDir() == STEMDIRECTION_down) {
-                xNote = xStem - radius * 3 + m_doc->GetDrawingStemWidth(staffSize);
-            }
-            else {
-                xNote = xStem - radius;
-            }
+        // (only shorter than whole notes)
+        if (drawingDur > DUR_1) {
+            int beamX = chord->GetDrawingX();
+            int originY = ( chord->GetDrawingStemDir() == STEMDIRECTION_down ? yMax : yMin );
+            int heightY = yMax - yMin;
+            DrawStem(dc, chord, staff, chord->GetDrawingStemDir(), radius, beamX, originY, heightY);
         }
     }
-    else
-    {
-        xNote = xStem - radius;
-    }
-
-    /************** Noteheads: **************/
     
-    if (drawingDur < DUR_1) {
-        DrawMaximaToBrevis( dc, noteY, element, layer, staff);
-    }
-    // Whole notes
-	else if (drawingDur == DUR_1) {
-        if (note->GetColored()==BOOLEAN_true)
-			fontNo = SMUFL_E0FA_noteheadWholeFilled;
-		else
-			fontNo = SMUFL_E0A2_noteheadWhole;
-
-		DrawSmuflCode( dc, xNote, noteY, fontNo, staff->m_drawingStaffSize, drawingCueSize );
-	}
-    // Other values
-	else {
-        if ((note->GetColored()==BOOLEAN_true) || drawingDur == DUR_2) {
-			fontNo = SMUFL_E0A3_noteheadHalf;
+    /************ Draw children (notes) ************/
+    
+    DrawLayerChildren(dc, chord, layer, staff, measure);
+    
+    /************ Dots ************/
+    
+    chord->m_dots.clear();
+    
+    if (chord->GetDots()) {
+        int numDots = chord->GetDots();
+        
+        //Set the x value...
+        int dotsX;
+        
+        //make sure all the dots are at the same X position
+        if (chord->GetDur() < DUR_2 || (chord->GetDur() > DUR_8 && !inBeam && (chord->GetDrawingStemDir() == STEMDIRECTION_up))) {
+            dotsX = chord->GetDrawingX() + (fullUnit * 7/2);
         }
         else {
-			fontNo = SMUFL_E0A4_noteheadBlack;
+            dotsX = chord->GetDrawingX() + (fullUnit * 5/2);
         }
         
-		DrawSmuflCode( dc, xNote, noteY, fontNo,  staff->m_drawingStaffSize, drawingCueSize );
+        // Notes in clusters: If the stem points up and we have a note on the (incorrect) right side of the stem, add a note diameter to the dot positioning to avoid overlapping.
+        if ((chord->GetDrawingStemDir() == STEMDIRECTION_up) && (chord->m_clusters.size() > 0)) dotsX += (radius * 2);
+        
+        //Prep where the dots will go by preventing overlaps and using space efficiently
+        for (ListOfObjects::reverse_iterator rit = chord->GetList(chord)->rbegin(); rit != chord->GetList(chord)->rend(); rit++)
+        {
+            Note *note = dynamic_cast<Note*>(*rit);
+            PrepareChordDots(dc, chord, dotsX, note->GetDrawingY(), numDots, staff);
+        }
+        
+        //And then draw them
+        std::list<int> *dotsList = &chord->m_dots;
+        for (std::list<int>::iterator it=dotsList->begin(); it != dotsList->end(); ++it)
+            DrawDots(dc, dotsX, *it, numDots, staff);
+    }
+    
+    /************ Accidentals ************/
+    
+    //navigate through list of notes, starting with outside and working in
 
-		if (!(inBeam && drawingDur > DUR_4) && !inFTrem && !inChord) {
-            DrawStem(dc, note, staff, note->GetDrawingStemDir(), radius, xStem, noteY);
+    chord->ResetAccidList();
+    std::vector<Note*> noteList = chord->m_accidList;
+    int size = (int)noteList.size();
+    if (size > 0)
+    {
+        //set the default x position
+        int xAccid = chord->GetDrawingX() - (radius * 2);
+
+        //if chord is a down-stemmed non-cluster, it needs one more note diameter of space
+        if ((chord->GetDrawingStemDir() == STEMDIRECTION_down) && (chord->m_clusters.size() > 0))
+        {
+            xAccid -= (radius * 2);
         }
 
-	}
+        int fwIdx, idx, bwIdx;
 
-    /************** Ledger lines: **************/
+        //reset the boolean 2d vector
+        chord->ResetAccidSpace(fullUnit);
+        std::vector<int> accidClusterStarts;
+        
+        //iterate through the list of notes with accidentals
+        for(idx = 0; idx < size; idx++)
+        {
+            Accid *curAccid = noteList.at(idx)->m_drawingAccid;
 
-    int staffTop = staffY + m_doc->GetDrawingUnit(staffSize);
-    int staffBot = staffY - m_doc->GetDrawingStaffSize(staffSize) - m_doc->GetDrawingUnit(staffSize);
-    
-    //if the note is not in the staff
-    if (!is_in(noteY,staffTop,staffBot))
-    {
-        int distance, highestNewLine, numLines;
+            //if the note does not need to be moved, save a new cluster start position
+            if (CalculateAccidX(staff, curAccid, chord, false))
+            {
+                accidClusterStarts.push_back(idx);
+            }
+        }
         
-        bool aboveStaff = (noteY > staffTop);
+        chord->ResetAccidSpace(fullUnit);
+        int accidSize = (int)accidClusterStarts.size();
         
-        distance = (aboveStaff ? (noteY - staffY) : staffY - m_doc->GetDrawingStaffSize(staffSize) - noteY);
-        highestNewLine = ((distance % m_doc->GetDrawingDoubleUnit(staffSize) > 0) ? (distance - m_doc->GetDrawingUnit(staffSize)) : distance);
-        numLines = highestNewLine / m_doc->GetDrawingDoubleUnit(staffSize);
- 
-        //if this is in a chord, we don't want to draw it yet, but we want to keep track of the maxima
-        if (inChord) {
-            if (inChord->m_drawingLedgerLines.count(staff)==0) {
-                std::vector<char> legerLines;
-                legerLines.resize(4);
-                inChord->m_drawingLedgerLines[staff] = legerLines;
+        //for each note that conflicts
+        for(idx = 0; idx < accidSize; idx++)
+        {
+            //set fwIdx to the start of the cluster
+            fwIdx = accidClusterStarts.at(idx);
+            //if this is the last cluster, set bwIdx to the last note in the chord
+            if (idx == accidSize - 1) bwIdx = size - 1;
+            //otherwise, set bwIdx to one before the beginning of the next cluster
+            else bwIdx = accidClusterStarts.at(idx + 1) - 1;
+            
+            //if it's even, this will catch the overlap; if it's odd, there's an if in the middle there
+            while (fwIdx <= bwIdx)
+            {
+                Accid *accidFwd = noteList.at(fwIdx)->m_drawingAccid;
+                Accid *accidBwd = noteList.at(bwIdx)->m_drawingAccid;
+                
+                //if the top note has an accidental, draw it and update prevAccid
+                accidFwd->SetDrawingX(xAccid);
+                CalculateAccidX(staff, accidFwd, chord, true);
+                DrawAccid(dc, accidFwd, layer, staff, measure);
+                //same, except with an extra check that we're not doing the same note twice
+                if (fwIdx != bwIdx) {
+                    accidBwd->SetDrawingX(xAccid);
+                    CalculateAccidX(staff, accidBwd, chord, true);
+                    DrawAccid(dc, accidBwd, layer, staff, measure);
+                    bwIdx--;
+                }
+                
+                fwIdx++;
             }
-            int idx = doubleLengthLedger + aboveStaff * 2; // 2x2 array
-            std::vector<char> *legerLines = &inChord->m_drawingLedgerLines.at(staff);
-            (*legerLines).at(idx) = ledgermax(numLines, (*legerLines).at(idx));
-        }
-        //we do want to go ahead and draw if it's not in a chord
-        else {
-            DrawLedgerLines(dc, note, staff, aboveStaff, false, 0, numLines);
+            fwIdx = idx;
         }
     }
     
-    /************** Accidentals/dots/peripherals: **************/
+    /************ Ledger lines ************/
+
+    dc->SetPen( m_currentColour, ToDeviceContextX( m_doc->GetDrawingStaffLineWidth(staffSize) ), AxSOLID );
+    dc->SetBrush(m_currentColour , AxTRANSPARENT );
     
-	if (note->m_drawingAccid) {
-        xAccid = xNote;
-        if (note->m_drawingAccid->GetFunc() != FUNC_edit) {
-            xAccid -= 1.5 * m_doc->GetGlyphWidth(SMUFL_E262_accidentalSharp, staffSize, drawingCueSize);
-        }
+    MapOfLedgerLineFlags::iterator iter;
+    for(iter = chord->m_drawingLedgerLines.begin(); iter != chord->m_drawingLedgerLines.end(); iter++) {
         
-        note->m_drawingAccid->SetDrawingX( xAccid );
-        note->m_drawingAccid->SetDrawingY( noteY );
+        std::vector<char> *legerLines = &(*iter).second;
         
-        //postpone drawing the accidental until later if it's in a chord or if it is not an attribute
-        if (!inChord && note->m_isDrawingAccidAttr) DrawAccid( dc, note->m_drawingAccid, layer, staff, measure );
-	}
-	
-    if (note->GetDots() && !inChord) {
-        int xDot;
-        if (note->GetActualDur() < DUR_2 || (note->GetActualDur() > DUR_8 && !inBeam && (note->GetDrawingStemDir() == STEMDIRECTION_up)))
-            xDot = xStem + m_doc->GetDrawingUnit(staffSize)*7/2;
-        else
-            xDot = xStem + m_doc->GetDrawingUnit(staffSize)*5/2;
+        //if there are double-length lines, we only need to draw single-length after they've been drawn
+        (*legerLines).at(0) -= (*legerLines).at(1);
+        (*legerLines).at(2) -= (*legerLines).at(3);
         
-		DrawDots( dc, xDot, noteY, note->GetDots(), staff );
-	}
-    
-    if (note->GetDrawingTieAttr()) {
-        System *system = dynamic_cast<System*>(measure->GetFirstParent( SYSTEM ) );
-        // create a placeholder for the tie attribute that will be drawn from the system
-        dc->StartGraphic(note->GetDrawingTieAttr(), "", note->GetDrawingTieAttr()->GetUuid().c_str());
-        dc->EndGraphic(note->GetDrawingTieAttr(), this);
-        if (system) system->AddToDrawingList(note->GetDrawingTieAttr());
+        //double-length lines below the staff
+        DrawLedgerLines(dc, chord, (*iter).first, false, true, 0, (*legerLines).at(1));
+        
+        //remainder single-length lines below the staff
+        DrawLedgerLines(dc, chord, (*iter).first, false, false, (*legerLines).at(1), (*legerLines).at(0));
+        
+        //double-length lines above the staff
+        DrawLedgerLines(dc, chord, (*iter).first, true, true, 0, (*legerLines).at(3));
+        
+        //remainder single-length lines above the staff
+        DrawLedgerLines(dc, chord, (*iter).first, true, false, (*legerLines).at(3), (*legerLines).at(2));
+
     }
+    
+    dc->ResetPen();
+    dc->ResetBrush();
+}
 
-    // This will draw lyrics, accid, etc. (but only if not in chord)
-    if (!inChord) DrawLayerChildren(dc, note, layer, staff, measure);
+void View::DrawClef( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
+{
+    assert( dc );
+    assert( element );
+    assert( layer );
+    assert( staff );
+    assert( measure );
+    
+    Clef *clef = dynamic_cast<Clef*>(element);
+    assert( clef );
 
-    if (note->GetFermata() != PLACE_NONE) {
-        DrawFermata(dc, element, layer, staff);
-    }
+    dc->StartGraphic( element, "", element->GetUuid() );
+	
+	int b = staff->GetDrawingY();
+	int a = element->GetDrawingX();
+    int sym = SMUFL_E050_gClef;	//sSOL, position d'ordre des cles sol fa ut in fonts
 
-    if (note->m_embellishment == EMB_TRILL) {
-        DrawTrill(dc, element, staff);
-    }
-}
+    /*  poser sym=no de position sSOL dans la fonte
+     *	au depart; ne faire operation sur b qu'une fois pour cas semblables,
+     *  et au palier commun superieur, incrementer sym, sans break.
+     */
+	switch(clef->GetClefId())
+	{
+		case C1 :
+            sym = SMUFL_E05C_cClef;
+            b -= m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize);
+            break;
+		case G1 :
+            b -= m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize);
+            break;
+		case G2_8va :
+            sym = SMUFL_E053_gClef8va;
+            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * 3;
+            break;
+        case G2_8vb :
+            sym = SMUFL_E052_gClef8vb;
+            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * 3;
+            break;
+		case C2 :
+            sym = SMUFL_E05C_cClef;
+            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * 3;
+            break;
+		case G2 :
+            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * 3;
+            break;
+		case F3 :
+            sym = SMUFL_E062_fClef;
+            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)*2;
+            break;
+		case C3 :
+            sym = SMUFL_E05C_cClef;
+            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)*2;
+            break;
+		case F5 :
+            sym =SMUFL_E062_fClef;
+            break;
+		case F4 :
+            sym = SMUFL_E062_fClef;
+            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+            break;
+		case C4 :
+            sym = SMUFL_E05C_cClef;
+            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+            break;
+		case C5 :
+            sym = SMUFL_E05C_cClef;
+            break;
+		case perc :
+            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * 2;
+            // FIXME
+            sym = SMUFL_E05C_cClef;
+            break;
+		default: 
+            break;
+	}
+
+    bool cueSize = false;
+    // force cue size for intermediate clefs
+    if (clef->GetFirstParent( LAYER )) cueSize = true;
     
-void View::DrawStem( DeviceContext *dc, LayerElement *object, Staff *staff, data_STEMDIRECTION dir, int radius, int xn, int originY, int heightY)
+    //if (!cueSize)
+    //    a -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
+    
+    DrawSmuflCode ( dc, a, b, sym, staff->m_drawingStaffSize, cueSize );
+   
+    dc->EndGraphic(element, this );
+}
+
+void View::DrawCustos( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
 {
-    assert(dynamic_cast<DurationInterface*>(object));
+    assert( dc );
+    assert( element );
+    assert( layer );
+    assert( staff );
+    assert( measure );
     
-    int staffSize = staff->m_drawingStaffSize;
-    int staffY = staff->GetDrawingY();
-    int baseStem, totalFlagStemHeight, flagStemHeight, nbFlags;
-    int drawingDur = dynamic_cast<DurationInterface*>(object)->GetActualDur();
-    bool drawingCueSize = object->IsCueSize();
-    int verticalCenter = staffY - m_doc->GetDrawingDoubleUnit(staffSize)*2;
+    Custos *custos = dynamic_cast<Custos*>(element);
+    assert( custos );
     
-    // baseStem is one octave for now (7 unit) - however, it should be 6 with 2-voice notation
-    baseStem = m_doc->GetDrawingOctaveSize(staffSize);
-    flagStemHeight = m_doc->GetDrawingDoubleUnit(staffSize);
-    if (drawingCueSize) {
-        baseStem = m_doc->GetGraceSize(baseStem);
-        flagStemHeight = m_doc->GetGraceSize(flagStemHeight);
-    }
+    dc->StartGraphic( element, "", element->GetUuid() );
+    
+    element->SetDrawingY( element->GetDrawingY() + CalculatePitchPosY( staff, custos->GetPloc(), layer->GetClefOffset( element ), custos->GetOloc()) );
 
-    nbFlags = drawingDur - DUR_8;
-    totalFlagStemHeight = flagStemHeight * (nbFlags * 2 - 1) / 2;
+    int x = element->GetDrawingX();
+    int y = element->GetDrawingY();
     
-    if (dir == STEMDIRECTION_down) {
-        // flip all lengths
-        baseStem = -baseStem;
-        totalFlagStemHeight = -totalFlagStemHeight;
-        radius = -radius;
-        heightY = -heightY;
-    }
+    y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) - m_doc->GetDrawingUnit(staff->m_drawingStaffSize)/4;  // LP - correction in 2.0.0
     
-    // If we have flags, add them to the height
-    int y1 = originY;
-    int y2 = ((drawingDur>DUR_8) ? (y1 + baseStem + totalFlagStemHeight) : (y1 + baseStem)) + heightY;
-    int x2 = xn + radius;
+    // HARDCODED (smufl code wrong)
+    DrawSmuflCode( dc, x, y, 35,  staff->m_drawingStaffSize, false );
     
-    if ((dir == STEMDIRECTION_up) && (y2 < verticalCenter) ) {
-        y2 = verticalCenter;
-    }
-    else if ((dir == STEMDIRECTION_down) && (y2 > verticalCenter) ) {
-        y2 = verticalCenter;
-    }
+    dc->EndGraphic(element, this );
+}
+
+void View::DrawDot( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
+{
+    assert( dc );
+    assert( element );
+    assert( layer );
+    assert( staff );
+    assert( measure );
     
-    // shorten the stem at its connection with the note head
-    int stemY1 = (dir == STEMDIRECTION_up) ? y1 + m_doc->GetDrawingUnit(staffSize) / 4 : y1 - m_doc->GetDrawingUnit(staffSize) / 4;
-    int stemY2 = y2;
-    if (drawingDur > DUR_4) {
-        // if we have flags, shorten the stem to make sure we have a nice overlap with the flag glyph
-        int shortener = (drawingCueSize) ?
-            m_doc->GetGraceSize(m_doc->GetDrawingUnit(staffSize)) :
-            m_doc->GetDrawingUnit(staffSize);
-        stemY2 = (dir == STEMDIRECTION_up) ? y2 - shortener : y2 + shortener;
-    }
+    Dot *dot = dynamic_cast<Dot*>(element);
+    assert( dot );
     
-    // draw the stems and the flags
-    if (dir == STEMDIRECTION_up) {
-        DrawFullRectangle( dc, x2 - m_doc->GetDrawingStemWidth(staffSize), stemY1, x2, stemY2);
-        
-        if (drawingDur > DUR_4) {
-            DrawSmuflCode( dc, x2 - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize), y2, SMUFL_E240_flag8thUp, staff->m_drawingStaffSize, drawingCueSize );
-            for (int i=0; i < nbFlags; i++)
-                DrawSmuflCode( dc, x2 - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize), y2 - (i + 1) * flagStemHeight, SMUFL_E240_flag8thUp,  staff->m_drawingStaffSize, drawingCueSize );
-        }
-    }
-    else {
-        DrawFullRectangle( dc, x2, stemY1, x2 + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize), stemY2);
-        
-        if (drawingDur > DUR_4) {
-            DrawSmuflCode( dc, x2 , y2, SMUFL_E241_flag8thDown , staff->m_drawingStaffSize, drawingCueSize );
-            for (int i=0; i < nbFlags; i++)
-                DrawSmuflCode( dc, x2, y2 + (i + 1) * flagStemHeight, SMUFL_E241_flag8thDown,  staff->m_drawingStaffSize, drawingCueSize );
-        }
-    }
+    dc->StartGraphic( element, "", element->GetUuid() );
     
-    // Store the start and end values
-    StemmedDrawingInterface *interface = dynamic_cast<StemmedDrawingInterface*>(object);
-    assert(interface);
-    interface->SetDrawingStemStart(Point(x2 - (m_doc->GetDrawingStemWidth(staffSize) / 2), y1));
-    interface->SetDrawingStemEnd(Point(x2 - (m_doc->GetDrawingStemWidth(staffSize) / 2), y2));
-    interface->SetDrawingStemDir(dir);
+    element->SetDrawingY( element->GetDrawingY() + CalculatePitchPosY( staff, dot->GetPloc(), layer->GetClefOffset( element ), dot->GetOloc()) );
     
-    // cast to note is check when setting drawingCueSize value
-    if ( drawingCueSize && ( dynamic_cast<Note*>(object)->GetGrace() == GRACE_acc ) ) {
-        DrawAcciaccaturaSlash(dc, object);
+    int x = element->GetDrawingX();
+    int y = element->GetDrawingY();
+    
+    // Use the note to which the points to for position
+    if ( dot->m_drawingNote ) {
+        x = dot->m_drawingNote->GetDrawingX() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize)*7/2;
+        y = dot->m_drawingNote->GetDrawingY();
     }
+
+    DrawDots( dc, x, y, 1, staff );
+    
+    dc->EndGraphic(element, this );
 }
 
-//skips "skip" lines before drawing "n" ledger lines
-void View::DrawLedgerLines ( DeviceContext *dc, LayerElement *element, Staff *staff, bool aboveStaff, bool doubleLength, int skip, int n)
+void View::DrawDurationElement( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
 {
-    //various variables
-    int ledgerY;
-    int staffY = staff->GetDrawingY();
-    int staffSize = staff->m_drawingStaffSize;
-    int betweenLines = m_doc->GetDrawingDoubleUnit(staffSize);
-    bool drawingCueSize = element->IsCueSize();
-    int ledge = m_doc->GetDrawingLedgerLineLength(staffSize, drawingCueSize);
-    int noteDiameter = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staffSize, drawingCueSize);
-    
-    //prep start and end positions of ledger line depending on stem direction and doubleLength
-    int xLedgerStart, xLedgerEnd;
-    if (doubleLength) {
-        Chord *chord = dynamic_cast<Chord*>(element);
-        assert( chord );
-        if (chord->GetDrawingStemDir() == STEMDIRECTION_down) {
-            xLedgerStart = element->GetDrawingX() - ledge - noteDiameter;
-            xLedgerEnd = element->GetDrawingX() + ledge;
-        }
-        else {
-            xLedgerStart = element->GetDrawingX() - ledge;
-            xLedgerEnd = element->GetDrawingX() + ledge + noteDiameter;
-        }
+    assert( dc );
+    assert( element );
+    assert( layer );
+    assert( staff );
+    assert( measure );
+    
+	if (dynamic_cast<Chord*>(element)) {
+        dc->StartGraphic( element, "", element->GetUuid() );
+        DrawChord(dc, element, layer, staff, measure);
+        dc->EndGraphic(element, this );
     }
-    else {
-        xLedgerStart = element->GetDrawingX() - ledge;
-        xLedgerEnd = element->GetDrawingX() + ledge;
+    else if (dynamic_cast<Note*>(element)) {
+        dc->StartGraphic( element, "", element->GetUuid() );
+        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 );
+        dc->EndGraphic(element, this );
+	}
+}
+
+void View::DrawKeySig( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
+{
+    assert( dc );
+    assert( element );
+    assert( layer );
+    assert( staff );
+    assert( measure );
+
+    KeySig *keySig = dynamic_cast<KeySig*>(element);
+    assert( keySig );
+    
+    int symb;
+    int x, y, i;
+    
+    Clef *c = layer->GetClef(element);
+    if (!c) {
+        keySig->SetEmptyBB();
+        return;
     }
     
-    //prep initial Y position
-    if (aboveStaff) {
-        ledgerY = (skip * betweenLines) + staffY;
+    // hidden key signature
+    if (!keySig->m_drawingShow) {
+        keySig->SetEmptyBB();
+        return;
     }
-    else {
-        ledgerY = staffY - m_doc->GetDrawingStaffSize(staffSize) - (skip * betweenLines);
-        betweenLines = -m_doc->GetDrawingDoubleUnit(staffSize);
+    
+    // C major (0) key sig and no cancellation
+    else if ((keySig->GetAlterationNumber() == 0) && (keySig->m_drawingCancelAccidCount == 0)) {
+        keySig->SetEmptyBB();
+        return;
     }
     
-    //add one line's distance to get it off the edge of the staff
-    ledgerY += betweenLines;
+    dc->StartGraphic( element, "", element->GetUuid() );
     
-    dc->SetPen( m_currentColour, ToDeviceContextX( m_doc->GetDrawingStaffLineWidth(staffSize) ), AxSOLID );
-    dc->SetBrush(m_currentColour , AxTRANSPARENT );
+    x = element->GetDrawingX();
+    // HARDCODED
+    int step = m_doc->GetGlyphWidth(SMUFL_E262_accidentalSharp, staff->m_drawingStaffSize, false) * TEMP_STYLE_KEYSIG_STEP;
     
-    //draw the lines
-    for (int i = 0; i < n; i++)
-    {
-        dc->DrawLine( ToDeviceContextX(xLedgerStart) , ToDeviceContextY ( ledgerY ) , ToDeviceContextX(xLedgerEnd) , ToDeviceContextY ( ledgerY ) );
-        ledgerY += betweenLines;
+    // Show cancellation if C major (0) or if any cancellation and show cancellation (showchange) is true (false by default)
+    if ( (keySig->GetAlterationNumber() == 0) || (layer->DrawKeySigCancellation() && keySig->m_drawingShowchange) ) {
+        // The type of alteration is different (f/s or f/n or s/n) - cancel all accid in the normal order
+        if (keySig->GetAlterationType() != keySig->m_drawingCancelAccidType) {
+            for (i = 0; i < keySig->m_drawingCancelAccidCount; i++) {
+                data_PITCHNAME pitch = KeySig::GetAlterationAt( keySig->m_drawingCancelAccidType, i);
+                y = staff->GetDrawingY() + CalculatePitchPosY( staff, pitch, layer->GetClefOffset( element ),
+                                            KeySig::GetOctave( keySig->m_drawingCancelAccidType, pitch, c->GetClefId()));;
+
+                DrawSmuflCode ( dc, x, y, SMUFL_E261_accidentalNatural, staff->m_drawingStaffSize, false );   
+                x += step;
+            }
+        }
+        // Cancel some of them if more accid before
+        else if (keySig->GetAlterationNumber() < keySig->m_drawingCancelAccidCount) {
+            for (i = keySig->GetAlterationNumber(); i < keySig->m_drawingCancelAccidCount; i++) {
+                data_PITCHNAME pitch = KeySig::GetAlterationAt( keySig->m_drawingCancelAccidType, i);
+                y = staff->GetDrawingY() + CalculatePitchPosY( staff, pitch, layer->GetClefOffset( element ),
+                                                              KeySig::GetOctave( keySig->m_drawingCancelAccidType, pitch, c->GetClefId()));;
+                
+                DrawSmuflCode ( dc, x, y, SMUFL_E261_accidentalNatural, staff->m_drawingStaffSize, false );
+                x += step;
+            }
+        }
     }
     
-    dc->ResetPen();
-    dc->ResetBrush();
-}
+    for (i = 0; i < keySig->GetAlterationNumber(); i++) {
+        data_PITCHNAME pitch = KeySig::GetAlterationAt( keySig->GetAlterationType(), i);
+        y = staff->GetDrawingY() + CalculatePitchPosY( staff, pitch, layer->GetClefOffset( element ),
+                                    KeySig::GetOctave( keySig->GetAlterationType(), pitch, c->GetClefId()));;
+        
+        if (keySig->GetAlterationType() == ACCIDENTAL_EXPLICIT_f) symb = SMUFL_E260_accidentalFlat;
+        else symb = SMUFL_E262_accidentalSharp;
+        
+        DrawSmuflCode ( dc, x, y, symb,  staff->m_drawingStaffSize, false );
+        x += step;
+    }
     
-void View::DrawRest ( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
-{	
+    dc->EndGraphic(element, this );
+}
+
+void View::DrawMeterSig( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
+{
     assert( dc );
     assert( element );
     assert( layer );
     assert( staff );
     assert( measure );
-        
-    Rest *rest = dynamic_cast<Rest*>(element);
-    assert( rest );
-
-    bool drawingCueSize = rest->IsCueSize();
-	int drawingDur = rest->GetActualDur();
-	int x = element->GetDrawingX();
-    int y = element->GetDrawingY();
     
-    // Temporary fix for rest within tuplet because drawing tuplet requires m_drawingStemXXX to be set
-    //element->m_drawingStemStart.x = element->m_drawingStemEnd.x = element->GetDrawingX() - (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2);
-    //element->m_drawingStemEnd.y = element->GetDrawingY();
-    //element->m_drawingStemStart.y = element->GetDrawingY();
-
-    if (drawingDur > DUR_2)
-    {
-		//x -= m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, drawingCueSize);
+    MeterSig *meterSig = dynamic_cast<MeterSig*>(element);
+    assert( meterSig );
+    
+    dc->StartGraphic( element, "", element->GetUuid() );
+    
+    int y = staff->GetDrawingY() - (m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 4);
+    int x = element->GetDrawingX();
+    
+    if ( meterSig->GetSym() == METERSIGN_common ) {
+        DrawSmuflCode( dc, element->GetDrawingX(), y, SMUFL_E08A_timeSigCommon, staff->m_drawingStaffSize, false);
+        x += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 5; // step forward because we have a symbol
     }
-
-    switch (drawingDur)
+    else if ( meterSig->GetSym() == METERSIGN_cut ) {
+        DrawSmuflCode( dc, element->GetDrawingX(), y, SMUFL_E08B_timeSigCutCommon, staff->m_drawingStaffSize, false);
+        x += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 5; // step forward because we have a symbol
+    }
+    else if (meterSig->GetCount())
     {	
-        case DUR_LG: DrawLongRest ( dc, x, y, staff); break;
-        case DUR_BR: DrawBreveRest( dc, x, y, staff); break;
-        case DUR_1:
-        case DUR_2: DrawWholeRest ( dc, x, y, drawingDur, rest->GetDots(), drawingCueSize, staff); break;
-        default: DrawQuarterRest( dc, x, y, drawingDur, rest->GetDots(), drawingCueSize, staff);
+        DrawMeterSigFigures ( dc, x, staff->GetDrawingY(), meterSig->GetCount(), meterSig->GetUnit(), staff);
     }
     
-    if(rest->GetFermata() != PLACE_NONE) {
-        DrawFermata(dc, element, layer, staff);
-    }
+    dc->EndGraphic(element, this );
 }
-    
+
 void View::DrawMRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
 {
     assert( dc );
@@ -632,12 +881,47 @@ void View::DrawMRest(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     // move it down according to the number of line in the staff
     y -= staff->m_drawingLines / 2 * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) - m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
     
-    DrawWholeRest ( dc, xCentered, y, DUR_1, 0, false, staff );
+    DrawRestWhole ( dc, xCentered, y, DUR_1, 0, false, staff );
+    
+    dc->EndGraphic(element, this);
+}
+
+void View::DrawMRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
+{
+    assert( dc );
+    assert( element );
+    assert( layer );
+    assert( staff );
+    assert( measure );
+    
+    MRpt *mRpt = dynamic_cast<MRpt*>(element);
+    assert( mRpt );
+    
+    dc->StartGraphic( element, "", element->GetUuid() );
+    
+    DrawMRptPart(dc, element->GetDrawingX(), SMUFL_E500_repeat1Bar, mRpt->m_drawingMeasureCount, false, staff, measure );
+    
+    dc->EndGraphic(element, this);
+}
+
+void View::DrawMRpt2(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
+{
+    assert( dc );
+    assert( element );
+    assert( layer );
+    assert( staff );
+    assert( measure );
+    
+    MRpt2 *mRpt2 = dynamic_cast<MRpt2*>(element);
+    assert( mRpt2 );
+    
+    dc->StartGraphic( element, "", element->GetUuid() );
+    
+    DrawMRptPart(dc, element->GetDrawingX(), SMUFL_E501_repeat2Bars, 2, true, staff, measure );
     
     dc->EndGraphic(element, this);
 }
 
-/** This function draws multi-measure rests **/
 void View::DrawMultiRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
 {
     assert( dc );
@@ -708,8 +992,8 @@ void View::DrawMultiRest(DeviceContext *dc, LayerElement *element, Layer *layer,
     
     dc->EndGraphic(element, this);
 }
-    
-void View::DrawBeatRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
+
+void View::DrawMultiRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
 {
     assert( dc );
     assert( element );
@@ -717,34 +1001,19 @@ void View::DrawBeatRpt(DeviceContext *dc, LayerElement *element, Layer *layer, S
     assert( staff );
     assert( measure );
     
-    BeatRpt *beatRpt = dynamic_cast<BeatRpt*>(element);
-    assert( beatRpt );
+    MultiRpt *multiRpt = dynamic_cast<MultiRpt*>(element);
+    assert( multiRpt );
     
     dc->StartGraphic( element, "", element->GetUuid() );
     
-    int x = element->GetDrawingX();
-    int xSymbol = x;
-    int y = element->GetDrawingY();
-    y -= staff->m_drawingLines / 2 * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+    DrawMRptPart(dc, element->GetDrawingX(), SMUFL_E501_repeat2Bars, multiRpt->GetNum(), true, staff, measure );
     
-    if (beatRpt->GetRend() == BEATRPT_REND_mixed) {
-        DrawSmuflCode( dc, xSymbol, y, SMUFL_E501_repeat2Bars, staff->m_drawingStaffSize, false );
-    }
-    else {
-        DrawSmuflCode( dc, xSymbol, y, SMUFL_E101_noteheadSlashHorizontalEnds, staff->m_drawingStaffSize, false );
-        int additionalSlash = beatRpt->GetRend() - BEATRPT_REND_8;
-        int halfWidth = m_doc->GetGlyphWidth(SMUFL_E101_noteheadSlashHorizontalEnds, staff->m_drawingStaffSize, false) / 2;
-        int i;
-        for (i = 0; i < additionalSlash; i++) {
-            xSymbol += halfWidth;
-            DrawSmuflCode( dc, xSymbol, y, SMUFL_E101_noteheadSlashHorizontalEnds, staff->m_drawingStaffSize, false );
-        }
-    }
-
     dc->EndGraphic(element, this);
-}
     
-void View::DrawMRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
+    return;
+}
+
+void View::DrawNote ( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
 {
     assert( dc );
     assert( element );
@@ -752,322 +1021,323 @@ void View::DrawMRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     assert( staff );
     assert( measure );
     
-    MRpt *mRpt = dynamic_cast<MRpt*>(element);
-    assert( mRpt );
+    Note *note = dynamic_cast<Note*>(element);
+    assert( note );
     
-    dc->StartGraphic( element, "", element->GetUuid() );
+    if (note->IsMensural()){
+        DrawMensuralNote(dc, element, layer, staff, measure);
+        return;
+    }
     
-    DrawMRptPart(dc, element->GetDrawingX(), SMUFL_E500_repeat1Bar, mRpt->m_drawingMeasureCount, false, staff, measure );
+    if (note->m_crossStaff) staff = note->m_crossStaff;
     
-    dc->EndGraphic(element, this);
-}
-
-void View::DrawMRpt2(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
-{
-    assert( dc );
-    assert( element );
-    assert( layer );
-    assert( staff );
-    assert( measure );
-    
-    MRpt2 *mRpt2 = dynamic_cast<MRpt2*>(element);
-    assert( mRpt2 );
-    
-    dc->StartGraphic( element, "", element->GetUuid() );
+    Chord *inChord = note->IsChordTone();
+    Beam *inBeam = note->IsInBeam();
+    bool inFTrem = note->IsInFTrem();
+    bool drawingCueSize = note->HasGrace();
     
-    DrawMRptPart(dc, element->GetDrawingX(), SMUFL_E501_repeat2Bars, 2, true, staff, measure );
+	int staffSize = staff->m_drawingStaffSize;
+    int noteY = element->GetDrawingY();
+    int xLedger, xNote, xAccid, xStem;
+    int drawingDur;
+    int staffY = staff->GetDrawingY();
+    wchar_t fontNo;
+	int ledge;
+	int verticalCenter = 0;
+    bool flippedNotehead = false;
+    bool doubleLengthLedger = false;
+
+	xStem = inChord ? inChord->GetDrawingX() : element->GetDrawingX();
+    xLedger = xStem;
     
-    dc->EndGraphic(element, this);
-}
+    drawingDur = note->GetDrawingDur();
+    drawingDur = ((note->GetColored()==BOOLEAN_true) && drawingDur > DUR_1) ? (drawingDur+1) : drawingDur;
     
-void View::DrawMultiRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
-{
-    assert( dc );
-    assert( element );
-    assert( layer );
-    assert( staff );
-    assert( measure );
+    int radius = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staffSize, drawingCueSize) / 2;
     
-    MultiRpt *multiRpt = dynamic_cast<MultiRpt*>(element);
-    assert( multiRpt );
+    if (drawingDur > DUR_1 || (drawingDur == DUR_1 && staff->notAnc)) {	// annuler provisoirement la modif. des lignes addit.
+		ledge = m_doc->GetDrawingLedgerLineLength(staffSize, drawingCueSize);
+	}
+    else {
+        ledge = m_doc->GetDrawingLedgerLineLength(staffSize, drawingCueSize);
+		radius += radius/3;
+	}
     
-    dc->StartGraphic( element, "", element->GetUuid() );
+    /************** Stem/notehead direction: **************/
     
-    DrawMRptPart(dc, element->GetDrawingX(), SMUFL_E501_repeat2Bars, multiRpt->GetNum(), true, staff, measure );
+    verticalCenter = staffY - m_doc->GetDrawingDoubleUnit(staffSize)*2;
+    if (!inChord && !inBeam && !inFTrem) {
+        if (note->HasStemDir()) {
+            note->SetDrawingStemDir(note->GetStemDir());
+        }
+        else if ( layer->GetDrawingStemDir() != STEMDIRECTION_NONE) {
+            note->SetDrawingStemDir( layer->GetDrawingStemDir() );
+        }
+        else {
+            note->SetDrawingStemDir( (noteY >= verticalCenter) ? STEMDIRECTION_down : STEMDIRECTION_up );
+        }
+    }
     
-    dc->EndGraphic(element, this);
+    //if the note is clustered, calculations are different
+    if (note->m_cluster) {
+        if (note->GetDrawingStemDir() == STEMDIRECTION_down) {
+            //stem down/even cluster = noteheads start on left (incorrect side)
+            if (note->m_cluster->size() % 2 == 0) {
+                flippedNotehead = (note->m_clusterPosition % 2 != 0);
+            }
+            //else they start on normal side
+            else {
+                flippedNotehead = (note->m_clusterPosition % 2 == 0);
+            }
+            
+            //if stem goes down, move ledger start to the left and expand it a full radius
+            if(!(note->IsClusterExtreme() && IsOnStaffLine(noteY, staff))) {
+                xLedger -= radius;
+                doubleLengthLedger = true;
+            }
+        }
+        else {
+            //flipped noteheads start on normal side no matter what
+            flippedNotehead = (note->m_clusterPosition % 2 == 0);
+            
+            //if stem goes up, move ledger start to the right and expand it a full radius
+            if(!(note->IsClusterExtreme() && IsOnStaffLine(noteY, staff))) {
+                xLedger += radius;
+                doubleLengthLedger = true;
+            }
+        }
+        
+        //positions notehead
+        if (!flippedNotehead) {
+            xNote = xStem - radius;
+        }
+        else {
+            //if we have a flipped notehead, we need to be in a chord
+            assert(inChord);
+            if (note->GetDrawingStemDir() == STEMDIRECTION_up) {
+                xNote = xStem + radius - m_doc->GetDrawingStemWidth(staffSize);
+            }
+            else if (note->GetDrawingStemDir() == STEMDIRECTION_down) {
+                xNote = xStem - radius * 3 + m_doc->GetDrawingStemWidth(staffSize);
+            }
+            else {
+                xNote = xStem - radius;
+            }
+        }
+    }
+    else
+    {
+        xNote = xStem - radius;
+    }
+
+    /************** Noteheads: **************/
     
-    return;
-}
+    if (drawingDur < DUR_1) {
+        DrawMaximaToBrevis( dc, noteY, element, layer, staff);
+    }
+    // Whole notes
+	else if (drawingDur == DUR_1) {
+        if (note->GetColored()==BOOLEAN_true)
+			fontNo = SMUFL_E0FA_noteheadWholeFilled;
+		else
+			fontNo = SMUFL_E0A2_noteheadWhole;
+
+		DrawSmuflCode( dc, xNote, noteY, fontNo, staff->m_drawingStaffSize, drawingCueSize );
+	}
+    // Other values
+	else {
+        if ((note->GetColored()==BOOLEAN_true) || drawingDur == DUR_2) {
+			fontNo = SMUFL_E0A3_noteheadHalf;
+        }
+        else {
+			fontNo = SMUFL_E0A4_noteheadBlack;
+        }
+        
+		DrawSmuflCode( dc, xNote, noteY, fontNo,  staff->m_drawingStaffSize, drawingCueSize );
+
+		if (!(inBeam && drawingDur > DUR_4) && !inFTrem && !inChord) {
+            DrawStem(dc, note, staff, note->GetDrawingStemDir(), radius, xStem, noteY);
+        }
+
+	}
+
+    /************** Ledger lines: **************/
+
+    int staffTop = staffY + m_doc->GetDrawingUnit(staffSize);
+    int staffBot = staffY - m_doc->GetDrawingStaffSize(staffSize) - m_doc->GetDrawingUnit(staffSize);
     
-void View::DrawMRptPart(DeviceContext *dc, int x, wchar_t smuflCode, int num, bool line, Staff *staff, Measure *measure )
-{
-    int width = measure->GetRightBarlineX() - measure->GetNonJustifiableLeftMargin();
-    int xCentered = measure->GetDrawingX() + measure->GetNonJustifiableLeftMargin()  + (width / 2);
+    //if the note is not in the staff
+    if (!is_in(noteY,staffTop,staffBot))
+    {
+        int distance, highestNewLine, numLines;
+        
+        bool aboveStaff = (noteY > staffTop);
+        
+        distance = (aboveStaff ? (noteY - staffY) : staffY - m_doc->GetDrawingStaffSize(staffSize) - noteY);
+        highestNewLine = ((distance % m_doc->GetDrawingDoubleUnit(staffSize) > 0) ? (distance - m_doc->GetDrawingUnit(staffSize)) : distance);
+        numLines = highestNewLine / m_doc->GetDrawingDoubleUnit(staffSize);
+ 
+        //if this is in a chord, we don't want to draw it yet, but we want to keep track of the maxima
+        if (inChord) {
+            if (inChord->m_drawingLedgerLines.count(staff)==0) {
+                std::vector<char> legerLines;
+                legerLines.resize(4);
+                inChord->m_drawingLedgerLines[staff] = legerLines;
+            }
+            int idx = doubleLengthLedger + aboveStaff * 2; // 2x2 array
+            std::vector<char> *legerLines = &inChord->m_drawingLedgerLines.at(staff);
+            (*legerLines).at(idx) = ledgermax(numLines, (*legerLines).at(idx));
+        }
+        //we do want to go ahead and draw if it's not in a chord
+        else {
+            DrawLedgerLines(dc, note, staff, aboveStaff, false, 0, numLines);
+        }
+    }
     
-    int xSymbol = xCentered - m_doc->GetGlyphWidth(smuflCode, staff->m_drawingStaffSize, false) / 2;
-    int y = staff->GetDrawingY();
-    int ySymbol = y - staff->m_drawingLines / 2 * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+    /************** Accidentals/dots/peripherals: **************/
     
-    DrawSmuflCode( dc, xSymbol, ySymbol, smuflCode, staff->m_drawingStaffSize, false );
+	if (note->m_drawingAccid) {
+        xAccid = xNote;
+        if (note->m_drawingAccid->GetFunc() != FUNC_edit) {
+            xAccid -= 1.5 * m_doc->GetGlyphWidth(SMUFL_E262_accidentalSharp, staffSize, drawingCueSize);
+        }
+        
+        note->m_drawingAccid->SetDrawingX( xAccid );
+        note->m_drawingAccid->SetDrawingY( noteY );
+        
+        //postpone drawing the accidental until later if it's in a chord or if it is not an attribute
+        if (!inChord && note->m_isDrawingAccidAttr) DrawAccid( dc, note->m_drawingAccid, layer, staff, measure );
+	}
+	
+    if (note->GetDots() && !inChord) {
+        int xDot;
+        if (note->GetActualDur() < DUR_2 || (note->GetActualDur() > DUR_8 && !inBeam && (note->GetDrawingStemDir() == STEMDIRECTION_up)))
+            xDot = xStem + m_doc->GetDrawingUnit(staffSize)*7/2;
+        else
+            xDot = xStem + m_doc->GetDrawingUnit(staffSize)*5/2;
+        
+		DrawDots( dc, xDot, noteY, note->GetDots(), staff );
+	}
     
-    if (line) {
-        DrawVerticalLine( dc, y, y - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize),
-                     xCentered, m_doc->GetDrawingBarLineWidth(staff->m_drawingStaffSize));
+    if (note->GetDrawingTieAttr()) {
+        System *system = dynamic_cast<System*>(measure->GetFirstParent( SYSTEM ) );
+        // create a placeholder for the tie attribute that will be drawn from the system
+        dc->StartGraphic(note->GetDrawingTieAttr(), "", note->GetDrawingTieAttr()->GetUuid().c_str());
+        dc->EndGraphic(note->GetDrawingTieAttr(), this);
+        if (system) system->AddToDrawingList(note->GetDrawingTieAttr());
     }
-    
-    if (num > 0) {
-        dc->SetFont( m_doc->GetDrawingSmuflFont( staff->m_drawingStaffSize, false) );
-        // calculate the width of the figures
-        int txt_length = 0;
-        int txt_height = 0;
-        std::wstring figures = IntToTupletFigures(num);
-        dc->GetSmuflTextExtent(figures, &txt_length, &txt_height);
-        dc->DrawMusicText( figures, ToDeviceContextX(xCentered - txt_length / 2),
-                          ToDeviceContextY(staff->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize)) );
-        dc->ResetFont();
+
+    // This will draw lyrics, accid, etc. (but only if not in chord)
+    if (!inChord) DrawLayerChildren(dc, note, layer, staff, measure);
+
+    if (note->GetFermata() != PLACE_NONE) {
+        DrawFermata(dc, element, layer, staff);
+    }
+
+    if (note->m_embellishment == EMB_TRILL) {
+        DrawTrill(dc, element, staff);
     }
 }
-    
-    
-void View::DrawBTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
+
+void View::DrawRest ( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
 {
     assert( dc );
     assert( element );
     assert( layer );
     assert( staff );
     assert( measure );
-    
-    BTrem *bTrem = dynamic_cast<BTrem*>(element);
-    assert( bTrem );
+        
+    Rest *rest = dynamic_cast<Rest*>(element);
+    assert( rest );
 
+    bool drawingCueSize = rest->IsCueSize();
+	int drawingDur = rest->GetActualDur();
+	int x = element->GetDrawingX();
+    int y = element->GetDrawingY();
     
-    dc->StartGraphic( element, "", element->GetUuid() );
-    
-    DrawLayerChildren(dc, bTrem, layer, staff, measure);
-    
-    data_STEMDIRECTION stemDir = STEMDIRECTION_NONE;
-    data_STEMMODIFIER stemMod;
-    int drawingDur;
-    LayerElement *childElement = NULL;
-    Point stemPoint;
-    bool drawingCueSize = false;
-    int x, y, yUnused;
-    
-    Chord *childChord = dynamic_cast<Chord*>(bTrem->FindChildByType(CHORD));
-    // Get from the chord or note child
-    if (childChord) {
-        stemDir = childChord->GetDrawingStemDir();
-        stemMod = childChord->GetStemMod();
-        stemPoint = childChord->GetDrawingStemStart();
-        drawingDur = childChord->GetDur();
-        childElement = childChord;
-    }
-    else {
-        Note *childNote = dynamic_cast<Note*>(bTrem->FindChildByType(NOTE));
-        if (childNote) {
-            drawingCueSize = childNote->IsCueSize();
-            stemDir = childNote->GetDrawingStemDir();
-            stemMod = childNote->GetStemMod();
-            stemPoint = childNote->GetDrawingStemStart();
-            drawingDur = childNote->GetDur();
-            childElement = childNote;
-        }
-    }
+    // Temporary fix for rest within tuplet because drawing tuplet requires m_drawingStemXXX to be set
+    //element->m_drawingStemStart.x = element->m_drawingStemEnd.x = element->GetDrawingX() - (m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) / 2);
+    //element->m_drawingStemEnd.y = element->GetDrawingY();
+    //element->m_drawingStemStart.y = element->GetDrawingY();
 
-    // nothing we can do...
-    if (stemDir == STEMDIRECTION_NONE) {
-        return;
+    if (drawingDur > DUR_2)
+    {
+		//x -= m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, drawingCueSize);
     }
-    
-    
-    int width = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, drawingCueSize);
-    int height = m_doc->GetDrawingBeamWidth(staff->m_drawingStaffSize, drawingCueSize) * 7 / 10;
-    int step = height + m_doc->GetDrawingBeamWhiteWidth(staff->m_drawingStaffSize, drawingCueSize);
 
-    if (stemDir == STEMDIRECTION_up) {
-        if (drawingDur > DUR_1) {
-            y = childElement->GetDrawingTop(m_doc, staff->m_drawingStaffSize) - 3 * height;
-            x = stemPoint.x;
-        }
-        else {
-            if (childElement->Is() == NOTE) y = childElement->GetDrawingY();
-            else childChord->GetYExtremes(&y, &yUnused);
-            y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6;
-            x = childElement->GetDrawingX();
-        }
-        step = -step;
-    }
-    else {
-        if (drawingDur > DUR_1) {
-            y = childElement->GetDrawingBottom(m_doc, staff->m_drawingStaffSize) + 1 * height;
-            x = stemPoint.x + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize);
-        }
-        else {
-            if (childElement->Is() == NOTE) y = childElement->GetDrawingY();
-            else childChord->GetYExtremes(&yUnused, &y);
-            y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 6;
-            x = childElement->GetDrawingX();
-        }
+    switch (drawingDur)
+    {	
+        case DUR_LG: DrawRestLong( dc, x, y, staff); break;
+        case DUR_BR: DrawRestBreve( dc, x, y, staff); break;
+        case DUR_1:
+        case DUR_2: DrawRestWhole( dc, x, y, drawingDur, rest->GetDots(), drawingCueSize, staff); break;
+        default: DrawRestQuarter( dc, x, y, drawingDur, rest->GetDots(), drawingCueSize, staff);
     }
     
-    int s;
-    for (s = 0; s < stemMod; s++) {
-        DrawObliquePolygon (dc, x - width / 2, y, x + width / 2, y + height, height);
-        y += step;
+    if(rest->GetFermata() != PLACE_NONE) {
+        DrawFermata(dc, element, layer, staff);
     }
-    
-    dc->EndGraphic(element, this);
-}
-    
-void View::DrawLongRest ( DeviceContext *dc, int x, int y, Staff *staff)
-{
-    int x1, x2, y1, y2;
-    
-    y1 = y;
-	x1 = x;
-	x2 = x + (m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2 / 3);
-    
-    // look if on line or between line
-	if ( (y - staff->GetDrawingY()) % m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize))
-		y1 -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-    
-	y2 = y1 + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)*2;
-	DrawFullRectangle( dc, x1, y2, x2, y1);
 }
 
-
-void View::DrawBreveRest ( DeviceContext *dc, int x, int y, Staff *staff)
-{	
-    int x1, x2, y1, y2;
-    y1 = y;
-	x1 = x;
-	x2 = x + (m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2 / 3);
-    
-    // look if one line or between line
-	if ( (y - staff->GetDrawingY()) % m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize))
-		y1 -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+void View::DrawSpace(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
+{
+    assert( dc );
+    assert( element );
+    assert( layer );
+    assert( staff );
+    assert( measure );
     
-	y2 = y1 + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-	DrawFullRectangle( dc, x1, y2, x2, y1);
-	
-    // lines
-    x1 = x - m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-    x2 = x + m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-
-	DrawHorizontalLine ( dc, x1, x2, y2, 1);
-	DrawHorizontalLine ( dc, x1, x2, y1, 1);
+    dc->StartGraphic( element, "", element->GetUuid() );
+    dc->DrawPlaceholder( ToDeviceContextX( element->GetDrawingX() ), ToDeviceContextY( element->GetDrawingY() ) );
+    dc->EndGraphic(element, this );
 }
 
-void View::DrawWholeRest ( DeviceContext *dc, int x, int y, int valeur, unsigned char dots, bool cueSize, Staff *staff)
+void View::DrawSyl( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
 {
-    int x1, x2, y1, y2, vertic;
-    y1 = y;
-    vertic = m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-	
-    int off = m_doc->GetDrawingLedgerLineLength(staff->m_drawingStaffSize, cueSize) * 2 / 3; // i.e., la moitie de la ronde
-
-	x1 = x - off;
-	x2 = x + off;
-
-	if (valeur == DUR_1)
-		vertic = -vertic;
-
-    // look if one line or between line
-	if ( (y - staff->GetDrawingY()) % m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize))
-	{
-		if (valeur == DUR_2)
-			y1 -= vertic;
-		else
-			y1 += vertic;
-	}
-
-	y2 = y1 + vertic;
-	DrawFullRectangle ( dc, x1, y1, x2, y2);
-
-	off /= 2;
-	x1 -= off;
-	x2 += off;
-
-    // legder line
-	if (y > (int)staff->GetDrawingY()  || y < staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize))
-		DrawHorizontalLine ( dc, x1, x2, y1, m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize));
-
-    if (dots) {
-		DrawDots( dc, (x2 + m_doc->GetDrawingUnit(staff->m_drawingStaffSize)), y2, dots, staff);
+    Syl *syl = dynamic_cast<Syl*>(element);
+    assert( syl );
+    
+    if ( !syl->GetStart() ) {
+        LogDebug("Syl parent note was not found");
+        return;
     }
-}
-
-
-void View::DrawQuarterRest ( DeviceContext *dc, int x, int y, int valeur, unsigned char dots, bool cueSize, Staff *staff)
-{
-    int y2 = y + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-	DrawSmuflCode( dc, x, y2, SMUFL_E4E5_restQuarter + (valeur-DUR_4), staff->m_drawingStaffSize, cueSize );
     
-	if (dots)
-	{	if (valeur < DUR_16) y += m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-		DrawDots( dc, (x + 2 * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)), y, dots, staff);
-	}
-}
-
-bool View::IsOnStaffLine ( int y, Staff *staff)
-{
-    return ((y - staff->GetDrawingY()) % m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) == 0 );
-}
-
-void View::PrepareChordDots ( DeviceContext *dc, Chord *chord, int x, int y, unsigned char dots, Staff *staff )
-{
-    std::list<int> *dotsList = &chord->m_dots;
-    int fullUnit = m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-    int doubleUnit = fullUnit * 2;
+    // move the position back - to be updated HARDCODED also see View::DrawSylConnector and View::DrawSylConnectorLines
+    syl->SetDrawingX( syl->GetStart()->GetDrawingX() - m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2 );
+    syl->SetDrawingY( GetSylY(syl, staff) );
     
-    //if it's on a staff line to start with, we need to compensate here and add a full unit like DrawDots would
-    if (IsOnStaffLine(y, staff)) {
-        //defaults to the space above the staffline first
-        //if that position is not on the list already, we're good to go
-        if(std::find(dotsList->begin(), dotsList->end(), y + fullUnit) == dotsList->end()) y += fullUnit;
-        
-        //if it is on the list, we should try the spot a doubleUnit below
-        else if(std::find(dotsList->begin(), dotsList->end(), y - fullUnit) == dotsList->end()) y -= fullUnit;
-        
-        //otherwise, any other space looks weird so let's not draw it
-        else return;
+    dc->StartGraphic( syl, "", syl->GetUuid() );
+    
+    dc->SetBrush( m_currentColour, AxSOLID );
+    
+    FontInfo currentFont;
+    if (syl->HasFontstyle()) {
+        currentFont = *m_doc->GetDrawingLyricFont(staff->m_drawingStaffSize);
+        currentFont.SetStyle(syl->GetFontstyle());
+        dc->SetFont(&currentFont);
     }
-    //similar if it's not on a staff line
     else {
-        //see if the optimal place exists already
-        if(std::find(dotsList->begin(), dotsList->end(), y) == dotsList->end()) {}
-        //if it does, then look up a space first
-        else if(std::find(dotsList->begin(), dotsList->end(), y + doubleUnit) == dotsList->end()) y += doubleUnit;
-        //then look down a space
-        else if(std::find(dotsList->begin(), dotsList->end(), y - doubleUnit) == dotsList->end()) y -= doubleUnit;
-        //otherwise let's not draw it
-        else return;
+        dc->SetFont( m_doc->GetDrawingLyricFont(staff->m_drawingStaffSize) );
     }
     
-    //finally, make sure it's not outside the acceptable extremes of the chord
-    int yMax, yMin;
-    chord->GetYExtremes(&yMax, &yMin);
-    if (y > (yMax + fullUnit)) return;
-    if (y < (yMin - fullUnit)) return;
+    DrawLyricString(dc, syl->GetDrawingX(), syl->GetDrawingY(), syl->GetText().c_str(), staff->m_drawingStaffSize );
     
-    //if it's not, add it to the dots list and go back to DrawChord
-    dotsList->push_back(y);
-}
-
-void View::DrawDots ( DeviceContext *dc, int x, int y, unsigned char dots, Staff *staff)
-{
-	int i;
-    if ( IsOnStaffLine(y, staff) ) {
-        y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+    dc->ResetFont();
+    dc->ResetBrush();
+    
+    if (syl->GetStart() && syl->GetEnd()) {
+        System *currentSystem = dynamic_cast<System*>( measure->GetFirstParent( SYSTEM ) );
+        // Postpone the drawing of the syl to the end of the system; this will call DrawSylConnector
+        // that will look if the last note is in the same system (or not) and draw the connectors accordingly
+        if (currentSystem) {
+            currentSystem->AddToDrawingList(syl);
+        }
     }
-	for (i = 0; i < dots; i++) {
-        DrawDot ( dc, x, y, staff->m_drawingStaffSize );
-		x += m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-	}
+    
+    dc->EndGraphic(syl, this );
 }
 
-void View::DrawBarline( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
+void View::DrawTuplet(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
 {
     assert( dc );
     assert( element );
@@ -1075,23 +1345,21 @@ void View::DrawBarline( DeviceContext *dc, LayerElement *element, Layer *layer,
     assert( staff );
     assert( measure );
     
-    Barline *barLine = dynamic_cast<Barline*>(element);
-    assert( barLine );
-    
-    if (barLine->GetRend() == BARRENDITION_invis) {
-        barLine->SetEmptyBB();
-        return;
-    }
+    Tuplet *tuplet = dynamic_cast<Tuplet*>(element);
+    assert( tuplet );
     
     dc->StartGraphic( element, "", element->GetUuid() );
     
-    int y = staff->GetDrawingY();
-    DrawBarline( dc, y, y - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize), barLine );
+    // Draw the inner elements
+    DrawLayerChildren(dc, tuplet, layer, staff, measure);
+    
+    // Add to the list of postponed element
+    layer->AddToDrawingList( tuplet );
     
     dc->EndGraphic(element, this );
 }
-    
-void View::DrawChord( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
+
+void View::DrawVerse( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
 {
     assert( dc );
     assert( element );
@@ -1099,955 +1367,685 @@ void View::DrawChord( DeviceContext *dc, LayerElement *element, Layer *layer, St
     assert( staff );
     assert( measure );
     
-    Chord* chord = dynamic_cast<Chord*>(element);
-    assert( chord );
+    Verse *verse = dynamic_cast<Verse*>(element);
+    assert( verse );
     
-    int staffSize = staff->m_drawingStaffSize;
-    int staffY = staff->GetDrawingY();
-	int verticalCenter = staffY - m_doc->GetDrawingDoubleUnit(staffSize)*2;
-    bool drawingCueSize = chord->IsCueSize();
-    int radius = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staffSize, drawingCueSize) / 2;
-    int fullUnit = m_doc->GetDrawingUnit(staffSize);
+    dc->StartGraphic( verse, "", verse->GetUuid() );
     
-    Beam *inBeam = chord->IsInBeam();
-    bool inFTrem = chord->IsInFTrem();
+    DrawLayerChildren(dc, verse, layer, staff, measure);
     
-    /************ Ledger line reset ************/
+    dc->EndGraphic( verse, this );
+}
+
+//----------------------------------------------------------------------------
+// Partial drawing methods
+//----------------------------------------------------------------------------
+
+
+void View::DrawAcciaccaturaSlash(DeviceContext *dc, LayerElement *element)
+{
+    Note *note = dynamic_cast<Note*>(element);
+    assert( note );
+
+    Staff *staff = dynamic_cast<Staff*>( note->GetFirstParent( STAFF ) );
+    assert( staff );
     
-    //if there are double-length lines, we only need to draw single-length after they've been drawn
-    chord->m_drawingLedgerLines.clear();
+    if (note->GetActualDur() < DUR_8)
+        return;
     
-    /************ Stems ************/
+    dc->SetPen(AxBLACK, m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize), AxSOLID);
+    dc->SetBrush( AxBLACK, AxSOLID );
     
-    int drawingDur = chord->GetDur();
+    int positionShift = m_doc->GetGraceSize(m_doc->GetDrawingUnit(staff->m_drawingStaffSize));
+    int positionShiftX1 = positionShift * 3 / 2;
+    int positionShiftY1 = positionShift * 2;
+    int positionShiftX2 = positionShift * 3;
+    int positionShiftY2 = positionShift * 6;
+    Point startPoint = note->GetDrawingStemStart();
     
-    // (unless we're in a beam or in an fTrem)
-    if (!inBeam && !inFTrem) {
-        int yMax, yMin;
-        chord->GetYExtremes(&yMax, &yMin);
-        
-        if (chord->HasStemDir()) {
-            chord->SetDrawingStemDir(chord->GetStemDir());
-        }
-        else if (layer->GetDrawingStemDir() != STEMDIRECTION_NONE) {
-            chord->SetDrawingStemDir(layer->GetDrawingStemDir());
-        }
-        else {
-            chord->SetDrawingStemDir(yMax - verticalCenter >= verticalCenter - yMin ? STEMDIRECTION_down : STEMDIRECTION_up);
-        }
-        
-        // (only shorter than whole notes)
-        if (drawingDur > DUR_1) {
-            int beamX = chord->GetDrawingX();
-            int originY = ( chord->GetDrawingStemDir() == STEMDIRECTION_down ? yMax : yMin );
-            int heightY = yMax - yMin;
-            DrawStem(dc, chord, staff, chord->GetDrawingStemDir(), radius, beamX, originY, heightY);
-        }
+    // HARDCODED
+    if (note->GetDrawingStemDir() == STEMDIRECTION_up) {
+        dc->DrawLine(
+                     ToDeviceContextX(startPoint.x - positionShiftX1 ),
+                     ToDeviceContextY(startPoint.y + positionShiftY1),
+                     ToDeviceContextX(startPoint.x + positionShiftX2),
+                     ToDeviceContextY(startPoint.y + positionShiftY2));
+    } else {
+        dc->DrawLine(ToDeviceContextX(startPoint.x - positionShiftX1),
+                     ToDeviceContextY(startPoint.y - positionShiftY1),
+                     ToDeviceContextX(startPoint.x + positionShiftX2),
+                     ToDeviceContextY(startPoint.y - positionShiftY2));
     }
     
-    /************ Draw children (notes) ************/
-    
-    DrawLayerChildren(dc, chord, layer, staff, measure);
+    dc->ResetPen();
+    dc->ResetBrush();
+}
+
+void View::DrawDots( DeviceContext *dc, int x, int y, unsigned char dots, Staff *staff)
+{
+	int i;
+    if ( IsOnStaffLine(y, staff) ) {
+        y += m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+    }
+	for (i = 0; i < dots; i++) {
+        DrawDot ( dc, x, y, staff->m_drawingStaffSize );
+		x += m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+	}
+}
+
+void View::DrawFermata(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff)
+{
+    int x, y;
+    int emb_offset = 0; // if there is and embellishment, offset the note up
     
-    /************ Dots ************/
+    // We move the fermata position of half of the fermata size
+    x = element->GetDrawingX() - m_doc->GetGlyphWidth(SMUFL_E4C0_fermataAbove, staff->m_drawingStaffSize, false) / 2;
     
-    chord->m_dots.clear();
+    data_PLACE place = PLACE_above;
+    if (layer->GetDrawingStemDir() != STEMDIRECTION_NONE) {
+        place = (layer->GetDrawingStemDir() == STEMDIRECTION_up) ? PLACE_above : PLACE_above;
+    }
     
-    if (chord->GetDots()) {
-        int numDots = chord->GetDots();
-        
-        //Set the x value...
-        int dotsX;
+    // First case, notes
+    if ((element->Is() == NOTE) || (element->Is() == CHORD)) {
+        // To be fix once m_embellishment is removed
+        if (element->Is() == NOTE)  {
+            Note *note = dynamic_cast<Note*>(element);
+            assert( note );
+            if (note->m_embellishment) {
+                emb_offset = m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+            }
+        }
         
-        //make sure all the dots are at the same X position
-        if (chord->GetDur() < DUR_2 || (chord->GetDur() > DUR_8 && !inBeam && (chord->GetDrawingStemDir() == STEMDIRECTION_up))) {
-            dotsX = chord->GetDrawingX() + (fullUnit * 7/2);
+        if (place == PLACE_above) {
+            // check that the notehead is in the staff.
+            if (element->GetDrawingTop(m_doc, staff->m_drawingStaffSize) < staff->GetDrawingY()) {
+                // in the staff, set the fermata 20 pixels above the last line (+ embellishment offset)
+                y = staff->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) + emb_offset;
+            }
+            else {
+                // out of the staff, place the trill above the notehead
+                y = element->GetDrawingTop(m_doc, staff->m_drawingStaffSize) + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) + emb_offset;
+            }
+            // draw the up-fermata - need cue size support
+            DrawSmuflCode ( dc, x, y, SMUFL_E4C0_fermataAbove, staff->m_drawingStaffSize, false );
         }
         else {
-            dotsX = chord->GetDrawingX() + (fullUnit * 5/2);
+            // This works as above, only we check that the note head is not
+            if (element->GetDrawingBottom(m_doc, staff->m_drawingStaffSize) > (staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize))) {
+                // notehead in staff, set  under
+                y = staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize) - m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            }
+            else {
+                // notehead under staff, set under notehead
+                y = element->GetDrawingBottom(m_doc, staff->m_drawingStaffSize) - m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            }
+            // draw the down-fermata - need cue size support
+            DrawSmuflCode ( dc, x, y, SMUFL_E4C1_fermataBelow, staff->m_drawingStaffSize, false );
         }
-        
-        // Notes in clusters: If the stem points up and we have a note on the (incorrect) right side of the stem, add a note diameter to the dot positioning to avoid overlapping.
-        if ((chord->GetDrawingStemDir() == STEMDIRECTION_up) && (chord->m_clusters.size() > 0)) dotsX += (radius * 2);
-        
-        //Prep where the dots will go by preventing overlaps and using space efficiently
-        for (ListOfObjects::reverse_iterator rit = chord->GetList(chord)->rbegin(); rit != chord->GetList(chord)->rend(); rit++)
-        {
-            Note *note = dynamic_cast<Note*>(*rit);
-            PrepareChordDots(dc, chord, dotsX, note->GetDrawingY(), numDots, staff);
+    } else if (element->Is() == REST) {
+        if (place == PLACE_above) {
+            y = staff->GetDrawingY() + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+            DrawSmuflCode ( dc, x, y, SMUFL_E4C0_fermataAbove, staff->m_drawingStaffSize, false );
+        }
+        else {
+            y = staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize) - m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            DrawSmuflCode ( dc, x, y, SMUFL_E4C1_fermataBelow, staff->m_drawingStaffSize, false );
         }
-        
-        //And then draw them
-        std::list<int> *dotsList = &chord->m_dots;
-        for (std::list<int>::iterator it=dotsList->begin(); it != dotsList->end(); ++it)
-            DrawDots(dc, dotsX, *it, numDots, staff);
     }
-    
-    /************ Accidentals ************/
-    
-    //navigate through list of notes, starting with outside and working in
-
-    chord->ResetAccidList();
-    std::vector<Note*> noteList = chord->m_accidList;
-    int size = (int)noteList.size();
-    if (size > 0)
-    {
-        //set the default x position
-        int xAccid = chord->GetDrawingX() - (radius * 2);
+}
 
-        //if chord is a down-stemmed non-cluster, it needs one more note diameter of space
-        if ((chord->GetDrawingStemDir() == STEMDIRECTION_down) && (chord->m_clusters.size() > 0))
-        {
-            xAccid -= (radius * 2);
+//skips "skip" lines before drawing "n" ledger lines
+void View::DrawLedgerLines( DeviceContext *dc, LayerElement *element, Staff *staff, bool aboveStaff, bool doubleLength, int skip, int n)
+{
+    //various variables
+    int ledgerY;
+    int staffY = staff->GetDrawingY();
+    int staffSize = staff->m_drawingStaffSize;
+    int betweenLines = m_doc->GetDrawingDoubleUnit(staffSize);
+    bool drawingCueSize = element->IsCueSize();
+    int ledge = m_doc->GetDrawingLedgerLineLength(staffSize, drawingCueSize);
+    int noteDiameter = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staffSize, drawingCueSize);
+    
+    //prep start and end positions of ledger line depending on stem direction and doubleLength
+    int xLedgerStart, xLedgerEnd;
+    if (doubleLength) {
+        Chord *chord = dynamic_cast<Chord*>(element);
+        assert( chord );
+        if (chord->GetDrawingStemDir() == STEMDIRECTION_down) {
+            xLedgerStart = element->GetDrawingX() - ledge - noteDiameter;
+            xLedgerEnd = element->GetDrawingX() + ledge;
         }
-
-        int fwIdx, idx, bwIdx;
-
-        //reset the boolean 2d vector
-        chord->ResetAccidSpace(fullUnit);
-        std::vector<int> accidClusterStarts;
-        
-        //iterate through the list of notes with accidentals
-        for(idx = 0; idx < size; idx++)
-        {
-            Accid *curAccid = noteList.at(idx)->m_drawingAccid;
-
-            //if the note does not need to be moved, save a new cluster start position
-            if (CalculateAccidX(staff, curAccid, chord, false))
-            {
-                accidClusterStarts.push_back(idx);
-            }
+        else {
+            xLedgerStart = element->GetDrawingX() - ledge;
+            xLedgerEnd = element->GetDrawingX() + ledge + noteDiameter;
         }
-        
-        chord->ResetAccidSpace(fullUnit);
-        int accidSize = (int)accidClusterStarts.size();
-        
-        //for each note that conflicts
-        for(idx = 0; idx < accidSize; idx++)
-        {
-            //set fwIdx to the start of the cluster
-            fwIdx = accidClusterStarts.at(idx);
-            //if this is the last cluster, set bwIdx to the last note in the chord
-            if (idx == accidSize - 1) bwIdx = size - 1;
-            //otherwise, set bwIdx to one before the beginning of the next cluster
-            else bwIdx = accidClusterStarts.at(idx + 1) - 1;
-            
-            //if it's even, this will catch the overlap; if it's odd, there's an if in the middle there
-            while (fwIdx <= bwIdx)
-            {
-                Accid *accidFwd = noteList.at(fwIdx)->m_drawingAccid;
-                Accid *accidBwd = noteList.at(bwIdx)->m_drawingAccid;
-                
-                //if the top note has an accidental, draw it and update prevAccid
-                accidFwd->SetDrawingX(xAccid);
-                CalculateAccidX(staff, accidFwd, chord, true);
-                DrawAccid(dc, accidFwd, layer, staff, measure);
-                //same, except with an extra check that we're not doing the same note twice
-                if (fwIdx != bwIdx) {
-                    accidBwd->SetDrawingX(xAccid);
-                    CalculateAccidX(staff, accidBwd, chord, true);
-                    DrawAccid(dc, accidBwd, layer, staff, measure);
-                    bwIdx--;
-                }
-                
-                fwIdx++;
-            }
-            fwIdx = idx;
-        }
-    }
-    
-    /************ Ledger lines ************/
-
-    dc->SetPen( m_currentColour, ToDeviceContextX( m_doc->GetDrawingStaffLineWidth(staffSize) ), AxSOLID );
-    dc->SetBrush(m_currentColour , AxTRANSPARENT );
-    
-    MapOfLedgerLineFlags::iterator iter;
-    for(iter = chord->m_drawingLedgerLines.begin(); iter != chord->m_drawingLedgerLines.end(); iter++) {
-        
-        std::vector<char> *legerLines = &(*iter).second;
-        
-        //if there are double-length lines, we only need to draw single-length after they've been drawn
-        (*legerLines).at(0) -= (*legerLines).at(1);
-        (*legerLines).at(2) -= (*legerLines).at(3);
-        
-        //double-length lines below the staff
-        DrawLedgerLines(dc, chord, (*iter).first, false, true, 0, (*legerLines).at(1));
-        
-        //remainder single-length lines below the staff
-        DrawLedgerLines(dc, chord, (*iter).first, false, false, (*legerLines).at(1), (*legerLines).at(0));
-        
-        //double-length lines above the staff
-        DrawLedgerLines(dc, chord, (*iter).first, true, true, 0, (*legerLines).at(3));
-        
-        //remainder single-length lines above the staff
-        DrawLedgerLines(dc, chord, (*iter).first, true, false, (*legerLines).at(3), (*legerLines).at(2));
-
-    }
-    
-    dc->ResetPen();
-    dc->ResetBrush();
-}
-
-void View::DrawClef( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
-{
-    assert( dc );
-    assert( element );
-    assert( layer );
-    assert( staff );
-    assert( measure );
-    
-    Clef *clef = dynamic_cast<Clef*>(element);
-    assert( clef );
-
-    dc->StartGraphic( element, "", element->GetUuid() );
-	
-	int b = staff->GetDrawingY();
-	int a = element->GetDrawingX();
-    int sym = SMUFL_E050_gClef;	//sSOL, position d'ordre des cles sol fa ut in fonts
-
-    /*  poser sym=no de position sSOL dans la fonte
-     *	au depart; ne faire operation sur b qu'une fois pour cas semblables,
-     *  et au palier commun superieur, incrementer sym, sans break.
-     */
-	switch(clef->GetClefId())
-	{
-		case C1 :
-            sym = SMUFL_E05C_cClef;
-            b -= m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize);
-            break;
-		case G1 :
-            b -= m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize);
-            break;
-		case G2_8va :
-            sym = SMUFL_E053_gClef8va;
-            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * 3;
-            break;
-        case G2_8vb :
-            sym = SMUFL_E052_gClef8vb;
-            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * 3;
-            break;
-		case C2 :
-            sym = SMUFL_E05C_cClef;
-            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * 3;
-            break;
-		case G2 :
-            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * 3;
-            break;
-		case F3 :
-            sym = SMUFL_E062_fClef;
-            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)*2;
-            break;
-		case C3 :
-            sym = SMUFL_E05C_cClef;
-            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)*2;
-            break;
-		case F5 :
-            sym =SMUFL_E062_fClef;
-            break;
-		case F4 :
-            sym = SMUFL_E062_fClef;
-            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-            break;
-		case C4 :
-            sym = SMUFL_E05C_cClef;
-            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-            break;
-		case C5 :
-            sym = SMUFL_E05C_cClef;
-            break;
-		case perc :
-            b -= m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) * 2;
-            // FIXME
-            sym = SMUFL_E05C_cClef;
-            break;
-		default: 
-            break;
-	}
-
-    bool cueSize = false;
-    // force cue size for intermediate clefs
-    if (clef->GetFirstParent( LAYER )) cueSize = true;
-    
-    //if (!cueSize)
-    //    a -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
-    
-    DrawSmuflCode ( dc, a, b, sym, staff->m_drawingStaffSize, cueSize );
-   
-    dc->EndGraphic(element, this );
-}
-
-void View::DrawMeterSigFigures( DeviceContext *dc, int x, int y, int num, int numBase, Staff *staff)
-{
-    assert( dc );
-    assert( staff );
-    
-    int ynum, yden;
-    std::wstring wtext;
-    
-    if (numBase)
-    {
-        ynum = y - (m_doc->GetDrawingUnit(staff->m_drawingStaffSize)*2);
-        yden = ynum - (m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)*2);
-    }
-    else
-        ynum = y - (m_doc->GetDrawingUnit(staff->m_drawingStaffSize)*4);
-    
-    if (numBase > 9 || num > 9)	{
-        x += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
     }
-    
-    dc->SetFont(m_doc->GetDrawingSmuflFont(staff->m_drawingStaffSize, false));
-    
-    wtext = IntToTimeSigFigures(num);
-    DrawSmuflString ( dc, x, ynum, wtext, true, staff->m_drawingStaffSize);	// true = center
-    
-    if (numBase)
-    {
-        wtext = IntToTimeSigFigures(numBase);
-        DrawSmuflString ( dc, x, yden, wtext, true, staff->m_drawingStaffSize);	// '1' = center
-    }
-    
-    dc->ResetFont();
-}
-    
-void View::DrawMeterSig( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
-{
-    assert( dc );
-    assert( element );
-    assert( layer );
-    assert( staff );
-    assert( measure );
-    
-    MeterSig *meterSig = dynamic_cast<MeterSig*>(element);
-    assert( meterSig );
-    
-    dc->StartGraphic( element, "", element->GetUuid() );
-    
-    int y = staff->GetDrawingY() - (m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 4);
-    int x = element->GetDrawingX();
-    
-    if ( meterSig->GetSym() == METERSIGN_common ) {
-        DrawSmuflCode( dc, element->GetDrawingX(), y, SMUFL_E08A_timeSigCommon, staff->m_drawingStaffSize, false);
-        x += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 5; // step forward because we have a symbol
-    }
-    else if ( meterSig->GetSym() == METERSIGN_cut ) {
-        DrawSmuflCode( dc, element->GetDrawingX(), y, SMUFL_E08B_timeSigCutCommon, staff->m_drawingStaffSize, false);
-        x += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 5; // step forward because we have a symbol
-    }
-    else if (meterSig->GetCount())
-    {	
-        DrawMeterSigFigures ( dc, x, staff->GetDrawingY(), meterSig->GetCount(), meterSig->GetUnit(), staff);
+    else {
+        xLedgerStart = element->GetDrawingX() - ledge;
+        xLedgerEnd = element->GetDrawingX() + ledge;
     }
     
-    dc->EndGraphic(element, this );
-}
-    
-bool View::CalculateAccidX(Staff *staff, Accid *accid, Chord *chord, bool adjustHorizontally)
-{
-    std::vector< std::vector<bool> > *accidSpace = &chord->m_accidSpace;
-    
-    //global drawing variables
-    int fullUnit = m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-    int halfUnit = fullUnit / 2;
-    int accidHeight = ACCID_HEIGHT * halfUnit;
-    
-    //drawing variables for the chord
-    int xLength = (int)accidSpace->front().size();
-    int yHeight = (int)accidSpace->size() - 1;
-    int listTop = chord->m_accidSpaceTop;
-    int listBot = chord->m_accidSpaceBot;
-    
-    //drawing variables for the accidental
-    int type = accid->GetAccid();
-    int centerY = accid->GetDrawingY();
-    int topY = centerY + (accidHeight / 2);
-    int bottomY = centerY - (accidHeight / 2);
-    
-    //difference between left end and right end of the accidental
-    int accidWidthDiff = ACCID_WIDTH - 1;
-    //difference between top and bottom of the accidental
-    int accidHeightDiff = ACCID_HEIGHT - 1;
-    //drawing variables for the accidental in accidSpace units
-    int accidTop = std::max(0, listTop - topY) / halfUnit;
-    int accidBot, alignmentThreshold;
-    //the left side of the accidental; gets incremented to avoid conflicts
-    int currentX = accidWidthDiff;
-    
-    //another way of calculating accidBot
-    assert(((int)accidSpace->size() - 1) - ((std::max(0, bottomY - listBot)) / halfUnit) == accidTop + accidHeightDiff);
-    
-    // store it for asserts
-    int accidSpaceSize = (int)accidSpace->size();
-    assert(accidTop >= 0);
-    assert(accidTop < accidSpaceSize);
-    
-    /*
-     * Make sure all four corners of the accidental are not on an already-taken spot.
-     * The top right corner of a flat can overlap something else; make sure that the bordering sections do not overlap.
-     * Move the accidental one half-unit left until it doesn't overlap.
-     */
-    if (type == ACCIDENTAL_EXPLICIT_f) {
-        alignmentThreshold = 2;
-        accidBot = accidTop + (accidHeightDiff * FLAT_BOTTOM_HEIGHT_MULTIPLIER);
-        assert(accidBot < accidSpaceSize);
-        while (currentX < xLength) {
-            if (accidSpace->at(accidTop + (ACCID_HEIGHT * FLAT_CORNER_HEIGHT_IGNORE)).at(currentX - accidWidthDiff)) currentX += 1;
-            // just in case
-            else if (currentX - accidWidthDiff + (ACCID_WIDTH * FLAT_CORNER_WIDTH_IGNORE) >= xLength ) break;
-            else if (accidSpace->at(accidTop).at(currentX - accidWidthDiff + (ACCID_WIDTH * FLAT_CORNER_WIDTH_IGNORE))) currentX += 1;
-            else if (accidSpace->at(accidBot).at(currentX - accidWidthDiff)) currentX += 1;
-            else if (accidSpace->at(accidTop).at(currentX)) currentX += 1;
-            else if (accidSpace->at(accidBot).at(currentX)) currentX += 1;
-            else break;
-        };
-    }
-    else if (type == ACCIDENTAL_EXPLICIT_n) {
-        alignmentThreshold = 1;
-        accidBot = accidTop + accidHeightDiff;
-        assert(accidBot < accidSpaceSize);
-        //Midpoint needs to be checked for non-flats as there's a chance that a natural/sharp could completely overlap a flat
-        int accidMid = accidTop + (accidBot - accidTop) / 2;
-        while (currentX < xLength) {
-            if (accidSpace->at(accidTop + (ACCID_HEIGHT * NATURAL_CORNER_HEIGHT_IGNORE)).at(currentX - accidWidthDiff)) currentX += 1;
-            // just in case
-            else if (currentX - accidWidthDiff + (ACCID_WIDTH * NATURAL_CORNER_WIDTH_IGNORE) >= xLength ) break;
-            else if (accidSpace->at(accidTop).at(currentX - accidWidthDiff + (ACCID_WIDTH * NATURAL_CORNER_WIDTH_IGNORE))) currentX += 1;
-            else if (accidSpace->at(accidMid).at(currentX - accidWidthDiff)) currentX += 1;
-            else if (accidSpace->at(accidBot).at(currentX - accidWidthDiff)) currentX += 1;
-            else if (accidSpace->at(accidTop).at(currentX)) currentX += 1;
-            else if (accidSpace->at(accidMid).at(currentX)) currentX += 1;
-            else if (accidSpace->at(accidBot).at(currentX)) currentX += 1;
-            else break;
-        };
-    }
-    else if (type == ACCIDENTAL_EXPLICIT_s) {
-        accidBot = accidTop + accidHeightDiff;
-        alignmentThreshold = 1;
-        //Midpoint needs to be checked for non-flats as there's a chance that a natural/sharp could completely overlap a flat
-        int accidMid = accidTop + (accidBot - accidTop) / 2;
-        while (currentX < xLength) {
-            if (accidSpace->at(accidTop).at(currentX - accidWidthDiff)) currentX += 1;
-            else if (accidSpace->at(accidMid).at(currentX - accidWidthDiff)) currentX += 1;
-            else if (accidSpace->at(accidBot).at(currentX - accidWidthDiff)) currentX += 1;
-            else if (accidSpace->at(accidTop).at(currentX)) currentX += 1;
-            else if (accidSpace->at(accidMid).at(currentX)) currentX += 1;
-            else if (accidSpace->at(accidBot).at(currentX)) currentX += 1;
-            else break;
-        };
+    //prep initial Y position
+    if (aboveStaff) {
+        ledgerY = (skip * betweenLines) + staffY;
     }
     else {
-        accidBot = accidTop + accidHeightDiff;
-        alignmentThreshold = 1;
-        assert(accidBot < accidSpaceSize);
-        //Midpoint needs to be checked for non-flats as there's a chance that a natural/sharp could completely overlap a flat
-        int accidMid = accidTop + (accidBot - accidTop) / 2;
-        assert(accidMid < accidSpaceSize);
-        while (currentX < xLength) {
-            if (accidSpace->at(accidTop).at(currentX - accidWidthDiff)) currentX += 1;
-            else if (accidSpace->at(accidMid).at(currentX - accidWidthDiff)) currentX += 1;
-            else if (accidSpace->at(accidBot).at(currentX - accidWidthDiff)) currentX += 1;
-            else if (accidSpace->at(accidTop).at(currentX)) currentX += 1;
-            else if (accidSpace->at(accidMid).at(currentX)) currentX += 1;
-            else if (accidSpace->at(accidBot).at(currentX)) currentX += 1;
-            else break;
-        };
+        ledgerY = staffY - m_doc->GetDrawingStaffSize(staffSize) - (skip * betweenLines);
+        betweenLines = -m_doc->GetDrawingDoubleUnit(staffSize);
     }
     
-    //If the accidental is lined up with the one above it, move it left by a halfunit to avoid visual confusion
-    //This doesn't need to be done with accidentals that are as far left or up as possible
-    if ((currentX < xLength - 1) && (accidTop > 1))
-    {
-        int yComp = accidTop - alignmentThreshold;
-        assert(yComp < accidSpaceSize);
-        assert(yComp >= 0);
-        if((accidSpace->at(yComp).at(currentX + 1) == false) && (accidSpace->at(yComp).at(currentX) == true)) currentX += 1;
-    }
+    //add one line's distance to get it off the edge of the staff
+    ledgerY += betweenLines;
     
-    //If the accidental is lined up with the one below it, move it left by a halfunit to avoid visual confusion
-    //This doesn't need to be done with accidentals that are as far left or down as possible
-    if ((currentX < xLength - 1) && (accidBot < (yHeight - 1)) && accidBot > 1)
-    {
-        int yComp = accidBot;
-        assert(yComp < accidSpaceSize);
-        assert(yComp >= 0);
-        if((accidSpace->at(yComp).at(currentX + 1) == false) && (accidSpace->at(yComp).at(currentX) == true)) currentX += 1;
-    }
-
-    //Just to make sure.
-    assert(currentX <= xLength);
+    dc->SetPen( m_currentColour, ToDeviceContextX( m_doc->GetDrawingStaffLineWidth(staffSize) ), AxSOLID );
+    dc->SetBrush(m_currentColour , AxTRANSPARENT );
     
-    //If we need to move the accidental horizontally, move it by currentX half-units.
-    if (adjustHorizontally)
-    {
-        int xShift = currentX * halfUnit;
-        accid->SetDrawingX(accid->GetDrawingX() - xShift);
-        
-        //mark the spaces as taken (true in accidSpace)
-        for(int xIdx = currentX; xIdx > currentX - ACCID_WIDTH; xIdx--)
-        {
-            for(int yIdx = accidTop; yIdx < accidBot + 1; yIdx++)
-            {
-                accidSpace->at(yIdx).at(xIdx) = true;
-            }
-        }
-    }
-    //Otherwise, just mark its vertical position so we can see if there are any vertical conflicts
-    else
+    //draw the lines
+    for (int i = 0; i < n; i++)
     {
-        for(int xIdx = 0; xIdx < ACCID_WIDTH; xIdx++) //x from 0 to 4, base position
-        {
-            for(int yIdx = accidTop; yIdx < accidBot + 1; yIdx++)
-            {
-                accidSpace->at(yIdx).at(xIdx) = true;
-            }
-        }
+        dc->DrawLine( ToDeviceContextX(xLedgerStart) , ToDeviceContextY ( ledgerY ) , ToDeviceContextX(xLedgerEnd) , ToDeviceContextY ( ledgerY ) );
+        ledgerY += betweenLines;
     }
     
-    //For debugging; leaving this in temporarily
-//    for (int vIdx = 0; vIdx < accidSpace->size(); vIdx++)
-//    {
-//        std::cout << "|";
-//        std::vector<bool> thisRow = accidSpace->at(vIdx);
-//        for (int hIdx = (int)thisRow.size() - 1; hIdx >= 0; hIdx --)
-//        {
-//            std::cout << thisRow.at(hIdx) << "|";
-//        }
-//        std::cout << std::endl;
-//    }
-//    std::cout << std::endl;
-    
-    //Regardless of whether or not we moved it, return true if there was a conflict and currentX would have been moved
-    return (currentX - accidWidthDiff == 0);
+    dc->ResetPen();
+    dc->ResetBrush();
 }
 
-void View::DrawAccid( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure, Accid *prevAccid )
+void View::DrawMeterSigFigures( DeviceContext *dc, int x, int y, int num, int numBase, Staff *staff)
 {
     assert( dc );
-    assert( element );
-    assert( layer );
     assert( staff );
-    assert( measure );
     
-    Accid *accid = dynamic_cast<Accid*>(element);
-    assert( accid );
+    int ynum, yden;
+    std::wstring wtext;
     
-    dc->StartGraphic( element, "", element->GetUuid() );
-
-    // Parent will be NULL if we are drawing a note @accid (see DrawNote) - the y value is already set
-    if ( accid->m_parent ) {
-        accid->SetDrawingY( accid->GetDrawingY() + CalculatePitchPosY( staff, accid->GetPloc(), layer->GetClefOffset( accid ), accid->GetOloc()) );
-        accid->m_drawingCueSize = accid->IsCueSize();
+    if (numBase)
+    {
+        ynum = y - (m_doc->GetDrawingUnit(staff->m_drawingStaffSize)*2);
+        yden = ynum - (m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)*2);
     }
+    else
+        ynum = y - (m_doc->GetDrawingUnit(staff->m_drawingStaffSize)*4);
     
-    /************** editorial accidental **************/
-    
-    if ( accid->GetFunc() == FUNC_edit ) {
-        // position is currently only above the staff
-        int y = staff->GetDrawingY();
-        // look at the note position and adjust it if necessary
-        Note *note = dynamic_cast<Note*>( accid->GetFirstParent( NOTE, MAX_ACCID_DEPTH ) );
-        if ( note ) {
-            if ( note->GetDrawingY() > y ) {
-                y = note->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-            }
-            if ( (note->GetDrawingStemDir() == STEMDIRECTION_up) && (note->GetDrawingStemEnd().y > y )) {
-                y = note->GetDrawingStemEnd().y;
-            }
-            
-            // adjust the x position so it is centered
-            int radius = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, accid->m_drawingCueSize);
-            if ( note->GetActualDur() < DUR_2 ) radius += radius/3;
-            accid->SetDrawingX( accid->GetDrawingX() + radius / 2 );
-        }
-        accid->SetDrawingY( y + TEMP_STYLE_ACCID_EDIT_SPACE * m_doc->GetDrawingUnit(staff->m_drawingStaffSize) / PARAM_DENOMINATOR );
+    if (numBase > 9 || num > 9)	{
+        x += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2;
     }
     
-    int x = accid->GetDrawingX();
-    int y = accid->GetDrawingY();
+    dc->SetFont(m_doc->GetDrawingSmuflFont(staff->m_drawingStaffSize, false));
     
-    int symc = SMUFL_E261_accidentalNatural;
-    switch (accid->GetAccid())
+    wtext = IntToTimeSigFigures(num);
+    DrawSmuflString ( dc, x, ynum, wtext, true, staff->m_drawingStaffSize);	// true = center
+    
+    if (numBase)
     {
-        case ACCIDENTAL_EXPLICIT_n :  symc = SMUFL_E261_accidentalNatural; break;
-        
-        /* The ACCID_DOUBLE_SHARP definition is used in two ways:
-         * 1) Antique notation (notAnc == true): it displays the two
-         *    stacked sharps used in key signatures;
-         * 2) Modern notation: is display a double flat
-         *    this poses no particular rendering problems;
-         * Case 1) on the other hand requires that the sharp
-         * is printed two times, the second time shifting it up
-         * (hence no break in the case statement)
-         * Same thing applies to LEIPZIG_ACCID_FLAT, but in this
-         * case it is used ONLY ad stacked flats (no double flat
-         * glyph).
-         */
-        case ACCIDENTAL_EXPLICIT_ss :
-            // This needs to be fixed because it is the old Wolfgang way to handle
-            // mensural notation
-            if (staff->notAnc) {
-                    symc = SMUFL_E262_accidentalSharp;
-                    DrawSmuflCode ( dc, x, y, symc,  staff->m_drawingStaffSize, accid->m_drawingCueSize );
-                    y += 7*m_doc->GetDrawingUnit(staff->m_drawingStaffSize); // LP
-            } else {
-                symc = SMUFL_E263_accidentalDoubleSharp;
-                break;
-            }
-        case ACCIDENTAL_EXPLICIT_s : symc = SMUFL_E262_accidentalSharp; break;
-        case ACCIDENTAL_EXPLICIT_ff : symc = SMUFL_E264_accidentalDoubleFlat;
-        case ACCIDENTAL_EXPLICIT_f : symc = SMUFL_E260_accidentalFlat; break;
-        case ACCIDENTAL_EXPLICIT_su : symc = SMUFL_E268_accidentalNaturalSharp; break; // Not sure this is correct...
-        case ACCIDENTAL_EXPLICIT_fu : symc= SMUFL_E267_accidentalNaturalFlat; break; // Same
-        default : break;
+        wtext = IntToTimeSigFigures(numBase);
+        DrawSmuflString ( dc, x, yden, wtext, true, staff->m_drawingStaffSize);	// '1' = center
     }
     
-    DrawSmuflCode ( dc, x, y, symc, staff->m_drawingStaffSize, accid->m_drawingCueSize );
-
-    dc->EndGraphic(element, this );
+    dc->ResetFont();
 }
 
-void View::DrawSpace(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
+void View::DrawMRptPart(DeviceContext *dc, int x, wchar_t smuflCode, int num, bool line, Staff *staff, Measure *measure )
 {
-    assert( dc );
-    assert( element );
-    assert( layer );
-    assert( staff );
-    assert( measure );
+    int width = measure->GetRightBarlineX() - measure->GetNonJustifiableLeftMargin();
+    int xCentered = measure->GetDrawingX() + measure->GetNonJustifiableLeftMargin()  + (width / 2);
     
-    dc->StartGraphic( element, "", element->GetUuid() );
-    dc->DrawPlaceholder( ToDeviceContextX( element->GetDrawingX() ), ToDeviceContextY( element->GetDrawingY() ) );
-    dc->EndGraphic(element, this );
-}
-
-void View::DrawCustos( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
-{
-    assert( dc );
-    assert( element );
-    assert( layer );
-    assert( staff );
-    assert( measure );
+    int xSymbol = xCentered - m_doc->GetGlyphWidth(smuflCode, staff->m_drawingStaffSize, false) / 2;
+    int y = staff->GetDrawingY();
+    int ySymbol = y - staff->m_drawingLines / 2 * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
     
-    Custos *custos = dynamic_cast<Custos*>(element);
-    assert( custos );
+    DrawSmuflCode( dc, xSymbol, ySymbol, smuflCode, staff->m_drawingStaffSize, false );
     
-    dc->StartGraphic( element, "", element->GetUuid() );
+    if (line) {
+        DrawVerticalLine( dc, y, y - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize),
+                     xCentered, m_doc->GetDrawingBarLineWidth(staff->m_drawingStaffSize));
+    }
     
-    element->SetDrawingY( element->GetDrawingY() + CalculatePitchPosY( staff, custos->GetPloc(), layer->GetClefOffset( element ), custos->GetOloc()) );
+    if (num > 0) {
+        dc->SetFont( m_doc->GetDrawingSmuflFont( staff->m_drawingStaffSize, false) );
+        // calculate the width of the figures
+        int txt_length = 0;
+        int txt_height = 0;
+        std::wstring figures = IntToTupletFigures(num);
+        dc->GetSmuflTextExtent(figures, &txt_length, &txt_height);
+        dc->DrawMusicText( figures, ToDeviceContextX(xCentered - txt_length / 2),
+                          ToDeviceContextY(staff->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize)) );
+        dc->ResetFont();
+    }
+}
 
-    int x = element->GetDrawingX();
-    int y = element->GetDrawingY();
-    
-    y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) - m_doc->GetDrawingUnit(staff->m_drawingStaffSize)/4;  // LP - correction in 2.0.0
+void View::DrawRestBreve( DeviceContext *dc, int x, int y, Staff *staff)
+{
+    int x1, x2, y1, y2;
+    y1 = y;
+	x1 = x;
+	x2 = x + (m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2 / 3);
     
-    // HARDCODED (smufl code wrong)
-    DrawSmuflCode( dc, x, y, 35,  staff->m_drawingStaffSize, false );
+    // look if one line or between line
+	if ( (y - staff->GetDrawingY()) % m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize))
+		y1 -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
     
-    dc->EndGraphic(element, this );
+	y2 = y1 + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+	DrawFullRectangle( dc, x1, y2, x2, y1);
+	
+    // lines
+    x1 = x - m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+    x2 = x + m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+
+	DrawHorizontalLine ( dc, x1, x2, y2, 1);
+	DrawHorizontalLine ( dc, x1, x2, y1, 1);
 }
 
-void View::DrawDot( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
+void View::DrawRestLong( DeviceContext *dc, int x, int y, Staff *staff)
 {
-    assert( dc );
-    assert( element );
-    assert( layer );
-    assert( staff );
-    assert( measure );
-    
-    Dot *dot = dynamic_cast<Dot*>(element);
-    assert( dot );
-    
-    dc->StartGraphic( element, "", element->GetUuid() );
+    int x1, x2, y1, y2;
     
-    element->SetDrawingY( element->GetDrawingY() + CalculatePitchPosY( staff, dot->GetPloc(), layer->GetClefOffset( element ), dot->GetOloc()) );
+    y1 = y;
+	x1 = x;
+	x2 = x + (m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2 / 3);
     
-    int x = element->GetDrawingX();
-    int y = element->GetDrawingY();
+    // look if on line or between line
+	if ( (y - staff->GetDrawingY()) % m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize))
+		y1 -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
     
-    // Use the note to which the points to for position
-    if ( dot->m_drawingNote ) {
-        x = dot->m_drawingNote->GetDrawingX() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize)*7/2;
-        y = dot->m_drawingNote->GetDrawingY();
-    }
+	y2 = y1 + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)*2;
+	DrawFullRectangle( dc, x1, y2, x2, y1);
+}
 
-    DrawDots( dc, x, y, 1, staff );
+void View::DrawRestQuarter( DeviceContext *dc, int x, int y, int valeur, unsigned char dots, bool cueSize, Staff *staff)
+{
+    int y2 = y + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+	DrawSmuflCode( dc, x, y2, SMUFL_E4E5_restQuarter + (valeur-DUR_4), staff->m_drawingStaffSize, cueSize );
     
-    dc->EndGraphic(element, this );
+	if (dots)
+	{	if (valeur < DUR_16) y += m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+		DrawDots( dc, (x + 2 * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)), y, dots, staff);
+	}
 }
-    
-int View::GetSylY( Syl *syl, Staff *staff )
+
+void View::DrawRestWhole( DeviceContext *dc, int x, int y, int valeur, unsigned char dots, bool cueSize, Staff *staff)
 {
-    assert( syl && staff );
-    
-    int y = syl->GetStart()->GetDrawingY();
-    if (staff->GetAlignment() ) {
-        y = staff->GetDrawingY() + staff->GetAlignment()->GetMaxHeight() -
-        syl->m_drawingVerse * TEMP_STYLE_LYIRC_LINE_SPACE * m_doc->GetDrawingUnit(staff->m_drawingStaffSize)  / PARAM_DENOMINATOR;
+    int x1, x2, y1, y2, vertic;
+    y1 = y;
+    vertic = m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+	
+    int off = m_doc->GetDrawingLedgerLineLength(staff->m_drawingStaffSize, cueSize) * 2 / 3; // i.e., la moitie de la ronde
+
+	x1 = x - off;
+	x2 = x + off;
+
+	if (valeur == DUR_1)
+		vertic = -vertic;
+
+    // look if one line or between line
+	if ( (y - staff->GetDrawingY()) % m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize))
+	{
+		if (valeur == DUR_2)
+			y1 -= vertic;
+		else
+			y1 += vertic;
+	}
+
+	y2 = y1 + vertic;
+	DrawFullRectangle ( dc, x1, y1, x2, y2);
+
+	off /= 2;
+	x1 -= off;
+	x2 += off;
+
+    // legder line
+	if (y > (int)staff->GetDrawingY()  || y < staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize))
+		DrawHorizontalLine ( dc, x1, x2, y1, m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize));
+
+    if (dots) {
+		DrawDots( dc, (x2 + m_doc->GetDrawingUnit(staff->m_drawingStaffSize)), y2, dots, staff);
     }
-    return y;
 }
-    
-void View::DrawSyl( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
+
+void View::DrawStem( DeviceContext *dc, LayerElement *object, Staff *staff, data_STEMDIRECTION dir, int radius, int xn, int originY, int heightY)
 {
-    Syl *syl = dynamic_cast<Syl*>(element);
-    assert( syl );
+    assert(dynamic_cast<DurationInterface*>(object));
     
-    if ( !syl->GetStart() ) {
-        LogDebug("Syl parent note was not found");
-        return;
-    }
+    int staffSize = staff->m_drawingStaffSize;
+    int staffY = staff->GetDrawingY();
+    int baseStem, totalFlagStemHeight, flagStemHeight, nbFlags;
+    int drawingDur = dynamic_cast<DurationInterface*>(object)->GetActualDur();
+    bool drawingCueSize = object->IsCueSize();
+    int verticalCenter = staffY - m_doc->GetDrawingDoubleUnit(staffSize)*2;
     
-    // move the position back - to be updated HARDCODED also see View::DrawSylConnector and View::DrawSylConnectorLines
-    syl->SetDrawingX( syl->GetStart()->GetDrawingX() - m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 2 );
-    syl->SetDrawingY( GetSylY(syl, staff) );
+    // baseStem is one octave for now (7 unit) - however, it should be 6 with 2-voice notation
+    baseStem = m_doc->GetDrawingOctaveSize(staffSize);
+    flagStemHeight = m_doc->GetDrawingDoubleUnit(staffSize);
+    if (drawingCueSize) {
+        baseStem = m_doc->GetGraceSize(baseStem);
+        flagStemHeight = m_doc->GetGraceSize(flagStemHeight);
+    }
+
+    nbFlags = drawingDur - DUR_8;
+    totalFlagStemHeight = flagStemHeight * (nbFlags * 2 - 1) / 2;
     
-    dc->StartGraphic( syl, "", syl->GetUuid() );
+    if (dir == STEMDIRECTION_down) {
+        // flip all lengths
+        baseStem = -baseStem;
+        totalFlagStemHeight = -totalFlagStemHeight;
+        radius = -radius;
+        heightY = -heightY;
+    }
     
-    dc->SetBrush( m_currentColour, AxSOLID );
+    // If we have flags, add them to the height
+    int y1 = originY;
+    int y2 = ((drawingDur>DUR_8) ? (y1 + baseStem + totalFlagStemHeight) : (y1 + baseStem)) + heightY;
+    int x2 = xn + radius;
     
-    FontInfo currentFont;
-    if (syl->HasFontstyle()) {
-        currentFont = *m_doc->GetDrawingLyricFont(staff->m_drawingStaffSize);
-        currentFont.SetStyle(syl->GetFontstyle());
-        dc->SetFont(&currentFont);
+    if ((dir == STEMDIRECTION_up) && (y2 < verticalCenter) ) {
+        y2 = verticalCenter;
     }
-    else {
-        dc->SetFont( m_doc->GetDrawingLyricFont(staff->m_drawingStaffSize) );
+    else if ((dir == STEMDIRECTION_down) && (y2 > verticalCenter) ) {
+        y2 = verticalCenter;
     }
     
-    DrawLyricString(dc, syl->GetDrawingX(), syl->GetDrawingY(), syl->GetText().c_str(), staff->m_drawingStaffSize );
-    
-    dc->ResetFont();
-    dc->ResetBrush();
+    // shorten the stem at its connection with the note head
+    int stemY1 = (dir == STEMDIRECTION_up) ? y1 + m_doc->GetDrawingUnit(staffSize) / 4 : y1 - m_doc->GetDrawingUnit(staffSize) / 4;
+    int stemY2 = y2;
+    if (drawingDur > DUR_4) {
+        // if we have flags, shorten the stem to make sure we have a nice overlap with the flag glyph
+        int shortener = (drawingCueSize) ?
+            m_doc->GetGraceSize(m_doc->GetDrawingUnit(staffSize)) :
+            m_doc->GetDrawingUnit(staffSize);
+        stemY2 = (dir == STEMDIRECTION_up) ? y2 - shortener : y2 + shortener;
+    }
     
-    if (syl->GetStart() && syl->GetEnd()) {
-        System *currentSystem = dynamic_cast<System*>( measure->GetFirstParent( SYSTEM ) );
-        // Postpone the drawing of the syl to the end of the system; this will call DrawSylConnector
-        // that will look if the last note is in the same system (or not) and draw the connectors accordingly
-        if (currentSystem) {
-            currentSystem->AddToDrawingList(syl);
+    // draw the stems and the flags
+    if (dir == STEMDIRECTION_up) {
+        DrawFullRectangle( dc, x2 - m_doc->GetDrawingStemWidth(staffSize), stemY1, x2, stemY2);
+        
+        if (drawingDur > DUR_4) {
+            DrawSmuflCode( dc, x2 - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize), y2, SMUFL_E240_flag8thUp, staff->m_drawingStaffSize, drawingCueSize );
+            for (int i=0; i < nbFlags; i++)
+                DrawSmuflCode( dc, x2 - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize), y2 - (i + 1) * flagStemHeight, SMUFL_E240_flag8thUp,  staff->m_drawingStaffSize, drawingCueSize );
+        }
+    }
+    else {
+        DrawFullRectangle( dc, x2, stemY1, x2 + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize), stemY2);
+        
+        if (drawingDur > DUR_4) {
+            DrawSmuflCode( dc, x2 , y2, SMUFL_E241_flag8thDown , staff->m_drawingStaffSize, drawingCueSize );
+            for (int i=0; i < nbFlags; i++)
+                DrawSmuflCode( dc, x2, y2 + (i + 1) * flagStemHeight, SMUFL_E241_flag8thDown,  staff->m_drawingStaffSize, drawingCueSize );
         }
     }
     
-    dc->EndGraphic(syl, this );
+    // Store the start and end values
+    StemmedDrawingInterface *interface = dynamic_cast<StemmedDrawingInterface*>(object);
+    assert(interface);
+    interface->SetDrawingStemStart(Point(x2 - (m_doc->GetDrawingStemWidth(staffSize) / 2), y1));
+    interface->SetDrawingStemEnd(Point(x2 - (m_doc->GetDrawingStemWidth(staffSize) / 2), y2));
+    interface->SetDrawingStemDir(dir);
+    
+    // cast to note is check when setting drawingCueSize value
+    if ( drawingCueSize && ( dynamic_cast<Note*>(object)->GetGrace() == GRACE_acc ) ) {
+        DrawAcciaccaturaSlash(dc, object);
+    }
 }
+
+// Draw a trill above the notehead
+// This function works as the up-fermata portion of DrawFermata
+// if there are many symbols to draw we could make a generalized function
+void View::DrawTrill(DeviceContext *dc, LayerElement *element, Staff *staff)
+{
+    int x, y;    
+
+    // It shoud be moved according to half of the trill size
+    x = element->GetDrawingX() - m_doc->GetGlyphWidth(SMUFL_E566_ornamentTrill, staff->m_drawingStaffSize, false);
+
+    // HARDCODED
+    if ((element->GetDrawingY()) < staff->GetDrawingY())
+        y = staff->GetDrawingY() + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+    else
+        y = (element->GetDrawingY()) + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
     
-void View::DrawVerse( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
+    DrawSmuflCode ( dc, x, y, SMUFL_E566_ornamentTrill, staff->m_drawingStaffSize, false );
+}
+
+//----------------------------------------------------------------------------
+// Calculation or preparation methods
+///----------------------------------------------------------------------------
+
+bool View::CalculateAccidX(Staff *staff, Accid *accid, Chord *chord, bool adjustHorizontally)
 {
-    assert( dc );
-    assert( element );
-    assert( layer );
-    assert( staff );
-    assert( measure );
+    std::vector< std::vector<bool> > *accidSpace = &chord->m_accidSpace;
     
-    Verse *verse = dynamic_cast<Verse*>(element);
-    assert( verse );
+    //global drawing variables
+    int fullUnit = m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+    int halfUnit = fullUnit / 2;
+    int accidHeight = ACCID_HEIGHT * halfUnit;
     
-    dc->StartGraphic( verse, "", verse->GetUuid() );
+    //drawing variables for the chord
+    int xLength = (int)accidSpace->front().size();
+    int yHeight = (int)accidSpace->size() - 1;
+    int listTop = chord->m_accidSpaceTop;
+    int listBot = chord->m_accidSpaceBot;
     
-    DrawLayerChildren(dc, verse, layer, staff, measure);
+    //drawing variables for the accidental
+    int type = accid->GetAccid();
+    int centerY = accid->GetDrawingY();
+    int topY = centerY + (accidHeight / 2);
+    int bottomY = centerY - (accidHeight / 2);
     
-    dc->EndGraphic( verse, this );
-}
-
+    //difference between left end and right end of the accidental
+    int accidWidthDiff = ACCID_WIDTH - 1;
+    //difference between top and bottom of the accidental
+    int accidHeightDiff = ACCID_HEIGHT - 1;
+    //drawing variables for the accidental in accidSpace units
+    int accidTop = std::max(0, listTop - topY) / halfUnit;
+    int accidBot, alignmentThreshold;
+    //the left side of the accidental; gets incremented to avoid conflicts
+    int currentX = accidWidthDiff;
     
-void View::DrawKeySig( DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure )
-{
-    assert( dc );
-    assert( element );
-    assert( layer );
-    assert( staff );
-    assert( measure );
-
-    KeySig *keySig = dynamic_cast<KeySig*>(element);
-    assert( keySig );
+    //another way of calculating accidBot
+    assert(((int)accidSpace->size() - 1) - ((std::max(0, bottomY - listBot)) / halfUnit) == accidTop + accidHeightDiff);
     
-    int symb;
-    int x, y, i;
+    // store it for asserts
+    int accidSpaceSize = (int)accidSpace->size();
+    assert(accidTop >= 0);
+    assert(accidTop < accidSpaceSize);
     
-    Clef *c = layer->GetClef(element);
-    if (!c) {
-        keySig->SetEmptyBB();
-        return;
+    /*
+     * Make sure all four corners of the accidental are not on an already-taken spot.
+     * The top right corner of a flat can overlap something else; make sure that the bordering sections do not overlap.
+     * Move the accidental one half-unit left until it doesn't overlap.
+     */
+    if (type == ACCIDENTAL_EXPLICIT_f) {
+        alignmentThreshold = 2;
+        accidBot = accidTop + (accidHeightDiff * FLAT_BOTTOM_HEIGHT_MULTIPLIER);
+        assert(accidBot < accidSpaceSize);
+        while (currentX < xLength) {
+            if (accidSpace->at(accidTop + (ACCID_HEIGHT * FLAT_CORNER_HEIGHT_IGNORE)).at(currentX - accidWidthDiff)) currentX += 1;
+            // just in case
+            else if (currentX - accidWidthDiff + (ACCID_WIDTH * FLAT_CORNER_WIDTH_IGNORE) >= xLength ) break;
+            else if (accidSpace->at(accidTop).at(currentX - accidWidthDiff + (ACCID_WIDTH * FLAT_CORNER_WIDTH_IGNORE))) currentX += 1;
+            else if (accidSpace->at(accidBot).at(currentX - accidWidthDiff)) currentX += 1;
+            else if (accidSpace->at(accidTop).at(currentX)) currentX += 1;
+            else if (accidSpace->at(accidBot).at(currentX)) currentX += 1;
+            else break;
+        };
+    }
+    else if (type == ACCIDENTAL_EXPLICIT_n) {
+        alignmentThreshold = 1;
+        accidBot = accidTop + accidHeightDiff;
+        assert(accidBot < accidSpaceSize);
+        //Midpoint needs to be checked for non-flats as there's a chance that a natural/sharp could completely overlap a flat
+        int accidMid = accidTop + (accidBot - accidTop) / 2;
+        while (currentX < xLength) {
+            if (accidSpace->at(accidTop + (ACCID_HEIGHT * NATURAL_CORNER_HEIGHT_IGNORE)).at(currentX - accidWidthDiff)) currentX += 1;
+            // just in case
+            else if (currentX - accidWidthDiff + (ACCID_WIDTH * NATURAL_CORNER_WIDTH_IGNORE) >= xLength ) break;
+            else if (accidSpace->at(accidTop).at(currentX - accidWidthDiff + (ACCID_WIDTH * NATURAL_CORNER_WIDTH_IGNORE))) currentX += 1;
+            else if (accidSpace->at(accidMid).at(currentX - accidWidthDiff)) currentX += 1;
+            else if (accidSpace->at(accidBot).at(currentX - accidWidthDiff)) currentX += 1;
+            else if (accidSpace->at(accidTop).at(currentX)) currentX += 1;
+            else if (accidSpace->at(accidMid).at(currentX)) currentX += 1;
+            else if (accidSpace->at(accidBot).at(currentX)) currentX += 1;
+            else break;
+        };
+    }
+    else if (type == ACCIDENTAL_EXPLICIT_s) {
+        accidBot = accidTop + accidHeightDiff;
+        alignmentThreshold = 1;
+        //Midpoint needs to be checked for non-flats as there's a chance that a natural/sharp could completely overlap a flat
+        int accidMid = accidTop + (accidBot - accidTop) / 2;
+        while (currentX < xLength) {
+            if (accidSpace->at(accidTop).at(currentX - accidWidthDiff)) currentX += 1;
+            else if (accidSpace->at(accidMid).at(currentX - accidWidthDiff)) currentX += 1;
+            else if (accidSpace->at(accidBot).at(currentX - accidWidthDiff)) currentX += 1;
+            else if (accidSpace->at(accidTop).at(currentX)) currentX += 1;
+            else if (accidSpace->at(accidMid).at(currentX)) currentX += 1;
+            else if (accidSpace->at(accidBot).at(currentX)) currentX += 1;
+            else break;
+        };
+    }
+    else {
+        accidBot = accidTop + accidHeightDiff;
+        alignmentThreshold = 1;
+        assert(accidBot < accidSpaceSize);
+        //Midpoint needs to be checked for non-flats as there's a chance that a natural/sharp could completely overlap a flat
+        int accidMid = accidTop + (accidBot - accidTop) / 2;
+        assert(accidMid < accidSpaceSize);
+        while (currentX < xLength) {
+            if (accidSpace->at(accidTop).at(currentX - accidWidthDiff)) currentX += 1;
+            else if (accidSpace->at(accidMid).at(currentX - accidWidthDiff)) currentX += 1;
+            else if (accidSpace->at(accidBot).at(currentX - accidWidthDiff)) currentX += 1;
+            else if (accidSpace->at(accidTop).at(currentX)) currentX += 1;
+            else if (accidSpace->at(accidMid).at(currentX)) currentX += 1;
+            else if (accidSpace->at(accidBot).at(currentX)) currentX += 1;
+            else break;
+        };
     }
     
-    // hidden key signature
-    if (!keySig->m_drawingShow) {
-        keySig->SetEmptyBB();
-        return;
+    //If the accidental is lined up with the one above it, move it left by a halfunit to avoid visual confusion
+    //This doesn't need to be done with accidentals that are as far left or up as possible
+    if ((currentX < xLength - 1) && (accidTop > 1))
+    {
+        int yComp = accidTop - alignmentThreshold;
+        assert(yComp < accidSpaceSize);
+        assert(yComp >= 0);
+        if((accidSpace->at(yComp).at(currentX + 1) == false) && (accidSpace->at(yComp).at(currentX) == true)) currentX += 1;
     }
     
-    // C major (0) key sig and no cancellation
-    else if ((keySig->GetAlterationNumber() == 0) && (keySig->m_drawingCancelAccidCount == 0)) {
-        keySig->SetEmptyBB();
-        return;
+    //If the accidental is lined up with the one below it, move it left by a halfunit to avoid visual confusion
+    //This doesn't need to be done with accidentals that are as far left or down as possible
+    if ((currentX < xLength - 1) && (accidBot < (yHeight - 1)) && accidBot > 1)
+    {
+        int yComp = accidBot;
+        assert(yComp < accidSpaceSize);
+        assert(yComp >= 0);
+        if((accidSpace->at(yComp).at(currentX + 1) == false) && (accidSpace->at(yComp).at(currentX) == true)) currentX += 1;
     }
-    
-    dc->StartGraphic( element, "", element->GetUuid() );
-    
-    x = element->GetDrawingX();
-    // HARDCODED
-    int step = m_doc->GetGlyphWidth(SMUFL_E262_accidentalSharp, staff->m_drawingStaffSize, false) * TEMP_STYLE_KEYSIG_STEP;
-    
-    // Show cancellation if C major (0) or if any cancellation and show cancellation (showchange) is true (false by default)
-    if ( (keySig->GetAlterationNumber() == 0) || (layer->DrawKeySigCancellation() && keySig->m_drawingShowchange) ) {
-        // The type of alteration is different (f/s or f/n or s/n) - cancel all accid in the normal order
-        if (keySig->GetAlterationType() != keySig->m_drawingCancelAccidType) {
-            for (i = 0; i < keySig->m_drawingCancelAccidCount; i++) {
-                data_PITCHNAME pitch = KeySig::GetAlterationAt( keySig->m_drawingCancelAccidType, i);
-                y = staff->GetDrawingY() + CalculatePitchPosY( staff, pitch, layer->GetClefOffset( element ),
-                                            KeySig::GetOctave( keySig->m_drawingCancelAccidType, pitch, c->GetClefId()));;
 
-                DrawSmuflCode ( dc, x, y, SMUFL_E261_accidentalNatural, staff->m_drawingStaffSize, false );   
-                x += step;
+    //Just to make sure.
+    assert(currentX <= xLength);
+    
+    //If we need to move the accidental horizontally, move it by currentX half-units.
+    if (adjustHorizontally)
+    {
+        int xShift = currentX * halfUnit;
+        accid->SetDrawingX(accid->GetDrawingX() - xShift);
+        
+        //mark the spaces as taken (true in accidSpace)
+        for(int xIdx = currentX; xIdx > currentX - ACCID_WIDTH; xIdx--)
+        {
+            for(int yIdx = accidTop; yIdx < accidBot + 1; yIdx++)
+            {
+                accidSpace->at(yIdx).at(xIdx) = true;
             }
         }
-        // Cancel some of them if more accid before
-        else if (keySig->GetAlterationNumber() < keySig->m_drawingCancelAccidCount) {
-            for (i = keySig->GetAlterationNumber(); i < keySig->m_drawingCancelAccidCount; i++) {
-                data_PITCHNAME pitch = KeySig::GetAlterationAt( keySig->m_drawingCancelAccidType, i);
-                y = staff->GetDrawingY() + CalculatePitchPosY( staff, pitch, layer->GetClefOffset( element ),
-                                                              KeySig::GetOctave( keySig->m_drawingCancelAccidType, pitch, c->GetClefId()));;
-                
-                DrawSmuflCode ( dc, x, y, SMUFL_E261_accidentalNatural, staff->m_drawingStaffSize, false );
-                x += step;
+    }
+    //Otherwise, just mark its vertical position so we can see if there are any vertical conflicts
+    else
+    {
+        for(int xIdx = 0; xIdx < ACCID_WIDTH; xIdx++) //x from 0 to 4, base position
+        {
+            for(int yIdx = accidTop; yIdx < accidBot + 1; yIdx++)
+            {
+                accidSpace->at(yIdx).at(xIdx) = true;
             }
         }
     }
     
-    for (i = 0; i < keySig->GetAlterationNumber(); i++) {
-        data_PITCHNAME pitch = KeySig::GetAlterationAt( keySig->GetAlterationType(), i);
-        y = staff->GetDrawingY() + CalculatePitchPosY( staff, pitch, layer->GetClefOffset( element ),
-                                    KeySig::GetOctave( keySig->GetAlterationType(), pitch, c->GetClefId()));;
-        
-        if (keySig->GetAlterationType() == ACCIDENTAL_EXPLICIT_f) symb = SMUFL_E260_accidentalFlat;
-        else symb = SMUFL_E262_accidentalSharp;
-        
-        DrawSmuflCode ( dc, x, y, symb,  staff->m_drawingStaffSize, false );
-        x += step;
-    }
+    //For debugging; leaving this in temporarily
+//    for (int vIdx = 0; vIdx < accidSpace->size(); vIdx++)
+//    {
+//        std::cout << "|";
+//        std::vector<bool> thisRow = accidSpace->at(vIdx);
+//        for (int hIdx = (int)thisRow.size() - 1; hIdx >= 0; hIdx --)
+//        {
+//            std::cout << thisRow.at(hIdx) << "|";
+//        }
+//        std::cout << std::endl;
+//    }
+//    std::cout << std::endl;
     
-    dc->EndGraphic(element, this );
+    //Regardless of whether or not we moved it, return true if there was a conflict and currentX would have been moved
+    return (currentX - accidWidthDiff == 0);
 }
 
-void View::DrawAcciaccaturaSlash(DeviceContext *dc, LayerElement *element)
+int View::GetSylY( Syl *syl, Staff *staff )
 {
-    Note *note = dynamic_cast<Note*>(element);
-    assert( note );
-
-    Staff *staff = dynamic_cast<Staff*>( note->GetFirstParent( STAFF ) );
-    assert( staff );
-    
-    if (note->GetActualDur() < DUR_8)
-        return;
-    
-    dc->SetPen(AxBLACK, m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize), AxSOLID);
-    dc->SetBrush( AxBLACK, AxSOLID );
-    
-    int positionShift = m_doc->GetGraceSize(m_doc->GetDrawingUnit(staff->m_drawingStaffSize));
-    int positionShiftX1 = positionShift * 3 / 2;
-    int positionShiftY1 = positionShift * 2;
-    int positionShiftX2 = positionShift * 3;
-    int positionShiftY2 = positionShift * 6;
-    Point startPoint = note->GetDrawingStemStart();
+    assert( syl && staff );
     
-    // HARDCODED
-    if (note->GetDrawingStemDir() == STEMDIRECTION_up) {
-        dc->DrawLine(
-                     ToDeviceContextX(startPoint.x - positionShiftX1 ),
-                     ToDeviceContextY(startPoint.y + positionShiftY1),
-                     ToDeviceContextX(startPoint.x + positionShiftX2),
-                     ToDeviceContextY(startPoint.y + positionShiftY2));
-    } else {
-        dc->DrawLine(ToDeviceContextX(startPoint.x - positionShiftX1),
-                     ToDeviceContextY(startPoint.y - positionShiftY1),
-                     ToDeviceContextX(startPoint.x + positionShiftX2),
-                     ToDeviceContextY(startPoint.y - positionShiftY2));
+    int y = syl->GetStart()->GetDrawingY();
+    if (staff->GetAlignment() ) {
+        y = staff->GetDrawingY() + staff->GetAlignment()->GetMaxHeight() -
+        syl->m_drawingVerse * TEMP_STYLE_LYIRC_LINE_SPACE * m_doc->GetDrawingUnit(staff->m_drawingStaffSize)  / PARAM_DENOMINATOR;
     }
-    
-    dc->ResetPen();
-    dc->ResetBrush();
+    return y;
 }
 
-void View::DrawFermata(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff)
+bool View::IsOnStaffLine ( int y, Staff *staff)
 {
-    int x, y;
-    int emb_offset = 0; // if there is and embellishment, offset the note up
-    
-    // We move the fermata position of half of the fermata size
-    x = element->GetDrawingX() - m_doc->GetGlyphWidth(SMUFL_E4C0_fermataAbove, staff->m_drawingStaffSize, false) / 2;
-    
-    data_PLACE place = PLACE_above;
-    if (layer->GetDrawingStemDir() != STEMDIRECTION_NONE) {
-        place = (layer->GetDrawingStemDir() == STEMDIRECTION_up) ? PLACE_above : PLACE_above;
-    }
-    
-    // First case, notes
-    if ((element->Is() == NOTE) || (element->Is() == CHORD)) {
-        // To be fix once m_embellishment is removed
-        if (element->Is() == NOTE)  {
-            Note *note = dynamic_cast<Note*>(element);
-            assert( note );
-            if (note->m_embellishment) {
-                emb_offset = m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-            }
-        }
-        
-        if (place == PLACE_above) {
-            // check that the notehead is in the staff.
-            if (element->GetDrawingTop(m_doc, staff->m_drawingStaffSize) < staff->GetDrawingY()) {
-                // in the staff, set the fermata 20 pixels above the last line (+ embellishment offset)
-                y = staff->GetDrawingY() + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) + emb_offset;
-            }
-            else {
-                // out of the staff, place the trill above the notehead
-                y = element->GetDrawingTop(m_doc, staff->m_drawingStaffSize) + m_doc->GetDrawingUnit(staff->m_drawingStaffSize) + emb_offset;
-            }
-            // draw the up-fermata - need cue size support
-            DrawSmuflCode ( dc, x, y, SMUFL_E4C0_fermataAbove, staff->m_drawingStaffSize, false );
-        }
-        else {
-            // This works as above, only we check that the note head is not
-            if (element->GetDrawingBottom(m_doc, staff->m_drawingStaffSize) > (staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize))) {
-                // notehead in staff, set  under
-                y = staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize) - m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-            }
-            else {
-                // notehead under staff, set under notehead
-                y = element->GetDrawingBottom(m_doc, staff->m_drawingStaffSize) - m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-            }
-            // draw the down-fermata - need cue size support
-            DrawSmuflCode ( dc, x, y, SMUFL_E4C1_fermataBelow, staff->m_drawingStaffSize, false );
-        }
-    } else if (element->Is() == REST) {
-        if (place == PLACE_above) {
-            y = staff->GetDrawingY() + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-            DrawSmuflCode ( dc, x, y, SMUFL_E4C0_fermataAbove, staff->m_drawingStaffSize, false );
-        }
-        else {
-            y = staff->GetDrawingY() - m_doc->GetDrawingStaffSize(staff->m_drawingStaffSize) - m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-            DrawSmuflCode ( dc, x, y, SMUFL_E4C1_fermataBelow, staff->m_drawingStaffSize, false );
-        }
-    }
+    return ((y - staff->GetDrawingY()) % m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) == 0 );
 }
 
-// Draw a trill above the notehead
-// This function works as the up-fermata portion of DrawFermata
-// if there are many symbols to draw we could make a generalized function
-void View::DrawTrill(DeviceContext *dc, LayerElement *element, Staff *staff)
+void View::PrepareChordDots ( DeviceContext *dc, Chord *chord, int x, int y, unsigned char dots, Staff *staff )
 {
-    int x, y;    
-
-    // It shoud be moved according to half of the trill size
-    x = element->GetDrawingX() - m_doc->GetGlyphWidth(SMUFL_E566_ornamentTrill, staff->m_drawingStaffSize, false);
-
-    // HARDCODED
-    if ((element->GetDrawingY()) < staff->GetDrawingY())
-        y = staff->GetDrawingY() + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-    else
-        y = (element->GetDrawingY()) + m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+    std::list<int> *dotsList = &chord->m_dots;
+    int fullUnit = m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+    int doubleUnit = fullUnit * 2;
     
-    DrawSmuflCode ( dc, x, y, SMUFL_E566_ornamentTrill, staff->m_drawingStaffSize, false );
+    //if it's on a staff line to start with, we need to compensate here and add a full unit like DrawDots would
+    if (IsOnStaffLine(y, staff)) {
+        //defaults to the space above the staffline first
+        //if that position is not on the list already, we're good to go
+        if(std::find(dotsList->begin(), dotsList->end(), y + fullUnit) == dotsList->end()) y += fullUnit;
+        
+        //if it is on the list, we should try the spot a doubleUnit below
+        else if(std::find(dotsList->begin(), dotsList->end(), y - fullUnit) == dotsList->end()) y -= fullUnit;
+        
+        //otherwise, any other space looks weird so let's not draw it
+        else return;
+    }
+    //similar if it's not on a staff line
+    else {
+        //see if the optimal place exists already
+        if(std::find(dotsList->begin(), dotsList->end(), y) == dotsList->end()) {}
+        //if it does, then look up a space first
+        else if(std::find(dotsList->begin(), dotsList->end(), y + doubleUnit) == dotsList->end()) y += doubleUnit;
+        //then look down a space
+        else if(std::find(dotsList->begin(), dotsList->end(), y - doubleUnit) == dotsList->end()) y -= doubleUnit;
+        //otherwise let's not draw it
+        else return;
+    }
+    
+    //finally, make sure it's not outside the acceptable extremes of the chord
+    int yMax, yMin;
+    chord->GetYExtremes(&yMax, &yMin);
+    if (y > (yMax + fullUnit)) return;
+    if (y < (yMin - fullUnit)) return;
+    
+    //if it's not, add it to the dots list and go back to DrawChord
+    dotsList->push_back(y);
 }
 
-} // namespace vrv    
-    
+
+} // namespace vrv

From 2b0bd40f9b905dbf2613ecd700688f8510fff2c5 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Sat, 31 Oct 2015 08:35:26 +0100
Subject: [PATCH 83/85] Adjust slope for btrem shorter bars

---
 src/view_beam.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 83a464f146a..85fc5017f19 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -394,14 +394,13 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     params.m_beamHasChord = OFF;
     params.m_hasMultipleStemDir = OFF;
     params.m_cueSize = OFF;
-    params.m_shortestDur = DUR_8;
+    // adjust params.m_shortestDur depending on the number of slashes
+    params.m_shortestDur = std::max(DUR_8, DUR_1 + fTrem->GetSlash());
     params.m_stemDir = STEMDIRECTION_NONE;
     
     // We look only at the first one for the duration since both are expected to be the same
     assert( dynamic_cast<AttDurationMusical*>(firstElement.m_element) );
     int dur =  dynamic_cast<AttDurationMusical*>(firstElement.m_element)->GetDur();
-    // We should adjust params.m_shortestDur depending on the number of slashes and if we want the
-    // bars to be closer or further away from the note heads
     
     Chord *childChord1 = NULL;
     Chord *childChord2 = NULL;
@@ -484,8 +483,17 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     // for non stem notes the bar should be shortenend
     if (dur < DUR_2) {
         x1 += 2 * space;
+        y1 += 2 * space * params.m_beamSlope;
         x2 -= 2 * space;
+        y2 -= 2 * space * params.m_beamSlope;
     }
+    else if (dur == DUR_4) {
+        x1 += space;
+        y1 += space * params.m_beamSlope;
+        x2 -= space;
+        y2 -= space * params.m_beamSlope;
+    }
+
     
     for (j = 0; j < fullBars ; j++) {
         DrawObliquePolygon (dc, x1, y1, x2, y2, polygonHeight);
@@ -495,9 +503,11 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
         y2 += dy2 * params.m_beamWidthWhite;
         
         // shorten the bar after having drawn the first one (but the first one)
-        if ((j == 0) && (dur > DUR_1)) {
+        if ((j == 0) && (dur > DUR_1) && (dur != DUR_4)) {
             x1 += space;
+            y1 += space * params.m_beamSlope;
             x2 -= space;
+            y2 -= space * params.m_beamSlope;
         }
     }
     

From f77d4b77567850aafef4af91ff787e21a9debba9 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 2 Nov 2015 08:26:03 +0100
Subject: [PATCH 84/85] Improving bTrem within beam

---
 src/view_beam.cpp    |  2 +-
 src/view_element.cpp | 54 ++++++++++++++++++++++++++++----------------
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 85fc5017f19..10e846db43b 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -257,7 +257,7 @@ void View::DrawBeam( DeviceContext *dc, LayerElement *element, Layer *layer, Sta
             barY = -barY;
         }
         
-        int fractBeamWidth = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, params.m_cueSize);
+        int fractBeamWidth = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, params.m_cueSize) * 7 / 10;
 
         // loop
         while (testDur <= params.m_shortestDur) {
diff --git a/src/view_element.cpp b/src/view_element.cpp
index d8ab07860a7..9204e14eb40 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -306,50 +306,58 @@ void View::DrawBTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     
     BTrem *bTrem = dynamic_cast<BTrem*>(element);
     assert( bTrem );
-
-    
-    dc->StartGraphic( element, "", element->GetUuid() );
-    
-    DrawLayerChildren(dc, bTrem, layer, staff, measure);
     
     data_STEMDIRECTION stemDir = STEMDIRECTION_NONE;
     data_STEMMODIFIER stemMod;
     int drawingDur;
     LayerElement *childElement = NULL;
+    Note *childNote = NULL;
+    Chord *childChord = NULL;
     Point stemPoint;
     bool drawingCueSize = false;
     int x, y, yUnused;
     
-    Chord *childChord = dynamic_cast<Chord*>(bTrem->FindChildByType(CHORD));
+    childChord = dynamic_cast<Chord*>(bTrem->FindChildByType(CHORD));
     // Get from the chord or note child
     if (childChord) {
-        stemDir = childChord->GetDrawingStemDir();
-        stemMod = childChord->GetStemMod();
-        stemPoint = childChord->GetDrawingStemStart();
         drawingDur = childChord->GetDur();
         childElement = childChord;
     }
     else {
-        Note *childNote = dynamic_cast<Note*>(bTrem->FindChildByType(NOTE));
+        childNote = dynamic_cast<Note*>(bTrem->FindChildByType(NOTE));
         if (childNote) {
-            drawingCueSize = childNote->IsCueSize();
-            stemDir = childNote->GetDrawingStemDir();
-            stemMod = childNote->GetStemMod();
-            stemPoint = childNote->GetDrawingStemStart();
             drawingDur = childNote->GetDur();
             childElement = childNote;
         }
     }
-
-    // nothing we can do...
-    if (stemDir == STEMDIRECTION_NONE) {
+    
+    if (!childElement) {
+        bTrem->SetEmptyBB();
         return;
     }
     
+    dc->StartGraphic( element, "", element->GetUuid() );
     
+    DrawLayerChildren(dc, bTrem, layer, staff, measure);
+    
+    // Get stem values from the chord or note child
+    if (childChord) {
+        stemDir = childChord->GetDrawingStemDir();
+        stemMod = childChord->GetStemMod();
+        stemPoint = childChord->GetDrawingStemStart();
+    }
+    else {
+        drawingCueSize = childNote->IsCueSize();
+        stemDir = childNote->GetDrawingStemDir();
+        stemMod = childNote->GetStemMod();
+        stemPoint = childNote->GetDrawingStemStart();
+    }
+    
+    int beamWidthBlack = m_doc->GetDrawingBeamWidth(staff->m_drawingStaffSize, drawingCueSize);
+    int beamWidthWhite = m_doc->GetDrawingBeamWhiteWidth(staff->m_drawingStaffSize, drawingCueSize);
     int width = m_doc->GetGlyphWidth(SMUFL_E0A3_noteheadHalf, staff->m_drawingStaffSize, drawingCueSize);
-    int height = m_doc->GetDrawingBeamWidth(staff->m_drawingStaffSize, drawingCueSize) * 7 / 10;
-    int step = height + m_doc->GetDrawingBeamWhiteWidth(staff->m_drawingStaffSize, drawingCueSize);
+    int height = beamWidthBlack * 7 / 10;
+    int step = height + beamWidthWhite;
 
     if (stemDir == STEMDIRECTION_up) {
         if (drawingDur > DUR_1) {
@@ -377,7 +385,15 @@ void View::DrawBTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
         }
     }
     
+    Beam *beam = childElement->IsInBeam();
+    if (beam) {
+        int beamStep = (drawingDur - DUR_8) * (beamWidthBlack + beamWidthWhite) + beamWidthWhite;
+        y += (stemDir == STEMDIRECTION_down) ? beamStep : -beamStep;
+    }
+    
     int s;
+    // by default draw 3 slashes (e.g., for a temolo on a whole note)
+    if (stemMod == STEMMODIFIER_NONE) stemMod = STEMMODIFIER_3slash;
     for (s = 0; s < stemMod; s++) {
         DrawObliquePolygon (dc, x - width / 2, y, x + width / 2, y + height, height);
         y += step;

From c8384567615d82bc76ba733830ae2d5cda30a863 Mon Sep 17 00:00:00 2001
From: Laurent Pugin <lxpugin@gmail.com>
Date: Mon, 30 Nov 2015 15:29:56 +0100
Subject: [PATCH 85/85] Version 0.9.10

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

diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index 06d7225c27d..0d833c2ec32 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -29,7 +29,7 @@ namespace vrv {
 #define VERSION_MINOR 9
 #define VERSION_REVISION 10
 // Adds "-dev" in the version number - should be set to false for releases
-#define VERSION_DEV true
+#define VERSION_DEV false
 
 //----------------------------------------------------------------------------
 // Typedefs