Skip to content

Commit

Permalink
Spelling (#11566)
Browse files Browse the repository at this point in the history
* spelling: above

Signed-off-by: Josh Soref <[email protected]>

* spelling: accessibility

Signed-off-by: Josh Soref <[email protected]>

* spelling: accessible

Signed-off-by: Josh Soref <[email protected]>

* spelling: account

Signed-off-by: Josh Soref <[email protected]>

* spelling: action

Signed-off-by: Josh Soref <[email protected]>

* spelling: activated

Signed-off-by: Josh Soref <[email protected]>

* spelling: active

Signed-off-by: Josh Soref <[email protected]>

* spelling: again

Signed-off-by: Josh Soref <[email protected]>

* spelling: allegro

Signed-off-by: Josh Soref <[email protected]>

* spelling: alternative

Signed-off-by: Josh Soref <[email protected]>

* spelling: amplitude

Signed-off-by: Josh Soref <[email protected]>

* spelling: and

Signed-off-by: Josh Soref <[email protected]>

* spelling: annotation

Signed-off-by: Josh Soref <[email protected]>

* spelling: appended

Signed-off-by: Josh Soref <[email protected]>

* spelling: appending

Signed-off-by: Josh Soref <[email protected]>

* spelling: appropriate

Signed-off-by: Josh Soref <[email protected]>

* spelling: arbitrarily

Signed-off-by: Josh Soref <[email protected]>

* spelling: architecture

Signed-off-by: Josh Soref <[email protected]>

* spelling: arpeggio

Signed-off-by: Josh Soref <[email protected]>

* spelling: arranger

Signed-off-by: Josh Soref <[email protected]>

* spelling: assumed

Signed-off-by: Josh Soref <[email protected]>

* spelling: asynchronous

Signed-off-by: Josh Soref <[email protected]>

* spelling: automatically

Signed-off-by: Josh Soref <[email protected]>

* spelling: availability

Signed-off-by: Josh Soref <[email protected]>

* spelling: available

Signed-off-by: Josh Soref <[email protected]>

* spelling: backslashes

Signed-off-by: Josh Soref <[email protected]>

* spelling: before

Signed-off-by: Josh Soref <[email protected]>

* spelling: beginning

Signed-off-by: Josh Soref <[email protected]>

* spelling: between

Signed-off-by: Josh Soref <[email protected]>

* spelling: bounding

Signed-off-by: Josh Soref <[email protected]>

* spelling: bracket

Signed-off-by: Josh Soref <[email protected]>

* spelling: builtin

Signed-off-by: Josh Soref <[email protected]>

* spelling: calculated

Signed-off-by: Josh Soref <[email protected]>

* spelling: categories

Signed-off-by: Josh Soref <[email protected]>

* spelling: check

Signed-off-by: Josh Soref <[email protected]>

* spelling: class

Signed-off-by: Josh Soref <[email protected]>

* spelling: clearance

Signed-off-by: Josh Soref <[email protected]>

* spelling: column

Signed-off-by: Josh Soref <[email protected]>

* spelling: combinations

Signed-off-by: Josh Soref <[email protected]>

* spelling: completed

Signed-off-by: Josh Soref <[email protected]>

* spelling: composer

Signed-off-by: Josh Soref <[email protected]>

* spelling: compression

Signed-off-by: Josh Soref <[email protected]>

* spelling: consideration

Signed-off-by: Josh Soref <[email protected]>

* spelling: constraints

Signed-off-by: Josh Soref <[email protected]>

* spelling: container

Signed-off-by: Josh Soref <[email protected]>

* spelling: continuous

Signed-off-by: Josh Soref <[email protected]>

* spelling: contrabass

Signed-off-by: Josh Soref <[email protected]>

* spelling: control

Signed-off-by: Josh Soref <[email protected]>

* spelling: convergence

Signed-off-by: Josh Soref <[email protected]>

* spelling: conversion

Signed-off-by: Josh Soref <[email protected]>

* spelling: convert

Signed-off-by: Josh Soref <[email protected]>

* spelling: coordinates

Signed-off-by: Josh Soref <[email protected]>

* spelling: correctly

Signed-off-by: Josh Soref <[email protected]>

* spelling: corresponds

Signed-off-by: Josh Soref <[email protected]>

* spelling: counting

Signed-off-by: Josh Soref <[email protected]>

* spelling: crescendo

Signed-off-by: Josh Soref <[email protected]>

* spelling: customizable

Signed-off-by: Josh Soref <[email protected]>

* spelling: cutout

Signed-off-by: Josh Soref <[email protected]>

* spelling: deep

Signed-off-by: Josh Soref <[email protected]>

* spelling: denom

Signed-off-by: Josh Soref <[email protected]>

* spelling: denominator

Signed-off-by: Josh Soref <[email protected]>

* spelling: diagram

Signed-off-by: Josh Soref <[email protected]>

* spelling: diminished

Signed-off-by: Josh Soref <[email protected]>

* spelling: direction

Signed-off-by: Josh Soref <[email protected]>

* spelling: directories

Signed-off-by: Josh Soref <[email protected]>

* spelling: disconnected

Signed-off-by: Josh Soref <[email protected]>

* spelling: doesn't

Signed-off-by: Josh Soref <[email protected]>

* spelling: dotted

Signed-off-by: Josh Soref <[email protected]>

* spelling: easeinout

Signed-off-by: Josh Soref <[email protected]>

* spelling: eighth

Signed-off-by: Josh Soref <[email protected]>

* spelling: element

Signed-off-by: Josh Soref <[email protected]>

* spelling: elements

Signed-off-by: Josh Soref <[email protected]>

* spelling: enabled

Signed-off-by: Josh Soref <[email protected]>

* spelling: engraving

Signed-off-by: Josh Soref <[email protected]>

* spelling: evenly

Signed-off-by: Josh Soref <[email protected]>

* spelling: exactly

Signed-off-by: Josh Soref <[email protected]>

* spelling: exceed

Signed-off-by: Josh Soref <[email protected]>

* spelling: excerpts

Signed-off-by: Josh Soref <[email protected]>

* spelling: excessively

Signed-off-by: Josh Soref <[email protected]>

* spelling: exclusive

Signed-off-by: Josh Soref <[email protected]>

* spelling: extension

Signed-off-by: Josh Soref <[email protected]>

* spelling: extrapolated

Signed-off-by: Josh Soref <[email protected]>

* spelling: farthest

Signed-off-by: Josh Soref <[email protected]>

* spelling: fits

Signed-off-by: Josh Soref <[email protected]>

* spelling: friends

Signed-off-by: Josh Soref <[email protected]>

* spelling: function

Signed-off-by: Josh Soref <[email protected]>

* spelling: glissando

Signed-off-by: Josh Soref <[email protected]>

* spelling: global

Signed-off-by: Josh Soref <[email protected]>

* spelling: grid

Signed-off-by: Josh Soref <[email protected]>

* spelling: halved

Signed-off-by: Josh Soref <[email protected]>

* spelling: happen

* spelling: harmonies

Signed-off-by: Josh Soref <[email protected]>

* spelling: have

Signed-off-by: Josh Soref <[email protected]>

* spelling: header

Signed-off-by: Josh Soref <[email protected]>

* spelling: height

Signed-off-by: Josh Soref <[email protected]>

* spelling: iabbrev

Signed-off-by: Josh Soref <[email protected]>

* spelling: ideally

Signed-off-by: Josh Soref <[email protected]>

* spelling: implementation

Signed-off-by: Josh Soref <[email protected]>

* spelling: in

Signed-off-by: Josh Soref <[email protected]>

* spelling: incoming

Signed-off-by: Josh Soref <[email protected]>

* spelling: incomplete

Signed-off-by: Josh Soref <[email protected]>

* spelling: increase

Signed-off-by: Josh Soref <[email protected]>

* spelling: indentation

Signed-off-by: Josh Soref <[email protected]>

* spelling: individual

Signed-off-by: Josh Soref <[email protected]>

* spelling: infer

Signed-off-by: Josh Soref <[email protected]>

* spelling: initial

Signed-off-by: Josh Soref <[email protected]>

* spelling: initially

Signed-off-by: Josh Soref <[email protected]>

* spelling: inputted

Signed-off-by: Josh Soref <[email protected]>

* spelling: instrument

Signed-off-by: Josh Soref <[email protected]>

* spelling: instruments

Signed-off-by: Josh Soref <[email protected]>

* spelling: invalid

Signed-off-by: Josh Soref <[email protected]>

* spelling: invocation

Signed-off-by: Josh Soref <[email protected]>

* spelling: iplugin

Signed-off-by: Josh Soref <[email protected]>

* spelling: javascript

Signed-off-by: Josh Soref <[email protected]>

* spelling: label

Signed-off-by: Josh Soref <[email protected]>

* spelling: laid out

Signed-off-by: Josh Soref <[email protected]>

* spelling: languages

Signed-off-by: Josh Soref <[email protected]>

* spelling: length

Signed-off-by: Josh Soref <[email protected]>

* spelling: linked

Signed-off-by: Josh Soref <[email protected]>

* spelling: lyrchord

Signed-off-by: Josh Soref <[email protected]>

* spelling: lyricist

Signed-off-by: Josh Soref <[email protected]>

* spelling: managed

Signed-off-by: Josh Soref <[email protected]>

* spelling: manually

Signed-off-by: Josh Soref <[email protected]>

* spelling: mapping

Signed-off-by: Josh Soref <[email protected]>

* spelling: mappings

Signed-off-by: Josh Soref <[email protected]>

* spelling: margins

Signed-off-by: Josh Soref <[email protected]>

* spelling: measure

Signed-off-by: Josh Soref <[email protected]>

* spelling: metric

Signed-off-by: Josh Soref <[email protected]>

* spelling: metronome

Signed-off-by: Josh Soref <[email protected]>

* spelling: military

Signed-off-by: Josh Soref <[email protected]>

* spelling: milliseconds

Signed-off-by: Josh Soref <[email protected]>

* spelling: minimum

Signed-off-by: Josh Soref <[email protected]>

* spelling: modifiers

Signed-off-by: Josh Soref <[email protected]>

* spelling: moving

Signed-off-by: Josh Soref <[email protected]>

* spelling: multi

Signed-off-by: Josh Soref <[email protected]>

* spelling: namespace

Signed-off-by: Josh Soref <[email protected]>

* spelling: navigate

Signed-off-by: Josh Soref <[email protected]>

* spelling: necessary

Signed-off-by: Josh Soref <[email protected]>

* spelling: needs

Signed-off-by: Josh Soref <[email protected]>

* spelling: newly

Signed-off-by: Josh Soref <[email protected]>

* spelling: notation

Signed-off-by: Josh Soref <[email protected]>

* spelling: numerator

Signed-off-by: Josh Soref <[email protected]>

* spelling: occasionally

Signed-off-by: Josh Soref <[email protected]>

* spelling: occurred

Signed-off-by: Josh Soref <[email protected]>

* spelling: occurrence

Signed-off-by: Josh Soref <[email protected]>

* spelling: omitted

Signed-off-by: Josh Soref <[email protected]>

* spelling: or

Signed-off-by: Josh Soref <[email protected]>

* spelling: oriented

Signed-off-by: Josh Soref <[email protected]>

* spelling: originally

Signed-off-by: Josh Soref <[email protected]>

* spelling: ornament

Signed-off-by: Josh Soref <[email protected]>

* spelling: ornaments

Signed-off-by: Josh Soref <[email protected]>

* spelling: output

Signed-off-by: Josh Soref <[email protected]>

* spelling: outputted

Signed-off-by: Josh Soref <[email protected]>

* spelling: outside

Signed-off-by: Josh Soref <[email protected]>

* spelling: overlapping

Signed-off-by: Josh Soref <[email protected]>

* spelling: overridden

Signed-off-by: Josh Soref <[email protected]>

* spelling: package

Signed-off-by: Josh Soref <[email protected]>

* spelling: padding

Signed-off-by: Josh Soref <[email protected]>

* spelling: parameter

Signed-off-by: Josh Soref <[email protected]>

* spelling: percussion

Signed-off-by: Josh Soref <[email protected]>

* spelling: placement

Signed-off-by: Josh Soref <[email protected]>

* spelling: playthrough

Signed-off-by: Josh Soref <[email protected]>

* spelling: positive

Signed-off-by: Josh Soref <[email protected]>

* spelling: preceded

Signed-off-by: Josh Soref <[email protected]>

* spelling: precision

Signed-off-by: Josh Soref <[email protected]>

* spelling: previous

Signed-off-by: Josh Soref <[email protected]>

* spelling: process

Signed-off-by: Josh Soref <[email protected]>

* spelling: property

Signed-off-by: Josh Soref <[email protected]>

* spelling: proximity

Signed-off-by: Josh Soref <[email protected]>

* spelling: publish

Signed-off-by: Josh Soref <[email protected]>

* spelling: rasgueado

Signed-off-by: Josh Soref <[email protected]>

* spelling: read

Signed-off-by: Josh Soref <[email protected]>

* spelling: receive

Signed-off-by: Josh Soref <[email protected]>

* spelling: received

Signed-off-by: Josh Soref <[email protected]>

* spelling: rectangle

Signed-off-by: Josh Soref <[email protected]>

* spelling: regarding

Signed-off-by: Josh Soref <[email protected]>

* spelling: register

Signed-off-by: Josh Soref <[email protected]>

* spelling: registry

Signed-off-by: Josh Soref <[email protected]>

* spelling: rehearsal

Signed-off-by: Josh Soref <[email protected]>

* spelling: related

Signed-off-by: Josh Soref <[email protected]>

* spelling: repeat

Signed-off-by: Josh Soref <[email protected]>

* spelling: repeatp

Signed-off-by: Josh Soref <[email protected]>

* spelling: replacements

Signed-off-by: Josh Soref <[email protected]>

* spelling: represent

Signed-off-by: Josh Soref <[email protected]>

* spelling: representation

Signed-off-by: Josh Soref <[email protected]>

* spelling: responses

Signed-off-by: Josh Soref <[email protected]>

* spelling: rhythm

Signed-off-by: Josh Soref <[email protected]>

* spelling: section

Signed-off-by: Josh Soref <[email protected]>

* spelling: selected

Signed-off-by: Josh Soref <[email protected]>

* spelling: selection

Signed-off-by: Josh Soref <[email protected]>

* spelling: separation

Signed-off-by: Josh Soref <[email protected]>

* spelling: separator

Signed-off-by: Josh Soref <[email protected]>

* spelling: shortcuts

Signed-off-by: Josh Soref <[email protected]>

* spelling: signatures

Signed-off-by: Josh Soref <[email protected]>

* spelling: simile

Signed-off-by: Josh Soref <[email protected]>

* spelling: slurred

Signed-off-by: Josh Soref <[email protected]>

* spelling: sound

Signed-off-by: Josh Soref <[email protected]>

* spelling: staccato

Signed-off-by: Josh Soref <[email protected]>

* spelling: staff

Signed-off-by: Josh Soref <[email protected]>

* spelling: stuff

Signed-off-by: Josh Soref <[email protected]>

* spelling: style

Signed-off-by: Josh Soref <[email protected]>

* spelling: suffix

Signed-off-by: Josh Soref <[email protected]>

* spelling: supported

Signed-off-by: Josh Soref <[email protected]>

* spelling: symbol

Signed-off-by: Josh Soref <[email protected]>

* spelling: symbols

Signed-off-by: Josh Soref <[email protected]>

* spelling: system

Signed-off-by: Josh Soref <[email protected]>

* spelling: tablature

Signed-off-by: Josh Soref <[email protected]>

* spelling: tcp_invalid

Signed-off-by: Josh Soref <[email protected]>

* spelling: that

Signed-off-by: Josh Soref <[email protected]>

* spelling: the

Signed-off-by: Josh Soref <[email protected]>

* spelling: thickness

Signed-off-by: Josh Soref <[email protected]>

* spelling: tibetan

Signed-off-by: Josh Soref <[email protected]>

* spelling: of

Signed-off-by: Josh Soref <[email protected]>

* spelling: to

Signed-off-by: Josh Soref <[email protected]>

* spelling: transparent

Signed-off-by: Josh Soref <[email protected]>

* spelling: transpose

Signed-off-by: Josh Soref <[email protected]>

* spelling: tremolo

Signed-off-by: Josh Soref <[email protected]>

* spelling: ultimately

Signed-off-by: Josh Soref <[email protected]>

* spelling: unassigned

Signed-off-by: Josh Soref <[email protected]>

* spelling: underscore

Signed-off-by: Josh Soref <[email protected]>

* spelling: unhandled

Signed-off-by: Josh Soref <[email protected]>

* spelling: uninstall

Signed-off-by: Josh Soref <[email protected]>

* spelling: unknown

Signed-off-by: Josh Soref <[email protected]>

* spelling: unnamed

Signed-off-by: Josh Soref <[email protected]>

* spelling: useful

Signed-off-by: Josh Soref <[email protected]>

* spelling: usually

Signed-off-by: Josh Soref <[email protected]>

* spelling: vertical

Signed-off-by: Josh Soref <[email protected]>

* spelling: violin

Signed-off-by: Josh Soref <[email protected]>

* spelling: visible

Signed-off-by: Josh Soref <[email protected]>

* spelling: when

Signed-off-by: Josh Soref <[email protected]>

* spelling: whether

Signed-off-by: Josh Soref <[email protected]>

* spelling: with

Signed-off-by: Josh Soref <[email protected]>

* spelling: within

Signed-off-by: Josh Soref <[email protected]>

* spelling: without

Signed-off-by: Josh Soref <[email protected]>

* spelling: would

Signed-off-by: Josh Soref <[email protected]>

* spelling: writing

Signed-off-by: Josh Soref <[email protected]>

* spelling: written

Signed-off-by: Josh Soref <[email protected]>

* spelling: xmlns

Signed-off-by: Josh Soref <[email protected]>

* Remove unused avaiableArticulationTypesChanged

Signed-off-by: Josh Soref <[email protected]>

* spelling: firstSystemIndentation [API]

Signed-off-by: Josh Soref <[email protected]>

* Enable testIncompleteTuplet

Signed-off-by: Josh Soref <[email protected]>

* Drop stray comment

Signed-off-by: Josh Soref <[email protected]>

* Update license header in module.cmake

per #11566 (comment)

Signed-off-by: Josh Soref <[email protected]>

Co-authored-by: Josh Soref <[email protected]>
  • Loading branch information
jsoref and jsoref authored May 15, 2022
1 parent 751c086 commit 55c452f
Show file tree
Hide file tree
Showing 321 changed files with 951 additions and 955 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ if (BUILD_UNIT_TESTS)
message(STATUS "Enabled testing")

define_property(TARGET PROPERTY OUTPUT_XML
BRIEF_DOCS "List XML files outputed by google test."
FULL_DOCS "List XML files outputed by google test."
BRIEF_DOCS "List XML files outputted by google test."
FULL_DOCS "List XML files outputted by google test."
)

add_subdirectory(thirdparty/googletest)
Expand Down
8 changes: 4 additions & 4 deletions Doxyfile.plugins
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ OPTIMIZE_OUTPUT_VHDL = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
# Fortran. In the later case the parser tries to guess whether the code is fixed
Expand Down Expand Up @@ -1527,7 +1527,7 @@ EXT_LINKS_IN_WINDOW = NO

FORMULA_FONTSIZE = 10

# Use the FORMULA_TRANPARENT tag to determine whether or not the images
# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
# generated for formulas are transparent PNGs. Transparent PNGs are not
# supported properly for IE 6.0, but are supported on all modern browsers.
#
Expand All @@ -1539,7 +1539,7 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES

# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
# http://www.mathjax.org) which uses client side Javascript for the rendering
# http://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
Expand Down Expand Up @@ -1609,7 +1609,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES

# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
# implemented using a web server instead of a web client using Javascript. There
# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
Expand Down
4 changes: 2 additions & 2 deletions build.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ endif()
# Clean - delete an existing build directory.
#
# We usually avoid this because performing a clean build takes much longer
# than an incremental build, but it is occassionally necessary. If you
# than an incremental build, but it is occasionally necessary. If you
# encounter errors during a build then you should try doing a clean build.

if(ARG_CLEAN)
Expand Down Expand Up @@ -272,7 +272,7 @@ endif()
# The working directory is unchanged. Use build_override.cmake to set the
# CMake variable RUN_ARGS to contain a list of arguments to pass to MuseScore
# on the command line. In addition, script arguments after "run" will be
# appened to this list, but note that certain arguments cannot be passed this
# appended to this list, but note that certain arguments cannot be passed this
# way (e.g. --help, --version) because they cancel CMake script processing.

if(ARG_RUN)
Expand Down
2 changes: 1 addition & 1 deletion build/Linux+BSD/org.musescore.MuseScore.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@
</ul>
<p>Zerberus:</p>
<ul>
<li>Fix #222031: remove ties and spanners when removing induvidual notes within a chord</li>
<li>Fix #222031: remove ties and spanners when removing individual notes within a chord</li>
<li>Fix #271718: clicking noise fix</li>
<li>Fix #271719: sound accumulation on noteOff</li>
<li>Fix #271722: long release samples do not play in their entirety</li>
Expand Down
2 changes: 1 addition & 1 deletion build/Packaging.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ IF(MINGW OR MSVC)
SET(MSCORE_EXECUTABLE_NAME ${MUSESCORE_NAME}${MUSESCORE_VERSION_MAJOR})

# 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.
# sure there is at least one set of four (4) backslashes.
SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/build/packaging\\\\installer_head_nsis.bmp")
SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\${MSCORE_EXECUTABLE_NAME}.exe,0")
SET(CPACK_NSIS_DISPLAY_NAME "${MUSESCORE_NAME} ${MUSESCORE_VERSION_FULL}")
Expand Down
2 changes: 1 addition & 1 deletion build/cmake/GetUtilsFunctions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function(fn__set_default
endfunction()

# Set a variable to value of an option from a list of command line arguments.
# The variable will only recieve a value if the relevant option was provided.
# The variable will only receive a value if the relevant option was provided.
function(fn__get_option
VAR_NAME # Name of the variable to set.
OPT_NAME # Name of the option to search for (e.g. "-foo").
Expand Down
59 changes: 30 additions & 29 deletions build/module.cmake
Original file line number Diff line number Diff line change
@@ -1,36 +1,37 @@
#=============================================================================
# MuseScore
# Music Composition & Notation
# SPDX-License-Identifier: GPL-3.0-only
# MuseScore-CLA-applies
#
# Copyright (C) 2020 MuseScore BVBA and others
# MuseScore
# Music Composition & Notation
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2.
# Copyright (C) 2022 MuseScore BVBA and others
#
# 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.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 3 as
# published by the Free Software Foundation.
#
# 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.
#=============================================================================
# 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, see <https://www.gnu.org/licenses/>.

## Setup
# set(MODULE somename) - set module (target) name
# set(MODULE_INCLUDE ...) - set include (by default see below include_directories)
# set(MODULE_DEF ...) - set definitions
# set(MODULE_SRC ...) - set sources and headers files
# set(MODULE_LINK ...) - set libraries for link
# set(MODULE_NOT_LINK_GLOBAL ON) - set for not link global lib
# set(MODULE_QRC somename.qrc) - set resource (qrc) file
# set(MODULE_BIG_QRC somename.qrc) - set big resource (qrc) file
# set(MODULE_UI ...) - set ui headers
# set(MODULE_QML_IMPORT ...) - set Qml import for QtCreator (so that there is code highlighting, jump, etc.)
# set(MODULE_USE_PCH_NONE ON) - set for disable PCH for module
# set(MODULE_USE_UNITY_NONE ON) - set for disable UNITY BUILD for module
# set(MODULE_OVERRIDEN_PCH ...) - set additional precompiled headers required for module
# set(MODULE somename) - set module (target) name
# set(MODULE_INCLUDE ...) - set include (by default see below include_directories)
# set(MODULE_DEF ...) - set definitions
# set(MODULE_SRC ...) - set sources and headers files
# set(MODULE_LINK ...) - set libraries for link
# set(MODULE_NOT_LINK_GLOBAL ON) - set for not link global lib
# set(MODULE_QRC somename.qrc) - set resource (qrc) file
# set(MODULE_BIG_QRC somename.qrc) - set big resource (qrc) file
# set(MODULE_UI ...) - set ui headers
# set(MODULE_QML_IMPORT ...) - set Qml import for QtCreator (so that there is code highlighting, jump, etc.)
# set(MODULE_USE_PCH_NONE ON) - set for disable PCH for module
# set(MODULE_USE_UNITY_NONE ON) - set for disable UNITY BUILD for module
# set(MODULE_OVERRIDDEN_PCH ...) - set additional precompiled headers required for module
# set(PROJECT_ROOT_DIR ${PROJECT_SOURCE_DIR}) - set root dir for module

# After all the settings you need to do:
Expand Down Expand Up @@ -78,11 +79,11 @@ if (BUILD_PCH)
# disabled pch for current module
else()
if (NOT ${MODULE} MATCHES global)
if (NOT DEFINED MODULE_OVERRIDEN_PCH)
if (NOT DEFINED MODULE_OVERRIDDEN_PCH)
target_precompile_headers(${MODULE} REUSE_FROM global)
target_compile_definitions(${MODULE} PRIVATE global_EXPORTS=1)
else()
target_precompile_headers(${MODULE} PRIVATE ${MODULE_OVERRIDEN_PCH})
target_precompile_headers(${MODULE} PRIVATE ${MODULE_OVERRIDDEN_PCH})
endif()
if (MODULE_NOT_LINK_GLOBAL)
set(MODULE_NOT_LINK_GLOBAL OFF)
Expand Down
46 changes: 23 additions & 23 deletions build/packaging/NSIS.template.in
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ Function un.RemoveFromPath
FunctionEnd

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Uninstall sutff
; Uninstall stuff
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

###########################################
Expand Down Expand Up @@ -477,15 +477,15 @@ Done:
Exch $R1
FunctionEnd

Function ConditionalAddToRegisty
Function ConditionalAddToRegistry
Pop $0
Pop $1
StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
StrCmp "$0" "" ConditionalAddToRegistry_EmptyString
WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@" \
"$1" "$0"
;MessageBox MB_OK "Set Registry: '$1' to '$0'"
DetailPrint "Set install registry entry: '$1' to '$0'"
ConditionalAddToRegisty_EmptyString:
ConditionalAddToRegistry_EmptyString:
FunctionEnd

;--------------------------------
Expand Down Expand Up @@ -675,44 +675,44 @@ Section "-Core installation"
WriteUninstaller "$INSTDIR\Uninstall.exe"
Push "DisplayName"
Push "@CPACK_NSIS_DISPLAY_NAME@"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry
Push "DisplayVersion"
Push "@CPACK_PACKAGE_VERSION@"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry
Push "Publisher"
Push "@CPACK_PACKAGE_VENDOR@"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry
Push "UninstallString"
Push "$INSTDIR\Uninstall.exe"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry
Push "NoRepair"
Push "1"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry

!ifdef CPACK_NSIS_ADD_REMOVE
;Create add/remove functionality
Push "ModifyPath"
Push "$INSTDIR\AddRemove.exe"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry
!else
Push "NoModify"
Push "1"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry
!endif

; Optional registration
Push "DisplayIcon"
Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry
Push "HelpLink"
Push "@CPACK_NSIS_HELP_LINK@"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry
Push "URLInfoAbout"
Push "@CPACK_NSIS_URL_INFO_ABOUT@"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry
Push "Contact"
Push "@CPACK_NSIS_CONTACT@"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry
!insertmacro MUI_INSTALLOPTIONS_READ $INSTALL_DESKTOP "NSIS.InstallOptions.ini" "Field 5" "State"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application

Expand All @@ -725,19 +725,19 @@ Section "-Core installation"
; Write special uninstall registry entries
Push "StartMenu"
Push "$STARTMENU_FOLDER"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry
Push "DoNotAddToPath"
Push "$DO_NOT_ADD_TO_PATH"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry
Push "AddToPathAllUsers"
Push "$ADD_TO_PATH_ALL_USERS"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry
Push "AddToPathCurrentUser"
Push "$ADD_TO_PATH_CURRENT_USER"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry
Push "InstallToDesktop"
Push "$INSTALL_DESKTOP"
Call ConditionalAddToRegisty
Call ConditionalAddToRegistry

@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@

Expand Down Expand Up @@ -879,7 +879,7 @@ Section "Uninstall"
@CPACK_NSIS_DELETE_ICONS@
@CPACK_NSIS_DELETE_ICONS_EXTRA@

;Delete empty start menu parent diretories
;Delete empty start menu parent directories
StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"

startMenuDeleteLoop:
Expand All @@ -892,13 +892,13 @@ Section "Uninstall"
StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
startMenuDeleteLoopDone:

; If the user changed the shortcut, then untinstall may not work. This should
; If the user changed the shortcut, then uninstall may not work. This should
; try to fix it.
StrCpy $MUI_TEMP "$START_MENU"
Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
@CPACK_NSIS_DELETE_ICONS_EXTRA@

;Delete empty start menu parent diretories
;Delete empty start menu parent directories
StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"

secondStartMenuDeleteLoop:
Expand Down
6 changes: 3 additions & 3 deletions mscore3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Palette handling
Lyrics
-------------------------------
- lyrics can be placed above a staff by changing the Placement property to "Above".
Verse numbers are counted from top to bottom. If you change for example the placment
Verse numbers are counted from top to bottom. If you change for example the placement
of a lyric in verse 3 to Above then all lyrics in verse 1-3 are placed above, verse 4+
will stay below.
- 'x' (flip) changes the placement of a lyric.
Expand Down Expand Up @@ -173,7 +173,7 @@ Lyrics
TODO: check if they can be removed in system mode

* path separator
Don't use QDir::separtor(), but "/", see https://doc.qt.io/qt-5/qdir.html#separator
Don't use QDir::separator(), but "/", see https://doc.qt.io/qt-5/qdir.html#separator
and http://agateau.com/2015/qdir-separator-considered-harmful/


Expand Down Expand Up @@ -213,7 +213,7 @@ paint() method in Element
====================================================================

Measure layout
A measure is layouted in four different contexts:
A measure is laid out in four different contexts:
- first measure in a system
- the measure is prepended by a system header

Expand Down
4 changes: 2 additions & 2 deletions mtest/musicxml/visual/testTitleFrameBottom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<work-title>Meta title</work-title>
</work>
<identification>
<creator type="composer">Meta conposer</creator>
<creator type="composer">Meta composer</creator>
<creator type="lyricist">Meta lyricist</creator>
<rights>Meta copyright</rights>
<encoding>
Expand Down Expand Up @@ -49,7 +49,7 @@
<credit-words default-x="595.44" default-y="156.386" justify="center" valign="top" font-size="14">Subtitle</credit-words>
</credit>
<credit page="1">
<credit-words default-x="1134.19" default-y="113.386" justify="right" valign="bottom" font-size="12">Conposer</credit-words>
<credit-words default-x="1134.19" default-y="113.386" justify="right" valign="bottom" font-size="12">Composer</credit-words>
</credit>
<credit page="1">
<credit-words default-x="56.6929" default-y="113.386" justify="left" valign="bottom" font-size="12">Lyricist</credit-words>
Expand Down
4 changes: 2 additions & 2 deletions mtest/musicxml/visual/testTitleFrameBottomCopyrightTop.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<work-title>Meta title</work-title>
</work>
<identification>
<creator type="composer">Meta conposer</creator>
<creator type="composer">Meta composer</creator>
<creator type="lyricist">Meta lyricist</creator>
<rights>Meta copyright</rights>
<encoding>
Expand Down Expand Up @@ -52,7 +52,7 @@
<credit-words default-x="595.44" default-y="156.386" justify="center" valign="top" font-size="14">Subtitle</credit-words>
</credit>
<credit page="1">
<credit-words default-x="1134.19" default-y="113.386" justify="right" valign="bottom" font-size="12">Conposer</credit-words>
<credit-words default-x="1134.19" default-y="113.386" justify="right" valign="bottom" font-size="12">Composer</credit-words>
</credit>
<credit page="1">
<credit-words default-x="56.6929" default-y="113.386" justify="left" valign="bottom" font-size="12">Lyricist</credit-words>
Expand Down
4 changes: 2 additions & 2 deletions mtest/musicxml/visual/testTitleFrameTopCopyrightBottom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<work-title>Meta title</work-title>
</work>
<identification>
<creator type="composer">Meta conposer</creator>
<creator type="composer">Meta composer</creator>
<creator type="lyricist">Meta lyricist</creator>
<rights>Meta copyright</rights>
<encoding>
Expand Down Expand Up @@ -49,7 +49,7 @@
<credit-words default-x="595.44" default-y="1569.97" justify="center" valign="top" font-size="14">Subtitle</credit-words>
</credit>
<credit page="1">
<credit-words default-x="1134.19" default-y="1526.67" justify="right" valign="bottom" font-size="12">Conposer</credit-words>
<credit-words default-x="1134.19" default-y="1526.67" justify="right" valign="bottom" font-size="12">Composer</credit-words>
</credit>
<credit page="1">
<credit-words default-x="56.6929" default-y="1526.67" justify="left" valign="bottom" font-size="12">Lyricist</credit-words>
Expand Down
2 changes: 1 addition & 1 deletion mtest/testoves/structure/tst_ove_structure.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private slots:
//void oveRepeatDCFineTest() { oveReadTest("cond - repeat - dc al fine"); }
//void oveRepeatDSCodaTest() { oveReadTest("cond - repeat - ds al coda_segno"); }
//void oveRepeatDSCodaToCodaTest() { oveReadTest("cond - repeat - ds al coda_segno_to coda"); }
//void oveRepepatDSFineTest() { oveReadTest("cond - repeat - ds al fine_segno"); }
//void oveRepeatDSFineTest() { oveReadTest("cond - repeat - ds al fine_segno"); }
//void oveRepeatNumericEndingTest() { oveReadTest("cond - repeat - numeric ending"); }
//void oveRepeatTheMomentTest() { oveReadTest("cond - repeat - the moment"); }
//void oveRepeatToCodaCodaTest() { oveReadTest("cond - repeat - to coda_coda"); }
Expand Down
Loading

0 comments on commit 55c452f

Please sign in to comment.