Skip to content

Commit

Permalink
fix typo in fonts_tablature.xml filename
Browse files Browse the repository at this point in the history
  • Loading branch information
@lasconic
lasconic committed Aug 27, 2012
1 parent ed25435 commit 4f5d638
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
0 fonts/fonts_tabulature.xml → fonts/fonts_tablature.xml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion libmscore/stafftype.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ bool StaffTypeTablature::readConfigFile(const QString& fileName)
path = rpath + QString("/fonts_tablature.xml");
}
#else
path = ":/fonts/fonts_tabulature.xml";
path = ":/fonts/fonts_tablature.xml";
#endif
_durationFonts.clear();
_fretFonts.clear();
Expand Down
2 changes: 1 addition & 1 deletion mscore/musescore-apple.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<file alias="fonts/mscore20.xml">../fonts/mscore20.xml</file>
<file alias="fonts/gonville.xml">../fonts/gonville.xml</file>
<file alias="fonts/fonts_figuredbass.xml">../fonts/fonts_figuredbass.xml</file>
<file alias="fonts/fonts_tabulature.xml">../fonts/fonts_tabulature.xml</file>
<file alias="fonts/fonts_tablature.xml">../fonts/fonts_tablature.xml</file>

<file alias="data/instruments.xml">../share/templates/instruments.xml</file>
<file>data/splash.jpg</file>
Expand Down
2 changes: 1 addition & 1 deletion mscore/musescore.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<file alias="fonts/FreeSerifMscore.ttf">../fonts/FreeSerifMscore.ttf</file>
<file alias="fonts/FreeSerifBold.ttf">../fonts/FreeSerifBold.ttf</file>
<file alias="fonts/FreeSans.ttf">../fonts/FreeSans.ttf</file>
<file alias="fonts/fonts_tabulature.xml">../fonts/fonts_tabulature.xml</file>
<file alias="fonts/fonts_tablature.xml">../fonts/fonts_tablature.xml</file>
<file alias="fonts/mscoreTab.ttf">../fonts/mscoreTab.ttf</file>
<file alias="fonts/fonts_figuredbass.xml">../fonts/fonts_figuredbass.xml</file>
<file alias="fonts/mscore-BC.ttf">../fonts/mscore-BC.ttf</file>
Expand Down

5 comments on commit 4f5d638

@mgavioli
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure this works: the file IS called fonts_tabulature.xml and the function StaffTypeTablature::readConfigFile() looks for such a name.

@vanferry
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this works well on my iOS device

@lasconic
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file is not called fonts_tabulature.xml anymore. Tabulature is not a word in english. So I changed the name of the file to fonts_tablature.xml and I change the qrc files, the readConfigFile() accordingly. Tested on mac and windows.

I forgot to change mtest.qrc though. It's done in the next commit.

@mgavioli
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I probably looked at the commit contents too quickly.

Anyway, for what is worth, "tabUlature" seems to be an English word: Wikipedia reports it as an alternative to "tablature", Goggle returns ca. 2,500,000 usages for it and the root it comes from gives several other words: tabUlar, (to) tabUlate, tabUlation, tabUlator...

@lasconic
Copy link
Contributor Author

@lasconic lasconic commented on 4f5d638 Aug 28, 2012 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.