Commit graph

442 commits

Author SHA1 Message Date
lasconic
b4466500d2 fix #58496: Section break doesn't reset courtesy time sig 2015-05-01 18:36:08 +02:00
Marc Sabatella
74be5ed6a5 fix #58231: crash changing text style of empty lyric 2015-04-29 11:26:45 -06:00
Marc Sabatella
7a9a0edd68 more fixes for 51271 - barline spans 2015-04-09 20:39:14 -06:00
ws
3e8cb5b2e5 fix #54556 Multimeasure clef position bug 2015-04-09 13:48:56 +02:00
ws
fd0fe54097 remove RubberBand element 2015-03-31 17:35:18 +02:00
lasconic
add341ad15 fix #51126: Tie from grace note has no end in 1.3 score 2015-03-19 20:40:30 +01:00
Maurizio M. Gavioli
d421eb4592 Fix thread 51151 - Corruption on Cross-measure values ON
Recent improvements to beaming broke the Cross-measure values flag, causing chord duration corruption if turned ON.

Fixed by saving and restoring more duration data while processing beaming data.

Also, added a test about turning this flag on and about undoing.
2015-03-19 01:04:51 +01:00
lasconic
40fa7d0854 revert fix for non displaying key sig when layout changes... 2015-03-12 15:53:01 +01:00
lasconic
d990e20891 try fix #50316: Concert Pitch modifies layout and forgets key signature in one line 2015-03-12 15:21:31 +01:00
Marc Sabatella
1eb94d9927 allow lyrics to use music bottom margin 2015-03-11 08:38:32 -06:00
Marc Sabatella
27c7980ba8 fix regression in page layout 2015-03-10 16:22:00 -06:00
Werner Schweer
4e51f1845b Merge pull request #1863 from MarcSabatella/24100-horizontal-frame-system
fix #24100: bad layout of horizontal frame
2015-03-10 13:33:17 +01:00
Marc Sabatella
9502af3e98 fix #24100: bad layout of horizontal frame 2015-03-09 20:16:46 -06:00
Marc Sabatella
dfaef4d217 fix #42891: lyrics run off bottom of page 2015-03-09 15:07:13 -06:00
lasconic
6f4416a0b3 fix typo 2015-02-25 19:53:10 +01:00
ws
2d53773cf7 fix #47106 change semantic of section break 2015-02-25 11:14:27 +01:00
ws
94ad0842ef fix #48561 Crash when toggling visibility of a line break over a multimeasure rest 2015-02-25 10:48:58 +01:00
lasconic
aeb0d525a5 remove style option for fix width measure and fix number of measure per system 2015-02-19 15:42:24 +01:00
Nicolas Froment
7dfe6bb53a Merge pull request #1784 from MarcSabatella/39351-small-slash-beams
fix #39351: alignment of small upstem slash notes
2015-02-19 12:49:20 +01:00
ws
329124c789 some layout optimizations/claenups 2015-02-19 10:33:46 +01:00
Marc Sabatella
d3184d2429 fix #39351: beams misaligned on small upstem chords with large heads 2015-02-18 14:17:08 -07:00
Nicolas Froment
fadb223d1b Merge pull request #1536 from mgavioli/glissando_v2
Glissando as a multi-segment line.
2015-02-18 15:23:22 +01:00
ws
e7591d1d63 fix regression in detecting multi measure rests 2015-02-18 12:26:26 +01:00
Maurizio M. Gavioli
c6687192ad Fix bug when reading old scores with parts 2015-02-18 12:25:10 +01:00
Maurizio M. Gavioli
f5d831a023 Glissando as a multi-segment line.
- Implemented as a sub-class of `SLine`.
- Anchor type changed from CHORD to NOTE: allows to attach glissando start and end points to individual notes, rather than generically to chords (with note within the chord chosen by the program).
- The Glissando element is now stored in the `Note::_spannerFor` list.
- `Chord::_glissando` has been removed and replaced by a `bool _endsGlissando`, recording whether the chord is at the end of glissando (as gliss.-end chords require more space if mid-measure or system-initial).
- Debugger UI for `Chord` updated accordingly.
- Glissando in now save into score file as a spanner, within the initial note, and with appropriate `<endSpanner>` tag in the Glissando ending note.
- Existing scores with the old Glissando file format are correctly read back.

Notes:

- MusicXML import/export of the new Glissando implementation NOT IMPLEMENTED.
- This version can read scores from older versions, but older versions **cannot read** scored from this version (they do not expect a <Glissando> tag within a Note). Does this require a NEW FILE VERSION NUMBER?
- This implementation would allow rather easily to move the start and end anchors around (as for slurs) to override the note/chord chosen by the program when the glissando is initially created; but the UI for this is not implemented yet.
2015-02-18 12:21:56 +01:00
ws
94a9b0b322 fix layout regression: wrong stem direction 2015-02-17 22:17:22 +01:00
ws
13eccf97fb fix #47976 Crash when closing score with empty tet-frame 2015-02-17 21:12:19 +01:00
ws
ec8913a19b fix #45601 changing note value can lead to missing accidentals; simplify layout() 2015-02-17 20:22:38 +01:00
ws
afc02ebe8a fix #46091 No clef change appears at start of system with 'Create for all systems' turned off 2015-02-16 15:26:36 +01:00
Nicolas Froment
b25ac8acc6 Merge pull request #1761 from MarcSabatella/46701-start-note-entry
fix #46701: note entry starts offscreen
2015-02-16 09:26:09 +01:00
Marc Sabatella
962551c49f Merge pull request #1759 from MarcSabatella/grace-unison
layout fix for unisons with grace notes in downstem voice
2015-02-14 15:11:23 -07:00
ws
c94d62d5a5 fix #23254 LAyout/undo issues with clef change after repeat barline 2015-02-14 16:24:52 +01:00
Marc Sabatella
87c9789f1f fix #46701: note entry starts offscreen 2015-02-13 17:18:41 -07:00
Marc Sabatella
36273a03cd layout fix for unisons with grace notes in downstem voice 2015-02-13 11:03:44 -07:00
Marc Sabatella
ad244baeca fix #46451: tie from normal note to grace before next note 2015-02-05 00:20:57 -07:00
Werner Schweer
70cbcdf1dc Merge pull request #1712 from MarcSabatella/46036-mid-measure-clef
fix #46036: allow mid-measure clef change at start of bar
2015-02-02 10:39:24 +01:00
Marc Sabatella
ea568fbfef fix #46036: allow mis-measure-type clef change at start of bar 2015-01-31 13:41:55 -07:00
Marc Sabatella
70f5820f08 fix #46006: flags in crossed voices collide with notes 2015-01-30 15:19:08 -07:00
Werner Schweer
db768c4cbe Merge pull request #1671 from mgavioli/no_lyrics_syll_padding_in_measure
Do not expect padding for lyrics syllabic dashes in Measure layout
2015-01-26 10:32:41 +01:00
ws
b98f097851 fix #45056: Adding frames causes a crash in parts by switching continuous view 2015-01-24 12:01:56 +01:00
Maurizio M. Gavioli
a4a51787bb Do not expect padding for lyrics syllabi dashes in Measure layout
In `Measure::layoutX()` and in `Score::computeMinWidth()` there is code to add room for dash padding in lyrics syllables, with a reference to `System::layoutLyrics()`.

As `System_layoutLLyrics()` no longer exists and as `LyricsLineSegment::layout()` now adjusts (and occasionally skips) dash width to actual note distance, this is now redundant and may in some cases interfere with the `LyricsLineSegment::layout()` calculations.

Some tests with rather dense polyphonic scores did show that some space may be gained, without raising any evident 'crowding' problem.
2015-01-23 22:26:44 +01:00
ws
69febbce94 fix #44676: Change of duration of measures including grace notes (acciaccatura) causes a crash in tab staff 2015-01-21 11:57:57 +01:00
ws
16764d4614 fix #44466: Crash extending volta over mmrest starting a new system + other cleanups 2015-01-19 12:41:16 +01:00
Maurizio M. Gavioli
c69d2a9262 Lyrics multi-system melisma and dashes
Implements melisma and dash lines for lyrics spanning several systems.

The melisma and dash line is based on the `SLine` class and its segments on the `LineSegment` class. Both the whole line and its segments are not selectable, marked as generated and not saved in the score file, which is not changed in any way.

For very wide dash segments, several dashes are drawn; the distance between the dashes is not configurable.

Lyrics layout code in `Measure` class and in `layout.cpp` file has been commented out as the lyrics line layout is all contained in the lyrics.cpp file

The line is registered with the `Score` (to have its layout delayed until all elements are positioned) with a mechanism similar to other `Spanner`'s, but in a different container (`_unmanagedSpanner`), as the owning `Lyrics` should decide when create, register, unregister and delete its line.

The line segments are registered with the `System` they belong to (to have them drawn), in the same way as other `Spanner`'s.

There is code for using the dash metrics of the lyrics font, but it is turned off via a conditional directive, as there does not seem to be a reliable way to determine the dash metrics; conventional values (determined by trials and errors and based on my taste!) are used when the conditional directive is off.
2015-01-11 10:16:19 +01:00
ws
328503f0a8 fix #42131: Infinite loop on score internal element adding 2015-01-08 10:12:34 +01:00
ws
58fec699ce do not create invisible c-keysig in new scores 2015-01-05 13:31:42 +01:00
Marc Sabatella
0b48254691 slightly more conservative hyphen padding 2014-12-31 17:01:17 -07:00
Nicolas Froment
90855910dd Merge pull request #1595 from MarcSabatella/separator-padding
Separator padding
2014-12-31 10:17:03 +01:00
Marc Sabatella
77e3a87ebf fix #42261: add space before melisma 2014-12-30 23:45:35 -07:00
ws
12a05414d6 fix: save Box topGap/bottomGap in spatium units 2014-12-30 21:14:31 +01:00
ws
7a7c1fc567 make page layout debug output DPI independant 2014-12-30 18:44:27 +01:00
ws
f6d6a527a7 add some debug code to pageLayout 2014-12-30 15:14:21 +01:00
Joachim Schmitz
cdb31d60cb fix compiler warnings in RELEASE mode under Windows
reg. possible uninitialized use of some variables and some unused
parameters
2014-12-18 21:45:49 +01:00
Marc Sabatella
9d7185d89a fix #32231: width of initial measure & other measures with key signatures in continuous view 2014-12-13 17:43:17 -07:00
ws
8ff4a8f95e fix #29931: Custom key signatures do not show 2014-12-08 18:02:29 +01:00
Werner Schweer
e4e377a36b Merge pull request #1316 from mgavioli/system_initial_barline_style
Style of the initial bar line of a system.
2014-12-08 13:03:03 +01:00
ws
f3071ac9d0 fix #29931: Custom key signatures do not show 2014-12-04 14:40:26 +01:00
Marc Sabatella
90c3c1593d fix #6535: grace note ties, articulations, and undo fixes 2014-11-29 19:46:33 -07:00
lasconic
c61c9aee68 fix #40036: Tremolo through stem on grace note all eighths in 1.3 score 2014-11-28 19:56:09 +01:00
ws
d5b29fd815 fix #34531 2014-11-23 13:34:30 +01:00
Nicolas Froment
6b0ff3a887 Merge pull request #1460 from MarcSabatella/slash-notation
fix #8924: native support for slash notation
2014-11-21 00:02:50 +01:00
ws
6c03319d5c fix #39006 2014-11-20 14:34:47 +01:00
Marc Sabatella
58e5a74588 fix #8924: native support for slash notation 2014-11-17 22:02:12 -07:00
ws
f53ca60935 fix #35601 2014-11-17 11:59:28 +01:00
Marc Sabatella
fef82c1a10 beam beats in X/4 according to minimum durations 2014-11-15 11:04:10 -07:00
Nicolas Froment
1e8c3a35c9 Merge pull request #1439 from MarcSabatella/38501-cross-staff-gliss
fix #38501: cheap partial fix for cross-staff and cross-system gliss
2014-11-11 13:33:51 +00:00
lasconic
5199474150 fix #38731: Beams connected to irregular tuplets in a 4/4 time signature and on beats one and three are incorrect 2014-11-10 19:08:53 +00:00
Marc Sabatella
98235e52b2 fix #38501: cheap partial fix for start position of cross-staff and cross-system gliss 2014-11-07 13:23:07 -07:00
Werner Schweer
1d02427ec7 Merge pull request #1388 from MarcSabatella/fingering-improvements
Fingering improvements
2014-11-01 13:40:30 +01:00
ws
6e8ed9b196 addition to fix #37651: complete layout calculations 2014-10-28 15:22:39 +01:00
ws
4be8014426 fix #37666 2014-10-28 11:47:04 +01:00
Marc Sabatella
25e43f2f1b fix #36256: layout shift due to courtesy elements 2014-10-26 22:53:50 -06:00
ws
fc3ea8e434 fix #29931 2014-10-23 17:00:23 +02:00
ws
8019c2846c fix #31451 2014-10-22 19:29:07 +02:00
ws
aa6b0c8e63 fix #30941 2014-10-22 17:17:26 +02:00
ws
c51599bb81 fix #36256 2014-10-21 18:57:43 +02:00
Marc Sabatella
4189822f54 add new fingering styles 2014-10-17 11:47:57 -06:00
ws
9b8c7c67ee fix #35496 2014-10-10 11:52:44 +02:00
ws
161dcb083d fix #14548 2014-10-07 11:32:09 +02:00
Marc Sabatella
ab15653628 avoid overlaps of melisma syllables, extenders, and hyphens 2014-09-22 11:56:32 -06:00
lasconic
d9bf96ba9a add comment 2014-09-20 22:32:31 +02:00
Maurizio M. Gavioli
5621af1c2b Style of the initial bar line of a system.
In some engraving styles (mainly jazz), a double system initial bar line is used at structural articulations of the piece.

The PR supports this style, by adding a `_systemInitialBarLineStyle` variable to the `Measure` class which controls the style of the system bar line when the measure is the first of the system and by default it is set to NORMAL. This variable is not accessed directly; rather it is controlled by manipulating the system bar line. A system bar line can be edited:

- by dropping on it a bar line style from the palette (structural styles, like any repeat or END are ignored);
- by selecting it and double clicking a bar line style from the palette (same note as above).

It can be reset:

- by undo;
- by dropping on it (or selecting and double clicking) a NORMAL bar line style from the palette;
- by selecting and deleting it.

As the system bar line style is stored in the measure, if the first measure of a system changes (because of some other editing), the system bar line style will follow accordingly.
2014-09-16 13:20:15 +02:00
Marc Sabatella
f13dfa6f0d fix #32826: end repeat on mmrest 2014-09-15 16:40:58 -06:00
lasconic
6e5926dd90 fix #33236: Impossible to right click a measure in continuous view if the measure is out of paper in normal view 2014-09-14 09:40:36 +02:00
Nicolas Froment
957d26e98b Merge pull request #1285 from MarcSabatella/32441-empty-key
fix #32441: bad layout with empty key signature
2014-09-09 22:04:14 +02:00
Marc Sabatella
52c0a97b0f fix #32611: alignment of small upstem chords 2014-09-09 07:50:49 -06:00
Marc Sabatella
7f2c2e894c fix #32161: false collisions with crossstaff notes 2014-09-08 11:31:00 -06:00
Marc Sabatella
107772a987 fix #32441: bad layout with empty key signature 2014-09-07 15:40:23 -06:00
Nicolas Froment
e89b028941 Merge pull request #1269 from MarcSabatella/31436-segno-mmrest
fix #31436: segno et al do not display in mmrest
2014-09-04 00:34:05 +02:00
Nicolas Froment
1ac50eb564 Merge pull request #1268 from MarcSabatella/31711-chord-mmrest
fix #31711: chord symbols & mmrests
2014-09-04 00:21:44 +02:00
Marc Sabatella
81c361ce6e fix #31436: segno et al do not display in mmrest 2014-09-02 11:55:45 -06:00
Marc Sabatella
dfdf16e87c fix #31711: chord symbols & mmrests 2014-09-02 11:50:30 -06:00
Marc Sabatella
97192e05df fix #31301: misaligned half notes 2014-08-31 13:22:50 -06:00
ws
0af0091e11 fix #30961 2014-08-27 14:36:42 +02:00
Marc Sabatella
067ae89944 fix crash on score with no measures 2014-08-23 08:22:49 -06:00
ws
0de0a1264c fix #28761 2014-08-23 11:58:50 +02:00
ws
f2ea47bc3a fix for #28761 and #29511 2014-08-22 13:33:46 +02:00
ws
8547e27734 fix #30041 2014-08-21 15:01:54 +02:00
ws
1886d6d911 fix #29796 2014-08-17 12:41:44 +02:00
ws
1dcdd1037d update instrument handling 2014-08-16 11:21:56 +02:00