smufl integration: articulation 1

chenlung · Nov 12, 2013 · 4b88445 · 4b88445
1 parent 5b021ad
commit 4b88445
Show file tree

Hide file tree

Showing 12 changed files with 539 additions and 292 deletions.
diff --git a/fonts/mscore/mscore.otf b/fonts/mscore/mscore.otf
diff --git a/fonts/mscore/mscore.sfd b/fonts/mscore/mscore.sfd
diff --git a/libmscore/articulation.cpp b/libmscore/articulation.cpp
@@ -366,7 +366,7 @@ void Articulation::draw(QPainter* painter) const
                   }
             }
       painter->setPen(curColor());
-      drawSymbol(sym, painter);
+      drawSymbol(sym, painter, QPointF(-0.5 * width(), _up ? 0.0 : height()));
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/chord.cpp b/libmscore/chord.cpp
@@ -2195,7 +2195,6 @@ QPointF Chord::layoutArticulation(Articulation* a)
                         }
                   pos.ry() = line * _spStaff2;                          // convert staff position to sp distance
                   }
-
             a->setPos(pos);
             a->adjustReadPos();
             return QPointF(pos);

diff --git a/libmscore/sym.cpp b/libmscore/sym.cpp
@@ -3300,15 +3300,20 @@ ScoreFont* ScoreFont::fontFactory(QString s)
             }
       return f;
       }
-#if 0
-Sym& ScoreFont::sym(SymId id)
-      {
-      return _symbols[int(id)];
-      }
-#endif
+
+//---------------------------------------------------------
+//   sym
+//    Get symbol for SymId.
+//    Use font 0 (Bravura) as fallback, if sym does not
+//    exist.
+//---------------------------------------------------------
 
 const Sym& ScoreFont::sym(SymId id) const
       {
+      if (id == SymId::noSym)
+            return _symbols[0];
+      if (!_symbols[int(id)].isValid() && (this != &_scoreFonts[0]))
+            return _scoreFonts[0]._symbols[int(id)];
       return _symbols[int(id)];
       }
 }

diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -4889,6 +4889,7 @@ int main(int argc, char* av[])
       mscore = new MuseScore();
       mscoreCore = mscore;
       gscore = new Score(MScore::defaultStyle());
+      gscore->setScoreFont(ScoreFont::fontFactory("Bravura"));
 
       if (writeWorkspaceFile) {
             Workspace::writeBuiltinWorkspace();

diff --git a/vtest/bravura-2-ref.png b/vtest/bravura-2-ref.png
diff --git a/vtest/bravura-2.mscz b/vtest/bravura-2.mscz
diff --git a/vtest/edit b/vtest/edit
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+#
+# edit file
+#
+
+MSCORE=../build.debug/mscore/mscore
+$MSCORE $1.mscz
+
diff --git a/vtest/emmentaler-2-ref.png b/vtest/emmentaler-2-ref.png
diff --git a/vtest/emmentaler-2.mscz b/vtest/emmentaler-2.mscz
diff --git a/vtest/gen b/vtest/gen
@@ -5,7 +5,7 @@
 #
 SRC="mmrest-1 mmrest-2 mmrest-4 mmrest-5 mmrest-6 mmrest-7 mmrest-8 mmrest-9\
  fmrest-1 fmrest-2 fmrest-3 fmrest-4 fmrest-5 measure-repeat-1 \
- noteheadposition-1 valign-1 emmentaler-1 bravura-1"
+ noteheadposition-1 valign-1 emmentaler-1 bravura-1 emmentaler-2 bravura-2"
 
 MSCORE=../build.debug/mscore/mscore
 DPI=130