Commit graph

442 commits

Author SHA1 Message Date
ws
3d8749ffe9 some regression fixes, code cleanups 2016-04-13 11:08:01 +02:00
ws
9f933d8503 Layout reorganization 2016-04-13 11:05:04 +02:00
lasconic
84aeb32b11 fix #103646: Crash after copy-paste linked measures before a system change with multimeasure rests 2016-03-29 16:44:55 +04:00
Nicolas Froment
d1c56b2c75 Merge pull request #2323 from MarcSabatella/91471-hbox-system
fix #91471: layout issues and crash on system with hbox only
2016-03-14 16:32:15 +04:00
Marc Sabatella
e1192b54bd fix #10217: option to only hide staff if instrument empty 2016-02-19 12:39:37 -07:00
Nicolas Froment
977bce367b Merge pull request #2318 from MarcSabatella/fingering-accidental
position fingering relative to accidental
2016-02-18 11:18:17 +04:00
Marc Sabatella
02700c63ac fix #95051: bad melisma layout after hbox 2016-01-30 20:44:07 -07:00
Marc Sabatella
eb26cc98e5 fix #91471: alternate fix that also improves undo behavior 2016-01-29 10:57:49 -07:00
Marc Sabatella
253aab438d fix #91471: layout issues and crash on system with hbox only 2016-01-29 10:08:35 -07:00
Marc Sabatella
d71d0326b6 fix #93006: layout shift due to overestimating size of courtesy signature 2016-01-26 07:43:56 -07:00
Nicolas Froment
d13e2406c6 Merge pull request #2343 from MarcSabatella/93316-slur-relayout
fix #93316: slur still lays out to deleted note
2016-01-22 14:02:08 +04:00
Marc Sabatella
45e6e2de4b fix #93316: slur still lays out to deleted note 2016-01-21 13:40:53 -07:00
lasconic
a619a84c2b fix #84351: Crash when saving with instrument name selected and continuous view 2016-01-21 16:08:04 +04:00
Marc Sabatella
f6c92ec857 fix #90766: bad layout with hbox at end of system followed by mmrest 2015-12-21 22:17:34 -05:00
Marc Sabatella
0ca9703ee2 position fingering relative to accidental 2015-12-17 17:34:32 -07:00
ws
600306e1ec fix page height in SYSTEM layout mode 2015-12-11 14:30:54 +01:00
ws
d8e4373435 make DPI=72 constant 2015-11-16 14:24:47 +01:00
ws
325215b210 simple implementation of SYSTEM layout mode 2015-11-04 13:22:33 +01:00
lasconic
c4c3f1c8c8 fix merge conflict in tst_clef_courtesy.cpp 2015-10-28 16:58:46 +01:00
Werner Schweer
aa648cf6ee Merge pull request #2227 from ericfont/78216-no-courtesy-key-time-sig-ends-non-measure-layoutSystemRow
fix #78216 no courtesy key or time sig if section ends on non-measure
2015-10-28 16:21:25 +01:00
lasconic
bf3ca4d273 Merge branch '2-3-line' of https://github.com/MarcSabatella/MuseScore into MarcSabatella-2-3-line
On branch MarcSabatella-2-3-line
2015-10-28 12:41:40 +01:00
Werner Schweer
e35a2a124d Merge pull request #2150 from MarcSabatella/cutaway
Support temporary & cutaway staves
2015-10-28 12:07:31 +01:00
Werner Schweer
5c5f5e77ef Merge pull request #2239 from mgavioli/LYRICS_Better_dash_control
Lyrics: Better dash control
2015-10-27 16:53:36 +01:00
Maurizio M. Gavioli
8c017d8536 Lyrics: Better dash control
This patch gives better control on lyrics dash management and it is intended to supersede https://github.com/musescore/MuseScore/pull/2213 which did not suit the taste of several forum users; for a discussion, see https://musescore.org/en/node/76021 .

Adds 3 new score style parameters:
- `lyricsDashMinLength` to control the minimum dash length (default: 0.4sp)
- `lyricsDashMaxLength` to control the maximum dash length (default: 0.8sp)
- `lyricsDashForce`: if set to __true__, a dash is always generated between two syllables of a word and, if there is not enough space for the min dash length, more space is added between the syllables to accommodate it; if set to __false__, no extra space is added and the two syllables are joined together (default: true)

The effect of the last parameter is exemplified by the following screen-shots:

Current situation (before this patch); if there is no room for the min dash length, the dash is skipped and some blank is left between syllables:

Patch with `lyricsDashForce = true`; chords are further spaced and a min-length dash is inserted:

Patch with `lyricsDashForce = false`: the second syllable is moved (slightly) to the left to reclaim the blank:
2015-10-03 23:55:33 +02:00
ws
e342fda2f8 implement vertical page orientation; enable properties for Score 2015-10-01 15:03:32 +02:00
Marc Sabatella
d4623821bc fix #81371: crash/hang with frames at end of score 2015-09-27 08:33:40 -06:00
Eric Fontaine
5f1ec2c513 fix #78216 no courtesy key or time sig if section ends on non-measure
If a section break occurs on a non-measure MeasureBase object such as a vertical or horizontal frame, then the courtesy key or time signature should still not be displayed in the final actual measure of the section.
2015-09-19 05:53:40 -04:00
Eric Fontaine
dec181560d fix #76006 append first measure before perform minWidth2() calculation
Previously, during Score::layoutSystem() the very first measure was not actually added to the system until after minWidth2() performed its calculation, resulting in Clef::layout() incorrectly determining that a courtesy clef should be added to all single-measure systems ending with a section break.  This is because teh showClef calculation in Clef::layout would evaluate (meas->system() && meas != meas->system()->lastMeasure()) to be true since meas->system()->lastMeasure() would be null at the time of executing minWidth2() for the first measure to be added to the system.

This fix first appends the initial measure of a system during Score::layoutSystem() before performing the minWidth2() calculation.  This ensures that Clef::layout() doesn't have an empty meas->system().

In order to accommodate the appending of the first measure earlier in the code, I first make sure to grab the state of system->measures().isEmpty() at the top of the loop, before possibly appending the first measure.  This ensures that will not break out of loop when performing calculation if (systemWasNotEmpty && (minWidth + ww > systemWidth)).

Also need to keep track of the value of isFirstMeasure until lower in the loop so can only append measure if did not already append measure

added test clef_courtesy03.mscx which has a single measure section m1.  When add clef to m2, should not display courtesy clef at end of m1, because courtesy clefs should not be displayed at end of a section.
2015-09-17 04:18:11 -04:00
Marc Sabatella
2e7e27b715 support scaled or non-scaled line distances 2015-09-01 13:42:17 -06:00
Marc Sabatella
73922c6898 fix 2-line and 3-line layout issues 2015-09-01 13:42:17 -06:00
Marc Sabatella
8e4fbee3b3 fix #73966: bad system spacing with lyrics or spacers at page break 2015-08-19 15:27:28 -06:00
lasconic
bb879a8ece fix #73801: SECTION_BREAK on non-measure MEASURE_BASE does not reset measure numbering in next section 2015-08-18 20:07:04 +02:00
Marc Sabatella
7ac83bf5fe fix #22626: automatic system dividers 2015-08-15 11:30:58 -06:00
Marc Sabatella
ccb17c4cc7 add UI (staff properties) 2015-08-04 11:53:54 -06:00
Marc Sabatella
4228f5a52a initial implementation using showIfEmpty 2015-07-31 17:28:55 -06:00
Marc Sabatella
423c24a35f fix #67031: incomplete glissando copied 2015-06-30 15:23:57 -06:00
Marc Sabatella
8ccf8607de fix #66826: always display key change at start of system 2015-06-27 11:07:31 -06:00
Werner Schweer
ff2d6e854a Merge pull request #2068 from MarcSabatella/54221-measure-after-frame
fix #54221: bd layout with measure after horizontal frame
2015-06-27 10:33:26 +02:00
ws
bf8dc84d4c handle special case if all measure stretches in a system are zero 2015-06-17 10:35:35 +02:00
ws
b8adcc617d fix #50921 Reduce stretch has bad effect on other measure as soon as stretch factor reaches 0 2015-06-17 09:56:12 +02:00
Marc Sabatella
4aa4c83bfe fix #54221: bd layout with measure after horizontal frame 2015-06-13 23:06:28 -06:00
Marc Sabatella
3e7f828e74 fix #65041: breath interferes with chord symbol spacing 2015-06-12 13:09:06 -06:00
Marc Sabatella
b4bdcddc9d fix #64911: space before start repeat 2015-06-11 23:04:43 -06:00
Marc Sabatella
432e14b300 fix #63711: no naturals on change to atonal key signature 2015-06-06 13:26:13 -06:00
Marc Sabatella
9c1437b034 fix #49246: elements duplicated when note tied over barline 2015-05-27 15:36:08 -06:00
Marc Sabatella
58d317bc2c fix #61571: note entry below staff in continuous view 2015-05-23 13:24:20 -06:00
lasconic
befbfde1a4 create system headers after section break in panoramic view 2015-05-13 14:15:57 +02:00
lasconic
e8541545bc Do not display vertical frame in panoramic view, display clef at beginning of section in panoramic view 2015-05-12 18:24:35 +02:00
ws
3e383af345 fix arpeggio and glissando lines 2015-05-08 08:59:34 +02:00
lasconic
61eed11401 fix all warnings on Mac OSX. Hopefully without side effects on other platforms. 2015-05-05 18:28:39 +02:00