Skip to content

Commit

Permalink
Merge commit 'ac75cf1814c819a4ed8922d51740898fe8cc9e4c'
Browse files Browse the repository at this point in the history
  • Loading branch information
@lpugin
lpugin committed Jul 15, 2015
2 parents f707d2a + ac75cf1 commit 125b4a5
Show file tree
Hide file tree
Showing 47 changed files with 1,958 additions and 928 deletions.
836 changes: 164 additions & 672 deletions LICENSE.txt
View file

Large diffs are not rendered by default.

39 changes: 39 additions & 0 deletions Verovio.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,19 @@
4D763EC71987D04E003FCAB5 /* metersig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D763EC51987D04D003FCAB5 /* metersig.cpp */; };
4D763EC91987D067003FCAB5 /* metersig.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D763EC81987D067003FCAB5 /* metersig.h */; };
4D763EEC198BF2D8003FCAB5 /* atts_shared.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DEE29091940BCC100C76319 /* atts_shared.cpp */; };
4D8CD8A61B4E922A00F0756F /* atts_critapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DEE28F31940BCC100C76319 /* atts_critapp.cpp */; };
4D8CD8A71B4E927300F0756F /* atts_critapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DEE28F31940BCC100C76319 /* atts_critapp.cpp */; };
4D983005192E959E00320037 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D983004192E959E00320037 /* main.cpp */; };
4D9A9C17199F560200028D93 /* verse.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D9A9C16199F560200028D93 /* verse.h */; };
4D9A9C19199F561200028D93 /* verse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D9A9C18199F561200028D93 /* verse.cpp */; };
4D9A9C1A199F561200028D93 /* verse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D9A9C18199F561200028D93 /* verse.cpp */; };
4D9A9C1C199F576100028D93 /* syl.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D9A9C1B199F576100028D93 /* syl.h */; };
4D9A9C1E19A1DE2000028D93 /* syl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D9A9C1D19A1DE2000028D93 /* syl.cpp */; };
4D9A9C1F19A1DE2000028D93 /* syl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D9A9C1D19A1DE2000028D93 /* syl.cpp */; };
4D9C53111B52E4AE0003C6EC /* checked.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D9C530D1B52E4AE0003C6EC /* checked.h */; };
4D9C53121B52E4AE0003C6EC /* core.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D9C530E1B52E4AE0003C6EC /* core.h */; };
4D9C53131B52E4AE0003C6EC /* unchecked.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D9C530F1B52E4AE0003C6EC /* unchecked.h */; };
4D9C53141B52E4AE0003C6EC /* utf8.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D9C53101B52E4AE0003C6EC /* utf8.h */; };
4DA3FCD319B61DB300CBDFE6 /* atts_cmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DEE28EF1940BCC100C76319 /* atts_cmn.cpp */; };
4DA3FCD419B61DB400CBDFE6 /* atts_cmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DEE28EF1940BCC100C76319 /* atts_cmn.cpp */; };
4DA80D961A6ACF5D0089802D /* style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DA80D951A6ACF5D0089802D /* style.cpp */; };
Expand Down Expand Up @@ -223,6 +229,10 @@
4D9A9C1B199F576100028D93 /* syl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = syl.h; path = include/vrv/syl.h; sourceTree = "<group>"; };
4D9A9C1D19A1DE2000028D93 /* syl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = syl.cpp; path = src/syl.cpp; sourceTree = "<group>"; };
4D9C5F3A1ADBBBEB005D3031 /* git_commit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = git_commit.h; path = include/vrv/git_commit.h; sourceTree = SOURCE_ROOT; };
4D9C530D1B52E4AE0003C6EC /* checked.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = checked.h; path = include/utf8/checked.h; sourceTree = "<group>"; };
4D9C530E1B52E4AE0003C6EC /* core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = core.h; path = include/utf8/core.h; sourceTree = "<group>"; };
4D9C530F1B52E4AE0003C6EC /* unchecked.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = unchecked.h; path = include/utf8/unchecked.h; sourceTree = "<group>"; };
4D9C53101B52E4AE0003C6EC /* utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utf8.h; path = include/utf8.h; sourceTree = "<group>"; };
4DA80D941A6940120089802D /* style.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = style.h; path = include/vrv/style.h; sourceTree = "<group>"; };
4DA80D951A6ACF5D0089802D /* style.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = style.cpp; path = src/style.cpp; sourceTree = "<group>"; };
4DB3072D1AC9ED1800EE0982 /* space.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = space.h; path = include/vrv/space.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -392,6 +402,17 @@
path = tinyxml;
sourceTree = "<group>";
};
4DBC09271B51960100B1832C /* utf8 */ = {
isa = PBXGroup;
children = (
4D9C530D1B52E4AE0003C6EC /* checked.h */,
4D9C530E1B52E4AE0003C6EC /* core.h */,
4D9C530F1B52E4AE0003C6EC /* unchecked.h */,
4D9C53101B52E4AE0003C6EC /* utf8.h */,
);
name = utf8;
sourceTree = "<group>";
};
4DC34B9E19BC33A0006175CD /* interfaces */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -470,6 +491,7 @@
4D7D8A3C1886E36200D78B62 /* tools */,
8F086F351885397A0037FD8E /* source */,
4D22C42118891D7300D0831F /* pugixml */,
4DBC09271B51960100B1832C /* utf8 */,
8F086EAA188534680037FD8E /* Products */,
);
sourceTree = "<group>";
Expand Down Expand Up @@ -636,6 +658,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
4D9C53111B52E4AE0003C6EC /* checked.h in Headers */,
8F59293418854BF800FE51AD /* aligner.h in Headers */,
8F59293618854BF800FE51AD /* barline.h in Headers */,
8F59293718854BF800FE51AD /* bboxdevicecontext.h in Headers */,
Expand All @@ -662,6 +685,7 @@
8F59294A18854BF800FE51AD /* note.h in Headers */,
8F59294B18854BF800FE51AD /* object.h in Headers */,
8F59294C18854BF800FE51AD /* page.h in Headers */,
4D9C53131B52E4AE0003C6EC /* unchecked.h in Headers */,
4DF28A031A754DE400BA9F7D /* measureelement.h in Headers */,
8F59294D18854BF800FE51AD /* pitchinterface.h in Headers */,
8F59294E18854BF800FE51AD /* positioninterface.h in Headers */,
Expand All @@ -680,8 +704,10 @@
4D22C41C18890E9900D0831F /* mrest.h in Headers */,
4D22C42418891FC000D0831F /* pugixml.hpp in Headers */,
4D22C42518891FC300D0831F /* pugiconfig.hpp in Headers */,
4D9C53121B52E4AE0003C6EC /* core.h in Headers */,
4D763EC91987D067003FCAB5 /* metersig.h in Headers */,
4D422101199805E400963292 /* att.h in Headers */,
4D9C53141B52E4AE0003C6EC /* utf8.h in Headers */,
4D422102199805E400963292 /* attdef.h in Headers */,
4D9A9C17199F560200028D93 /* verse.h in Headers */,
4D9A9C1C199F576100028D93 /* syl.h in Headers */,
Expand Down Expand Up @@ -792,6 +818,7 @@
8F086EEE188539540037FD8E /* iomei.cpp in Sources */,
8F086EEF188539540037FD8E /* iomusxml.cpp in Sources */,
8F086EF0188539540037FD8E /* iopae.cpp in Sources */,
4D8CD8A61B4E922A00F0756F /* atts_critapp.cpp in Sources */,
8F086EF1188539540037FD8E /* keysig.cpp in Sources */,
4D43C30C1A9BB22A00EA28F3 /* view_mensural.cpp in Sources */,
8F086EF2188539540037FD8E /* layer.cpp in Sources */,
Expand Down Expand Up @@ -869,6 +896,7 @@
8F3DD34818854B2E0051330C /* mensur.cpp in Sources */,
8F3DD34A18854B2E0051330C /* multirest.cpp in Sources */,
8F3DD34C18854B2E0051330C /* note.cpp in Sources */,
4D8CD8A71B4E927300F0756F /* atts_critapp.cpp in Sources */,
8F3DD34E18854B2E0051330C /* pitchinterface.cpp in Sources */,
8F3DD35018854B2E0051330C /* positioninterface.cpp in Sources */,
8F3DD35218854B2E0051330C /* rest.cpp in Sources */,
Expand Down Expand Up @@ -941,9 +969,14 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = ../include;
};
name = Debug;
};
Expand Down Expand Up @@ -971,9 +1004,15 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
./include/vrv/,
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = NO;
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = ../include;
};
name = Release;
};
Expand Down
Loading

0 comments on commit 125b4a5

Please sign in to comment.