LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1395 from Jojo-Schmitz/style-for-partname

Browse source 
fix #36971: avoid collision of partname and lyricist
This commit is contained in:
Nicolas Froment 2014-10-30 23:00:39 +00:00
commit 7c2e632189
4 changed files with 4 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmscore/style.cpp
View file

@ -272,7 +272,7 @@ void initStyle(MStyle* s)
s->addTextStyle(TextStyle(QT_TRANSLATE_NOOP ("TextStyle", "Instrument Name (Short)"), ff, 12, false, false, false,
AlignmentFlags::RIGHT | AlignmentFlags::VCENTER, QPointF(), OffsetType::ABS, true));
s->addTextStyle(TextStyle(QT_TRANSLATE_NOOP ("TextStyle", "Instrument Name (Part)"), ff, 18, false, false, false,
AlignmentFlags::LEFT | AlignmentFlags::BOTTOM, QPointF(), OffsetType::ABS));
AlignmentFlags::LEFT | AlignmentFlags::TOP, QPointF(), OffsetType::ABS));
// dynamics size is 12pt for bravura-text
s->addTextStyle(TextStyle(QT_TRANSLATE_NOOP ("TextStyle", "Dynamics"), ff, 12, false, false,false,

11
share/templates/04-Jazz-Jazz_Big_Band.mscx
View file

@ -112,7 +112,7 @@
</TextStyle>
<TextStyle>
<halign>left</halign>
<valign>bottom</valign>
<valign>top</valign>
<offsetType>absolute</offsetType>
<name>Instrument Name (Part)</name>
<family>MuseJazz</family>
@ -379,15 +379,6 @@
<bold>1</bold>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
<TextStyle>
<halign>right</halign>
<valign>top</valign>
<offsetType>spatium</offsetType>
<name>Lyrics Verse</name>
<family>MuseJazz</family>
<size>11</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
<page-layout>
<landscape>1</landscape>
<page-margins type="even">

11
share/templates/04-Jazz-Jazz_Combo.mscx
View file

@ -112,7 +112,7 @@
</TextStyle>
<TextStyle>
<halign>left</halign>
<valign>bottom</valign>
<valign>top</valign>
<offsetType>absolute</offsetType>
<name>Instrument Name (Part)</name>
<family>MuseJazz</family>
@ -379,15 +379,6 @@
<bold>1</bold>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
<TextStyle>
<halign>right</halign>
<valign>top</valign>
<offsetType>spatium</offsetType>
<name>Lyrics Verse</name>
<family>MuseJazz</family>
<size>11</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
<page-layout>
<landscape>1</landscape>
<page-margins type="even">

11
share/templates/04-Jazz-Jazz_Lead_Sheet.mscx
View file

@ -104,7 +104,7 @@
</TextStyle>
<TextStyle>
<halign>left</halign>
<valign>bottom</valign>
<valign>top</valign>
<offsetType>absolute</offsetType>
<name>Instrument Name (Part)</name>
<family>MuseJazz</family>
@ -371,15 +371,6 @@
<bold>1</bold>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
<TextStyle>
<halign>right</halign>
<valign>top</valign>
<offsetType>spatium</offsetType>
<name>Lyrics Verse</name>
<family>MuseJazz</family>
<size>11</size>
<sizeIsSpatiumDependent>1</sizeIsSpatiumDependent>
</TextStyle>
<page-layout>
<page-margins type="both">
<left-margin>56.6929</left-margin>