fix #20954: Brackets drawn incorrectly in Gonville

musescore · May 3, 2013 · 0a4a5d3 · 0a4a5d3
1 parent a5178d9
commit 0a4a5d3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/fonts/gonville.xml b/fonts/gonville.xml
@@ -157,13 +157,13 @@
     <bbox x="-2.49909" y="-8.19523" w="4.99818" h="8.19523"/>
     </Glyph>
   <Glyph>
-    <name>brackettips.down</name>
+    <name>brackettips.dright</name>
     <code>0xe10c</code>
     <attach x="8.23558" y="0"/>
     <bbox x="0" y="-1.8543" w="8.23558" h="4.81397"/>
     </Glyph>
   <Glyph>
-    <name>brackettips.up</name>
+    <name>brackettips.uright</name>
     <code>0xe10d</code>
     <attach x="8.23278" y="0"/>
     <bbox x="0" y="-2.95286" w="8.23278" h="4.80419"/>

diff --git a/libmscore/sym.cpp b/libmscore/sym.cpp
@@ -639,8 +639,8 @@ void initSymbols(int idx)
                               if (idx1 != noSym)
                                     symbols[idx][idx1] = Sym(code, fid, p, b);
                               else {
-                                    qDebug("symbol <%s> for symbol set %d not found in %s",
-                                       qPrintable(name), idx, qPrintable(path));
+                                    qDebug("symbol <%s> declared in %s for symbol set %d not used",
+                                       qPrintable(name), qPrintable(path), idx);
                                     }
                               }
                         else
@@ -652,8 +652,14 @@ void initSymbols(int idx)
             }
       for (int i = 0; i < lastSym; ++i) {
             Sym* sym = &symbols[idx][i];
-            if (sym->code() == -1)
+            if (sym->code() == -1) {
                   qDebug("no code for symbol %s", Sym::id2name(SymId(i)));
+                  if (idx > 0) {
+                        //fallback to default font
+                        symbols[idx][i] = symbols[0][i];
+                        }
+                  }
+
             }
       }