Commit graph

785 commits

Author SHA1 Message Date
Dmitri Ovodok
b16e88320e fix #280350: apply the fix for widening MM rests to all staves 2018-12-28 14:57:27 +03:00
anatoly-os
d32f837e1d
Merge pull request #4438 from mattmcclinch/273302-fermata-placement
fix #273302: Fermata loses assignment to voice and direction
2018-12-21 16:02:46 +02:00
Matt McClinch
34f261df2a fix #273302: Fermata loses assignment to voice and direction 2018-12-20 06:13:51 -05:00
Dmitri Ovodok
08c8d364b2 fix #279110: correct spacer behaviour with invisible staves 2018-12-19 18:05:39 +02:00
ws
a1977db22f fix #275379 Segno symbol collides with measure number text 2018-12-09 15:11:26 +01:00
MarcSabatella
2a0014c68a fix #278896: invisible text should not affect mmrests or hide empty staves 2018-12-01 23:34:44 -07:00
mirabilos
77983234c8
some spelling fixes
most from the spell checker built into Debian’s automated
package checking tool lintian, two from me during applying
those lintian-suggested fixes
2018-11-27 22:49:18 +01:00
anatoly-os
3426bf12a5
Merge pull request #4026 from jthistle/277038-concert-pitch-doesnt-reset-pitch-to-c
fix #277038: concert pitch doesn't reset key sig to C at start of system when toggled
2018-11-21 15:04:27 +02:00
James Thistlewood
7425757a90 fix #277038: concert pitch doesn't reset key sig to C at start of system when toggled 2018-11-20 20:16:13 +00:00
anatoly-os
aafbd1dab2
Merge pull request #4177 from dmitrio95/276684-anacrusis-timesig
fix #276684: always display nominal time signature after adding staves
2018-11-20 21:06:06 +02:00
Dmitri Ovodok
c6e1ca4ad6 fix #277821: calculate min measure width consistently with MM rests 2018-11-20 15:15:04 +02:00
Dmitri Ovodok
eeb18fa57c fix #276684: always display nominal time signature after adding staves 2018-11-20 11:03:40 +02:00
Matt McClinch
6df5c1c9aa Fix #272887: Unable to add mid-measure clef on the first tick of a measure 2018-11-14 12:06:16 -05:00
ws
d2e452040b fix #278099 Crash when inserting a symbol from master palette 2018-11-13 13:32:33 +01:00
ws
1edd676aa7 fix #277699 Staff properties corrupted on MusicXML import after Master Palette opened
The problem is deep in the initialization of staff types in Staff.
This commit also tries to make handling of StaffType more "const correct" and adds some
assertions which may lead to crashes (and helps detecting bad code).
2018-11-08 15:50:00 +01:00
Dmitri Ovodok
c95dfd5a40 Make it possible to record elements written to MSCX 2018-10-29 16:30:19 +02:00
ws
1455fbcb48 fix #277435 Measure numbers are not removed properly on adding a system break 2018-10-28 19:04:29 +01:00
ws
abc08ac1f1 fix millimeter offset handling for subtext etc. 2018-10-26 12:28:11 +02:00
ws
417d89e07d fix layout regressions for Jump and Marker 2018-10-25 18:32:23 +02:00
anatoly-os
23710ffe51
Merge pull request #4045 from Jojo-Schmitz/measure-crash
fix #275805: Change actual duration after joining measures leads to crash
2018-10-24 12:06:12 +02:00
ws
8a42030a4c fix measure number layout 2018-10-24 10:40:19 +02:00
Joachim Schmitz
7b2f8b066c fix #275805: Change actual duration after joining measures leads to crash
as per https://musescore.org/en/node/275805#comment-851139, adjusted to
a meanwhile changed line number
2018-10-20 18:35:41 +02:00
Dmitri Ovodok
ed1e4fa3fc Fix the missed conversion of ticks to fraction 2018-10-19 15:42:52 +03:00
ws
d77183b3bb refactoring of Element::userOff and TextBase::offset 2018-10-18 11:56:23 +02:00
Joachim Schmitz
474e8152cd fix #275218: fix MSVC C4456 warnings
reg. a declaration shadowing a previously declared local
variable,
"Warning C4456: declaration of 'XXX' hides previous local
declaration"
2018-09-27 17:38:19 +02:00
Dmitri Ovodok
c354eb24c3 Remove read300 functions 2018-09-19 01:57:37 +03:00
alexandr
34cf407404 fix #271616: Fermata tempo is not applied when importing 2.X->3.0 score
Add reading timeStretch for feramta from mscz
Add calculating ticks for segments before first using fermata
Add fermata.mscx to unit tests
2018-09-14 09:09:29 +02:00
anatoly-os
bef6efca3e
Merge pull request #3943 from mattmcclinch/276049-measure-number
fix #276049: 'Measure numbers every system' should place numbers after split measures
2018-09-13 17:03:55 +02:00
ws
d15d09af81 fix #276037 Incorrect dynamics position on 1-line staff 2018-09-12 09:24:02 +02:00
Joachim Schmitz
b27817fe19 fix more MSVC warnings
* The one C4100
* The one C4189
* The two C4457
* The two C4701
* The 475 C4267, changing to size_t were easily possible, casting to
int elsewhere
* Fix GCC warnings reg. wrong printf format for a size_t, reg. unused
variables and reg. ambigous else branch, seen on Travis CI
2018-09-11 16:56:50 +02:00
ws
c7d8989e9f fix merge issues 2018-09-11 16:34:05 +02:00
ws
b232149321 remove measure staff shapes, replace with skyline 2018-09-11 16:30:47 +02:00
Matt McClinch
08aeb12ae8 fix #276049: 'Measure numbers every system' should place numbers after split measures 2018-09-10 14:06:24 -04:00
Joachim Schmitz
5604bfc390 Fix #139021: Crash on loading a possibly corrupted 2.0 file 2018-09-10 17:18:32 +02:00
anatoly-os
61b040899b Revert "Merge pull request #3926 from handrok/fix#271616-Fermata_tempo"
This reverts commit cb6a5c911f.
These changes crash MuseScore when open some 2.06 scores.
2018-09-09 01:47:38 +02:00
alexandr
8422a7d410 fix #271616: Fermata tempo is not applied when importing 2.X->3.0 score 2018-09-06 14:30:44 +02:00
anatoly-os
d357f58b5d
Merge pull request #3623 from mattmcclinch/140256-keysig-unpitched
fix #140256: Regression: no key signatures at beginning of systems if…
2018-09-04 11:24:52 +02:00
Matt McClinch
af0a6c71c7 fix #275369: Key signatures are lost 2.X->3.0 2018-09-01 11:31:45 -04:00
anatoly-os
bc2013ff9d
Merge pull request #3890 from mattmcclinch/275369-keysig
fix #275369: Key signatures are lost 2.X->3.0
2018-08-31 10:03:34 +02:00
anatoly-os
40dc553a75
Merge pull request #3870 from dmitrio95/scorecmp2_squashed
Changes to MSCX fileformat for better comparability (squashed)
2018-08-24 10:00:14 +02:00
Matt McClinch
8b03a09a8d fix #275369: Key signatures are lost 2.X->3.0 2018-08-21 23:47:09 -04:00
alexandr
40abead04d fix #275288: fix deleting tag "Text" when it is empty
During the reading XML MS populate map which consist of lid. This map is container of LinkedElements which is defined by the tag "lid". When tag "Text" doesn't have any text it is deleted. Error was that removing corrresponding element from map container is missing. So I add such kind of removing.

add lid with empty text to unit tests
2018-08-21 16:07:43 +02:00
Dmitri Ovodok
0e67931325 Remove "clip" and "needFirstTick" boolean arguments to Score::writeSegments 2018-08-16 19:10:29 +03:00
Dmitri Ovodok
41366f5a5e Avoid using linked IDs (<lid>) when writing linked elements
This commit includes also the following changes needed for correct
work of the changed links reading code:
- Correct current reading position when reading multimeasure rests
- Assign track number for Fingering while reading MSCX
2018-08-16 19:10:29 +03:00
Dmitri Ovodok
44fb6c46c0 Write voices within <voice> tags when saving score to file 2018-08-16 19:10:29 +03:00
Dmitri Ovodok
5b6cd11a30 Remove some unused code from Measure::read and Score::pasteStaff 2018-08-16 19:10:29 +03:00
Dmitri Ovodok
72be412663 Read/write tuplets without using IDs 2018-08-16 19:10:28 +03:00
Dmitri Ovodok
d0a24894d2 Read/write beams without using IDs 2018-08-16 19:10:28 +03:00
Dmitri Ovodok
104898195b Read and write spanners using the connectors framework
Remove IDs for spanners
2018-08-16 19:10:28 +03:00
Dmitri Ovodok
2c28195c1c Add a framework to read/write connectors using relative positions instead of IDs
Try to reconnect broken connectors while reading MSCX files
2018-08-16 19:10:28 +03:00
Dmitri Ovodok
9bb7666779 Use a universal <location> tag to denote various position shifts 2018-08-16 19:09:58 +03:00
Dmitri Ovodok
f1b40314f7 Do not write measure numbers to MSCX file 2018-08-16 19:08:45 +03:00
Dmitri Ovodok
55bef706b8 Add API for retrieving positions of elements in terms of fractions
Rename fpos -> rfrac
Merge Element::ftick with Element::afrac
2018-08-16 19:08:45 +03:00
Dmitri Ovodok
8fa920b7df Backup old MSC read functions, add a test for fileformats compatibility
Use old read functions for reading 1.x and 2.x fileformats

Assign version number 3.01 to the new MSCX format flavor
2018-08-16 19:08:45 +03:00
anatoly-os
2b5b85f1b3
Merge pull request #3858 from Jojo-Schmitz/MSVC-warnings
Fix #275218: fix MSVC warnings
2018-08-14 12:03:07 +02:00
anatoly-os
292446659f
Merge pull request #3793 from mattmcclinch/274028-courtesy-accidental
fix #274028: Courtesy accidental on tied note ignored later in measure
2018-08-14 11:13:27 +02:00
Joachim Schmitz
632f830f5f Fix #275218: fix MSVC compiler warnings
* Warnings C4304, C4804 and C4838.
* Warnings C4065 and most C4702 (all but two).
* Warnings C4701.
* Warnings C4244.
* Warnings C4457.
* Warnings C4459.
* Some warnings C4456, due to nested `foreach` loops.
2018-08-14 10:03:49 +02:00
ws
10ebbb9080 update text style implementation 2018-08-01 11:46:35 +02:00
MarcSabatella
813b479d13 fix #189741: corruption on change duration with local timesig 2018-07-26 15:43:44 -06:00
Matt McClinch
0bce043c93 fix #274028: Courtesy accidental on tied note ignored later in measure 2018-07-08 17:10:24 -04:00
ws
d1d386102e fix #273766 Automatic Placement with 'Hide empty staves' 2018-07-04 16:22:33 +02:00
Joachim Schmitz
e541ea64a7 Fix #273555: Checking "Show first" with an interval of 1 for measure numbers only shows measure number 1 2018-06-22 14:31:31 +02:00
ws
2c012a23d4 fix #210116 Delete all and Undo duplicates the clef 2018-06-08 18:25:56 +02:00
Anatoly
344d332429
Merge pull request #3662 from mattmcclinch/272172-remove-tuplets
fix #272172: Remove tuplets after inserting measures causes corruption/crash
2018-05-21 11:55:15 +02:00
Joachim Schmitz
72bd2caa51 Measure numbering by interval should take 1st measure number into account
See discussion in https://musescore.org/en/node/272390
2018-05-15 13:00:57 +02:00
ws
94eaac8c67 fix #272058 Backward compatibility of previous versions files (1.2 and 1.3) 2018-05-14 10:07:56 +02:00
Matt McClinch
4e14bbcc3c fix #272172: Remove tuplets after inserting measures causes corruption/crash
fix #272185: Delete a measure containing some tuplets + rest leads to corruption after inserting a measure
2018-05-08 15:59:39 -04:00
Matt McClinch
4c8dbaa9fc fix #268122: Missing naturals when switching key 2018-05-03 21:26:04 -04:00
ws
af29311ec4 remove Element->_readPos 2018-04-30 16:08:25 +02:00
wschweer
903817537c remove code duplication: LinkedStaves 2018-04-27 13:29:39 +02:00
ws
27145ea9b3 fix #271258: Changing 9va-8vb for an Ottava in the Inspector leads to crash 2018-04-13 14:30:54 +02:00
ws
82699c7233 fix adjustment of system header gap in general style 2018-04-13 11:15:28 +02:00
Matt McClinch
4b602d1489 fix #140256: Regression: no key signatures at beginning of systems if any instrument is unpitched percussion 2018-04-11 16:50:19 -04:00
Joachim Schmitz
2c4e32b306 fix 2 compiler warnings 2018-03-29 11:15:03 +02:00
ws
33d1cd7fb4 rename StyleIdx -> Sid and P_ID -> Pid 2018-03-27 15:36:00 +02:00
ws
6969419cfc update subStyle implementation 2018-03-21 14:05:43 +01:00
ws
1a4bd0feb9 add tuplet shape to segment/measure shape; properties update 2018-03-16 10:58:31 +01:00
luz.paz
dab3b5f056 Misc. typos follow up
Follow up to previous typo commit a8ac55c180
2018-02-19 19:30:12 -05:00
herrwagner
11001b53ec fix #268713: start repeat barline added twice 2018-01-22 18:39:20 +01:00
ws
35265cd358 implement new fermata element 2018-01-16 13:38:28 +01:00
ws
187effc33a fix #268201 2018-01-09 10:24:49 +01:00
Werner Schweer
f26ebf688f fix #268110 2018-01-04 12:41:42 +01:00
Werner Schweer
e6175c5dda rearrange class hierarchy 2017-12-27 11:51:09 +01:00
Werner Schweer
1943bd1ff1 replace most static_cast in libmscore 2017-12-20 16:49:58 +01:00
Werner Schweer
283b8c9369 fix end/start repeat barline layout 2017-12-19 12:16:38 +01:00
Werner Schweer
c1db68ea82 fix several issues for import gtp and ptb files 2017-11-30 13:05:36 +01:00
Werner Schweer
2210363047 update Palm Mute; fix for grace notes in drum staff 2017-11-29 09:50:02 +01:00
Werner Schweer
e212f7d57e add new elements LetRing and Vibrato 2017-11-27 09:56:54 +01:00
Werner Schweer
6c735b8798 another multi measure rest layout fix 2017-10-18 13:09:35 +02:00
Werner Schweer
7724169f97 fix for multi measure rest layout 2017-10-17 14:28:03 +02:00
Werner Schweer
302eb0f891 fix clef left margin when there is no systemic barline 2017-10-09 11:47:17 +02:00
Werner Schweer
c4af0c22bc fix for auto layout lyrics/slurs 2017-09-19 15:20:06 +02:00
Werner Schweer
8feb117936 change barline alignment & layout 2017-08-04 15:45:48 +02:00
Werner Schweer
931891724d slur layout update 2017-08-02 18:19:18 +02:00
divya-urs
28d4e39b05 accessibility: nextElement and prevElement 2017-07-13 23:52:00 +05:30
Werner Schweer
b35caf3a45 use barAccidentalDistance style parameter 2017-07-06 13:28:37 +02:00
Werner Schweer
a8329a43b7 layout ottavas after slurs 2017-06-23 19:48:10 +02:00
Werner Schweer
b4f7489ccc regression: start edit mode when adding a slur 2017-06-23 19:30:54 +02:00
Werner Schweer
ac41fa396e update edit infrastructure 2017-03-31 13:03:30 +02:00
lasconic
c08b67ff90 fix #183846 split irreg-len meas shouldn't add rest
This fixes an bug which produced corrupted measures when splitting irregular length measures.  In Score::cmdSplitMeasure() after the newly split measures are first created, if their new actual length was greater than their nominal length, then Measure::adjustToLen() would append additional padding rests at the end of the measure.  However, the subsequent range.write() assumed that the measures were entirely empty before copying contents from the original measure into the new measures.  The extra padding rests were unnecessary, and caused the resulting measures to contain too many notes than their actual length, hence the corruption.

The fix here is to add a default boolean parameter to adjustToLen() called appendRestsIfNecessary which is true by default so as to not change behavior when it is called without specifiying the parameter. However, cmdSplitMeasure() will call adjustToLen with that boolean explicitly false, so that the new measures don't get unnecessary rests.
2017-03-24 17:31:25 +01:00
Werner Schweer
d435c3e5fc change barline alignment 2017-03-20 18:24:29 +01:00
Werner Schweer
1167ae6a0d barline layout fixes 2017-03-20 18:24:29 +01:00
Werner Schweer
f3ad7db520 fix #182211: Time Signature position of numerals not updated when staff size change 2017-03-20 18:24:29 +01:00
lasconic
752bafc8e9 fix #99146: File > Save Selection… leads to corrupt score if selection is not 4/4 and does not start with time signature 2017-03-09 23:55:10 +01:00
Werner Schweer
867f2582f6 move Segment::Type into SegmentType 2017-03-08 13:12:26 +01:00
Werner Schweer
6e3c2479ca change drop behaviour for end-start repeat barlines 2017-03-08 10:51:19 +01:00
Werner Schweer
297b66f6b6 barline fixes 2017-03-07 18:02:07 +01:00
Werner Schweer
c4b477bab2 fixes for layout, align property 2017-02-23 11:42:03 +01:00
Werner Schweer
88703a3259 interpret custom keys 2017-02-13 12:45:37 +01:00
Werner Schweer
f8417ca046 add SystemText element 2017-01-20 11:05:52 +01:00
Werner Schweer
1d4c6b2f21 move Element::type() to ScoreElement 2017-01-18 14:16:33 +01:00
lasconic
c745526cfe fix compilation after 5433d71 2017-01-16 22:16:10 +01:00
Werner Schweer
5433d719d9 replace TextStyle by SubStyle 2017-01-16 20:59:21 +01:00
Werner Schweer
0b1aea952f layout for movements 2017-01-05 11:28:45 +01:00
Werner Schweer
9bbec943ad fix barlines in palette 2016-12-29 15:11:28 +01:00
Werner Schweer
aa98918784 add 'set as staff default' button for barline in inspector 2016-12-28 19:09:11 +01:00
Werner Schweer
22454df70e small fixes for save/restore barlines 2016-12-28 17:21:30 +01:00
Werner Schweer
1a52a38164 update BarLine, mtests 2016-12-28 16:36:59 +01:00
Werner Schweer
337e885896 barline changes, part-1 2016-12-28 16:36:59 +01:00
Werner Schweer
6e7e05aaec impl. staff type changes 2016-12-18 14:31:34 +01:00
Joachim Schmitz
fd1d06cf98 fix #151361: Can't build in RELEASE mode 2016-12-15 14:21:32 +01:00
Werner Schweer
660b393b98 change StaffType interface 2016-12-14 15:44:24 +01:00
Werner Schweer
cb7485f6f8 hide MStaff 2016-12-14 15:40:26 +01:00
Werner Schweer
6dd13e4074 hide MStaff elements 2016-12-14 15:40:26 +01:00
lasconic
f8a5eb8e34 fix #127281: Crash when adding line/section/page breaks by double-clicking on a multimeasure rest 2016-12-05 15:18:36 +01:00
lasconic
9db7d2207c fix #106021: Reducing actual duration of measure with text elements will corrupt measure 2016-12-05 10:18:23 +01:00
Werner Schweer
107343b1aa fix #148121, #138326; add provisions for global insert mode 2016-12-01 13:35:48 +01:00
Werner Schweer
71842fd4c4 fix #142121: Key signature out of position 2016-11-29 18:39:29 +01:00
Werner Schweer
c5f46bb208 rename Xml() -> XmlWriter() 2016-11-19 11:51:21 +01:00
Werner Schweer
bb7d535ce5 add score ptr to XmlReader and Xml 2016-11-19 10:31:14 +01:00
Werner Schweer
ca4a0d23b7 fix generation of coourtesy time signatures 2016-11-16 15:41:55 +01:00
Werner Schweer
bfde93fa44 small optimizations 2016-11-07 09:59:18 +01:00
Werner Schweer
62ec21a671 replace more complete re-layouts with range layout 2016-11-07 09:59:18 +01:00
Werner Schweer
793e11f486 fix #139501 Collision of lyrics 2016-11-02 14:07:39 +01:00
Werner Schweer
42b14fa114 fix performance regressions: slow loading files 2016-11-02 08:55:54 +01:00
Werner Schweer
85240e9eb0 fix #138966: Spacing problems 2016-10-31 10:55:11 +01:00
Werner Schweer
f91498ad5c fix minimumMeasureWidth style option 2016-10-26 10:35:12 +02:00
Werner Schweer
f7d96502c3 update layout, change handling of clefs, system header and trailer 2016-10-25 17:35:55 +02:00
Werner Schweer
4e0b0dbae0 update layout code 2016-10-20 11:32:17 +02:00
Werner Schweer
79b7746f5b layout updates 2016-10-18 15:41:11 +02:00
Werner Schweer
ac629b716e remove line break if you drop a no break 2016-10-13 16:33:27 +02:00
Werner Schweer
b511d0a490 section break implies line break 2016-10-13 14:28:00 +02:00
Werner Schweer
2b44d04ad9 implement 'fixed' spacer 2016-10-12 20:06:57 +02:00
Werner Schweer
ab1723fc6f implementation of 'no break' layout break type 2016-10-12 17:56:22 +02:00
lasconic
24c05a27f0 fix #136681: Corrupted scores with complex tuplet 2016-10-10 11:20:26 +02:00
Werner Schweer
6f5aadf8ef remove staffIdx(Staff*) from score() 2016-09-28 21:13:05 +02:00
Werner Schweer
fc202d12a3 fix #126386 Crash adding a note to part 2016-09-28 20:20:14 +02:00
Werner Schweer
6ca3fc19e0 fix #124166 printing from MuseScore or exporting via a third-party pdf printer causes an unexpected result 2016-09-26 10:19:35 +02:00
Werner Schweer
e38215d41c update hairpin; fix drag of lines to staff > 1 2016-09-22 17:28:44 +02:00
Werner Schweer
8c18761d3b change accidental file format 2016-09-22 12:02:41 +02:00