Merge branch 'develop'

.gitignore

@@ -66,3 +66,4 @@ emscripten/npm-dev/node_modules
 # VS Code files
 .vscode/settings.json
 main
+DerivedData

.travis.yml

@@ -1,37 +1,59 @@
 branches:
   only:
   - develop
-
+  
 sudo: false
-dist: trusty
+dist: bionic
 language: cpp
 
-matrix:
+git:
+  depth:
+    3
+
+jobs:
   include:
-    # GCC5 on Linux
-    - os: linux
+    # test build on osx and an linux with g++
+    - stage: build-c++
+      name: osx-xcode
+      os: osx
+      osx_image: xcode11.1
+      script:
+        - cd tools
+        - cmake .
+        - make
+    - name: linux-g++-5       
+      os: linux
+      dist: bionic
+      script:
+        - cd tools
+        - cmake .
+        - make
+    # deploy emscripten build and doxygen
+    - stage: deploy
+      # name: emscripten
+      # os: linux
+      # dist: bionic
+      # env:
+      #   global:
+      #     - COMMIT_AUTHOR_EMAIL: "lxpugin@gmail.com"
+      # 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
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
           packages:
-            - g++-5
+            - doxygen
       env:
-        - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
-
-    # Clang on OSX
-    - os: osx
-      osx_image: xcode9.2
-
-before_install:
-  - eval "${MATRIX_EVAL}"
-
-before_install:
-  - eval "${MATRIX_EVAL}"
-
-before_script:
-  - cd tools
-  - cmake .
-
-script: 
-  - make
+        global:
+          - COMMIT_AUTHOR_EMAIL: "lxpugin@gmail.com"
+      script:
+        - ./deploy-doxygen.sh

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
 ## [unreleased]
+* Support for 512th and 1024th duration
+* Support for iOS cocoapods build (@eltiren)
+* Support for SVG currentColor (@rettinghaus)
+* Options for controlling header and footer (--header / --footer "auto|none|encoded") (@rettinghaus)
+* Bug fix with grace notes and mRests
+
+### Changes
+* Options --no-header and --no-footer deprecated
 
 ## [2.2.1] - 2019-10-23
 * Fix bug with mensural notation layout

README.md

@@ -14,13 +14,19 @@ Verovio follows the [Standard Music Font Layout (SMuFL)](http://www.smufl.org) s
 
 The project page is http://www.verovio.org. Verovio is available under the LGPL license (see LICENSE.txt).
 
+Building and using instructions
+-------------------------------
+
+See the [wiki](https://github.com/rism-ch/verovio/wiki/Building-instructions), with instructions for:
+* [Command-line tool](https://github.com/rism-ch/verovio/wiki/Building-instructions#command-line-tool)
+* [XCode](https://github.com/rism-ch/verovio/wiki/Building-instructions#xcode)
+* [Visual Studio](https://github.com/rism-ch/verovio/wiki/Building-instructions#visual-studio)
+* [JavaScript](https://github.com/rism-ch/verovio/wiki/Building-instructions#javascript-toolkit)
+* [NPM](https://github.com/rism-ch/verovio/wiki/Building-instructions#npm)
+* [Python](https://github.com/rism-ch/verovio/wiki/Building-instructions#building-the-python-toolkit)
+* [Java](https://github.com/rism-ch/verovio/wiki/Building-instructions#building-the-java-toolkit)
+* [CocoaPods](https://github.com/rism-ch/verovio/wiki/Building-instructions#cocoapods)
 
-NPM
----
-
-The development version is available via [NPM](https://www.npmjs.com/package/verovio-dev)
-
-    $ npm install verovio-dev
 
 LibMEI
 ------

Verovio.podspec

@@ -0,0 +1,41 @@
+Pod::Spec.new do |s|
+  s.name           = 'Verovio'
+  s.version        = '2.1.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.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}',
+                          'libmei/{atts_critapp,atts_externalsymbols,atts_facsimile,atts_gestural,atts_mei}.{h,cpp}', 
+                          'libmei/{atts_mensural,atts_midi,atts_neumes,atts_pagebased,atts_shared}.{h,cpp}',
+                          'libmei/{atts_visual,atttypes}.{h,cpp}'
+  s.public_header_files = 'src/**/*.{h}',
+                          'include/{hum,json,midi,pugi,utf8,vrv}/*.{h,hpp}',
+                          'libmei/{attclasses,attconverter,atts_analytical,atts_cmn,atts_cmnornaments}.{h}',
+                          '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.xcconfig = {
+      "CLANG_CXX_LANGUAGE_STANDARD" => "gnu++14",
+      "CLANG_CXX_LIBRARY" => "libc++",
+      "GCC_C_LANGUAGE_STANDARD" => "gnu11",
+      "GCC_DYNAMIC_NO_PIC" => "NO",
+      "GCC_NO_COMMON_BLOCKS" => "YES",
+      "GCC_SYMBOLS_PRIVATE_EXTERN" => "NO",
+      "CLANG_ENABLE_OBJC_ARC" => "YES",
+      "CLANG_ENABLE_OBJC_WEAK" => "YES",
+      "ENABLE_STRICT_OBJC_MSGSEND" => "YES",
+      "MTL_FAST_MATH" => "YES",
+      "SUPPORTS_UIKITFORMAC" => "NO",
+      "MTL_ENABLE_DEBUG_INFO" => "NO"
+    }
+  s.info_plist = {
+    'CFBundleIdentifier' => 'com.rism.VerovioFramework'
+  }
+end

Verovio.xcodeproj/project.pbxproj

@@ -2641,6 +2641,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 8F086E9E188534680037FD8E;
 			productRefGroup = 8F086EAA188534680037FD8E /* Products */;

bindings/qt/lib/src/toolkit.cpp

@@ -32,13 +32,12 @@ int Toolkit::adjustedDisplayHeightForPage(int page)
 
     Q_ASSERT(page <= m_adjustedDisplayHeights.count());
 
-    int defaultPageHeight = 1000;
-
     if (m_adjustedDisplayHeights[page - 1] != 0) {
         return m_adjustedDisplayHeights[page - 1];
     }
     else {
         int averagePageHeight = 0;
+        int defaultPageHeight = 1000;
         int num = 0;
         for (auto height : m_adjustedDisplayHeights) {
             if (height != 0) {

data/Bravura.xml

@@ -178,6 +178,18 @@
 	<g c="E24B" x="0.0" y="-751.0" w="299.0" h="1564.0" h-a-x="301" >
 		<a n="stemDownSW" x="0" y="-2.812"/>
 	</g>
+	<g c="E24C" x="-1.0" y="-812.0" w="266.0" h="1703.0" h-a-x="268" >
+		<a n="stemUpNW" x="0" y="3.324"/>
+	</g>
+	<g c="E24D" x="0.0" y="-939.0" w="300.0" h="1751.0" h-a-x="301" >
+		<a n="stemDownSW" x="0" y="-3.608"/>
+	</g>
+	<g c="E24E" x="0.0" y="-812.0" w="265.0" h="1891.0" h-a-x="272" >
+		<a n="stemUpNW" x="0" y="4.064"/>
+	</g>
+	<g c="E24F" x="0.0" y="-1202.0" w="301.0" h="1945.0" h-a-x="310" >
+		<a n="stemDownSW" x="0" y="-4.684"/>
+	</g>
 	<g c="E260" x="0.0" y="-175.0" w="226.0" h="614.0" h-a-x="226" >
 		<a n="cutOutNE" x="0.252" y="0.656"/>
 		<a n="cutOutSE" x="0.504" y="-0.476"/>
@@ -320,6 +332,8 @@
 	<g c="E4E9" x="0.0" y="-753.0" w="423.0" h="1183.0" h-a-x="424" />
 	<g c="E4EA" x="0.0" y="-750.0" w="485.0" h="1439.0" h-a-x="485" />
 	<g c="E4EB" x="0.0" y="-1000.0" w="541.0" h="1696.0" h-a-x="541" />
+	<g c="E4EC" x="0.0" y="-1000.0" w="604.0" h="1944.0" h-a-x="604" />
+	<g c="E4ED" x="0.0" y="-993.0" w="668.0" h="2190.0" h-a-x="668" />
 	<g c="E500" x="0.0" y="-250.0" w="532.0" h="529.0" h-a-x="533" />
 	<g c="E501" x="0.0" y="-250.0" w="762.0" h="529.0" h-a-x="761" />
 	<g c="E502" x="0.0" y="-250.0" w="1232.0" h="529.0" h-a-x="1233" />

data/Bravura/E24C-flag512thUp.xml

@@ -0,0 +1,4 @@
+<symbol id="E24C" viewBox="0 0 1000 1000" overflow="inherit">
+   <path transform="scale(1,-1)"
+         d="M264 -670c0 -9 1 -18 1 -28c0 -44 -4 -92 -8 -97c-6 -12 -12 -17 -19 -17c-3 0 -6 1 -8 2c-7 2 -13 11 -13 23c0 3 0 5 1 8c5 29 8 58 8 86c0 48 -9 94 -31 138c-65 134 -134 136 -191 138h-5v191c0 182 1 183 1 183v925c0 6 14 9 15 9c8 0 15 0 16 -18 c17 -97 74 -122 124 -179l16 -17c56 -60 82 -89 91 -144c1 -9 2 -18 2 -28c0 -39 -10 -81 -18 -109c7 -15 12 -31 16 -50c1 -9 2 -18 2 -28c0 -39 -10 -81 -18 -109c7 -15 12 -31 16 -50c1 -9 2 -18 2 -28c0 -39 -10 -81 -18 -109c7 -15 12 -31 16 -49c1 -9 2 -18 2 -28 c0 -39 -10 -82 -18 -110c7 -15 12 -31 16 -49c1 -9 2 -19 2 -29c0 -37 -9 -77 -17 -105c4 -12 7 -25 10 -40c2 -12 3 -24 3 -36c0 -58 -21 -113 -23 -120c-1 -1 -1 -3 -1 -5c0 -3 1 -7 1 -8c16 -37 25 -75 27 -113zM155 -224c25 -27 44 -48 59 -67l8 27c2 7 3 14 3 22 c0 13 -4 27 -16 47c-54 91 -117 117 -170 118c19 -80 68 -96 116 -147zM155 -54c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 13 -3 27 -15 47c-56 94 -117 118 -171 118c20 -85 69 -110 116 -164zM155 133c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22 c0 12 -3 26 -15 46c-56 94 -117 119 -171 119c20 -85 69 -110 116 -164zM155 320c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 12 -3 26 -15 46c-56 94 -117 119 -171 119c20 -85 69 -110 116 -164zM209 552c-55 94 -116 119 -170 119c20 -85 69 -110 116 -164 c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 13 3 21c0 12 -4 27 -16 47zM222 -450c1 7 2 14 2 21c0 29 -10 57 -27 82c-30 46 -82 98 -140 98h-6c-8 0 -12 -7 -12 -13c18 -77 62 -100 108 -151c19 -21 35 -40 50 -65c2 -3 5 -4 8 -4c5 0 10 4 11 7c4 8 4 16 6 25z"/>
+</symbol>

data/Bravura/E24D-flag512thDown.xml

@@ -0,0 +1,4 @@
+<symbol id="E24D" viewBox="0 0 1000 1000" overflow="inherit">
+   <path transform="scale(1,-1)"
+         d="M284 167c8 -28 16 -65 16 -101c0 -12 -1 -24 -3 -36c-3 -19 -7 -35 -13 -50c8 -28 16 -65 16 -101c0 -12 -1 -24 -3 -36c-3 -19 -7 -35 -13 -50c8 -28 16 -65 16 -101c0 -12 -1 -24 -3 -36c-3 -19 -7 -35 -13 -50c8 -28 16 -65 16 -101c0 -12 -1 -24 -3 -36 c-12 -72 -39 -103 -118 -187c-58 -63 -122 -82 -140 -200c-3 -9 -17 -21 -24 -21s-15 14 -15 14v1349c62 3 126 5 204 143c23 41 31 72 31 100c0 34 -12 65 -20 110c-1 3 -1 6 -1 9c0 13 7 22 14 25c2 0 3 1 5 1c7 0 16 -4 22 -16c4 -8 20 -73 20 -122v-11 c-4 -62 -9 -74 -21 -99l-2 -3l-3 -7c-1 -3 -2 -5 -2 -7s0 -4 2 -8c1 -5 21 -51 21 -107c0 -11 0 -22 -2 -33c1 0 32 -75 32 -147c0 -12 -1 -24 -3 -35c-3 -19 -7 -35 -13 -50zM258 86c0 7 -2 17 -5 28c-15 -22 -37 -45 -65 -76l-8 -9c-52 -55 -115 -76 -140 -159 c62 2 142 32 203 137c13 24 16 42 16 56c0 8 -1 15 -1 23zM246 329c-16 -30 -41 -59 -84 -106c-51 -54 -106 -72 -122 -166c64 0 139 28 202 137c14 24 17 40 17 55c0 8 -1 16 -1 24c0 13 -6 36 -12 56zM153 418c-47 -52 -93 -76 -115 -156c0 -5 5 -13 15 -13h8 c61 0 112 53 145 102c17 25 27 52 27 82c0 9 -1 19 -3 28c0 6 -2 15 -4 23c-1 3 -7 6 -12 6c-3 0 -6 -1 -8 -4c-17 -25 -34 -45 -53 -68zM258 -474c0 6 -2 16 -5 27c-17 -23 -41 -49 -74 -84c-51 -56 -115 -77 -140 -160c62 2 143 33 203 137c14 24 17 41 17 56 c0 8 -1 16 -1 24zM258 -287c0 6 -2 16 -5 27c-17 -23 -41 -49 -74 -84c-51 -56 -114 -77 -139 -160c62 2 142 33 202 137c14 24 17 41 17 56c0 8 -1 16 -1 24zM258 -101c0 7 -2 17 -5 28c-16 -22 -37 -46 -67 -77l-7 -7c-51 -56 -114 -77 -139 -160c62 2 142 32 203 137 c13 24 16 41 16 56c0 8 -1 16 -1 23z"/>
+</symbol>

data/Bravura/E24E-flag1024thUp.xml

@@ -0,0 +1,4 @@
+<symbol id="E24E" viewBox="0 0 1000 1000" overflow="inherit">
+   <path transform="scale(1,-1)"
+         d="M264 -670c0 -9 1 -18 1 -28c0 -44 -4 -92 -8 -97c-6 -12 -12 -17 -19 -17c-3 0 -6 1 -8 2c-7 2 -13 11 -13 23c0 3 0 5 1 8c5 29 8 58 8 86c0 48 -9 94 -31 138c-65 134 -134 136 -190 138h-5v1487c0 6 15 9 16 9c8 0 15 0 16 -18c17 -98 73 -123 123 -180l15 -16 c57 -61 83 -89 92 -144c1 -9 2 -18 2 -28c0 -39 -10 -82 -18 -110c8 -15 13 -31 16 -50c1 -9 2 -18 2 -28c0 -39 -10 -81 -18 -109c8 -15 13 -31 16 -50c1 -9 2 -18 2 -28c0 -39 -10 -81 -18 -109c8 -15 13 -31 16 -50c1 -9 2 -18 2 -28c0 -39 -10 -81 -18 -109 c8 -15 13 -31 16 -49c1 -9 2 -18 2 -28c0 -39 -10 -82 -18 -110c8 -15 13 -31 16 -49c1 -9 2 -19 2 -29c0 -37 -9 -77 -17 -105c4 -12 8 -25 10 -40c2 -12 3 -24 3 -36c0 -58 -21 -113 -23 -120c-1 -1 -1 -3 -1 -5c0 -3 1 -7 1 -8c16 -37 25 -75 27 -113zM155 -224 c25 -27 44 -48 59 -67l8 27c2 7 3 14 3 22c0 13 -3 27 -15 47c-54 91 -117 117 -171 118c19 -80 69 -96 116 -147zM155 -54c23 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 13 -3 27 -15 47c-56 94 -117 118 -171 118c20 -85 69 -110 116 -164zM155 133 c23 -24 41 -44 56 -61l11 38c2 7 3 14 3 22c0 13 -3 27 -15 47c-56 94 -117 118 -171 118c20 -85 69 -110 116 -164zM155 320c23 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 12 -3 26 -15 46c-56 94 -117 119 -171 119c20 -85 69 -110 116 -164zM155 507 c23 -24 41 -44 56 -61l11 38c2 7 3 14 3 22c0 12 -3 26 -15 46c-56 94 -117 119 -171 119c20 -85 69 -110 116 -164zM209 740c-55 94 -116 118 -170 118c20 -85 69 -110 116 -164c22 -24 41 -44 55 -61c5 14 9 29 12 38c2 7 3 14 3 22c0 13 -4 27 -16 47zM222 -450 c1 7 2 14 2 21c0 29 -10 57 -27 82c-30 46 -82 98 -140 98h-6c-6 0 -11 -5 -11 -13c17 -77 61 -99 107 -151c19 -21 35 -40 50 -65c2 -3 5 -4 8 -4c5 0 10 4 11 7c4 8 4 16 6 25z"/>
+</symbol>

data/Bravura/E24F-flag1024thDown.xml

@@ -0,0 +1,4 @@
+<symbol id="E24F" viewBox="0 0 1000 1000" overflow="inherit">
+   <path transform="scale(1,-1)"
+         d="M284 98c8 -28 16 -65 16 -101c0 -12 -1 -24 -3 -36c-3 -19 -7 -35 -13 -50c8 -28 16 -65 16 -101c0 -12 -1 -24 -3 -36c-3 -19 -7 -35 -13 -50c8 -28 16 -65 16 -101c0 -12 -1 -24 -3 -36c-3 -19 -7 -35 -13 -50c8 -28 16 -65 16 -101c0 -12 -1 -24 -3 -36 c-3 -20 -8 -37 -14 -53c9 -29 18 -68 18 -107c0 -11 -1 -23 -3 -34c-13 -72 -41 -103 -119 -187c-58 -63 -122 -82 -140 -200c-3 -9 -17 -21 -24 -21s-15 14 -15 14v1543c62 3 126 5 204 143c23 42 30 72 30 100c0 34 -11 65 -19 110c-1 3 -1 6 -1 9c0 13 7 22 14 25 c2 0 3 1 5 1c7 0 15 -4 21 -16c5 -8 21 -72 21 -122v-11c-4 -65 -9 -76 -24 -103l-3 -6c-1 -4 -2 -5 -2 -8c0 -2 1 -3 2 -7c0 -1 0 -2 1 -3c5 -12 21 -54 21 -104c0 -11 0 -22 -2 -33c1 0 32 -75 32 -147c0 -12 -1 -24 -3 -35c-3 -19 -7 -35 -13 -50zM257 17 c0 7 -1 17 -4 28c-15 -22 -37 -45 -65 -76l-8 -9c-52 -55 -116 -76 -141 -159c62 2 143 32 204 137c13 23 15 39 15 53c0 9 -1 18 -1 26zM246 260c-16 -30 -41 -59 -84 -106c-51 -54 -106 -72 -122 -166c64 0 139 28 203 137c13 23 15 39 15 53c0 9 -1 18 -1 26 c0 13 -5 36 -11 56zM153 349c-47 -52 -93 -76 -115 -156c0 -5 5 -13 15 -13h8c61 0 112 53 145 102c17 25 27 52 27 82c0 9 -1 19 -3 28c0 6 -2 15 -4 23c-1 3 -7 6 -12 6c-3 0 -6 -1 -8 -4c-17 -25 -34 -45 -53 -68zM257 -737c0 7 -2 20 -5 32c-16 -21 -37 -43 -65 -73 l-8 -9c-52 -57 -116 -78 -140 -167c63 2 142 32 204 137c13 23 15 40 15 54c0 9 -1 18 -1 26zM257 -543c0 6 -1 16 -4 27c-17 -23 -41 -49 -74 -84c-51 -56 -115 -77 -140 -160c62 2 143 33 204 137c13 23 15 40 15 54c0 9 -1 18 -1 26zM257 -356c0 6 -1 16 -4 27 c-17 -23 -41 -49 -74 -84c-51 -56 -115 -77 -140 -160c62 2 143 33 204 137c13 23 15 40 15 54c0 9 -1 18 -1 26zM257 -169c0 6 -1 16 -4 27c-16 -22 -37 -46 -67 -77l-7 -7c-51 -56 -115 -77 -140 -160c62 2 143 33 204 137c13 23 15 40 15 54c0 9 -1 18 -1 26z"/>
+</symbol>

data/Bravura/E4EC-rest512th.xml

@@ -0,0 +1,4 @@
+<symbol id="E4EC" viewBox="0 0 1000 1000" overflow="inherit">
+   <path transform="scale(1,-1)"
+         d="M430 624v-10c18 0 54 21 62 46c4 14 35 147 36 150s1 6 1 9c0 9 -4 13 -9 13c-2 0 -4 -1 -6 -2c-13 -7 -22 -11 -36 -15c-12 -4 -28 -7 -42 -7c-9 0 -17 1 -24 3c-10 3 -20 8 -28 14c-16 12 -28 31 -28 51c0 38 31 68 68 68c38 0 68 -30 68 -68c0 -3 0 -6 -1 -10 c35 1 85 61 92 67c3 2 6 4 11 4c2 -1 10 -5 10 -11c0 -1 -1 -2 -1 -4c-2 -13 -27 -101 -27 -101s-413 -1786 -416 -1797c-4 -12 -7 -24 -40 -24c-23 0 -27 10 -27 19c0 3 0 6 1 8c2 4 64 261 68 275c1 2 1 4 1 6c0 5 -3 6 -5 6s-3 0 -4 -1c-13 -7 -18 -8 -32 -13 c-11 -4 -26 -7 -40 -7c-9 0 -18 2 -26 4c-10 3 -20 7 -28 14c-16 12 -28 30 -28 50c0 38 31 68 68 68c38 0 68 -30 68 -68v-9c13 0 40 5 46 29l43 180c0 6 -3 12 -7 12c-1 0 -2 0 -3 -1c-13 -7 -21 -11 -36 -15c-12 -4 -28 -7 -42 -7c-9 0 -17 1 -24 3c-10 3 -20 8 -28 14 c-16 12 -28 31 -28 51c0 38 31 68 68 68c38 0 68 -30 68 -68v-10c15 0 48 15 55 44l36 152c1 3 1 5 1 7c0 5 -2 9 -6 9c-1 0 -3 0 -5 -1c-13 -7 -21 -10 -35 -15c-11 -4 -26 -7 -40 -7c-10 0 -19 2 -27 4c-10 3 -19 7 -27 14c-16 12 -28 30 -28 50c0 38 30 68 68 68 c37 0 68 -30 68 -68c0 -3 0 -6 -1 -9c16 0 45 10 54 37c4 14 33 136 37 154c1 5 2 9 2 12c0 6 -2 9 -6 9c-2 0 -3 -1 -6 -2c-13 -6 -21 -10 -35 -15c-12 -4 -26 -7 -40 -7c-9 0 -19 2 -27 4c-10 3 -19 8 -28 14c-16 12 -27 30 -27 51c0 37 30 68 68 68c37 0 68 -31 68 -68 c0 -4 -1 -7 -1 -10c16 0 47 10 55 40c6 21 25 101 38 155c1 1 1 2 1 3c0 2 1 4 1 6c0 9 -4 15 -10 15c-2 0 -4 -1 -6 -2c-13 -6 -21 -10 -35 -15c-12 -4 -26 -7 -40 -7c-9 0 -19 2 -27 4c-10 3 -19 8 -28 14c-15 12 -27 30 -27 51c0 37 30 68 68 68c37 0 68 -31 68 -68 c0 -4 -1 -7 -1 -10c18 0 53 14 61 44c4 16 36 147 38 159c1 2 1 3 1 5c0 7 -5 14 -11 14c-2 0 -3 0 -5 -1c-13 -7 -21 -11 -36 -15c-12 -4 -28 -7 -42 -7c-9 0 -17 1 -24 3c-10 3 -20 8 -28 14c-16 12 -28 31 -28 51c0 38 31 68 68 68c38 0 68 -30 68 -68z"/>
+</symbol>

data/Bravura/E4ED-rest1024th.xml

@@ -0,0 +1,4 @@
+<symbol id="E4ED" viewBox="0 0 1000 1000" overflow="inherit">
+   <path transform="scale(1,-1)"
+         d="M473 1059l-28 14c-15 15 -29 35 -29 53c0 38 33 71 72 71c38 0 66 -33 66 -81c47 0 67 57 104 72c0 0 10 -5 10 -15c0 -9 -104 -387 -104 -387c-53 -246 -407 -1750 -407 -1760c-5 -14 -10 -19 -39 -19c-8 0 -28 19 -28 23c5 6 67 261 71 275c0 4 0 9 -9 9l-34 -9 c-8 -6 -23 -10 -37 -10c-10 0 -19 4 -29 4l-27 15c-14 9 -25 28 -25 52c0 32 29 67 67 67c33 0 65 -29 65 -81c15 0 38 9 49 33c4 13 37 170 43 175c0 5 -6 15 -11 15c-14 -10 -23 -10 -38 -15c-8 -5 -23 -9 -37 -9c-9 0 -20 4 -28 4l-29 15c-14 9 -24 27 -24 52 c0 32 29 67 67 67c33 0 66 -29 66 -81c14 4 47 18 57 46c4 15 33 139 33 153c0 4 -5 14 -10 14c-9 -10 -19 -10 -33 -14c-9 -5 -24 -11 -38 -11c-9 0 -18 6 -29 6l-27 14c-14 9 -29 28 -29 51c0 34 33 66 67 66c32 0 70 -28 70 -80c15 5 43 14 52 38c20 52 39 157 39 161 c0 5 -5 14 -11 14c-14 -9 -22 -9 -37 -14c-9 -4 -24 -9 -38 -9c-9 0 -19 5 -28 5l-29 14c-14 10 -29 28 -29 52c0 33 34 66 72 66s61 -80 71 -80c15 4 43 14 53 42l36 157c0 4 0 18 -13 18l-38 -14c-14 -4 -34 -4 -48 -4h-18l-29 14c-14 15 -28 33 -28 52c0 37 33 66 71 66 s67 -29 67 -76c18 0 50 15 60 42l38 161c0 5 0 14 -15 14l-38 -14c-9 -4 -22 -4 -37 -4c-8 0 -18 0 -28 4c-7 0 -18 5 -29 10c-14 14 -28 33 -28 51c0 39 34 67 71 67s66 -28 66 -75c19 0 52 19 62 47c4 14 38 147 38 147s3 13 3 19c0 2 -2 5 -3 5c-5 0 -11 -5 -15 -5 l-38 -14c-9 -5 -24 -5 -37 -5c-10 0 -20 0 -28 5c-11 0 -18 6 -28 8c-14 14 -29 34 -29 53c0 39 33 66 71 66c37 0 66 -27 66 -76c19 0 56 24 62 43c14 47 42 118 42 165c0 4 -5 10 -14 10l-38 -14c-11 -6 -25 -10 -38 -10c-10 0 -19 4 -29 4z"/>
+</symbol>