Skip to content

Commit

Permalink
Merge branch 'develop-transpose'
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	Verovio.podspec
#	bindings/java/pom.xml
#	bindings/python/setup.py
#	codemeta.json
#	include/vrv/vrvdef.h
  • Loading branch information
lpugin committed Jan 15, 2020
2 parents baa26fc + 3a3613d commit 47fcebb
Show file tree
Hide file tree
Showing 100 changed files with 18,289 additions and 2,005 deletions.
117 changes: 88 additions & 29 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,59 +1,118 @@
branches:
only:
- develop
- develop

sudo: false
os: linux
dist: bionic
language: cpp

git:
depth:
3

env:
global:
- COMMIT_AUTHOR_EMAIL: "$(git log -1 --pretty=format:'%aE')" # TODO: switch author email back to: "[email protected]" if necessary
- SHA: "$(git rev-parse --verify HEAD)"
# repos
- EMSCRIPTEN_REPOSITORY: "https://github.com/emscripten-core/emsdk.git"
- VEROVIO_REPOSITORY: "https://${GH_TOKEN}@github.com/rism-ch/verovio"
# branches
- BUILD_BRANCH: develop
- GH_PAGES_BRANCH: gh-pages
- TEMPORARY_OUTPUT_BRANCH: gh-pages-update-toolkit-${SHA}
# directories
- CURRENT_PATH: "$(pwd)"
- EMSCRIPTEN_DIRECTORY: "emsdk"
- GH_PAGES_DIRECTORY: "gh-pages"
- OUTPUT_DIRECTORY: "${CURRENT_PATH}/${GH_PAGES_DIRECTORY}"

# cache emscripten installation, tools build and output directory to be used throughout different stages
cache:
directories:
- $EMSCRIPTEN_DIRECTORY
- $GH_PAGES_DIRECTORY
- tools

# define order of stages
# conditions for any stage can be included here
stages:
- build-c++
- precache
- build-toolkit
- deploy

jobs:
include:
# test build on osx and an linux with g++
#################
# BUILD-C++ STAGE
#################
# tests builds on osx and on linux with g++
- stage: build-c++
name: osx-xcode
name: osx-xcode-11.1
os: osx
osx_image: xcode11.1
script:
- cd tools
- cmake .
- make
- name: linux-g++-5
- name: linux-g++
os: linux
dist: bionic
script:
- cd tools
- cmake .
- make
# deploy emscripten build and doxygen

################
# PRECACHE STAGE
################
# precaches the emscripten installation, gh-pages, and make-build
# has to come before "build-toolkit" stage
- stage: precache
name: "Precache emscripten installation, make build and gh-pages"
os: linux
script:
- ./travis/ci_precache.sh

#####################
# BUILD-TOOLKIT STAGE
#####################
# builds toolkit with different options in parallel
# all "substages" have to use the same stage id ("build-toolkit")
- stage: build-toolkit
name: "no humdrum"
os: linux
script:
- ./travis/ci_build-toolkit.sh nohumdrum
- name: "no humdrum light"
os: linux
script:
- ./travis/ci_build-toolkit.sh light
- name: "no humdrum wasm"
os: linux
script:
- ./travis/ci_build-toolkit.sh wasm
- name: "default (with humdrum)"
os: linux
script:
- travis_wait 30 ./travis/ci_build-toolkit.sh default

##############
# DEPLOY stage
##############
# deploys toolkit and doxygen builds in parallel
- stage: deploy
# name: emscripten
# os: linux
# dist: bionic
# env:
# global:
# - COMMIT_AUTHOR_EMAIL: "[email protected]"
# script:
# - git clone https://github.com/emscripten-core/emsdk.git
# - cd emsdk
# - ./emsdk install latest
# - ./emsdk activate latest
# - source ./emsdk_env.sh
# - cd ..
# - ./deploy-develop.sh
# -
name: doxygen
os: linux
dist: bionic
name: toolkit
os: linux
skip_cleanup: true
script:
- ./travis/ci_deploy-toolkit.sh
- name: doxygen
os: linux
addons:
apt:
packages:
- doxygen
env:
global:
- COMMIT_AUTHOR_EMAIL: "[email protected]"
script:
- ./deploy-doxygen.sh
- ./travis/ci_deploy-doxygen.sh
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ See the JavaScript toolkit running in the [MEI Viewer](http://www.verovio.org/me

![Choice interaction](https://raw.githubusercontent.com/rism-ch/verovio/gh-pages/movies/reflow.gif)

Verovio can also render Plain and Easy (PAE) code and DARMS code and has a basic MusicXML import function. It is designed as a tool usable as a one-step conversion tool and it is written in pure standard C++ with no dependencies on third-party frameworks and libraries.
Verovio can also render [Plaine & Easie Code](https://www.iaml.info/plaine-easie-code) and imports MusicXML, Humdrum data, and ABC notation. It is designed as a tool usable as a one-step conversion tool and it is written in pure standard C++.

Verovio follows the [Standard Music Font Layout (SMuFL)](http://www.smufl.org) specification and the font can be changed for personalizing the output.

Expand Down Expand Up @@ -41,6 +41,6 @@ If you are willing to contribute to Verovio, please follow the [contribution](do
Example output
--------------

This page was generated with version 0.9.13-dev-b953d3b
This page was generated with version 2.4.0-dev-2748fed

![Example page](https://raw.githubusercontent.com/rism-ch/verovio/gh-pages/images/verovio-exp-0.9.13-dev.png)
![Example page](https://raw.githubusercontent.com/rism-ch/verovio/gh-pages/images/verovio-exp-2.4.0-dev.png)
7 changes: 4 additions & 3 deletions Verovio.podspec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Pod::Spec.new do |s|
s.name = 'Verovio'
s.version = '2.3.5'
s.version = '2.4.0'
s.license = { :type => 'LGPL' }
s.homepage = 'https://www.verovio.org/index.xhtml'
s.authors = { 'Contributors List' => 'https://github.com/rism-ch/verovio/graphs/contributors' }
s.summary = 'Verovio'
s.source = { :git => 'https://github.com/rism-ch/verovio.git', :tag => 'version-' + s.version.to_s }
s.swift_versions = ['5.1']
s.swift_versions = ['3.0', '4.0', '4.1', '4.2', '5.0','5.1']
s.source_files = 'src/**/*.{h,cpp,cc}',
'include/{hum,json,midi,pugi,utf8,vrv}/*.{h,hpp}',
'libmei/{attclasses,attconverter,atts_analytical,atts_cmn,atts_cmnornaments}.{h,cpp}',
Expand All @@ -19,8 +19,9 @@ Pod::Spec.new do |s|
'libmei/{atts_critapp,atts_externalsymbols,atts_facsimile,atts_gestural,atts_mei}.{h}',
'libmei/{atts_mensural,atts_midi,atts_neumes,atts_pagebased,atts_shared}.{h}',
'libmei/{atts_visual,atttypes}.{h}'
s.platform = :ios, '12.0'
s.resources = 'data'
s.ios.deployment_target = '12.0'
s.osx.deployment_target = '10.13'
s.xcconfig = {
"CLANG_CXX_LANGUAGE_STANDARD" => "gnu++14",
"CLANG_CXX_LIBRARY" => "libc++",
Expand Down
30 changes: 25 additions & 5 deletions Verovio.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,12 @@
4DC34BAB19BC4A83006175CD /* custos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DC34BA619BC4A83006175CD /* custos.cpp */; };
4DC34BAC19BC4A83006175CD /* dot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DC34BA719BC4A83006175CD /* dot.cpp */; };
4DC34BAD19BC4A83006175CD /* dot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DC34BA719BC4A83006175CD /* dot.cpp */; };
4DC3B9E5239E2ABF007F185E /* transposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DC3B9E4239E2ABE007F185E /* transposition.cpp */; };
4DC3B9E7239E2AE1007F185E /* transposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DC3B9E4239E2ABE007F185E /* transposition.cpp */; };
4DC3B9E8239E2AE2007F185E /* transposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DC3B9E4239E2ABE007F185E /* transposition.cpp */; };
4DC3B9E9239E2AE3007F185E /* transposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DC3B9E4239E2ABE007F185E /* transposition.cpp */; };
4DC3B9EA239E2B22007F185E /* transposition.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DC3B9E6239E2AD9007F185E /* transposition.h */; };
4DC3B9EB239E2B23007F185E /* transposition.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DC3B9E6239E2AD9007F185E /* transposition.h */; settings = {ATTRIBUTES = (Public, ); }; };
4DCA95D81A515D0E008AD7E9 /* editorial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DCA95D71A515D0E008AD7E9 /* editorial.cpp */; };
4DCA95D91A515D0E008AD7E9 /* editorial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DCA95D71A515D0E008AD7E9 /* editorial.cpp */; };
4DCA95DB1A515D33008AD7E9 /* editorial.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DCA95DA1A515D33008AD7E9 /* editorial.h */; };
Expand Down Expand Up @@ -1360,6 +1366,8 @@
4DC34BA519BC4A82006175CD /* accid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = accid.cpp; path = src/accid.cpp; sourceTree = "<group>"; };
4DC34BA619BC4A83006175CD /* custos.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = custos.cpp; path = src/custos.cpp; sourceTree = "<group>"; };
4DC34BA719BC4A83006175CD /* dot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dot.cpp; path = src/dot.cpp; sourceTree = "<group>"; };
4DC3B9E4239E2ABE007F185E /* transposition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = transposition.cpp; path = src/transposition.cpp; sourceTree = "<group>"; };
4DC3B9E6239E2AD9007F185E /* transposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = transposition.h; path = include/vrv/transposition.h; sourceTree = "<group>"; };
4DCA95D71A515D0E008AD7E9 /* editorial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = editorial.cpp; path = src/editorial.cpp; sourceTree = "<group>"; };
4DCA95DA1A515D33008AD7E9 /* editorial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = editorial.h; path = include/vrv/editorial.h; sourceTree = "<group>"; };
4DD11DC22240E78B00A405D8 /* c_wrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = c_wrapper.cpp; path = tools/c_wrapper.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1957,6 +1965,8 @@
4D1D733B1A1D0390001E08F6 /* smufl.h */,
8F086EBF188539540037FD8E /* toolkit.cpp */,
8F59291618854BF800FE51AD /* toolkit.h */,
4DC3B9E4239E2ABE007F185E /* transposition.cpp */,
4DC3B9E6239E2AD9007F185E /* transposition.h */,
8F086EB6188539540037FD8E /* verticalaligner.cpp */,
8F59290D18854BF800FE51AD /* verticalaligner.h */,
8F086EE1188539540037FD8E /* vrv.cpp */,
Expand Down Expand Up @@ -2322,6 +2332,7 @@
4DB3D8B41F83D08700B5FC2B /* devicecontextbase.h in Headers */,
4DEC4DD921C8295700D1D273 /* rdg.h in Headers */,
4DB3D8D01F83D11800B5FC2B /* mordent.h in Headers */,
4DC3B9EA239E2B22007F185E /* transposition.h in Headers */,
4D1BE7821C69434C0086DC0E /* MidiFile.h in Headers */,
4D9C53121B52E4AE0003C6EC /* core.h in Headers */,
4DEC4DD221C8295700D1D273 /* supplied.h in Headers */,
Expand Down Expand Up @@ -2509,6 +2520,7 @@
BB4C4B6E22A932D7001F6AF0 /* note.h in Headers */,
BB4C4BA422A932E5001F6AF0 /* textdirinterface.h in Headers */,
BB4C4A8E22A9328F001F6AF0 /* attalternates.h in Headers */,
4DC3B9EB239E2B23007F185E /* transposition.h in Headers */,
BB4C4BC622A93317001F6AF0 /* core.h in Headers */,
BB4C4BC122A932FC001F6AF0 /* MidiMessage.h in Headers */,
BB4C4B9222A932DF001F6AF0 /* textelement.h in Headers */,
Expand Down Expand Up @@ -2627,7 +2639,7 @@
8F086EA0188534680037FD8E /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1010;
LastUpgradeCheck = 1130;
TargetAttributes = {
BB4C4A5122A930A3001F6AF0 = {
CreatedOnToolsVersion = 10.2.1;
Expand Down Expand Up @@ -2868,6 +2880,7 @@
4D1694501E3A44F300569BF4 /* attconverter.cpp in Sources */,
4D1694511E3A44F300569BF4 /* glyph.cpp in Sources */,
4D1694521E3A44F300569BF4 /* syl.cpp in Sources */,
4DC3B9E7239E2AE1007F185E /* transposition.cpp in Sources */,
4D1694531E3A44F300569BF4 /* atts_cmn.cpp in Sources */,
4D6DF9F720E1074100C12BBD /* subst.cpp in Sources */,
4D1694541E3A44F300569BF4 /* floatingobject.cpp in Sources */,
Expand Down Expand Up @@ -3073,6 +3086,7 @@
4DC34BAC19BC4A83006175CD /* dot.cpp in Sources */,
4DEC4DB221C826E000D1D273 /* supplied.cpp in Sources */,
4DA0EAC322BB779400A7EBEB /* surface.cpp in Sources */,
4DC3B9E5239E2ABF007F185E /* transposition.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -3247,6 +3261,7 @@
4DB3D8DC1F83D14900B5FC2B /* artic.cpp in Sources */,
4D9A9C1F19A1DE2000028D93 /* syl.cpp in Sources */,
4D4335CB1ED00A33003BE1A9 /* atts_gestural.cpp in Sources */,
4DC3B9E9239E2AE3007F185E /* transposition.cpp in Sources */,
4DB0B0171C44129300DBDCC3 /* timestamp.cpp in Sources */,
40D45EC4204EEB03009C1EC9 /* instrdef.cpp in Sources */,
4D766F0420ACAD6E006875D8 /* syllable.cpp in Sources */,
Expand Down Expand Up @@ -3437,6 +3452,7 @@
BB4C4BBE22A932FC001F6AF0 /* MidiFile.cpp in Sources */,
BB4C4A9C22A9328F001F6AF0 /* options.cpp in Sources */,
BB4C4A6222A9321F001F6AF0 /* atts_cmn.cpp in Sources */,
4DC3B9E8239E2AE2007F185E /* transposition.cpp in Sources */,
BB4C4A9822A9328F001F6AF0 /* horizontalaligner.cpp in Sources */,
BB4C4BAC22A932EB001F6AF0 /* view_control.cpp in Sources */,
BB4C4B2B22A932CF001F6AF0 /* mordent.cpp in Sources */,
Expand All @@ -3462,6 +3478,7 @@
4D16945E1E3A44F300569BF4 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "";
};
Expand All @@ -3470,6 +3487,7 @@
4D16945F1E3A44F300569BF4 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "";
};
Expand All @@ -3479,7 +3497,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
Expand Down Expand Up @@ -3535,7 +3553,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
Expand Down Expand Up @@ -3584,6 +3602,7 @@
8F086EB4188534690037FD8E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
NO_HUMDRUM_SUPPORT,
Expand All @@ -3596,6 +3615,7 @@
8F086EB5188534690037FD8E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
GCC_PREPROCESSOR_DEFINITIONS = NO_HUMDRUM_SUPPORT;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "";
Expand Down Expand Up @@ -3639,7 +3659,7 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
Expand Down Expand Up @@ -3689,7 +3709,7 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
LastUpgradeVersion = "1130"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -63,8 +63,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -85,8 +83,6 @@
ReferencedContainer = "container:Verovio.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
Loading

0 comments on commit 47fcebb

Please sign in to comment.