diff -Nru musescore-1.1+dfsg/debian/changelog musescore-1.2+dfsg/debian/changelog --- musescore-1.1+dfsg/debian/changelog 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/changelog 2012-03-22 13:25:18.000000000 +0000 @@ -1,7 +1,38 @@ -musescore (1.1+dfsg-0ubuntu~lucid1) lucid; urgency=low +musescore (1.2+dfsg-0ubuntu~lucid0.1) lucid; urgency=low + + * New upstream release + + see + + many bugfixes (Closes: #641780, #663411, #649225, #657910, #642953) + (LP: #794282, #944619, #743116) + + musescore-common dependency has been correctly versioned since 1.1 + (Closes: #655111) + * 12-debianise-about-box.patch: + + redirect bug submitters to the correct package on Launchpad + * 25-desktop-file-genericnames.patch: (Closes: #640988) + + no more meaningless GenericName entries in desktop file + * debian/rules: use dh_prep instead of dh_clean -k + * debian/rules, debian/manpages: make sure `musescore` has a manpage + * debian/control: ensure transitional packages are oldlibs/extra + * debian/control, debian/compat: + + revert debhelper compatibility to v7 for older systems + + -- Toby Smithe Wed, 21 Mar 2012 18:45:32 +0000 + +musescore (1.1+dfsg-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt". + Note: some patches were updated with "quilt refresh" to make + them apply cleanly. + * Update to Standards-Version to 3.9.3 and debhelper to 9. + + -- Jari Aalto Wed, 29 Feb 2012 04:55:51 -0500 + +musescore (1.1+dfsg-1) unstable; urgency=low * New upstream release: (LP: #819293) + MuseScore Connect + - debian/control: depend on libqtwebkit-dev + add sol notehead, alternative brevist notehead group + add new symbols for old notation + improvements to MuseJazz font diff -Nru musescore-1.1+dfsg/debian/compat musescore-1.2+dfsg/debian/compat --- musescore-1.1+dfsg/debian/compat 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/compat 2012-03-22 13:24:59.000000000 +0000 @@ -1 +1 @@ -5 +7 diff -Nru musescore-1.1+dfsg/debian/control musescore-1.2+dfsg/debian/control --- musescore-1.1+dfsg/debian/control 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/control 2012-03-22 13:24:56.000000000 +0000 @@ -2,11 +2,11 @@ Section: sound Priority: optional Maintainer: Toby Smithe -Build-Depends: debhelper (>= 5.0.51~), dpatch, cmake, doxygen, - graphviz, libqt4-dev (>= 4.5.0), libasound2-dev, libjack-dev, +Build-Depends: debhelper (>= 7), cmake, doxygen, + graphviz, libqt4-dev (>= 4.6.0), libqtwebkit-dev, libasound2-dev, libjack-dev, libsndfile1-dev (>= 1.0.18), portaudio19-dev, zlib1g-dev, libfreetype6-dev, chrpath -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://www.musescore.org/ Vcs-Bzr: http://bazaar.launchpad.net/~mscore-ubuntu/musescore/debian Vcs-Browser: http://bazaar.launchpad.net/~mscore-ubuntu/musescore/debian/files @@ -17,7 +17,7 @@ Replaces: mscore (<< 0.9.6+dfsg-1) Conflicts: mscore (<< 0.9.6+dfsg-1) Depends: ${misc:Depends}, ${shlibs:Depends}, libqtscript4-qtbindings, - musescore-common (>= 1.0+dfsg-1), musescore-soundfont-gm, xdg-utils, + musescore-common (>= 1.2+dfsg-0), musescore-soundfont-gm, xdg-utils, desktop-file-utils, gawk Recommends: pulseaudio-utils Suggests: fluid-soundfont-gm @@ -62,6 +62,8 @@ Package: mscore Architecture: all +Section: oldlibs +Priority: extra Depends: ${misc:Depends}, musescore Description: Dummy transitional package for musescore The package `mscore` has been renamed to `musescore`. @@ -70,6 +72,8 @@ Package: mscore-common Architecture: all +Section: oldlibs +Priority: extra Depends: ${misc:Depends}, musescore-common Description: Dummy transitional package for musescore-common The package `mscore-common` has been renamed to `musescore-common`. diff -Nru musescore-1.1+dfsg/debian/manpages musescore-1.2+dfsg/debian/manpages --- musescore-1.1+dfsg/debian/manpages 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/manpages 2012-03-22 00:02:57.000000000 +0000 @@ -1 +1,3 @@ mscore/packaging/mscore.1 +mscore/packaging/musescore.1 + diff -Nru musescore-1.1+dfsg/debian/patches/00list musescore-1.2+dfsg/debian/patches/00list --- musescore-1.1+dfsg/debian/patches/00list 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -# dropped 01-use-global-fluidsynth with 0.9.5b1869+dfsg-1 -# dropped 02-freedom with 0.9.6b2490 -# dropped 03-build-desktop-file with version 0.9.2+dfsg-1 -# dropped 04-use-fluid-soundfont with 0.9.6b2439 -05-use-mscore-common-files -# dropped 06-build-documentation with version 0.9.2+dfsg-1 -# dropped 07-fix-xml-in-msc with version 0.9.3n~svn1071+dfsg-1 -08-disable-multiple-jobs -09-disable-building-qtscript -10-disable-awl -# dropped 11-install-manual with 0.9.5b1925+dfsg (REVERTED BELOW) -11-install-manual -12-debianise-about-box -13-fix-arm-qreal-ftbfs -14-enable-portaudio-by-default -# dropped 15-add-mime-to-desktop-file with 0.9.5b1825+dfsg -# dropped 16-ProcessHTML with 0.9.6b2421 -# 17-ProcessHTML-remove-ja -18-correct-sf2-path -19-fix-window-icon -20-fix-dso-linking -21-fix-startup-notification -22-fix-casting -23-fix-bindings diff -Nru musescore-1.1+dfsg/debian/patches/05-use-mscore-common-files.dpatch musescore-1.2+dfsg/debian/patches/05-use-mscore-common-files.dpatch --- musescore-1.1+dfsg/debian/patches/05-use-mscore-common-files.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/05-use-mscore-common-files.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 05-use-mscore-common-files.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: On Debian systems, use mscore-common files as opposed to those -## DP: linked into the mscore binary where possible. This is done for -## DP: two reasons: to make users aware of the available demo files in -## DP: /usr/share/mscore, and to reduce the size of the mscore binary. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' musescore-1.0~/mscore/mscore/mscore.qrc musescore-1.0/mscore/mscore/mscore.qrc ---- musescore-1.0~/mscore/mscore/mscore.qrc 2011-02-04 21:13:12.000000000 +0000 -+++ musescore-1.0/mscore/mscore/mscore.qrc 2011-02-14 17:18:31.764404961 +0000 -@@ -5,11 +5,6 @@ - data/previous.png - data/next.png - data/repeat.svg -- data/paper1.png -- data/paper2.png -- data/paper3.png -- data/paper4.png -- data/paper5.png - data/text_bold.svg - data/text_italic.svg - data/text_left.svg -@@ -38,7 +33,6 @@ - fonts/MuseJazz.ttf - ../share/templates/instruments.xml - data/splash.jpg -- ../demos/promenade.mscx - data/speaker.svg - data/midiin.svg - data/undo.svg -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' musescore-1.0~/mscore/mscore/preferences.cpp musescore-1.0/mscore/mscore/preferences.cpp ---- musescore-1.0~/mscore/mscore/preferences.cpp 2011-02-04 21:13:12.000000000 +0000 -+++ musescore-1.0/mscore/mscore/preferences.cpp 2011-02-14 17:19:18.165824863 +0000 -@@ -115,7 +115,7 @@ - bgUseColor = true; - fgUseColor = false; - bgWallpaper = QString(); -- fgWallpaper = ":/data/paper5.png"; -+ fgWallpaper = "/usr/share/mscore/wallpaper/paper4.png"; - fgColor.setRgb(255, 255, 255); - bgColor.setRgb(0x76, 0x76, 0x6e); - -@@ -163,7 +163,7 @@ - layoutBreakColor = Qt::green; - antialiasedDrawing = true; - sessionStart = SCORE_SESSION; -- startScore = ":/data/Promenade_Example.mscx"; -+ startScore = "/usr/share/mscore/demos/promenade.mscx"; - workingDirectory = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation); - showSplashScreen = true; - -@@ -183,7 +183,7 @@ - - midiExpandRepeats = true; - playRepeats = true; -- instrumentList = ":/data/instruments.xml"; -+ instrumentList = "/usr/share/mscore/templates/instruments.xml"; - - alternateNoteEntryMethod = false; - proximity = 6; -@@ -344,7 +344,7 @@ - bgUseColor = s.value("bgUseColor", true).toBool(); - fgUseColor = s.value("fgUseColor", false).toBool(); - bgWallpaper = s.value("bgWallpaper").toString(); -- fgWallpaper = s.value("fgWallpaper", ":/data/paper5.png").toString(); -+ fgWallpaper = s.value("fgWallpaper", "/usr/share/mscore/wallpaper/paper4.png").toString(); - fgColor = s.value("fgColor", QColor(255, 255, 255)).value(); - bgColor = s.value("bgColor", QColor(0x76, 0x76, 0x6e)).value(); - -@@ -449,7 +449,7 @@ - else if (ss == "empty") - sessionStart = EMPTY_SESSION; - -- startScore = s.value("startScore", ":/data/Promenade_Example.mscx").toString(); -+ startScore = s.value("startScore", "/usr/share/mscore/demos/promenade.mscx").toString(); - instrumentList = s.value("instrumentList", ":/data/instruments.xml").toString(); - - s.beginGroup("PlayPanel"); diff -Nru musescore-1.1+dfsg/debian/patches/05-use-mscore-common-files.patch musescore-1.2+dfsg/debian/patches/05-use-mscore-common-files.patch --- musescore-1.1+dfsg/debian/patches/05-use-mscore-common-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/05-use-mscore-common-files.patch 2012-03-21 22:26:21.000000000 +0000 @@ -0,0 +1,90 @@ +From: Toby Smithe +Subject: Use mscore-common. + On Debian systems, use mscore-common files as opposed to those + linked into the mscore binary where possible. This is done for + two reasons: to make users aware of the available demo files in + /usr/share/mscore, and to reduce the size of the mscore binary. + +--- + mscore/mscore/mscore.qrc | 6 ------ + mscore/mscore/preferences.cpp | 10 +++++----- + 2 files changed, 5 insertions(+), 11 deletions(-) + +--- a/mscore/mscore/mscore.qrc ++++ b/mscore/mscore/mscore.qrc +@@ -5,11 +5,6 @@ + data/previous.png + data/next.png + data/repeat.svg +- data/paper1.png +- data/paper2.png +- data/paper3.png +- data/paper4.png +- data/paper5.png + data/text_bold.svg + data/text_italic.svg + data/text_left.svg +@@ -38,7 +33,6 @@ + fonts/MuseJazz.ttf + ../share/templates/instruments.xml + data/splash.jpg +- ../demos/Reunion.mscz + data/speaker.svg + data/midiin.svg + data/undo.svg +--- a/mscore/mscore/preferences.cpp ++++ b/mscore/mscore/preferences.cpp +@@ -115,7 +115,7 @@ + bgUseColor = true; + fgUseColor = false; + bgWallpaper = QString(); +- fgWallpaper = ":/data/paper5.png"; ++ fgWallpaper = "/usr/share/mscore/wallpaper/paper4.png"; + fgColor.setRgb(255, 255, 255); + bgColor.setRgb(0x76, 0x76, 0x6e); + +@@ -163,7 +163,7 @@ + layoutBreakColor = Qt::green; + antialiasedDrawing = true; + sessionStart = SCORE_SESSION; +- startScore = ":/data/Reunion_Example.mscz"; ++ startScore = "/usr/share/mscore/demos/Reunion.mscz"; + workingDirectory = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation); + showSplashScreen = true; + +@@ -183,7 +183,7 @@ + + midiExpandRepeats = true; + playRepeats = true; +- instrumentList = ":/data/instruments.xml"; ++ instrumentList = "/usr/share/mscore/templates/instruments.xml"; + + alternateNoteEntryMethod = false; + proximity = 6; +@@ -350,7 +350,7 @@ + bgUseColor = s.value("bgUseColor", true).toBool(); + fgUseColor = s.value("fgUseColor", false).toBool(); + bgWallpaper = s.value("bgWallpaper").toString(); +- fgWallpaper = s.value("fgWallpaper", ":/data/paper5.png").toString(); ++ fgWallpaper = s.value("fgWallpaper", "/usr/share/mscore/wallpaper/paper4.png").toString(); + fgColor = s.value("fgColor", QColor(255, 255, 255)).value(); + bgColor = s.value("bgColor", QColor(0x76, 0x76, 0x6e)).value(); + +@@ -459,9 +459,15 @@ + else if (ss == "empty") + sessionStart = EMPTY_SESSION; + +- startScore = s.value("startScore", ":/data/Reunion_Example.mscz").toString(); ++ startScore = s.value("startScore", "/usr/share/mscore/demos/Reunion.mscz").toString(); + if(startScore == ":/data/Promenade_Example.mscx") +- startScore = ":/data/Reunion_Example.mscz"; ++ startScore = "/usr/share/mscore/demos/Reunion.mscz"; ++ if(startScore == ":/data/Reunion_Example.mscz") ++ startScore = "/usr/share/mscore/demos/Reunion.mscz"; ++ if(startScore == "/usr/share/mscore/demos/Promenade_Example.mscx") ++ startScore = "/usr/share/mscore/demos/Reunion.mscz"; ++ if(startScore == "/usr/share/mscore/demos/promenade.mscx") ++ startScore = "/usr/share/mscore/demos/Reunion.mscz"; + instrumentList = s.value("instrumentList", ":/data/instruments.xml").toString(); + + readShortcuts(); diff -Nru musescore-1.1+dfsg/debian/patches/08-disable-multiple-jobs.dpatch musescore-1.2+dfsg/debian/patches/08-disable-multiple-jobs.dpatch --- musescore-1.1+dfsg/debian/patches/08-disable-multiple-jobs.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/08-disable-multiple-jobs.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 08-disable-multiple-jobs.dpatch by Tobias Toedter -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: The current system of detecting multiple CPUs and using them for -## DP: multiple jobs in parallel is not very robust and results in a FTBFS on -## DP: some architectures. - -@DPATCH@ -diff -urNad trunk~/Makefile trunk/Makefile ---- trunk~/Makefile 2009-02-26 20:15:29.000000000 +0000 -+++ trunk/Makefile 2009-03-15 20:05:54.000000000 +0000 -@@ -19,7 +19,7 @@ - #============================================================================= - - REVISION = `cat mscore/mscore/revision.h` --CPUS = `grep -c processor /proc/cpuinfo` -+#CPUS = `grep -c processor /proc/cpuinfo` - - PREFIX = "/usr/local" - VERSION = "0.9.5b${REVISION}" -@@ -37,7 +37,8 @@ - ../mscore; \ - make lupdate; \ - make lrelease; \ -- make -j ${CPUS}; \ -+ #make -j ${CPUS}; \ -+ make; \ - else \ - echo "build directory does already exist, please remove first with 'make clean'"; \ - fi; diff -Nru musescore-1.1+dfsg/debian/patches/08-disable-multiple-jobs.patch musescore-1.2+dfsg/debian/patches/08-disable-multiple-jobs.patch --- musescore-1.1+dfsg/debian/patches/08-disable-multiple-jobs.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/08-disable-multiple-jobs.patch 2012-03-21 18:23:33.000000000 +0000 @@ -0,0 +1,31 @@ +From: Tobias Toedter +Subject: Detect multiple CPUs better + The current system of detecting multiple CPUs and using them for + multiple jobs in parallel is not very robust and results in a FTBFS on + some architectures. + +--- + Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/Makefile ++++ b/Makefile +@@ -19,7 +19,7 @@ + #============================================================================= + + REVISION = `cat mscore/mscore/revision.h` +-CPUS = `grep -c processor /proc/cpuinfo` ++#CPUS = `grep -c processor /proc/cpuinfo` + + PREFIX = "/usr/local" + #VERSION = "1.2r${REVISION}" +@@ -36,7 +36,8 @@ + -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ + ../mscore; \ + make lrelease; \ +- make -j ${CPUS}; \ ++ #make -j ${CPUS}; \ ++ make; \ + else \ + echo "build directory does already exist, please remove first with 'make clean'"; \ + fi; diff -Nru musescore-1.1+dfsg/debian/patches/09-disable-building-qtscript.dpatch musescore-1.2+dfsg/debian/patches/09-disable-building-qtscript.dpatch --- musescore-1.1+dfsg/debian/patches/09-disable-building-qtscript.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/09-disable-building-qtscript.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,380 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 09-disable-building-qtscript.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Only build static QtScript bindings. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' musescore-1.0~/mscore/CMakeLists.txt musescore-1.0/mscore/CMakeLists.txt ---- musescore-1.0~/mscore/CMakeLists.txt 2011-02-04 21:13:45.000000000 +0000 -+++ musescore-1.0/mscore/CMakeLists.txt 2011-02-14 17:21:15.209361619 +0000 -@@ -31,7 +31,7 @@ - set(GCC_VISIBILITY TRUE) # requires gcc 4.x? - set(HAS_AUDIOFILE TRUE) # requires libsndfile - --set(BUILD_SCRIPTGEN TRUE) #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib) -+set(BUILD_SCRIPTGEN FALSE) #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib) - set(STATIC_SCRIPT_BINDINGS FALSE) - set(USE_SSE FALSE) - -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' musescore-1.0~/mscore/CMakeLists.txt.~1~ musescore-1.0/mscore/CMakeLists.txt.~1~ ---- musescore-1.0~/mscore/CMakeLists.txt.~1~ 1970-01-01 01:00:00.000000000 +0100 -+++ musescore-1.0/mscore/CMakeLists.txt.~1~ 2011-02-04 21:13:45.000000000 +0000 -@@ -0,0 +1,357 @@ -+#============================================================================= -+# Mscore -+# Linux Music Score Editor -+# $Id:$ -+# -+# Copyright (C) 2002-2009 by Werner Schweer and others -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License version 2. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+#============================================================================= -+ -+project(mscore) -+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) -+ -+cmake_policy(SET CMP0003 NEW) -+ -+# for debugging the make system uncomment next line: -+# set(CMAKE_VERBOSE_MAKEFILE ON) -+ -+set(MSCORE_UNSTABLE FALSE) # mark as unstable -+ -+set(GCC_VISIBILITY TRUE) # requires gcc 4.x? -+set(HAS_AUDIOFILE TRUE) # requires libsndfile -+ -+set(BUILD_SCRIPTGEN TRUE) #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib) -+set(STATIC_SCRIPT_BINDINGS FALSE) -+set(USE_SSE FALSE) -+ -+if (MINGW) -+ set(GCC_VISIBILITY FALSE) # we use gcc 3.6 -+ set(STATIC_SCRIPT_BINDINGS TRUE) -+endif (MINGW) -+ -+if (APPLE) -+ set(HAS_AUDIOFILE TRUE) # requires libsndfile -+ set(STATIC_SCRIPT_BINDINGS TRUE) -+ set(CMAKE_OSX_ARCHITECTURES i386 ppc) # build universal library -+ set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) -+ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4) #min version required -+ find_library(AudioToolboxFW NAMES AudioToolbox) -+ find_library(AudioUnitFW NAMES AudioUnit) -+ find_library(CoreAudioFW NAMES CoreAudio) -+ find_library(CoreMidiFW NAMES CoreMIDI) -+ find_library(SystemConfigurationFW NAMES SystemConfiguration) -+ find_library(CoreServicesFW NAMES CoreServices) -+ set(OsxFrameworks ${AudioToolboxFW} ${AudioUnitFW} ${CoreAudioFW} ${CoreMidiFW} ${SystemConfigurationFW} ${CoreServicesFW}) -+endif (APPLE) -+ -+set(CMAKE_INCLUDE_CURRENT_DIR TRUE) -+set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) -+set(CMAKE_SKIP_RULE_DEPENDENCY TRUE) -+ -+# The Mscore version number. -+SET(Mscore_VERSION_MAJOR "1") -+SET(Mscore_VERSION_MINOR "0") -+SET(Mscore_VERSION_PATCH "0") -+ -+SET(Mscore_VERSION "${Mscore_VERSION_MAJOR}.${Mscore_VERSION_MINOR}") -+#SET(Mscore_VERSION_FULL "${Mscore_VERSION}.${Mscore_VERSION_PATCH}") -+SET(Mscore_VERSION_FULL "${Mscore_VERSION}") -+ -+if (MINGW OR APPLE) -+ if(MINGW) -+ SET(Mscore_INSTALL_NAME "") -+ SET(Mscore_SHARE_NAME "./") -+ else(MINGW) -+ SET(Mscore_INSTALL_NAME "Contents/Resources/") -+ SET(Mscore_SHARE_NAME "mscore.app/") -+ endif(MINGW) -+else (MINGW OR APPLE) -+ SET(Mscore_INSTALL_NAME "mscore-${Mscore_VERSION}/") -+ SET(Mscore_SHARE_NAME "share/") -+endif (MINGW OR APPLE) -+ -+include ( ${PROJECT_SOURCE_DIR}/cmake/UsePkgConfig1.cmake ) -+include ( ${PROJECT_SOURCE_DIR}/cmake/TargetDoc.cmake) -+ -+## -+## look for Qt4 -+## -+ -+set(QT_MIN_VERSION "4.6.0") -+set(QT_USE_QTXML TRUE) -+set(QT_USE_QTSVG TRUE) -+set(QT_USE_QTNETWORK TRUE) -+set(QT_USE_QTUITOOLS TRUE) -+set(QT_USE_QTDESIGNER TRUE) -+set(QT_USE_QTSCRIPT TRUE) -+set(QT_USE_QTSCRIPTTOOLS TRUE) -+ -+find_package(Qt4 "4.6") -+ -+if (NOT QT4_FOUND) -+ message(FATAL_ERROR "Fatal error: QT (version >= 4.6.0) required." -+ " Cmake tries to detect QT4 by searching for 'qmake' in your PATH." -+ "If you have QT4 installed, make sure qmake is found in your PATH. " -+ "If you compiled QT4 yourself make sure your new qmake ist found" -+ " _first_ in your PATH." -+ ) -+else (NOT QT4_FOUND) -+ message("Qt lib found at ${QT_LIBRARY_DIR}") -+endif (NOT QT4_FOUND) -+ -+ -+# Set QT_QTSCRIPT_INCLUDE_DIR -+FIND_PATH(QT_QTSCRIPT_INCLUDE_DIR QtScript -+ PATHS -+ ${QT_INCLUDE_DIR}/QtScript -+ ${QT_LIBRARY_DIR}/QtScript.framework/Headers -+ NO_DEFAULT_PATH -+ ) -+ -+# Set QT_QTSCRIPT_LIBRARY (for cmake 2.4) -+#FIND_LIBRARY(QT_QTSCRIPT_LIBRARY_RELEASE NAMES QtScript QtScript4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -+#FIND_LIBRARY(QT_QTSCRIPT_LIBRARY_DEBUG NAMES QtScript QtScript_debug QtScriptd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -+#_QT4_ADJUST_LIB_VARS(QTSCRIPT) -+ -+# Set QT_QTSCRIPT_TOOLS_LIBRARY (apparently still needed on Ubuntu 9.10 - cmake 2.6.4) -+if (NOT MINGW AND NOT APPLE) -+FIND_LIBRARY(QT_QTSCRIPT_TOOLS_LIBRARY_RELEASE NAMES QtScriptTools QtScriptTools4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -+FIND_LIBRARY(QT_QTSCRIPT_TOOLS_LIBRARY_DEBUG NAMES QtScriptTools QtScriptTools_debug QtScriptToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -+_QT4_ADJUST_LIB_VARS(QTSCRIPT_TOOLS) -+endif (NOT MINGW AND NOT APPLE) -+ -+include(${QT_USE_FILE}) -+ -+## -+## alsa >= 1.0.0 -+## -+ -+if (APPLE OR MINGW) -+ message("Disabling ALSA support due to OS X or MINGW build.") -+ set (USE_ALSA 0) -+ set (HAS_MIDI 1) -+else (APPLE OR MINGW) -+ PKGCONFIG (alsa 1.0.0 ALSA_INCDIR ALSA_LIBDIR ALSA_LIB ALSA_CPP ) -+ if (NOT ALSA_INCDIR) -+ message(FATAL_ERROR "Fatal error: ALSA >= 1.0.0 required") -+ else (NOT ALSA_INCDIR) -+ message("Alsa detected.") -+ set (USE_ALSA 1) -+ set (HAS_MIDI 1) -+ endif (NOT ALSA_INCDIR) -+endif (APPLE OR MINGW) -+ -+ -+## -+## find jack >= JACK_MIN_VERSION -+## -+ -+SET(JACK_LONGNAME "jack (jack audio connection kit)") -+SET(JACK_MIN_VERSION "0.98.0") -+ -+SET(BUILD_JACK AUTO CACHE STRING "Build with support for ${JACK_LONGNAME}. jack >= ${JACK_MIN_VERSION} will be needed. [ON/OFF/AUTO]") -+IF(BUILD_JACK) -+ IF(MINGW) -+ set (USE_JACK 1) -+ IF("$ENV{PROCESSOR_ARCHITEW6432}" STREQUAL "") -+ IF($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "x86") -+ # "pure" 32-bit environment -+ set (JACK_INCDIR "C:/Program Files/Jack v1.9.5/includes") -+ set (JACK_LIB "C:/Program Files/Jack v1.9.5/lib/libjack.a") -+ ELSE($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "x86") -+ # "pure" 64-bit environment -+ set (JACK_INCDIR "C:/Program Files (x86)/Jack v1.9.5/includes") -+ set (JACK_LIB "C:/Program Files (x86)/Jack v1.9.5/lib/libjack.a") -+ ENDIF($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "x86") -+ ELSE("$ENV{PROCESSOR_ARCHITEW6432}" STREQUAL "") -+ IF("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "x86") -+ # 32-bit program running with an underlying 64-bit environment -+ set (JACK_INCDIR "C:/Program Files (x86)/Jack v1.9.5/includes") -+ set (JACK_LIB "C:/Program Files (x86)/Jack v1.9.5/lib/libjack.a") -+ ELSE("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "x86") -+ # theoretically impossible case... -+ ENDIF("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "x86") -+ ENDIF("$ENV{PROCESSOR_ARCHITEW6432}" STREQUAL "") -+ -+ ELSE(MINGW) -+ PKGCONFIG(jack ${JACK_MIN_VERSION} JACK_INCDIR JACK_LIBDIR JACK_LIB JACK_CPP) -+ IF(JACK_INCDIR) -+ MESSAGE(STATUS "${JACK_LONGNAME} >= ${JACK_MIN_VERSION} found") -+ SET(USE_JACK 1) -+ ELSE(JACK_INCDIR) -+ MESSAGE(STATUS "${JACK_LONGNAME} >= ${JACK_MIN_VERSION} not found") -+ IF(NOT BUILD_JACK STREQUAL AUTO) -+ MESSAGE(SEND_ERROR "Error: jack support requested but not found (BUILD_JACK=${BUILD_JACK})") -+ ENDIF() -+ ENDIF(JACK_INCDIR) -+ ENDIF(MINGW) -+ELSE(BUILD_JACK) -+ MESSAGE(STATUS "${JACK_LONGNAME} support disabled") -+ENDIF(BUILD_JACK) -+ -+ -+## -+## portaudio -+## -+ -+if (MINGW) -+ set ( USE_PORTAUDIO 1 ) -+ set ( USE_PORTMIDI 1 ) -+else (MINGW) -+ PKGCONFIG (portaudio-2.0 19 PORTAUDIO_INCDIR PORTAUDIO_LIBDIR PORTAUDIO_LIB PORTAUDIO_CPP ) -+ if (PORTAUDIO_INCDIR) -+ message("portaudio detected ${PORTAUDIO_INCDIR} ${PORTAUDIO_LIBDIR} ${PORTAUDIO_LIB}") -+ set ( USE_PORTAUDIO 1 ) -+ else (PORTAUDIO_INCDIR) -+ message("optional package portaudio-2.0 Version 19 not found (package portaudio19-dev)\n") -+ set ( USE_PORTAUDIO 0 ) -+ endif (PORTAUDIO_INCDIR) -+ if (APPLE) -+ set ( USE_PORTMIDI 1 ) -+ else (APPLE) -+ set (USE_PORTMIDI 0) -+ endif (APPLE) -+endif (MINGW) -+ -+## -+## produce config.h file -+## -+configure_file ( -+ ${PROJECT_SOURCE_DIR}/config.h.in -+ ${PROJECT_BINARY_DIR}/config.h -+ ) -+if (NOT MINGW AND NOT APPLE) -+ install( FILES packaging/mscore.desktop DESTINATION share/applications) -+endif (NOT MINGW AND NOT APPLE) -+ -+set (subdirs al awl bww2mxml osdabzip rtf2html mscore share manual demos -+ singleapp fluid) -+ -+if (BUILD_SCRIPTGEN) -+ set (subdirs ${subdirs} scriptgen) -+endif (BUILD_SCRIPTGEN) -+ -+if (MINGW OR APPLE) -+ set (subdirs ${subdirs} portmidi) -+endif (MINGW OR APPLE) -+ -+subdirs(${subdirs}) -+ -+ -+include_directories( -+ ${PROJECT_SOURCE_DIR} -+ ${PROJECT_SOURCE_DIR}/mscore -+ ${PROJECT_BINARY_DIR} -+ ${PROJECT_BINARY_DIR}/mscore -+ ${ALSA_INCDIR} -+ ${JACK_INCDIR} -+ ${PORTAUDIO_INCDIR} -+) -+ -+## -+## create package target -+## -+ -+include (InstallRequiredSystemLibraries) -+ -+ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MuseScore is a full featured WYSIWYG score editor") -+ SET(CPACK_PACKAGE_VENDOR "Werner Schweer and Others") -+ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/COPYING") -+ SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING") -+ -+ SET(CPACK_PACKAGE_VERSION_MAJOR "${Mscore_VERSION_MAJOR}") -+ SET(CPACK_PACKAGE_VERSION_MINOR "${Mscore_VERSION_MINOR}") -+ SET(CPACK_PACKAGE_VERSION_PATCH "${Mscore_VERSION_PATCH}") -+ SET(CPACK_PACKAGE_INSTALL_DIRECTORY "MuseScore ${Mscore_VERSION_MAJOR}.${Mscore_VERSION_MINOR}") -+ -+ SET(CPACK_NSIS_COMPRESSOR "/FINAL /SOLID lzma") -+ -+ IF(MINGW) -+ SET(CPACK_PACKAGE_INSTALL_DIRECTORY "MuseScore") -+ # There is a bug in NSI that does not handle full unix paths properly. Make -+ # sure there is at least one set of four (4) backlasshes. -+ SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mscore/data\\\\installerhead.bmp") -+ SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\mscore.exe,0") -+ SET(CPACK_NSIS_DISPLAY_NAME "MuseScore ${Mscore_VERSION_FULL} MuseScore score typesetter") -+ SET(CPACK_NSIS_HELP_LINK "http://www.musescore.org/") -+ SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.musescore.org/") -+ SET(CPACK_NSIS_CONTACT "ws@wschweer.de") -+ SET(CPACK_NSIS_MODIFY_PATH OFF) -+ SET(CPACK_STRIP_FILES "mscore.exe") -+ -+ # File types association: -+ SET(CPACK_NSIS_DEFINES "!include ${PROJECT_SOURCE_DIR}/packaging\\\\FileAssociation.nsh") -+ -+ SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " -+ Push \\\"ATENDATA\\\" -+ Push \\\"$INSTDIR\\\\share\\\\aten\\\" -+ Call WriteEnvStr -+ ") -+ -+ SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " -+ \\\${registerExtension} \\\"MuseScore File\\\" \\\".mscx\\\" \\\"\\\$INSTDIR\\\\bin\\\\mscore.exe\\\" -+ \\\${registerExtension} \\\"Compressed MuseScore File\\\" \\\".mscz\\\" \\\"\\\$INSTDIR\\\\bin\\\\mscore.exe\\\" -+ ") -+ SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " -+ \\\${unregisterExtension} \\\".mscx\\\" \\\"MuseScore File\\\" -+ \\\${unregisterExtension} \\\".mscz\\\" \\\"Compressed MuseScore File\\\" -+ ") -+ ELSE(MINGW) -+ SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mscore/data/mscore.bmp") -+ SET(CPACK_STRIP_FILES "mscore") -+ SET(CPACK_SOURCE_STRIP_FILES "") -+ ENDIF(MINGW) -+ -+ SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mscore") -+ SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${Mscore_VERSION_FULL}") -+ SET(CPACK_PACKAGE_EXECUTABLES "mscore" "MuseScore") -+ -+ set(CPACK_DEBIAN_PACKAGE_NAME "mscore") -+ set(CPACK_DEBIAN_PACKAGE_VERSION "${Mscore_VERSION_FULL}-0ubuntu0.1") -+ set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386") -+ -+ set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt4-core (>= 4.4), libqt4-gui (>= 4.4)") -+ -+ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "tsmithe@ubuntu.com") -+ set(CPACK_DEBIAN_PACKAGE_SECTION "devel") -+ set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional") -+ set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "") -+ set(CPACK_DEBIAN_PACKAGE_SUGGESTS "") -+ -+ set(CPACK_PACKAGE_CONTACT "ws@wschweer.de") -+ -+if (MINGW) -+ set(CPACK_GENERATOR "NSIS") -+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/packaging" ${CMAKE_MODULE_PATH}) # Use custom version of NSIS.InstallOptions.ini -+else (MINGW) -+ if (NOT APPLE) -+ set(CPACK_GENERATOR "DEB;TBZ2") -+ set(CPACK_DEB "on") -+ endif (NOT APPLE) -+endif (MINGW) -+ -+include (CPack) -+ -+add_custom_target(lupdate -+ COMMAND ${PROJECT_SOURCE_DIR}/gen-qt-projectfile ${PROJECT_SOURCE_DIR} > mscore.pro -+ COMMAND lupdate -noobsolete ${PROJECT_BINARY_DIR}/mscore.pro -+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR} -+ ) -+ -+add_custom_target(lrelease -+ COMMAND ${PROJECT_SOURCE_DIR}/gen-qt-projectfile ${PROJECT_SOURCE_DIR} > mscore.pro -+ COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/locale/*.ts -+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR} -+ ) -+ diff -Nru musescore-1.1+dfsg/debian/patches/09-disable-building-qtscript.patch musescore-1.2+dfsg/debian/patches/09-disable-building-qtscript.patch --- musescore-1.1+dfsg/debian/patches/09-disable-building-qtscript.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/09-disable-building-qtscript.patch 2012-03-21 18:52:31.000000000 +0000 @@ -0,0 +1,14 @@ +From: Toby Smithe +Subject: Only build static QtScript bindings. + +--- a/mscore/CMakeLists.txt ++++ b/mscore/CMakeLists.txt +@@ -32,7 +32,7 @@ + set(HAS_AUDIOFILE TRUE) # requires libsndfile + set(OSC TRUE) # osc remote control + +-set(BUILD_SCRIPTGEN TRUE) #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib) ++set(BUILD_SCRIPTGEN FALSE) #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib) + set(STATIC_SCRIPT_BINDINGS FALSE) + set(USE_SSE FALSE) + diff -Nru musescore-1.1+dfsg/debian/patches/10-disable-awl.dpatch musescore-1.2+dfsg/debian/patches/10-disable-awl.dpatch --- musescore-1.1+dfsg/debian/patches/10-disable-awl.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/10-disable-awl.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10-disable-awl.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Disable building awl plugin to ease shlib errors. - -@DPATCH@ -diff -urNad trunk~/mscore/CMakeLists.txt trunk/mscore/CMakeLists.txt ---- trunk~/mscore/CMakeLists.txt 2009-03-19 16:20:36.000000000 +0000 -+++ trunk/mscore/CMakeLists.txt 2009-03-19 16:21:23.000000000 +0000 -@@ -34,6 +34,8 @@ - - set(STATIC_SCRIPT_BINDINGS TRUE) - -+set(BUILD_AWL_PLUGIN FALSE) -+ - if (MINGW) - set(GCC_VISIBILITY FALSE) # we use gcc 3.6 - set(STATIC_SCRIPT_BINDINGS TRUE) -diff -urNad trunk~/mscore/awl/CMakeLists.txt trunk/mscore/awl/CMakeLists.txt ---- trunk~/mscore/awl/CMakeLists.txt 2009-01-23 18:24:54.000000000 +0000 -+++ trunk/mscore/awl/CMakeLists.txt 2009-03-19 16:20:36.000000000 +0000 -@@ -83,6 +83,8 @@ - colorlabel.h - ) - -+if (BUILD_AWL_PLUGIN) -+ - add_library ( - awlplugin SHARED - ${PROJECT_BINARY_DIR}/all.h -@@ -107,4 +109,6 @@ - - install( TARGETS awlplugin DESTINATION ${QT_PLUGINS_DIR}/designer/ ) - -+endif (BUILD_AWL_PLUGIN) -+ - endif (NOT MINGW AND NOT APPLE) diff -Nru musescore-1.1+dfsg/debian/patches/10-disable-awl.patch musescore-1.2+dfsg/debian/patches/10-disable-awl.patch --- musescore-1.1+dfsg/debian/patches/10-disable-awl.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/10-disable-awl.patch 2012-03-21 18:41:47.000000000 +0000 @@ -0,0 +1,37 @@ +From: Toby Smithe +Subject: Disable building awl plugin to ease shlib errors. + +--- + mscore/CMakeLists.txt | 2 ++ + mscore/awl/CMakeLists.txt | 4 ++++ + 2 files changed, 6 insertions(+) + +--- a/mscore/CMakeLists.txt ++++ b/mscore/CMakeLists.txt +@@ -36,6 +36,8 @@ + set(STATIC_SCRIPT_BINDINGS FALSE) + set(USE_SSE FALSE) + ++set(BUILD_AWL_PLUGIN FALSE) ++ + if (MINGW) + set(GCC_VISIBILITY FALSE) # we use gcc 3.6 + set(STATIC_SCRIPT_BINDINGS TRUE) +--- a/mscore/awl/CMakeLists.txt ++++ b/mscore/awl/CMakeLists.txt +@@ -84,6 +84,8 @@ + pitchlabel.h + ) + ++if (BUILD_AWL_PLUGIN) ++ + add_library ( + awlplugin SHARED + ${PROJECT_BINARY_DIR}/all.h +@@ -119,4 +121,6 @@ + target_link_libraries (ltest awlplugin ${QT_LIBRARIES}) + + ++endif (BUILD_AWL_PLUGIN) ++ + endif (NOT MINGW AND NOT APPLE) diff -Nru musescore-1.1+dfsg/debian/patches/11-install-manual.dpatch musescore-1.2+dfsg/debian/patches/11-install-manual.dpatch --- musescore-1.1+dfsg/debian/patches/11-install-manual.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/11-install-manual.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 11-install-manual.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Manual PDFs etc are not found in this checkout. This patch adds a -## DP: build option to disable manual file installation. - -@DPATCH@ -diff -urNad beta1~/mscore/CMakeLists.txt beta1/mscore/CMakeLists.txt ---- beta1~/mscore/CMakeLists.txt 2010-02-13 17:46:36.591442632 +0000 -+++ beta1/mscore/CMakeLists.txt 2010-02-13 17:46:36.941460514 +0000 -@@ -36,6 +36,8 @@ - - set(BUILD_AWL_PLUGIN FALSE) - -+set(INSTALL_MANUAL_FILES FALSE) # not found in this checkout -+ - if (MINGW) - set(GCC_VISIBILITY FALSE) # we use gcc 3.6 - set(STATIC_SCRIPT_BINDINGS TRUE) -diff -urNad beta1~/mscore/manual/CMakeLists.txt beta1/mscore/manual/CMakeLists.txt ---- beta1~/mscore/manual/CMakeLists.txt 2010-02-13 17:06:16.000000000 +0000 -+++ beta1/mscore/manual/CMakeLists.txt 2010-02-13 17:50:17.628942648 +0000 -@@ -18,6 +18,7 @@ - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - #============================================================================= - -+if(INSTALL_MANUAL_FILES) - install(FILES - MuseScore-en.pdf - MuseScore-de.pdf -@@ -32,3 +33,4 @@ - MuseScore-pt-br.pdf - DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}man - ) -+endif(INSTALL_MANUAL_FILES) -diff -urNad beta1~/mscore/mscore/mscore.cpp beta1/mscore/mscore/mscore.cpp ---- beta1~/mscore/mscore/mscore.cpp 2010-02-13 17:08:36.000000000 +0000 -+++ beta1/mscore/mscore/mscore.cpp 2010-02-13 17:49:17.368955209 +0000 -@@ -819,8 +819,8 @@ - QMenu* menuHelp = mb->addMenu(tr("&Help")); - menuHelp->setObjectName("Help"); - -- menuHelp->addAction(getAction("local-help")); -- menuHelp->addAction(tr("Online Handbook"), this, SLOT(helpBrowser1())); -+ // menuHelp->addAction(getAction("local-help")); -+ menuHelp->addAction(tr("Online Handbook"), this, SLOT(helpBrowser1()), Qt::Key_F1); - menuHelp->addSeparator(); - menuHelp->addAction(tr("&About"), this, SLOT(about())); - menuHelp->addAction(tr("About&Qt"), this, SLOT(aboutQt())); diff -Nru musescore-1.1+dfsg/debian/patches/11-install-manual.patch musescore-1.2+dfsg/debian/patches/11-install-manual.patch --- musescore-1.1+dfsg/debian/patches/11-install-manual.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/11-install-manual.patch 2012-03-21 18:41:55.000000000 +0000 @@ -0,0 +1,49 @@ +From: Toby Smithe +Subject: Manual PDFs etc are not found in this checkout. + This patch adds a build option to disable manual file installation. + +--- + mscore/CMakeLists.txt | 2 ++ + mscore/manual/CMakeLists.txt | 2 ++ + mscore/mscore/mscore.cpp | 4 ++-- + 3 files changed, 6 insertions(+), 2 deletions(-) + +--- a/mscore/CMakeLists.txt ++++ b/mscore/CMakeLists.txt +@@ -38,6 +38,8 @@ + + set(BUILD_AWL_PLUGIN FALSE) + ++set(INSTALL_MANUAL_FILES FALSE) # not found in this checkout ++ + if (MINGW) + set(GCC_VISIBILITY FALSE) # we use gcc 3.6 + set(STATIC_SCRIPT_BINDINGS TRUE) +--- a/mscore/manual/CMakeLists.txt ++++ b/mscore/manual/CMakeLists.txt +@@ -18,6 +18,7 @@ + # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + #============================================================================= + ++if(INSTALL_MANUAL_FILES) + install(FILES + MuseScore-da.pdf + MuseScore-de.pdf +@@ -38,3 +39,4 @@ + MuseScore-zh_CN.pdf + DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}man + ) ++endif(INSTALL_MANUAL_FILES) +--- a/mscore/mscore/mscore.cpp ++++ b/mscore/mscore/mscore.cpp +@@ -841,8 +841,8 @@ + QMenu* menuHelp = mb->addMenu(tr("&Help")); + menuHelp->setObjectName("Help"); + +- menuHelp->addAction(getAction("local-help")); +- menuHelp->addAction(tr("Online Handbook"), this, SLOT(helpBrowser1())); ++ // menuHelp->addAction(getAction("local-help")); ++ menuHelp->addAction(tr("Online Handbook"), this, SLOT(helpBrowser1()), Qt::Key_F1); + menuHelp->addSeparator(); + menuHelp->addAction(tr("&About"), this, SLOT(about())); + menuHelp->addAction(tr("About&Qt"), this, SLOT(aboutQt())); diff -Nru musescore-1.1+dfsg/debian/patches/12-debianise-about-box.dpatch musescore-1.2+dfsg/debian/patches/12-debianise-about-box.dpatch --- musescore-1.1+dfsg/debian/patches/12-debianise-about-box.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/12-debianise-about-box.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 12-debianise-about-box.dpatch by Toby Smithe -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Add information about Debian/Ubuntu to the about box. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' musescore-1.0~/mscore/mscore/aboutbox.ui musescore-1.0/mscore/mscore/aboutbox.ui ---- musescore-1.0~/mscore/mscore/aboutbox.ui 2011-02-04 21:13:12.000000000 +0000 -+++ musescore-1.0/mscore/mscore/aboutbox.ui 2011-02-15 22:54:48.574317123 +0000 -@@ -7,7 +7,7 @@ - 0 - 0 - 500 -- 300 -+ 348 - - - -@@ -594,13 +594,17 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> - p, li { white-space: pre-wrap; } --</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> --<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Visit </span><a href="http://www.musescore.org/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">www.musescore.org</span></a><span style=" font-family:'Arial'; font-size:10pt;"> for new versions and more information.</span></p> --<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Support MuseScore with </span><a href="http://www.musescore.org/en/donate"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">your donation</span></a></p> -- -+</style></head><body style=" font-family:'Lucida Grande'; font-size:9pt; font-weight:400; font-style:normal;"> -+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Copyright </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">©</span><span style=" font-family:'Arial'; font-size:10pt;"> 1999-2011 Werner Schweer and Others. </span></p> -+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Published under the </span><a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"><span style=" font-family:'Arial'; font-size:10pt; text-decoration: underline; color:#0000ff;">GNU General Public License</span></a><span style=" font-family:'Arial'; font-size:10pt;">.</span></p> - <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:10pt;"></p> --<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Copyright </span><span style=" font-size:10pt;">©</span><span style=" font-family:'Arial'; font-size:10pt;"> 1999-2009 Werner Schweer and Others. </span></p> --<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Published under the GNU General Public License</span></p></body></html> -+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Visit </span><a href="http://www.musescore.org/"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; text-decoration: underline; color:#0000ff;">www.musescore.org</span></a><span style=" font-family:'Arial'; font-size:10pt;"> for more information.</span></p> -+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Support MuseScore with </span><a href="http://www.musescore.org/en/donate"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; text-decoration: underline; color:#0000ff;">your donation</span></a></p> -+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:10pt;"></p> -+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">This package has been customised for Debian and</span></p> -+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Ubuntu by </span><a href="mailto:tsmithe@ubuntu.com"><span style=" font-family:'Arial'; font-size:10pt; text-decoration: underline; color:#0000ff;">Toby Smithe</span></a><span style=" font-family:'Arial'; font-size:10pt;">, and may diverge somewhat</span></p> -+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">from a &quot;vanilla&quot; installation from source. To file a bug,</span></p> -+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">please see </span><a href="https://launchpad.net/ubuntu/+source/mscore/+filebug"><span style=" font-family:'Arial'; font-size:10pt; text-decoration: underline; color:#0000ff;">Launchpad</span></a><span style=" font-family:'Arial'; font-size:10pt;"> or the </span><a href="http://www.debian.org/Bugs/Reporting"><span style=" font-family:'Arial'; font-size:10pt; text-decoration: underline; color:#0000ff;">Debian documentation</span></a><span style=" font-family:'Arial'; font-size:10pt;">.</span></p></body></html> - - - false diff -Nru musescore-1.1+dfsg/debian/patches/12-debianise-about-box.patch musescore-1.2+dfsg/debian/patches/12-debianise-about-box.patch --- musescore-1.1+dfsg/debian/patches/12-debianise-about-box.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/12-debianise-about-box.patch 2012-03-21 22:33:25.000000000 +0000 @@ -0,0 +1,38 @@ +From: Toby Smithe +Subject: Add information about Debian/Ubuntu to the about box. + +--- a/mscore/mscore/aboutbox.ui ++++ b/mscore/mscore/aboutbox.ui +@@ -7,7 +7,7 @@ + 0 + 0 + 500 +- 300 ++ 348 + + + +@@ -594,13 +594,17 @@ + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + p, li { white-space: pre-wrap; } +-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Visit </span><a href="http://www.musescore.org/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">www.musescore.org</span></a><span style=" font-family:'Arial'; font-size:10pt;"> for new versions and more information.</span></p> +-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Support MuseScore with </span><a href="http://www.musescore.org/en/donate"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">your donation</span></a></p> +- ++</style></head><body style=" font-family:'Lucida Grande'; font-size:9pt; font-weight:400; font-style:normal;"> ++<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Copyright </span><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt;">©</span><span style=" font-family:'Arial'; font-size:10pt;"> 1999-2011 Werner Schweer and Others. </span></p> ++<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Published under the </span><a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"><span style=" font-family:'Arial'; font-size:10pt; text-decoration: underline; color:#0000ff;">GNU General Public License</span></a><span style=" font-family:'Arial'; font-size:10pt;">.</span></p> + <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:10pt;"></p> +-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Copyright </span><span style=" font-size:10pt;">©</span><span style=" font-family:'Arial'; font-size:10pt;"> 1999-2009 Werner Schweer and Others. </span></p> +-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Published under the GNU General Public License</span></p></body></html> ++<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Visit </span><a href="http://www.musescore.org/"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; text-decoration: underline; color:#0000ff;">www.musescore.org</span></a><span style=" font-family:'Arial'; font-size:10pt;"> for more information.</span></p> ++<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Support MuseScore with </span><a href="http://www.musescore.org/en/donate"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; text-decoration: underline; color:#0000ff;">your donation</span></a></p> ++<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:10pt;"></p> ++<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">This package has been customised for Debian and</span></p> ++<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Ubuntu by </span><a href="mailto:tsmithe@ubuntu.com"><span style=" font-family:'Arial'; font-size:10pt; text-decoration: underline; color:#0000ff;">Toby Smithe</span></a><span style=" font-family:'Arial'; font-size:10pt;">, and may diverge somewhat</span></p> ++<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">from a &quot;vanilla&quot; installation from source. To file a bug,</span></p> ++<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">please see </span><a href="https://launchpad.net/ubuntu/+source/musescore/+filebug"><span style=" font-family:'Arial'; font-size:10pt; text-decoration: underline; color:#0000ff;">Launchpad</span></a><span style=" font-family:'Arial'; font-size:10pt;"> or the </span><a href="http://www.debian.org/Bugs/Reporting"><span style=" font-family:'Arial'; font-size:10pt; text-decoration: underline; color:#0000ff;">Debian documentation</span></a><span style=" font-family:'Arial'; font-size:10pt;">.</span></p></body></html> + + + false diff -Nru musescore-1.1+dfsg/debian/patches/13-fix-arm-qreal-ftbfs.dpatch musescore-1.2+dfsg/debian/patches/13-fix-arm-qreal-ftbfs.dpatch --- musescore-1.1+dfsg/debian/patches/13-fix-arm-qreal-ftbfs.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/13-fix-arm-qreal-ftbfs.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 13-fix-arm-qreal-ftbfs.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: qreal is float on arm, not double - -@DPATCH@ -diff -urNad beta1~/mscore/mscore/barline.cpp beta1/mscore/mscore/barline.cpp ---- beta1~/mscore/mscore/barline.cpp 2010-02-13 17:08:36.000000000 +0000 -+++ beta1/mscore/mscore/barline.cpp 2010-02-13 17:45:26.651540910 +0000 -@@ -96,7 +96,7 @@ - { - double lw = point(score()->styleS(ST_barWidth)); - double y1, y2; -- getY(&y1, &y2); -+ getY((double*)&y1, (double*)&y2); - - QPen pen(p.pen()); - pen.setWidthF(lw); -@@ -313,7 +313,7 @@ - *grips = 1; - double lw = point(score()->styleS(ST_barWidth)); - double y1, y2; -- getY(&y1, &y2); -+ getY((double*)&y1, (double*)&y2); - grip[0].translate(QPointF(lw * .5, y2) + canvasPos()); - } - -@@ -360,7 +360,7 @@ - void BarLine::endEditDrag() - { - double y1, h2; -- getY(&y1, &h2); -+ getY((double*)&y1, (double*)&h2); - yoff = 0.0; - double ay1 = canvasPos().y(); - double ay2 = ay1 + h2; -@@ -402,7 +402,7 @@ - _span = staff() ? staff()->barLineSpan() : 1; - - double y1, y2; -- getY(&y1, &y2); -+ getY((double*)&y1, (double*)&y2); - Spatium w = score()->styleS(ST_barWidth); - double dw = 0.0; - ---- ./mscore/mscore/beam.cpp.orig2010-09-25 07:58:09.000000000 +0000 -+++ ./mscore/mscore/beam.cpp 2010-10-04 12:09:32.000000000 +0000 -@@ -786,7 +786,7 @@ - - double x2 = npos.x(); - double y1 = npos.y(); -- double y = _up ? qMin(qreal(p1dy), _p1[idx].y()) : qMax(p1dy, _p1[idx].y()); -+ double y = _up ? qMin(qreal(p1dy), _p1[idx].y()) : qMax(qreal(p1dy), _p1[idx].y()); - double y2 = y + (x2 - x1) * slope + cp.y(); - - double stemLen = _up ? (y1 - y2) : (y2 - y1); diff -Nru musescore-1.1+dfsg/debian/patches/13-fix-arm-qreal-ftbfs.patch musescore-1.2+dfsg/debian/patches/13-fix-arm-qreal-ftbfs.patch --- musescore-1.1+dfsg/debian/patches/13-fix-arm-qreal-ftbfs.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/13-fix-arm-qreal-ftbfs.patch 2012-03-21 18:42:07.000000000 +0000 @@ -0,0 +1,57 @@ +From: Toby Smithe +Subject: qreal is float on arm, not double + +--- + mscore/mscore/barline.cpp | 8 ++++---- + mscore/mscore/beam.cpp | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +--- a/mscore/mscore/barline.cpp ++++ b/mscore/mscore/barline.cpp +@@ -96,7 +96,7 @@ + { + double lw = point(score()->styleS(ST_barWidth)); + double y1, y2; +- getY(&y1, &y2); ++ getY((double*)&y1, (double*)&y2); + + QPen pen(p.pen()); + pen.setWidthF(lw); +@@ -346,7 +346,7 @@ + *grips = 1; + double lw = point(score()->styleS(ST_barWidth)); + double y1, y2; +- getY(&y1, &y2); ++ getY((double*)&y1, (double*)&y2); + grip[0].translate(QPointF(lw * .5, y2) + canvasPos()); + } + +@@ -393,7 +393,7 @@ + void BarLine::endEditDrag() + { + double y1, h2; +- getY(&y1, &h2); ++ getY((double*)&y1, (double*)&h2); + yoff = 0.0; + double ay1 = canvasPos().y(); + double ay2 = ay1 + h2; +@@ -449,7 +449,7 @@ + _span = staff() ? staff()->barLineSpan() : 1; + + double y1, y2; +- getY(&y1, &y2); ++ getY((double*)&y1, (double*)&y2); + Spatium w = score()->styleS(ST_barWidth); + double dw = 0.0; + +--- a/mscore/mscore/beam.cpp ++++ b/mscore/mscore/beam.cpp +@@ -786,7 +786,7 @@ + + double x2 = npos.x(); + double y1 = npos.y(); +- double y = _up ? qMin(qreal(p1dy), _p1[idx].y()) : qMax(p1dy, _p1[idx].y()); ++ double y = _up ? qMin(qreal(p1dy), _p1[idx].y()) : qMax(qreal(p1dy), _p1[idx].y()); + double y2 = y + (x2 - x1) * slope + cp.y(); + + double stemLen = _up ? (y1 - y2) : (y2 - y1); diff -Nru musescore-1.1+dfsg/debian/patches/14-enable-portaudio-by-default.dpatch musescore-1.2+dfsg/debian/patches/14-enable-portaudio-by-default.dpatch --- musescore-1.1+dfsg/debian/patches/14-enable-portaudio-by-default.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/14-enable-portaudio-by-default.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 14-enable-portaudio-by-default.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Try to ensure audio always works by defaulting to PortAudio enabled. - -@DPATCH@ -diff -urNad trunk~/mscore/mscore/preferences.cpp trunk/mscore/mscore/preferences.cpp ---- trunk~/mscore/mscore/preferences.cpp 2009-10-08 17:15:15.170997010 +0100 -+++ trunk/mscore/mscore/preferences.cpp 2009-10-08 17:19:34.013497946 +0100 -@@ -167,7 +167,7 @@ - #else - useAlsaAudio = true; - useJackAudio = false; -- usePortaudioAudio = false; -+ usePortaudioAudio = true; - useJackMidi = false; - #endif - alsaDevice = "default"; -@@ -382,7 +382,7 @@ - useAlsaAudio = s.value("useAlsaAudio", true).toBool(); - useJackAudio = s.value("useJackAudio", false).toBool(); - useJackMidi = s.value("useJackMidi", false).toBool(); -- usePortaudioAudio = s.value("usePortaudioAudio", false).toBool(); -+ usePortaudioAudio = s.value("usePortaudioAudio", true).toBool(); - #endif - - alsaDevice = s.value("alsaDevice", "default").toString(); diff -Nru musescore-1.1+dfsg/debian/patches/14-enable-portaudio-by-default.patch musescore-1.2+dfsg/debian/patches/14-enable-portaudio-by-default.patch --- musescore-1.1+dfsg/debian/patches/14-enable-portaudio-by-default.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/14-enable-portaudio-by-default.patch 2012-03-21 18:42:18.000000000 +0000 @@ -0,0 +1,27 @@ +From: Toby Smithe +Subject: Try to ensure audio always works by defaulting to PortAudio enabled. + +--- + mscore/mscore/preferences.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/mscore/mscore/preferences.cpp ++++ b/mscore/mscore/preferences.cpp +@@ -148,7 +148,7 @@ + #else + useAlsaAudio = true; + useJackAudio = false; +- usePortaudioAudio = false; ++ usePortaudioAudio = true; + useJackMidi = false; + #endif + alsaDevice = "default"; +@@ -381,7 +381,7 @@ + useAlsaAudio = s.value("useAlsaAudio", true).toBool(); + useJackAudio = s.value("useJackAudio", false).toBool(); + useJackMidi = s.value("useJackMidi", false).toBool(); +- usePortaudioAudio = s.value("usePortaudioAudio", false).toBool(); ++ usePortaudioAudio = s.value("usePortaudioAudio", true).toBool(); + #endif + + alsaDevice = s.value("alsaDevice", "default").toString(); diff -Nru musescore-1.1+dfsg/debian/patches/17-ProcessHTML-remove-ja.dpatch musescore-1.2+dfsg/debian/patches/17-ProcessHTML-remove-ja.dpatch --- musescore-1.1+dfsg/debian/patches/17-ProcessHTML-remove-ja.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/17-ProcessHTML-remove-ja.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 17-ProcessHTML-remove-ja.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Remove 'ja' while it is unavailable. - -@DPATCH@ -diff -urNad trunk~/mscore/manual/ProcessHTML.py trunk/mscore/manual/ProcessHTML.py ---- trunk~/mscore/manual/ProcessHTML.py 2010-04-08 12:05:12.000000000 +0100 -+++ trunk/mscore/manual/ProcessHTML.py 2010-04-08 12:08:18.681034511 +0100 -@@ -602,7 +602,7 @@ - - - def main(): -- language_choices = ['all','en','ca','de','el','es','fi','fr','gl','hu','it','ja','nb','nl','pl','pt-BR','ro','ru'] -+ language_choices = ['all','en','ca','de','el','es','fi','fr','gl','hu','it','nb','nl','pl','pt-BR','ro','ru'] # remove ja temporarily; not in this checkout - - parser = OptionParser() - parser.add_option("-l","--lang", dest="language_code", diff -Nru musescore-1.1+dfsg/debian/patches/17-ProcessHTML-remove-ja.patch musescore-1.2+dfsg/debian/patches/17-ProcessHTML-remove-ja.patch --- musescore-1.1+dfsg/debian/patches/17-ProcessHTML-remove-ja.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/17-ProcessHTML-remove-ja.patch 2012-03-21 18:42:23.000000000 +0000 @@ -0,0 +1,15 @@ +From: Toby Smithe +Subject: Remove 'ja' while it is unavailable. + +diff -urNad trunk~/mscore/manual/ProcessHTML.py trunk/mscore/manual/ProcessHTML.py +--- trunk~/mscore/manual/ProcessHTML.py 2010-04-08 12:05:12.000000000 +0100 ++++ trunk/mscore/manual/ProcessHTML.py 2010-04-08 12:08:18.681034511 +0100 +@@ -602,7 +602,7 @@ + + + def main(): +- language_choices = ['all','en','ca','de','el','es','fi','fr','gl','hu','it','ja','nb','nl','pl','pt-BR','ro','ru'] ++ language_choices = ['all','en','ca','de','el','es','fi','fr','gl','hu','it','nb','nl','pl','pt-BR','ro','ru'] # remove ja temporarily; not in this checkout + + parser = OptionParser() + parser.add_option("-l","--lang", dest="language_code", diff -Nru musescore-1.1+dfsg/debian/patches/18-correct-sf2-path.dpatch musescore-1.2+dfsg/debian/patches/18-correct-sf2-path.dpatch --- musescore-1.1+dfsg/debian/patches/18-correct-sf2-path.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/18-correct-sf2-path.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 18-correct-sf2-path.dpatch by Toby Smithe -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Point musescore at the correct SoundFont path on Debian/Ubuntu. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' musescore-1.1~/mscore/mscore/mscore.cpp musescore-1.1/mscore/mscore/mscore.cpp ---- musescore-1.1~/mscore/mscore/mscore.cpp 2011-08-12 15:38:55.551175811 +0100 -+++ musescore-1.1/mscore/mscore/mscore.cpp 2011-08-12 15:41:38.461414743 +0100 -@@ -1883,7 +1883,7 @@ - if (!useFactorySettings) - preferences.read(); - else { -- preferences.soundFont = mscoreGlobalShare+"sound/TimGM6mb.sf2"; -+ preferences.soundFont = "/usr/share/sounds/sf2/TimGM6mb.sf2"; - } - - QSplashScreen* sc = 0; -@@ -3288,4 +3288,4 @@ - showWebPanel(false); - preferences.showWebPanel = false; - preferences.dirty = true; -- } -\ No newline at end of file -+ } -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' musescore-1.1~/mscore/mscore/preferences.cpp musescore-1.1/mscore/mscore/preferences.cpp ---- musescore-1.1~/mscore/mscore/preferences.cpp 2011-08-12 15:38:55.571175831 +0100 -+++ musescore-1.1/mscore/mscore/preferences.cpp 2011-08-12 15:42:38.141502282 +0100 -@@ -361,7 +361,7 @@ - playNotes = s.value("playNotes", true).toBool(); - lPort = s.value("lPort").toString(); - rPort = s.value("rPort").toString(); -- defaultSoundfont = mscoreGlobalShare+"sound/TimGM6mb.sf2"; -+ defaultSoundfont = "/usr/share/sounds/sf2/TimGM6mb.sf2"; - soundFont = s.value("soundFont", defaultSoundfont).toString(); - if (soundFont == ":/data/piano1.sf2") { - // silently change to new default sound font diff -Nru musescore-1.1+dfsg/debian/patches/18-correct-sf2-path.patch musescore-1.2+dfsg/debian/patches/18-correct-sf2-path.patch --- musescore-1.1+dfsg/debian/patches/18-correct-sf2-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/18-correct-sf2-path.patch 2012-03-21 18:50:19.000000000 +0000 @@ -0,0 +1,25 @@ +From: Toby Smithe +Subject: Point musescore at the correct SoundFont path on Debian/Ubuntu. + +--- a/mscore/mscore/mscore.cpp ++++ b/mscore/mscore/mscore.cpp +@@ -1890,7 +1890,7 @@ + if (!useFactorySettings) + preferences.read(); + else { +- preferences.soundFont = mscoreGlobalShare+"sound/TimGM6mb.sf2"; ++ preferences.soundFont = "/usr/share/sounds/sf2/TimGM6mb.sf2"; + } + preferences.useOsc = useOsc; + +--- a/mscore/mscore/preferences.cpp ++++ b/mscore/mscore/preferences.cpp +@@ -366,7 +366,7 @@ + playNotes = s.value("playNotes", true).toBool(); + lPort = s.value("lPort").toString(); + rPort = s.value("rPort").toString(); +- defaultSoundfont = mscoreGlobalShare+"sound/TimGM6mb.sf2"; ++ defaultSoundfont = "/usr/share/sounds/sf2/TimGM6mb.sf2"; + soundFont = s.value("soundFont", defaultSoundfont).toString(); + if (soundFont == ":/data/piano1.sf2") { + // silently change to new default sound font diff -Nru musescore-1.1+dfsg/debian/patches/19-fix-window-icon.dpatch musescore-1.2+dfsg/debian/patches/19-fix-window-icon.dpatch --- musescore-1.1+dfsg/debian/patches/19-fix-window-icon.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/19-fix-window-icon.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 19-fix-window-icon.dpatch by Toby Smithe -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix the path to the window icon. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' musescore-1.1~/mscore/mscore/icons.cpp musescore-1.1/mscore/mscore/icons.cpp ---- musescore-1.1~/mscore/mscore/icons.cpp 2011-07-27 14:32:43.000000000 +0100 -+++ musescore-1.1/mscore/mscore/icons.cpp 2011-08-12 15:45:06.071719251 +0100 -@@ -156,7 +156,7 @@ - icons[grace32_ICON] = new QIcon(":/data/grace32.svg"); - icons[keys_ICON] = new QIcon(":/data/keyboard.svg"); - icons[tie_ICON] = new QIcon(":/data/tie.svg"); -- icons[window_ICON] = new QIcon(":/data/mscore.xpm"); -+ icons[window_ICON] = new QIcon(":/data/mscore.png"); - icons[community_ICON] = new QIcon(":/data/community.svg"); - } - diff -Nru musescore-1.1+dfsg/debian/patches/19-fix-window-icon.patch musescore-1.2+dfsg/debian/patches/19-fix-window-icon.patch --- musescore-1.1+dfsg/debian/patches/19-fix-window-icon.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/19-fix-window-icon.patch 2012-03-21 17:18:43.000000000 +0000 @@ -0,0 +1,15 @@ +From: Toby Smithe +Subject: Fix the path to the window icon. + +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' musescore-1.1~/mscore/mscore/icons.cpp musescore-1.1/mscore/mscore/icons.cpp +--- musescore-1.1~/mscore/mscore/icons.cpp 2011-07-27 14:32:43.000000000 +0100 ++++ musescore-1.1/mscore/mscore/icons.cpp 2011-08-12 15:45:06.071719251 +0100 +@@ -156,7 +156,7 @@ + icons[grace32_ICON] = new QIcon(":/data/grace32.svg"); + icons[keys_ICON] = new QIcon(":/data/keyboard.svg"); + icons[tie_ICON] = new QIcon(":/data/tie.svg"); +- icons[window_ICON] = new QIcon(":/data/mscore.xpm"); ++ icons[window_ICON] = new QIcon(":/data/mscore.png"); + icons[community_ICON] = new QIcon(":/data/community.svg"); + } + diff -Nru musescore-1.1+dfsg/debian/patches/20-fix-dso-linking.dpatch musescore-1.2+dfsg/debian/patches/20-fix-dso-linking.dpatch --- musescore-1.1+dfsg/debian/patches/20-fix-dso-linking.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/20-fix-dso-linking.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20-fix-dso-linking.dpatch by Toby Smithe -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: The linker in wheezy/natty does not use indirect shared libraries -## DP: for symbol resolution. This patch makes explicit any implicit deps. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' musescore-1.0~/mscore/mscore/CMakeLists.txt musescore-1.0/mscore/mscore/CMakeLists.txt ---- musescore-1.0~/mscore/mscore/CMakeLists.txt 2011-02-04 21:13:12.000000000 +0000 -+++ musescore-1.0/mscore/mscore/CMakeLists.txt 2011-02-14 22:58:43.561222385 +0000 -@@ -187,6 +187,9 @@ - ${AUDIO} - ) - -+# gold does not use indirect shared libraries for symbol resolution -+target_link_libraries(mscore dl rt) -+ - if (STATIC_SCRIPT_BINDINGS) - target_link_libraries(mscore - qtscript_core diff -Nru musescore-1.1+dfsg/debian/patches/20-fix-dso-linking.patch musescore-1.2+dfsg/debian/patches/20-fix-dso-linking.patch --- musescore-1.1+dfsg/debian/patches/20-fix-dso-linking.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/20-fix-dso-linking.patch 2012-03-21 18:35:54.000000000 +0000 @@ -0,0 +1,17 @@ +From: Toby Smithe +Subject: Make explicit any implicit deps. + The linker in wheezy/natty does not use indirect shared libraries + for symbol resolution. + +--- a/mscore/mscore/CMakeLists.txt ++++ b/mscore/mscore/CMakeLists.txt +@@ -166,6 +166,9 @@ + target_link_libraries(mscore rt) + endif (NOT MINGW AND NOT APPLE) + ++# gold does not use indirect shared libraries for symbol resolution ++target_link_libraries(mscore dl rt) ++ + if (STATIC_SCRIPT_BINDINGS) + target_link_libraries(mscore + qtscript_core diff -Nru musescore-1.1+dfsg/debian/patches/21-fix-startup-notification.dpatch musescore-1.2+dfsg/debian/patches/21-fix-startup-notification.dpatch --- musescore-1.1+dfsg/debian/patches/21-fix-startup-notification.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/21-fix-startup-notification.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 21-fix-startup-notification.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix startup notification bug owing to use of wrapper script. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' musescore-1.1~/mscore/packaging/mscore.desktop musescore-1.1/mscore/packaging/mscore.desktop ---- musescore-1.1~/mscore/packaging/mscore.desktop 2011-07-27 14:32:24.000000000 +0100 -+++ musescore-1.1/mscore/packaging/mscore.desktop 2011-08-12 15:47:00.431886973 +0100 -@@ -8,6 +8,7 @@ - Icon=mscore - Name=MuseScore - StartupNotify=true -+StartupWMClass=mscore.real - Terminal=false - Type=Application - Categories=Qt;Audio;Sequencer;Midi;AudioVideoEditing;Music;AudioVideo; diff -Nru musescore-1.1+dfsg/debian/patches/21-fix-startup-notification.patch musescore-1.2+dfsg/debian/patches/21-fix-startup-notification.patch --- musescore-1.1+dfsg/debian/patches/21-fix-startup-notification.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/21-fix-startup-notification.patch 2012-03-21 18:42:38.000000000 +0000 @@ -0,0 +1,13 @@ +From: Toby Smithe +Subject: Fix startup notification bug owing to use of wrapper script. + +--- a/mscore/packaging/mscore.desktop ++++ b/mscore/packaging/mscore.desktop +@@ -8,6 +8,7 @@ + Icon=mscore + Name=MuseScore + StartupNotify=true ++StartupWMClass=mscore.real + Terminal=false + Type=Application + Categories=Qt;Audio;Sequencer;Midi;AudioVideoEditing;Music;AudioVideo; diff -Nru musescore-1.1+dfsg/debian/patches/22-fix-casting.dpatch musescore-1.2+dfsg/debian/patches/22-fix-casting.dpatch --- musescore-1.1+dfsg/debian/patches/22-fix-casting.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/22-fix-casting.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 22-fix-casting.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix a casting error - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' musescore-1.1~/mscore/mscore/exportxml.cpp musescore-1.1/mscore/mscore/exportxml.cpp ---- musescore-1.1~/mscore/mscore/exportxml.cpp 2011-07-27 14:32:43.000000000 +0100 -+++ musescore-1.1/mscore/mscore/exportxml.cpp 2011-08-12 17:00:27.808351229 +0100 -@@ -2363,7 +2363,7 @@ - el->userOff().y()); - */ - if (el->type() == HAIRPIN || el->type() == OTTAVA || el->type() == TEXTLINE) { -- SLine* sl = static_cast(el); -+ SLine* sl = static_cast(el); - // printf("slin segsz=%d", sl->lineSegments().size()); - if (sl->lineSegments().size() > 0) { - LineSegment* seg = sl->lineSegments().at(0); - diff -Nru musescore-1.1+dfsg/debian/patches/22-fix-casting.patch musescore-1.2+dfsg/debian/patches/22-fix-casting.patch --- musescore-1.1+dfsg/debian/patches/22-fix-casting.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/22-fix-casting.patch 2012-03-21 18:42:46.000000000 +0000 @@ -0,0 +1,16 @@ +From: Toby Smithe +Subject: Fix a casting error + +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' musescore-1.1~/mscore/mscore/exportxml.cpp musescore-1.1/mscore/mscore/exportxml.cpp +--- musescore-1.1~/mscore/mscore/exportxml.cpp 2011-07-27 14:32:43.000000000 +0100 ++++ musescore-1.1/mscore/mscore/exportxml.cpp 2011-08-12 17:00:27.808351229 +0100 +@@ -2363,7 +2363,7 @@ + el->userOff().y()); + */ + if (el->type() == HAIRPIN || el->type() == OTTAVA || el->type() == TEXTLINE) { +- SLine* sl = static_cast(el); ++ SLine* sl = static_cast(el); + // printf("slin segsz=%d", sl->lineSegments().size()); + if (sl->lineSegments().size() > 0) { + LineSegment* seg = sl->lineSegments().at(0); + diff -Nru musescore-1.1+dfsg/debian/patches/23-fix-bindings.dpatch musescore-1.2+dfsg/debian/patches/23-fix-bindings.dpatch --- musescore-1.1+dfsg/debian/patches/23-fix-bindings.dpatch 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/23-fix-bindings.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 23-fix-bindings.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Switch the Mixer to be bound to F8 rather than F10, as that conflicts -## DP: with the main menu binding in GNOME/Unity. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' musescore-1.1~/mscore/mscore/actions.cpp musescore-1.1/mscore/mscore/actions.cpp ---- musescore-1.1~/mscore/mscore/actions.cpp 2011-07-27 14:32:43.000000000 +0100 -+++ musescore-1.1/mscore/mscore/actions.cpp 2011-08-12 18:31:27.426358807 +0100 -@@ -1428,7 +1428,7 @@ - //Cmd + M is for minimize to dock on mac - Qt::Key_M, - #else -- Qt::Key_F10, -+ Qt::Key_F8, - #endif - Qt::ApplicationShortcut, - QT_TRANSLATE_NOOP("action","Mixer"), diff -Nru musescore-1.1+dfsg/debian/patches/23-fix-bindings.patch musescore-1.2+dfsg/debian/patches/23-fix-bindings.patch --- musescore-1.1+dfsg/debian/patches/23-fix-bindings.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/23-fix-bindings.patch 2012-03-21 18:42:53.000000000 +0000 @@ -0,0 +1,15 @@ +From: Toby Smithe +Subject: Switch the Mixer to F8. + The default F10 conclits with main menu binding in GNOME/Unity + +--- a/mscore/mscore/actions.cpp ++++ b/mscore/mscore/actions.cpp +@@ -1428,7 +1428,7 @@ + //Cmd + M is for minimize to dock on mac + Qt::Key_M, + #else +- Qt::Key_F10, ++ Qt::Key_F8, + #endif + Qt::ApplicationShortcut, + QT_TRANSLATE_NOOP("action","Mixer"), diff -Nru musescore-1.1+dfsg/debian/patches/24-build-multiarch.patch musescore-1.2+dfsg/debian/patches/24-build-multiarch.patch --- musescore-1.1+dfsg/debian/patches/24-build-multiarch.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/24-build-multiarch.patch 2012-03-21 21:21:58.000000000 +0000 @@ -0,0 +1,15 @@ +From: Toby Smithe +Subject: Allow for building on non-32-bit architectures + Fix architecture-specific build rules + +--- a/mscore/CMakeLists.txt ++++ b/mscore/CMakeLists.txt +@@ -291,7 +291,7 @@ + add_custom_command( + OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch + COMMAND ${CMAKE_CXX_COMPILER} +- -x c++-header -g ${FLAGS} -m32 ++ -x c++-header -g ${FLAGS} + -I${QT_HEADERS_DIR} + -o all.h.gch all.h + DEPENDS ${PROJECT_BINARY_DIR}/all.h diff -Nru musescore-1.1+dfsg/debian/patches/25-desktop-file-genericnames.patch musescore-1.2+dfsg/debian/patches/25-desktop-file-genericnames.patch --- musescore-1.1+dfsg/debian/patches/25-desktop-file-genericnames.patch 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/25-desktop-file-genericnames.patch 2012-03-21 22:52:08.000000000 +0000 @@ -0,0 +1,13 @@ +--- a/mscore/packaging/mscore.desktop ++++ b/mscore/packaging/mscore.desktop +@@ -3,8 +3,8 @@ + Comment=WYSIWYG Music score typesetter + Comment[ru]=Визуальный редактор нотных партитур + Exec=mscore +-GenericName=mscore +-GenericName[ru]=MuseScore ++GenericName=Music notation ++GenericName[de]=Notensatz + Icon=mscore + Name=MuseScore + StartupNotify=true diff -Nru musescore-1.1+dfsg/debian/patches/series musescore-1.2+dfsg/debian/patches/series --- musescore-1.1+dfsg/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/debian/patches/series 2012-03-21 22:51:13.000000000 +0000 @@ -0,0 +1,22 @@ +# dropped 01-use-global-fluidsynth with 0.9.5b1869+dfsg-1 +# dropped 02-freedom with 0.9.6b2490 +# dropped 03-build-desktop-file with version 0.9.2+dfsg-1 +# dropped 04-use-fluid-soundfont with 0.9.6b2439 +05-use-mscore-common-files.patch +# dropped 06-build-documentation with version 0.9.2+dfsg-1 +# dropped 07-fix-xml-in-msc with version 0.9.3n~svn1071+dfsg-1 +08-disable-multiple-jobs.patch +09-disable-building-qtscript.patch +10-disable-awl.patch +# dropped 11-install-manual with 0.9.5b1925+dfsg (REVERTED BELOW) +11-install-manual.patch +12-debianise-about-box.patch +# dropped 15-add-mime-to-desktop-file with 0.9.5b1825+dfsg +# dropped 16-ProcessHTML with 0.9.6b2421 +# 17-ProcessHTML-remove-ja.patch +18-correct-sf2-path.patch +20-fix-dso-linking.patch +21-fix-startup-notification.patch +23-fix-bindings.patch +24-build-multiarch.patch +25-desktop-file-genericnames.patch diff -Nru musescore-1.1+dfsg/debian/README.source musescore-1.2+dfsg/debian/README.source --- musescore-1.1+dfsg/debian/README.source 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -Please see /usr/share/doc/dpatch/README.source.gz for information on the patch -handling system in use here. All modifications to upstream source are held -in patches in debian/patches, and dpatch is used to manage these. Exceptions -to this include where binary files have been removed, whether or not they are -to be re-created during package build, as with the PDF manuals compared to the -non-free soundfont. - - -- Toby Smithe Thu, 8 Oct 2009 17:29:17 +0100 diff -Nru musescore-1.1+dfsg/debian/rules musescore-1.2+dfsg/debian/rules --- musescore-1.1+dfsg/debian/rules 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/rules 2012-03-21 23:52:34.000000000 +0000 @@ -1,18 +1,8 @@ #!/usr/bin/make -f # -*- makefile -*- -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - -patch: patch-stamp - -patch-stamp: - dpatch apply-all - dpatch cat-all >patch-stamp - configure: configure-stamp -configure-stamp: patch +configure-stamp: dh_testdir touch configure-stamp @@ -25,10 +15,10 @@ #cd mscore/manual && \ #python ProcessHTML.py -o $(MAKE) PREFIX="/usr" release + cp mscore/packaging/mscore.1 mscore/packaging/musescore.1 touch $@ -clean: clean-patched unpatch -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp @@ -41,7 +31,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/musescore install @@ -59,7 +49,7 @@ cd $(CURDIR)/debian/musescore-common/usr/share && ln -s mscore-* mscore rm -r $(CURDIR)/debian/musescore-common/usr/share/mscore/sound mv $(CURDIR)/debian/musescore/usr/bin/mscore \ - $(CURDIR)/debian/musescore/usr/bin/mscore.real + $(CURDIR)/debian/musescore/usr/bin/mscore.real chrpath -d $(CURDIR)/debian/musescore/usr/bin/mscore.real install -T -m0755 $(CURDIR)/debian/mscore.sh \ $(CURDIR)/debian/musescore/usr/bin/mscore @@ -107,17 +97,17 @@ # rm -r musescore-$(version) #### ----------------- Note on usage of below rules ------------------ #### -## The update-to-svn and build-svn rules are written from an Ubuntu ## +## The update-to-svn and build-svn rules are written from an Ubuntu ## ## perspective, designed to be able to automate the building of packages ## -## from svn for either Debian or Ubuntu systems, on Ubuntu systems. ## -## Apart from the standard coreutils and dephelper, the rules may ## -## require the following packages: svn, lsb-release, ubuntu-dev-tools ## -## and python-pisa. By default, packages for Debian unstable are ## -## produced. If Ubuntu packages are required, set the environment ## -## variable "BUILD_UBUNTU". This will build for the currently running ## -## release by default; if you wish to build for any other, set the ## -## environment variable "UBUNTU_RELEASE" to the codename of that ## -## release. ## +## from svn for either Debian or Ubuntu systems, on Ubuntu systems. ## +## Apart from the standard coreutils and dephelper, the rules may ## +## require the following packages: svn, lsb-release, ubuntu-dev-tools ## +## and python-pisa. By default, packages for Debian unstable are ## +## produced. If Ubuntu packages are required, set the environment ## +## variable "BUILD_UBUNTU". This will build for the currently running ## +## release by default; if you wish to build for any other, set the ## +## environment variable "UBUNTU_RELEASE" to the codename of that ## +## release. ## #### ----------------------------------------------------------------- #### update-to-svn: version = $(shell svn up > /dev/null; make version) @@ -145,7 +135,7 @@ echo "musescore ($(version)+dfsg-1) unstable; urgency=low" > debian/changelog.new; \ fi echo >> debian/changelog.new - echo " * New svn revision" >> debian/changelog.new + echo " * New svn revision" >> debian/changelog.new echo >> debian/changelog.new echo " -- Toby Smithe $(pkgdate)" >> debian/changelog.new echo >> debian/changelog.new diff -Nru musescore-1.1+dfsg/debian/source/format musescore-1.2+dfsg/debian/source/format --- musescore-1.1+dfsg/debian/source/format 2012-03-22 14:02:11.000000000 +0000 +++ musescore-1.2+dfsg/debian/source/format 2012-03-22 14:02:17.000000000 +0000 @@ -1 +1 @@ -1.0 +3.0 (quilt) diff -Nru musescore-1.1+dfsg/Makefile musescore-1.2+dfsg/Makefile --- musescore-1.1+dfsg/Makefile 2011-07-27 13:33:18.000000000 +0000 +++ musescore-1.2+dfsg/Makefile 2012-03-13 13:37:09.000000000 +0000 @@ -22,8 +22,8 @@ CPUS = `grep -c processor /proc/cpuinfo` PREFIX = "/usr/local" -#VERSION = "1.0r${REVISION}" -VERSION = 1.1 +#VERSION = "1.2r${REVISION}" +VERSION = 1.2 ROOT=`pwd` diff -Nru musescore-1.1+dfsg/Makefile.mingw musescore-1.2+dfsg/Makefile.mingw --- musescore-1.1+dfsg/Makefile.mingw 2011-07-27 13:33:18.000000000 +0000 +++ musescore-1.2+dfsg/Makefile.mingw 2012-03-13 13:37:09.000000000 +0000 @@ -20,21 +20,21 @@ REVISION = $(shell type mscore\mscore\revision.h) -VERSION = 1.1r${REVISION} +VERSION = 1.2r${REVISION} MINGW_DIR = C:\QtSDK\mingw -win32: +release: if not exist win32build\nul mkdir win32build if not exist win32install\nul mkdir win32install - cd win32build & cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=../mscore/cmake/mingw32.mingw.cmake -DCMAKE_INSTALL_PREFIX=../win32install -DCMAKE_BUILD_TYPE=Release -DCMAKE_MAKE_PROGRAM=${MINGW_DIR}\bin\mingw32-make.exe ../mscore - cd win32build & $(MAKE) lrelease + cd win32build & cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=../mscore/cmake/mingw32.mingw.cmake -DCMAKE_INSTALL_PREFIX=../win32install -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_MAKE_PROGRAM=${MINGW_DIR}\bin\mingw32-make.exe ../mscore + cd win32build & $(MAKE) lrelease cd win32build & $(MAKE) debug: if not exist win32build\nul mkdir win32build if not exist win32install\nul mkdir win32install - cd win32build & cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=../mscore/cmake/mingw32.mingw.cmake -DCMAKE_INSTALL_PREFIX=../win32install -DCMAKE_BUILD_TYPE=Debug -DCMAKE_MAKE_PROGRAM=${MINGW_DIR}\bin\mingw32-make.exe ../mscore - cd win32build & $(MAKE) lrelease + cd win32build & cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=../mscore/cmake/mingw32.mingw.cmake -DCMAKE_INSTALL_PREFIX=../win32install -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_MAKE_PROGRAM=${MINGW_DIR}\bin\mingw32-make.exe ../mscore + cd win32build & $(MAKE) lrelease cd win32build & $(MAKE) install: diff -Nru musescore-1.1+dfsg/Makefile.osx musescore-1.2+dfsg/Makefile.osx --- musescore-1.1+dfsg/Makefile.osx 2011-07-27 13:33:18.000000000 +0000 +++ musescore-1.2+dfsg/Makefile.osx 2012-03-13 13:37:09.000000000 +0000 @@ -21,8 +21,8 @@ REVISION = `cat mscore/mscore/revision.h` CPUS = `grep -c processor /proc/cpuinfo` -#VERSION = "1.0r${REVISION}" -VERSION = 1.1 +VERSION = "1.2r${REVISION}" +#VERSION = 1.1 PREFIX=../applebuild @@ -35,10 +35,10 @@ cd build; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ ../mscore -G Xcode; \ - xcodebuild -project mscore.xcodeproj -target lrelease; \ - xcodebuild -project mscore.xcodeproj -configuration Release -target ALL_BUILD; \ - else \ - echo "build directory does already exist, please remove first with 'make clean'"; \ + xcodebuild -project mscore.xcodeproj -target lrelease; \ + xcodebuild -project mscore.xcodeproj -configuration Release -target ALL_BUILD; \ + else \ + echo "build directory does already exist, please remove first with 'make clean'"; \ fi; debug: @@ -48,9 +48,9 @@ cd build; \ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ ../mscore -G Xcode; \ - xcodebuild -project mscore.xcodeproj -target lrelease; \ - xcodebuild -project mscore.xcodeproj -configuration Debug -target ALL_BUILD; \ - else \ + xcodebuild -project mscore.xcodeproj -target lrelease; \ + xcodebuild -project mscore.xcodeproj -configuration Debug -target ALL_BUILD; \ + else \ echo "build directory does already exist, please remove first with 'make clean'"; \ fi; Binary files /tmp/E7n9nStfV_/musescore-1.1+dfsg/.Makefile.swp and /tmp/TV1rGBYhHO/musescore-1.2+dfsg/.Makefile.swp differ diff -Nru musescore-1.1+dfsg/mscore/al/CMakeLists.txt musescore-1.2+dfsg/mscore/al/CMakeLists.txt --- musescore-1.1+dfsg/mscore/al/CMakeLists.txt 2011-07-27 13:32:44.000000000 +0000 +++ musescore-1.2+dfsg/mscore/al/CMakeLists.txt 2012-03-13 13:32:28.000000000 +0000 @@ -18,29 +18,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #============================================================================= -add_custom_command( - OUTPUT ${PROJECT_BINARY_DIR}/all.h - COMMAND ${CMAKE_COMMAND} - ARGS -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h - DEPENDS ${PROJECT_SOURCE_DIR}/all.h - WORKING_DIRECTORY ${PROJECT_BINARY_DIR} - ) - -add_custom_command( - OUTPUT ${PROJECT_BINARY_DIR}/all.h.pch - COMMAND ${CMAKE_CXX_COMPILER} - -g -Wextra -Wall - -I"${QT_INCLUDE_DIR}" - -o all.h.pch all.h - DEPENDS ${PROJECT_BINARY_DIR}/all.h - WORKING_DIRECTORY ${PROJECT_BINARY_DIR} - ) - -set_source_files_properties( - ${PROJECT_BINARY_DIR}/all.h - ${PROJECT_BINARY_DIR}/all.h.pch - PROPERTIES generated true - ) +include (${PROJECT_SOURCE_DIR}/cmake/gch.cmake) set (al_src al.cpp @@ -57,13 +35,14 @@ endif (USE_SSE) add_library(al STATIC + ${PROJECT_BINARY_DIR}/all.h + ${PCH} ${al_src} - ${PROJECT_BINARY_DIR}/all.h.pch ) set_source_files_properties( dsp.cpp xml.cpp tempo.cpp sig.cpp pos.cpp fraction.cpp - PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h" + PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch" ) set_source_files_properties(dspSSE.cpp @@ -74,3 +53,6 @@ PROPERTIES COMPILE_FLAGS "-msse" ) +ADD_DEPENDENCIES(al mops1) +ADD_DEPENDENCIES(al mops2) + diff -Nru musescore-1.1+dfsg/mscore/all.h musescore-1.2+dfsg/mscore/all.h --- musescore-1.1+dfsg/mscore/all.h 2011-07-27 13:33:18.000000000 +0000 +++ musescore-1.2+dfsg/mscore/all.h 2012-03-13 13:37:09.000000000 +0000 @@ -119,10 +119,19 @@ #include #include #include +#include + +#if QT_VERSION >= 0x040800 +#include +#include +#endif #include #include +#include +#include + #include #include #include diff -Nru musescore-1.1+dfsg/mscore/awl/CMakeLists.txt musescore-1.2+dfsg/mscore/awl/CMakeLists.txt --- musescore-1.1+dfsg/mscore/awl/CMakeLists.txt 2011-07-27 13:32:23.000000000 +0000 +++ musescore-1.2+dfsg/mscore/awl/CMakeLists.txt 2012-03-13 13:31:52.000000000 +0000 @@ -18,6 +18,8 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #============================================================================= +include (${PROJECT_SOURCE_DIR}/cmake/gch.cmake) + QT4_WRAP_CPP (mocs aslider.h knob.h @@ -35,34 +37,10 @@ denomspinbox.h ) -add_custom_command( - OUTPUT ${PROJECT_BINARY_DIR}/all.h - COMMAND ${CMAKE_COMMAND} - ARGS -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h - DEPENDS ${PROJECT_SOURCE_DIR}/all.h - WORKING_DIRECTORY ${PROJECT_BINARY_DIR} - ) - -add_custom_command( - OUTPUT ${PROJECT_BINARY_DIR}/all.h.pch - COMMAND ${CMAKE_CXX_COMPILER} - -g -Wextra -Wall - -I"${QT_INCLUDE_DIR}" - -o all.h.pch all.h - DEPENDS ${PROJECT_BINARY_DIR}/all.h - WORKING_DIRECTORY ${PROJECT_BINARY_DIR} - ) - -set_source_files_properties( - ${PROJECT_BINARY_DIR}/all.h - ${PROJECT_BINARY_DIR}/all.h.pch - PROPERTIES generated true - ) - add_library ( awl STATIC ${PROJECT_BINARY_DIR}/all.h - ${PROJECT_BINARY_DIR}/all.h.pch + ${PCH} ${mocs} aslider.cpp knob.cpp @@ -83,9 +61,12 @@ set_target_properties( awl PROPERTIES COMPILE_FLAGS - "-include ${PROJECT_BINARY_DIR}/all.h" + "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch" ) +ADD_DEPENDENCIES(awl mops1) +ADD_DEPENDENCIES(awl mops2) + if (NOT MINGW AND NOT APPLE) QT4_WRAP_CPP (mocs2 aslider.h @@ -106,7 +87,7 @@ add_library ( awlplugin SHARED ${PROJECT_BINARY_DIR}/all.h - ${PROJECT_BINARY_DIR}/all.h.pch + ${PCH} ${mocs2} awlplugin.cpp aslider.cpp diff -Nru musescore-1.1+dfsg/mscore/bww2mxml/lexer.cpp musescore-1.2+dfsg/mscore/bww2mxml/lexer.cpp --- musescore-1.1+dfsg/mscore/bww2mxml/lexer.cpp 2011-07-27 13:32:22.000000000 +0000 +++ musescore-1.2+dfsg/mscore/bww2mxml/lexer.cpp 2012-03-13 13:31:50.000000000 +0000 @@ -2,7 +2,7 @@ // BWW to MusicXML converter // Part of MusE Score // Linux Music Score Editor -// $Id: lexer.cpp 3793 2010-12-22 21:54:17Z lvinken $ +// $Id: lexer.cpp 4868 2011-10-17 19:55:18Z lvinken $ // // Copyright (C) 2010 Werner Schweer and others // @@ -45,6 +45,293 @@ { qDebug() << "Lexer::Lexer() begin"; + // Initialize the grace note translation table + + // Single Grace notes + graceMap["ag"] = "LA"; + graceMap["bg"] = "B"; + graceMap["cg"] = "C"; + graceMap["dg"] = "D"; + graceMap["eg"] = "E"; + graceMap["fg"] = "F"; + graceMap["gg"] = "HG"; + graceMap["tg"] = "HA"; + + // Regular Doublings + graceMap["dblg"] = "HG LG D"; + graceMap["dbla"] = "HG LA D"; + graceMap["dbb"] = "HG B D"; + graceMap["dbc"] = "HG C D"; + graceMap["dbd"] = "HG D E"; + graceMap["dbe"] = "HG E F"; + graceMap["dbf"] = "HG F HG"; + graceMap["dbhg"] = "HG F"; + graceMap["dbha"] = "HA HG"; + + // Thumb Doublings +/* + graceMap["thdblg"] = "HA LG D"; + graceMap["thdbla"] = "HA LA D"; + graceMap["thdbb"] = "HA B D"; + graceMap["thdbc"] = "HA C D"; + graceMap["thdbd"] = "HA D E"; + graceMap["thdbe"] = "HA E F"; + graceMap["thdbf"] = "HA F HG"; + graceMap["thdbhg"] = "HA HG F"; +*/ + graceMap["tdblg"] = "HA LG D"; + graceMap["tdbla"] = "HA LA D"; + graceMap["tdbb"] = "HA B D"; + graceMap["tdbc"] = "HA C D"; + graceMap["tdbd"] = "HA D E"; + graceMap["tdbe"] = "HA E F"; + graceMap["tdbf"] = "HA F HG"; + + // Half Doublings + graceMap["hdblg"] = "LG D"; + graceMap["hdbla"] = "LA D"; + graceMap["hdbb"] = "B D"; + graceMap["hdbc"] = "C D"; + graceMap["hdbd"] = "D E"; + graceMap["hdbe"] = "E F"; + graceMap["hdbf"] = "F HG"; +/* + graceMap["hdbhg"] = "HG F"; + graceMap["hdbha"] = "HA HG"; +*/ + + // Single Strikes (same as single grace notes) + graceMap["strlg"] = "LG"; + graceMap["strla"] = "LA"; + graceMap["strb"] = "B"; + graceMap["strc"] = "C"; + graceMap["strd"] = "D"; + graceMap["stre"] = "E"; + graceMap["strf"] = "F"; + graceMap["strhg"] = "HG"; +/* + graceMap["strha"] = "HA"; +*/ + + // G Grace note, Thumb and Half Strikes + graceMap["gstla"] = "HG LA LG"; + graceMap["gstb"] = "HG B LG"; + graceMap["gstc"] = "HG C LG"; + graceMap["gstd"] = "HG D LG"; + graceMap["lgstd"] = "HG D C"; + graceMap["gste"] = "HG E LA"; + graceMap["gstf"] = "HG F E"; + + graceMap["tstla"] = "HA LA LG"; + graceMap["tstb"] = "HA B LG"; + graceMap["tstc"] = "HA C LG"; + graceMap["tstd"] = "HA D LG"; + graceMap["ltstd"] = "HA D C"; + graceMap["tste"] = "HA E LA"; + graceMap["tstf"] = "HA F E"; + graceMap["tsthg"] = "HA HG F"; + + graceMap["hstla"] = "LA LG"; + graceMap["hstb"] = "B LG"; + graceMap["hstc"] = "C LG"; + graceMap["hstd"] = "D LG"; + graceMap["lhstd"] = "D C"; + graceMap["hste"] = "E LA"; + graceMap["hstf"] = "F E"; + graceMap["hsthg"] = "HG F"; + + // Regular Grips + graceMap["grp"] = "LG D LG"; + graceMap["hgrp"] = "D LG"; + graceMap["grpb"] = "LG B LG"; + + // G Grace note, Thumb and Half Grips + graceMap["ggrpla"] = "HG LA LG D LG"; + graceMap["ggrpb"] = "HG B LG D LG"; + graceMap["ggrpc"] = "HG C LG D LG"; + graceMap["ggrpd"] = "HG D LG D LG"; + graceMap["ggrpdb"] = "HG D LG B LG"; + graceMap["ggrpe"] = "HG E LG D LG"; + graceMap["ggrpf"] = "HG F LG F LG"; + + graceMap["tgrpla"] = "HA LA LG D LG"; + graceMap["tgrpb"] = "HA B LG D LG"; + graceMap["tgrpc"] = "HA C LG D LG"; + graceMap["tgrpd"] = "HA D LG D LG"; + graceMap["tgrpdb"] = "HA D LG B LG"; + graceMap["tgrpe"] = "HA E LG D LG"; + graceMap["tgrpf"] = "HA F LG F LG"; + graceMap["tgrphg"] = "HA HG LG F LG"; + + graceMap["hgrpla"] = "LA LG D LG"; + graceMap["hgrpb"] = "B LG D LG"; + graceMap["hgrpc"] = "C LG D LG"; + graceMap["hgrpd"] = "D LG D LG"; + graceMap["hgrpdb"] = "D LG B LG"; + graceMap["hgrpe"] = "E LG D LG"; + graceMap["hgrpf"] = "F LG F LG"; + graceMap["hgrphg"] = "HG LG D LG"; + graceMap["hgrpha"] = "HA LG D LG"; + + // Taorluaths and Bublys + graceMap["tar"] = "LG D LG E"; + graceMap["tarb"] = "LG B LG E"; + graceMap["htar"] = "D LG E"; + graceMap["bubly"] = "LG D LG C LG"; + graceMap["hbubly"] = "D LG C LG"; + + // Birls + graceMap["brl"] = "LG LA LG"; + graceMap["abr"] = "LA LG LA LG"; + graceMap["gbr"] = "HG LA LG LA LG"; + graceMap["tbr"] = "HA LA LG LA LG"; + + // Light, Heavy and Half D Throws + graceMap["thrd"] = "LG D C"; + graceMap["hvthrd"] = "LG D LG C"; + graceMap["hthrd"] = "D C"; + graceMap["hhvthrd"] = "D LG C"; + + // Regular, Thumb Grace Note and Half Peles + graceMap["pella"] = "HG LA E LA LG"; + graceMap["pelb"] = "HG B E B LG"; + graceMap["pelc"] = "HG C E C LG"; + graceMap["peld"] = "HG D E D LG"; + graceMap["lpeld"] = "HG D E D C"; + graceMap["pele"] = "HG E F E LA"; + graceMap["pelf"] = "HG F HG F E"; + + graceMap["tpella"] = "HA LA E LA LG"; + graceMap["tpelb"] = "HA B E B LG"; + graceMap["tpelc"] = "HA C E C LG"; + graceMap["tpeld"] = "HA D E D LG"; + graceMap["ltpeld"] = "HA D E D C"; + graceMap["tpele"] = "HA E F E LA"; + graceMap["tpelf"] = "HA F HG F E"; + graceMap["tpelhg"] = "HA HG HA HG F"; + + graceMap["hpella"] = "LA E LA LG"; + graceMap["hpelb"] = "B E B LG"; + graceMap["hpelc"] = "C E C LG"; + graceMap["hpeld"] = "D E D LG"; + graceMap["lhpeld"] = "D E D C"; + graceMap["hpele"] = "E F E LA"; + graceMap["hpelf"] = "F HG F E"; + graceMap["hpelhg"] = "HG HA HG F"; + + // Regular Double Strikes + graceMap["st2la"] = "LG LA LG"; + graceMap["st2b"] = "LG B LG"; + graceMap["st2c"] = "LG C LG"; + graceMap["st2d"] = "LG D LG"; + graceMap["lst2d"] = "C D C"; + graceMap["st2e"] = "LA E LA"; + graceMap["st2f"] = "E F E"; + graceMap["st2hg"] = "F HG F"; + graceMap["st2ha"] = "HG HA HG"; + + // G Grace note, Thumb and Half Double Strikes + graceMap["gst2la"] = "HG LA LG LA LG"; + graceMap["gst2b"] = "HG B LG B LG"; + graceMap["gst2c"] = "HG C LG C LG"; + graceMap["gst2d"] = "HG D LG D LG"; + graceMap["lgst2d"] = "HG D C D C"; + graceMap["gst2e"] = "HG E LA E LA"; + graceMap["gst2f"] = "HG F E F E"; + + graceMap["tst2la"] = "HA LA LG LA LG"; + graceMap["tst2b"] = "HA B LG B LG"; + graceMap["tst2c"] = "HA C LG C LG"; + graceMap["tst2d"] = "HA D LG D LG"; + graceMap["ltst2d"] = "HA D C D C"; + graceMap["tst2e"] = "HA E LA E LA"; + graceMap["tst2f"] = "HA F E F E"; + graceMap["tst2hg"] = "HA HG F HG F"; + + graceMap["hst2la"] = "LA LG LA LG"; + graceMap["hst2b"] = "B LG B LG"; + graceMap["hst2c"] = "C LG C LG"; + graceMap["hst2d"] = "D LG D LG"; + graceMap["lhst2d"] = "D C D C"; + graceMap["hst2e"] = "E LA E LA"; + graceMap["hst2f"] = "F E F E"; + graceMap["hst2hg"] = "HG F HG F"; + graceMap["hst2ha"] = "HA HG HA HG"; + + // Regular Triple Strikes + graceMap["st3la"] = "LG LA LG LA LG"; + graceMap["st3b"] = "LG B LG B LG"; + graceMap["st3c"] = "LG C LG C LG"; + graceMap["st3d"] = "LG D LG D LG"; + graceMap["lst3d"] = "C D C D C"; + graceMap["st3e"] = "LA E LA E LA"; + graceMap["st3f"] = "E F E F E"; + graceMap["st3hg"] = "F HG F HG F"; + graceMap["st3ha"] = "HG HA HG HA HG"; + + // G Grace note, Thumb and Half Triple Strikes + graceMap["gst3la"] = "HG LA LG LA LG LA LG"; + graceMap["gst3b"] = "HG B LG B LG B LG"; + graceMap["gst3c"] = "HG C LG C LG C LG"; + graceMap["gst3d"] = "HG D LG D LG D LG"; + graceMap["lgst3d"] = "HG D C D C D C"; + graceMap["gst3e"] = "HG E LA E LA E LA"; + graceMap["gst3f"] = "HG F E F E F E"; + + graceMap["tst3la"] = "HA LA LG LA LG LA LG"; + graceMap["tst3b"] = "HA B LG B LG B LG"; + graceMap["tst3c"] = "HA C LG C LG C LG"; + graceMap["tst3d"] = "HA D LG D LG D LG"; + graceMap["ltst3d"] = "HA D C D C D C"; + graceMap["tst3e"] = "HA E LA E LA E LA"; + graceMap["tst3f"] = "HA F E F E F E"; + graceMap["tst3hg"] = "HA HG F HG F HG F"; + + graceMap["hst3la"] = "LA LG LA LG LA LG"; + graceMap["hst3b"] = "B LG B LG B LG"; + graceMap["hst3c"] = "C LG C LG C LG"; + graceMap["hst3d"] = "D LG D LG D LG"; + graceMap["lhst3d"] = "D C D C D C"; + graceMap["hst3e"] = "E LA E LA E LA"; + graceMap["hst3f"] = "F E F E F E"; + graceMap["hst3hg"] = "HG F HG F HG F"; + graceMap["hst3ha"] = "HA HG HA HG HA HG"; + + // Double Grace notes + graceMap["dlg"] = "D LG"; + graceMap["dla"] = "D LA"; + graceMap["db"] = "D B"; + graceMap["dc"] = "D C"; + graceMap["elg"] = "E LG"; + graceMap["ela"] = "E LA"; + graceMap["eb"] = "E B"; + graceMap["ec"] = "E C"; + graceMap["ed"] = "E D"; + + graceMap["flg"] = "F LG"; + graceMap["fla"] = "F LA"; + graceMap["fb"] = "F B"; + graceMap["fc"] = "F C"; + graceMap["fd"] = "F D"; + graceMap["fe"] = "F E"; + + graceMap["glg"] = "HG LG"; + graceMap["gla"] = "HG LA"; + graceMap["gb"] = "HG B"; + graceMap["gc"] = "HG C"; + graceMap["gd"] = "HG D"; + graceMap["ge"] = "HG E"; + graceMap["gf"] = "HG F"; + + graceMap["tlg"] = "HA LG"; + graceMap["tla"] = "HA LA"; + graceMap["tb"] = "HA B"; + graceMap["tc"] = "HA C"; + graceMap["td"] = "HA D"; + graceMap["te"] = "HA E"; + graceMap["tf"] = "HA F"; + graceMap["thg"] = "HA HG"; + getSym(); qDebug() << "Lexer::Lexer() end"; @@ -175,16 +462,6 @@ QRegExp rTie("\\^t[es]"); QRegExp rTriplet("\\^3[es]"); QRegExp rDot("'([hl][ag]|[b-f])"); - QRegExp rSingleGrace("[a-gt]g"); - QRegExp rStrike("str([hl][ag]|[b-f])"); - QRegExp rDoubling("db([hl][ag]|[b-f])"); - QRegExp rHalfDoubling("hdb([hl][ag]|[b-f])"); - QRegExp rThumbDoubling("thdb(l[ag]|[b-f]|hg)"); - QRegExp rSlur("l?gstd"); - QRegExp rThrow("thrd"); - QRegExp rBirl("abr|brl|gbrl|tbrl"); - QRegExp rGrip("grp"); - QRegExp rTaorluath("tar"); if (rClef.exactMatch(word)) type = CLEF; @@ -204,26 +481,11 @@ type = TRIPLET; else if (rDot.exactMatch(word)) type = DOT; - else if (rSingleGrace.exactMatch(word)) - type = SINGLEGRACE; - else if (rStrike.exactMatch(word)) - type = STRIKE; - else if (rDoubling.exactMatch(word)) - type = DOUBLING; - else if (rHalfDoubling.exactMatch(word)) - type = HALFDOUBLING; - else if (rThumbDoubling.exactMatch(word)) - type = THUMBDOUBLING; - else if (rSlur.exactMatch(word)) - type = SLUR; - else if (rThrow.exactMatch(word)) - type = THROW; - else if (rBirl.exactMatch(word)) - type = BIRL; - else if (rGrip.exactMatch(word)) - type = GRIP; - else if (rTaorluath.exactMatch(word)) - type = TAORLUATH; + else if (graceMap.contains(word)) + { + type = GRACE; + value = graceMap.value(word); + } else type = UNKNOWN; diff -Nru musescore-1.1+dfsg/mscore/bww2mxml/lexer.h musescore-1.2+dfsg/mscore/bww2mxml/lexer.h --- musescore-1.1+dfsg/mscore/bww2mxml/lexer.h 2011-07-27 13:32:22.000000000 +0000 +++ musescore-1.2+dfsg/mscore/bww2mxml/lexer.h 2012-03-13 13:31:50.000000000 +0000 @@ -2,7 +2,7 @@ // BWW to MusicXML converter // Part of MusE Score // Linux Music Score Editor -// $Id: lexer.h 3793 2010-12-22 21:54:17Z lvinken $ +// $Id: lexer.h 4867 2011-10-16 19:25:05Z lvinken $ // // Copyright (C) 2010 Werner Schweer and others // @@ -27,6 +27,7 @@ Definition of class Lexer */ +#include #include #include #include @@ -51,12 +52,13 @@ int symLineNumber() const { return lineNumber; } private: void categorizeWord(QString word); - QTextStream in; ///< Input stream - QString line; ///< The current line - int lineNumber; ///< The current line number (zero-based) - QStringList list; ///< Unprocessed words - Symbol type; ///< Last symbol type - QString value; ///< Last symbol value + QTextStream in; ///< Input stream + QString line; ///< The current line + int lineNumber; ///< The current line number (zero-based) + QStringList list; ///< Unprocessed words + Symbol type; ///< Last symbol type + QString value; ///< Last symbol value + QMap graceMap; ///< Map bww embellishments to separate grace notes }; } // namespace Bww diff -Nru musescore-1.1+dfsg/mscore/bww2mxml/parser.cpp musescore-1.2+dfsg/mscore/bww2mxml/parser.cpp --- musescore-1.1+dfsg/mscore/bww2mxml/parser.cpp 2011-07-27 13:32:22.000000000 +0000 +++ musescore-1.2+dfsg/mscore/bww2mxml/parser.cpp 2012-03-13 13:31:50.000000000 +0000 @@ -2,7 +2,7 @@ // BWW to MusicXML converter // Part of MusE Score // Linux Music Score Editor -// $Id: parser.cpp 3891 2011-01-15 14:57:18Z lvinken $ +// $Id: parser.cpp 4867 2011-10-16 19:25:05Z lvinken $ // // Copyright (C) 2010 Werner Schweer and others // @@ -40,24 +40,6 @@ static const int WHOLE_MEASURE_DURATION = 192; /** - Determine if symbol is a grace sequence - */ - -static bool isGrace(Bww::Symbol sym) -{ - return (sym == Bww::SINGLEGRACE - || sym == Bww::STRIKE - || sym == Bww::DOUBLING - || sym == Bww::HALFDOUBLING - || sym == Bww::THUMBDOUBLING - || sym == Bww::SLUR - || sym == Bww::THROW - || sym == Bww::BIRL - || sym == Bww::GRIP - || sym == Bww::TAORLUATH); -} - -/** Determine if symbol is part of a note sequence */ @@ -66,7 +48,7 @@ return (sym == Bww::NOTE || sym == Bww::TIE || sym == Bww::TRIPLET - || isGrace(sym)); + || sym == Bww::GRACE); } /** @@ -494,100 +476,6 @@ tsigFound(false) { qDebug() << "Parser::Parser()"; - - // Initialize the grace note translation table - // Grace sequence definitions were taken from Lilyponds bagpipe.ly - // For some Lilypond sequences the bww name is unknown - - // Single grace notes - graceMap["ag"] = "LA"; - graceMap["bg"] = "B"; - graceMap["cg"] = "C"; - graceMap["dg"] = "D"; - graceMap["eg"] = "E"; - graceMap["fg"] = "F"; - graceMap["gg"] = "HG"; - graceMap["tg"] = "HA"; - - // Strikes (same as single grace notes) - graceMap["strlg"] = "LG"; - graceMap["strla"] = "LA"; - graceMap["strb"] = "B"; - graceMap["strc"] = "C"; - graceMap["strd"] = "D"; - graceMap["stre"] = "E"; - graceMap["strf"] = "F"; - graceMap["strhg"] = "HG"; - graceMap["strha"] = "HA"; - - // Doublings - graceMap["dblg"] = "HG LG D"; - graceMap["dbla"] = "HG LA D"; - graceMap["dbb"] = "HG B D"; - graceMap["dbc"] = "HG C D"; - graceMap["dbd"] = "HG D E"; - graceMap["dbe"] = "HG E F"; - graceMap["dbf"] = "HG F HG"; - graceMap["dbhg"] = "HG F"; - graceMap["dbha"] = "HA HG"; - - // Half doublings - graceMap["hdblg"] = "LG D"; - graceMap["hdbla"] = "LA D"; - graceMap["hdbb"] = "B D"; - graceMap["hdbc"] = "C D"; - graceMap["hdbd"] = "D E"; - graceMap["hdbe"] = "E F"; - graceMap["hdbf"] = "F HG"; - graceMap["hdbhg"] = "HG F"; - graceMap["hdbha"] = "HA HG"; - - // Thumb doublings - graceMap["thdblg"] = "HA LG D"; - graceMap["thdbla"] = "HA LA D"; - graceMap["thdbb"] = "HA B D"; - graceMap["thdbc"] = "HA C D"; - graceMap["thdbd"] = "HA D E"; - graceMap["thdbe"] = "HA E F"; - graceMap["thdbf"] = "HA F HG"; - graceMap["thdbhg"] = "HA HG F"; - - // Shakes - // Half shakes - // Thumb shakes - // ??? - - // Slurs - graceMap["gstd"] = "HG D LG"; - graceMap["lgstd"] = "HG D C"; - - // Half slurs - // Thumb slurs - // ??? - - // Catches - // ??? - - // Throws - graceMap["thrd"] = "LG D C"; - // graceMap["???"] = "D C"; - // graceMap["???"] = "LG D LG C"; - // graceMap["???"] = "F E HG E"; - - // Birls - graceMap["abr"] = "LA LG LA LG"; - graceMap["brl"] = "LG LA LG"; - graceMap["gbrl"] = "HG LA LG LA LG"; - graceMap["tbrl"] = "D LA LG LA LG"; - - // Grips - graceMap["grp"] = "LG D LG"; - - // Taorluaths - graceMap["tar"] = "LG D LG E"; - - // Crunluaths - // ??? } /** @@ -823,21 +711,18 @@ const QString type = "32"; const int dots = 0; - if (graceMap.contains(lex.symValue())) + QStringList graces = lex.symValue().split(" "); + for (int i = 0; i < graces.size(); ++i) { - QStringList graces = graceMap.value(lex.symValue()).split(" "); - for (int i = 0; i < graces.size(); ++i) + const QString beam = graceBeam(graces.size(), i); + NoteDescription noteDesc(graces.at(i), beam, type, dots, false, false, ST_NONE, true); + if (measures.isEmpty()) { - const QString beam = graceBeam(graces.size(), i); - NoteDescription noteDesc(graces.at(i), beam, type, dots, false, false, ST_NONE, true); - if (measures.isEmpty()) - { - errorHandler("cannot append note: no measure"); - } - else - { - measures.last().notes.append(noteDesc); - } + errorHandler("cannot append note: no measure"); + } + else + { + measures.last().notes.append(noteDesc); } } lex.getSym(); @@ -926,9 +811,9 @@ void Parser::parseSeqNotes() { qDebug() << "Parser::parseSeqNotes() value:" << qPrintable(lex.symValue()); - while (isGrace(lex.symType()) || lex.symType() == NOTE || lex.symType() == TIE || lex.symType() == TRIPLET) + while (lex.symType() == GRACE || lex.symType() == NOTE || lex.symType() == TIE || lex.symType() == TRIPLET) { - if (isGrace(lex.symType())) parseGraces(); + if (lex.symType() == GRACE) parseGraces(); else if (lex.symType() == NOTE) parseNote(); else if (lex.symType() == TIE) { diff -Nru musescore-1.1+dfsg/mscore/bww2mxml/parser.h musescore-1.2+dfsg/mscore/bww2mxml/parser.h --- musescore-1.1+dfsg/mscore/bww2mxml/parser.h 2011-07-27 13:32:22.000000000 +0000 +++ musescore-1.2+dfsg/mscore/bww2mxml/parser.h 2012-03-13 13:31:50.000000000 +0000 @@ -2,7 +2,7 @@ // BWW to MusicXML converter // Part of MusE Score // Linux Music Score Editor -// $Id: parser.h 3891 2011-01-15 14:57:18Z lvinken $ +// $Id: parser.h 4867 2011-10-16 19:25:05Z lvinken $ // // Copyright (C) 2010 Werner Schweer and others // @@ -28,7 +28,6 @@ */ #include -#include #include #include @@ -105,7 +104,6 @@ int tempo; ///< Tune tempo read from the header int beat; ///< Beat type, read from the clef line int beats; ///< Number of beats, read from the clef line - QMap graceMap; ///< Map bww embellishments to separate grace notes bool inMeasure; ///< State: writing the notes in a measure int measureNr; ///< Current measure number bool tieStart; ///< Tie start pending diff -Nru musescore-1.1+dfsg/mscore/bww2mxml/symbols.cpp musescore-1.2+dfsg/mscore/bww2mxml/symbols.cpp --- musescore-1.1+dfsg/mscore/bww2mxml/symbols.cpp 2011-07-27 13:32:22.000000000 +0000 +++ musescore-1.2+dfsg/mscore/bww2mxml/symbols.cpp 2012-03-13 13:31:50.000000000 +0000 @@ -2,7 +2,7 @@ // BWW to MusicXML converter // Part of MusE Score // Linux Music Score Editor -// $Id: symbols.cpp 3793 2010-12-22 21:54:17Z lvinken $ +// $Id: symbols.cpp 4867 2011-10-16 19:25:05Z lvinken $ // // Copyright (C) 2010 Werner Schweer and others // @@ -44,16 +44,7 @@ "TIE", "TRIPLET", "DOT", - "SINGLEGRACE", - "STRIKE", - "DOUBLING", - "HALFDOUBLING", - "THUMBDOUBLING", - "SLUR", - "THROW", - "BIRL", - "GRIP", - "TAORLUATH", + "GRACE", "UNKNOWN", "NONE" }; diff -Nru musescore-1.1+dfsg/mscore/bww2mxml/symbols.h musescore-1.2+dfsg/mscore/bww2mxml/symbols.h --- musescore-1.1+dfsg/mscore/bww2mxml/symbols.h 2011-07-27 13:32:22.000000000 +0000 +++ musescore-1.2+dfsg/mscore/bww2mxml/symbols.h 2012-03-13 13:31:50.000000000 +0000 @@ -2,7 +2,7 @@ // BWW to MusicXML converter // Part of MusE Score // Linux Music Score Editor -// $Id: symbols.h 3793 2010-12-22 21:54:17Z lvinken $ +// $Id: symbols.h 4867 2011-10-16 19:25:05Z lvinken $ // // Copyright (C) 2010 Werner Schweer and others // @@ -44,16 +44,7 @@ TIE, TRIPLET, DOT, - SINGLEGRACE, - STRIKE, - DOUBLING, - HALFDOUBLING, - THUMBDOUBLING, - SLUR, - THROW, - BIRL, - GRIP, - TAORLUATH, + GRACE, UNKNOWN, NONE }; diff -Nru musescore-1.1+dfsg/mscore/bww2mxml/test/iotest musescore-1.2+dfsg/mscore/bww2mxml/test/iotest --- musescore-1.1+dfsg/mscore/bww2mxml/test/iotest 2011-07-27 13:32:22.000000000 +0000 +++ musescore-1.2+dfsg/mscore/bww2mxml/test/iotest 2012-03-13 13:31:50.000000000 +0000 @@ -29,6 +29,7 @@ rwtestAll() { rwtest testBeams.bww + rwtest testDoublings.bww rwtest testDuration.bww rwtest testGraces.bww rwtest testHello.bww diff -Nru musescore-1.1+dfsg/mscore/bww2mxml/test/testDoublings.bww musescore-1.2+dfsg/mscore/bww2mxml/test/testDoublings.bww --- musescore-1.1+dfsg/mscore/bww2mxml/test/testDoublings.bww 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/mscore/bww2mxml/test/testDoublings.bww 2012-03-13 13:31:50.000000000 +0000 @@ -0,0 +1,71 @@ +"Grace notes and embellishments",(T,L,0,0,Times New Roman,16,700,0,0,18,0,0,0) + +"Testfile",(Y,C,0,0,Times New Roman,14,400,0,0,18,0,0,0) + +"Leon Vinken",(M,R,0,0,Times New Roman,14,400,0,0,18,0,0,0) + +"Part of bbw2mxml",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0) + +TuneTempo,90 + + +& sharpf sharpc 16_4 +ag LG_4 bg LA_4 cg LA_4 dg LA_4 eg LA_4 fg LA_4 gg LA_4 tg LA_4 !t + +& sharpf sharpc +E_4 dblg LG_4 dbla LA_4 dbb B_4 dbc C_4 dbd D_4 dbe E_4 dbf F_4 dbhg HG_4 dbha HA_4 !t +HG_4 tdblg LG_4 tdbla LA_4 tdbb B_4 tdbc C_4 tdbd D_4 tdbe E_4 tdbf F_4 !t +HA_4 hdblg LG_4 hdbla LA_4 hdbb B_4 hdbc C_4 hdbd D_4 hdbe E_4 hdbf F_4 !t + +& sharpf sharpc +B_4 strlg B_4 E_4 strla E_4 C_4 strb C_4 D_4 strc D_4 E_4 strd E_4 F_4 stre F_4 HG_4 strf HG_4 HA_4 strhg HA_4 !t + +& sharpf sharpc +E_4 gstla LA_4 gstb B_4 gstc C_4 gstd D_4 lgstd D_4 gste E_4 gstf F_4 !t +F_4 tstla LA_4 tstb B_4 tstc C_4 tstd D_4 ltstd D_4 tste E_4 tstf F_4 tsthg HG_4 !t +HA_4 hstla LA_4 hstb B_4 hstc C_4 hstd D_4 lhstd D_4 hste E_4 hstf F_4 hsthg HG_4 !t + +& sharpf sharpc +LA_4 grp E_4 LG_4 hgrp E_4 D_4 grpb E_4 D_4 grpb LA_4 !t + +& sharpf sharpc +E_4 ggrpla LA_4 ggrpb B_4 ggrpc C_4 ggrpd D_4 ggrpdb D_4 ggrpe E_4 ggrpf F_4 !t +F_4 tgrpla LA_4 tgrpb B_4 tgrpc C_4 tgrpd D_4 tgrpdb D_4 tgrpe E_4 tgrpf F_4 tgrphg HG_4 !t +HA_4 hgrpla LA_4 hgrpb B_4 hgrpc C_4 hgrpd D_4 hgrpdb D_4 hgrpe E_4 hgrpf F_4 hgrphg HG_4 hgrpha HA_4 !t + +& sharpf sharpc +C_4 tar LA_4 D_4 tarb LA_4 LG_4 htar LA_4 C_4 bubly B_4 LG_4 hbubly B_4 !t + +& sharpf sharpc +LA_4 brl LA_4 HA_4 abr LA_4 E_4 gbr LA_4 HG_4 tbr LA_4 !t + +& sharpf sharpc +LA_4 thrd D_4 LA_4 hvthrd D_4 LG_4 hthrd D_4 LG_4 hhvthrd D_4 !t + +& sharpf sharpc +E_4 pella LA_4 pelb B_4 pelc C_4 peld D_4 lpeld D_4 pele E_4 pelf F_4 !t +HG_4 tpella LA_4 tpelb B_4 tpelc C_4 tpeld D_4 ltpeld D_4 tpele E_4 tpelf F_4 tpelhg HG_4 !t +HA_4 hpella LA_4 hpelb B_4 hpelc C_4 hpeld D_4 lhpeld D_4 hpele E_4 hpelf F_4 hpelhg HG_4 !t + +& sharpf sharpc +LA_4 st2la LA_4 B_4 st2b B_4 C_4 st2c C_4 D_4 st2d D_4 D_4 lst2d D_4 E_4 st2e E_4 F_4 st2f F_4 HG_4 st2hg HG_4 HA_4 st2ha HA_4 !t + +& sharpf sharpc +E_4 gst2la LA_4 gst2b B_4 gst2c C_4 gst2d D_4 lgst2d D_4 gst2e E_4 gst2f F_4 !t +HG_4 tst2la LA_4 tst2b B_4 tst2c C_4 tst2d D_4 ltst2d D_4 tst2e E_4 tst2f F_4 tst2hg HG_4 !t +HA_4 hst2la LA_4 hst2b B_4 hst2c C_4 hst2d D_4 lhst2d D_4 hst2e E_4 hst2f F_4 hst2hg HG_4 hst2ha HA_4 !t + +& sharpf sharpc +LA_4 st3la LA_4 B_4 st3b B_4 C_4 st3c C_4 D_4 st3d D_4 D_4 lst3d D_4 E_4 st3e E_4 F_4 st3f F_4 HG_4 st3hg HG_4 HA_4 st3ha HA_4 !t + +& sharpf sharpc +E_4 gst3la LA_4 gst3b B_4 gst3c C_4 gst3d D_4 lgst3d D_4 gst3e E_4 gst3f F_4 !t +HG_4 tst3la LA_4 tst3b B_4 tst3c C_4 tst3d D_4 ltst3d D_4 tst3e E_4 tst3f F_4 tst3hg HG_4 !t +HA_4 hst3la LA_4 hst3b B_4 hst3c C_4 hst3d D_4 lhst3d D_4 hst3e E_4 hst3f F_4 hst3hg HG_4 hst3ha HA_4 !t + +dlg LA_4 dla B_4 db C_4 dc D_4 elg LA_4 ela B_4 eb C_4 ec D_4 ed E_4 !t +flg LA_4 fla B_4 fb C_4 fc D_4 fd E_4 fe F_4 !t +glg LA_4 gla B_4 gb C_4 gc D_4 gd E_4 ge F_4 gf HG_4 !t +tlg LA_4 tla B_4 tb C_4 tc D_4 td E_4 te F_4 tf HG_4 thg HA_4 !t + +!I diff -Nru musescore-1.1+dfsg/mscore/bww2mxml/test/testDoublingsShort.bww musescore-1.2+dfsg/mscore/bww2mxml/test/testDoublingsShort.bww --- musescore-1.1+dfsg/mscore/bww2mxml/test/testDoublingsShort.bww 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/mscore/bww2mxml/test/testDoublingsShort.bww 2012-03-13 13:31:50.000000000 +0000 @@ -0,0 +1,16 @@ +"Grace notes and embellishments (short version)",(T,L,0,0,Times New Roman,16,700,0,0,18,0,0,0) + +"Testfile",(Y,C,0,0,Times New Roman,14,400,0,0,18,0,0,0) + +"Leon Vinken",(M,R,0,0,Times New Roman,14,400,0,0,18,0,0,0) + +"Part of bbw2mxml",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0) + +TuneTempo,90 + + +& sharpf sharpc 2_4 +E_4 dblg LG_4 !t +HG_4 tdblg LG_4 !t + +!I diff -Nru musescore-1.1+dfsg/mscore/bww2mxml/test/testDoublings.xml musescore-1.2+dfsg/mscore/bww2mxml/test/testDoublings.xml --- musescore-1.1+dfsg/mscore/bww2mxml/test/testDoublings.xml 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/mscore/bww2mxml/test/testDoublings.xml 2012-03-13 13:31:50.000000000 +0000 @@ -0,0 +1,12636 @@ + + + + + Grace notes and embellishments + + + Leon Vinken + Part of bbw2mxml + + bww2mxml + + + + + Bagpipe + + Bagpipe + + + 1 + 110 + + + + + + + 48 + + 2 + major + + + + G + 2 + + + + + + quarter + 90 + + + + + + + + A + 4 + + 32nd + up + + + + G + 4 + + 48 + quarter + down + + + + + B + 4 + + 32nd + up + + + + A + 4 + + 48 + quarter + down + + + + + C + 1 + 5 + + 32nd + up + + + + A + 4 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + + + + A + 4 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + + + + A + 4 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + + + + A + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + + + + A + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + + + + A + 4 + + 48 + quarter + down + + + + + + + E + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + end + end + end + + + + G + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + G + 5 + + 32nd + up + end + end + end + + + + A + 5 + + 48 + quarter + down + + + + + + G + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + end + end + end + + + + G + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + + A + 5 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + end + end + end + + + + G + 4 + + 48 + quarter + down + + + + + A + 4 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + B + 4 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + C + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + G + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + + + B + 4 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + + + + B + 4 + + 48 + quarter + down + + + + E + 5 + + 48 + quarter + down + + + + + A + 4 + + 32nd + up + + + + E + 5 + + 48 + quarter + down + + + + C + 1 + 5 + + 48 + quarter + down + + + + + B + 4 + + 32nd + up + + + + C + 1 + 5 + + 48 + quarter + down + + + + D + 5 + + 48 + quarter + down + + + + + C + 1 + 5 + + 32nd + up + + + + D + 5 + + 48 + quarter + down + + + + E + 5 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + + + + E + 5 + + 48 + quarter + down + + + + F + 1 + 5 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + + + + F + 1 + 5 + + 48 + quarter + down + + + + G + 5 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + + + + G + 5 + + 48 + quarter + down + + + + A + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + + + + A + 5 + + 48 + quarter + down + + + + + + + E + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + + F + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + + + A + 5 + + 48 + quarter + down + + + + + A + 4 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + B + 4 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + C + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + + + + A + 4 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + G + 4 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + D + 5 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + D + 5 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + + + E + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + + F + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + + + A + 5 + + 48 + quarter + down + + + + + A + 4 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + B + 4 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + C + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 5 + + 48 + quarter + down + + + + + + + C + 1 + 5 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + D + 5 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + G + 4 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + C + 1 + 5 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + G + 4 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + + + A + 4 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + A + 5 + + 48 + quarter + down + + + + + A + 4 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + E + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + G + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + + + A + 4 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + A + 4 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + G + 4 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + G + 4 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + + + E + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + + G + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + A + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + + + A + 5 + + 48 + quarter + down + + + + + A + 4 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + B + 4 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + C + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + A + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + + + + A + 4 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + B + 4 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + C + 1 + 5 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + D + 5 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + D + 5 + + 48 + quarter + down + + + + + C + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + E + 5 + + 48 + quarter + down + + + + + A + 4 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + F + 1 + 5 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + G + 5 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + A + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + A + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + end + end + end + + + + A + 5 + + 48 + quarter + down + + + + + + + E + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + + G + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + + + A + 5 + + 48 + quarter + down + + + + + A + 4 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + B + 4 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + C + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + A + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + end + end + end + + + + A + 5 + + 48 + quarter + down + + + + + + + A + 4 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + B + 4 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + C + 1 + 5 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + D + 5 + + 48 + quarter + down + + + + + G + 4 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + D + 5 + + 48 + quarter + down + + + + + C + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + E + 5 + + 48 + quarter + down + + + + + A + 4 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + F + 1 + 5 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + G + 5 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + A + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + A + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + A + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + end + end + end + + + + A + 5 + + 48 + quarter + down + + + + + + + E + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + + G + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + + + A + 5 + + 48 + quarter + down + + + + + A + 4 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + B + 4 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + B + 4 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + C + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + G + 4 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + D + 5 + + 32nd + up + continue + continue + continue + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + A + 4 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + A + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + continue + continue + continue + + + + + A + 5 + + 32nd + up + continue + continue + continue + + + + + G + 5 + + 32nd + up + end + end + end + + + + A + 5 + + 48 + quarter + down + + + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + D + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + E + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + + + F + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + F + 1 + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + G + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + G + 4 + + 32nd + up + end + end + end + + + + A + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + A + 4 + + 32nd + up + end + end + end + + + + B + 4 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + B + 4 + + 32nd + up + end + end + end + + + + C + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + C + 1 + 5 + + 32nd + up + end + end + end + + + + D + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + D + 5 + + 32nd + up + end + end + end + + + + E + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + E + 5 + + 32nd + up + end + end + end + + + + F + 1 + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + F + 1 + 5 + + 32nd + up + end + end + end + + + + G + 5 + + 48 + quarter + down + + + + + A + 5 + + 32nd + up + begin + begin + begin + + + + + G + 5 + + 32nd + up + end + end + end + + + + A + 5 + + 48 + quarter + down + + + light-heavy + + + + diff -Nru musescore-1.1+dfsg/mscore/ChangeLog musescore-1.2+dfsg/mscore/ChangeLog --- musescore-1.1+dfsg/mscore/ChangeLog 2011-07-27 13:33:18.000000000 +0000 +++ musescore-1.2+dfsg/mscore/ChangeLog 2012-03-13 13:37:09.000000000 +0000 @@ -1,3 +1,226 @@ +======== MuseScore 1.2 released ============== +13.mar (la) + - change splash screen +12.mar (la) + - fix #15457: Undo Insert Measure after changing clef causes crash + - make musescore.com plugin translatable + - french, german and spanish translations added for m.c plugin + - MusicXML: don't import tempo 0 as tempo text + - remove mscore-palette.xml on first start of 1.2 +11.mar (lv) + - fix #15325: [MusicXML import] [1.2] Notes are interpreted as rests, wrong lengths, strange results + - disable several debug printf in importxml.cpp +10.mar (la) + - fix DMG icon layout on Mac OSX 10.6 see http://openradar.appspot.com/7186342 + - Ability to nudge lyrics with left and right arrows +09.mar (la) + - fix #15353: 'start with score' box too narrow on Mac OSX +08.mar (la) + - basic support of tuplets in capella import +07.mar (la) + - fix #15283: Paste and undo causes crash + - fix #15376: Copy paste of nested tuplets causes corruption + - see #15351: ability to nudge element by space, 1/10 and 1/100 space + - Texts can be nudge left and right in edit mode by 1/10 sp +06.mar (la) + - fix #4893: Non-removable courtesy clef appears after insert measure before first one + - fix #15347: Dragging slur from Lines palette causes crash + - fix #14064: Opening capella files causes crash +05.mar (la) + - add Belarusian translation +03.mar (lv) + - update MusicXML regression test +01.mar (la) + - #15228 change behavior of add octave up/down to perfect octave +26.feb (la) + - default reverb/chorus to minimum +25.feb (lv) + - fix #15129: [MusicXML] [1.2] empty measures are not imported + (la) + - fix #15147: Style Page Nums "show first" not checked, 1st page > 1: 1st page number still shown (mi) +24. feb (la) + - Change Moussorgski's Promenade by Marc Sabatella's Reunion ! + - use english note name in Edit Drumset dialog + - fix #15123: Measure rest should be shown as breve if measure >= 4/2 (patch by Miwarre) + - fix #15059: save a newly created part don't remove the asterisk (patch by Jorgk) + - fix #15132: Create new score and quit/reopen presents incorrect dialog +22.feb (lv) + - update MusicXML regression test + (la) + - fix #15080: [MusicXML] [1.2] weird behaviour midi-instrument pan value +20.feb (lv) + - fix #14825: [MusicXML import] [1.2] import error: 31a-Directions.xml missing dashes and bracket + (la) + - fix #14917: Wrong bracket in nested tuplet + - export MIDI with relative tempo set in Play Panel +19.feb (lv) + - fix #15002: [MusicXML] [1.2] Export/import of uneven tuplets (16th, eighth, eighth, 16th) + - fix #15033: [MusicXML] [1.2] Handle tuplet property "number" +18.feb (lv) + - partial fix #15002: [MusicXML] [1.2] Export/import of uneven tuplets (16th, eighth, eighth, 16th) + (export only) + - support parentheses attribute for accidentals (prefered as of MusicXML 1.1) + - fix MusicXML regression test +17.feb (la) + - MusicXML import export volume and pan for each instrument + - Change order of MusicXML tags to please Finale +16.feb (la) + - fix #14992: Inserting measures corrupts score with tuplets +15.feb (la) + - fix #14973: Transparent and truly vectorial embedded SVG (patch by Miwarre) +14.feb (la) + - fix #14648: Disallow copy of part of tuplets (patch by Jorgk) +13.feb (la) + - Add Frame Text to Vertical Frame + - MusicXML: minimal support of page relative text on first page in import and export +10.feb (la) + - fix #3482: pasting after copy/cut creates note with wrong duration (patch by Jorgk) +09.feb (lv) + - fix #14828: [MusicXML import] [1.2] import error: 46a-Barlines.xml: unexpected multi-measure rests + - fix #14834: [MusicXML import] [1.2] import error: 45e-Repeats-Nested-Alternatives.xml: repeat start missing +08.feb (lv) + - fix #14827: [MusicXML import] [1.2] import error: 32a-Notations.xml: missing notations + - fix #14862: [MusicXML] [1.2] Export notations imported by issue 14827 + (la) + - fix #14819: import error: 01f-Pitches-ParenthesizedMicrotoneAccidentals.xml imports without microtone accidentals + - fix #14818: import error: 01e-Pitches-ParenthesizedAccidentals.xml imports without double flat in parentheses + - fix #14832: import error: 41d-StaffGroups-Nested.xml: part-group symbol=line not supported + - fix #14804: Bad pitch and alter exported for cross staff note + - fix #14418: Voltas lost when importing MusicXML +05.feb (lv) + - fix #14701: [MusicXML Export] [1.2] Key signature is not exported from a mscz saved with 1.1 + - fix #14244: [MusicXML] [1.2] Export of trill line fails +02.feb (la) + - fix #12300: Add european language characters in MuseJazz (by Marc Sabatella and Jorgk) + - add two more chordnames sus#4 & Maj7b13 + - fix #14409: Crash on copying tuplets + - fix #14429: Articulations / ornaments in small staves are not small + - fix #14420: Measures long 2/1 or more not cleared to measure rest +29.jan (lv) + - fix #14692: [MusicXML import] [1.2] import error: 41g-PartNoId.xml causes crash + - fix #14693: [MusicXML import] [1.2] import error: 41h-TooManyParts.xml causes crash + Note: fix prevents crashes but still need further investigation for side effects +28.jan (lv) + - fix #14590: [MusicXML import] [1.2] import errors 23a-Tuplets.xml +22.jan (lv) + - fix #14451: [MusicXML import] [1.2] import errors 02a-Rests-Durations.xml +10.jan (la) + - fix #6649: Transposition when creating a score from a template + - add Salvation Army Brass band templates +9.jan (la) + - add drumset file for french drums notation see #14340 + - change default drumset folder to "templates" dir + - add UK Brass Band template by FMFK + - remove subbeam button + - read and ignore "pos" + - partly fix #10552 : no more crash on undo, dynamic created + - add Jazz Combo and Band templates by Marc Sabatella +6.jan (la) + - add "Create desktop shortcut" option in windows installer + - reduce auto update check period + - fix default style of Frame Text + - fix german chordnames (H / Bb) + - fix #14272: Add 'Can't open" dialog for unknow filetype + - fix #14076: Add MuseScore.org link in dialog for more recent file + - fix: Offset for offtime not saved + - Incomplete fix #12966: Measure insert corrupts key changes +28.dec (lv) + - importxml.cpp cleanup +27.dec (lv) + - importxml.cpp cleanup +22.dec (ws) + - save "pos" element in addition to "offset" for better upward + compatibility to 2.0 version + (lv) + - fix #14088: [MusicXML] Problem importing triplets from XML if tuplet element is missing + - fix #14160: [MusicXML] Problem importing tuplets from XML in a multi-voice context +20.dec (lv) + - fix #14118: [MusicXML] Import of tuplets containing chords is incorrect +13.dec (lv) + - fix #5947: [MusicXML] Slurs is not well placed with grace note + - fix #12445: [MusicXML] Import can produce empty voice 1: + set (automativally) generated rests to invisible + - fix #12349: Wrong placed slurs after importing a MusicXML file +12.dec (ws) + - fix #14036: Background Wallpaper Distortion +11.dec (lv) + - fix #12445: [MusicXML] Import can produce empty voice 1 + - fix "variable set but not used" warnings in importxml.cpp +2.dec (lv) + - fix #11221: Don't set "Break multi measure rest" when importing from MusicXML + - fix #13860: MusicXML: support lyrics exported by Sibelius 7 +28.nov (lv) + - updated MusicXML testfiles: added + - code cleanup MusicXML importer/exporter +27.nov (lv) + - testfile for #13860: MusicXML: support lyrics exported by Sibelius 7 +26.nov (lv) + - fix #13782: MusicXML: Errors in Import and Crash after closing +17.nov (la) + - fix #13478: Zoom during playback using shortcuts +29.oct (la) + - fix #13357: Creating part causes crash (key sig corruption) + - fix #13364: Score tabs disappear +26.oct (ws) + - changes to tuplet handling to allow reading of corrupted files + (#13350) +24 oct (la) + - fix #13301: add score.close() to plugin framework + - fix #5433: Staff with one line and repeat bars are not aligned +19.oct (la) + - fix #13183: [MusicXML] Wrong import of right barline + - add dynamic and note velocity support in MusicXML export/import +17.oct (lv) + - fix #13107: bww import: missing bagpipe doublings +9.oct (lv) + - fix #12382: [MusicXML] Key Signature for 2 Staves + - fix crash reading MusicXML file with different key signatures on the first staff and second staff + - add MusicXML testfile for issue 12382 ("Key Signature for 2 Staves") +4.oct (ws) + - fix regression from 30.sep change +30.sep (ws) + - fix regression #4157: Natural alfter a tie across barline +29.sep (ws) + - fix #1395: Accidental after a tied note + (la) + - fix #12085: Enharmonics not preserved when toggling concert pitch in part > 1 octave +20.sep (la) + - fix pedal ending in midi export + http://musescore.org/en/node/12642#comment-42743 +6.sep (la) + - fix 12218: shaped noteheads aren't shared + - fix 12419: Ledger lines are still visible for invisible notes +3.sep (lv) + - fix #12276: MusicXML import: sub-optimal handling of different duration measures + (la) + - fix #12394: Chordnames are not exported for grand staff +31.aug (lv) + - added function to determine measure length, in preparation for fixing #12276 +30.aug (lv) + - refactored tick handling in MusicXML import, in preparation for fixing #12276 + (la) + - fix #12161: Changing time signature should change autobeam properties +29.aug (la) + - fix #12322: Exported parts close on command without a warning +21.aug (lv) + - fix #11675: Crash opening MusicXML from Finale + note: the attached file romance-1.zip still does not open correctly (probably a separate + issue still to be investigated), but at least it does not crash due to the voice mapper + anymore +18.aug (lv) + - reworked MusicXML voice mapper + (la) + - fix bug on midi import +15.aug (la) + - fix #12084: Crash when running transpose with title selected + - fix #11926: Pedal marking created in 1.0 are displayed incorrectly in MuseScore 1.1 +14.aug (la) + - fix translation of context menu on keysig + - apply patches from Toby Smithe (#12108) + +10.aug (la) + - fix #11927: MusicXML export duplicate chordnames + - fix #11479: playback swing of quarter notes on counter beat ======== MuseScore 1.1 released ============== @@ -20,7 +243,7 @@ - open MuseScore maximize on very first startup - fix rest position for 1 and 3 staff lines 30.jun (la) - - fix #11267: Shift + drag tuplet, delete, undo cause crash + - fix #11267: Shift + drag tuplet, delete, undo cause crash 29.jun (ws) - fix entry of underline character in lyrics entry mode (for german keyboard press Strg+Umsch+"-", for english Ctrl+"_") diff -Nru musescore-1.1+dfsg/mscore/cmake/gch.cmake musescore-1.2+dfsg/mscore/cmake/gch.cmake --- musescore-1.1+dfsg/mscore/cmake/gch.cmake 1970-01-01 00:00:00.000000000 +0000 +++ musescore-1.2+dfsg/mscore/cmake/gch.cmake 2012-03-13 13:31:50.000000000 +0000 @@ -0,0 +1,29 @@ +#============================================================================= +# Mscore +# Linux Music Score Editor +# $Id:$ +# +# Copyright (C) 2011 by Werner Schweer and others +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +#============================================================================= + + +SET_SOURCE_FILES_PROPERTIES( + ${PCH} + ${PROJECT_BINARY_DIR}/all.h + PROPERTIES GENERATED 1 + ) + + + diff -Nru musescore-1.1+dfsg/mscore/cmake/mingw32.mingw.cmake musescore-1.2+dfsg/mscore/cmake/mingw32.mingw.cmake --- musescore-1.1+dfsg/mscore/cmake/mingw32.mingw.cmake 2011-07-27 13:32:23.000000000 +0000 +++ musescore-1.2+dfsg/mscore/cmake/mingw32.mingw.cmake 2012-03-13 13:31:50.000000000 +0000 @@ -5,7 +5,7 @@ set (CMAKE_SYSTEM_NAME "Windows") set (CROSS C:/QtSDK/mingw) -set (CROSSQT C:/QtSDK/Desktop/Qt/4.7.3/mingw) +set (CROSSQT C:/QtSDK/Desktop/Qt/4.8.0/mingw) set (CMAKE_C_COMPILER ${CROSS}/bin/gcc.exe) set (CMAKE_CXX_COMPILER ${CROSS}/bin/g++.exe) diff -Nru musescore-1.1+dfsg/mscore/CMakeLists.txt musescore-1.2+dfsg/mscore/CMakeLists.txt --- musescore-1.1+dfsg/mscore/CMakeLists.txt 2011-07-27 13:33:18.000000000 +0000 +++ musescore-1.2+dfsg/mscore/CMakeLists.txt 2012-03-13 13:37:09.000000000 +0000 @@ -26,10 +26,11 @@ # for debugging the make system uncomment next line: # set(CMAKE_VERBOSE_MAKEFILE ON) -set(MSCORE_UNSTABLE FALSE) # mark as unstable +set(MSCORE_UNSTABLE FALSE) # mark as unstable set(GCC_VISIBILITY TRUE) # requires gcc 4.x? set(HAS_AUDIOFILE TRUE) # requires libsndfile +set(OSC TRUE) # osc remote control set(BUILD_SCRIPTGEN TRUE) #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib) set(STATIC_SCRIPT_BINDINGS FALSE) @@ -43,9 +44,17 @@ if (APPLE) set(HAS_AUDIOFILE TRUE) # requires libsndfile set(STATIC_SCRIPT_BINDINGS TRUE) - set(CMAKE_OSX_ARCHITECTURES i386 ppc) # build universal library - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4) #min version required + + set (CMAKE_CXX_COMPILER clang++) # use clang, comment for 10.4 & 10.5 + set(CMAKE_OSX_ARCHITECTURES i386) # build only i386 by default + set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) #min version required + + #toggle the following for 10.4 & 10.5 + #set(CMAKE_OSX_ARCHITECTURES i386 ppc) # build universal binary + #set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) + #set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4) #min version required + find_library(AudioToolboxFW NAMES AudioToolbox) find_library(AudioUnitFW NAMES AudioUnit) find_library(CoreAudioFW NAMES CoreAudio) @@ -61,7 +70,7 @@ # The Mscore version number. SET(Mscore_VERSION_MAJOR "1") -SET(Mscore_VERSION_MINOR "1") +SET(Mscore_VERSION_MINOR "2") SET(Mscore_VERSION_PATCH "0") SET(Mscore_VERSION "${Mscore_VERSION_MAJOR}.${Mscore_VERSION_MINOR}") @@ -168,18 +177,18 @@ IF("$ENV{PROCESSOR_ARCHITEW6432}" STREQUAL "") IF($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "x86") # "pure" 32-bit environment - set (JACK_INCDIR "C:/Program Files/Jack v1.9.7/includes") - set (JACK_LIB "C:/Program Files/Jack v1.9.7/lib/libjack.a") + set (JACK_INCDIR "C:/Program Files/Jack/includes") + set (JACK_LIB "C:/Program Files/Jack/lib/libjack.a") ELSE($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "x86") # "pure" 64-bit environment - set (JACK_INCDIR "C:/Program Files (x86)/Jack v1.9.7/includes") - set (JACK_LIB "C:/Program Files (x86)/Jack v1.9.7/lib/libjack.a") + set (JACK_INCDIR "C:/Program Files (x86)/Jack/includes") + set (JACK_LIB "C:/Program Files (x86)/Jack/lib/libjack.a") ENDIF($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "x86") ELSE("$ENV{PROCESSOR_ARCHITEW6432}" STREQUAL "") IF("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "x86") # 32-bit program running with an underlying 64-bit environment - set (JACK_INCDIR "C:/Program Files (x86)/Jack v1.9.7/includes") - set (JACK_LIB "C:/Program Files (x86)/Jack v1.9.7/lib/libjack.a") + set (JACK_INCDIR "C:/Program Files (x86)/Jack/includes") + set (JACK_LIB "C:/Program Files (x86)/Jack/lib/libjack.a") ELSE("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "x86") # theoretically impossible case... ENDIF("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "x86") @@ -232,23 +241,83 @@ ${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h ) + +# +# create precompiled header file +# +add_custom_command( + OUTPUT ${PROJECT_BINARY_DIR}/all.h + COMMAND ${CMAKE_COMMAND} + ARGS -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h + DEPENDS ${PROJECT_SOURCE_DIR}/all.h + WORKING_DIRECTORY ${PROJECT_BINARY_DIR} + ) + +set(CMAKE_CXX_FLAGS_DEBUG "") +set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") + +if (CMAKE_BUILD_TYPE STREQUAL "DEBUG") + if (MINGW) + set(FLAGS -DQT_DEBUG -DQT_DLL) + else (MINGW) + set (FLAGS -DQT_DEBUG) + endif (MINGW) +else (CMAKE_BUILD_TYPE STREQUAL "DEBUG") + if (MINGW) + set(FLAGS -O2 -DNDEBUG -DQT_DLL -DQT_NO_DEBUG) + else (MINGW) + set(FLAGS -O2 -DNDEBUG -DQT_NO_DEBUG) + endif (MINGW) +endif (CMAKE_BUILD_TYPE STREQUAL "DEBUG") + +MESSAGE( STATUS "CMAKE_CXX_COMPILER_ID:" ${CMAKE_CXX_COMPILER_ID}) + +if (${CMAKE_CXX_COMPILER_ID} EQUAL "Clang") + add_custom_command( + OUTPUT ${PROJECT_BINARY_DIR}/all.h.pch + COMMAND ${CMAKE_CXX_COMPILER} + -x c++-header -g ${FLAGS} + -I${QT_INCLUDE_DIR} + -o all.h.pch all.h + DEPENDS ${PROJECT_BINARY_DIR}/all.h + WORKING_DIRECTORY ${PROJECT_BINARY_DIR} + ) + set (PCH ${PROJECT_BINARY_DIR}/all.h.pch) +else (${CMAKE_CXX_COMPILER_ID} EQUAL "Clang") + add_custom_command( + OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch + COMMAND ${CMAKE_CXX_COMPILER} + -x c++-header -g ${FLAGS} -m32 + -I${QT_HEADERS_DIR} + -o all.h.gch all.h + DEPENDS ${PROJECT_BINARY_DIR}/all.h + WORKING_DIRECTORY ${PROJECT_BINARY_DIR} + ) + set (PCH ${PROJECT_BINARY_DIR}/all.h.gch) +endif(${CMAKE_CXX_COMPILER_ID} EQUAL "Clang") + +ADD_CUSTOM_TARGET(mops1 DEPENDS ${PROJECT_BINARY_DIR}/all.h) +ADD_CUSTOM_TARGET(mops2 DEPENDS ${PCH}) + + if (NOT MINGW AND NOT APPLE) install( FILES packaging/mscore.desktop DESTINATION share/applications) endif (NOT MINGW AND NOT APPLE) -set (subdirs al awl bww2mxml osdabzip rtf2html mscore share manual demos +subdirs (al awl bww2mxml osdabzip rtf2html mscore share manual demos singleapp fluid) if (BUILD_SCRIPTGEN) - set (subdirs ${subdirs} scriptgen) + subdirs (scriptgen) endif (BUILD_SCRIPTGEN) if (MINGW OR APPLE) - set (subdirs ${subdirs} portmidi) + subdirs (portmidi) endif (MINGW OR APPLE) -subdirs(${subdirs}) - +if (OSC) + subdirs (ofqf) +endif (OSC) include_directories( ${PROJECT_SOURCE_DIR} @@ -353,6 +422,7 @@ add_custom_target(lrelease COMMAND ${PROJECT_SOURCE_DIR}/gen-qt-projectfile ${PROJECT_SOURCE_DIR} > mscore.pro COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/locale/*.ts + COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/plugins/musescore.com/translations/*.ts WORKING_DIRECTORY ${PROJECT_BINARY_DIR} ) diff -Nru musescore-1.1+dfsg/mscore/config.h.in musescore-1.2+dfsg/mscore/config.h.in --- musescore-1.1+dfsg/mscore/config.h.in 2011-07-27 13:33:18.000000000 +0000 +++ musescore-1.2+dfsg/mscore/config.h.in 2012-03-13 13:37:09.000000000 +0000 @@ -33,3 +33,5 @@ #define INSTALL_NAME "${Mscore_INSTALL_NAME}" #define INSTPREFIX "${CMAKE_INSTALL_PREFIX}" #define VERSION "${Mscore_VERSION_FULL}" + +#cmakedefine OSC diff -Nru musescore-1.1+dfsg/mscore/demos/CMakeLists.txt musescore-1.2+dfsg/mscore/demos/CMakeLists.txt --- musescore-1.1+dfsg/mscore/demos/CMakeLists.txt 2011-07-27 13:32:59.000000000 +0000 +++ musescore-1.2+dfsg/mscore/demos/CMakeLists.txt 2012-03-13 13:33:11.000000000 +0000 @@ -41,6 +41,7 @@ sarabande-gfh.mscz All_Dudes.mscz Triumph.mscz + Reunion.mscz DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}demos ) diff -Nru musescore-1.1+dfsg/mscore/demos/golliwogg.mscx musescore-1.2+dfsg/mscore/demos/golliwogg.mscx --- musescore-1.1+dfsg/mscore/demos/golliwogg.mscx 2011-07-27 13:32:59.000000000 +0000 +++ musescore-1.2+dfsg/mscore/demos/golliwogg.mscx 2012-03-13 13:33:10.000000000 +0000 @@ -1,8 +1,8 @@ - - 9.69674 - -1295.12 - -2219.14 + + 1.2 + 5449 + 1.56 480 + Title + 0 + Composer + 0 + Subtitle + 0 Tempo + 1 - + 0 + f + 0 - 253 + 13 + + 44 + + + + 44 + + + + 44 + + + 1 + 1 132 @@ -1418,6 +1439,7 @@ sforzato + 0 @@ -1425,9 +1447,11 @@ 82 12 + Fingering - + + 0 Fingering - + + 0 + f + 0 16th - + 16th - 6 + 3 68 10 @@ -1563,7 +1591,7 @@ 16th - 6 + 3 65 13 @@ -1571,7 +1599,7 @@ 16th - 6 + 3 63 11 @@ -1589,7 +1617,6 @@ 4 - @@ -1601,17 +1628,21 @@ 110 2097184 + sff + 3600 - + 0 90 7340042 + + 2880 - + 0 + MeasureNumber measure @@ -1699,22 +1731,24 @@ 90 2097184 + f + 5520 - + 0 60 2097184 + p 4800 - eighth - + begin @@ -1722,7 +1756,7 @@ staccato - 12 + 6 51 11 @@ -1735,7 +1769,7 @@ mid eighth - 12 + 6 mid @@ -1743,7 +1777,7 @@ staccato - 12 + 6 51 11 @@ -1758,7 +1792,7 @@ staccato - 12 + 6 51 11 @@ -1773,22 +1807,23 @@ 60 0 + p + 6000 - 5760 auto eighth - + begin eighth - 15 + 7 51 11 @@ -1801,7 +1836,7 @@ mid eighth - 15 + 7 mid @@ -1809,7 +1844,7 @@ staccato - 15 + 7 51 11 @@ -1824,31 +1859,34 @@ 60 0 + p + 7440 - 90 0 + f + 6960 - + 0 6720 eighth - + 16th staccato - 18 + 8 51 11 @@ -1863,7 +1901,7 @@ staccato - 18 + 8 51 11 @@ -1876,14 +1914,14 @@ mid eighth - 18 + 8 eighth staccato - 18 + 8 51 11 @@ -1898,8 +1936,9 @@ 40 0 - pp + pp + 0 line @@ -1907,14 +1946,14 @@ eighth - + eighth staccato - 21 + 9 51 11 @@ -1927,14 +1966,14 @@ mid eighth - 21 + 9 eighth staccato - 21 + 9 51 11 @@ -1945,25 +1984,28 @@ - - MeasureNumber + MeasureNumber 80 0 + mf - + + 0 + Staff - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 sff + 11280 - + 0 - + 10560 @@ -2226,9 +2284,10 @@ sforzato + - 32 + 14 58 12 @@ -2240,7 +2299,7 @@ staccato - 32 + 14 58 12 @@ -2248,19 +2307,19 @@ 16th - 32 + 14 60 14 5 - + eighth - 33 + 15 58 12 @@ -2272,7 +2331,7 @@ staccato - 33 + 15 63 11 @@ -2298,21 +2357,21 @@ 4 - 60 0 + p - + line - + 16th @@ -2322,9 +2381,10 @@ sforzato + - 38 + 16 58 12 @@ -2333,7 +2393,7 @@ eighth - 38 + 16 56 10 @@ -2341,20 +2401,20 @@ 16th - 38 + 16 58 12 - + eighth staccato - 39 + 17 60 14 @@ -2365,7 +2425,7 @@ staccato - 39 + 17 56 10 @@ -2374,29 +2434,31 @@ - MeasureNumber + MeasureNumber 60 0 - p + p - + 16th sforzato + tenuto + - 42 + 18 58 12 @@ -2405,7 +2467,7 @@ eighth - 42 + 18 56 10 @@ -2413,20 +2475,20 @@ 16th - 42 + 18 58 12 - + eighth staccato - 43 + 19 59 7 @@ -2437,7 +2499,7 @@ staccato - 43 + 19 56 10 @@ -2448,24 +2510,28 @@ 90 0 + f - + + 0 - + 16th - 46 + 20 58 12 + Fingering + 14400 - + 0 Fingering + 14520 - + 0 + 15840 - + 0 Fingering + 15360 - + 0 Fingering + 15840 - + 0 f - + + 0 - + 16th sforzato + - 52 + 23 up 70 @@ -2661,7 +2739,7 @@ eighth - 52 + 23 68 10 @@ -2669,20 +2747,20 @@ 16th - 52 + 23 70 12 - + eighth staccato - 53 + 24 65 13 @@ -2693,7 +2771,7 @@ staccato - 53 + 24 70 12 @@ -2701,6 +2779,7 @@ + 1 16320 eighth @@ -2724,6 +2803,7 @@ + 1 eighth @@ -2749,16 +2829,17 @@ line - + 16th sforzato + - 56 + 25 up 68 @@ -2768,7 +2849,7 @@ eighth - 56 + 25 65 13 @@ -2776,20 +2857,20 @@ 16th - 56 + 25 63 11 - + eighth staccato - 57 + 26 59 7 @@ -2800,7 +2881,7 @@ staccato - 57 + 26 63 11 @@ -2808,6 +2889,7 @@ + 1 17280 eighth @@ -2825,6 +2907,7 @@ + 1 eighth @@ -2843,18 +2926,20 @@ 0.8 - MeasureNumber + MeasureNumber 110 0 + sff + 18960 - + 0 - + 18240 @@ -2862,9 +2947,10 @@ sforzato + - 60 + 27 58 12 @@ -2876,7 +2962,7 @@ staccato - 60 + 27 58 12 @@ -2884,19 +2970,19 @@ 16th - 60 + 27 60 14 5 - + eighth - 61 + 28 58 12 @@ -2908,7 +2994,7 @@ staccato - 61 + 28 63 11 @@ -2939,15 +3025,18 @@ 60 0 + p - + + Staff + 20280 - + 0 ff + 22800 - + 0 90 0 + f + 22080 - + 0 - + 16th sforzato + - 73 + 32 65 13 @@ -3104,7 +3198,7 @@ staccato - 73 + 32 65 13 @@ -3115,23 +3209,25 @@ sforzato + - 73 + 32 67 15 5 - + eighth sforzato + - 74 + 33 65 13 @@ -3142,13 +3238,14 @@ umarcato + staccato - 1 + - 74 + 33 67 15 @@ -3186,6 +3283,7 @@ umarcato + staccato @@ -3206,22 +3304,23 @@ - MeasureNumber + MeasureNumber 60 0 + p - + - + 16th - 76 + 34 60 14 @@ -3234,7 +3333,7 @@ eighth - 76 + 34 62 16 @@ -3246,7 +3345,7 @@ 16th - 76 + 34 63 11 @@ -3256,7 +3355,7 @@ 15 - + eighth @@ -3264,7 +3363,7 @@ staccato - 77 + 35 62 16 @@ -3280,7 +3379,7 @@ staccato - 77 + 35 60 14 @@ -3297,6 +3396,7 @@ tenuto + down @@ -3310,6 +3410,7 @@ + 1 24960 quarter @@ -3333,6 +3434,7 @@ + 1 eighth @@ -3341,16 +3443,17 @@ 60 0 + p - + - + 16th - 82 + 36 60 14 @@ -3363,7 +3466,7 @@ eighth - 82 + 36 62 16 @@ -3375,7 +3478,7 @@ 16th - 82 + 36 63 11 @@ -3385,7 +3488,7 @@ 15 - + eighth @@ -3393,7 +3496,7 @@ staccato - 83 + 37 62 16 @@ -3409,7 +3512,7 @@ staccato - 83 + 37 60 14 @@ -3436,12 +3539,12 @@ 13 - + eighth - 86 + 38 60 14 @@ -3454,7 +3557,7 @@ mid eighth - 86 + 38 62 16 @@ -3469,12 +3572,13 @@ sforzato + staccato - 86 + 38 67 15 @@ -3493,9 +3597,10 @@ 60 0 + p - + line @@ -3529,8 +3634,8 @@ - MeasureNumber + MeasureNumber half @@ -3552,8 +3657,10 @@ 60 0 - + + + 0 f + 30840 - + 0 100 0 + ff + 31440 - + 0 30720 16th - + 16th - 95 + 39 46 12 @@ -3618,7 +3728,7 @@ 16th - 95 + 39 48 14 @@ -3626,18 +3736,18 @@ 16th - 95 + 39 50 16 - + eighth - 96 + 40 48 14 @@ -3648,30 +3758,30 @@ staccato - 96 + 40 46 12 - 60 0 + p - + - + 16th - 99 + 41 60 14 @@ -3684,7 +3794,7 @@ eighth - 99 + 41 62 16 @@ -3696,7 +3806,7 @@ 16th - 99 + 41 63 11 @@ -3706,7 +3816,7 @@ 15 - + eighth @@ -3714,7 +3824,7 @@ staccato - 100 + 42 62 16 @@ -3730,7 +3840,7 @@ staccato - 100 + 42 60 14 @@ -3762,6 +3872,7 @@ + 1 32640 quarter @@ -3790,22 +3901,23 @@ - MeasureNumber + MeasureNumber 60 0 + p - + - + 16th - 105 + 43 60 14 @@ -3818,7 +3930,7 @@ eighth - 105 + 43 62 16 @@ -3830,7 +3942,7 @@ 16th - 105 + 43 63 11 @@ -3840,7 +3952,7 @@ 15 - + eighth @@ -3848,7 +3960,7 @@ staccato - 106 + 44 62 16 @@ -3863,7 +3975,7 @@ staccato - 106 + 44 60 14 @@ -3891,7 +4003,7 @@ 13 - + eighth @@ -3899,7 +4011,7 @@ staccato - 109 + 45 60 14 @@ -3912,7 +4024,7 @@ mid eighth - 109 + 45 62 16 @@ -3928,7 +4040,7 @@ staccato - 109 + 45 67 15 @@ -3947,9 +4059,11 @@ 90 0 + f - + + 0 half @@ -3970,7 +4084,7 @@ - + 1 35520 @@ -3980,9 +4094,10 @@ sforzato + 1 - 112 + 46 up 1 @@ -3994,7 +4109,7 @@ 1 eighth - 112 + 46 1 35640 @@ -4009,7 +4124,7 @@ staccato 1 - 112 + 46 1 35880 @@ -4017,7 +4132,7 @@ 12 - + 1 35520 @@ -4028,10 +4143,11 @@ sforzato + 1 36000 - 113 + 47 up 1 @@ -4046,9 +4162,10 @@ sforzato + 1 - 113 + 47 1 36240 @@ -4072,9 +4189,10 @@ + quarter - + 1 36480 @@ -4084,9 +4202,10 @@ sforzato + 1 - 116 + 48 up 1 @@ -4098,7 +4217,7 @@ 1 eighth - 116 + 48 1 36600 @@ -4109,7 +4228,7 @@ 1 16th - 116 + 48 1 36840 @@ -4123,6 +4242,7 @@ umarcato + 1 up @@ -4139,17 +4259,21 @@ 90 0 + f - + + 0 100 0 + ff + 38160 - + 0 line @@ -4158,12 +4282,12 @@ 37440 16th - + 16th - 118 + 49 68 10 @@ -4171,7 +4295,7 @@ 16th - 118 + 49 65 13 @@ -4180,20 +4304,20 @@ 16th - 118 + 49 63 11 - + eighth staccato - 119 + 50 59 7 @@ -4201,7 +4325,6 @@ 4 - eighth @@ -4211,7 +4334,7 @@ dmarcato - 119 + 50 up 50 @@ -4225,16 +4348,17 @@ - MeasureNumber + MeasureNumber 60 0 + p + 38640 - 38400 @@ -4287,10 +4411,11 @@ 60 0 + p + 40560 - 40320 @@ -4343,10 +4468,11 @@ 60 0 + p + 42480 - 42240 @@ -4396,8 +4522,10 @@ 60 0 - + + + 0 + MeasureNumber 50 0 + pp - + + 0 2 + Tempo + 44400 1 - + 0 pp - + + 0 eighth @@ -4787,8 +4947,8 @@ - MeasureNumber + MeasureNumber measure @@ -4834,9 +4994,11 @@ 50 0 + pp - + + 0 eighth @@ -4967,9 +5129,11 @@ 50 0 + pp - + + 0 eighth @@ -5034,8 +5198,8 @@ - MeasureNumber + MeasureNumber eighth @@ -5131,16 +5295,17 @@ measure - 1.33333 + Tempo + 1 - + 0 Staff - + + 0 p - + quarter @@ -5242,30 +5410,34 @@ 0.7 - MeasureNumber + MeasureNumber 50 0 + pp + 59760 - + 0 60 0 + p + 59520 - 2 + Tempo 1 - + 0 Fingering + 1 - + 0 Fingering + 1 - + 0 pp + 60720 - + 0 60480 @@ -5437,7 +5616,7 @@ 16 - + 60720 @@ -5447,7 +5626,7 @@ 60720 - 133 + 52 71 7 @@ -5476,7 +5655,7 @@ 60960 - 133 + 52 71 7 @@ -5507,7 +5686,7 @@ 61200 - 133 + 52 72 14 @@ -5523,16 +5702,18 @@ 60 0 + p + 61920 - 1.33333 + Tempo 1 - + 0 pp + 63600 - + 0 2 + Tempo 63360 1 - + 0 + MeasureNumber eighth @@ -5758,7 +5942,7 @@ 16 - + 64560 @@ -5768,7 +5952,7 @@ 64560 - 137 + 54 70 12 @@ -5797,7 +5981,7 @@ 64800 - 137 + 54 70 12 @@ -5827,7 +6011,7 @@ 65040 - 137 + 54 70 12 @@ -5842,16 +6026,19 @@ 80 0 + mf + 65760 - + 0 1.33333 + Tempo 1 - + 0 f + 66480 - + 0 66240 @@ -5894,6 +6083,7 @@ sforzato + 80 @@ -5913,10 +6103,12 @@ 2 + Tempo + 1 - + 0 + MeasureNumber 60 0 + p + 69600 - 1.33333 + Tempo 69120 1 - + 0 p - + 2 + Tempo + 1 - + 0 Tempo + 1 - + 0 - 50 0 + pp - + + 0 2 + Tempo + 1 - + 0 + MeasureNumber + 90 0 + f + 75360 - + 0 74880 @@ -6667,10 +6875,12 @@ 100 0 + ff + 76080 - + 0 75840 @@ -6707,16 +6917,18 @@ 90 0 + f - + + 0 - + 16th - 150 + 61 up 77 @@ -6726,7 +6938,7 @@ eighth - 150 + 61 80 10 @@ -6735,7 +6947,7 @@ 16th - 150 + 61 78 8 @@ -6746,6 +6958,7 @@ tenuto + up @@ -6753,7 +6966,7 @@ 11 - + 1 76800 @@ -6761,7 +6974,7 @@ 1 eighth - 151 + 62 down 1 @@ -6774,7 +6987,7 @@ 1 mid eighth - 151 + 62 1 77040 @@ -6786,7 +6999,7 @@ 1 mid eighth - 151 + 62 down 1 @@ -6799,7 +7012,7 @@ 1 eighth - 151 + 62 1 77520 @@ -6812,12 +7025,12 @@ line - + 16th - 152 + 63 up 70 @@ -6827,7 +7040,7 @@ eighth - 152 + 63 73 9 @@ -6835,13 +7048,13 @@ 16th - 152 + 63 71 7 - + 1 @@ -6849,8 +7062,9 @@ tenuto + - 153 + 64 65 13 @@ -6858,7 +7072,7 @@ 16th - 153 + 64 66 8 @@ -6867,8 +7081,8 @@ - MeasureNumber + MeasureNumber half @@ -6923,9 +7137,10 @@ 7536700 0 + p - + half @@ -6955,6 +7170,7 @@ + 1 80640 1 @@ -6973,7 +7189,7 @@ 12 - + 1 80640 @@ -6987,7 +7203,7 @@ 81120 - 159 + 65 up 1 @@ -7003,7 +7219,7 @@ staccato 1 - 159 + 65 1 81360 @@ -7015,9 +7231,10 @@ 0 + p - + half @@ -7037,6 +7254,7 @@ + 1 81600 1 @@ -7055,7 +7273,7 @@ 12 - + 1 81600 @@ -7069,7 +7287,7 @@ 82080 - 160 + 66 up 1 @@ -7085,7 +7303,7 @@ staccato 1 - 160 + 66 1 82320 @@ -7097,10 +7315,12 @@ 1 + Tempo + 1 - + 0 p - + line @@ -7134,6 +7355,7 @@ tenuto + 1 82560 @@ -7165,15 +7387,17 @@ - MeasureNumber + MeasureNumber 50 0 + pp - + + 0 half @@ -7204,6 +7428,7 @@ + 2 83520 1 @@ -7221,7 +7446,7 @@ 12 - + 2 83520 @@ -7235,7 +7460,7 @@ 84000 - 163 + 67 2 84000 @@ -7250,7 +7475,7 @@ staccato 2 - 163 + 67 2 84240 @@ -7263,9 +7488,11 @@ 50 0 + pp - + + 0 half @@ -7295,6 +7522,7 @@ + 2 84480 1 @@ -7313,7 +7541,7 @@ 12 - + 2 84480 @@ -7327,7 +7555,7 @@ 84960 - 165 + 68 2 84960 @@ -7342,7 +7570,7 @@ staccato 2 - 165 + 68 2 85200 @@ -7355,16 +7583,20 @@ 50 0 + pp - + + 0 1 + Tempo + 1 - + 0 + MeasureNumber 2 + Tempo + 1 - + 0 + MeasureNumber - + eighth staccato - 188 + 81 48 14 @@ -7789,7 +8051,7 @@ sforzato - 188 + 81 43 15 @@ -7804,7 +8066,7 @@ sforzato - 188 + 81 48 14 @@ -7818,34 +8080,36 @@ sforzato - 188 + 81 50 16 - 90 0 + f - + + 0 - + 16th sforzato + - 190 + 82 up 70 @@ -7855,7 +8119,7 @@ eighth - 190 + 82 68 10 @@ -7863,20 +8127,20 @@ 16th - 190 + 82 70 12 - + eighth staccato - 191 + 83 65 13 @@ -7887,7 +8151,7 @@ staccato - 191 + 83 70 12 @@ -7895,6 +8159,7 @@ + 1 93120 eighth @@ -7918,6 +8183,7 @@ + 1 eighth @@ -7940,16 +8206,17 @@ - + 16th sforzato + - 194 + 84 68 10 @@ -7958,7 +8225,7 @@ eighth - 194 + 84 65 13 @@ -7966,20 +8233,20 @@ 16th - 194 + 84 63 11 - + eighth staccato - 195 + 85 59 7 @@ -7990,7 +8257,7 @@ staccato - 195 + 85 63 11 @@ -7998,6 +8265,7 @@ + 1 94080 eighth @@ -8015,6 +8283,7 @@ + 1 eighth @@ -8031,16 +8300,17 @@ - + 16th sforzato + - 198 + 86 58 12 @@ -8052,7 +8322,7 @@ staccato - 198 + 86 58 12 @@ -8060,18 +8330,18 @@ 16th - 198 + 86 60 14 - + eighth - 199 + 87 58 12 @@ -8083,7 +8353,7 @@ staccato - 199 + 87 63 11 @@ -8113,25 +8383,27 @@ 0.8 - MeasureNumber + MeasureNumber 0 + p - + - + 16th sforzato + - 204 + 88 58 12 @@ -8143,7 +8415,7 @@ staccato - 204 + 88 58 12 @@ -8151,20 +8423,20 @@ 16th - 204 + 88 60 14 - + eighth staccato - 205 + 89 58 12 @@ -8175,7 +8447,7 @@ staccato - 205 + 89 61 9 @@ -8184,14 +8456,14 @@ 0.8 - + eighth staccato - 208 + 90 63 11 @@ -8202,7 +8474,7 @@ staccato - 208 + 90 65 13 @@ -8214,7 +8486,7 @@ staccato - 208 + 90 63 11 @@ -8225,7 +8497,7 @@ staccato - 208 + 90 66 8 @@ -8237,19 +8509,23 @@ 90 0 + f - + + 0 100 0 + ff + 99360 - + 0 - + 98880 @@ -8257,10 +8533,11 @@ sforzato + 98880 - 211 + 91 65 13 @@ -8272,7 +8549,7 @@ staccato - 211 + 91 65 13 @@ -8283,23 +8560,25 @@ sforzato + - 211 + 91 67 15 5 - + eighth sforzato + - 212 + 92 65 13 @@ -8310,7 +8589,7 @@ staccato - 212 + 92 67 15 @@ -8367,12 +8646,12 @@ 0.8 - + 16th - 214 + 93 60 14 @@ -8385,7 +8664,7 @@ eighth - 214 + 93 62 16 @@ -8400,7 +8679,7 @@ staccato - 214 + 93 63 11 @@ -8410,7 +8689,7 @@ 15 - + eighth @@ -8418,7 +8697,7 @@ staccato - 215 + 94 62 16 @@ -8434,7 +8713,7 @@ staccato - 215 + 94 60 14 @@ -8455,6 +8734,7 @@ tenuto + down @@ -8468,6 +8748,7 @@ + 1 101760 quarter @@ -8495,6 +8776,7 @@ + 1 eighth @@ -8502,22 +8784,23 @@ 0.9 - MeasureNumber + MeasureNumber 60 0 + p - + - + 16th - 220 + 95 60 14 @@ -8530,7 +8813,7 @@ eighth - 220 + 95 62 16 @@ -8542,7 +8825,7 @@ 16th - 220 + 95 63 11 @@ -8552,7 +8835,7 @@ 15 - + eighth @@ -8560,7 +8843,7 @@ staccato - 221 + 96 62 16 @@ -8576,7 +8859,7 @@ staccato - 221 + 96 60 14 @@ -8616,11 +8899,11 @@ 11 - + eighth - 224 + 97 62 16 @@ -8638,9 +8921,10 @@ sforzato + - 224 + 97 67 15 @@ -8656,7 +8940,6 @@ 4 - @@ -8664,9 +8947,10 @@ 60 0 + p - + half @@ -8733,9 +9017,10 @@ 60 0 + p - + line @@ -8767,8 +9052,8 @@ - MeasureNumber + MeasureNumber half @@ -8783,7 +9068,6 @@ - 1 @@ -8799,11 +9083,12 @@ + 2 107520 eighth - + 2 107520 @@ -8811,7 +9096,7 @@ 2 107760 16th - 233 + 98 down 2 @@ -8823,7 +9108,7 @@ 2 16th - 233 + 98 2 107880 @@ -8848,11 +9133,11 @@ - + 16th - 236 + 99 60 14 @@ -8864,7 +9149,7 @@ eighth - 236 + 99 62 16 @@ -8876,7 +9161,7 @@ 16th - 236 + 99 63 11 @@ -8886,11 +9171,11 @@ 15 - + eighth - 237 + 100 62 16 @@ -8902,7 +9187,7 @@ eighth - 237 + 100 60 14 @@ -8928,6 +9213,7 @@ + 1 109440 quarter @@ -8951,16 +9237,17 @@ + 1 eighth - + 16th - 242 + 101 60 14 @@ -8972,7 +9259,7 @@ eighth - 242 + 101 62 16 @@ -8984,7 +9271,7 @@ 16th - 242 + 101 63 11 @@ -8994,11 +9281,11 @@ 15 - + eighth - 243 + 102 62 16 @@ -9010,7 +9297,7 @@ eighth - 243 + 102 60 14 @@ -9037,11 +9324,11 @@ 13 - + eighth - 246 + 103 60 14 @@ -9054,7 +9341,7 @@ mid eighth - 246 + 103 62 16 @@ -9066,7 +9353,7 @@ eighth - 246 + 103 67 15 @@ -9083,26 +9370,29 @@ - MeasureNumber + MeasureNumber 90 0 + f - + + 0 - + 16th sforzato + - 249 + 104 82 12 @@ -9111,7 +9401,7 @@ eighth - 249 + 104 80 10 @@ -9119,21 +9409,22 @@ 16th - 249 + 104 82 12 - + eighth sforzato + - 250 + 105 77 13 @@ -9144,8 +9435,9 @@ sforzato + - 250 + 105 82 12 @@ -9179,16 +9471,17 @@ - + 16th sforzato + - 253 + 106 80 10 @@ -9197,7 +9490,7 @@ eighth - 253 + 106 77 13 @@ -9205,7 +9498,7 @@ 16th - 253 + 106 75 11 @@ -9216,6 +9509,7 @@ umarcato + 71 @@ -9243,6 +9537,7 @@ + 1 quarter @@ -9251,28 +9546,32 @@ 90 0 + f + 114360 - + 0 100 0 + ff + 114960 - + 0 114240 16th - + 16th - 255 + 107 68 10 @@ -9280,7 +9579,7 @@ 16th - 255 + 107 65 13 @@ -9288,13 +9587,13 @@ 16th - 255 + 107 63 11 - + begin @@ -9302,7 +9601,7 @@ staccato - 256 + 108 59 7 @@ -9310,7 +9609,6 @@ 4 - mid @@ -9321,7 +9619,7 @@ dmarcato - 256 + 108 up 50 @@ -9337,10 +9635,11 @@ 60 0 + p + 115440 - 115200 @@ -9393,10 +9692,11 @@ 60 0 + p + 117360 - line @@ -9445,8 +9745,8 @@ - MeasureNumber + MeasureNumber measure @@ -9456,10 +9756,11 @@ 60 0 + p + 119280 - 119040 @@ -9507,16 +9808,18 @@ 90 0 + f + 120480 - + 0 120000 quarter - + eighth @@ -9524,7 +9827,7 @@ dmarcato - 262 + 109 47 7 @@ -9533,7 +9836,7 @@ mid 32nd - 262 + 109 46 12 @@ -9541,7 +9844,7 @@ 32nd - 262 + 109 44 10 @@ -9549,7 +9852,7 @@ 32nd - 262 + 109 43 15 @@ -9557,7 +9860,7 @@ 32nd - 262 + 109 41 13 @@ -9568,10 +9871,12 @@ 100 0 + ff + 121200 - + 0 120960 @@ -9599,9 +9904,11 @@ 100 0 + ff - + + 0 eighth @@ -9629,24 +9936,27 @@ - + 16th sforzato + - 2 + 110 up 70 12 + Fingering - + + 0 Fingering - + + 0 p - + - + eighth staccato - 26 + 124 down 39 @@ -10164,7 +10478,7 @@ staccato - 26 + 124 53 13 @@ -10174,14 +10488,14 @@ 10 - + eighth staccato - 27 + 125 down 39 @@ -10197,7 +10511,7 @@ staccato - 27 + 125 53 13 @@ -10209,14 +10523,14 @@ - + eighth staccato - 30 + 126 down 39 @@ -10232,7 +10546,7 @@ staccato - 30 + 126 53 13 @@ -10242,14 +10556,14 @@ 10 - + eighth staccato - 31 + 127 down 39 @@ -10265,7 +10579,7 @@ staccato - 31 + 127 53 13 @@ -10277,14 +10591,14 @@ - + eighth staccato - 34 + 128 down 39 @@ -10300,7 +10614,7 @@ staccato - 34 + 128 53 13 @@ -10310,14 +10624,14 @@ 15 - + eighth staccato - 35 + 129 down 39 @@ -10330,7 +10644,7 @@ eighth - 35 + 129 53 13 @@ -10342,14 +10656,14 @@ - + eighth staccato - 36 + 130 down 39 @@ -10365,7 +10679,7 @@ staccato - 36 + 130 53 13 @@ -10375,14 +10689,14 @@ 15 - + eighth staccato - 37 + 131 down 39 @@ -10398,7 +10712,7 @@ staccato - 37 + 131 53 13 @@ -10410,14 +10724,14 @@ - + eighth staccato - 40 + 132 down 39 @@ -10433,7 +10747,7 @@ staccato - 40 + 132 51 11 @@ -10443,14 +10757,14 @@ 13 - + eighth staccato - 41 + 133 down 39 @@ -10466,7 +10780,7 @@ staccato - 41 + 133 51 11 @@ -10478,14 +10792,14 @@ - + eighth staccato - 44 + 134 down 39 @@ -10501,7 +10815,7 @@ staccato - 44 + 134 51 11 @@ -10511,14 +10825,14 @@ 13 - + eighth staccato - 45 + 135 down 39 @@ -10534,7 +10848,7 @@ staccato - 45 + 135 51 11 @@ -10546,19 +10860,21 @@ - + 16th - 48 + 136 46 12 + Fingering - + + 0 Fingering + 15120 - 0 + 0 Fingering - + 0 + 0 Fingering - + 0 + 0 Fingering - + + 0 Fingering + 5 - 0 + 0 Fingering - + 0 + 0 Fingering + 5 - 0 + 0 Fingering + 5 - + 0 Fingering - + 0 + 0 Fingering - + + 0 Fingering - + 0 + 0 Fingering - + 0 + 0 Fingering - + + 0 Fingering - + 0 + 0 Fingering - + 0 + 0 Fingering + 5 - 0 + 0 Fingering - + 0 + 0 Fingering + 5 - + 0 Fingering - + 0 + 0 Fingering - + 0 + 0 Fingering - + 0 + 0 Fingering - + + 0 Fingering - + + 0 pp + 71280 - + 0 + 71040 eighth - + eighth staccato - 146 + 195 down 56 @@ -14168,7 +14563,7 @@ staccato - 146 + 195 down 56 @@ -14188,7 +14583,7 @@ staccato - 146 + 195 56 10 @@ -14232,20 +14627,21 @@ 60 2097184 + p + 72240 - 72000 eighth - + eighth - 147 + 196 54 8 @@ -14254,7 +14650,7 @@ mid eighth - 147 + 196 53 13 @@ -14262,7 +14658,7 @@ eighth - 147 + 196 51 11 @@ -14292,9 +14688,10 @@ 60 0 + p - + half @@ -14318,11 +14715,12 @@ + 6 73920 eighth - + 6 @@ -14332,7 +14730,7 @@ staccato 6 - 149 + 197 down 6 @@ -14361,7 +14759,7 @@ staccato 6 - 149 + 197 6 74400 @@ -14388,7 +14786,7 @@ staccato 6 - 149 + 197 6 74640 @@ -14414,7 +14812,6 @@ quarter - quarter @@ -14445,6 +14842,7 @@ sforzato + 71 @@ -14461,7 +14859,6 @@ 4 - @@ -14475,6 +14872,7 @@ + 5 76800 eighth @@ -14519,22 +14917,23 @@ 3 eighth + Tuplet 77760 - + 0 +

3

 - + eighth - 154 + 198 up 63 @@ -14543,18 +14942,18 @@ eighth - 154 + 198 61 9 - + 0 eighth - 155 + 199 up 59 @@ -14564,7 +14963,7 @@ 0 eighth - 155 + 199 58 12 @@ -14573,7 +14972,7 @@ 0 eighth - 155 + 199 56 10 @@ -14581,13 +14980,13 @@ - + 16th - 156 + 200 46 12 @@ -14596,7 +14995,7 @@ eighth - 156 + 200 49 9 @@ -14604,7 +15003,7 @@ 16th - 156 + 200 47 7 @@ -14624,12 +15023,12 @@ - + 16th - 157 + 201 37 9 @@ -14637,7 +15036,7 @@ eighth - 157 + 201 39 11 @@ -14645,18 +15044,18 @@ 16th - 157 + 201 41 13 - + eighth - 158 + 202 39 11 @@ -14665,7 +15064,7 @@ eighth - 158 + 202 37 9 @@ -14695,12 +15094,12 @@ - + 16th - 161 + 203 46 12 @@ -14708,7 +15107,7 @@ eighth - 161 + 203 49 9 @@ -14716,17 +15115,17 @@ 16th - 161 + 203 47 7 - + 16th - 162 + 204 37 9 @@ -14734,7 +15133,7 @@ eighth - 162 + 204 39 11 @@ -14742,7 +15141,7 @@ 16th - 162 + 204 41 13 @@ -14750,11 +15149,11 @@ - + eighth - 164 + 205 39 11 @@ -14763,7 +15162,7 @@ eighth - 164 + 205 37 9 @@ -14792,7 +15191,33 @@ - 64253 + 64173 + + 40 + + + + 40 + + + + 40 + + + + 44 + + + + 44 + + + + 44 + + + 1 + 1 measure @@ -14804,14 +15229,14 @@ - + eighth staccato - 172 + 206 down 39 @@ -14827,7 +15252,7 @@ staccato - 172 + 206 53 13 @@ -14837,14 +15262,14 @@ 15 - + eighth staccato - 173 + 207 down 39 @@ -14860,7 +15285,7 @@ staccato - 173 + 207 53 13 @@ -14872,14 +15297,14 @@ - + eighth staccato - 174 + 208 down 39 @@ -14895,7 +15320,7 @@ staccato - 174 + 208 53 13 @@ -14905,14 +15330,14 @@ 15 - + eighth staccato - 175 + 209 down 39 @@ -14928,7 +15353,7 @@ staccato - 175 + 209 53 13 @@ -14943,18 +15368,19 @@ 60 0 + p - + - + eighth staccato - 178 + 210 down 39 @@ -14970,7 +15396,7 @@ staccato - 178 + 210 51 11 @@ -14980,14 +15406,14 @@ 13 - + eighth staccato - 179 + 211 down 39 @@ -15003,7 +15429,7 @@ staccato - 179 + 211 51 11 @@ -15018,18 +15444,19 @@ 60 655392 + p - + - + eighth staccato - 182 + 212 down 39 @@ -15045,7 +15472,7 @@ staccato - 182 + 212 51 11 @@ -15055,14 +15482,14 @@ 13 - + eighth staccato - 183 + 213 down 39 @@ -15078,7 +15505,7 @@ staccato - 183 + 213 51 11 @@ -15090,11 +15517,11 @@ - + 16th - 186 + 214 46 12 @@ -15102,7 +15529,7 @@ eighth - 186 + 214 43 15 @@ -15113,20 +15540,20 @@ staccato - 186 + 214 41 13 - + eighth staccato - 187 + 215 39 11 @@ -15137,7 +15564,7 @@ staccato - 187 + 215 38 16 @@ -15145,14 +15572,14 @@ - + eighth staccato - 189 + 216 36 14 @@ -15166,7 +15593,7 @@ sforzato - 189 + 216 31 15 @@ -15181,7 +15608,7 @@ sforzato - 189 + 216 36 14 @@ -15195,7 +15622,7 @@ sforzato - 189 + 216 38 16 @@ -15203,14 +15630,14 @@ - + eighth staccato - 192 + 217 down 39 @@ -15226,7 +15653,7 @@ staccato - 192 + 217 53 13 @@ -15236,14 +15663,14 @@ 10 - + eighth staccato - 193 + 218 down 39 @@ -15259,7 +15686,7 @@ staccato - 193 + 218 53 13 @@ -15271,14 +15698,14 @@ - + eighth staccato - 196 + 219 down 39 @@ -15294,7 +15721,7 @@ staccato - 196 + 219 53 13 @@ -15304,14 +15731,14 @@ 10 - + eighth staccato - 197 + 220 down 39 @@ -15327,7 +15754,7 @@ staccato - 197 + 220 53 13 @@ -15339,14 +15766,14 @@ - + eighth staccato - 200 + 221 down 39 @@ -15362,7 +15789,7 @@ staccato - 200 + 221 53 13 @@ -15372,14 +15799,14 @@ 15 - + eighth staccato - 201 + 222 down 39 @@ -15395,7 +15822,7 @@ staccato - 201 + 222 53 13 @@ -15407,14 +15834,14 @@ - + eighth staccato - 202 + 223 down 39 @@ -15430,7 +15857,7 @@ staccato - 202 + 223 53 13 @@ -15440,14 +15867,14 @@ 15 - + eighth staccato - 203 + 224 down 39 @@ -15463,7 +15890,7 @@ staccato - 203 + 224 53 13 @@ -15475,14 +15902,14 @@ - + eighth staccato - 206 + 225 down 42 @@ -15498,7 +15925,7 @@ staccato - 206 + 225 49 9 @@ -15512,14 +15939,14 @@ 10 - + eighth staccato - 207 + 226 down 42 @@ -15535,7 +15962,7 @@ staccato - 207 + 226 49 9 @@ -15551,14 +15978,14 @@ - + eighth staccato - 209 + 227 down 42 @@ -15574,7 +16001,7 @@ staccato - 209 + 227 49 9 @@ -15588,14 +16015,14 @@ 12 - + eighth staccato - 210 + 228 down 42 @@ -15611,7 +16038,7 @@ staccato - 210 + 228 49 9 @@ -15642,11 +16069,11 @@ 18 - + eighth - 213 + 229 60 14 @@ -15664,7 +16091,7 @@ umarcato - 213 + 229 53 13 @@ -15726,18 +16153,17 @@ eighth - - + eighth staccato - 216 + 230 56 10 @@ -15753,7 +16179,7 @@ staccato - 216 + 230 68 10 @@ -15763,14 +16189,14 @@ 12 - + eighth staccato - 217 + 231 56 10 @@ -15785,7 +16211,7 @@ staccato - 217 + 231 68 10 @@ -15797,14 +16223,14 @@ - + eighth staccato - 218 + 232 56 10 @@ -15819,7 +16245,7 @@ staccato - 218 + 232 68 10 @@ -15829,14 +16255,14 @@ 12 - + eighth staccato - 219 + 233 56 10 @@ -15851,7 +16277,7 @@ staccato - 219 + 233 68 10 @@ -15863,14 +16289,14 @@ - + eighth staccato - 222 + 234 55 15 @@ -15885,20 +16311,20 @@ staccato - 222 + 234 70 12 - + eighth staccato - 223 + 235 55 15 @@ -15913,7 +16339,7 @@ staccato - 223 + 235 70 12 @@ -15921,14 +16347,14 @@ - + eighth staccato - 225 + 236 55 15 @@ -15943,18 +16369,18 @@ staccato - 225 + 236 70 12 - + eighth - 226 + 237 55 15 @@ -15972,9 +16398,10 @@ sforzato + - 226 + 237 63 11 @@ -15982,16 +16409,15 @@ 4 - - + 16th - 227 + 238 47 19 @@ -16000,7 +16426,7 @@ eighth - 227 + 238 49 21 @@ -16011,20 +16437,20 @@ staccato - 227 + 238 51 23 - + eighth staccato - 228 + 239 49 21 @@ -16035,7 +16461,7 @@ staccato - 228 + 239 47 19 @@ -16043,12 +16469,12 @@ - + 16th - 229 + 240 46 12 @@ -16058,7 +16484,7 @@ eighth - 229 + 240 48 14 @@ -16070,21 +16496,21 @@ staccato - 229 + 240 50 16 5 - + eighth staccato - 230 + 241 48 14 @@ -16095,7 +16521,7 @@ staccato - 230 + 241 46 12 @@ -16103,12 +16529,12 @@ - + 16th - 231 + 242 46 12 @@ -16117,7 +16543,7 @@ eighth - 231 + 242 48 14 @@ -16128,20 +16554,20 @@ staccato - 231 + 242 50 16 - + eighth staccato - 232 + 243 48 14 @@ -16152,7 +16578,7 @@ staccato - 232 + 243 46 12 @@ -16163,12 +16589,12 @@ 16th - + 16th - 234 + 244 34 12 @@ -16180,7 +16606,7 @@ 16th - 234 + 244 36 14 @@ -16188,13 +16614,13 @@ 16th - 234 + 244 38 16 - + eighth @@ -16202,7 +16628,7 @@ staccato - 235 + 245 36 14 @@ -16216,7 +16642,7 @@ dmarcato - 235 + 245 22 12 @@ -16227,18 +16653,17 @@ - - + eighth staccato - 238 + 246 56 10 @@ -16253,7 +16678,7 @@ staccato - 238 + 246 68 10 @@ -16263,14 +16688,14 @@ 12 - + eighth staccato - 239 + 247 56 10 @@ -16285,7 +16710,7 @@ staccato - 239 + 247 68 10 @@ -16297,14 +16722,14 @@ - + eighth staccato - 240 + 248 56 10 @@ -16319,7 +16744,7 @@ staccato - 240 + 248 68 10 @@ -16329,14 +16754,14 @@ 12 - + eighth staccato - 241 + 249 56 10 @@ -16351,7 +16776,7 @@ staccato - 241 + 249 68 10 @@ -16363,14 +16788,14 @@ - + eighth staccato - 244 + 250 55 15 @@ -16385,7 +16810,7 @@ staccato - 244 + 250 67 15 @@ -16395,14 +16820,14 @@ 12 - + eighth staccato - 245 + 251 55 15 @@ -16417,7 +16842,7 @@ staccato - 245 + 251 67 15 @@ -16429,14 +16854,14 @@ - + eighth staccato - 247 + 252 55 15 @@ -16451,7 +16876,7 @@ staccato - 247 + 252 67 15 @@ -16461,14 +16886,14 @@ 12 - + eighth staccato - 248 + 253 55 15 @@ -16483,7 +16908,7 @@ staccato - 248 + 253 67 15 @@ -16495,16 +16920,17 @@ - + 16th sforzato + - 251 + 254 70 12 @@ -16513,7 +16939,7 @@ eighth - 251 + 254 68 10 @@ -16524,21 +16950,22 @@ staccato - 251 + 254 70 12 - + eighth sforzato + - 252 + 255 65 13 @@ -16549,8 +16976,9 @@ sforzato + - 252 + 255 70 12 @@ -16584,16 +17012,17 @@ - + 16th sforzato + - 254 + 256 68 10 @@ -16602,7 +17031,7 @@ eighth - 254 + 256 65 13 @@ -16610,7 +17039,7 @@ 16th - 254 + 256 63 11 @@ -16621,6 +17050,7 @@ umarcato + 59 @@ -16630,7 +17060,6 @@ 4 - 5 @@ -16652,6 +17081,7 @@ + 5 quarter @@ -16933,9 +17363,7 @@ quarter - - 59.8604 - 208.596 + begin @@ -16944,7 +17372,7 @@ dmarcato - 263 + 262 35 7 @@ -16953,7 +17381,7 @@ mid 32nd - 263 + 262 34 12 @@ -16961,7 +17389,7 @@ 32nd - 263 + 262 32 10 @@ -16969,7 +17397,7 @@ 32nd - 263 + 262 31 15 @@ -16977,7 +17405,7 @@ 32nd - 263 + 262 29 13 @@ -17008,6 +17436,7 @@ eighth + 1 27 11 @@ -17024,5 +17453,5 @@ - 0 + 4 diff -Nru musescore-1.1+dfsg/mscore/demos/inv6.mscx musescore-1.2+dfsg/mscore/demos/inv6.mscx --- musescore-1.1+dfsg/mscore/demos/inv6.mscx 2011-07-27 13:32:59.000000000 +0000 +++ musescore-1.2+dfsg/mscore/demos/inv6.mscx 2012-03-13 13:33:10.000000000 +0000 @@ -1,8 +1,8 @@ - - 1 - 0.211667 - 0.211667 + + 1.2 + 5449 + 1.625 480 0 1 @@ -37,6 +31,7 @@ 61.5385 123.077 + 0 @@ -67,9 +62,11 @@ 0 - Piano + Piano + + @@ -85,19 +82,37 @@ 5 5 - Title - Inventio 6 + Title + 0 + + +

Inventio 6

+ - Subtitle - BWV 777 + Subtitle + 0 + + +

BWV 777

+ - Composer - J. S. Bach + Composer + 0 + + +

J. S. Bach

+ @@ -108,24 +123,30 @@ 3 - 120 + 16th - + begin - 240 - 1 - + eighth + 0 + + 76 + 18 + - 240 - 1 - + eighth + 0 + + 75 + 23 + - 120 - 1 + 16th + 0 74 16 @@ -137,26 +158,35 @@ 1.2 - + - 120 - 2 - + 16th + 1 + + 74 + 16 + - 240 - 2 - + eighth + 1 + + 73 + 21 + - 240 - 2 - + eighth + 1 + + 71 + 19 + - 120 - 2 + 16th + 1 69 17 @@ -167,197 +197,284 @@ 1.2 - + - 120 - 3 - + 16th + 2 + + 69 + 17 + - 240 - 3 - + eighth + 2 + + 68 + 22 + - 240 - 3 - + eighth + 2 + + 66 + 20 + - 60 - 3 - + 32nd + 2 + + 68 + 22 + - 60 - 3 - + 32nd + 2 + + 69 + 17 + 1.2 - + - 120 - 4 - + 16th + 3 + + 68 + 22 + - 60 - 4 - + 32nd + 3 + + 71 + 19 + - 60 - 4 - + 32nd + 3 + + 69 + 17 + - 120 - 4 - + 16th + 3 + + 71 + 19 + - 60 - 4 - + 32nd + 3 + + 68 + 22 + - 60 - 4 - + 32nd + 3 + + 66 + 20 + + + + 16th + 3 + + 68 + 22 + + + + 32nd + 3 + + 64 + 18 + + + + 32nd + 3 + + 63 + 23 + + + + 1.2 + + - 120 + eighth 4 - + + 64 + 18 + - 60 + eighth 4 - + + 66 + 20 + - 60 + eighth 4 - + + 68 + 22 + - + 1.2 - 240 + eighth 5 - + + 69 + 17 + - 240 + eighth 5 - + + 71 + 19 + - 240 + eighth 5 - + + 73 + 21 + - + 1.2 - MeasureNumber + MeasureNumber - 240 + eighth 6 - + + 75 + 23 + - 240 + 16th 6 - + + 76 + 18 + - 240 + 16th 6 - - - - - 1.2 - - - - 240 - 7 - - - - 120 - 7 - - - - 120 - 7 - + + 75 + 23 + - 120 - 7 - + 16th + 6 + + 73 + 21 + - 120 - 7 - + 16th + 6 + + 71 + 19 + 1.2 - + - 240 - 8 - + eighth + 7 + + 76 + 18 + - 240 - 8 - + eighth + 7 + + 64 + 18 + - 240 + eighth 1.2 - 120 + 16th - + begin - 240 - 9 - + eighth + 8 + + 80 + 22 + - 240 - 9 - + eighth + 8 + + 76 + 18 + - 120 - 9 + 16th + 8 73 21 @@ -368,41 +485,59 @@ 1.2 - + - 120 - 10 - + 16th + 9 + + 73 + 21 + - 60 - 10 - + 32nd + 9 + + 76 + 18 + - 60 - 10 - + 32nd + 9 + + 75 + 23 + - 120 - 10 - + 16th + 9 + + 76 + 18 + - 120 - 10 - + 16th + 9 + + 73 + 21 + - 120 - 10 - + 16th + 9 + + 70 + 24 + - 120 - 10 + 16th + 9 66 20 @@ -413,30 +548,35 @@ 1.1 - - MeasureNumber - - - + - 120 - 11 - + 16th + 10 + + 66 + 20 + - 240 - 11 - + eighth + 10 + + 78 + 20 + - 240 - 11 - + eighth + 10 + + 75 + 23 + - 120 - 11 + 16th + 10 71 19 @@ -447,42 +587,60 @@ 1.1 - + - 120 - 12 + 16th + 11 up - + + 71 + 19 + - 60 - 12 - + 32nd + 11 + + 75 + 23 + - 60 - 12 - + 32nd + 11 + + 73 + 21 + - 120 - 12 - + 16th + 11 + + 75 + 23 + - 120 - 12 - + 16th + 11 + + 71 + 19 + - 120 - 12 - + 16th + 11 + + 68 + 22 + - 120 - 12 + 16th + 11 64 18 @@ -493,26 +651,39 @@ 1.1 - + + + MeasureNumber + + - 120 - 13 - + 16th + 12 + + 64 + 18 + - 240 - 13 - + eighth + 12 + + 76 + 18 + - 240 - 13 - + eighth + 12 + + 73 + 21 + - 120 - 13 + 16th + 12 70 24 @@ -523,26 +694,35 @@ 1.1 - + - 120 - 14 - + 16th + 13 + + 70 + 24 + - 240 - 14 - + eighth + 13 + + 80 + 22 + - 240 - 14 - + eighth + 13 + + 78 + 20 + - 120 - 14 + 16th + 13 76 18 @@ -553,171 +733,252 @@ 1.1 - + - 120 - 15 - + 16th + 14 + + 76 + 18 + - 240 - 15 - + eighth + 14 + + 75 + 23 + - 240 - 15 - + eighth + 14 + + 73 + 21 + - 120 - 15 - + 16th + 14 + + 71 + 19 + - + - 120 - 16 - + 16th + 15 + + 70 + 24 + - 60 - 16 - + 32nd + 15 + + 64 + 18 + - 60 - 16 - + 32nd + 15 + + 63 + 23 + - 120 - 16 - + 16th + 15 + + 64 + 18 + - 60 - 16 - + 32nd + 15 + + 70 + 24 + - 60 - 16 - + 32nd + 15 + + 68 + 22 + - 120 - 16 - + 16th + 15 + + 70 + 24 + - 60 - 16 - + 32nd + 15 + + 71 + 19 + - 60 - 16 - + 32nd + 15 + + 70 + 24 + 1.1 - - MeasureNumber - - - + - 120 - 17 - + 16th + 16 + + 71 + 19 + - 120 - 17 - + 16th + 16 + + 63 + 23 + - 120 - 17 - + 16th + 16 + + 61 + 21 + - 120 - 17 - + 16th + 16 + + 71 + 19 + - 120 - 17 - + 16th + 16 + + 61 + 21 + - 120 - 17 - + 16th + 16 + + 70 + 24 + 1.1 - 240 - + eighth + + 71 + 19 + - 120 + 16th - + begin - 120 - 18 - + 16th + 17 + + 71 + 19 + - 120 - 18 - + 16th + 17 + + 75 + 23 + - 120 - 18 - + 16th + 17 + + 78 + 20 + 1.1 + + + MeasureNumber + - 240 - + eighth + + 83 + 19 + - 120 + 16th - + begin - 120 - 19 - + 16th + 18 + + 83 + 19 + - 120 - 19 - + 16th + 18 + + 78 + 20 + - 120 - 19 - + 16th + 18 + + 75 + 23 + @@ -726,143 +987,200 @@ line - + - 120 - 20 - + 16th + 19 + + 71 + 19 + - 120 - 20 - + 16th + 19 + + 66 + 20 + - 120 - 20 - + 16th + 19 + + 63 + 23 + - 120 - 20 - + 16th + 19 + + 59 + 19 + - 240 + eighth - MeasureNumber + MeasureNumber - + - 240 - 21 - + eighth + 20 + + 59 + 19 + - 240 - 21 - + eighth + 20 + + 61 + 21 + - 240 - 21 - + eighth + 20 + + 63 + 23 + - + - 240 - 22 - + eighth + 21 + + 64 + 18 + - 240 - 22 - + eighth + 21 + + 66 + 20 + - 240 - 22 - + eighth + 21 + + 68 + 22 + - + - 240 - 23 - + eighth + 22 + + 70 + 24 + - 120 - 23 - + 16th + 22 + + 71 + 19 + - 120 - 23 - + 16th + 22 + + 70 + 24 + - 120 - 23 - + 16th + 22 + + 68 + 22 + - 120 - 23 - + 16th + 22 + + 66 + 20 + - + - 240 - 24 - + eighth + 23 + + 71 + 19 + - 240 - 24 - + eighth + 23 + + 59 + 19 + - 240 + eighth - 120 + 16th - + begin - 240 - 25 - + eighth + 24 + + 83 + 19 + - 240 - 25 - + eighth + 24 + + 82 + 24 + - 120 - 25 + 16th + 24 81 17 @@ -872,331 +1190,493 @@ + + + + 16th + 25 + + 81 + 17 + + + + eighth + 25 + + 80 + 22 + + + + eighth + 25 + + 78 + 20 + + + + 16th + 25 + + 76 + 18 + + + + + + + 0.9 - 120 + 16th + 26 + + 76 + 18 + + + + eighth 26 - + + 75 + 23 + - 240 + eighth 26 - + + 73 + 21 + - 240 + 32nd 26 - + + 75 + 23 + - 120 + 32nd 26 76 18 - - - + 0.9 - MeasureNumber + MeasureNumber - 120 + 16th + 27 + + 75 + 23 + + + + 32nd + 27 + + 78 + 20 + + + + 32nd + 27 + + 76 + 18 + + + + 16th + 27 + + 78 + 20 + + + + 32nd 27 - + + 75 + 23 + - 240 + 32nd 27 - + + 73 + 21 + - 240 + 16th 27 - + + 75 + 23 + - 60 + 32nd 27 - + + 71 + 19 + - 60 + 32nd 27 - + + 70 + 24 + - + 0.9 - 120 + 16th 28 - + + 71 + 19 + - 60 + 32nd 28 - + + 75 + 23 + - 60 + 32nd 28 - + + 73 + 21 + - 120 + 16th 28 - + + 75 + 23 + - 60 + 32nd 28 - + + 80 + 22 + - 60 + 32nd 28 - + + 79 + 27 + - 120 + 16th 28 - + + 80 + 22 + - 60 + 32nd 28 - + + 73 + 21 + - 60 + 32nd 28 - + + 71 + 19 + - + 0.9 - 120 + 16th 29 - + + 73 + 21 + - 60 + 32nd 29 - + + 76 + 18 + - 60 + 32nd 29 - + + 75 + 23 + - 120 + 16th 29 - + + 76 + 18 + - 60 + 32nd 29 - + + 82 + 24 + - 60 + 32nd 29 - + + 80 + 22 + - 120 + 16th 29 - + + 82 + 24 + - 60 + 32nd 29 - + + 75 + 23 + - 60 + 32nd 29 - + + 73 + 21 + - - 0.9 + - 120 + 16th 30 - + + 75 + 23 + - 60 + 32nd 30 - + + 80 + 22 + - 60 + 32nd 30 - + + 79 + 27 + - 120 + 16th 30 - + + 80 + 22 + - 60 + 32nd 30 - + + 83 + 19 + - 60 + 32nd 30 - + + 82 + 24 + - 120 + 16th 30 - + + 83 + 19 + - 60 + 32nd 30 - + + 75 + 23 + - 60 + 32nd 30 - + + 74 + 28 + - + + + + MeasureNumber + - 120 + 16th 31 - + + 75 + 23 + - 60 + 32nd 31 - + + 82 + 24 + - 60 + 32nd 31 - + + 80 + 22 + - 120 + 16th 31 - + + 82 + 24 + - 60 + 32nd 31 - + + 79 + 27 + - 60 + 32nd 31 - + + 77 + 25 + - 120 + 16th 31 - + + 80 + 22 + - 60 + 32nd 31 - + + 75 + 23 + - 60 + 32nd 31 - + + 74 + 28 + - - - MeasureNumber - - + - 120 - 32 - - - - 60 - 32 - - - - 60 - 32 - - - - 120 - 32 - - - - 60 - 32 - - - - 60 - 32 - - - - 120 + 16th 32 - - - - 60 - 32 - + + 75 + 23 + - 60 + eighth 32 - - - - - - - - 120 - 33 - - - - 240 - 33 81 17 @@ -1204,13 +1684,16 @@ - 240 - 33 - + eighth + 32 + + 80 + 22 + - 120 - 33 + 16th + 32 78 20 @@ -1220,77 +1703,113 @@ - - 423.518 - 423.518 + + 5.8177 + 5.8177 - 120 - 34 - + 16th + 118 + + 78 + 20 + - 60 - 34 - + 32nd + 118 + + 76 + 18 + - 60 - 34 - + 32nd + 118 + + 75 + 23 + - 120 - 34 - + 16th + 118 + + 76 + 18 + - 60 - 34 - + 32nd + 118 + + 73 + 21 + - 60 - 34 - + 32nd + 118 + + 72 + 26 + - 120 - 34 - + 16th + 118 + + 73 + 21 + - 60 - 34 - + 32nd + 118 + + 76 + 18 + - 60 - 34 - + 32nd + 118 + + 75 + 23 + - + - 120 - 35 - + 16th + 33 + + 76 + 18 + - 240 - 35 - + eighth + 33 + + 80 + 22 + - 240 - 35 - + eighth + 33 + + 78 + 20 + - 120 - 35 + 16th + 33 76 18 @@ -1300,82 +1819,114 @@ - - 452.744 - 452.744 + + 5.91331 + 5.91331 - 120 - 36 - + 16th + 119 + + 76 + 18 + - 60 - 36 - + 32nd + 119 + + 75 + 23 + - 60 - 36 - + 32nd + 119 + + 73 + 21 + - 120 - 36 - + 16th + 119 + + 75 + 23 + - 60 - 36 - + 32nd + 119 + + 71 + 19 + - 60 - 36 - + 32nd + 119 + + 70 + 24 + - 120 - 36 - + 16th + 119 + + 71 + 19 + - 60 - 36 - + 32nd + 119 + + 73 + 21 + - 60 - 36 - + 32nd + 119 + + 71 + 19 + 0.9 - - MeasureNumber - - - + - 120 - 37 - + 16th + 34 + + 73 + 21 + - 240 - 37 - + eighth + 34 + + 76 + 18 + - 240 - 37 - + eighth + 34 + + 75 + 23 + - 120 - 37 + 16th + 34 73 21 @@ -1386,170 +1937,261 @@ 0.9 - + + + MeasureNumber + + - 120 - 38 - + 16th + 35 + + 73 + 21 + - 60 - 38 - + 32nd + 35 + + 71 + 19 + - 60 - 38 - + 32nd + 35 + + 70 + 24 + - 120 - 38 - + 16th + 35 + + 71 + 19 + - 60 - 38 - + 32nd + 35 + + 68 + 22 + - 60 - 38 - + 32nd + 35 + + 67 + 27 + - 120 - 38 - + 16th + 35 + + 68 + 22 + - 60 - 38 - + 32nd + 35 + + 69 + 17 + - 60 - 38 - + 32nd + 35 + + 68 + 22 + 0.9 - + - 120 - 39 - + 16th + 36 + + 69 + 17 + - 60 - 39 - + 32nd + 36 + + 73 + 21 + - 60 - 39 - + 32nd + 36 + + 71 + 19 + - 120 - 39 - + 16th + 36 + + 73 + 21 + - 60 - 39 - + 32nd + 36 + + 69 + 17 + - 60 - 39 - + 32nd + 36 + + 68 + 22 + - 120 - 39 - + 16th + 36 + + 69 + 17 + - 60 - 39 - + 32nd + 36 + + 76 + 18 + - 60 - 39 - + 32nd + 36 + + 75 + 23 + 0.9 - + - 120 - 40 - + 16th + 37 + + 76 + 18 + - 60 - 40 - + 32nd + 37 + + 67 + 27 + - 60 - 40 - + 32nd + 37 + + 65 + 25 + - 120 - 40 - + 16th + 37 + + 67 + 27 + - 60 - 40 - + 32nd + 37 + + 70 + 24 + - 60 - 40 - + 32nd + 37 + + 68 + 22 + - 120 - 40 - + 16th + 37 + + 70 + 24 + - 60 - 40 - + 32nd + 37 + + 59 + 19 + - 60 - 40 - + 32nd + 37 + + 58 + 24 + - + - 120 - 41 - + 16th + 38 + + 59 + 19 + - 120 - 41 - + 16th + 38 + + 68 + 22 + - 120 - 41 + 16th + 38 64 18 @@ -1557,178 +2199,260 @@ - 120 - 41 - + 16th + 38 + + 61 + 21 + - 120 - 41 - + 16th + 38 + + 58 + 24 + - 120 - 41 - + 16th + 38 + + 67 + 27 + - - MeasureNumber - - - + - 120 - 42 - + 16th + 39 + + 68 + 22 + - 120 - 42 - + 16th + 39 + + 63 + 23 + - 120 - 42 - + 16th + 39 + + 59 + 19 + - 120 - 42 - + 16th + 39 + + 56 + 22 + - 240 + eighth - + - 240 - 43 - + eighth + 40 + + 64 + 18 + - 240 - 43 - + eighth + 40 + + 66 + 20 + - 240 - 43 - - - + eighth + 40 + + 68 + 22 + + + - + + + MeasureNumber + + - 240 - 44 - + eighth + 41 + + 69 + 17 + - 240 - 44 - + eighth + 41 + + 71 + 19 + - 240 - 44 - + eighth + 41 + + 73 + 21 + - + - 240 - 45 - + eighth + 42 + + 75 + 23 + - 120 - 45 - + 16th + 42 + + 76 + 18 + - 120 - 45 - + 16th + 42 + + 75 + 23 + - 120 - 45 - + 16th + 42 + + 73 + 21 + - 120 - 45 - + 16th + 42 + + 71 + 19 + - + down - 360 - 46 - + 1 + eighth + 43 + + 76 + 18 + - 60 - 46 - + 32nd + 43 + + 71 + 19 + - 60 - 46 - + 32nd + 43 + + 69 + 17 + - 120 - 46 - + 16th + 43 + + 71 + 19 + - 60 - 46 - + 32nd + 43 + + 68 + 22 + - 60 - 46 - + 32nd + 43 + + 66 + 20 + line - + - 120 - 47 - + 16th + 44 + + 68 + 22 + - 240 - 47 - + eighth + 44 + + 76 + 18 + - 240 - 47 - + eighth + 44 + + 75 + 23 + - 120 - 47 + 16th + 44 74 16 @@ -1739,29 +2463,38 @@ - MeasureNumber + MeasureNumber - + - 120 - 48 - + 16th + 45 + + 74 + 16 + - 240 - 48 - + eighth + 45 + + 73 + 21 + - 240 - 48 - + eighth + 45 + + 71 + 19 + - 120 - 48 + 16th + 45 69 17 @@ -1771,233 +2504,339 @@ - + - 120 - 49 - + 16th + 46 + + 69 + 17 + - 240 - 49 - + eighth + 46 + + 68 + 22 + - 240 - 49 - + eighth + 46 + + 66 + 20 + - 60 - 49 - + 32nd + 46 + + 68 + 22 + - 60 - 49 - + 32nd + 46 + + 69 + 17 + - + - 120 - 50 - + 16th + 47 + + 68 + 22 + - 60 - 50 - + 32nd + 47 + + 71 + 19 + - 60 - 50 - + 32nd + 47 + + 69 + 17 + - 120 - 50 - + 16th + 47 + + 71 + 19 + - 60 - 50 - + 32nd + 47 + + 68 + 22 + - 60 - 50 - + 32nd + 47 + + 66 + 20 + - 120 - 50 - + 16th + 47 + + 68 + 22 + - 60 - 50 - + 32nd + 47 + + 64 + 18 + - 60 - 50 - + 32nd + 47 + + 63 + 23 + - + - 240 - 51 - + eighth + 48 + + 64 + 18 + - 240 - 51 - + eighth + 48 + + 66 + 20 + - 240 - 51 - + eighth + 48 + + 69 + 17 + line - + - 240 - 52 - + eighth + 49 + + 71 + 19 + - 240 - 52 - + eighth + 49 + + 75 + 23 + - 240 - 52 - + eighth + 49 + + 78 + 20 + - MeasureNumber + MeasureNumber - + - 240 - 53 - + eighth + 50 + + 63 + 23 + - 240 - 53 - + eighth + 50 + + 64 + 18 + - 240 - 53 - + eighth + 50 + + 68 + 22 + - + - 240 - 54 - + eighth + 51 + + 69 + 17 + - 240 - 54 - + eighth + 51 + + 73 + 21 + - 240 - 54 - + eighth + 51 + + 76 + 18 + - + - 240 - 55 - + eighth + 52 + + 61 + 21 + - 240 - 55 - + eighth + 52 + + 66 + 20 + - 240 - 55 - + eighth + 52 + + 69 + 17 + - + - 240 - 56 - + eighth + 53 + + 71 + 19 + - 240 - 56 - + eighth + 53 + + 73 + 21 + - 240 - 56 - + eighth + 53 + + 75 + 23 + line - + - 240 - 57 - + eighth + 54 + + 76 + 18 + - 240 - 57 - + eighth + 54 + + 73 + 21 + - 240 - 57 - + eighth + 54 + + 69 + 17 + - MeasureNumber + MeasureNumber - 720 + 1 + quarter 78 20 @@ -2007,167 +2846,251 @@ - + - 120 - 58 - + 16th + 55 + + 78 + 20 + - 120 - 58 - + 16th + 55 + + 76 + 18 + - 120 - 58 - + 16th + 55 + + 75 + 23 + - 120 - 58 - + 16th + 55 + + 73 + 21 + - 120 - 58 - + 16th + 55 + + 71 + 19 + - 120 - 58 - + 16th + 55 + + 69 + 17 + - + - 120 - 59 - + 16th + 56 + + 68 + 22 + - 60 - 59 - + 32nd + 56 + + 64 + 18 + - 60 - 59 - + 32nd + 56 + + 63 + 23 + - 120 - 59 - + 16th + 56 + + 64 + 18 + - 60 - 59 - + 32nd + 56 + + 68 + 22 + - 60 - 59 - + 32nd + 56 + + 66 + 20 + - 120 - 59 - + 16th + 56 + + 68 + 22 + - 60 - 59 - + 32nd + 56 + + 71 + 19 + - 60 - 59 - + 32nd + 56 + + 69 + 17 + - + up - 120 - 60 - + 16th + 57 + + 71 + 19 + - 60 - 60 - + 32nd + 57 + + 68 + 22 + - 60 - 60 - + 32nd + 57 + + 66 + 20 + - 120 - 60 - + 16th + 57 + + 68 + 22 + - 60 - 60 - + 32nd + 57 + + 71 + 19 + - 60 - 60 - + 32nd + 57 + + 69 + 17 + - 120 - 60 - + 16th + 57 + + 71 + 19 + - 60 - 60 - + 32nd + 57 + + 76 + 18 + - 60 - 60 - + 32nd + 57 + + 75 + 23 + 2 - + - 120 - 61 - + 16th + 58 + + 76 + 18 + - 120 - 61 - + 16th + 58 + + 71 + 19 + - 120 - 61 - + 16th + 58 + + 68 + 22 + - 120 - 61 - - - - 240 - - - + 16th + 58 + + 64 + 18 + + + + eighth + + + @@ -2177,109 +3100,154 @@ 8 3 - + - 240 - 62 - + eighth + 59 + + 52 + 18 + - 240 - 62 - + eighth + 59 + + 54 + 20 + - 240 - 62 - + eighth + 59 + + 56 + 22 + - + - 240 - 63 - + eighth + 60 + + 57 + 17 + - 240 - 63 - + eighth + 60 + + 59 + 19 + - 240 - 63 - + eighth + 60 + + 61 + 21 + - + - 240 - 64 - + eighth + 61 + + 63 + 23 + - 120 - 64 - + 16th + 61 + + 64 + 18 + - 120 - 64 - + 16th + 61 + + 63 + 23 + - 120 - 64 - + 16th + 61 + + 61 + 21 + - 120 - 64 - + 16th + 61 + + 59 + 19 + - + - 240 - 65 - + eighth + 62 + + 64 + 18 + - 240 - 65 - + eighth + 62 + + 52 + 18 + - 240 + eighth - 120 + 16th - + begin - 240 - 66 - + eighth + 63 + + 52 + 18 + - 240 - 66 - + eighth + 63 + + 51 + 23 + - 120 - 66 + 16th + 63 50 16 @@ -2289,26 +3257,35 @@ - + - 120 - 67 - + 16th + 64 + + 50 + 16 + - 240 - 67 - + eighth + 64 + + 49 + 21 + - 240 - 67 - + eighth + 64 + + 47 + 19 + - 120 - 67 + 16th + 64 45 17 @@ -2318,398 +3295,596 @@ - + - 120 - 68 - + 16th + 65 + + 45 + 17 + - 240 - 68 - + eighth + 65 + + 44 + 22 + - 240 - 68 - + eighth + 65 + + 42 + 20 + - 60 - 68 - + 32nd + 65 + + 44 + 22 + - 60 - 68 - + 32nd + 65 + + 45 + 17 + - + - 120 - 69 - + 16th + 66 + + 44 + 22 + - 60 - 69 - + 32nd + 66 + + 47 + 19 + - 60 - 69 - + 32nd + 66 + + 45 + 17 + - 120 - 69 - + 16th + 66 + + 47 + 19 + - 60 - 69 - + 32nd + 66 + + 44 + 22 + - 60 - 69 - + 32nd + 66 + + 42 + 20 + - 120 - 69 - + 16th + 66 + + 44 + 22 + - 60 - 69 - + 32nd + 66 + + 40 + 18 + - 60 - 69 - + 32nd + 66 + + 39 + 23 + - + - 240 - 70 - + eighth + 67 + + 40 + 18 + - 240 - 70 - + eighth + 67 + + 49 + 21 + - 240 - 70 - + eighth + 67 + + 52 + 18 + - + - 240 - 71 - + eighth + 68 + + 54 + 20 + - 240 - 71 - + eighth + 68 + + 58 + 24 + - 240 - 71 - + eighth + 68 + + 61 + 21 + - + - 240 - 72 - + eighth + 69 + + 39 + 23 + - 240 - 72 - + eighth + 69 + + 47 + 19 + - 240 - 72 - + eighth + 69 + + 51 + 23 + - + - 240 - 73 - - + eighth + 70 + + 52 + 18 + + - 240 - 73 - + eighth + 70 + + 56 + 22 + - 240 - 73 - + eighth + 70 + + 59 + 19 + - + - 240 - 74 - + eighth + 71 + + 37 + 21 + - 240 - 74 - + eighth + 71 + + 49 + 21 + - 240 - 74 - + eighth + 71 + + 52 + 18 + - + - 240 - 75 - + eighth + 72 + + 54 + 20 + - 240 - 75 - + eighth + 72 + + 56 + 22 + - 240 - 75 - + eighth + 72 + + 58 + 24 + - + - 240 - 76 - + eighth + 73 + + 59 + 19 + - 240 - 76 - + eighth + 73 + + 52 + 18 + - 240 - 76 - + eighth + 73 + + 56 + 22 + - + - 120 - 77 - + 16th + 74 + + 54 + 20 + - 120 - 77 - + 16th + 74 + + 61 + 21 + - 120 - 77 - + 16th + 74 + + 58 + 24 + - 120 - 77 - + 16th + 74 + + 61 + 21 + - 120 - 77 - + 16th + 74 + + 52 + 18 + - 120 - 77 - + 16th + 74 + + 61 + 21 + - + - 240 - 78 - + eighth + 75 + + 51 + 23 + - 240 - 78 - + eighth + 75 + + 52 + 18 + - 240 - 78 - + eighth + 75 + + 54 + 20 + - + - 120 - 79 - + 16th + 76 + + 47 + 19 + - 60 - 79 - + 32nd + 76 + + 59 + 19 + - 60 - 79 - + 32nd + 76 + + 58 + 24 + - 120 - 79 - + 16th + 76 + + 59 + 19 + - 60 - 79 - + 32nd + 76 + + 54 + 20 + - 60 - 79 - + 32nd + 76 + + 52 + 18 + - 120 - 79 - + 16th + 76 + + 54 + 20 + - 60 - 79 - + 32nd + 76 + + 51 + 23 + - 60 - 79 - + 32nd + 76 + + 49 + 21 + - + up - 120 - 80 - + 16th + 77 + + 51 + 23 + - 60 - 80 - + 32nd + 77 + + 54 + 20 + - 60 - 80 - + 32nd + 77 + + 52 + 18 + - 120 - 80 - + 16th + 77 + + 54 + 20 + - 60 - 80 - + 32nd + 77 + + 51 + 23 + - 60 - 80 - + 32nd + 77 + + 49 + 21 + - 120 - 80 - + 16th + 77 + + 51 + 23 + - 60 - 80 - + 32nd + 77 + + 47 + 19 + - 60 - 80 - + 32nd + 77 + + 46 + 24 + - 480 - + quarter + + 47 + 19 + - 240 - + eighth + + 35 + 19 + - 120 + 16th - + begin - 240 - 81 - + eighth + 78 + + 59 + 19 + - 240 - 81 - + eighth + 78 + + 58 + 24 + - 120 - 81 + 16th + 78 57 17 @@ -2719,26 +3894,35 @@ - + - 120 - 82 - + 16th + 79 + + 57 + 17 + - 240 - 82 - + eighth + 79 + + 56 + 22 + - 240 - 82 - + eighth + 79 + + 54 + 20 + - 120 - 82 + 16th + 79 52 18 @@ -2748,460 +3932,675 @@ - + - 120 - 83 - + 16th + 80 + + 52 + 18 + - 240 - 83 - + eighth + 80 + + 51 + 23 + - 240 - 83 - + eighth + 80 + + 49 + 21 + - 60 - 83 - + 32nd + 80 + + 51 + 23 + - 60 - 83 - + 32nd + 80 + + 52 + 18 + - + up - 120 - 84 - + 16th + 81 + + 51 + 23 + - 60 - 84 - + 32nd + 81 + + 54 + 20 + - 60 - 84 - + 32nd + 81 + + 52 + 18 + + + + 16th + 81 + + 54 + 20 + + + + 32nd + 81 + + 51 + 23 + + + + 32nd + 81 + + 49 + 21 + + + + 16th + 81 + + 51 + 23 + + + + 32nd + 81 + + 47 + 19 + + + + 32nd + 81 + + 46 + 24 + + + + + + + + eighth + 82 + + 47 + 19 + + + + eighth + 82 + + 49 + 21 + + + + eighth + 82 + + 51 + 23 + + + + + + + + eighth + 83 + + 52 + 18 + + + + eighth + 83 + + 54 + 20 + - 120 - 84 - + eighth + 83 + + 56 + 22 + + + + + - 60 + eighth 84 - + + 58 + 24 + - 60 + 16th 84 - + + 59 + 19 + - 120 + 16th 84 - + + 58 + 24 + - 60 + 16th 84 - + + 56 + 22 + - 60 + 16th 84 - + + 54 + 20 + - + + down - 240 - 85 - - - - 240 + eighth 85 - + + 59 + 19 + - 240 + eighth 85 - + + 47 + 19 + + + eighth + - + - 240 + eighth 86 - + + 56 + 22 + - 240 + eighth 86 - + + 59 + 19 + - 240 + eighth 86 - + + 63 + 23 + - + - 240 - 87 - - - - 120 - 87 - - - - 120 + eighth 87 - + + 55 + 27 + - 120 + eighth 87 - + + 58 + 24 + - 120 + eighth 87 - + + 63 + 23 + - + - down - 240 + eighth 88 - + + 56 + 22 + - 240 + eighth 88 - + + 59 + 19 + + + + eighth + 88 + + 63 + 23 + - - 240 - - + - 240 + eighth 89 - + + 51 + 23 + - 240 + eighth 89 - + + 63 + 23 + - 240 + eighth 89 - + + 61 + 21 + - + - 240 + eighth 90 - + + 60 + 26 + - 240 + eighth 90 - + + 61 + 21 + - 240 + eighth 90 - + + 63 + 23 + - + - 240 + eighth 91 - + + 56 + 22 + - 240 + eighth 91 - + + 61 + 21 + - 240 + eighth 91 - + + 59 + 19 + - + - 240 + eighth 92 - + + 58 + 24 + - 240 + eighth 92 - + + 59 + 19 + - 240 + eighth 92 - + + 61 + 21 + - + - 240 + eighth 93 - + + 54 + 20 + - 240 + eighth 93 - + + 59 + 19 + - 240 + eighth 93 - + + 63 + 23 + - + - 240 + eighth 94 - + + 55 + 27 + - 240 + eighth 94 - + + 56 + 22 + - 240 + eighth 94 - + + 57 + 17 + - + - 240 + eighth 95 - + + 51 + 23 + - 240 + eighth 95 - + + 56 + 22 + - 240 + eighth 95 - - - - - - - - 240 - 96 - - - - 240 - 96 - - - - 240 - 96 - - - - - - - - 240 - 97 - - - - 240 - 97 - - - - 240 - 97 - - - - - - - - 240 - 98 - - - - 240 - 98 - - - - 240 - 98 - + + 59 + 19 + - 240 - + eighth + + 49 + 21 + - 240 + eighth - 240 - + eighth + + 61 + 21 + - + - 240 - 99 - + eighth + 96 + + 61 + 21 + - 240 - 99 - + eighth + 96 + + 58 + 24 + - 240 - 99 - + eighth + 96 + + 56 + 22 + - + - 240 - 100 - + eighth + 97 + + 56 + 22 + - 240 - 100 - + eighth + 97 + + 49 + 21 + - 240 - 100 - + eighth + 97 + + 51 + 23 + - 240 - + eighth + + 44 + 22 + - 120 + 16th - + begin - 120 - 101 - + 16th + 98 + + 44 + 22 + - 120 - 101 - + 16th + 98 + + 56 + 22 + - 120 - 101 - + 16th + 98 + + 54 + 20 + - + - 120 - 102 - + 16th + 99 + + 54 + 20 + - 240 - 102 - + eighth + 99 + + 52 + 18 + - 240 - 102 - + eighth + 99 + + 51 + 23 + - 120 - 102 + 16th + 99 - 1 50 16 @@ -3210,26 +4609,35 @@ - + - 120 - 103 - + 16th + 100 + + 50 + 16 + - 240 - 103 - + eighth + 100 + + 49 + 21 + - 240 - 103 - + eighth + 100 + + 47 + 19 + - 120 - 103 + 16th + 100 45 17 @@ -3239,206 +4647,309 @@ - + - 120 - 104 - + 16th + 101 + + 45 + 17 + - 240 - 104 - + eighth + 101 + + 44 + 22 + - 240 - 104 - + eighth + 101 + + 42 + 20 + - 60 - 104 - + 32nd + 101 + + 44 + 22 + - 60 - 104 - + 32nd + 101 + + 45 + 17 + - + - 120 - 105 - + 16th + 102 + + 44 + 22 + - 60 - 105 - + 32nd + 102 + + 47 + 19 + - 60 - 105 - + 32nd + 102 + + 45 + 17 + - 120 - 105 - + 16th + 102 + + 47 + 19 + - 60 - 105 - + 32nd + 102 + + 44 + 22 + - 60 - 105 - + 32nd + 102 + + 42 + 20 + - 120 - 105 - + 16th + 102 + + 44 + 22 + - 60 - 105 - + 32nd + 102 + + 40 + 18 + - 60 - 105 - + 32nd + 102 + + 39 + 23 + - + - 240 - 106 - + eighth + 103 + + 40 + 18 + - 240 - 106 - + eighth + 103 + + 42 + 20 + - 240 - 106 - + eighth + 103 + + 44 + 22 + - + - 240 - 107 - + eighth + 104 + + 45 + 17 + - 240 - 107 - + eighth + 104 + + 47 + 19 + - 240 - 107 - + eighth + 104 + + 49 + 21 + - + up - 240 - 108 - + eighth + 105 + + 51 + 23 + - 120 - 108 - + 16th + 105 + + 52 + 18 + - 120 - 108 - + 16th + 105 + + 51 + 23 + - 120 - 108 - + 16th + 105 + + 49 + 21 + - 120 - 108 - + 16th + 105 + + 47 + 19 + - + - 360 - 109 - + 1 + eighth + 106 + + 52 + 18 + - 60 - 109 - + 32nd + 106 + + 59 + 19 + - 60 - 109 - + 32nd + 106 + + 57 + 17 + - 120 - 109 - + 16th + 106 + + 59 + 19 + - 60 - 109 - + 32nd + 106 + + 56 + 22 + - 60 - 109 - + 32nd + 106 + + 54 + 20 + - + - 120 - 110 - + 16th + 107 + + 56 + 22 + - 240 - 110 - + eighth + 107 + + 61 + 21 + - 240 - 110 - + eighth + 107 + + 57 + 17 + - 120 - 110 + 16th + 107 54 20 @@ -3448,41 +4959,59 @@ - + - 120 - 111 - + 16th + 108 + + 54 + 20 + - 60 - 111 - + 32nd + 108 + + 57 + 17 + - 60 - 111 - + 32nd + 108 + + 56 + 22 + - 120 - 111 - + 16th + 108 + + 57 + 17 + - 120 - 111 - + 16th + 108 + + 54 + 20 + - 120 - 111 - + 16th + 108 + + 51 + 23 + - 120 - 111 + 16th + 108 47 19 @@ -3492,26 +5021,35 @@ - + - 120 - 112 - + 16th + 109 + + 47 + 19 + - 240 - 112 - + eighth + 109 + + 59 + 19 + - 240 - 112 - + eighth + 109 + + 56 + 22 + - 120 - 112 + 16th + 109 52 18 @@ -3521,41 +5059,59 @@ - + - 120 - 113 - + 16th + 110 + + 52 + 18 + - 60 - 113 - + 32nd + 110 + + 56 + 22 + - 60 - 113 - + 32nd + 110 + + 54 + 20 + - 120 - 113 - + 16th + 110 + + 56 + 22 + - 120 - 113 - + 16th + 110 + + 52 + 18 + - 120 - 113 - + 16th + 110 + + 49 + 21 + - 120 - 113 + 16th + 110 45 17 @@ -3565,26 +5121,35 @@ - + - 120 - 114 - + 16th + 111 + + 45 + 17 + - 240 - 114 - + eighth + 111 + + 57 + 17 + - 240 - 114 - + eighth + 111 + + 54 + 20 + - 120 - 114 + 16th + 111 51 23 @@ -3594,26 +5159,35 @@ - + - 120 - 115 - + 16th + 112 + + 51 + 23 + - 240 - 115 - + eighth + 112 + + 61 + 21 + - 240 - 115 - + eighth + 112 + + 59 + 19 + - 120 - 115 + 16th + 112 57 17 @@ -3623,26 +5197,35 @@ - + - 120 - 116 - + 16th + 113 + + 57 + 17 + - 240 - 116 - + eighth + 113 + + 56 + 22 + - 240 - 116 - + eighth + 113 + + 54 + 20 + - 120 - 116 + 16th + 113 52 18 @@ -3652,148 +5235,221 @@ - + - 120 - 117 - + 16th + 114 + + 52 + 18 + - 60 - 117 - + 32nd + 114 + + 57 + 17 + - 60 - 117 - + 32nd + 114 + + 56 + 22 + - 120 - 117 - + 16th + 114 + + 57 + 17 + - 60 - 117 - + 32nd + 114 + + 51 + 23 + - 60 - 117 - + 32nd + 114 + + 49 + 21 + - 120 - 117 - + 16th + 114 + + 51 + 23 + - 60 - 117 - + 32nd + 114 + + 56 + 22 + - 60 - 117 - + 32nd + 114 + + 54 + 20 + - + - 240 - 118 - + eighth + 115 + + 56 + 22 + - 240 - 118 - + eighth + 115 + + 57 + 17 + - 240 - 118 - + eighth + 115 + + 59 + 19 + - 240 - + eighth + + 52 + 18 + - 120 + 16th - + begin - 120 - 119 - + 16th + 116 + + 64 + 18 + - 120 - 119 - + 16th + 116 + + 59 + 19 + - 120 - 119 - + 16th + 116 + + 56 + 22 + - + - 120 - 120 - + 16th + 117 + + 52 + 18 + - 120 - 120 - + 16th + 117 + + 59 + 19 + - 120 - 120 - + 16th + 117 + + 56 + 22 + - 120 - 120 - + 16th + 117 + + 52 + 18 + - 120 - 120 - + 16th + 117 + + 47 + 19 + - 120 - 120 - + 16th + 117 + + 44 + 22 + - 480 - + quarter + + 40 + 18 + - 240 - + eighth + dfermata - - + + + + 52 + 18 + - 4 + 0 Binary files /tmp/E7n9nStfV_/musescore-1.1+dfsg/mscore/demos/praeludium2.mscz and /tmp/TV1rGBYhHO/musescore-1.2+dfsg/mscore/demos/praeludium2.mscz differ diff -Nru musescore-1.1+dfsg/mscore/demos/prelude-sr.mscx musescore-1.2+dfsg/mscore/demos/prelude-sr.mscx --- musescore-1.1+dfsg/mscore/demos/prelude-sr.mscx 2011-07-27 13:32:59.000000000 +0000 +++ musescore-1.2+dfsg/mscore/demos/prelude-sr.mscx 2012-03-13 13:33:10.000000000 +0000 @@ -1,8 +1,8 @@ - - 0.884797 - 2.05862 - 3.21786 + + 1.2 + 5449 + 1.764 480 + Title + 0 + Subtitle + 0 + Composer + 0 Tempo 1 - + 0 ff - + + 0 4 + + 32 + + + + 32 + + + + 32 + + + + 32 + + + 1 + 1 1073742084 @@ -559,9 +586,11 @@ 57 17 + Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 pp + 3120 - + 0 2880 @@ -639,6 +674,7 @@ staccato + down @@ -646,9 +682,11 @@ 17 5 + Fingering - + + 0 Fingering - + + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 Fingering - + + 2 + 0 + MeasureNumber half @@ -1246,15 +1356,18 @@ staccato + down 60 14 + Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 mf - + + 0 line + eighth - - -252.538 - -203.796 + eighth tenuto + - 9 + 5 68 22 + Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 1 + 0 + MeasureNumber - - -193.571 - -193.571 + eighth tenuto + - 13 + 7 64 18 @@ -2098,9 +2278,10 @@ tenuto + - 13 + 7 64 18 @@ -2119,9 +2300,10 @@ tenuto + - 13 + 7 66 20 @@ -2140,9 +2322,10 @@ tenuto + - 13 + 7 63 23 @@ -2156,18 +2339,17 @@ 23 - - -157.994 - -109.252 + eighth tenuto + - 14 + 8 64 18 @@ -2186,9 +2368,10 @@ tenuto + - 14 + 8 61 21 @@ -2207,9 +2390,10 @@ tenuto + - 14 + 8 63 23 @@ -2228,9 +2412,10 @@ tenuto + - 14 + 8 60 26 @@ -2260,16 +2445,19 @@ + 1 eighth + 1 quarter + 1 half @@ -2278,9 +2466,11 @@ 16 2 + ppp - + + 0 no @@ -2288,6 +2478,7 @@ tenuto + @@ -2303,17 +2494,16 @@ 21 - - -164.087 - -194.55 + eighth tenuto + - 17 + 9 61 21 @@ -2332,8 +2522,9 @@ tenuto + - 17 + 9 64 18 @@ -2352,8 +2543,9 @@ tenuto + - 17 + 9 63 23 @@ -2369,6 +2561,7 @@ + eighth @@ -2376,6 +2569,7 @@ tenuto + 62 @@ -2392,6 +2586,7 @@ + long @@ -2400,6 +2595,7 @@ tenuto + 60 @@ -2416,6 +2612,7 @@ + 1 14400 half @@ -2426,6 +2623,7 @@ staccato + 1 @@ -2441,6 +2639,7 @@ staccato + 1 @@ -2456,19 +2655,19 @@ + eighth - - -223.054 - -259.611 + eighth tenuto + - 19 + 10 61 21 @@ -2487,8 +2686,9 @@ tenuto + - 19 + 10 68 22 @@ -2507,8 +2707,9 @@ tenuto + - 19 + 10 66 20 @@ -2524,6 +2725,7 @@ + eighth @@ -2531,6 +2733,7 @@ tenuto + 64 @@ -2547,6 +2750,7 @@ + eighth @@ -2554,6 +2758,7 @@ tenuto + 60 @@ -2584,6 +2789,7 @@ staccato + 1 @@ -2598,6 +2804,7 @@ staccato + 1 @@ -2610,25 +2817,23 @@ 0.8 - MeasureNumber + MeasureNumber eighth - - up - -183.345 - -112.159 + eighth tenuto + - 21 + 11 61 21 @@ -2647,9 +2852,10 @@ tenuto + - 21 + 11 62 16 @@ -2669,9 +2875,10 @@ tenuto + - 21 + 11 59 19 @@ -2685,18 +2892,17 @@ 19 - - -141.676 - -89.904 + eighth tenuto + - 22 + 12 61 21 @@ -2715,9 +2921,10 @@ tenuto + - 22 + 12 57 17 @@ -2736,9 +2943,10 @@ tenuto + - 22 + 12 59 19 @@ -2757,9 +2965,10 @@ tenuto + - 22 + 12 56 22 @@ -2795,6 +3004,7 @@ tenuto + @@ -2810,17 +3020,16 @@ 17 - - -102.847 - -70.4897 + eighth tenuto + - 25 + 13 57 17 @@ -2839,8 +3048,9 @@ tenuto + - 25 + 13 61 21 @@ -2859,8 +3069,9 @@ tenuto + - 25 + 13 59 19 @@ -2882,6 +3093,7 @@ tenuto + 57 @@ -2904,6 +3116,7 @@ tenuto + 56 @@ -2920,7 +3133,6 @@ 4 - @@ -2940,11 +3152,13 @@ + 1 eighth + 1 quarter @@ -2954,6 +3168,7 @@ staccato + 1 @@ -2968,6 +3183,7 @@ staccato + 1 @@ -2982,25 +3198,27 @@ 16 2 + ppp - + + 0 + eighth - - -324.874 - -350.704 + eighth tenuto + - 27 + 14 52 18 @@ -3015,8 +3233,9 @@ tenuto + - 27 + 14 56 22 @@ -3031,8 +3250,9 @@ tenuto + - 27 + 14 55 27 @@ -3044,6 +3264,7 @@ + eighth @@ -3051,6 +3272,7 @@ tenuto + 54 @@ -3067,6 +3289,7 @@ + eighth @@ -3074,6 +3297,7 @@ tenuto + 51 @@ -3127,19 +3351,19 @@ + eighth - - -345.057 - -345.057 + eighth tenuto + - 29 + 15 52 18 @@ -3154,8 +3378,9 @@ tenuto + - 29 + 15 56 22 @@ -3170,8 +3395,9 @@ tenuto + - 29 + 15 55 27 @@ -3183,6 +3409,7 @@ + eighth @@ -3190,6 +3417,7 @@ tenuto + 54 @@ -3206,6 +3434,7 @@ + eighth @@ -3213,6 +3442,7 @@ tenuto + 51 @@ -3229,7 +3459,6 @@ - 1 @@ -3263,22 +3492,26 @@ - MeasureNumber + MeasureNumber 80 2 + mf - + + 0 1.5 + Tempo + 1 - + 0 + Tuplet + 0 +

3

 @@ -3313,12 +3547,13 @@ 3 eighth - Tuplet + Tuplet + 0 +

3

 @@ -3332,12 +3567,13 @@ 3 eighth - Tuplet + Tuplet + 0 +

3

 @@ -3351,12 +3587,13 @@ 3 eighth - Tuplet + Tuplet + 0 +

3

 @@ -3367,14 +3604,17 @@ tenuto + 64 18 + Fingering - + + 0 Fingering + 1 - + 0 Fingering + 1 - + 0 Fingering + 1 - + 0 Fingering + 1 - + 0 Fingering + 1 - + 0 Fingering + 1 - + 0 Fingering + 1 - + 0 Fingering + 1 - + 0 Fingering + 1 - + 0 Fingering + 1 - + 0 Fingering + 1 - + 0 Staff - + + 0 + 30240 - + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 1 + 0 Fingering - + + 1 + 0 Fingering - + + 1 + 0 Fingering - + + 1 + 0 Fingering - + + 1 + 0 Fingering - + + 1 + 0 Fingering - + + 1 + 0 Fingering - + + 1 + 0 + MeasureNumber + + 32000 - + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 1 + 0 mf - + + 0 1 @@ -4710,6 +5032,7 @@ tenuto + @@ -4722,6 +5045,7 @@ tenuto + 63 @@ -4733,6 +5057,7 @@ tenuto + 62 @@ -4744,6 +5069,7 @@ tenuto + @@ -4751,7 +5077,7 @@ 21 - + 1 down @@ -4760,7 +5086,7 @@ 33600 18 eighth - 47 + 32 1 64 @@ -4771,7 +5097,7 @@ 1 18 eighth - 47 + 32 1 56 @@ -4782,14 +5108,14 @@ 1 18 eighth - 47 + 32 1 61 21 - + 1 down @@ -4797,7 +5123,7 @@ 1 19 eighth - 48 + 33 1 62 @@ -4808,7 +5134,7 @@ 1 19 eighth - 48 + 33 1 55 @@ -4819,14 +5145,14 @@ 1 19 eighth - 48 + 33 1 61 21 - + 1 down @@ -4834,7 +5160,7 @@ 1 20 eighth - 49 + 34 1 62 @@ -4845,7 +5171,7 @@ 1 20 eighth - 49 + 34 1 54 @@ -4856,14 +5182,14 @@ 1 20 eighth - 49 + 34 1 60 26 - + 1 down @@ -4871,7 +5197,7 @@ 1 21 eighth - 50 + 35 1 61 @@ -4882,7 +5208,7 @@ 1 21 eighth - 50 + 35 1 52 @@ -4893,7 +5219,7 @@ 1 21 eighth - 50 + 35 1 56 @@ -4943,6 +5269,7 @@ tenuto + @@ -4955,6 +5282,7 @@ tenuto + 63 @@ -4967,6 +5295,7 @@ tenuto + 62 @@ -4978,6 +5307,7 @@ tenuto + @@ -4985,7 +5315,7 @@ 21 - + 1 down @@ -4994,7 +5324,7 @@ 35520 22 eighth - 51 + 36 1 64 @@ -5005,7 +5335,7 @@ 1 22 eighth - 51 + 36 1 56 @@ -5016,14 +5346,14 @@ 1 22 eighth - 51 + 36 1 61 21 - + 1 down @@ -5031,7 +5361,7 @@ 1 23 eighth - 52 + 37 1 63 @@ -5042,7 +5372,7 @@ 1 23 eighth - 52 + 37 1 55 @@ -5053,14 +5383,14 @@ 1 23 eighth - 52 + 37 1 61 21 - + 1 down @@ -5068,7 +5398,7 @@ 1 24 eighth - 53 + 38 1 62 @@ -5079,7 +5409,7 @@ 1 24 eighth - 53 + 38 1 54 @@ -5090,14 +5420,14 @@ 1 24 eighth - 53 + 38 1 60 26 - + 1 down @@ -5105,7 +5435,7 @@ 1 25 eighth - 54 + 39 1 61 @@ -5116,7 +5446,7 @@ 1 25 eighth - 54 + 39 1 52 @@ -5127,7 +5457,7 @@ 1 25 eighth - 54 + 39 1 56 @@ -5137,8 +5467,8 @@ - MeasureNumber + MeasureNumber 1 @@ -5183,9 +5513,11 @@ 68 22 + Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 1 + 0 Fingering - + + 1 + 0 Fingering - + + 1 + 0 Fingering - + + 1 + 0 Fingering - + + 1 + 0 Fingering - + + 1 + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 + MeasureNumber 1 @@ -6023,7 +6389,7 @@ 17 - + 1 @@ -6031,7 +6397,7 @@ 43200 38 eighth - 67 + 52 1 74 @@ -6042,7 +6408,7 @@ 1 38 eighth - 67 + 52 1 65 @@ -6053,21 +6419,21 @@ 1 38 eighth - 67 + 52 1 71 19 - + 1 1 39 eighth - 68 + 53 1 73 @@ -6078,7 +6444,7 @@ 1 39 eighth - 68 + 53 1 66 @@ -6089,21 +6455,21 @@ 1 39 eighth - 68 + 53 1 69 17 - + 1 1 40 eighth - 69 + 54 1 71 @@ -6114,7 +6480,7 @@ 1 40 eighth - 69 + 54 1 62 @@ -6125,21 +6491,21 @@ 1 40 eighth - 69 + 54 1 68 22 - + 1 1 41 eighth - 70 + 55 1 69 @@ -6150,7 +6516,7 @@ 1 41 eighth - 70 + 55 1 61 @@ -6161,7 +6527,7 @@ 1 41 eighth - 70 + 55 1 66 @@ -6238,7 +6604,7 @@ 18 - + 1 @@ -6246,7 +6612,7 @@ 45120 42 eighth - 71 + 56 1 69 @@ -6257,7 +6623,7 @@ 1 42 eighth - 71 + 56 1 60 @@ -6268,21 +6634,21 @@ 1 42 eighth - 71 + 56 1 66 20 - + 1 1 43 eighth - 72 + 57 1 68 @@ -6293,7 +6659,7 @@ 1 43 eighth - 72 + 57 1 61 @@ -6304,21 +6670,21 @@ 1 43 eighth - 72 + 57 1 64 18 - + 1 1 44 eighth - 73 + 58 1 66 @@ -6329,7 +6695,7 @@ 1 44 eighth - 73 + 58 1 57 @@ -6340,21 +6706,21 @@ 1 44 eighth - 73 + 58 1 63 23 - + 1 1 45 eighth - 74 + 59 1 64 @@ -6365,7 +6731,7 @@ 1 45 eighth - 74 + 59 1 56 @@ -6376,7 +6742,7 @@ 1 45 eighth - 74 + 59 1 61 @@ -6453,7 +6819,7 @@ 24 - + 1 @@ -6464,9 +6830,10 @@ sforzato + 1 - 75 + 60 1 62 @@ -6477,7 +6844,7 @@ 1 46 eighth - 75 + 60 1 57 @@ -6488,21 +6855,21 @@ 1 46 eighth - 75 + 60 1 61 21 - + 1 1 47 eighth - 76 + 61 1 69 @@ -6513,7 +6880,7 @@ 1 47 eighth - 76 + 61 1 57 @@ -6524,14 +6891,14 @@ 1 47 eighth - 76 + 61 1 61 21 - + 1 @@ -6541,9 +6908,10 @@ sforzato + 1 - 77 + 62 1 63 @@ -6554,7 +6922,7 @@ 1 48 eighth - 77 + 62 1 58 @@ -6565,21 +6933,21 @@ 1 48 eighth - 77 + 62 1 61 21 - + 1 1 49 eighth - 78 + 63 1 70 @@ -6590,7 +6958,7 @@ 1 49 eighth - 78 + 63 1 58 @@ -6601,7 +6969,7 @@ 1 49 eighth - 78 + 63 1 61 @@ -6611,8 +6979,8 @@ - MeasureNumber + MeasureNumber 1 @@ -6655,6 +7023,7 @@ sforzato + @@ -6675,6 +7044,7 @@ sforzato + @@ -6690,7 +7060,7 @@ 21 - + 1 @@ -6698,7 +7068,7 @@ 48960 50 eighth - 79 + 64 1 64 @@ -6709,7 +7079,7 @@ 1 50 eighth - 79 + 64 1 59 @@ -6720,21 +7090,21 @@ 1 50 eighth - 79 + 64 1 63 23 - + 1 1 51 eighth - 80 + 65 1 71 @@ -6745,7 +7115,7 @@ 1 51 eighth - 80 + 65 1 59 @@ -6756,21 +7126,21 @@ 1 51 eighth - 80 + 65 1 63 23 - + 1 1 52 eighth - 81 + 66 1 72 @@ -6781,7 +7151,7 @@ 1 52 eighth - 81 + 66 1 60 @@ -6792,21 +7162,21 @@ 1 52 eighth - 81 + 66 1 66 20 - + 1 1 53 eighth - 82 + 67 1 73 @@ -6817,7 +7187,7 @@ 1 53 eighth - 82 + 67 1 61 @@ -6828,7 +7198,7 @@ 1 53 eighth - 82 + 67 1 64 @@ -6838,9 +7208,11 @@ + ff - + + 0 1 @@ -6883,6 +7255,7 @@ sforzato + @@ -6895,6 +7268,7 @@ tenuto + 75 @@ -6906,6 +7280,7 @@ tenuto + 74 @@ -6917,6 +7292,7 @@ tenuto + @@ -6924,7 +7300,7 @@ 21 - + 1 @@ -6932,7 +7308,7 @@ 50880 54 eighth - 83 + 68 1 76 @@ -6943,7 +7319,7 @@ 1 54 eighth - 83 + 68 1 68 @@ -6954,21 +7330,21 @@ 1 54 eighth - 83 + 68 1 73 21 - + 1 1 55 eighth - 84 + 69 1 75 @@ -6979,7 +7355,7 @@ 1 55 eighth - 84 + 69 1 67 @@ -6990,21 +7366,21 @@ 1 55 eighth - 84 + 69 1 73 21 - + 1 1 56 eighth - 85 + 70 1 74 @@ -7015,7 +7391,7 @@ 1 56 eighth - 85 + 70 1 66 @@ -7026,21 +7402,21 @@ 1 56 eighth - 85 + 70 1 72 26 - + 1 1 57 eighth - 86 + 71 1 73 @@ -7051,7 +7427,7 @@ 1 57 eighth - 86 + 71 1 64 @@ -7062,7 +7438,7 @@ 1 57 eighth - 86 + 71 1 68 @@ -7112,6 +7488,7 @@ sforzato + @@ -7124,6 +7501,7 @@ tenuto + 75 @@ -7136,6 +7514,7 @@ tenuto + 74 @@ -7147,6 +7526,7 @@ tenuto + @@ -7154,7 +7534,7 @@ 21 - + 1 @@ -7162,7 +7542,7 @@ 52800 58 eighth - 87 + 72 1 76 @@ -7173,7 +7553,7 @@ 1 58 eighth - 87 + 72 1 68 @@ -7184,21 +7564,21 @@ 1 58 eighth - 87 + 72 1 73 21 - + 1 1 59 eighth - 88 + 73 1 75 @@ -7209,7 +7589,7 @@ 1 59 eighth - 88 + 73 1 67 @@ -7220,21 +7600,21 @@ 1 59 eighth - 88 + 73 1 73 21 - + 1 1 60 eighth - 89 + 74 1 74 @@ -7245,7 +7625,7 @@ 1 60 eighth - 89 + 74 1 66 @@ -7256,21 +7636,21 @@ 1 60 eighth - 89 + 74 1 72 26 - + 1 1 61 eighth - 90 + 75 1 73 @@ -7281,7 +7661,7 @@ 1 61 eighth - 90 + 75 1 64 @@ -7292,7 +7672,7 @@ 1 61 eighth - 90 + 75 1 68 @@ -7302,8 +7682,8 @@ - MeasureNumber + MeasureNumber 1 @@ -7373,7 +7753,7 @@ 22 - + 1 @@ -7381,7 +7761,7 @@ 54720 62 eighth - 91 + 76 1 80 @@ -7392,7 +7772,7 @@ 1 62 eighth - 91 + 76 1 68 @@ -7403,21 +7783,21 @@ 1 62 eighth - 91 + 76 1 73 21 - + 1 1 63 eighth - 92 + 77 1 78 @@ -7428,7 +7808,7 @@ 1 63 eighth - 92 + 77 1 69 @@ -7439,21 +7819,21 @@ 1 63 eighth - 92 + 77 1 73 21 - + 1 1 64 eighth - 93 + 78 1 81 @@ -7464,7 +7844,7 @@ 1 64 eighth - 93 + 78 1 66 @@ -7475,21 +7855,21 @@ 1 64 eighth - 93 + 78 1 73 21 - + 1 1 65 eighth - 94 + 79 1 80 @@ -7500,7 +7880,7 @@ 1 65 eighth - 94 + 79 1 68 @@ -7511,7 +7891,7 @@ 1 65 eighth - 94 + 79 1 73 @@ -7622,7 +8002,7 @@ 18 - + 1 @@ -7630,7 +8010,7 @@ 56640 66 eighth - 95 + 80 1 78 @@ -7641,7 +8021,7 @@ 1 66 eighth - 95 + 80 1 66 @@ -7652,21 +8032,21 @@ 1 66 eighth - 95 + 80 1 73 21 - + 1 1 67 eighth - 96 + 81 1 78 @@ -7677,7 +8057,7 @@ 1 67 eighth - 96 + 81 1 66 @@ -7688,21 +8068,21 @@ 1 67 eighth - 96 + 81 1 73 21 - + 1 1 68 eighth - 97 + 82 1 76 @@ -7713,7 +8093,7 @@ 1 68 eighth - 97 + 82 1 66 @@ -7724,21 +8104,21 @@ 1 68 eighth - 97 + 82 1 72 26 - + 1 1 69 eighth - 98 + 83 1 76 @@ -7749,7 +8129,7 @@ 1 69 eighth - 98 + 83 1 64 @@ -7760,7 +8140,7 @@ 1 69 eighth - 98 + 83 1 73 @@ -7810,6 +8190,7 @@ sforzato + @@ -7822,6 +8203,7 @@ tenuto + 75 @@ -7833,6 +8215,7 @@ tenuto + 74 @@ -7844,6 +8227,7 @@ tenuto + @@ -7851,7 +8235,7 @@ 21 - + 1 @@ -7859,7 +8243,7 @@ 58560 72 eighth - 99 + 84 1 76 @@ -7870,7 +8254,7 @@ 1 72 eighth - 99 + 84 1 68 @@ -7881,21 +8265,21 @@ 1 72 eighth - 99 + 84 1 73 21 - + 1 1 73 eighth - 100 + 85 1 75 @@ -7906,7 +8290,7 @@ 1 73 eighth - 100 + 85 1 67 @@ -7917,21 +8301,21 @@ 1 73 eighth - 100 + 85 1 73 21 - + 1 1 74 eighth - 101 + 86 1 74 @@ -7942,7 +8326,7 @@ 1 74 eighth - 101 + 86 1 66 @@ -7953,21 +8337,21 @@ 1 74 eighth - 101 + 86 1 72 26 - + 1 1 75 eighth - 102 + 87 1 73 @@ -7978,7 +8362,7 @@ 1 75 eighth - 102 + 87 1 64 @@ -7989,7 +8373,7 @@ 1 75 eighth - 102 + 87 1 68 @@ -7999,8 +8383,8 @@ - MeasureNumber + MeasureNumber 1 @@ -8043,6 +8427,7 @@ sforzato + @@ -8055,6 +8440,7 @@ tenuto + 75 @@ -8067,6 +8453,7 @@ tenuto + 74 @@ -8078,6 +8465,7 @@ tenuto + @@ -8085,7 +8473,7 @@ 21 - + 1 @@ -8093,7 +8481,7 @@ 60480 76 eighth - 103 + 88 1 76 @@ -8104,7 +8492,7 @@ 1 76 eighth - 103 + 88 1 68 @@ -8115,21 +8503,21 @@ 1 76 eighth - 103 + 88 1 73 21 - + 1 1 77 eighth - 104 + 89 1 75 @@ -8140,7 +8528,7 @@ 1 77 eighth - 104 + 89 1 67 @@ -8151,21 +8539,21 @@ 1 77 eighth - 104 + 89 1 73 21 - + 1 1 78 eighth - 105 + 90 1 74 @@ -8176,7 +8564,7 @@ 1 78 eighth - 105 + 90 1 66 @@ -8187,21 +8575,21 @@ 1 78 eighth - 105 + 90 1 72 26 - + 1 1 79 eighth - 106 + 91 1 73 @@ -8212,7 +8600,7 @@ 1 79 eighth - 106 + 91 1 64 @@ -8223,7 +8611,7 @@ 1 79 eighth - 106 + 91 1 68 @@ -8300,7 +8688,7 @@ 22 - + 1 @@ -8308,7 +8696,7 @@ 62400 80 eighth - 107 + 92 1 80 @@ -8319,7 +8707,7 @@ 1 80 eighth - 107 + 92 1 68 @@ -8330,21 +8718,21 @@ 1 80 eighth - 107 + 92 1 73 21 - + 1 1 81 eighth - 108 + 93 1 78 @@ -8355,7 +8743,7 @@ 1 81 eighth - 108 + 93 1 69 @@ -8366,21 +8754,21 @@ 1 81 eighth - 108 + 93 1 73 21 - + 1 1 82 eighth - 109 + 94 1 81 @@ -8391,7 +8779,7 @@ 1 82 eighth - 109 + 94 1 66 @@ -8402,21 +8790,21 @@ 1 82 eighth - 109 + 94 1 73 21 - + 1 1 83 eighth - 110 + 95 1 80 @@ -8427,7 +8815,7 @@ 1 83 eighth - 110 + 95 1 68 @@ -8438,7 +8826,7 @@ 1 83 eighth - 110 + 95 1 73 @@ -8448,8 +8836,10 @@ - + + + 0 + MeasureNumber + fff + 67200 - + 0 2 @@ -8741,7 +9135,7 @@ 18 - + 88 @@ -8749,7 +9143,7 @@ sforzato - 115 + 100 84 26 @@ -8762,9 +9156,11 @@ 93 17 + Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 + MeasureNumber 2 @@ -9735,7 +10194,7 @@ 3 eighth - + 72000 @@ -9744,7 +10203,7 @@ sforzato - 127 + 112 69 17 @@ -9757,9 +10216,11 @@ 78 20 + Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 + MeasureNumber 2 @@ -10716,7 +11238,7 @@ 3 eighth - + 77760 @@ -10725,7 +11247,7 @@ sforzato - 139 + 124 57 17 @@ -10738,9 +11260,11 @@ 66 20 + Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 Fingering - + + 0 + + + 0 ff + 82560 - + 0 81600 @@ -11300,6 +11853,7 @@ + 2 81600 half @@ -11333,8 +11887,10 @@ line - + + + 0 ff + 84480 - + 0 83520 @@ -11364,6 +11922,7 @@ + 2 83520 half @@ -11374,6 +11933,7 @@ sforzato + 2 @@ -11395,15 +11955,17 @@ - MeasureNumber + MeasureNumber 1 + Tempo + 1 - + 0 + 85680 - + 0 + MeasureNumber eighth - + eighth sforzato - 153 + 135 76 18 @@ -11839,7 +12403,7 @@ sforzato - 153 + 135 83 19 @@ -11858,7 +12422,7 @@ sforzato - 153 + 135 81 17 @@ -11928,14 +12492,14 @@ eighth - + eighth sforzato - 155 + 136 80 22 @@ -11958,7 +12522,7 @@ sforzato - 155 + 136 81 17 @@ -11981,7 +12545,7 @@ sforzato - 155 + 136 78 20 @@ -11999,14 +12563,14 @@ 20 - + eighth sforzato - 156 + 137 80 22 @@ -12029,7 +12593,7 @@ sforzato - 156 + 137 76 18 @@ -12052,7 +12616,7 @@ sforzato - 156 + 137 78 20 @@ -12075,7 +12639,7 @@ sforzato - 156 + 137 75 23 @@ -12098,14 +12662,14 @@ line - + eighth sforzato - 159 + 138 76 18 @@ -12128,7 +12692,7 @@ sforzato - 159 + 138 76 18 @@ -12151,7 +12715,7 @@ sforzato - 159 + 138 78 20 @@ -12174,7 +12738,7 @@ sforzato - 159 + 138 75 23 @@ -12192,14 +12756,14 @@ 23 - + eighth sforzato - 160 + 139 76 18 @@ -12222,7 +12786,7 @@ sforzato - 160 + 139 73 21 @@ -12245,7 +12809,7 @@ sforzato - 160 + 139 75 23 @@ -12268,7 +12832,7 @@ sforzato - 160 + 139 72 26 @@ -12289,17 +12853,17 @@ - MeasureNumber + MeasureNumber - + eighth sforzato - 163 + 140 73 21 @@ -12326,7 +12890,7 @@ sforzato - 163 + 140 73 21 @@ -12349,7 +12913,7 @@ sforzato - 163 + 140 76 18 @@ -12372,7 +12936,7 @@ sforzato - 163 + 140 75 23 @@ -12447,14 +13011,14 @@ eighth - + eighth sforzato - 165 + 141 73 21 @@ -12477,7 +13041,7 @@ sforzato - 165 + 141 80 22 @@ -12496,7 +13060,7 @@ sforzato - 165 + 141 78 20 @@ -12592,14 +13156,14 @@ 19.512 - + eighth tenuto - 167 + 142 61 21 @@ -12618,7 +13182,7 @@ tenuto - 167 + 142 62 16 @@ -12637,7 +13201,7 @@ tenuto - 167 + 142 59 19 @@ -12651,14 +13215,14 @@ 19 - + eighth tenuto - 168 + 143 61 21 @@ -12677,7 +13241,7 @@ tenuto - 168 + 143 57 17 @@ -12696,7 +13260,7 @@ tenuto - 168 + 143 59 19 @@ -12715,7 +13279,7 @@ tenuto - 168 + 143 56 22 @@ -12732,8 +13296,8 @@ - MeasureNumber + MeasureNumber no @@ -12754,14 +13318,14 @@ 17 - + eighth tenuto - 171 + 144 57 17 @@ -12780,7 +13344,7 @@ tenuto - 171 + 144 61 21 @@ -12799,7 +13363,7 @@ tenuto - 171 + 144 59 19 @@ -12858,10 +13422,12 @@ + mf + 105120 - + 0 104640 @@ -13041,14 +13607,17 @@ + ppp - + + 0 whole + 68 @@ -13076,6 +13645,24 @@ 4 + + 32 + + + + 32 + + + + 32 + + + + 32 + + + 1 + 1 1073742084 @@ -13120,6 +13707,7 @@ sforzato + 25 @@ -13138,11 +13726,13 @@ + Staff + 5 3120 - + 0 Fingering - + + 5 + 0 Fingering - + + 5 + 0 + 39840 - + 0 + + + 0 + 47520 - + 0 + + + 0 Fingering - + + 0 Fingering - + + 0 + 85680 - + 0 mf + 105120 - + 0 104640 @@ -18939,14 +19637,17 @@ + ppp - + + 0 whole + 52 @@ -18974,6 +19675,24 @@ 4 + + 32 + + + + 32 + + + + 32 + + + + 32 + + + 1 + 1 1073742084 @@ -18991,8 +19710,10 @@ - + + + 0