Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MU3] Fix #295588: Add Petaluma font #5381

Merged
merged 1 commit into from
Oct 22, 2020

Conversation

Jojo-Schmitz
Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz commented Oct 12, 2019

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Oct 12, 2019

Not sure we want or need Petaluma specific vtests. Or whether there are any font specific mtests.

mscore/editstyle.cpp Outdated Show resolved Hide resolved
mscore/editstyle.ui Outdated Show resolved Hide resolved
QFont::insertSubstitution("MuseJazz Text", "Bravura Text");
QFont::insertSubstitution("MuseJazz Text", "Bravura Text");
QFont::insertSubstitution("Petaluma Text", "Bravura Text");
QFont::insertSubstitution("Petaluma Script","Bravura Text");
Copy link
Contributor Author

@Jojo-Schmitz Jojo-Schmitz Oct 13, 2019

Choose a reason for hiding this comment

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

Here Petaluma Script probably isn't needed either, see above

@@ -358,6 +358,8 @@ void MScore::init()
":/fonts/bravura/BravuraText.otf",
":/fonts/gootville/GootvilleText.otf",
":/fonts/mscore/MScoreText.ttf",
":/fonts/petaluma/PetalumaText.otf",
":/fonts/petaluma/PetalumaScript.otf",
Copy link
Contributor Author

@Jojo-Schmitz Jojo-Schmitz Oct 13, 2019

Choose a reason for hiding this comment

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

Here Petaluma Script is needed, in the same way as FreeSerif is, Question is whether Petaluma Text is needed here?

@@ -1071,6 +1072,8 @@ if (APPLE)
../fonts/mscoreTab.ttf
../fonts/mscore-BC.ttf
../fonts/bravura/BravuraText.otf
../fonts/petaluma/PetalumaText.otf
../fonts/petaluma/PetalumaScript.otf
Copy link
Contributor Author

@Jojo-Schmitz Jojo-Schmitz Oct 13, 2019

Choose a reason for hiding this comment

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

Here Petaluma Script is needed, in the same way as FreeSerif is, Question is whether Petaluma Text is needed here? This might be independant of the question above.
Guess a Mac user and developer is needed here...

@ecstrema
Copy link
Contributor

It would be good to see this one merged.
Could you please add collect artifacts, so we can test it?

@Jojo-Schmitz
Copy link
Contributor Author

rebased and done ;-)

@ecstrema
Copy link
Contributor

Where do you set the style loaded when the font is chosen (when loadStyleBasedOnFont checkbox is checked)?

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Feb 20, 2020

You mean optimizeStyleCheckbox? I don't think any additional coding is needed there, scoreFont->engravingDefaults() should take care of that

@ecstrema
Copy link
Contributor

I thought a style file was associated with each individual engraving font, and that these were loaded when a different font was specified.

@Jojo-Schmitz
Copy link
Contributor Author

Not that I'd know

@ecstrema
Copy link
Contributor

So what is this?
image

@ecstrema
Copy link
Contributor

Works well!
I especially like the big keysigs and the "normal" fermatas. (compared to musejazz)
image

@ecstrema
Copy link
Contributor

That was Petaluma text.
This one is Petaluma script:
image

@ecstrema
Copy link
Contributor

Both are nice except for chord symbols

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Feb 21, 2020

So what is this?
image

That is the button optimizeStyleCheckbox triggering scoreFont->engravingDefaults() which gets some settings from the font itself, its .json file I think

@ecstrema
Copy link
Contributor

Ah. It's clear now. I read
"load style settings based on font" as
"load style file based on font"

@ecstrema
Copy link
Contributor

ecstrema commented Apr 9, 2020

@anatoly-os any news regarding the merging of this PR?

@Jojo-Schmitz Jojo-Schmitz changed the base branch from master to 3.x May 8, 2020 07:27
and use Steinberg's naming to easy further updates
@Jojo-Schmitz
Copy link
Contributor Author

It is in master now, waiting for it to get merged into 3.x for 3.6

@Jojo-Schmitz Jojo-Schmitz changed the title Fix #295588: add Petaluma font [MU3] Fix #295588: Add Petaluma font Oct 20, 2020
@vpereverzev vpereverzev merged commit 40b4f6d into musescore:3.x Oct 22, 2020
@Jojo-Schmitz Jojo-Schmitz deleted the petaluma branch October 22, 2020 14:29
Jojo-Schmitz referenced this pull request in cbjeukendrup/MuseScore Aug 30, 2021
Jojo-Schmitz added a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 30, 2021
Update musescorefonts-Petaluma.qrc, pretty bad ommission from musescore#5381

Backport of musescore#8958 (not a very straight one...)
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 31, 2021
Update musescorefonts-Petaluma.qrc, pretty bad ommission from musescore#5381

Backport of musescore#8958 (not a very straight one...), part 2 (part 1 doesn't
apply here at all)
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 1, 2021
Update musescorefonts-Petaluma.qrc, pretty bad ommission from musescore#5381

Backport of musescore#8958 (not a very straight one...), part 2 (part 1 doesn't
apply here at all)
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 2, 2021
Update musescorefonts-Petaluma.qrc, pretty bad ommission from musescore#5381

Backport of musescore#8958 (not a very straight one...), part 2 (part 1 doesn't
apply here at all)
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 2, 2021
Update musescorefonts-Petaluma.qrc, pretty bad ommission from musescore#5381

Backport of musescore#8958 (not a very straight one...), part 2 (part 1 doesn't
apply here at all)
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 9, 2021
Update musescorefonts-Petaluma.qrc, pretty bad ommission from musescore#5381

Backport of musescore#8958 (not a very straight one...), part 2 (part 1 doesn't
apply here at all)
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 10, 2021
Update musescorefonts-Petaluma.qrc, pretty bad ommission from musescore#5381

Backport of musescore#8958 (not a very straight one...), part 2 (part 1 doesn't
apply here at all)
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 23, 2021
Update musescorefonts-Petaluma.qrc, pretty bad ommission from musescore#5381

Backport of musescore#8958 (not a very straight one...), part 2 (part 1 doesn't
apply here at all)
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 26, 2021
Update musescorefonts-Petaluma.qrc, pretty bad ommission from musescore#5381

Backport of musescore#8958 (not a very straight one...), part 2 (part 1 doesn't
apply here at all)
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 29, 2021
Update musescorefonts-Petaluma.qrc, pretty bad ommission from musescore#5381

Backport of musescore#8958 (not a very straight one...), part 2 (part 1 doesn't
apply here at all)
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request May 12, 2022
Update musescorefonts-Petaluma.qrc, pretty bad ommission from musescore#5381

Backport of musescore#8958 (not a very straight one...), part 2 (part 1 doesn't
apply here at all)
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Mar 5, 2023
Update musescorefonts-Petaluma.qrc, pretty bad ommission from musescore#5381

Backport of musescore#8958 (not a very straight one...), part 2 (part 1 doesn't
apply here at all)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants