Commit graph

331 commits

Author SHA1 Message Date
Joachim Schmitz
fd8b2af294 fix mtest after a286e8a 2016-05-20 11:33:22 +02:00
ws
a286e8afc8 fix #111866: Stem direction in Inspector does not default to Auto 2016-05-20 10:09:27 +02:00
ws
1afdb4ce3e reorder layout to fix hooks 2016-05-19 13:15:46 +02:00
Fyrult
82b46c8923 Check if there would be ledger lines before creating 2016-05-13 18:39:00 -04:00
Fyrult
fff73630ff fix #15121: Ledger lines don't appear for notes beyond staff in drum palette 2016-05-07 01:06:40 -04:00
Nicolas Froment
ba9ab8df9a Merge pull request #2582 from ZackTheCardshark/100396-noteheads-terminology
Fix #100396: change "note heads" to "noteheads"
2016-05-06 16:25:02 +02:00
ZackTheCardshark
cdc82364e4 Fix #100396: change "note heads" to "noteheads"
See http://music.stackexchange.com/questions/42722/notehead-or-note-head

(also correct "fo" to "for" in comment)
2016-05-02 21:22:29 -04:00
ws
32c3100f80 layout optimizations 2016-05-02 13:42:03 +02:00
ws
e6fed8a7ed fix #107671: Accidentals and grace notes collide with stems 2016-04-27 16:33:30 +02:00
ws
069db44e0c fix #106851: changing pitch on percussion staff crashes MuseScore 2016-04-21 14:18:39 +02:00
ws
097ac65733 fix more regressions; comment out all failing mtest 2016-04-13 12:07:48 +02:00
ws
073fd90f8c fix layout for moved beams 2016-04-13 12:07:47 +02:00
ws
28921bec16 cross beam fixes 2016-04-13 12:05:47 +02:00
ws
9d0478d365 fix stem shapes for cross staff beams 2016-04-13 12:05:46 +02:00
ws
bbd802f8ae framework for partial relayout 2016-04-13 11:35:21 +02:00
ws
6fdbf515e8 changed element type conversion 2016-04-13 11:20:06 +02:00
ws
592ce7f53c fix misc. layout regressions 2016-04-13 11:20:05 +02:00
ws
66455c0cb3 more layout regression fixes 2016-04-13 11:20:05 +02:00
ws
14ee35ba52 misc. regression fixes 2016-04-13 11:20:05 +02:00
ws
9ec1d02471 code cleanups & speed optimizations 2016-04-13 11:18:14 +02:00
ws
dfba52ba77 more regression fixes & cleaups 2016-04-13 11:10:18 +02:00
ws
492709f203 code cleanups 2016-04-13 11:10:17 +02:00
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
66d75cc8cf fix #103801: clean up a few -Wmaybe-uninitialized warnings 2016-03-28 15:29:43 +04:00
lasconic
5d4dfd666d fix undo of linked staff addition when part is present 2016-03-24 11:29:17 +04:00
lasconic
242b4ba1da fix #96246: crash removing null lyric 2016-02-01 12:29:09 +04: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
Marc Sabatella
851472a82b fix #69271: arpeggio manual adjustments not saved for tab 2016-01-19 20:56:13 -07:00
Werner Schweer
ad302568e4 Merge pull request #2155 from mgavioli/Fix#19155_change_glissando_anchors
Fixes #19155 Editable anchors for glissandi and other note-anchored spanners
2015-10-28 16:49:05 +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
Maurizio M. Gavioli
49edb8d0c3 Fixes #19155, #22861 (duplicate of the former) and #23100.
__References__:
Issues:	https://musescore.org/en/node/19155 https://musescore.org/en/node/22861 https://musescore.org/en/node/23100

__Description__:
Allows to change the start and end note to which a glissando is anchored after it has been entered. Either anchor can be changed independently.

The user interface follows the current working of other 'snappable' lines. Once either the start or end grip is selected:
- `[Shift]+[Left]` snaps the anchor to the previous chord, defaulting to its top note.
- `[Shift]+[Right]` snaps to the next chord, defaulting to its top note.
- `[Shift]+[Up]` snaps to the note above (possibly in a chord, voice or staff above the current one).
- `[Shift]+[Down]` snaps to the note below (possibly in a chord, voice or staff below the current one).

This permits to set the anchor points of a glissando to any note in the score, allowing several glissandi between the notes of the same two chords and other complex configurations (glissandi skipping intermediate chords, start and end notes in different voices or staves, and so on).

It is possible to move the anchor to a different staff of the same instrument, but not to a different instrument; also, it is not possible to 'cross' a change of instrument in the same staff.

__Known limitations__:
- The `[Shift]+[Up]` and `[Shift]+[Down]` use the same note-finding functions as the `[Alt]+[Up]` and `[Alt]+[Down]`actions which move the selection cursor to the above and below note, even across voices or staves. Occasionally, in particular if the note immediately above or below is not time-aligned, the algorithm has little expected results; however, the behaviour is already known to the user. Improving the algorithm would benefit both uses.

__Notes__:
- Most of the added infrastructure is not specific to glissando but to any spanner anchored to notes, then it should also add after-the-fact "snap to" note support to note-anchored text line.
- When moving an anchor, the algorithm usually prefers a note in the same voice/staff of the old note if it exists; if there is none, it tries other voices of the same staff.
- The change of anchor is undoable.
- The fix corrects the management of the `Chord::_endsGlissando` flag, taking into account that a chord can be the ending point of several glissandi and removing one of them not necessarily means the chord no longer ends a glissando (another glissando may still exists).
- The fix also improved the rendering of the glissando wavy line, with better alignment with anchor notes and, with glissando text, better text-line spacing.
2015-09-30 09:16:47 +02:00
Maurizio M. Gavioli
6cab2d0f3b TAB - Mixing mensural value symbols and beaming in historic tablatures
__References__: Technology Preview forum post with discussion, screen-shots and links to additional threads https://musescore.org/en/node/81051

Implements the possibility to mix, in TAB's with note symbols at staff side, mensural value symbols (discreet glyphs) with the 'grid'-shaped beaming found in historical sources and commonly used in lute literature.

The beaming is implemented by special drawing of the `TabDurationSymbol` element holding the note value symbol, using drawing primitives instead of the relevant font glyph.

The user may choose between the two renderings (discreet glyph or beaming grid), on a chord-by-chord basis, by setting the chord `BeamMode` (via for instance the relevant palette): `AUTO` selects the glyph rendering, `beam start` the start of the grid and `beam middle` the continuation of the grid beamed to the previous element.

Typographic features of the grid (stem width, stem height and beam thickness) depend on the glyph style and are hard-coded in the style definition. As well as the number of beams for note value, which also depends on the note value style.

Also:
- Implements to possibility to force the display of a note value which would not be rendered by the current note value repetition setting, by setting the chord beam mode to any other value.
- Implements the 'no stem' chord setting for this TAB style, allowing to remove a note value symbol otherwise generated by the current repetition setting.
- Improves the detection of note value font metrics (still not perfect, though, as Qt `QFontMetricsF::tightboundingRect()` returns very approximated results)
- Fixes note value glyph scaling, when the staff scale is modified.
2015-09-27 13:33:05 +02:00
Marc Sabatella
975cfcd2bf fix articulations on non-scaled staves 2015-09-01 13:42:17 -06:00
Marc Sabatella
2e7e27b715 support scaled or non-scaled line distances 2015-09-01 13:42:17 -06:00
Marc Sabatella
83fa21774b fix articulations 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
lasconic
34838db48b fix mtest 2015-08-28 15:58:42 +02:00
lasconic
c31c4b7f9c fix #22994: cross-staff grace note layout 2015-08-28 15:00:34 +02:00
Maurizio M. Gavioli
8e0aeaa579 TAB: Support for input and display of bass string notations
Supports 'standard' configuration for bass string notations in historic tablatures (lutes and other plucked instruments, as well as viols), both of the French and of the Italian style. This should fill the last 'big hole' in historic TAB support.

Bass strings (or bourdons) are extra strings in addition to the 6 'standard' strings, which are not represented by tab lines and were indicated by other typograhic devices in historic sources. Among the innumerable variations shown in sources, this implementation supports the following styles, chosen to be general enough to suit the majority of cases, without requiring new parameters in the TAB style dialogue box:

- French: the first 4 bass courses are indicated by a fret mark in the 'seventh' TAB position (below bottom string) with 0, 1, 2 or 3 slashes prefixed; other bass courses are indicated, also in the 'seventh' TAB position, by the string number (from 4 on) and cannot contain a fret mark (as they didn't in historic sources).
- Italian: the first 2 bass courses are indicated by a fret mark in the 'seventh' TAB position (abover top string) with 1 or 2 'ledger lines' underneath; other bass courses are indicated, also in the 'seventh' TAB position, by the string number (from 9 on) and cannot contain a fret mark (as they didn't in historic sources). Rhythm marks above these indication are raised to leave room for them.

Both styles do not blindly assume that French style is top-to-bottom and Italian is 'upside-down' -- as historic sources are -- but adapt to the actual string order of the TAB. The choice between the two styles depends on the TAB using numbers or letters for the fret marks.

The implementation does not try to detect if the TAB is really of a historic style and applies either bass string notation whenever more strings are used than there are TAB lines. If this proves unsuitable to modern usage, some better heuristics can probably be found.

For a discussion and some screen shots, see: https://musescore.org/en/node/67261

**Note entry**

During TAB note entry, if the instruments has more strings than the TAB has lines, the string cursor can be moved outside of the TAB body, one position below for 'top-to-bottom' TAB's and one position above for 'upside-down' TAB's.

Further up or down movements add, to the 'blue cursor rectangle', markers indicating which is the actual target string (the cursor does not actually move), equal to the marks a note in that string will receive (slashes, ledger lines or string ordinal, according to the style and the string); during input the user will then receive the same info as when reading entered notes.

Other Notes:

- the `InputStatus::_string` variable, holding the current target TAB string in TAB note entry, changed meaning from the __visual__ string index to the __physical__ string index: this allows a better containment of the peculiarities of the individual TAB styles within the `StaffStyle` class, leaving other classes somehow freer of concern about TAB visual order and other peculiarities. As this variable is only used with TAB's, this change should not affect other functions.

- Some calculation for rhythm symbols have been moved from `TabDurationSymbol::draw()` to `TabDurationSymbol::layout()`, hopefully speeding up the drawing process.

- In fonts for historic styles, '10' has been replaced by 'X' both in fret numbers and in string ordinals, as this is more common in historic sources. Currently, this is not configurable; an additional style parameter could be added in future, if there will be enough request for it.
2015-08-17 10:52:05 +02:00
Maurizio M. Gavioli
f1a76e82a0 Fix #69846, #69821, #63561 - multi-voice TAB's: stem and slur positions
__Background__:

In the original TAB implementation, the "Stems above / below" setting was followed when there was only one voice, while with multiple voices, voice 1 stems were always above and voice 2 stems always below.

In issue https://musescore.org/en/node/63561 the OP reported that:
- with multiple voices, stems in TAB did not follow the "Stems above / below" setting;
- extra space was allocated for voice 2 stems.

Both issues were more apparent than real, because the example provided casually had no stems in voice 2 (all whole notes). With the commit 33797cd6c5 :
- voice 1 stems are forced to be below or down according to the setting even for multi-voice cases and voice 2 stems on the opposite side;
- additional distance is allocated above the TAB staff (but not below) if stems are above or there are multiple voices or below (but not above) if stems are below and there is only voice 1.

__Issues__:

1a) The original stem directions were __by design__, assuming that with multiple voices notes of voice 1 tend to be above and notes of voice 2 tend to be below; then it is more sensible to put voice 1 stems above and voice 2 stems below, limiting the "Stems above / below" setting to the single voice case only.

1b) Stem direction controls slurs and tie placement and users are complaining that, with multiple voices, stems, slurs and ties are placed unexpectedly. See issue https://musescore.org/en/node/69846 and forum post https://musescore.org/en/node/69821 .

2) About additional staff distance allocation, with multiple voices it has to be allocated __both__ above and below, as stems may appear both above and below.

__Fix__:

1) This patch fixes 1) by restoring the original stem direction computation (single voice: follow "Stems above / below" setting | multiple voices: voice 1 unconditionally above and voice 2 below) when tab is configured to have stems beside the staff and also when it is configured to have __no stems at all_ (so that slurs and ties occur in expected positions).

2) It corrects additional staff distance allocation for the multiple voice case. No resources are spent to check the odd case when one voice casually has no stems over the entire system (in which case, additional distance on that side could in theory be spared).
2015-07-26 20:55:02 +02:00
lasconic
335c3bd36b fix #67001: Crash on opening file with invalid note anchored textline. Also delete note line when start or end note deleted. 2015-06-29 16:20:47 +02:00
pgkos
f231485736 Implement valid two-note tremolo layout 2015-06-26 18:13:24 +02:00
lasconic
33797cd6c5 fix #63561: TAB - Modified stem direction - don't work properly 2015-06-03 15:24:07 +02:00
Marc Sabatella
9c1437b034 fix #49246: elements duplicated when note tied over barline 2015-05-27 15:36:08 -06:00
lasconic
f44a313495 fix #59881 fix #59861 stemless measure and tab 2015-05-10 09:58:54 +02:00
ws
fd0fe54097 remove RubberBand element 2015-03-31 17:35:18 +02:00
ws
8282094dd6 code cleanups; rename instr() to instrument() 2015-03-26 13:11:46 +01:00
ws
39164cecf8 fix #49916 Crash when adding, changing and removing staves with slurred grace notes 2015-03-10 16:21:27 +01:00