Remove parentheses after cut and common time from MuseJazz and add them programmatically in older scores.

Author: ecstrema

fonts/musejazz/MuseJazz.otf

@@ -167,7 +167,7 @@ void TimeSig::write(XmlWriter& xml) const
 
 void TimeSig::read(XmlReader& e)
       {
-      int n=0, z1=0, z2=0, z3=0, z4=0;
+      int n = 0, z1 = 0, z2 = 0, z3 = 0, z4 = 0;
       bool old = false;
 
       while (e.readNextStartElement()) {
@@ -235,9 +235,9 @@ void TimeSig::read(XmlReader& e)
             _sig.set(z1+z2+z3+z4, n);
             }
       _stretch.reduce();
-      
+
       // Read and Write num/den strings into parserString for backwards compatibility
-      if ( _timeSigType == TimeSigType::NORMAL && parserString().isEmpty() 
+      if ( _timeSigType == TimeSigType::NORMAL && parserString().isEmpty()
           && (!numeratorString().isEmpty() || !denominatorString().isEmpty())) {
             setParserString(numeratorString());
             if (!denominatorString().isEmpty())
@@ -257,6 +257,20 @@ void TimeSig::read(XmlReader& e)
                         setDenominatorString(QString::number(_sig.denominator()));
                   }
             }
+
+      if (old) {
+            // Musejazz had by default a closing parenthesis after cut and common time signatures
+            if (masterScore()->scoreFont()->name() == "MuseJazz") {
+                  if (_timeSigType == TimeSigType::ALLA_BREVE) {
+                        _timeSigType = TimeSigType::NORMAL;
+                        setParserString("C)");
+                        }
+                  else if (_timeSigType == TimeSigType::FOUR_FOUR) {
+                        _timeSigType = TimeSigType::NORMAL;
+                        setParserString("¢)");
+                        }
+                  }
+            }
       }
 
 //---------------------------------------------------------
@@ -363,15 +377,15 @@ void TimeSig::layout()
                   pString.replace(QRegExp("\\)([ +=x\\*\\-]+)"),")|\\1");   // insert separator between ')' and '+x=-'
                   pString.replace(QRegExp("(\\|[ +=x\\*\\-]+)"),"\\1|");    // then after isolated '+x-='
                   pString.replace(" ","| |");                       // split spaces
-                  // add separator after '(' with no matching ')' inside numerators (which include numbers, '+' and fractions) 
+                  // add separator after '(' with no matching ')' inside numerators (which include numbers, '+' and fractions)
                   pString.replace(QRegExp("\\(([0-9+\\xE097\\xE098\\xE099\\xE09A\\xE09B]+[\\/])+"), "(|\\1");
 
                   qDebug("---pString after %s", qPrintable(pString));
 
                   // Create list of time signature blocks ('numerator/denominator', or just 'numerator' for center drawn glyphs like 'C', '+' or '(' )
                   QStringList sList = pString.split("|", QString::SkipEmptyParts);
 
-                  // LOOP thru the sList and create the numerator and denominator strings and positions 
+                  // LOOP thru the sList and create the numerator and denominator strings and positions
                   ns.clear();
                   ds.clear();
                   pns.clear();
@@ -418,7 +432,7 @@ void TimeSig::layout()
                   //else {
                   //      ns = { toTimeSigString(_numeratorString, largeTimeSig(), false) };
                   //      ds = { toTimeSigString(_denominatorString, largeTimeSig(), false) };
-                  //      }           
+                  //      }
                   }
 
             ScoreFont* font = score()->scoreFont();
@@ -439,13 +453,13 @@ void TimeSig::layout()
                   // Handle special cases here:
                   // SymId::space doesn't have a bbox, so add ::space _advance value (10.0) to the rect width
                   if (ns[i].size() && ns[i][0] == SymId::space)
-                        nRect.adjust(0, 0, 10.0 * mag.width(), 0);  
+                        nRect.adjust(0, 0, 10.0 * mag.width(), 0);
                   // else if ... (other special cases):
                   //   TO DO:... "Emmentaler" parentheses have bad bboxes
-                  //   TO DO:... "Gonville" doesn't have big parentheses. 
+                  //   TO DO:... "Gonville" doesn't have big parentheses.
                   //   TO DO: * Both cases are problems with the font. It's better to fix the glyphs there
                   // Adjust note symbols' bboxes in denominator so the glyphs are draw at a correct vertical pos. in the staff
-                  if (ds[i].size() && (ds[i][0] == SymId::metNoteQuarterDown || ds[i][0] == SymId::metNote8thDown 
+                  if (ds[i].size() && (ds[i][0] == SymId::metNoteQuarterDown || ds[i][0] == SymId::metNote8thDown
                       || ds[i][0] == SymId::metNoteHalfDown || ds[i][0] == SymId::metNote16thDown)) {
                         dRect.adjust(0, 53 * mag.height(), 0, 0);
                         if (ds[i].size() > 1 || ds[i][1] == SymId::metAugmentationDot)
@@ -503,7 +517,7 @@ void TimeSig::draw(QPainter* painter) const
             return;
       painter->setPen(curColor());
 
-      // loop and draw t/s blocks 
+      // loop and draw t/s blocks
       for (int i = 0; i < ns.size(); i++) {
             drawSymbols(ns[i], painter, pns[i], _scale);
             drawSymbols(ds[i], painter, pds[i], _scale);
@@ -716,4 +730,3 @@ bool TimeSig::operator==(const TimeSig& ts) const
       }
 
 }
-