Commit graph

661 commits

Author SHA1 Message Date
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