Added a missing Leland Text item

iveshenry18 · Nov 13, 2020 · f1c4951 · f1c4951
1 parent 2123994
commit f1c4951
Show file tree

Hide file tree

Showing 5 changed files with 1,105 additions and 1 deletion.
diff --git a/libmscore/barline.cpp b/libmscore/barline.cpp
@@ -475,7 +475,7 @@ void BarLine::drawDots(QPainter* painter, qreal x) const
             const StaffType* st = staffType();
 
             //workaround to make new Bravura, Petaluma and Leland font work correctly with repeatDots
-            qreal offset = (score()->scoreFont()->name() == "Bravura" || score()->scoreFont()->name() == "Petaluma" || score()->scoreFont()->name() == "Leland") ? 0 : 0.5 * score()->spatium() * mag();
+            qreal offset = (score()->scoreFont()->name() == "Leland" || score()->scoreFont()->name() == "Bravura" || score()->scoreFont()->name() == "Petaluma") ? 0 : 0.5 * score()->spatium() * mag();
             y1l          = st->doty1() * _spatium + offset;
             y2l          = st->doty2() * _spatium + offset;
             }

diff --git a/mscore/editstyle.ui b/mscore/editstyle.ui
@@ -337,6 +337,11 @@
              </item>
              <item row="1" column="1">
               <widget class="QComboBox" name="musicalTextFont">
+               <item>
+                <property name="text">
+                 <string notr="true">Leland Text</string>
+                </property>
+               </item>
                <item>
                 <property name="text">
                  <string notr="true">Bravura Text</string>

diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
@@ -40,6 +40,7 @@ if (MSVC)
 endif (MSVC)
 
 QT5_ADD_RESOURCES(qrc_files ${PROJECT_SOURCE_DIR}/mtest/mtest.qrc
+            ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Campania.qrc
             ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Leland.qrc
             ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Edwin.qrc
             ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-MScore.qrc

diff --git a/share/styles/CMakeLists.txt b/share/styles/CMakeLists.txt
@@ -18,6 +18,7 @@
 #=============================================================================
 
 install(FILES
+      Leland.mss
       MuseJazz.mss
       chords_std.xml
       chords_jazz.xml