Commit graph

9562 commits

Author SHA1 Message Date
lasconic
480a01f66a Change design on page settings dialog to vertical, see #70861 2015-08-26 09:35:59 +02:00
Nicolas Froment
13f0918b11 Merge pull request #2141 from ericfont/70861-page-layout-vert-spacer-cols-1-2
fix #70861: add (sp) and vertical spacers in page layout window
2015-08-25 18:39:49 +02:00
Nicolas Froment
41e9bdc609 Merge pull request #2172 from ericfont/65161-repeatlist-unwind-section-by-section_updated
Fix #65161 repeatlist unwind section by section UPDATED
2015-08-25 17:58:42 +02:00
Nicolas Froment
3f093ca946 Merge pull request #2185 from lvinken/46861-melisma-2
Fix #46861: [MusicXML] Add support for melisma in import and export
2015-08-25 16:52:43 +02:00
Leon Vinken
18eef07f73 Fix #46861: [MusicXML] Add support for melisma in import and export 2015-08-25 13:18:43 +02:00
lasconic
97324ae14b fix #74536: [Windows] Too much space between the f dynamics in Emmentaler text 2015-08-24 23:20:57 +02:00
Marc Sabatella
a23ef389c0 Merge pull request #2178 from MarcSabatella/74021-transpose-text-crash
fix #74021: crash on transpose with frame text selected
2015-08-19 17:43:14 -06:00
Marc Sabatella
1195ffe5de fix #74021: crash on transpose with frame text selected 2015-08-19 16:30:50 -06:00
Nicolas Froment
6084a74bba Merge pull request #2175 from MarcSabatella/slash-parts
fix #73821: toggle rhythmic slash notation does not follow links
2015-08-19 09:56:42 +02:00
Eric Fontaine
11362dbe35 Fix #65161 repeatlist unwind section by section _rebased
Each section is unwound individually. A giant album should have same repeat list as concatenation of repeatlists from individual scores (provided each score only refered to markers in its score).
Partitions score by section breaks, and is now aware about section breaks occuring on non-measure MeasureBase objects such as horizontal/vertical frames (repeat37 test).
2015-08-18 14:15:03 -04: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
e6dc6dfdb4 fix #73821: toggle rhythmic slash notation does not follow links 2015-08-18 10:15:29 -06:00
Nicolas Froment
24b0bc8861 Merge pull request #2164 from MarcSabatella/73051-spanner-edit-voices
fix #73051: editing spanner length with multiple voices and/or tuplets
2015-08-18 14:15:21 +02:00
Nicolas Froment
53f89d9fd5 Merge pull request #2174 from MarcSabatella/69866-gap-navigation
Note input nagivation in gaps
2015-08-18 13:55:18 +02:00
Nicolas Froment
d1ee5a2a97 Merge pull request #2173 from mgavioli/Fix#71076_TAB_make_flag_symbol_unselectable
Fix #71076 - TABs: Make flag symbols unselectable
2015-08-18 11:30:04 +02:00
Marc Sabatella
6243586d7b select rest (or top remaining note of chord) on note delete in note entry mode 2015-08-17 20:01:41 -06:00
Marc Sabatella
51360dd9a5 fix #69866: unable to navigate into next measure in voice 2 2015-08-17 20:00:57 -06:00
Maurizio M. Gavioli
53e585cd99 Fix # 71076 : Make flag symbols unselectable
The flag symbols used in historic tabs are not supposed to be selectable, but on some occasions, they happen to be, which causes a crash.
2015-08-17 23:12:00 +02:00
lasconic
1dad6e284e fix #73716: Add or modify text in a frame followed by playback start causes a crash 2015-08-17 22:21:37 +02:00
Nicolas Froment
96405ddf01 Merge pull request #2167 from MarcSabatella/50686-slur-track2
fix #50686: problems with slurs crossing to higher staves
2015-08-17 22:02:38 +02:00
Nicolas Froment
1229937647 Merge pull request #2169 from ericfont/73531-ending-jumprepeat
fix #73531 final measure has both repeat and DS/DC
2015-08-17 15:02:52 +02:00
ws
88b59f3f87 improve sfz parser for ivyAudio piano 2015-08-17 13:09:13 +02:00
lasconic
5561dd0a64 comment file format, remove unused fonts in mac build 2015-08-17 11:26:55 +02:00
Nicolas Froment
a38c0ad1f1 Merge pull request #2113 from mgavioli/TAB_bass_string_support
TAB: Support for input and display of bass string notations
2015-08-17 11:24:28 +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
Eric Fontaine
0f2d648b64 fix #73531 ending measure has jump and repeat 2015-08-16 10:40:46 -04:00
Nicolas Froment
039188062d Merge pull request #2135 from MarcSabatella/22626-system-dividers
fix #22626: automatic system dividers
2015-08-15 19:52:33 +02:00
Marc Sabatella
7ac83bf5fe fix #22626: automatic system dividers 2015-08-15 11:30:58 -06:00
Marc Sabatella
9a1d2a84a0 fix #50686: problems with slurs crossing to higher staves 2015-08-15 08:29:29 -06:00
Marc Sabatella
ed6aa2e8cf fix #63041: editing spanner length with tuplets 2015-08-15 08:26:04 -06:00
Marc Sabatella
4ea940f564 fix #73051: editing spanner length with multiple voices 2015-08-15 08:07:21 -06:00
Nicolas Froment
7c6ad688d4 Merge pull request #2168 from ericfont/73486-73496-jumpToStartRepeat-evaluate-conditions-in-proper-order-also-ctests-j2
Fix #73486 Fix #73496 rewrite jumpToStartRepeat reorder conditions eval
2015-08-15 14:57:02 +02:00
Eric Fontaine
0f3a3e5762 Fix #73486 #73496 rewrite jumpToStartRepeat condition evalation reordered 2015-08-15 08:30:22 -04:00
Nicolas Froment
52adf6107e Merge pull request #2166 from Jojo-Schmitz/tremolo-crash
fix 70416: crash on 2-note tremolo of unbeamed 16th or shorter
2015-08-14 17:48:20 +02:00
Joachim Schmitz
3aa59ddb2f fix 70416: crash on 2-note tremolo of unbeamed 16th or shorter 2015-08-14 17:17:04 +02:00
Nicolas Froment
ca2e6e97aa Merge pull request #2163 from MarcSabatella/72491-textline
fix #72491: text properties in lines added by double click
2015-08-14 15:10:54 +02:00
Marc Sabatella
42ec49d357 fix #72491: text properties in lines added by double click 2015-08-11 15:05:54 -06:00
Nicolas Froment
c2b3bb9cea Merge pull request #2158 from ericfont/71441-zerberus-cancel
Fix #71441 add cancel button to zerberus sfz loading
2015-08-11 20:01:26 +02:00
Eric Fontaine
1e2a54028e Fix #71441 add cancel button to zerberus sfz loading 2015-08-11 10:12:14 -04:00
lasconic
3a350d1ca4 fix drum clef import in ove 2015-08-11 09:33:04 +02:00
Nicolas Froment
0bb048d59a Merge pull request #2157 from Jojo-Schmitz/progress-bar
Ability to cancel audio export
2015-08-10 11:09:16 +02:00
Nicolas Froment
19aa4fa4b9 Merge pull request #2162 from lvinken/71876-musicxml-slide-crash
fix #71876
2015-08-10 08:37:38 +02:00
Joachim Schmitz
39b0d3dc2d fix progress bar issues on exporting audio
* add an "Exporting..." to the progress bars of audio export
* add ability to cancel audio export and delete the partially created
files
2015-08-10 08:20:06 +02:00
Nicolas Froment
2352e1caa6 Merge pull request #2161 from ericfont/72731-win-large-address-aware
Fix #72731 win32 large-address-aware
2015-08-09 22:22:02 +02:00
Leon Vinken
3bad235ec4 fix #71876 2015-08-09 22:07:00 +02:00
Eric Fontaine
1c48b4c571 Fix #72731 win32 large-address-aware
This allows 32-bit builds to access 4GB memory when run in 64-bit windows.

This fixes issue that occurred when loading multiple large soundfonts would cause a crash in windows when exceed the 2GB limit.  I'm able to build release both via command line makefile and in QT Creator, and tested them both to ensure now I'm able to load two very large zerberus .sfz soundfonts without crashing.
2015-08-09 12:40:47 -04:00
Nicolas Froment
a4610d6b3c Merge pull request #2160 from ericfont/windows-makefile-default-nprocessors
windows makefile set default number of jobs to %NUMBER_OF_PROCESSORS%
2015-08-09 12:19:18 +02:00
Eric Fontaine
b46f1ae077 windows makefile set default number of jobs to %NUMBER_OF_PROCESSORS%
%NUMBER_OF_PROCESSORS% is a standard windows environment variable.  It should be used by default.
2015-08-09 06:09:17 -04:00
Nicolas Froment
3f94d879dd Merge pull request #2154 from Jojo-Schmitz/plugins-requiresScore
Followup patch to PR #2142
2015-08-06 12:22:06 +02:00
Nicolas Froment
0c91cc0870 Merge pull request #2156 from Jojo-Schmitz/translate-zerberus
make string translatable
2015-08-06 12:21:07 +02:00