diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
index 1b2a06a5f05..08437b037dc 100644
--- a/.github/workflows/ci_build.yml
+++ b/.github/workflows/ci_build.yml
@@ -112,7 +112,7 @@ jobs:
 
     steps:
       - name: Checkout main repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Installation step for Ubuntu
       - name: Configure Ubuntu with ${{ matrix.compiler }}-${{ matrix.version }}
@@ -239,7 +239,7 @@ jobs:
 
     steps:
       - name: Checkout main repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create TEMP_DIR
         working-directory: ${{ github.workspace }}
@@ -291,7 +291,7 @@ jobs:
 
     steps:
       - name: Checkout main repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create TEMP_DIR
         working-directory: ${{ github.workspace }}
@@ -353,7 +353,7 @@ jobs:
 
     steps:
       - name: Checkout GH_PAGES_REPO into GH_PAGES_DIR
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # repository to check out
           repository: ${{ env.GH_PAGES_REPO }}
@@ -435,7 +435,7 @@ jobs:
 
     steps:
       - name: Checkout main repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install doxygen
         run: |
@@ -472,7 +472,7 @@ jobs:
 
     steps:
       - name: Checkout DOXYGEN_REPO into DOXYGEN_DIR
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # repository to check out
           repository: ${{ env.DOXYGEN_REPO }}
diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
index 2bd967fee70..e00c94d00fa 100644
--- a/.github/workflows/clang-format-check.yml
+++ b/.github/workflows/clang-format-check.yml
@@ -16,7 +16,7 @@ jobs:
     name: Check for ${{ matrix.path['check'] }}
           
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run clang-format style check for C/C++ programs.
         uses: jidicula/clang-format-action@v4.9.0
         with:
diff --git a/.github/workflows/python-ci-wheel.yml b/.github/workflows/python-ci-wheel.yml
index 4eba9e8bbda..219ed29ce00 100644
--- a/.github/workflows/python-ci-wheel.yml
+++ b/.github/workflows/python-ci-wheel.yml
@@ -24,7 +24,7 @@ jobs:
       # Build the wheels for Linux, Windows and macOS
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         architecture: [x86, x64]
         include:
           - os: macos-latest
@@ -48,7 +48,7 @@ jobs:
     steps:
       #===============================================#
       # Set up
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -82,7 +82,7 @@ jobs:
       #===============================================#
       # wheels
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.11.1
+        uses: pypa/cibuildwheel@v2.16.1
         with:
           output-dir: wheelhouse
         env:
@@ -147,7 +147,7 @@ jobs:
     steps:
       #===============================================#
       # Set up
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -224,7 +224,7 @@ jobs:
     steps:
       #===============================================#
       # Set up
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python 3.9
         uses: actions/setup-python@v4
diff --git a/.github/workflows/tests_build.yml b/.github/workflows/tests_build.yml
index 8080101ed21..042d65eaf72 100644
--- a/.github/workflows/tests_build.yml
+++ b/.github/workflows/tests_build.yml
@@ -45,7 +45,7 @@ jobs:
           echo "OUTPUT_DIR=${{ github.event.pull_request.number }}/${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
       - name: Checkout GH_PAGES_BRANCH into GH_PAGES_DIR
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ env.GH_PAGES_REPO }}
           ref: ${{ env.GH_PAGES_BRANCH }}
@@ -67,7 +67,7 @@ jobs:
           python3 -m pip install diffimg jsondiff lxml xmldiff cairosvg
 
       - name: Checkout the dev branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: develop
           path: ${{ env.DEV_DIR }}/
@@ -88,7 +88,7 @@ jobs:
           python3 ../../doc/test-suite.py ${{ github.workspace }}/${{env.GH_PAGES_DIR}}/musicxmlTestSuite ${{ github.workspace }}/${{ env.TEMP_DIR }}/${{ env.DEV_DIR }}/
 
       - name: Checkout the PR
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           path: ${{ env.PR_DIR }}/
diff --git a/.gitignore b/.gitignore
index 1c2172a8b7b..a452c339bc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,4 @@ Release/
 # Intermediate font files
 fonts/**/tmp
 libmei/tools/__pycache__
+doc/.venv
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8906a50d062..6b095c12dbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,25 @@
 
 ## [unreleased]
 
+## [4.1.0] - 2023-12-15
+* Support for staves ordered by `scoreDef`
+* Support for `rend@letterspacing` and `syl@letterspacing` in MEI vu
+* Support for `nc@loc`
+* Support for `note@head.color`
+* Support for `note@head.fill` with `@headshape="diammond"`
+* Support for `staffDef@oct.default`
+* Improved metadata in the Humdrum importer (@gregchapman-dev)
+* Improved layout with labels in verses
+* Fix validity of the MEI header output in MEI Basic
+* Fix for the Java binding and cocoaPods
+
+## [4.0.1] - 2023-09-05
+* Fix MEI version in output
+
+## [4.0.0] - 2023-09-05
+* Update schemas to MEI 5.0 and corresponding adjustments
+* Support for `space` within `beam`
+
 ## [3.16.0] - 2023-07-03
 * Support for rectangular tone clusters (@eNote-GmbH)
 * Support for delayed turns on chords (@eNote-GmbH)
diff --git a/Verovio.podspec b/Verovio.podspec
index 769a2dc10b7..e401987e0fa 100644
--- a/Verovio.podspec
+++ b/Verovio.podspec
@@ -1,21 +1,21 @@
 Pod::Spec.new do |s|
   s.name           = 'Verovio'
-  s.version        = '3.17.0-dev'
-  s.license        = { :type => 'LGPL' }
+  s.version        = '4.2.0-dev'
+  s.license        = { :type => 'LGPL', :file => 'COPYING' }
   s.homepage       = 'https://www.verovio.org/index.xhtml'
   s.authors        = { 'Contributors List' => 'https://github.com/rism-digital/verovio/graphs/contributors' }
   s.summary        = 'Verovio'
   s.source         = { :git => 'https://github.com/rism-digital/verovio.git', :tag => 'version-' + s.version.to_s }
-  s.swift_versions = ['3.0', '4.0', '4.1', '4.2', '5.0','5.1']
+  s.swift_versions = ['3.0', '4.0', '4.1', '4.2', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7']
   s.source_files        = 'src/**/*.{h,cpp,cc}',
-                          'include/{crc,hum,json,midi,pugi,utf8,vrv,zip}/*.{h,hpp}',
-                          'libmei/{dist,addons}/*.{h,cpp}'
+                        'include/{crc,hum,json,midi,pugi,utf8,vrv,zip}/*.{h,hpp}',
+                        'libmei/{dist,addons}/*.{h,cpp}'
   s.public_header_files = 'src/**/*.{h}',
                           'include/{crc,hum,json,midi,pugi,utf8,vrv,zip}/*.{h,hpp}',
                           'libmei/{dist,addons}/*.{h}'
   s.resources      = 'data'
-  s.ios.deployment_target = '10.0'
-  s.osx.deployment_target = '10.13'
+  s.ios.deployment_target = '14.0'
+  s.osx.deployment_target = '10.15'
   s.pod_target_xcconfig = {
       "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
       "CLANG_CXX_LIBRARY" => "libc++",
@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
       "MTL_FAST_MATH" => "YES",
       "SUPPORTS_UIKITFORMAC" => "NO",
       "MTL_ENABLE_DEBUG_INFO" => "NO",
-      "PRODUCT_BUNDLE_IDENTIFIER" => "com.rism.VerovioFramework"
+      "PRODUCT_BUNDLE_IDENTIFIER" => "digital.rism.VerovioFramework"
     }
 end
 
diff --git a/Verovio.xcodeproj/project.pbxproj b/Verovio.xcodeproj/project.pbxproj
index 71a61738a1e..b129cb6e9af 100644
--- a/Verovio.xcodeproj/project.pbxproj
+++ b/Verovio.xcodeproj/project.pbxproj
@@ -375,6 +375,12 @@
 		4D796B5E1D78641900A15238 /* harm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D796B5D1D78641900A15238 /* harm.cpp */; };
 		4D798CBD1B8AEDBA007281CA /* drawinginterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D798CBC1B8AEDBA007281CA /* drawinginterface.cpp */; };
 		4D798CBE1B8AEDBA007281CA /* drawinginterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D798CBC1B8AEDBA007281CA /* drawinginterface.cpp */; };
+		4D7AFDC72A5554A100835ED1 /* divline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D7AFDC62A5554A100835ED1 /* divline.cpp */; };
+		4D7AFDC82A5554A100835ED1 /* divline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D7AFDC62A5554A100835ED1 /* divline.cpp */; };
+		4D7AFDC92A5554A100835ED1 /* divline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D7AFDC62A5554A100835ED1 /* divline.cpp */; };
+		4D7AFDCA2A5554A100835ED1 /* divline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D7AFDC62A5554A100835ED1 /* divline.cpp */; };
+		4D7AFDCC2A5554C100835ED1 /* divline.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D7AFDCB2A5554C100835ED1 /* divline.h */; };
+		4D7AFDCD2A5554C100835ED1 /* divline.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D7AFDCB2A5554C100835ED1 /* divline.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4D81351B2322C2CC00F59C01 /* keyaccid.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D81351A2322C2CC00F59C01 /* keyaccid.h */; };
 		4D81351C2322C2CC00F59C01 /* keyaccid.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D81351A2322C2CC00F59C01 /* keyaccid.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4D81351E2322C41800F59C01 /* keyaccid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D81351D2322C41800F59C01 /* keyaccid.cpp */; };
@@ -1844,6 +1850,8 @@
 		4D796B5D1D78641900A15238 /* harm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = harm.cpp; path = src/harm.cpp; sourceTree = "<group>"; };
 		4D797B041A67C55F007637BD /* devicecontextbase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = devicecontextbase.h; path = include/vrv/devicecontextbase.h; sourceTree = "<group>"; };
 		4D798CBC1B8AEDBA007281CA /* drawinginterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = drawinginterface.cpp; path = src/drawinginterface.cpp; sourceTree = "<group>"; };
+		4D7AFDC62A5554A100835ED1 /* divline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = divline.cpp; path = src/divline.cpp; sourceTree = "<group>"; };
+		4D7AFDCB2A5554C100835ED1 /* divline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = divline.h; path = include/vrv/divline.h; sourceTree = "<group>"; };
 		4D81351A2322C2CC00F59C01 /* keyaccid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keyaccid.h; path = include/vrv/keyaccid.h; sourceTree = "<group>"; };
 		4D81351D2322C41800F59C01 /* keyaccid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = keyaccid.cpp; path = src/keyaccid.cpp; sourceTree = "<group>"; };
 		4D88AD07289673D50006D7DA /* symbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = symbol.h; path = include/vrv/symbol.h; sourceTree = "<group>"; };
@@ -2607,8 +2615,9 @@
 				4DF2AF7D1A62F6A50016F869 /* drawinginterface.h */,
 				8F086EBE188539540037FD8E /* durationinterface.cpp */,
 				8F59291518854BF800FE51AD /* durationinterface.h */,
-				4DA0EAD322BB77AF00A7EBEB /* facsimileinterface.h */,
 				4DA0EAE922BB77C300A7EBEB /* facsimileinterface.cpp */,
+				4DA0EAD322BB77AF00A7EBEB /* facsimileinterface.h */,
+				4DE0B9A02988070C00D4C939 /* interface.h */,
 				4D94721E20CA702C00C780C8 /* linkinginterface.cpp */,
 				4D94721C20CA701000C780C8 /* linkinginterface.h */,
 				8F086ECF188539540037FD8E /* pitchinterface.cpp */,
@@ -2763,7 +2772,6 @@
 				4D95D4F41D7185DE00B2B856 /* floatingobject.h */,
 				4D09D3EC1EA8AD8500A420E6 /* horizontalaligner.cpp */,
 				4D14600F1EA8A913007DB90C /* horizontalaligner.h */,
-				4DE0B9A02988070C00D4C939 /* interface.h */,
 				4DACC93F2990ED2600B55913 /* libmei.h */,
 				8F086ECD188539540037FD8E /* object.cpp */,
 				8F59292418854BF800FE51AD /* object.h */,
@@ -2907,6 +2915,8 @@
 				8F59291218854BF800FE51AD /* clef.h */,
 				4DC34BA619BC4A83006175CD /* custos.cpp */,
 				4DC34BA019BC4A70006175CD /* custos.h */,
+				4D7AFDC62A5554A100835ED1 /* divline.cpp */,
+				4D7AFDCB2A5554C100835ED1 /* divline.h */,
 				4DC34BA719BC4A83006175CD /* dot.cpp */,
 				4DC34BA119BC4A70006175CD /* dot.h */,
 				4DEEDE631E617C930087E8BC /* elementpart.cpp */,
@@ -3205,6 +3215,7 @@
 				4DACCA112990F2E600B55913 /* attalternates.h in Headers */,
 				4DACC98C2990F29A00B55913 /* atts_usersymbols.h in Headers */,
 				8F59294418854BF800FE51AD /* layer.h in Headers */,
+				4D7AFDCC2A5554C100835ED1 /* divline.h in Headers */,
 				E7F1C36429F033FB007E12C1 /* savefunctor.h in Headers */,
 				4DACCA172990F2E600B55913 /* attdef.h in Headers */,
 				4DB3D8EC1F83D18300B5FC2B /* proport.h in Headers */,
@@ -3491,6 +3502,7 @@
 				BB4C4B4C22A932D7001F6AF0 /* custos.h in Headers */,
 				4DACCA182990F2E600B55913 /* attdef.h in Headers */,
 				BB4C4ADA22A932B6001F6AF0 /* system.h in Headers */,
+				4D7AFDCD2A5554C100835ED1 /* divline.h in Headers */,
 				4DACC9CD2990F29A00B55913 /* attclasses.h in Headers */,
 				E76A9D4829A74E180044682D /* adjustdotsfunctor.h in Headers */,
 				4DA0EAE422BB77AF00A7EBEB /* surface.h in Headers */,
@@ -3845,6 +3857,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				4D1693F51E3A44F300569BF4 /* verticalaligner.cpp in Sources */,
+				4D7AFDC82A5554A100835ED1 /* divline.cpp in Sources */,
 				4D1693F61E3A44F300569BF4 /* barline.cpp in Sources */,
 				E7901661298BCB2C008FDB4E /* calcalignmentxposfunctor.cpp in Sources */,
 				400FEDD6206FA74D000D3233 /* gracegrp.cpp in Sources */,
@@ -4322,6 +4335,7 @@
 				8F086F0A188539540037FD8E /* view_page.cpp in Sources */,
 				E7876F2029C0A702002147DC /* adjusttupletsxfunctor.cpp in Sources */,
 				E79C87C3269440570098FE85 /* lv.cpp in Sources */,
+				4D7AFDC72A5554A100835ED1 /* divline.cpp in Sources */,
 				4DEC4DA621C81ED400D1D273 /* reg.cpp in Sources */,
 				8F086F0B188539540037FD8E /* view_tuplet.cpp in Sources */,
 				4D4C26ED1EF7E75400681770 /* label.cpp in Sources */,
@@ -4406,6 +4420,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				4DEF8A6621B7AAF90093A76B /* f.cpp in Sources */,
+				4D7AFDC92A5554A100835ED1 /* divline.cpp in Sources */,
 				4DB3D8F01F83D1A700B5FC2B /* fig.cpp in Sources */,
 				E790165F298BCB27008FDB4E /* calcalignmentxposfunctor.cpp in Sources */,
 				8F3DD36718854B410051330C /* verticalaligner.cpp in Sources */,
@@ -4687,6 +4702,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				BB4C4AF522A932BC001F6AF0 /* ref.cpp in Sources */,
+				4D7AFDCA2A5554A100835ED1 /* divline.cpp in Sources */,
 				BB4C4B9322A932E5001F6AF0 /* areaposinterface.cpp in Sources */,
 				E7901660298BCB27008FDB4E /* calcalignmentxposfunctor.cpp in Sources */,
 				BB4C4AA122A9328F001F6AF0 /* verticalaligner.cpp in Sources */,
diff --git a/bindings/iOS/all.h b/bindings/iOS/all.h
index c884aa77465..9c77adf6e96 100644
--- a/bindings/iOS/all.h
+++ b/bindings/iOS/all.h
@@ -75,6 +75,7 @@
 #import <VerovioFramework/devicecontextbase.h>
 #import <VerovioFramework/dir.h>
 #import <VerovioFramework/div.h>
+#import <VerovioFramework/divline.h>
 #import <VerovioFramework/doc.h>
 #import <VerovioFramework/docselection.h>
 #import <VerovioFramework/dot.h>
@@ -139,6 +140,7 @@
 #import <VerovioFramework/libmei.h>
 #import <VerovioFramework/ligature.h>
 #import <VerovioFramework/linkinginterface.h>
+#import <VerovioFramework/liquescent.h>
 #import <VerovioFramework/lv.h>
 #import <VerovioFramework/mdiv.h>
 #import <VerovioFramework/measure.h>
@@ -172,7 +174,6 @@
 #import <VerovioFramework/pedal.h>
 #import <VerovioFramework/pgfoot.h>
 #import <VerovioFramework/pghead.h>
-#import <VerovioFramework/pghead2.h>
 #import <VerovioFramework/phrase.h>
 #import <VerovioFramework/pitchinflection.h>
 #import <VerovioFramework/pitchinterface.h>
diff --git a/bindings/java/pom.xml b/bindings/java/pom.xml
index 4bf70a08e9a..33ef0597eb8 100644
--- a/bindings/java/pom.xml
+++ b/bindings/java/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.rism.verovio</groupId>
   <artifactId>VerovioToolkit</artifactId>
-  <version>3.17.0-dev</version>
+  <version>4.2.0-dev</version>
   <packaging>jar</packaging>
 
   <name>VerovioToolkit</name>
@@ -29,11 +29,11 @@
                <goal>run</goal>
              </goals>
              <configuration>
-               <tasks>
+               <target>
                  <property name="native.classpath" refid="maven.compile.classpath" />
                  <echo file="${project.build.directory}/compile-classpath" message="${native.classpath}" />
                  <exec dir="." executable="./build.sh" failonerror="true"/>
-               </tasks>
+               </target>
              </configuration>
            </execution>
          </executions>
diff --git a/bindings/python/.pypi-version b/bindings/python/.pypi-version
index de1ab3a3da4..84066c019f4 100644
--- a/bindings/python/.pypi-version
+++ b/bindings/python/.pypi-version
@@ -1,3 +1,3 @@
 # dummy file used by setup.py for counting revisions when publishing to test.pypi
 # counting can be reset by making a change to this file
-3.17.0
+4.2.0
diff --git a/codemeta.json b/codemeta.json
index 85627993ac9..390078a93ba 100644
--- a/codemeta.json
+++ b/codemeta.json
@@ -4,8 +4,8 @@
   "identifier": "Verovio",
   "name": "Verovio",
   "description": "Verovio is a fast, portable and lightweight open-source library for engraving Music Encoding Initiative (MEI) music scores into SVG.",
-  "softwareVersion": "3.17.0-dev",
-  "datePublished": "2023-07-03",
+  "softwareVersion": "4.2.0-dev",
+  "datePublished": "2023-12-15",
   "license": "https://www.gnu.org/licenses/lgpl-3.0",
   "programmingLanguage": [{
     "@type": "ComputerLanguage",
diff --git a/data/Bravura.css b/data/Bravura.css
index 4527236eee8..c4c899e374f 100644
--- a/data/Bravura.css
+++ b/data/Bravura.css
@@ -1,6 +1,6 @@
 @font-face {
     font-family: 'Bravura';
-    src: url(data:application/font-woff2;charset=utf-8;base64,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) format('woff2');
+    src: url(data:application/font-woff2;charset=utf-8;base64,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) format('woff2');
     font-weight: normal;
     font-style: normal;
 }
\ No newline at end of file
diff --git a/data/Bravura.xml b/data/Bravura.xml
index 7ef71dbd76c..6c8403f057e 100644
--- a/data/Bravura.xml
+++ b/data/Bravura.xml
@@ -809,6 +809,7 @@
   <g c="EB9D" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="0" n="staffPosLower6" />
   <g c="EB9E" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="0" n="staffPosLower7" />
   <g c="EB9F" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="0" n="staffPosLower8" />
+  <g c="EBA6" x="0.0" y="0.0" w="148.0" h="786.0" h-a-x="149" n="luteDurationDoubleWhole" />
   <g c="EBA7" x="0.0" y="0.0" w="36.0" h="790.0" h-a-x="36" n="luteDurationWhole" />
   <g c="EBA8" x="0.0" y="0.0" w="228.0" h="786.0" h-a-x="228" n="luteDurationHalf" />
   <g c="EBA9" x="0.0" y="0.0" w="228.0" h="786.0" h-a-x="228" n="luteDurationQuarter" />
diff --git a/data/Bravura/EBA6.xml b/data/Bravura/EBA6.xml
new file mode 100644
index 00000000000..9ff55298b55
--- /dev/null
+++ b/data/Bravura/EBA6.xml
@@ -0,0 +1 @@
+<symbol id="EBA6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M4 663c-3 3 -4 7 -4 11c0 5 2 11 6 14l112 94l6 3c2 1 4 1 6 1c10 0 18 -8 18 -18v-750c0 -10 -8 -18 -18 -18s-18 8 -18 18v712l-82 -70c-4 -2 -8 -4 -12 -4c-5 0 -10 2 -14 7z" /></symbol>
\ No newline at end of file
diff --git a/data/Leipzig.css b/data/Leipzig.css
index 0409002b61b..1c5ceaffd16 100644
--- a/data/Leipzig.css
+++ b/data/Leipzig.css
@@ -1,6 +1,6 @@
 @font-face {
     font-family: 'Leipzig';
-    src: url(data:application/font-woff2;charset=utf-8;base64,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) format('woff2');
+    src: url(data:application/font-woff2;charset=utf-8;base64,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) format('woff2');
     font-weight: normal;
     font-style: normal;
 }
\ No newline at end of file
diff --git a/data/Leipzig.xml b/data/Leipzig.xml
index cd3ff7288fe..e9ec64193a3 100644
--- a/data/Leipzig.xml
+++ b/data/Leipzig.xml
@@ -572,6 +572,7 @@
   <g c="E049" x="0.0" y="-73.0" w="537.0" h="653.0" h-a-x="537" n="codaSquare" />
   <g c="E503" x="0.0" y="73.0" w="95.0" h="94.0" h-a-x="95" n="repeatBarUpperDot" />
   <g c="E505" x="0.0" y="-166.0" w="95.0" h="94.0" h-a-x="95" n="repeatBarLowerDot" />
+  <g c="EBA6" x="-82.0" y="0.0" w="174.0" h="791.0" h-a-x="92" n="luteDurationDoubleWhole" />
   <g c="E0A5" x="0.0" y="0.0" w="0.0" h="0.0" h-a-x="314" n="noteheadNull" />
   <g c="E940" x="-209.0" y="-209.0" w="418.0" h="418.0" h-a-x="0" n="mensuralCombStemDiagonal" />
   <g c="E905" x="0.0" y="-500.0" w="526.0" h="1000.0" h-a-x="526" n="mensuralCclef" />
diff --git a/data/Leipzig/EBA6.xml b/data/Leipzig/EBA6.xml
new file mode 100644
index 00000000000..0c45cc9dca9
--- /dev/null
+++ b/data/Leipzig/EBA6.xml
@@ -0,0 +1 @@
+<symbol id="EBA6" viewBox="0 0 1000 1000" overflow="inherit"><path transform="scale(1,-1)" d="M-82 763c11 4 128 23 137 26c7 2 12 2 14 2c15 0 16 -15 16 -35v-7c0 -94 -4 -76 -5 -259v-43c0 -99 2 -259 2 -292c0 -19 1 -33 1 -41v-60c1 -23 4 -41 9 -54h-60c-8 155 -23 497 -23 725c0 1 0 6 -1 16c0 4 -2 5 -5 5c-10 -1 -25 -4 -46 -11c-22 -6 -35 -10 -37 -10 c-2 24 -2 37 -2 38z" /></symbol>
\ No newline at end of file
diff --git a/doc/diffTests.sh b/doc/diffTests.sh
index 2e4513c57e4..1f49b58bb10 100755
--- a/doc/diffTests.sh
+++ b/doc/diffTests.sh
@@ -30,8 +30,10 @@ then
     echo "Emptying directories ..."
     rm $indir1/*/*.png
     rm $indir1/*/*.svg
+    rm $indir1/*/*.json
     rm $indir2/*/*.png
     rm $indir2/*/*.svg
+    rm $indir2/*/*.json
     rm $outdir/*/*.png
     rm $outdir/index.html
 fi
diff --git a/emscripten/buildToolkit b/emscripten/buildToolkit
index 649fb415fa5..b6f20e5a7ae 100755
--- a/emscripten/buildToolkit
+++ b/emscripten/buildToolkit
@@ -122,6 +122,7 @@ if ($wasmQ) {
 	$LFLAGS .= " -s INITIAL_MEMORY=512MB";
 	$LFLAGS .= " -s STACK_SIZE=256MB";
 	$LFLAGS .= " -s SINGLE_FILE=1";
+	$LFLAGS .= " -s INCOMING_MODULE_JS_API=onRuntimeInitialized";
 	$FLAGS_NAME = "-wasm";
 }
 
@@ -240,16 +241,17 @@ if ($makeQ) {
 
 print "*************\nBuilding makefile...\n";
 my $cmakeCmd = "$EMCMAKE cmake ../cmake $cmake -DCMAKE_CXX_FLAGS=\"$FLAGS\"";
+print "$cmakeCmd\n" if $CHATTY;
 system($cmakeCmd) == 0 or die "system $cmakeCmd failed: $?";
 
 print "*************\nCompiling...\n";
 my $makeCmd = "$EMMAKE make -j 8";
+print "$makeCmd\n" if $CHATTY;
 system($makeCmd);
 
 print "*************\nLinking...\n";
 my $ccCmd = "$EMCC $CHATTY libverovio.a $LFLAGS $FLAGS $embed $exports $extra_exports $output $modularize";
 print "$ccCmd\n" if $CHATTY;
-
 system($ccCmd);
 
 if ($? == 0) {
diff --git a/emscripten/npm/package.json b/emscripten/npm/package.json
index 85b665e5169..68404c71027 100644
--- a/emscripten/npm/package.json
+++ b/emscripten/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "verovio",
-  "version": "3.17.0-alpha",
+  "version": "4.2.0-alpha",
   "description": "This is the stable version of the verovio package",
   "main": "dist/verovio-toolkit-wasm.js",
   "exports": {
diff --git a/fonts/poetry.lock b/fonts/poetry.lock
index e7f2ff99d5b..7c516f071b4 100644
--- a/fonts/poetry.lock
+++ b/fonts/poetry.lock
@@ -1,10 +1,9 @@
-# This file is automatically @generated by Poetry and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand.
 
 [[package]]
 name = "appnope"
 version = "0.1.3"
 description = "Disable App Nap on macOS >= 10.9"
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -16,7 +15,6 @@ files = [
 name = "astroid"
 version = "2.14.2"
 description = "An abstract syntax tree for Python with inference support."
-category = "dev"
 optional = false
 python-versions = ">=3.7.2"
 files = [
@@ -36,7 +34,6 @@ wrapt = [
 name = "asttokens"
 version = "2.2.1"
 description = "Annotate AST trees with source code positions"
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -54,7 +51,6 @@ test = ["astroid", "pytest"]
 name = "backcall"
 version = "0.2.0"
 description = "Specifications for callback functions passed in to an API"
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -66,7 +62,6 @@ files = [
 name = "black"
 version = "22.12.0"
 description = "The uncompromising code formatter."
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -102,7 +97,6 @@ uvloop = ["uvloop (>=0.15.2)"]
 name = "click"
 version = "8.1.3"
 description = "Composable command line interface toolkit"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -117,7 +111,6 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""}
 name = "colorama"
 version = "0.4.6"
 description = "Cross-platform colored terminal text."
-category = "dev"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
 files = [
@@ -129,7 +122,6 @@ files = [
 name = "decorator"
 version = "5.1.1"
 description = "Decorators for Humans"
-category = "dev"
 optional = false
 python-versions = ">=3.5"
 files = [
@@ -141,7 +133,6 @@ files = [
 name = "dill"
 version = "0.3.6"
 description = "serialize all of python"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -156,7 +147,6 @@ graph = ["objgraph (>=1.7.2)"]
 name = "executing"
 version = "1.2.0"
 description = "Get the currently executing AST node of a frame, and other information"
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -171,7 +161,6 @@ tests = ["asttokens", "littleutils", "pytest", "rich"]
 name = "ipython"
 version = "8.10.0"
 description = "IPython: Productive Interactive Computing"
-category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -210,7 +199,6 @@ test-extra = ["curio", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.21)", "pa
 name = "isort"
 version = "5.12.0"
 description = "A Python utility / library to sort Python imports."
-category = "dev"
 optional = false
 python-versions = ">=3.8.0"
 files = [
@@ -228,7 +216,6 @@ requirements-deprecated-finder = ["pip-api", "pipreqs"]
 name = "jedi"
 version = "0.18.2"
 description = "An autocompletion tool for Python that can be used for text editors."
-category = "dev"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -248,7 +235,6 @@ testing = ["Django (<3.1)", "attrs", "colorama", "docopt", "pytest (<7.0.0)"]
 name = "lazy-object-proxy"
 version = "1.9.0"
 description = "A fast and thorough lazy object proxy."
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -294,7 +280,6 @@ files = [
 name = "matplotlib-inline"
 version = "0.1.6"
 description = "Inline Matplotlib backend for Jupyter"
-category = "dev"
 optional = false
 python-versions = ">=3.5"
 files = [
@@ -309,7 +294,6 @@ traitlets = "*"
 name = "mccabe"
 version = "0.7.0"
 description = "McCabe checker, plugin for flake8"
-category = "dev"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -321,7 +305,6 @@ files = [
 name = "mypy"
 version = "0.971"
 description = "Optional static typing for Python"
-category = "dev"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -364,7 +347,6 @@ reports = ["lxml"]
 name = "mypy-extensions"
 version = "1.0.0"
 description = "Type system extensions for programs checked with the mypy type checker."
-category = "dev"
 optional = false
 python-versions = ">=3.5"
 files = [
@@ -376,7 +358,6 @@ files = [
 name = "numpy"
 version = "1.24.2"
 description = "Fundamental package for array computing in Python"
-category = "main"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -414,7 +395,6 @@ files = [
 name = "parso"
 version = "0.8.3"
 description = "A Python Parser"
-category = "dev"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -430,7 +410,6 @@ testing = ["docopt", "pytest (<6.0.0)"]
 name = "pathspec"
 version = "0.11.0"
 description = "Utility library for gitignore style pattern matching of file paths."
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -442,7 +421,6 @@ files = [
 name = "pexpect"
 version = "4.8.0"
 description = "Pexpect allows easy control of interactive console applications."
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -457,7 +435,6 @@ ptyprocess = ">=0.5"
 name = "pickleshare"
 version = "0.7.5"
 description = "Tiny 'shelve'-like database with concurrency support"
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -469,7 +446,6 @@ files = [
 name = "platformdirs"
 version = "3.0.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -485,7 +461,6 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2.1)", "pytes
 name = "prompt-toolkit"
 version = "3.0.36"
 description = "Library for building powerful interactive command lines in Python"
-category = "dev"
 optional = false
 python-versions = ">=3.6.2"
 files = [
@@ -500,7 +475,6 @@ wcwidth = "*"
 name = "ptyprocess"
 version = "0.7.0"
 description = "Run a subprocess in a pseudo terminal"
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -512,7 +486,6 @@ files = [
 name = "pure-eval"
 version = "0.2.2"
 description = "Safely evaluate AST nodes without side effects"
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -525,14 +498,13 @@ tests = ["pytest"]
 
 [[package]]
 name = "pygments"
-version = "2.14.0"
+version = "2.15.0"
 description = "Pygments is a syntax highlighting package written in Python."
-category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 files = [
-    {file = "Pygments-2.14.0-py3-none-any.whl", hash = "sha256:fa7bd7bd2771287c0de303af8bfdfc731f51bd2c6a47ab69d117138893b82717"},
-    {file = "Pygments-2.14.0.tar.gz", hash = "sha256:b3ed06a9e8ac9a9aae5a6f5dbe78a8a58655d17b43b93c078f094ddc476ae297"},
+    {file = "Pygments-2.15.0-py3-none-any.whl", hash = "sha256:77a3299119af881904cd5ecd1ac6a66214b6e9bed1f2db16993b54adede64094"},
+    {file = "Pygments-2.15.0.tar.gz", hash = "sha256:f7e36cffc4c517fbc252861b9a6e4644ca0e5abadf9a113c72d1358ad09b9500"},
 ]
 
 [package.extras]
@@ -542,7 +514,6 @@ plugins = ["importlib-metadata"]
 name = "pylint"
 version = "2.16.2"
 description = "python code static checker"
-category = "dev"
 optional = false
 python-versions = ">=3.7.2"
 files = [
@@ -572,7 +543,6 @@ testutils = ["gitpython (>3)"]
 name = "scipy"
 version = "1.9.3"
 description = "Fundamental algorithms for scientific computing in Python"
-category = "main"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -611,7 +581,6 @@ test = ["asv", "gmpy2", "mpmath", "pytest", "pytest-cov", "pytest-xdist", "sciki
 name = "six"
 version = "1.16.0"
 description = "Python 2 and 3 compatibility utilities"
-category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
 files = [
@@ -623,7 +592,6 @@ files = [
 name = "stack-data"
 version = "0.6.2"
 description = "Extract data from python stack frames and tracebacks for informative displays"
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -643,7 +611,6 @@ tests = ["cython", "littleutils", "pygments", "pytest", "typeguard"]
 name = "svgpathtools"
 version = "1.6.0"
 description = "A collection of tools for manipulating and analyzing SVG Path objects and Bezier curves."
-category = "main"
 optional = false
 python-versions = "*"
 files = [
@@ -660,7 +627,6 @@ svgwrite = "*"
 name = "svgwrite"
 version = "1.4.3"
 description = "A Python library to create SVG drawings."
-category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -672,7 +638,6 @@ files = [
 name = "tomli"
 version = "2.0.1"
 description = "A lil' TOML parser"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -684,7 +649,6 @@ files = [
 name = "tomlkit"
 version = "0.11.6"
 description = "Style preserving TOML library"
-category = "dev"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -696,7 +660,6 @@ files = [
 name = "traitlets"
 version = "5.9.0"
 description = "Traitlets Python configuration system"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -712,7 +675,6 @@ test = ["argcomplete (>=2.0)", "pre-commit", "pytest", "pytest-mock"]
 name = "typing-extensions"
 version = "4.5.0"
 description = "Backported and Experimental Type Hints for Python 3.7+"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -724,7 +686,6 @@ files = [
 name = "wcwidth"
 version = "0.2.6"
 description = "Measures the displayed width of unicode strings in a terminal"
-category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -736,7 +697,6 @@ files = [
 name = "wrapt"
 version = "1.14.1"
 description = "Module for decorators, wrappers and monkey patching."
-category = "dev"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
 files = [
diff --git a/fonts/supported.xml b/fonts/supported.xml
index 859837641f5..ccd9a8d22d7 100644
--- a/fonts/supported.xml
+++ b/fonts/supported.xml
@@ -2834,7 +2834,7 @@
         <!--<glyph glyph-code="EBA3" smufl-name="luteBarlineStartRepeat" />-->
         <!--<glyph glyph-code="EBA4" smufl-name="luteBarlineEndRepeat" />-->
         <!--<glyph glyph-code="EBA5" smufl-name="luteBarlineFinal" />-->
-        <!--<glyph glyph-code="EBA6" smufl-name="luteDurationDoubleWhole" />-->
+        <glyph glyph-code="EBA6" smufl-name="luteDurationDoubleWhole" />
         <glyph glyph-code="EBA7" smufl-name="luteDurationWhole" />
         <glyph glyph-code="EBA8" smufl-name="luteDurationHalf" />
         <glyph glyph-code="EBA9" smufl-name="luteDurationQuarter" />
diff --git a/include/hum/.download b/include/hum/.download
index ae3293fb191..f7d50d15a27 100755
--- a/include/hum/.download
+++ b/include/hum/.download
@@ -1,2 +1,2 @@
-wget https://raw.githubusercontent.com/craigsapp/humlib/master/include/humlib.h -O humlib.h
+wget https://raw.githubusercontent.com/craigsapp/humlib/master/min/humlib.h -O humlib.h
 
diff --git a/include/hum/humlib.h b/include/hum/humlib.h
index 42fea3f0d8d..5223b1a9250 100644
--- a/include/hum/humlib.h
+++ b/include/hum/humlib.h
@@ -1,9 +1,9 @@
 //
 // Programmer:    Craig Stuart Sapp <craig@ccrma.stanford.edu>
 // Creation Date: Sat Aug  8 12:24:49 PDT 2015
-// Last Modified: Sat Apr 15 11:52:53 PDT 2023
-// Filename:      humlib.h
-// URL:           https://github.com/craigsapp/humlib/blob/master/include/humlib.h
+// Last Modified: Tue Dec 12 11:01:04 PST 2023
+// Filename:      min/humlib.h
+// URL:           https://github.com/craigsapp/humlib/blob/master/min/humlib.h
 // Syntax:        C++11
 // vim:           ts=3
 //
@@ -39,17 +39,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef _HUMLIB_H_INCLUDED
 #define _HUMLIB_H_INCLUDED
 
-#include <stdarg.h>
-#include <string.h>
-
 #include <algorithm>
 #include <cctype>
 #include <chrono>
 #include <cmath>
+#include <cstdarg>
+#include <cstring>
 #include <cstring>
 #include <ctime>
 #include <fstream>
 #include <functional>
+#include <iomanip>
 #include <iostream>
 #include <list>
 #include <locale>
@@ -1230,6 +1230,7 @@ class HumdrumLine : public std::string, public HumHash {
 		bool        isCommentGlobal        (void) const;
 		bool        isCommentUniversal     (void) const;
 		bool        isReference            (void) const;
+		bool        isReferenceRecord      (void) const { return isReference(); }
 		bool        isGlobalReference      (void) const;
 		bool        isUniversalReference   (void) const;
 		bool        isSignifier            (void) const;
@@ -1544,9 +1545,12 @@ class HumdrumToken : public std::string, public HumHash {
 		bool     isModernMensurationSymbol (void);
 		bool     isOriginalMensuration     (void) { return isOriginalMensurationSymbol(); }
 		bool     isModernMensuration       (void) { return isModernMensurationSymbol(); }
-		bool     isInstrumentDesignation   (void);
 		bool     isInstrumentName          (void);
 		bool     isInstrumentAbbreviation  (void);
+		bool     isInstrumentDesignation   (void);
+		bool     isInstrumentCode          (void) { return isInstrumentDesignation(); }
+		bool     isInstrumentClass         (void);
+		bool     isInstrumentGroup         (void);
 		bool     isModernInstrumentName    (void);
 		bool     isModernInstrumentAbbreviation(void);
 		bool     isOriginalInstrumentName    (void);
@@ -2313,6 +2317,26 @@ std::ostream& operator<<(std::ostream& out, HumdrumFileBase& infile);
 
 
 
+//////////////////////////////
+//
+// HumdrumFileBase::initializeArray -- adjust the size of the input array
+//     to the same dimensions as the HumdrumFile, filling in each cell of the
+//     array with the given value as a default.
+//
+
+template <class TYPE>
+void HumdrumFileBase::initializeArray(std::vector<std::vector<TYPE>>& array, TYPE value) {
+	HumdrumFileBase& infile = *this;
+	array.clear();
+	array.resize(infile.getLineCount());
+	for (int i=0; i<infile.getLineCount(); i++) {
+		array[i].resize(infile[i].getFieldCount());
+		fill(array[i].begin(), array[i].end(), value);
+	}
+}
+
+
+
 class HumdrumFileStructure : public HumdrumFileBase {
 	public:
 		              HumdrumFileStructure         (void);
@@ -3338,7 +3362,7 @@ class MuseRecord : public MuseRecordBasic {
 		std::string      getStaffString               (void);
 		int              getStaff                     (void);
 		int              staffQ                       (void);
-		
+
 		// column 25 ---> blank
 
 		// columns 26 - 31: beam codes
@@ -3400,7 +3424,7 @@ class MuseRecord : public MuseRecordBasic {
 		int              getFigureCount               (void);
 
 		// columns 3 -- 5 ---> blank
-		
+
 		// columns 6 -- 8: figure division pointer advancement (duration)
 		std::string      getFigurePointerField        (void);
 		int              figurePointerQ               (void);
@@ -4091,6 +4115,9 @@ class Convert {
 		static double  coefficientOfVariationPopulation(const std::vector<double>& x);
 		static double  nPvi                 (const std::vector<double>& x);
 
+		// instrument related functions defined in Convert-instrument.cpp
+		static std::vector<std::pair<std::string, std::string>> getInstrumentList(void);
+
 		// Reference record functions defined in Convert-reference.cpp
 		static std::string getReferenceKeyMeaning(HTp token);
 		static std::string getReferenceKeyMeaning(const std::string& token);
@@ -4275,6 +4302,9 @@ class MxmlPart {
 		string        cleanSpaces          (const string& input);
 		bool          hasOrnaments         (void) const;
 
+		vector<pair<int, int>> getVoiceMapping (void) { return m_voicemapping; };
+		vector<vector<int>> getStaffVoiceHist (void) { return m_staffvoicehist; };
+
 
 	private:
 		void          receiveStaffNumberFromChild (int staffnum, int voicenum);
@@ -4820,6 +4850,7 @@ class MxmlEvent {
 		void               setVoiceNumber     (int value);
 		int                getStaffNumber     (void) const;
 		int                getStaffIndex      (void) const;
+		int                getCrossStaffOffset(void) const;
 		int                getVoiceIndex      (int maxvoice = 4) const;
 		void               setStaffNumber     (int value);
 		measure_event_type getType            (void) const;
@@ -5243,27 +5274,25 @@ class HumTool : public Options {
 //
 
 #define BASIC_INTERFACE(CLASS)                         \
-using namespace std;                                   \
-using namespace hum;                                   \
 int main(int argc, char** argv) {                      \
-	CLASS interface;                                    \
+	hum::CLASS interface;                               \
 	if (!interface.process(argc, argv)) {               \
-		interface.getError(cerr);                        \
+		interface.getError(std::cerr);                   \
 		return -1;                                       \
 	}                                                   \
-	HumdrumFile infile;                                 \
+	hum::HumdrumFile infile;                            \
 	if (interface.getArgCount() > 0) {                  \
 		infile.readNoRhythm(interface.getArgument(1));   \
 	} else {                                            \
-		infile.readNoRhythm(cin);                        \
+		infile.readNoRhythm(std::cin);                   \
 	}                                                   \
-	int status = interface.run(infile, cout);           \
+	int status = interface.run(infile, std::cout);      \
 	if (interface.hasWarning()) {                       \
-		interface.getWarning(cerr);                      \
+		interface.getWarning(std::cerr);                 \
 		return 0;                                        \
 	}                                                   \
 	if (interface.hasError()) {                         \
-		interface.getError(cerr);                        \
+		interface.getError(std::cerr);                   \
 		return -1;                                       \
 	}                                                   \
 	interface.finally();                                \
@@ -5278,39 +5307,37 @@ int main(int argc, char** argv) {                      \
 //    usage implementation).
 //
 
-#define STREAM_INTERFACE(CLASS)                                  \
-using namespace std;                                             \
-using namespace hum;                                             \
-int main(int argc, char** argv) {                                \
-	CLASS interface;                                              \
-	if (!interface.process(argc, argv)) {                         \
-		interface.getError(cerr);                                  \
-		return -1;                                                 \
-	}                                                             \
-	HumdrumFileStream instream(static_cast<Options&>(interface)); \
-	HumdrumFileSet infiles;                                       \
-	bool status = true;                                           \
-	while (instream.readSingleSegment(infiles)) {                 \
-		status &= interface.run(infiles);                          \
-		if (interface.hasWarning()) {                              \
-			interface.getWarning(cerr);                             \
-		}                                                          \
-		if (interface.hasAnyText()) {                              \
-		   interface.getAllText(cout);                             \
-		}                                                          \
-		if (interface.hasError()) {                                \
-			interface.getError(cerr);                               \
-         return -1;                                              \
-		}                                                          \
-		if (!interface.hasAnyText()) {                             \
-			for (int i=0; i<infiles.getCount(); i++) {              \
-				cout << infiles[i];                                  \
-			}                                                       \
-		}                                                          \
-		interface.clearOutput();                                   \
-	}                                                             \
-	interface.finally();                                          \
-	return !status;                                               \
+#define STREAM_INTERFACE(CLASS)                                            \
+int main(int argc, char** argv) {                                          \
+	hum::CLASS interface;                                                   \
+	if (!interface.process(argc, argv)) {                                   \
+		interface.getError(std::cerr);                                       \
+		return -1;                                                           \
+	}                                                                       \
+	hum::HumdrumFileStream instream(static_cast<hum::Options&>(interface)); \
+	hum::HumdrumFileSet infiles;                                            \
+	bool status = true;                                                     \
+	while (instream.readSingleSegment(infiles)) {                           \
+		status &= interface.run(infiles);                                    \
+		if (interface.hasWarning()) {                                        \
+			interface.getWarning(std::cerr);                                  \
+		}                                                                    \
+		if (interface.hasAnyText()) {                                        \
+		   interface.getAllText(std::cout);                                  \
+		}                                                                    \
+		if (interface.hasError()) {                                          \
+			interface.getError(std::cerr);                                    \
+         return -1;                                                        \
+		}                                                                    \
+		if (!interface.hasAnyText()) {                                       \
+			for (int i=0; i<infiles.getCount(); i++) {                        \
+				cout << infiles[i];                                            \
+			}                                                                 \
+		}                                                                    \
+		interface.clearOutput();                                             \
+	}                                                                       \
+	interface.finally();                                                    \
+	return !status;                                                         \
 }
 
 
@@ -5322,30 +5349,28 @@ int main(int argc, char** argv) {                                \
 //    Humdrum files.
 //
 
-#define RAW_STREAM_INTERFACE(CLASS)                              \
-using namespace std;                                             \
-using namespace hum;                                             \
-int main(int argc, char** argv) {                                \
-	CLASS interface;                                              \
-	if (!interface.process(argc, argv)) {                         \
-		interface.getError(cerr);                                  \
-		return -1;                                                 \
-	}                                                             \
-	HumdrumFileStream instream(static_cast<Options&>(interface)); \
-	bool status = interface.run(instream);                        \
-	if (interface.hasWarning()) {                                 \
-		interface.getWarning(cerr);                                \
-	}                                                             \
-	if (interface.hasAnyText()) {                                 \
-	   interface.getAllText(cout);                                \
-	}                                                             \
-	if (interface.hasError()) {                                   \
-		interface.getError(cerr);                                  \
-        return -1;                                               \
-	}                                                             \
-	interface.finally();                                          \
-	interface.clearOutput();                                      \
-	return !status;                                               \
+#define RAW_STREAM_INTERFACE(CLASS)                                        \
+int main(int argc, char** argv) {                                          \
+	hum::CLASS interface;                                                   \
+	if (!interface.process(argc, argv)) {                                   \
+		interface.getError(std::cerr);                                       \
+		return -1;                                                           \
+	}                                                                       \
+	hum::HumdrumFileStream instream(static_cast<hum::Options&>(interface)); \
+	bool status = interface.run(instream);                                  \
+	if (interface.hasWarning()) {                                           \
+		interface.getWarning(std::cerr);                                     \
+	}                                                                       \
+	if (interface.hasAnyText()) {                                           \
+	   interface.getAllText(std::cout);                                     \
+	}                                                                       \
+	if (interface.hasError()) {                                             \
+		interface.getError(std::cerr);                                       \
+        return -1;                                                         \
+	}                                                                       \
+	interface.finally();                                                    \
+	interface.clearOutput();                                                \
+	return !status;                                                         \
 }
 
 
@@ -5356,37 +5381,35 @@ int main(int argc, char** argv) {                                \
 //    usage implementation).
 //
 
-#define SET_INTERFACE(CLASS)                                     \
-using namespace std;                                             \
-using namespace hum;                                             \
-int main(int argc, char** argv) {                                \
-	CLASS interface;                                              \
-	if (!interface.process(argc, argv)) {                         \
-		interface.getError(cerr);                                  \
-		return -1;                                                 \
-	}                                                             \
-	HumdrumFileStream instream(static_cast<Options&>(interface)); \
-	HumdrumFileSet infiles;                                       \
-	instream.read(infiles);                                       \
-	bool status = interface.run(infiles);                         \
-	if (interface.hasWarning()) {                                 \
-		interface.getWarning(cerr);                                \
-	}                                                             \
-	if (interface.hasAnyText()) {                                 \
-	   interface.getAllText(cout);                                \
-	}                                                             \
-	if (interface.hasError()) {                                   \
-		interface.getError(cerr);                                  \
-        return -1;                                               \
-	}                                                             \
-	if (!interface.hasAnyText()) {                                \
-		for (int i=0; i<infiles.getCount(); i++) {                 \
-			cout << infiles[i];                                     \
-		}                                                          \
-	}                                                             \
-	interface.finally();                                          \
-	interface.clearOutput();                                      \
-	return !status;                                               \
+#define SET_INTERFACE(CLASS)                                               \
+int main(int argc, char** argv) {                                          \
+	hum::CLASS interface;                                                   \
+	if (!interface.process(argc, argv)) {                                   \
+		interface.getError(std::cerr);                                       \
+		return -1;                                                           \
+	}                                                                       \
+	hum::HumdrumFileStream instream(static_cast<hum::Options&>(interface)); \
+	hum::HumdrumFileSet infiles;                                            \
+	instream.read(infiles);                                                 \
+	bool status = interface.run(infiles);                                   \
+	if (interface.hasWarning()) {                                           \
+		interface.getWarning(std::cerr);                                     \
+	}                                                                       \
+	if (interface.hasAnyText()) {                                           \
+	   interface.getAllText(std::cout);                                     \
+	}                                                                       \
+	if (interface.hasError()) {                                             \
+		interface.getError(std::cerr);                                       \
+        return -1;                                                         \
+	}                                                                       \
+	if (!interface.hasAnyText()) {                                          \
+		for (int i=0; i<infiles.getCount(); i++) {                           \
+			std::cout << infiles[i];                                          \
+		}                                                                    \
+	}                                                                       \
+	interface.finally();                                                    \
+	interface.clearOutput();                                                \
+	return !status;                                                         \
 }
 
 
@@ -5479,6 +5502,35 @@ class HumdrumFileSet {
 
 
 
+class Tool_addic : public HumTool {
+	public:
+		         Tool_addic        (void);
+		        ~Tool_addic        () {};
+
+		bool     run               (HumdrumFileSet& infiles);
+		bool     run               (HumdrumFile& infile);
+		bool     run               (const string& indata, ostream& out);
+		bool     run               (HumdrumFile& infile, ostream& out);
+
+		int      getInstrumentCodeIndex(HumdrumFile& infile);
+		int      getInstrumentClassIndex(HumdrumFile& infile);
+		void     updateInstrumentClassLine(HumdrumFile& infile, int codeIndex, int classIndex);
+		std::string makeClassLine(HumdrumFile& infile, int codeIndex);
+		std::string getInstrumentClass(const string& code);
+
+
+	protected:
+		void     initialize        (void);
+		void     processFile       (HumdrumFile& infile);
+
+	private:
+		std::vector<std::pair<std::string, std::string>> m_instrumentList;
+		bool m_fixQ = false;  // used with -f option: fix incorrect instrument classes
+
+
+};
+
+
 class Tool_autoaccid : public HumTool {
 	public:
 		         Tool_autoaccid    (void);
@@ -6094,7 +6146,7 @@ class Tool_cmr : public HumTool {
 		void             getPartNames            (std::vector<std::string>& partNames, HumdrumFile& infile);
 		void             checkForCmr             (int index, int direction, HumdrumFile& infile);
 		bool             hasHigher               (int pitch, int tolerance,
-		                                          std::vector<int>& midinums, 
+		                                          std::vector<int>& midinums,
 		                                          std::vector<std::vector<HTp>>& notelist,
 		                                          int index1, int index2);
 		bool             hasGroupUp              (void);
@@ -6208,39 +6260,6 @@ class Tool_colorgroups : public HumTool {
 };
 
 
-class Tool_colorthirds : public HumTool {
-	public:
-		         Tool_colorthirds  (void);
-		        ~Tool_colorthirds  () {};
-
-		bool     run               (HumdrumFileSet& infiles);
-		bool     run               (HumdrumFile& infile);
-		bool     run               (const string& indata, ostream& out);
-		bool     run               (HumdrumFile& infile, ostream& out);
-
-	protected:
-		void             initialize        (void);
-		void             processFile       (HumdrumFile& infile);
-		std::vector<int> getMidiNotes(std::vector<HTp>& kernNotes);
-		std::vector<int> getChordPositions(std::vector<int>& midiNotes);
-		void             labelChordPositions(std::vector<HTp>& kernNotes, std::vector<int>& chordPositions);
-
-	private:
-		std::string m_root_marker = "@";
-		std::string m_third_marker = "N";
-		std::string m_fifth_marker = "Z";
-
-		std::string m_root_color = "crimson";
-		std::string m_third_color = "limegreen";
-		std::string m_fifth_color = "royalblue";
-
-		bool m_colorThirds = true;
-		bool m_colorFifths = true;
-		bool m_colorTriads = true;
-
-};
-
-
 class Tool_colortriads : public HumTool {
 	public:
 		         Tool_colortriads  (void);
@@ -6454,10 +6473,11 @@ class Tool_composite : public HumTool {
 		int m_groupAssignmentIndex  = 0;
 		int m_verseLabelIndex       = 0;
 
-		int m_coincidenceEventCount   = -1;
-		int m_fullCompositeEventCount = -1;
-		int m_groupAEventCount        = -1;
-		int m_groupBEventCount        = -1;
+		// analytic counts:
+		int m_coincidenceEventCount   = -1; // number of events in coincidence
+		int m_fullCompositeEventCount = -1; // number of events in full composite rhythm
+		int m_groupAEventCount        = -1; // number of events in group A composite rhythm
+		int m_groupBEventCount        = -1; // number of events in group B composite rhythm
 
 		double m_scoreSize          = 100.0;
 		double m_analysisSize       = 100.0;
@@ -6817,7 +6837,7 @@ class Tool_deg : public HumTool {
 		// m_insertTracks: matches to m_degSpines first dimension.
 		// It gives the track number for spines before which the corresponding
 		// m_degSpine[x] spine should be inserted.  A -1 value at the last
-		// position in m_insertTracks means append the **deg spine at the 
+		// position in m_insertTracks means append the **deg spine at the
 		// end of the line.
 		std::vector<int> m_insertTracks;
 
@@ -7124,7 +7144,7 @@ class Tool_esac2hum : public HumTool {
 		void      getLyrics             (vector<string>& lyrics, const string& buffer);
 		void      cleanupLyrics         (vector<string>& lyrics);
 		bool      getFileContents       (vector<string>& array, const string& filename);
-		void      chopExtraInfo         (char* holdbuffer);
+		void      chopExtraInfo         (string& buffer);
 		void      printHumdrumHeaderInfo(ostream& out, vector<string>& song);
 		void      printHumdrumFooterInfo(ostream& out, vector<string>& song);
 
@@ -7275,7 +7295,7 @@ class Tool_extract : public HumTool {
 
 class FiguredBassNumber {
 	public:
-		            FiguredBassNumber(int num, string accid, bool showAccid, int voiceIndex, int lineIndex, bool isAttack, bool intervallsatz);
+		            FiguredBassNumber(int num, string accid, bool showAccid, int voiceIndex, int lineIndex, bool isAttack, bool intervallsatz, string intervalQuality, bool hint);
 		std::string toString(bool nonCompoundIntervalsQ, bool noAccidentalsQ, bool hideThreeQ);
 		int         getNumberWithinOctave(void);
 
@@ -7288,6 +7308,8 @@ class FiguredBassNumber {
 		bool        m_isAttack;
 		bool        m_convert2To9 = false;
 		bool        m_intervallsatz = false;
+		std::string m_intervalQuality;
+		bool        m_hint = false;
 
 };
 
@@ -7300,7 +7322,7 @@ class FiguredBassAbbreviationMapping {
 		// String to compare the numbers with
 		// e.g. "6 4 3"
 		// Sorted by size, larger numbers first
-		string m_str; 
+		string m_str;
 
 		// Figured bass number as int
 		vector<int> m_numbers;
@@ -7334,6 +7356,7 @@ class Tool_fb : public HumTool {
 		string                     getNumberString                        (vector<FiguredBassNumber*> numbers);
 		string                     getKeySignature                        (HumdrumFile& infile, int lineIndex);
 		int                        getLowestBase40Pitch                   (vector<int> base40Pitches);
+		string                     getIntervalQuality                     (int basePitchBase40, int targetPitchBase40);
 
 
 	private:
@@ -7351,6 +7374,7 @@ class Tool_fb : public HumTool {
 		bool   m_showNegativeQ  = false;
 		bool   m_aboveQ         = false;
 		string m_rateQ          = "";
+		bool   m_hintQ          = false;
 
 		string m_spineTracks    = ""; // used with -s option
 		string m_kernTracks     = ""; // used with -k option
@@ -7800,7 +7824,7 @@ class Tool_humtr : public HumTool {
 	public:
 		            Tool_humtr        (void);
 		           ~Tool_humtr        () {};
-  
+
 		bool        run               (HumdrumFileSet& infiles);
 		bool        run               (HumdrumFile& infile);
 		bool        run               (const std::string& indata, ostream& out);
@@ -7922,16 +7946,32 @@ class Tool_kern2mens : public HumTool {
 		bool     run                      (HumdrumFile& infile, ostream& out);
 
 	protected:
-		void     convertToMens            (HumdrumFile& infile);
-		string   convertKernTokenToMens   (HTp token);
-		void     printBarline             (HumdrumFile& infile, int line);
+		void        convertToMens         (HumdrumFile& infile);
+		std::string convertKernTokenToMens(HTp token);
+		void        printBarline          (HumdrumFile& infile, int line);
+		std::string getClefConversion     (HTp token);
+		void        storeKernEditorialAccidental(HumdrumFile& infile);
+		void        storeKernTerminalLong (HumdrumFile& infile);
+		void        addVerovioStyling     (HumdrumFile& infile);
+		void        analyzeColoration     (HumdrumFile& infile);
+		void        analyzeColoration     (HTp infile);
 
 	private:
-		bool     m_numbersQ   = true;      // used with -N option
-		bool     m_measuresQ  = true;      // used with -M option
-		bool     m_invisibleQ = true;      // used with -I option
-		bool     m_doublebarQ = true;      // used with -D option
-		string   m_clef;                   // used with -c option
+		bool        m_numbersQ   = true; // used with -N option
+		bool        m_measuresQ  = true; // used with -M option
+		bool        m_invisibleQ = true; // used with -I option
+		bool        m_doublebarQ = true; // used with -D option
+		bool        m_noverovioQ = false; // used with -V option
+		bool        m_evenNoteSpacingQ = false; // used with -e option
+		std::string m_clef;              // used with -c option
+
+		std::string m_kernEditorialAccidental;  // used with !!!RDF**kern:
+		int         m_kernEdAccLineIndex = -1;
+		std::string m_mensEdAccLine;
+
+		std::string m_kernTerminalLong;  // used with !!!RDF**kern:
+		int         m_kernTerminalLongIndex = -1;
+		std::string m_mensTerminalLongLine;
 
 };
 
@@ -8352,6 +8392,7 @@ class Tool_mens2kern : public HumTool {
 		                              int brevis_def, int semibrevis_def);
 		void     getMensuralInfo     (HTp token, int& maximodus, int& modus,
 		                              int& tempus, int& prolatio);
+		std::string getClefConversion(HTp token);
 
 	private:
 		bool     m_debugQ;
@@ -8360,6 +8401,62 @@ class Tool_mens2kern : public HumTool {
 };
 
 
+class Tool_meter : public HumTool {
+
+	public:
+		         Tool_meter        (void);
+		        ~Tool_meter        () {};
+
+		bool     run               (HumdrumFileSet& infiles);
+		bool     run               (HumdrumFile& infile);
+		bool     run               (const string& indata, std::ostream& out);
+		bool     run               (HumdrumFile& infile, std::ostream& out);
+
+
+	protected:
+		void     initialize        (void);
+		void     processFile       (HumdrumFile& infile);
+		void     getMeterData      (HumdrumFile& infile);
+		void     processLine       (HumdrumLine& line,
+		                            std::vector<HumNum>& curNum,
+		                            std::vector<HumNum>& curDen,
+		                            std::vector<HumNum>& curBeat,
+		                            std::vector<HumNum>& curBarTime);
+		void     printMeterData    (HumdrumFile& infile);
+		void     printHumdrumLine  (HumdrumLine& line, bool printLabels);
+		int      printKernAndAnalysisSpine(HumdrumLine& line, int index, bool printLabels, bool forceInterpretation = false);
+		HumNum   getHumNum          (HTp token, const std::string& parameter);
+		std::string getHumNumString(HumNum input);
+		bool     searchForLabels   (HumdrumLine& line);
+		void     printLabelLine    (HumdrumLine& line);
+		void     analyzePickupMeasures(HumdrumFile& infile);
+		void     analyzePickupMeasures(HTp sstart);
+		HumNum   getTimeSigDuration(HTp tsig);
+		void     markPickupContent (HTp stok, HTp etok);
+
+	private:
+
+		bool     m_commaQ       = false;
+		bool     m_debugQ       = false;
+		bool     m_denominatorQ = false;
+		bool     m_eighthQ      = false;
+		bool     m_floatQ       = false;
+		bool     m_halfQ        = false;
+		bool     m_joinQ        = false;
+		bool     m_nobeatQ      = false;
+		bool     m_nolabelQ     = false;
+		bool     m_numeratorQ   = false;
+		bool     m_quarterQ     = false;
+		bool     m_restQ        = false;
+		bool     m_sixteenthQ   = false;
+		bool     m_tsigQ        = false;
+		bool     m_wholeQ       = false;
+		bool     m_zeroQ        = false;
+		int      m_digits       = 0;
+
+};
+
+
 class Tool_metlev : public HumTool {
 	public:
 		      Tool_metlev      (void);
@@ -8545,7 +8642,7 @@ class SonorityNoteData {
 				break;
 			}
 		}
-	
+
 		bool hasAccidental(void) {
 			// Set only with setText() input.
 			return m_accidentalQ;
@@ -8942,6 +9039,7 @@ class Tool_musicxml2hum : public HumTool {
 		                             std::vector<SimultaneousEvents*>& nowevents,
 		                             HumNum nowtime,
 		                             std::vector<MxmlPart>& partdata);
+		void   handleFiguredBassWithoutNonZeroEvent (std::vector<SimultaneousEvents*>& nowevents, HumNum nowtime);
 		void   appendNonZeroEvents   (GridMeasure* outdata,
 		                              std::vector<SimultaneousEvents*>& nowevents,
 		                              HumNum nowtime,
@@ -9080,12 +9178,14 @@ class Tool_musicxml2hum : public HumTool {
 		bool m_stemsQ        = false;
 		int  m_slurabove     = 0;
 		int  m_slurbelow     = 0;
+		int  m_staffabove    = 0;
+		int  m_staffbelow    = 0;
 		char m_hasEditorial  = '\0';
 		bool m_hasOrnamentsQ = false;
 		int  m_maxstaff      = 0;
 		std::vector<std::vector<std::string>> m_last_ottava_direction;
 		std::vector<MusicXmlHarmonyInfo> offsetHarmony;
-		std::vector<MusicXmlFiguredBassInfo> offsetFiguredBass;
+		std::vector<MusicXmlFiguredBassInfo> m_offsetFiguredBass;
 		std::vector<string> m_stop_char;
 
 		// RDF indications in **kern data:
@@ -9098,7 +9198,7 @@ class Tool_musicxml2hum : public HumTool {
 		std::vector<std::vector<pugi::xml_node>> m_current_brackets;
 		std::map<int, string> m_bracket_type_buffer;
 		std::vector<std::vector<pugi::xml_node>> m_used_hairpins;
-		std::vector<pugi::xml_node> m_current_figured_bass;
+		std::vector<std::vector<pugi::xml_node>> m_current_figured_bass;
 		std::vector<std::pair<int, pugi::xml_node>> m_current_text;
 		std::vector<std::pair<int, pugi::xml_node>> m_current_tempo;
 
@@ -9293,6 +9393,74 @@ class Tool_myank : public HumTool {
 };
 
 
+class Tool_nproof : public HumTool {
+
+	public:
+		         Tool_nproof        (void);
+		        ~Tool_nproof        () {};
+
+		bool     run               (HumdrumFileSet& infiles);
+		bool     run               (HumdrumFile& infile);
+		bool     run               (const string& indata, std::ostream& out);
+		bool     run               (HumdrumFile& infile, std::ostream& out);
+
+		void     checkForBlankLines(HumdrumFile& infile);
+		void     checkInstrumentInformation(HumdrumFile& infile);
+		void     checkKeyInformation(HumdrumFile& infile);
+		void     checkSpineTerminations(HumdrumFile& infile);
+		void     checkForValidInstrumentCode(HTp token, vector<pair<string, string>>& instrumentList);
+		void     checkReferenceRecords(HumdrumFile& infile);
+
+	protected:
+		void     initialize        (void);
+		void     processFile       (HumdrumFile& infile);
+
+	private:
+		int m_errorCount = 0;
+		std::string m_errorList;
+		std::string m_errorHtml;
+
+		bool m_noblankQ       = false;
+		bool m_noinstrumentQ  = false;
+		bool m_nokeyQ         = false;
+		bool m_noreferenceQ   = false;
+		bool m_noterminationQ = false;
+
+		bool m_fileQ          = false;
+		bool m_rawQ           = false;
+
+};
+
+
+class Tool_ordergps : public HumTool {
+	public:
+		      Tool_ordergps  (void);
+		     ~Tool_ordergps  () {};
+
+		bool  run            (HumdrumFileSet& infiles);
+		bool  run            (HumdrumFile& infile);
+		bool  run            (const string& indata, ostream& out);
+		bool  run            (HumdrumFile& infile, ostream& out);
+
+	protected:
+		void  initialize     (void);
+		void  processFile    (HumdrumFile& infile);
+		void  printStaffLine (HumdrumFile& infile);
+		void  printFile      (HumdrumFile& infile, int gindex, int pindex, int sindex);
+		void  printFileTop   (HumdrumFile& infile, int gindex, int pindex, int sindex);
+
+	private:
+		bool m_emptyQ   = false;
+		bool m_fileQ    = false;
+		bool m_listQ    = false;
+		bool m_problemQ = false;
+		bool m_reverseQ = false;
+		bool m_staffQ   = false;
+		bool m_topQ     = false;
+
+};
+
+
 
 class Tool_pccount : public HumTool {
 	public:
@@ -9428,6 +9596,38 @@ class Tool_phrase : public HumTool {
 
 
 
+class Tool_pline : public HumTool {
+	public:
+		         Tool_pline        (void);
+		        ~Tool_pline        () {};
+
+		bool     run               (HumdrumFileSet& infiles);
+		bool     run               (HumdrumFile& infile);
+		bool     run               (const string& indata, ostream& out);
+		bool     run               (HumdrumFile& infile, ostream& out);
+
+
+	protected:
+		void     initialize        (void);
+		void     processFile       (HumdrumFile& infile);
+		void     getPlineInterpretations(HumdrumFile& infile, vector<HTp>& tokens);
+		void     plineToColor      (HumdrumFile& infile, vector<HTp>& tokens);
+		void     markRests         (HumdrumFile& infile);
+		void     markSpineRests    (HTp spineStop);
+		void     fillLineInfo      (HumdrumFile& infile, std::vector<std::vector<int>>& lineInfo);
+
+	private:
+		bool     m_colorQ   = false;  // used with -c option
+		// bool     m_overlapQ = false;  // used with -o option
+
+		std::vector<std::string> m_colors;
+		std::vector<HTp> m_ptokens;
+		std::vector<std::vector<int>> m_lineInfo;
+
+
+};
+
+
 class Tool_pnum : public HumTool {
 	public:
 		      Tool_pnum               (void);
@@ -10084,6 +10284,58 @@ class Tool_tassoize : public HumTool {
 };
 
 
+class Tool_textdur : public HumTool {
+	public:
+		         Tool_textdur  (void);
+		        ~Tool_textdur  () {};
+
+		bool     run               (HumdrumFileSet& infiles);
+		bool     run               (HumdrumFile& infile);
+		bool     run               (const string& indata, ostream& out);
+		bool     run               (HumdrumFile& infile, ostream& out);
+
+
+	protected:
+		void     initialize        (void);
+		void     processFile       (HumdrumFile& infile);
+		void     printMelismas     (HumdrumFile& infile);
+		void     printDurations     (HumdrumFile& infile);
+		void     getTextSpineStarts(HumdrumFile& infile, vector<HTp>& starts);
+		void     processTextSpine  (vector<HTp>& starts, int index);
+		int      getMelisma        (HTp tok1, HTp tok2);
+		HumNum   getDuration       (HTp tok1, HTp tok2);
+		HTp      getTandemKernToken(HTp token);
+		void     printInterleaved  (HumdrumFile& infile);
+		void     printInterleavedLine(HumdrumLine& line, vector<bool>& textTrack);
+		void     printTokenAnalysis(HTp token);
+		void     printAnalysis      (void);
+		void     printDurationAverage(void);
+		void     printMelismaAverage(void);
+		void     printHtmlContent   (void);
+		void     printMelismaHtmlHistogram(void);
+		void     printMelismaHtmlHistogram(int index, int maxVal);
+		void     printDurationHtmlHistogram(void);
+		void     fillInstrumentNameInfo(void);
+		std::string getColumnName   (HTp token);
+
+	private:
+		std::vector<HTp>                 m_textStarts;
+		std::vector<int>                 m_track2column;
+		std::vector<string>              m_columnName;
+
+		std::vector<std::vector<HTp>>    m_syllables;  // List of syllables in **text/**sylba
+		std::vector<std::vector<HumNum>> m_durations;  // List of durations excluding trailing rests
+		std::vector<std::vector<int>>    m_melismas;   // List of note counts for syllable
+
+		bool m_analysisQ     = false;  // used with -a option
+		bool m_melismaQ      = false;  // used with -m option
+		bool m_durationQ     = true;   // used with -m, -d option
+		bool m_interleaveQ   = false;  // used with -i option
+		HumNum m_RhythmFactor = 1;     // uwed with -1, -2, -8, and later -f #
+
+};
+
+
 class Tool_thru : public HumTool {
 	public:
 		         Tool_thru         (void);
@@ -10344,6 +10596,105 @@ class Tool_trillspell : public HumTool {
 
 
 
+class Tool_tspos : public HumTool {
+	public:
+		         Tool_tspos  (void);
+		        ~Tool_tspos  () {};
+
+		bool     run               (HumdrumFileSet& infiles);
+		bool     run               (HumdrumFile& infile);
+		bool     run               (const string& indata, ostream& out);
+		bool     run               (HumdrumFile& infile, ostream& out);
+
+	protected:
+		void             initialize        (HumdrumFile& infile);
+		void             processFile       (HumdrumFile& infile);
+		std::vector<int> getMidiNotes(std::vector<HTp>& kernNotes);
+		std::vector<int> getChordPositions(std::vector<int>& midiNotes);
+		std::vector<int> getNoteMods(std::vector<int>& midiNotes);
+		std::vector<int> getThirds(std::vector<int>& midiNotes);
+		std::vector<int> getFifths(std::vector<int>& midiNotes);
+		void             labelChordPositions(std::vector<HTp>& kernNotes, std::vector<int>& chordPositions);
+		void             labelThirds(std::vector<HTp>& kernNotes, std::vector<int>& thirdPositions);
+		void             labelFifths(std::vector<HTp>& kernNotes, std::vector<int>& fifthPositions);
+		void             keepOnlyDoubles(std::vector<int>& output);
+		void             checkForTriadicSonority(std::vector<int>& positions, int line);
+		std::string      generateStatistics(HumdrumFile& infile);
+		std::vector<std::string> getTrackNames(HumdrumFile& infile);
+		int              getVectorSum(std::vector<int>& input);
+		void             analyzeVoiceCount(HumdrumFile& infile);
+		int              countVoicesOnLine(HumdrumFile& infile, int line);
+		std::string      generateTable(HumdrumFile& infile, std::vector<std::string>& name);
+		bool             hasFullTriadAttack(HumdrumLine& line);
+		void             avoidRdfCollisions(HumdrumFile& infile);
+		void             printUsedMarkers(void);
+		std::string      makeOpacityColor(std::string& color, double value, double total);
+		int              getToolCounter(HumdrumFile& infile);
+		std::string      makePercentString(double value, double total, int digits);
+
+	private:
+		std::string m_root_marker      = "@";
+		std::string m_third_marker     = "N";
+		std::string m_fifth_marker     = "Z";
+		std::string m_3rd_root_marker  = "j";
+		std::string m_3rd_third_marker = "l";
+		std::string m_5th_root_marker  = "V";
+		std::string m_5th_fifth_marker = "|";
+
+		std::vector<int> m_used_markers;
+
+		std::string m_root_color       = "#DC143C"; // crimson
+		std::string m_third_color      = "#32CD32"; // limegreen
+		std::string m_fifth_color      = "#4169E1"; // royalblue
+		std::string m_3rd_root_color   = "#8B0000"; // darkred
+		std::string m_3rd_third_color  = "#008000"; // green
+		std::string m_5th_root_color   = "#8B0000"; // darkred
+		std::string m_5th_fifth_color  = "#4682B4"; // steelblue
+
+		bool m_colorThirds = true;   // used with -3 option (to negate)
+		bool m_colorFifths = true;   // used with -5 option (to negate)
+		bool m_colorTriads = true;   // used with -T option (to negate)
+		bool m_doubleQ     = false;  // used with -d option
+
+		bool m_topQ = false;         // used with --top option
+		bool m_tableQ = false;       // used with -t option
+		bool m_triadAttack = false;  // used with -x option
+
+		// Statistical data variables:
+		vector<bool> m_triadState;
+
+		// m_partTriadPositions -- count the number of chordal positions by
+		// voice.  The first dimention is the track number of the part, and
+		// the second dimension is the counts for 7 categories:
+		// 0 = count of root positions in full triadic chords
+		// 1 = count of third positions in full triadic chords
+		// 2 = count of fifth positions in full triadic chords
+		// 3 = count of root positions in partial triadic chords ("open thirds")
+		// 4 = count of third positions in partial triadic chords
+		// 5 = count of root positions in partial triadic chords ("open fifths")
+		// 6 = count of fifth positions in partial triadic chords
+		std::vector<vector<int>> m_partTriadPositions;
+		int m_positionCount = 7; // entries in 2nd dim. of m_partTriadPositions
+
+		string m_toolName = "tspos";
+
+		std::vector<int> m_voiceCount;
+		// m_voice: used with -v option to limit analysis to sonorities that
+		// have the given voice count. 0 means analyze any voice counts.
+		int m_voice = 0;
+
+		bool m_compressedQ = false;
+
+		bool m_minorQ = true;
+		bool m_majorQ = true;
+
+		bool m_questionQ = true;
+		int  m_toolCount = 0;
+
+		std::vector<string> m_fullNames;
+};
+
+
 } // end of namespace hum
 
 
diff --git a/include/pugi/pugiconfig.hpp b/include/pugi/pugiconfig.hpp
index 77496aefe7c..3dc839da6ec 100644
--- a/include/pugi/pugiconfig.hpp
+++ b/include/pugi/pugiconfig.hpp
@@ -1,77 +1,77 @@
-/**
- * pugixml parser - version 1.13
- * --------------------------------------------------------
- * Copyright (C) 2006-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
- * Report bugs and download new versions at https://pugixml.org/
- *
- * This library is distributed under the MIT License. See notice at the end
- * of this file.
- *
- * This work is based on the pugxml parser, which is:
- * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
- */
-
-#ifndef HEADER_PUGICONFIG_HPP
-#define HEADER_PUGICONFIG_HPP
-
-// Uncomment this to enable wchar_t mode
-// #define PUGIXML_WCHAR_MODE
-
-// Uncomment this to enable compact mode
-// #define PUGIXML_COMPACT
-
-// Uncomment this to disable XPath
-// #define PUGIXML_NO_XPATH
-
-// Uncomment this to disable STL
-// #define PUGIXML_NO_STL
-
-// Uncomment this to disable exceptions
-// #define PUGIXML_NO_EXCEPTIONS
-
-// Set this to control attributes for public classes/functions, i.e.:
-// #define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL
-// #define PUGIXML_CLASS __declspec(dllimport) // to import all classes from DLL
-// #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall
-// In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead
-
-// Tune these constants to adjust memory-related behavior
-// #define PUGIXML_MEMORY_PAGE_SIZE 32768
-// #define PUGIXML_MEMORY_OUTPUT_STACK 10240
-// #define PUGIXML_MEMORY_XPATH_PAGE_SIZE 4096
-
-// Tune this constant to adjust max nesting for XPath queries
-// #define PUGIXML_XPATH_DEPTH_LIMIT 1024
-
-// Uncomment this to switch to header-only version
-// #define PUGIXML_HEADER_ONLY
-
-// Uncomment this to enable long long support
-// #define PUGIXML_HAS_LONG_LONG
-
-#endif
-
-/**
- * Copyright (c) 2006-2022 Arseny Kapoulkine
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
+/**
+ * pugixml parser - version 1.14
+ * --------------------------------------------------------
+ * Copyright (C) 2006-2023, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Report bugs and download new versions at https://pugixml.org/
+ *
+ * This library is distributed under the MIT License. See notice at the end
+ * of this file.
+ *
+ * This work is based on the pugxml parser, which is:
+ * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
+ */
+
+#ifndef HEADER_PUGICONFIG_HPP
+#define HEADER_PUGICONFIG_HPP
+
+// Uncomment this to enable wchar_t mode
+// #define PUGIXML_WCHAR_MODE
+
+// Uncomment this to enable compact mode
+// #define PUGIXML_COMPACT
+
+// Uncomment this to disable XPath
+// #define PUGIXML_NO_XPATH
+
+// Uncomment this to disable STL
+// #define PUGIXML_NO_STL
+
+// Uncomment this to disable exceptions
+// #define PUGIXML_NO_EXCEPTIONS
+
+// Set this to control attributes for public classes/functions, i.e.:
+// #define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL
+// #define PUGIXML_CLASS __declspec(dllimport) // to import all classes from DLL
+// #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall
+// In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead
+
+// Tune these constants to adjust memory-related behavior
+// #define PUGIXML_MEMORY_PAGE_SIZE 32768
+// #define PUGIXML_MEMORY_OUTPUT_STACK 10240
+// #define PUGIXML_MEMORY_XPATH_PAGE_SIZE 4096
+
+// Tune this constant to adjust max nesting for XPath queries
+// #define PUGIXML_XPATH_DEPTH_LIMIT 1024
+
+// Uncomment this to switch to header-only version
+// #define PUGIXML_HEADER_ONLY
+
+// Uncomment this to enable long long support
+// #define PUGIXML_HAS_LONG_LONG
+
+#endif
+
+/**
+ * Copyright (c) 2006-2023 Arseny Kapoulkine
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
diff --git a/include/pugi/pugixml.hpp b/include/pugi/pugixml.hpp
index 59c0c58641e..d17a7e6930e 100644
--- a/include/pugi/pugixml.hpp
+++ b/include/pugi/pugixml.hpp
@@ -1,1506 +1,1516 @@
-/**
- * pugixml parser - version 1.13
- * --------------------------------------------------------
- * Copyright (C) 2006-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
- * Report bugs and download new versions at https://pugixml.org/
- *
- * This library is distributed under the MIT License. See notice at the end
- * of this file.
- *
- * This work is based on the pugxml parser, which is:
- * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
- */
-
-// Define version macro; evaluates to major * 1000 + minor * 10 + patch so that it's safe to use in less-than comparisons
-// Note: pugixml used major * 100 + minor * 10 + patch format up until 1.9 (which had version identifier 190); starting from pugixml 1.10, the minor version number is two digits
-#ifndef PUGIXML_VERSION
-#	define PUGIXML_VERSION 1130 // 1.13
-#endif
-
-// Include user configuration file (this can define various configuration macros)
-#include "pugiconfig.hpp"
-
-#ifndef HEADER_PUGIXML_HPP
-#define HEADER_PUGIXML_HPP
-
-// Include stddef.h for size_t and ptrdiff_t
-#include <stddef.h>
-
-// Include exception header for XPath
-#if !defined(PUGIXML_NO_XPATH) && !defined(PUGIXML_NO_EXCEPTIONS)
-#	include <exception>
-#endif
-
-// Include STL headers
-#ifndef PUGIXML_NO_STL
-#	include <iterator>
-#	include <iosfwd>
-#	include <string>
-#endif
-
-// Macro for deprecated features
-#ifndef PUGIXML_DEPRECATED
-#	if defined(__GNUC__)
-#		define PUGIXML_DEPRECATED __attribute__((deprecated))
-#	elif defined(_MSC_VER) && _MSC_VER >= 1300
-#		define PUGIXML_DEPRECATED __declspec(deprecated)
-#	else
-#		define PUGIXML_DEPRECATED
-#	endif
-#endif
-
-// If no API is defined, assume default
-#ifndef PUGIXML_API
-#	define PUGIXML_API
-#endif
-
-// If no API for classes is defined, assume default
-#ifndef PUGIXML_CLASS
-#	define PUGIXML_CLASS PUGIXML_API
-#endif
-
-// If no API for functions is defined, assume default
-#ifndef PUGIXML_FUNCTION
-#	define PUGIXML_FUNCTION PUGIXML_API
-#endif
-
-// If the platform is known to have long long support, enable long long functions
-#ifndef PUGIXML_HAS_LONG_LONG
-#	if __cplusplus >= 201103
-#		define PUGIXML_HAS_LONG_LONG
-#	elif defined(_MSC_VER) && _MSC_VER >= 1400
-#		define PUGIXML_HAS_LONG_LONG
-#	endif
-#endif
-
-// If the platform is known to have move semantics support, compile move ctor/operator implementation
-#ifndef PUGIXML_HAS_MOVE
-#	if __cplusplus >= 201103
-#		define PUGIXML_HAS_MOVE
-#	elif defined(_MSC_VER) && _MSC_VER >= 1600
-#		define PUGIXML_HAS_MOVE
-#	endif
-#endif
-
-// If C++ is 2011 or higher, add 'noexcept' specifiers
-#ifndef PUGIXML_NOEXCEPT
-#	if __cplusplus >= 201103
-#		define PUGIXML_NOEXCEPT noexcept
-#	elif defined(_MSC_VER) && _MSC_VER >= 1900
-#		define PUGIXML_NOEXCEPT noexcept
-#	else
-#		define PUGIXML_NOEXCEPT
-#	endif
-#endif
-
-// Some functions can not be noexcept in compact mode
-#ifdef PUGIXML_COMPACT
-#	define PUGIXML_NOEXCEPT_IF_NOT_COMPACT
-#else
-#	define PUGIXML_NOEXCEPT_IF_NOT_COMPACT PUGIXML_NOEXCEPT
-#endif
-
-// If C++ is 2011 or higher, add 'override' qualifiers
-#ifndef PUGIXML_OVERRIDE
-#	if __cplusplus >= 201103
-#		define PUGIXML_OVERRIDE override
-#	elif defined(_MSC_VER) && _MSC_VER >= 1700
-#		define PUGIXML_OVERRIDE override
-#	else
-#		define PUGIXML_OVERRIDE
-#	endif
-#endif
-
-// If C++ is 2011 or higher, use 'nullptr'
-#ifndef PUGIXML_NULL
-#	if __cplusplus >= 201103
-#		define PUGIXML_NULL nullptr
-#	elif defined(_MSC_VER) && _MSC_VER >= 1600
-#		define PUGIXML_NULL nullptr
-#	else
-#		define PUGIXML_NULL 0
-#	endif
-#endif
-
-// Character interface macros
-#ifdef PUGIXML_WCHAR_MODE
-#	define PUGIXML_TEXT(t) L ## t
-#	define PUGIXML_CHAR wchar_t
-#else
-#	define PUGIXML_TEXT(t) t
-#	define PUGIXML_CHAR char
-#endif
-
-namespace pugi
-{
-	// Character type used for all internal storage and operations; depends on PUGIXML_WCHAR_MODE
-	typedef PUGIXML_CHAR char_t;
-
-#ifndef PUGIXML_NO_STL
-	// String type used for operations that work with STL string; depends on PUGIXML_WCHAR_MODE
-	typedef std::basic_string<PUGIXML_CHAR, std::char_traits<PUGIXML_CHAR>, std::allocator<PUGIXML_CHAR> > string_t;
-#endif
-}
-
-// The PugiXML namespace
-namespace pugi
-{
-	// Tree node types
-	enum xml_node_type
-	{
-		node_null,			// Empty (null) node handle
-		node_document,		// A document tree's absolute root
-		node_element,		// Element tag, i.e. '<node/>'
-		node_pcdata,		// Plain character data, i.e. 'text'
-		node_cdata,			// Character data, i.e. '<![CDATA[text]]>'
-		node_comment,		// Comment tag, i.e. '<!-- text -->'
-		node_pi,			// Processing instruction, i.e. '<?name?>'
-		node_declaration,	// Document declaration, i.e. '<?xml version="1.0"?>'
-		node_doctype		// Document type declaration, i.e. '<!DOCTYPE doc>'
-	};
-
-	// Parsing options
-
-	// Minimal parsing mode (equivalent to turning all other flags off).
-	// Only elements and PCDATA sections are added to the DOM tree, no text conversions are performed.
-	const unsigned int parse_minimal = 0x0000;
-
-	// This flag determines if processing instructions (node_pi) are added to the DOM tree. This flag is off by default.
-	const unsigned int parse_pi = 0x0001;
-
-	// This flag determines if comments (node_comment) are added to the DOM tree. This flag is off by default.
-	const unsigned int parse_comments = 0x0002;
-
-	// This flag determines if CDATA sections (node_cdata) are added to the DOM tree. This flag is on by default.
-	const unsigned int parse_cdata = 0x0004;
-
-	// This flag determines if plain character data (node_pcdata) that consist only of whitespace are added to the DOM tree.
-	// This flag is off by default; turning it on usually results in slower parsing and more memory consumption.
-	const unsigned int parse_ws_pcdata = 0x0008;
-
-	// This flag determines if character and entity references are expanded during parsing. This flag is on by default.
-	const unsigned int parse_escapes = 0x0010;
-
-	// This flag determines if EOL characters are normalized (converted to #xA) during parsing. This flag is on by default.
-	const unsigned int parse_eol = 0x0020;
-
-	// This flag determines if attribute values are normalized using CDATA normalization rules during parsing. This flag is on by default.
-	const unsigned int parse_wconv_attribute = 0x0040;
-
-	// This flag determines if attribute values are normalized using NMTOKENS normalization rules during parsing. This flag is off by default.
-	const unsigned int parse_wnorm_attribute = 0x0080;
-
-	// This flag determines if document declaration (node_declaration) is added to the DOM tree. This flag is off by default.
-	const unsigned int parse_declaration = 0x0100;
-
-	// This flag determines if document type declaration (node_doctype) is added to the DOM tree. This flag is off by default.
-	const unsigned int parse_doctype = 0x0200;
-
-	// This flag determines if plain character data (node_pcdata) that is the only child of the parent node and that consists only
-	// of whitespace is added to the DOM tree.
-	// This flag is off by default; turning it on may result in slower parsing and more memory consumption.
-	const unsigned int parse_ws_pcdata_single = 0x0400;
-
-	// This flag determines if leading and trailing whitespace is to be removed from plain character data. This flag is off by default.
-	const unsigned int parse_trim_pcdata = 0x0800;
-
-	// This flag determines if plain character data that does not have a parent node is added to the DOM tree, and if an empty document
-	// is a valid document. This flag is off by default.
-	const unsigned int parse_fragment = 0x1000;
-
-	// This flag determines if plain character data is be stored in the parent element's value. This significantly changes the structure of
-	// the document; this flag is only recommended for parsing documents with many PCDATA nodes in memory-constrained environments.
-	// This flag is off by default.
-	const unsigned int parse_embed_pcdata = 0x2000;
-
-	// The default parsing mode.
-	// Elements, PCDATA and CDATA sections are added to the DOM tree, character/reference entities are expanded,
-	// End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules.
-	const unsigned int parse_default = parse_cdata | parse_escapes | parse_wconv_attribute | parse_eol;
-
-	// The full parsing mode.
-	// Nodes of all types are added to the DOM tree, character/reference entities are expanded,
-	// End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules.
-	const unsigned int parse_full = parse_default | parse_pi | parse_comments | parse_declaration | parse_doctype;
-
-	// These flags determine the encoding of input data for XML document
-	enum xml_encoding
-	{
-		encoding_auto,		// Auto-detect input encoding using BOM or < / <? detection; use UTF8 if BOM is not found
-		encoding_utf8,		// UTF8 encoding
-		encoding_utf16_le,	// Little-endian UTF16
-		encoding_utf16_be,	// Big-endian UTF16
-		encoding_utf16,		// UTF16 with native endianness
-		encoding_utf32_le,	// Little-endian UTF32
-		encoding_utf32_be,	// Big-endian UTF32
-		encoding_utf32,		// UTF32 with native endianness
-		encoding_wchar,		// The same encoding wchar_t has (either UTF16 or UTF32)
-		encoding_latin1
-	};
-
-	// Formatting flags
-
-	// Indent the nodes that are written to output stream with as many indentation strings as deep the node is in DOM tree. This flag is on by default.
-	const unsigned int format_indent = 0x01;
-
-	// Write encoding-specific BOM to the output stream. This flag is off by default.
-	const unsigned int format_write_bom = 0x02;
-
-	// Use raw output mode (no indentation and no line breaks are written). This flag is off by default.
-	const unsigned int format_raw = 0x04;
-
-	// Omit default XML declaration even if there is no declaration in the document. This flag is off by default.
-	const unsigned int format_no_declaration = 0x08;
-
-	// Don't escape attribute values and PCDATA contents. This flag is off by default.
-	const unsigned int format_no_escapes = 0x10;
-
-	// Open file using text mode in xml_document::save_file. This enables special character (i.e. new-line) conversions on some systems. This flag is off by default.
-	const unsigned int format_save_file_text = 0x20;
-
-	// Write every attribute on a new line with appropriate indentation. This flag is off by default.
-	const unsigned int format_indent_attributes = 0x40;
-
-	// Don't output empty element tags, instead writing an explicit start and end tag even if there are no children. This flag is off by default.
-	const unsigned int format_no_empty_element_tags = 0x80;
-
-	// Skip characters belonging to range [0; 32) instead of "&#xNN;" encoding. This flag is off by default.
-	const unsigned int format_skip_control_chars = 0x100;
-
-	// Use single quotes ' instead of double quotes " for enclosing attribute values. This flag is off by default.
-	const unsigned int format_attribute_single_quote = 0x200;
-
-	// The default set of formatting flags.
-	// Nodes are indented depending on their depth in DOM tree, a default declaration is output if document has none.
-	const unsigned int format_default = format_indent;
-
-	const int default_double_precision = 17;
-	const int default_float_precision = 9;
-
-	// Forward declarations
-	struct xml_attribute_struct;
-	struct xml_node_struct;
-
-	class xml_node_iterator;
-	class xml_attribute_iterator;
-	class xml_named_node_iterator;
-
-	class xml_tree_walker;
-
-	struct xml_parse_result;
-
-	class xml_node;
-
-	class xml_text;
-
-	#ifndef PUGIXML_NO_XPATH
-	class xpath_node;
-	class xpath_node_set;
-	class xpath_query;
-	class xpath_variable_set;
-	#endif
-
-	// Range-based for loop support
-	template <typename It> class xml_object_range
-	{
-	public:
-		typedef It const_iterator;
-		typedef It iterator;
-
-		xml_object_range(It b, It e): _begin(b), _end(e)
-		{
-		}
-
-		It begin() const { return _begin; }
-		It end() const { return _end; }
-
-		bool empty() const { return _begin == _end; }
-
-	private:
-		It _begin, _end;
-	};
-
-	// Writer interface for node printing (see xml_node::print)
-	class PUGIXML_CLASS xml_writer
-	{
-	public:
-		virtual ~xml_writer() {}
-
-		// Write memory chunk into stream/file/whatever
-		virtual void write(const void* data, size_t size) = 0;
-	};
-
-	// xml_writer implementation for FILE*
-	class PUGIXML_CLASS xml_writer_file: public xml_writer
-	{
-	public:
-		// Construct writer from a FILE* object; void* is used to avoid header dependencies on stdio
-		xml_writer_file(void* file);
-
-		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
-
-	private:
-		void* file;
-	};
-
-	#ifndef PUGIXML_NO_STL
-	// xml_writer implementation for streams
-	class PUGIXML_CLASS xml_writer_stream: public xml_writer
-	{
-	public:
-		// Construct writer from an output stream object
-		xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream);
-		xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream);
-
-		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
-
-	private:
-		std::basic_ostream<char, std::char_traits<char> >* narrow_stream;
-		std::basic_ostream<wchar_t, std::char_traits<wchar_t> >* wide_stream;
-	};
-	#endif
-
-	// A light-weight handle for manipulating attributes in DOM tree
-	class PUGIXML_CLASS xml_attribute
-	{
-		friend class xml_attribute_iterator;
-		friend class xml_node;
-
-	private:
-		xml_attribute_struct* _attr;
-
-		typedef void (*unspecified_bool_type)(xml_attribute***);
-
-	public:
-		// Default constructor. Constructs an empty attribute.
-		xml_attribute();
-
-		// Constructs attribute from internal pointer
-		explicit xml_attribute(xml_attribute_struct* attr);
-
-		// Safe bool conversion operator
-		operator unspecified_bool_type() const;
-
-		// Borland C++ workaround
-		bool operator!() const;
-
-		// Comparison operators (compares wrapped attribute pointers)
-		bool operator==(const xml_attribute& r) const;
-		bool operator!=(const xml_attribute& r) const;
-		bool operator<(const xml_attribute& r) const;
-		bool operator>(const xml_attribute& r) const;
-		bool operator<=(const xml_attribute& r) const;
-		bool operator>=(const xml_attribute& r) const;
-
-		// Check if attribute is empty
-		bool empty() const;
-
-		// Get attribute name/value, or "" if attribute is empty
-		const char_t* name() const;
-		const char_t* value() const;
-
-		// Get attribute value, or the default value if attribute is empty
-		const char_t* as_string(const char_t* def = PUGIXML_TEXT("")) const;
-
-		// Get attribute value as a number, or the default value if conversion did not succeed or attribute is empty
-		int as_int(int def = 0) const;
-		unsigned int as_uint(unsigned int def = 0) const;
-		double as_double(double def = 0) const;
-		float as_float(float def = 0) const;
-
-	#ifdef PUGIXML_HAS_LONG_LONG
-		long long as_llong(long long def = 0) const;
-		unsigned long long as_ullong(unsigned long long def = 0) const;
-	#endif
-
-		// Get attribute value as bool (returns true if first character is in '1tTyY' set), or the default value if attribute is empty
-		bool as_bool(bool def = false) const;
-
-		// Set attribute name/value (returns false if attribute is empty or there is not enough memory)
-		bool set_name(const char_t* rhs);
-		bool set_value(const char_t* rhs, size_t sz);
-		bool set_value(const char_t* rhs);
-
-		// Set attribute value with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
-		bool set_value(int rhs);
-		bool set_value(unsigned int rhs);
-		bool set_value(long rhs);
-		bool set_value(unsigned long rhs);
-		bool set_value(double rhs);
-		bool set_value(double rhs, int precision);
-		bool set_value(float rhs);
-		bool set_value(float rhs, int precision);
-		bool set_value(bool rhs);
-
-	#ifdef PUGIXML_HAS_LONG_LONG
-		bool set_value(long long rhs);
-		bool set_value(unsigned long long rhs);
-	#endif
-
-		// Set attribute value (equivalent to set_value without error checking)
-		xml_attribute& operator=(const char_t* rhs);
-		xml_attribute& operator=(int rhs);
-		xml_attribute& operator=(unsigned int rhs);
-		xml_attribute& operator=(long rhs);
-		xml_attribute& operator=(unsigned long rhs);
-		xml_attribute& operator=(double rhs);
-		xml_attribute& operator=(float rhs);
-		xml_attribute& operator=(bool rhs);
-
-	#ifdef PUGIXML_HAS_LONG_LONG
-		xml_attribute& operator=(long long rhs);
-		xml_attribute& operator=(unsigned long long rhs);
-	#endif
-
-		// Get next/previous attribute in the attribute list of the parent node
-		xml_attribute next_attribute() const;
-		xml_attribute previous_attribute() const;
-
-		// Get hash value (unique for handles to the same object)
-		size_t hash_value() const;
-
-		// Get internal pointer
-		xml_attribute_struct* internal_object() const;
-	};
-
-#ifdef __BORLANDC__
-	// Borland C++ workaround
-	bool PUGIXML_FUNCTION operator&&(const xml_attribute& lhs, bool rhs);
-	bool PUGIXML_FUNCTION operator||(const xml_attribute& lhs, bool rhs);
-#endif
-
-	// A light-weight handle for manipulating nodes in DOM tree
-	class PUGIXML_CLASS xml_node
-	{
-		friend class xml_attribute_iterator;
-		friend class xml_node_iterator;
-		friend class xml_named_node_iterator;
-
-	protected:
-		xml_node_struct* _root;
-
-		typedef void (*unspecified_bool_type)(xml_node***);
-
-	public:
-		// Default constructor. Constructs an empty node.
-		xml_node();
-
-		// Constructs node from internal pointer
-		explicit xml_node(xml_node_struct* p);
-
-		// Safe bool conversion operator
-		operator unspecified_bool_type() const;
-
-		// Borland C++ workaround
-		bool operator!() const;
-
-		// Comparison operators (compares wrapped node pointers)
-		bool operator==(const xml_node& r) const;
-		bool operator!=(const xml_node& r) const;
-		bool operator<(const xml_node& r) const;
-		bool operator>(const xml_node& r) const;
-		bool operator<=(const xml_node& r) const;
-		bool operator>=(const xml_node& r) const;
-
-		// Check if node is empty.
-		bool empty() const;
-
-		// Get node type
-		xml_node_type type() const;
-
-		// Get node name, or "" if node is empty or it has no name
-		const char_t* name() const;
-
-		// Get node value, or "" if node is empty or it has no value
-		// Note: For <node>text</node> node.value() does not return "text"! Use child_value() or text() methods to access text inside nodes.
-		const char_t* value() const;
-
-		// Get attribute list
-		xml_attribute first_attribute() const;
-		xml_attribute last_attribute() const;
-
-		// Get children list
-		xml_node first_child() const;
-		xml_node last_child() const;
-
-		// Get next/previous sibling in the children list of the parent node
-		xml_node next_sibling() const;
-		xml_node previous_sibling() const;
-
-		// Get parent node
-		xml_node parent() const;
-
-		// Get root of DOM tree this node belongs to
-		xml_node root() const;
-
-		// Get text object for the current node
-		xml_text text() const;
-
-		// Get child, attribute or next/previous sibling with the specified name
-		xml_node child(const char_t* name) const;
-		xml_attribute attribute(const char_t* name) const;
-		xml_node next_sibling(const char_t* name) const;
-		xml_node previous_sibling(const char_t* name) const;
-
-		// Get attribute, starting the search from a hint (and updating hint so that searching for a sequence of attributes is fast)
-		xml_attribute attribute(const char_t* name, xml_attribute& hint) const;
-
-		// Get child value of current node; that is, value of the first child node of type PCDATA/CDATA
-		const char_t* child_value() const;
-
-		// Get child value of child with specified name. Equivalent to child(name).child_value().
-		const char_t* child_value(const char_t* name) const;
-
-		// Set node name/value (returns false if node is empty, there is not enough memory, or node can not have name/value)
-		bool set_name(const char_t* rhs);
-		bool set_value(const char_t* rhs, size_t sz);
-		bool set_value(const char_t* rhs);
-
-		// Add attribute with specified name. Returns added attribute, or empty attribute on errors.
-		xml_attribute append_attribute(const char_t* name);
-		xml_attribute prepend_attribute(const char_t* name);
-		xml_attribute insert_attribute_after(const char_t* name, const xml_attribute& attr);
-		xml_attribute insert_attribute_before(const char_t* name, const xml_attribute& attr);
-
-		// Add a copy of the specified attribute. Returns added attribute, or empty attribute on errors.
-		xml_attribute append_copy(const xml_attribute& proto);
-		xml_attribute prepend_copy(const xml_attribute& proto);
-		xml_attribute insert_copy_after(const xml_attribute& proto, const xml_attribute& attr);
-		xml_attribute insert_copy_before(const xml_attribute& proto, const xml_attribute& attr);
-
-		// Add child node with specified type. Returns added node, or empty node on errors.
-		xml_node append_child(xml_node_type type = node_element);
-		xml_node prepend_child(xml_node_type type = node_element);
-		xml_node insert_child_after(xml_node_type type, const xml_node& node);
-		xml_node insert_child_before(xml_node_type type, const xml_node& node);
-
-		// Add child element with specified name. Returns added node, or empty node on errors.
-		xml_node append_child(const char_t* name);
-		xml_node prepend_child(const char_t* name);
-		xml_node insert_child_after(const char_t* name, const xml_node& node);
-		xml_node insert_child_before(const char_t* name, const xml_node& node);
-
-		// Add a copy of the specified node as a child. Returns added node, or empty node on errors.
-		xml_node append_copy(const xml_node& proto);
-		xml_node prepend_copy(const xml_node& proto);
-		xml_node insert_copy_after(const xml_node& proto, const xml_node& node);
-		xml_node insert_copy_before(const xml_node& proto, const xml_node& node);
-
-		// Move the specified node to become a child of this node. Returns moved node, or empty node on errors.
-		xml_node append_move(const xml_node& moved);
-		xml_node prepend_move(const xml_node& moved);
-		xml_node insert_move_after(const xml_node& moved, const xml_node& node);
-		xml_node insert_move_before(const xml_node& moved, const xml_node& node);
-
-		// Remove specified attribute
-		bool remove_attribute(const xml_attribute& a);
-		bool remove_attribute(const char_t* name);
-
-		// Remove all attributes
-		bool remove_attributes();
-
-		// Remove specified child
-		bool remove_child(const xml_node& n);
-		bool remove_child(const char_t* name);
-
-		// Remove all children
-		bool remove_children();
-
-		// Parses buffer as an XML document fragment and appends all nodes as children of the current node.
-		// Copies/converts the buffer, so it may be deleted or changed after the function returns.
-		// Note: append_buffer allocates memory that has the lifetime of the owning document; removing the appended nodes does not immediately reclaim that memory.
-		xml_parse_result append_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-
-		// Find attribute using predicate. Returns first attribute for which predicate returned true.
-		template <typename Predicate> xml_attribute find_attribute(Predicate pred) const
-		{
-			if (!_root) return xml_attribute();
-
-			for (xml_attribute attrib = first_attribute(); attrib; attrib = attrib.next_attribute())
-				if (pred(attrib))
-					return attrib;
-
-			return xml_attribute();
-		}
-
-		// Find child node using predicate. Returns first child for which predicate returned true.
-		template <typename Predicate> xml_node find_child(Predicate pred) const
-		{
-			if (!_root) return xml_node();
-
-			for (xml_node node = first_child(); node; node = node.next_sibling())
-				if (pred(node))
-					return node;
-
-			return xml_node();
-		}
-
-		// Find node from subtree using predicate. Returns first node from subtree (depth-first), for which predicate returned true.
-		template <typename Predicate> xml_node find_node(Predicate pred) const
-		{
-			if (!_root) return xml_node();
-
-			xml_node cur = first_child();
-
-			while (cur._root && cur._root != _root)
-			{
-				if (pred(cur)) return cur;
-
-				if (cur.first_child()) cur = cur.first_child();
-				else if (cur.next_sibling()) cur = cur.next_sibling();
-				else
-				{
-					while (!cur.next_sibling() && cur._root != _root) cur = cur.parent();
-
-					if (cur._root != _root) cur = cur.next_sibling();
-				}
-			}
-
-			return xml_node();
-		}
-
-		// Find child node by attribute name/value
-		xml_node find_child_by_attribute(const char_t* name, const char_t* attr_name, const char_t* attr_value) const;
-		xml_node find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const;
-
-	#ifndef PUGIXML_NO_STL
-		// Get the absolute node path from root as a text string.
-		string_t path(char_t delimiter = '/') const;
-	#endif
-
-		// Search for a node by path consisting of node names and . or .. elements.
-		xml_node first_element_by_path(const char_t* path, char_t delimiter = '/') const;
-
-		// Recursively traverse subtree with xml_tree_walker
-		bool traverse(xml_tree_walker& walker);
-
-	#ifndef PUGIXML_NO_XPATH
-		// Select single node by evaluating XPath query. Returns first node from the resulting node set.
-		xpath_node select_node(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
-		xpath_node select_node(const xpath_query& query) const;
-
-		// Select node set by evaluating XPath query
-		xpath_node_set select_nodes(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
-		xpath_node_set select_nodes(const xpath_query& query) const;
-
-		// (deprecated: use select_node instead) Select single node by evaluating XPath query.
-		PUGIXML_DEPRECATED xpath_node select_single_node(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
-		PUGIXML_DEPRECATED xpath_node select_single_node(const xpath_query& query) const;
-
-	#endif
-
-		// Print subtree using a writer object
-		void print(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
-
-	#ifndef PUGIXML_NO_STL
-		// Print subtree to stream
-		void print(std::basic_ostream<char, std::char_traits<char> >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
-		void print(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, unsigned int depth = 0) const;
-	#endif
-
-		// Child nodes iterators
-		typedef xml_node_iterator iterator;
-
-		iterator begin() const;
-		iterator end() const;
-
-		// Attribute iterators
-		typedef xml_attribute_iterator attribute_iterator;
-
-		attribute_iterator attributes_begin() const;
-		attribute_iterator attributes_end() const;
-
-		// Range-based for support
-		xml_object_range<xml_node_iterator> children() const;
-		xml_object_range<xml_named_node_iterator> children(const char_t* name) const;
-		xml_object_range<xml_attribute_iterator> attributes() const;
-
-		// Get node offset in parsed file/string (in char_t units) for debugging purposes
-		ptrdiff_t offset_debug() const;
-
-		// Get hash value (unique for handles to the same object)
-		size_t hash_value() const;
-
-		// Get internal pointer
-		xml_node_struct* internal_object() const;
-	};
-
-#ifdef __BORLANDC__
-	// Borland C++ workaround
-	bool PUGIXML_FUNCTION operator&&(const xml_node& lhs, bool rhs);
-	bool PUGIXML_FUNCTION operator||(const xml_node& lhs, bool rhs);
-#endif
-
-	// A helper for working with text inside PCDATA nodes
-	class PUGIXML_CLASS xml_text
-	{
-		friend class xml_node;
-
-		xml_node_struct* _root;
-
-		typedef void (*unspecified_bool_type)(xml_text***);
-
-		explicit xml_text(xml_node_struct* root);
-
-		xml_node_struct* _data_new();
-		xml_node_struct* _data() const;
-
-	public:
-		// Default constructor. Constructs an empty object.
-		xml_text();
-
-		// Safe bool conversion operator
-		operator unspecified_bool_type() const;
-
-		// Borland C++ workaround
-		bool operator!() const;
-
-		// Check if text object is empty
-		bool empty() const;
-
-		// Get text, or "" if object is empty
-		const char_t* get() const;
-
-		// Get text, or the default value if object is empty
-		const char_t* as_string(const char_t* def = PUGIXML_TEXT("")) const;
-
-		// Get text as a number, or the default value if conversion did not succeed or object is empty
-		int as_int(int def = 0) const;
-		unsigned int as_uint(unsigned int def = 0) const;
-		double as_double(double def = 0) const;
-		float as_float(float def = 0) const;
-
-	#ifdef PUGIXML_HAS_LONG_LONG
-		long long as_llong(long long def = 0) const;
-		unsigned long long as_ullong(unsigned long long def = 0) const;
-	#endif
-
-		// Get text as bool (returns true if first character is in '1tTyY' set), or the default value if object is empty
-		bool as_bool(bool def = false) const;
-
-		// Set text (returns false if object is empty or there is not enough memory)
-		bool set(const char_t* rhs, size_t sz);
-		bool set(const char_t* rhs);
-
-		// Set text with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
-		bool set(int rhs);
-		bool set(unsigned int rhs);
-		bool set(long rhs);
-		bool set(unsigned long rhs);
-		bool set(double rhs);
-		bool set(double rhs, int precision);
-		bool set(float rhs);
-		bool set(float rhs, int precision);
-		bool set(bool rhs);
-
-	#ifdef PUGIXML_HAS_LONG_LONG
-		bool set(long long rhs);
-		bool set(unsigned long long rhs);
-	#endif
-
-		// Set text (equivalent to set without error checking)
-		xml_text& operator=(const char_t* rhs);
-		xml_text& operator=(int rhs);
-		xml_text& operator=(unsigned int rhs);
-		xml_text& operator=(long rhs);
-		xml_text& operator=(unsigned long rhs);
-		xml_text& operator=(double rhs);
-		xml_text& operator=(float rhs);
-		xml_text& operator=(bool rhs);
-
-	#ifdef PUGIXML_HAS_LONG_LONG
-		xml_text& operator=(long long rhs);
-		xml_text& operator=(unsigned long long rhs);
-	#endif
-
-		// Get the data node (node_pcdata or node_cdata) for this object
-		xml_node data() const;
-	};
-
-#ifdef __BORLANDC__
-	// Borland C++ workaround
-	bool PUGIXML_FUNCTION operator&&(const xml_text& lhs, bool rhs);
-	bool PUGIXML_FUNCTION operator||(const xml_text& lhs, bool rhs);
-#endif
-
-	// Child node iterator (a bidirectional iterator over a collection of xml_node)
-	class PUGIXML_CLASS xml_node_iterator
-	{
-		friend class xml_node;
-
-	private:
-		mutable xml_node _wrap;
-		xml_node _parent;
-
-		xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent);
-
-	public:
-		// Iterator traits
-		typedef ptrdiff_t difference_type;
-		typedef xml_node value_type;
-		typedef xml_node* pointer;
-		typedef xml_node& reference;
-
-	#ifndef PUGIXML_NO_STL
-		typedef std::bidirectional_iterator_tag iterator_category;
-	#endif
-
-		// Default constructor
-		xml_node_iterator();
-
-		// Construct an iterator which points to the specified node
-		xml_node_iterator(const xml_node& node);
-
-		// Iterator operators
-		bool operator==(const xml_node_iterator& rhs) const;
-		bool operator!=(const xml_node_iterator& rhs) const;
-
-		xml_node& operator*() const;
-		xml_node* operator->() const;
-
-		xml_node_iterator& operator++();
-		xml_node_iterator operator++(int);
-
-		xml_node_iterator& operator--();
-		xml_node_iterator operator--(int);
-	};
-
-	// Attribute iterator (a bidirectional iterator over a collection of xml_attribute)
-	class PUGIXML_CLASS xml_attribute_iterator
-	{
-		friend class xml_node;
-
-	private:
-		mutable xml_attribute _wrap;
-		xml_node _parent;
-
-		xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent);
-
-	public:
-		// Iterator traits
-		typedef ptrdiff_t difference_type;
-		typedef xml_attribute value_type;
-		typedef xml_attribute* pointer;
-		typedef xml_attribute& reference;
-
-	#ifndef PUGIXML_NO_STL
-		typedef std::bidirectional_iterator_tag iterator_category;
-	#endif
-
-		// Default constructor
-		xml_attribute_iterator();
-
-		// Construct an iterator which points to the specified attribute
-		xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent);
-
-		// Iterator operators
-		bool operator==(const xml_attribute_iterator& rhs) const;
-		bool operator!=(const xml_attribute_iterator& rhs) const;
-
-		xml_attribute& operator*() const;
-		xml_attribute* operator->() const;
-
-		xml_attribute_iterator& operator++();
-		xml_attribute_iterator operator++(int);
-
-		xml_attribute_iterator& operator--();
-		xml_attribute_iterator operator--(int);
-	};
-
-	// Named node range helper
-	class PUGIXML_CLASS xml_named_node_iterator
-	{
-		friend class xml_node;
-
-	public:
-		// Iterator traits
-		typedef ptrdiff_t difference_type;
-		typedef xml_node value_type;
-		typedef xml_node* pointer;
-		typedef xml_node& reference;
-
-	#ifndef PUGIXML_NO_STL
-		typedef std::bidirectional_iterator_tag iterator_category;
-	#endif
-
-		// Default constructor
-		xml_named_node_iterator();
-
-		// Construct an iterator which points to the specified node
-		xml_named_node_iterator(const xml_node& node, const char_t* name);
-
-		// Iterator operators
-		bool operator==(const xml_named_node_iterator& rhs) const;
-		bool operator!=(const xml_named_node_iterator& rhs) const;
-
-		xml_node& operator*() const;
-		xml_node* operator->() const;
-
-		xml_named_node_iterator& operator++();
-		xml_named_node_iterator operator++(int);
-
-		xml_named_node_iterator& operator--();
-		xml_named_node_iterator operator--(int);
-
-	private:
-		mutable xml_node _wrap;
-		xml_node _parent;
-		const char_t* _name;
-
-		xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name);
-	};
-
-	// Abstract tree walker class (see xml_node::traverse)
-	class PUGIXML_CLASS xml_tree_walker
-	{
-		friend class xml_node;
-
-	private:
-		int _depth;
-
-	protected:
-		// Get current traversal depth
-		int depth() const;
-
-	public:
-		xml_tree_walker();
-		virtual ~xml_tree_walker();
-
-		// Callback that is called when traversal begins
-		virtual bool begin(xml_node& node);
-
-		// Callback that is called for each node traversed
-		virtual bool for_each(xml_node& node) = 0;
-
-		// Callback that is called when traversal ends
-		virtual bool end(xml_node& node);
-	};
-
-	// Parsing status, returned as part of xml_parse_result object
-	enum xml_parse_status
-	{
-		status_ok = 0,				// No error
-
-		status_file_not_found,		// File was not found during load_file()
-		status_io_error,			// Error reading from file/stream
-		status_out_of_memory,		// Could not allocate memory
-		status_internal_error,		// Internal error occurred
-
-		status_unrecognized_tag,	// Parser could not determine tag type
-
-		status_bad_pi,				// Parsing error occurred while parsing document declaration/processing instruction
-		status_bad_comment,			// Parsing error occurred while parsing comment
-		status_bad_cdata,			// Parsing error occurred while parsing CDATA section
-		status_bad_doctype,			// Parsing error occurred while parsing document type declaration
-		status_bad_pcdata,			// Parsing error occurred while parsing PCDATA section
-		status_bad_start_element,	// Parsing error occurred while parsing start element tag
-		status_bad_attribute,		// Parsing error occurred while parsing element attribute
-		status_bad_end_element,		// Parsing error occurred while parsing end element tag
-		status_end_element_mismatch,// There was a mismatch of start-end tags (closing tag had incorrect name, some tag was not closed or there was an excessive closing tag)
-
-		status_append_invalid_root,	// Unable to append nodes since root type is not node_element or node_document (exclusive to xml_node::append_buffer)
-
-		status_no_document_element	// Parsing resulted in a document without element nodes
-	};
-
-	// Parsing result
-	struct PUGIXML_CLASS xml_parse_result
-	{
-		// Parsing status (see xml_parse_status)
-		xml_parse_status status;
-
-		// Last parsed offset (in char_t units from start of input data)
-		ptrdiff_t offset;
-
-		// Source document encoding
-		xml_encoding encoding;
-
-		// Default constructor, initializes object to failed state
-		xml_parse_result();
-
-		// Cast to bool operator
-		operator bool() const;
-
-		// Get error description
-		const char* description() const;
-	};
-
-	// Document class (DOM tree root)
-	class PUGIXML_CLASS xml_document: public xml_node
-	{
-	private:
-		char_t* _buffer;
-
-		char _memory[192];
-
-		// Non-copyable semantics
-		xml_document(const xml_document&);
-		xml_document& operator=(const xml_document&);
-
-		void _create();
-		void _destroy();
-		void _move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
-
-	public:
-		// Default constructor, makes empty document
-		xml_document();
-
-		// Destructor, invalidates all node/attribute handles to this document
-		~xml_document();
-
-	#ifdef PUGIXML_HAS_MOVE
-		// Move semantics support
-		xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
-		xml_document& operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
-	#endif
-
-		// Removes all nodes, leaving the empty document
-		void reset();
-
-		// Removes all nodes, then copies the entire contents of the specified document
-		void reset(const xml_document& proto);
-
-	#ifndef PUGIXML_NO_STL
-		// Load document from stream.
-		xml_parse_result load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-		xml_parse_result load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options = parse_default);
-	#endif
-
-		// (deprecated: use load_string instead) Load document from zero-terminated string. No encoding conversions are applied.
-		PUGIXML_DEPRECATED xml_parse_result load(const char_t* contents, unsigned int options = parse_default);
-
-		// Load document from zero-terminated string. No encoding conversions are applied.
-		xml_parse_result load_string(const char_t* contents, unsigned int options = parse_default);
-
-		// Load document from file
-		xml_parse_result load_file(const char* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-		xml_parse_result load_file(const wchar_t* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-
-		// Load document from buffer. Copies/converts the buffer, so it may be deleted or changed after the function returns.
-		xml_parse_result load_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-
-		// Load document from buffer, using the buffer for in-place parsing (the buffer is modified and used for storage of document data).
-		// You should ensure that buffer data will persist throughout the document's lifetime, and free the buffer memory manually once document is destroyed.
-		xml_parse_result load_buffer_inplace(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-
-		// Load document from buffer, using the buffer for in-place parsing (the buffer is modified and used for storage of document data).
-		// You should allocate the buffer with pugixml allocation function; document will free the buffer when it is no longer needed (you can't use it anymore).
-		xml_parse_result load_buffer_inplace_own(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-
-		// Save XML document to writer (semantics is slightly different from xml_node::print, see documentation for details).
-		void save(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
-
-	#ifndef PUGIXML_NO_STL
-		// Save XML document to stream (semantics is slightly different from xml_node::print, see documentation for details).
-		void save(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
-		void save(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default) const;
-	#endif
-
-		// Save XML to file
-		bool save_file(const char* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
-		bool save_file(const wchar_t* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
-
-		// Get document element
-		xml_node document_element() const;
-	};
-
-#ifndef PUGIXML_NO_XPATH
-	// XPath query return type
-	enum xpath_value_type
-	{
-		xpath_type_none,	  // Unknown type (query failed to compile)
-		xpath_type_node_set,  // Node set (xpath_node_set)
-		xpath_type_number,	  // Number
-		xpath_type_string,	  // String
-		xpath_type_boolean	  // Boolean
-	};
-
-	// XPath parsing result
-	struct PUGIXML_CLASS xpath_parse_result
-	{
-		// Error message (0 if no error)
-		const char* error;
-
-		// Last parsed offset (in char_t units from string start)
-		ptrdiff_t offset;
-
-		// Default constructor, initializes object to failed state
-		xpath_parse_result();
-
-		// Cast to bool operator
-		operator bool() const;
-
-		// Get error description
-		const char* description() const;
-	};
-
-	// A single XPath variable
-	class PUGIXML_CLASS xpath_variable
-	{
-		friend class xpath_variable_set;
-
-	protected:
-		xpath_value_type _type;
-		xpath_variable* _next;
-
-		xpath_variable(xpath_value_type type);
-
-		// Non-copyable semantics
-		xpath_variable(const xpath_variable&);
-		xpath_variable& operator=(const xpath_variable&);
-
-	public:
-		// Get variable name
-		const char_t* name() const;
-
-		// Get variable type
-		xpath_value_type type() const;
-
-		// Get variable value; no type conversion is performed, default value (false, NaN, empty string, empty node set) is returned on type mismatch error
-		bool get_boolean() const;
-		double get_number() const;
-		const char_t* get_string() const;
-		const xpath_node_set& get_node_set() const;
-
-		// Set variable value; no type conversion is performed, false is returned on type mismatch error
-		bool set(bool value);
-		bool set(double value);
-		bool set(const char_t* value);
-		bool set(const xpath_node_set& value);
-	};
-
-	// A set of XPath variables
-	class PUGIXML_CLASS xpath_variable_set
-	{
-	private:
-		xpath_variable* _data[64];
-
-		void _assign(const xpath_variable_set& rhs);
-		void _swap(xpath_variable_set& rhs);
-
-		xpath_variable* _find(const char_t* name) const;
-
-		static bool _clone(xpath_variable* var, xpath_variable** out_result);
-		static void _destroy(xpath_variable* var);
-
-	public:
-		// Default constructor/destructor
-		xpath_variable_set();
-		~xpath_variable_set();
-
-		// Copy constructor/assignment operator
-		xpath_variable_set(const xpath_variable_set& rhs);
-		xpath_variable_set& operator=(const xpath_variable_set& rhs);
-
-	#ifdef PUGIXML_HAS_MOVE
-		// Move semantics support
-		xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT;
-		xpath_variable_set& operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT;
-	#endif
-
-		// Add a new variable or get the existing one, if the types match
-		xpath_variable* add(const char_t* name, xpath_value_type type);
-
-		// Set value of an existing variable; no type conversion is performed, false is returned if there is no such variable or if types mismatch
-		bool set(const char_t* name, bool value);
-		bool set(const char_t* name, double value);
-		bool set(const char_t* name, const char_t* value);
-		bool set(const char_t* name, const xpath_node_set& value);
-
-		// Get existing variable by name
-		xpath_variable* get(const char_t* name);
-		const xpath_variable* get(const char_t* name) const;
-	};
-
-	// A compiled XPath query object
-	class PUGIXML_CLASS xpath_query
-	{
-	private:
-		void* _impl;
-		xpath_parse_result _result;
-
-		typedef void (*unspecified_bool_type)(xpath_query***);
-
-		// Non-copyable semantics
-		xpath_query(const xpath_query&);
-		xpath_query& operator=(const xpath_query&);
-
-	public:
-		// Construct a compiled object from XPath expression.
-		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on compilation errors.
-		explicit xpath_query(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL);
-
-		// Constructor
-		xpath_query();
-
-		// Destructor
-		~xpath_query();
-
-	#ifdef PUGIXML_HAS_MOVE
-		// Move semantics support
-		xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT;
-		xpath_query& operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT;
-	#endif
-
-		// Get query expression return type
-		xpath_value_type return_type() const;
-
-		// Evaluate expression as boolean value in the specified context; performs type conversion if necessary.
-		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
-		bool evaluate_boolean(const xpath_node& n) const;
-
-		// Evaluate expression as double value in the specified context; performs type conversion if necessary.
-		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
-		double evaluate_number(const xpath_node& n) const;
-
-	#ifndef PUGIXML_NO_STL
-		// Evaluate expression as string value in the specified context; performs type conversion if necessary.
-		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
-		string_t evaluate_string(const xpath_node& n) const;
-	#endif
-
-		// Evaluate expression as string value in the specified context; performs type conversion if necessary.
-		// At most capacity characters are written to the destination buffer, full result size is returned (includes terminating zero).
-		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
-		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty  set instead.
-		size_t evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const;
-
-		// Evaluate expression as node set in the specified context.
-		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on type mismatch and std::bad_alloc on out of memory errors.
-		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty node set instead.
-		xpath_node_set evaluate_node_set(const xpath_node& n) const;
-
-		// Evaluate expression as node set in the specified context.
-		// Return first node in document order, or empty node if node set is empty.
-		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on type mismatch and std::bad_alloc on out of memory errors.
-		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty node instead.
-		xpath_node evaluate_node(const xpath_node& n) const;
-
-		// Get parsing result (used to get compilation errors in PUGIXML_NO_EXCEPTIONS mode)
-		const xpath_parse_result& result() const;
-
-		// Safe bool conversion operator
-		operator unspecified_bool_type() const;
-
-		// Borland C++ workaround
-		bool operator!() const;
-	};
-
-	#ifndef PUGIXML_NO_EXCEPTIONS
-        #if defined(_MSC_VER)
-          // C4275 can be ignored in Visual C++ if you are deriving
-          // from a type in the Standard C++ Library
-          #pragma warning(push)
-          #pragma warning(disable: 4275)
-        #endif
-	// XPath exception class
-	class PUGIXML_CLASS xpath_exception: public std::exception
-	{
-	private:
-		xpath_parse_result _result;
-
-	public:
-		// Construct exception from parse result
-		explicit xpath_exception(const xpath_parse_result& result);
-
-		// Get error message
-		virtual const char* what() const throw() PUGIXML_OVERRIDE;
-
-		// Get parse result
-		const xpath_parse_result& result() const;
-	};
-        #if defined(_MSC_VER)
-          #pragma warning(pop)
-        #endif
-	#endif
-
-	// XPath node class (either xml_node or xml_attribute)
-	class PUGIXML_CLASS xpath_node
-	{
-	private:
-		xml_node _node;
-		xml_attribute _attribute;
-
-		typedef void (*unspecified_bool_type)(xpath_node***);
-
-	public:
-		// Default constructor; constructs empty XPath node
-		xpath_node();
-
-		// Construct XPath node from XML node/attribute
-		xpath_node(const xml_node& node);
-		xpath_node(const xml_attribute& attribute, const xml_node& parent);
-
-		// Get node/attribute, if any
-		xml_node node() const;
-		xml_attribute attribute() const;
-
-		// Get parent of contained node/attribute
-		xml_node parent() const;
-
-		// Safe bool conversion operator
-		operator unspecified_bool_type() const;
-
-		// Borland C++ workaround
-		bool operator!() const;
-
-		// Comparison operators
-		bool operator==(const xpath_node& n) const;
-		bool operator!=(const xpath_node& n) const;
-	};
-
-#ifdef __BORLANDC__
-	// Borland C++ workaround
-	bool PUGIXML_FUNCTION operator&&(const xpath_node& lhs, bool rhs);
-	bool PUGIXML_FUNCTION operator||(const xpath_node& lhs, bool rhs);
-#endif
-
-	// A fixed-size collection of XPath nodes
-	class PUGIXML_CLASS xpath_node_set
-	{
-	public:
-		// Collection type
-		enum type_t
-		{
-			type_unsorted,			// Not ordered
-			type_sorted,			// Sorted by document order (ascending)
-			type_sorted_reverse		// Sorted by document order (descending)
-		};
-
-		// Constant iterator type
-		typedef const xpath_node* const_iterator;
-
-		// We define non-constant iterator to be the same as constant iterator so that various generic algorithms (i.e. boost foreach) work
-		typedef const xpath_node* iterator;
-
-		// Default constructor. Constructs empty set.
-		xpath_node_set();
-
-		// Constructs a set from iterator range; data is not checked for duplicates and is not sorted according to provided type, so be careful
-		xpath_node_set(const_iterator begin, const_iterator end, type_t type = type_unsorted);
-
-		// Destructor
-		~xpath_node_set();
-
-		// Copy constructor/assignment operator
-		xpath_node_set(const xpath_node_set& ns);
-		xpath_node_set& operator=(const xpath_node_set& ns);
-
-	#ifdef PUGIXML_HAS_MOVE
-		// Move semantics support
-		xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT;
-		xpath_node_set& operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT;
-	#endif
-
-		// Get collection type
-		type_t type() const;
-
-		// Get collection size
-		size_t size() const;
-
-		// Indexing operator
-		const xpath_node& operator[](size_t index) const;
-
-		// Collection iterators
-		const_iterator begin() const;
-		const_iterator end() const;
-
-		// Sort the collection in ascending/descending order by document order
-		void sort(bool reverse = false);
-
-		// Get first node in the collection by document order
-		xpath_node first() const;
-
-		// Check if collection is empty
-		bool empty() const;
-
-	private:
-		type_t _type;
-
-		xpath_node _storage[1];
-
-		xpath_node* _begin;
-		xpath_node* _end;
-
-		void _assign(const_iterator begin, const_iterator end, type_t type);
-		void _move(xpath_node_set& rhs) PUGIXML_NOEXCEPT;
-	};
-#endif
-
-#ifndef PUGIXML_NO_STL
-	// Convert wide string to UTF8
-	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const wchar_t* str);
-	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >& str);
-
-	// Convert UTF8 to wide string
-	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const char* str);
-	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const std::basic_string<char, std::char_traits<char>, std::allocator<char> >& str);
-#endif
-
-	// Memory allocation function interface; returns pointer to allocated memory or NULL on failure
-	typedef void* (*allocation_function)(size_t size);
-
-	// Memory deallocation function interface
-	typedef void (*deallocation_function)(void* ptr);
-
-	// Override default memory management functions. All subsequent allocations/deallocations will be performed via supplied functions.
-	void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate);
-
-	// Get current memory management functions
-	allocation_function PUGIXML_FUNCTION get_memory_allocation_function();
-	deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function();
-}
-
-#if !defined(PUGIXML_NO_STL) && (defined(_MSC_VER) || defined(__ICC))
-namespace std
-{
-	// Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier)
-	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_node_iterator&);
-	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_attribute_iterator&);
-	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_named_node_iterator&);
-}
-#endif
-
-#if !defined(PUGIXML_NO_STL) && defined(__SUNPRO_CC)
-namespace std
-{
-	// Workarounds for (non-standard) iterator category detection
-	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_node_iterator&);
-	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_attribute_iterator&);
-	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_named_node_iterator&);
-}
-#endif
-
-#endif
-
-// Make sure implementation is included in header-only mode
-// Use macro expansion in #include to work around QMake (QTBUG-11923)
-#if defined(PUGIXML_HEADER_ONLY) && !defined(PUGIXML_SOURCE)
-#	define PUGIXML_SOURCE "pugixml.cpp"
-#	include PUGIXML_SOURCE
-#endif
-
-/**
- * Copyright (c) 2006-2022 Arseny Kapoulkine
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
+/**
+ * pugixml parser - version 1.14
+ * --------------------------------------------------------
+ * Copyright (C) 2006-2023, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Report bugs and download new versions at https://pugixml.org/
+ *
+ * This library is distributed under the MIT License. See notice at the end
+ * of this file.
+ *
+ * This work is based on the pugxml parser, which is:
+ * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
+ */
+
+// Define version macro; evaluates to major * 1000 + minor * 10 + patch so that it's safe to use in less-than comparisons
+// Note: pugixml used major * 100 + minor * 10 + patch format up until 1.9 (which had version identifier 190); starting from pugixml 1.10, the minor version number is two digits
+#ifndef PUGIXML_VERSION
+#	define PUGIXML_VERSION 1140 // 1.14
+#endif
+
+// Include user configuration file (this can define various configuration macros)
+#include "pugiconfig.hpp"
+
+#ifndef HEADER_PUGIXML_HPP
+#define HEADER_PUGIXML_HPP
+
+// Include stddef.h for size_t and ptrdiff_t
+#include <stddef.h>
+
+// Include exception header for XPath
+#if !defined(PUGIXML_NO_XPATH) && !defined(PUGIXML_NO_EXCEPTIONS)
+#	include <exception>
+#endif
+
+// Include STL headers
+#ifndef PUGIXML_NO_STL
+#	include <iterator>
+#	include <iosfwd>
+#	include <string>
+#endif
+
+// Macro for deprecated features
+#ifndef PUGIXML_DEPRECATED
+#	if defined(__GNUC__)
+#		define PUGIXML_DEPRECATED __attribute__((deprecated))
+#	elif defined(_MSC_VER) && _MSC_VER >= 1300
+#		define PUGIXML_DEPRECATED __declspec(deprecated)
+#	else
+#		define PUGIXML_DEPRECATED
+#	endif
+#endif
+
+// If no API is defined, assume default
+#ifndef PUGIXML_API
+#	define PUGIXML_API
+#endif
+
+// If no API for classes is defined, assume default
+#ifndef PUGIXML_CLASS
+#	define PUGIXML_CLASS PUGIXML_API
+#endif
+
+// If no API for functions is defined, assume default
+#ifndef PUGIXML_FUNCTION
+#	define PUGIXML_FUNCTION PUGIXML_API
+#endif
+
+// If the platform is known to have long long support, enable long long functions
+#ifndef PUGIXML_HAS_LONG_LONG
+#	if __cplusplus >= 201103
+#		define PUGIXML_HAS_LONG_LONG
+#	elif defined(_MSC_VER) && _MSC_VER >= 1400
+#		define PUGIXML_HAS_LONG_LONG
+#	endif
+#endif
+
+// If the platform is known to have move semantics support, compile move ctor/operator implementation
+#ifndef PUGIXML_HAS_MOVE
+#	if __cplusplus >= 201103
+#		define PUGIXML_HAS_MOVE
+#	elif defined(_MSC_VER) && _MSC_VER >= 1600
+#		define PUGIXML_HAS_MOVE
+#	endif
+#endif
+
+// If C++ is 2011 or higher, add 'noexcept' specifiers
+#ifndef PUGIXML_NOEXCEPT
+#	if __cplusplus >= 201103
+#		define PUGIXML_NOEXCEPT noexcept
+#	elif defined(_MSC_VER) && _MSC_VER >= 1900
+#		define PUGIXML_NOEXCEPT noexcept
+#	else
+#		define PUGIXML_NOEXCEPT
+#	endif
+#endif
+
+// Some functions can not be noexcept in compact mode
+#ifdef PUGIXML_COMPACT
+#	define PUGIXML_NOEXCEPT_IF_NOT_COMPACT
+#else
+#	define PUGIXML_NOEXCEPT_IF_NOT_COMPACT PUGIXML_NOEXCEPT
+#endif
+
+// If C++ is 2011 or higher, add 'override' qualifiers
+#ifndef PUGIXML_OVERRIDE
+#	if __cplusplus >= 201103
+#		define PUGIXML_OVERRIDE override
+#	elif defined(_MSC_VER) && _MSC_VER >= 1700
+#		define PUGIXML_OVERRIDE override
+#	else
+#		define PUGIXML_OVERRIDE
+#	endif
+#endif
+
+// If C++ is 2011 or higher, use 'nullptr'
+#ifndef PUGIXML_NULL
+#	if __cplusplus >= 201103
+#		define PUGIXML_NULL nullptr
+#	elif defined(_MSC_VER) && _MSC_VER >= 1600
+#		define PUGIXML_NULL nullptr
+#	else
+#		define PUGIXML_NULL 0
+#	endif
+#endif
+
+// Character interface macros
+#ifdef PUGIXML_WCHAR_MODE
+#	define PUGIXML_TEXT(t) L ## t
+#	define PUGIXML_CHAR wchar_t
+#else
+#	define PUGIXML_TEXT(t) t
+#	define PUGIXML_CHAR char
+#endif
+
+namespace pugi
+{
+	// Character type used for all internal storage and operations; depends on PUGIXML_WCHAR_MODE
+	typedef PUGIXML_CHAR char_t;
+
+#ifndef PUGIXML_NO_STL
+	// String type used for operations that work with STL string; depends on PUGIXML_WCHAR_MODE
+	typedef std::basic_string<PUGIXML_CHAR, std::char_traits<PUGIXML_CHAR>, std::allocator<PUGIXML_CHAR> > string_t;
+#endif
+}
+
+// The PugiXML namespace
+namespace pugi
+{
+	// Tree node types
+	enum xml_node_type
+	{
+		node_null,			// Empty (null) node handle
+		node_document,		// A document tree's absolute root
+		node_element,		// Element tag, i.e. '<node/>'
+		node_pcdata,		// Plain character data, i.e. 'text'
+		node_cdata,			// Character data, i.e. '<![CDATA[text]]>'
+		node_comment,		// Comment tag, i.e. '<!-- text -->'
+		node_pi,			// Processing instruction, i.e. '<?name?>'
+		node_declaration,	// Document declaration, i.e. '<?xml version="1.0"?>'
+		node_doctype		// Document type declaration, i.e. '<!DOCTYPE doc>'
+	};
+
+	// Parsing options
+
+	// Minimal parsing mode (equivalent to turning all other flags off).
+	// Only elements and PCDATA sections are added to the DOM tree, no text conversions are performed.
+	const unsigned int parse_minimal = 0x0000;
+
+	// This flag determines if processing instructions (node_pi) are added to the DOM tree. This flag is off by default.
+	const unsigned int parse_pi = 0x0001;
+
+	// This flag determines if comments (node_comment) are added to the DOM tree. This flag is off by default.
+	const unsigned int parse_comments = 0x0002;
+
+	// This flag determines if CDATA sections (node_cdata) are added to the DOM tree. This flag is on by default.
+	const unsigned int parse_cdata = 0x0004;
+
+	// This flag determines if plain character data (node_pcdata) that consist only of whitespace are added to the DOM tree.
+	// This flag is off by default; turning it on usually results in slower parsing and more memory consumption.
+	const unsigned int parse_ws_pcdata = 0x0008;
+
+	// This flag determines if character and entity references are expanded during parsing. This flag is on by default.
+	const unsigned int parse_escapes = 0x0010;
+
+	// This flag determines if EOL characters are normalized (converted to #xA) during parsing. This flag is on by default.
+	const unsigned int parse_eol = 0x0020;
+
+	// This flag determines if attribute values are normalized using CDATA normalization rules during parsing. This flag is on by default.
+	const unsigned int parse_wconv_attribute = 0x0040;
+
+	// This flag determines if attribute values are normalized using NMTOKENS normalization rules during parsing. This flag is off by default.
+	const unsigned int parse_wnorm_attribute = 0x0080;
+
+	// This flag determines if document declaration (node_declaration) is added to the DOM tree. This flag is off by default.
+	const unsigned int parse_declaration = 0x0100;
+
+	// This flag determines if document type declaration (node_doctype) is added to the DOM tree. This flag is off by default.
+	const unsigned int parse_doctype = 0x0200;
+
+	// This flag determines if plain character data (node_pcdata) that is the only child of the parent node and that consists only
+	// of whitespace is added to the DOM tree.
+	// This flag is off by default; turning it on may result in slower parsing and more memory consumption.
+	const unsigned int parse_ws_pcdata_single = 0x0400;
+
+	// This flag determines if leading and trailing whitespace is to be removed from plain character data. This flag is off by default.
+	const unsigned int parse_trim_pcdata = 0x0800;
+
+	// This flag determines if plain character data that does not have a parent node is added to the DOM tree, and if an empty document
+	// is a valid document. This flag is off by default.
+	const unsigned int parse_fragment = 0x1000;
+
+	// This flag determines if plain character data is be stored in the parent element's value. This significantly changes the structure of
+	// the document; this flag is only recommended for parsing documents with many PCDATA nodes in memory-constrained environments.
+	// This flag is off by default.
+	const unsigned int parse_embed_pcdata = 0x2000;
+	
+	// This flag determines whether determines whether the the two pcdata should be merged or not, if no intermediatory data are parsed in the document.
+	// This flag is off by default.
+	const unsigned int parse_merge_pcdata = 0x4000;
+
+	// The default parsing mode.
+	// Elements, PCDATA and CDATA sections are added to the DOM tree, character/reference entities are expanded,
+	// End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules.
+	const unsigned int parse_default = parse_cdata | parse_escapes | parse_wconv_attribute | parse_eol;
+
+	// The full parsing mode.
+	// Nodes of all types are added to the DOM tree, character/reference entities are expanded,
+	// End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules.
+	const unsigned int parse_full = parse_default | parse_pi | parse_comments | parse_declaration | parse_doctype;
+
+	// These flags determine the encoding of input data for XML document
+	enum xml_encoding
+	{
+		encoding_auto,		// Auto-detect input encoding using BOM or < / <? detection; use UTF8 if BOM is not found
+		encoding_utf8,		// UTF8 encoding
+		encoding_utf16_le,	// Little-endian UTF16
+		encoding_utf16_be,	// Big-endian UTF16
+		encoding_utf16,		// UTF16 with native endianness
+		encoding_utf32_le,	// Little-endian UTF32
+		encoding_utf32_be,	// Big-endian UTF32
+		encoding_utf32,		// UTF32 with native endianness
+		encoding_wchar,		// The same encoding wchar_t has (either UTF16 or UTF32)
+		encoding_latin1
+	};
+
+	// Formatting flags
+
+	// Indent the nodes that are written to output stream with as many indentation strings as deep the node is in DOM tree. This flag is on by default.
+	const unsigned int format_indent = 0x01;
+
+	// Write encoding-specific BOM to the output stream. This flag is off by default.
+	const unsigned int format_write_bom = 0x02;
+
+	// Use raw output mode (no indentation and no line breaks are written). This flag is off by default.
+	const unsigned int format_raw = 0x04;
+
+	// Omit default XML declaration even if there is no declaration in the document. This flag is off by default.
+	const unsigned int format_no_declaration = 0x08;
+
+	// Don't escape attribute values and PCDATA contents. This flag is off by default.
+	const unsigned int format_no_escapes = 0x10;
+
+	// Open file using text mode in xml_document::save_file. This enables special character (i.e. new-line) conversions on some systems. This flag is off by default.
+	const unsigned int format_save_file_text = 0x20;
+
+	// Write every attribute on a new line with appropriate indentation. This flag is off by default.
+	const unsigned int format_indent_attributes = 0x40;
+
+	// Don't output empty element tags, instead writing an explicit start and end tag even if there are no children. This flag is off by default.
+	const unsigned int format_no_empty_element_tags = 0x80;
+
+	// Skip characters belonging to range [0; 32) instead of "&#xNN;" encoding. This flag is off by default.
+	const unsigned int format_skip_control_chars = 0x100;
+
+	// Use single quotes ' instead of double quotes " for enclosing attribute values. This flag is off by default.
+	const unsigned int format_attribute_single_quote = 0x200;
+
+	// The default set of formatting flags.
+	// Nodes are indented depending on their depth in DOM tree, a default declaration is output if document has none.
+	const unsigned int format_default = format_indent;
+
+	const int default_double_precision = 17;
+	const int default_float_precision = 9;
+
+	// Forward declarations
+	struct xml_attribute_struct;
+	struct xml_node_struct;
+
+	class xml_node_iterator;
+	class xml_attribute_iterator;
+	class xml_named_node_iterator;
+
+	class xml_tree_walker;
+
+	struct xml_parse_result;
+
+	class xml_node;
+
+	class xml_text;
+
+	#ifndef PUGIXML_NO_XPATH
+	class xpath_node;
+	class xpath_node_set;
+	class xpath_query;
+	class xpath_variable_set;
+	#endif
+
+	// Range-based for loop support
+	template <typename It> class xml_object_range
+	{
+	public:
+		typedef It const_iterator;
+		typedef It iterator;
+
+		xml_object_range(It b, It e): _begin(b), _end(e)
+		{
+		}
+
+		It begin() const { return _begin; }
+		It end() const { return _end; }
+
+		bool empty() const { return _begin == _end; }
+
+	private:
+		It _begin, _end;
+	};
+
+	// Writer interface for node printing (see xml_node::print)
+	class PUGIXML_CLASS xml_writer
+	{
+	public:
+		virtual ~xml_writer();
+
+		// Write memory chunk into stream/file/whatever
+		virtual void write(const void* data, size_t size) = 0;
+	};
+
+	// xml_writer implementation for FILE*
+	class PUGIXML_CLASS xml_writer_file: public xml_writer
+	{
+	public:
+		// Construct writer from a FILE* object; void* is used to avoid header dependencies on stdio
+		xml_writer_file(void* file);
+
+		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
+
+	private:
+		void* file;
+	};
+
+	#ifndef PUGIXML_NO_STL
+	// xml_writer implementation for streams
+	class PUGIXML_CLASS xml_writer_stream: public xml_writer
+	{
+	public:
+		// Construct writer from an output stream object
+		xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream);
+		xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream);
+
+		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
+
+	private:
+		std::basic_ostream<char, std::char_traits<char> >* narrow_stream;
+		std::basic_ostream<wchar_t, std::char_traits<wchar_t> >* wide_stream;
+	};
+	#endif
+
+	// A light-weight handle for manipulating attributes in DOM tree
+	class PUGIXML_CLASS xml_attribute
+	{
+		friend class xml_attribute_iterator;
+		friend class xml_node;
+
+	private:
+		xml_attribute_struct* _attr;
+
+		typedef void (*unspecified_bool_type)(xml_attribute***);
+
+	public:
+		// Default constructor. Constructs an empty attribute.
+		xml_attribute();
+
+		// Constructs attribute from internal pointer
+		explicit xml_attribute(xml_attribute_struct* attr);
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Comparison operators (compares wrapped attribute pointers)
+		bool operator==(const xml_attribute& r) const;
+		bool operator!=(const xml_attribute& r) const;
+		bool operator<(const xml_attribute& r) const;
+		bool operator>(const xml_attribute& r) const;
+		bool operator<=(const xml_attribute& r) const;
+		bool operator>=(const xml_attribute& r) const;
+
+		// Check if attribute is empty
+		bool empty() const;
+
+		// Get attribute name/value, or "" if attribute is empty
+		const char_t* name() const;
+		const char_t* value() const;
+
+		// Get attribute value, or the default value if attribute is empty
+		const char_t* as_string(const char_t* def = PUGIXML_TEXT("")) const;
+
+		// Get attribute value as a number, or the default value if conversion did not succeed or attribute is empty
+		int as_int(int def = 0) const;
+		unsigned int as_uint(unsigned int def = 0) const;
+		double as_double(double def = 0) const;
+		float as_float(float def = 0) const;
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		long long as_llong(long long def = 0) const;
+		unsigned long long as_ullong(unsigned long long def = 0) const;
+	#endif
+
+		// Get attribute value as bool (returns true if first character is in '1tTyY' set), or the default value if attribute is empty
+		bool as_bool(bool def = false) const;
+
+		// Set attribute name/value (returns false if attribute is empty or there is not enough memory)
+		bool set_name(const char_t* rhs);
+		bool set_name(const char_t* rhs, size_t size);
+		bool set_value(const char_t* rhs);
+		bool set_value(const char_t* rhs, size_t size);
+
+		// Set attribute value with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
+		bool set_value(int rhs);
+		bool set_value(unsigned int rhs);
+		bool set_value(long rhs);
+		bool set_value(unsigned long rhs);
+		bool set_value(double rhs);
+		bool set_value(double rhs, int precision);
+		bool set_value(float rhs);
+		bool set_value(float rhs, int precision);
+		bool set_value(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		bool set_value(long long rhs);
+		bool set_value(unsigned long long rhs);
+	#endif
+
+		// Set attribute value (equivalent to set_value without error checking)
+		xml_attribute& operator=(const char_t* rhs);
+		xml_attribute& operator=(int rhs);
+		xml_attribute& operator=(unsigned int rhs);
+		xml_attribute& operator=(long rhs);
+		xml_attribute& operator=(unsigned long rhs);
+		xml_attribute& operator=(double rhs);
+		xml_attribute& operator=(float rhs);
+		xml_attribute& operator=(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		xml_attribute& operator=(long long rhs);
+		xml_attribute& operator=(unsigned long long rhs);
+	#endif
+
+		// Get next/previous attribute in the attribute list of the parent node
+		xml_attribute next_attribute() const;
+		xml_attribute previous_attribute() const;
+
+		// Get hash value (unique for handles to the same object)
+		size_t hash_value() const;
+
+		// Get internal pointer
+		xml_attribute_struct* internal_object() const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xml_attribute& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xml_attribute& lhs, bool rhs);
+#endif
+
+	// A light-weight handle for manipulating nodes in DOM tree
+	class PUGIXML_CLASS xml_node
+	{
+		friend class xml_attribute_iterator;
+		friend class xml_node_iterator;
+		friend class xml_named_node_iterator;
+
+	protected:
+		xml_node_struct* _root;
+
+		typedef void (*unspecified_bool_type)(xml_node***);
+
+	public:
+		// Default constructor. Constructs an empty node.
+		xml_node();
+
+		// Constructs node from internal pointer
+		explicit xml_node(xml_node_struct* p);
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Comparison operators (compares wrapped node pointers)
+		bool operator==(const xml_node& r) const;
+		bool operator!=(const xml_node& r) const;
+		bool operator<(const xml_node& r) const;
+		bool operator>(const xml_node& r) const;
+		bool operator<=(const xml_node& r) const;
+		bool operator>=(const xml_node& r) const;
+
+		// Check if node is empty.
+		bool empty() const;
+
+		// Get node type
+		xml_node_type type() const;
+
+		// Get node name, or "" if node is empty or it has no name
+		const char_t* name() const;
+
+		// Get node value, or "" if node is empty or it has no value
+		// Note: For <node>text</node> node.value() does not return "text"! Use child_value() or text() methods to access text inside nodes.
+		const char_t* value() const;
+
+		// Get attribute list
+		xml_attribute first_attribute() const;
+		xml_attribute last_attribute() const;
+
+		// Get children list
+		xml_node first_child() const;
+		xml_node last_child() const;
+
+		// Get next/previous sibling in the children list of the parent node
+		xml_node next_sibling() const;
+		xml_node previous_sibling() const;
+
+		// Get parent node
+		xml_node parent() const;
+
+		// Get root of DOM tree this node belongs to
+		xml_node root() const;
+
+		// Get text object for the current node
+		xml_text text() const;
+
+		// Get child, attribute or next/previous sibling with the specified name
+		xml_node child(const char_t* name) const;
+		xml_attribute attribute(const char_t* name) const;
+		xml_node next_sibling(const char_t* name) const;
+		xml_node previous_sibling(const char_t* name) const;
+
+		// Get attribute, starting the search from a hint (and updating hint so that searching for a sequence of attributes is fast)
+		xml_attribute attribute(const char_t* name, xml_attribute& hint) const;
+
+		// Get child value of current node; that is, value of the first child node of type PCDATA/CDATA
+		const char_t* child_value() const;
+
+		// Get child value of child with specified name. Equivalent to child(name).child_value().
+		const char_t* child_value(const char_t* name) const;
+
+		// Set node name/value (returns false if node is empty, there is not enough memory, or node can not have name/value)
+		bool set_name(const char_t* rhs);
+		bool set_name(const char_t* rhs, size_t size);
+		bool set_value(const char_t* rhs);
+		bool set_value(const char_t* rhs, size_t size);
+
+		// Add attribute with specified name. Returns added attribute, or empty attribute on errors.
+		xml_attribute append_attribute(const char_t* name);
+		xml_attribute prepend_attribute(const char_t* name);
+		xml_attribute insert_attribute_after(const char_t* name, const xml_attribute& attr);
+		xml_attribute insert_attribute_before(const char_t* name, const xml_attribute& attr);
+
+		// Add a copy of the specified attribute. Returns added attribute, or empty attribute on errors.
+		xml_attribute append_copy(const xml_attribute& proto);
+		xml_attribute prepend_copy(const xml_attribute& proto);
+		xml_attribute insert_copy_after(const xml_attribute& proto, const xml_attribute& attr);
+		xml_attribute insert_copy_before(const xml_attribute& proto, const xml_attribute& attr);
+
+		// Add child node with specified type. Returns added node, or empty node on errors.
+		xml_node append_child(xml_node_type type = node_element);
+		xml_node prepend_child(xml_node_type type = node_element);
+		xml_node insert_child_after(xml_node_type type, const xml_node& node);
+		xml_node insert_child_before(xml_node_type type, const xml_node& node);
+
+		// Add child element with specified name. Returns added node, or empty node on errors.
+		xml_node append_child(const char_t* name);
+		xml_node prepend_child(const char_t* name);
+		xml_node insert_child_after(const char_t* name, const xml_node& node);
+		xml_node insert_child_before(const char_t* name, const xml_node& node);
+
+		// Add a copy of the specified node as a child. Returns added node, or empty node on errors.
+		xml_node append_copy(const xml_node& proto);
+		xml_node prepend_copy(const xml_node& proto);
+		xml_node insert_copy_after(const xml_node& proto, const xml_node& node);
+		xml_node insert_copy_before(const xml_node& proto, const xml_node& node);
+
+		// Move the specified node to become a child of this node. Returns moved node, or empty node on errors.
+		xml_node append_move(const xml_node& moved);
+		xml_node prepend_move(const xml_node& moved);
+		xml_node insert_move_after(const xml_node& moved, const xml_node& node);
+		xml_node insert_move_before(const xml_node& moved, const xml_node& node);
+
+		// Remove specified attribute
+		bool remove_attribute(const xml_attribute& a);
+		bool remove_attribute(const char_t* name);
+
+		// Remove all attributes
+		bool remove_attributes();
+
+		// Remove specified child
+		bool remove_child(const xml_node& n);
+		bool remove_child(const char_t* name);
+
+		// Remove all children
+		bool remove_children();
+
+		// Parses buffer as an XML document fragment and appends all nodes as children of the current node.
+		// Copies/converts the buffer, so it may be deleted or changed after the function returns.
+		// Note: append_buffer allocates memory that has the lifetime of the owning document; removing the appended nodes does not immediately reclaim that memory.
+		xml_parse_result append_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Find attribute using predicate. Returns first attribute for which predicate returned true.
+		template <typename Predicate> xml_attribute find_attribute(Predicate pred) const
+		{
+			if (!_root) return xml_attribute();
+
+			for (xml_attribute attrib = first_attribute(); attrib; attrib = attrib.next_attribute())
+				if (pred(attrib))
+					return attrib;
+
+			return xml_attribute();
+		}
+
+		// Find child node using predicate. Returns first child for which predicate returned true.
+		template <typename Predicate> xml_node find_child(Predicate pred) const
+		{
+			if (!_root) return xml_node();
+
+			for (xml_node node = first_child(); node; node = node.next_sibling())
+				if (pred(node))
+					return node;
+
+			return xml_node();
+		}
+
+		// Find node from subtree using predicate. Returns first node from subtree (depth-first), for which predicate returned true.
+		template <typename Predicate> xml_node find_node(Predicate pred) const
+		{
+			if (!_root) return xml_node();
+
+			xml_node cur = first_child();
+
+			while (cur._root && cur._root != _root)
+			{
+				if (pred(cur)) return cur;
+
+				if (cur.first_child()) cur = cur.first_child();
+				else if (cur.next_sibling()) cur = cur.next_sibling();
+				else
+				{
+					while (!cur.next_sibling() && cur._root != _root) cur = cur.parent();
+
+					if (cur._root != _root) cur = cur.next_sibling();
+				}
+			}
+
+			return xml_node();
+		}
+
+		// Find child node by attribute name/value
+		xml_node find_child_by_attribute(const char_t* name, const char_t* attr_name, const char_t* attr_value) const;
+		xml_node find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Get the absolute node path from root as a text string.
+		string_t path(char_t delimiter = '/') const;
+	#endif
+
+		// Search for a node by path consisting of node names and . or .. elements.
+		xml_node first_element_by_path(const char_t* path, char_t delimiter = '/') const;
+
+		// Recursively traverse subtree with xml_tree_walker
+		bool traverse(xml_tree_walker& walker);
+
+	#ifndef PUGIXML_NO_XPATH
+		// Select single node by evaluating XPath query. Returns first node from the resulting node set.
+		xpath_node select_node(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
+		xpath_node select_node(const xpath_query& query) const;
+
+		// Select node set by evaluating XPath query
+		xpath_node_set select_nodes(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
+		xpath_node_set select_nodes(const xpath_query& query) const;
+
+		// (deprecated: use select_node instead) Select single node by evaluating XPath query.
+		PUGIXML_DEPRECATED xpath_node select_single_node(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
+		PUGIXML_DEPRECATED xpath_node select_single_node(const xpath_query& query) const;
+
+	#endif
+
+		// Print subtree using a writer object
+		void print(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Print subtree to stream
+		void print(std::basic_ostream<char, std::char_traits<char> >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
+		void print(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, unsigned int depth = 0) const;
+	#endif
+
+		// Child nodes iterators
+		typedef xml_node_iterator iterator;
+
+		iterator begin() const;
+		iterator end() const;
+
+		// Attribute iterators
+		typedef xml_attribute_iterator attribute_iterator;
+
+		attribute_iterator attributes_begin() const;
+		attribute_iterator attributes_end() const;
+
+		// Range-based for support
+		xml_object_range<xml_node_iterator> children() const;
+		xml_object_range<xml_attribute_iterator> attributes() const;
+
+		// Range-based for support for all children with the specified name
+		// Note: name pointer must have a longer lifetime than the returned object; be careful with passing temporaries!
+		xml_object_range<xml_named_node_iterator> children(const char_t* name) const;
+
+		// Get node offset in parsed file/string (in char_t units) for debugging purposes
+		ptrdiff_t offset_debug() const;
+
+		// Get hash value (unique for handles to the same object)
+		size_t hash_value() const;
+
+		// Get internal pointer
+		xml_node_struct* internal_object() const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xml_node& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xml_node& lhs, bool rhs);
+#endif
+
+	// A helper for working with text inside PCDATA nodes
+	class PUGIXML_CLASS xml_text
+	{
+		friend class xml_node;
+
+		xml_node_struct* _root;
+
+		typedef void (*unspecified_bool_type)(xml_text***);
+
+		explicit xml_text(xml_node_struct* root);
+
+		xml_node_struct* _data_new();
+		xml_node_struct* _data() const;
+
+	public:
+		// Default constructor. Constructs an empty object.
+		xml_text();
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Check if text object is empty
+		bool empty() const;
+
+		// Get text, or "" if object is empty
+		const char_t* get() const;
+
+		// Get text, or the default value if object is empty
+		const char_t* as_string(const char_t* def = PUGIXML_TEXT("")) const;
+
+		// Get text as a number, or the default value if conversion did not succeed or object is empty
+		int as_int(int def = 0) const;
+		unsigned int as_uint(unsigned int def = 0) const;
+		double as_double(double def = 0) const;
+		float as_float(float def = 0) const;
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		long long as_llong(long long def = 0) const;
+		unsigned long long as_ullong(unsigned long long def = 0) const;
+	#endif
+
+		// Get text as bool (returns true if first character is in '1tTyY' set), or the default value if object is empty
+		bool as_bool(bool def = false) const;
+
+		// Set text (returns false if object is empty or there is not enough memory)
+		bool set(const char_t* rhs);
+		bool set(const char_t* rhs, size_t size);
+
+		// Set text with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
+		bool set(int rhs);
+		bool set(unsigned int rhs);
+		bool set(long rhs);
+		bool set(unsigned long rhs);
+		bool set(double rhs);
+		bool set(double rhs, int precision);
+		bool set(float rhs);
+		bool set(float rhs, int precision);
+		bool set(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		bool set(long long rhs);
+		bool set(unsigned long long rhs);
+	#endif
+
+		// Set text (equivalent to set without error checking)
+		xml_text& operator=(const char_t* rhs);
+		xml_text& operator=(int rhs);
+		xml_text& operator=(unsigned int rhs);
+		xml_text& operator=(long rhs);
+		xml_text& operator=(unsigned long rhs);
+		xml_text& operator=(double rhs);
+		xml_text& operator=(float rhs);
+		xml_text& operator=(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		xml_text& operator=(long long rhs);
+		xml_text& operator=(unsigned long long rhs);
+	#endif
+
+		// Get the data node (node_pcdata or node_cdata) for this object
+		xml_node data() const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xml_text& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xml_text& lhs, bool rhs);
+#endif
+
+	// Child node iterator (a bidirectional iterator over a collection of xml_node)
+	class PUGIXML_CLASS xml_node_iterator
+	{
+		friend class xml_node;
+
+	private:
+		mutable xml_node _wrap;
+		xml_node _parent;
+
+		xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent);
+
+	public:
+		// Iterator traits
+		typedef ptrdiff_t difference_type;
+		typedef xml_node value_type;
+		typedef xml_node* pointer;
+		typedef xml_node& reference;
+
+	#ifndef PUGIXML_NO_STL
+		typedef std::bidirectional_iterator_tag iterator_category;
+	#endif
+
+		// Default constructor
+		xml_node_iterator();
+
+		// Construct an iterator which points to the specified node
+		xml_node_iterator(const xml_node& node);
+
+		// Iterator operators
+		bool operator==(const xml_node_iterator& rhs) const;
+		bool operator!=(const xml_node_iterator& rhs) const;
+
+		xml_node& operator*() const;
+		xml_node* operator->() const;
+
+		xml_node_iterator& operator++();
+		xml_node_iterator operator++(int);
+
+		xml_node_iterator& operator--();
+		xml_node_iterator operator--(int);
+	};
+
+	// Attribute iterator (a bidirectional iterator over a collection of xml_attribute)
+	class PUGIXML_CLASS xml_attribute_iterator
+	{
+		friend class xml_node;
+
+	private:
+		mutable xml_attribute _wrap;
+		xml_node _parent;
+
+		xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent);
+
+	public:
+		// Iterator traits
+		typedef ptrdiff_t difference_type;
+		typedef xml_attribute value_type;
+		typedef xml_attribute* pointer;
+		typedef xml_attribute& reference;
+
+	#ifndef PUGIXML_NO_STL
+		typedef std::bidirectional_iterator_tag iterator_category;
+	#endif
+
+		// Default constructor
+		xml_attribute_iterator();
+
+		// Construct an iterator which points to the specified attribute
+		xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent);
+
+		// Iterator operators
+		bool operator==(const xml_attribute_iterator& rhs) const;
+		bool operator!=(const xml_attribute_iterator& rhs) const;
+
+		xml_attribute& operator*() const;
+		xml_attribute* operator->() const;
+
+		xml_attribute_iterator& operator++();
+		xml_attribute_iterator operator++(int);
+
+		xml_attribute_iterator& operator--();
+		xml_attribute_iterator operator--(int);
+	};
+
+	// Named node range helper
+	class PUGIXML_CLASS xml_named_node_iterator
+	{
+		friend class xml_node;
+
+	public:
+		// Iterator traits
+		typedef ptrdiff_t difference_type;
+		typedef xml_node value_type;
+		typedef xml_node* pointer;
+		typedef xml_node& reference;
+
+	#ifndef PUGIXML_NO_STL
+		typedef std::bidirectional_iterator_tag iterator_category;
+	#endif
+
+		// Default constructor
+		xml_named_node_iterator();
+
+		// Construct an iterator which points to the specified node
+		// Note: name pointer is stored in the iterator and must have a longer lifetime than iterator itself
+		xml_named_node_iterator(const xml_node& node, const char_t* name);
+
+		// Iterator operators
+		bool operator==(const xml_named_node_iterator& rhs) const;
+		bool operator!=(const xml_named_node_iterator& rhs) const;
+
+		xml_node& operator*() const;
+		xml_node* operator->() const;
+
+		xml_named_node_iterator& operator++();
+		xml_named_node_iterator operator++(int);
+
+		xml_named_node_iterator& operator--();
+		xml_named_node_iterator operator--(int);
+
+	private:
+		mutable xml_node _wrap;
+		xml_node _parent;
+		const char_t* _name;
+
+		xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name);
+	};
+
+	// Abstract tree walker class (see xml_node::traverse)
+	class PUGIXML_CLASS xml_tree_walker
+	{
+		friend class xml_node;
+
+	private:
+		int _depth;
+
+	protected:
+		// Get current traversal depth
+		int depth() const;
+
+	public:
+		xml_tree_walker();
+		virtual ~xml_tree_walker();
+
+		// Callback that is called when traversal begins
+		virtual bool begin(xml_node& node);
+
+		// Callback that is called for each node traversed
+		virtual bool for_each(xml_node& node) = 0;
+
+		// Callback that is called when traversal ends
+		virtual bool end(xml_node& node);
+	};
+
+	// Parsing status, returned as part of xml_parse_result object
+	enum xml_parse_status
+	{
+		status_ok = 0,				// No error
+
+		status_file_not_found,		// File was not found during load_file()
+		status_io_error,			// Error reading from file/stream
+		status_out_of_memory,		// Could not allocate memory
+		status_internal_error,		// Internal error occurred
+
+		status_unrecognized_tag,	// Parser could not determine tag type
+
+		status_bad_pi,				// Parsing error occurred while parsing document declaration/processing instruction
+		status_bad_comment,			// Parsing error occurred while parsing comment
+		status_bad_cdata,			// Parsing error occurred while parsing CDATA section
+		status_bad_doctype,			// Parsing error occurred while parsing document type declaration
+		status_bad_pcdata,			// Parsing error occurred while parsing PCDATA section
+		status_bad_start_element,	// Parsing error occurred while parsing start element tag
+		status_bad_attribute,		// Parsing error occurred while parsing element attribute
+		status_bad_end_element,		// Parsing error occurred while parsing end element tag
+		status_end_element_mismatch,// There was a mismatch of start-end tags (closing tag had incorrect name, some tag was not closed or there was an excessive closing tag)
+
+		status_append_invalid_root,	// Unable to append nodes since root type is not node_element or node_document (exclusive to xml_node::append_buffer)
+
+		status_no_document_element	// Parsing resulted in a document without element nodes
+	};
+
+	// Parsing result
+	struct PUGIXML_CLASS xml_parse_result
+	{
+		// Parsing status (see xml_parse_status)
+		xml_parse_status status;
+
+		// Last parsed offset (in char_t units from start of input data)
+		ptrdiff_t offset;
+
+		// Source document encoding
+		xml_encoding encoding;
+
+		// Default constructor, initializes object to failed state
+		xml_parse_result();
+
+		// Cast to bool operator
+		operator bool() const;
+
+		// Get error description
+		const char* description() const;
+	};
+
+	// Document class (DOM tree root)
+	class PUGIXML_CLASS xml_document: public xml_node
+	{
+	private:
+		char_t* _buffer;
+
+		char _memory[192];
+
+		// Non-copyable semantics
+		xml_document(const xml_document&);
+		xml_document& operator=(const xml_document&);
+
+		void _create();
+		void _destroy();
+		void _move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
+
+	public:
+		// Default constructor, makes empty document
+		xml_document();
+
+		// Destructor, invalidates all node/attribute handles to this document
+		~xml_document();
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
+		xml_document& operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
+	#endif
+
+		// Removes all nodes, leaving the empty document
+		void reset();
+
+		// Removes all nodes, then copies the entire contents of the specified document
+		void reset(const xml_document& proto);
+
+	#ifndef PUGIXML_NO_STL
+		// Load document from stream.
+		xml_parse_result load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+		xml_parse_result load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options = parse_default);
+	#endif
+
+		// (deprecated: use load_string instead) Load document from zero-terminated string. No encoding conversions are applied.
+		PUGIXML_DEPRECATED xml_parse_result load(const char_t* contents, unsigned int options = parse_default);
+
+		// Load document from zero-terminated string. No encoding conversions are applied.
+		xml_parse_result load_string(const char_t* contents, unsigned int options = parse_default);
+
+		// Load document from file
+		xml_parse_result load_file(const char* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+		xml_parse_result load_file(const wchar_t* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Load document from buffer. Copies/converts the buffer, so it may be deleted or changed after the function returns.
+		xml_parse_result load_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Load document from buffer, using the buffer for in-place parsing (the buffer is modified and used for storage of document data).
+		// You should ensure that buffer data will persist throughout the document's lifetime, and free the buffer memory manually once document is destroyed.
+		xml_parse_result load_buffer_inplace(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Load document from buffer, using the buffer for in-place parsing (the buffer is modified and used for storage of document data).
+		// You should allocate the buffer with pugixml allocation function; document will free the buffer when it is no longer needed (you can't use it anymore).
+		xml_parse_result load_buffer_inplace_own(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Save XML document to writer (semantics is slightly different from xml_node::print, see documentation for details).
+		void save(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Save XML document to stream (semantics is slightly different from xml_node::print, see documentation for details).
+		void save(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+		void save(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default) const;
+	#endif
+
+		// Save XML to file
+		bool save_file(const char* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+		bool save_file(const wchar_t* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+
+		// Get document element
+		xml_node document_element() const;
+	};
+
+#ifndef PUGIXML_NO_XPATH
+	// XPath query return type
+	enum xpath_value_type
+	{
+		xpath_type_none,	  // Unknown type (query failed to compile)
+		xpath_type_node_set,  // Node set (xpath_node_set)
+		xpath_type_number,	  // Number
+		xpath_type_string,	  // String
+		xpath_type_boolean	  // Boolean
+	};
+
+	// XPath parsing result
+	struct PUGIXML_CLASS xpath_parse_result
+	{
+		// Error message (0 if no error)
+		const char* error;
+
+		// Last parsed offset (in char_t units from string start)
+		ptrdiff_t offset;
+
+		// Default constructor, initializes object to failed state
+		xpath_parse_result();
+
+		// Cast to bool operator
+		operator bool() const;
+
+		// Get error description
+		const char* description() const;
+	};
+
+	// A single XPath variable
+	class PUGIXML_CLASS xpath_variable
+	{
+		friend class xpath_variable_set;
+
+	protected:
+		xpath_value_type _type;
+		xpath_variable* _next;
+
+		xpath_variable(xpath_value_type type);
+
+		// Non-copyable semantics
+		xpath_variable(const xpath_variable&);
+		xpath_variable& operator=(const xpath_variable&);
+
+	public:
+		// Get variable name
+		const char_t* name() const;
+
+		// Get variable type
+		xpath_value_type type() const;
+
+		// Get variable value; no type conversion is performed, default value (false, NaN, empty string, empty node set) is returned on type mismatch error
+		bool get_boolean() const;
+		double get_number() const;
+		const char_t* get_string() const;
+		const xpath_node_set& get_node_set() const;
+
+		// Set variable value; no type conversion is performed, false is returned on type mismatch error
+		bool set(bool value);
+		bool set(double value);
+		bool set(const char_t* value);
+		bool set(const xpath_node_set& value);
+	};
+
+	// A set of XPath variables
+	class PUGIXML_CLASS xpath_variable_set
+	{
+	private:
+		xpath_variable* _data[64];
+
+		void _assign(const xpath_variable_set& rhs);
+		void _swap(xpath_variable_set& rhs);
+
+		xpath_variable* _find(const char_t* name) const;
+
+		static bool _clone(xpath_variable* var, xpath_variable** out_result);
+		static void _destroy(xpath_variable* var);
+
+	public:
+		// Default constructor/destructor
+		xpath_variable_set();
+		~xpath_variable_set();
+
+		// Copy constructor/assignment operator
+		xpath_variable_set(const xpath_variable_set& rhs);
+		xpath_variable_set& operator=(const xpath_variable_set& rhs);
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT;
+		xpath_variable_set& operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT;
+	#endif
+
+		// Add a new variable or get the existing one, if the types match
+		xpath_variable* add(const char_t* name, xpath_value_type type);
+
+		// Set value of an existing variable; no type conversion is performed, false is returned if there is no such variable or if types mismatch
+		bool set(const char_t* name, bool value);
+		bool set(const char_t* name, double value);
+		bool set(const char_t* name, const char_t* value);
+		bool set(const char_t* name, const xpath_node_set& value);
+
+		// Get existing variable by name
+		xpath_variable* get(const char_t* name);
+		const xpath_variable* get(const char_t* name) const;
+	};
+
+	// A compiled XPath query object
+	class PUGIXML_CLASS xpath_query
+	{
+	private:
+		void* _impl;
+		xpath_parse_result _result;
+
+		typedef void (*unspecified_bool_type)(xpath_query***);
+
+		// Non-copyable semantics
+		xpath_query(const xpath_query&);
+		xpath_query& operator=(const xpath_query&);
+
+	public:
+		// Construct a compiled object from XPath expression.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on compilation errors.
+		explicit xpath_query(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL);
+
+		// Constructor
+		xpath_query();
+
+		// Destructor
+		~xpath_query();
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT;
+		xpath_query& operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT;
+	#endif
+
+		// Get query expression return type
+		xpath_value_type return_type() const;
+
+		// Evaluate expression as boolean value in the specified context; performs type conversion if necessary.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		bool evaluate_boolean(const xpath_node& n) const;
+
+		// Evaluate expression as double value in the specified context; performs type conversion if necessary.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		double evaluate_number(const xpath_node& n) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Evaluate expression as string value in the specified context; performs type conversion if necessary.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		string_t evaluate_string(const xpath_node& n) const;
+	#endif
+
+		// Evaluate expression as string value in the specified context; performs type conversion if necessary.
+		// At most capacity characters are written to the destination buffer, full result size is returned (includes terminating zero).
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty  set instead.
+		size_t evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const;
+
+		// Evaluate expression as node set in the specified context.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on type mismatch and std::bad_alloc on out of memory errors.
+		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty node set instead.
+		xpath_node_set evaluate_node_set(const xpath_node& n) const;
+
+		// Evaluate expression as node set in the specified context.
+		// Return first node in document order, or empty node if node set is empty.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on type mismatch and std::bad_alloc on out of memory errors.
+		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty node instead.
+		xpath_node evaluate_node(const xpath_node& n) const;
+
+		// Get parsing result (used to get compilation errors in PUGIXML_NO_EXCEPTIONS mode)
+		const xpath_parse_result& result() const;
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+	};
+
+	#ifndef PUGIXML_NO_EXCEPTIONS
+        #if defined(_MSC_VER)
+          // C4275 can be ignored in Visual C++ if you are deriving
+          // from a type in the Standard C++ Library
+          #pragma warning(push)
+          #pragma warning(disable: 4275)
+        #endif
+	// XPath exception class
+	class PUGIXML_CLASS xpath_exception: public std::exception
+	{
+	private:
+		xpath_parse_result _result;
+
+	public:
+		// Construct exception from parse result
+		explicit xpath_exception(const xpath_parse_result& result);
+
+		// Get error message
+		virtual const char* what() const throw() PUGIXML_OVERRIDE;
+
+		// Get parse result
+		const xpath_parse_result& result() const;
+	};
+        #if defined(_MSC_VER)
+          #pragma warning(pop)
+        #endif
+	#endif
+
+	// XPath node class (either xml_node or xml_attribute)
+	class PUGIXML_CLASS xpath_node
+	{
+	private:
+		xml_node _node;
+		xml_attribute _attribute;
+
+		typedef void (*unspecified_bool_type)(xpath_node***);
+
+	public:
+		// Default constructor; constructs empty XPath node
+		xpath_node();
+
+		// Construct XPath node from XML node/attribute
+		xpath_node(const xml_node& node);
+		xpath_node(const xml_attribute& attribute, const xml_node& parent);
+
+		// Get node/attribute, if any
+		xml_node node() const;
+		xml_attribute attribute() const;
+
+		// Get parent of contained node/attribute
+		xml_node parent() const;
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Comparison operators
+		bool operator==(const xpath_node& n) const;
+		bool operator!=(const xpath_node& n) const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xpath_node& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xpath_node& lhs, bool rhs);
+#endif
+
+	// A fixed-size collection of XPath nodes
+	class PUGIXML_CLASS xpath_node_set
+	{
+	public:
+		// Collection type
+		enum type_t
+		{
+			type_unsorted,			// Not ordered
+			type_sorted,			// Sorted by document order (ascending)
+			type_sorted_reverse		// Sorted by document order (descending)
+		};
+
+		// Constant iterator type
+		typedef const xpath_node* const_iterator;
+
+		// We define non-constant iterator to be the same as constant iterator so that various generic algorithms (i.e. boost foreach) work
+		typedef const xpath_node* iterator;
+
+		// Default constructor. Constructs empty set.
+		xpath_node_set();
+
+		// Constructs a set from iterator range; data is not checked for duplicates and is not sorted according to provided type, so be careful
+		xpath_node_set(const_iterator begin, const_iterator end, type_t type = type_unsorted);
+
+		// Destructor
+		~xpath_node_set();
+
+		// Copy constructor/assignment operator
+		xpath_node_set(const xpath_node_set& ns);
+		xpath_node_set& operator=(const xpath_node_set& ns);
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT;
+		xpath_node_set& operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT;
+	#endif
+
+		// Get collection type
+		type_t type() const;
+
+		// Get collection size
+		size_t size() const;
+
+		// Indexing operator
+		const xpath_node& operator[](size_t index) const;
+
+		// Collection iterators
+		const_iterator begin() const;
+		const_iterator end() const;
+
+		// Sort the collection in ascending/descending order by document order
+		void sort(bool reverse = false);
+
+		// Get first node in the collection by document order
+		xpath_node first() const;
+
+		// Check if collection is empty
+		bool empty() const;
+
+	private:
+		type_t _type;
+
+		xpath_node _storage[1];
+
+		xpath_node* _begin;
+		xpath_node* _end;
+
+		void _assign(const_iterator begin, const_iterator end, type_t type);
+		void _move(xpath_node_set& rhs) PUGIXML_NOEXCEPT;
+	};
+#endif
+
+#ifndef PUGIXML_NO_STL
+	// Convert wide string to UTF8
+	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const wchar_t* str);
+	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >& str);
+
+	// Convert UTF8 to wide string
+	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const char* str);
+	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const std::basic_string<char, std::char_traits<char>, std::allocator<char> >& str);
+#endif
+
+	// Memory allocation function interface; returns pointer to allocated memory or NULL on failure
+	typedef void* (*allocation_function)(size_t size);
+
+	// Memory deallocation function interface
+	typedef void (*deallocation_function)(void* ptr);
+
+	// Override default memory management functions. All subsequent allocations/deallocations will be performed via supplied functions.
+	void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate);
+
+	// Get current memory management functions
+	allocation_function PUGIXML_FUNCTION get_memory_allocation_function();
+	deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function();
+}
+
+#if !defined(PUGIXML_NO_STL) && (defined(_MSC_VER) || defined(__ICC))
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier)
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_node_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_attribute_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_named_node_iterator&);
+}
+#endif
+
+#if !defined(PUGIXML_NO_STL) && defined(__SUNPRO_CC)
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_node_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_attribute_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_named_node_iterator&);
+}
+#endif
+
+#endif
+
+// Make sure implementation is included in header-only mode
+// Use macro expansion in #include to work around QMake (QTBUG-11923)
+#if defined(PUGIXML_HEADER_ONLY) && !defined(PUGIXML_SOURCE)
+#	define PUGIXML_SOURCE "pugixml.cpp"
+#	include PUGIXML_SOURCE
+#endif
+
+/**
+ * Copyright (c) 2006-2023 Arseny Kapoulkine
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
diff --git a/include/vrv/adjustslursfunctor.h b/include/vrv/adjustslursfunctor.h
index af32d918c71..cc4665938fc 100644
--- a/include/vrv/adjustslursfunctor.h
+++ b/include/vrv/adjustslursfunctor.h
@@ -9,9 +9,36 @@
 #define __VRV_ADJUSTSLURSFUNCTOR_H__
 
 #include "functor.h"
+#include "slur.h"
 
 namespace vrv {
 
+//----------------------------------------------------------------------------
+// ControlPointConstraint
+//----------------------------------------------------------------------------
+/**
+ * This represents a constraint ax + by >= c where x and y are
+ * vertical control point adjustments
+ */
+struct ControlPointConstraint {
+    double a;
+    double b;
+    double c;
+};
+
+//----------------------------------------------------------------------------
+// ControlPointAdjustment
+//----------------------------------------------------------------------------
+/**
+ * A vertical adjustment of bezier control points
+ */
+struct ControlPointAdjustment {
+    int leftShift;
+    int rightShift;
+    bool moveUpwards;
+    int requestedStaffSpace;
+};
+
 //----------------------------------------------------------------------------
 // AdjustSlursFunctor
 //----------------------------------------------------------------------------
@@ -39,6 +66,11 @@ class AdjustSlursFunctor : public DocFunctor {
      */
     bool HasCrossStaffSlurs() const { return m_crossStaffSlurs; }
 
+    /*
+     * Reset the current slur and curve
+     */
+    void ResetCurrent();
+
     /*
      * Functor interface
      */
@@ -50,12 +82,97 @@ class AdjustSlursFunctor : public DocFunctor {
 protected:
     //
 private:
-    //
+    /**
+     * High level helper functions
+     */
+    ///@{
+    void AdjustSlur(int unit) const;
+
+    void AdjustOuterSlur(const ArrayOfFloatingCurvePositioners &innerCurves, int unit) const;
+    ///@}
+
+    /**
+     * Intermediate level helper functions
+     */
+    ///@{
+    // Discard certain spanned elements
+    void FilterSpannedElements(const BezierCurve &bezierCurve, int margin) const;
+
+    // Detect collisions near the endpoints
+    NearEndCollision DetectCollisionsNearEnd(const BezierCurve &bezierCurve, int margin) const;
+
+    // Calculate the vertical shift of the slur end points
+    std::pair<int, int> CalcEndPointShift(const BezierCurve &bezierCurve, double flexibility, int margin) const;
+
+    // Apply the vertical shift of the slur end points
+    void ApplyEndPointShift(BezierCurve &bezierCurve, int endPointShiftLeft, int endPointShiftRight) const;
+
+    // Calculate slur from bulge values
+    void AdjustSlurFromBulge(BezierCurve &bezierCurve, int unit) const;
+
+    // Check whether control points should be adjusted horizontally
+    bool AllowControlOffsetAdjustment(const BezierCurve &bezierCurve, double symmetry, int unit) const;
+
+    // Calculate the horizontal control point offset
+    std::tuple<bool, int, int> CalcControlPointOffset(const BezierCurve &bezierCurve, int margin) const;
+
+    // Calculate the vertical control point shift
+    ControlPointAdjustment CalcControlPointVerticalShift(
+        const BezierCurve &bezierCurve, double symmetry, int margin) const;
+
+    // Solve the constraints for vertical control point adjustment
+    std::pair<int, int> SolveControlPointConstraints(
+        const std::list<ControlPointConstraint> &constraints, double symmetry = 0.0) const;
+
+    // Improve the slur shape by adjusting the control point heights
+    void AdjustSlurShape(BezierCurve &bezierCurve, curvature_CURVEDIR dir, int unit) const;
+    ///@}
+
+    /**
+     * Intermediate level helper functions for adjustment w.r.t. inner slurs
+     */
+    ///@{
+    // Calculate the vertical control point shift
+    ControlPointAdjustment CalcControlPointShift(const BezierCurve &bezierCurve,
+        const ArrayOfFloatingCurvePositioners &innerCurves, double symmetry, int margin) const;
+
+    // Calculate the vertical shift of the slur end points
+    std::pair<int, int> CalcEndPointShift(const BezierCurve &bezierCurve,
+        const ArrayOfFloatingCurvePositioners &innerCurves, double flexibility, int margin) const;
+    ///@}
+
+    /**
+     * Low level helper functions
+     */
+    ///@{
+    // Shift end points for collisions nearby
+    void ShiftEndPoints(int &shiftLeft, int &shiftRight, double ratio, int intersection, double flexibility,
+        bool isBelow, char spanningType) const;
+
+    // Calculate the full and partial shift radii
+    std::pair<double, double> CalcShiftRadii(bool forShiftLeft, double flexibility, char spanningType) const;
+
+    // Determine a quadratic interpolation function between zero and one and evaluate it
+    double CalcQuadraticInterpolation(double zeroAt, double oneAt, double arg) const;
+
+    // Rotate the slope by a given number of degrees, but choose smaller angles if already close to the vertical axis
+    // Choose doublingBound as the positive slope value where doubling has the same effect as rotating:
+    // tan(atan(doublingBound) + degrees * PI / 180.0) ≈ 2.0 * doublingBound
+    double RotateSlope(double slope, double degrees, double doublingBound, bool upwards) const;
+
+    // Calculate the minimal angle <)C1P1P2 or <)P1P2C2
+    float GetMinControlPointAngle(const BezierCurve &bezierCurve, float angle, int unit) const;
+    ///@}
+
 public:
     //
 private:
     // Indicates that there is at least one cross-staff slur
     bool m_crossStaffSlurs;
+    // The current slur
+    Slur *m_currentSlur;
+    // The curve positioner
+    FloatingCurvePositioner *m_currentCurve;
 };
 
 } // namespace vrv
diff --git a/include/vrv/bboxdevicecontext.h b/include/vrv/bboxdevicecontext.h
index e22c3408618..05b63b990ba 100644
--- a/include/vrv/bboxdevicecontext.h
+++ b/include/vrv/bboxdevicecontext.h
@@ -115,7 +115,7 @@ class BBoxDeviceContext : public DeviceContext {
      * @name Method for starting and ending a graphic
      */
     ///@{
-    void StartGraphic(Object *object, std::string gClass, std::string gId, GraphicID graphicID = PRIMARY,
+    void StartGraphic(Object *object, const std::string &gClass, const std::string &gId, GraphicID graphicID = PRIMARY,
         bool prepend = false) override;
     void EndGraphic(Object *object, View *view) override;
     ///@}
diff --git a/include/vrv/boundingbox.h b/include/vrv/boundingbox.h
index c4c7e1a3308..20a437657c5 100644
--- a/include/vrv/boundingbox.h
+++ b/include/vrv/boundingbox.h
@@ -182,7 +182,8 @@ class BoundingBox {
      * A segment of the beam that matches horizontal position of the bounding box is taken to find whether there is
      * intersection.
      */
-    int Intersects(const BeamDrawingInterface *beamInterface, Accessor type, int margin = 0) const;
+    int Intersects(const BeamDrawingInterface *beamInterface, Accessor type, int margin = 0,
+        bool fromBeamContentSide = false) const;
 
     //----------------//
     // Static methods //
diff --git a/include/vrv/btrem.h b/include/vrv/btrem.h
index c7c11b804d0..9d64e26e046 100644
--- a/include/vrv/btrem.h
+++ b/include/vrv/btrem.h
@@ -21,9 +21,9 @@ namespace vrv {
  * This class models the MEI <bTrem> element.
  */
 class BTrem : public LayerElement,
-              public AttBTremLog,
               public AttNumbered,
               public AttNumberPlacement,
+              public AttTremForm,
               public AttTremMeasured {
 public:
     /**
diff --git a/include/vrv/calcalignmentpitchposfunctor.h b/include/vrv/calcalignmentpitchposfunctor.h
index d7f4c3d2147..c6c2504f587 100644
--- a/include/vrv/calcalignmentpitchposfunctor.h
+++ b/include/vrv/calcalignmentpitchposfunctor.h
@@ -40,6 +40,9 @@ class CalcAlignmentPitchPosFunctor : public DocFunctor {
      */
     ///@{
     FunctorCode VisitLayerElement(LayerElement *layerElement) override;
+    FunctorCode VisitScore(Score *score) override;
+    FunctorCode VisitScoreDef(ScoreDef *scoreDef) override;
+    FunctorCode VisitStaffDef(StaffDef *staffDef) override;
     ///@}
 
 protected:
@@ -49,7 +52,10 @@ class CalcAlignmentPitchPosFunctor : public DocFunctor {
 public:
     //
 private:
-    //
+    // The current scoreDef default octave
+    data_OCTAVE m_octDefault;
+    // The current staffDef default octaves
+    std::map<int, data_OCTAVE> m_octDefaultForStaffN;
 };
 
 } // namespace vrv
diff --git a/include/vrv/devicecontext.h b/include/vrv/devicecontext.h
index f0255c0b125..e493d38b611 100644
--- a/include/vrv/devicecontext.h
+++ b/include/vrv/devicecontext.h
@@ -247,8 +247,8 @@ class DeviceContext {
      * For example, the method can be used for grouping shapes in <g></g> in SVG
      */
     ///@{
-    virtual void StartGraphic(
-        Object *object, std::string gClass, std::string gId, GraphicID graphicID = PRIMARY, bool preprend = false)
+    virtual void StartGraphic(Object *object, const std::string &gClass, const std::string &gId,
+        GraphicID graphicID = PRIMARY, bool preprend = false)
         = 0;
     virtual void EndGraphic(Object *object, View *view) = 0;
     ///@}
@@ -258,10 +258,15 @@ class DeviceContext {
      * For example, the method can be used for grouping shapes in <g></g> in SVG
      */
     ///@{
-    virtual void StartCustomGraphic(std::string name, std::string gClass = "", std::string gId = ""){};
+    virtual void StartCustomGraphic(const std::string &name, std::string gClass = "", std::string gId = ""){};
     virtual void EndCustomGraphic(){};
     ///@}
 
+    /**
+     * Method for changing the color of a custom graphic
+     */
+    virtual void SetCustomGraphicColor(const std::string &color){};
+
     /**
      * @name Methods for re-starting and ending a graphic for objects drawn in separate steps
      * The methods can be used to the output together, for example for a Beam
@@ -276,7 +281,7 @@ class DeviceContext {
      * For example, in SVG, a text graphic is a <tspan> (and not a <g>)
      */
     ///@{
-    virtual void StartTextGraphic(Object *object, std::string gClass, std::string gId)
+    virtual void StartTextGraphic(Object *object, const std::string &gClass, const std::string &gId)
     {
         StartGraphic(object, gClass, gId);
     }
diff --git a/include/vrv/devicecontextbase.h b/include/vrv/devicecontextbase.h
index 3db45409c47..faa51c6d05d 100644
--- a/include/vrv/devicecontextbase.h
+++ b/include/vrv/devicecontextbase.h
@@ -133,6 +133,7 @@ class FontInfo {
     FontInfo()
     {
         m_pointSize = 0;
+        m_letterSpacing = 0.0;
         m_family = 0; // was wxFONTFAMILY_DEFAULT;
         m_style = FONTSTYLE_NONE;
         m_weight = FONTWEIGHT_NONE;
@@ -147,6 +148,7 @@ class FontInfo {
 
     // accessors and modifiers for the font elements
     int GetPointSize() const { return m_pointSize; }
+    int GetLetterSpacing() const { return m_letterSpacing; }
     data_FONTSTYLE GetStyle() const { return m_style; }
     data_FONTWEIGHT GetWeight() const { return m_weight; }
     bool GetUnderlined() const { return m_underlined; }
@@ -158,6 +160,7 @@ class FontInfo {
     SmuflTextFont GetSmuflFont() const { return m_smuflFont; }
 
     void SetPointSize(int pointSize) { m_pointSize = pointSize; }
+    void SetLetterSpacing(double letterSpacing) { m_letterSpacing = letterSpacing; }
     void SetStyle(data_FONTSTYLE style) { m_style = style; }
     void SetWeight(data_FONTWEIGHT weight) { m_weight = weight; }
     void SetUnderlined(bool underlined) { m_underlined = underlined; }
@@ -171,6 +174,7 @@ class FontInfo {
 
 private:
     int m_pointSize;
+    int m_letterSpacing;
     int m_family;
     data_FONTSTYLE m_style;
     data_FONTWEIGHT m_weight;
diff --git a/include/vrv/div.h b/include/vrv/div.h
index 9ba84946929..8c488866910 100644
--- a/include/vrv/div.h
+++ b/include/vrv/div.h
@@ -18,7 +18,7 @@ namespace vrv {
 
 /**
  * This class represents an MEI Div.
- * The current implementation accepts <rend> as child of <div>, which is not valid
+ * The current implementation accepts rend as child of div, which is not valid
  * See https://github.com/music-encoding/music-encoding/issues/1189
  */
 class Div : public TextLayoutElement {
diff --git a/include/vrv/divline.h b/include/vrv/divline.h
new file mode 100644
index 00000000000..98622e62d5f
--- /dev/null
+++ b/include/vrv/divline.h
@@ -0,0 +1,104 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        divline.h
+// Author:      Yinan Zhou
+// Created:     2021
+// Copyright (c) Authors and others. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __VRV_DIVLINE_H__
+#define __VRV_DIVLINE_H__
+
+#include "atts_externalsymbols.h"
+#include "atts_neumes.h"
+#include "atts_shared.h"
+#include "layerelement.h"
+
+namespace vrv {
+
+//----------------------------------------------------------------------------
+// DivLine
+//----------------------------------------------------------------------------
+
+/**
+ * This class models the MEI <divLine> element.
+ */
+class DivLine : public LayerElement,
+                public AttColor,
+                public AttDivLineLog,
+                public AttExtSymAuth,
+                public AttExtSymNames,
+                public AttNNumberLike,
+                public AttVisibility {
+public:
+    /**
+     * @name Constructors, destructors, and other standard methods
+     * Reset method resets all attribute classes.
+     */
+    ///@{
+    DivLine();
+    virtual ~DivLine();
+    virtual Object *Clone() const { return new DivLine(*this); }
+    virtual void Reset();
+    virtual std::string GetClassName() const { return "DivLine"; }
+    ///@}
+
+    /** Override the method since alignment is required */
+    virtual bool HasToBeAligned() const { return true; }
+
+    /**
+     * Use to set the alignment for the Measure BarLine members.
+     * This is as special case where we need to add to the measure aligner.
+     */
+    bool SetAlignment(Alignment *alignment);
+
+    /**
+     * Retrieve SMuFL string for the divLine.
+     */
+    std::wstring GetSymbolStr() const;
+
+    /**
+     * @name Method used for drawing divLine on ornaments
+     */
+    static wchar_t GetDivLineGlyph(divLineLog_FORM);
+
+private:
+    //
+public:
+    //
+private:
+};
+
+//----------------------------------------------------------------------------
+// DivLineAttr
+//----------------------------------------------------------------------------
+
+/**
+ * This class models the divLine related attributes of a MEI measure.
+ */
+class DivLineAttr : public DivLine {
+public:
+    /**
+     * @name Constructors, destructors, and other standard methods
+     * No Reset() method is required.
+     */
+    ///@{
+    DivLineAttr();
+    virtual ~DivLineAttr();
+    virtual Object *Clone() const { return new DivLineAttr(*this); }
+    virtual std::string GetClassName() const { return "DivLineAttr"; }
+    ///@}
+
+    // void SetLeft() { m_isLeft = true; }
+
+private:
+    //
+public:
+    //
+private:
+    /** A flag for left barlines (right if false) */
+    // bool m_isLeft;
+};
+
+} // namespace vrv
+
+#endif
diff --git a/include/vrv/doc.h b/include/vrv/doc.h
index d1cfdc7a7af..d32fd434a3b 100644
--- a/include/vrv/doc.h
+++ b/include/vrv/doc.h
@@ -90,12 +90,12 @@ class Doc : public Object {
     /**
      * Generate a document pgFoot if none is provided
      */
-    bool GenerateFooter();
+    void GenerateFooter();
 
     /**
      * Generate a document pgHead from the MEI header if none is provided
      */
-    bool GenerateHeader();
+    void GenerateHeader();
 
     /**
      * Generate measure numbers from measure attributes
@@ -121,11 +121,6 @@ class Doc : public Object {
      */
     bool HasPage(int pageIdx) const;
 
-    /**
-     * Get all the Score in the visible Mdiv.
-     */
-    std::list<Score *> GetScores();
-
     /**
      * Get the Pages in the visible Mdiv.
      * Will find it only when having read a pages-based MEI file,
@@ -141,6 +136,31 @@ class Doc : public Object {
      */
     int GetPageCount() const;
 
+    /**
+     * Get the first scoreDef
+     */
+    ///@{
+    ScoreDef *GetFirstScoreDef();
+    const ScoreDef *GetFirstScoreDef() const;
+    ///@}
+
+    /**
+     * Get all visible scores / the first visible score
+     * Lazily updates the visible scores, hence not const
+     */
+    ///@{
+    std::list<Score *> GetVisibleScores();
+    Score *GetFirstVisibleScore();
+    ///@}
+
+    /**
+     * Get the corresponding score for a node
+     */
+    ///@{
+    Score *GetCorrespondingScore(const Object *object);
+    const Score *GetCorrespondingScore(const Object *object) const;
+    ///@}
+
     /**
      * Return true if the MIDI generation is already done
      */
@@ -225,7 +245,7 @@ class Doc : public Object {
      * Get the default distance from the staff for the object
      * The distance is given in x * MEI UNIT
      */
-    data_MEASUREMENTSIGNED GetStaffDistance(const ClassId classId, int staffIndex, data_STAFFREL staffPosition);
+    data_MEASUREMENTSIGNED GetStaffDistance(const Object *object, int staffIndex, data_STAFFREL staffPosition) const;
 
     /**
      * Prepare the timemap for MIDI and timemap file export.
@@ -418,19 +438,6 @@ class Doc : public Object {
     bool HasFacsimile() const { return m_facsimile != NULL; }
     ///@}
 
-    /**
-     * @name Setter and getter for the current Score/ScoreDef.
-     * If not set, then looks for the first Score in the Document and use that.
-     * The currentScoreDef is also changed by the Object::Process whenever as Score is reached.
-     * When processing backward, the ScoreDef is changed when reaching the corresponding PageMilestoneEnd
-     */
-    ///@{
-    Score *GetCurrentScore();
-    ScoreDef *GetCurrentScoreDef();
-    void SetCurrentScore(Score *score);
-    bool HasCurrentScore() const { return m_currentScore != NULL; }
-    ///@}
-
     /**
      * Return true if the document has been cast off already.
      */
@@ -477,6 +484,11 @@ class Doc : public Object {
      */
     void PrepareMeasureIndices();
 
+    /**
+     * Determine all visible scores
+     */
+    void CollectVisibleScores();
+
 public:
     Page *m_selectionPreceding;
     Page *m_selectionFollowing;
@@ -498,6 +510,11 @@ class Doc : public Object {
      */
     pugi::xml_document m_back;
 
+    /**
+     * The music@decls value
+     */
+    std::string m_musicDecls;
+
     /** The current page height */
     int m_drawingPageHeight;
     /** The current page width */
@@ -546,12 +563,10 @@ class Doc : public Object {
     Resources m_resources;
 
     /**
-     * @name Holds a pointer to the current score/scoreDef.
-     * Set by Doc::GetCurrentScoreDef or explicitly through Doc::SetCurrentScoreDef
+     * The list of all visible scores
+     * Used in Doc::GetCorrespondingScore to quickly determine the score for an object
      */
-    ///@{
-    Score *m_currentScore;
-    ///@}
+    std::list<Score *> m_visibleScores;
 
     /**
      * A flag indicating if the document has been cast off or not.
diff --git a/include/vrv/drawinginterface.h b/include/vrv/drawinginterface.h
index cd915eaa3c0..32d2e88e253 100644
--- a/include/vrv/drawinginterface.h
+++ b/include/vrv/drawinginterface.h
@@ -95,12 +95,10 @@ class BeamDrawingInterface : public ObjectListInterface {
 
     /**
      * Return information about the position in the beam.
-     * (no const since the cached list is updated)
-     * Object * is a pointer to the object implementing the interface (e.g., Beam, fTrem)
      */
     ///@{
-    bool IsFirstIn(const Object *object, const LayerElement *element) const;
-    bool IsLastIn(const Object *object, const LayerElement *element) const;
+    bool IsFirstIn(const LayerElement *element) const;
+    bool IsLastIn(const LayerElement *element) const;
     ///@}
 
     /**
@@ -113,11 +111,17 @@ class BeamDrawingInterface : public ObjectListInterface {
     ///@}
 
     /**
-     * Initialize m_cueSize value based on the @cue attribute and presence of child elements with @cue/@grace
+     * Initialize m_cueSize value based on the @cue attribute and presence of child elements with @cue
      * attributes
      */
     void InitCue(bool beamCue);
 
+    /**
+     * Initialize m_notesStemDir value based on the @graceGrp attribute and presence of child elements with @grace
+     * attributes
+     */
+    void InitGraceStemDir(bool graceGrp);
+
     bool IsHorizontal() const;
 
     bool IsRepeatedPattern() const;
@@ -163,7 +167,7 @@ class BeamDrawingInterface : public ObjectListInterface {
      * Return the position of the element in the beam.
      * For notes, lookup the position of the parent chord.
      */
-    int GetPosition(const Object *object, const LayerElement *element) const;
+    int GetPosition(const LayerElement *element) const;
 
     //
 private:
diff --git a/include/vrv/editortoolkit_neume.h b/include/vrv/editortoolkit_neume.h
index e265398335f..dfeb65043e5 100644
--- a/include/vrv/editortoolkit_neume.h
+++ b/include/vrv/editortoolkit_neume.h
@@ -17,6 +17,7 @@
 #include "doc.h"
 #include "editortoolkit.h"
 #include "view.h"
+#include "vrv.h"
 #include "zone.h"
 
 #include "jsonxx.h"
@@ -38,36 +39,46 @@ class EditorToolkitNeume : public EditorToolkit {
      */
     ///@{
     bool Chain(jsonxx::Array actions);
+    bool DisplaceClefOctave(std::string elementId, std::string direction);
     bool Drag(std::string elementId, int x, int y);
     bool Insert(std::string elementType, std::string staffId, int ulx, int uly, int lrx, int lry,
         std::vector<std::pair<std::string, std::string>> attributes);
+    bool InsertToSyllable(std::string elementId);
     bool Merge(std::vector<std::string> elementIds);
+    bool MoveOutsideSyllable(std::string elementId);
     bool Set(std::string elementId, std::string attrType, std::string attrValue);
     bool SetText(std::string elementId, const std::string &text);
     bool SetClef(std::string elementId, std::string shape);
     bool Split(std::string elementId, int x);
+    bool SplitNeume(std::string elementId, std::string ncId);
     bool Remove(std::string elementId);
     bool Resize(std::string elementId, int ulx, int uly, int lrx, int lry, float resize = NAN);
     bool Group(std::string groupType, std::vector<std::string> elementIds);
     bool Ungroup(std::string groupType, std::vector<std::string> elementIds);
     bool ChangeGroup(std::string elementId, std::string contour);
-    bool ToggleLigature(std::vector<std::string> elementIds, std::string isLigature);
+    bool ToggleLigature(std::vector<std::string> elementIds);
     bool ChangeStaff(std::string elementId);
+    bool ChangeStaffTo(std::string elementId, std::string staffId);
+    bool ClefMovementHandler(Clef *clef, int x, int y);
     ///@}
 protected:
     /**
      * Parse JSON instructions for experimental editor functions.
      */
     ///@{
+    bool ParseDisplaceClefAction(jsonxx::Object param, std::string *elementId, std::string *direction);
     bool ParseDragAction(jsonxx::Object param, std::string *elementId, int *x, int *y);
     bool ParseInsertAction(jsonxx::Object param, std::string *elementType, std::string *startId, std::string *endId);
     bool ParseInsertAction(jsonxx::Object param, std::string *elementType, std::string *staffId, int *ulx, int *uly,
         int *lrx, int *lry, std::vector<std::pair<std::string, std::string>> *attributes);
+    bool ParseInsertToSyllableAction(jsonxx::Object param, std::string *elementId);
     bool ParseMergeAction(jsonxx::Object param, std::vector<std::string> *elementIds);
+    bool ParseMoveOutsideSyllableAction(jsonxx::Object param, std::string *elementId);
     bool ParseSetAction(jsonxx::Object param, std::string *elementId, std::string *attrType, std::string *attrValue);
     bool ParseSetTextAction(jsonxx::Object param, std::string *elementId, std::string *text);
     bool ParseSetClefAction(jsonxx::Object param, std::string *elementId, std::string *shape);
     bool ParseSplitAction(jsonxx::Object param, std::string *elementId, int *x);
+    bool ParseSplitNeumeAction(jsonxx::Object param, std::string *elementId, std::string *ncId);
     bool ParseRemoveAction(jsonxx::Object param, std::string *elementId);
     bool ParseResizeAction(jsonxx::Object param, std::string *elementId, int *ulx, int *uly, int *lrx, int *lry);
     bool ParseResizeRotateAction(
@@ -75,8 +86,9 @@ class EditorToolkitNeume : public EditorToolkit {
     bool ParseGroupAction(jsonxx::Object param, std::string *groupType, std::vector<std::string> *elementIds);
     bool ParseUngroupAction(jsonxx::Object param, std::string *groupType, std::vector<std::string> *elementIds);
     bool ParseChangeGroupAction(jsonxx::Object param, std::string *elementId, std::string *contour);
-    bool ParseToggleLigatureAction(jsonxx::Object param, std::vector<std::string> *elementIds, std::string *isLigature);
+    bool ParseToggleLigatureAction(jsonxx::Object param, std::vector<std::string> *elementIds);
     bool ParseChangeStaffAction(jsonxx::Object param, std::string *elementId);
+    bool ParseChangeStaffToAction(jsonxx::Object param, std::string *elementId, std::string *staffId);
     ///@}
 
     /**
@@ -104,8 +116,8 @@ struct ClosestBB {
     int distanceToBB(int ulx, int uly, int lrx, int lry, double rotate = 0)
     {
         int offset = (x - ulx) * tan(rotate * M_PI / 180.0);
-        uly = uly - offset;
-        lry = lry - offset;
+        uly = uly + offset;
+        lry = lry + offset;
         int xDiff = std::max((ulx > x ? ulx - x : 0), (x > lrx ? x - lrx : 0));
         int yDiff = std::max((uly > y ? uly - y : 0), (y > lry ? y - lry : 0));
 
@@ -126,11 +138,45 @@ struct ClosestBB {
     }
 };
 
+// To be used with std::stable_sort to find the position to insert a new accid / divLine
+struct ClosestNeume {
+    int x;
+    int y;
+
+    bool operator()(Object *a, Object *b)
+    {
+        // check if neume has neume components
+        if (!a->GetFirst(NC)) {
+            LogError("Neume %s doesn't have neume components.", a->GetID().c_str());
+            return true;
+        }
+        if (!b->GetFirst(NC)) {
+            LogError("Neume %s doesn't have neume components.", b->GetID().c_str());
+            return true;
+        }
+        if (!a->GetFirst(NC)->GetFacsimileInterface()) {
+            LogError("Neume component %s doesn't have facsimile.", a->GetFirst(NC)->GetID().c_str());
+            return true;
+        }
+        if (!b->GetFirst(NC)->GetFacsimileInterface()) {
+            LogError("Neume component %s doesn't have facsimile.", b->GetFirst(NC)->GetID().c_str());
+            return true;
+        }
+        Zone *zoneA = a->GetFirst(NC)->GetFacsimileInterface()->GetZone();
+        Zone *zoneB = b->GetFirst(NC)->GetFacsimileInterface()->GetZone();
+
+        int distA = std::abs(x - zoneA->GetUlx());
+        int distB = std::abs(x - zoneB->GetUlx());
+
+        return (distA < distB);
+    }
+};
+
 // To be used with std::stable_sort to find the position to insert a new staff
 
 struct StaffSort {
     // Sort staves left-to-right and top-to-bottom
-    // Sort by y if there is no intersection, by x if there is
+    // Sort by y if there is no intersection, by x if there is x intersection is smaller than half length of staff line
     bool operator()(Object *a, Object *b)
     {
         if (!a->GetFacsimileInterface() || !b->GetFacsimileInterface()) return true;
@@ -156,8 +202,11 @@ struct StaffSort {
             : zoneB->GetUly() - (zoneB->GetLrx() - zoneB->GetUlx()) * tan(zoneB->GetRotate() * M_PI / 180.0);
 
         // Check for y intersection
-        if ((aLowest <= bLowest && aLowest >= bHighest) || (aHighest <= bLowest && aHighest >= bHighest)
-            || (bLowest <= aLowest && bLowest >= aHighest) || (bHighest <= aLowest && bHighest >= aHighest)) {
+        // if the x intersection part is smaller than half of length of staffA
+        // sort by x coordinate
+        if (((aLowest <= bLowest && aLowest >= bHighest) || (aHighest <= bLowest && aHighest >= bHighest)
+                || (bLowest <= aLowest && bLowest >= aHighest) || (bHighest <= aLowest && bHighest >= aHighest))
+            && (zoneA->GetLrx() - zoneB->GetUlx() <= 0.5 * (zoneA->GetLrx() - zoneA->GetUlx()))) {
             // sort by x center
             return (zoneA->GetUlx() < zoneB->GetUlx());
         }
diff --git a/include/vrv/floatingobject.h b/include/vrv/floatingobject.h
index aaa9d9edcf3..f6cd1f450a3 100644
--- a/include/vrv/floatingobject.h
+++ b/include/vrv/floatingobject.h
@@ -251,7 +251,7 @@ class FloatingPositioner : public BoundingBox {
     /**
      * Update the Y drawing relative position based on collision detection with the overlapping bounding box
      */
-    void CalcDrawingYRel(Doc *doc, const StaffAlignment *staffAlignment, const BoundingBox *horizOverlappingBBox);
+    void CalcDrawingYRel(const Doc *doc, const StaffAlignment *staffAlignment, const BoundingBox *horizOverlappingBBox);
 
     /**
      * Align extender elements across systems
diff --git a/include/vrv/functor.h b/include/vrv/functor.h
index 54185b9ecb9..6a08fac2bea 100644
--- a/include/vrv/functor.h
+++ b/include/vrv/functor.h
@@ -8,8 +8,6 @@
 #ifndef __VRV_FUNCTOR_H__
 #define __VRV_FUNCTOR_H__
 
-#include <stack>
-
 #include "comparison.h"
 #include "functorinterface.h"
 #include "vrvdef.h"
@@ -31,7 +29,7 @@ class FunctorBase {
      * @name Constructors, destructors
      */
     ///@{
-    FunctorBase(){};
+    FunctorBase() {}
     virtual ~FunctorBase() = default;
     ///@}
 
@@ -45,16 +43,7 @@ class FunctorBase {
     ///@}
 
     /**
-     * Getters/Setters for the filters
-     */
-    ///@{
-    Filters *GetFilters() { return m_filters.empty() ? NULL : m_filters.top(); }
-    void PushFilters(Filters *filters) { m_filters.push(filters); }
-    void PopFilters() { m_filters.pop(); }
-    ///@}
-
-    /**
-     * Getters/Setters for the visibility
+     * Getter/Setter for the visibility
      */
     ///@{
     bool VisibleOnly() const { return m_visibleOnly; }
@@ -62,12 +51,24 @@ class FunctorBase {
     ///@}
 
     /**
-     * Getters/Setters for the direction
+     * Getters/Setters for the filters and direction
+     * Here setters return the previous value
      */
     ///@{
-    bool GetDirection() const { return m_direction.empty() ? FORWARD : m_direction.top(); }
-    void PushDirection(bool direction) { m_direction.push(direction); }
-    void PopDirection() { m_direction.pop(); }
+    Filters *GetFilters() const { return m_filters; }
+    Filters *SetFilters(Filters *filters)
+    {
+        Filters *previous = m_filters;
+        m_filters = filters;
+        return previous;
+    }
+    bool GetDirection() const { return m_direction; }
+    bool SetDirection(bool direction)
+    {
+        bool previous = m_direction;
+        m_direction = direction;
+        return previous;
+    }
     ///@}
 
     /**
@@ -82,12 +83,12 @@ class FunctorBase {
 private:
     // The functor code
     FunctorCode m_code = FUNCTOR_CONTINUE;
-    // The filter stack
-    std::stack<Filters *> m_filters;
+    // The filters
+    Filters *m_filters = NULL;
     // Visible only flag
     bool m_visibleOnly = true;
-    // The direction stack
-    std::stack<bool> m_direction;
+    // Direction
+    bool m_direction = FORWARD;
 };
 
 //----------------------------------------------------------------------------
@@ -103,7 +104,7 @@ class Functor : public FunctorBase, public FunctorInterface {
      * @name Constructors, destructors
      */
     ///@{
-    Functor(){};
+    Functor() {}
     virtual ~Functor() = default;
     ///@}
 
@@ -128,7 +129,7 @@ class ConstFunctor : public FunctorBase, public ConstFunctorInterface {
      * @name Constructors, destructors
      */
     ///@{
-    ConstFunctor(){};
+    ConstFunctor() {}
     virtual ~ConstFunctor() = default;
     ///@}
 
diff --git a/include/vrv/horizontalaligner.h b/include/vrv/horizontalaligner.h
index 1e3ae47f246..9c8a8da8160 100644
--- a/include/vrv/horizontalaligner.h
+++ b/include/vrv/horizontalaligner.h
@@ -45,6 +45,7 @@ enum AlignmentType {
     ALIGNMENT_ACCID,
     ALIGNMENT_GRACENOTE,
     ALIGNMENT_BARLINE,
+    ALIGNMENT_DIVLINE,
     ALIGNMENT_DEFAULT,
     // Non-justifiable
     ALIGNMENT_MEASURE_RIGHT_BARLINE,
diff --git a/include/vrv/iohumdrum.h b/include/vrv/iohumdrum.h
index 9036fe2cfde..f5ac61083e2 100644
--- a/include/vrv/iohumdrum.h
+++ b/include/vrv/iohumdrum.h
@@ -22,6 +22,7 @@
 #include "clef.h"
 #include "dir.h"
 #include "ending.h"
+#include "fing.h"
 #include "ftrem.h"
 #include "harm.h"
 #include "io.h"
@@ -365,12 +366,19 @@ class HumdrumSignifiers {
     bool empty = true;
 
     // boolean switches:
-    char nostem = '\0'; // !!!RDF**kern: N = no stem
-    char cuesize = '\0'; // !!!RDF**kern: @ = cue size
-    char terminallong = '\0'; // !!!RDF**kern: l = terminal long
-    char terminalbreve = '\0'; // !!!RDF**kern: l = terminal breve
-    std::vector<char> editacc; // !!!RDF**kern: i = editorial accidental
-    std::vector<std::string> edittype; // !!!RDF**kern: i = editoral accidental, brack[ets]/paren[theses]
+    std::string nostem; // !!!RDF**kern: N = no stem
+    std::string cuesize; // !!!RDF**kern: @ = cue size
+
+    std::string kernTerminalLong; // !!!RDF**kern: l = terminal long
+    std::string kernTerminalBreve; // !!!RDF**kern: l = terminal breve
+
+    std::string mensTerminalLong; // !!!RDF**mens: l = terminal long
+    std::string mensTerminalBreve; // !!!RDF**mens: l = terminal breve
+
+    std::vector<string> editaccKern; // !!!RDF**kern: i = editorial accidental
+    std::vector<string> editaccMens; // !!!RDF**mens: z = editorial accidental
+    std::vector<std::string> edittypeKern; // !!!RDF**kern: i = editoral accidental, brack[ets]/paren[theses]
+    std::vector<std::string> edittypeMens; // !!!RDF**mens: z = editoral accidental, brack[ets]/paren[theses]
 
     // for **dynam:
     std::string cresctext; // !!!RDF**kern: > = "cresc."
@@ -378,8 +386,8 @@ class HumdrumSignifiers {
     std::string decresctext; // !!!RDF**kern: > = "decresc."
     std::string decrescfontstyle; // !!!RDF**kern: < = "decresc." fontstyle="normal|italic|bold|bold-italic"
 
-    char below = '\0'; // !!!RDF**kern: < = below (previous signifier is "below")
-    char above = '\0'; // !!!RDF**kern: > = above (previous signifier is "above")
+    std::string below; // !!!RDF**kern: < = below (previous signifier is "below")
+    std::string above; // !!!RDF**kern: > = above (previous signifier is "above")
 
     std::string phrase_color; // for global stying of phrase markers
     std::string phrase_style; // for global stying of phrase markers
@@ -397,30 +405,77 @@ class HumdrumSignifiers {
     // default is red if no color given:
     // !!!RDF**kern: i = matched note
     // !!!RDF**kern: i = marked note
-    std::vector<char> mark;
+    std::vector<string> mark;
     std::vector<std::string> mcolor;
     std::vector<std::string> markdir;
 
     // Coloring of **mens notes (not for coloration).
     // default color is hotpink, since red is used for
     // colored notes in black notation.
-    std::vector<char> mens_mark;
+    std::vector<string> mens_mark;
     std::vector<std::string> mens_mcolor;
     std::vector<std::string> mens_markdir;
 
     // Coloring of **text:
-    std::vector<char> textmark;
+    std::vector<string> textmark;
     std::vector<std::string> textcolor;
 
     // Articulation signfiers
-    char hairpinAccent = '\0'; // For <> accent on a note.
-    char verticalStroke = '\0'; // For horizontal stroke ornament
-    char lhpizz = '\0'; // For left-hand pizzicato
-    char tremolo = '\0'; // For unmeasured tremolo slashes
+    std::string hairpinAccent; // For <> accent on a note.
+    std::string verticalStroke; // For horizontal stroke ornament
+    std::string lhpizz; // For left-hand pizzicato
+    std::string tremolo; // For unmeasured tremolo slashes
 };
 
 #endif /* NO_HUMDRUM_SUPPORT */
 
+struct HumdrumReferenceItem {
+    std::string lineText; // the full text of the HumdrumLine containing this item,
+                          // e.g. "!!!OTL2@FR:Le deuxième titre Français"
+    std::string key; // the interpreted key, with key, index, isTranslated, language stripped out
+                     // e.g. "OTL" (if not parseable, we get everything between "!!!" and ":")
+    std::string value; // the value (everything after the ':')
+                       // e.g. "Le deuxième titre Français"
+    bool isParseable = false; // true if we could parse out key, index, isTranslated, language
+                              // e.g. true
+    bool isHumdrumKey = false; // true if isParseable and key is in the known list of Humdrum keys
+                               // e.g. true
+    bool isTranslated = false; // true if single '@' (not '@@') is present
+                               // e.g. true
+    std::string language; // the language, if present, lowercased
+                          // e.g. "fr"
+    int index = -1; // the index (0 if not present)
+                    // e.g. 2
+};
+
+struct DateWithErrors {
+    bool valid = false; // if false, ignore everything here, the date was not parseable.
+    std::string dateError; // error of the entire date ("", "approximate", "uncertain")
+    int year;
+    std::string yearError; // error of the year ("", "approximate", "uncertain")
+    int month;
+    std::string monthError; // error of the month ("", "approximate", "uncertain")
+    int day;
+    std::string dayError; // error of the day ("", "approximate", "uncertain")
+    int hour;
+    std::string hourError; // error of the hour ("", "approximate", "uncertain")
+    int minute;
+    std::string minuteError; // error of the minute ("", "approximate", "uncertain")
+    int second;
+    std::string secondError; // error of the second ("", "approximate", "uncertain")
+};
+
+struct DateConstruct {
+    // constructType can be any of "" (invalid), "DateSingle" (one date), "DateRelative"
+    // (one date, qualifier="before" or "after"), "DateBetween" (two dates), "DateSelection"
+    // (N dates, qualifier="and" or "or"), or "DateConstructRange" (two DateConstructs).
+    std::string constructType; // if type is "", ignore everything here, the date construct was not parseable.
+    std::string dateConstructError; // error of the entire DateConstruct
+    std::string qualifier;
+    std::vector<DateWithErrors> dates; // empty for "DateConstructRange"
+    std::vector<DateConstruct> dateConstructs; // only used for "DateConstructRange" (has two elements in that case)
+};
+
 //----------------------------------------------------------------------------
 // HumdrumInput
 //----------------------------------------------------------------------------
@@ -482,7 +537,7 @@ class HumdrumInput : public vrv::Input {
     void addFermata(hum::HTp token, vrv::Object *parent = NULL);
     void addBreath(hum::HTp token, vrv::Object *parent = NULL);
     void addTrill(vrv::Object *linked, hum::HTp token);
-    void addTurn(hum::HTp token, const string &tok, int noteIndex);
+    void addTurn(hum::HTp token, const std::string &tok, int noteIndex);
     void addMordent(vrv::Object *linked, hum::HTp token);
     void addOrnaments(vrv::Object *object, hum::HTp token);
     void addArpeggio(vrv::Object *object, hum::HTp token);
@@ -596,7 +651,7 @@ class HumdrumInput : public vrv::Input {
     void embedQstampInClass(vrv::Space *irest, hum::HTp token, const std::string &tstring);
     void embedPitchInformationInClass(vrv::Note *note, const std::string &token);
     void embedTieInformation(Note *note, const std::string &token);
-    void splitSyllableBySpaces(vector<std::string> &vtext, char spacer = ' ');
+    void splitSyllableBySpaces(std::vector<std::string> &vtext, char spacer = ' ');
     void addDefaultTempo(ScoreDef *scoreDef);
     int getChordNoteCount(hum::HTp token);
     bool isLeftmostSystemArpeggio(hum::HTp token);
@@ -657,7 +712,7 @@ class HumdrumInput : public vrv::Input {
     void removeInstrumentAbbreviation(StaffDef *sd);
     std::string getEndIdForOttava(hum::HTp token);
     void prepareInitialOttavas(hum::HTp measure);
-    void linkFingeringToNote(Dir *dir, hum::HTp token, int xstaffindex);
+    void linkFingeringToNote(Fing *fing, hum::HTp token, int xstaffindex);
     bool checkForTupletForcedBreak(const std::vector<hum::HTp> &duritems, int index);
     void extractSlurNoteAttachmentInformation(std::vector<std::pair<int, bool>> &data, hum::HTp token, char slurtype);
     void extractPhraseNoteAttachmentInformation(
@@ -723,7 +778,7 @@ class HumdrumInput : public vrv::Input {
     bool hasLayoutParameter(hum::HTp token, const std::string &category, const std::string &param);
     void assignTupletScalings(std::vector<humaux::HumdrumBeamAndTuplet> &tg);
     std::string getLayoutParameter(hum::HTp token, const std::string &category, const std::string &catkey,
-        const string &trueString, const string &falseString = "");
+        const std::string &trueString, const std::string &falseString = "");
     void analyzeClefNulls(hum::HumdrumFile &infile);
     void markAdjacentNullsWithClef(hum::HTp clef);
     void markOtherClefsAsChange(hum::HTp clef);
@@ -744,12 +799,12 @@ class HumdrumInput : public vrv::Input {
     void addPlicaUp(Note *note);
     void addPlicaDown(Note *note);
     void setLayoutSlurDirection(Slur *slur, hum::HTp token);
-    void setFontStyle(Rend *rend, const string &fontstyle);
+    void setFontStyle(Rend *rend, const std::string &fontstyle);
     void setFontWeight(Rend *rend, const std::string &fontweight);
     void importVerovioOptions(Doc *doc);
     void adjustChordNoteDurations(Chord *chord, std::vector<Note *> &notes, std::vector<string> &tstrings);
     void adjustChordNoteDuration(Note *note, hum::HumNum hdur, int dur, int dots, hum::HumNum chorddur,
-        const string &tstring, hum::HumNum factor);
+        const std::string &tstring, hum::HumNum factor);
     void setNoteMeiDur(Note *note, int meidur);
     void storeExpansionListsInChoice(Section *section, std::vector<hum::HTp> &expansions);
     double getMmTempo(hum::HTp token, bool checklast = false);
@@ -766,7 +821,7 @@ class HumdrumInput : public vrv::Input {
     void addBarLineElement(hum::HTp bartok, std::vector<std::string> &elements, std::vector<void *> &pointers);
     void prepareFingerings(hum::HumdrumFile &infile);
     void prepareFingerings(hum::HTp fstart);
-    std::string getLoColor(hum::HTp token, const string &category, int subtoken = 0);
+    std::string getLoColor(hum::HTp token, const std::string &category, int subtoken = 0);
     bool isTieAllowedToHang(hum::HTp token);
     void analyzeVerseColor(hum::HumdrumFile &infile);
     void analyzeVerseColor(hum::HTp &token);
@@ -803,8 +858,8 @@ class HumdrumInput : public vrv::Input {
     void analyzeHarmInterpretations(hum::HTp starttok);
     void analyzeDegreeInterpretations(hum::HTp starttok);
     void analyzeTextInterpretation(hum::HTp starttok);
-    void addHarmLabel(
-        hum::HumNum timestamp, const std::string &label, const std::string &n, const std::string &place, int staffNum);
+    void addHarmLabel(hum::HumNum timestamp, const std::string &label, const std::string &labelStyle,
+        const std::string &n, const std::string &place, int staffNum);
     std::u32string getMoveableDoName(hum::HTp token, int degree, int semitones);
     void setFontsizeForHarm(Harm *harm, const std::string &fontsize);
     void setFontStyleForHarm(Harm *harm, const std::string &style);
@@ -824,22 +879,53 @@ class HumdrumInput : public vrv::Input {
     void checkForLineContinuations(hum::HTp token);
     std::u32string convertNumberToWstring(int number);
     void appendTextToRend(Rend *rend, const std::string &content);
-    void parseMultiVerovioOptions(std::map<std::string, std::string> &parameters, const string &input);
+    void parseMultiVerovioOptions(std::map<std::string, std::string> &parameters, const std::string &input);
     void addSforzandoToNote(hum::HTp token, int staffindex);
     void addDynamicsMark(hum::HTp dyntok, hum::HTp token, hum::HLp line, const std::string &letters, int staffindex,
         int staffadj, int trackdiff);
     bool hasNoStaves(hum::HumdrumFile &infile);
     hum::HTp getVisualKeySignature(hum::HTp keysigtok);
+    bool isNotAtStartOfMeasure(std::vector<hum::HTp> &layerdata, int index);
+    void analyzeFingerings(hum::HumdrumFile &infile);
+    void analyzeFingerings(hum::HTp sstart);
+    void insertMidMeasureKeySignature(
+        int staffindex, std::vector<std::string> &elements, std::vector<void *> &pointers, hum::HTp token);
+    int getKeySignatureNumber(const std::string &humkeysig);
+    int getStaffNumForSpine(hum::HTp token);
+    bool checkIfReversedSpineOrder(std::vector<hum::HTp> &staffstarts);
 
     // header related functions: ///////////////////////////////////////////
     void createHeader();
-    void insertTitle(pugi::xml_node &titleStmt, const std::vector<hum::HumdrumLine *> &references);
-    void insertExtMeta(std::vector<hum::HumdrumLine *> &references);
-    void addPerson(std::vector<std::vector<std::string>> &respPeople, std::vector<hum::HumdrumLine *> &references,
-        const std::string &key, const std::string &role);
-    void getRespPeople(std::vector<std::vector<std::string>> &respPeople, std::vector<hum::HumdrumLine *> &references);
-    void insertRespStmt(pugi::xml_node &titleStmt, std::vector<std::vector<std::string>> &respPeople);
-    void insertPeople(pugi::xml_node &work, std::vector<std::vector<std::string>> &respPeople);
+    void createFileDesc(pugi::xml_node meiHead);
+    void createDigitalSource(pugi::xml_node sourceDesc);
+    void createPrintedSource(pugi::xml_node sourceDesc);
+    void createRecordedSource(pugi::xml_node sourceDesc);
+    void createUnpublishedSource(pugi::xml_node sourceDesc);
+    void createEncodingDesc(pugi::xml_node meiHead);
+    void createWorkList(pugi::xml_node meiHead);
+    void createHumdrumVerbatimExtMeta(pugi::xml_node meiHead);
+    void createBackMatter();
+    void createSimpleTitleElement();
+    void createSimpleComposerElements();
+    void createTitleElements(pugi::xml_node element);
+    void createComposerElements(pugi::xml_node element);
+    void fillInIsoDate(pugi::xml_node element, const std::string &dateString);
+    std::map<std::string, std::string> isoDateAttributesFromHumdrumDate(
+        const std::string &inHumdrumDate, bool edtf = false);
+    DateConstruct dateConstructFromHumdrumDate(const std::string &dateString);
+    std::map<std::string, std::string> isoDateAttributesFromDateConstruct(
+        const DateConstruct &dateConstruct, bool edtf, bool isEdgeOfDateConstructRange = false);
+    std::string isoDateFromDateWithErrors(const DateWithErrors &dateWithErrors, bool edtf);
+    DateWithErrors dateWithErrorsFromHumdrumDate(const std::string &dateString);
+    bool sanityCheckDate(int year, int month, int day, int hour, int minute, int second);
+    std::string stripDateError(std::string &value);
+    std::string getTextListLanguage(const std::vector<HumdrumReferenceItem> &textItems);
+    std::map<std::string, std::vector<HumdrumReferenceItem>> getAllReferenceItems(hum::HumdrumFile &infile);
+    std::vector<HumdrumReferenceItem> getReferenceItems(const std::string &key);
+    bool anyReferenceItemsExist(const std::vector<string> &keys);
+    int getBestItem(const std::vector<HumdrumReferenceItem> &items, const std::string &requiredLanguage);
+    bool isStandardHumdrumKey(const std::string &key);
+    void appendText(pugi::xml_node element, std::string text);
 
     /// Templates ///////////////////////////////////////////////////////////
     template <class ELEMENT> void verticalRest(ELEMENT rest, const std::string &token);
@@ -897,8 +983,8 @@ class HumdrumInput : public vrv::Input {
     template <class ELEMENT> void addDurRecip(ELEMENT element, const std::string &ttoken);
     template <class ELEMENT> void addFermata(ELEMENT *rest, const std::string &tstring);
     template <class ELEMENT> void storeExpansionList(ELEMENT *parent, hum::HTp etok);
-    template <class ELEMENT> void setWrittenAccidentalUpper(ELEMENT element, const string &value);
-    template <class ELEMENT> void setWrittenAccidentalLower(ELEMENT element, const string &value);
+    template <class ELEMENT> void setWrittenAccidentalUpper(ELEMENT element, const std::string &value);
+    template <class ELEMENT> void setWrittenAccidentalLower(ELEMENT element, const std::string &value);
     template <class ELEMENT> void attachToToken(ELEMENT *element, hum::HTp token);
     template <class ELEMENT> void setAttachmentType(ELEMENT *element, hum::HTp token);
     template <class ELEMENT>
@@ -913,7 +999,6 @@ class HumdrumInput : public vrv::Input {
     static int nextLowerPowerOfTwo(int x);
     static hum::HumNum nextHigherPowerOfTwo(hum::HumNum x);
     static std::string getDateString();
-    static std::string getReferenceValue(const std::string &key, std::vector<hum::HumdrumLine *> &references);
     static bool replace(std::string &str, const std::string &oldStr, const std::string &newStr);
     static bool replace(std::u32string &str, const std::u32string &oldStr, const std::u32string &newStr);
 
@@ -1148,13 +1233,13 @@ class HumdrumInput : public vrv::Input {
     std::vector<Slur *> m_ftrem_slurs;
 
     // m_group_name == used to store group names, such as *I""trumpets
-    std::map<int, string> m_group_name;
+    std::map<int, std::string> m_group_name;
 
     // m_group_name_tok == used to store group names, such as *I""trumpets
     std::map<int, hum::HTp> m_group_name_tok;
 
     // m_group_abbr == used to store group abbreviations, such as *I""trps.
-    std::map<int, string> m_group_abbr;
+    std::map<int, std::string> m_group_abbr;
 
     // m_group_abbr_tok == used to store group abbreviations, such as *I""trps.
     std::map<int, hum::HTp> m_group_abbr_tok;
@@ -1196,6 +1281,114 @@ class HumdrumInput : public vrv::Input {
     // (excluding augmentation dots).
     std::string m_textSmuflSpacer = "\xc2\xa0";
 
+    // Some metadata elements that are computed once and used multiple times
+    std::vector<hum::HumdrumLine *> m_humdrumLineReferences;
+    std::map<std::string, std::vector<HumdrumReferenceItem>> m_references;
+    pugi::xml_document m_simpleTitleDoc;
+    pugi::xml_node m_simpleTitle;
+    pugi::xml_document m_simpleComposersDoc;
+    pugi::xml_document m_madsDoc;
+    pugi::xml_node m_madsCollection;
+
+    std::vector<string> m_standardHumdrumKeys = {
+        "COM", // composer's name
+        "COA", // attributed composer
+        "COS", // suspected composer
+        "COL", // composer's abbreviated, alias, or stage name
+        "COC", // composer's corporate name
+        "CDT", // composer's birth and death dates (**zeit format)
+        "CBL", // composer's birth location
+        "CDL", // composer's death location
+        "CNT", // composer's nationality
+        "LYR", // lyricist's name
+        "LIB", // librettist's name
+        "LAR", // music arranger's name
+        "LOR", // orchestrator's name
+        "TXO", // original language of vocal/choral text
+        "TXL", // language of the encoded vocal/choral text
+        "TRN", // translator of the text
+        "RTL", // album title
+        "RMM", // manufacturer or sponsoring company
+        "RC#", // recording company's catalog number of album
+        "RRD", // release date (**date format)
+        "RLC", // place of recording
+        "RNP", // producer's name
+        "RDT", // date of recording (**date format)
+        "RT#", // track number
+        "MGN", // Humdrum encodes, say, a MIDI performance)
+        "MPN", // ensemble's name
+        "MPS", // performer's name
+        "MRD", // suspected performer
+        "MLC", // date of performance (**date format)
+        "MCN", // place of performance
+        "MPD", // conductor's name
+        "MDT", // date of first performance (**date format)
+        "OTL", // I've seen 'em (another way to say date of performance?)
+        "OTP", // title
+        "OTA", // popular title
+        "OPR", // alternative title
+        "OAC", // title of parent work
+        "OSC", // act number (e.g. '2' or 'Act 2')
+        "OMV", // scene number (e.g. '3' or 'Scene 3')
+        "OMD", // movement number (e.g. '4', or 'mov. 4', or...)
+        "OPS", // movement name
+        "ONM", // opus number (e.g. '23', or 'Opus 23')
+        "OVM", // number (e.g. number of song within ABC multi-song file)
+        "ODE", // volume number (e.g. '6' or 'Vol. 6')
+        "OCO", // dedicated to
+        "OCL", // commissioned by
+        "ONB", // collected/transcribed by
+        "ODT", // free form note related to title or identity of work
+        "OCY", // date or period of composition (**date or **zeit format)
+        "OPC", // country of composition
+        "GTL", // city, town, or village of composition
+        "GAW", // group title (e.g. 'The Seasons')
+        "GCO", // associated work, such as a play or film
+        "PUB", // publication status 'published'/'unpublished'
+        "PED", // publication editor
+        "PPR", // first publisher
+        "PDT", // date first published (**date format)
+        "PTL", // publication (volume) title
+        "PPP", // place first published
+        "PC#", // publisher's catalog number (NOT scholarly catalog)
+        "SCT", // scholarly catalog abbrev/number (e.g. 'BWV 551')
+        "SCA", // scholarly catalog (unabbreviated) (e.g. 'Koechel 117')
+        "SMS", // unpublished manuscript source name
+        "SML", // unpublished manuscript location
+        "SMA", // acknowledgment of manuscript access
+        "YEP", // publisher of electronic edition
+        "YEC", // date and owner of electronic copyright
+        "YER", // date electronic edition released
+        "YEM", // copyright message (e.g. 'All rights reserved')
+        "YEN", // country of copyright
+        "YOR", // original document from which encoded doc was prepared
+        "YOO", // original document owner
+        "YOY", // original copyright year
+        "YOE", // original editor
+        "EED", // electronic editor
+        "ENC", // electronic encoder (person)
+        "END", // encoding date
+        "EMD", // electronic document modification description (one/mod)
+        "EEV", // electronic edition version
+        "EFL", // file number e.g. '1/4' for one of four
+        "EST", // encoding status (usually deleted before distribution)
+        "VTS", // checksum (excluding the VTS line itself)
+        "ACO", // collection designation
+        "AFR", // form designation
+        "AGN", // genre designation
+        "AST", // style, period, or type of work designation
+        "AMD", // mode classification e.g. '5; Lydian'
+        "AMT", // metric classification, must be one of eight names, e.g. 'simple quadruple'
+        "AIN", // instrumentation, must be alphabetical list of *I abbrevs, space-delimited
+        "ARE", // geographical region of origin (list of 'narrowing down' names of regions)
+        "ARL", // geographical location of origin (lat/long)
+        "HAO", // aural history (lots of text, stories about the work)
+        "HTX", // freeform translation of vocal text
+        "RLN", // Extended ASCII language code
+        "RNB", // a note about the representation
+        "RWB" // a warning about the representation
+    };
+
 #endif /* NO_HUMDRUM_SUPPORT */
 };
 
diff --git a/include/vrv/iomei.h b/include/vrv/iomei.h
index 05d5c967dc5..6b0d7800119 100644
--- a/include/vrv/iomei.h
+++ b/include/vrv/iomei.h
@@ -52,6 +52,7 @@ class Del;
 class Dot;
 class Dir;
 class Div;
+class DivLine;
 class DurationInterface;
 class Dynam;
 class Ending;
@@ -305,7 +306,7 @@ class MEIOutput : public Output {
      * Scoredef manipulation
      */
     ///@{
-    void WriteCustomScoreDef();
+    void WriteCustomScoreDef(ScoreDef *scoreDef);
     void AdjustStaffDef(StaffDef *staffDef, Measure *measure);
     bool AdjustLabel(Label *label);
     ///@}
@@ -389,6 +390,7 @@ class MEIOutput : public Output {
     void WriteChord(pugi::xml_node currentNode, Chord *chord);
     void WriteClef(pugi::xml_node currentNode, Clef *clef);
     void WriteCustos(pugi::xml_node currentNode, Custos *custos);
+    void WriteDivLine(pugi::xml_node currentNode, DivLine *divLine);
     void WriteDot(pugi::xml_node currentNode, Dot *dot);
     void WriteFTrem(pugi::xml_node currentNode, FTrem *fTrem);
     void WriteGraceGrp(pugi::xml_node currentNode, GraceGrp *graceGrp);
@@ -699,6 +701,7 @@ class MEIInput : public Input {
     bool ReadChord(Object *parent, pugi::xml_node chord);
     bool ReadClef(Object *parent, pugi::xml_node clef);
     bool ReadCustos(Object *parent, pugi::xml_node custos);
+    bool ReadDivLine(Object *parent, pugi::xml_node divLine);
     bool ReadDot(Object *parent, pugi::xml_node dot);
     bool ReadFTrem(Object *parent, pugi::xml_node fTrem);
     bool ReadGraceGrp(Object *parent, pugi::xml_node graceGrp);
@@ -886,20 +889,20 @@ class MEIInput : public Input {
      */
     ///@{
     // to MEI 5.0.0
-    void UpgradeKeySigTo_5_0_0(pugi::xml_node keySig);
-    void UpgradePageTo_5_0_0(Page *page);
-    void UpgradePgHeadFootTo_5_0_0(pugi::xml_node element);
-    void UpgradeMeasureTo_5_0_0(pugi::xml_node measure);
-    void UpgradeMeterSigTo_5_0_0(pugi::xml_node meterSig, MeterSig *vrvMeterSig);
-    void UpgradeScoreDefElementTo_5_0_0(pugi::xml_node scoreDefElement);
-    void UpgradeStaffTo_5_0_0(pugi::xml_node staff);
-    void UpgradeLayerElementTo_5_0_0(pugi::xml_node element);
-    void UpgradeRendTo_5_0_0(pugi::xml_node element);
+    void UpgradeKeySigTo_5_0(pugi::xml_node keySig);
+    void UpgradePageTo_5_0(Page *page);
+    void UpgradePgHeadFootTo_5_0(pugi::xml_node element);
+    void UpgradeMeasureTo_5_0(pugi::xml_node measure);
+    void UpgradeMeterSigTo_5_0(pugi::xml_node meterSig, MeterSig *vrvMeterSig);
+    void UpgradeScoreDefElementTo_5_0(pugi::xml_node scoreDefElement);
+    void UpgradeStaffTo_5_0(pugi::xml_node staff);
+    void UpgradeLayerElementTo_5_0(pugi::xml_node element);
+    void UpgradeRendTo_5_0(pugi::xml_node element);
     // to MEI 4.0.0
     void UpgradeBeatRptTo_4_0_0(pugi::xml_node beatRpt, BeatRpt *vrvBeatRpt);
     void UpgradeDurGesTo_4_0_0(pugi::xml_node element, DurationInterface *interface);
     void UpgradeFTremTo_4_0_0(pugi::xml_node fTrem, FTrem *vrvFTrem);
-    void UpgradeMensurTo_5_0_0(pugi::xml_node mensur, Mensur *vrvMensur);
+    void UpgradeMensurTo_5_0(pugi::xml_node mensur, Mensur *vrvMensur);
     void UpgradeMordentTo_4_0_0(pugi::xml_node mordent, Mordent *vrvMordent);
     void UpgradeScoreDefElementTo_4_0_0(pugi::xml_node scoreDefElement, ScoreDefElement *vrvScoreDefElement);
     void UpgradeStaffDefTo_4_0_0(pugi::xml_node staffDef, StaffDef *vrvStaffDef);
diff --git a/include/vrv/iomusxml.h b/include/vrv/iomusxml.h
index 62ca7c1c802..2d6decc245c 100644
--- a/include/vrv/iomusxml.h
+++ b/include/vrv/iomusxml.h
@@ -197,7 +197,14 @@ class MusicXmlInput : public Input {
     MusicXmlInput(Doc *doc);
     virtual ~MusicXmlInput();
 
+private:
+    /*
+     * Objects that were not successfully added and should be destroyed at the end of the import
+     */
+    ListOfObjects m_garbage;
+
 #ifndef NO_MUSICXML_SUPPORT
+public:
     bool Import(const std::string &musicxml) override;
 
 private:
@@ -558,11 +565,6 @@ class MusicXmlInput : public Input {
     /* measure rests */
     std::map<int, int> m_multiRests;
 
-    /*
-     * Objects that were not successfully added and should be destroyed at the end of the import
-     */
-    ListOfObjects m_garbage;
-
 #endif // NO_MUSICXML_SUPPORT
 };
 
diff --git a/include/vrv/keysig.h b/include/vrv/keysig.h
index 773aa23e323..edaf86d536a 100644
--- a/include/vrv/keysig.h
+++ b/include/vrv/keysig.h
@@ -45,10 +45,10 @@ class KeySig : public LayerElement,
                public ObjectListInterface,
                public AttAccidental,
                public AttColor,
-               public AttPitch,
-               public AttKeySigAnl,
+               public AttKeyMode,
                public AttKeySigLog,
                public AttKeySigVis,
+               public AttPitch,
                public AttVisibility {
 public:
     /**
diff --git a/include/vrv/layerelement.h b/include/vrv/layerelement.h
index f9eb21bddfe..af0917a61d7 100644
--- a/include/vrv/layerelement.h
+++ b/include/vrv/layerelement.h
@@ -24,6 +24,7 @@ class Beam;
 class BeamElementCoord;
 class FTrem;
 class Layer;
+class Liquescent;
 class Mensur;
 class MeterSig;
 class Staff;
diff --git a/include/vrv/nc.h b/include/vrv/nc.h
index 83d1296332f..4f02ea5430b 100644
--- a/include/vrv/nc.h
+++ b/include/vrv/nc.h
@@ -15,6 +15,7 @@
 #include "atts_analytical.h"
 #include "atts_neumes.h"
 #include "atts_shared.h"
+#include "atts_visual.h"
 #include "durationinterface.h"
 #include "layerelement.h"
 #include "pitchinterface.h"
@@ -35,6 +36,7 @@ class Nc : public LayerElement,
            public PitchInterface,
            public PositionInterface,
            public AttColor,
+           public AttCurvatureDirection,
            public AttIntervalMelodic,
            public AttNcForm {
 public:
diff --git a/include/vrv/neume.h b/include/vrv/neume.h
index 083aa39eede..9ca466cbe7d 100644
--- a/include/vrv/neume.h
+++ b/include/vrv/neume.h
@@ -77,6 +77,7 @@ class Neume : public LayerElement, public ObjectListInterface, public AttColor {
      */
     bool IsSupportedChild(Object *object) override;
 
+    int GetLigatureCount(int position);
     bool IsLastInNeume(const LayerElement *element) const;
 
     bool GenerateChildMelodic();
diff --git a/include/vrv/object.h b/include/vrv/object.h
index fce939c1569..1cb3f41ff41 100644
--- a/include/vrv/object.h
+++ b/include/vrv/object.h
@@ -692,7 +692,6 @@ class Object : public BoundingBox {
      * Helper methods for functor processing
      */
     ///@{
-    void UpdateDocumentScore(bool direction);
     bool SkipChildren(bool visibleOnly) const;
     bool FiltersApply(const Filters *filters, Object *object) const;
     ///@}
@@ -809,6 +808,7 @@ class Object : public BoundingBox {
  * children LayerElement for processing.
  * The list is a flatten list of pointers to children elements.
  * It is not an abstract class but should not be instanciated directly.
+ * It is expected to be used as a base class of element classes derived from Object.
  */
 class ObjectListInterface {
 public:
@@ -816,7 +816,7 @@ class ObjectListInterface {
     ObjectListInterface(){};
     virtual ~ObjectListInterface(){};
     ObjectListInterface(const ObjectListInterface &listInterface); // copy constructor;
-    ObjectListInterface &operator=(const ObjectListInterface &listInterface); // copy assignement;
+    ObjectListInterface &operator=(const ObjectListInterface &listInterface); // copy assignment;
 
     /**
      * Look for the Object in the list and return its position (-1 if not found)
@@ -853,29 +853,30 @@ class ObjectListInterface {
      * Return the list.
      * Before returning the list, it checks that the list is up-to-date with Object::IsModified
      * If not, it updates the list and also calls FilterList.
-     * Because this is an interface, we need to pass the object - not the best design.
      */
     ///@{
-    const ListOfConstObjects &GetList(const Object *node) const;
-    ListOfObjects GetList(const Object *node);
+    const ListOfConstObjects &GetList() const;
+    ListOfObjects GetList();
     ///@}
 
+    /**
+     * Reset the list of children and call FilterList().
+     */
+    void ResetList() const;
+
     /**
      * Convenience functions that check if the list is up-to-date
      * If not, the list is updated before returning the result
      */
     ///@{
-    bool HasEmptyList(const Object *node) const;
-    int GetListSize(const Object *node) const;
-    const Object *GetListFront(const Object *node) const;
-    Object *GetListFront(const Object *node);
-    const Object *GetListBack(const Object *node) const;
-    Object *GetListBack(const Object *node);
+    bool HasEmptyList() const;
+    int GetListSize() const;
+    const Object *GetListFront() const;
+    Object *GetListFront();
+    const Object *GetListBack() const;
+    Object *GetListBack();
     ///@}
 
-private:
-    mutable ListOfConstObjects m_list;
-
 protected:
     /**
      * Filter the list for a specific class.
@@ -883,12 +884,19 @@ class ObjectListInterface {
      */
     virtual void FilterList(ListOfConstObjects &childList) const {};
 
-public:
+private:
     /**
-     * Reset the list of children and call FilterList().
-     * As for GetList, we need to pass the object.
+     * Retrieve the owner object of the interface.
      */
-    void ResetList(const Object *node) const;
+    const Object *GetInterfaceOwner() const;
+
+public:
+    //
+private:
+    // The flat list of children
+    mutable ListOfConstObjects m_list;
+    // The owner object
+    mutable const Object *m_owner = NULL;
 };
 
 //----------------------------------------------------------------------------
@@ -910,12 +918,12 @@ class TextListInterface : public ObjectListInterface {
     /**
      * Returns a contatenated version of all the text children
      */
-    std::u32string GetText(const Object *node) const;
+    std::u32string GetText() const;
 
     /**
      * Fill an array of lines with concatenated content of each line
      */
-    void GetTextLines(const Object *node, std::vector<std::u32string> &lines) const;
+    void GetTextLines(std::vector<std::u32string> &lines) const;
 
 protected:
     /**
diff --git a/include/vrv/options.h b/include/vrv/options.h
index 7e4a351d223..ad4c87eb7ae 100644
--- a/include/vrv/options.h
+++ b/include/vrv/options.h
@@ -86,7 +86,7 @@ enum option_SMUFLTEXTFONT { SMUFLTEXTFONT_embedded = 0, SMUFLTEXTFONT_linked, SM
 // Option
 //----------------------------------------------------------------------------
 
-enum class OptionsCategory { None, Base, General, Layout, Margins, Midi, Selectors, Full };
+enum class OptionsCategory { None, Base, General, Layout, Mensural, Margins, Midi, Selectors, Full };
 
 /**
  * This class is a base class of each styling parameter
@@ -626,8 +626,6 @@ class Options {
     OptionBool m_incip;
     OptionBool m_justifyVertically;
     OptionBool m_landscape;
-    OptionBool m_ligatureAsBracket;
-    OptionBool m_mensuralToMeasure;
     OptionDbl m_minLastJustification;
     OptionBool m_mmOutput;
     OptionBool m_moveScoreDefinitionToStaff;
@@ -826,6 +824,14 @@ class Options {
     OptionBool m_midiNoCue;
     OptionDbl m_midiTempoAdjustment;
 
+    /**
+     * Mensural
+     */
+    OptionGrp m_mensural;
+
+    OptionBool m_ligatureAsBracket;
+    OptionBool m_mensuralToMeasure;
+
     /**
      * Deprecated options
      */
diff --git a/include/vrv/ornam.h b/include/vrv/ornam.h
index 88b1da5c8ed..25950ab63b3 100644
--- a/include/vrv/ornam.h
+++ b/include/vrv/ornam.h
@@ -29,8 +29,6 @@ class Ornam : public ControlElement,
               public TextDirInterface,
               public TimePointInterface,
               public AttColor,
-              public AttExtSymAuth,
-              public AttExtSymNames,
               public AttOrnamentAccid {
 public:
     /**
@@ -64,11 +62,6 @@ class Ornam : public ControlElement,
      */
     bool IsSupportedChild(Object *object) override;
 
-    /**
-     * Get the SMuFL glyph for the ornam based glyph.num
-     */
-    char32_t GetOrnamGlyph() const;
-
     //----------//
     // Functors //
     //----------//
diff --git a/include/vrv/page.h b/include/vrv/page.h
index 7bab10d7ec7..f1751100c99 100644
--- a/include/vrv/page.h
+++ b/include/vrv/page.h
@@ -48,11 +48,6 @@ class Page : public Object {
     bool IsSupportedChild(Object *object) override;
     ///@}
 
-    /**
-     * Return the number of system (children are System object only)
-     */
-    int GetSystemCount() const { return (int)GetChildren().size(); }
-
     /**
      * @name Get and set the pixel per unit factor.
      */
diff --git a/include/vrv/pitchinterface.h b/include/vrv/pitchinterface.h
index ed9d397659a..72b0d42a029 100644
--- a/include/vrv/pitchinterface.h
+++ b/include/vrv/pitchinterface.h
@@ -25,7 +25,7 @@ class Layer;
  * This class is an interface for elements with pitch, such as notes and neumes.
  * It is not an abstract class but should not be instanciated directly.
  */
-class PitchInterface : public Interface, public AttNoteGes, public AttOctave, public AttPitch {
+class PitchInterface : public Interface, public AttNoteGes, public AttOctave, public AttPitch, public AttPitchGes {
 public:
     /**
      * @name Constructors, destructors, reset methods
@@ -38,6 +38,15 @@ class PitchInterface : public Interface, public AttNoteGes, public AttOctave, pu
     InterfaceId IsInterface() const override { return INTERFACE_PITCH; }
     ///@}
 
+    /**
+     * @name Set and get the default octave
+     */
+    ///@{
+    void SetOctDefault(data_OCTAVE oct) { m_octDefault = oct; }
+    data_OCTAVE GetOctDefault() const { return m_octDefault; }
+    bool HasOctDefault() const { return (m_octDefault != MEI_UNSET_OCT); }
+    ///@}
+
     /**
      * Interface comparison operator.
      * Checks if the LayerElement has a PitchInterface and compares attributes
@@ -90,7 +99,10 @@ class PitchInterface : public Interface, public AttNoteGes, public AttOctave, pu
 public:
     //
 private:
-    //
+    /**
+     * The default octave: extracted from scoreDef/staffDef and used when no octave attribute is given
+     */
+    data_OCTAVE m_octDefault;
 };
 
 } // namespace vrv
diff --git a/include/vrv/preparedatafunctor.h b/include/vrv/preparedatafunctor.h
index 505b7518820..412ef9f3918 100644
--- a/include/vrv/preparedatafunctor.h
+++ b/include/vrv/preparedatafunctor.h
@@ -558,6 +558,47 @@ class PrepareTimestampsFunctor : public Functor {
     ListOfObjectBeatPairs m_tstamps;
 };
 
+//----------------------------------------------------------------------------
+// PreparePedalsFunctor
+//----------------------------------------------------------------------------
+
+/**
+ * This class matches down and up pedal lines.
+ */
+class PreparePedalsFunctor : public DocFunctor {
+public:
+    /**
+     * @name Constructors, destructors
+     */
+    ///@{
+    PreparePedalsFunctor(Doc *doc);
+    virtual ~PreparePedalsFunctor() = default;
+    ///@}
+
+    /*
+     * Abstract base implementation
+     */
+    bool ImplementsEndInterface() const override { return true; }
+
+    /*
+     * Functor interface
+     */
+    ///@{
+    FunctorCode VisitMeasureEnd(Measure *measure) override;
+    FunctorCode VisitPedal(Pedal *pedal) override;
+    ///@}
+
+protected:
+    //
+private:
+    //
+public:
+    //
+private:
+    // The current pedals to be linked / grouped
+    std::list<Pedal *> m_pedalLines;
+};
+
 //----------------------------------------------------------------------------
 // PreparePointersByLayerFunctor
 //----------------------------------------------------------------------------
@@ -579,7 +620,7 @@ class PreparePointersByLayerFunctor : public Functor {
     /*
      * Abstract base implementation
      */
-    bool ImplementsEndInterface() const override { return false; }
+    bool ImplementsEndInterface() const override { return true; }
 
     /*
      * Functor interface
@@ -587,6 +628,7 @@ class PreparePointersByLayerFunctor : public Functor {
     ///@{
     FunctorCode VisitDot(Dot *dot) override;
     FunctorCode VisitLayerElement(LayerElement *layerElement) override;
+    FunctorCode VisitMeasureEnd(Measure *measure) override;
     ///@}
 
 protected:
@@ -687,7 +729,13 @@ class PrepareLayerElementPartsFunctor : public Functor {
 protected:
     //
 private:
-    //
+    // Create stem if it does not exist
+    Stem *EnsureStemExists(Stem *stem, Object *parent) const;
+    // Create dots if they should exist, otherwise remove them
+    Dots *ProcessDots(Dots *dots, Object *parent, bool shouldExist) const;
+    // Create flag if it should exist, otherwise remove it
+    Flag *ProcessFlag(Flag *flag, Object *parent, bool shouldExist) const;
+
 public:
     //
 private:
@@ -861,13 +909,13 @@ class PrepareMilestonesFunctor : public Functor {
  * This class groups FloatingObjects by drawingGrpId.
  * Also chains the Dynam and Hairpin.
  */
-class PrepareFloatingGrpsFunctor : public DocFunctor {
+class PrepareFloatingGrpsFunctor : public Functor {
 public:
     /**
      * @name Constructors, destructors
      */
     ///@{
-    PrepareFloatingGrpsFunctor(Doc *doc);
+    PrepareFloatingGrpsFunctor();
     virtual ~PrepareFloatingGrpsFunctor() = default;
     ///@}
 
@@ -906,8 +954,6 @@ class PrepareFloatingGrpsFunctor : public DocFunctor {
     std::vector<Hairpin *> m_hairpins;
     // The map of existing harms (based on @n)
     std::map<std::string, Harm *> m_harms;
-    // The current pedals to be linked / grouped
-    std::list<Pedal *> m_pedalLines;
 };
 
 //----------------------------------------------------------------------------
diff --git a/include/vrv/score.h b/include/vrv/score.h
index de496139af5..975909c70b9 100644
--- a/include/vrv/score.h
+++ b/include/vrv/score.h
@@ -56,12 +56,6 @@ class Score : public PageElement, public PageMilestoneInterface, public AttLabel
     const ScoreDef *GetScoreDef() const { return &m_scoreDef; }
     ///@}
 
-    /**
-     * Helper looking at the parent Doc and set its scoreDef as current one.
-     * Called from Object::Process
-     */
-    void SetAsCurrent();
-
     /**
      * Calculate the height of the pgHead/pgHead2 and pgFoot/pgFoot2 (if any)
      * Requires the Doc to have an empty Pages object because it adds temporary pages
diff --git a/include/vrv/scoredefinterface.h b/include/vrv/scoredefinterface.h
index a9f4e7afbe2..2fd9dd6b59d 100644
--- a/include/vrv/scoredefinterface.h
+++ b/include/vrv/scoredefinterface.h
@@ -36,6 +36,7 @@ class ScoreDefInterface : public Interface,
                           public AttMidiTempo,
                           public AttMmTempo,
                           public AttMultinumMeasures,
+                          public AttOctaveDefault,
                           public AttPianoPedals,
                           public AttSpacing,
                           public AttSystems {
diff --git a/include/vrv/slur.h b/include/vrv/slur.h
index a3cf6a0ec4b..15fb1174a3c 100644
--- a/include/vrv/slur.h
+++ b/include/vrv/slur.h
@@ -42,32 +42,6 @@ struct NearEndCollision {
     bool endPointsAdjusted;
 };
 
-//----------------------------------------------------------------------------
-// ControlPointConstraint
-//----------------------------------------------------------------------------
-/**
- * This represents a constraint ax + by >= c where x and y are
- * vertical control point adjustments
- */
-struct ControlPointConstraint {
-    double a;
-    double b;
-    double c;
-};
-
-//----------------------------------------------------------------------------
-// ControlPointAdjustment
-//----------------------------------------------------------------------------
-/**
- * A vertical adjustment of bezier control points
- */
-struct ControlPointAdjustment {
-    int leftShift;
-    int rightShift;
-    bool moveUpwards;
-    int requestedStaffSpace;
-};
-
 // Helper enum classes
 enum class SlurCurveDirection { None, Above, Below, AboveBelow, BelowAbove };
 enum class PortatoSlurType { None, StemSide, Centered };
@@ -80,8 +54,8 @@ class Slur : public ControlElement,
              public TimeSpanningInterface,
              public AttColor,
              public AttCurvature,
-             public AttCurveRend,
-             public AttLayerIdent {
+             public AttLayerIdent,
+             public AttLineRendBase {
 public:
     /**
      * @name Constructors, destructors, reset and class name methods
@@ -195,18 +169,6 @@ class Slur : public ControlElement,
      */
     void InitBezierControlSides(BezierCurve &bezier, curvature_CURVEDIR curveDir) const;
 
-    /**
-     * Slur adjustment
-     */
-    ///@{
-    void AdjustSlur(const Doc *doc, FloatingCurvePositioner *curve, int unit);
-
-    void AdjustOuterSlur(
-        const Doc *doc, FloatingCurvePositioner *curve, const ArrayOfFloatingCurvePositioners &innerCurves, int unit);
-
-    float GetAdjustedSlurAngle(const Doc *doc, Point &p1, Point &p2, curvature_CURVEDIR curveDir) const;
-    ///@}
-
     //----------//
     // Functors //
     //----------//
@@ -258,83 +220,8 @@ class Slur : public ControlElement,
     bool StartsOnBeam() const { return this->HasBoundaryOnBeam(true); }
     bool EndsOnBeam() const { return this->HasBoundaryOnBeam(false); }
     bool HasBoundaryOnBeam(bool isStart) const;
-    ///@}
-
-    /**
-     * Adjust slur position based on overlapping objects within its spanning elements
-     */
-    ///@{
-    // Discard certain spanned elements
-    void FilterSpannedElements(FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, int margin);
-
-    // Detect collisions near the endpoints
-    NearEndCollision DetectCollisionsNearEnd(
-        FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, int margin);
-
-    // Calculate the vertical shift of the slur end points
-    std::pair<int, int> CalcEndPointShift(
-        FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, double flexibility, int margin);
-
-    // Apply the vertical shift of the slur end points
-    void ApplyEndPointShift(
-        FloatingCurvePositioner *curve, BezierCurve &bezierCurve, int endPointShiftLeft, int endPointShiftRight);
-
-    // Calculate slur from bulge values
-    void AdjustSlurFromBulge(FloatingCurvePositioner *curve, BezierCurve &bezierCurve, int unit);
-
-    // Check whether control points should be adjusted horizontally
-    bool AllowControlOffsetAdjustment(const BezierCurve &bezierCurve, double symmetry, int unit) const;
-
-    // Calculate the horizontal control point offset
-    std::tuple<bool, int, int> CalcControlPointOffset(
-        FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, int margin);
-
-    // Calculate the vertical control point shift
-    ControlPointAdjustment CalcControlPointVerticalShift(
-        FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, double symmetry, int margin);
-
-    // Solve the constraints for vertical control point adjustment
-    std::pair<int, int> SolveControlPointConstraints(
-        const std::list<ControlPointConstraint> &constraints, double symmetry = 0.0) const;
-
-    // Improve the slur shape by adjusting the control point heights
-    void AdjustSlurShape(BezierCurve &bezierCurve, curvature_CURVEDIR dir, int unit);
-    ///@}
-
-    /**
-     * Adjust slur position based on inner slurs
-     */
-    ///@{
-    // Calculate the vertical control point shift
-    ControlPointAdjustment CalcControlPointShift(FloatingCurvePositioner *curve, const BezierCurve &bezierCurve,
-        const ArrayOfFloatingCurvePositioners &innerCurves, double symmetry, int margin);
-
-    // Calculate the vertical shift of the slur end points
-    std::pair<int, int> CalcEndPointShift(FloatingCurvePositioner *curve, const BezierCurve &bezierCurve,
-        const ArrayOfFloatingCurvePositioners &innerCurves, double flexibility, int margin);
-    ///@}
-
-    /**
-     * Low level helper functions for slur adjustment
-     */
-    ///@{
-    // Shift end points for collisions nearby
-    void ShiftEndPoints(int &shiftLeft, int &shiftRight, double ratio, int intersection, double flexibility,
-        bool isBelow, char spanningType) const;
-
-    // Calculate the full and partial shift radii
-    std::pair<double, double> CalcShiftRadii(bool forShiftLeft, double flexibility, char spanningType) const;
-
-    // Determine a quadratic interpolation function between zero and one and evaluate it
-    double CalcQuadraticInterpolation(double zeroAt, double oneAt, double arg) const;
-
-    // Rotate the slope by a given number of degrees, but choose smaller angles if already close to the vertical axis
-    // Choose doublingBound as the positive slope value where doubling has the same effect as rotating:
-    // tan(atan(doublingBound) + degrees * PI / 180.0) ≈ 2.0 * doublingBound
-    double RotateSlope(double slope, double degrees, double doublingBound, bool upwards) const;
-
-    // Calculate the minimal angle <)C1P1P2 or <)P1P2C2
-    float GetMinControlPointAngle(const BezierCurve &bezierCurve, float angle, int unit) const;
+    // Angle adjustment
+    float GetAdjustedSlurAngle(const Doc *doc, Point &p1, Point &p2, curvature_CURVEDIR curveDir) const;
     ///@}
 
 public:
diff --git a/include/vrv/smufl.h b/include/vrv/smufl.h
index 867ebd0954b..5e70fa53c69 100644
--- a/include/vrv/smufl.h
+++ b/include/vrv/smufl.h
@@ -547,6 +547,7 @@ enum {
     SMUFL_EB9D_staffPosLower6 = 0xEB9D,
     SMUFL_EB9E_staffPosLower7 = 0xEB9E,
     SMUFL_EB9F_staffPosLower8 = 0xEB9F,
+    SMUFL_EBA6_luteDurationDoubleWhole = 0xEBA6,
     SMUFL_EBA7_luteDurationWhole = 0xEBA7,
     SMUFL_EBA8_luteDurationHalf = 0xEBA8,
     SMUFL_EBA9_luteDurationQuarter = 0xEBA9,
@@ -643,7 +644,7 @@ enum {
 };
 
 /** The number of glyphs for verification **/
-#define SMUFL_COUNT 618
+#define SMUFL_COUNT 619
 
 } // namespace vrv
 
diff --git a/include/vrv/surface.h b/include/vrv/surface.h
index 5d155a3d876..f6cc1eb8eec 100644
--- a/include/vrv/surface.h
+++ b/include/vrv/surface.h
@@ -27,7 +27,7 @@ namespace vrv {
  * in MEI
  */
 
-class Surface : public Object, public AttTyped, public AttCoordinated {
+class Surface : public Object, public AttTyped, public AttCoordinated, public AttCoordinatedUl {
 public:
     /**
      * @name Constructors, destructors, reset, and class name methods
diff --git a/include/vrv/svgdevicecontext.h b/include/vrv/svgdevicecontext.h
index 9eed0baa79a..0e7b43e4afd 100644
--- a/include/vrv/svgdevicecontext.h
+++ b/include/vrv/svgdevicecontext.h
@@ -117,7 +117,7 @@ class SvgDeviceContext : public DeviceContext {
      * @name Method for starting and ending a graphic
      */
     ///@{
-    void StartGraphic(Object *object, std::string gClass, std::string gId, GraphicID graphicID = PRIMARY,
+    void StartGraphic(Object *object, const std::string &gClass, const std::string &gId, GraphicID graphicID = PRIMARY,
         bool prepend = false) override;
     void EndGraphic(Object *object, View *view) override;
     ///@}
@@ -126,10 +126,15 @@ class SvgDeviceContext : public DeviceContext {
      * @name Method for starting and ending a graphic custom graphic that do not correspond to an Object
      */
     ///@{
-    void StartCustomGraphic(std::string name, std::string gClass = "", std::string gId = "") override;
+    void StartCustomGraphic(const std::string &name, std::string gClass = "", std::string gId = "") override;
     void EndCustomGraphic() override;
     ///@}
 
+    /**
+     * Method for changing the color of a custom graphic
+     */
+    virtual void SetCustomGraphicColor(const std::string &color) override;
+
     /**
      * @name Methods for re-starting and ending a graphic for objects drawn in separate steps
      */
@@ -142,7 +147,7 @@ class SvgDeviceContext : public DeviceContext {
      * @name Method for starting and ending a text (<tspan>) text graphic
      */
     ///@{
-    void StartTextGraphic(Object *object, std::string gClass, std::string gId) override;
+    void StartTextGraphic(Object *object, const std::string &gClass, const std::string &gId) override;
     void EndTextGraphic(Object *object, View *view) override;
     ///@}
 
@@ -171,8 +176,8 @@ class SvgDeviceContext : public DeviceContext {
     /**
      * Add id, data-id and class attributes
      */
-    void AppendIdAndClass(
-        std::string gId, std::string baseClass, std::string addedClasses, GraphicID graphicID = PRIMARY);
+    void AppendIdAndClass(const std::string &gId, const std::string &baseClass, const std::string &addedClasses,
+        GraphicID graphicID = PRIMARY);
 
     /**
      * Append additional attributes, as given in m_svgAdditionalAttributes
@@ -225,7 +230,7 @@ class SvgDeviceContext : public DeviceContext {
     /**
      * Setter for an additional CSS
      */
-    void SetCss(std::string css) { m_css = css; }
+    void SetCss(const std::string &css) { m_css = css; }
 
     /**
      *  Copies additional attributes of defined elements to the SVG, each string in the form "elementName@attribute"
diff --git a/include/vrv/tie.h b/include/vrv/tie.h
index 2784d10b767..ccd92e5e5e7 100644
--- a/include/vrv/tie.h
+++ b/include/vrv/tie.h
@@ -28,7 +28,7 @@ class Tie : public ControlElement,
             public TimeSpanningInterface,
             public AttColor,
             public AttCurvature,
-            public AttCurveRend {
+            public AttLineRendBase {
 public:
     /**
      * @name Constructors, destructors, and other standard methods
diff --git a/include/vrv/toolkit.h b/include/vrv/toolkit.h
index 3078f7e420c..268175e3217 100644
--- a/include/vrv/toolkit.h
+++ b/include/vrv/toolkit.h
@@ -500,9 +500,10 @@ class Toolkit {
     /**
      * Get the MEI as a string.
      *
-     * @param jsonOptions A stringified JSON object with the output options
+     * @param jsonOptions A stringified JSON object with the output options;
      * pageNo: integer; (1-based), all pages if none (or 0) specified;
      * scoreBased: true or false; true by default;
+     * basic: true or false; false by default;
      * removeIds: true or false; false by default - remove all \@xml:id not used in the data;
      */
     std::string GetMEI(const std::string &jsonOptions = "");
diff --git a/include/vrv/tuning.h b/include/vrv/tuning.h
index d5be1648c09..bdb78867b98 100644
--- a/include/vrv/tuning.h
+++ b/include/vrv/tuning.h
@@ -45,13 +45,13 @@ class Tuning : public Object, public AttCourseLog {
     int CalcPitchPos(int course, data_NOTATIONTYPE notationType, int lines) const;
 
     /**
-     * Calclate the MIDI pitch number for course/fret
+     * Calculate the MIDI note number for course/fret
      *
-     * @param[in] course
-     * @param[in] fret
-     * @param[in] notationType, used to default tuning if not otherwise specified
+     * @param[in] course The course number
+     * @param[in] fret The fret number
+     * @param[in] notationType The notationType used to default tuning if not otherwise specified
      *
-     * @return MIDI pitch
+     * @return MIDI note number
      */
     int CalcPitchNumber(int course, int fret, data_NOTATIONTYPE notationType) const;
 
diff --git a/include/vrv/verticalaligner.h b/include/vrv/verticalaligner.h
index 5a209b611c7..d5ce55c8644 100644
--- a/include/vrv/verticalaligner.h
+++ b/include/vrv/verticalaligner.h
@@ -39,6 +39,11 @@ class SystemAligner : public Object {
     SystemAligner();
     virtual ~SystemAligner();
 
+    /**
+     * Override the method of adding AlignmentReference children
+     */
+    bool IsSupportedChild(Object *object) override;
+
     /**
      * Do not copy children for HorizontalAligner
      */
@@ -67,6 +72,13 @@ class SystemAligner : public Object {
      */
     StaffAlignment *GetStaffAlignment(int idx, Staff *staff, const Doc *doc);
 
+    /**
+     * Reorder the staff alignment as given in the staffNs.
+     * Reordering will fail if the number of staffAlignment does not correspond, or
+     * if some staffAlignment pointers are missing for a corresponding staffN
+     */
+    void ReorderBy(const std::vector<int> &staffNs);
+
     /**
      * Get the StaffAlignment for the staffN.
      * Return NULL if not found.
diff --git a/include/vrv/view.h b/include/vrv/view.h
index 830a5e617ec..2c5473db68d 100644
--- a/include/vrv/view.h
+++ b/include/vrv/view.h
@@ -31,6 +31,7 @@ class ControlElement;
 class DeviceContext;
 class Dir;
 class Div;
+class DivLine;
 class Doc;
 class Dynam;
 class EditorialElement;
@@ -49,6 +50,7 @@ class KeyAccid;
 class Layer;
 class LayerElement;
 class Lb;
+class Liquescent;
 class Measure;
 class MNum;
 class Mordent;
@@ -412,6 +414,7 @@ class View {
      * Defined in view_neume.cpp
      */
     ///@{
+    void DrawDivLine(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure);
     void DrawSyllable(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure);
     void DrawNc(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure);
     void DrawNeume(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure);
diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
index f2e47befc7d..86ead543896 100644
--- a/include/vrv/vrvdef.h
+++ b/include/vrv/vrvdef.h
@@ -38,8 +38,8 @@ namespace vrv {
 // Version
 //----------------------------------------------------------------------------
 
-#define VERSION_MAJOR 3
-#define VERSION_MINOR 17
+#define VERSION_MAJOR 4
+#define VERSION_MINOR 2
 #define VERSION_REVISION 0
 // Adds "-dev" in the version number - should be set to false for releases
 #define VERSION_DEV true
@@ -218,6 +218,7 @@ enum ClassId : uint16_t {
     CHORD,
     CLEF,
     CUSTOS,
+    DIVLINE,
     DOT,
     DOTS,
     FLAG,
@@ -311,6 +312,7 @@ class BeamElementCoord;
 class BoundingBox;
 class Comparison;
 class CurveSpannedElement;
+class DivLine;
 class FloatingPositioner;
 class FloatingCurvePositioner;
 class GraceAligner;
@@ -318,6 +320,7 @@ class InterfaceComparison;
 class LayerElement;
 class LedgerLine;
 class LinkingInterface;
+class Liquescent;
 class Nc;
 class Note;
 class Neume;
@@ -681,6 +684,13 @@ enum GraphicID { PRIMARY = 0, SPANNING, SYMBOLREF };
 #define SUPER_SCRIPT_POSITION -0.20 // lowered down from the midline
 #define SUB_SCRIPT_POSITION -0.17 // lowered down from the baseline
 
+//----------------------------------------------------------------------------
+// Neume notation note size to staff size ratio defines
+//----------------------------------------------------------------------------
+
+#define NOTE_HEIGHT_TO_STAFF_SIZE_RATIO 2
+#define NOTE_WIDTH_TO_STAFF_SIZE_RATIO 1.4
+
 } // namespace vrv
 
 #endif // __VRV_DEF_H__
diff --git a/include/vrv/zone.h b/include/vrv/zone.h
index bbe0c1b90c4..c9e3e44ebc7 100644
--- a/include/vrv/zone.h
+++ b/include/vrv/zone.h
@@ -27,7 +27,7 @@ namespace vrv {
  * in MEI
  */
 
-class Zone : public Object, public AttTyped, public AttCoordinated {
+class Zone : public Object, public AttTyped, public AttCoordinated, public AttCoordinatedUl {
 public:
     /**
      * @name Constructors, destructors, reset, and class name methods
diff --git a/libmei/addons/attdef.h b/libmei/addons/attdef.h
index b94f8eafbe4..fd991b11345 100644
--- a/libmei/addons/attdef.h
+++ b/libmei/addons/attdef.h
@@ -22,6 +22,7 @@
 namespace vrv {
 
 #define MEI_UNSET -0x7FFFFFFF
+#define MEI_UNSET_OCT -127
 
 /**
  * MEI virtual unit;
diff --git a/libmei/config.yml b/libmei/config.yml
index fcb10ef424f..e2f1f42844d 100644
--- a/libmei/config.yml
+++ b/libmei/config.yml
@@ -5,4 +5,4 @@ addons_dir: "./addons"
 elements: false
 namespace: "vrv"
 datatypes: "./datatypes.yml"
-basic_odd: "./mei/develop/mei-basic_compiled.odd"
\ No newline at end of file
+basic_odd: "./mei/mei-basic_compiled.odd"
\ No newline at end of file
diff --git a/libmei/datatypes.yml b/libmei/datatypes.yml
index fe307d2a24b..165866c920e 100644
--- a/libmei/datatypes.yml
+++ b/libmei/datatypes.yml
@@ -168,7 +168,7 @@ defaults:
     data_MIDIVALUE_PAN:
         data_MIDIVALUE_PAN()
     data_OCTAVE:
-        -127
+        MEI_UNSET_OCT
     data_SUMMAND_List:
         std::vector<int>()
     xsdAnyURI_List:
@@ -208,6 +208,11 @@ modules:
                 type: double
                 default: -1.0
 
+    neumes:
+        att.divLine.log:
+            form:
+                type: divLineLog_FORM
+
     shared:
         att.articulation:
             artic:
@@ -253,3 +258,9 @@ modules:
             tab.fret:
                 type: int
                 default: -1
+    
+    visual:
+        att.mensural.vis:
+            mensur.slash:
+                type: char
+                default: 0
diff --git a/libmei/dist/attclasses.h b/libmei/dist/attclasses.h
index cd97543bc18..114d32e45ef 100644
--- a/libmei/dist/attclasses.h
+++ b/libmei/dist/attclasses.h
@@ -26,13 +26,11 @@ enum AttClassId {
     ATT_HARMONICFUNCTION,
     ATT_INTERVALHARMONIC,
     ATT_INTERVALMELODIC,
-    ATT_KEYSIGANL,
     ATT_KEYSIGDEFAULTANL,
     ATT_MELODICFUNCTION,
     ATT_PITCHCLASS,
     ATT_SOLFA,
     ATT_ARPEGLOG,
-    ATT_BTREMLOG,
     ATT_BEAMPRESENT,
     ATT_BEAMREND,
     ATT_BEAMSECONDARY,
@@ -42,7 +40,6 @@ enum AttClassId {
     ATT_BRACKETSPANLOG,
     ATT_CUTOUT,
     ATT_EXPANDABLE,
-    ATT_FTREMLOG,
     ATT_GLISSPRESENT,
     ATT_GRACEGRPLOG,
     ATT_GRACED,
@@ -57,10 +54,10 @@ enum AttClassId {
     ATT_PEDALLOG,
     ATT_PIANOPEDALS,
     ATT_REHEARSAL,
-    ATT_SCOREDEFVISCMN,
     ATT_SLURREND,
     ATT_STEMSCMN,
     ATT_TIEREND,
+    ATT_TREMFORM,
     ATT_TREMMEASURED,
     ATT_MORDENTLOG,
     ATT_ORNAMPRESENT,
@@ -78,13 +75,12 @@ enum AttClassId {
     ATT_NOTEGESTAB,
     ATT_ACCIDENTALGES,
     ATT_ARTICULATIONGES,
+    ATT_ATTACKING,
     ATT_BENDGES,
     ATT_DURATIONGES,
-    ATT_MDIVGES,
-    ATT_NCGES,
     ATT_NOTEGES,
     ATT_ORNAMENTACCIDGES,
-    ATT_SECTIONGES,
+    ATT_PITCHGES,
     ATT_SOUNDLOCATION,
     ATT_TIMESTAMPGES,
     ATT_TIMESTAMP2GES,
@@ -114,6 +110,7 @@ enum AttClassId {
     ATT_DIVLINELOG,
     ATT_NCLOG,
     ATT_NCFORM,
+    ATT_NEUMETYPE,
     ATT_MARGINS,
     ATT_ALIGNMENT,
     ATT_ACCIDLOG,
@@ -139,9 +136,9 @@ enum AttClassId {
     ATT_COORDX2,
     ATT_COORDY1,
     ATT_COORDINATED,
+    ATT_COORDINATEDUL,
     ATT_CUE,
     ATT_CURVATURE,
-    ATT_CURVEREND,
     ATT_CUSTOSLOG,
     ATT_DATAPOINTING,
     ATT_DATABLE,
@@ -165,6 +162,7 @@ enum AttClassId {
     ATT_HORIZONTALALIGN,
     ATT_INTERNETMEDIA,
     ATT_JOINED,
+    ATT_KEYMODE,
     ATT_KEYSIGLOG,
     ATT_KEYSIGDEFAULTLOG,
     ATT_LABELLED,
@@ -181,6 +179,7 @@ enum AttClassId {
     ATT_MEDIABOUNDS,
     ATT_MEDIUM,
     ATT_MEIVERSION,
+    ATT_MENSURLOG,
     ATT_METADATAPOINTING,
     ATT_METERCONFORMANCE,
     ATT_METERCONFORMANCEBAR,
@@ -271,10 +270,12 @@ enum AttClassId {
     ATT_BEATRPTVIS,
     ATT_CHORDVIS,
     ATT_CLEFFINGVIS,
+    ATT_CURVATUREDIRECTION,
     ATT_EPISEMAVIS,
     ATT_FTREMVIS,
     ATT_FERMATAVIS,
     ATT_FINGGRPVIS,
+    ATT_GUITARGRIDVIS,
     ATT_HAIRPINVIS,
     ATT_HARMVIS,
     ATT_HISPANTICKVIS,
diff --git a/libmei/dist/attconverter.cpp b/libmei/dist/attconverter.cpp
index 659e5ecef62..d97e5b5a880 100644
--- a/libmei/dist/attconverter.cpp
+++ b/libmei/dist/attconverter.cpp
@@ -43,6 +43,8 @@ std::string AttConverterBase::AccidentalGesturalToStr(data_ACCIDENTAL_GESTURAL d
         case ACCIDENTAL_GESTURAL_sd: value = "sd"; break;
         case ACCIDENTAL_GESTURAL_fu: value = "fu"; break;
         case ACCIDENTAL_GESTURAL_fd: value = "fd"; break;
+        case ACCIDENTAL_GESTURAL_xu: value = "xu"; break;
+        case ACCIDENTAL_GESTURAL_ffd: value = "ffd"; break;
         case ACCIDENTAL_GESTURAL_bms: value = "bms"; break;
         case ACCIDENTAL_GESTURAL_kms: value = "kms"; break;
         case ACCIDENTAL_GESTURAL_bs: value = "bs"; break;
@@ -74,6 +76,8 @@ data_ACCIDENTAL_GESTURAL AttConverterBase::StrToAccidentalGestural(const std::st
     if (value == "sd") return ACCIDENTAL_GESTURAL_sd;
     if (value == "fu") return ACCIDENTAL_GESTURAL_fu;
     if (value == "fd") return ACCIDENTAL_GESTURAL_fd;
+    if (value == "xu") return ACCIDENTAL_GESTURAL_xu;
+    if (value == "ffd") return ACCIDENTAL_GESTURAL_ffd;
     if (value == "bms") return ACCIDENTAL_GESTURAL_bms;
     if (value == "kms") return ACCIDENTAL_GESTURAL_kms;
     if (value == "bs") return ACCIDENTAL_GESTURAL_bs;
@@ -130,6 +134,8 @@ std::string AttConverterBase::AccidentalGesturalExtendedToStr(data_ACCIDENTAL_GE
         case ACCIDENTAL_GESTURAL_extended_sd: value = "sd"; break;
         case ACCIDENTAL_GESTURAL_extended_fu: value = "fu"; break;
         case ACCIDENTAL_GESTURAL_extended_fd: value = "fd"; break;
+        case ACCIDENTAL_GESTURAL_extended_xu: value = "xu"; break;
+        case ACCIDENTAL_GESTURAL_extended_ffd: value = "ffd"; break;
         default:
             LogWarning("Unknown value '%d' for data.ACCIDENTAL.GESTURAL.extended", data);
             value = "";
@@ -144,6 +150,8 @@ data_ACCIDENTAL_GESTURAL_extended AttConverterBase::StrToAccidentalGesturalExten
     if (value == "sd") return ACCIDENTAL_GESTURAL_extended_sd;
     if (value == "fu") return ACCIDENTAL_GESTURAL_extended_fu;
     if (value == "fd") return ACCIDENTAL_GESTURAL_extended_fd;
+    if (value == "xu") return ACCIDENTAL_GESTURAL_extended_xu;
+    if (value == "ffd") return ACCIDENTAL_GESTURAL_extended_ffd;
     if (logWarning && !value.empty())
         LogWarning("Unsupported value '%s' for data.ACCIDENTAL.GESTURAL.extended", value.c_str());
     return ACCIDENTAL_GESTURAL_extended_NONE;
@@ -171,6 +179,10 @@ std::string AttConverterBase::AccidentalWrittenToStr(data_ACCIDENTAL_WRITTEN dat
         case ACCIDENTAL_WRITTEN_fd: value = "fd"; break;
         case ACCIDENTAL_WRITTEN_nu: value = "nu"; break;
         case ACCIDENTAL_WRITTEN_nd: value = "nd"; break;
+        case ACCIDENTAL_WRITTEN_xu: value = "xu"; break;
+        case ACCIDENTAL_WRITTEN_xd: value = "xd"; break;
+        case ACCIDENTAL_WRITTEN_ffu: value = "ffu"; break;
+        case ACCIDENTAL_WRITTEN_ffd: value = "ffd"; break;
         case ACCIDENTAL_WRITTEN_1qf: value = "1qf"; break;
         case ACCIDENTAL_WRITTEN_3qf: value = "3qf"; break;
         case ACCIDENTAL_WRITTEN_1qs: value = "1qs"; break;
@@ -213,6 +225,10 @@ data_ACCIDENTAL_WRITTEN AttConverterBase::StrToAccidentalWritten(const std::stri
     if (value == "fd") return ACCIDENTAL_WRITTEN_fd;
     if (value == "nu") return ACCIDENTAL_WRITTEN_nu;
     if (value == "nd") return ACCIDENTAL_WRITTEN_nd;
+    if (value == "xu") return ACCIDENTAL_WRITTEN_xu;
+    if (value == "xd") return ACCIDENTAL_WRITTEN_xd;
+    if (value == "ffu") return ACCIDENTAL_WRITTEN_ffu;
+    if (value == "ffd") return ACCIDENTAL_WRITTEN_ffd;
     if (value == "1qf") return ACCIDENTAL_WRITTEN_1qf;
     if (value == "3qf") return ACCIDENTAL_WRITTEN_3qf;
     if (value == "1qs") return ACCIDENTAL_WRITTEN_1qs;
@@ -285,6 +301,10 @@ std::string AttConverterBase::AccidentalWrittenExtendedToStr(data_ACCIDENTAL_WRI
         case ACCIDENTAL_WRITTEN_extended_fd: value = "fd"; break;
         case ACCIDENTAL_WRITTEN_extended_nu: value = "nu"; break;
         case ACCIDENTAL_WRITTEN_extended_nd: value = "nd"; break;
+        case ACCIDENTAL_WRITTEN_extended_xu: value = "xu"; break;
+        case ACCIDENTAL_WRITTEN_extended_xd: value = "xd"; break;
+        case ACCIDENTAL_WRITTEN_extended_ffu: value = "ffu"; break;
+        case ACCIDENTAL_WRITTEN_extended_ffd: value = "ffd"; break;
         case ACCIDENTAL_WRITTEN_extended_1qf: value = "1qf"; break;
         case ACCIDENTAL_WRITTEN_extended_3qf: value = "3qf"; break;
         case ACCIDENTAL_WRITTEN_extended_1qs: value = "1qs"; break;
@@ -305,6 +325,10 @@ data_ACCIDENTAL_WRITTEN_extended AttConverterBase::StrToAccidentalWrittenExtende
     if (value == "fd") return ACCIDENTAL_WRITTEN_extended_fd;
     if (value == "nu") return ACCIDENTAL_WRITTEN_extended_nu;
     if (value == "nd") return ACCIDENTAL_WRITTEN_extended_nd;
+    if (value == "xu") return ACCIDENTAL_WRITTEN_extended_xu;
+    if (value == "xd") return ACCIDENTAL_WRITTEN_extended_xd;
+    if (value == "ffu") return ACCIDENTAL_WRITTEN_extended_ffu;
+    if (value == "ffd") return ACCIDENTAL_WRITTEN_extended_ffd;
     if (value == "1qf") return ACCIDENTAL_WRITTEN_extended_1qf;
     if (value == "3qf") return ACCIDENTAL_WRITTEN_extended_3qf;
     if (value == "1qs") return ACCIDENTAL_WRITTEN_extended_1qs;
@@ -3911,29 +3935,6 @@ audience_AUDIENCE AttConverterBase::StrToAudienceAudience(const std::string &val
     return audience_AUDIENCE_NONE;
 }
 
-std::string AttConverterBase::BTremLogFormToStr(bTremLog_FORM data) const
-{
-    std::string value;
-    switch (data) {
-        case bTremLog_FORM_meas: value = "meas"; break;
-        case bTremLog_FORM_unmeas: value = "unmeas"; break;
-        default:
-            LogWarning("Unknown value '%d' for att.bTrem.log@form", data);
-            value = "";
-            break;
-    }
-    return value;
-}
-
-bTremLog_FORM AttConverterBase::StrToBTremLogForm(const std::string &value, bool logWarning) const
-{
-    if (value == "meas") return bTremLog_FORM_meas;
-    if (value == "unmeas") return bTremLog_FORM_unmeas;
-    if (logWarning && !value.empty())
-        LogWarning("Unsupported value '%s' for att.bTrem.log@form", value.c_str());
-    return bTremLog_FORM_NONE;
-}
-
 std::string AttConverterBase::BeamRendFormToStr(beamRend_FORM data) const
 {
     std::string value;
@@ -4036,6 +4037,29 @@ curvature_CURVEDIR AttConverterBase::StrToCurvatureCurvedir(const std::string &v
     return curvature_CURVEDIR_NONE;
 }
 
+std::string AttConverterBase::CurvatureDirectionCurveToStr(curvatureDirection_CURVE data) const
+{
+    std::string value;
+    switch (data) {
+        case curvatureDirection_CURVE_a: value = "a"; break;
+        case curvatureDirection_CURVE_c: value = "c"; break;
+        default:
+            LogWarning("Unknown value '%d' for att.curvatureDirection@curve", data);
+            value = "";
+            break;
+    }
+    return value;
+}
+
+curvatureDirection_CURVE AttConverterBase::StrToCurvatureDirectionCurve(const std::string &value, bool logWarning) const
+{
+    if (value == "a") return curvatureDirection_CURVE_a;
+    if (value == "c") return curvatureDirection_CURVE_c;
+    if (logWarning && !value.empty())
+        LogWarning("Unsupported value '%s' for att.curvatureDirection@curve", value.c_str());
+    return curvatureDirection_CURVE_NONE;
+}
+
 std::string AttConverterBase::CurveLogFuncToStr(curveLog_FUNC data) const
 {
     std::string value;
@@ -4226,29 +4250,6 @@ extSymAuth_GLYPHAUTH AttConverterBase::StrToExtSymAuthGlyphauth(const std::strin
     return extSymAuth_GLYPHAUTH_NONE;
 }
 
-std::string AttConverterBase::FTremLogFormToStr(fTremLog_FORM data) const
-{
-    std::string value;
-    switch (data) {
-        case fTremLog_FORM_meas: value = "meas"; break;
-        case fTremLog_FORM_unmeas: value = "unmeas"; break;
-        default:
-            LogWarning("Unknown value '%d' for att.fTrem.log@form", data);
-            value = "";
-            break;
-    }
-    return value;
-}
-
-fTremLog_FORM AttConverterBase::StrToFTremLogForm(const std::string &value, bool logWarning) const
-{
-    if (value == "meas") return fTremLog_FORM_meas;
-    if (value == "unmeas") return fTremLog_FORM_unmeas;
-    if (logWarning && !value.empty())
-        LogWarning("Unsupported value '%s' for att.fTrem.log@form", value.c_str());
-    return fTremLog_FORM_NONE;
-}
-
 std::string AttConverterBase::FermataVisFormToStr(fermataVis_FORM data) const
 {
     std::string value;
@@ -4641,29 +4642,6 @@ lineLog_FUNC AttConverterBase::StrToLineLogFunc(const std::string &value, bool l
     return lineLog_FUNC_NONE;
 }
 
-std::string AttConverterBase::LiquescentVisCurveToStr(liquescentVis_CURVE data) const
-{
-    std::string value;
-    switch (data) {
-        case liquescentVis_CURVE_a: value = "a"; break;
-        case liquescentVis_CURVE_c: value = "c"; break;
-        default:
-            LogWarning("Unknown value '%d' for att.liquescent.vis@curve", data);
-            value = "";
-            break;
-    }
-    return value;
-}
-
-liquescentVis_CURVE AttConverterBase::StrToLiquescentVisCurve(const std::string &value, bool logWarning) const
-{
-    if (value == "a") return liquescentVis_CURVE_a;
-    if (value == "c") return liquescentVis_CURVE_c;
-    if (logWarning && !value.empty())
-        LogWarning("Unsupported value '%s' for att.liquescent.vis@curve", value.c_str());
-    return liquescentVis_CURVE_NONE;
-}
-
 std::string AttConverterBase::MeasurementUnitToStr(measurement_UNIT data) const
 {
     std::string value;
@@ -4725,8 +4703,11 @@ std::string AttConverterBase::MeiVersionMeiversionToStr(meiVersion_MEIVERSION da
         case meiVersion_MEIVERSION_3_0_0: value = "3.0.0"; break;
         case meiVersion_MEIVERSION_4_0_0: value = "4.0.0"; break;
         case meiVersion_MEIVERSION_4_0_1: value = "4.0.1"; break;
-        case meiVersion_MEIVERSION_5_0_0_devplusbasic: value = "5.0.0-dev+basic"; break;
-        case meiVersion_MEIVERSION_5_0_0_dev: value = "5.0.0-dev"; break;
+        case meiVersion_MEIVERSION_5_0: value = "5.0"; break;
+        case meiVersion_MEIVERSION_5_0plusbasic: value = "5.0+basic"; break;
+        case meiVersion_MEIVERSION_5_0plusCMN: value = "5.0+CMN"; break;
+        case meiVersion_MEIVERSION_5_0plusMensural: value = "5.0+Mensural"; break;
+        case meiVersion_MEIVERSION_5_0plusNeumes: value = "5.0+Neumes"; break;
         default:
             LogWarning("Unknown value '%d' for att.meiVersion@meiversion", data);
             value = "";
@@ -4741,8 +4722,11 @@ meiVersion_MEIVERSION AttConverterBase::StrToMeiVersionMeiversion(const std::str
     if (value == "3.0.0") return meiVersion_MEIVERSION_3_0_0;
     if (value == "4.0.0") return meiVersion_MEIVERSION_4_0_0;
     if (value == "4.0.1") return meiVersion_MEIVERSION_4_0_1;
-    if (value == "5.0.0-dev+basic") return meiVersion_MEIVERSION_5_0_0_devplusbasic;
-    if (value == "5.0.0-dev") return meiVersion_MEIVERSION_5_0_0_dev;
+    if (value == "5.0") return meiVersion_MEIVERSION_5_0;
+    if (value == "5.0+basic") return meiVersion_MEIVERSION_5_0plusbasic;
+    if (value == "5.0+CMN") return meiVersion_MEIVERSION_5_0plusCMN;
+    if (value == "5.0+Mensural") return meiVersion_MEIVERSION_5_0plusMensural;
+    if (value == "5.0+Neumes") return meiVersion_MEIVERSION_5_0plusNeumes;
     if (logWarning && !value.empty())
         LogWarning("Unsupported value '%s' for att.meiVersion@meiversion", value.c_str());
     return meiVersion_MEIVERSION_NONE;
@@ -4894,50 +4878,86 @@ ncForm_CON AttConverterBase::StrToNcFormCon(const std::string &value, bool logWa
     return ncForm_CON_NONE;
 }
 
-std::string AttConverterBase::NcFormCurveToStr(ncForm_CURVE data) const
+std::string AttConverterBase::NcFormRellenToStr(ncForm_RELLEN data) const
 {
     std::string value;
     switch (data) {
-        case ncForm_CURVE_a: value = "a"; break;
-        case ncForm_CURVE_c: value = "c"; break;
+        case ncForm_RELLEN_l: value = "l"; break;
+        case ncForm_RELLEN_s: value = "s"; break;
         default:
-            LogWarning("Unknown value '%d' for att.ncForm@curve", data);
+            LogWarning("Unknown value '%d' for att.ncForm@rellen", data);
             value = "";
             break;
     }
     return value;
 }
 
-ncForm_CURVE AttConverterBase::StrToNcFormCurve(const std::string &value, bool logWarning) const
+ncForm_RELLEN AttConverterBase::StrToNcFormRellen(const std::string &value, bool logWarning) const
 {
-    if (value == "a") return ncForm_CURVE_a;
-    if (value == "c") return ncForm_CURVE_c;
+    if (value == "l") return ncForm_RELLEN_l;
+    if (value == "s") return ncForm_RELLEN_s;
     if (logWarning && !value.empty())
-        LogWarning("Unsupported value '%s' for att.ncForm@curve", value.c_str());
-    return ncForm_CURVE_NONE;
+        LogWarning("Unsupported value '%s' for att.ncForm@rellen", value.c_str());
+    return ncForm_RELLEN_NONE;
 }
 
-std::string AttConverterBase::NcFormRellenToStr(ncForm_RELLEN data) const
+std::string AttConverterBase::NeumeTypeTypeToStr(neumeType_TYPE data) const
 {
     std::string value;
     switch (data) {
-        case ncForm_RELLEN_l: value = "l"; break;
-        case ncForm_RELLEN_s: value = "s"; break;
+        case neumeType_TYPE_apostropha: value = "apostropha"; break;
+        case neumeType_TYPE_bistropha: value = "bistropha"; break;
+        case neumeType_TYPE_climacus: value = "climacus"; break;
+        case neumeType_TYPE_clivis: value = "clivis"; break;
+        case neumeType_TYPE_oriscus: value = "oriscus"; break;
+        case neumeType_TYPE_pes: value = "pes"; break;
+        case neumeType_TYPE_pessubpunctis: value = "pessubpunctis"; break;
+        case neumeType_TYPE_porrectus: value = "porrectus"; break;
+        case neumeType_TYPE_porrectusflexus: value = "porrectusflexus"; break;
+        case neumeType_TYPE_pressusmaior: value = "pressusmaior"; break;
+        case neumeType_TYPE_pressusminor: value = "pressusminor"; break;
+        case neumeType_TYPE_punctum: value = "punctum"; break;
+        case neumeType_TYPE_quilisma: value = "quilisma"; break;
+        case neumeType_TYPE_scandicus: value = "scandicus"; break;
+        case neumeType_TYPE_strophicus: value = "strophicus"; break;
+        case neumeType_TYPE_torculus: value = "torculus"; break;
+        case neumeType_TYPE_torculusresupinus: value = "torculusresupinus"; break;
+        case neumeType_TYPE_tristropha: value = "tristropha"; break;
+        case neumeType_TYPE_virga: value = "virga"; break;
+        case neumeType_TYPE_virgastrata: value = "virgastrata"; break;
         default:
-            LogWarning("Unknown value '%d' for att.ncForm@rellen", data);
+            LogWarning("Unknown value '%d' for att.neumeType@type", data);
             value = "";
             break;
     }
     return value;
 }
 
-ncForm_RELLEN AttConverterBase::StrToNcFormRellen(const std::string &value, bool logWarning) const
+neumeType_TYPE AttConverterBase::StrToNeumeTypeType(const std::string &value, bool logWarning) const
 {
-    if (value == "l") return ncForm_RELLEN_l;
-    if (value == "s") return ncForm_RELLEN_s;
+    if (value == "apostropha") return neumeType_TYPE_apostropha;
+    if (value == "bistropha") return neumeType_TYPE_bistropha;
+    if (value == "climacus") return neumeType_TYPE_climacus;
+    if (value == "clivis") return neumeType_TYPE_clivis;
+    if (value == "oriscus") return neumeType_TYPE_oriscus;
+    if (value == "pes") return neumeType_TYPE_pes;
+    if (value == "pessubpunctis") return neumeType_TYPE_pessubpunctis;
+    if (value == "porrectus") return neumeType_TYPE_porrectus;
+    if (value == "porrectusflexus") return neumeType_TYPE_porrectusflexus;
+    if (value == "pressusmaior") return neumeType_TYPE_pressusmaior;
+    if (value == "pressusminor") return neumeType_TYPE_pressusminor;
+    if (value == "punctum") return neumeType_TYPE_punctum;
+    if (value == "quilisma") return neumeType_TYPE_quilisma;
+    if (value == "scandicus") return neumeType_TYPE_scandicus;
+    if (value == "strophicus") return neumeType_TYPE_strophicus;
+    if (value == "torculus") return neumeType_TYPE_torculus;
+    if (value == "torculusresupinus") return neumeType_TYPE_torculusresupinus;
+    if (value == "tristropha") return neumeType_TYPE_tristropha;
+    if (value == "virga") return neumeType_TYPE_virga;
+    if (value == "virgastrata") return neumeType_TYPE_virgastrata;
     if (logWarning && !value.empty())
-        LogWarning("Unsupported value '%s' for att.ncForm@rellen", value.c_str());
-    return ncForm_RELLEN_NONE;
+        LogWarning("Unsupported value '%s' for att.neumeType@type", value.c_str());
+    return neumeType_TYPE_NONE;
 }
 
 std::string AttConverterBase::NoteGesExtremisToStr(noteGes_EXTREMIS data) const
@@ -5426,6 +5446,29 @@ tempoLog_FUNC AttConverterBase::StrToTempoLogFunc(const std::string &value, bool
     return tempoLog_FUNC_NONE;
 }
 
+std::string AttConverterBase::TremFormFormToStr(tremForm_FORM data) const
+{
+    std::string value;
+    switch (data) {
+        case tremForm_FORM_meas: value = "meas"; break;
+        case tremForm_FORM_unmeas: value = "unmeas"; break;
+        default:
+            LogWarning("Unknown value '%d' for att.tremForm@form", data);
+            value = "";
+            break;
+    }
+    return value;
+}
+
+tremForm_FORM AttConverterBase::StrToTremFormForm(const std::string &value, bool logWarning) const
+{
+    if (value == "meas") return tremForm_FORM_meas;
+    if (value == "unmeas") return tremForm_FORM_unmeas;
+    if (logWarning && !value.empty())
+        LogWarning("Unsupported value '%s' for att.tremForm@form", value.c_str());
+    return tremForm_FORM_NONE;
+}
+
 std::string AttConverterBase::TupletVisNumformatToStr(tupletVis_NUMFORMAT data) const
 {
     std::string value;
diff --git a/libmei/dist/attconverter.h b/libmei/dist/attconverter.h
index cc7724b062a..5d158e75565 100644
--- a/libmei/dist/attconverter.h
+++ b/libmei/dist/attconverter.h
@@ -300,9 +300,6 @@ class AttConverterBase {
     std::string AudienceAudienceToStr(audience_AUDIENCE data) const;
     audience_AUDIENCE StrToAudienceAudience(const std::string &value, bool logWarning = true) const;
 
-    std::string BTremLogFormToStr(bTremLog_FORM data) const;
-    bTremLog_FORM StrToBTremLogForm(const std::string &value, bool logWarning = true) const;
-
     std::string BeamRendFormToStr(beamRend_FORM data) const;
     beamRend_FORM StrToBeamRendForm(const std::string &value, bool logWarning = true) const;
 
@@ -315,6 +312,9 @@ class AttConverterBase {
     std::string CurvatureCurvedirToStr(curvature_CURVEDIR data) const;
     curvature_CURVEDIR StrToCurvatureCurvedir(const std::string &value, bool logWarning = true) const;
 
+    std::string CurvatureDirectionCurveToStr(curvatureDirection_CURVE data) const;
+    curvatureDirection_CURVE StrToCurvatureDirectionCurve(const std::string &value, bool logWarning = true) const;
+
     std::string CurveLogFuncToStr(curveLog_FUNC data) const;
     curveLog_FUNC StrToCurveLogFunc(const std::string &value, bool logWarning = true) const;
 
@@ -339,9 +339,6 @@ class AttConverterBase {
     std::string ExtSymAuthGlyphauthToStr(extSymAuth_GLYPHAUTH data) const;
     extSymAuth_GLYPHAUTH StrToExtSymAuthGlyphauth(const std::string &value, bool logWarning = true) const;
 
-    std::string FTremLogFormToStr(fTremLog_FORM data) const;
-    fTremLog_FORM StrToFTremLogForm(const std::string &value, bool logWarning = true) const;
-
     std::string FermataVisFormToStr(fermataVis_FORM data) const;
     fermataVis_FORM StrToFermataVisForm(const std::string &value, bool logWarning = true) const;
 
@@ -390,9 +387,6 @@ class AttConverterBase {
     std::string LineLogFuncToStr(lineLog_FUNC data) const;
     lineLog_FUNC StrToLineLogFunc(const std::string &value, bool logWarning = true) const;
 
-    std::string LiquescentVisCurveToStr(liquescentVis_CURVE data) const;
-    liquescentVis_CURVE StrToLiquescentVisCurve(const std::string &value, bool logWarning = true) const;
-
     std::string MeasurementUnitToStr(measurement_UNIT data) const;
     measurement_UNIT StrToMeasurementUnit(const std::string &value, bool logWarning = true) const;
 
@@ -417,12 +411,12 @@ class AttConverterBase {
     std::string NcFormConToStr(ncForm_CON data) const;
     ncForm_CON StrToNcFormCon(const std::string &value, bool logWarning = true) const;
 
-    std::string NcFormCurveToStr(ncForm_CURVE data) const;
-    ncForm_CURVE StrToNcFormCurve(const std::string &value, bool logWarning = true) const;
-
     std::string NcFormRellenToStr(ncForm_RELLEN data) const;
     ncForm_RELLEN StrToNcFormRellen(const std::string &value, bool logWarning = true) const;
 
+    std::string NeumeTypeTypeToStr(neumeType_TYPE data) const;
+    neumeType_TYPE StrToNeumeTypeType(const std::string &value, bool logWarning = true) const;
+
     std::string NoteGesExtremisToStr(noteGes_EXTREMIS data) const;
     noteGes_EXTREMIS StrToNoteGesExtremis(const std::string &value, bool logWarning = true) const;
 
@@ -477,6 +471,9 @@ class AttConverterBase {
     std::string TempoLogFuncToStr(tempoLog_FUNC data) const;
     tempoLog_FUNC StrToTempoLogFunc(const std::string &value, bool logWarning = true) const;
 
+    std::string TremFormFormToStr(tremForm_FORM data) const;
+    tremForm_FORM StrToTremFormForm(const std::string &value, bool logWarning = true) const;
+
     std::string TupletVisNumformatToStr(tupletVis_NUMFORMAT data) const;
     tupletVis_NUMFORMAT StrToTupletVisNumformat(const std::string &value, bool logWarning = true) const;
 
diff --git a/libmei/dist/attmodule.cpp b/libmei/dist/attmodule.cpp
index cdff9d3b589..74f400b5c03 100644
--- a/libmei/dist/attmodule.cpp
+++ b/libmei/dist/attmodule.cpp
@@ -106,14 +106,6 @@ bool AttModule::SetAnalytical(Object *element, const std::string &attrType, cons
             return true;
         }
     }
-    if (element->HasAttClass(ATT_KEYSIGANL)) {
-        AttKeySigAnl *att = dynamic_cast<AttKeySigAnl *>(element);
-        assert(att);
-        if (attrType == "mode") {
-            att->SetMode(att->StrToMode(attrValue));
-            return true;
-        }
-    }
     if (element->HasAttClass(ATT_KEYSIGDEFAULTANL)) {
         AttKeySigDefaultAnl *att = dynamic_cast<AttKeySigDefaultAnl *>(element);
         assert(att);
@@ -188,13 +180,6 @@ void AttModule::GetAnalytical(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "intm", att->StrToStr(att->GetIntm()) });
         }
     }
-    if (element->HasAttClass(ATT_KEYSIGANL)) {
-        const AttKeySigAnl *att = dynamic_cast<const AttKeySigAnl *>(element);
-        assert(att);
-        if (att->HasMode()) {
-            attributes->push_back({ "mode", att->ModeToStr(att->GetMode()) });
-        }
-    }
     if (element->HasAttClass(ATT_KEYSIGDEFAULTANL)) {
         const AttKeySigDefaultAnl *att = dynamic_cast<const AttKeySigDefaultAnl *>(element);
         assert(att);
@@ -251,14 +236,6 @@ bool AttModule::SetCmn(Object *element, const std::string &attrType, const std::
             return true;
         }
     }
-    if (element->HasAttClass(ATT_BTREMLOG)) {
-        AttBTremLog *att = dynamic_cast<AttBTremLog *>(element);
-        assert(att);
-        if (attrType == "form") {
-            att->SetForm(att->StrToBTremLogForm(attrValue));
-            return true;
-        }
-    }
     if (element->HasAttClass(ATT_BEAMPRESENT)) {
         AttBeamPresent *att = dynamic_cast<AttBeamPresent *>(element);
         assert(att);
@@ -347,14 +324,6 @@ bool AttModule::SetCmn(Object *element, const std::string &attrType, const std::
             return true;
         }
     }
-    if (element->HasAttClass(ATT_FTREMLOG)) {
-        AttFTremLog *att = dynamic_cast<AttFTremLog *>(element);
-        assert(att);
-        if (attrType == "form") {
-            att->SetForm(att->StrToFTremLogForm(attrValue));
-            return true;
-        }
-    }
     if (element->HasAttClass(ATT_GLISSPRESENT)) {
         AttGlissPresent *att = dynamic_cast<AttGlissPresent *>(element);
         assert(att);
@@ -511,14 +480,6 @@ bool AttModule::SetCmn(Object *element, const std::string &attrType, const std::
             return true;
         }
     }
-    if (element->HasAttClass(ATT_SCOREDEFVISCMN)) {
-        AttScoreDefVisCmn *att = dynamic_cast<AttScoreDefVisCmn *>(element);
-        assert(att);
-        if (attrType == "grid.show") {
-            att->SetGridShow(att->StrToBoolean(attrValue));
-            return true;
-        }
-    }
     if (element->HasAttClass(ATT_SLURREND)) {
         AttSlurRend *att = dynamic_cast<AttSlurRend *>(element);
         assert(att);
@@ -551,6 +512,14 @@ bool AttModule::SetCmn(Object *element, const std::string &attrType, const std::
             return true;
         }
     }
+    if (element->HasAttClass(ATT_TREMFORM)) {
+        AttTremForm *att = dynamic_cast<AttTremForm *>(element);
+        assert(att);
+        if (attrType == "form") {
+            att->SetForm(att->StrToTremFormForm(attrValue));
+            return true;
+        }
+    }
     if (element->HasAttClass(ATT_TREMMEASURED)) {
         AttTremMeasured *att = dynamic_cast<AttTremMeasured *>(element);
         assert(att);
@@ -572,13 +541,6 @@ void AttModule::GetCmn(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "order", att->ArpegLogOrderToStr(att->GetOrder()) });
         }
     }
-    if (element->HasAttClass(ATT_BTREMLOG)) {
-        const AttBTremLog *att = dynamic_cast<const AttBTremLog *>(element);
-        assert(att);
-        if (att->HasForm()) {
-            attributes->push_back({ "form", att->BTremLogFormToStr(att->GetForm()) });
-        }
-    }
     if (element->HasAttClass(ATT_BEAMPRESENT)) {
         const AttBeamPresent *att = dynamic_cast<const AttBeamPresent *>(element);
         assert(att);
@@ -654,13 +616,6 @@ void AttModule::GetCmn(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "expand", att->BooleanToStr(att->GetExpand()) });
         }
     }
-    if (element->HasAttClass(ATT_FTREMLOG)) {
-        const AttFTremLog *att = dynamic_cast<const AttFTremLog *>(element);
-        assert(att);
-        if (att->HasForm()) {
-            attributes->push_back({ "form", att->FTremLogFormToStr(att->GetForm()) });
-        }
-    }
     if (element->HasAttClass(ATT_GLISSPRESENT)) {
         const AttGlissPresent *att = dynamic_cast<const AttGlissPresent *>(element);
         assert(att);
@@ -792,13 +747,6 @@ void AttModule::GetCmn(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "reh.enclose", att->RehearsalRehencloseToStr(att->GetRehEnclose()) });
         }
     }
-    if (element->HasAttClass(ATT_SCOREDEFVISCMN)) {
-        const AttScoreDefVisCmn *att = dynamic_cast<const AttScoreDefVisCmn *>(element);
-        assert(att);
-        if (att->HasGridShow()) {
-            attributes->push_back({ "grid.show", att->BooleanToStr(att->GetGridShow()) });
-        }
-    }
     if (element->HasAttClass(ATT_SLURREND)) {
         const AttSlurRend *att = dynamic_cast<const AttSlurRend *>(element);
         assert(att);
@@ -826,6 +774,13 @@ void AttModule::GetCmn(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "tie.lwidth", att->LinewidthToStr(att->GetTieLwidth()) });
         }
     }
+    if (element->HasAttClass(ATT_TREMFORM)) {
+        const AttTremForm *att = dynamic_cast<const AttTremForm *>(element);
+        assert(att);
+        if (att->HasForm()) {
+            attributes->push_back({ "form", att->TremFormFormToStr(att->GetForm()) });
+        }
+    }
     if (element->HasAttClass(ATT_TREMMEASURED)) {
         const AttTremMeasured *att = dynamic_cast<const AttTremMeasured *>(element);
         assert(att);
@@ -1282,6 +1237,14 @@ bool AttModule::SetGestural(Object *element, const std::string &attrType, const
             return true;
         }
     }
+    if (element->HasAttClass(ATT_ATTACKING)) {
+        AttAttacking *att = dynamic_cast<AttAttacking *>(element);
+        assert(att);
+        if (attrType == "attacca") {
+            att->SetAttacca(att->StrToBoolean(attrValue));
+            return true;
+        }
+    }
     if (element->HasAttClass(ATT_BENDGES)) {
         AttBendGes *att = dynamic_cast<AttBendGes *>(element);
         assert(att);
@@ -1318,30 +1281,6 @@ bool AttModule::SetGestural(Object *element, const std::string &attrType, const
             return true;
         }
     }
-    if (element->HasAttClass(ATT_MDIVGES)) {
-        AttMdivGes *att = dynamic_cast<AttMdivGes *>(element);
-        assert(att);
-        if (attrType == "attacca") {
-            att->SetAttacca(att->StrToBoolean(attrValue));
-            return true;
-        }
-    }
-    if (element->HasAttClass(ATT_NCGES)) {
-        AttNcGes *att = dynamic_cast<AttNcGes *>(element);
-        assert(att);
-        if (attrType == "oct.ges") {
-            att->SetOctGes(att->StrToOctave(attrValue));
-            return true;
-        }
-        if (attrType == "pname.ges") {
-            att->SetPnameGes(att->StrToPitchname(attrValue));
-            return true;
-        }
-        if (attrType == "pnum") {
-            att->SetPnum(att->StrToInt(attrValue));
-            return true;
-        }
-    }
     if (element->HasAttClass(ATT_NOTEGES)) {
         AttNoteGes *att = dynamic_cast<AttNoteGes *>(element);
         assert(att);
@@ -1349,18 +1288,6 @@ bool AttModule::SetGestural(Object *element, const std::string &attrType, const
             att->SetExtremis(att->StrToNoteGesExtremis(attrValue));
             return true;
         }
-        if (attrType == "oct.ges") {
-            att->SetOctGes(att->StrToOctave(attrValue));
-            return true;
-        }
-        if (attrType == "pname.ges") {
-            att->SetPnameGes(att->StrToPitchname(attrValue));
-            return true;
-        }
-        if (attrType == "pnum") {
-            att->SetPnum(att->StrToInt(attrValue));
-            return true;
-        }
     }
     if (element->HasAttClass(ATT_ORNAMENTACCIDGES)) {
         AttOrnamentAccidGes *att = dynamic_cast<AttOrnamentAccidGes *>(element);
@@ -1374,11 +1301,19 @@ bool AttModule::SetGestural(Object *element, const std::string &attrType, const
             return true;
         }
     }
-    if (element->HasAttClass(ATT_SECTIONGES)) {
-        AttSectionGes *att = dynamic_cast<AttSectionGes *>(element);
+    if (element->HasAttClass(ATT_PITCHGES)) {
+        AttPitchGes *att = dynamic_cast<AttPitchGes *>(element);
         assert(att);
-        if (attrType == "attacca") {
-            att->SetAttacca(att->StrToBoolean(attrValue));
+        if (attrType == "oct.ges") {
+            att->SetOctGes(att->StrToOctave(attrValue));
+            return true;
+        }
+        if (attrType == "pname.ges") {
+            att->SetPnameGes(att->StrToPitchname(attrValue));
+            return true;
+        }
+        if (attrType == "pnum") {
+            att->SetPnum(att->StrToInt(attrValue));
             return true;
         }
     }
@@ -1438,6 +1373,13 @@ void AttModule::GetGestural(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "artic.ges", att->ArticulationListToStr(att->GetArticGes()) });
         }
     }
+    if (element->HasAttClass(ATT_ATTACKING)) {
+        const AttAttacking *att = dynamic_cast<const AttAttacking *>(element);
+        assert(att);
+        if (att->HasAttacca()) {
+            attributes->push_back({ "attacca", att->BooleanToStr(att->GetAttacca()) });
+        }
+    }
     if (element->HasAttClass(ATT_BENDGES)) {
         const AttBendGes *att = dynamic_cast<const AttBendGes *>(element);
         assert(att);
@@ -1467,41 +1409,12 @@ void AttModule::GetGestural(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "dur.recip", att->StrToStr(att->GetDurRecip()) });
         }
     }
-    if (element->HasAttClass(ATT_MDIVGES)) {
-        const AttMdivGes *att = dynamic_cast<const AttMdivGes *>(element);
-        assert(att);
-        if (att->HasAttacca()) {
-            attributes->push_back({ "attacca", att->BooleanToStr(att->GetAttacca()) });
-        }
-    }
-    if (element->HasAttClass(ATT_NCGES)) {
-        const AttNcGes *att = dynamic_cast<const AttNcGes *>(element);
-        assert(att);
-        if (att->HasOctGes()) {
-            attributes->push_back({ "oct.ges", att->OctaveToStr(att->GetOctGes()) });
-        }
-        if (att->HasPnameGes()) {
-            attributes->push_back({ "pname.ges", att->PitchnameToStr(att->GetPnameGes()) });
-        }
-        if (att->HasPnum()) {
-            attributes->push_back({ "pnum", att->IntToStr(att->GetPnum()) });
-        }
-    }
     if (element->HasAttClass(ATT_NOTEGES)) {
         const AttNoteGes *att = dynamic_cast<const AttNoteGes *>(element);
         assert(att);
         if (att->HasExtremis()) {
             attributes->push_back({ "extremis", att->NoteGesExtremisToStr(att->GetExtremis()) });
         }
-        if (att->HasOctGes()) {
-            attributes->push_back({ "oct.ges", att->OctaveToStr(att->GetOctGes()) });
-        }
-        if (att->HasPnameGes()) {
-            attributes->push_back({ "pname.ges", att->PitchnameToStr(att->GetPnameGes()) });
-        }
-        if (att->HasPnum()) {
-            attributes->push_back({ "pnum", att->IntToStr(att->GetPnum()) });
-        }
     }
     if (element->HasAttClass(ATT_ORNAMENTACCIDGES)) {
         const AttOrnamentAccidGes *att = dynamic_cast<const AttOrnamentAccidGes *>(element);
@@ -1513,11 +1426,17 @@ void AttModule::GetGestural(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "accidlower.ges", att->AccidentalGesturalToStr(att->GetAccidlowerGes()) });
         }
     }
-    if (element->HasAttClass(ATT_SECTIONGES)) {
-        const AttSectionGes *att = dynamic_cast<const AttSectionGes *>(element);
+    if (element->HasAttClass(ATT_PITCHGES)) {
+        const AttPitchGes *att = dynamic_cast<const AttPitchGes *>(element);
         assert(att);
-        if (att->HasAttacca()) {
-            attributes->push_back({ "attacca", att->BooleanToStr(att->GetAttacca()) });
+        if (att->HasOctGes()) {
+            attributes->push_back({ "oct.ges", att->OctaveToStr(att->GetOctGes()) });
+        }
+        if (att->HasPnameGes()) {
+            attributes->push_back({ "pname.ges", att->PitchnameToStr(att->GetPnameGes()) });
+        }
+        if (att->HasPnum()) {
+            attributes->push_back({ "pnum", att->IntToStr(att->GetPnum()) });
         }
     }
     if (element->HasAttClass(ATT_SOUNDLOCATION)) {
@@ -2119,7 +2038,7 @@ bool AttModule::SetNeumes(Object *element, const std::string &attrType, const st
         AttDivLineLog *att = dynamic_cast<AttDivLineLog *>(element);
         assert(att);
         if (attrType == "form") {
-            att->SetForm(att->StrToStr(attrValue));
+            att->SetForm(att->StrToDivLineLogForm(attrValue));
             return true;
         }
     }
@@ -2146,10 +2065,6 @@ bool AttModule::SetNeumes(Object *element, const std::string &attrType, const st
             att->SetCon(att->StrToNcFormCon(attrValue));
             return true;
         }
-        if (attrType == "curve") {
-            att->SetCurve(att->StrToNcFormCurve(attrValue));
-            return true;
-        }
         if (attrType == "hooked") {
             att->SetHooked(att->StrToBoolean(attrValue));
             return true;
@@ -2171,6 +2086,14 @@ bool AttModule::SetNeumes(Object *element, const std::string &attrType, const st
             return true;
         }
     }
+    if (element->HasAttClass(ATT_NEUMETYPE)) {
+        AttNeumeType *att = dynamic_cast<AttNeumeType *>(element);
+        assert(att);
+        if (attrType == "type") {
+            att->SetType(att->StrToStr(attrValue));
+            return true;
+        }
+    }
 
     return false;
 }
@@ -2181,7 +2104,7 @@ void AttModule::GetNeumes(const Object *element, ArrayOfStrAttr *attributes)
         const AttDivLineLog *att = dynamic_cast<const AttDivLineLog *>(element);
         assert(att);
         if (att->HasForm()) {
-            attributes->push_back({ "form", att->StrToStr(att->GetForm()) });
+            attributes->push_back({ "form", att->DivLineLogFormToStr(att->GetForm()) });
         }
     }
     if (element->HasAttClass(ATT_NCLOG)) {
@@ -2203,9 +2126,6 @@ void AttModule::GetNeumes(const Object *element, ArrayOfStrAttr *attributes)
         if (att->HasCon()) {
             attributes->push_back({ "con", att->NcFormConToStr(att->GetCon()) });
         }
-        if (att->HasCurve()) {
-            attributes->push_back({ "curve", att->NcFormCurveToStr(att->GetCurve()) });
-        }
         if (att->HasHooked()) {
             attributes->push_back({ "hooked", att->BooleanToStr(att->GetHooked()) });
         }
@@ -2222,6 +2142,13 @@ void AttModule::GetNeumes(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "tilt", att->CompassdirectionToStr(att->GetTilt()) });
         }
     }
+    if (element->HasAttClass(ATT_NEUMETYPE)) {
+        const AttNeumeType *att = dynamic_cast<const AttNeumeType *>(element);
+        assert(att);
+        if (att->HasType()) {
+            attributes->push_back({ "type", att->StrToStr(att->GetType()) });
+        }
+    }
 }
 
 } // namespace vrv
@@ -2530,14 +2457,6 @@ bool AttModule::SetShared(Object *element, const std::string &attrType, const st
     if (element->HasAttClass(ATT_COORDINATED)) {
         AttCoordinated *att = dynamic_cast<AttCoordinated *>(element);
         assert(att);
-        if (attrType == "ulx") {
-            att->SetUlx(att->StrToInt(attrValue));
-            return true;
-        }
-        if (attrType == "uly") {
-            att->SetUly(att->StrToInt(attrValue));
-            return true;
-        }
         if (attrType == "lrx") {
             att->SetLrx(att->StrToInt(attrValue));
             return true;
@@ -2551,6 +2470,18 @@ bool AttModule::SetShared(Object *element, const std::string &attrType, const st
             return true;
         }
     }
+    if (element->HasAttClass(ATT_COORDINATEDUL)) {
+        AttCoordinatedUl *att = dynamic_cast<AttCoordinatedUl *>(element);
+        assert(att);
+        if (attrType == "ulx") {
+            att->SetUlx(att->StrToInt(attrValue));
+            return true;
+        }
+        if (attrType == "uly") {
+            att->SetUly(att->StrToInt(attrValue));
+            return true;
+        }
+    }
     if (element->HasAttClass(ATT_CUE)) {
         AttCue *att = dynamic_cast<AttCue *>(element);
         assert(att);
@@ -2575,18 +2506,6 @@ bool AttModule::SetShared(Object *element, const std::string &attrType, const st
             return true;
         }
     }
-    if (element->HasAttClass(ATT_CURVEREND)) {
-        AttCurveRend *att = dynamic_cast<AttCurveRend *>(element);
-        assert(att);
-        if (attrType == "lform") {
-            att->SetLform(att->StrToLineform(attrValue));
-            return true;
-        }
-        if (attrType == "lwidth") {
-            att->SetLwidth(att->StrToLinewidth(attrValue));
-            return true;
-        }
-    }
     if (element->HasAttClass(ATT_CUSTOSLOG)) {
         AttCustosLog *att = dynamic_cast<AttCustosLog *>(element);
         assert(att);
@@ -2819,6 +2738,14 @@ bool AttModule::SetShared(Object *element, const std::string &attrType, const st
             return true;
         }
     }
+    if (element->HasAttClass(ATT_KEYMODE)) {
+        AttKeyMode *att = dynamic_cast<AttKeyMode *>(element);
+        assert(att);
+        if (attrType == "mode") {
+            att->SetMode(att->StrToMode(attrValue));
+            return true;
+        }
+    }
     if (element->HasAttClass(ATT_KEYSIGLOG)) {
         AttKeySigLog *att = dynamic_cast<AttKeySigLog *>(element);
         assert(att);
@@ -2906,14 +2833,14 @@ bool AttModule::SetShared(Object *element, const std::string &attrType, const st
             att->SetLform(att->StrToLineform(attrValue));
             return true;
         }
-        if (attrType == "lsegs") {
-            att->SetLsegs(att->StrToInt(attrValue));
-            return true;
-        }
         if (attrType == "lwidth") {
             att->SetLwidth(att->StrToLinewidth(attrValue));
             return true;
         }
+        if (attrType == "lsegs") {
+            att->SetLsegs(att->StrToInt(attrValue));
+            return true;
+        }
     }
     if (element->HasAttClass(ATT_LINKING)) {
         AttLinking *att = dynamic_cast<AttLinking *>(element);
@@ -3027,6 +2954,14 @@ bool AttModule::SetShared(Object *element, const std::string &attrType, const st
             return true;
         }
     }
+    if (element->HasAttClass(ATT_MENSURLOG)) {
+        AttMensurLog *att = dynamic_cast<AttMensurLog *>(element);
+        assert(att);
+        if (attrType == "level") {
+            att->SetLevel(att->StrToDuration(attrValue));
+            return true;
+        }
+    }
     if (element->HasAttClass(ATT_METADATAPOINTING)) {
         AttMetadataPointing *att = dynamic_cast<AttMetadataPointing *>(element);
         assert(att);
@@ -4128,12 +4063,6 @@ void AttModule::GetShared(const Object *element, ArrayOfStrAttr *attributes)
     if (element->HasAttClass(ATT_COORDINATED)) {
         const AttCoordinated *att = dynamic_cast<const AttCoordinated *>(element);
         assert(att);
-        if (att->HasUlx()) {
-            attributes->push_back({ "ulx", att->IntToStr(att->GetUlx()) });
-        }
-        if (att->HasUly()) {
-            attributes->push_back({ "uly", att->IntToStr(att->GetUly()) });
-        }
         if (att->HasLrx()) {
             attributes->push_back({ "lrx", att->IntToStr(att->GetLrx()) });
         }
@@ -4144,6 +4073,16 @@ void AttModule::GetShared(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "rotate", att->DblToStr(att->GetRotate()) });
         }
     }
+    if (element->HasAttClass(ATT_COORDINATEDUL)) {
+        const AttCoordinatedUl *att = dynamic_cast<const AttCoordinatedUl *>(element);
+        assert(att);
+        if (att->HasUlx()) {
+            attributes->push_back({ "ulx", att->IntToStr(att->GetUlx()) });
+        }
+        if (att->HasUly()) {
+            attributes->push_back({ "uly", att->IntToStr(att->GetUly()) });
+        }
+    }
     if (element->HasAttClass(ATT_CUE)) {
         const AttCue *att = dynamic_cast<const AttCue *>(element);
         assert(att);
@@ -4164,16 +4103,6 @@ void AttModule::GetShared(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "curvedir", att->CurvatureCurvedirToStr(att->GetCurvedir()) });
         }
     }
-    if (element->HasAttClass(ATT_CURVEREND)) {
-        const AttCurveRend *att = dynamic_cast<const AttCurveRend *>(element);
-        assert(att);
-        if (att->HasLform()) {
-            attributes->push_back({ "lform", att->LineformToStr(att->GetLform()) });
-        }
-        if (att->HasLwidth()) {
-            attributes->push_back({ "lwidth", att->LinewidthToStr(att->GetLwidth()) });
-        }
-    }
     if (element->HasAttClass(ATT_CUSTOSLOG)) {
         const AttCustosLog *att = dynamic_cast<const AttCustosLog *>(element);
         assert(att);
@@ -4371,6 +4300,13 @@ void AttModule::GetShared(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "join", att->StrToStr(att->GetJoin()) });
         }
     }
+    if (element->HasAttClass(ATT_KEYMODE)) {
+        const AttKeyMode *att = dynamic_cast<const AttKeyMode *>(element);
+        assert(att);
+        if (att->HasMode()) {
+            attributes->push_back({ "mode", att->ModeToStr(att->GetMode()) });
+        }
+    }
     if (element->HasAttClass(ATT_KEYSIGLOG)) {
         const AttKeySigLog *att = dynamic_cast<const AttKeySigLog *>(element);
         assert(att);
@@ -4445,12 +4381,12 @@ void AttModule::GetShared(const Object *element, ArrayOfStrAttr *attributes)
         if (att->HasLform()) {
             attributes->push_back({ "lform", att->LineformToStr(att->GetLform()) });
         }
-        if (att->HasLsegs()) {
-            attributes->push_back({ "lsegs", att->IntToStr(att->GetLsegs()) });
-        }
         if (att->HasLwidth()) {
             attributes->push_back({ "lwidth", att->LinewidthToStr(att->GetLwidth()) });
         }
+        if (att->HasLsegs()) {
+            attributes->push_back({ "lsegs", att->IntToStr(att->GetLsegs()) });
+        }
     }
     if (element->HasAttClass(ATT_LINKING)) {
         const AttLinking *att = dynamic_cast<const AttLinking *>(element);
@@ -4543,6 +4479,13 @@ void AttModule::GetShared(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "meiversion", att->MeiVersionMeiversionToStr(att->GetMeiversion()) });
         }
     }
+    if (element->HasAttClass(ATT_MENSURLOG)) {
+        const AttMensurLog *att = dynamic_cast<const AttMensurLog *>(element);
+        assert(att);
+        if (att->HasLevel()) {
+            attributes->push_back({ "level", att->DurationToStr(att->GetLevel()) });
+        }
+    }
     if (element->HasAttClass(ATT_METADATAPOINTING)) {
         const AttMetadataPointing *att = dynamic_cast<const AttMetadataPointing *>(element);
         assert(att);
@@ -5437,14 +5380,6 @@ bool AttModule::SetVisual(Object *element, const std::string &attrType, const st
             att->SetArrowFillcolor(att->StrToStr(attrValue));
             return true;
         }
-        if (attrType == "line.form") {
-            att->SetLineForm(att->StrToLineform(attrValue));
-            return true;
-        }
-        if (attrType == "line.width") {
-            att->SetLineWidth(att->StrToLinewidth(attrValue));
-            return true;
-        }
     }
     if (element->HasAttClass(ATT_BARLINEVIS)) {
         AttBarLineVis *att = dynamic_cast<AttBarLineVis *>(element);
@@ -5506,6 +5441,14 @@ bool AttModule::SetVisual(Object *element, const std::string &attrType, const st
             return true;
         }
     }
+    if (element->HasAttClass(ATT_CURVATUREDIRECTION)) {
+        AttCurvatureDirection *att = dynamic_cast<AttCurvatureDirection *>(element);
+        assert(att);
+        if (attrType == "curve") {
+            att->SetCurve(att->StrToCurvatureDirectionCurve(attrValue));
+            return true;
+        }
+    }
     if (element->HasAttClass(ATT_EPISEMAVIS)) {
         AttEpisemaVis *att = dynamic_cast<AttEpisemaVis *>(element);
         assert(att);
@@ -5554,6 +5497,14 @@ bool AttModule::SetVisual(Object *element, const std::string &attrType, const st
             return true;
         }
     }
+    if (element->HasAttClass(ATT_GUITARGRIDVIS)) {
+        AttGuitarGridVis *att = dynamic_cast<AttGuitarGridVis *>(element);
+        assert(att);
+        if (attrType == "grid.show") {
+            att->SetGridShow(att->StrToBoolean(attrValue));
+            return true;
+        }
+    }
     if (element->HasAttClass(ATT_HAIRPINVIS)) {
         AttHairpinVis *att = dynamic_cast<AttHairpinVis *>(element);
         assert(att);
@@ -5653,10 +5604,6 @@ bool AttModule::SetVisual(Object *element, const std::string &attrType, const st
     if (element->HasAttClass(ATT_LIQUESCENTVIS)) {
         AttLiquescentVis *att = dynamic_cast<AttLiquescentVis *>(element);
         assert(att);
-        if (attrType == "curve") {
-            att->SetCurve(att->StrToLiquescentVisCurve(attrValue));
-            return true;
-        }
         if (attrType == "looped") {
             att->SetLooped(att->StrToBoolean(attrValue));
             return true;
@@ -5829,10 +5776,6 @@ bool AttModule::SetVisual(Object *element, const std::string &attrType, const st
     if (element->HasAttClass(ATT_STAFFDEFVIS)) {
         AttStaffDefVis *att = dynamic_cast<AttStaffDefVis *>(element);
         assert(att);
-        if (attrType == "grid.show") {
-            att->SetGridShow(att->StrToBoolean(attrValue));
-            return true;
-        }
         if (attrType == "layerscheme") {
             att->SetLayerscheme(att->StrToLayerscheme(attrValue));
             return true;
@@ -5937,12 +5880,6 @@ void AttModule::GetVisual(const Object *element, ArrayOfStrAttr *attributes)
         if (att->HasArrowFillcolor()) {
             attributes->push_back({ "arrow.fillcolor", att->StrToStr(att->GetArrowFillcolor()) });
         }
-        if (att->HasLineForm()) {
-            attributes->push_back({ "line.form", att->LineformToStr(att->GetLineForm()) });
-        }
-        if (att->HasLineWidth()) {
-            attributes->push_back({ "line.width", att->LinewidthToStr(att->GetLineWidth()) });
-        }
     }
     if (element->HasAttClass(ATT_BARLINEVIS)) {
         const AttBarLineVis *att = dynamic_cast<const AttBarLineVis *>(element);
@@ -5994,6 +5931,13 @@ void AttModule::GetVisual(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "clef.visible", att->BooleanToStr(att->GetClefVisible()) });
         }
     }
+    if (element->HasAttClass(ATT_CURVATUREDIRECTION)) {
+        const AttCurvatureDirection *att = dynamic_cast<const AttCurvatureDirection *>(element);
+        assert(att);
+        if (att->HasCurve()) {
+            attributes->push_back({ "curve", att->CurvatureDirectionCurveToStr(att->GetCurve()) });
+        }
+    }
     if (element->HasAttClass(ATT_EPISEMAVIS)) {
         const AttEpisemaVis *att = dynamic_cast<const AttEpisemaVis *>(element);
         assert(att);
@@ -6034,6 +5978,13 @@ void AttModule::GetVisual(const Object *element, ArrayOfStrAttr *attributes)
             attributes->push_back({ "orient", att->FingGrpVisOrientToStr(att->GetOrient()) });
         }
     }
+    if (element->HasAttClass(ATT_GUITARGRIDVIS)) {
+        const AttGuitarGridVis *att = dynamic_cast<const AttGuitarGridVis *>(element);
+        assert(att);
+        if (att->HasGridShow()) {
+            attributes->push_back({ "grid.show", att->BooleanToStr(att->GetGridShow()) });
+        }
+    }
     if (element->HasAttClass(ATT_HAIRPINVIS)) {
         const AttHairpinVis *att = dynamic_cast<const AttHairpinVis *>(element);
         assert(att);
@@ -6116,9 +6067,6 @@ void AttModule::GetVisual(const Object *element, ArrayOfStrAttr *attributes)
     if (element->HasAttClass(ATT_LIQUESCENTVIS)) {
         const AttLiquescentVis *att = dynamic_cast<const AttLiquescentVis *>(element);
         assert(att);
-        if (att->HasCurve()) {
-            attributes->push_back({ "curve", att->LiquescentVisCurveToStr(att->GetCurve()) });
-        }
         if (att->HasLooped()) {
             attributes->push_back({ "looped", att->BooleanToStr(att->GetLooped()) });
         }
@@ -6263,9 +6211,6 @@ void AttModule::GetVisual(const Object *element, ArrayOfStrAttr *attributes)
     if (element->HasAttClass(ATT_STAFFDEFVIS)) {
         const AttStaffDefVis *att = dynamic_cast<const AttStaffDefVis *>(element);
         assert(att);
-        if (att->HasGridShow()) {
-            attributes->push_back({ "grid.show", att->BooleanToStr(att->GetGridShow()) });
-        }
         if (att->HasLayerscheme()) {
             attributes->push_back({ "layerscheme", att->LayerschemeToStr(att->GetLayerscheme()) });
         }
diff --git a/libmei/dist/atts_analytical.cpp b/libmei/dist/atts_analytical.cpp
index 205f2acaa2f..e913cbb8e29 100644
--- a/libmei/dist/atts_analytical.cpp
+++ b/libmei/dist/atts_analytical.cpp
@@ -182,46 +182,6 @@ bool AttIntervalMelodic::HasIntm() const
     return (m_intm != "");
 }
 
-//----------------------------------------------------------------------------
-// AttKeySigAnl
-//----------------------------------------------------------------------------
-
-AttKeySigAnl::AttKeySigAnl() : Att()
-{
-    ResetKeySigAnl();
-}
-
-void AttKeySigAnl::ResetKeySigAnl()
-{
-    m_mode = MODE_NONE;
-}
-
-bool AttKeySigAnl::ReadKeySigAnl(pugi::xml_node element, bool removeAttr)
-{
-    bool hasAttribute = false;
-    if (element.attribute("mode")) {
-        this->SetMode(StrToMode(element.attribute("mode").value()));
-        if (removeAttr) element.remove_attribute("mode");
-        hasAttribute = true;
-    }
-    return hasAttribute;
-}
-
-bool AttKeySigAnl::WriteKeySigAnl(pugi::xml_node element)
-{
-    bool wroteAttribute = false;
-    if (this->HasMode()) {
-        element.append_attribute("mode") = ModeToStr(this->GetMode()).c_str();
-        wroteAttribute = true;
-    }
-    return wroteAttribute;
-}
-
-bool AttKeySigAnl::HasMode() const
-{
-    return (m_mode != MODE_NONE);
-}
-
 //----------------------------------------------------------------------------
 // AttKeySigDefaultAnl
 //----------------------------------------------------------------------------
diff --git a/libmei/dist/atts_analytical.h b/libmei/dist/atts_analytical.h
index f214943cf8e..8381b948639 100644
--- a/libmei/dist/atts_analytical.h
+++ b/libmei/dist/atts_analytical.h
@@ -232,55 +232,6 @@ class InstIntervalMelodic : public AttIntervalMelodic {
     virtual ~InstIntervalMelodic() = default;
 };
 
-//----------------------------------------------------------------------------
-// AttKeySigAnl
-//----------------------------------------------------------------------------
-
-class AttKeySigAnl : public Att {
-protected:
-    AttKeySigAnl();
-    ~AttKeySigAnl() = default;
-
-public:
-    /** Reset the default values for the attribute class **/
-    void ResetKeySigAnl();
-
-    /** Read the values for the attribute class **/
-    bool ReadKeySigAnl(pugi::xml_node element, bool removeAttr = true);
-
-    /** Write the values for the attribute class **/
-    bool WriteKeySigAnl(pugi::xml_node element);
-
-    /**
-     * @name Setters, getters and presence checker for class members.
-     * The checker returns true if the attribute class is set (e.g., not equal
-     * to the default value)
-     **/
-    ///@{
-    void SetMode(data_MODE mode_) { m_mode = mode_; }
-    data_MODE GetMode() const { return m_mode; }
-    bool HasMode() const;
-    ///@}
-
-private:
-    /** Indicates major, minor, or other tonality. **/
-    data_MODE m_mode;
-};
-
-//----------------------------------------------------------------------------
-// InstKeySigAnl
-//----------------------------------------------------------------------------
-
-/**
- * Instantiable version of AttKeySigAnl
- */
-
-class InstKeySigAnl : public AttKeySigAnl {
-public:
-    InstKeySigAnl() = default;
-    virtual ~InstKeySigAnl() = default;
-};
-
 //----------------------------------------------------------------------------
 // AttKeySigDefaultAnl
 //----------------------------------------------------------------------------
diff --git a/libmei/dist/atts_cmn.cpp b/libmei/dist/atts_cmn.cpp
index b36be4bd036..837e1dd4f66 100644
--- a/libmei/dist/atts_cmn.cpp
+++ b/libmei/dist/atts_cmn.cpp
@@ -62,46 +62,6 @@ bool AttArpegLog::HasOrder() const
     return (m_order != arpegLog_ORDER_NONE);
 }
 
-//----------------------------------------------------------------------------
-// AttBTremLog
-//----------------------------------------------------------------------------
-
-AttBTremLog::AttBTremLog() : Att()
-{
-    ResetBTremLog();
-}
-
-void AttBTremLog::ResetBTremLog()
-{
-    m_form = bTremLog_FORM_NONE;
-}
-
-bool AttBTremLog::ReadBTremLog(pugi::xml_node element, bool removeAttr)
-{
-    bool hasAttribute = false;
-    if (element.attribute("form")) {
-        this->SetForm(StrToBTremLogForm(element.attribute("form").value()));
-        if (removeAttr) element.remove_attribute("form");
-        hasAttribute = true;
-    }
-    return hasAttribute;
-}
-
-bool AttBTremLog::WriteBTremLog(pugi::xml_node element)
-{
-    bool wroteAttribute = false;
-    if (this->HasForm()) {
-        element.append_attribute("form") = BTremLogFormToStr(this->GetForm()).c_str();
-        wroteAttribute = true;
-    }
-    return wroteAttribute;
-}
-
-bool AttBTremLog::HasForm() const
-{
-    return (m_form != bTremLog_FORM_NONE);
-}
-
 //----------------------------------------------------------------------------
 // AttBeamPresent
 //----------------------------------------------------------------------------
@@ -522,46 +482,6 @@ bool AttExpandable::HasExpand() const
     return (m_expand != BOOLEAN_NONE);
 }
 
-//----------------------------------------------------------------------------
-// AttFTremLog
-//----------------------------------------------------------------------------
-
-AttFTremLog::AttFTremLog() : Att()
-{
-    ResetFTremLog();
-}
-
-void AttFTremLog::ResetFTremLog()
-{
-    m_form = fTremLog_FORM_NONE;
-}
-
-bool AttFTremLog::ReadFTremLog(pugi::xml_node element, bool removeAttr)
-{
-    bool hasAttribute = false;
-    if (element.attribute("form")) {
-        this->SetForm(StrToFTremLogForm(element.attribute("form").value()));
-        if (removeAttr) element.remove_attribute("form");
-        hasAttribute = true;
-    }
-    return hasAttribute;
-}
-
-bool AttFTremLog::WriteFTremLog(pugi::xml_node element)
-{
-    bool wroteAttribute = false;
-    if (this->HasForm()) {
-        element.append_attribute("form") = FTremLogFormToStr(this->GetForm()).c_str();
-        wroteAttribute = true;
-    }
-    return wroteAttribute;
-}
-
-bool AttFTremLog::HasForm() const
-{
-    return (m_form != fTremLog_FORM_NONE);
-}
-
 //----------------------------------------------------------------------------
 // AttGlissPresent
 //----------------------------------------------------------------------------
@@ -1287,46 +1207,6 @@ bool AttRehearsal::HasRehEnclose() const
     return (m_rehEnclose != rehearsal_REHENCLOSE_NONE);
 }
 
-//----------------------------------------------------------------------------
-// AttScoreDefVisCmn
-//----------------------------------------------------------------------------
-
-AttScoreDefVisCmn::AttScoreDefVisCmn() : Att()
-{
-    ResetScoreDefVisCmn();
-}
-
-void AttScoreDefVisCmn::ResetScoreDefVisCmn()
-{
-    m_gridShow = BOOLEAN_NONE;
-}
-
-bool AttScoreDefVisCmn::ReadScoreDefVisCmn(pugi::xml_node element, bool removeAttr)
-{
-    bool hasAttribute = false;
-    if (element.attribute("grid.show")) {
-        this->SetGridShow(StrToBoolean(element.attribute("grid.show").value()));
-        if (removeAttr) element.remove_attribute("grid.show");
-        hasAttribute = true;
-    }
-    return hasAttribute;
-}
-
-bool AttScoreDefVisCmn::WriteScoreDefVisCmn(pugi::xml_node element)
-{
-    bool wroteAttribute = false;
-    if (this->HasGridShow()) {
-        element.append_attribute("grid.show") = BooleanToStr(this->GetGridShow()).c_str();
-        wroteAttribute = true;
-    }
-    return wroteAttribute;
-}
-
-bool AttScoreDefVisCmn::HasGridShow() const
-{
-    return (m_gridShow != BOOLEAN_NONE);
-}
-
 //----------------------------------------------------------------------------
 // AttSlurRend
 //----------------------------------------------------------------------------
@@ -1477,6 +1357,46 @@ bool AttTieRend::HasTieLwidth() const
     return (m_tieLwidth.HasValue());
 }
 
+//----------------------------------------------------------------------------
+// AttTremForm
+//----------------------------------------------------------------------------
+
+AttTremForm::AttTremForm() : Att()
+{
+    ResetTremForm();
+}
+
+void AttTremForm::ResetTremForm()
+{
+    m_form = tremForm_FORM_NONE;
+}
+
+bool AttTremForm::ReadTremForm(pugi::xml_node element, bool removeAttr)
+{
+    bool hasAttribute = false;
+    if (element.attribute("form")) {
+        this->SetForm(StrToTremFormForm(element.attribute("form").value()));
+        if (removeAttr) element.remove_attribute("form");
+        hasAttribute = true;
+    }
+    return hasAttribute;
+}
+
+bool AttTremForm::WriteTremForm(pugi::xml_node element)
+{
+    bool wroteAttribute = false;
+    if (this->HasForm()) {
+        element.append_attribute("form") = TremFormFormToStr(this->GetForm()).c_str();
+        wroteAttribute = true;
+    }
+    return wroteAttribute;
+}
+
+bool AttTremForm::HasForm() const
+{
+    return (m_form != tremForm_FORM_NONE);
+}
+
 //----------------------------------------------------------------------------
 // AttTremMeasured
 //----------------------------------------------------------------------------
diff --git a/libmei/dist/atts_cmn.h b/libmei/dist/atts_cmn.h
index 747223483ae..83f97531ef0 100644
--- a/libmei/dist/atts_cmn.h
+++ b/libmei/dist/atts_cmn.h
@@ -74,55 +74,6 @@ class InstArpegLog : public AttArpegLog {
     virtual ~InstArpegLog() = default;
 };
 
-//----------------------------------------------------------------------------
-// AttBTremLog
-//----------------------------------------------------------------------------
-
-class AttBTremLog : public Att {
-protected:
-    AttBTremLog();
-    ~AttBTremLog() = default;
-
-public:
-    /** Reset the default values for the attribute class **/
-    void ResetBTremLog();
-
-    /** Read the values for the attribute class **/
-    bool ReadBTremLog(pugi::xml_node element, bool removeAttr = true);
-
-    /** Write the values for the attribute class **/
-    bool WriteBTremLog(pugi::xml_node element);
-
-    /**
-     * @name Setters, getters and presence checker for class members.
-     * The checker returns true if the attribute class is set (e.g., not equal
-     * to the default value)
-     **/
-    ///@{
-    void SetForm(bTremLog_FORM form_) { m_form = form_; }
-    bTremLog_FORM GetForm() const { return m_form; }
-    bool HasForm() const;
-    ///@}
-
-private:
-    /** Indicates to what degree the harmonic label is supported by the notation. **/
-    bTremLog_FORM m_form;
-};
-
-//----------------------------------------------------------------------------
-// InstBTremLog
-//----------------------------------------------------------------------------
-
-/**
- * Instantiable version of AttBTremLog
- */
-
-class InstBTremLog : public AttBTremLog {
-public:
-    InstBTremLog() = default;
-    virtual ~InstBTremLog() = default;
-};
-
 //----------------------------------------------------------------------------
 // AttBeamPresent
 //----------------------------------------------------------------------------
@@ -611,55 +562,6 @@ class InstExpandable : public AttExpandable {
     virtual ~InstExpandable() = default;
 };
 
-//----------------------------------------------------------------------------
-// AttFTremLog
-//----------------------------------------------------------------------------
-
-class AttFTremLog : public Att {
-protected:
-    AttFTremLog();
-    ~AttFTremLog() = default;
-
-public:
-    /** Reset the default values for the attribute class **/
-    void ResetFTremLog();
-
-    /** Read the values for the attribute class **/
-    bool ReadFTremLog(pugi::xml_node element, bool removeAttr = true);
-
-    /** Write the values for the attribute class **/
-    bool WriteFTremLog(pugi::xml_node element);
-
-    /**
-     * @name Setters, getters and presence checker for class members.
-     * The checker returns true if the attribute class is set (e.g., not equal
-     * to the default value)
-     **/
-    ///@{
-    void SetForm(fTremLog_FORM form_) { m_form = form_; }
-    fTremLog_FORM GetForm() const { return m_form; }
-    bool HasForm() const;
-    ///@}
-
-private:
-    /** Indicates to what degree the harmonic label is supported by the notation. **/
-    fTremLog_FORM m_form;
-};
-
-//----------------------------------------------------------------------------
-// InstFTremLog
-//----------------------------------------------------------------------------
-
-/**
- * Instantiable version of AttFTremLog
- */
-
-class InstFTremLog : public AttFTremLog {
-public:
-    InstFTremLog() = default;
-    virtual ~InstFTremLog() = default;
-};
-
 //----------------------------------------------------------------------------
 // AttGlissPresent
 //----------------------------------------------------------------------------
@@ -1440,55 +1342,6 @@ class InstRehearsal : public AttRehearsal {
     virtual ~InstRehearsal() = default;
 };
 
-//----------------------------------------------------------------------------
-// AttScoreDefVisCmn
-//----------------------------------------------------------------------------
-
-class AttScoreDefVisCmn : public Att {
-protected:
-    AttScoreDefVisCmn();
-    ~AttScoreDefVisCmn() = default;
-
-public:
-    /** Reset the default values for the attribute class **/
-    void ResetScoreDefVisCmn();
-
-    /** Read the values for the attribute class **/
-    bool ReadScoreDefVisCmn(pugi::xml_node element, bool removeAttr = true);
-
-    /** Write the values for the attribute class **/
-    bool WriteScoreDefVisCmn(pugi::xml_node element);
-
-    /**
-     * @name Setters, getters and presence checker for class members.
-     * The checker returns true if the attribute class is set (e.g., not equal
-     * to the default value)
-     **/
-    ///@{
-    void SetGridShow(data_BOOLEAN gridShow_) { m_gridShow = gridShow_; }
-    data_BOOLEAN GetGridShow() const { return m_gridShow; }
-    bool HasGridShow() const;
-    ///@}
-
-private:
-    /** Determines whether to display guitar chord grids. **/
-    data_BOOLEAN m_gridShow;
-};
-
-//----------------------------------------------------------------------------
-// InstScoreDefVisCmn
-//----------------------------------------------------------------------------
-
-/**
- * Instantiable version of AttScoreDefVisCmn
- */
-
-class InstScoreDefVisCmn : public AttScoreDefVisCmn {
-public:
-    InstScoreDefVisCmn() = default;
-    virtual ~InstScoreDefVisCmn() = default;
-};
-
 //----------------------------------------------------------------------------
 // AttSlurRend
 //----------------------------------------------------------------------------
@@ -1656,6 +1509,55 @@ class InstTieRend : public AttTieRend {
     virtual ~InstTieRend() = default;
 };
 
+//----------------------------------------------------------------------------
+// AttTremForm
+//----------------------------------------------------------------------------
+
+class AttTremForm : public Att {
+protected:
+    AttTremForm();
+    ~AttTremForm() = default;
+
+public:
+    /** Reset the default values for the attribute class **/
+    void ResetTremForm();
+
+    /** Read the values for the attribute class **/
+    bool ReadTremForm(pugi::xml_node element, bool removeAttr = true);
+
+    /** Write the values for the attribute class **/
+    bool WriteTremForm(pugi::xml_node element);
+
+    /**
+     * @name Setters, getters and presence checker for class members.
+     * The checker returns true if the attribute class is set (e.g., not equal
+     * to the default value)
+     **/
+    ///@{
+    void SetForm(tremForm_FORM form_) { m_form = form_; }
+    tremForm_FORM GetForm() const { return m_form; }
+    bool HasForm() const;
+    ///@}
+
+private:
+    /** Indicates to what degree the harmonic label is supported by the notation. **/
+    tremForm_FORM m_form;
+};
+
+//----------------------------------------------------------------------------
+// InstTremForm
+//----------------------------------------------------------------------------
+
+/**
+ * Instantiable version of AttTremForm
+ */
+
+class InstTremForm : public AttTremForm {
+public:
+    InstTremForm() = default;
+    virtual ~InstTremForm() = default;
+};
+
 //----------------------------------------------------------------------------
 // AttTremMeasured
 //----------------------------------------------------------------------------
diff --git a/libmei/dist/atts_gestural.cpp b/libmei/dist/atts_gestural.cpp
index b448bd659a6..28917cfcbf6 100644
--- a/libmei/dist/atts_gestural.cpp
+++ b/libmei/dist/atts_gestural.cpp
@@ -102,6 +102,46 @@ bool AttArticulationGes::HasArticGes() const
     return (m_articGes != std::vector<data_ARTICULATION>());
 }
 
+//----------------------------------------------------------------------------
+// AttAttacking
+//----------------------------------------------------------------------------
+
+AttAttacking::AttAttacking() : Att()
+{
+    ResetAttacking();
+}
+
+void AttAttacking::ResetAttacking()
+{
+    m_attacca = BOOLEAN_NONE;
+}
+
+bool AttAttacking::ReadAttacking(pugi::xml_node element, bool removeAttr)
+{
+    bool hasAttribute = false;
+    if (element.attribute("attacca")) {
+        this->SetAttacca(StrToBoolean(element.attribute("attacca").value()));
+        if (removeAttr) element.remove_attribute("attacca");
+        hasAttribute = true;
+    }
+    return hasAttribute;
+}
+
+bool AttAttacking::WriteAttacking(pugi::xml_node element)
+{
+    bool wroteAttribute = false;
+    if (this->HasAttacca()) {
+        element.append_attribute("attacca") = BooleanToStr(this->GetAttacca()).c_str();
+        wroteAttribute = true;
+    }
+    return wroteAttribute;
+}
+
+bool AttAttacking::HasAttacca() const
+{
+    return (m_attacca != BOOLEAN_NONE);
+}
+
 //----------------------------------------------------------------------------
 // AttBendGes
 //----------------------------------------------------------------------------
@@ -257,116 +297,6 @@ bool AttDurationGes::HasDurRecip() const
     return (m_durRecip != "");
 }
 
-//----------------------------------------------------------------------------
-// AttMdivGes
-//----------------------------------------------------------------------------
-
-AttMdivGes::AttMdivGes() : Att()
-{
-    ResetMdivGes();
-}
-
-void AttMdivGes::ResetMdivGes()
-{
-    m_attacca = BOOLEAN_NONE;
-}
-
-bool AttMdivGes::ReadMdivGes(pugi::xml_node element, bool removeAttr)
-{
-    bool hasAttribute = false;
-    if (element.attribute("attacca")) {
-        this->SetAttacca(StrToBoolean(element.attribute("attacca").value()));
-        if (removeAttr) element.remove_attribute("attacca");
-        hasAttribute = true;
-    }
-    return hasAttribute;
-}
-
-bool AttMdivGes::WriteMdivGes(pugi::xml_node element)
-{
-    bool wroteAttribute = false;
-    if (this->HasAttacca()) {
-        element.append_attribute("attacca") = BooleanToStr(this->GetAttacca()).c_str();
-        wroteAttribute = true;
-    }
-    return wroteAttribute;
-}
-
-bool AttMdivGes::HasAttacca() const
-{
-    return (m_attacca != BOOLEAN_NONE);
-}
-
-//----------------------------------------------------------------------------
-// AttNcGes
-//----------------------------------------------------------------------------
-
-AttNcGes::AttNcGes() : Att()
-{
-    ResetNcGes();
-}
-
-void AttNcGes::ResetNcGes()
-{
-    m_octGes = -127;
-    m_pnameGes = PITCHNAME_NONE;
-    m_pnum = MEI_UNSET;
-}
-
-bool AttNcGes::ReadNcGes(pugi::xml_node element, bool removeAttr)
-{
-    bool hasAttribute = false;
-    if (element.attribute("oct.ges")) {
-        this->SetOctGes(StrToOctave(element.attribute("oct.ges").value()));
-        if (removeAttr) element.remove_attribute("oct.ges");
-        hasAttribute = true;
-    }
-    if (element.attribute("pname.ges")) {
-        this->SetPnameGes(StrToPitchname(element.attribute("pname.ges").value()));
-        if (removeAttr) element.remove_attribute("pname.ges");
-        hasAttribute = true;
-    }
-    if (element.attribute("pnum")) {
-        this->SetPnum(StrToInt(element.attribute("pnum").value()));
-        if (removeAttr) element.remove_attribute("pnum");
-        hasAttribute = true;
-    }
-    return hasAttribute;
-}
-
-bool AttNcGes::WriteNcGes(pugi::xml_node element)
-{
-    bool wroteAttribute = false;
-    if (this->HasOctGes()) {
-        element.append_attribute("oct.ges") = OctaveToStr(this->GetOctGes()).c_str();
-        wroteAttribute = true;
-    }
-    if (this->HasPnameGes()) {
-        element.append_attribute("pname.ges") = PitchnameToStr(this->GetPnameGes()).c_str();
-        wroteAttribute = true;
-    }
-    if (this->HasPnum()) {
-        element.append_attribute("pnum") = IntToStr(this->GetPnum()).c_str();
-        wroteAttribute = true;
-    }
-    return wroteAttribute;
-}
-
-bool AttNcGes::HasOctGes() const
-{
-    return (m_octGes != -127);
-}
-
-bool AttNcGes::HasPnameGes() const
-{
-    return (m_pnameGes != PITCHNAME_NONE);
-}
-
-bool AttNcGes::HasPnum() const
-{
-    return (m_pnum != MEI_UNSET);
-}
-
 //----------------------------------------------------------------------------
 // AttNoteGes
 //----------------------------------------------------------------------------
@@ -379,9 +309,6 @@ AttNoteGes::AttNoteGes() : Att()
 void AttNoteGes::ResetNoteGes()
 {
     m_extremis = noteGes_EXTREMIS_NONE;
-    m_octGes = -127;
-    m_pnameGes = PITCHNAME_NONE;
-    m_pnum = MEI_UNSET;
 }
 
 bool AttNoteGes::ReadNoteGes(pugi::xml_node element, bool removeAttr)
@@ -392,21 +319,6 @@ bool AttNoteGes::ReadNoteGes(pugi::xml_node element, bool removeAttr)
         if (removeAttr) element.remove_attribute("extremis");
         hasAttribute = true;
     }
-    if (element.attribute("oct.ges")) {
-        this->SetOctGes(StrToOctave(element.attribute("oct.ges").value()));
-        if (removeAttr) element.remove_attribute("oct.ges");
-        hasAttribute = true;
-    }
-    if (element.attribute("pname.ges")) {
-        this->SetPnameGes(StrToPitchname(element.attribute("pname.ges").value()));
-        if (removeAttr) element.remove_attribute("pname.ges");
-        hasAttribute = true;
-    }
-    if (element.attribute("pnum")) {
-        this->SetPnum(StrToInt(element.attribute("pnum").value()));
-        if (removeAttr) element.remove_attribute("pnum");
-        hasAttribute = true;
-    }
     return hasAttribute;
 }
 
@@ -417,18 +329,6 @@ bool AttNoteGes::WriteNoteGes(pugi::xml_node element)
         element.append_attribute("extremis") = NoteGesExtremisToStr(this->GetExtremis()).c_str();
         wroteAttribute = true;
     }
-    if (this->HasOctGes()) {
-        element.append_attribute("oct.ges") = OctaveToStr(this->GetOctGes()).c_str();
-        wroteAttribute = true;
-    }
-    if (this->HasPnameGes()) {
-        element.append_attribute("pname.ges") = PitchnameToStr(this->GetPnameGes()).c_str();
-        wroteAttribute = true;
-    }
-    if (this->HasPnum()) {
-        element.append_attribute("pnum") = IntToStr(this->GetPnum()).c_str();
-        wroteAttribute = true;
-    }
     return wroteAttribute;
 }
 
@@ -437,21 +337,6 @@ bool AttNoteGes::HasExtremis() const
     return (m_extremis != noteGes_EXTREMIS_NONE);
 }
 
-bool AttNoteGes::HasOctGes() const
-{
-    return (m_octGes != -127);
-}
-
-bool AttNoteGes::HasPnameGes() const
-{
-    return (m_pnameGes != PITCHNAME_NONE);
-}
-
-bool AttNoteGes::HasPnum() const
-{
-    return (m_pnum != MEI_UNSET);
-}
-
 //----------------------------------------------------------------------------
 // AttOrnamentAccidGes
 //----------------------------------------------------------------------------
@@ -508,43 +393,73 @@ bool AttOrnamentAccidGes::HasAccidlowerGes() const
 }
 
 //----------------------------------------------------------------------------
-// AttSectionGes
+// AttPitchGes
 //----------------------------------------------------------------------------
 
-AttSectionGes::AttSectionGes() : Att()
+AttPitchGes::AttPitchGes() : Att()
 {
-    ResetSectionGes();
+    ResetPitchGes();
 }
 
-void AttSectionGes::ResetSectionGes()
+void AttPitchGes::ResetPitchGes()
 {
-    m_attacca = BOOLEAN_NONE;
+    m_octGes = MEI_UNSET_OCT;
+    m_pnameGes = PITCHNAME_NONE;
+    m_pnum = MEI_UNSET;
 }
 
-bool AttSectionGes::ReadSectionGes(pugi::xml_node element, bool removeAttr)
+bool AttPitchGes::ReadPitchGes(pugi::xml_node element, bool removeAttr)
 {
     bool hasAttribute = false;
-    if (element.attribute("attacca")) {
-        this->SetAttacca(StrToBoolean(element.attribute("attacca").value()));
-        if (removeAttr) element.remove_attribute("attacca");
+    if (element.attribute("oct.ges")) {
+        this->SetOctGes(StrToOctave(element.attribute("oct.ges").value()));
+        if (removeAttr) element.remove_attribute("oct.ges");
+        hasAttribute = true;
+    }
+    if (element.attribute("pname.ges")) {
+        this->SetPnameGes(StrToPitchname(element.attribute("pname.ges").value()));
+        if (removeAttr) element.remove_attribute("pname.ges");
+        hasAttribute = true;
+    }
+    if (element.attribute("pnum")) {
+        this->SetPnum(StrToInt(element.attribute("pnum").value()));
+        if (removeAttr) element.remove_attribute("pnum");
         hasAttribute = true;
     }
     return hasAttribute;
 }
 
-bool AttSectionGes::WriteSectionGes(pugi::xml_node element)
+bool AttPitchGes::WritePitchGes(pugi::xml_node element)
 {
     bool wroteAttribute = false;
-    if (this->HasAttacca()) {
-        element.append_attribute("attacca") = BooleanToStr(this->GetAttacca()).c_str();
+    if (this->HasOctGes()) {
+        element.append_attribute("oct.ges") = OctaveToStr(this->GetOctGes()).c_str();
+        wroteAttribute = true;
+    }
+    if (this->HasPnameGes()) {
+        element.append_attribute("pname.ges") = PitchnameToStr(this->GetPnameGes()).c_str();
+        wroteAttribute = true;
+    }
+    if (this->HasPnum()) {
+        element.append_attribute("pnum") = IntToStr(this->GetPnum()).c_str();
         wroteAttribute = true;
     }
     return wroteAttribute;
 }
 
-bool AttSectionGes::HasAttacca() const
+bool AttPitchGes::HasOctGes() const
 {
-    return (m_attacca != BOOLEAN_NONE);
+    return (m_octGes != MEI_UNSET_OCT);
+}
+
+bool AttPitchGes::HasPnameGes() const
+{
+    return (m_pnameGes != PITCHNAME_NONE);
+}
+
+bool AttPitchGes::HasPnum() const
+{
+    return (m_pnum != MEI_UNSET);
 }
 
 //----------------------------------------------------------------------------
diff --git a/libmei/dist/atts_gestural.h b/libmei/dist/atts_gestural.h
index e49d7a8052d..9400a9d9bf1 100644
--- a/libmei/dist/atts_gestural.h
+++ b/libmei/dist/atts_gestural.h
@@ -123,6 +123,58 @@ class InstArticulationGes : public AttArticulationGes {
     virtual ~InstArticulationGes() = default;
 };
 
+//----------------------------------------------------------------------------
+// AttAttacking
+//----------------------------------------------------------------------------
+
+class AttAttacking : public Att {
+protected:
+    AttAttacking();
+    ~AttAttacking() = default;
+
+public:
+    /** Reset the default values for the attribute class **/
+    void ResetAttacking();
+
+    /** Read the values for the attribute class **/
+    bool ReadAttacking(pugi::xml_node element, bool removeAttr = true);
+
+    /** Write the values for the attribute class **/
+    bool WriteAttacking(pugi::xml_node element);
+
+    /**
+     * @name Setters, getters and presence checker for class members.
+     * The checker returns true if the attribute class is set (e.g., not equal
+     * to the default value)
+     **/
+    ///@{
+    void SetAttacca(data_BOOLEAN attacca_) { m_attacca = attacca_; }
+    data_BOOLEAN GetAttacca() const { return m_attacca; }
+    bool HasAttacca() const;
+    ///@}
+
+private:
+    /**
+     * Indicates that the performance of the next musical division should begin
+     * immediately following this one.
+     **/
+    data_BOOLEAN m_attacca;
+};
+
+//----------------------------------------------------------------------------
+// InstAttacking
+//----------------------------------------------------------------------------
+
+/**
+ * Instantiable version of AttAttacking
+ */
+
+class InstAttacking : public AttAttacking {
+public:
+    InstAttacking() = default;
+    virtual ~InstAttacking() = default;
+};
+
 //----------------------------------------------------------------------------
 // AttBendGes
 //----------------------------------------------------------------------------
@@ -261,119 +313,6 @@ class InstDurationGes : public AttDurationGes {
     virtual ~InstDurationGes() = default;
 };
 
-//----------------------------------------------------------------------------
-// AttMdivGes
-//----------------------------------------------------------------------------
-
-class AttMdivGes : public Att {
-protected:
-    AttMdivGes();
-    ~AttMdivGes() = default;
-
-public:
-    /** Reset the default values for the attribute class **/
-    void ResetMdivGes();
-
-    /** Read the values for the attribute class **/
-    bool ReadMdivGes(pugi::xml_node element, bool removeAttr = true);
-
-    /** Write the values for the attribute class **/
-    bool WriteMdivGes(pugi::xml_node element);
-
-    /**
-     * @name Setters, getters and presence checker for class members.
-     * The checker returns true if the attribute class is set (e.g., not equal
-     * to the default value)
-     **/
-    ///@{
-    void SetAttacca(data_BOOLEAN attacca_) { m_attacca = attacca_; }
-    data_BOOLEAN GetAttacca() const { return m_attacca; }
-    bool HasAttacca() const;
-    ///@}
-
-private:
-    /**
-     * Indicates that the performance of the next musical division should begin
-     * immediately following this one.
-     **/
-    data_BOOLEAN m_attacca;
-};
-
-//----------------------------------------------------------------------------
-// InstMdivGes
-//----------------------------------------------------------------------------
-
-/**
- * Instantiable version of AttMdivGes
- */
-
-class InstMdivGes : public AttMdivGes {
-public:
-    InstMdivGes() = default;
-    virtual ~InstMdivGes() = default;
-};
-
-//----------------------------------------------------------------------------
-// AttNcGes
-//----------------------------------------------------------------------------
-
-class AttNcGes : public Att {
-protected:
-    AttNcGes();
-    ~AttNcGes() = default;
-
-public:
-    /** Reset the default values for the attribute class **/
-    void ResetNcGes();
-
-    /** Read the values for the attribute class **/
-    bool ReadNcGes(pugi::xml_node element, bool removeAttr = true);
-
-    /** Write the values for the attribute class **/
-    bool WriteNcGes(pugi::xml_node element);
-
-    /**
-     * @name Setters, getters and presence checker for class members.
-     * The checker returns true if the attribute class is set (e.g., not equal
-     * to the default value)
-     **/
-    ///@{
-    void SetOctGes(data_OCTAVE octGes_) { m_octGes = octGes_; }
-    data_OCTAVE GetOctGes() const { return m_octGes; }
-    bool HasOctGes() const;
-    //
-    void SetPnameGes(data_PITCHNAME pnameGes_) { m_pnameGes = pnameGes_; }
-    data_PITCHNAME GetPnameGes() const { return m_pnameGes; }
-    bool HasPnameGes() const;
-    //
-    void SetPnum(int pnum_) { m_pnum = pnum_; }
-    int GetPnum() const { return m_pnum; }
-    bool HasPnum() const;
-    ///@}
-
-private:
-    /** Records performed octave information that differs from the written value. **/
-    data_OCTAVE m_octGes;
-    /** Contains a performed pitch name that differs from the written value. **/
-    data_PITCHNAME m_pnameGes;
-    /** Holds a pitch-to-number mapping, a base-40 or MIDI note number, for example. **/
-    int m_pnum;
-};
-
-//----------------------------------------------------------------------------
-// InstNcGes
-//----------------------------------------------------------------------------
-
-/**
- * Instantiable version of AttNcGes
- */
-
-class InstNcGes : public AttNcGes {
-public:
-    InstNcGes() = default;
-    virtual ~InstNcGes() = default;
-};
-
 //----------------------------------------------------------------------------
 // AttNoteGes
 //----------------------------------------------------------------------------
@@ -402,29 +341,11 @@ class AttNoteGes : public Att {
     void SetExtremis(noteGes_EXTREMIS extremis_) { m_extremis = extremis_; }
     noteGes_EXTREMIS GetExtremis() const { return m_extremis; }
     bool HasExtremis() const;
-    //
-    void SetOctGes(data_OCTAVE octGes_) { m_octGes = octGes_; }
-    data_OCTAVE GetOctGes() const { return m_octGes; }
-    bool HasOctGes() const;
-    //
-    void SetPnameGes(data_PITCHNAME pnameGes_) { m_pnameGes = pnameGes_; }
-    data_PITCHNAME GetPnameGes() const { return m_pnameGes; }
-    bool HasPnameGes() const;
-    //
-    void SetPnum(int pnum_) { m_pnum = pnum_; }
-    int GetPnum() const { return m_pnum; }
-    bool HasPnum() const;
     ///@}
 
 private:
     /** Indicates an extreme, indefinite performed pitch. **/
     noteGes_EXTREMIS m_extremis;
-    /** Records performed octave information that differs from the written value. **/
-    data_OCTAVE m_octGes;
-    /** Contains a performed pitch name that differs from the written value. **/
-    data_PITCHNAME m_pnameGes;
-    /** Holds a pitch-to-number mapping, a base-40 or MIDI note number, for example. **/
-    int m_pnum;
 };
 
 //----------------------------------------------------------------------------
@@ -497,23 +418,23 @@ class InstOrnamentAccidGes : public AttOrnamentAccidGes {
 };
 
 //----------------------------------------------------------------------------
-// AttSectionGes
+// AttPitchGes
 //----------------------------------------------------------------------------
 
-class AttSectionGes : public Att {
+class AttPitchGes : public Att {
 protected:
-    AttSectionGes();
-    ~AttSectionGes() = default;
+    AttPitchGes();
+    ~AttPitchGes() = default;
 
 public:
     /** Reset the default values for the attribute class **/
-    void ResetSectionGes();
+    void ResetPitchGes();
 
     /** Read the values for the attribute class **/
-    bool ReadSectionGes(pugi::xml_node element, bool removeAttr = true);
+    bool ReadPitchGes(pugi::xml_node element, bool removeAttr = true);
 
     /** Write the values for the attribute class **/
-    bool WriteSectionGes(pugi::xml_node element);
+    bool WritePitchGes(pugi::xml_node element);
 
     /**
      * @name Setters, getters and presence checker for class members.
@@ -521,31 +442,40 @@ class AttSectionGes : public Att {
      * to the default value)
      **/
     ///@{
-    void SetAttacca(data_BOOLEAN attacca_) { m_attacca = attacca_; }
-    data_BOOLEAN GetAttacca() const { return m_attacca; }
-    bool HasAttacca() const;
+    void SetOctGes(data_OCTAVE octGes_) { m_octGes = octGes_; }
+    data_OCTAVE GetOctGes() const { return m_octGes; }
+    bool HasOctGes() const;
+    //
+    void SetPnameGes(data_PITCHNAME pnameGes_) { m_pnameGes = pnameGes_; }
+    data_PITCHNAME GetPnameGes() const { return m_pnameGes; }
+    bool HasPnameGes() const;
+    //
+    void SetPnum(int pnum_) { m_pnum = pnum_; }
+    int GetPnum() const { return m_pnum; }
+    bool HasPnum() const;
     ///@}
 
 private:
-    /**
-     * Indicates that the performance of the next musical division should begin
-     * immediately following this one.
-     **/
-    data_BOOLEAN m_attacca;
+    /** Records performed octave information that differs from the written value. **/
+    data_OCTAVE m_octGes;
+    /** Contains a performed pitch name that differs from the written value. **/
+    data_PITCHNAME m_pnameGes;
+    /** Holds a pitch-to-number mapping, a base-40 or MIDI note number, for example. **/
+    int m_pnum;
 };
 
 //----------------------------------------------------------------------------
-// InstSectionGes
+// InstPitchGes
 //----------------------------------------------------------------------------
 
 /**
- * Instantiable version of AttSectionGes
+ * Instantiable version of AttPitchGes
  */
 
-class InstSectionGes : public AttSectionGes {
+class InstPitchGes : public AttPitchGes {
 public:
-    InstSectionGes() = default;
-    virtual ~InstSectionGes() = default;
+    InstPitchGes() = default;
+    virtual ~InstPitchGes() = default;
 };
 
 //----------------------------------------------------------------------------
diff --git a/libmei/dist/atts_neumes.cpp b/libmei/dist/atts_neumes.cpp
index cbb89b100a1..f9c9eb06fb1 100644
--- a/libmei/dist/atts_neumes.cpp
+++ b/libmei/dist/atts_neumes.cpp
@@ -33,14 +33,14 @@ AttDivLineLog::AttDivLineLog() : Att()
 
 void AttDivLineLog::ResetDivLineLog()
 {
-    m_form = "";
+    m_form = divLineLog_FORM_NONE;
 }
 
 bool AttDivLineLog::ReadDivLineLog(pugi::xml_node element, bool removeAttr)
 {
     bool hasAttribute = false;
     if (element.attribute("form")) {
-        this->SetForm(StrToStr(element.attribute("form").value()));
+        this->SetForm(StrToDivLineLogForm(element.attribute("form").value()));
         if (removeAttr) element.remove_attribute("form");
         hasAttribute = true;
     }
@@ -51,7 +51,7 @@ bool AttDivLineLog::WriteDivLineLog(pugi::xml_node element)
 {
     bool wroteAttribute = false;
     if (this->HasForm()) {
-        element.append_attribute("form") = StrToStr(this->GetForm()).c_str();
+        element.append_attribute("form") = DivLineLogFormToStr(this->GetForm()).c_str();
         wroteAttribute = true;
     }
     return wroteAttribute;
@@ -59,7 +59,7 @@ bool AttDivLineLog::WriteDivLineLog(pugi::xml_node element)
 
 bool AttDivLineLog::HasForm() const
 {
-    return (m_form != "");
+    return (m_form != divLineLog_FORM_NONE);
 }
 
 //----------------------------------------------------------------------------
@@ -130,7 +130,6 @@ void AttNcForm::ResetNcForm()
 {
     m_angled = BOOLEAN_NONE;
     m_con = ncForm_CON_NONE;
-    m_curve = ncForm_CURVE_NONE;
     m_hooked = BOOLEAN_NONE;
     m_ligated = BOOLEAN_NONE;
     m_rellen = ncForm_RELLEN_NONE;
@@ -151,11 +150,6 @@ bool AttNcForm::ReadNcForm(pugi::xml_node element, bool removeAttr)
         if (removeAttr) element.remove_attribute("con");
         hasAttribute = true;
     }
-    if (element.attribute("curve")) {
-        this->SetCurve(StrToNcFormCurve(element.attribute("curve").value()));
-        if (removeAttr) element.remove_attribute("curve");
-        hasAttribute = true;
-    }
     if (element.attribute("hooked")) {
         this->SetHooked(StrToBoolean(element.attribute("hooked").value()));
         if (removeAttr) element.remove_attribute("hooked");
@@ -195,10 +189,6 @@ bool AttNcForm::WriteNcForm(pugi::xml_node element)
         element.append_attribute("con") = NcFormConToStr(this->GetCon()).c_str();
         wroteAttribute = true;
     }
-    if (this->HasCurve()) {
-        element.append_attribute("curve") = NcFormCurveToStr(this->GetCurve()).c_str();
-        wroteAttribute = true;
-    }
     if (this->HasHooked()) {
         element.append_attribute("hooked") = BooleanToStr(this->GetHooked()).c_str();
         wroteAttribute = true;
@@ -232,11 +222,6 @@ bool AttNcForm::HasCon() const
     return (m_con != ncForm_CON_NONE);
 }
 
-bool AttNcForm::HasCurve() const
-{
-    return (m_curve != ncForm_CURVE_NONE);
-}
-
 bool AttNcForm::HasHooked() const
 {
     return (m_hooked != BOOLEAN_NONE);
@@ -262,4 +247,44 @@ bool AttNcForm::HasTilt() const
     return (m_tilt != data_COMPASSDIRECTION());
 }
 
+//----------------------------------------------------------------------------
+// AttNeumeType
+//----------------------------------------------------------------------------
+
+AttNeumeType::AttNeumeType() : Att()
+{
+    ResetNeumeType();
+}
+
+void AttNeumeType::ResetNeumeType()
+{
+    m_type = "";
+}
+
+bool AttNeumeType::ReadNeumeType(pugi::xml_node element, bool removeAttr)
+{
+    bool hasAttribute = false;
+    if (element.attribute("type")) {
+        this->SetType(StrToStr(element.attribute("type").value()));
+        if (removeAttr) element.remove_attribute("type");
+        hasAttribute = true;
+    }
+    return hasAttribute;
+}
+
+bool AttNeumeType::WriteNeumeType(pugi::xml_node element)
+{
+    bool wroteAttribute = false;
+    if (this->HasType()) {
+        element.append_attribute("type") = StrToStr(this->GetType()).c_str();
+        wroteAttribute = true;
+    }
+    return wroteAttribute;
+}
+
+bool AttNeumeType::HasType() const
+{
+    return (m_type != "");
+}
+
 } // namespace vrv
diff --git a/libmei/dist/atts_neumes.h b/libmei/dist/atts_neumes.h
index cce5271c4ce..77f76e4d717 100644
--- a/libmei/dist/atts_neumes.h
+++ b/libmei/dist/atts_neumes.h
@@ -50,14 +50,14 @@ class AttDivLineLog : public Att {
      * to the default value)
      **/
     ///@{
-    void SetForm(std::string form_) { m_form = form_; }
-    std::string GetForm() const { return m_form; }
+    void SetForm(divLineLog_FORM form_) { m_form = form_; }
+    divLineLog_FORM GetForm() const { return m_form; }
     bool HasForm() const;
     ///@}
 
 private:
     /** Indicates to what degree the harmonic label is supported by the notation. **/
-    std::string m_form;
+    divLineLog_FORM m_form;
 };
 
 //----------------------------------------------------------------------------
@@ -162,10 +162,6 @@ class AttNcForm : public Att {
     ncForm_CON GetCon() const { return m_con; }
     bool HasCon() const;
     //
-    void SetCurve(ncForm_CURVE curve_) { m_curve = curve_; }
-    ncForm_CURVE GetCurve() const { return m_curve; }
-    bool HasCurve() const;
-    //
     void SetHooked(data_BOOLEAN hooked_) { m_hooked = hooked_; }
     data_BOOLEAN GetHooked() const { return m_hooked; }
     bool HasHooked() const;
@@ -195,8 +191,6 @@ class AttNcForm : public Att {
      * should not be used for the first component of a neume.
      **/
     ncForm_CON m_con;
-    /** Records direction of curvature. **/
-    ncForm_CURVE m_curve;
     /** Pen stroke has an extension; specific to Hispanic notation. **/
     data_BOOLEAN m_hooked;
     /** Indicates participation in a ligature. **/
@@ -226,6 +220,58 @@ class InstNcForm : public AttNcForm {
     virtual ~InstNcForm() = default;
 };
 
+//----------------------------------------------------------------------------
+// AttNeumeType
+//----------------------------------------------------------------------------
+
+class AttNeumeType : public Att {
+protected:
+    AttNeumeType();
+    ~AttNeumeType() = default;
+
+public:
+    /** Reset the default values for the attribute class **/
+    void ResetNeumeType();
+
+    /** Read the values for the attribute class **/
+    bool ReadNeumeType(pugi::xml_node element, bool removeAttr = true);
+
+    /** Write the values for the attribute class **/
+    bool WriteNeumeType(pugi::xml_node element);
+
+    /**
+     * @name Setters, getters and presence checker for class members.
+     * The checker returns true if the attribute class is set (e.g., not equal
+     * to the default value)
+     **/
+    ///@{
+    void SetType(std::string type_) { m_type = type_; }
+    std::string GetType() const { return m_type; }
+    bool HasType() const;
+    ///@}
+
+private:
+    /**
+     * Provides a description of the relationship between the current and the target
+     * categories.
+     **/
+    std::string m_type;
+};
+
+//----------------------------------------------------------------------------
+// InstNeumeType
+//----------------------------------------------------------------------------
+
+/**
+ * Instantiable version of AttNeumeType
+ */
+
+class InstNeumeType : public AttNeumeType {
+public:
+    InstNeumeType() = default;
+    virtual ~InstNeumeType() = default;
+};
+
 } // namespace vrv
 
 #endif // __LIBMEI_ATTS_NEUMES_H__
diff --git a/libmei/dist/atts_shared.cpp b/libmei/dist/atts_shared.cpp
index 355de5cc18e..d65dd28bf23 100644
--- a/libmei/dist/atts_shared.cpp
+++ b/libmei/dist/atts_shared.cpp
@@ -1003,8 +1003,6 @@ AttCoordinated::AttCoordinated() : Att()
 
 void AttCoordinated::ResetCoordinated()
 {
-    m_ulx = MEI_UNSET;
-    m_uly = MEI_UNSET;
     m_lrx = MEI_UNSET;
     m_lry = MEI_UNSET;
     m_rotate = 0.0;
@@ -1013,16 +1011,6 @@ void AttCoordinated::ResetCoordinated()
 bool AttCoordinated::ReadCoordinated(pugi::xml_node element, bool removeAttr)
 {
     bool hasAttribute = false;
-    if (element.attribute("ulx")) {
-        this->SetUlx(StrToInt(element.attribute("ulx").value()));
-        if (removeAttr) element.remove_attribute("ulx");
-        hasAttribute = true;
-    }
-    if (element.attribute("uly")) {
-        this->SetUly(StrToInt(element.attribute("uly").value()));
-        if (removeAttr) element.remove_attribute("uly");
-        hasAttribute = true;
-    }
     if (element.attribute("lrx")) {
         this->SetLrx(StrToInt(element.attribute("lrx").value()));
         if (removeAttr) element.remove_attribute("lrx");
@@ -1044,14 +1032,6 @@ bool AttCoordinated::ReadCoordinated(pugi::xml_node element, bool removeAttr)
 bool AttCoordinated::WriteCoordinated(pugi::xml_node element)
 {
     bool wroteAttribute = false;
-    if (this->HasUlx()) {
-        element.append_attribute("ulx") = IntToStr(this->GetUlx()).c_str();
-        wroteAttribute = true;
-    }
-    if (this->HasUly()) {
-        element.append_attribute("uly") = IntToStr(this->GetUly()).c_str();
-        wroteAttribute = true;
-    }
     if (this->HasLrx()) {
         element.append_attribute("lrx") = IntToStr(this->GetLrx()).c_str();
         wroteAttribute = true;
@@ -1067,16 +1047,6 @@ bool AttCoordinated::WriteCoordinated(pugi::xml_node element)
     return wroteAttribute;
 }
 
-bool AttCoordinated::HasUlx() const
-{
-    return (m_ulx != MEI_UNSET);
-}
-
-bool AttCoordinated::HasUly() const
-{
-    return (m_uly != MEI_UNSET);
-}
-
 bool AttCoordinated::HasLrx() const
 {
     return (m_lrx != MEI_UNSET);
@@ -1092,6 +1062,61 @@ bool AttCoordinated::HasRotate() const
     return (m_rotate != 0.0);
 }
 
+//----------------------------------------------------------------------------
+// AttCoordinatedUl
+//----------------------------------------------------------------------------
+
+AttCoordinatedUl::AttCoordinatedUl() : Att()
+{
+    ResetCoordinatedUl();
+}
+
+void AttCoordinatedUl::ResetCoordinatedUl()
+{
+    m_ulx = MEI_UNSET;
+    m_uly = MEI_UNSET;
+}
+
+bool AttCoordinatedUl::ReadCoordinatedUl(pugi::xml_node element, bool removeAttr)
+{
+    bool hasAttribute = false;
+    if (element.attribute("ulx")) {
+        this->SetUlx(StrToInt(element.attribute("ulx").value()));
+        if (removeAttr) element.remove_attribute("ulx");
+        hasAttribute = true;
+    }
+    if (element.attribute("uly")) {
+        this->SetUly(StrToInt(element.attribute("uly").value()));
+        if (removeAttr) element.remove_attribute("uly");
+        hasAttribute = true;
+    }
+    return hasAttribute;
+}
+
+bool AttCoordinatedUl::WriteCoordinatedUl(pugi::xml_node element)
+{
+    bool wroteAttribute = false;
+    if (this->HasUlx()) {
+        element.append_attribute("ulx") = IntToStr(this->GetUlx()).c_str();
+        wroteAttribute = true;
+    }
+    if (this->HasUly()) {
+        element.append_attribute("uly") = IntToStr(this->GetUly()).c_str();
+        wroteAttribute = true;
+    }
+    return wroteAttribute;
+}
+
+bool AttCoordinatedUl::HasUlx() const
+{
+    return (m_ulx != MEI_UNSET);
+}
+
+bool AttCoordinatedUl::HasUly() const
+{
+    return (m_uly != MEI_UNSET);
+}
+
 //----------------------------------------------------------------------------
 // AttCue
 //----------------------------------------------------------------------------
@@ -1202,61 +1227,6 @@ bool AttCurvature::HasCurvedir() const
     return (m_curvedir != curvature_CURVEDIR_NONE);
 }
 
-//----------------------------------------------------------------------------
-// AttCurveRend
-//----------------------------------------------------------------------------
-
-AttCurveRend::AttCurveRend() : Att()
-{
-    ResetCurveRend();
-}
-
-void AttCurveRend::ResetCurveRend()
-{
-    m_lform = LINEFORM_NONE;
-    m_lwidth = data_LINEWIDTH();
-}
-
-bool AttCurveRend::ReadCurveRend(pugi::xml_node element, bool removeAttr)
-{
-    bool hasAttribute = false;
-    if (element.attribute("lform")) {
-        this->SetLform(StrToLineform(element.attribute("lform").value()));
-        if (removeAttr) element.remove_attribute("lform");
-        hasAttribute = true;
-    }
-    if (element.attribute("lwidth")) {
-        this->SetLwidth(StrToLinewidth(element.attribute("lwidth").value()));
-        if (removeAttr) element.remove_attribute("lwidth");
-        hasAttribute = true;
-    }
-    return hasAttribute;
-}
-
-bool AttCurveRend::WriteCurveRend(pugi::xml_node element)
-{
-    bool wroteAttribute = false;
-    if (this->HasLform()) {
-        element.append_attribute("lform") = LineformToStr(this->GetLform()).c_str();
-        wroteAttribute = true;
-    }
-    if (this->HasLwidth()) {
-        element.append_attribute("lwidth") = LinewidthToStr(this->GetLwidth()).c_str();
-        wroteAttribute = true;
-    }
-    return wroteAttribute;
-}
-
-bool AttCurveRend::HasLform() const
-{
-    return (m_lform != LINEFORM_NONE);
-}
-
-bool AttCurveRend::HasLwidth() const
-{
-    return (m_lwidth.HasValue());
-}
-
 //----------------------------------------------------------------------------
 // AttCustosLog
 //----------------------------------------------------------------------------
@@ -2357,6 +2327,46 @@ bool AttJoined::HasJoin() const
     return (m_join != "");
 }
 
+//----------------------------------------------------------------------------
+// AttKeyMode
+//----------------------------------------------------------------------------
+
+AttKeyMode::AttKeyMode() : Att()
+{
+    ResetKeyMode();
+}
+
+void AttKeyMode::ResetKeyMode()
+{
+    m_mode = MODE_NONE;
+}
+
+bool AttKeyMode::ReadKeyMode(pugi::xml_node element, bool removeAttr)
+{
+    bool hasAttribute = false;
+    if (element.attribute("mode")) {
+        this->SetMode(StrToMode(element.attribute("mode").value()));
+        if (removeAttr) element.remove_attribute("mode");
+        hasAttribute = true;
+    }
+    return hasAttribute;
+}
+
+bool AttKeyMode::WriteKeyMode(pugi::xml_node element)
+{
+    bool wroteAttribute = false;
+    if (this->HasMode()) {
+        element.append_attribute("mode") = ModeToStr(this->GetMode()).c_str();
+        wroteAttribute = true;
+    }
+    return wroteAttribute;
+}
+
+bool AttKeyMode::HasMode() const
+{
+    return (m_mode != MODE_NONE);
+}
+
 //----------------------------------------------------------------------------
 // AttKeySigLog
 //----------------------------------------------------------------------------
@@ -2749,8 +2759,8 @@ AttLineRendBase::AttLineRendBase() : Att()
 void AttLineRendBase::ResetLineRendBase()
 {
     m_lform = LINEFORM_NONE;
-    m_lsegs = MEI_UNSET;
     m_lwidth = data_LINEWIDTH();
+    m_lsegs = MEI_UNSET;
 }
 
 bool AttLineRendBase::ReadLineRendBase(pugi::xml_node element, bool removeAttr)
@@ -2761,16 +2771,16 @@ bool AttLineRendBase::ReadLineRendBase(pugi::xml_node element, bool removeAttr)
         if (removeAttr) element.remove_attribute("lform");
         hasAttribute = true;
     }
-    if (element.attribute("lsegs")) {
-        this->SetLsegs(StrToInt(element.attribute("lsegs").value()));
-        if (removeAttr) element.remove_attribute("lsegs");
-        hasAttribute = true;
-    }
     if (element.attribute("lwidth")) {
         this->SetLwidth(StrToLinewidth(element.attribute("lwidth").value()));
         if (removeAttr) element.remove_attribute("lwidth");
         hasAttribute = true;
     }
+    if (element.attribute("lsegs")) {
+        this->SetLsegs(StrToInt(element.attribute("lsegs").value()));
+        if (removeAttr) element.remove_attribute("lsegs");
+        hasAttribute = true;
+    }
     return hasAttribute;
 }
 
@@ -2781,14 +2791,14 @@ bool AttLineRendBase::WriteLineRendBase(pugi::xml_node element)
         element.append_attribute("lform") = LineformToStr(this->GetLform()).c_str();
         wroteAttribute = true;
     }
-    if (this->HasLsegs()) {
-        element.append_attribute("lsegs") = IntToStr(this->GetLsegs()).c_str();
-        wroteAttribute = true;
-    }
     if (this->HasLwidth()) {
         element.append_attribute("lwidth") = LinewidthToStr(this->GetLwidth()).c_str();
         wroteAttribute = true;
     }
+    if (this->HasLsegs()) {
+        element.append_attribute("lsegs") = IntToStr(this->GetLsegs()).c_str();
+        wroteAttribute = true;
+    }
     return wroteAttribute;
 }
 
@@ -2797,14 +2807,14 @@ bool AttLineRendBase::HasLform() const
     return (m_lform != LINEFORM_NONE);
 }
 
-bool AttLineRendBase::HasLsegs() const
+bool AttLineRendBase::HasLwidth() const
 {
-    return (m_lsegs != MEI_UNSET);
+    return (m_lwidth.HasValue());
 }
 
-bool AttLineRendBase::HasLwidth() const
+bool AttLineRendBase::HasLsegs() const
 {
-    return (m_lwidth.HasValue());
+    return (m_lsegs != MEI_UNSET);
 }
 
 //----------------------------------------------------------------------------
@@ -3297,6 +3307,46 @@ bool AttMeiVersion::HasMeiversion() const
     return (m_meiversion != meiVersion_MEIVERSION_NONE);
 }
 
+//----------------------------------------------------------------------------
+// AttMensurLog
+//----------------------------------------------------------------------------
+
+AttMensurLog::AttMensurLog() : Att()
+{
+    ResetMensurLog();
+}
+
+void AttMensurLog::ResetMensurLog()
+{
+    m_level = DURATION_NONE;
+}
+
+bool AttMensurLog::ReadMensurLog(pugi::xml_node element, bool removeAttr)
+{
+    bool hasAttribute = false;
+    if (element.attribute("level")) {
+        this->SetLevel(StrToDuration(element.attribute("level").value()));
+        if (removeAttr) element.remove_attribute("level");
+        hasAttribute = true;
+    }
+    return hasAttribute;
+}
+
+bool AttMensurLog::WriteMensurLog(pugi::xml_node element)
+{
+    bool wroteAttribute = false;
+    if (this->HasLevel()) {
+        element.append_attribute("level") = DurationToStr(this->GetLevel()).c_str();
+        wroteAttribute = true;
+    }
+    return wroteAttribute;
+}
+
+bool AttMensurLog::HasLevel() const
+{
+    return (m_level != DURATION_NONE);
+}
+
 //----------------------------------------------------------------------------
 // AttMetadataPointing
 //----------------------------------------------------------------------------
@@ -4043,7 +4093,7 @@ AttOctave::AttOctave() : Att()
 
 void AttOctave::ResetOctave()
 {
-    m_oct = -127;
+    m_oct = MEI_UNSET_OCT;
 }
 
 bool AttOctave::ReadOctave(pugi::xml_node element, bool removeAttr)
@@ -4069,7 +4119,7 @@ bool AttOctave::WriteOctave(pugi::xml_node element)
 
 bool AttOctave::HasOct() const
 {
-    return (m_oct != -127);
+    return (m_oct != MEI_UNSET_OCT);
 }
 
 //----------------------------------------------------------------------------
@@ -4083,7 +4133,7 @@ AttOctaveDefault::AttOctaveDefault() : Att()
 
 void AttOctaveDefault::ResetOctaveDefault()
 {
-    m_octDefault = -127;
+    m_octDefault = MEI_UNSET_OCT;
 }
 
 bool AttOctaveDefault::ReadOctaveDefault(pugi::xml_node element, bool removeAttr)
@@ -4109,7 +4159,7 @@ bool AttOctaveDefault::WriteOctaveDefault(pugi::xml_node element)
 
 bool AttOctaveDefault::HasOctDefault() const
 {
-    return (m_octDefault != -127);
+    return (m_octDefault != MEI_UNSET_OCT);
 }
 
 //----------------------------------------------------------------------------
@@ -5764,7 +5814,7 @@ AttStaffLocPitched::AttStaffLocPitched() : Att()
 void AttStaffLocPitched::ResetStaffLocPitched()
 {
     m_ploc = PITCHNAME_NONE;
-    m_oloc = -127;
+    m_oloc = MEI_UNSET_OCT;
 }
 
 bool AttStaffLocPitched::ReadStaffLocPitched(pugi::xml_node element, bool removeAttr)
@@ -5804,7 +5854,7 @@ bool AttStaffLocPitched::HasPloc() const
 
 bool AttStaffLocPitched::HasOloc() const
 {
-    return (m_oloc != -127);
+    return (m_oloc != MEI_UNSET_OCT);
 }
 
 //----------------------------------------------------------------------------
diff --git a/libmei/dist/atts_shared.h b/libmei/dist/atts_shared.h
index e6d444e1ac4..b86e2877bab 100644
--- a/libmei/dist/atts_shared.h
+++ b/libmei/dist/atts_shared.h
@@ -1215,14 +1215,6 @@ class AttCoordinated : public Att {
      * to the default value)
      **/
     ///@{
-    void SetUlx(int ulx_) { m_ulx = ulx_; }
-    int GetUlx() const { return m_ulx; }
-    bool HasUlx() const;
-    //
-    void SetUly(int uly_) { m_uly = uly_; }
-    int GetUly() const { return m_uly; }
-    bool HasUly() const;
-    //
     void SetLrx(int lrx_) { m_lrx = lrx_; }
     int GetLrx() const { return m_lrx; }
     bool HasLrx() const;
@@ -1237,10 +1229,6 @@ class AttCoordinated : public Att {
     ///@}
 
 private:
-    /** Indicates the upper-left corner x coordinate. **/
-    int m_ulx;
-    /** Indicates the upper-left corner y coordinate. **/
-    int m_uly;
     /** Indicates the lower-right corner x coordinate. **/
     int m_lrx;
     /** Indicates the lower-left corner x coordinate. **/
@@ -1268,6 +1256,61 @@ class InstCoordinated : public AttCoordinated {
     virtual ~InstCoordinated() = default;
 };
 
+//----------------------------------------------------------------------------
+// AttCoordinatedUl
+//----------------------------------------------------------------------------
+
+class AttCoordinatedUl : public Att {
+protected:
+    AttCoordinatedUl();
+    ~AttCoordinatedUl() = default;
+
+public:
+    /** Reset the default values for the attribute class **/
+    void ResetCoordinatedUl();
+
+    /** Read the values for the attribute class **/
+    bool ReadCoordinatedUl(pugi::xml_node element, bool removeAttr = true);
+
+    /** Write the values for the attribute class **/
+    bool WriteCoordinatedUl(pugi::xml_node element);
+
+    /**
+     * @name Setters, getters and presence checker for class members.
+     * The checker returns true if the attribute class is set (e.g., not equal
+     * to the default value)
+     **/
+    ///@{
+    void SetUlx(int ulx_) { m_ulx = ulx_; }
+    int GetUlx() const { return m_ulx; }
+    bool HasUlx() const;
+    //
+    void SetUly(int uly_) { m_uly = uly_; }
+    int GetUly() const { return m_uly; }
+    bool HasUly() const;
+    ///@}
+
+private:
+    /** Indicates the upper-left corner x coordinate. **/
+    int m_ulx;
+    /** Indicates the upper-left corner y coordinate. **/
+    int m_uly;
+};
+
+//----------------------------------------------------------------------------
+// InstCoordinatedUl
+//----------------------------------------------------------------------------
+
+/**
+ * Instantiable version of AttCoordinatedUl
+ */
+
+class InstCoordinatedUl : public AttCoordinatedUl {
+public:
+    InstCoordinatedUl() = default;
+    virtual ~InstCoordinatedUl() = default;
+};
+
 //----------------------------------------------------------------------------
 // AttCue
 //----------------------------------------------------------------------------
@@ -1390,63 +1433,6 @@ class InstCurvature : public AttCurvature {
     virtual ~InstCurvature() = default;
 };
 
-//----------------------------------------------------------------------------
-// AttCurveRend
-//----------------------------------------------------------------------------
-
-class AttCurveRend : public Att {
-protected:
-    AttCurveRend();
-    ~AttCurveRend() = default;
-
-public:
-    /** Reset the default values for the attribute class **/
-    void ResetCurveRend();
-
-    /** Read the values for the attribute class **/
-    bool ReadCurveRend(pugi::xml_node element, bool removeAttr = true);
-
-    /** Write the values for the attribute class **/
-    bool WriteCurveRend(pugi::xml_node element);
-
-    /**
-     * @name Setters, getters and presence checker for class members.
-     * The checker returns true if the attribute class is set (e.g., not equal
-     * to the default value)
-     **/
-    ///@{
-    void SetLform(data_LINEFORM lform_) { m_lform = lform_; }
-    data_LINEFORM GetLform() const { return m_lform; }
-    bool HasLform() const;
-    //
-    void SetLwidth(data_LINEWIDTH lwidth_) { m_lwidth = lwidth_; }
-    data_LINEWIDTH GetLwidth() const { return m_lwidth; }
-    bool HasLwidth() const;
-    /** Getter for reference (for alternate type only) */
-    data_LINEWIDTH *GetLwidthAlternate() { return &m_lwidth; }
-    ///@}
-
-private:
-    /** Describes the line style of a curve. **/
-    data_LINEFORM m_lform;
-    /** Width of a curved line. **/
-    data_LINEWIDTH m_lwidth;
-};
-
-//----------------------------------------------------------------------------
-// InstCurveRend
-//----------------------------------------------------------------------------
-
-/**
- * Instantiable version of AttCurveRend
- */
-
-class InstCurveRend : public AttCurveRend {
-public:
-    InstCurveRend() = default;
-    virtual ~InstCurveRend() = default;
-};
-
 //----------------------------------------------------------------------------
 // AttCustosLog
 //----------------------------------------------------------------------------
@@ -2701,6 +2687,55 @@ class InstJoined : public AttJoined {
     virtual ~InstJoined() = default;
 };
 
+//----------------------------------------------------------------------------
+// AttKeyMode
+//----------------------------------------------------------------------------
+
+class AttKeyMode : public Att {
+protected:
+    AttKeyMode();
+    ~AttKeyMode() = default;
+
+public:
+    /** Reset the default values for the attribute class **/
+    void ResetKeyMode();
+
+    /** Read the values for the attribute class **/
+    bool ReadKeyMode(pugi::xml_node element, bool removeAttr = true);
+
+    /** Write the values for the attribute class **/
+    bool WriteKeyMode(pugi::xml_node element);
+
+    /**
+     * @name Setters, getters and presence checker for class members.
+     * The checker returns true if the attribute class is set (e.g., not equal
+     * to the default value)
+     **/
+    ///@{
+    void SetMode(data_MODE mode_) { m_mode = mode_; }
+    data_MODE GetMode() const { return m_mode; }
+    bool HasMode() const;
+    ///@}
+
+private:
+    /** Indicates major, minor, or other tonality. **/
+    data_MODE m_mode;
+};
+
+//----------------------------------------------------------------------------
+// InstKeyMode
+//----------------------------------------------------------------------------
+
+/**
+ * Instantiable version of AttKeyMode
+ */
+
+class InstKeyMode : public AttKeyMode {
+public:
+    InstKeyMode() = default;
+    virtual ~InstKeyMode() = default;
+};
+
 //----------------------------------------------------------------------------
 // AttKeySigLog
 //----------------------------------------------------------------------------
@@ -3154,20 +3189,22 @@ class AttLineRendBase : public Att {
     data_LINEFORM GetLform() const { return m_lform; }
     bool HasLform() const;
     //
-    void SetLsegs(int lsegs_) { m_lsegs = lsegs_; }
-    int GetLsegs() const { return m_lsegs; }
-    bool HasLsegs() const;
-    //
     void SetLwidth(data_LINEWIDTH lwidth_) { m_lwidth = lwidth_; }
     data_LINEWIDTH GetLwidth() const { return m_lwidth; }
     bool HasLwidth() const;
     /** Getter for reference (for alternate type only) */
     data_LINEWIDTH *GetLwidthAlternate() { return &m_lwidth; }
+    //
+    void SetLsegs(int lsegs_) { m_lsegs = lsegs_; }
+    int GetLsegs() const { return m_lsegs; }
+    bool HasLsegs() const;
     ///@}
 
 private:
-    /** Describes the line style of a curve. **/
+    /** Describes the style of a line. **/
     data_LINEFORM m_lform;
+    /** Width of a line. **/
+    data_LINEWIDTH m_lwidth;
     /**
      * Describes the number of segments into which a dashed or dotted line may be
      * divided, or the number of "peaks" of a wavy line; a pair of space-separated
@@ -3176,8 +3213,6 @@ class AttLineRendBase : public Att {
      * amount of space; that is, the minimum and maximum values are equal.
      **/
     int m_lsegs;
-    /** Width of a curved line. **/
-    data_LINEWIDTH m_lwidth;
 };
 
 //----------------------------------------------------------------------------
@@ -3648,6 +3683,55 @@ class InstMeiVersion : public AttMeiVersion {
     virtual ~InstMeiVersion() = default;
 };
 
+//----------------------------------------------------------------------------
+// AttMensurLog
+//----------------------------------------------------------------------------
+
+class AttMensurLog : public Att {
+protected:
+    AttMensurLog();
+    ~AttMensurLog() = default;
+
+public:
+    /** Reset the default values for the attribute class **/
+    void ResetMensurLog();
+
+    /** Read the values for the attribute class **/
+    bool ReadMensurLog(pugi::xml_node element, bool removeAttr = true);
+
+    /** Write the values for the attribute class **/
+    bool WriteMensurLog(pugi::xml_node element);
+
+    /**
+     * @name Setters, getters and presence checker for class members.
+     * The checker returns true if the attribute class is set (e.g., not equal
+     * to the default value)
+     **/
+    ///@{
+    void SetLevel(data_DURATION level_) { m_level = level_; }
+    data_DURATION GetLevel() const { return m_level; }
+    bool HasLevel() const;
+    ///@}
+
+private:
+    /** Indicates the nesting level of staff grouping symbols. **/
+    data_DURATION m_level;
+};
+
+//----------------------------------------------------------------------------
+// InstMensurLog
+//----------------------------------------------------------------------------
+
+/**
+ * Instantiable version of AttMensurLog
+ */
+
+class InstMensurLog : public AttMensurLog {
+public:
+    InstMensurLog() = default;
+    virtual ~InstMensurLog() = default;
+};
+
 //----------------------------------------------------------------------------
 // AttMetadataPointing
 //----------------------------------------------------------------------------
diff --git a/libmei/dist/atts_visual.cpp b/libmei/dist/atts_visual.cpp
index 832314ecc8d..6106237605c 100644
--- a/libmei/dist/atts_visual.cpp
+++ b/libmei/dist/atts_visual.cpp
@@ -78,8 +78,6 @@ void AttArpegVis::ResetArpegVis()
     m_arrowSize = MEI_UNSET;
     m_arrowColor = "";
     m_arrowFillcolor = "";
-    m_lineForm = LINEFORM_NONE;
-    m_lineWidth = data_LINEWIDTH();
 }
 
 bool AttArpegVis::ReadArpegVis(pugi::xml_node element, bool removeAttr)
@@ -110,16 +108,6 @@ bool AttArpegVis::ReadArpegVis(pugi::xml_node element, bool removeAttr)
         if (removeAttr) element.remove_attribute("arrow.fillcolor");
         hasAttribute = true;
     }
-    if (element.attribute("line.form")) {
-        this->SetLineForm(StrToLineform(element.attribute("line.form").value()));
-        if (removeAttr) element.remove_attribute("line.form");
-        hasAttribute = true;
-    }
-    if (element.attribute("line.width")) {
-        this->SetLineWidth(StrToLinewidth(element.attribute("line.width").value()));
-        if (removeAttr) element.remove_attribute("line.width");
-        hasAttribute = true;
-    }
     return hasAttribute;
 }
 
@@ -146,14 +134,6 @@ bool AttArpegVis::WriteArpegVis(pugi::xml_node element)
         element.append_attribute("arrow.fillcolor") = StrToStr(this->GetArrowFillcolor()).c_str();
         wroteAttribute = true;
     }
-    if (this->HasLineForm()) {
-        element.append_attribute("line.form") = LineformToStr(this->GetLineForm()).c_str();
-        wroteAttribute = true;
-    }
-    if (this->HasLineWidth()) {
-        element.append_attribute("line.width") = LinewidthToStr(this->GetLineWidth()).c_str();
-        wroteAttribute = true;
-    }
     return wroteAttribute;
 }
 
@@ -182,16 +162,6 @@ bool AttArpegVis::HasArrowFillcolor() const
     return (m_arrowFillcolor != "");
 }
 
-bool AttArpegVis::HasLineForm() const
-{
-    return (m_lineForm != LINEFORM_NONE);
-}
-
-bool AttArpegVis::HasLineWidth() const
-{
-    return (m_lineWidth.HasValue());
-}
-
 //----------------------------------------------------------------------------
 // AttBarLineVis
 //----------------------------------------------------------------------------
@@ -467,6 +437,46 @@ bool AttCleffingVis::HasClefVisible() const
     return (m_clefVisible != BOOLEAN_NONE);
 }
 
+//----------------------------------------------------------------------------
+// AttCurvatureDirection
+//----------------------------------------------------------------------------
+
+AttCurvatureDirection::AttCurvatureDirection() : Att()
+{
+    ResetCurvatureDirection();
+}
+
+void AttCurvatureDirection::ResetCurvatureDirection()
+{
+    m_curve = curvatureDirection_CURVE_NONE;
+}
+
+bool AttCurvatureDirection::ReadCurvatureDirection(pugi::xml_node element, bool removeAttr)
+{
+    bool hasAttribute = false;
+    if (element.attribute("curve")) {
+        this->SetCurve(StrToCurvatureDirectionCurve(element.attribute("curve").value()));
+        if (removeAttr) element.remove_attribute("curve");
+        hasAttribute = true;
+    }
+    return hasAttribute;
+}
+
+bool AttCurvatureDirection::WriteCurvatureDirection(pugi::xml_node element)
+{
+    bool wroteAttribute = false;
+    if (this->HasCurve()) {
+        element.append_attribute("curve") = CurvatureDirectionCurveToStr(this->GetCurve()).c_str();
+        wroteAttribute = true;
+    }
+    return wroteAttribute;
+}
+
+bool AttCurvatureDirection::HasCurve() const
+{
+    return (m_curve != curvatureDirection_CURVE_NONE);
+}
+
 //----------------------------------------------------------------------------
 // AttEpisemaVis
 //----------------------------------------------------------------------------
@@ -687,6 +697,46 @@ bool AttFingGrpVis::HasOrient() const
     return (m_orient != fingGrpVis_ORIENT_NONE);
 }
 
+//----------------------------------------------------------------------------
+// AttGuitarGridVis
+//----------------------------------------------------------------------------
+
+AttGuitarGridVis::AttGuitarGridVis() : Att()
+{
+    ResetGuitarGridVis();
+}
+
+void AttGuitarGridVis::ResetGuitarGridVis()
+{
+    m_gridShow = BOOLEAN_NONE;
+}
+
+bool AttGuitarGridVis::ReadGuitarGridVis(pugi::xml_node element, bool removeAttr)
+{
+    bool hasAttribute = false;
+    if (element.attribute("grid.show")) {
+        this->SetGridShow(StrToBoolean(element.attribute("grid.show").value()));
+        if (removeAttr) element.remove_attribute("grid.show");
+        hasAttribute = true;
+    }
+    return hasAttribute;
+}
+
+bool AttGuitarGridVis::WriteGuitarGridVis(pugi::xml_node element)
+{
+    bool wroteAttribute = false;
+    if (this->HasGridShow()) {
+        element.append_attribute("grid.show") = BooleanToStr(this->GetGridShow()).c_str();
+        wroteAttribute = true;
+    }
+    return wroteAttribute;
+}
+
+bool AttGuitarGridVis::HasGridShow() const
+{
+    return (m_gridShow != BOOLEAN_NONE);
+}
+
 //----------------------------------------------------------------------------
 // AttHairpinVis
 //----------------------------------------------------------------------------
@@ -1128,18 +1178,12 @@ AttLiquescentVis::AttLiquescentVis() : Att()
 
 void AttLiquescentVis::ResetLiquescentVis()
 {
-    m_curve = liquescentVis_CURVE_NONE;
     m_looped = BOOLEAN_NONE;
 }
 
 bool AttLiquescentVis::ReadLiquescentVis(pugi::xml_node element, bool removeAttr)
 {
     bool hasAttribute = false;
-    if (element.attribute("curve")) {
-        this->SetCurve(StrToLiquescentVisCurve(element.attribute("curve").value()));
-        if (removeAttr) element.remove_attribute("curve");
-        hasAttribute = true;
-    }
     if (element.attribute("looped")) {
         this->SetLooped(StrToBoolean(element.attribute("looped").value()));
         if (removeAttr) element.remove_attribute("looped");
@@ -1151,10 +1195,6 @@ bool AttLiquescentVis::ReadLiquescentVis(pugi::xml_node element, bool removeAttr
 bool AttLiquescentVis::WriteLiquescentVis(pugi::xml_node element)
 {
     bool wroteAttribute = false;
-    if (this->HasCurve()) {
-        element.append_attribute("curve") = LiquescentVisCurveToStr(this->GetCurve()).c_str();
-        wroteAttribute = true;
-    }
     if (this->HasLooped()) {
         element.append_attribute("looped") = BooleanToStr(this->GetLooped()).c_str();
         wroteAttribute = true;
@@ -1162,11 +1202,6 @@ bool AttLiquescentVis::WriteLiquescentVis(pugi::xml_node element)
     return wroteAttribute;
 }
 
-bool AttLiquescentVis::HasCurve() const
-{
-    return (m_curve != liquescentVis_CURVE_NONE);
-}
-
 bool AttLiquescentVis::HasLooped() const
 {
     return (m_looped != BOOLEAN_NONE);
@@ -1275,7 +1310,7 @@ void AttMensuralVis::ResetMensuralVis()
     m_mensurOrient = ORIENTATION_NONE;
     m_mensurSign = MENSURATIONSIGN_NONE;
     m_mensurSize = data_FONTSIZE();
-    m_mensurSlash = MEI_UNSET;
+    m_mensurSlash = 0;
 }
 
 bool AttMensuralVis::ReadMensuralVis(pugi::xml_node element, bool removeAttr)
@@ -1399,7 +1434,7 @@ bool AttMensuralVis::HasMensurSize() const
 
 bool AttMensuralVis::HasMensurSlash() const
 {
-    return (m_mensurSlash != MEI_UNSET);
+    return (m_mensurSlash != 0);
 }
 
 //----------------------------------------------------------------------------
@@ -1938,7 +1973,6 @@ AttStaffDefVis::AttStaffDefVis() : Att()
 
 void AttStaffDefVis::ResetStaffDefVis()
 {
-    m_gridShow = BOOLEAN_NONE;
     m_layerscheme = LAYERSCHEME_NONE;
     m_linesColor = "";
     m_linesVisible = BOOLEAN_NONE;
@@ -1948,11 +1982,6 @@ void AttStaffDefVis::ResetStaffDefVis()
 bool AttStaffDefVis::ReadStaffDefVis(pugi::xml_node element, bool removeAttr)
 {
     bool hasAttribute = false;
-    if (element.attribute("grid.show")) {
-        this->SetGridShow(StrToBoolean(element.attribute("grid.show").value()));
-        if (removeAttr) element.remove_attribute("grid.show");
-        hasAttribute = true;
-    }
     if (element.attribute("layerscheme")) {
         this->SetLayerscheme(StrToLayerscheme(element.attribute("layerscheme").value()));
         if (removeAttr) element.remove_attribute("layerscheme");
@@ -1979,10 +2008,6 @@ bool AttStaffDefVis::ReadStaffDefVis(pugi::xml_node element, bool removeAttr)
 bool AttStaffDefVis::WriteStaffDefVis(pugi::xml_node element)
 {
     bool wroteAttribute = false;
-    if (this->HasGridShow()) {
-        element.append_attribute("grid.show") = BooleanToStr(this->GetGridShow()).c_str();
-        wroteAttribute = true;
-    }
     if (this->HasLayerscheme()) {
         element.append_attribute("layerscheme") = LayerschemeToStr(this->GetLayerscheme()).c_str();
         wroteAttribute = true;
@@ -2002,11 +2027,6 @@ bool AttStaffDefVis::WriteStaffDefVis(pugi::xml_node element)
     return wroteAttribute;
 }
 
-bool AttStaffDefVis::HasGridShow() const
-{
-    return (m_gridShow != BOOLEAN_NONE);
-}
-
 bool AttStaffDefVis::HasLayerscheme() const
 {
     return (m_layerscheme != LAYERSCHEME_NONE);
diff --git a/libmei/dist/atts_visual.h b/libmei/dist/atts_visual.h
index 0e8ad069431..29586bee1fe 100644
--- a/libmei/dist/atts_visual.h
+++ b/libmei/dist/atts_visual.h
@@ -120,16 +120,6 @@ class AttArpegVis : public Att {
     void SetArrowFillcolor(std::string arrowFillcolor_) { m_arrowFillcolor = arrowFillcolor_; }
     std::string GetArrowFillcolor() const { return m_arrowFillcolor; }
     bool HasArrowFillcolor() const;
-    //
-    void SetLineForm(data_LINEFORM lineForm_) { m_lineForm = lineForm_; }
-    data_LINEFORM GetLineForm() const { return m_lineForm; }
-    bool HasLineForm() const;
-    //
-    void SetLineWidth(data_LINEWIDTH lineWidth_) { m_lineWidth = lineWidth_; }
-    data_LINEWIDTH GetLineWidth() const { return m_lineWidth; }
-    bool HasLineWidth() const;
-    /** Getter for reference (for alternate type only) */
-    data_LINEWIDTH *GetLineWidthAlternate() { return &m_lineWidth; }
     ///@}
 
 private:
@@ -143,10 +133,6 @@ class AttArpegVis : public Att {
     std::string m_arrowColor;
     /** Captures the fill color of the arrow if different from the line color. **/
     std::string m_arrowFillcolor;
-    /** Visual form of the line. **/
-    data_LINEFORM m_lineForm;
-    /** Width of the line. **/
-    data_LINEWIDTH m_lineWidth;
 };
 
 //----------------------------------------------------------------------------
@@ -447,6 +433,55 @@ class InstCleffingVis : public AttCleffingVis {
     virtual ~InstCleffingVis() = default;
 };
 
+//----------------------------------------------------------------------------
+// AttCurvatureDirection
+//----------------------------------------------------------------------------
+
+class AttCurvatureDirection : public Att {
+protected:
+    AttCurvatureDirection();
+    ~AttCurvatureDirection() = default;
+
+public:
+    /** Reset the default values for the attribute class **/
+    void ResetCurvatureDirection();
+
+    /** Read the values for the attribute class **/
+    bool ReadCurvatureDirection(pugi::xml_node element, bool removeAttr = true);
+
+    /** Write the values for the attribute class **/
+    bool WriteCurvatureDirection(pugi::xml_node element);
+
+    /**
+     * @name Setters, getters and presence checker for class members.
+     * The checker returns true if the attribute class is set (e.g., not equal
+     * to the default value)
+     **/
+    ///@{
+    void SetCurve(curvatureDirection_CURVE curve_) { m_curve = curve_; }
+    curvatureDirection_CURVE GetCurve() const { return m_curve; }
+    bool HasCurve() const;
+    ///@}
+
+private:
+    /** Records direction of curvature. **/
+    curvatureDirection_CURVE m_curve;
+};
+
+//----------------------------------------------------------------------------
+// InstCurvatureDirection
+//----------------------------------------------------------------------------
+
+/**
+ * Instantiable version of AttCurvatureDirection
+ */
+
+class InstCurvatureDirection : public AttCurvatureDirection {
+public:
+    InstCurvatureDirection() = default;
+    virtual ~InstCurvatureDirection() = default;
+};
+
 //----------------------------------------------------------------------------
 // AttEpisemaVis
 //----------------------------------------------------------------------------
@@ -667,6 +702,55 @@ class InstFingGrpVis : public AttFingGrpVis {
     virtual ~InstFingGrpVis() = default;
 };
 
+//----------------------------------------------------------------------------
+// AttGuitarGridVis
+//----------------------------------------------------------------------------
+
+class AttGuitarGridVis : public Att {
+protected:
+    AttGuitarGridVis();
+    ~AttGuitarGridVis() = default;
+
+public:
+    /** Reset the default values for the attribute class **/
+    void ResetGuitarGridVis();
+
+    /** Read the values for the attribute class **/
+    bool ReadGuitarGridVis(pugi::xml_node element, bool removeAttr = true);
+
+    /** Write the values for the attribute class **/
+    bool WriteGuitarGridVis(pugi::xml_node element);
+
+    /**
+     * @name Setters, getters and presence checker for class members.
+     * The checker returns true if the attribute class is set (e.g., not equal
+     * to the default value)
+     **/
+    ///@{
+    void SetGridShow(data_BOOLEAN gridShow_) { m_gridShow = gridShow_; }
+    data_BOOLEAN GetGridShow() const { return m_gridShow; }
+    bool HasGridShow() const;
+    ///@}
+
+private:
+    /** Determines whether to display guitar chord grids. **/
+    data_BOOLEAN m_gridShow;
+};
+
+//----------------------------------------------------------------------------
+// InstGuitarGridVis
+//----------------------------------------------------------------------------
+
+/**
+ * Instantiable version of AttGuitarGridVis
+ */
+
+class InstGuitarGridVis : public AttGuitarGridVis {
+public:
+    InstGuitarGridVis() = default;
+    virtual ~InstGuitarGridVis() = default;
+};
+
 //----------------------------------------------------------------------------
 // AttHairpinVis
 //----------------------------------------------------------------------------
@@ -1111,18 +1195,12 @@ class AttLiquescentVis : public Att {
      * to the default value)
      **/
     ///@{
-    void SetCurve(liquescentVis_CURVE curve_) { m_curve = curve_; }
-    liquescentVis_CURVE GetCurve() const { return m_curve; }
-    bool HasCurve() const;
-    //
     void SetLooped(data_BOOLEAN looped_) { m_looped = looped_; }
     data_BOOLEAN GetLooped() const { return m_looped; }
     bool HasLooped() const;
     ///@}
 
 private:
-    /** Records direction of curvature. **/
-    liquescentVis_CURVE m_curve;
     /** Indicates whether curve is closed. **/
     data_BOOLEAN m_looped;
 };
@@ -1263,8 +1341,8 @@ class AttMensuralVis : public Att {
     /** Getter for reference (for alternate type only) */
     data_FONTSIZE *GetMensurSizeAlternate() { return &m_mensurSize; }
     //
-    void SetMensurSlash(int mensurSlash_) { m_mensurSlash = mensurSlash_; }
-    int GetMensurSlash() const { return m_mensurSlash; }
+    void SetMensurSlash(char mensurSlash_) { m_mensurSlash = mensurSlash_; }
+    char GetMensurSlash() const { return m_mensurSlash; }
     bool HasMensurSlash() const;
     ///@}
 
@@ -1290,7 +1368,7 @@ class AttMensuralVis : public Att {
      * Indicates the number lines added to the mensuration sign.
      * For example, one slash is added for what we now call 'alla breve'.
      **/
-    int m_mensurSlash;
+    char m_mensurSlash;
 };
 
 //----------------------------------------------------------------------------
@@ -1959,10 +2037,6 @@ class AttStaffDefVis : public Att {
      * to the default value)
      **/
     ///@{
-    void SetGridShow(data_BOOLEAN gridShow_) { m_gridShow = gridShow_; }
-    data_BOOLEAN GetGridShow() const { return m_gridShow; }
-    bool HasGridShow() const;
-    //
     void SetLayerscheme(data_LAYERSCHEME layerscheme_) { m_layerscheme = layerscheme_; }
     data_LAYERSCHEME GetLayerscheme() const { return m_layerscheme; }
     bool HasLayerscheme() const;
@@ -1981,8 +2055,6 @@ class AttStaffDefVis : public Att {
     ///@}
 
 private:
-    /** Determines whether to display guitar chord grids. **/
-    data_BOOLEAN m_gridShow;
     /** Indicates the number of layers and their stem directions. **/
     data_LAYERSCHEME m_layerscheme;
     /** Captures the colors of the staff lines. **/
diff --git a/libmei/dist/atttypes.h b/libmei/dist/atttypes.h
index 2c5568c3c29..7d15953404c 100644
--- a/libmei/dist/atttypes.h
+++ b/libmei/dist/atttypes.h
@@ -37,6 +37,8 @@ enum data_ACCIDENTAL_GESTURAL : int8_t {
     ACCIDENTAL_GESTURAL_sd,
     ACCIDENTAL_GESTURAL_fu,
     ACCIDENTAL_GESTURAL_fd,
+    ACCIDENTAL_GESTURAL_xu,
+    ACCIDENTAL_GESTURAL_ffd,
     ACCIDENTAL_GESTURAL_bms,
     ACCIDENTAL_GESTURAL_kms,
     ACCIDENTAL_GESTURAL_bs,
@@ -74,6 +76,8 @@ enum data_ACCIDENTAL_GESTURAL_extended : int8_t {
     ACCIDENTAL_GESTURAL_extended_sd,
     ACCIDENTAL_GESTURAL_extended_fu,
     ACCIDENTAL_GESTURAL_extended_fd,
+    ACCIDENTAL_GESTURAL_extended_xu,
+    ACCIDENTAL_GESTURAL_extended_ffd,
     ACCIDENTAL_GESTURAL_extended_MAX
 };
 
@@ -100,6 +104,10 @@ enum data_ACCIDENTAL_WRITTEN : int8_t {
     ACCIDENTAL_WRITTEN_fd,
     ACCIDENTAL_WRITTEN_nu,
     ACCIDENTAL_WRITTEN_nd,
+    ACCIDENTAL_WRITTEN_xu,
+    ACCIDENTAL_WRITTEN_xd,
+    ACCIDENTAL_WRITTEN_ffu,
+    ACCIDENTAL_WRITTEN_ffd,
     ACCIDENTAL_WRITTEN_1qf,
     ACCIDENTAL_WRITTEN_3qf,
     ACCIDENTAL_WRITTEN_1qs,
@@ -148,6 +156,10 @@ enum data_ACCIDENTAL_WRITTEN_extended : int8_t {
     ACCIDENTAL_WRITTEN_extended_fd,
     ACCIDENTAL_WRITTEN_extended_nu,
     ACCIDENTAL_WRITTEN_extended_nd,
+    ACCIDENTAL_WRITTEN_extended_xu,
+    ACCIDENTAL_WRITTEN_extended_xd,
+    ACCIDENTAL_WRITTEN_extended_ffu,
+    ACCIDENTAL_WRITTEN_extended_ffd,
     ACCIDENTAL_WRITTEN_extended_1qf,
     ACCIDENTAL_WRITTEN_extended_3qf,
     ACCIDENTAL_WRITTEN_extended_1qs,
@@ -1790,7 +1802,7 @@ enum data_VERTICALALIGNMENT : int8_t {
 };
 
 /**
- * MEI att.accid.log@func
+ * MEI att.accid.log\@func
  */
 enum accidLog_FUNC : int8_t {
     accidLog_FUNC_NONE = 0,
@@ -1800,7 +1812,7 @@ enum accidLog_FUNC : int8_t {
 };
 
 /**
- * MEI att.anchoredText.log@func
+ * MEI att.anchoredText.log\@func
  */
 enum anchoredTextLog_FUNC : int8_t {
     anchoredTextLog_FUNC_NONE = 0,
@@ -1809,7 +1821,7 @@ enum anchoredTextLog_FUNC : int8_t {
 };
 
 /**
- * MEI att.arpeg.log@order
+ * MEI att.arpeg.log\@order
  */
 enum arpegLog_ORDER : int8_t {
     arpegLog_ORDER_NONE = 0,
@@ -1820,7 +1832,7 @@ enum arpegLog_ORDER : int8_t {
 };
 
 /**
- * MEI att.audience@audience
+ * MEI att.audience\@audience
  */
 enum audience_AUDIENCE : int8_t {
     audience_AUDIENCE_NONE = 0,
@@ -1830,17 +1842,7 @@ enum audience_AUDIENCE : int8_t {
 };
 
 /**
- * MEI att.bTrem.log@form
- */
-enum bTremLog_FORM : int8_t {
-    bTremLog_FORM_NONE = 0,
-    bTremLog_FORM_meas,
-    bTremLog_FORM_unmeas,
-    bTremLog_FORM_MAX
-};
-
-/**
- * MEI att.beamRend@form
+ * MEI att.beamRend\@form
  */
 enum beamRend_FORM : int8_t {
     beamRend_FORM_NONE = 0,
@@ -1852,7 +1854,7 @@ enum beamRend_FORM : int8_t {
 };
 
 /**
- * MEI att.beaming.vis@beam.rend
+ * MEI att.beaming.vis\@beam.rend
  */
 enum beamingVis_BEAMREND : int8_t {
     beamingVis_BEAMREND_NONE = 0,
@@ -1863,7 +1865,7 @@ enum beamingVis_BEAMREND : int8_t {
 };
 
 /**
- * MEI att.bracketSpan.log@func
+ * MEI att.bracketSpan.log\@func
  */
 enum bracketSpanLog_FUNC : int8_t {
     bracketSpanLog_FUNC_NONE = 0,
@@ -1874,7 +1876,7 @@ enum bracketSpanLog_FUNC : int8_t {
 };
 
 /**
- * MEI att.curvature@curvedir
+ * MEI att.curvature\@curvedir
  */
 enum curvature_CURVEDIR : int8_t {
     curvature_CURVEDIR_NONE = 0,
@@ -1885,7 +1887,17 @@ enum curvature_CURVEDIR : int8_t {
 };
 
 /**
- * MEI att.curve.log@func
+ * MEI att.curvatureDirection\@curve
+ */
+enum curvatureDirection_CURVE : int8_t {
+    curvatureDirection_CURVE_NONE = 0,
+    curvatureDirection_CURVE_a,
+    curvatureDirection_CURVE_c,
+    curvatureDirection_CURVE_MAX
+};
+
+/**
+ * MEI att.curve.log\@func
  */
 enum curveLog_FUNC : int8_t {
     curveLog_FUNC_NONE = 0,
@@ -1894,7 +1906,7 @@ enum curveLog_FUNC : int8_t {
 };
 
 /**
- * MEI att.cutout@cutout
+ * MEI att.cutout\@cutout
  */
 enum cutout_CUTOUT : int8_t {
     cutout_CUTOUT_NONE = 0,
@@ -1903,7 +1915,7 @@ enum cutout_CUTOUT : int8_t {
 };
 
 /**
- * MEI att.divLine.log@form
+ * MEI att.divLine.log\@form
  */
 enum divLineLog_FORM : int8_t {
     divLineLog_FORM_NONE = 0,
@@ -1917,7 +1929,7 @@ enum divLineLog_FORM : int8_t {
 };
 
 /**
- * MEI att.dot.log@form
+ * MEI att.dot.log\@form
  */
 enum dotLog_FORM : int8_t {
     dotLog_FORM_NONE = 0,
@@ -1927,7 +1939,7 @@ enum dotLog_FORM : int8_t {
 };
 
 /**
- * MEI att.endings@ending.rend
+ * MEI att.endings\@ending.rend
  */
 enum endings_ENDINGREND : int8_t {
     endings_ENDINGREND_NONE = 0,
@@ -1938,7 +1950,7 @@ enum endings_ENDINGREND : int8_t {
 };
 
 /**
- * MEI att.episema.vis@form
+ * MEI att.episema.vis\@form
  */
 enum episemaVis_FORM : int8_t {
     episemaVis_FORM_NONE = 0,
@@ -1948,7 +1960,7 @@ enum episemaVis_FORM : int8_t {
 };
 
 /**
- * MEI att.evidence@evidence
+ * MEI att.evidence\@evidence
  */
 enum evidence_EVIDENCE : int8_t {
     evidence_EVIDENCE_NONE = 0,
@@ -1959,7 +1971,7 @@ enum evidence_EVIDENCE : int8_t {
 };
 
 /**
- * MEI att.extSym.auth@glyph.auth
+ * MEI att.extSym.auth\@glyph.auth
  */
 enum extSymAuth_GLYPHAUTH : int8_t {
     extSymAuth_GLYPHAUTH_NONE = 0,
@@ -1968,17 +1980,7 @@ enum extSymAuth_GLYPHAUTH : int8_t {
 };
 
 /**
- * MEI att.fTrem.log@form
- */
-enum fTremLog_FORM : int8_t {
-    fTremLog_FORM_NONE = 0,
-    fTremLog_FORM_meas,
-    fTremLog_FORM_unmeas,
-    fTremLog_FORM_MAX
-};
-
-/**
- * MEI att.fermata.vis@form
+ * MEI att.fermata.vis\@form
  */
 enum fermataVis_FORM : int8_t {
     fermataVis_FORM_NONE = 0,
@@ -1988,7 +1990,7 @@ enum fermataVis_FORM : int8_t {
 };
 
 /**
- * MEI att.fermata.vis@shape
+ * MEI att.fermata.vis\@shape
  */
 enum fermataVis_SHAPE : int8_t {
     fermataVis_SHAPE_NONE = 0,
@@ -1999,7 +2001,7 @@ enum fermataVis_SHAPE : int8_t {
 };
 
 /**
- * MEI att.fingGrp.log@form
+ * MEI att.fingGrp.log\@form
  */
 enum fingGrpLog_FORM : int8_t {
     fingGrpLog_FORM_NONE = 0,
@@ -2010,7 +2012,7 @@ enum fingGrpLog_FORM : int8_t {
 };
 
 /**
- * MEI att.fingGrp.vis@orient
+ * MEI att.fingGrp.vis\@orient
  */
 enum fingGrpVis_ORIENT : int8_t {
     fingGrpVis_ORIENT_NONE = 0,
@@ -2020,7 +2022,7 @@ enum fingGrpVis_ORIENT : int8_t {
 };
 
 /**
- * MEI att.graceGrp.log@attach
+ * MEI att.graceGrp.log\@attach
  */
 enum graceGrpLog_ATTACH : int8_t {
     graceGrpLog_ATTACH_NONE = 0,
@@ -2031,7 +2033,7 @@ enum graceGrpLog_ATTACH : int8_t {
 };
 
 /**
- * MEI att.hairpin.log@form
+ * MEI att.hairpin.log\@form
  */
 enum hairpinLog_FORM : int8_t {
     hairpinLog_FORM_NONE = 0,
@@ -2041,7 +2043,7 @@ enum hairpinLog_FORM : int8_t {
 };
 
 /**
- * MEI att.harm.anl@form
+ * MEI att.harm.anl\@form
  */
 enum harmAnl_FORM : int8_t {
     harmAnl_FORM_NONE = 0,
@@ -2051,7 +2053,7 @@ enum harmAnl_FORM : int8_t {
 };
 
 /**
- * MEI att.harm.vis@rendgrid
+ * MEI att.harm.vis\@rendgrid
  */
 enum harmVis_RENDGRID : int8_t {
     harmVis_RENDGRID_NONE = 0,
@@ -2062,7 +2064,7 @@ enum harmVis_RENDGRID : int8_t {
 };
 
 /**
- * MEI att.harpPedal.log@a
+ * MEI att.harpPedal.log\@a
  */
 enum harpPedalLog_A : int8_t {
     harpPedalLog_A_NONE = 0,
@@ -2073,7 +2075,7 @@ enum harpPedalLog_A : int8_t {
 };
 
 /**
- * MEI att.harpPedal.log@b
+ * MEI att.harpPedal.log\@b
  */
 enum harpPedalLog_B : int8_t {
     harpPedalLog_B_NONE = 0,
@@ -2084,7 +2086,7 @@ enum harpPedalLog_B : int8_t {
 };
 
 /**
- * MEI att.harpPedal.log@c
+ * MEI att.harpPedal.log\@c
  */
 enum harpPedalLog_C : int8_t {
     harpPedalLog_C_NONE = 0,
@@ -2095,7 +2097,7 @@ enum harpPedalLog_C : int8_t {
 };
 
 /**
- * MEI att.harpPedal.log@d
+ * MEI att.harpPedal.log\@d
  */
 enum harpPedalLog_D : int8_t {
     harpPedalLog_D_NONE = 0,
@@ -2106,7 +2108,7 @@ enum harpPedalLog_D : int8_t {
 };
 
 /**
- * MEI att.harpPedal.log@e
+ * MEI att.harpPedal.log\@e
  */
 enum harpPedalLog_E : int8_t {
     harpPedalLog_E_NONE = 0,
@@ -2117,7 +2119,7 @@ enum harpPedalLog_E : int8_t {
 };
 
 /**
- * MEI att.harpPedal.log@f
+ * MEI att.harpPedal.log\@f
  */
 enum harpPedalLog_F : int8_t {
     harpPedalLog_F_NONE = 0,
@@ -2128,7 +2130,7 @@ enum harpPedalLog_F : int8_t {
 };
 
 /**
- * MEI att.harpPedal.log@g
+ * MEI att.harpPedal.log\@g
  */
 enum harpPedalLog_G : int8_t {
     harpPedalLog_G_NONE = 0,
@@ -2139,7 +2141,7 @@ enum harpPedalLog_G : int8_t {
 };
 
 /**
- * MEI att.line.log@func
+ * MEI att.line.log\@func
  */
 enum lineLog_FUNC : int8_t {
     lineLog_FUNC_NONE = 0,
@@ -2150,17 +2152,7 @@ enum lineLog_FUNC : int8_t {
 };
 
 /**
- * MEI att.liquescent.vis@curve
- */
-enum liquescentVis_CURVE : int8_t {
-    liquescentVis_CURVE_NONE = 0,
-    liquescentVis_CURVE_a,
-    liquescentVis_CURVE_c,
-    liquescentVis_CURVE_MAX
-};
-
-/**
- * MEI att.measurement@unit
+ * MEI att.measurement\@unit
  */
 enum measurement_UNIT : int8_t {
     measurement_UNIT_NONE = 0,
@@ -2185,7 +2177,7 @@ enum measurement_UNIT : int8_t {
 };
 
 /**
- * MEI att.meiVersion@meiversion
+ * MEI att.meiVersion\@meiversion
  */
 enum meiVersion_MEIVERSION : int8_t {
     meiVersion_MEIVERSION_NONE = 0,
@@ -2193,13 +2185,16 @@ enum meiVersion_MEIVERSION : int8_t {
     meiVersion_MEIVERSION_3_0_0,
     meiVersion_MEIVERSION_4_0_0,
     meiVersion_MEIVERSION_4_0_1,
-    meiVersion_MEIVERSION_5_0_0_devplusbasic,
-    meiVersion_MEIVERSION_5_0_0_dev,
+    meiVersion_MEIVERSION_5_0,
+    meiVersion_MEIVERSION_5_0plusbasic,
+    meiVersion_MEIVERSION_5_0plusCMN,
+    meiVersion_MEIVERSION_5_0plusMensural,
+    meiVersion_MEIVERSION_5_0plusNeumes,
     meiVersion_MEIVERSION_MAX
 };
 
 /**
- * MEI att.mensur.vis@form
+ * MEI att.mensur.vis\@form
  */
 enum mensurVis_FORM : int8_t {
     mensurVis_FORM_NONE = 0,
@@ -2209,7 +2204,7 @@ enum mensurVis_FORM : int8_t {
 };
 
 /**
- * MEI att.mensural.vis@mensur.form
+ * MEI att.mensural.vis\@mensur.form
  */
 enum mensuralVis_MENSURFORM : int8_t {
     mensuralVis_MENSURFORM_NONE = 0,
@@ -2219,7 +2214,7 @@ enum mensuralVis_MENSURFORM : int8_t {
 };
 
 /**
- * MEI att.meterConformance@metcon
+ * MEI att.meterConformance\@metcon
  */
 enum meterConformance_METCON : int8_t {
     meterConformance_METCON_NONE = 0,
@@ -2230,7 +2225,7 @@ enum meterConformance_METCON : int8_t {
 };
 
 /**
- * MEI att.meterSigGrp.log@func
+ * MEI att.meterSigGrp.log\@func
  */
 enum meterSigGrpLog_FUNC : int8_t {
     meterSigGrpLog_FUNC_NONE = 0,
@@ -2242,7 +2237,7 @@ enum meterSigGrpLog_FUNC : int8_t {
 };
 
 /**
- * MEI att.mordent.log@form
+ * MEI att.mordent.log\@form
  */
 enum mordentLog_FORM : int8_t {
     mordentLog_FORM_NONE = 0,
@@ -2252,7 +2247,7 @@ enum mordentLog_FORM : int8_t {
 };
 
 /**
- * MEI att.ncForm@con
+ * MEI att.ncForm\@con
  */
 enum ncForm_CON : int8_t {
     ncForm_CON_NONE = 0,
@@ -2263,17 +2258,7 @@ enum ncForm_CON : int8_t {
 };
 
 /**
- * MEI att.ncForm@curve
- */
-enum ncForm_CURVE : int8_t {
-    ncForm_CURVE_NONE = 0,
-    ncForm_CURVE_a,
-    ncForm_CURVE_c,
-    ncForm_CURVE_MAX
-};
-
-/**
- * MEI att.ncForm@rellen
+ * MEI att.ncForm\@rellen
  */
 enum ncForm_RELLEN : int8_t {
     ncForm_RELLEN_NONE = 0,
@@ -2283,7 +2268,35 @@ enum ncForm_RELLEN : int8_t {
 };
 
 /**
- * MEI att.note.ges@extremis
+ * MEI att.neumeType\@type
+ */
+enum neumeType_TYPE : int8_t {
+    neumeType_TYPE_NONE = 0,
+    neumeType_TYPE_apostropha,
+    neumeType_TYPE_bistropha,
+    neumeType_TYPE_climacus,
+    neumeType_TYPE_clivis,
+    neumeType_TYPE_oriscus,
+    neumeType_TYPE_pes,
+    neumeType_TYPE_pessubpunctis,
+    neumeType_TYPE_porrectus,
+    neumeType_TYPE_porrectusflexus,
+    neumeType_TYPE_pressusmaior,
+    neumeType_TYPE_pressusminor,
+    neumeType_TYPE_punctum,
+    neumeType_TYPE_quilisma,
+    neumeType_TYPE_scandicus,
+    neumeType_TYPE_strophicus,
+    neumeType_TYPE_torculus,
+    neumeType_TYPE_torculusresupinus,
+    neumeType_TYPE_tristropha,
+    neumeType_TYPE_virga,
+    neumeType_TYPE_virgastrata,
+    neumeType_TYPE_MAX
+};
+
+/**
+ * MEI att.note.ges\@extremis
  */
 enum noteGes_EXTREMIS : int8_t {
     noteGes_EXTREMIS_NONE = 0,
@@ -2293,7 +2306,7 @@ enum noteGes_EXTREMIS : int8_t {
 };
 
 /**
- * MEI att.noteHeads@head.auth
+ * MEI att.noteHeads\@head.auth
  */
 enum noteHeads_HEADAUTH : int8_t {
     noteHeads_HEADAUTH_NONE = 0,
@@ -2302,7 +2315,7 @@ enum noteHeads_HEADAUTH : int8_t {
 };
 
 /**
- * MEI att.octave.log@coll
+ * MEI att.octave.log\@coll
  */
 enum octaveLog_COLL : int8_t {
     octaveLog_COLL_NONE = 0,
@@ -2311,7 +2324,7 @@ enum octaveLog_COLL : int8_t {
 };
 
 /**
- * MEI att.pb.vis@folium
+ * MEI att.pb.vis\@folium
  */
 enum pbVis_FOLIUM : int8_t {
     pbVis_FOLIUM_NONE = 0,
@@ -2321,7 +2334,7 @@ enum pbVis_FOLIUM : int8_t {
 };
 
 /**
- * MEI att.pedal.log@dir
+ * MEI att.pedal.log\@dir
  */
 enum pedalLog_DIR : int8_t {
     pedalLog_DIR_NONE = 0,
@@ -2333,7 +2346,7 @@ enum pedalLog_DIR : int8_t {
 };
 
 /**
- * MEI att.pedal.log@func
+ * MEI att.pedal.log\@func
  */
 enum pedalLog_FUNC : int8_t {
     pedalLog_FUNC_NONE = 0,
@@ -2345,7 +2358,7 @@ enum pedalLog_FUNC : int8_t {
 };
 
 /**
- * MEI att.pointing@xlink:actuate
+ * MEI att.pointing\@xlink:actuate
  */
 enum pointing_XLINKACTUATE : int8_t {
     pointing_XLINKACTUATE_NONE = 0,
@@ -2357,7 +2370,7 @@ enum pointing_XLINKACTUATE : int8_t {
 };
 
 /**
- * MEI att.pointing@xlink:show
+ * MEI att.pointing\@xlink:show
  */
 enum pointing_XLINKSHOW : int8_t {
     pointing_XLINKSHOW_NONE = 0,
@@ -2370,7 +2383,7 @@ enum pointing_XLINKSHOW : int8_t {
 };
 
 /**
- * MEI att.recordType@recordtype
+ * MEI att.recordType\@recordtype
  */
 enum recordType_RECORDTYPE : int8_t {
     recordType_RECORDTYPE_NONE = 0,
@@ -2392,7 +2405,7 @@ enum recordType_RECORDTYPE : int8_t {
 };
 
 /**
- * MEI att.regularMethod@method
+ * MEI att.regularMethod\@method
  */
 enum regularMethod_METHOD : int8_t {
     regularMethod_METHOD_NONE = 0,
@@ -2402,7 +2415,7 @@ enum regularMethod_METHOD : int8_t {
 };
 
 /**
- * MEI att.rehearsal@reh.enclose
+ * MEI att.rehearsal\@reh.enclose
  */
 enum rehearsal_REHENCLOSE : int8_t {
     rehearsal_REHENCLOSE_NONE = 0,
@@ -2413,7 +2426,7 @@ enum rehearsal_REHENCLOSE : int8_t {
 };
 
 /**
- * MEI att.repeatMark.log@func
+ * MEI att.repeatMark.log\@func
  */
 enum repeatMarkLog_FUNC : int8_t {
     repeatMarkLog_FUNC_NONE = 0,
@@ -2426,7 +2439,7 @@ enum repeatMarkLog_FUNC : int8_t {
 };
 
 /**
- * MEI att.sb.vis@form
+ * MEI att.sb.vis\@form
  */
 enum sbVis_FORM : int8_t {
     sbVis_FORM_NONE = 0,
@@ -2435,7 +2448,7 @@ enum sbVis_FORM : int8_t {
 };
 
 /**
- * MEI att.staffGroupingSym@symbol
+ * MEI att.staffGroupingSym\@symbol
  */
 enum staffGroupingSym_SYMBOL : int8_t {
     staffGroupingSym_SYMBOL_NONE = 0,
@@ -2448,7 +2461,7 @@ enum staffGroupingSym_SYMBOL : int8_t {
 };
 
 /**
- * MEI att.syl.log@con
+ * MEI att.syl.log\@con
  */
 enum sylLog_CON : int8_t {
     sylLog_CON_NONE = 0,
@@ -2464,7 +2477,7 @@ enum sylLog_CON : int8_t {
 };
 
 /**
- * MEI att.syl.log@wordpos
+ * MEI att.syl.log\@wordpos
  */
 enum sylLog_WORDPOS : int8_t {
     sylLog_WORDPOS_NONE = 0,
@@ -2476,7 +2489,7 @@ enum sylLog_WORDPOS : int8_t {
 };
 
 /**
- * MEI att.targetEval@evaluate
+ * MEI att.targetEval\@evaluate
  */
 enum targetEval_EVALUATE : int8_t {
     targetEval_EVALUATE_NONE = 0,
@@ -2487,7 +2500,7 @@ enum targetEval_EVALUATE : int8_t {
 };
 
 /**
- * MEI att.tempo.log@func
+ * MEI att.tempo.log\@func
  */
 enum tempoLog_FUNC : int8_t {
     tempoLog_FUNC_NONE = 0,
@@ -2499,7 +2512,17 @@ enum tempoLog_FUNC : int8_t {
 };
 
 /**
- * MEI att.tuplet.vis@num.format
+ * MEI att.tremForm\@form
+ */
+enum tremForm_FORM : int8_t {
+    tremForm_FORM_NONE = 0,
+    tremForm_FORM_meas,
+    tremForm_FORM_unmeas,
+    tremForm_FORM_MAX
+};
+
+/**
+ * MEI att.tuplet.vis\@num.format
  */
 enum tupletVis_NUMFORMAT : int8_t {
     tupletVis_NUMFORMAT_NONE = 0,
@@ -2509,7 +2532,7 @@ enum tupletVis_NUMFORMAT : int8_t {
 };
 
 /**
- * MEI att.turn.log@form
+ * MEI att.turn.log\@form
  */
 enum turnLog_FORM : int8_t {
     turnLog_FORM_NONE = 0,
@@ -2519,7 +2542,7 @@ enum turnLog_FORM : int8_t {
 };
 
 /**
- * MEI att.voltaGroupingSym@voltasym
+ * MEI att.voltaGroupingSym\@voltasym
  */
 enum voltaGroupingSym_VOLTASYM : int8_t {
     voltaGroupingSym_VOLTASYM_NONE = 0,
@@ -2532,7 +2555,7 @@ enum voltaGroupingSym_VOLTASYM : int8_t {
 };
 
 /**
- * MEI att.whitespace@xml:space
+ * MEI att.whitespace\@xml:space
  */
 enum whitespace_XMLSPACE : int8_t {
     whitespace_XMLSPACE_NONE = 0,
diff --git a/libmei/dist/meibasic.h b/libmei/dist/meibasic.h
index f057bffa1b3..ef66762c8aa 100644
--- a/libmei/dist/meibasic.h
+++ b/libmei/dist/meibasic.h
@@ -12,66 +12,66 @@ class MEIBasic {
     // clang-format off
     
     inline static std::map<std::string, std::vector<std::string>> map = {
-        {"arpeg", {"label", "type", "order", "layer", "plist", "staff", "tstamp", "startid", "arrow", "arrow.shape", "arrow.size", "arrow.color", "arrow.fillcolor", "line.form", "line.width", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
-        {"beam", {"label", "type", "layer", "staff", "cue"}},
-        {"beatRpt", {"label", "type", "beatdef", "layer", "staff", "slash", "expand", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "plist"}},
-        {"breath", {"label", "type", "layer", "staff", "startid", "tstamp", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "ho", "vo"}},
-        {"bTrem", {"label", "type", "form", "layer", "staff", "dots", "dur", "num", "num.place", "num.visible", "unitdur"}},
-        {"fermata", {"label", "type", "layer", "plist", "staff", "tstamp", "endid", "startid", "form", "shape", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "place", "ho", "vo"}},
-        {"fTrem", {"label", "type", "form", "layer", "staff", "dots", "dur", "unitdur"}},
-        {"gliss", {"label", "type", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo", "startho", "endho", "startvo", "endvo", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lsegs", "lwidth"}},
-        {"graceGrp", {"label", "type", "attach", "layer", "staff", "grace", "grace.time"}},
-        {"hairpin", {"label", "type", "form", "niente", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "opening", "closed", "opening.vertical", "angle.optimize", "lform", "lsegs", "lwidth", "place", "ho", "vo", "startho", "endho", "startvo", "endvo", "val", "val2"}},
-        {"halfmRpt", {"label", "type", "layer", "staff", "dur", "expand", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
-        {"harpPedal", {"label", "type", "c", "d", "e", "f", "g", "a", "b", "layer", "plist", "staff", "tstamp", "endid", "startid", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
-        {"lv", {"label", "type", "layer", "plist", "staff", "tstamp", "endid", "startid", "tstamp2", "ho", "vo", "startho", "endho", "startvo", "endvo", "curvedir"}},
+        {"arpeg", {"label", "type", "order", "layer", "plist", "staff", "tstamp", "startid", "arrow", "arrow.shape", "arrow.size", "arrow.color", "arrow.fillcolor", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "lform", "lwidth", "lsegs", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
+        {"beam", {"label", "type", "layer", "staff", "color", "cue"}},
+        {"beatRpt", {"label", "type", "beatdef", "layer", "staff", "slash", "color", "expand", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "plist"}},
+        {"breath", {"label", "type", "layer", "staff", "startid", "tstamp", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "ho", "vo"}},
+        {"bTrem", {"label", "type", "layer", "staff", "dots", "dur", "num", "form", "num.place", "num.visible", "unitdur"}},
+        {"fermata", {"label", "type", "layer", "plist", "staff", "tstamp", "endid", "startid", "form", "shape", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "place", "ho", "vo"}},
+        {"fTrem", {"label", "type", "layer", "staff", "dots", "dur", "form", "unitdur"}},
+        {"gliss", {"label", "type", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo", "startho", "endho", "startvo", "endvo", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lwidth", "lsegs"}},
+        {"graceGrp", {"label", "type", "attach", "layer", "staff", "grace", "grace.time", "color"}},
+        {"hairpin", {"label", "type", "form", "niente", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "opening", "closed", "opening.vertical", "angle.optimize", "color", "lform", "lwidth", "lsegs", "place", "ho", "vo", "startho", "endho", "startvo", "endvo", "val", "val2"}},
+        {"halfmRpt", {"label", "type", "layer", "staff", "dur", "color", "expand", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
+        {"harpPedal", {"label", "type", "c", "d", "e", "f", "g", "a", "b", "layer", "plist", "staff", "tstamp", "endid", "startid", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
+        {"lv", {"label", "type", "layer", "plist", "staff", "tstamp", "endid", "startid", "tstamp2", "color", "curvedir", "lform", "lwidth", "lsegs", "ho", "vo", "startho", "endho", "startvo", "endvo"}},
         {"measure", {"label", "type", "left", "right", "metcon", "n"}},
-        {"mNum", {"label", "type", "xml:lang", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
-        {"mRest", {"label", "type", "cue", "dur", "layer", "staff", "cutout", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
-        {"mRpt", {"label", "type", "layer", "staff", "num", "expand", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "num.place", "num.visible", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight"}},
-        {"multiRest", {"label", "type", "layer", "staff", "num", "block", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "num.place", "num.visible", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "width"}},
-        {"multiRpt", {"label", "type", "layer", "staff", "num", "expand", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight"}},
-        {"octave", {"label", "type", "coll", "layer", "plist", "staff", "tstamp", "dur", "dis", "dis.place", "endid", "startid", "tstamp2", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lsegs", "lwidth", "ho", "vo", "startho", "endho"}},
-        {"pedal", {"label", "type", "dir", "func", "layer", "plist", "staff", "tstamp", "endid", "startid", "tstamp2", "form", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lsegs", "lwidth", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
-        {"reh", {"label", "type", "xml:lang", "staff", "startid", "tstamp", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
-        {"repeatMark", {"label", "type", "xml:lang", "func", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lsegs", "lwidth", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "place", "ho", "vo", "startho", "endho"}},
-        {"slur", {"label", "type", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "ho", "vo", "startho", "endho", "startvo", "endvo", "curvedir"}},
-        {"tie", {"label", "type", "layer", "plist", "staff", "tstamp", "endid", "startid", "tstamp2", "ho", "vo", "startho", "endho", "startvo", "endvo", "curvedir"}},
-        {"tuplet", {"label", "type", "dur", "num", "numbase", "layer", "staff", "endid", "startid", "bracket.place", "bracket.visible", "dur.visible", "num.format", "num.place", "num.visible"}},
-        {"mordent", {"label", "type", "form", "long", "layer", "plist", "staff", "tstamp", "endid", "startid", "accidupper", "accidlower", "accidupper.ges", "accidlower.ges", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
-        {"trill", {"label", "type", "layer", "plist", "staff", "tstamp", "dur", "accidupper", "accidlower", "accidupper.ges", "accidlower.ges", "endid", "startid", "tstamp2", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lsegs", "lwidth", "place", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo", "startho", "endho"}},
-        {"turn", {"label", "type", "delayed", "form", "layer", "plist", "staff", "tstamp", "accidupper", "accidlower", "accidupper.ges", "accidlower.ges", "startid", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
-        {"fing", {"label", "type", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lsegs", "lwidth", "place", "ho", "vo"}},
+        {"mNum", {"label", "type", "xml:lang", "color", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
+        {"mRest", {"label", "type", "cue", "dur", "layer", "staff", "color", "cutout", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
+        {"mRpt", {"label", "type", "layer", "staff", "num", "color", "expand", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "num.place", "num.visible", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight"}},
+        {"multiRest", {"label", "type", "layer", "staff", "num", "block", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "num.place", "num.visible", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "width"}},
+        {"multiRpt", {"label", "type", "layer", "staff", "num", "color", "expand", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight"}},
+        {"octave", {"label", "type", "coll", "layer", "plist", "staff", "tstamp", "dur", "dis", "dis.place", "endid", "startid", "tstamp2", "color", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lwidth", "lsegs", "ho", "vo", "startho", "endho"}},
+        {"pedal", {"label", "type", "dir", "func", "layer", "plist", "staff", "tstamp", "endid", "startid", "tstamp2", "form", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lwidth", "lsegs", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
+        {"reh", {"label", "type", "xml:lang", "staff", "startid", "tstamp", "color", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
+        {"repeatMark", {"label", "type", "xml:lang", "func", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lwidth", "lsegs", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "place", "ho", "vo", "startho", "endho"}},
+        {"slur", {"label", "type", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "color", "curvedir", "lform", "lwidth", "lsegs", "ho", "vo", "startho", "endho", "startvo", "endvo"}},
+        {"tie", {"label", "type", "layer", "plist", "staff", "tstamp", "endid", "startid", "tstamp2", "color", "curvedir", "lform", "lwidth", "lsegs", "ho", "vo", "startho", "endho", "startvo", "endvo"}},
+        {"tuplet", {"label", "type", "dur", "num", "numbase", "layer", "staff", "endid", "startid", "bracket.place", "bracket.visible", "dur.visible", "num.format", "color", "num.place", "num.visible"}},
+        {"mordent", {"label", "type", "form", "long", "layer", "plist", "staff", "tstamp", "endid", "startid", "accidupper", "accidlower", "accidupper.ges", "accidlower.ges", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
+        {"trill", {"label", "type", "layer", "plist", "staff", "tstamp", "dur", "accidupper", "accidlower", "accidupper.ges", "accidlower.ges", "endid", "startid", "tstamp2", "color", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lwidth", "lsegs", "place", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo", "startho", "endho"}},
+        {"turn", {"label", "type", "delayed", "form", "layer", "plist", "staff", "tstamp", "accidupper", "accidlower", "accidupper.ges", "accidlower.ges", "startid", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
+        {"fing", {"label", "type", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lwidth", "lsegs", "place", "ho", "vo"}},
         {"fingGrp", {"label", "type", "form", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2"}},
         {"chordDef", {"label", "type", "tab.pos", "tab.strings"}},
         {"chordMember", {"label", "type", "accid.ges", "pname", "oct", "tab.fing", "tab.fret", "tab.string"}},
         {"chordTable", {"label", "type"}},
-        {"f", {"label", "type", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lsegs", "lwidth", "place", "ho", "vo"}},
+        {"f", {"label", "type", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lwidth", "lsegs", "place", "ho", "vo"}},
         {"fb", {"label", "type"}},
-        {"harm", {"label", "type", "chordref", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2"}},
+        {"harm", {"label", "type", "chordref", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "rendgrid", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lwidth", "lsegs", "place", "ho", "vo", "startho", "endho"}},
         {"availability", {"label", "type", "data"}},
         {"fileDesc", {"label", "type", "corresp"}},
         {"meiHead", {"label", "xml:lang", "type"}},
         {"pubStmt", {"label", "type"}},
         {"titleStmt", {"label", "type"}},
-        {"refrain", {"label", "type", "xml:lang", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "vo", "voltasym"}},
-        {"verse", {"label", "type", "xml:lang", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "vo", "voltasym"}},
-        {"volta", {"label", "type", "xml:lang", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "vo"}},
+        {"refrain", {"label", "type", "xml:lang", "color", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "vo", "voltasym"}},
+        {"verse", {"label", "type", "color", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "vo", "voltasym", "n"}},
+        {"volta", {"label", "type", "xml:lang", "color", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "vo"}},
         {"instrDef", {"label", "n", "type", "midi.channel", "midi.duty", "midi.port", "midi.track", "midi.instrnum", "midi.instrname", "midi.pan", "midi.patchname", "midi.patchnum", "midi.volume", "azimuth", "elevation"}},
         {"persName", {"label", "type", "xml:lang", "nymref", "role", "enddate", "isodate", "notafter", "notbefore", "startdate"}},
-        {"accid", {"label", "type", "func", "accid", "layer", "plist", "staff", "tstamp", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "ho", "vo", "accid.ges"}},
+        {"accid", {"label", "type", "func", "accid", "layer", "plist", "staff", "tstamp", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "ho", "vo", "accid.ges"}},
         {"arranger", {"label", "type", "xml:lang"}},
-        {"artic", {"label", "type", "artic", "layer", "plist", "staff", "tstamp", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "place", "ho", "vo"}},
+        {"artic", {"label", "type", "artic", "layer", "plist", "staff", "tstamp", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "place", "ho", "vo"}},
         {"body", {"label", "type"}},
-        {"caesura", {"label", "type", "layer", "staff", "startid", "tstamp", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "ho", "vo"}},
-        {"chord", {"label", "type", "dots", "grace", "grace.time", "cue", "dur", "layer", "staff", "cluster", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "stem.dir", "stem.len", "stem.mod", "ho", "breaksec", "instr", "stem.dir", "stem.len", "stem.mod"}},
-        {"clef", {"label", "type", "layer", "staff", "cautionary", "shape", "line", "oct", "dis", "dis.place", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
+        {"caesura", {"label", "type", "layer", "staff", "startid", "tstamp", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "ho", "vo"}},
+        {"chord", {"label", "type", "dots", "grace", "grace.time", "cue", "dur", "layer", "staff", "cluster", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "stem.dir", "stem.len", "stem.mod", "ho", "breaksec", "instr"}},
+        {"clef", {"label", "type", "layer", "staff", "cautionary", "shape", "line", "oct", "dis", "dis.place", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo"}},
         {"clefGrp", {"label", "type", "layer", "staff"}},
         {"composer", {"label", "type", "xml:lang"}},
         {"date", {"label", "type", "calendar", "enddate", "isodate", "notafter", "notbefore", "startdate", "xml:lang"}},
-        {"dir", {"label", "type", "xml:lang", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lsegs", "lwidth", "place", "ho", "vo", "startho", "endho"}},
-        {"dynam", {"label", "type", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lsegs", "lwidth", "place", "ho", "vo", "startho", "endho", "xml:lang"}},
-        {"ending", {"label", "type", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lsegs", "lwidth"}},
+        {"dir", {"label", "type", "xml:lang", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lwidth", "lsegs", "place", "ho", "vo", "startho", "endho"}},
+        {"dynam", {"label", "type", "layer", "plist", "staff", "tstamp", "dur", "endid", "startid", "tstamp2", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lwidth", "lsegs", "place", "ho", "vo", "startho", "endho", "xml:lang"}},
+        {"ending", {"label", "type", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lwidth", "lsegs"}},
         {"label", {"label", "type", "xml:lang"}},
         {"labelAbbr", {"label", "type", "xml:lang"}},
         {"layer", {"label", "n", "type"}},
@@ -80,15 +80,15 @@ class MEIBasic {
         {"mdiv", {"label", "type", "attacca", "n"}},
         {"mei", {"meiversion"}},
         {"music", {"label", "type"}},
-        {"note", {"label", "type", "dots", "cue", "dur", "layer", "staff", "grace", "grace.time", "pname", "oct", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "stem.dir", "stem.len", "stem.mod", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "breaksec", "oct.ges", "pname.ges", "instr", "vel", "tab.fing", "tab.fret", "tab.string"}},
-        {"ornam", {"label", "type", "layer", "plist", "staff", "tstamp", "dur", "accidupper", "accidlower", "accidupper.ges", "accidlower.ges", "endid", "startid", "tstamp2", "place", "ho", "vo", "startho", "endho"}},
+        {"note", {"label", "type", "dots", "cue", "dur", "layer", "staff", "grace", "grace.time", "pname", "oct", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "stem.dir", "stem.len", "stem.mod", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "breaksec", "oct.ges", "pname.ges", "instr", "vel", "tab.fing", "tab.fret", "tab.string"}},
+        {"ornam", {"label", "type", "layer", "plist", "staff", "tstamp", "dur", "accidupper", "accidlower", "accidupper.ges", "accidlower.ges", "endid", "startid", "tstamp2", "color", "place", "ho", "vo", "startho", "endho"}},
         {"pb", {"label", "type", "folium"}},
-        {"pgFoot", {"label", "type", "xml:lang", "halign", "func"}},
-        {"pgHead", {"label", "type", "xml:lang", "halign", "func"}},
+        {"pgFoot", {"label", "type", "func", "halign", "xml:lang"}},
+        {"pgHead", {"label", "type", "func", "halign", "xml:lang"}},
         {"pubPlace", {"label", "type", "xml:lang"}},
-        {"rend", {"label", "type", "glyph.auth", "glyph.uri", "halign", "xml:lang", "altrend", "rend", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "valign", "xml:space", "rotation"}},
+        {"rend", {"color", "label", "type", "glyph.auth", "glyph.uri", "halign", "xml:lang", "altrend", "rend", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "valign", "xml:space", "rotation"}},
         {"respStmt", {"label", "type"}},
-        {"rest", {"label", "type", "dots", "cue", "dur", "layer", "staff", "breaksec", "ho", "vo", "instr"}},
+        {"rest", {"label", "type", "dots", "cue", "dur", "layer", "staff", "color", "breaksec", "ho", "vo", "instr"}},
         {"sb", {"label", "type", "form", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight"}},
         {"score", {"label", "type"}},
         {"scoreDef", {"label", "type", "keysig", "meter.count", "meter.unit", "meter.sym"}},
@@ -98,8 +98,8 @@ class MEIBasic {
         {"staffDef", {"label", "n", "type", "lines", "clef.shape", "clef.line", "clef.dis", "clef.dis.place", "keysig", "meter.count", "meter.unit", "meter.sym", "trans.diat", "trans.semi", "instr", "tab.strings", "ppq", "tune.Hz", "tune.pname", "tune.temper"}},
         {"staffGrp", {"label", "type", "bar.thru", "symbol", "instr"}},
         {"syl", {"label", "type", "xml:lang", "con", "wordpos", "place", "fontfam", "fontname", "fontsize", "fontstyle", "fontweight", "letterspacing", "lineheight", "ho", "vo", "halign"}},
-        {"symbol", {"label", "type", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "scale", "ho", "vo"}},
-        {"tempo", {"label", "type", "xml:lang", "func", "layer", "plist", "staff", "tstamp", "mm", "mm.unit", "mm.dots", "endid", "startid", "tstamp2", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lsegs", "lwidth", "place", "ho", "vo", "startho", "endho", "midi.bpm", "midi.mspb"}},
+        {"symbol", {"label", "type", "color", "glyph.auth", "glyph.uri", "glyph.name", "glyph.num", "scale", "ho", "vo"}},
+        {"tempo", {"label", "type", "xml:lang", "func", "layer", "plist", "staff", "tstamp", "mm", "mm.unit", "mm.dots", "endid", "startid", "tstamp2", "extender", "lendsym", "lendsym.size", "lstartsym", "lstartsym.size", "lform", "lwidth", "lsegs", "place", "ho", "vo", "startho", "endho", "midi.bpm", "midi.mspb"}},
         {"title", {"label", "xml:lang", "n", "level", "type"}},
         {"barre", {"label", "type", "endid", "startid", "fret"}},
     };
diff --git a/libmei/mei/develop/mei-all_compiled.odd b/libmei/mei/mei-all_compiled.odd
similarity index 93%
rename from libmei/mei/develop/mei-all_compiled.odd
rename to libmei/mei/mei-all_compiled.odd
index 8be4d4eb9c5..9e03cdf81a3 100644
--- a/libmei/mei/develop/mei-all_compiled.odd
+++ b/libmei/mei/mei-all_compiled.odd
@@ -1,16 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?><TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xml:base="file:/home/runner/work/music-encoding/music-encoding/customizations/mei-all.xml"><?TEIVERSION Version 4.0.0?>
+<?xml version="1.0" encoding="utf-8"?><TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xml:base="file:/Users/rettinghaus/git/music-encoding/customizations/mei-all.xml"><?TEIVERSION Version 5.0?>
   <teiHeader>
     <fileDesc>
       <titleStmt>
-        <title>Music Encoding Initiative Guidelines: <title type="sub">All
-          Customization</title></title>
+        <title>Music Encoding Initiative Guidelines: <title type="sub">All Customization</title></title>
         <respStmt>
           <resp>Authored by</resp>
           <name xml:id="PR">Perry Roland</name>
         </respStmt>
       </titleStmt>
       <publicationStmt>
-        <p/>
+        <publisher>Music Encoding Initiative (MEI) Board</publisher>
+        <availability>
+          <licence target="https://opensource.org/license/ECL-2.0/">Licensed under the Educational Community License version 2.0</licence>
+        </availability>
       </publicationStmt>
       <sourceDesc>
         <p/>
@@ -29,7 +31,7 @@
     <body>
 
       <!-- Limit the set of possible start elements -->
-      <schemaSpec ident="mei" ns="http://www.music-encoding.org/ns/mei" prefix="mei_" start="mei meiHead meiCorpus music" source="/home/runner/work/music-encoding/music-encoding/dist/schemata/dev/mei-source_canonicalized.xml"><macroSpec rend="add" ident="data.ACCIDENTAL.WRITTEN" module="MEI" type="dt">
+      <schemaSpec ident="mei" ns="http://www.music-encoding.org/ns/mei" prefix="mei_" start="mei meiHead meiCorpus music" source="/Users/rettinghaus/git/music-encoding/build/mei-source_canonicalized.xml"><macroSpec rend="add" ident="data.ACCIDENTAL.WRITTEN" module="MEI" type="dt">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Written accidental values.</desc>
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <alternate minOccurs="1" maxOccurs="1"><macroRef key="data.ACCIDENTAL.WRITTEN.basic"/><macroRef key="data.ACCIDENTAL.WRITTEN.extended"/><macroRef key="data.ACCIDENTAL.aeu"/><macroRef key="data.ACCIDENTAL.persian"/></alternate>
@@ -104,6 +106,18 @@
         <valItem ident="nd">
           <desc xml:lang="en">Natural note lowered by quarter tone (natural modified by arrow).</desc>
         </valItem>
+        <valItem ident="xu">
+          <desc xml:lang="en">Double sharp note raised by quarter tone (double sharp modified by arrow).</desc>
+        </valItem>
+        <valItem ident="xd">
+          <desc xml:lang="en">Double sharp note lowered by quarter tone (double sharp modified by arrow).</desc>
+        </valItem>
+        <valItem ident="ffu">
+          <desc xml:lang="en">Double flat note raised by quarter tone (double flat modified by arrow).</desc>
+        </valItem>
+        <valItem ident="ffd">
+          <desc xml:lang="en">Double flat note lowered by quarter tone (double flat modified by arrow).</desc>
+        </valItem>
         
         <valItem ident="1qf">
           <desc xml:lang="en">1/4-tone flat accidental.</desc>
@@ -214,6 +228,12 @@
         <valItem ident="fd">
           <desc xml:lang="en">Three quarter-tones flat.</desc>
         </valItem>
+        <valItem ident="xu">
+          <desc xml:lang="en">Five quarter-tones sharp.</desc>
+        </valItem>
+        <valItem ident="ffd">
+          <desc xml:lang="en">Five quarter-tones flat.</desc>
+        </valItem>
       </valList>
     </content>
   </macroSpec><macroSpec rend="add" ident="data.ARTICULATION" module="MEI" type="dt">
@@ -249,6 +269,12 @@
         <valItem ident="spicc">
           <desc xml:lang="en">Spiccato.</desc>
         </valItem>
+        <valItem ident="stress">
+          <desc xml:lang="en">Stress (Unicode 00B4).</desc>
+        </valItem>
+        <valItem ident="unstress">
+          <desc xml:lang="en">Unstress (Unicode 02D8).</desc>
+        </valItem>
         <valItem ident="doit">
           <desc xml:lang="en">Main note followed by short slide to higher, indeterminate pitch (Unicode
             1D185).</desc>
@@ -337,7 +363,7 @@
         </valItem>
       </valList>
     </content>
-    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="warn_deprecated" scheme="isoschematron">
+    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="warn_deprecated" scheme="schematron">
       <constraint>
         <sch:rule context="@artic">
           <sch:assert role="warning" test="not(contains(., 'marc-stacc')) and not(contains(., 'ten-stacc'))">"<sch:value-of select="."/>" contains a deprecated value.</sch:assert>
@@ -382,7 +408,7 @@
           <desc xml:lang="en">Dotted line (SMuFL E037).</desc>
         </valItem>
         <valItem ident="dbl">
-          <desc xml:lang="en">Double barline (SMuFL E031 and Unicode 1D101).</desc>
+          <desc xml:lang="en">Double bar line (SMuFL E031 and Unicode 1D101).</desc>
         </valItem>
         <valItem ident="dbldashed">
           <desc xml:lang="en">Double dashed line.</desc>
@@ -391,16 +417,16 @@
           <desc xml:lang="en">Double dotted line.</desc>
         </valItem>
         <valItem ident="dblheavy">
-          <desc xml:lang="en">Heavy double barline (SMuFL E035).</desc>
+          <desc xml:lang="en">Heavy double bar line (SMuFL E035).</desc>
         </valItem> 
         <valItem ident="dblsegno">
           <desc xml:lang="en">Segno serpent with vertical lines (SMuFL E04B).</desc>
         </valItem> 
         <valItem ident="end">
-          <desc xml:lang="en">End barline (SMuFL E032 and Unicode 1D102).</desc>
+          <desc xml:lang="en">End bar line (SMuFL E032 and Unicode 1D102).</desc>
         </valItem>
         <valItem ident="heavy">
-          <desc xml:lang="en">Heavy barline (SMuFL E034).</desc>
+          <desc xml:lang="en">Heavy bar line (SMuFL E034).</desc>
         </valItem> 
         <valItem ident="invis">
           <desc xml:lang="en">Bar line not rendered.</desc>
@@ -418,7 +444,7 @@
           <desc xml:lang="en">Segno serpent.</desc>
         </valItem>
         <valItem ident="single">
-          <desc xml:lang="en">Single barline (SMuFL E030 and Unicode 1D100).</desc>
+          <desc xml:lang="en">Single bar line (SMuFL E030 and Unicode 1D100).</desc>
         </valItem>
       </valList>
     </content>
@@ -487,6 +513,24 @@
         </valItem>
       </valList>
     </content>
+  </macroSpec><macroSpec rend="add" ident="data.CANCELACCID" module="MEI" type="dt">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Indicates where cancellation accidentals are shown in a key signature.</desc>
+    <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <valList type="closed">
+        <valItem ident="none">
+          <desc xml:lang="en">Do not show cancellation accidentals.</desc>
+        </valItem>
+        <valItem ident="before">
+          <desc xml:lang="en">Show cancellation accidentals before the new key accidentals.</desc>
+        </valItem>
+        <valItem ident="after">
+          <desc xml:lang="en">Show cancellation accidentals after the new key accidentals ("Old style" or "French")</desc>
+        </valItem>
+        <valItem ident="before-bar">
+          <desc xml:lang="en">Show cancellation accidentals before the barline (also known as "Russian").</desc>
+        </valItem>
+      </valList>
+    </content>
   </macroSpec><macroSpec rend="add" ident="data.CERTAINTY" module="MEI" type="dt">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Values for certainty attribute. Certainty may be expressed by one of the predefined symbolic values <val>high</val>, 
       <val>medium</val>, or <val>low</val>. The value <val>unknown</val> should be used in cases where the encoder 
@@ -522,7 +566,7 @@
           <desc xml:lang="en">G clef (Unicode 1D11E).</desc>
         </valItem>
         <valItem ident="GG">
-          <desc xml:lang="en">Double G clef.</desc>
+          <desc xml:lang="en">Double G clef. Sounds one octave lower than G clef. (See remarks on usage below.)</desc>
         </valItem>
         <valItem ident="F">
           <desc xml:lang="en">F clef (Unicode 1D122).</desc>
@@ -538,6 +582,14 @@
         </valItem>
       </valList>
     </content>
+    <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>Double-G clefs sound one octave lower, so do not combine with <att>dis</att>/
+        <att>dis.place</att>/<att>clef.dis</att>/<att>clef.dis.place</att>. In some cases
+        the double G clef may be used to indicate that two voices share one staff and 
+        does not sound one octave lower. In this case the <att>oct</att> attribute may be 
+        used to clarify the sounding octave of the instruments for the clef.
+      </p>
+    </remarks>
   </macroSpec><macroSpec rend="add" ident="data.CLUSTER" module="MEI" type="dt">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Tone-cluster rendition.</desc>
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -1126,7 +1178,7 @@
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><ref name="data.DURATION.cmn"/><ref name="data.DURATIONRESTS.mensural"/></choice>
     </content>
-  </macroSpec><macroSpec rend="add" ident="data.DURATION.gestural" module="MEI" type="dt">
+  </macroSpec><macroSpec rend="add" ident="data.DURATION.GESTURAL" module="MEI" type="dt">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Performed duration attribute values.</desc>
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><ref name="data.DURATION.cmn"/><ref name="data.DURATION.mensural"/></choice>
@@ -1677,12 +1729,12 @@
     </content>
   </macroSpec><macroSpec rend="add" ident="data.MEASUREBEAT" module="MEI" type="dt">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A count of measures plus a beat location, <abbr>i.e.</abbr>, [0-9]+m *\+ *[0-9]+(\.?[0-9]*)?. The
-      measure count is the number of barlines crossed by the event, while the beat location is a
+      measure count is the number of bar lines crossed by the event, while the beat location is a
       timestamp expressed as a beat with an optional fractional part. For example, "1m+3.5"
       indicates a point in the next measure on the second half of beat 3. The measure number must be
       in the range of 0 to the number of remaining measures, while the beat number must be in the
       range from 0 to the numerator of the time signature plus 1. For example, in 6/8 the beat
-      number must be within the range from 0 (the left barline) to 7 (the right barline). A value
+      number must be within the range from 0 (the left bar line) to 7 (the right bar line). A value
       with a measure number of "0", such as "0m+2", indicates a point within the current
       measure.</desc>
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -1692,14 +1744,14 @@
     </content>
   </macroSpec><macroSpec rend="add" ident="data.MEASUREBEATOFFSET" module="MEI" type="dt">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A count of measures plus a beat location, <abbr>i.e.</abbr>, (\+|-)?[0-9]+m\+[0-9]+(\.?[0-9]*)?. The
-      measure count is the number of barlines crossed by the event, while the beat location is a
+      measure count is the number of bar lines crossed by the event, while the beat location is a
       timestamp expressed as a beat with an optional fractional part. The measure number must be in
       the range of preceding measures to the number of remaining measures. A value with a positive
       measure number, such as "1m+3", indicates a point in the following measure, while a value with
       a negative measure number, such as "-1m+3", marks a point in the preceding measure. The beat
       number must be in the range from 0 to the numerator of the time signature plus 1. For example,
-      in 6/8 the beat number must be within the range from 0 (the left barline) to 7 (the right
-      barline). A value with a measure number of "0", such as "0m+2", indicates a point within the
+      in 6/8 the beat number must be within the range from 0 (the left bar line) to 7 (the right
+      bar line). A value with a measure number of "0", such as "0m+2", indicates a point within the
       current measure.</desc>
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:data type="token">
@@ -1910,8 +1962,8 @@
         <valItem ident="norm">
           <desc xml:lang="en">Meter signature rendered using traditional numeric values.</desc>
         </valItem>
-        <valItem ident="invis">
-          <desc xml:lang="en">Meter signature not rendered.</desc>
+        <valItem ident="sym+norm">
+          <desc xml:lang="en">Meter signature rendered using both the symbol and the traditional numeric values.</desc>
         </valItem>
       </valList>
     </content>
@@ -2761,7 +2813,7 @@
         <valItem ident="circle">
           <desc xml:lang="en">Enclosing circle.</desc>
         </valItem>
-        <valItem ident="dblwhole">
+        <valItem ident="fences">
           <desc xml:lang="en">Enclosing "fences".</desc>
         </valItem>
       </valList>
@@ -2776,8 +2828,7 @@
         </rng:data></choice>
     </content>
   </macroSpec><macroSpec rend="add" ident="data.OCTAVE" module="MEI" type="dt">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Oct attribute values. The default values conform to Acoustical Society of America
-      representation. Read, p. 44.</desc>
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Octave number. The default values conform to the Scientific Pitch Notation (SPN).</desc>
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:data type="nonNegativeInteger">
         <rng:param name="maxInclusive">9</rng:param>
@@ -2842,26 +2893,50 @@
       </valList>
     </content>
 </macroSpec><macroSpec rend="add" ident="data.PERCENT" module="MEI" type="dt">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Positive decimal number plus '%', <abbr>i.e.</abbr>, [0-9]+(\.?[0-9]*)?\%.</desc>
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Positive decimal number plus '%', <abbr>i.e.</abbr>, [0-9]+(\.[0-9]*)?%.</desc>
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:data type="token">
-        <rng:param name="pattern">[0-9]+(\.?[0-9]*)?%</rng:param>
+        <rng:param name="pattern">[0-9]+(\.[0-9]*)?%</rng:param>
       </rng:data>
     </content>
   </macroSpec><macroSpec rend="add" ident="data.PERCENT.LIMITED" module="MEI" type="dt">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Positive decimal number between 0 and 100, followed by a percent sign "%".</desc>
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Decimal number between 0 and 100, followed by a percent sign "%".</desc>
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:data type="token">
-        <rng:param name="pattern">(([0-9]|[1-9][0-9])(\.[0-9]+)?|100(\.0+)?)%</rng:param>
+        <rng:param name="pattern">(([0-9]|[1-9][0-9])(\.[0-9]*)?|100(\.0*)?)%</rng:param>
       </rng:data>
     </content>
   </macroSpec><macroSpec rend="add" ident="data.PERCENT.LIMITED.SIGNED" module="MEI" type="dt">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Positive decimal number between -100 and 100, followed by a percent sign "%".</desc>
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Decimal number between -100 and 100, followed by a percent sign "%".</desc>
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:data type="token">
-        <rng:param name="pattern">(\+|-)?(([0-9]|[1-9][0-9])(\.[0-9]+)?|100(\.0+)?)%</rng:param>
+        <rng:param name="pattern">(\+|-)?(([0-9]|[1-9][0-9])(\.[0-9]*)?|100(\.0*)?)%</rng:param>
       </rng:data>
     </content>
+  </macroSpec><macroSpec rend="add" ident="data.PGFUNC" module="MEI" type="dt">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Page header and footer function; a value that defines the function (i.e., the placement) of the header or the footer.</desc>
+    <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <valList type="closed">
+        <valItem ident="all">
+          <desc xml:lang="en">Header or footer for all pages, including the first and the last page, unless a page header or footer for the first or the last page is provided.</desc>
+        </valItem>
+        <valItem ident="first">
+          <desc xml:lang="en">Header or footer for the first page only.</desc>
+        </valItem>
+        <valItem ident="last">
+          <desc xml:lang="en">Header or footer for the last page only.</desc>
+        </valItem>
+        <valItem ident="alt1">
+          <desc xml:lang="en">The first of an alternating pattern of headers or footers.</desc>
+        </valItem>
+        <valItem ident="alt2">
+          <desc xml:lang="en">The second of an alternating pattern of headers or footers.</desc>
+        </valItem>
+      </valList>
+    </content>
+    <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>An alternating pattern with "alt1" and "alt2" starts from the first page. However, if header or footer with a func="first" is also defined, it will shift the pattern by one page. A header or footer with func="last" will interupt the pattern.</p>
+    </remarks>
   </macroSpec><macroSpec rend="add" ident="data.PGSCALE" module="MEI" type="dt">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Page scale factor; a percentage of the values in page.height and page.width.</desc>
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -2882,7 +2957,7 @@
         <rng:param name="pattern">[a-g]</rng:param>
       </rng:data>
     </content>
-  </macroSpec><macroSpec rend="add" ident="data.PITCHNAME.GES" module="MEI" type="dt">
+  </macroSpec><macroSpec rend="add" ident="data.PITCHNAME.GESTURAL" module="MEI" type="dt">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural pitch names need an additional value for when the notated pitch is not to be
       sounded.</desc>
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -2900,7 +2975,7 @@
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><ref name="data.STAFFREL"/><ref name="data.NONSTAFFPLACE"/><ref name="data.NMTOKEN"/></choice>
     </content>
-    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="constrain_place" scheme="isoschematron">
+    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="constrain_place" scheme="schematron">
       <constraint>
         <sch:rule context="@place">
           <sch:assert test="not((some $token in tokenize(normalize-space(.),' ') satisfies             $token =('below','above','between','within')) and count(tokenize(normalize-space(.),' ')) gt 1)">Other values not permitted when 'above', 'below', 'between' or 'within' is
@@ -3027,7 +3102,7 @@
       </valList>
     </content>
   </macroSpec><macroSpec rend="add" ident="data.STAFFLOC" module="MEI" type="dt">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Staff location. The value '0' indicates the bottom line of the current staff; positive
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Staff location. The value <val>0</val> indicates the bottom line of the current staff; positive
       values are used for positions above the bottom line and negative values for the positions
       below. For example, in treble clef, 1 = F4, 2 = G4, 3 = A4, etc. and -1 = D4, -2 = C4, and so
       on.</desc>
@@ -3039,7 +3114,7 @@
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><ref name="data.STAFFREL.basic"/><ref name="data.STAFFREL.extended"/></choice>
     </content>
-    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="between_requires_adjacent_staves" scheme="isoschematron">
+    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="between_requires_adjacent_staves" scheme="schematron">
       <constraint>
         <sch:rule context="mei:*[@place eq 'between']">
           <sch:assert test="count(tokenize(normalize-space(string(@staff)), '\s+')) = 2">The @staff
@@ -3377,7 +3452,7 @@
         <datatype>
           <rng:data type="NMTOKEN"/>
         </datatype>
-        <constraintSpec ident="When_notationsubtype" scheme="isoschematron">
+        <constraintSpec ident="When_notationsubtype" scheme="schematron">
           <constraint>
             <sch:rule context="mei:*[@notationsubtype]">
               <sch:assert test="@notationtype">An element with a notationsubtype attribute must have
@@ -3389,8 +3464,15 @@
     </attList>
   </classSpec><classSpec rend="add" ident="att.accid.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.ambitus.anl" module="MEI.analytical" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.intervalHarmonic"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.ambNote.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.anchoredText.anl" module="MEI.analytical" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.annot.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.arpeg.anl" module="MEI.analytical" type="atts">
@@ -3490,10 +3572,13 @@
         </valList>
       </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.graceGrp.anl" module="MEI.analytical" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.harmonicFunction" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes describing the harmonic function of a single pitch.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="deg" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">degree</gloss>
         <desc xml:lang="en">Captures scale degree information using <ref target="https://www.humdrum.org/rep/deg/">Humdrum **deg syntax</ref> -- an optional indicator
           of melodic approach (^ = ascending approach, v = descending approach), a scale degree
           value (1 = tonic ... 7 = leading tone), and an optional indication of chromatic
@@ -3514,6 +3599,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe harmonic intervals.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="inth" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">interval harmonic</gloss>
         <desc xml:lang="en">Encodes the harmonic interval between pitches occurring at the same time.</desc>
         <datatype maxOccurs="unbounded">
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.INTERVAL.HARMONIC"/>
@@ -3524,6 +3610,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that provide for description of intervallic content.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="intm" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">interval melodic</gloss>
         <desc xml:lang="en">Encodes the melodic interval from the previous pitch. The value may be a general
           directional indication (u, d, s, etc.), an indication of diatonic interval direction,
           quality, and size, or a precise numeric value in half steps.</desc>
@@ -3538,16 +3625,9 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.accidental"/>
+      <memberOf key="att.keyMode"/>
       <memberOf key="att.pitch"/>
     </classes>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="mode" usage="opt">
-        <desc xml:lang="en">Indicates major, minor, or other tonality.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MODE"/>
-        </datatype>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.keySigDefault.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Used by staffDef and scoreDef to provide default values for attributes in the analytical
       domain that are related to key signatures.</desc>
@@ -3584,6 +3664,8 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.lv.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.lyrics.anl" module="MEI.analytical" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.measure.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -3601,12 +3683,16 @@
     </attList>
   </classSpec><classSpec rend="add" ident="att.mensur.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.metaMark.anl" module="MEI.analytical" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.meterSig.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.meterSigGrp.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.midi.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.mNum.anl" module="MEI.analytical" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.mordent.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.mRest.anl" module="MEI.analytical" type="atts">
@@ -3634,6 +3720,7 @@
       <memberOf key="att.harmonicFunction"/>
       <memberOf key="att.intervalMelodic"/>
       <memberOf key="att.melodicFunction"/>
+      <memberOf key="att.neumeType"/>
       <memberOf key="att.pitchClass"/>
       <memberOf key="att.solfa"/>
     </classes>
@@ -3641,6 +3728,9 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.neume.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.neumeType"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.note.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -3682,12 +3772,15 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe pitch class.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="pclass" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">pitch class</gloss>
         <desc xml:lang="en">Holds pitch class information.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PITCHCLASS"/>
         </datatype>
       </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.plica.anl" module="MEI.analytical" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes that describe the properties of a plica in the mensural repertoire.</desc>
   </classSpec><classSpec rend="add" ident="att.proport.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.quilisma.anl" module="MEI.analytical" type="atts">
@@ -3698,6 +3791,8 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.reh.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.repeatMark.anl" module="MEI.analytical" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.rest.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -3725,6 +3820,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that specify pitch using sol-fa.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="psolfa" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">pitch sol-fa</gloss>
         <desc xml:lang="en">Contains sol-fa designation, <abbr>e.g.</abbr>, do, re, mi, etc., in either a fixed or movable Do
           system.</desc>
         <datatype>
@@ -3750,6 +3846,8 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.stageDir.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.stem.anl" module="MEI.analytical" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes that describe the properties of a stem in the mensural repertoire.</desc>
   </classSpec><classSpec rend="add" ident="att.strophicus.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.syl.anl" module="MEI.analytical" type="atts">
@@ -4007,7 +4105,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BEAMPLACE"/>
         </datatype>
-        <constraintSpec ident="check_beam_place" scheme="isoschematron">
+        <constraintSpec ident="check_beam_place" scheme="schematron">
           <constraint>
             <sch:rule context="mei:beam[@place eq 'mixed' and not(descendant::mei:*[local-name() eq 'note' or local-name() eq 'chord'][@staff != ./@staff] or descendant::mei:*[local-name() eq 'note' or local-name() eq 'chord'][@staff != ancestor::mei:staff/@n])]">
               <sch:assert test="count(descendant::mei:*[local-name() eq 'note' or local-name() eq 'chord'][@stem.dir]) = count(descendant::mei:*[local-name() eq 'note' or local-name() eq 'chord'])">Stem direction must be specified for all notes and chords under the
@@ -4052,7 +4150,7 @@
       <memberOf key="att.beamedWith"/>
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.beatRpt.log" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
@@ -4076,7 +4174,7 @@
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.bracketSpan.log" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
@@ -4084,10 +4182,11 @@
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="func" usage="req">
+        <gloss versionDate="2022-10-18" xml:lang="en">function</gloss>
         <desc xml:lang="en">Describes the function of the bracketed event sequence.</desc>
         <datatype>
           <rng:data type="NMTOKENS"/>
@@ -4113,29 +4212,17 @@
       <memberOf key="att.partIdent"/>
       <memberOf key="att.staffIdent"/>
       <memberOf key="att.startId"/>
-      <memberOf key="att.timestamp.logical"/>
+      <memberOf key="att.timestamp.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.bTrem.log" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.event"/>
       <memberOf key="att.augmentDots"/>
-      <memberOf key="att.duration.logical"/>
+      <memberOf key="att.duration.log"/>
       <memberOf key="att.numbered"/>
+      <memberOf key="att.tremForm"/>
     </classes>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="form" usage="opt">
-        <desc xml:lang="en">Indicates whether the tremolo is measured or unmeasured.</desc>
-        <valList type="closed">
-          <valItem ident="meas">
-            <desc xml:lang="en">Measured tremolo.</desc>
-          </valItem>
-          <valItem ident="unmeas">
-            <desc xml:lang="en">Unmeasured tremolo.</desc>
-          </valItem>
-        </valList>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.chord.anl.cmn" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes in the CMN repertoire.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -4175,21 +4262,8 @@
         </valList>
       </attDef>
     </attList>
-  </classSpec><classSpec rend="add" ident="att.mNum.anl" module="MEI.cmn" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
-  </classSpec><classSpec rend="add" ident="att.mNum.ges" module="MEI.cmn" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.mNum.log" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
-  </classSpec><classSpec rend="add" ident="att.mNum.vis" module="MEI.cmn" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
-    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.color"/>
-      <memberOf key="att.placementRelStaff"/>
-      <memberOf key="att.typography"/>
-      <memberOf key="att.visualOffset"/>
-      <memberOf key="att.xy"/>
-    </classes>
   </classSpec><classSpec rend="add" ident="att.expandable" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that indicate whether to render a repeat symbol or the source material to which
       it refers.</desc>
@@ -4214,25 +4288,14 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.event"/>
       <memberOf key="att.augmentDots"/>
-      <memberOf key="att.duration.logical"/>
+      <memberOf key="att.duration.log"/>
+      <memberOf key="att.tremForm"/>
     </classes>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="form" usage="opt">
-        <desc xml:lang="en">Describes the style of the tremolo.</desc>
-        <valList type="closed">
-          <valItem ident="meas">
-            <desc xml:lang="en">Measured tremolo.</desc>
-          </valItem>
-          <valItem ident="unmeas">
-            <desc xml:lang="en">Unmeasured tremolo.</desc>
-          </valItem>
-        </valList>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.glissPresent" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that indicate whether an event participates in a glissando.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="gliss" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">glissando</gloss>
         <desc xml:lang="en">Indicates that this element participates in a glissando. If visual information about
           the glissando needs to be recorded, then a <gi scheme="MEI">gliss</gi> element should be
           employed instead.</desc>
@@ -4247,7 +4310,7 @@
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.graced" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that mark a note or chord as a "grace", how it should "steal" time, and how
@@ -4267,10 +4330,6 @@
         </datatype>
       </attDef>
     </attList>
-  </classSpec><classSpec rend="add" ident="att.graceGrp.anl" module="MEI.cmn" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
-  </classSpec><classSpec rend="add" ident="att.graceGrp.ges" module="MEI.cmn" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.graceGrp.log" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -4294,18 +4353,13 @@
         </valList>
       </attDef>
     </attList>
-  </classSpec><classSpec rend="add" ident="att.graceGrp.vis" module="MEI.cmn" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
-    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.color"/>
-    </classes>
   </classSpec><classSpec rend="add" ident="att.hairpin.log" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="form" usage="req">
@@ -4332,7 +4386,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.event"/>
-      <memberOf key="att.duration.logical"/>
+      <memberOf key="att.duration.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.harpPedal.log" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes. The pedal setting, <abbr>i.e.</abbr>, flat, natural, or sharp, for each
@@ -4458,7 +4512,7 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.lvPresent" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that indicate the presence of an l.v. (laissez vibrer) marking attached to a
@@ -4504,6 +4558,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="func" usage="req">
+        <gloss versionDate="2022-10-18" xml:lang="en">function</gloss>
         <desc xml:lang="en">Function of the meter signature group.</desc>
         <valList type="closed">
           <valItem ident="alternating">
@@ -4516,6 +4571,9 @@
             <desc xml:lang="en">Meter signatures with different unit values are used to express a complex metrical
               pattern that is not expressible using traditional means, such as 2/4+1/8.</desc>
           </valItem>
+          <valItem ident="other">
+            <desc xml:lang="en">Meter signatures in a relationship not covered by the values alternating, interchanging or mixed.</desc>
+          </valItem>
         </valList>
       </attDef>
     </attList>
@@ -4581,6 +4639,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record numbers to be displayed with a feature.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="num" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">number</gloss>
         <desc xml:lang="en">Records a number or count accompanying a notational feature.</desc>
         <datatype>
           <rng:data type="positiveInteger"/>
@@ -4592,6 +4651,7 @@
       tremolo or tuplet.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="num.place" usage="opt">
+        <gloss versionDate="2022-10-30" xml:lang="en">number placement</gloss>
         <desc xml:lang="en">States where the tuplet number will be placed in relation to the note heads.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.STAFFREL.basic"/>
@@ -4611,7 +4671,7 @@
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.octaveDisplacement"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="coll" usage="opt">
@@ -4633,10 +4693,11 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="dir" usage="req">
+        <gloss versionDate="2022-10-30" xml:lang="en">direction</gloss>
         <desc xml:lang="en">Records the position of the piano damper pedal.</desc>
         <valList type="closed">
           <valItem ident="down">
@@ -4654,6 +4715,7 @@
         </valList>
       </attDef>
       <attDef ident="func" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">function</gloss>
         <desc xml:lang="en">Indicates the function of the depressed pedal, but not necessarily the text associated
           with its use. Use the <gi>dir</gi> element for such text.</desc>
         <datatype>
@@ -4687,7 +4749,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.curvature"/>
-      <memberOf key="att.curveRend"/>
+      <memberOf key="att.lineRend.base"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.pianoPedals" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Used by scoreDef and staffDef to provide default description of piano pedal
@@ -4707,8 +4769,8 @@
       <memberOf key="att.partIdent"/>
       <memberOf key="att.staffIdent"/>
       <memberOf key="att.startId"/>
-      <memberOf key="att.timestamp.logical"/>
-      <memberOf key="att.timestamp.gestural"/>
+      <memberOf key="att.timestamp.log"/>
+      <memberOf key="att.timestamp.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.rehearsal" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes used by scoreDef and staffDef to provide default information about rehearsal
@@ -4752,26 +4814,19 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.beaming.vis"/>
+      <memberOf key="att.guitarGrid.vis"/>
       <memberOf key="att.pianoPedals"/>
       <memberOf key="att.rehearsal"/>
       <memberOf key="att.slurRend"/>
       <memberOf key="att.tieRend"/>
     </classes>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="grid.show" usage="opt">
-        <desc xml:lang="en">Determines whether to display guitar chord grids.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
-        </datatype>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.slur.log" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.slurRend" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe the rendition of slurs.</desc>
@@ -4794,6 +4849,8 @@
       <memberOf key="att.fermataPresent"/>
       <memberOf key="att.tupletPresent"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.space.log.cmn" module="MEI.cmn" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes in the CMN repertoire.</desc>
   </classSpec><classSpec rend="add" ident="att.staffDef.log.cmn" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes for staffDef in the CMN repertoire.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -4826,7 +4883,7 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.tieRend" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe the rendition of ties.</desc>
@@ -4842,6 +4899,21 @@
         </datatype>
       </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.tremForm" module="MEI.cmn" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">Attributes describing the form of a tremolo.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="form" usage="opt">
+        <desc xml:lang="en">Describes the style of the tremolo.</desc>
+        <valList type="closed">
+          <valItem ident="meas">
+            <desc xml:lang="en">Measured tremolo.</desc>
+          </valItem>
+          <valItem ident="unmeas">
+            <desc xml:lang="en">Unmeasured tremolo.</desc>
+          </valItem>
+        </valList>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.tremMeasured" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe measured tremolandi.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -4869,7 +4941,7 @@
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.duration.ratio"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" predeclare="true" ident="model.controlEventLike.cmn" module="MEI.cmn" type="model">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups control events that appear in CMN.</desc>
@@ -4946,7 +5018,7 @@
       
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="model.graphicPrimitiveLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="attacca_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="attacca_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:attacca[not(ancestor::mei:syllable)]">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -4972,10 +5044,10 @@
       <memberOf key="model.eventLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.eventLike"/><ref name="model.eventLike.cmn"/><ref name="model.appLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="When_not_copyof_beam_content" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="When_not_copyof_beam_content" scheme="schematron">
       <constraint>
-        <sch:rule context="mei:beam[not(@copyof)]">
-          <sch:assert test="count(descendant::*[local-name()='note' or local-name()='rest' or               local-name()='chord' or local-name()='space']) &gt; 1">A beam without a copyof attribute must have at least 2 note, rest, chord, or space
+        <sch:rule context="mei:beam[not(@copyof or @sameas)]">
+          <sch:assert test="count(descendant::*[local-name()='note' or local-name()='rest' or               local-name()='chord' or local-name()='space']) &gt; 1">A beam that contains neither a copyof nor sameas attribute must have at least 2 note, rest, chord, or space
             descendants.</sch:assert>
         </sch:rule>
       </constraint>
@@ -4996,7 +5068,7 @@
       <memberOf key="model.controlEventLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="beamspan_start-_and_end-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="beamspan_start-_and_end-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:beamSpan">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5039,7 +5111,7 @@
       <memberOf key="model.controlEventLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="bend_start-_and_end-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="bend_start-_and_end-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:bend">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5058,7 +5130,7 @@
       <memberOf key="model.controlEventLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="bracketSpan_start-_and_end-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="bracketSpan_start-_and_end-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:bracketSpan">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5085,7 +5157,7 @@
       <memberOf key="model.controlEventLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="breath_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="breath_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:breath">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5125,7 +5197,7 @@
       <memberOf key="model.controlEventLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="fermata_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="fermata_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:fermata">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5162,7 +5234,7 @@
       <memberOf key="model.controlEventLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="gliss_start-_and_end-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="gliss_start-_and_end-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:gliss">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5181,7 +5253,7 @@
         <att>tstamp.real</att> attribute, while the ending point may be recorded by either a
         <att>dur</att>, <att>dur.ges</att>, <att>endid</att>, or <att>tstamp2</att> attribute. It is
         a semantic error not to specify one starting and one ending type of attribute.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="graceGrp" module="MEI.cmn"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A container for a sequence of grace notes.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    </remarks></elementSpec><elementSpec rend="add" ident="graceGrp" module="MEI.cmn"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">grace group</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A container for a sequence of grace notes.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.graceGrp.log"/>
@@ -5191,14 +5263,14 @@
       <memberOf key="model.eventLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.eventLike"/><ref name="model.eventLike.cmn"/><ref name="model.appLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="When_not_copyof_graceGrp_content" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="When_not_copyof_graceGrp_content" scheme="schematron">
       <constraint>
         <sch:rule context="mei:graceGrp[not(@copyof)]">
           <sch:assert test="count(descendant::*[local-name()='note' or local-name()='rest' or               local-name()='chord' or local-name()='space']) &gt; 0">A graceGrp without a copyof attribute must have at least 1 note, rest, chord, or space
             descendants.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="When_graced" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="When_graced" scheme="schematron">
       <constraint>
         <sch:rule context="mei:graceGrp[@grace]">
           <sch:assert test="not(descendant::mei:*[@grace])">The grace attribute is not allowed on
@@ -5216,7 +5288,7 @@
       <memberOf key="model.controlEventLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="hairpin_start-_and_end-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="hairpin_start-_and_end-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:hairpin">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5255,7 +5327,7 @@
       <memberOf key="model.controlEventLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="harpPedal_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="harpPedal_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:harpPedal">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5276,14 +5348,14 @@
       <memberOf key="model.controlEventLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="curve"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="lv_start-_and_end-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="lv_start-_and_end-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:lv">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
             attributes: startid, tstamp, tstamp.ges or tstamp.real.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="lv_containing_curve" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="lv_containing_curve" scheme="schematron">
       <constraint>
         <sch:rule context="mei:lv[mei:curve[@bezier or @bulge or @curvedir or @lform or @lwidth or @ho or @startho or @endho or @to or @startto or @endto or @vo or @startvo or              @endvo or @x or @y or @x2 or @y2]]">
           <sch:assert test="not(@bezier or @bulge or @curvedir or @lform or @lwidth or @ho or @startho or @endho or @to or @startto or @endto or @vo or @startvo or @endvo or @x or @y or @x2 or @y2)" role="warning">The visual attributes of the lv element (@bezier, @bulge, @curvedir,
@@ -5326,7 +5398,7 @@
       <memberOf key="model.meterSigLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content></elementSpec><elementSpec rend="add" ident="meterSigGrp" module="MEI.cmn"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">meter signature group</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Used to capture alternating, interchanging, and mixed meter signatures.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    </content></elementSpec><elementSpec rend="add" ident="meterSigGrp" module="MEI.cmn"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">meter signature group</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Used to capture alternating, interchanging, mixed or other non-standard meter signatures.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.meterSigGrp.anl"/>
@@ -5336,7 +5408,7 @@
       <memberOf key="model.meterSigLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="meterSig"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_meterSigGrpContent" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_meterSigGrpContent" scheme="schematron">
       <constraint>
         <sch:rule context="mei:meterSigGrp[not(@copyof)]">
           <sch:assert test="count(mei:meterSig) &gt; 1">meterSigGrp must have at least 2 child
@@ -5444,7 +5516,7 @@
       <memberOf key="model.controlEventLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="octave_start-_and_end-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="octave_start-_and_end-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:octave">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5489,7 +5561,7 @@
       <memberOf key="model.ossiaLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><interleave><oneOrMore><ref name="oStaff"/></oneOrMore><oneOrMore><ref name="model.staffLike"/></oneOrMore></interleave><interleave><oneOrMore><ref name="oLayer"/></oneOrMore><oneOrMore><ref name="model.layerLike"/></oneOrMore></interleave></choice>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_ossia" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_ossia" scheme="schematron">
       <constraint>
         <sch:pattern>
           <sch:rule context="mei:measure/mei:ossia">
@@ -5535,7 +5607,7 @@
       <memberOf key="model.controlEventLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="pedal_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="pedal_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:pedal">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5562,6 +5634,37 @@
       <p>It may also be called a "rehearsal figure", or when numbers are used instead of letters, a
         "rehearsal number". See Read, p. 443. <gi scheme="MEI">reh</gi> uses a subset of
         model.textPhraseLike.limited.</p>
+    </remarks></elementSpec><elementSpec rend="add" ident="repeatMark" module="MEI.cmn"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">repetition mark</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      An instruction expressed as a combination of text and symbols – segno and coda – typically above, 
+      below, or between staves, but not on the staff.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.common"/>
+      <memberOf key="att.facsimile"/>
+      <memberOf key="att.lang"/>
+      <memberOf key="att.repeatMark.log"/>
+      <memberOf key="att.repeatMark.vis"/>
+      <memberOf key="att.repeatMark.ges"/>
+      <memberOf key="att.repeatMark.anl"/>
+      <memberOf key="model.controlEventLike"/>
+    </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="model.graphicPrimitiveLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="repeatMark_start-type_attributes_required" scheme="isoschematron">
+      <constraint>
+        <sch:rule context="mei:repeatMark">
+          <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
+            attributes: startid, tstamp, tstamp.ges or tstamp.real.</sch:assert>
+        </sch:rule>
+      </constraint>
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="repeatMark_with_glyph_has_to_be_empty" scheme="isoschematron">
+      <constraint>
+        <sch:rule context="mei:repeatMark[@glyph.num or @glyph.name]">
+          <sch:assert test="not(element()) and not(text())">When @glyph.name or @glyph.num is present, repeatMark must not have content.</sch:assert>
+        </sch:rule>
+      </constraint>
+    </constraintSpec><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>When only <att>func</att> is provided to describe the function of the repeat mark (<abbr>i.e.</abbr>, without glyph information and no textual content), then a renderer
+        can rely on it to display the appropriate symbol. When textual content is provided, it will take precedence over the symbol implied by the function. Generic repeat marks where
+        no function can be determined, then generic <gi scheme="MEI">dir</gi> elements should be used.
+      </p>
     </remarks></elementSpec><elementSpec rend="add" ident="slur" module="MEI.cmn"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Indication of 1) a "unified melodic idea" or 2) performance technique.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -5572,7 +5675,7 @@
       <memberOf key="model.controlEventLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="curve"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="slur_start-_and_end-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="slur_start-_and_end-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:slur">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5581,7 +5684,7 @@
             dur, dur.ges, endid, or tstamp2.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="slur_containing_curve" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="slur_containing_curve" scheme="schematron">
       <constraint>
         <sch:rule context="mei:slur[mei:curve[@bezier or @bulge or @curvedir or @lform or @lwidth or @ho or @startho or @endho or @to or @startto or @endto or @vo or @startvo or @endvo or @x or @y or @x2 or @y2]]">
           <sch:assert test="not(@bezier or @bulge or @curvedir or @lform or @lwidth or @ho or @startho or @endho or @to or @startto or @endto or @vo or @startvo or @endvo or @x or @y or @x2 or @y2)" role="warning">The visual attributes of the slur (@bezier, @bulge, @curvedir, @lform,
@@ -5616,7 +5719,7 @@
       <memberOf key="model.controlEventLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="curve"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="tie_start-_and_end-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="tie_start-_and_end-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:tie">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5625,7 +5728,7 @@
             dur, dur.ges, endid, or tstamp2.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="tie_containing_curve" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="tie_containing_curve" scheme="schematron">
       <constraint>
         <sch:rule context="mei:tie[mei:curve[@bezier or @bulge or @curvedir or @lform or @lwidth or @ho or @startho or @endho or @to or @startto or @endto or @vo or @startvo or @endvo or @x or @y or @x2 or @y2]]">
           <sch:assert test="not(@bezier or @bulge or @curvedir or @lform or @lwidth or @ho or @startho or @endho or @to or @startto or @endto or @vo or @startvo or @endvo or @x or @y or @x2 or @y2)" role="warning">The visual attributes of the tie (@bezier, @bulge, @curvedir, @lform,
@@ -5672,7 +5775,7 @@
       <memberOf key="model.controlEventLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="tupletSpan_start-_and_end-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="tupletSpan_start-_and_end-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:tupletSpan">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5755,6 +5858,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes for marking the presence of an ornament.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="ornam" usage="opt">
+        <gloss versionDate="2022-10-30" xml:lang="en">ornament</gloss>
         <desc xml:lang="en">Indicates that this element has an attached ornament. If visual information about the
           ornament is needed, then one of the elements that represents an ornament (mordent, trill,
           or turn) should be employed.</desc>
@@ -5770,7 +5874,7 @@
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.ornamentAccid"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.turn.log" module="MEI.cmnOrnaments" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
@@ -5817,7 +5921,7 @@
       <memberOf key="model.ornamentLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="mordent_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="mordent_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:mordent">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5839,7 +5943,7 @@
       <memberOf key="model.ornamentLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="trill_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="trill_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:trill">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5866,7 +5970,7 @@
       <memberOf key="model.ornamentLike.cmn"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="turn_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="turn_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:turn">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -5885,8 +5989,7 @@
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="meiHead"/>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="mei"/></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on the teiCorpus element in the Text Encoding Initiative (TEI)
-        standard. The MEI instances making up the corpus may be related in a number of ways, for
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-teiCorpus.html">teiCorpus</ref> element of the Text Encoding Initiative (TEI). The MEI instances making up the corpus may be related in a number of ways, for
         example, by composer, by similar instrumentation, by holding institution, etc. This
         element’s name should not be changed in order to assure an absolute minimum level of MEI
         compliance.</p>
@@ -5922,7 +6025,7 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="model.rdgPart"/>
     </classes>
-  </classSpec><elementSpec rend="add" ident="app" module="MEI.critapp"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">(apparatus) – Contains one or more alternative encodings.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  </classSpec><elementSpec rend="add" ident="app" module="MEI.critapp"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">apparatus</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains one or more alternative encodings.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="model.appLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -5937,8 +6040,8 @@
         unclear), or the nature of the variation or the principles required to understand it (<abbr>e.g.</abbr>,
         lectio difficilior, usus auctoris, etc.).</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="lem" module="MEI.critapp"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">(lemma) – Contains the lemma, or base text, of a textual variation.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-app.html">app</ref> element of the Text Encoding Initiative (TEI).</p>
+    </remarks></elementSpec><elementSpec rend="add" ident="lem" module="MEI.critapp"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">lemma</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains the lemma, or base text, of a textual variation.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.crit"/>
       <memberOf key="att.pointing"/>
@@ -5962,8 +6065,8 @@
         example, when used as a descendent of <gi scheme="MEI">verse</gi>, <gi scheme="MEI">lem</gi>
         should only contain those elements allowed within <gi scheme="MEI">verse</gi>.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="rdg" module="MEI.critapp"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">(reading) – Contains a single reading within a textual variation.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-lem.html">lem</ref> element of the Text Encoding Initiative (TEI).</p>
+    </remarks></elementSpec><elementSpec rend="add" ident="rdg" module="MEI.critapp"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">reading</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a single reading within a textual variation.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.crit"/>
       <memberOf key="att.pointing"/>
@@ -5985,20 +6088,20 @@
         example, when used as a descendent of <gi scheme="MEI">verse</gi>, <gi scheme="MEI">rdg</gi>
         should only contain those elements allowed within <gi scheme="MEI">verse</gi>.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-rdg.html">rdg</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><classSpec rend="add" ident="att.sp.log" module="MEI.drama" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.stageDir.log" module="MEI.drama" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" predeclare="true" ident="model.stageDirLike" module="MEI.drama" type="model">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements containing stage directions in performance texts.</desc>
@@ -6020,14 +6123,14 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="speaker"/><zeroOrMore><choice><ref name="model.annotLike"/><ref name="model.appLike"/><ref name="model.figureLike"/><ref name="model.milestoneLike.text"/></choice></zeroOrMore></zeroOrMore>
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.lgLike"/><ref name="model.lLike"/><ref name="model.pLike"/><ref name="model.quoteLike"/><ref name="model.stageDirLike"/><ref name="list"/></choice></oneOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.annotLike"/><ref name="model.appLike"/><ref name="model.figureLike"/><ref name="model.milestoneLike.text"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="sp_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="sp_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:sp[ancestor::mei:layer or ancestor::mei:measure or ancestor::mei:staff][not(ancestor::mei:sp)]">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
             attributes: startid, tstamp, tstamp.ges or tstamp.real.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="sp_start-type_attributes_forbidden" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="sp_start-type_attributes_forbidden" scheme="schematron">
       <constraint>
         <sch:rule context="mei:sp[not(ancestor::mei:layer or ancestor::mei:measure or ancestor::mei:staff)]">
           <sch:assert test="not(@startid or @endid or @tstamp or @tstamp2 or @tstamp.ges or @tstamp.real or                @startho or @endho or @to or @startto or @endto or @staff or @layer or @place or @plist)">Must not have any of the attributes: startid, endid, tstamp, tstamp2, tstamp.ges,
@@ -6040,7 +6143,7 @@
         not a descendant of <gi scheme="MEI">sp</gi>. In a textual content <gi scheme="MEI">sp</gi>
         must NOT have any musical attributes.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-sp.html">sp</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="stageDir" module="MEI.drama"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">stage direction</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains any kind of stage direction within a dramatic text or
       fragment.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -6053,14 +6156,14 @@
       <memberOf key="model.stageDirLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="stageDir_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="stageDir_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:stageDir[ancestor::mei:layer or ancestor::mei:measure or ancestor::mei:staff][not(ancestor::mei:sp)]">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
             attributes: startid, tstamp, tstamp.ges or tstamp.real.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="stageDir_start-type_attributes_forbidden" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="stageDir_start-type_attributes_forbidden" scheme="schematron">
       <constraint>
         <sch:rule context="mei:stageDir[not(ancestor::mei:layer or ancestor::mei:measure or ancestor::mei:staff) or ancestor::mei:sp]">
           <sch:assert test="not(@startid or @endid or @tstamp or @tstamp2 or @tstamp.ges or @tstamp.real or @startho or @endho or @to or                @startto or @endto or @staff or @layer or @place or @plist)">Must not have any of the attributes: startid, endid, tstamp, tstamp2, tstamp.ges,
@@ -6072,7 +6175,7 @@
       <p>In a musical context <gi scheme="MEI">stageDir</gi> must have a start-type attribute when
         it’s not a descendant of <gi scheme="MEI">sp</gi>. In a textual content <gi scheme="MEI">stageDir</gi> must NOT have any musical attributes.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-stage.html">stage</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><classSpec rend="add" ident="att.agentIdent" module="MEI.edittrans" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes for the identification of a causative agent.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -6088,13 +6191,13 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.controlEvent"/>
-      <memberOf key="att.origin.timestamp.logical"/>
+      <memberOf key="att.origin.timestamp.log"/>
       <memberOf key="att.origin.staffIdent"/>
       <memberOf key="att.origin.layerIdent"/>
       <memberOf key="att.origin.startEndId"/>
       <memberOf key="att.octaveDisplacement"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.edit" module="MEI.edittrans" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes describing the nature of an encoded scholarly intervention or
@@ -6103,27 +6206,15 @@
       <memberOf key="att.source"/>
       <memberOf key="att.evidence"/>
     </classes>
-  </classSpec><classSpec rend="add" ident="att.metaMark.anl" module="MEI.edittrans" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
-  </classSpec><classSpec rend="add" ident="att.metaMark.ges" module="MEI.edittrans" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-    </classes>
   </classSpec><classSpec rend="add" ident="att.metaMark.log" module="MEI.edittrans" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
       <memberOf key="att.edit"/>
       <memberOf key="att.trans"/>
     </classes>
-  </classSpec><classSpec rend="add" ident="att.metaMark.vis" module="MEI.edittrans" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
-    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.placementRelStaff"/>
-    </classes>
   </classSpec><classSpec rend="add" ident="att.reasonIdent" module="MEI.edittrans" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that identify the reason why an editorial feature is used.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -6192,8 +6283,8 @@
         permitted to occur within the parent of its own <gi scheme="MEI">app</gi> ancestor. For
         example, when used as a descendent of <gi scheme="MEI">verse</gi>, <gi scheme="MEI">abbr</gi> should only contain those elements allowed within <gi scheme="MEI">verse</gi>.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-abbr.html">abbr</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-abbr">abbr</ref> element of the Encoded
+        Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="add" module="MEI.edittrans"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">addition</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Marks an addition to the text.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -6223,7 +6314,7 @@
         example, when used as a descendent of <gi scheme="MEI">verse</gi>, <gi scheme="MEI">add</gi>
         should only contain those elements allowed within <gi scheme="MEI">verse</gi>.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-add.html">add</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="choice" module="MEI.edittrans"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups a number of alternative encodings for the same point in a text.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="model.editLike"/>
@@ -6236,7 +6327,7 @@
         encodings to be considered as parallel. Note also that <gi scheme="MEI">choice</gi> elements
         may be recursively nested.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-choice.html">choice</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="corr" module="MEI.edittrans"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">correction</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains the correct form of an apparent erroneous passage.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.edit"/>
@@ -6258,7 +6349,7 @@
         permitted to occur within the parent of its own <gi scheme="MEI">app</gi> ancestor. For
         example, when used as a descendent of <gi scheme="MEI">verse</gi>, <gi scheme="MEI">corr</gi> should only contain those elements allowed within <gi scheme="MEI">verse</gi>.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-corr.html">corr</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="cpMark" module="MEI.edittrans"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">copy/colla parte mark</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A verbal or graphical indication to copy musical material
       written elsewhere.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -6270,7 +6361,7 @@
       <memberOf key="model.controlEventLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="cpMark_start-_and_end-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="cpMark_start-_and_end-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:cpMark">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -6328,7 +6419,7 @@
         permitted to occur within the parent of its own <gi scheme="MEI">app</gi> ancestor. For
         example, when used as a descendent of <gi scheme="MEI">verse</gi>, <gi scheme="MEI">damage</gi> should only contain those elements allowed within <gi scheme="MEI">verse</gi>.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-damage.html">damage</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="del" module="MEI.edittrans"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">deletion</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains information deleted, marked as deleted, or otherwise indicated as
       superfluous or spurious in the copy text by an author, scribe, annotator, or corrector.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -6353,8 +6444,7 @@
         example, when used as a descendent of <gi scheme="MEI">verse</gi>, <gi scheme="MEI">del</gi>
         should only contain those elements allowed within <gi scheme="MEI">verse</gi>.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-del.html">del</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="expan" module="MEI.edittrans"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">expansion</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains the expansion of an abbreviation.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.edit"/>
@@ -6366,6 +6456,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.divLike"/><ref name="model.editLike"/><ref name="model.editTransPart"/><ref name="model.fLike"/><ref name="model.graphicPrimitiveLike"/><ref name="model.layerPart"/><ref name="model.milestoneLike.music"/><ref name="model.neumeComponentModifierLike"/><ref name="model.neumeModifierLike"/><ref name="model.neumePart"/><ref name="model.sectionPart"/><ref name="model.staffGrpLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="abbr" usage="opt">
+        <gloss versionDate="2022-10-30" xml:lang="en">abbreviation</gloss>
         <desc xml:lang="en">Captures the abbreviated form of the text.</desc>
         <datatype>
           <rng:data type="string"/>
@@ -6375,8 +6466,8 @@
         permitted to occur within the parent of its own <gi scheme="MEI">app</gi> ancestor. For
         example, when used as a descendent of <gi scheme="MEI">verse</gi>, <gi scheme="MEI">expan</gi> should only contain those elements allowed within <gi scheme="MEI">verse</gi>.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-expan.html">expan</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-expan">expan</ref> element of the Encoded
+        Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="gap" module="MEI.edittrans"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Indicates a point where material has been omitted in a transcription, whether as part of
       sampling practice or for editorial reasons described in the MEI header.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -6403,7 +6494,7 @@
         deletion by an identifiable hand. The <att>cert</att> attribute signifies the degree of
         certainty ascribed to the identification of the extent of the missing material.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-gap.html">gap</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="handShift" module="MEI.edittrans"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Marks the beginning of a passage written in a new hand, or of a change in the scribe,
       writing style, ink or character of the document hand.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -6424,7 +6515,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_newTarget" scheme="isoschematron">
+        <constraintSpec ident="check_newTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@new">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@new attribute should
@@ -6440,7 +6531,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_oldTarget" scheme="isoschematron">
+        <constraintSpec ident="check_oldTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@old">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@old attribute should
@@ -6461,10 +6552,10 @@
         attribute signifies the degree of certainty ascribed to the identification of the new
         hand.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-handShift.html">handShift</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="metaMark" module="MEI.edittrans"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A graphical or textual statement with additional / explanatory information about the
       musical text. The textual consequences of this intervention are encoded independently via
-      other means; that is, with elements such as &lt;add&gt;, &lt;del&gt;, etc.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      other means; that is, with elements such as <gi scheme="MEI">add</gi>, <gi scheme="MEI">del</gi>, etc.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.lang"/>
@@ -6545,7 +6636,7 @@
         permitted to occur within the parent of its own <gi scheme="MEI">app</gi> ancestor. For
         example, when used as a descendent of <gi scheme="MEI">verse</gi>, <gi scheme="MEI">orig</gi> should only contain those elements allowed within <gi scheme="MEI">verse</gi>.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-orig.html">orig</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="reg" module="MEI.edittrans"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">regularization</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains material which has been regularized or normalized in some
       sense.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -6569,7 +6660,7 @@
         example, when used as a descendent of <gi scheme="MEI">verse</gi>, <gi scheme="MEI">reg</gi>
         should only contain those elements allowed within <gi scheme="MEI">verse</gi>.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-reg.html">reg</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="restore" module="MEI.edittrans"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Indicates restoration of material to an earlier state by cancellation of an editorial or
       authorial marking or instruction.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -6582,6 +6673,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.divLike"/><ref name="model.editLike"/><ref name="model.editTransPart"/><ref name="model.fLike"/><ref name="model.graphicPrimitiveLike"/><ref name="model.keyAccidLike"/><ref name="model.layerPart"/><ref name="model.milestoneLike.music"/><ref name="model.neumeComponentModifierLike"/><ref name="model.neumeModifierLike"/><ref name="model.neumePart"/><ref name="model.sectionPart"/><ref name="model.staffGrpLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="desc" usage="opt">
+        <gloss versionDate="2022-10-30" xml:lang="en">description</gloss>
         <desc xml:lang="en">Provides a description of the means of restoration, <val>stet</val> or <val>strike-down</val>, 
           for example.</desc>
         <datatype>
@@ -6592,7 +6684,7 @@
         be permitted to occur within the parent of its own <gi scheme="MEI">app</gi> ancestor. For
         example, when used as a descendent of <gi scheme="MEI">verse</gi>, <gi scheme="MEI">restore</gi> should only contain those elements allowed within <gi scheme="MEI">verse</gi>.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-restore.html">restore</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="sic" module="MEI.edittrans"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains apparently incorrect or inaccurate material.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.edit"/>
@@ -6610,7 +6702,7 @@
         example, when used as a descendent of <gi scheme="MEI">verse</gi>, <gi scheme="MEI">sic</gi>
         should only contain those elements allowed within <gi scheme="MEI">verse</gi>.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-sic.html">sic</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="subst" module="MEI.edittrans"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">substitution</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups transcriptional elements when the combination is to be regarded as
       a single intervention in the text.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -6621,7 +6713,7 @@
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="model.transcriptionLike"/>
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.transcriptionLike"/></oneOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-subst.html">subst</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="supplied" module="MEI.edittrans"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains material supplied by the transcriber or editor for any reason.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.agentIdent"/>
@@ -6649,7 +6741,7 @@
         be permitted to occur within the parent of its own <gi scheme="MEI">app</gi> ancestor. For
         example, when used as a descendent of <gi scheme="MEI">verse</gi>, <gi scheme="MEI">supplied</gi> should only contain those elements allowed within <gi scheme="MEI">verse</gi>.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-supplied.html">supplied</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="unclear" module="MEI.edittrans"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains material that cannot be transcribed with certainty because it is illegible or
       inaudible in the source.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -6679,14 +6771,13 @@
         be permitted to occur within the parent of its own <gi scheme="MEI">app</gi> ancestor. For
         example, when used as a descendent of <gi scheme="MEI">verse</gi>, <gi scheme="MEI">unclear</gi> should only contain those elements allowed within <gi scheme="MEI">verse</gi>.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
-    </remarks></elementSpec><classSpec rend="add" ident="att.extSym" module="MEI.externalsymbols" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes used to associate MEI features with corresponding glyphs in an
-      externally-defined standard such as SMuFL.</desc>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-unclear.html">unclear</ref> element of the Text Encoding Initiative (TEI).</p>
+    </remarks></elementSpec><classSpec rend="add" ident="att.extSym.auth" module="MEI.externalsymbols" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that point to an external symbol authority.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="glyph.auth" usage="opt">
         <desc xml:lang="en">A name or label associated with the controlled vocabulary from which the value of
-            <att>glyph.name</att> or <att>glyph.num</att> is taken.</desc>
+          <att>glyph.name</att> or <att>glyph.num</att> is taken, or the textual content of the element.</desc>
         <datatype>
           <rng:data type="NMTOKEN"/>
         </datatype>
@@ -6696,12 +6787,23 @@
           </valItem>
         </valList>
       </attDef>
+      <attDef ident="glyph.uri" usage="opt">
+        <desc xml:lang="en">The web-accessible location of the controlled vocabulary from which the value of
+          <att>glyph.name</att> or <att>glyph.num</att> is taken, or the textual content of the element.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
+        </datatype>
+      </attDef>
+    </attList>
+  </classSpec><classSpec rend="add" ident="att.extSym.names" module="MEI.externalsymbols" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that specify names or values taken from an external symbol authority.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="glyph.name" usage="opt">
         <desc xml:lang="en">Glyph name.</desc>
         <datatype>
           <rng:data type="string"/>
         </datatype>
-        <constraintSpec ident="check_glyph.name" scheme="isoschematron">
+        <constraintSpec ident="check_glyph.name" scheme="schematron">
           <constraint>
             <sch:rule context="@glyph.name">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@glyph.name attribute
@@ -6716,7 +6818,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.HEXNUM"/>
         </datatype>
-        <constraintSpec ident="check_glyph.num" scheme="isoschematron">
+        <constraintSpec ident="check_glyph.num" scheme="schematron">
           <constraint>
             <sch:rule context="mei:*[@glyph.num and (lower-case(@glyph.auth) eq 'smufl' or @glyph.uri eq 'http://www.smufl.org/')]">
               <sch:assert role="warning" test="matches(normalize-space(@glyph.num), '^(#x|U\+)E([0-9AB][0-9A-F][0-9A-F]|C[0-9A][0-9A-F]|CB[0-9A-F])$')">SMuFL version 1.18 uses the range U+E000 - U+ECBF.</sch:assert>
@@ -6724,24 +6826,24 @@
           </constraint>
         </constraintSpec>
       </attDef>
-      <attDef ident="glyph.uri" usage="opt">
-        <desc xml:lang="en">The web-accessible location of the controlled vocabulary from which the value of
-            <att>glyph.name</att> or <att>glyph.num</att> is taken.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
-        </datatype>
-      </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.extSym" module="MEI.externalsymbols" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes used to associate MEI features with corresponding glyphs in an
+      externally-defined standard such as SMuFL.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.extSym.auth"/>
+      <memberOf key="att.extSym.names"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.facsimile" module="MEI.facsimile" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that associate a feature corresponding with all or part of an image.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="facs" usage="opt">
-        <desc xml:lang="en">Permits the current element to reference a facsimile surface or image zone which
-          corresponds to it.</desc>
-        <datatype maxOccurs="unbounded">
+        <gloss versionDate="2022-10-18" xml:lang="en">facsimile</gloss>
+        <desc versionDate="2022-10-18" xml:lang="en">Points to one or more images, portions of an image, or surfaces which correspond to the current element.</desc>
+        <datatype minOccurs="1" maxOccurs="unbounded">
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_facsTarget" scheme="isoschematron">
+        <constraintSpec ident="check_facsTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@facs">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@facs attribute should
@@ -6770,7 +6872,7 @@
       <p>The <att>decls</att> attribute may be used to link the collection of images with a
         particular source described in the header.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-facsimile.html">facsimile</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="surface" module="MEI.facsimile"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Defines a writing surface in terms of a rectangular coordinate space, optionally grouping
       one or more graphic representations of that space, and rectangular zones of interest within
       it.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -6789,8 +6891,8 @@
       <p>The <att>startid</att> attribute may be used to hold a reference to the first feature
         occurring on this surface.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="zone" module="MEI.facsimile"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Defines an area of interest within a surface or graphic file.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-surface.html">surface</ref> element of the Text Encoding Initiative (TEI).</p>
+    </remarks></elementSpec><elementSpec rend="add" ident="zone" module="MEI.facsimile"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Defines an area of interest within a <gi scheme="MEI">surface</gi> or graphic file.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.coordinated"/>
       <memberOf key="att.dataPointing"/>
@@ -6800,7 +6902,7 @@
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>Scalable Vector Graphics (SVG) markup may be used when allowed by the graphicLike
         model.</p>
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-zone.html">zone</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><classSpec rend="add" ident="att.tabular" module="MEI.figtable" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes shared by table cells.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -6846,8 +6948,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="figDesc"/><ref name="model.captionLike"/><ref name="model.graphicLike"/><ref name="model.scoreLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on the figure element in the Text Encoding Initiative (TEI)
-        standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-figure.html">figure</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="figDesc" module="MEI.figtable"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">figure description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a brief prose description of the appearance or content of
       a graphic figure, for use when documenting an image without displaying it.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -6860,9 +6961,10 @@
         confuse this entity with a figure caption. A caption is text primarily intended for display
         with an illustration. It may or may not function as a description of the illustration.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-figDesc.html">figDesc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="graphic" module="MEI.figtable"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Indicates the location of an inline graphic.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
+      <memberOf key="att.coordinated.ul"/>
       <memberOf key="att.dimensions"/>
       <memberOf key="att.internetMedia"/>
       <memberOf key="att.facsimile"/>
@@ -6873,7 +6975,7 @@
       <memberOf key="model.graphicLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="zone"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="graphic_attributes" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="graphic_attributes" scheme="schematron">
       <constraint>
         <sch:rule context="mei:zone/mei:graphic">
           <sch:assert role="warning" test="count(mei:*) = 0">Graphic child of zone should not have
@@ -6890,18 +6992,8 @@
             attributes.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="ulx" usage="opt">
-        <desc xml:lang="en">Indicates the upper-left corner x coordinate.</desc>
-        <datatype>
-          <rng:data type="nonNegativeInteger"/>
-        </datatype>
-      </attDef><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="uly" usage="opt">
-        <desc xml:lang="en">Indicates the upper-left corner y coordinate.</desc>
-        <datatype>
-          <rng:data type="nonNegativeInteger"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+    </constraintSpec><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-graphic.html">graphic</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="table" module="MEI.figtable"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains text displayed in tabular form.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -6913,8 +7005,8 @@
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="tr"/></oneOrMore>
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.captionLike"/></optional>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Encoded Archival Description (EAD), Text
-        Encoding Initiative (TEI), and HTML standards.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-table">table</ref> element of the Encoded Archival Description (EAD), the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-table.html">table</ref> element of the Text
+        Encoding Initiative (TEI), and the <ref target="https://html.spec.whatwg.org/#the-table-element">table</ref> element of <abbr>HTML</abbr>.</p>
     </remarks></elementSpec><elementSpec rend="add" ident="td" module="MEI.figtable"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">table data</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Designates a table cell that contains data as opposed to a cell that
       contains column or row heading information.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -6928,7 +7020,7 @@
       <p>The <att>colspan</att> and <att>rowspan</att> attributes record tabular display rendering
         information.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the HTML standard.</p>
+      <p>The model of this element is based on the <ref target="https://html.spec.whatwg.org/#the-td-element">td</ref> element of <abbr>HTML</abbr>.</p>
     </remarks></elementSpec><elementSpec rend="add" ident="th" module="MEI.figtable"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">table header</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Designates a table cell containing column or row heading information as
       opposed to one containing data.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -6942,7 +7034,7 @@
       <p>The <att>colspan</att> and <att>rowspan</att> attributes record tabular display rendering
         information.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the HTML standard.</p>
+      <p>The model of this element is based on the <ref target="https://html.spec.whatwg.org/#the-th-element">th</ref> element of <abbr>HTML</abbr>.</p>
     </remarks></elementSpec><elementSpec rend="add" ident="tr" module="MEI.figtable"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">table row</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A formatting element that contains one or more cells (intersection of a row
       and a column) in a <gi scheme="MEI">table</gi>.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -6954,14 +7046,14 @@
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>More precise rendition of the table and its cells can be specified in a style sheet.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the HTML standard.</p>
+      <p>The model of this element is based on the <ref target="https://html.spec.whatwg.org/#the-tr-element">tr</ref> element of <abbr>HTML</abbr>.</p>
     </remarks></elementSpec><classSpec rend="add" ident="att.fing.log" module="MEI.fingering" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.fingGrp.log" module="MEI.fingering" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
@@ -6969,7 +7061,7 @@
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="form" usage="opt">
@@ -6992,7 +7084,7 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="model.controlEventLike"/>
     </classes>
-  </classSpec><elementSpec rend="add" ident="fing" module="MEI.fingering"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">finger – An individual finger in a fingering indication.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  </classSpec><elementSpec rend="add" ident="fing" module="MEI.fingering"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">finger</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">An individual finger in a fingering indication.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.fing.anl"/>
@@ -7002,14 +7094,14 @@
       <memberOf key="model.fingeringLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="fing_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="fing_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:fing[not(ancestor::mei:fingGrp)]">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
             attributes: startid, tstamp, tstamp.ges or tstamp.real.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="stack_exclusion" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="stack_exclusion" scheme="schematron">
       
       <constraint>
         <sch:rule context="mei:fing">
@@ -7017,7 +7109,7 @@
             descendant of fing.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec></elementSpec><elementSpec rend="add" ident="fingGrp" module="MEI.fingering"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">(finger group)– A group of individual fingers in a fingering indication.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    </constraintSpec></elementSpec><elementSpec rend="add" ident="fingGrp" module="MEI.fingering"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">finger group</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A group of individual fingers in a fingering indication.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.fingGrp.anl"/>
@@ -7027,14 +7119,14 @@
       <memberOf key="model.fingeringLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.fingeringLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="require_fingeringLike_children" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="require_fingeringLike_children" scheme="schematron">
       <constraint>
         <sch:rule context="mei:fingGrp">
           <sch:assert test="count(mei:fing) + count(mei:fingGrp) &gt; 1">At least 2 fing or fingGrp
             elements are required.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_fingGrp_start-type_attributes" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_fingGrp_start-type_attributes" scheme="schematron">
       <constraint>
         <sch:pattern>
           <sch:rule context="mei:fingGrp[not(ancestor::mei:fingGrp)][@tstamp or @startid]">
@@ -7280,10 +7372,19 @@
             equals "true".</sch:assert>
         </sch:rule>
       </constraint>
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_singleton_availability" scheme="schematron">
+      <constraint>
+        <sch:rule context="mei:manifestation[@singleton eq 'false'] | mei:manifestation[not(@singleton)]">
+          <sch:assert test="not(mei:availability)">Availability is only permitted when @singleton equals "true".</sch:assert>
+        </sch:rule>
+      </constraint>
     </constraintSpec><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="singleton">
+        <desc xml:lang="en">Indicates the manifestation is a unique physical object.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
         </datatype>
+        <remarks xml:lang="en"><p>This attribute is inspired by the <ref target="https://repository.ifla.org/handle/123456789/659">FRBRoo</ref> concept of manifestation singleton.</p></remarks>
+        <remarks xml:lang="en"><p>Manifestation singleton encompasses: manuscripts, preperatory sketches, and final clean drafts.</p></remarks>
       </attDef></attList></elementSpec><elementSpec rend="add" ident="manifestationList" module="MEI.frbr"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A container for the descriptions of physical embodiments of an expression of a
       work.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -7317,7 +7418,7 @@
         </datatype>
       </attDef>
     </attList>
-  </classSpec><elementSpec rend="add" ident="genDesc" module="MEI.genetic"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">(genetic description) - Bundles information about the textual development of a
+  </classSpec><elementSpec rend="add" ident="genDesc" module="MEI.genetic"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">genetic description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Bundles information about the textual development of a
       work.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.metadataPointing"/>
@@ -7360,9 +7461,9 @@
     </remarks></elementSpec><classSpec rend="add" ident="att.accid.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.accidental.gestural"/>
+      <memberOf key="att.accidental.ges"/>
     </classes>
-  </classSpec><classSpec rend="add" ident="att.accidental.gestural" module="MEI.gestural" type="atts">
+  </classSpec><classSpec rend="add" ident="att.accidental.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes for capturing momentary pitch inflection in the gestural domain.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="accid.ges" usage="opt">
@@ -7370,7 +7471,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.ACCIDENTAL.GESTURAL"/>
         </datatype>
-        <constraintSpec ident="check_accid_duplication" scheme="isoschematron">
+        <constraintSpec ident="check_accid_duplication" scheme="schematron">
           <constraint>
             <sch:rule context="@accid.ges">
               <sch:assert role="warning" test="not(. eq ../@accid)">The value of @accid.ges should
@@ -7380,23 +7481,27 @@
         </constraintSpec>
       </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.ambitus.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.ambNote.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.anchoredText.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.annot.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.arpeg.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.artic.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.articulation.gestural"/>
+      <memberOf key="att.articulation.ges"/>
     </classes>
-  </classSpec><classSpec rend="add" ident="att.articulation.gestural" module="MEI.gestural" type="atts">
+  </classSpec><classSpec rend="add" ident="att.articulation.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes describing the method of performance.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="artic.ges" usage="opt">
@@ -7409,8 +7514,19 @@
   </classSpec><classSpec rend="add" ident="att.attacca.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.attacking" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes whether an element is performed "attacca".</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="attacca">
+        <desc xml:lang="en">Indicates that the performance of the next musical division should begin immediately
+          following this one.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.barLine.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.beam.ges" module="MEI.gestural" type="atts">
@@ -7418,15 +7534,15 @@
   </classSpec><classSpec rend="add" ident="att.beamSpan.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.beatRpt.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.bend.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="amount" usage="opt">
@@ -7440,13 +7556,13 @@
   </classSpec><classSpec rend="add" ident="att.bracketSpan.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.breath.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.timestamp.gestural"/>
+      <memberOf key="att.timestamp.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.bTrem.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
@@ -7456,14 +7572,14 @@
   </classSpec><classSpec rend="add" ident="att.caesura.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.chord.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.articulation.gestural"/>
-      <memberOf key="att.duration.gestural"/>
+      <memberOf key="att.articulation.ges"/>
+      <memberOf key="att.duration.ges"/>
       <memberOf key="att.instrumentIdent"/>
       <memberOf key="att.chord.ges.cmn"/>
     </classes>
@@ -7472,7 +7588,7 @@
   </classSpec><classSpec rend="add" ident="att.chordMember.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.accidental.gestural"/>
+      <memberOf key="att.accidental.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.clef.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
@@ -7481,8 +7597,8 @@
   </classSpec><classSpec rend="add" ident="att.cpMark.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.curve.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
@@ -7490,31 +7606,25 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.mdiv.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="attacca">
-        <desc xml:lang="en">Indicates that the performance of the next musical division should begin immediately
-          following this one.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
-        </datatype>
-      </attDef>
-    </attList>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.attacking"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.dir.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.dot.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-  </classSpec><classSpec rend="add" ident="att.duration.gestural" module="MEI.gestural" type="atts">
+  </classSpec><classSpec rend="add" ident="att.duration.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record performed duration that differs from a feature’s written
       duration.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="dur.ges" usage="opt">
         <desc xml:lang="en">Records performed duration information that differs from the written duration.</desc>
         <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.DURATION.gestural"/>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.DURATION.GESTURAL"/>
         </datatype>
       </attDef>
       <attDef ident="dots.ges" usage="opt">
@@ -7559,40 +7669,40 @@
   </classSpec><classSpec rend="add" ident="att.dynam.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
+      <memberOf key="att.duration.ges"/>
       <memberOf key="att.midiValue"/>
       <memberOf key="att.midiValue2"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.ending.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.episema.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.articulation.gestural"/>
+      <memberOf key="att.articulation.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.f.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.fermata.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
+      <memberOf key="att.duration.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.fing.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.fingGrp.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.fTrem.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
@@ -7602,34 +7712,36 @@
   </classSpec><classSpec rend="add" ident="att.gliss.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.graceGrp.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.grpSym.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.hairpin.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
+      <memberOf key="att.duration.ges"/>
       <memberOf key="att.midiValue"/>
       <memberOf key="att.midiValue2"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.halfmRpt.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
+      <memberOf key="att.duration.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.harm.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.harpPedal.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
+      <memberOf key="att.duration.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.hispanTick.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
@@ -7657,15 +7769,15 @@
   </classSpec><classSpec rend="add" ident="att.line.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes for describing the performed components of a line.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.liquescent.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.lv.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.lyrics.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
@@ -7674,22 +7786,30 @@
       time of the measure. In reality, this is usually the same as the onset time of the first event
       in the measure.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.timestamp.gestural"/>
+      <memberOf key="att.timestamp.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.mensur.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.metaMark.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.meterSig.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.meterSigGrp.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.midi.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.mNum.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.mordent.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.mRest.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
+      <memberOf key="att.duration.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.mRpt.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
@@ -7698,12 +7818,12 @@
   </classSpec><classSpec rend="add" ident="att.mSpace.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
+      <memberOf key="att.duration.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.multiRest.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
+      <memberOf key="att.duration.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.multiRpt.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
@@ -7711,54 +7831,36 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      <memberOf key="att.accidental.gestural"/>
-      <memberOf key="att.articulation.gestural"/>
-      <memberOf key="att.duration.gestural"/>
+      <memberOf key="att.accidental.ges"/>
+      <memberOf key="att.articulation.ges"/>
+      <memberOf key="att.duration.ges"/>
       <memberOf key="att.instrumentIdent"/>
       <memberOf key="att.midiVelocity"/>
+      <memberOf key="att.pitch.ges"/>
     </classes>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="oct.ges" usage="opt">
-        <desc xml:lang="en">Records performed octave information that differs from the written value.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.OCTAVE"/>
-        </datatype>
-      </attDef>
-      <attDef ident="pname.ges" usage="opt">
-        <desc xml:lang="en">Contains a performed pitch name that differs from the written value.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PITCHNAME.GES"/>
-        </datatype>
-      </attDef>
-      <attDef ident="pnum" usage="opt">
-        <desc xml:lang="en">Holds a pitch-to-number mapping, a base-40 or MIDI note number, for example.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PITCHNUMBER"/>
-        </datatype>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.ncGrp.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.timestamp.gestural"/>
+      <memberOf key="att.timestamp.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.neume.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.timestamp.gestural"/>
+      <memberOf key="att.timestamp.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.note.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.accidental.gestural"/>
-      <memberOf key="att.articulation.gestural"/>
-      <memberOf key="att.duration.gestural"/>
+      <memberOf key="att.accidental.ges"/>
+      <memberOf key="att.articulation.ges"/>
+      <memberOf key="att.duration.ges"/>
       <memberOf key="att.instrumentIdent"/>
       <memberOf key="att.midiVelocity"/>
       <memberOf key="att.note.ges.mensural"/>
+      <memberOf key="att.pitch.ges"/>
       <memberOf key="att.stringtab"/>
     </classes>
-    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="extremis_disallows_gestural_pitch" scheme="isoschematron">
+    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="extremis_disallows_gestural_pitch" scheme="schematron">
       <constraint>
         <sch:rule context="mei:note[@extremis]">
           <sch:assert test="not(@pname.ges) and not(@oct.ges)">When the @extremis attribute is used,
@@ -7785,38 +7887,20 @@
             necessary to record the written pitch and octave of the symbol for this note.</p>
         </remarks>
       </attDef>
-      <attDef ident="oct.ges" usage="opt">
-        <desc xml:lang="en">Records performed octave information that differs from the written value.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.OCTAVE"/>
-        </datatype>
-      </attDef>
-      <attDef ident="pname.ges" usage="opt">
-        <desc xml:lang="en">Contains a performed pitch name that differs from the written value.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PITCHNAME.GES"/>
-        </datatype>
-      </attDef>
-      <attDef ident="pnum" usage="opt">
-        <desc xml:lang="en">Holds a pitch-to-number mapping, a base-40 or MIDI note number, for example.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PITCHNUMBER"/>
-        </datatype>
-      </attDef>
     </attList>
   </classSpec><classSpec rend="add" ident="att.octave.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.oriscus.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.ornam.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.ornamentAccid.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural accidentals associated with ornaments.</desc>
@@ -7847,29 +7931,60 @@
   </classSpec><classSpec rend="add" ident="att.pedal.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.phrase.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
-  </classSpec><classSpec rend="add" ident="att.proport.ges" module="MEI.gestural" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-  </classSpec><classSpec rend="add" ident="att.quilisma.ges" module="MEI.gestural" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-  </classSpec><classSpec rend="add" ident="att.rdg.ges" module="MEI.gestural" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-  </classSpec><classSpec rend="add" ident="att.refrain.ges" module="MEI.gestural" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-  </classSpec><classSpec rend="add" ident="att.reh.ges" module="MEI.gestural" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-  </classSpec><classSpec rend="add" ident="att.rest.ges" module="MEI.gestural" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.rest.ges.mensural"/>
+  </classSpec><classSpec rend="add" ident="att.pitch.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural attributes about pitch.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="oct.ges" usage="opt">
+        <desc xml:lang="en">Records performed octave information that differs from the written value.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.OCTAVE"/>
+        </datatype>
+      </attDef>
+      <attDef ident="pname.ges" usage="opt">
+        <desc xml:lang="en">Contains a performed pitch name that differs from the written value.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PITCHNAME.GESTURAL"/>
+        </datatype>
+      </attDef>
+      <attDef ident="pnum" usage="opt">
+        <gloss versionDate="2022-10-30" xml:lang="en">pitch number</gloss>
+        <desc xml:lang="en">Holds a pitch-to-number mapping, a base-40 or MIDI note number, for example.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PITCHNUMBER"/>
+        </datatype>
+      </attDef>
+    </attList>
+  </classSpec><classSpec rend="add" ident="att.plica.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes that describe the properties of a plica in the mensural repertoire.</desc>
+  </classSpec><classSpec rend="add" ident="att.proport.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.quilisma.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.rdg.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.refrain.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.reh.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.repeatMark.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
+    </classes>
+  </classSpec><classSpec rend="add" ident="att.rest.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.rest.ges.mensural"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.sb.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
@@ -7892,22 +8007,16 @@
     </classes>
   </classSpec><classSpec rend="add" ident="att.section.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="attacca">
-        <desc xml:lang="en">Indicates that the performance of the next section should begin immediately following
-          this one.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
-        </datatype>
-      </attDef>
-    </attList>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.attacking"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.signifLet.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.slur.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.soundLocation" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that locate a sound source within 3-D space.</desc>
@@ -7936,12 +8045,12 @@
   </classSpec><classSpec rend="add" ident="att.sp.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.space.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
+      <memberOf key="att.duration.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.staff.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
@@ -7961,8 +8070,10 @@
   </classSpec><classSpec rend="add" ident="att.stageDir.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.stem.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes that describe the properties of a stem in the mensural repertoire.</desc>
   </classSpec><classSpec rend="add" ident="att.strophicus.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.syl.ges" module="MEI.gestural" type="atts">
@@ -7979,9 +8090,9 @@
   </classSpec><classSpec rend="add" ident="att.tie.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
-  </classSpec><classSpec rend="add" ident="att.timestamp.gestural" module="MEI.gestural" type="atts">
+  </classSpec><classSpec rend="add" ident="att.timestamp.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record a performed (as opposed to notated) time stamp.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="tstamp.ges" usage="opt">
@@ -7998,7 +8109,7 @@
         </datatype>
       </attDef>
     </attList>
-  </classSpec><classSpec rend="add" ident="att.timestamp2.gestural" module="MEI.gestural" type="atts">
+  </classSpec><classSpec rend="add" ident="att.timestamp2.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record a performed (as opposed to notated) time stamp for the end of an
       event.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -8019,18 +8130,18 @@
   </classSpec><classSpec rend="add" ident="att.trill.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.duration.ges"/>
+      <memberOf key="att.timestamp2.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.tuplet.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.duration.gestural"/>
+      <memberOf key="att.duration.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.tupletSpan.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.timestamp2.gestural"/>
+      <memberOf key="att.timestamp2.ges"/>
       <memberOf key="att.tuplet.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.turn.ges" module="MEI.gestural" type="atts">
@@ -8057,7 +8168,7 @@
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.harm.log" module="MEI.harmony" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
@@ -8065,16 +8176,17 @@
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="chordref" usage="opt">
+        <gloss versionDate="2022-10-30" xml:lang="en">chord reference</gloss>
         <desc xml:lang="en">Contains a reference to a <gi scheme="MEI">chordDef</gi> element elsewhere in the
           document.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_chordrefTarget" scheme="isoschematron">
+        <constraintSpec ident="check_chordrefTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@chordref">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@chordref attribute
@@ -8168,7 +8280,7 @@
       <memberOf key="model.harmLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="model.graphicPrimitiveLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/><ref name="model.figbassLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="harm_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="harm_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:harm">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -8187,6 +8299,7 @@
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="editionStmt"/></optional>
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="pubStmt"/></optional>
+      <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="availability"/></optional>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="physDesc"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="physLoc"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="seriesStmt"/></zeroOrMore>
@@ -8242,6 +8355,60 @@
         </datatype>
       </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.perfRes" module="MEI.header" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that define the characteristics and components of the performance resource.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.perfRes.basic"/>
+      <memberOf key="att.transposition"/>
+    </classes>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="solo" usage="opt">
+        <desc xml:lang="en">Use this attribute to identify the performance resource as a soloist especially in an accompanied work, such as a concerto or vocal solo.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
+        </datatype>
+      </attDef>
+    </attList>
+  </classSpec><classSpec rend="add" ident="att.perfRes.basic" module="MEI.header" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that define the characteristics and components of the performance resource or a performance resource list.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.adlibitum"/>
+    </classes>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="count" usage="opt">
+        <desc xml:lang="en">Indicates the number of performers.</desc>
+        <datatype>
+          <rng:data type="positiveInteger"/>
+        </datatype>
+      </attDef>
+    </attList>
+  </classSpec><classSpec rend="add" ident="att.adlibitum" module="MEI.header" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe a performance resource as ad libitum (optional).</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="adlib" usage="opt">
+        <desc xml:lang="en">Marks a performance resource as ad libitum (optional).</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
+        </datatype>
+      </attDef>
+    </attList>
+    <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>The technical term “ad libitum” has several meanings depending on the context in which it occurs:</p>
+      <p>
+        <list type="gloss">
+          <head>Meanings of ad libitum</head>
+          <label>1</label>
+          <item>indicates an optional performance resource (instrumental or vocal part or group),</item>
+          <label>2</label>
+          <item>marks a passage to be played freely or free in time,</item>
+          <label>3</label>
+          <item>requests or invites to improvise a passage of music,</item>
+          <label>4</label>
+          <item>indicates that the number repetitions can be set individually or spontaneously.</item>
+        </list>
+      </p>
+      <p>Currently only the use within a performance resource (case 1) is supported.</p>
+    </remarks>
   </classSpec><classSpec rend="add" ident="att.recordType" type="atts" module="MEI.header">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that define the characteristics and components of the bibliographic
       description.</desc>
@@ -8415,8 +8582,7 @@
         information about limitations on the <hi rend="bold">use</hi> of material, such as those
         afforded by copyright.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Encoded Archival Description (EAD)
-        standard.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-accessrestrict">accessrestrict</ref> element of the Encoded Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="acquisition" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Records information concerning the process by which an item was acquired by the holding
       institution.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -8424,9 +8590,9 @@
       <memberOf key="att.datable"/>
       <memberOf key="att.lang"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
+      <choice xmlns="http://relaxng.org/ns/structure/1.0"><group><zeroOrMore><ref name="model.headLike"/></zeroOrMore><zeroOrMore><choice><ref name="eventList"/><ref name="model.pLike"/></choice></zeroOrMore></group><zeroOrMore><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore></choice>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-acquisition.html">acquisition</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="altId" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">alternative identifier</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">May contain a bibliographic identifier that does not fit within
       the meiHead element’s id attribute, for example because the identifier does not fit the
       definition of an XML id or because multiple identifiers are needed.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -8435,7 +8601,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.lbLike"/><ref name="model.rendLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>One or the other of <gi scheme="MEI">altId</gi> or the <att>id</att> attribute on <gi scheme="MEI">mei</gi> is required when applicable.</p>
+      <p>One or the other of <gi scheme="MEI">altId</gi> or the <att>xml:id</att> attribute on <gi scheme="MEI">mei</gi> is required when applicable.</p>
     </remarks></elementSpec><elementSpec rend="add" ident="appInfo" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">application information</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups information about applications which have acted upon
       the MEI file.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -8444,7 +8610,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="application"/></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-appInfo.html">appInfo</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="application" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Provides information about an application which has acted upon the current
       document.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -8459,13 +8625,13 @@
           <rng:data type="NMTOKEN"/>
         </datatype>
       </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-application.html">application</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="attUsage" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Documents the usage of a specific attribute of the element.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="desc"/></optional>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="context_attribute_requires_content" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="context_attribute_requires_content" scheme="schematron">
       <constraint>
         <sch:rule context="@context">
           <sch:assert role="warning" test="not(normalize-space(.) eq '')">@context attribute should
@@ -8478,7 +8644,7 @@
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.NMTOKEN"/>
         </datatype>
       </attDef><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="context" usage="opt">
-        <desc xml:lang="en">Circumstances in which the element appears, an XPath expression.</desc>
+        <desc xml:lang="en">Circumstances in which the attribute appears, an XPath expression.</desc>
         <datatype>
           <rng:data type="string"/>
         </datatype>
@@ -8497,14 +8663,13 @@
       <memberOf key="att.bibl"/>
       <memberOf key="att.dataPointing"/>
       <memberOf key="model.pubStmtPart"/>
-      <memberOf key="model.titlePagePart"/>
+      <memberOf key="model.imprintPart"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.availabilityPart"/>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>When used within the <gi scheme="MEI">fileDesc</gi> element, <gi scheme="MEI">availability</gi> indicates access to the MEI-encoded document itself.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-availability.html">availability</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="bifolium" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Describes a folded sheet of paper.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.dimensions"/>
@@ -8555,7 +8720,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="desc"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="catRel"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="category"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="category_id" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="category_id" scheme="schematron">
       <constraint>
         <sch:rule context="mei:category">
           <sch:assert test="@xml:id" role="warning">To be addressable, the category element must
@@ -8600,7 +8765,7 @@
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="respStmt"/></optional>
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="changeDesc"/>
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.dateLike"/></optional>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_change" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_change" scheme="schematron">
       <constraint>
         <sch:rule context="mei:change">
           <sch:assert test="@isodate or mei:date">The date of the change must be recorded in an
@@ -8619,8 +8784,7 @@
         to designate an MEI encoding that has been so substantively changed that it constitutes a
         new version that supersedes earlier versions.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Encoded Archival Description (EAD)
-        standard.</p>
+      <p>The model of this element is based on the respective element of the Encoded Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="changeDesc" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">change description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Description of a revision of the MEI file.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -8657,14 +8821,14 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><choice><zeroOrMore><ref name="model.workLike"/></zeroOrMore><zeroOrMore><ref name="model.expressionLike"/></zeroOrMore></choice><choice><zeroOrMore><ref name="model.manifestationLike"/></zeroOrMore><zeroOrMore><ref name="model.itemLike"/></zeroOrMore></choice></choice>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="checkComponentList" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="checkComponentList" scheme="schematron">
       <constraint>
         <sch:rule context="mei:componentList">
           <sch:assert test="every $i in ./child::mei:*[not(local-name()='head')] satisfies             $i/local-name() eq ./parent::mei:*/local-name()">Only child elements of the same name as the parent of the componentList are
             allowed.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="checkComponents" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="checkComponents" scheme="schematron">
       <constraint>
         <sch:rule context="mei:componentList[mei:*[@comptype]]">
           <sch:assert role="warning" test="count(mei:*[@comptype]) = count(mei:*[local-name() ne 'head'])">When any child
@@ -8692,8 +8856,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Encoded Archival Description (EAD)
-        standard.</p>
+      <p>The model of this element is based on the respective element of the Encoded Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="contentItem" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a single entry within a content description element.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -8708,7 +8871,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><optional><ref name="model.pLike"/></optional><oneOrMore><optional><ref name="label"/></optional><ref name="contentItem"/></oneOrMore></choice>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="checkContentsLabels" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="checkContentsLabels" scheme="schematron">
       <constraint>
         <sch:rule context="mei:contents[mei:label]">
           <sch:assert role="warning" test="count(mei:label) = count(mei:contentItem)">When labels
@@ -8718,7 +8881,7 @@
     </constraintSpec><exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:space="preserve">
 <contents>
-  <p>A suitable tone ; Left hand colouring ; Rhythm and accent ; Tempo ; 
+  <p>A suitable tone ; Left hand coloring ; Rhythm and accent ; Tempo ; 
     Flexibility ; Ornaments</p>
 </contents>
             </egXML>
@@ -8780,7 +8943,7 @@
           </valItem>
         </valList>
       </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-correction.html">correction</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="cutout" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A cutout is a section of a document sheet that has been removed and is now missing.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.dimensions"/>
@@ -8876,8 +9039,8 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.editionLike"/><zeroOrMore><choice><ref name="model.respLikePart"/><ref name="respStmt"/></choice></zeroOrMore></oneOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-editionStmt.html">editionStmt</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-editionstmt">editionstmt</ref> Encoded
+        Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="editorialDecl" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">editorial declaration</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Used to provide details of editorial principles and practices
       applied during the encoding of musical text.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -8889,7 +9052,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><oneOrMore><ref name="model.pLike"/></oneOrMore><group><oneOrMore><ref name="model.editorialDeclPart"/></oneOrMore><zeroOrMore><ref name="model.pLike"/></zeroOrMore></group></choice>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-editorialDecl.html">editorialDecl</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="encodingDesc" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">encoding description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Documents the relationship between an electronic file and the
       source or sources from which it was derived as well as applications used in the
       encoding/editing process.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -8906,7 +9069,7 @@
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="tagsDecl"/></optional>
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="classDecls"/></optional>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-encodingDesc.html">encodingDesc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="exhibHist" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">exhibition history</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A record of public exhibitions, including dates, venues,
       etc.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -8916,8 +9079,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><group><zeroOrMore><ref name="model.headLike"/></zeroOrMore><zeroOrMore><choice><ref name="eventList"/><ref name="model.pLike"/></choice></zeroOrMore></group><zeroOrMore><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore></choice>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Encoded Archival Description (EAD)
-        standard.</p>
+      <p>The model of this element is based on the <abbr>MARC</abbr> <ref target="https://www.loc.gov/marc/bibliographic/bd585.html">585</ref> field.</p>
     </remarks></elementSpec><elementSpec rend="add" ident="extMeta" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">extended metadata</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Provides a container element for non-MEI metadata formats.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -8947,8 +9109,8 @@
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>Extent in this context represents file size.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-fileDesc.html">fileDesc</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-filedesc">filedesc</ref> element of the Encoded
+        Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="foliaDesc" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Describes the order of folia and bifolia making up the text block of a manuscript or
       print.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -8993,7 +9155,7 @@
         <val>thick</val>, etc. may be described within the content of the <gi scheme="MEI">hand</gi> 
         element.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-handNote.html">handNote</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="handList" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Container for one or more hand elements.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -9001,7 +9163,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><optional><ref name="label"/></optional><ref name="hand"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="checkHandListLabels" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="checkHandListLabels" scheme="schematron">
       <constraint>
         <sch:rule context="mei:handList[mei:label]">
           <sch:assert role="warning" test="count(mei:label) = count(mei:hand)">When labels are used,
@@ -9009,7 +9171,7 @@
         </sch:rule>
       </constraint>
     </constraintSpec><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-handNotes.html">handNotes</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="history" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Provides a container for information about the history of a resource other than the
       circumstances of its creation.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9018,7 +9180,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="acquisition"/><ref name="exhibHist"/><ref name="provenance"/><ref name="treatHist"/><ref name="treatSched"/><ref name="model.divLike"/><ref name="model.textComponentLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="history_restriction" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="history_restriction" scheme="schematron">
       <constraint>
         <sch:rule context="mei:history[parent::mei:work or parent::mei:expression or parent::mei:manifestation[not(@singleton='true')]]">
           <sch:assert test="not(mei:acquisition or mei:provenance or mei:exhibHist or mei:treatHist or mei:treatSched)">The elements acquisition, provenance, exhibHist, treatHist and treatSched are not permitted at the work or expression level and are only permitted at the manifestation level, if the manifestation is a manifestation singleton.</sch:assert>
@@ -9036,7 +9198,7 @@
       <memberOf key="att.whitespace"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:text/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_incipCode_form_mimetype" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_incipCode_form_mimetype" scheme="schematron">
       <constraint>
         <sch:rule context="mei:incipCode">
           <sch:assert test="@form or @mimetype">incipCode must have a form or mimetype
@@ -9053,7 +9215,7 @@
             <desc xml:lang="en">Plaine &amp; Easie Code.</desc>
           </valItem>
           <valItem ident="humdrumKern">
-            <desc xml:lang="en">Humdrum Kern format.</desc>
+            <desc xml:lang="en">**kern representation of the Humdrum format.</desc>
           </valItem>
           <valItem ident="parsons">
             <desc xml:lang="en">Parsons code.</desc>
@@ -9084,24 +9246,20 @@
       <memberOf key="att.lang"/>
       <memberOf key="model.editorialDeclPart"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name=""/></zeroOrMore>
+      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.pLike"/></oneOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-interpretation.html">interpretation</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="key" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Key captures information about tonal center and mode.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.accidental"/>
       <memberOf key="att.bibl"/>
+      <memberOf key="att.keyMode"/>
       <memberOf key="att.pitch"/>
       <memberOf key="model.workIdent"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:text/>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="mode" usage="opt">
-        <desc xml:lang="en">Indicates major, minor, or other tonality.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MODE"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>This element is used exclusively within bibliographic descriptions. Do not confuse this
         element with <gi scheme="MEI">keySig</gi>, which is used within the body of an MEI file to
         record this data.</p>
@@ -9119,8 +9277,8 @@
         of the authorizing list may be encoded in the <att>auth</att> attribute and the
         <att>auth.uri</att> attribute, respectively.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-language.html">language</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-language">language</ref> element of the Encoded
+        Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="langUsage" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">language usage</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements describing the languages, sub-languages, dialects,
       etc., represented within the encoded resource.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9130,7 +9288,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="language"/></oneOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-langUsage.html">langUsage</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="meiHead" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">MEI header</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Supplies the descriptive and declarative metadata prefixed to every
       MEI-conformant text.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.basic"/>
@@ -9226,7 +9384,7 @@
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.NMTOKEN"/>
         </datatype>
       </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-namespace.html">namespace</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="normalization" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Indicates the extent of normalization or regularization of the original source carried out
       in converting it to electronic form.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9239,8 +9397,8 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.pLike"/></oneOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="notesStmt" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">(notes statement)– Collects any notes providing information about a text additional to
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-normalization.html">normalization</ref> element of the Text Encoding Initiative (TEI).</p>
+    </remarks></elementSpec><elementSpec rend="add" ident="notesStmt" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">notes statement</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Collects any notes providing information about a text additional to
       that recorded in other parts of the bibliographic description.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -9248,7 +9406,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.annotLike"/></oneOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-notesStmt.html">notesStmt</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="otherChar" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">other distinguishing characteristic</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Any characteristic that serves to differentiate a
       work or expression from another.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9360,34 +9518,24 @@
       <memberOf key="att.bibl"/>
       <memberOf key="att.edit"/>
       <memberOf key="att.lang"/>
+      <memberOf key="att.perfRes"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="perfRes"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="count" usage="opt">
-        <desc xml:lang="en">Indicates the number of performers.</desc>
-        <datatype>
-          <rng:data type="positiveInteger"/>
-        </datatype>
-      </attDef><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="solo" usage="opt">
-        <desc xml:lang="en">Marks this instrument or vocal part as a soloist. Do not use this attribute for a solo
-          instrument which is not accompanied.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
-        </datatype>
-      </attDef></attList></elementSpec><elementSpec rend="add" ident="perfResList" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Several instrumental or vocal resources treated as a group.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>In the context of a performance resource the attribute <att>adlib</att> marks a resource as optional.</p>
+    </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>To indicate the tuning of an instrument, the attribute <att>trans.diat</att> can be used.</p>
+    </remarks></elementSpec><elementSpec rend="add" ident="perfResList" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">performance resources list</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Several instrumental or vocal resources treated as a group.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.authorized"/>
       <memberOf key="att.bibl"/>
       <memberOf key="att.edit"/>
       <memberOf key="att.lang"/>
+      <memberOf key="att.perfRes.basic"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="annot"/><ref name="perfRes"/><ref name="perfResList"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="count" usage="opt">
-        <desc xml:lang="en">Indicates the number of performers.</desc>
-        <datatype>
-          <rng:data type="positiveInteger"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>The function of instrumentalists or vocalists is represented by the choice of <gi scheme="MEI">perfRes</gi> and <gi scheme="MEI">perfResList</gi> child elements. Arrangements
         are coded for the medium of the work being described, not for the original medium.</p>
     </remarks></elementSpec><elementSpec rend="add" ident="physDesc" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">physical description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Container for information about the appearance, construction, or
@@ -9404,8 +9552,7 @@
         transcribed as part of the front or back matter; <abbr>i.e.</abbr>, when they are considered to be
         meta-data rather than a transcription.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Encoded Archival Description (EAD)
-        standard.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-physdesc">physdesc</ref> element of the Encoded Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="physMedium" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">physical medium</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Records the physical materials used in the source, such as ink and
       paper.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9419,9 +9566,8 @@
       <p>All materials may be described in a single <gi scheme="MEI">physMedium</gi> element or
         multiple elements may be used, one for each medium.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Encoded Archival Description (EAD) standard. It
-        has the same function as the material element in the Text Encoding Initiative (TEI)
-        standard.</p>
+      <p>The model of this element is based on respective elements of the Encoded Archival Description (EAD). It
+        has the same function as the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-material.html">material</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="plateNum" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">plate number</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Designation assigned to a resource by a music publisher, usually printed
       at the bottom of each page, and sometimes appearing also on the title page.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9480,7 +9626,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.pLike"/></oneOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-projectDesc.html">projectDesc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="provenance" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">The record of ownership or custodianship of an item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -9489,8 +9635,8 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><group><zeroOrMore><ref name="model.headLike"/></zeroOrMore><zeroOrMore><choice><ref name="eventList"/><ref name="model.pLike"/></choice></zeroOrMore></group><zeroOrMore><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore></choice>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Encoded Archival Description (EAD) and Text
-        Encoding Initiative (TEI) standards.</p>
+      <p>The model of this element is based on the respective element of the Encoded Archival Description (EAD) and the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-provenance.html">provenance</ref> element of the Text
+        Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="pubStmt" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">publication statement</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Container for information regarding the publication or
       distribution of a bibliographic item, including the publisher’s name and address, the date of
       publication, and other relevant details.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -9502,7 +9648,7 @@
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>When an item is unpublished, use only the <gi scheme="MEI">unpub</gi> sub-element.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-publicationStmt.html">publicationStmt</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="revisionDesc" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">revision description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Container for information about alterations that have been made
       to an MEI file.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9514,7 +9660,7 @@
       <p>It is recommended that changes be recorded in reverse chronological order, with the most
         recent alteration first.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-revisionDesc.html">revisionDesc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="samplingDecl" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">sampling declaration</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a prose description of the rationale and methods used in
       sampling texts in the creation of a corpus or collection.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9526,7 +9672,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.pLike"/></oneOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-samplingDecl.html">samplingDecl</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="scoreFormat" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Describes the type of score used to represent a musical composition (<abbr>e.g.</abbr>, short score,
       full score, condensed score, close score, etc.).</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9547,7 +9693,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.pLike"/></oneOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-segmentation.html">segmentation</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="seriesStmt" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">series statement</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups information about the series, if any, to which a publication
       belongs.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9562,7 +9708,7 @@
         series, but not describe each component. The <gi scheme="MEI">seriesStmt</gi> element is
         provided within seriesStmt for the description of a sub-series.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-seriesStmt.html">seriesStmt</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="soundChan" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">sound channels</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Reflects the number of apparent sound channels in the playback of a
       recording (monaural, stereophonic, quadraphonic, etc.).</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9613,8 +9759,8 @@
       <p>The <att>data</att> attribute may be used to reference one or more musical features found
         in the content of this particular source.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-source.html">source</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-source">source</ref> element of the Encoded
+        Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="sourceDesc" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">source description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A container for the descriptions of the source(s) used in the
       creation of the electronic file.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9644,7 +9790,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.pLike"/></oneOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-stdVals.html">stdVals</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="sysReq" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">system requirements</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">System requirements for using the electronic item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -9661,14 +9807,14 @@
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="desc"/></optional>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="namespace"/></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-tagsDecl.html">tagsDecl</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="tagUsage" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Documents the usage of a specific element within the document.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="desc"/></optional>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="attUsage"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="context_attribute_requires_content" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="context_attribute_requires_content" scheme="schematron">
       <constraint>
         <sch:rule context="@context">
           <sch:assert role="warning" test="not(normalize-space(.) eq '')">@context attribute should
@@ -9697,7 +9843,7 @@
           <rng:data type="nonNegativeInteger"/>
         </datatype>
       </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-tagUsage.html">tagUsage</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="taxonomy" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Defines a typology either implicitly, by means of a bibliographic citation, or explicitly
       by a structured taxonomy.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9714,7 +9860,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><optional><ref name="label"/></optional><ref name="term"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="checkTermListLabels" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="checkTermListLabels" scheme="schematron">
       <constraint>
         <sch:rule context="mei:termList[mei:label]">
           <sch:assert role="warning" test="count(mei:label) = count(mei:term)">When labels are used,
@@ -9732,7 +9878,7 @@
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.titleLike"/></oneOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.respLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-titleStmt.html">titleStmt</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="trackConfig" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">track configuration</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Number of physical/input tracks on a sound medium (<abbr>e.g.</abbr>, eight
       track, twelve track).</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9766,8 +9912,7 @@
       <p>Treatment history may also comprise details of the treatment process (<abbr>e.g.</abbr>, chemical
         solutions used, techniques applied, etc.), the date the treatment was applied, etc.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Encoded Archival Description (EAD)
-        standard.</p>
+      <p>The model of this element is based on the respective element of the Encoded Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="treatSched" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">treatment scheduled</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Scheduled treatment, <abbr>e.g.</abbr>, de-acidification, restoration, etc., for
       an item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -9777,13 +9922,13 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><group><zeroOrMore><ref name="model.headLike"/></zeroOrMore><zeroOrMore><choice><ref name="eventList"/><ref name="model.pLike"/></choice></zeroOrMore></group><zeroOrMore><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore></choice>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Encoded Archival Description (EAD)
-        standard.</p>
+      <p>The model of this element is based on the respective element of the Encoded Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="unpub" module="MEI.header"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">unpublished</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Used to explicitly indicate that a bibliographic resource is
       unpublished.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
       <memberOf key="att.lang"/>
+      <memberOf key="model.imprintPart"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:text/>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
@@ -9806,8 +9951,7 @@
         the <gi scheme="MEI">accessRestrict</gi> element, which holds information about conditions
         affecting the availability of the material.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Encoded Archival Description (EAD)
-        standard.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-userestrict">userestrict</ref> element of the Encoded Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="watermark" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a description of a watermark or similar device.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -9821,7 +9965,7 @@
       <p>The <att>facs</att> attribute may be used to record the location of the watermark in a
         facsimile image.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-watermark.html">watermark</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="work" module="MEI.header"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Provides a detailed description of a work — a distinct intellectual or artistic creation —
       specifically its history, language use, and high-level musical attributes (<abbr>e.g.</abbr>, key, tempo,
       meter, medium of performance, and intended duration).</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -10087,7 +10231,7 @@
     </content>
   </macroSpec><classSpec rend="add" ident="att.duration.quality" module="MEI.mensural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attribute that expresses duration for a given mensural note symbol.</desc>
-    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_duplex_quality" scheme="isoschematron">
+    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_duplex_quality" scheme="schematron">
       <constraint>
         <sch:rule context="(mei:note|mei:space)[@dur.quality='duplex']">
           <sch:assert test="@dur='longa'">
@@ -10096,7 +10240,7 @@
         </sch:rule>
       </constraint>
     </constraintSpec>
-    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_maiorminor_quality" scheme="isoschematron">
+    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_maiorminor_quality" scheme="schematron">
       <constraint>
         <sch:rule context="(mei:note|mei:space)[@dur.quality='maior' or @dur.quality='minor']">
           <sch:assert test="@dur='semibrevis'">
@@ -10145,7 +10289,7 @@
     </attList>
   </classSpec><classSpec rend="add" ident="att.mensural.shared" module="MEI.mensural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Shared attributes in the mensural repertoire.</desc>
-    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="mensuration_conflicting_attributes" scheme="isoschematron">
+    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="mensuration_conflicting_attributes" scheme="schematron">
       <constraint>
         <sch:rule context="mei:mensur[@divisio]">
           <sch:assert test="not(@tempus) and not(@prolatio)">
@@ -10205,28 +10349,8 @@
         </datatype>
       </attDef>
     </attList>
-  </classSpec><classSpec rend="add" ident="att.plica.anl" module="MEI.mensural" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes that describe the properties of a plica in the mensural repertoire.</desc>
-  </classSpec><classSpec rend="add" ident="att.plica.ges" module="MEI.mensural" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes that describe the properties of a plica in the mensural repertoire.</desc>
   </classSpec><classSpec rend="add" ident="att.plica.log" module="MEI.mensural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes that describe the properties of a plica in the mensural repertoire.</desc>
-  </classSpec><classSpec rend="add" ident="att.plica.vis" module="MEI.mensural" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes that describe the properties of a plica stem in the mensural repertoire.</desc>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="dir" usage="opt">
-        <desc xml:lang="en">Describes the direction of a stem.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.STEMDIRECTION.basic"/>
-        </datatype>
-      </attDef>
-      <attDef ident="len" usage="opt">
-        <desc xml:lang="en">Encodes the stem length.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MEASUREMENTUNSIGNED"/>
-        </datatype>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.proport.log" module="MEI.mensural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes. These attributes describe augmentation or diminution of the
       normal value of the notes in mensural notation as a ratio.</desc>
@@ -10270,58 +10394,8 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.mensural.vis"/>
     </classes>
-  </classSpec><classSpec rend="add" ident="att.stem.anl" module="MEI.mensural" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes that describe the properties of a stem in the mensural repertoire.</desc>
-  </classSpec><classSpec rend="add" ident="att.stem.ges" module="MEI.mensural" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes that describe the properties of a stem in the mensural repertoire.</desc>
   </classSpec><classSpec rend="add" ident="att.stem.log" module="MEI.mensural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes that describe the properties of a stem in the mensural repertoire.</desc>
-  </classSpec><classSpec rend="add" ident="att.stem.vis" module="MEI.mensural" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes that describe the properties of a stem in the mensural repertoire.</desc>
-    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-        <memberOf key="att.xy"/>
-        <memberOf key="att.color"/>
-        <memberOf key="att.extSym"/>
-        <memberOf key="att.visibility"/>
-    </classes>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="pos" usage="opt">
-        <desc xml:lang="en">Records the position of the stem in relation to the note head(s).</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.STEMPOSITION"/>
-        </datatype>
-      </attDef>
-      <attDef ident="len" usage="opt">
-        <desc xml:lang="en">Encodes the stem length.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MEASUREMENTUNSIGNED"/>
-        </datatype>
-      </attDef>
-      <attDef ident="form" usage="opt">
-        <desc xml:lang="en">Encodes the form of the stem using the values provided by the data.STEMFORM.mensural datatype.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.STEMFORM.mensural"/>
-        </datatype>
-      </attDef>
-      <attDef ident="dir" usage="opt">
-        <desc xml:lang="en">Describes the direction of a stem.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.STEMDIRECTION"/>
-        </datatype>
-      </attDef>
-      <attDef ident="flag.pos" usage="opt">
-        <desc xml:lang="en">Records the position of the flag using the values provided by the data.FLAGPOS.mensural datatype.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.FLAGPOS.mensural"/>
-        </datatype>
-      </attDef>
-      <attDef ident="flag.form" usage="opt">
-        <desc xml:lang="en">Encodes the form of the flag using the values provided by the data.FLAGFORM.mensural datatype.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.FLAGFORM.mensural"/>
-        </datatype>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.stems.mensural" module="MEI.mensural" type="atts">
       <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe the properties of stemmed features specific to mensural repertoires.</desc>
       <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -10343,11 +10417,6 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="model.layerPart.mensuralAndNeumes"/>
     </classes>
-  </classSpec><classSpec rend="add" predeclare="true" ident="model.sectionPart.mensural" module="MEI.mensural" type="model">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements that may appear as part of a section in the mensural repertoire.</desc>
-    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="model.sectionPart.mensuralAndNeumes"/>
-    </classes>
   </classSpec><classSpec rend="add" predeclare="true" ident="model.staffDefPart.mensural" module="MEI.mensural" type="model">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements that may appear in the declaration of staff features.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -10398,7 +10467,7 @@
       <memberOf key="att.plica.vis"/>
       <memberOf key="att.plica.ges"/>
       <memberOf key="att.plica.anl"/>
-    </classes><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_plica" scheme="isoschematron">
+    </classes><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_plica" scheme="schematron">
       <constraint>
         <sch:rule context="mei:plica">
           <sch:assert test="count(../mei:plica) &lt;= 1">Only one plica is allowed.</sch:assert>
@@ -10429,7 +10498,7 @@
       <memberOf key="att.stem.anl"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_stem" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_stem" scheme="schematron">
       <constraint>
         <sch:rule context="mei:stem">
           <sch:assert test="not(ancestor::mei:note/@*[starts-with(local-name(),'stem.')])">A note with nested stem elements must not have @stem.* attributes.</sch:assert>
@@ -10480,7 +10549,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_instrTarget" scheme="isoschematron">
+        <constraintSpec ident="check_instrTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@instr">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@instr attribute
@@ -10498,8 +10567,8 @@
       <memberOf key="att.layerIdent"/>
       <memberOf key="att.partIdent"/>
       <memberOf key="att.staffIdent"/>
-      <memberOf key="att.timestamp.logical"/>
-      <memberOf key="att.timestamp.gestural"/>
+      <memberOf key="att.timestamp.log"/>
+      <memberOf key="att.timestamp.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.midi.log" module="MEI.midi" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
@@ -10510,7 +10579,7 @@
     </classes>
   </classSpec><classSpec rend="add" ident="att.midiInstrument" module="MEI.midi" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record MIDI instrument information.</desc>
-    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="One_of_instrname_or_instrnum" scheme="isoschematron">
+    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="One_of_instrname_or_instrnum" scheme="schematron">
       <constraint>
         <sch:rule context="mei:*[@midi.instrname]">
           <sch:assert test="not(@midi.instrnum)">Only one of @midi.instrname and @midi.instrnum
@@ -10518,7 +10587,7 @@
         </sch:rule>
       </constraint>
     </constraintSpec>
-    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="One_of_patchname_or_patchnum" scheme="isoschematron">
+    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="One_of_patchname_or_patchnum" scheme="schematron">
       <constraint>
         <sch:rule context="mei:*[@midi.patchname]">
           <sch:assert test="not(@midi.patchnum)">Only one of @midi.patchname and @midi.patchnum
@@ -10571,6 +10640,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record MIDI numbers.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="num" usage="req">
+        <gloss versionDate="2022-10-30" xml:lang="en">number</gloss>
         <desc xml:lang="en">MIDI number in the range set by data.MIDIVALUE.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MIDIVALUE"/>
@@ -10689,7 +10759,13 @@
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>The element’s content must be wrapped in a CDATA section to avoid parsing errors.</p>
     </remarks></elementSpec><elementSpec rend="add" ident="instrDef" module="MEI.midi"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">instrument definition</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">MIDI instrument declaration.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.common"/>
+      <memberOf key="att.basic"/>
+      <memberOf key="att.labelled"/>
+      <memberOf key="att.linking"/>
+      <memberOf key="att.metadataPointing"/>
+      <memberOf key="att.nInteger"/>
+      <memberOf key="att.responsibility"/>
+      <memberOf key="att.typed"/>
       <memberOf key="att.instrDef.anl"/>
       <memberOf key="att.instrDef.ges"/>
       <memberOf key="att.instrDef.log"/>
@@ -10790,7 +10866,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that express the relationship between a component and its host.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="comptype" usage="opt">
-        <constraintSpec ident="checkComponentType" scheme="isoschematron">
+        <constraintSpec ident="checkComponentType" scheme="schematron">
           <constraint>
             <sch:rule context="mei:*[@comptype]">
               <sch:let name="elementName" value="local-name()"/>
@@ -10814,6 +10890,18 @@
         </valList>
       </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.foliation.scheme" type="atts" module="MEI.msDesc">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe foliation schemes.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="scheme" usage="opt">
+        <desc xml:lang="en">Identifies the foliation scheme in terms of which the location is being specified by
+          pointing to some foliation element defining it, or to some other equivalent
+          resource.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" predeclare="true" ident="model.msInline" type="model" module="MEI.msDesc">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements that may appear inline when the msdesc module is active.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -10828,7 +10916,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-accMat.html">accMat</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="addDesc" module="MEI.msDesc"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">addition description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Provides a description of significant additions found within an
       item, such as marginalia or other annotations.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -10838,22 +10926,19 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-additions.html">additions</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="binding" module="MEI.msDesc"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">binding</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a description of one binding, <abbr>i.e.</abbr>, type of covering, boards, etc.
       applied to an item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
+      <memberOf key="att.contemporary"/>
       <memberOf key="att.datable"/>
       <memberOf key="att.lang"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="head"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="condition"/><ref name="decoNote"/><ref name="dimensions"/><ref name="p"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="contemporary" usage="opt">
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-binding.html">binding</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="bindingDesc" module="MEI.msDesc"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">binding description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Describes the present and former bindings of an item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -10863,7 +10948,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="head"/></zeroOrMore>
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><group><zeroOrMore><ref name="binding"/></zeroOrMore><zeroOrMore><choice><ref name="condition"/><ref name="decoNote"/><ref name="p"/></choice></zeroOrMore></group><zeroOrMore><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore></choice>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-bindingDesc.html">bindingDesc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="catchwords" module="MEI.msDesc"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Describes the system used to ensure correct ordering of the quires making up an item,
       typically by means of annotations at the foot of the page.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -10873,8 +10958,15 @@
       <memberOf key="model.physDescPart"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
-    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_catchwords_inline" scheme="schematron">
+      <constraint>
+        <sch:rule context="mei:catchwords">
+          <sch:assert test="ancestor::mei:physDesc">The catchwords element may only appear as a
+            descendant of the physDesc element.</sch:assert>
+        </sch:rule>
+      </constraint>
+    </constraintSpec><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-catchwords.html">catchwords</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="collation" module="MEI.msDesc"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Records a description of how the leaves or bifolia of an item are physically
       arranged.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -10883,7 +10975,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-collation.html">collation</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="colophon" module="MEI.msDesc"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a statement providing information regarding the date, place, agency, or reason
       for production of the item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -10894,7 +10986,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-colophon.html">colophon</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="decoDesc" module="MEI.msDesc"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">decoration description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a description of the decoration of an item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -10903,7 +10995,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><group><zeroOrMore><ref name="head"/></zeroOrMore><zeroOrMore><choice><ref name="condition"/><ref name="decoNote"/><ref name="p"/></choice></zeroOrMore></group><zeroOrMore><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore></choice>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-decoDesc.html">decoDesc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="decoNote" module="MEI.msDesc"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">decoration note</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a description of one or more decorative features of an
       item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -10912,7 +11004,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><group><zeroOrMore><ref name="head"/></zeroOrMore><zeroOrMore><choice><ref name="condition"/><ref name="decoNote"/><ref name="p"/></choice></zeroOrMore></group><zeroOrMore><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore></choice>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-decoNote.html">decoNote</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="explicit" module="MEI.msDesc"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains the explicit of a manuscript item; that is, the closing words of the text proper,
       exclusive of any rubric or colophon which might follow it.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -10923,7 +11015,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-explicit.html">explicit</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="foliation" module="MEI.msDesc"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Describes the numbering system or systems used to count the leaves or pages in a
       codex.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -10932,7 +11024,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-foliation.html">foliation</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="heraldry" module="MEI.msDesc"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a heraldic formula or phrase, typically found as part of a blazon, coat of arms,
       etc.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -10944,7 +11036,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-heraldry.html">heraldry</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="layout" module="MEI.msDesc"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Describes how text is laid out on the page, including information about any ruling,
       pricking, or other evidence of page-preparation techniques.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11002,7 +11094,7 @@
             supplied.</p>
         </remarks>
       </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-layout.html">layout</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="layoutDesc" module="MEI.msDesc"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">layout description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Collects layout descriptions.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -11011,23 +11103,17 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><group><zeroOrMore><ref name="head"/></zeroOrMore><zeroOrMore><choice><ref name="p"/><ref name="layout"/></choice></zeroOrMore></group><zeroOrMore><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore></choice>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-layoutDesc.html">layoutDesc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="locus" module="MEI.msDesc"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Defines a location within a manuscript or manuscript component, usually as a (possibly
       discontinuous) sequence of folio references.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
+      <memberOf key="att.foliation.scheme"/>
       <memberOf key="att.lang"/>
       <memberOf key="model.msInline"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="locus"/><ref name="rend"/><ref name="symbol"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="scheme" usage="opt">
-        <desc xml:lang="en">Identifies the foliation scheme in terms of which the location is being specified by
-          pointing to some foliation element defining it, or to some other equivalent
-          resource.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
-        </datatype>
-      </attDef><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="from" usage="opt">
+    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="from" usage="opt">
         <desc xml:lang="en">Specifies the starting point of the location in a normalized form.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.WORD"/>
@@ -11038,24 +11124,26 @@
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.WORD"/>
         </datatype>
       </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-locus.html">locus</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="locusGrp" module="MEI.msDesc"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">locus group</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups locations which together form a distinct but discontinuous item
       within a manuscript or manuscript part, according to a specific foliation.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
+      <memberOf key="att.foliation.scheme"/>
       <memberOf key="att.lang"/>
       <memberOf key="model.msInline"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="locus"/></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="scheme" usage="opt">
-        <desc xml:lang="en">Identifies the foliation scheme in terms of which the location is being specified by
-          pointing to some foliation element defining it, or to some other equivalent
-          resource.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_locusGrp_inline" module="MEI.msDesc" scheme="schematron">
+      <constraint>
+        <sch:rule context="mei:locusGrp">
+          <sch:assert test="ancestor::mei:physDesc or parent::mei:contentItem or              ancestor::mei:source[ancestor::mei:componentList[ancestor::mei:sourceDesc or              ancestor::mei:sourceList or ancestor::mei:workList]]">The locusGrp element may only appear as a descendant of a physDesc element, a
+            contentItem element, or a source element that is a component of another source or
+            work.</sch:assert>
+        </sch:rule>
+      </constraint>
+    </constraintSpec><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-locusGrp.html">locusGrp</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="rubric" module="MEI.msDesc"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a string of words through which a manuscript signals the beginning or end of a
       text division, often with an assertion as to its author and title, which is in some way set
       off from the text itself, usually in red ink, or by use of different size or type of script,
@@ -11073,11 +11161,11 @@
             <desc xml:lang="en">Signals beginning of a text division.</desc>
           </valItem>
           <valItem ident="final">
-            <desc xml:lang="en">Makrs the end of a text division.</desc>
+            <desc xml:lang="en">Marks the end of a text division.</desc>
           </valItem>
         </valList>
       </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-rubric.html">rubric</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="scriptDesc" module="MEI.msDesc"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">script description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a description of the letters or characters used in an
       autographic item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11087,7 +11175,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><group><zeroOrMore><ref name="head"/></zeroOrMore><zeroOrMore><ref name="p"/></zeroOrMore><zeroOrMore><ref name="scriptNote"/></zeroOrMore></group><zeroOrMore><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore></choice>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-scriptDesc.html">scriptDesc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="scriptNote" module="MEI.msDesc"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">script note</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Describes a particular script distinguished within the description of an
       autographic item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11096,20 +11184,17 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-scriptNote.html">scriptNote</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="seal" module="MEI.msDesc"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A single seal or similar attachment.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
+      <memberOf key="att.contemporary"/>
       <memberOf key="att.datable"/>
       <memberOf key="att.lang"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><group><zeroOrMore><ref name="head"/></zeroOrMore><zeroOrMore><choice><ref name="condition"/><ref name="decoNote"/><ref name="p"/></choice></zeroOrMore></group><zeroOrMore><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore></choice>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="contemporary">
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-seal.html">seal</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="sealDesc" module="MEI.msDesc"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">seal description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Describes the seals or similar external attachments applied to an
       item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11119,7 +11204,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><group><zeroOrMore><ref name="head"/></zeroOrMore><choice><zeroOrMore><ref name="seal"/></zeroOrMore><zeroOrMore><choice><ref name="condition"/><ref name="decoNote"/><ref name="p"/></choice></zeroOrMore></choice></group><zeroOrMore><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore></choice>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-sealDesc.html">sealDesc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="secFolio" module="MEI.msDesc"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">second folio</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Marks the word or words taken from a fixed point in a codex (typically
       the beginning of the second leaf) in order to provide a unique identifier for the item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11130,8 +11215,15 @@
       <memberOf key="model.physDescPart"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
-    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_secFolio_inline" scheme="schematron">
+      <constraint>
+        <sch:rule context="mei:secFolio">
+          <sch:assert test="ancestor::mei:physDesc">The secFolio element may only appear as a
+            descendant of the physDesc element.</sch:assert>
+        </sch:rule>
+      </constraint>
+    </constraintSpec><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-secFol.html">secFol</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="signatures" module="MEI.msDesc"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Provides a description of the leaf or quire signatures found within a codex.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -11140,8 +11232,15 @@
       <memberOf key="model.physDescPart"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
-    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_signatures_inline" scheme="schematron">
+      <constraint>
+        <sch:rule context="mei:signatures">
+          <sch:assert test="ancestor::mei:physDesc">The signatures element may only appear as a
+            descendant of the physDesc element.</sch:assert>
+        </sch:rule>
+      </constraint>
+    </constraintSpec><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-signatures.html">signatures</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="stamp" module="MEI.msDesc"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a word or phrase describing an official mark indicating ownership, genuineness,
       validity, etc.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11154,7 +11253,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-stamp.html">stamp</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="support" module="MEI.msDesc"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Provides a description of the physical support material of a written item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -11163,7 +11262,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="head"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="condition"/><ref name="decoNote"/><ref name="dimensions"/><ref name="p"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-support.html">support</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="supportDesc" module="MEI.msDesc"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">support description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements describing the physical support material of an
       item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11190,7 +11289,7 @@
           </valItem>
         </valList>
       </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-supportDesc.html">supportDesc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="typeDesc" module="MEI.msDesc"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">type description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a description of the typefaces or other aspects of the
       printing of a printed source.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11200,7 +11299,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><group><zeroOrMore><ref name="head"/></zeroOrMore><zeroOrMore><ref name="p"/></zeroOrMore><zeroOrMore><ref name="typeNote"/></zeroOrMore></group><zeroOrMore><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore></choice>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-typeDesc.html">typeDesc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="typeNote" module="MEI.msDesc"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">type note</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Describes a particular font or other significant typographic feature of a
       printed resource.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11209,7 +11308,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-typeNote.html">typeNote</ref> element in the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><classSpec rend="add" predeclare="true" ident="model.addressPart" module="MEI.namesdates" type="model">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements used as part of a physical address.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -11256,7 +11355,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-addName.html">addName</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="bloc" module="MEI.namesdates"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains the name of a geopolitical unit consisting of two or more nation states or
       countries.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11269,7 +11368,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-bloc.html">bloc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="corpName" module="MEI.namesdates"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">corporate name</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Identifies an organization or group of people that acts as a single
       entity.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11289,8 +11388,7 @@
         sub-elements. The name of the list from which a controlled value is taken may be recorded
         using the <att>auth</att> attribute.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Encoded Archival Description (EAD)
-        standard.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-corpname">corpname</ref> element of the Encoded Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="country" module="MEI.namesdates"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains the name of a geopolitical unit, such as a nation, country, colony, or
       commonwealth, larger than or administratively superior to a region and smaller than a
       bloc.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -11304,7 +11402,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-country.html">country</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="district" module="MEI.namesdates"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains the name of any kind of subdivision of a settlement, such as a parish, ward, or
       other administrative or geographic unit.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11317,7 +11415,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-district.html">district</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="famName" module="MEI.namesdates"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">family name</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a family (inherited) name, as opposed to a given, baptismal, or
       nick name.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11340,7 +11438,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-forename.html">forename</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="genName" module="MEI.namesdates"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">generational name component</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a name component used to distinguish otherwise
       similar names on the basis of the relative ages or generations of the persons named.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11353,7 +11451,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-genName.html">genName</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="geogFeat" module="MEI.namesdates"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">geographical feature name</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a common noun identifying a geographical
       feature.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11366,7 +11464,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-geogFeat.html">geogFeat</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="geogName" module="MEI.namesdates"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">geographic name</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">The proper noun designation for a place, natural feature, or political
       jurisdiction.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11387,8 +11485,7 @@
         Thesaurus of Geographic Names (TGN), may be recorded using the <att>auth</att>
         attribute.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Encoded Archival Description (EAD)
-        standard.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-geogname">geogname</ref> element of the Encoded Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="nameLink" module="MEI.namesdates"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">name link</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a connecting phrase or link used within a name but not regarded as
       part of it, such as "van der" or "of", "from", etc.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11401,7 +11498,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-nameLink.html">nameLink</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="periodName" module="MEI.namesdates"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">period name</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A label that describes a period of time, such as 'Baroque' or '3rd Style
       period'.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11433,9 +11530,8 @@
         nameLink, and roleName elements. The name of the list from which a controlled value for
         persName is taken may be recorded using the <att>auth</att> attribute.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Encoded Archival Description (EAD)
-        standard.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="postBox" module="MEI.namesdates"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">(postal box or post office box) contains a number or other identifier for some postal
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-persname">persname</ref> element of the Encoded Archival Description (EAD).</p>
+    </remarks></elementSpec><elementSpec rend="add" ident="postBox" module="MEI.namesdates"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">postal box or post office box</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a number or other identifier for some postal
       delivery point other than a street address.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -11444,8 +11540,8 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="postCode" module="MEI.namesdates"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">(postal code) contains a numerical or alphanumeric code used as part of a postal address
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-postBox.html">postBox</ref> element of the Text Encoding Initiative (TEI).</p>
+    </remarks></elementSpec><elementSpec rend="add" ident="postCode" module="MEI.namesdates"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">postal code</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a numerical or alphanumeric code used as part of a postal address
       to simplify sorting or delivery of mail.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -11454,7 +11550,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-postCode.html">postCode</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="region" module="MEI.namesdates"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains the name of an administrative unit such as a state, province, or county, larger
       than a settlement, but smaller than a country.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11467,7 +11563,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-region.html">region</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="roleName" module="MEI.namesdates"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">role name</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a name component which indicates that the referent has a particular
       role or position in society, such as an official title or rank.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11480,7 +11576,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-roleName.html">roleName</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="settlement" module="MEI.namesdates"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains the name of a settlement such as a city, town, or village identified as a single
       geopolitical or administrative unit.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11493,7 +11589,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-settlement.html">settlement</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="street" module="MEI.namesdates"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">full street address including any name or number identifying a building as well as the
       name of the street or route on which it is located.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11503,7 +11599,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-street.html">street</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="styleName" module="MEI.namesdates"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">style name</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A label for a characteristic style of writing or performance, such as
       'bebop' or 'rock-n-roll'.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -11521,7 +11617,25 @@
         attribute.</p>
     </remarks></elementSpec><macroSpec rend="add" ident="data.STAFFITEM.neumes" module="MEI.neumes" type="dt">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Items in the Neume repertoire that may be printed near a staff.</desc>
-  </macroSpec><classSpec rend="add" ident="att.episema.log" module="MEI.neumes" type="atts">
+  </macroSpec><classSpec rend="add" ident="att.divLine.log" module="MEI.neumes" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="form" usage="opt">
+        <desc xml:lang="en">Identifies the different kinds of division.</desc>
+        <datatype maxOccurs="unbounded">
+          <rng:data type="NMTOKEN"/>
+        </datatype>
+        <valList type="semi">
+          <valItem ident="caesura"/>
+          <valItem ident="finalis"/>
+          <valItem ident="maior"/>
+          <valItem ident="maxima"/>
+          <valItem ident="minima"/>
+          <valItem ident="virgula"/>
+        </valList>
+      </attDef>
+    </attList>
+  </classSpec><classSpec rend="add" ident="att.episema.log" module="MEI.neumes" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
@@ -11566,6 +11680,7 @@
         </datatype>
       </attDef>
       <attDef ident="pname" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">pitch name</gloss>
         <desc xml:lang="en">Contains a written pitch name.</desc>
         <datatype>
           <rng:data type="token">
@@ -11576,6 +11691,9 @@
     </attList>
   </classSpec><classSpec rend="add" ident="att.ncForm" module="MEI.neumes" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record visual details of neume notation.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.curvatureDirection"/>
+    </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="angled" usage="opt">
         <desc/>
@@ -11598,17 +11716,6 @@
           </valItem>
         </valList>
       </attDef>
-      <attDef ident="curve" usage="opt">
-        <desc xml:lang="en">Records direction of curvature.</desc>
-        <valList type="closed">
-          <valItem ident="a">
-            <desc xml:lang="en">Anti-clockwise curvature.</desc>
-          </valItem>
-          <valItem ident="c">
-            <desc xml:lang="en">Clockwise curvature.</desc>
-          </valItem>
-        </valList>
-      </attDef>
       <attDef ident="hooked" usage="opt">
         <desc xml:lang="en">Pen stroke has an extension; specific to Hispanic notation.</desc>
         <datatype>
@@ -11666,6 +11773,39 @@
       <memberOf key="att.staffIdent"/>
       <memberOf key="att.sylText"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.neumeType" module="MEI.neumes" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that specify the type of neumes.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="type" usage="opt">
+        <desc xml:lang="en">Designation which characterizes the element in some sense, using any convenient
+          classification scheme or typology that employs single-token labels.</desc>
+        <datatype maxOccurs="unbounded">
+          <rng:data type="NMTOKEN"/>
+        </datatype>
+        <valList type="semi">
+          <valItem ident="apostropha"/>
+          <valItem ident="bistropha"/>
+          <valItem ident="climacus"/>
+          <valItem ident="clivis"/>
+          <valItem ident="oriscus"/>
+          <valItem ident="pes"/>
+          <valItem ident="pessubpunctis"/>
+          <valItem ident="porrectus"/>
+          <valItem ident="porrectusflexus"/>
+          <valItem ident="pressusmaior"/>
+          <valItem ident="pressusminor"/>
+          <valItem ident="punctum"/>
+          <valItem ident="quilisma"/>
+          <valItem ident="scandicus"/>
+          <valItem ident="strophicus"/>
+          <valItem ident="torculus"/>
+          <valItem ident="torculusresupinus"/>
+          <valItem ident="tristropha"/>
+          <valItem ident="virga"/>
+          <valItem ident="virgastrata"/>
+        </valList>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.oriscus.log" module="MEI.neumes" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.quilisma.log" module="MEI.neumes" type="atts">
@@ -11705,16 +11845,6 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements that modify neume-like features.</desc>
   </classSpec><classSpec rend="add" predeclare="true" ident="model.neumePart" module="MEI.neumes" type="model">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements that may occur within a neume.</desc>
-  </classSpec><classSpec rend="add" predeclare="true" ident="model.sectionPart.neumes" module="MEI.neumes" type="model">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements that may appear as part of a section in the neume repertoire.</desc>
-    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="model.sectionPart.mensuralAndNeumes"/>
-    </classes>
-  </classSpec><classSpec rend="add" predeclare="true" ident="model.staffPart.neumes" module="MEI.neumes" type="model">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements that are components of a staff in the neume repertoire.</desc>
-    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="model.staffPart.mensuralAndNeumes"/>
-    </classes>
   </classSpec><classSpec rend="add" predeclare="true" ident="model.syllableLike" module="MEI.neumes" type="model">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements that accommodate neumed text.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -11764,37 +11894,7 @@
       <memberOf key="model.neumePart"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.appLike"/><ref name="model.editLike"/><ref name="model.neumeComponentModifierLike"/><ref name="model.neumeModifierLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="type" usage="opt">
-        <desc xml:lang="en">Designation which characterizes the element in some sense, using any convenient
-          classification scheme or typology that employs single-token labels.</desc>
-        <datatype maxOccurs="unbounded">
-          <rng:data type="NMTOKEN"/>
-        </datatype>
-        <valList type="semi">
-          <valItem ident="apostropha"/>
-          <valItem ident="bistropha"/>
-          <valItem ident="climacus"/>
-          <valItem ident="clivis"/>
-          <valItem ident="oriscus"/>
-          <valItem ident="pes"/>
-          <valItem ident="pessubpunctis"/>
-          <valItem ident="porrectus"/>
-          <valItem ident="porrectusflexus"/>
-          <valItem ident="pressusmaior"/>
-          <valItem ident="pressusmaior"/>
-          <valItem ident="pressusminor"/>
-          <valItem ident="pressusminor"/>
-          <valItem ident="punctum"/>
-          <valItem ident="quilisma"/>
-          <valItem ident="scandicus"/>
-          <valItem ident="strophicus"/>
-          <valItem ident="torculus"/>
-          <valItem ident="torculusresupinus"/>
-          <valItem ident="tristropha"/>
-          <valItem ident="virga"/>
-          <valItem ident="virgastrata"/>
-        </valList>
-      </attDef></attList></elementSpec><elementSpec rend="add" ident="ncGrp" module="MEI.neumes"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Collection of one or more neume components.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    </content></elementSpec><elementSpec rend="add" ident="ncGrp" module="MEI.neumes"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">neume component group</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Collection of one or more neume components.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.ncGrp.anl"/>
@@ -11819,37 +11919,7 @@
       <memberOf key="model.eventLike.neumes"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.appLike"/><ref name="model.editLike"/><ref name="model.neumeModifierLike"/><ref name="model.neumePart"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="type" usage="opt">
-        <desc xml:lang="en">Designation which characterizes the element in some sense, using any convenient
-          classification scheme or typology that employs single-token labels.</desc>
-        <datatype maxOccurs="unbounded">
-          <rng:data type="NMTOKEN"/>
-        </datatype>
-        <valList type="semi">
-          <valItem ident="apostropha"/>
-          <valItem ident="bistropha"/>
-          <valItem ident="climacus"/>
-          <valItem ident="clivis"/>
-          <valItem ident="oriscus"/>
-          <valItem ident="pes"/>
-          <valItem ident="pessubpunctis"/>
-          <valItem ident="porrectus"/>
-          <valItem ident="porrectusflexus"/>
-          <valItem ident="pressusmaior"/>
-          <valItem ident="pressusmaior"/>
-          <valItem ident="pressusminor"/>
-          <valItem ident="pressusminor"/>
-          <valItem ident="punctum"/>
-          <valItem ident="quilisma"/>
-          <valItem ident="scandicus"/>
-          <valItem ident="strophicus"/>
-          <valItem ident="torculus"/>
-          <valItem ident="torculusresupinus"/>
-          <valItem ident="tristropha"/>
-          <valItem ident="virga"/>
-          <valItem ident="virgastrata"/>
-        </valList>
-      </attDef></attList></elementSpec><elementSpec rend="add" ident="oriscus" module="MEI.neumes"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Oriscus.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    </content></elementSpec><elementSpec rend="add" ident="oriscus" module="MEI.neumes"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Oriscus.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.oriscus.anl"/>
@@ -11899,6 +11969,7 @@
       <memberOf key="att.basic"/>
       <memberOf key="att.classed"/>
       <memberOf key="att.color"/>
+      <memberOf key="att.divLine.log"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.labelled"/>
       <memberOf key="att.linking"/>
@@ -11910,22 +11981,9 @@
       <memberOf key="att.xy"/>
       <memberOf key="att.visualOffset.ho"/>
       <memberOf key="model.eventLike.neumes"/>
-    </classes><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="form" usage="opt">
-        <desc xml:lang="en">Identifies the different kinds of division.</desc>
-        <datatype maxOccurs="unbounded">
-          <rng:data type="NMTOKEN"/>
-        </datatype>
-        <valList type="semi">
-          <valItem ident="caesura"/>
-          <valItem ident="finalis"/>
-          <valItem ident="maior"/>
-          <valItem ident="maxima"/>
-          <valItem ident="minima"/>
-          <valItem ident="virgula"/>
-        </valList>
-      </attDef></attList></elementSpec><classSpec rend="add" ident="att.alignment" module="MEI.performance" type="atts">
+    </classes></elementSpec><classSpec rend="add" ident="att.alignment" module="MEI.performance" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Temporal alignment attributes.</desc>
-    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_whenTarget" scheme="isoschematron">
+    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_whenTarget" scheme="schematron">
       <constraint>
         <sch:rule context="@when">
           <sch:assert role="warning" test="not(normalize-space(.) eq '')">@when attribute should
@@ -11954,7 +12012,7 @@
       <memberOf key="att.pointing"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="clip"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="avFile_child_of_clip" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="avFile_child_of_clip" scheme="schematron">
       <constraint>
         <sch:rule context="mei:clip/mei:avFile">
           <sch:assert test="count(mei:*) = 0">An avFile child of clip cannot have
@@ -11974,7 +12032,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="avFile"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="when"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="betype_required_when_begin_or_end" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="betype_required_when_begin_or_end" scheme="schematron">
       <constraint>
         <sch:rule context="mei:clip[@begin or @end]">
           <sch:assert role="warning" test="@betype or ancestor::mei:*[@betype]">When @begin or @end
@@ -12004,7 +12062,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="avFile"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="when"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="clip"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="betype_required_when_begin_or_end" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="betype_required_when_begin_or_end" scheme="schematron">
       <constraint>
         <sch:rule context="mei:recording[@begin or @end]">
           <sch:assert role="warning" test="@betype">When @begin or @end is used, @betype should be
@@ -12019,8 +12077,8 @@
       <memberOf key="att.common"/>
       <memberOf key="att.dataPointing"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_when_interval" scheme="isoschematron">
+      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="extData"/></zeroOrMore>
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_when_interval" scheme="schematron">
       <constraint>
         <sch:rule context="mei:when[@interval]">
           <sch:assert test="@since">@since must be present when @interval is used.</sch:assert>
@@ -12036,7 +12094,7 @@
             be 'time'.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_when_absolute" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_when_absolute" scheme="schematron">
       <constraint>
         <sch:rule context="mei:when[@absolute]">
           <sch:assert role="warning" test="@abstype or ancestor::mei:*[@betype]">When @absolute is
@@ -12080,7 +12138,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_sinceTarget" scheme="isoschematron">
+        <constraintSpec ident="check_sinceTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@since">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@since attribute
@@ -12094,7 +12152,7 @@
       <p>The <att>data</att> attribute may be used to reference one or more features that occur at
         this point in time.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-when.html">when</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><classSpec rend="add" predeclare="true" ident="model.locrefLike" module="MEI.ptrref" type="model">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements used for purposes of location and reference.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -12114,8 +12172,8 @@
       <p>Unlike the <gi scheme="MEI">ref</gi> element, <gi scheme="MEI">ptr</gi> cannot contain text
         or sub-elements to describe the referenced object.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Encoded Archival Description (EAD) and Text
-        Encoding Initiative (TEI) standards.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-ptr">ptr</ref> element of the Encoded Archival Description (EAD) and the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-ptr.html">ptr</ref> element of the Text
+        Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="ref" module="MEI.ptrref"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">reference</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Defines a traversible reference to another location. May contain text and
       sub-elements that describe the destination.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -12131,8 +12189,8 @@
       <p>Unlike the <gi scheme="MEI">ptr</gi> element, <gi scheme="MEI">ref</gi> may contain text
         and sub-elements to describe the destination.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Encoded Archival Description (EAD) and TEI
-        standards.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-ref">ref</ref> element of the Encoded Archival Description (EAD) and the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-ref.html">ref</ref> element of the Text
+        Encoding Initiative (TEI).</p>
     </remarks></elementSpec><macroSpec rend="add" ident="macro.anyXML" module="MEI.shared" type="pe">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Permits any XML elements except those from the MEI or SVG namespace.</desc>
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -12247,35 +12305,16 @@
         </datatype>
       </attDef>
     </attList>
-  </classSpec><classSpec rend="add" ident="att.ambitus.anl" module="MEI.shared" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
-    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.intervalHarmonic"/>
-    </classes>
-  </classSpec><classSpec rend="add" ident="att.ambitus.ges" module="MEI.shared" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.ambitus.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
-  </classSpec><classSpec rend="add" ident="att.ambitus.vis" module="MEI.shared" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.ambNote.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.accidental"/>
       <memberOf key="att.coloration"/>
-      <memberOf key="att.duration.logical"/>
+      <memberOf key="att.duration.log"/>
       <memberOf key="att.pitched"/>
     </classes>
-  </classSpec><classSpec rend="add" ident="att.anchoredText.anl" module="MEI.shared" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
-  </classSpec><classSpec rend="add" ident="att.anchoredText.ges" module="MEI.shared" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-  </classSpec><classSpec rend="add" ident="att.anchoredText.vis" module="MEI.shared" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
-    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.visualOffset"/>
-      <memberOf key="att.xy"/>
-    </classes>
   </classSpec><classSpec rend="add" ident="att.annot.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes for annot. Values for the type attribute can be taken from any
       convenient typology of annotation suitable to the work in hand; <abbr>e.g.</abbr>, annotation, gloss,
@@ -12288,8 +12327,8 @@
       <memberOf key="att.partIdent"/>
       <memberOf key="att.staffIdent"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp.logical"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp.log"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.artic.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
@@ -12315,7 +12354,7 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="target" usage="opt">
@@ -12323,7 +12362,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_attaccaTarget" scheme="isoschematron">
+        <constraintSpec ident="check_attaccaTarget" scheme="schematron">
           <constraint>
             <sch:rule context="mei:attacca/@target">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@target attribute
@@ -12358,7 +12397,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.AUGMENTDOT"/>
         </datatype>
-        <constraintSpec ident="dots_attribute_requires_dur" scheme="isoschematron">
+        <constraintSpec ident="dots_attribute_requires_dur" scheme="schematron">
           <constraint>
             <sch:rule context="mei:*[@dots]">
               <sch:assert test="@dur">An element with a dots attribute must also have a dur
@@ -12414,7 +12453,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that capture the placement of bar lines.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="bar.len" usage="opt">
-        <desc xml:lang="en">States the length of barlines in virtual units. The value must be greater than 0 and
+        <desc xml:lang="en">States the length of bar lines in virtual units. The value must be greater than 0 and
           is typically equal to 2 times (the number of staff lines - 1); <abbr>e.g.</abbr>, a value of <val>8</val> for a
           5-line staff.</desc>
         <datatype>
@@ -12431,7 +12470,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BARMETHOD"/>
         </datatype>
-        <constraintSpec ident="check_barmethod" scheme="isoschematron">
+        <constraintSpec ident="check_barmethod" scheme="schematron">
           <constraint>
             <sch:rule context="@bar.method[parent::*[matches(local-name(), '(staffDef|measure)')]]">
               <sch:assert test="not(. eq 'mensur')">"mensur" not allowed in this
@@ -12495,7 +12534,7 @@
       <memberOf key="att.partIdent"/>
       <memberOf key="att.staffIdent"/>
       <memberOf key="att.startId"/>
-      <memberOf key="att.timestamp.logical"/>
+      <memberOf key="att.timestamp.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.calendared" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that indicate the calendar system of a date or other datable element.</desc>
@@ -12533,7 +12572,7 @@
       <memberOf key="att.augmentDots"/>
       <memberOf key="att.chord.log.cmn"/>
       <memberOf key="att.cue"/>
-      <memberOf key="att.duration.logical"/>
+      <memberOf key="att.duration.log"/>
       <memberOf key="att.event"/>
       <memberOf key="att.sylText"/>
     </classes>
@@ -12546,7 +12585,7 @@
         <datatype maxOccurs="unbounded">
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_classURI" scheme="isoschematron">
+        <constraintSpec ident="check_classURI" scheme="schematron">
           <constraint>
             <sch:rule context="@class">
               <sch:assert test="every $i in tokenize(., '\s+') satisfies substring($i,2)=//mei:category/@xml:id or matches($i, '^([a-z]+://|\.{1,2}/)')">The value in @class must either correspond to the @xml:id attribute of a category
@@ -12576,7 +12615,7 @@
   </classSpec><classSpec rend="add" ident="att.cleffing.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Used by staffDef and scoreDef to provide default values for attributes in the logical
       domain related to clefs.</desc>
-    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="clef_shape_requires_clef_line" scheme="isoschematron">
+    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="clef_shape_requires_clef_line" scheme="schematron">
       <constraint>
         <sch:rule context="mei:*[matches(@clef.shape, '[FCG]')]">
           <sch:assert test="@clef.line">An 'F', 'C', or 'G' clef requires that its position be
@@ -12620,7 +12659,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.clefShape" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record the shape of a clef.</desc>
-    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="shape_requires_line" scheme="isoschematron">
+    <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="shape_requires_line" scheme="schematron">
       <constraint>
         <sch:rule context="mei:clef[matches(@shape, '[FCG]')]">
           <sch:assert test="@line">When @shape is present, @line must also be
@@ -12671,6 +12710,15 @@
       <memberOf key="att.responsibility"/>
       <memberOf key="att.typed"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.contemporary" module="MEI.shared" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes specifying whether a feature is contemporary or historical.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="contemporary" usage="opt">
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.controlEvent" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes shared by events which rely on other events for their existence. For example, a
       slur/phrase marking must be drawn between or over a group of notes. The slur is therefore a
@@ -12682,25 +12730,16 @@
       <memberOf key="att.plist"/>
       <memberOf key="att.staffIdent"/>
       <memberOf key="att.targetEval"/>
-      <memberOf key="att.timestamp.logical"/>
-      <memberOf key="att.timestamp.gestural"/>
+      <memberOf key="att.timestamp.log"/>
+      <memberOf key="att.timestamp.ges"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.coordinated" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">This attribute class records the position of a feature within a two-dimensional coordinate
       system.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.coordinated.ul"/>
+    </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="ulx" usage="opt">
-        <desc xml:lang="en">Indicates the upper-left corner x coordinate.</desc>
-        <datatype>
-          <rng:data type="nonNegativeInteger"/>
-        </datatype>
-      </attDef>
-      <attDef ident="uly" usage="opt">
-        <desc xml:lang="en">Indicates the upper-left corner y coordinate.</desc>
-        <datatype>
-          <rng:data type="nonNegativeInteger"/>
-        </datatype>
-      </attDef>
       <attDef ident="lrx" usage="opt">
         <desc xml:lang="en">Indicates the lower-right corner x coordinate.</desc>
         <datatype>
@@ -12728,6 +12767,23 @@
         </remarks>
       </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.coordinated.ul" module="MEI.shared" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">This attribute class records the upper left position of a feature within a two-dimensional coordinate
+      system.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="ulx" usage="opt">
+        <desc xml:lang="en">Indicates the upper-left corner x coordinate.</desc>
+        <datatype>
+          <rng:data type="nonNegativeInteger"/>
+        </datatype>
+      </attDef>
+      <attDef ident="uly" usage="opt">
+        <desc xml:lang="en">Indicates the upper-left corner y coordinate.</desc>
+        <datatype>
+          <rng:data type="nonNegativeInteger"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.cue" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe "cue-ness".</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -12774,22 +12830,6 @@
         </valList>
       </attDef>
     </attList>
-  </classSpec><classSpec rend="add" ident="att.curveRend" module="MEI.shared" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record the visual rendition of curves.</desc>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="lform" usage="opt">
-        <desc xml:lang="en">Describes the line style of a curve.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEFORM"/>
-        </datatype>
-      </attDef>
-      <attDef ident="lwidth" usage="opt">
-        <desc xml:lang="en">Width of a curved line.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEWIDTH"/>
-        </datatype>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.custos.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -12803,7 +12843,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_custosTarget" scheme="isoschematron">
+        <constraintSpec ident="check_custosTarget" scheme="schematron">
           <constraint>
             <sch:rule context="mei:custos/@target">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@target attribute
@@ -12857,7 +12897,7 @@
         <datatype maxOccurs="unbounded">
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_dataTarget" scheme="isoschematron">
+        <constraintSpec ident="check_dataTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@data">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@data attribute should
@@ -12885,7 +12925,7 @@
         <datatype maxOccurs="unbounded">
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_declsTarget" scheme="isoschematron">
+        <constraintSpec ident="check_declsTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@decls">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@decls attribute
@@ -12911,11 +12951,17 @@
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.distances" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe distance from the staff.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="dir.dist" usage="opt">
+        <desc xml:lang="en">Records the default distance from the staff for directives.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MEASUREMENTSIGNED"/>
+        </datatype>
+      </attDef>
       <attDef ident="dynam.dist" usage="opt">
         <desc xml:lang="en">Records the default distance from the staff for dynamic marks.</desc>
         <datatype>
@@ -12929,8 +12975,14 @@
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MEASUREMENTSIGNED"/>
         </datatype>
       </attDef>
-      <attDef ident="text.dist" usage="opt">
-        <desc xml:lang="en">Determines how far from the staff to render text elements.</desc>
+      <attDef ident="reh.dist" usage="opt">
+        <desc xml:lang="en">Records the default distance from the staff for rehearsal marks.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MEASUREMENTSIGNED"/>
+        </datatype>
+      </attDef>
+      <attDef ident="tempo.dist" usage="opt">
+        <desc xml:lang="en">Records the default distance from the staff for tempo marks.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MEASUREMENTSIGNED"/>
         </datatype>
@@ -12958,6 +13010,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that permit total duration to be represented by multiple values.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="dur" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">duration</gloss>
         <desc xml:lang="en">When a duration cannot be represented as a single power-of-two value, multiple
           space-separated values that add up to the total duration may be used.</desc>
         <datatype maxOccurs="unbounded">
@@ -12990,10 +13043,11 @@
         </datatype>
       </attDef>
     </attList>
-  </classSpec><classSpec rend="add" ident="att.duration.logical" module="MEI.shared" type="atts">
+  </classSpec><classSpec rend="add" ident="att.duration.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that express duration in musical terms.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="dur" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">duration</gloss>
         <desc xml:lang="en">Records the duration of a feature using the relative durational values provided by the
           data.DURATION datatype.</desc>
         <datatype>
@@ -13005,6 +13059,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe duration as a ratio.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="num" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">number</gloss>
         <desc xml:lang="en">Along with numbase, describes duration as a ratio. num is the first value in the
           ratio, while numbase is the second.</desc>
         <datatype>
@@ -13025,7 +13080,7 @@
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.enclosingChars" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that capture characters used to enclose symbols having a cautionary or
@@ -13069,8 +13124,8 @@
       <memberOf key="att.alignment"/>
       <memberOf key="att.layerIdent"/>
       <memberOf key="att.staffIdent"/>
-      <memberOf key="att.timestamp.gestural"/>
-      <memberOf key="att.timestamp.logical"/>
+      <memberOf key="att.timestamp.ges"/>
+      <memberOf key="att.timestamp.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.evidence" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes describing the support for and the certainty of an assertion.</desc>
@@ -13128,7 +13183,7 @@
         <datatype>
           <rng:data type="string"/>
         </datatype>
-        <constraintSpec ident="check_extent" scheme="isoschematron">
+        <constraintSpec ident="check_extent" scheme="schematron">
           <constraint>
             <sch:rule context="@extent[matches(normalize-space(.), '^\d+(\.\d+)?$')]">
               <sch:assert role="warning" test="../@unit">The @unit attribute is
@@ -13165,6 +13220,16 @@
         </datatype>
       </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.formework" module="MEI.shared" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record the function (i.e., placement) of forme work elements.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="func" usage="opt">
+        <desc xml:lang="en">Records the function (i.e., placement) of a page header or footer.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PGFUNC"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.grpSym.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -13187,7 +13252,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_handTarget" scheme="isoschematron">
+        <constraintSpec ident="check_handTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@hand">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@hand attribute should
@@ -13256,7 +13321,7 @@
         <datatype maxOccurs="unbounded">
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_joinTarget" scheme="isoschematron">
+        <constraintSpec ident="check_joinTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@join">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@join attribute should
@@ -13275,6 +13340,16 @@
       <memberOf key="att.accidental"/>
       <memberOf key="att.pitched"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.keyMode" module="MEI.shared" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes for describing key mode.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="mode" usage="opt">
+        <desc xml:lang="en">Indicates major, minor, or other tonality.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MODE"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.keySig.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -13294,7 +13369,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Used by staffDef and scoreDef to provide default values for attributes in the logical
       domain that are related to key signatures.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="key.sig" usage="opt">
+      <attDef ident="keysig" usage="opt">
         <desc xml:lang="en">Written key signature.</desc>
         <datatype maxOccurs="unbounded">
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.KEYFIFTHS"/>
@@ -13365,7 +13440,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_defTarget_layer" scheme="isoschematron">
+        <constraintSpec ident="check_defTarget_layer" scheme="schematron">
           <constraint>
             <sch:rule context="mei:layer/@def">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@def attribute should
@@ -13415,6 +13490,7 @@
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
       <attDef ident="lendsym" usage="opt">
+        <gloss versionDate="2022-11-11" xml:lang="en">line end symbol</gloss>
         <desc xml:lang="en">Symbol rendered at end of line.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINESTARTENDSYMBOL"/>
@@ -13427,6 +13503,7 @@
         </datatype>
       </attDef>
       <attDef ident="lstartsym" usage="opt">
+        <gloss versionDate="2022-11-11" xml:lang="en">line start symbol</gloss>
         <desc xml:lang="en">Symbol rendered at start of line.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINESTARTENDSYMBOL"/>
@@ -13440,16 +13517,22 @@
       </attDef>
     </attList>
   </classSpec><classSpec rend="add" ident="att.lineRend.base" module="MEI.shared" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record the basic visual rendition of lines.</desc>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="lform" usage="opt">
-        <desc xml:lang="en">Describes the line style of a line.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEFORM"/>
-        </datatype>
-      </attDef>
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record the basic visual rendition of lines.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      <attDef ident="lsegs" usage="opt">
+        <attDef ident="lform" usage="opt">
+          <desc xml:lang="en">Describes the style of a line.</desc>
+          <datatype>
+            <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEFORM"/>
+          </datatype>
+        </attDef>
+        <attDef ident="lwidth" usage="opt">
+          <desc xml:lang="en">Width of a line.</desc>
+          <datatype>
+            <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEWIDTH"/>
+          </datatype>
+        </attDef>
+        <attDef ident="lsegs" usage="opt">
         <desc xml:lang="en">Describes the number of segments into which a dashed or dotted line may be divided, or
           the number of "peaks" of a wavy line; a pair of space-separated values (minimum and
           maximum, respectively) provides a range between which a rendering system-supplied value
@@ -13460,7 +13543,7 @@
             <rng:param name="minInclusive">2</rng:param>
           </rng:data>
         </datatype>
-        <constraintSpec ident="check_lsegs" scheme="isoschematron">
+        <constraintSpec ident="check_lsegs" scheme="schematron">
           <constraint>
             <sch:rule context="@lsegs">
               <sch:assert test="matches(../@lform, '(dashed|dotted|wavy)')">@lform attribute
@@ -13469,12 +13552,6 @@
           </constraint>
         </constraintSpec>
       </attDef>
-      <attDef ident="lwidth" usage="opt">
-        <desc xml:lang="en">Width of a line.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEWIDTH"/>
-        </datatype>
-      </attDef>
       
     </attList>
   </classSpec><classSpec rend="add" ident="att.linking" module="MEI.shared" type="atts">
@@ -13779,30 +13856,28 @@
         </datatype>
       </attDef>
     </attList>
-  </classSpec><classSpec rend="add" ident="att.meiVersion" module="MEI.shared" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record the version of MEI in use.</desc>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="meiversion" usage="opt">
-        <desc xml:lang="en">Specifies a generic MEI version label.</desc>
-        <defaultVal>5.0.0-dev</defaultVal>
-        <valList type="closed">
-          <valItem ident="5.0.0-dev">
-            <desc xml:lang="en">Development version of MEI 5.0.0</desc>
-          </valItem>
-        </valList>
-      </attDef>
-    </attList>
-  </classSpec><classSpec rend="add" ident="att.mensur.log" module="MEI.shared" type="atts">
+  </classSpec><classSpec rend="add" ident="att.meiVersion" module="MEI.shared" type="atts"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record the version of MEI in use.</desc><classes/><attList><attDef ident="meiversion" usage="rec"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Specifies a generic MEI version label.</desc><defaultVal>5.0</defaultVal><valList type="closed" mode="change"><valItem xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="5.0">
+            <desc xml:lang="en">MEI 5.0</desc>
+          </valItem></valList></attDef></attList></classSpec><classSpec rend="add" ident="att.mensur.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.duration.ratio"/>
       <memberOf key="att.mensural.shared"/>
     </classes>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="level" usage="opt">
+        <desc>Level of duration at which the proportion given by the @num and @numbase ratio applies.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.DURATION.mensural"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.meterConformance" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that provide information about a structure’s conformance to the prevailing
       meter.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="metcon" usage="opt">
+        <gloss versionDate="2022-11-11" xml:lang="en">meter conformance</gloss>
         <desc xml:lang="en">Indicates the relationship between the content of a staff or layer and the prevailing
           meter.</desc>
         <valList type="closed">
@@ -13823,6 +13898,7 @@
       meter.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="metcon" usage="opt">
+        <gloss versionDate="2022-11-11" xml:lang="en">meter conformance</gloss>
         <desc xml:lang="en">Indicates the relationship between the content of a measure and the prevailing
           meter.</desc>
         <datatype>
@@ -13833,7 +13909,7 @@
         <desc xml:lang="en">Indicates whether or not a bar line is "controlling"; that is, if it indicates a point
           of alignment across all the parts. Bar lines within a score are usually controlling; that
           is, they "line up". Bar lines within parts may or may not be controlling. When applied to
-          <gi scheme="MEI">measure</gi>, this attribute indicates the nature of the right barline
+          <gi scheme="MEI">measure</gi>, this attribute indicates the nature of the right bar line
           but not the left.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
@@ -13854,6 +13930,7 @@
         </datatype>
       </attDef>
       <attDef ident="sym" usage="opt">
+        <gloss versionDate="2022-11-11" xml:lang="en">symbol</gloss>
         <desc xml:lang="en">Indicates the use of a meter symbol instead of a numeric meter signature, that is, 'C'
           for common time or 'C' with a slash for cut time.</desc>
         <datatype>
@@ -13949,7 +14026,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_nymrefTarget" scheme="isoschematron">
+        <constraintSpec ident="check_nymrefTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@nymref">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@nymref attribute
@@ -14017,7 +14094,7 @@
       <memberOf key="att.augmentDots"/>
       <memberOf key="att.coloration"/>
       <memberOf key="att.cue"/>
-      <memberOf key="att.duration.logical"/>
+      <memberOf key="att.duration.log"/>
       <memberOf key="att.event"/>
       <memberOf key="att.note.log.cmn"/>
       <memberOf key="att.note.log.mensural"/>
@@ -14033,7 +14110,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_head.altsymTarget" scheme="isoschematron">
+        <constraintSpec ident="check_head.altsymTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@head.altsym">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@head.altsym attribute
@@ -14050,7 +14127,7 @@
         <datatype>
           <rng:data type="NMTOKEN"/>
         </datatype>
-        <constraintSpec ident="check_head.auth" scheme="isoschematron">
+        <constraintSpec ident="check_head.auth" scheme="schematron">
           <constraint>
             <sch:rule context="mei:*[lower-case(@head.auth) eq 'smufl']">
               <sch:assert test="matches(@head.shape, '^#x') or matches(@head.shape, '^U+')">When
@@ -14102,7 +14179,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.HEADSHAPE"/>
         </datatype>
-        <constraintSpec ident="check_headshape_num" scheme="isoschematron">
+        <constraintSpec ident="check_headshape_num" scheme="schematron">
           <constraint>
             <sch:rule context="mei:*[(matches(@head.shape, '#x') or matches(@head.shape, 'U+')) and (lower-case(@head.auth) eq 'smufl')]">
               <sch:assert role="warning" test="matches(normalize-space(@head.shape), '^(#x|U\+)E([0-9AB][0-9A-F][0-9A-F]|C[0-9A][0-9A-F]|CB[0-9A-F])$')">SMuFL version 1.18 uses the range U+E000 - U+ECBF.</sch:assert>
@@ -14122,6 +14199,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record written octave.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="oct" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">octave</gloss>
         <desc xml:lang="en">Captures written octave information.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.OCTAVE"/>
@@ -14216,7 +14294,7 @@
         </datatype>
       </attDef>
     </attList>
-  </classSpec><classSpec rend="add" ident="att.origin.timestamp.logical" module="MEI.shared" type="atts">
+  </classSpec><classSpec rend="add" ident="att.origin.timestamp.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that identify a musical range in terms of musical time.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="origin.tstamp" usage="opt">
@@ -14233,7 +14311,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MEASUREBEAT"/>
         </datatype>
-        <constraintSpec ident="origin.tstamp2_requires_origin.tstamp" scheme="isoschematron">
+        <constraintSpec ident="origin.tstamp2_requires_origin.tstamp" scheme="schematron">
           <constraint>
             <sch:rule context="mei:*[@origin.tstamp2]">
               <sch:assert test="@origin.tstamp">When @origin.tstamp2 is used @origin.tstamp must
@@ -14250,7 +14328,7 @@
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.ornamentAccid"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.pad.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
@@ -14276,24 +14354,28 @@
         </datatype>
       </attDef>
       <attDef ident="page.topmar" usage="opt">
+        <gloss versionDate="2022-11-11" xml:lang="en">page top margin</gloss>
         <desc xml:lang="en">Indicates the amount of whitespace at the top of a page.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MEASUREMENTUNSIGNED"/>
         </datatype>
       </attDef>
       <attDef ident="page.botmar" usage="opt">
+        <gloss versionDate="2022-11-11" xml:lang="en">page bottom margin</gloss>
         <desc xml:lang="en">Indicates the amount of whitespace at the bottom of a page.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MEASUREMENTUNSIGNED"/>
         </datatype>
       </attDef>
       <attDef ident="page.leftmar" usage="opt">
+        <gloss versionDate="2022-11-11" xml:lang="en">page left margin</gloss>
         <desc xml:lang="en">Indicates the amount of whitespace at the left side of a page.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MEASUREMENTUNSIGNED"/>
         </datatype>
       </attDef>
       <attDef ident="page.rightmar" usage="opt">
+        <gloss versionDate="2022-11-11" xml:lang="en">page right margin</gloss>
         <desc xml:lang="en">Indicates the amount of whitespace at the right side of a page.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MEASUREMENTUNSIGNED"/>
@@ -14365,12 +14447,13 @@
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.pitch" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record written pitch name.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="pname" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">pitch name</gloss>
         <desc xml:lang="en">Contains a written pitch name.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PITCHNAME"/>
@@ -14426,7 +14509,7 @@
         <datatype maxOccurs="unbounded">
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_plistTarget" scheme="isoschematron">
+        <constraintSpec ident="check_plistTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@plist">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@plist attribute
@@ -14560,7 +14643,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.CONFIDENCE"/>
         </datatype>
-        <constraintSpec ident="check_confidence" scheme="isoschematron">
+        <constraintSpec ident="check_confidence" scheme="schematron">
           <constraint>
             <sch:rule context="mei:*[@confidence]">
               <sch:assert test="@min and @max">The attributes @min and @max are required when
@@ -14570,6 +14653,36 @@
         </constraintSpec>
       </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.repeatMark.log" module="MEI.shared" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.controlEvent"/>
+      <memberOf key="att.duration.additive"/>
+      <memberOf key="att.startEndId"/>
+      <memberOf key="att.timestamp2.log"/>
+    </classes>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="func" usage="req">
+        <desc xml:lang="en">Indicates the function of the mark, usually implying a corresponding form.</desc>
+        <valList type="closed">
+          <valItem ident="coda">
+            <desc xml:lang="en">Coda (SMuFL E048 or Unicode 1D10C).</desc>
+          </valItem>
+          <valItem ident="segno">
+            <desc xml:lang="en">Segno (SMuFL E047 or Unicode 1D10B).</desc>
+          </valItem>
+          <valItem ident="dalSegno">
+            <desc xml:lang="en">Dal segno (SMuFL E045 or Unicode 1D109).</desc>
+          </valItem>
+          <valItem ident="daCapo">
+            <desc xml:lang="en">Da capo (SMuFL E046 or Unicode 1D10A).</desc>
+          </valItem>
+          <valItem ident="fine">
+            <desc xml:lang="en">Fine. (text)</desc>
+          </valItem>
+        </valList>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.responsibility" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes capturing information regarding responsibility for some aspect of the text's
       creation, transcription, editing, or encoding.</desc>
@@ -14581,7 +14694,7 @@
         <datatype maxOccurs="unbounded">
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_respTarget" scheme="isoschematron">
+        <constraintSpec ident="check_respTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@resp">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@resp attribute should
@@ -14598,11 +14711,11 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.augmentDots"/>
       <memberOf key="att.cue"/>
-      <memberOf key="att.restduration.logical"/>
+      <memberOf key="att.restduration.log"/>
       <memberOf key="att.event"/>
       <memberOf key="att.rest.log.cmn"/>
     </classes>
-  </classSpec><classSpec rend="add" ident="att.restduration.logical" module="MEI.shared" type="atts">
+  </classSpec><classSpec rend="add" ident="att.restduration.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that express duration of rests in musical terms.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="dur" usage="opt">
@@ -14707,8 +14820,9 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.augmentDots"/>
-      <memberOf key="att.duration.logical"/>
+      <memberOf key="att.duration.log"/>
       <memberOf key="att.event"/>
+      <memberOf key="att.space.log.cmn"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.spacing" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that capture notation spacing information.</desc>
@@ -14754,7 +14868,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_defTarget_staff" scheme="isoschematron">
+        <constraintSpec ident="check_defTarget_staff" scheme="schematron">
           <constraint>
             <sch:rule context="mei:staff/@def">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@def attribute should
@@ -14888,7 +15002,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_endidTarget" scheme="isoschematron">
+        <constraintSpec ident="check_endidTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@endid">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@endid attribute
@@ -14910,7 +15024,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_startidTarget" scheme="isoschematron">
+        <constraintSpec ident="check_startidTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@startid">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@startid attribute
@@ -14963,7 +15077,7 @@
         <datatype maxOccurs="1">
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_stem.sameasTarget" scheme="isoschematron">
+        <constraintSpec ident="check_stem.sameasTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@stem.sameas">
               <sch:let name="layer.n" value="self::node()/ancestor::mei:layer/@n"/>
@@ -15130,7 +15244,7 @@
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.mmTempo"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="func">
@@ -15167,6 +15281,7 @@
         </datatype>
       </attDef>
       <attDef ident="rend" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">rendition</gloss>
         <desc xml:lang="en">Captures the appearance of the element’s contents using MEI-defined
           descriptors.</desc>
         <datatype maxOccurs="unbounded">
@@ -15224,11 +15339,12 @@
         </datatype>
       </attDef>
     </attList>
-  </classSpec><classSpec rend="add" ident="att.timestamp.logical" module="MEI.shared" type="atts">
+  </classSpec><classSpec rend="add" ident="att.timestamp.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record a time stamp in terms of musical time, <abbr>i.e.</abbr>, beats[.fractional beat
       part].</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="tstamp" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">time stamp</gloss>
         <desc xml:lang="en">Encodes the onset time in terms of musical time, <abbr>i.e.</abbr>, beats[.fractional beat part],
           as expressed in the written time signature.</desc>
         <datatype>
@@ -15236,7 +15352,7 @@
         </datatype>
       </attDef>
     </attList>
-  </classSpec><classSpec rend="add" ident="att.timestamp2.logical" module="MEI.shared" type="atts">
+  </classSpec><classSpec rend="add" ident="att.timestamp2.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record a time stamp for the end of an event in terms of musical
       time.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -15252,6 +15368,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe transposition.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="trans.diat" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">transposition (diatonic)</gloss>
         <desc xml:lang="en">Records the amount of diatonic pitch shift, <abbr>e.g.</abbr>, C to C♯ = 0, C to D♭ = 1, necessary
           to calculate the sounded pitch from the written one.</desc>
         <datatype>
@@ -15259,6 +15376,7 @@
         </datatype>
       </attDef>
       <attDef ident="trans.semi" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">transposition (semitones)</gloss>
         <desc xml:lang="en">Records the amount of pitch shift in semitones, <abbr>e.g.</abbr>, C to C♯ = 1, C to D♭ = 1,
           necessary to calculate the sounded pitch from the written one.</desc>
         <datatype>
@@ -15546,7 +15664,7 @@
       <attDef ident="xml:space" usage="opt">
         <desc xml:lang="en">Allows one to signal to an application whether an element’s white space is
           "significant". The behavior of xml:space cascades to all descendant elements, but it can
-          be turned off locally by setting the xml:space attribute to the value "default".</desc>
+          be turned off locally by setting the xml:space attribute to the value <val>default</val>.</desc>
         <valList type="closed">
           <valItem ident="default">
             <desc xml:lang="en">Allows the application to handle white space as necessary. Not including an
@@ -15571,7 +15689,7 @@
     </attList>
     <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>The width attribute may be used to capture measure width data for interchange with music
-        printing systems that utilize this information for printing. On &lt;barLine&gt; the width
+        printing systems that utilize this information for printing. On <gi scheme="MEI">barLine</gi> the width
         attribute captures the width of the preceding measure.</p>
     </remarks>
   </classSpec><classSpec rend="add" ident="att.xy" module="MEI.shared" type="atts">
@@ -15765,8 +15883,7 @@
   </classSpec><classSpec rend="add" predeclare="true" ident="model.noteModifierLike" module="MEI.shared" type="model">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements that modify note-like features.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
-      <memberOf key="model.layerPart.mensural"/>
+      <memberOf key="model.layerPart.mensuralAndNeumes"/>
     </classes>
   </classSpec><classSpec rend="add" predeclare="true" ident="model.numLike" module="MEI.shared" type="model">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements that denote a number or a quantity.</desc>
@@ -15831,12 +15948,6 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements that represent a score.</desc>
   </classSpec><classSpec rend="add" predeclare="true" ident="model.scorePart" module="MEI.shared" type="model">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements that may appear as part of a score.</desc>
-  </classSpec><classSpec rend="add" predeclare="true" ident="model.scorePart.mensuralAndNeumes" module="MEI.shared" type="model">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements that may appear as part of a score in the mensural and neumes
-      repertoires.</desc>
-    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="model.scorePart"/>
-    </classes>
   </classSpec><classSpec rend="add" predeclare="true" ident="model.sectionLike" module="MEI.shared" type="model">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Groups elements that represent a segment of music notation.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -15916,6 +16027,7 @@
       <memberOf key="att.accid.ges"/>
       <memberOf key="att.accid.anl"/>
       <memberOf key="model.noteModifierLike"/>
+      <memberOf key="model.syllablePart"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
@@ -15933,7 +16045,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-actor.html">actor</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="address" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a postal address, for example of a publisher, an organization, or an
       individual.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -15943,8 +16055,8 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><oneOrMore><ref name="addrLine"/></oneOrMore><oneOrMore><choice><ref name="model.addressPart"/></choice></oneOrMore></choice>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-address.html">address</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-address">address</ref> element of the Encoded
+        Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="addrLine" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">address line</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Single line of a postal address.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -15955,8 +16067,8 @@
       <p> <gi scheme="MEI">addrLine</gi> may be repeated as many times as necessary to enter all
         lines of an address.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-addrLine.html">addrLine</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-addressline">addressline</ref> element of the Encoded
+        Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="ambitus" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Range of a voice, instrument or piece.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -16008,7 +16120,7 @@
       <memberOf key="model.annotLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><group><zeroOrMore><ref name="model.headLike"/></zeroOrMore><zeroOrMore><ref name="model.textComponentLike"/></zeroOrMore></group><zeroOrMore><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.editLike"/><ref name="model.textPhraseLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore></choice>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_annot_data" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_annot_data" scheme="schematron">
       <constraint>
         <sch:rule context="mei:annot[@data]">
           <sch:assert test="ancestor::mei:notesStmt">The @data attribute may only occur on an
@@ -16066,8 +16178,8 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-author.html">author</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-author">author</ref> element of the Encoded
+        Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="barLine" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Vertical line drawn through one or more staves that divides musical notation into metrical
       units.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -16085,7 +16197,7 @@
       <p>This element is provided for repertoires, such as mensural notation, that lack measures.
         Because the <gi scheme="MEI">barLine</gi> element’s attributes, from which the logical and
         visual characteristics of the bar line can be discerned, largely duplicate those of measure,
-        the use of barLine is not necessary within <gi scheme="MEI">measure</gi> elements in
+        the use of <gi scheme="MEI">barLine</gi> is not necessary within <gi scheme="MEI">measure</gi> elements in
         CMN.</p>
     </remarks></elementSpec><elementSpec rend="add" ident="bibl" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">bibliographic reference</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Provides a loosely-structured bibliographic citation in which
       the sub-components may or may not be explicitly marked.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -16103,8 +16215,8 @@
         and <gi scheme="MEI">corpName</gi>. This element may also function as a hypertext reference
         to an external electronic resource. Do not confuse this element with <gi scheme="MEI">ref</gi>, which does not provide special bibliographic sub-elements.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-bibl.html">bibl</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-bibref">bibref</ref> element of the Encoded
+        Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="biblList" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">List of bibliographic references.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -16114,7 +16226,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><group><optional><ref name="label"/></optional><ref name="model.biblLike"/></group><ref name="biblList"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="checkBiblLabels" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="checkBiblLabels" scheme="schematron">
       <constraint>
         <sch:rule context="mei:biblList[mei:label]">
           <sch:assert role="warning" test="count(mei:label) = count(mei:bibl)">When labels are used,
@@ -16122,7 +16234,7 @@
         </sch:rule>
       </constraint>
     </constraintSpec><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-listBibl.html">listBibl</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="biblScope" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">scope of citation</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Defines the scope of a bibliographic reference, for example as a
       list of page numbers, or a named subdivision of a larger work.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -16144,7 +16256,7 @@
       </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>Use the <att>from</att> and <att>to</att> attributes to regularize the beginning and ending
         values provided in the element content.</p>
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-biblScope.html">biblScope</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="biblStruct" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">structured bibliographic citation</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a bibliographic citation in which
       bibliographic sub-elements must appear in a specified order.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -16182,7 +16294,7 @@
       <memberOf key="model.controlEventLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="caesura_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="caesura_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:caesura">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -16217,7 +16329,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="castItem"/><ref name="castGrp"/><ref name="roleDesc"/></choice></oneOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-castGroup.html">castGroup</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="castItem" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a single entry within a cast list, describing either a single role or a list of
       non-speaking roles.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -16227,7 +16339,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="role"/><ref name="roleDesc"/><ref name="actor"/><ref name="perfRes"/></choice></oneOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-castItem.html">castItem</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="castList" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a single cast list or dramatis personae.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -16238,7 +16350,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="castItem"/><ref name="castGrp"/></choice></oneOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-castList.html">castList</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="cb" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">column beginning</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">An empty formatting element that forces text to begin in a new
       column.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.basic"/>
@@ -16257,7 +16369,7 @@
         <datatype>
           <rng:data type="positiveInteger"/>
         </datatype>
-        <constraintSpec ident="check_cb" scheme="isoschematron">
+        <constraintSpec ident="check_cb" scheme="schematron">
           <constraint>
             <sch:rule context="mei:cb">
               <sch:let name="totalColumns" value="preceding::mei:colLayout[1]/@cols"/>
@@ -16270,7 +16382,7 @@
           </constraint>
         </constraintSpec>
       </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-cb.html">cb</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="chord" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A simultaneous sounding of two or more notes in the same layer *with the same
       duration*.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -16296,7 +16408,7 @@
       <memberOf key="model.syllablePart"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Clef_position_lines" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Clef_position_lines" scheme="schematron">
       <constraint>
         <sch:rule context="mei:clef[matches(@shape, '[FCG]')][ancestor::mei:staffDef[@lines]]">
           <sch:let name="thisstaff" value="ancestor::mei:staffDef/@n"/>
@@ -16304,7 +16416,7 @@
             staff.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Clef_position_nolines" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Clef_position_nolines" scheme="schematron">
       <constraint>
         <sch:rule context="mei:clef[ancestor::mei:staffDef[not(@lines)]]">
           <sch:let name="thisstaff" value="ancestor::mei:staffDef/@n"/>
@@ -16363,7 +16475,7 @@
       <memberOf key="model.respLikePart"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_contributor_role" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_contributor_role" scheme="schematron">
       <constraint>
         <sch:rule context="mei:contributor">
           <sch:assert test="not(matches(normalize-space(lower-case(@role)), '(arranger|author|composer|contributor|editor|funder|librettist|lyricist|sponsor)'))">The value of @role must not contain the name of another element available in this
@@ -16392,7 +16504,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="dedication"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI).</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-creation.html">creation</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="custos" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Symbol placed at the end of a line of music to indicate the first note of the next line.
       Sometimes called a "direct".</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -16421,8 +16533,8 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-date.html">date</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-date">date</ref> element of the Encoded
+        Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="dedicatee" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Entity to whom a creative work is formally offered.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -16431,7 +16543,7 @@
       <memberOf key="model.textPhraseLike.limited"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_dedicatee" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_dedicatee" scheme="schematron">
       <constraint>
         <sch:rule context="mei:dedicatee">
           <sch:assert test="not(ancestor::mei:dedicatee)">The dedicatee element may not be
@@ -16457,7 +16569,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-desc.html">desc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="dim" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">dimension</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Any single dimensional specification.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -16525,7 +16637,7 @@
       <memberOf key="model.textPhraseLike.limited"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_dimensions" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_dimensions" scheme="schematron">
       <constraint>
         <sch:rule context="mei:physDesc/mei:dimensions">
           <sch:assert test="not(count(mei:depth) &gt; 1)">The depth element may only appear
@@ -16541,12 +16653,11 @@
         capture of the individual dimensions of an object. Do not confuse this element with the <gi scheme="MEI">extent</gi> element, which is used to indicate the quantity of described
         materials.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="dir" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">directive</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">An instruction expressed as a combination of text and symbols — such as
-      segno and coda symbols, fermatas over a bar line, etc., typically above, below, or between
-      staves, but not on the staff — that is not encoded elsewhere in more specific elements, like
-      <gi scheme="MEI">tempo</gi> or <gi scheme="MEI">dynam</gi>.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-dimensions.html">dimensions</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-dimensions">dimensions</ref> element of the Encoded
+        Archival Description (EAD).</p>
+    </remarks></elementSpec><elementSpec rend="add" ident="dir" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">directive</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">An instruction expressed as a combination of text and symbols, typically above,
+      below, or between staves, but not on the staff — that is not encoded elsewhere in more specific
+      elements, like <gi scheme="MEI">tempo</gi>, <gi scheme="MEI">dynam</gi>  or <gi scheme="MEI">repeatMark</gi>.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.lang"/>
@@ -16557,7 +16668,7 @@
       <memberOf key="model.controlEventLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="model.graphicPrimitiveLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="dir_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="dir_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:dir[not(ancestor::mei:syllable)]">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -16583,7 +16694,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-distributor.html">distributor</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="div" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">division</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Major structural division of text, such as a preface, chapter or
       section.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.basic"/>
@@ -16654,8 +16765,8 @@
           </valItem>
         </valList>
       </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>Often, the <gi scheme="MEI">head</gi> sub-element identifies the <gi scheme="MEI">div</gi>’s purpose. This element is modelled on an element in the Text Encoding Initiative
-        (TEI) standard.</p>
+      <p>Often, the <gi scheme="MEI">head</gi> sub-element identifies the <gi scheme="MEI">div</gi>’s purpose. The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-div.html">div</ref> element of the Text Encoding Initiative
+        (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="dot" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Dot of augmentation or division.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -16682,14 +16793,14 @@
       <memberOf key="model.controlEventLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="dynam_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="dynam_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:dynam">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real"> Must have one of
             the attributes: startid, tstamp, tstamp.ges or tstamp.real.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="dynam_end-type_attributes" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="dynam_end-type_attributes" scheme="schematron">
       <constraint>
         <sch:rule context="mei:dynam[@val2]">
           <sch:assert test="@dur or @dur.ges or @endid or @tstamp2">When @val2 is present, either
@@ -16718,8 +16829,8 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="editor"/><ref name="respStmt"/><ref name="textLang"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-edition.html">edition</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-edition">edition</ref> element of the Encoded
+        Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="editor" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">The name of the individual(s), institution(s) or organization(s) acting in an editorial
       capacity.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -16731,7 +16842,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-editor.html">editor</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="ending" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Alternative ending for a repeated passage of music; <abbr>i.e.</abbr>, prima volta, seconda volta,
       etc.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -16812,8 +16923,19 @@
       <p>Use the <gi scheme="MEI">dimensions</gi> element when it is necessary to specify the <hi rend="bold">physical</hi> size of materials being described, for example, height and
         width.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-extent.html">extent</ref> element of the Text Encoding Initiative (TEI).</p>
+    </remarks></elementSpec><elementSpec rend="add" ident="extData" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-05-23" xml:lang="en">extended data</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Provides a container element for non-MEI data formats.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.basic"/>
+      <memberOf key="att.labelled"/>
+      <memberOf key="att.responsibility"/>
+      <memberOf key="att.typed"/>
+      <memberOf key="att.whitespace"/>
+      <memberOf key="att.pointing"/>
+      <memberOf key="att.internetMedia"/>
+    </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><group><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="macro.anyXML"/></choice></group></zeroOrMore>
+    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>Container for holding non-MEI data formats, similar to <gi scheme="MEI">extMeta</gi> but available in <gi scheme="MEI">when</gi> rather than in <gi scheme="MEI">meiHead</gi>. The content of this element, by virtue of being inside a <gi scheme="MEI">when</gi> element, is associated with a particular point in time in a media file and this point in time may be linked to symbolic data, such as notes, chords, rests, etc., recorded elsewhere. When the data in <gi scheme="MEI">extData</gi> contains left angle bracket (less-than) or ampersand characters, or when it contains white space that should be preserved (such as line breaks), then the data should be enclosed in a CDATA section (<abbr>e.g.</abbr>, for JSON formatted data).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="funder" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Names of individuals, institutions, or organizations responsible for funding. Funders
       provide financial support for a project; they are distinct from sponsors, who provide
       intellectual support and authority.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -16826,7 +16948,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-funder.html">funder</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="genre" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Term or terms that designate a category characterizing a particular style, form, or
       content.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -16850,7 +16972,7 @@
       <p>Because its model contains the music element, each of the subordinate MEI documents can
         have its own front and back matter.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-group.html">group</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="grpSym" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">group symbol</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A brace or bracket used to group two or more staves of a score or
       part.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -16861,14 +16983,14 @@
       <memberOf key="att.grpSym.anl"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.labelLike"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_grpSym_attributes_scoreDef" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_grpSym_attributes_scoreDef" scheme="schematron">
       <constraint>
         <sch:rule context="mei:grpSym[parent::mei:scoreDef]">
           <sch:assert test="@startid and @endid and @level">In scoreDef, grpSym must have startid,
             endid, and level attributes.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_grpSym_attributes_staffDef" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_grpSym_attributes_staffDef" scheme="schematron">
       <constraint>
         <sch:rule context="mei:grpSym[parent::mei:staffGrp]">
           <sch:assert test="not(@startid or @endid or @level)">In staffGrp, grpSym must not have
@@ -16892,8 +17014,8 @@
       <p>One or more <gi scheme="MEI">head</gi> elements usually identify the parent element and/or
         its purpose.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in Encoded Archival Description (EAD), Text Encoding
-        Initiative (TEI), and HTML standards.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-head">head</ref> element of the Encoded Archival Description (EAD), the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-head.html">head</ref> element of the Text Encoding
+        Initiative (TEI), and the <ref target="https://html.spec.whatwg.org/#the-head-element">head</ref> element of <abbr>HTML</abbr>.</p>
     </remarks></elementSpec><elementSpec rend="add" ident="height" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Description of the vertical size of an object.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -16924,8 +17046,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.imprintPart"/><ref name="model.textPhraseLike"/><ref name="model.transcriptionLike"/><ref name="respStmt"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-imprint.html">imprint</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="incip" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">incipit</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">The opening music and/or words of a musical or textual work.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -16956,7 +17077,7 @@
       <memberOf key="model.keyAccidLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_keyAccidPlacement" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_keyAccidPlacement" scheme="schematron">
       <constraint>
         <sch:rule context="mei:keyAccid">
           <sch:assert test="(@x and @y) or @pname or @loc">One of the following is required: @x and
@@ -16988,7 +17109,7 @@
       <memberOf key="model.keySigLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.keyAccidLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_keyAccid_oct" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_keyAccid_oct" scheme="schematron">
       <constraint>
         <sch:rule context="mei:keySig[mei:keyAccid[@oct]]">
           <sch:assert test="count(mei:keyAccid[@oct]) = count(mei:keyAccid)">If the @oct attribute
@@ -16996,7 +17117,7 @@
             elements.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_keySig_editorial" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_keySig_editorial" scheme="schematron">
       <constraint>
         <sch:rule context="mei:keySig/mei:*[local-name() eq 'add' or local-name() eq 'corr'             or local-name() eq 'damage' or local-name() eq 'del' or local-name() eq 'orig' or              local-name() eq 'reg' or local-name() eq 'restore' or local-name() eq 'sic' or              local-name() eq 'supplied' or local-name() eq 'unclear']">
           <sch:assert test="count(mei:keyAccid) = count(mei:*)">Only keyAccid elements are allowed
@@ -17013,7 +17134,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-label.html">label</ref> element of the Text Encoding Initiative (TEI).</p>
       <p>Don't confuse this element, which is used to capture labelling text appearing in the
         document, with the <att>label</att> attribute, which records text to be used to generate a
         designation for the element to which it’s attached, a "tool tip" or prefatory text, for
@@ -17041,7 +17162,7 @@
       <memberOf key="att.layer.anl"/>
       <memberOf key="model.layerLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.annotLike"/><ref name="model.appLike"/><ref name="model.editLike"/><ref name="model.graphicPrimitiveLike"/><ref name="model.layerPart"/><ref name="model.milestoneLike.music"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
+      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.annotLike"/><ref name="model.appLike"/><ref name="model.editLike"/><ref name="model.graphicPrimitiveLike"/><ref name="model.layerPart"/><ref name="model.milestoneLike.music"/><ref name="model.transcriptionLike"/><ref name="divLine"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>The term 'layer' is used instead of 'voice' in order to avoid confusion between 'voice' and
         'voice leading' and 'voicing'. The <att>def</att> attribute may be used to create a
@@ -17082,13 +17203,14 @@
         attribute. Do not confuse this element with the <gi scheme="MEI">sb</gi> element, which
         performs a similar function for musical notation.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-lb.html">lb</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="lg" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">line group</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">May be used for any section of text that is organized as a group of lines;
       however, it is most often used for a group of verse lines functioning as a formal unit, <abbr>e.g.</abbr>, a
       stanza, refrain, verse paragraph, etc.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.lang"/>
+      <memberOf key="att.lyrics.anl"/>
       <memberOf key="att.lyrics.ges"/>
       <memberOf key="att.lyrics.log"/>
       <memberOf key="att.lyrics.vis"/>
@@ -17100,7 +17222,7 @@
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.lLike"/><ref name="model.lgLike"/></choice>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.lLike"/><ref name="model.lgLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-lg.html">lg</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="librettist" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Person or organization who is a writer of the text of an opera, oratorio, etc.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -17149,7 +17271,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="meiHead"/>
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="music"/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_staff" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_staff" scheme="schematron">
       <constraint>
         <sch:rule context="mei:*[@staff]">
           <sch:assert test="every $i in tokenize(normalize-space(@staff), '\s+') satisfies $i=//mei:staffDef/@n">The values in @staff must correspond to @n attribute of a staffDef
@@ -17195,7 +17317,7 @@
       <memberOf key="model.nameLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="nameParts" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="nameParts" scheme="schematron">
       <constraint>
         <sch:rule context="mei:name">
           <sch:assert role="warning" test="not(mei:geogName or mei:persName or mei:corpName)">Recommended practice is to use name elements to capture sub-parts of a generic
@@ -17246,8 +17368,7 @@
         its electronically-available location may be recorded using the <att>auth</att> and
         <att>auth.uri</att> attributes.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Encoded Archival Description (EAD)
-        standard.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-name">name</ref> element of the Encoded Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="note" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A single pitched event.  </desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -17298,7 +17419,7 @@
       <memberOf key="model.controlEventLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="model.graphicPrimitiveLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="ornam_start-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="ornam_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:ornam">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -17324,8 +17445,8 @@
       <p>A paragraph is usually typographically distinct: The text usually begins on a new line and
         the first letter of the content is often indented, enlarged, or both.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Encoded Archival Description, Text Encoding
-        Initiative (TEI), and HTML standards.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-p">p</ref> element of the Encoded Archival Description, the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-p.html">p</ref> element of the Text Encoding
+        Initiative (TEI), and the <ref target="https://html.spec.whatwg.org/#the-p-element">p</ref> element of <abbr>HTML</abbr>.</p>
     </remarks></elementSpec><elementSpec rend="add" ident="pad" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">padding</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">An indication of extra visual space between notational elements.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.pad.log"/>
@@ -17384,7 +17505,7 @@
         calculated by counting previous <gi scheme="MEI">pb</gi> ancestor elements. When used in a
         score context, a page beginning implies an accompanying system beginning.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-pb.html">pb</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="pgDesc" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">page description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a brief prose description of the appearance or description
       of the content of a physical page.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -17396,77 +17517,34 @@
       <p>Best practice suggests the use of controlled vocabulary. Don't confuse this element with a
         figure caption. A caption is text primarily intended for display with an illustration. It
         may or may not function as a description of the illustration.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="pgFoot" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">page footer</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A running footer on the first page. Also, used to temporarily override a
-      running footer on individual pages.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    </remarks></elementSpec><elementSpec rend="add" ident="pgFoot" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">page footer</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A running footer.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
+      <memberOf key="att.formework"/>
+      <memberOf key="att.horizontalAlign"/>
       <memberOf key="att.lang"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textComponentLike"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/><ref name="model.appLike"/><ref name="anchoredText"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="halign" usage="opt">
-        <desc xml:lang="en">Records horizontal alignment of the page footer.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.HORIZONTALALIGNMENT"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is used to capture the textual data that often appears on the first page of
+    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>This element is used to capture the textual data that often appears in
         printed music. It may also be used for similarly formatted material in manuscripts. When
         used within <gi scheme="MEI">pb</gi>, it records a temporary suspension of the pattern of
         page footers established by the use of <gi scheme="MEI">pgFoot</gi> within a previous <gi scheme="MEI">scoreDef</gi>. Auto-generated page numbers may be indicated with a processing
-        instruction. The pgHead, pgHead2, pgFoot, and pgFoot2 elements should <hi rend="bold">*not*</hi> be used to encode textual notes/annotations.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="pgFoot2" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">page footer 2</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A running footer on the pages following the first.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.common"/>
-      <memberOf key="att.facsimile"/>
-      <memberOf key="att.lang"/>
-    </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textComponentLike"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/><ref name="model.appLike"/><ref name="anchoredText"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="halign" usage="opt">
-        <desc xml:lang="en">Records horizontal alignment of the page footer. Use multiple values to capture an
-          alternating pattern.</desc>
-        <datatype maxOccurs="unbounded">
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.HORIZONTALALIGNMENT"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is used to capture the textual data that often appears on the second and
-        succeeding pages of printed music. It may also be used for similarly formatted material in
-        manuscripts. Auto-generated page numbers may be indicated with a processing instruction. The
-        pgHead, pgHead2, pgFoot, and pgFoot2 elements should <hi rend="bold">*not*</hi> be used to
-        encode textual notes/annotations.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="pgHead" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">page header</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A running header on the first page. Also, used to temporarily override a
-      running header on individual pages.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+        instruction. The pgHead and pgFoot elements should <hi rend="bold">*not*</hi> be used to encode textual notes/annotations.</p>
+    </remarks></elementSpec><elementSpec rend="add" ident="pgHead" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">page header</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A running header.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
+      <memberOf key="att.formework"/>
+      <memberOf key="att.horizontalAlign"/>
       <memberOf key="att.lang"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textComponentLike"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/><ref name="model.appLike"/><ref name="anchoredText"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="halign" usage="opt">
-        <desc xml:lang="en">Records horizontal alignment of the page header.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.HORIZONTALALIGNMENT"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is used to capture the textual data that often appears on the first page of
+    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+      <p>This element is used to capture the textual data that often appears in
         printed music. It may also be used for similarly formatted material in manuscripts. When
         used within <gi scheme="MEI">pb</gi>, it records a temporary suspension of the pattern of
         page headers established by the use of <gi scheme="MEI">pgHead</gi> within a previous <gi scheme="MEI">scoreDef</gi>. Auto-generated page numbers may be indicated with a processing
-        instruction. The pgHead, pgHead2, pgFoot, and pgFoot2 elements should <hi rend="bold">*not*</hi> be used to encode textual notes/annotations.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="pgHead2" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">page header 2</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A running header on the pages following the first.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.common"/>
-      <memberOf key="att.facsimile"/>
-      <memberOf key="att.lang"/>
-    </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textComponentLike"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/><ref name="model.appLike"/><ref name="anchoredText"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="halign" usage="opt">
-        <desc xml:lang="en">Records horizontal alignment of the page header. Use multiple values to capture an
-          alternating pattern.</desc>
-        <datatype maxOccurs="unbounded">
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.HORIZONTALALIGNMENT"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is used to capture the textual data that often appears at the top of the
-        second and succeeding pages of printed music. It may also be used for similarly formatted
-        material in manuscripts. Auto-generated page numbers may be indicated with a processing
-        instruction. The pgHead, pgHead2, pgFoot, and pgFoot2 elements should <hi rend="bold">not</hi> be used to encode textual notes/annotations.</p>
+        instruction. The pgHead and pgFoot elements should <hi rend="bold">*not*</hi> be used to encode textual notes/annotations.</p>
     </remarks></elementSpec><elementSpec rend="add" ident="phrase" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Indication of 1) a "unified melodic idea" or 2) performance technique.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -17477,7 +17555,7 @@
       <memberOf key="model.controlEventLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="curve"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="phrase_start-_and_end-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="phrase_start-_and_end-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:phrase">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -17486,7 +17564,7 @@
             dur, dur.ges, endid, or tstamp2.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="phrase_containing_curve" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="phrase_containing_curve" scheme="schematron">
       <constraint>
         <sch:rule context="mei:phrase[mei:curve[@bezier or @bulge or @curvedir or @lform or @lwidth or @ho or              @startho or @endho or @to or @startto or @endto or @vo or @startvo or @endvo or @x or @y or @x2 or @y2]]">
           <sch:assert test="not(@bezier or @bulge or @curvedir or @lform or @lwidth or @ho or @startho or @endho or                @to or @startto or @endto or @vo or @startvo or @endvo or @x or @y or @x2 or @y2)" role="warning">The visual attributes of the phrase (@bezier, @bulge, @curvedir, @lform,
@@ -17522,8 +17600,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><group><ref name="model.repositoryLike"/><zeroOrMore><ref name="model.identifierLike"/></zeroOrMore></group></zeroOrMore>
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="history"/></optional>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Encoded Archival Description (EAD)
-        standard.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-physloc">physloc</ref> element of the Encoded Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="publisher" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Name of the organization responsible for the publication of a bibliographic item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -17534,7 +17611,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-publisher.html">publisher</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="pubPlace" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">publication place</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Name of the place where a bibliographic item was published.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -17545,7 +17622,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-pubPlace.html">pubPlace</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="recipient" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">The name of the individual(s), institution(s) or organization(s) receiving
       correspondence.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -17583,7 +17660,7 @@
       <memberOf key="model.relationLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="FRBR_relation" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="FRBR_relation" scheme="schematron">
       <constraint>
         
         <sch:rule context="mei:relationList/mei:relation[parent::mei:work or parent::mei:expression or           parent::mei:source or parent::mei:item]">
@@ -17625,6 +17702,7 @@
       italicized, of a text word or phrase.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.color"/>
       <memberOf key="att.common"/>
+      <memberOf key="att.extSym.auth"/>
       <memberOf key="att.horizontalAlign"/>
       <memberOf key="att.lang"/>
       <memberOf key="att.textRendition"/>
@@ -17642,7 +17720,9 @@
         </datatype>
       </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>When an entire element should be rendered in a special way, a style sheet function should
-        be used instead of the <gi scheme="MEI">rend</gi> element.</p>
+        be used instead of the <gi scheme="MEI">rend</gi> element. The <att>glyph.auth</att> and <att>glyph.uri</att>
+        attributes may be used to specify an external authority, <abbr>e.g.,</abbr> SMuFL, to be used for
+        displaying code points in the textual content of the element.</p>
     </remarks></elementSpec><elementSpec rend="add" ident="repository" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Institution, agency, or individual which holds a bibliographic item.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -17657,8 +17737,7 @@
         sub-elements. The name of the list from which a controlled value is taken may be recorded
         using the <att>auth</att> attribute.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Encoded Archival Description (EAD)
-        standard.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-repository">repository</ref> element of the Encoded Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="resp" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">responsibility</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A phrase describing the nature of intellectual responsibility.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.authorized"/>
@@ -17672,7 +17751,7 @@
       <p>The name of the list from which a controlled value is taken may be recorded using the
         <att>auth</att> attribute.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-resp.html">resp</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="respStmt" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">responsibility statement</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Transcription of text that names one or more individuals,
       groups, or in rare cases, mechanical processes, responsible for creation, realization,
       production, funding, or distribution of the intellectual or artistic content.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -17684,7 +17763,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="name"/><ref name="resp"/><ref name="model.nameLike.agent"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_respStmt" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_respStmt" scheme="schematron">
       <constraint>
         <sch:rule context="mei:respStmt[not(ancestor::mei:change)]">
           <sch:assert test="(mei:resp and (mei:name or mei:corpName or mei:persName)) or             count(mei:*[@role]) = count(mei:*) and count(mei:*) &gt; 0" role="warning">At least one element pair (a resp element and a name-like element) is
@@ -17693,7 +17772,7 @@
         </sch:rule>
       </constraint>
     </constraintSpec><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-respStmt.html">respStmt</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="rest" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A non-sounding event found in the source being transcribed.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -17704,7 +17783,7 @@
       <memberOf key="model.eventLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="dot"/><ref name="model.appLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_restline" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_restline" scheme="schematron">
       <constraint>
         <sch:rule context="mei:rest[@line]">
           <sch:let name="thisstaff" value="ancestor::mei:staff/@n"/>
@@ -17722,7 +17801,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-role.html">role</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="roleDesc" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">role description</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Describes a character’s role in a drama.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -17730,7 +17809,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-roleDesc.html">roleDesc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="sb" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">system beginning</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">An empty formatting element that forces musical notation to begin on
       a new line.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -17773,10 +17852,8 @@
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.symbolTableLike"/></optional>
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.keySigLike"/></optional>
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.meterSigLike"/></optional>
-      <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="pgHead"/></optional>
-      <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="pgHead2"/></optional>
-      <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="pgFoot"/></optional>
-      <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="pgFoot2"/></optional>
+      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="pgHead"/></zeroOrMore>
+      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="pgFoot"/></zeroOrMore>
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="instrGrp"/></optional>
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><optional><ref name="model.staffGrpLike"/></optional></choice>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="grpSym"/></zeroOrMore>
@@ -17795,7 +17872,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="expansion"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.annotLike"/><ref name="model.appLike"/><ref name="model.divLike"/><ref name="model.editLike"/><ref name="model.graphicPrimitiveLike"/><ref name="model.milestoneLike.music"/><ref name="model.relationLike"/><ref name="model.sectionPart"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_sectionexpansion" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_sectionexpansion" scheme="schematron">
       <constraint>
         <sch:rule context="mei:section[mei:expansion]">
           <sch:assert test="descendant::mei:section|descendant::mei:ending|descendant::mei:rdg">A
@@ -17818,7 +17895,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.identifierLike"/><ref name="model.locrefLike"/><ref name="model.milestoneLike.text"/><ref name="model.titleLike"/><ref name="editor"/><ref name="extent"/><ref name="respStmt"/><ref name="textLang"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-series.html">series</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="space" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A placeholder used to fill an incomplete measure, layer, etc. most often so that the
       combined duration of the events equals the number of beats in the measure.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -17839,7 +17916,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-speaker.html">speaker</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="sponsor" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Names of sponsoring individuals, organizations or institutions. Sponsors give their
       intellectual authority to a project; they are to be distinguished from funders, who provide
       the funding but do not necessarily take intellectual responsibility.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -17852,8 +17929,8 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-sponsor.html">sponsor</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-sponsor">sponsor</ref> element of the Encoded
+        Archival Description (EAD).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="stack" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">stacked text</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">An inline table with a single column.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -17902,7 +17979,7 @@
       <memberOf key="model.staffLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.annotLike"/><ref name="model.appLike"/><ref name="model.editLike"/><ref name="model.graphicPrimitiveLike"/><ref name="model.milestoneLike.music"/><ref name="model.relationLike"/><ref name="model.staffDefLike"/><ref name="model.staffPart"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="checkStaff_n" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="checkStaff_n" scheme="schematron">
       <constraint>
         <sch:rule context="mei:staff[@n]">
           <sch:let name="thisstaff" value="@n"/>
@@ -17933,7 +18010,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.labelLike"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.instrDefLike"/><ref name="model.layerDefLike"/><ref name="model.staffDefPart"/></choice></zeroOrMore>
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="ambitus"/></optional>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_staffDefn" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_staffDefn" scheme="schematron">
       <constraint>
         <sch:rule context="mei:staffDef[not(ancestor::mei:staff)]">
           <sch:let name="thisstaff" value="@n"/>
@@ -17945,7 +18022,7 @@
             permitted.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_ancestor_staff" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_ancestor_staff" scheme="schematron">
       <constraint>
         <sch:rule context="mei:staffDef[ancestor::mei:staff and @n]">
           <sch:let name="thisstaff" value="@n"/>
@@ -17953,7 +18030,7 @@
             current staff.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_ancestor_staff_lines" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_ancestor_staff_lines" scheme="schematron">
       <constraint>
         <sch:rule context="mei:staffDef[ancestor::mei:staff and not(@n)]">
           <sch:let name="thisstaff" value="ancestor::mei:staff/@n"/>
@@ -17962,14 +18039,14 @@
             exist.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_clef_position_staffDef" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_clef_position_staffDef" scheme="schematron">
       <constraint>
         <sch:rule context="mei:staffDef[@clef.line and @lines]">
           <sch:assert test="number(@clef.line) &lt;= number(@lines)">The clef position must be less
             than or equal to the number of lines on the staff.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_clef_position_staffDef_nolines" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_clef_position_staffDef_nolines" scheme="schematron">
       <constraint>
         <sch:rule context="mei:staffDef[@clef.line and not(@lines)]">
           <sch:let name="thisstaff" value="@n"/>
@@ -17978,7 +18055,7 @@
             less than or equal to the number of lines on the staff.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_tab_strings_lines" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_tab_strings_lines" scheme="schematron">
       <constraint>
         <sch:rule context="mei:staffDef[@tab.strings and @lines]">
           <sch:let name="countTokens" value="count(tokenize(normalize-space(@tab.strings), '\s'))"/>
@@ -17986,7 +18063,7 @@
             number of values as there are staff lines.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_tab_strings_nolines" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_tab_strings_nolines" scheme="schematron">
       <constraint>
         <sch:rule context="mei:staffDef[@tab.strings and not(@lines)]">
           <sch:let name="countTokens" value="count(tokenize(normalize-space(@tab.strings), '\s'))"/>
@@ -17996,7 +18073,7 @@
             lines.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_lines_color" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_lines_color" scheme="schematron">
       <constraint>
         <sch:pattern>
           <sch:rule context="mei:staffDef[@lines.color and @lines]">
@@ -18013,7 +18090,7 @@
           </sch:rule>
         </sch:pattern>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_staff_ppq_ancestor" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_staff_ppq_ancestor" scheme="schematron">
       <constraint>
         <sch:pattern>
           <sch:rule context="mei:staffDef[@ppq][ancestor::mei:scoreDef[@ppq]]">
@@ -18024,7 +18101,7 @@
           </sch:rule>
         </sch:pattern>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_staff_ppq_preceding" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_staff_ppq_preceding" scheme="schematron">
       <constraint>
         <sch:pattern>
           <sch:rule context="mei:staffDef[@ppq][preceding::mei:scoreDef[@ppq]]">
@@ -18050,7 +18127,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.instrDefLike"/></zeroOrMore>
       <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.staffGrpLike"/><ref name="model.staffDefLike"/></choice></oneOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="grpSym"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_staffGrp_unique_staff_n_values" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_staffGrp_unique_staff_n_values" scheme="schematron">
       <constraint>
         <sch:rule context="mei:staffGrp">
           <sch:let name="countstaves" value="count(descendant::mei:staffDef)"/>
@@ -18087,7 +18164,7 @@
       <memberOf key="model.textPhraseLike.limited"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="symbolDef_symbol_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="symbolDef_symbol_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:symbol[ancestor::mei:symbolDef]">
           <sch:assert test="@startid or (@x and @y)">In the symbolDef context, symbol must have
@@ -18119,7 +18196,7 @@
       <memberOf key="model.workIdent"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/><ref name="model.graphicPrimitiveLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="tempo_in_header_disallow_most_attrs" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="tempo_in_header_disallow_most_attrs" scheme="schematron">
       <constraint>
         <sch:rule context="mei:tempo[not(ancestor::mei:score or ancestor::mei:part)]">
           <sch:assert test="not(@*[name() != 'analog' and name() != 'class' and name() != 'label' and name() != 'mm' and name() != 'mm.dots' and name() != 'translit' and name() != 'type' and name() != 'mm.unit' and name() != 'n' and name() != 'xml:base' and name() != 'xml:id' and name() != 'xml:lang'])">Only analog, class, label, mm, mm.dots, mm.unit, n, translit, type, xml:base, xml:id,
@@ -18127,7 +18204,7 @@
             part.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="tempo_start-type_attributes_required" scheme="isoschematron">
+    </constraintSpec><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="tempo_start-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:tempo[not(ancestor::mei:syllable) and not(ancestor::mei:work) and not(ancestor::mei:expression) and not(count(ancestor::mei:*) = 0)]">
           <sch:assert test="@startid or @tstamp or @tstamp.ges or @tstamp.real">Must have one of the
@@ -18142,7 +18219,7 @@
       <memberOf key="model.textPhraseLike.limited"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_term_dataTarget" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="Check_term_dataTarget" scheme="schematron">
       <constraint>
         <sch:rule context="mei:term[@data]">
           <sch:assert test="ancestor::mei:classification">The @data attribute may only occur on a
@@ -18158,7 +18235,7 @@
         taxonomy, <att>class</att> must contain an absolute URI, which may include the fragment
         identifier of the element containing the category label.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-term.html">term</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="textLang" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">text language</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Identifies the languages and writing systems within the work described
       by a bibliographic description, not the language of the description.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -18270,7 +18347,7 @@
         as those constituting an article or preposition) that should not be used for sorting a title
         or name may be indicated in the <att>nonfiling</att> attribute.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-title.html">title</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="titlePage" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a transcription of the title page of a text.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -18285,7 +18362,7 @@
       <p>This element may be used within the <gi scheme="MEI">physDesc</gi> element when no other
         transcription is provided.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in Encoded Archival Description (EAD) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-titlePage.html">titlePage</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="titlePart" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a subsection or division of the title of a bibliographic entity.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.authorized"/>
       <memberOf key="att.basic"/>
@@ -18356,7 +18433,7 @@
           </valItem>
         </valList>
       </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-titlePart.html">titlePart</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="width" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Description of the horizontal size of an object.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.bibl"/>
@@ -18479,7 +18556,7 @@
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.headLike"/><ref name="model.milestoneLike.text"/></choice></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.figureLike"/><ref name="model.textComponentLike"/><ref name="sp"/></choice><zeroOrMore><ref name="model.milestoneLike.text"/></zeroOrMore></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-argument.html">argument</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="back" module="MEI.text"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">back matter</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains any appendixes, advertisements, indexes, etc. following the main
       body of a musical text.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -18490,8 +18567,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.divLike"/><ref name="model.frontAndBackPart"/><ref name="model.milestoneLike.text"/><ref name="model.relationLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-back.html">back</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="epigraph" module="MEI.text"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a quotation, anonymous or attributed, appearing on a title page.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -18501,7 +18577,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.paracontentPart"/><ref name="p"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-epigraph.html">epigraph</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="front" module="MEI.text"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">front matter</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Bundles prefatory text found before the start of the musical text.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -18516,8 +18592,7 @@
         as textual divisions; that is, as <gi scheme="MEI">div</gi> elements, with an optional <gi scheme="MEI">head</gi> sub-element describing the nature of the division. The <gi scheme="MEI">pb</gi> element is allowed here in order to accommodate page images, <abbr>e.g.</abbr>,
         cover, endpapers, etc. before and after the actual textual matter.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) and Encoded
-        Archival Description (EAD) standards.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-front.html">front</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="imprimatur" module="MEI.text"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a formal statement authorizing the publication of a work, sometimes required to
       appear on a title page or its verso.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -18528,7 +18603,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.paracontentPart"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-imprimatur.html">imprimatur</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="l" module="MEI.text"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">line of text</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a single line of text within a line group.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -18546,7 +18621,7 @@
       <p>Do not confuse this element with the <gi scheme="MEI">line</gi> element, which is used for
         graphical lines that occur in music notation.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-l.html">l</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="li" module="MEI.text"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">list item</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Single item in a <gi scheme="MEI">list</gi>.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
@@ -18554,8 +18629,8 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textComponentLike"/><ref name="model.textPhraseLike"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in the Encoded Archival Description (EAD), Text
-        Encoding Initiative (TEI), and HTML standards.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-item">item</ref> elements of the Encoded Archival Description (EAD), the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-item.html">item</ref> element of the Text
+        Encoding Initiative (TEI), and the <ref target="https://html.spec.whatwg.org/#the-li-element">li</ref> element of <abbr>HTML</abbr>.</p>
     </remarks></elementSpec><elementSpec rend="add" ident="list" module="MEI.text"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A formatting element that contains a series of items separated from one another and
       arranged in a linear, often vertical, sequence.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.basic"/>
@@ -18571,7 +18646,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.headLike"/></zeroOrMore>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><optional><ref name="label"/></optional><ref name="li"/></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="list_type_constraint" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="list_type_constraint" scheme="schematron">
       <constraint>
         <sch:rule context="mei:list[contains(@type,'gloss')]">
           <sch:assert test="count(mei:label) = count(mei:li)">In a list of type "gloss" all items
@@ -18627,8 +18702,8 @@
             label.</p>
         </remarks>
       </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements in Encoded Archival Description (EAD), Text Encoding
-        Initiative (TEI), and HTML standards.</p>
+      <p>The model of this element is based on the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-list">list</ref> element of the Encoded Archival Description (EAD), the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-list.html">list</ref> element of the Text Encoding
+        Initiative (TEI), and the respective elements of <abbr>HTML</abbr>.</p>
     </remarks></elementSpec><elementSpec rend="add" ident="q" module="MEI.text"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">quoted</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains material which is distinguished from the surrounding phrase-level text
       using quotation marks or a similar method. Use <gi scheme="MEI">quote</gi> for block-level
       quotations.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -18681,7 +18756,7 @@
         and passages that are mentioned but not used.</p>
       <p>Do not confuse this element, used to capture phrase-level quotations, and <gi scheme="MEI">quote</gi>, intended for block quotations.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements found in HTML, TEI, and EAD standards.</p>
+      <p>The model of this element is based on the <ref target="https://html.spec.whatwg.org/#the-q-element">q</ref> element of <abbr>HTML</abbr> and the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-q.html">q</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="quote" module="MEI.text"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">quoted material</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains a paragraph-like block of text attributed to an external
       source, normally set off from the surrounding text by spacing or other typographic
       distinction.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -18696,9 +18771,8 @@
       <p>The source for the quote may be included in a <gi scheme="MEI">bibl</gi> sub-element.</p>
       <p>Do not confuse this element, used to capture block-level quotations, and <gi scheme="MEI">q</gi>, intended for inline quotations.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on elements found in HTML, TEI, and EAD standards.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="seg" module="MEI.text"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">(arbitrary segment) represents any segmentation of text below the "text component"
-      level.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-quote.html">quote</ref> element of the Text Encoding Initiative (TEI) and the <ref target="https://www.loc.gov/ead/EAD3taglib/EAD3-TL-eng.html#elem-quote">quote</ref> element of the Encoded Archival Description (EAD).</p>
+    </remarks></elementSpec><elementSpec rend="add" ident="seg" module="MEI.text"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">arbitrary segment</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">represents any segmentation of text below the "text component" level.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.lang"/>
@@ -18706,7 +18780,7 @@
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.editLike"/><ref name="model.sylLike"/><ref name="model.textPhraseLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
     </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
-      <p>This element is modelled on an element in the Text Encoding Initiative (TEI) standard.</p>
+      <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-seg.html">seg</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><classSpec rend="add" ident="att.altSym" module="MEI.usersymbols" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes supplying pointers to user-defined symbols.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -18716,7 +18790,7 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.URI"/>
         </datatype>
-        <constraintSpec ident="check_altsymTarget" scheme="isoschematron">
+        <constraintSpec ident="check_altsymTarget" scheme="schematron">
           <constraint>
             <sch:rule context="@altsym">
               <sch:assert role="warning" test="not(normalize-space(.) eq '')">@altsym attribute
@@ -18773,7 +18847,7 @@
       <memberOf key="att.controlEvent"/>
       <memberOf key="att.duration.additive"/>
       <memberOf key="att.startEndId"/>
-      <memberOf key="att.timestamp2.logical"/>
+      <memberOf key="att.timestamp2.log"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="func" usage="rec">
@@ -18832,7 +18906,7 @@
       <memberOf key="model.graphicPrimitiveLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:empty/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="symbolDef_curve_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="symbolDef_curve_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:curve[ancestor::mei:symbolDef]">
           <sch:assert test="@startid or (@x and @y)">In the symbolDef context, curve must have
@@ -18866,7 +18940,7 @@
       <memberOf key="model.graphicPrimitiveLike"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textPhraseLike.limited"/></choice></zeroOrMore>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="line_start-_and_end-type_attributes_required" scheme="isoschematron">
+    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="line_start-_and_end-type_attributes_required" scheme="schematron">
       <constraint>
         <sch:rule context="mei:line[ancestor::mei:symbolDef]">
           <sch:assert test="@startid or (@x and @y)">When used in the symbolDef context, must have
@@ -18968,6 +19042,8 @@
       <memberOf key="att.visualOffset.vo"/>
       <memberOf key="att.xy"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.ambitus.vis" module="MEI.visual" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.ambNote.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -18978,6 +19054,12 @@
       <memberOf key="att.stems"/>
       <memberOf key="att.typography"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.anchoredText.vis" module="MEI.visual" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.visualOffset"/>
+      <memberOf key="att.xy"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.annot.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -18995,6 +19077,7 @@
       <memberOf key="att.color"/>
       <memberOf key="att.enclosingChars"/>
       <memberOf key="att.extSym"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.typography"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.xy"/>
@@ -19030,18 +19113,6 @@
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.COLOR"/>
         </datatype>
       </attDef>
-      <attDef ident="line.form" usage="opt">
-        <desc xml:lang="en">Visual form of the line.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEFORM"/>
-        </datatype>
-      </attDef>
-      <attDef ident="line.width" usage="opt">
-        <desc xml:lang="en">Width of the line.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEWIDTH"/>
-        </datatype>
-      </attDef>
     </attList>
   </classSpec><classSpec rend="add" ident="att.artic.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
@@ -19050,7 +19121,7 @@
       <memberOf key="att.color"/>
       <memberOf key="att.enclosingChars"/>
       <memberOf key="att.extSym"/>
-       <memberOf key="att.placementOnStaff"/>       
+      <memberOf key="att.placementOnStaff"/>
       <memberOf key="att.placementRelEvent"/>
       <memberOf key="att.staffLoc"/>
       <memberOf key="att.staffLoc.pitched"/>
@@ -19080,7 +19151,8 @@
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="len" usage="opt">
-        <desc xml:lang="en">States the length of barlines in virtual units. The value must be greater than 0 and
+        <gloss versionDate="2022-10-30" xml:lang="en">length</gloss>
+        <desc xml:lang="en">States the length of bar lines in virtual units. The value must be greater than 0 and
           is typically equal to 2 times (the number of staff lines - 1); <abbr>e.g.</abbr>, a value of <val>8</val> for a
           5-line staff.</desc>
         <datatype>
@@ -19188,12 +19260,12 @@
       attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.color"/>
+      <memberOf key="att.curvature"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.visualOffset2"/>
       <memberOf key="att.xy"/>
       <memberOf key="att.xy2"/>
-      <memberOf key="att.curvature"/>
-      <memberOf key="att.curveRend"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.bracketSpan.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
@@ -19313,12 +19385,27 @@
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.xy"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.curvatureDirection" module="MEI.visual" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes describing the direction of curvature.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="curve" usage="opt">
+        <desc xml:lang="en">Records direction of curvature.</desc>
+        <valList type="closed">
+          <valItem ident="a">
+            <desc xml:lang="en">Anti-clockwise curvature.</desc>
+          </valItem>
+          <valItem ident="c">
+            <desc xml:lang="en">Clockwise curvature.</desc>
+          </valItem>
+        </valList>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.curve.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.color"/>
       <memberOf key="att.curvature"/>
-      <memberOf key="att.curveRend"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.visualOffset2"/>
       <memberOf key="att.xy"/>
@@ -19487,6 +19574,7 @@
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="orient" usage="opt">
+        <gloss versionDate="2022-10-30" xml:lang="en">orientation</gloss>
         <valList type="closed">
           <valItem ident="horiz">
             <desc xml:lang="en">Combination expressed horizontally, as for brass instruments.</desc>
@@ -19514,7 +19602,7 @@
         <datatype>
           <rng:data type="nonNegativeInteger"/>
         </datatype>
-        <constraintSpec ident="check_beams.floating" scheme="isoschematron">
+        <constraintSpec ident="check_beams.floating" scheme="schematron">
           <constraint>
             <sch:rule context="mei:fTrem[@beams and @beams.float]">
               <sch:assert test="@beams.float &lt;= @beams">The number of floating beams must be less
@@ -19543,6 +19631,21 @@
       <memberOf key="att.xy2"/>
       <memberOf key="att.lineRend"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.graceGrp.vis" module="MEI.visual" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.color"/>
+    </classes>
+  </classSpec><classSpec rend="add" ident="att.guitarGrid.vis" module="MEI.visual" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="grid.show" usage="opt">
+        <desc xml:lang="en">Determines whether to display guitar chord grids.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.grpSym.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -19694,10 +19797,10 @@
       <memberOf key="att.visibility"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="sig.showchange" usage="opt">
-        <desc xml:lang="en">Determines whether cautionary accidentals should be displayed at a key change.</desc>
+      <attDef ident="cancelaccid" usage="opt">
+        <desc xml:lang="en">Determines where cautionary accidentals should be displayed at a key change.</desc>
         <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.CANCELACCID"/>
         </datatype>
       </attDef>
     </attList>
@@ -19705,14 +19808,14 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Used by staffDef and scoreDef to provide default values for attributes in the visual
       domain related to key signatures.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="keysig.show" usage="opt">
-        <desc xml:lang="en">Indicates whether the key signature should be displayed.</desc>
+      <attDef ident="keysig.cancelaccid" usage="opt">
+        <desc xml:lang="en">Determines where cautionary accidentals should be displayed at a key change.</desc>
         <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.CANCELACCID"/>
         </datatype>
       </attDef>
-      <attDef ident="keysig.showchange" usage="opt">
-        <desc xml:lang="en">Determines whether cautionary accidentals should be displayed at a key change.</desc>
+      <attDef ident="keysig.visible" usage="opt">
+        <desc xml:lang="en">Determines whether the key signature is to be displayed.</desc>
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
         </datatype>
@@ -19800,6 +19903,7 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.altSym"/>
       <memberOf key="att.color"/>
+      <memberOf key="att.curvatureDirection"/>
       <memberOf key="att.enclosingChars"/>
       <memberOf key="att.extSym"/>
       <memberOf key="att.staffLoc"/>
@@ -19809,17 +19913,6 @@
       <memberOf key="att.xy"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="curve" usage="opt">
-        <desc xml:lang="en">Records direction of curvature.</desc>
-        <valList type="closed">
-          <valItem ident="a">
-            <desc xml:lang="en">Anti-clockwise curvature.</desc>
-          </valItem>
-          <valItem ident="c">
-            <desc xml:lang="en">Clockwise curvature.</desc>
-          </valItem>
-        </valList>
-      </attDef>
       <attDef ident="looped" usage="opt">
         <desc xml:lang="en">Indicates whether curve is closed.</desc>
         <datatype>
@@ -19836,12 +19929,12 @@
       beats.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.color"/>
+      <memberOf key="att.curvature"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.visualOffset2"/>
       <memberOf key="att.xy"/>
       <memberOf key="att.xy2"/>
-      <memberOf key="att.curvature"/>
-      <memberOf key="att.curveRend"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.lyrics.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
@@ -19957,6 +20050,11 @@
         </datatype>
       </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.metaMark.vis" module="MEI.visual" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.placementRelStaff"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.meterSig.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -19965,6 +20063,7 @@
       <memberOf key="att.enclosingChars"/>
       <memberOf key="att.extSym"/>
       <memberOf key="att.typography"/>
+      <memberOf key="att.visibility"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="form" usage="opt">
@@ -19991,9 +20090,24 @@
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
         </datatype>
       </attDef>
+      <attDef ident="meter.visible" usage="opt">
+        <desc xml:lang="en">Determines whether the meter signature is to be displayed.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
+        </datatype>
+      </attDef>
     </attList>
   </classSpec><classSpec rend="add" ident="att.meterSigGrp.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
+  </classSpec><classSpec rend="add" ident="att.mNum.vis" module="MEI.visual" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.color"/>
+      <memberOf key="att.placementRelStaff"/>
+      <memberOf key="att.typography"/>
+      <memberOf key="att.visualOffset"/>
+      <memberOf key="att.xy"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.mordent.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -20016,7 +20130,6 @@
       <memberOf key="att.staffLoc.pitched"/>
       <memberOf key="att.typography"/>
       <memberOf key="att.visualOffset"/>
-      <memberOf key="att.visibility"/>
       <memberOf key="att.xy"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.mRpt.vis" module="MEI.visual" type="atts">
@@ -20055,6 +20168,7 @@
       <memberOf key="att.staffLoc"/>
       <memberOf key="att.staffLoc.pitched"/>
       <memberOf key="att.typography"/>
+      <memberOf key="att.visibility"/>
       <memberOf key="att.width"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -20221,6 +20335,24 @@
       <memberOf key="att.xy2"/>
       <memberOf key="att.phrase.vis.cmn"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.plica.vis" module="MEI.visual" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes that describe the properties of a plica stem in the mensural repertoire.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="dir" usage="opt">
+        <gloss versionDate="2022-10-30" xml:lang="en">direction</gloss>
+        <desc xml:lang="en">Describes the direction of a stem.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.STEMDIRECTION.basic"/>
+        </datatype>
+      </attDef>
+      <attDef ident="len" usage="opt">
+        <gloss versionDate="2022-10-30" xml:lang="en">length</gloss>
+        <desc xml:lang="en">Encodes the stem length.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MEASUREMENTUNSIGNED"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.proport.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -20276,6 +20408,18 @@
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.xy"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.repeatMark.vis" module="MEI.visual" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.extender"/>
+      <memberOf key="att.extSym"/>
+      <memberOf key="att.placementRelStaff"/>
+      <memberOf key="att.verticalGroup"/>
+      <memberOf key="att.visualOffset"/>
+      <memberOf key="att.visualOffset2.ho"/>
+      <memberOf key="att.visualOffset2.to"/>
+      <memberOf key="att.xy"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.rest.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -20384,12 +20528,12 @@
       normal position) of the entire rendered slur/phrase mark.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.color"/>
+      <memberOf key="att.curvature"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.visualOffset2"/>
       <memberOf key="att.xy"/>
       <memberOf key="att.xy2"/>
-      <memberOf key="att.curvature"/>
-      <memberOf key="att.curveRend"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.sp.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
@@ -20425,6 +20569,7 @@
       <memberOf key="att.barring"/>
       <memberOf key="att.cleffing.vis"/>
       <memberOf key="att.distances"/>
+      <memberOf key="att.guitarGrid.vis"/>
       <memberOf key="att.keySigDefault.vis"/>
       <memberOf key="att.lyricStyle"/>
       <memberOf key="att.meterSigDefault.vis"/>
@@ -20439,12 +20584,6 @@
       <memberOf key="att.staffDef.vis.mensural"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="grid.show" usage="opt">
-        <desc xml:lang="en">Determines whether to display guitar chord grids.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
-        </datatype>
-      </attDef>
       <attDef ident="layerscheme" usage="opt">
         <desc xml:lang="en">Indicates the number of layers and their stem directions.</desc>
         <datatype>
@@ -20457,7 +20596,7 @@
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.COLOR"/>
         </datatype>
         <remarks xml:lang="en">
-          <p>The value is structured; that is, it should contain a single color value or have 
+          <p>The value is structured; that is, it should contain a single color value or have
             the same number of space-separated values as the number of lines indicated by the
             lines attribute. The first value then applies to the lowest line of the staff.</p>
           <p>All values from data.COLOR are allowed.</p>
@@ -20487,6 +20626,7 @@
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="bar.thru" usage="opt">
+        <gloss versionDate="2022-10-18" xml:lang="en">bar lines through</gloss>
         <desc xml:lang="en">Indicates whether bar lines go across the space between staves (true) or are only
           drawn across the lines of each staff (false).</desc>
         <datatype>
@@ -20507,6 +20647,55 @@
       <memberOf key="att.visualOffset2.to"/>
       <memberOf key="att.xy"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.stem.vis" module="MEI.visual" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes that describe the properties of a stem in the mensural repertoire.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.xy"/>
+      <memberOf key="att.color"/>
+      <memberOf key="att.extSym"/>
+      <memberOf key="att.visibility"/>
+    </classes>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="pos" usage="opt">
+        <gloss versionDate="2022-10-30" xml:lang="en">position</gloss>
+        <desc xml:lang="en">Records the position of the stem in relation to the note head(s).</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.STEMPOSITION"/>
+        </datatype>
+      </attDef>
+      <attDef ident="len" usage="opt">
+        <gloss versionDate="2022-10-30" xml:lang="en">length</gloss>
+        <desc xml:lang="en">Encodes the stem length.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MEASUREMENTUNSIGNED"/>
+        </datatype>
+      </attDef>
+      <attDef ident="form" usage="opt">
+        <desc xml:lang="en">Encodes the form of the stem using the values provided by the data.STEMFORM.mensural datatype.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.STEMFORM.mensural"/>
+        </datatype>
+      </attDef>
+      <attDef ident="dir" usage="opt">
+        <gloss versionDate="2022-10-30" xml:lang="en">direction</gloss>
+        <desc xml:lang="en">Describes the direction of a stem.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.STEMDIRECTION"/>
+        </datatype>
+      </attDef>
+      <attDef ident="flag.pos" usage="opt">
+        <desc xml:lang="en">Records the position of the flag using the values provided by the data.FLAGPOS.mensural datatype.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.FLAGPOS.mensural"/>
+        </datatype>
+      </attDef>
+      <attDef ident="flag.form" usage="opt">
+        <desc xml:lang="en">Encodes the form of the flag using the values provided by the data.FLAGFORM.mensural datatype.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.FLAGFORM.mensural"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.strophicus.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -20547,6 +20736,7 @@
   </classSpec><classSpec rend="add" ident="att.tempo.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.extender"/>
       <memberOf key="att.placementRelStaff"/>
       <memberOf key="att.verticalGroup"/>
       <memberOf key="att.visualOffset"/>
@@ -20563,12 +20753,12 @@
       beats.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.color"/>
+      <memberOf key="att.curvature"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.visualOffset2"/>
       <memberOf key="att.xy"/>
       <memberOf key="att.xy2"/>
-      <memberOf key="att.curvature"/>
-      <memberOf key="att.curveRend"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.trill.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
@@ -20660,7 +20850,7 @@
       <memberOf key="att.visualOffset.vo"/>
       <memberOf key="att.xy"/>
     </classes>
-  </classSpec><constraintSpec ident="set_ns" scheme="isoschematron" mode="add">
+  </classSpec><constraintSpec ident="set_ns" scheme="schematron" mode="add">
           <constraint>
             <sch:ns prefix="mei" uri="http://www.music-encoding.org/ns/mei"/>
             <sch:ns prefix="xlink" uri="http://www.w3.org/1999/xlink"/>
diff --git a/libmei/mei/develop/mei-basic_compiled.odd b/libmei/mei/mei-basic_compiled.odd
similarity index 97%
rename from libmei/mei/develop/mei-basic_compiled.odd
rename to libmei/mei/mei-basic_compiled.odd
index c311db8a660..b1b8931f0d0 100644
--- a/libmei/mei/develop/mei-basic_compiled.odd
+++ b/libmei/mei/mei-basic_compiled.odd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xml:base="file:/opt/docker-mei/music-encoding/customizations/mei-basic.xml"><?TEIVERSION Version 5.0.0?>
+<?xml version="1.0" encoding="utf-8"?><TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xml:base="file:/Users/rettinghaus/git/music-encoding/customizations/mei-basic.xml"><?TEIVERSION Version 5.0?>
     <teiHeader>
         <fileDesc>
             <titleStmt>
@@ -11,13 +11,20 @@
                     <resp>Revisions</resp>
                     <name xml:id="LP">Laurent Pugin</name>
                 </respStmt>
+                <respStmt>
+                    <resp>Revisions</resp>
+                    <name xml:id="KR">Klaus Rettinghaus</name>
+                </respStmt>
                 <respStmt>
                     <resp>In collaboration with</resp>
                     <name>The MEI Community</name>
                 </respStmt>
             </titleStmt>
             <publicationStmt>
-                <p/>
+                <publisher>Music Encoding Initiative (MEI) Board</publisher>
+                <availability>
+                    <licence target="https://opensource.org/license/ECL-2.0/">Licensed under the Educational Community License version 2.0</licence>
+                </availability>
             </publicationStmt>
             <sourceDesc>
                 <p/>
@@ -33,11 +40,14 @@
             <change n="3" from="2023-05-24" to="2023-06-12" who="#LP">
                 <desc>Revisions at the MEI Developers Conference, Charlottesville.</desc>
             </change>
+            <change n="4" when="2023-08-23" who="#KR">
+                <desc>Fixing color attribute and cleanup attribute class references.</desc>
+            </change>
         </revisionDesc>
     </teiHeader>
     <text>
         <body>
-            <schemaSpec ident="mei" start="mei" prefix="mei_" ns="http://www.music-encoding.org/ns/mei" source="/opt/docker-mei/music-encoding/build/mei-source_canonicalized.xml"><macroSpec rend="add" ident="data.ACCIDENTAL.WRITTEN" module="MEI" type="dt">
+            <schemaSpec ident="mei" start="mei" prefix="mei_" ns="http://www.music-encoding.org/ns/mei" source="/Users/rettinghaus/git/music-encoding/build/mei-source_canonicalized.xml"><macroSpec rend="add" ident="data.ACCIDENTAL.WRITTEN" module="MEI" type="dt">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Written accidental values.</desc>
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <alternate minOccurs="1" maxOccurs="1"><macroRef key="data.ACCIDENTAL.WRITTEN.basic"/><macroRef key="data.ACCIDENTAL.WRITTEN.extended"/><macroRef key="data.ACCIDENTAL.aeu"/><macroRef key="data.ACCIDENTAL.persian"/></alternate>
@@ -112,6 +122,18 @@
         <valItem ident="nd">
           <desc xml:lang="en">Natural note lowered by quarter tone (natural modified by arrow).</desc>
         </valItem>
+        <valItem ident="xu">
+          <desc xml:lang="en">Double sharp note raised by quarter tone (double sharp modified by arrow).</desc>
+        </valItem>
+        <valItem ident="xd">
+          <desc xml:lang="en">Double sharp note lowered by quarter tone (double sharp modified by arrow).</desc>
+        </valItem>
+        <valItem ident="ffu">
+          <desc xml:lang="en">Double flat note raised by quarter tone (double flat modified by arrow).</desc>
+        </valItem>
+        <valItem ident="ffd">
+          <desc xml:lang="en">Double flat note lowered by quarter tone (double flat modified by arrow).</desc>
+        </valItem>
         
         <valItem ident="1qf">
           <desc xml:lang="en">1/4-tone flat accidental.</desc>
@@ -222,6 +244,12 @@
         <valItem ident="fd">
           <desc xml:lang="en">Three quarter-tones flat.</desc>
         </valItem>
+        <valItem ident="xu">
+          <desc xml:lang="en">Five quarter-tones sharp.</desc>
+        </valItem>
+        <valItem ident="ffd">
+          <desc xml:lang="en">Five quarter-tones flat.</desc>
+        </valItem>
       </valList>
     </content>
   </macroSpec><macroSpec rend="add" ident="data.ARTICULATION" module="MEI" type="dt">
@@ -2668,7 +2696,7 @@
       </valList>
     </content>
   </macroSpec><macroSpec rend="add" ident="data.STAFFLOC" module="MEI" type="dt">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Staff location. The value '0' indicates the bottom line of the current staff; positive
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Staff location. The value <val>0</val> indicates the bottom line of the current staff; positive
       values are used for positions above the bottom line and negative values for the positions
       below. For example, in treble clef, 1 = F4, 2 = G4, 3 = A4, etc. and -1 = D4, -2 = C4, and so
       on.</desc>
@@ -3166,20 +3194,8 @@
       <memberOf key="att.augmentDots"/>
       <memberOf key="att.duration.log"/>
       <memberOf key="att.numbered"/>
+      <memberOf key="att.tremForm"/>
     </classes>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="form" usage="opt">
-        <desc xml:lang="en">Indicates whether the tremolo is measured or unmeasured.</desc>
-        <valList type="closed">
-          <valItem ident="meas">
-            <desc xml:lang="en">Measured tremolo.</desc>
-          </valItem>
-          <valItem ident="unmeas">
-            <desc xml:lang="en">Unmeasured tremolo.</desc>
-          </valItem>
-        </valList>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.chord.log.cmn" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes in the CMN repertoire.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -3231,20 +3247,8 @@
       <memberOf key="att.event"/>
       <memberOf key="att.augmentDots"/>
       <memberOf key="att.duration.log"/>
+      <memberOf key="att.tremForm"/>
     </classes>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="form" usage="opt">
-        <desc xml:lang="en">Describes the style of the tremolo.</desc>
-        <valList type="closed">
-          <valItem ident="meas">
-            <desc xml:lang="en">Measured tremolo.</desc>
-          </valItem>
-          <valItem ident="unmeas">
-            <desc xml:lang="en">Unmeasured tremolo.</desc>
-          </valItem>
-        </valList>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.gliss.log" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -3657,6 +3661,21 @@
       <memberOf key="att.startEndId"/>
       <memberOf key="att.timestamp2.log"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.tremForm" module="MEI.cmn" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">Attributes describing the form of a tremolo.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="form" usage="opt">
+        <desc xml:lang="en">Describes the style of the tremolo.</desc>
+        <valList type="closed">
+          <valItem ident="meas">
+            <desc xml:lang="en">Measured tremolo.</desc>
+          </valItem>
+          <valItem ident="unmeas">
+            <desc xml:lang="en">Unmeasured tremolo.</desc>
+          </valItem>
+        </valList>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.tremMeasured" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe measured tremolandi.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -3883,7 +3902,7 @@
         <att>tstamp.real</att> attribute, while the ending point may be recorded by either a
         <att>dur</att>, <att>dur.ges</att>, <att>endid</att>, or <att>tstamp2</att> attribute. It is
         a semantic error not to specify one starting and one ending type of attribute.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="graceGrp" module="MEI.cmn"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A container for a sequence of grace notes.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    </remarks></elementSpec><elementSpec rend="add" ident="graceGrp" module="MEI.cmn"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">grace group</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A container for a sequence of grace notes.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       
       <memberOf key="att.graceGrp.log"/>
@@ -4543,7 +4562,7 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="model.controlEventLike"/>
     </classes>
-  </classSpec><elementSpec rend="add" ident="fing" module="MEI.fingering"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">finger – An individual finger in a fingering indication.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  </classSpec><elementSpec rend="add" ident="fing" module="MEI.fingering"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">finger</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">An individual finger in a fingering indication.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       
       
@@ -4568,7 +4587,7 @@
             descendant of fing.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec></elementSpec><elementSpec rend="add" ident="fingGrp" module="MEI.fingering"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">(finger group)– A group of individual fingers in a fingering indication.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    </constraintSpec></elementSpec><elementSpec rend="add" ident="fingGrp" module="MEI.fingering"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">finger group</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A group of individual fingers in a fingering indication.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       
       
@@ -4627,6 +4646,17 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
     </classes>
+  </classSpec><classSpec rend="add" ident="att.attacking" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes whether an element is performed "attacca".</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="attacca">
+        <desc xml:lang="en">Indicates that the performance of the next musical division should begin immediately
+          following this one.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.breath.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -4658,15 +4688,9 @@
     </classes>
   </classSpec><classSpec rend="add" ident="att.mdiv.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="attacca">
-        <desc xml:lang="en">Indicates that the performance of the next musical division should begin immediately
-          following this one.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
-        </datatype>
-      </attDef>
-    </attList>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.attacking"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.f.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -4807,15 +4831,9 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.section.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="attacca">
-        <desc xml:lang="en">Indicates that the performance of the next section should begin immediately following
-          this one.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
-        </datatype>
-      </attDef>
-    </attList>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.attacking"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.slur.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -5007,7 +5025,7 @@
       <memberOf key="att.common"/>
       
       <memberOf key="att.harm.log"/>
-      
+      <memberOf key="att.harm.vis"/>
       
       
       <memberOf key="model.harmLike"/>
@@ -5125,23 +5143,7 @@
       <p>The <gi scheme="MEI">lb</gi> element is allowed here in order to facilitate karaoke
         applications. The <att>func</att> attribute on <gi scheme="MEI">lb</gi> may be used to
         distinguish true line endings from those of line groups for these applications.</p>
-    </remarks></elementSpec><elementSpec rend="add" ident="verse" module="MEI.lyrics"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Division of a poem or song lyrics, sometimes having a fixed length, meter or rhyme scheme;
-      a stanza.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <memberOf key="att.common"/>
-      
-      <memberOf key="att.lang"/>
-      
-      <memberOf key="att.verse.vis"/>
-      
-      
-      <memberOf key="model.verseLike"/>
-    </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="label"/></zeroOrMore>
-      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="labelAbbr"/></zeroOrMore>
-      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="dir"/><ref name="dynam"/><ref name="tempo"/><ref name="space"/></choice></zeroOrMore>
-      <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="volta"/><ref name="model.sylLike"/><ref name="model.appLike"/><ref name="model.editLike"/></choice></oneOrMore>
-      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.lbLike"/></zeroOrMore>
-    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+    </remarks></elementSpec><elementSpec rend="add" ident="verse" module="MEI.lyrics"><desc rend="replace" xml:lang="en">Division of a poem or song lyrics, sometimes having a fixed length, meter or rhyme scheme; a stanza.</desc><classes><memberOf key="att.common"/><memberOf key="att.verse.vis"/><memberOf key="model.verseLike"/><memberOf key="att.nNumberLike" mode="add"/></classes><content><zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="label"/></zeroOrMore><zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="labelAbbr"/></zeroOrMore><oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="volta"/><ref name="model.sylLike"/></choice></oneOrMore></content><attList/><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>The <gi scheme="MEI">lb</gi> element is allowed here in order to facilitate karaoke
         applications. The <att>func</att> attribute on <gi scheme="MEI">lb</gi> may be used to
         distinguish true line endings from those of line groups for these applications.</p>
@@ -5657,6 +5659,17 @@
         </datatype>
       </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.color" module="MEI.shared" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual color attributes.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="color" usage="opt">
+        <desc xml:lang="en">Used to indicate visual appearance. Do not confuse this with the musical term 'color'
+          as used in pre-CMN notation.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.COLOR"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.common" module="MEI.shared" type="atts"><desc>Attributes common to many elements.</desc><classes><memberOf key="att.id" mode="add"/><memberOf key="att.labelled" mode="add"/><memberOf key="att.typed" mode="add"/></classes><attList/></classSpec><classSpec rend="add" ident="att.controlEvent" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes shared by events which rely on other events for their existence. For example, a
       slur/phrase marking must be drawn between or over a group of notes. The slur is therefore a
@@ -5830,6 +5843,16 @@
         </datatype>
       </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.formework" module="MEI.shared" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record the function (i.e., placement) of forme work elements.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="func" usage="opt">
+        <desc xml:lang="en">Records the function (i.e., placement) of a page header or footer.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PGFUNC"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.horizontalAlign" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record horizontal alignment.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -5966,15 +5989,20 @@
   </classSpec><classSpec rend="add" ident="att.lineRend.base" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record the basic visual rendition of lines.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="lform" usage="opt">
-        <gloss versionDate="2022-10-18" xml:lang="en">line form</gloss>
-        <desc xml:lang="en">Describes the line style of a line.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEFORM"/>
-        </datatype>
-      </attDef>
       
-      <attDef ident="lsegs" usage="opt">
+        <attDef ident="lform" usage="opt">
+          <desc xml:lang="en">Describes the style of a line.</desc>
+          <datatype>
+            <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEFORM"/>
+          </datatype>
+        </attDef>
+        <attDef ident="lwidth" usage="opt">
+          <desc xml:lang="en">Width of a line.</desc>
+          <datatype>
+            <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEWIDTH"/>
+          </datatype>
+        </attDef>
+        <attDef ident="lsegs" usage="opt">
         <desc xml:lang="en">Describes the number of segments into which a dashed or dotted line may be divided, or
           the number of "peaks" of a wavy line; a pair of space-separated values (minimum and
           maximum, respectively) provides a range between which a rendering system-supplied value
@@ -5994,27 +6022,13 @@
           </constraint>
         </constraintSpec>
       </attDef>
-      <attDef ident="lwidth" usage="opt">
-        <desc xml:lang="en">Width of a line.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEWIDTH"/>
-        </datatype>
-      </attDef>
       
     </attList>
-  </classSpec><classSpec ident="att.meiVersion" module="MEI.shared" type="atts" mode="replace">
-                    <desc>Attributes that record the version of MEI in use.</desc>
-                    <attList>
-                        <attDef ident="meiversion" usage="req">
-                            <desc>Specifies a generic MEI version label.</desc>
-                            <valList type="closed">
-                                <valItem ident="5.0.0-dev+basic">
-                                    <desc>This version of MEI.</desc>
-                                </valItem>
-                            </valList>
-                        </attDef>
-                    </attList>
-                </classSpec><classSpec ident="att.meterConformance.bar" module="MEI.shared" type="atts" mode="replace">
+  </classSpec><classSpec rend="add" ident="att.meiVersion" module="MEI.shared" type="atts"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record the version of MEI in use.</desc><classes/><attList><attDef ident="meiversion" usage="req"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Specifies a generic MEI version label.</desc><defaultVal xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">5.0</defaultVal><valList type="closed" mode="change"><valItem xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="5.0">
+            <desc xml:lang="en">MEI 5.0</desc>
+          </valItem><valItem xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="5.0+basic">
+              <desc>MEI 5.0+basic</desc>
+          </valItem></valList></attDef></attList></classSpec><classSpec ident="att.meterConformance.bar" module="MEI.shared" type="atts" mode="replace">
                     <desc>Attributes that provide information about a measure's conformance to the prevailing
                         meter.</desc>
                     <attList>
@@ -6817,7 +6831,7 @@
       <attDef ident="xml:space" usage="opt">
         <desc xml:lang="en">Allows one to signal to an application whether an element’s white space is
           "significant". The behavior of xml:space cascades to all descendant elements, but it can
-          be turned off locally by setting the xml:space attribute to the value "default".</desc>
+          be turned off locally by setting the xml:space attribute to the value <val>default</val>.</desc>
         <valList type="closed">
           <valItem ident="default">
             <desc xml:lang="en">Allows the application to handle white space as necessary. Not including an
@@ -7173,8 +7187,18 @@
         attributes, a caesura will be rendered as a pair of slanted lines through the top line of
         the staff.</p>
       <p/>
-    </remarks></elementSpec><elementSpec rend="add" ident="chord" module="MEI.shared"><desc rend="replace">A simultaneous sounding of two or more notes in the same layer *with the same
-                        duration*.</desc><classes><memberOf key="att.common"/><memberOf key="att.chord.log"/><memberOf key="att.chord.vis"/><memberOf key="att.chord.ges"/><memberOf key="att.stems" mode="add"/><memberOf key="model.eventLike"/></classes><content><zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.chordPart"/><ref name="model.appLike"/><ref name="model.editLike"/><ref name="model.sylLike"/><ref name="model.transcriptionLike"/><ref name="model.verseLike"/></choice></zeroOrMore></content><attList/></elementSpec><elementSpec rend="add" ident="clef" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Indication of the exact location of a particular note on the staff and, therefore, the
+    </remarks></elementSpec><elementSpec rend="add" ident="chord" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A simultaneous sounding of two or more notes in the same layer *with the same
+      duration*.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.common"/>
+      
+      <memberOf key="att.chord.log"/>
+      <memberOf key="att.chord.vis"/>
+      <memberOf key="att.chord.ges"/>
+      
+      <memberOf key="model.eventLike"/>
+    </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.chordPart"/><ref name="model.appLike"/><ref name="model.editLike"/><ref name="model.sylLike"/><ref name="model.transcriptionLike"/><ref name="model.verseLike"/></choice></zeroOrMore>
+    </content></elementSpec><elementSpec rend="add" ident="clef" module="MEI.shared"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Indication of the exact location of a particular note on the staff and, therefore, the
       other notes as well.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.event"/>
@@ -7494,20 +7518,12 @@
     </remarks></elementSpec><elementSpec rend="add" ident="pgFoot" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">page footer</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A running footer.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       
+      <memberOf key="att.formework"/>
+      <memberOf key="att.horizontalAlign"/>
       <memberOf key="att.lang"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textComponentLike"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/><ref name="model.appLike"/><ref name="anchoredText"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="halign" usage="opt">
-        <desc xml:lang="en">Records horizontal alignment of the page footer.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.HORIZONTALALIGNMENT"/>
-        </datatype>
-      </attDef><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="func" usage="opt">
-        <desc xml:lang="en">Records the function (i.e., placement) of the page footer.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PGFUNC"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>This element is used to capture the textual data that often appears in
         printed music. It may also be used for similarly formatted material in manuscripts. When
         used within <gi scheme="MEI">pb</gi>, it records a temporary suspension of the pattern of
@@ -7516,20 +7532,12 @@
     </remarks></elementSpec><elementSpec rend="add" ident="pgHead" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">page header</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A running header.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       
+      <memberOf key="att.formework"/>
+      <memberOf key="att.horizontalAlign"/>
       <memberOf key="att.lang"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textComponentLike"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/><ref name="model.appLike"/><ref name="anchoredText"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="halign" usage="opt">
-        <desc xml:lang="en">Records horizontal alignment of the page header.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.HORIZONTALALIGNMENT"/>
-        </datatype>
-      </attDef><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="func" usage="opt">
-        <desc xml:lang="en">Records the function (i.e., placement) of the page header.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PGFUNC"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>This element is used to capture the textual data that often appears in
         printed music. It may also be used for similarly formatted material in manuscripts. When
         used within <gi scheme="MEI">pb</gi>, it records a temporary suspension of the pattern of
@@ -7548,7 +7556,7 @@
       <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-pubPlace.html">pubPlace</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="rend" module="MEI.shared"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-18" xml:lang="en">render</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">A formatting element indicating special visual rendering, <abbr>e.g.</abbr>, bold or
       italicized, of a text word or phrase.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.common"/>
       <memberOf key="att.extSym.auth"/>
       <memberOf key="att.horizontalAlign"/>
@@ -8084,13 +8092,14 @@
       <p>The <att>startid</att> and <att>endid</att> attributes are used to indicate the <gi scheme="MEI">chordMember</gi> elements on which the barre starts and finishes respectively.
         The fret at which the barre should be created is recorded by the <att>fret</att>
         attribute.</p>
-    </remarks></elementSpec><classSpec rend="add" ident="att.accid.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.extSym"/><memberOf key="att.visualOffset.ho"/><memberOf key="att.visualOffset.vo"/></classes><attList/></classSpec><classSpec rend="add" ident="att.arpeg.vis" module="MEI.visual" type="atts">
+    </remarks></elementSpec><classSpec rend="add" ident="att.accid.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.color"/><memberOf key="att.extSym"/><memberOf key="att.visualOffset.ho"/><memberOf key="att.visualOffset.vo"/></classes><attList/></classSpec><classSpec rend="add" ident="att.arpeg.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       
       <memberOf key="att.extSym"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.typography"/>
       <memberOf key="att.visualOffset"/>
       
@@ -8126,28 +8135,16 @@
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.COLOR"/>
         </datatype>
       </attDef>
-      <attDef ident="line.form" usage="opt">
-        <desc xml:lang="en">Visual form of the line.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEFORM"/>
-        </datatype>
-      </attDef>
-      <attDef ident="line.width" usage="opt">
-        <desc xml:lang="en">Width of the line.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEWIDTH"/>
-        </datatype>
-      </attDef>
     </attList>
-  </classSpec><classSpec rend="add" ident="att.artic.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.extSym"/><memberOf key="att.placementRelEvent"/><memberOf key="att.visualOffset"/></classes><attList/></classSpec><classSpec rend="add" ident="att.beam.vis" module="MEI.visual" type="atts">
+  </classSpec><classSpec rend="add" ident="att.artic.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.color"/><memberOf key="att.extSym"/><memberOf key="att.placementRelEvent"/><memberOf key="att.visualOffset"/></classes><attList/></classSpec><classSpec rend="add" ident="att.beam.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.cue"/>
       
       
     </classes>
-  </classSpec><classSpec rend="add" ident="att.beatRpt.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.expandable"/><memberOf key="att.extSym"/></classes><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="slash" usage="req">
+  </classSpec><classSpec rend="add" ident="att.beatRpt.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.color"/><memberOf key="att.expandable"/><memberOf key="att.extSym"/></classes><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="slash" usage="req">
         <desc xml:lang="en">Indicates the number of slashes required to render the appropriate beat repeat symbol.
           When a single beat consisting of a single note or chord is repeated, the repetition symbol
           is a single thick, slanting slash; therefore, the value <val>1</val> should be used. When the beat
@@ -8157,15 +8154,15 @@
         <datatype>
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BEATRPT.REND"/>
         </datatype>
-      </attDef></attList></classSpec><classSpec rend="add" ident="att.breath.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.extSym"/><memberOf key="att.visualOffset"/></classes><attList/></classSpec><classSpec rend="add" ident="att.bTrem.vis" module="MEI.visual" type="atts">
+      </attDef></attList></classSpec><classSpec rend="add" ident="att.breath.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.color"/><memberOf key="att.extSym"/><memberOf key="att.visualOffset"/></classes><attList/></classSpec><classSpec rend="add" ident="att.bTrem.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.numberPlacement"/>
     </classes>
-  </classSpec><classSpec rend="add" ident="att.caesura.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.extSym"/><memberOf key="att.visualOffset"/></classes><attList/></classSpec><classSpec rend="add" ident="att.chord.vis" module="MEI.visual" type="atts"><desc>Visual domain attributes for chord. The slur, slur.dir, slur.rend, tie, tie.dir, and tie.rend
+  </classSpec><classSpec rend="add" ident="att.caesura.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.color"/><memberOf key="att.extSym"/><memberOf key="att.visualOffset"/></classes><attList/></classSpec><classSpec rend="add" ident="att.chord.vis" module="MEI.visual" type="atts"><desc>Visual domain attributes for chord. The slur, slur.dir, slur.rend, tie, tie.dir, and tie.rend
                         attributes here are syntactic sugar for these attributes on each of the chord's individual
                         notes. The values here apply to all the notes in the chord. If some notes are slurred or tied
-                        while others aren't, then the individual note attributes must be used.</desc><classes><memberOf key="att.extSym"/><memberOf key="att.stems"/><memberOf key="att.visualOffset.ho"/><memberOf key="att.chord.vis.cmn"/></classes><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="cluster" usage="opt">
+                        while others aren't, then the individual note attributes must be used.</desc><classes><memberOf key="att.color"/><memberOf key="att.extSym"/><memberOf key="att.stems"/><memberOf key="att.visualOffset.ho"/><memberOf key="att.chord.vis.cmn"/></classes><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="cluster" usage="opt">
         <desc xml:lang="en">Indicates a single, alternative note head should be displayed instead of individual
           note heads. The highest and lowest notes of the chord usually indicate the upper and lower
           boundaries of the cluster note head.</desc>
@@ -8176,7 +8173,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       
       <memberOf key="att.extSym"/>
       <memberOf key="att.typography"/>
@@ -8223,7 +8220,7 @@
       <p>If <att>tstamp2</att> is not provided, then the extender should be drawn based on the value
         of <att>tstamp2</att> on the harm ancestor.</p>
     </remarks>
-  </classSpec><classSpec rend="add" ident="att.fermata.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.extSym"/><memberOf key="att.placementRelStaff"/><memberOf key="att.visualOffset"/></classes><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="form" usage="opt">
+  </classSpec><classSpec rend="add" ident="att.fermata.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.color"/><memberOf key="att.extSym"/><memberOf key="att.placementRelStaff"/><memberOf key="att.visualOffset"/></classes><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="form" usage="opt">
         <desc xml:lang="en">Describes the visual appearance of the fermata; that is, whether it occurs as upright
           or inverted.</desc>
         <valList type="closed">
@@ -8265,7 +8262,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.extSym"/>
       <memberOf key="att.typography"/>
       <memberOf key="att.visualOffset"/>
@@ -8277,7 +8274,7 @@
   </classSpec><classSpec rend="add" ident="att.graceGrp.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
+      <memberOf key="att.color"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.hairpin.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes. The startho and startvo attributes record the horizontal and
@@ -8289,7 +8286,7 @@
       the startho, endho, startvo, and endvo attributes, while the placement of the entire rendered
       mark may be controlled by use of the ho and vo attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.lineRend.base"/>
       <memberOf key="att.placementRelStaff"/>
       
@@ -8329,17 +8326,30 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.expandable"/>
       <memberOf key="att.extSym"/>
       <memberOf key="att.typography"/>
       <memberOf key="att.visualOffset"/>
     </classes>
-  </classSpec><classSpec rend="add" ident="att.harpPedal.vis" module="MEI.visual" type="atts">
+  </classSpec><classSpec rend="add" ident="att.harm.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.extender"/><memberOf key="att.placementRelStaff"/><memberOf key="att.visualOffset"/><memberOf key="att.visualOffset2.ho"/></classes><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="rendgrid" usage="opt">
+        <desc xml:lang="en">Describes how the harmonic indication should be rendered.</desc>
+        <valList type="closed">
+          <valItem ident="grid">
+            <desc xml:lang="en">Chord tablature grid.</desc>
+          </valItem>
+          <valItem ident="gridtext">
+            <desc xml:lang="en">Chord tablature grid and the element’s textual content.</desc>
+          </valItem>
+          <valItem ident="text">
+            <desc xml:lang="en">Textual content of the element.</desc>
+          </valItem>
+        </valList>
+      </attDef></attList></classSpec><classSpec rend="add" ident="att.harpPedal.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.extSym"/>
       <memberOf key="att.placementRelStaff"/>
       <memberOf key="att.typography"/>
@@ -8359,18 +8369,18 @@
       lines. Startto and endto describe the start and end points in terms of time; that is,
       beats.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
+      <memberOf key="att.color"/>
+      <memberOf key="att.curvature"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.visualOffset2"/>
       
       
-      <memberOf key="att.curvature"/>
-      
     </classes>
   </classSpec><classSpec rend="add" ident="att.mNum.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.placementRelStaff"/>
       <memberOf key="att.typography"/>
       <memberOf key="att.visualOffset"/>
@@ -8380,7 +8390,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       
       <memberOf key="att.extSym"/>
       <memberOf key="att.placementRelStaff"/>
@@ -8391,7 +8401,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.cutout"/>
       <memberOf key="att.extSym"/>
       
@@ -8399,13 +8409,12 @@
       <memberOf key="att.typography"/>
       <memberOf key="att.visualOffset"/>
       
-      
     </classes>
   </classSpec><classSpec rend="add" ident="att.mRpt.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.expandable"/>
       <memberOf key="att.extSym"/>
       <memberOf key="att.numberPlacement"/>
@@ -8415,12 +8424,13 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.extSym"/>
       <memberOf key="att.numberPlacement"/>
       
       
       <memberOf key="att.typography"/>
+      
       <memberOf key="att.width"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -8436,7 +8446,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.expandable"/>
       <memberOf key="att.extSym"/>
       <memberOf key="att.typography"/>
@@ -8445,7 +8455,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       
       <memberOf key="att.extSym"/>
       
@@ -8462,7 +8472,7 @@
   </classSpec><classSpec rend="add" ident="att.octave.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.extender"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.visualOffset2.ho"/>
@@ -8473,7 +8483,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       
       <memberOf key="att.placementRelStaff"/>
       <memberOf key="att.visualOffset"/>
@@ -8503,7 +8513,7 @@
       allows the full range of values.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.extSym"/>
       <memberOf key="att.lineRend"/>
       <memberOf key="att.placementRelStaff"/>
@@ -8523,7 +8533,7 @@
   </classSpec><classSpec rend="add" ident="att.refrain.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.placementRelStaff"/>
       <memberOf key="att.typography"/>
       
@@ -8534,7 +8544,7 @@
   </classSpec><classSpec rend="add" ident="att.reh.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.placementRelStaff"/>
       <memberOf key="att.typography"/>
       <memberOf key="att.visualOffset"/>
@@ -8552,7 +8562,7 @@
       
       
     </classes>
-  </classSpec><classSpec rend="add" ident="att.rest.vis" module="MEI.visual" type="atts"><desc>Visual domain attributes.</desc><classes><memberOf key="att.rest.vis.cmn"/><memberOf key="att.visualOffset"/></classes><attList/></classSpec><classSpec rend="add" ident="att.sb.vis" module="MEI.visual" type="atts">
+  </classSpec><classSpec rend="add" ident="att.rest.vis" module="MEI.visual" type="atts"><desc>Visual domain attributes.</desc><classes><memberOf key="att.color"/><memberOf key="att.rest.vis.cmn"/><memberOf key="att.visualOffset"/></classes><attList/></classSpec><classSpec rend="add" ident="att.sb.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
@@ -8584,13 +8594,13 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes for slur. The vo attribute is the vertical offset (from its
       normal position) of the entire rendered slur/phrase mark.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
+      <memberOf key="att.color"/>
+      <memberOf key="att.curvature"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.visualOffset2"/>
       
       
-      <memberOf key="att.curvature"/>
-      
     </classes>
   </classSpec><classSpec rend="add" ident="att.space.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
@@ -8643,7 +8653,7 @@
     </classes>
     
     
-  </classSpec><classSpec rend="add" ident="att.symbol.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.extSym"/><memberOf key="att.scalable"/><memberOf key="att.visualOffset"/></classes><attList/></classSpec><classSpec rend="add" ident="att.tempo.vis" module="MEI.visual" type="atts">
+  </classSpec><classSpec rend="add" ident="att.symbol.vis" module="MEI.visual" type="atts"><desc xml:lang="en">Visual domain attributes.</desc><classes><memberOf key="att.color"/><memberOf key="att.extSym"/><memberOf key="att.scalable"/><memberOf key="att.visualOffset"/></classes><attList/></classSpec><classSpec rend="add" ident="att.tempo.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.extender"/>
@@ -8662,19 +8672,19 @@
       lines. Startto and endto describe the start and end points in terms of time; that is,
       beats.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
+      <memberOf key="att.color"/>
+      <memberOf key="att.curvature"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.visualOffset2"/>
       
       
-      <memberOf key="att.curvature"/>
-      
     </classes>
   </classSpec><classSpec rend="add" ident="att.trill.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       
       <memberOf key="att.extender"/>
       <memberOf key="att.placementRelStaff"/>
@@ -8688,7 +8698,7 @@
   </classSpec><classSpec rend="add" ident="att.tuplet.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.numberPlacement"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -8727,7 +8737,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       
-      
+      <memberOf key="att.color"/>
       
       <memberOf key="att.extSym"/>
       <memberOf key="att.placementRelStaff"/>
@@ -8738,7 +8748,7 @@
   </classSpec><classSpec rend="add" ident="att.verse.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.placementRelStaff"/>
       <memberOf key="att.typography"/>
       
@@ -8749,7 +8759,7 @@
   </classSpec><classSpec rend="add" ident="att.volta.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      
+      <memberOf key="att.color"/>
       <memberOf key="att.typography"/>
       
       <memberOf key="att.visualOffset.vo"/>
diff --git a/libmei/mei/develop/mei-verovio.xml b/libmei/mei/mei-verovio.xml
similarity index 97%
rename from libmei/mei/develop/mei-verovio.xml
rename to libmei/mei/mei-verovio.xml
index 4c9a796df64..3d2a80d1fee 100644
--- a/libmei/mei/develop/mei-verovio.xml
+++ b/libmei/mei/mei-verovio.xml
@@ -91,7 +91,7 @@
 					<attList>
 						<attDef ident="meiversion" usage="req">
 							<desc xml:lang="en">Specifies a generic MEI version label.</desc>
-							<defaultVal>5.0.0-dev</defaultVal>
+							<defaultVal>5.0</defaultVal>
 							<valList type="closed">
 								<valItem ident="2013">
 									<desc xml:lang="en">MEI 2013</desc>
@@ -105,11 +105,20 @@
 								<valItem ident="4.0.1">
 									<desc xml:lang="en">MEI 4.0.1</desc>
 								</valItem>
-								<valItem ident="5.0.0-dev+basic">
-									<desc xml:lang="en">MEI basic</desc>
+								<valItem ident="5.0">
+									<desc xml:lang="en">MEI 5.0</desc>
 								</valItem>
-								<valItem ident="5.0.0-dev">
-									<desc xml:lang="en">Development version of MEI 5.0.0</desc>
+								<valItem ident="5.0+basic">
+									<desc>MEI 5.0+basic</desc>
+								</valItem>
+								<valItem ident="5.0+CMN">
+									<desc>MEI 5.0+CMN</desc>
+								</valItem>
+								<valItem ident="5.0+Mensural">
+									<desc>MEI 5.0+Mensural</desc>
+								</valItem>
+								<valItem ident="5.0+Neumes">
+									<desc>MEI 5.0+Neumes</desc>
 								</valItem>
 							</valList>
 						</attDef>
@@ -243,7 +252,7 @@
 						<memberOf key="model.secbLike"/>
 					</classes>
 					<content>
-						<rng:empty/>
+						<empty/>
 					</content>
 				</elementSpec>
 
@@ -259,7 +268,7 @@
 						<memberOf key="model.mdivbLike"/>
 					</classes>
 					<content>
-						<rng:empty/>
+						<empty/>
 					</content>
 				</elementSpec>
 
@@ -296,7 +305,7 @@
 						<memberOf key="model.scorebLike"/>
 					</classes>
 					<content>
-						<rng:empty/>
+						<empty/>
 					</content>
 					<remarks>
 						<p>This element is necessary to allow round-tripping between page-based and score-based (regular) MEI.</p>
diff --git a/libmei/mei/develop/mei-verovio_compiled.odd b/libmei/mei/mei-verovio_compiled.odd
similarity index 99%
rename from libmei/mei/develop/mei-verovio_compiled.odd
rename to libmei/mei/mei-verovio_compiled.odd
index 6f7ff7c7885..a3ca3632df4 100644
--- a/libmei/mei/develop/mei-verovio_compiled.odd
+++ b/libmei/mei/mei-verovio_compiled.odd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xml:base="file:/Users/laurent/projects/verovio_develop/libmei/mei/develop/mei-verovio.xml"><?TEIVERSION Version 5.0.0?>
+<?xml version="1.0" encoding="utf-8"?><TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xml:base="file:/Users/rettinghaus/git/verovio/libmei/mei/mei-verovio.xml"><?TEIVERSION Version 5.0?>
 	<teiHeader>
 		<fileDesc>
 			<titleStmt>
@@ -50,7 +50,7 @@
 			<divGen type="toc"/>
 		</front>
 		<body>
-			<schemaSpec ident="mei" start="mei meiHead meiCorpus music" ns="http://www.music-encoding.org/ns/mei" source="/Users/laurent/libs/mei_official/build/mei-source_canonicalized.xml"><macroSpec rend="add" ident="data.ACCIDENTAL.WRITTEN" module="MEI" type="dt">
+			<schemaSpec ident="mei" start="mei meiHead meiCorpus music" ns="http://www.music-encoding.org/ns/mei" source="/Users/rettinghaus/git/music-encoding/build/mei-source_canonicalized.xml"><macroSpec rend="add" ident="data.ACCIDENTAL.WRITTEN" module="MEI" type="dt">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Written accidental values.</desc>
     <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <alternate minOccurs="1" maxOccurs="1"><macroRef key="data.ACCIDENTAL.WRITTEN.basic"/><macroRef key="data.ACCIDENTAL.WRITTEN.extended"/><macroRef key="data.ACCIDENTAL.aeu"/><macroRef key="data.ACCIDENTAL.persian"/></alternate>
@@ -125,6 +125,18 @@
         <valItem ident="nd">
           <desc xml:lang="en">Natural note lowered by quarter tone (natural modified by arrow).</desc>
         </valItem>
+        <valItem ident="xu">
+          <desc xml:lang="en">Double sharp note raised by quarter tone (double sharp modified by arrow).</desc>
+        </valItem>
+        <valItem ident="xd">
+          <desc xml:lang="en">Double sharp note lowered by quarter tone (double sharp modified by arrow).</desc>
+        </valItem>
+        <valItem ident="ffu">
+          <desc xml:lang="en">Double flat note raised by quarter tone (double flat modified by arrow).</desc>
+        </valItem>
+        <valItem ident="ffd">
+          <desc xml:lang="en">Double flat note lowered by quarter tone (double flat modified by arrow).</desc>
+        </valItem>
         
         <valItem ident="1qf">
           <desc xml:lang="en">1/4-tone flat accidental.</desc>
@@ -235,6 +247,12 @@
         <valItem ident="fd">
           <desc xml:lang="en">Three quarter-tones flat.</desc>
         </valItem>
+        <valItem ident="xu">
+          <desc xml:lang="en">Five quarter-tones sharp.</desc>
+        </valItem>
+        <valItem ident="ffd">
+          <desc xml:lang="en">Five quarter-tones flat.</desc>
+        </valItem>
       </valList>
     </content>
   </macroSpec><macroSpec rend="add" ident="data.ARTICULATION" module="MEI" type="dt">
@@ -3103,7 +3121,7 @@
       </valList>
     </content>
   </macroSpec><macroSpec rend="add" ident="data.STAFFLOC" module="MEI" type="dt">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Staff location. The value '0' indicates the bottom line of the current staff; positive
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Staff location. The value <val>0</val> indicates the bottom line of the current staff; positive
       values are used for positions above the bottom line and negative values for the positions
       below. For example, in treble clef, 1 = F4, 2 = G4, 3 = A4, etc. and -1 = D4, -2 = C4, and so
       on.</desc>
@@ -3621,16 +3639,9 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.accidental"/>
+      <memberOf key="att.keyMode"/>
       <memberOf key="att.pitch"/>
     </classes>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="mode" usage="opt">
-        <desc xml:lang="en">Indicates major, minor, or other tonality.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MODE"/>
-        </datatype>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.keySigDefault.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Used by staffDef and scoreDef to provide default values for attributes in the analytical
       domain that are related to key signatures.</desc>
@@ -3723,6 +3734,7 @@
       <memberOf key="att.harmonicFunction"/>
       <memberOf key="att.intervalMelodic"/>
       <memberOf key="att.melodicFunction"/>
+      <memberOf key="att.neumeType"/>
       <memberOf key="att.pitchClass"/>
       <memberOf key="att.solfa"/>
     </classes>
@@ -3730,6 +3742,9 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.neume.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.neumeType"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.note.anl" module="MEI.analytical" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -4220,20 +4235,8 @@
       <memberOf key="att.augmentDots"/>
       <memberOf key="att.duration.log"/>
       <memberOf key="att.numbered"/>
+      <memberOf key="att.tremForm"/>
     </classes>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="form" usage="opt">
-        <desc xml:lang="en">Indicates whether the tremolo is measured or unmeasured.</desc>
-        <valList type="closed">
-          <valItem ident="meas">
-            <desc xml:lang="en">Measured tremolo.</desc>
-          </valItem>
-          <valItem ident="unmeas">
-            <desc xml:lang="en">Unmeasured tremolo.</desc>
-          </valItem>
-        </valList>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.chord.anl.cmn" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Analytical domain attributes in the CMN repertoire.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -4300,20 +4303,8 @@
       <memberOf key="att.event"/>
       <memberOf key="att.augmentDots"/>
       <memberOf key="att.duration.log"/>
+      <memberOf key="att.tremForm"/>
     </classes>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="form" usage="opt">
-        <desc xml:lang="en">Describes the style of the tremolo.</desc>
-        <valList type="closed">
-          <valItem ident="meas">
-            <desc xml:lang="en">Measured tremolo.</desc>
-          </valItem>
-          <valItem ident="unmeas">
-            <desc xml:lang="en">Unmeasured tremolo.</desc>
-          </valItem>
-        </valList>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.glissPresent" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that indicate whether an event participates in a glissando.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -4772,7 +4763,7 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.curvature"/>
-      <memberOf key="att.curveRend"/>
+      <memberOf key="att.lineRend.base"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.pianoPedals" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Used by scoreDef and staffDef to provide default description of piano pedal
@@ -4837,19 +4828,12 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.beaming.vis"/>
+      <memberOf key="att.guitarGrid.vis"/>
       <memberOf key="att.pianoPedals"/>
       <memberOf key="att.rehearsal"/>
       <memberOf key="att.slurRend"/>
       <memberOf key="att.tieRend"/>
     </classes>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="grid.show" usage="opt">
-        <desc xml:lang="en">Determines whether to display guitar chord grids.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
-        </datatype>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.slur.log" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -4929,6 +4913,21 @@
         </datatype>
       </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.tremForm" module="MEI.cmn" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">Attributes describing the form of a tremolo.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="form" usage="opt">
+        <desc xml:lang="en">Describes the style of the tremolo.</desc>
+        <valList type="closed">
+          <valItem ident="meas">
+            <desc xml:lang="en">Measured tremolo.</desc>
+          </valItem>
+          <valItem ident="unmeas">
+            <desc xml:lang="en">Unmeasured tremolo.</desc>
+          </valItem>
+        </valList>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.tremMeasured" module="MEI.cmn" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe measured tremolandi.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -6965,6 +6964,7 @@
       <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-figDesc.html">figDesc</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="graphic" module="MEI.figtable"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Indicates the location of an inline graphic.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
+      <memberOf key="att.coordinated.ul"/>
       <memberOf key="att.dimensions"/>
       <memberOf key="att.internetMedia"/>
       <memberOf key="att.facsimile"/>
@@ -6992,17 +6992,7 @@
             attributes.</sch:assert>
         </sch:rule>
       </constraint>
-    </constraintSpec><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="ulx" usage="opt">
-        <desc xml:lang="en">Indicates the upper-left corner x coordinate.</desc>
-        <datatype>
-          <rng:data type="nonNegativeInteger"/>
-        </datatype>
-      </attDef><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="uly" usage="opt">
-        <desc xml:lang="en">Indicates the upper-left corner y coordinate.</desc>
-        <datatype>
-          <rng:data type="nonNegativeInteger"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+    </constraintSpec><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>The model of this element is based on the <ref target="https://tei-c.org/release/doc/tei-p5-doc/en/html/ref-graphic.html">graphic</ref> element of the Text Encoding Initiative (TEI).</p>
     </remarks></elementSpec><elementSpec rend="add" ident="table" module="MEI.figtable"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Contains text displayed in tabular form.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
@@ -7459,6 +7449,17 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.timestamp2.ges"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.attacking" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes whether an element is performed "attacca".</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="attacca">
+        <desc xml:lang="en">Indicates that the performance of the next musical division should begin immediately
+          following this one.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.barLine.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.beam.ges" module="MEI.gestural" type="atts">
@@ -7538,15 +7539,9 @@
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.mdiv.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="attacca">
-        <desc xml:lang="en">Indicates that the performance of the next musical division should begin immediately
-          following this one.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
-        </datatype>
-      </attDef>
-    </attList>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.attacking"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.dir.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -7774,28 +7769,8 @@
       <memberOf key="att.duration.ges"/>
       <memberOf key="att.instrumentIdent"/>
       <memberOf key="att.midiVelocity"/>
+      <memberOf key="att.pitch.ges"/>
     </classes>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="oct.ges" usage="opt">
-        <desc xml:lang="en">Records performed octave information that differs from the written value.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.OCTAVE"/>
-        </datatype>
-      </attDef>
-      <attDef ident="pname.ges" usage="opt">
-        <desc xml:lang="en">Contains a performed pitch name that differs from the written value.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PITCHNAME.GESTURAL"/>
-        </datatype>
-      </attDef>
-      <attDef ident="pnum" usage="opt">
-        <gloss versionDate="2022-10-30" xml:lang="en">pitch number</gloss>
-        <desc xml:lang="en">Holds a pitch-to-number mapping, a base-40 or MIDI note number, for example.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PITCHNUMBER"/>
-        </datatype>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.ncGrp.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -7815,6 +7790,7 @@
       <memberOf key="att.instrumentIdent"/>
       <memberOf key="att.midiVelocity"/>
       <memberOf key="att.note.ges.mensural"/>
+      <memberOf key="att.pitch.ges"/>
       
     </classes>
     <constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="extremis_disallows_gestural_pitch" scheme="schematron">
@@ -7844,25 +7820,6 @@
             necessary to record the written pitch and octave of the symbol for this note.</p>
         </remarks>
       </attDef>
-      <attDef ident="oct.ges" usage="opt">
-        <desc xml:lang="en">Records performed octave information that differs from the written value.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.OCTAVE"/>
-        </datatype>
-      </attDef>
-      <attDef ident="pname.ges" usage="opt">
-        <desc xml:lang="en">Contains a performed pitch name that differs from the written value.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PITCHNAME.GESTURAL"/>
-        </datatype>
-      </attDef>
-      <attDef ident="pnum" usage="opt">
-        <gloss versionDate="2022-10-30" xml:lang="en">pitch number</gloss>
-        <desc xml:lang="en">Holds a pitch-to-number mapping, a base-40 or MIDI note number, for example.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PITCHNUMBER"/>
-        </datatype>
-      </attDef>
     </attList>
   </classSpec><classSpec rend="add" ident="att.octave.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
@@ -7915,6 +7872,29 @@
       <memberOf key="att.duration.ges"/>
       <memberOf key="att.timestamp2.ges"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.pitch.ges" module="MEI.gestural" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural attributes about pitch.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="oct.ges" usage="opt">
+        <desc xml:lang="en">Records performed octave information that differs from the written value.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.OCTAVE"/>
+        </datatype>
+      </attDef>
+      <attDef ident="pname.ges" usage="opt">
+        <desc xml:lang="en">Contains a performed pitch name that differs from the written value.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PITCHNAME.GESTURAL"/>
+        </datatype>
+      </attDef>
+      <attDef ident="pnum" usage="opt">
+        <gloss versionDate="2022-10-30" xml:lang="en">pitch number</gloss>
+        <desc xml:lang="en">Holds a pitch-to-number mapping, a base-40 or MIDI note number, for example.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.PITCHNUMBER"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.plica.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes that describe the properties of a plica in the mensural repertoire.</desc>
   </classSpec><classSpec rend="add" ident="att.proport.ges" module="MEI.gestural" type="atts">
@@ -7960,15 +7940,9 @@
     </classes>
   </classSpec><classSpec rend="add" ident="att.section.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="attacca">
-        <desc xml:lang="en">Indicates that the performance of the next section should begin immediately following
-          this one.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
-        </datatype>
-      </attDef>
-    </attList>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.attacking"/>
+    </classes>
   </classSpec><classSpec rend="add" ident="att.signifLet.ges" module="MEI.gestural" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Gestural domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.slur.ges" module="MEI.gestural" type="atts">
@@ -8603,7 +8577,7 @@
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.NMTOKEN"/>
         </datatype>
       </attDef><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="context" usage="opt">
-        <desc xml:lang="en">Circumstances in which the element appears, an XPath expression.</desc>
+        <desc xml:lang="en">Circumstances in which the attribute appears, an XPath expression.</desc>
         <datatype>
           <rng:data type="string"/>
         </datatype>
@@ -9213,16 +9187,12 @@
       <memberOf key="att.common"/>
       <memberOf key="att.accidental"/>
       <memberOf key="att.bibl"/>
+      <memberOf key="att.keyMode"/>
       <memberOf key="att.pitch"/>
       <memberOf key="model.workIdent"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <rng:text/>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="mode" usage="opt">
-        <desc xml:lang="en">Indicates major, minor, or other tonality.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MODE"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>This element is used exclusively within bibliographic descriptions. Do not confuse this
         element with <gi scheme="MEI">keySig</gi>, which is used within the body of an MEI file to
         record this data.</p>
@@ -9924,14 +9894,7 @@
       <memberOf key="model.physDescPart"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.struc-unstrucContent"/>
-    </content><constraintSpec xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="check_watermark_inline" scheme="schematron">
-      <constraint>
-        <sch:rule context="mei:watermark">
-          <sch:assert test="ancestor::mei:physDesc">The watermark element may only appear as a
-            descendant of the physDesc element.</sch:assert>
-        </sch:rule>
-      </constraint>
-    </constraintSpec><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>The <att>facs</att> attribute may be used to record the location of the watermark in a
         facsimile image.</p>
     </remarks><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
@@ -11214,6 +11177,9 @@
     </attList>
   </classSpec><classSpec rend="add" ident="att.ncForm" module="MEI.neumes" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record visual details of neume notation.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.curvatureDirection"/>
+    </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <attDef ident="angled" usage="opt">
         <desc/>
@@ -11236,17 +11202,6 @@
           </valItem>
         </valList>
       </attDef>
-      <attDef ident="curve" usage="opt">
-        <desc xml:lang="en">Records direction of curvature.</desc>
-        <valList type="closed">
-          <valItem ident="a">
-            <desc xml:lang="en">Anti-clockwise curvature.</desc>
-          </valItem>
-          <valItem ident="c">
-            <desc xml:lang="en">Clockwise curvature.</desc>
-          </valItem>
-        </valList>
-      </attDef>
       <attDef ident="hooked" usage="opt">
         <desc xml:lang="en">Pen stroke has an extension; specific to Hispanic notation.</desc>
         <datatype>
@@ -11304,6 +11259,39 @@
       <memberOf key="att.staffIdent"/>
       <memberOf key="att.sylText"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.neumeType" module="MEI.neumes" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that specify the type of neumes.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="type" usage="opt">
+        <desc xml:lang="en">Designation which characterizes the element in some sense, using any convenient
+          classification scheme or typology that employs single-token labels.</desc>
+        <datatype maxOccurs="unbounded">
+          <rng:data type="NMTOKEN"/>
+        </datatype>
+        <valList type="semi">
+          <valItem ident="apostropha"/>
+          <valItem ident="bistropha"/>
+          <valItem ident="climacus"/>
+          <valItem ident="clivis"/>
+          <valItem ident="oriscus"/>
+          <valItem ident="pes"/>
+          <valItem ident="pessubpunctis"/>
+          <valItem ident="porrectus"/>
+          <valItem ident="porrectusflexus"/>
+          <valItem ident="pressusmaior"/>
+          <valItem ident="pressusminor"/>
+          <valItem ident="punctum"/>
+          <valItem ident="quilisma"/>
+          <valItem ident="scandicus"/>
+          <valItem ident="strophicus"/>
+          <valItem ident="torculus"/>
+          <valItem ident="torculusresupinus"/>
+          <valItem ident="tristropha"/>
+          <valItem ident="virga"/>
+          <valItem ident="virgastrata"/>
+        </valList>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.oriscus.log" module="MEI.neumes" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
   </classSpec><classSpec rend="add" ident="att.quilisma.log" module="MEI.neumes" type="atts">
@@ -11392,37 +11380,7 @@
       <memberOf key="model.neumePart"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.appLike"/><ref name="model.editLike"/><ref name="model.neumeComponentModifierLike"/><ref name="model.neumeModifierLike"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="type" usage="opt">
-        <desc xml:lang="en">Designation which characterizes the element in some sense, using any convenient
-          classification scheme or typology that employs single-token labels.</desc>
-        <datatype maxOccurs="unbounded">
-          <rng:data type="NMTOKEN"/>
-        </datatype>
-        <valList type="semi">
-          <valItem ident="apostropha"/>
-          <valItem ident="bistropha"/>
-          <valItem ident="climacus"/>
-          <valItem ident="clivis"/>
-          <valItem ident="oriscus"/>
-          <valItem ident="pes"/>
-          <valItem ident="pessubpunctis"/>
-          <valItem ident="porrectus"/>
-          <valItem ident="porrectusflexus"/>
-          <valItem ident="pressusmaior"/>
-          <valItem ident="pressusmaior"/>
-          <valItem ident="pressusminor"/>
-          <valItem ident="pressusminor"/>
-          <valItem ident="punctum"/>
-          <valItem ident="quilisma"/>
-          <valItem ident="scandicus"/>
-          <valItem ident="strophicus"/>
-          <valItem ident="torculus"/>
-          <valItem ident="torculusresupinus"/>
-          <valItem ident="tristropha"/>
-          <valItem ident="virga"/>
-          <valItem ident="virgastrata"/>
-        </valList>
-      </attDef></attList></elementSpec><elementSpec rend="add" ident="ncGrp" module="MEI.neumes"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">neume component group</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Collection of one or more neume components.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    </content></elementSpec><elementSpec rend="add" ident="ncGrp" module="MEI.neumes"><gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2023-06-16" xml:lang="en">neume component group</gloss><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Collection of one or more neume components.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.ncGrp.anl"/>
@@ -11447,37 +11405,7 @@
       <memberOf key="model.eventLike.neumes"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><ref name="model.appLike"/><ref name="model.editLike"/><ref name="model.neumeModifierLike"/><ref name="model.neumePart"/><ref name="model.transcriptionLike"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="type" usage="opt">
-        <desc xml:lang="en">Designation which characterizes the element in some sense, using any convenient
-          classification scheme or typology that employs single-token labels.</desc>
-        <datatype maxOccurs="unbounded">
-          <rng:data type="NMTOKEN"/>
-        </datatype>
-        <valList type="semi">
-          <valItem ident="apostropha"/>
-          <valItem ident="bistropha"/>
-          <valItem ident="climacus"/>
-          <valItem ident="clivis"/>
-          <valItem ident="oriscus"/>
-          <valItem ident="pes"/>
-          <valItem ident="pessubpunctis"/>
-          <valItem ident="porrectus"/>
-          <valItem ident="porrectusflexus"/>
-          <valItem ident="pressusmaior"/>
-          <valItem ident="pressusmaior"/>
-          <valItem ident="pressusminor"/>
-          <valItem ident="pressusminor"/>
-          <valItem ident="punctum"/>
-          <valItem ident="quilisma"/>
-          <valItem ident="scandicus"/>
-          <valItem ident="strophicus"/>
-          <valItem ident="torculus"/>
-          <valItem ident="torculusresupinus"/>
-          <valItem ident="tristropha"/>
-          <valItem ident="virga"/>
-          <valItem ident="virgastrata"/>
-        </valList>
-      </attDef></attList></elementSpec><elementSpec rend="add" ident="oriscus" module="MEI.neumes"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Oriscus.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    </content></elementSpec><elementSpec rend="add" ident="oriscus" module="MEI.neumes"><desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Oriscus.</desc><classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.oriscus.anl"/>
@@ -12285,19 +12213,10 @@
   </classSpec><classSpec rend="add" ident="att.coordinated" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">This attribute class records the position of a feature within a two-dimensional coordinate
       system.</desc>
+    <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <memberOf key="att.coordinated.ul"/>
+    </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="ulx" usage="opt">
-        <desc xml:lang="en">Indicates the upper-left corner x coordinate.</desc>
-        <datatype>
-          <rng:data type="nonNegativeInteger"/>
-        </datatype>
-      </attDef>
-      <attDef ident="uly" usage="opt">
-        <desc xml:lang="en">Indicates the upper-left corner y coordinate.</desc>
-        <datatype>
-          <rng:data type="nonNegativeInteger"/>
-        </datatype>
-      </attDef>
       <attDef ident="lrx" usage="opt">
         <desc xml:lang="en">Indicates the lower-right corner x coordinate.</desc>
         <datatype>
@@ -12325,6 +12244,23 @@
         </remarks>
       </attDef>
     </attList>
+  </classSpec><classSpec rend="add" ident="att.coordinated.ul" module="MEI.shared" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">This attribute class records the upper left position of a feature within a two-dimensional coordinate
+      system.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="ulx" usage="opt">
+        <desc xml:lang="en">Indicates the upper-left corner x coordinate.</desc>
+        <datatype>
+          <rng:data type="nonNegativeInteger"/>
+        </datatype>
+      </attDef>
+      <attDef ident="uly" usage="opt">
+        <desc xml:lang="en">Indicates the upper-left corner y coordinate.</desc>
+        <datatype>
+          <rng:data type="nonNegativeInteger"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.cue" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that describe "cue-ness".</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -12371,22 +12307,6 @@
         </valList>
       </attDef>
     </attList>
-  </classSpec><classSpec rend="add" ident="att.curveRend" module="MEI.shared" type="atts">
-    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record the visual rendition of curves.</desc>
-    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="lform" usage="opt">
-        <desc xml:lang="en">Describes the line style of a curve.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEFORM"/>
-        </datatype>
-      </attDef>
-      <attDef ident="lwidth" usage="opt">
-        <desc xml:lang="en">Width of a curved line.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEWIDTH"/>
-        </datatype>
-      </attDef>
-    </attList>
   </classSpec><classSpec rend="add" ident="att.custos.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -12897,6 +12817,16 @@
       <memberOf key="att.accidental"/>
       <memberOf key="att.pitched"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.keyMode" module="MEI.shared" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes for describing key mode.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="mode" usage="opt">
+        <desc xml:lang="en">Indicates major, minor, or other tonality.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.MODE"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.keySig.log" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Logical domain attributes.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -13066,15 +12996,20 @@
   </classSpec><classSpec rend="add" ident="att.lineRend.base" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that record the basic visual rendition of lines.</desc>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="lform" usage="opt">
-        <gloss versionDate="2022-10-18" xml:lang="en">line form</gloss>
-        <desc xml:lang="en">Describes the line style of a line.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEFORM"/>
-        </datatype>
-      </attDef>
       
-      <attDef ident="lsegs" usage="opt">
+        <attDef ident="lform" usage="opt">
+          <desc xml:lang="en">Describes the style of a line.</desc>
+          <datatype>
+            <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEFORM"/>
+          </datatype>
+        </attDef>
+        <attDef ident="lwidth" usage="opt">
+          <desc xml:lang="en">Width of a line.</desc>
+          <datatype>
+            <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEWIDTH"/>
+          </datatype>
+        </attDef>
+        <attDef ident="lsegs" usage="opt">
         <desc xml:lang="en">Describes the number of segments into which a dashed or dotted line may be divided, or
           the number of "peaks" of a wavy line; a pair of space-separated values (minimum and
           maximum, respectively) provides a range between which a rendering system-supplied value
@@ -13094,12 +13029,6 @@
           </constraint>
         </constraintSpec>
       </attDef>
-      <attDef ident="lwidth" usage="opt">
-        <desc xml:lang="en">Width of a line.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEWIDTH"/>
-        </datatype>
-      </attDef>
       
     </attList>
   </classSpec><classSpec rend="add" ident="att.linking" module="MEI.shared" type="atts">
@@ -13409,7 +13338,7 @@
 					<attList>
 						<attDef ident="meiversion" usage="req">
 							<desc xml:lang="en">Specifies a generic MEI version label.</desc>
-							<defaultVal>5.0.0-dev</defaultVal>
+							<defaultVal>5.0</defaultVal>
 							<valList type="closed">
 								<valItem ident="2013">
 									<desc xml:lang="en">MEI 2013</desc>
@@ -13423,11 +13352,20 @@
 								<valItem ident="4.0.1">
 									<desc xml:lang="en">MEI 4.0.1</desc>
 								</valItem>
-								<valItem ident="5.0.0-dev+basic">
-									<desc xml:lang="en">MEI basic</desc>
+								<valItem ident="5.0">
+									<desc xml:lang="en">MEI 5.0</desc>
+								</valItem>
+								<valItem ident="5.0+basic">
+									<desc>MEI 5.0+basic</desc>
+								</valItem>
+								<valItem ident="5.0+CMN">
+									<desc>MEI 5.0+CMN</desc>
+								</valItem>
+								<valItem ident="5.0+Mensural">
+									<desc>MEI 5.0+Mensural</desc>
 								</valItem>
-								<valItem ident="5.0.0-dev">
-									<desc xml:lang="en">Development version of MEI 5.0.0</desc>
+								<valItem ident="5.0+Neumes">
+									<desc>MEI 5.0+Neumes</desc>
 								</valItem>
 							</valList>
 						</attDef>
@@ -13438,6 +13376,14 @@
       <memberOf key="att.duration.ratio"/>
       <memberOf key="att.mensural.shared"/>
     </classes>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="level" usage="opt">
+        <desc>Level of duration at which the proportion given by the @num and @numbase ratio applies.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.DURATION.mensural"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.meterConformance" module="MEI.shared" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes that provide information about a structure’s conformance to the prevailing
       meter.</desc>
@@ -15230,7 +15176,7 @@
       <attDef ident="xml:space" usage="opt">
         <desc xml:lang="en">Allows one to signal to an application whether an element’s white space is
           "significant". The behavior of xml:space cascades to all descendant elements, but it can
-          be turned off locally by setting the xml:space attribute to the value "default".</desc>
+          be turned off locally by setting the xml:space attribute to the value <val>default</val>.</desc>
         <valList type="closed">
           <valItem ident="default">
             <desc xml:lang="en">Allows the application to handle white space as necessary. Not including an
@@ -17075,15 +17021,11 @@
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.formework"/>
+      <memberOf key="att.horizontalAlign"/>
       <memberOf key="att.lang"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textComponentLike"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/><ref name="model.appLike"/><ref name="anchoredText"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="halign" usage="opt">
-        <desc xml:lang="en">Records horizontal alignment of the page footer.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.HORIZONTALALIGNMENT"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>This element is used to capture the textual data that often appears in
         printed music. It may also be used for similarly formatted material in manuscripts. When
         used within <gi scheme="MEI">pb</gi>, it records a temporary suspension of the pattern of
@@ -17093,15 +17035,11 @@
       <memberOf key="att.common"/>
       <memberOf key="att.facsimile"/>
       <memberOf key="att.formework"/>
+      <memberOf key="att.horizontalAlign"/>
       <memberOf key="att.lang"/>
     </classes><content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><choice><rng:text xmlns="http://www.tei-c.org/ns/1.0"/><ref name="model.textComponentLike"/><ref name="model.textPhraseLike.limited"/><ref name="model.editLike"/><ref name="model.transcriptionLike"/><ref name="model.appLike"/><ref name="anchoredText"/></choice></zeroOrMore>
-    </content><attList><attDef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" ident="halign" usage="opt">
-        <desc xml:lang="en">Records horizontal alignment of the page header.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.HORIZONTALALIGNMENT"/>
-        </datatype>
-      </attDef></attList><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+    </content><remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <p>This element is used to capture the textual data that often appears in
         printed music. It may also be used for similarly formatted material in manuscripts. When
         used within <gi scheme="MEI">pb</gi>, it records a temporary suspension of the pattern of
@@ -17414,8 +17352,8 @@
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.symbolTableLike"/></optional>
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.keySigLike"/></optional>
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="model.meterSigLike"/></optional>
-      <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="pgHead"/></optional>
-      <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="pgFoot"/></optional>
+      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="pgHead"/></zeroOrMore>
+      <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="pgFoot"/></zeroOrMore>
       <optional xmlns="http://relaxng.org/ns/structure/1.0"><ref name="instrGrp"/></optional>
       <choice xmlns="http://relaxng.org/ns/structure/1.0"><optional><ref name="model.staffGrpLike"/></optional></choice>
       <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"><ref name="grpSym"/></zeroOrMore>
@@ -18556,6 +18494,7 @@
       <memberOf key="att.color"/>
       <memberOf key="att.enclosingChars"/>
       <memberOf key="att.extSym"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.typography"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.xy"/>
@@ -18591,18 +18530,6 @@
           <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.COLOR"/>
         </datatype>
       </attDef>
-      <attDef ident="line.form" usage="opt">
-        <desc xml:lang="en">Visual form of the line.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEFORM"/>
-        </datatype>
-      </attDef>
-      <attDef ident="line.width" usage="opt">
-        <desc xml:lang="en">Width of the line.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.LINEWIDTH"/>
-        </datatype>
-      </attDef>
     </attList>
   </classSpec><classSpec rend="add" ident="att.artic.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
@@ -18750,12 +18677,12 @@
       attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.color"/>
+      <memberOf key="att.curvature"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.visualOffset2"/>
       <memberOf key="att.xy"/>
       <memberOf key="att.xy2"/>
-      <memberOf key="att.curvature"/>
-      <memberOf key="att.curveRend"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.bracketSpan.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
@@ -18875,12 +18802,27 @@
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.xy"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.curvatureDirection" module="MEI.visual" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Attributes describing the direction of curvature.</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="curve" usage="opt">
+        <desc xml:lang="en">Records direction of curvature.</desc>
+        <valList type="closed">
+          <valItem ident="a">
+            <desc xml:lang="en">Anti-clockwise curvature.</desc>
+          </valItem>
+          <valItem ident="c">
+            <desc xml:lang="en">Clockwise curvature.</desc>
+          </valItem>
+        </valList>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.curve.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.color"/>
       <memberOf key="att.curvature"/>
-      <memberOf key="att.curveRend"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.visualOffset2"/>
       <memberOf key="att.xy"/>
@@ -19111,6 +19053,16 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.color"/>
     </classes>
+  </classSpec><classSpec rend="add" ident="att.guitarGrid.vis" module="MEI.visual" type="atts">
+    <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes</desc>
+    <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+      <attDef ident="grid.show" usage="opt">
+        <desc xml:lang="en">Determines whether to display guitar chord grids.</desc>
+        <datatype>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
+        </datatype>
+      </attDef>
+    </attList>
   </classSpec><classSpec rend="add" ident="att.grpSym.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -19368,6 +19320,7 @@
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.altSym"/>
       <memberOf key="att.color"/>
+      <memberOf key="att.curvatureDirection"/>
       <memberOf key="att.enclosingChars"/>
       <memberOf key="att.extSym"/>
       <memberOf key="att.staffLoc"/>
@@ -19377,17 +19330,6 @@
       <memberOf key="att.xy"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="curve" usage="opt">
-        <desc xml:lang="en">Records direction of curvature.</desc>
-        <valList type="closed">
-          <valItem ident="a">
-            <desc xml:lang="en">Anti-clockwise curvature.</desc>
-          </valItem>
-          <valItem ident="c">
-            <desc xml:lang="en">Clockwise curvature.</desc>
-          </valItem>
-        </valList>
-      </attDef>
       <attDef ident="looped" usage="opt">
         <desc xml:lang="en">Indicates whether curve is closed.</desc>
         <datatype>
@@ -19404,12 +19346,12 @@
       beats.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.color"/>
+      <memberOf key="att.curvature"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.visualOffset2"/>
       <memberOf key="att.xy"/>
       <memberOf key="att.xy2"/>
-      <memberOf key="att.curvature"/>
-      <memberOf key="att.curveRend"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.lyrics.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
@@ -20003,12 +19945,12 @@
       normal position) of the entire rendered slur/phrase mark.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.color"/>
+      <memberOf key="att.curvature"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.visualOffset2"/>
       <memberOf key="att.xy"/>
       <memberOf key="att.xy2"/>
-      <memberOf key="att.curvature"/>
-      <memberOf key="att.curveRend"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.sp.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
@@ -20044,6 +19986,7 @@
       <memberOf key="att.barring"/>
       <memberOf key="att.cleffing.vis"/>
       <memberOf key="att.distances"/>
+      <memberOf key="att.guitarGrid.vis"/>
       <memberOf key="att.keySigDefault.vis"/>
       <memberOf key="att.lyricStyle"/>
       <memberOf key="att.meterSigDefault.vis"/>
@@ -20058,12 +20001,6 @@
       <memberOf key="att.staffDef.vis.mensural"/>
     </classes>
     <attList xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <attDef ident="grid.show" usage="opt">
-        <desc xml:lang="en">Determines whether to display guitar chord grids.</desc>
-        <datatype>
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="data.BOOLEAN"/>
-        </datatype>
-      </attDef>
       <attDef ident="layerscheme" usage="opt">
         <desc xml:lang="en">Indicates the number of layers and their stem directions.</desc>
         <datatype>
@@ -20233,12 +20170,12 @@
       beats.</desc>
     <classes xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
       <memberOf key="att.color"/>
+      <memberOf key="att.curvature"/>
+      <memberOf key="att.lineRend.base"/>
       <memberOf key="att.visualOffset"/>
       <memberOf key="att.visualOffset2"/>
       <memberOf key="att.xy"/>
       <memberOf key="att.xy2"/>
-      <memberOf key="att.curvature"/>
-      <memberOf key="att.curveRend"/>
     </classes>
   </classSpec><classSpec rend="add" ident="att.trill.vis" module="MEI.visual" type="atts">
     <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">Visual domain attributes.</desc>
@@ -20366,14 +20303,14 @@
 						<memberOf key="att.common"/>
 						<memberOf key="model.secbLike"/>
 					</classes><content>
-						<rng:empty/>
+						<empty/>
 					</content></elementSpec><classSpec rend="add" predeclare="true" ident="model.mdivbLike" type="model" module="MEI.pageBased" mode="add">
 					<desc xml:lang="en">Collects mdivbLike (mdiv beginning) elements.</desc>
 				</classSpec><elementSpec rend="add" ident="mdivb" module="MEI.pageBased" mode="add"><gloss xml:lang="en">mdiv beginning</gloss><desc xml:lang="en">A milestone element indicating the start of a new mdiv in page-based MEI.</desc><classes>
 						<memberOf key="att.common"/>
 						<memberOf key="model.mdivbLike"/>
 					</classes><content>
-						<rng:empty/>
+						<empty/>
 					</content></elementSpec><elementSpec rend="add" ident="scoreb" module="MEI.pageBased" mode="add"><gloss xml:lang="en">score beginning</gloss><desc xml:lang="en">A milestone element indicating the start of a new score in page-based MEI.</desc><classes>
 						<memberOf key="att.common"/>
 						
@@ -20385,7 +20322,7 @@
 						<memberOf key="att.common"/>
 						
 					</classes><content>
-						<rng:empty/>
+						<empty/>
 					</content><remarks>
 						<p>This element is necessary to allow round-tripping between page-based and score-based (regular) MEI.</p>
 					</remarks></elementSpec><elementSpec rend="add" ident="partb" module="MEI.pageBased" mode="add"><gloss xml:lang="en">part beginning</gloss><desc xml:lang="en">A milestone element indicating the start of a new part in page-based MEI.</desc><classes>
diff --git a/libmei/tools/cpp.py b/libmei/tools/cpp.py
index d6f593416d6..aa4ff7b1fca 100644
--- a/libmei/tools/cpp.py
+++ b/libmei/tools/cpp.py
@@ -926,7 +926,7 @@ def create_att_datatypes(cpp_ns: str, schema, outdir: Path):
 
         val_prefix = vrv_getformattedvallist(list_type.rsplit('@')[0], list_type.rsplit('@')[1])
         type_start_fmt = {
-            "meitype": list_type,
+            "meitype": list_type.replace("@", "\@"),
             "vrvtype": val_prefix,
             "enumtype": " : int8_t" if len(values) < 64 else "",
             "val_prefix":  val_prefix
diff --git a/setup.py b/setup.py
index 8366bbc0ef5..fc1f38b2709 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ def get_commit():
     """Call tools/get_git_commit.sh on any platform."""
     if os.path.exists('./tools'):
         print('running tools/get_git_commit.sh')
-        os.system('bash -c "cd tools; ./get_git_commit.sh"')
+        os.system('sh -c "cd tools; ./get_git_commit.sh"')
     else:
         print('tools directory is missing')
 
diff --git a/src/adjustaccidxfunctor.cpp b/src/adjustaccidxfunctor.cpp
index ece6761c994..7bc8b01512d 100644
--- a/src/adjustaccidxfunctor.cpp
+++ b/src/adjustaccidxfunctor.cpp
@@ -10,6 +10,7 @@
 //----------------------------------------------------------------------------
 
 #include "doc.h"
+#include "score.h"
 
 //----------------------------------------------------------------------------
 
@@ -41,7 +42,8 @@ FunctorCode AdjustAccidXFunctor::VisitAlignmentReference(AlignmentReference *ali
     if (accids.empty()) return FUNCTOR_SIBLINGS;
 
     assert(m_doc);
-    StaffDef *staffDef = m_doc->GetCurrentScoreDef()->GetStaffDef(alignmentReference->GetN());
+    ScoreDef *scoreDef = m_doc->GetCorrespondingScore(alignmentReference)->GetScoreDef();
+    StaffDef *staffDef = scoreDef->GetStaffDef(alignmentReference->GetN());
     int staffSize = (staffDef && staffDef->HasScale()) ? staffDef->GetScale() : 100;
 
     std::sort(accids.begin(), accids.end(), AccidSpaceSort());
diff --git a/src/adjustarpegfunctor.cpp b/src/adjustarpegfunctor.cpp
index 83e56f4cfab..6051efd924b 100644
--- a/src/adjustarpegfunctor.cpp
+++ b/src/adjustarpegfunctor.cpp
@@ -172,10 +172,10 @@ FunctorCode AdjustArpegFunctor::VisitMeasureEnd(Measure *measure)
 {
     if (!m_alignmentArpegTuples.empty()) {
         m_measureAligner = &measure->m_measureAligner;
-        // Process backwards on measure aligner
-        this->PushDirection(BACKWARD);
+        // Process backwards on measure aligner, then reset to previous direction
+        const bool previousDirection = this->SetDirection(BACKWARD);
         m_measureAligner->Process(*this);
-        this->PopDirection();
+        this->SetDirection(previousDirection);
         m_alignmentArpegTuples.clear();
     }
 
diff --git a/src/adjustbeamsfunctor.cpp b/src/adjustbeamsfunctor.cpp
index f0f130b9552..c887831d837 100644
--- a/src/adjustbeamsfunctor.cpp
+++ b/src/adjustbeamsfunctor.cpp
@@ -298,21 +298,12 @@ FunctorCode AdjustBeamsFunctor::VisitRest(Rest *rest)
     if (!m_outerBeam) return FUNCTOR_SIBLINGS;
 
     // Calculate possible overlap for the rest with beams
-    int leftMargin = 0, rightMargin = 0;
     const int beams = m_outerBeam->GetBeamPartDuration(rest, false) - DUR_4;
     const int beamWidth = m_outerBeam->m_beamWidth;
-    if (m_directionBias > 0) {
-        leftMargin = m_y1 - beams * beamWidth - rest->GetSelfTop();
-        rightMargin = m_y2 - beams * beamWidth - rest->GetSelfTop();
-    }
-    else {
-        leftMargin = rest->GetSelfBottom() - m_y1 - beams * beamWidth;
-        rightMargin = rest->GetSelfBottom() - m_y2 - beams * beamWidth;
-    }
+    const int overlapMargin = rest->Intersects(m_outerBeam, SELF, beams * beamWidth, true) * m_directionBias;
 
     // Adjust drawing location for the rest based on the overlap with beams.
     // Adjustment should be an even number, so that the rest is positioned properly
-    const int overlapMargin = std::min(leftMargin, rightMargin);
     if (overlapMargin >= 0) return FUNCTOR_CONTINUE;
 
     Staff *staff = rest->GetAncestorStaff();
@@ -344,11 +335,9 @@ FunctorCode AdjustBeamsFunctor::VisitRest(Rest *rest)
     }
 
     const int unit = m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-    const int unitChangeNumber = ((std::abs(overlapMargin) + unit / 6) / unit);
-    if (unitChangeNumber > 0) {
-        const int adjust = unitChangeNumber * unit * m_directionBias;
-        if (std::abs(adjust) > std::abs(m_overlapMargin)) m_overlapMargin = adjust;
-    }
+    const int unitChangeNumber = std::abs(overlapMargin) / unit + 1;
+    const int adjust = unitChangeNumber * unit * m_directionBias;
+    if (std::abs(adjust) > std::abs(m_overlapMargin)) m_overlapMargin = adjust;
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/adjustdotsfunctor.cpp b/src/adjustdotsfunctor.cpp
index 749adcd8910..1f930da9a88 100644
--- a/src/adjustdotsfunctor.cpp
+++ b/src/adjustdotsfunctor.cpp
@@ -11,6 +11,7 @@
 
 #include "doc.h"
 #include "elementpart.h"
+#include "score.h"
 #include "staff.h"
 
 //----------------------------------------------------------------------------
@@ -101,7 +102,7 @@ FunctorCode AdjustDotsFunctor::VisitMeasure(Measure *measure)
     if (!measure->HasAlignmentRefWithMultipleLayers()) return FUNCTOR_SIBLINGS;
 
     Filters filters;
-    this->PushFilters(&filters);
+    Filters *previousFilters = this->SetFilters(&filters);
 
     std::vector<int>::iterator iter;
     for (iter = m_staffNs.begin(); iter != m_staffNs.end(); ++iter) {
@@ -118,14 +119,14 @@ FunctorCode AdjustDotsFunctor::VisitMeasure(Measure *measure)
         measure->m_measureAligner.Process(*this);
     }
 
-    this->PopFilters();
+    this->SetFilters(previousFilters);
 
     return FUNCTOR_SIBLINGS;
 }
 
 FunctorCode AdjustDotsFunctor::VisitScore(Score *score)
 {
-    m_staffNs = m_doc->GetCurrentScoreDef()->GetStaffNs();
+    m_staffNs = score->GetScoreDef()->GetStaffNs();
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/adjustgracexposfunctor.cpp b/src/adjustgracexposfunctor.cpp
index eda19401a21..85e4876cbb5 100644
--- a/src/adjustgracexposfunctor.cpp
+++ b/src/adjustgracexposfunctor.cpp
@@ -10,6 +10,7 @@
 //----------------------------------------------------------------------------
 
 #include "doc.h"
+#include "score.h"
 
 //----------------------------------------------------------------------------
 
@@ -48,9 +49,9 @@ FunctorCode AdjustGraceXPosFunctor::VisitAlignment(Alignment *alignment)
         MeasureAligner *measureAligner = vrv_cast<MeasureAligner *>(alignment->GetFirstAncestor(MEASURE_ALIGNER));
         assert(measureAligner);
 
-        this->PushDirection(BACKWARD);
+        const bool previousDirection = this->SetDirection(BACKWARD);
         Filters filters;
-        this->PushFilters(&filters);
+        Filters *previousFilters = this->SetFilters(&filters);
 
         std::vector<int>::iterator iter;
         for (iter = m_staffNs.begin(); iter != m_staffNs.end(); ++iter) {
@@ -108,8 +109,8 @@ FunctorCode AdjustGraceXPosFunctor::VisitAlignment(Alignment *alignment)
             }
         }
 
-        this->PopDirection();
-        this->PopFilters();
+        this->SetDirection(previousDirection);
+        this->SetFilters(previousFilters);
 
         // Change the flag back
         m_isGraceAlignment = false;
@@ -141,15 +142,15 @@ FunctorCode AdjustGraceXPosFunctor::VisitAlignmentReference(AlignmentReference *
     // Because we are processing grace notes alignment backward (see VisitAlignment) we need
     // to process the children (LayerElement) "by hand" in FORWARD manner
     // (filters can be NULL because filtering was already applied in the parent)
-    this->PushDirection(FORWARD);
-    this->PushFilters(NULL);
+    const bool previousDirection = this->SetDirection(FORWARD);
+    Filters *previousFilters = this->SetFilters(NULL);
 
     for (auto child : alignmentReference->GetChildren()) {
         child->Process(*this);
     }
 
-    this->PopDirection();
-    this->PopFilters();
+    this->SetDirection(previousDirection);
+    this->SetFilters(previousFilters);
 
     return FUNCTOR_SIBLINGS;
 }
@@ -205,7 +206,7 @@ FunctorCode AdjustGraceXPosFunctor::VisitMeasure(Measure *measure)
     m_rightDefaultAlignment = NULL;
 
     // We process it backward because we want to get the rightDefaultAlignment
-    this->PushDirection(BACKWARD);
+    const bool previousDirection = this->SetDirection(BACKWARD);
     measure->m_measureAligner.Process(*this);
 
     // We need to process the staves in the reverse order
@@ -220,7 +221,7 @@ FunctorCode AdjustGraceXPosFunctor::VisitMeasure(Measure *measure)
     m_staffNs = staffNsReversed;
     m_measureTieEndpoints = measure->GetInternalTieEndpoints();
     measure->m_measureAligner.Process(*this);
-    this->PopDirection();
+    this->SetDirection(previousDirection);
 
     // Put params back
     m_staffNs = staffNs;
@@ -230,7 +231,7 @@ FunctorCode AdjustGraceXPosFunctor::VisitMeasure(Measure *measure)
 
 FunctorCode AdjustGraceXPosFunctor::VisitScore(Score *score)
 {
-    m_staffNs = m_doc->GetCurrentScoreDef()->GetStaffNs();
+    m_staffNs = score->GetScoreDef()->GetStaffNs();
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/adjustlayersfunctor.cpp b/src/adjustlayersfunctor.cpp
index 80d0c344b7f..058120c970c 100644
--- a/src/adjustlayersfunctor.cpp
+++ b/src/adjustlayersfunctor.cpp
@@ -10,6 +10,7 @@
 //----------------------------------------------------------------------------
 
 #include "doc.h"
+#include "score.h"
 #include "staff.h"
 
 //----------------------------------------------------------------------------
@@ -124,7 +125,7 @@ FunctorCode AdjustLayersFunctor::VisitMeasure(Measure *measure)
     if (!measure->HasAlignmentRefWithMultipleLayers()) return FUNCTOR_SIBLINGS;
 
     Filters filters;
-    this->PushFilters(&filters);
+    Filters *previousFilters = this->SetFilters(&filters);
 
     std::vector<int>::iterator iter;
     for (iter = m_staffNs.begin(); iter != m_staffNs.end(); ++iter) {
@@ -141,14 +142,14 @@ FunctorCode AdjustLayersFunctor::VisitMeasure(Measure *measure)
         measure->m_measureAligner.Process(*this);
     }
 
-    this->PopFilters();
+    this->SetFilters(previousFilters);
 
     return FUNCTOR_SIBLINGS;
 }
 
 FunctorCode AdjustLayersFunctor::VisitScore(Score *score)
 {
-    m_staffNs = m_doc->GetCurrentScoreDef()->GetStaffNs();
+    m_staffNs = score->GetScoreDef()->GetStaffNs();
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/adjustslursfunctor.cpp b/src/adjustslursfunctor.cpp
index 2eac8fdb01e..34d5bb61c6b 100644
--- a/src/adjustslursfunctor.cpp
+++ b/src/adjustslursfunctor.cpp
@@ -27,6 +27,13 @@ namespace vrv {
 AdjustSlursFunctor::AdjustSlursFunctor(Doc *doc) : DocFunctor(doc)
 {
     m_crossStaffSlurs = false;
+    this->ResetCurrent();
+}
+
+void AdjustSlursFunctor::ResetCurrent()
+{
+    m_currentCurve = NULL;
+    m_currentSlur = NULL;
 }
 
 FunctorCode AdjustSlursFunctor::VisitStaffAlignment(StaffAlignment *staffAlignment)
@@ -42,22 +49,26 @@ FunctorCode AdjustSlursFunctor::VisitStaffAlignment(StaffAlignment *staffAlignme
         if (!positioner->GetObject()->Is({ PHRASE, SLUR })) continue;
         Slur *slur = vrv_cast<Slur *>(positioner->GetObject());
         assert(slur);
+        m_currentSlur = slur;
 
         assert(positioner->Is(FLOATING_CURVE_POSITIONER));
         FloatingCurvePositioner *curve = vrv_cast<FloatingCurvePositioner *>(positioner);
         assert(curve);
+        m_currentCurve = curve;
 
         // Skip if no content bounding box is available
         if (!curve->HasContentBB()) continue;
         positioners.push_back(curve);
 
-        slur->AdjustSlur(m_doc, curve, unit);
+        this->AdjustSlur(unit);
 
         if (curve->IsCrossStaff()) {
             m_crossStaffSlurs = true;
         }
     }
 
+    this->ResetCurrent();
+
     // Detection of inner slurs
     std::map<FloatingCurvePositioner *, ArrayOfFloatingCurvePositioners> innerCurveMap;
     for (int i = 0; i < (int)positioners.size(); ++i) {
@@ -104,9 +115,14 @@ FunctorCode AdjustSlursFunctor::VisitStaffAlignment(StaffAlignment *staffAlignme
     for (const auto &mapEntry : innerCurveMap) {
         Slur *slur = vrv_cast<Slur *>(mapEntry.first->GetObject());
         assert(slur);
-        slur->AdjustOuterSlur(m_doc, mapEntry.first, mapEntry.second, unit);
+        m_currentCurve = mapEntry.first;
+        m_currentSlur = slur;
+
+        this->AdjustOuterSlur(mapEntry.second, unit);
     }
 
+    this->ResetCurrent();
+
     return FUNCTOR_SIBLINGS;
 }
 
@@ -117,4 +133,834 @@ FunctorCode AdjustSlursFunctor::VisitSystem(System *system)
     return FUNCTOR_SIBLINGS;
 }
 
+void AdjustSlursFunctor::AdjustSlur(int unit) const
+{
+    assert(m_currentCurve);
+    assert(m_currentSlur);
+
+    Point points[4];
+    m_currentCurve->GetPoints(points);
+    BezierCurve bezier(points[0], points[1], points[2], points[3]);
+    m_currentSlur->InitBezierControlSides(bezier, m_currentCurve->GetDir());
+    bezier.UpdateControlPointParams();
+
+    const int margin = m_doc->GetOptions()->m_slurMargin.GetValue() * unit;
+    const double flexibility = m_doc->GetOptions()->m_slurEndpointFlexibility.GetValue();
+    const double symmetry = m_doc->GetOptions()->m_slurSymmetry.GetValue();
+
+    // STEP 1: Filter spanned elements and discard certain bounding boxes even though they collide
+    this->FilterSpannedElements(bezier, margin);
+
+    // STEP 2: Detect collisions near the endpoints and switch to secondary endpoints if necessary
+    NearEndCollision nearEndCollision = this->DetectCollisionsNearEnd(bezier, margin);
+    m_currentSlur->CalcInitialCurve(m_doc, m_currentCurve, &nearEndCollision);
+    if (nearEndCollision.endPointsAdjusted) {
+        m_currentCurve->GetPoints(points);
+        bezier.p1 = points[0];
+        bezier.c1 = points[1];
+        bezier.c2 = points[2];
+        bezier.p2 = points[3];
+        bezier.UpdateControlPointParams();
+        m_currentSlur->CalcSpannedElements(m_currentCurve);
+        this->FilterSpannedElements(bezier, margin);
+    }
+    else {
+        m_currentCurve->UpdatePoints(bezier);
+    }
+
+    // STEP 3: Calculate the vertical adjustment of endpoints. This shifts the slur vertically.
+    // Only collisions near the endpoints are taken into account.
+    int endPointShiftLeft = 0;
+    int endPointShiftRight = 0;
+    std::tie(endPointShiftLeft, endPointShiftRight) = this->CalcEndPointShift(bezier, flexibility, margin);
+    this->ApplyEndPointShift(bezier, endPointShiftLeft, endPointShiftRight);
+
+    // Special handling if bulge is prescribed from here on
+    if (m_currentSlur->HasBulge()) {
+        this->AdjustSlurFromBulge(bezier, unit);
+        return;
+    }
+
+    // STEP 4: Calculate the horizontal offset of the control points.
+    // The idea is to shift control points to the outside if there is an obstacle in the vicinity of the corresponding
+    // endpoint. For C1 we consider the largest angle <)BP1P2 where B is a colliding left bounding box corner and choose
+    // C1 in this direction. Similar for C2.
+    if (this->AllowControlOffsetAdjustment(bezier, symmetry, unit)) {
+        bool ok = false;
+        int controlPointOffsetLeft = 0;
+        int controlPointOffsetRight = 0;
+        std::tie(ok, controlPointOffsetLeft, controlPointOffsetRight) = this->CalcControlPointOffset(bezier, margin);
+        if (ok) {
+            bezier.SetLeftControlOffset(controlPointOffsetLeft);
+            bezier.SetRightControlOffset(controlPointOffsetRight);
+            bezier.UpdateControlPoints();
+            m_currentCurve->UpdatePoints(bezier);
+        }
+    }
+
+    // STEP 5: Calculate the vertical shift of the control points.
+    // For each colliding bounding box we formulate a constraint ax + by >= c
+    // where x, y denote the vertical adjustments of the control points and c is the size of the collision.
+    // The coefficients a, b are calculated from the Bezier curve equation.
+    // After collecting all constraints we calculate a solution.
+    const ControlPointAdjustment adjustment = this->CalcControlPointVerticalShift(bezier, symmetry, margin);
+    const int leftSign = (bezier.IsLeftControlAbove() == adjustment.moveUpwards) ? 1 : -1;
+    bezier.SetLeftControlHeight(bezier.GetLeftControlHeight() + leftSign * adjustment.leftShift);
+    const int rightSign = (bezier.IsRightControlAbove() == adjustment.moveUpwards) ? 1 : -1;
+    bezier.SetRightControlHeight(bezier.GetRightControlHeight() + rightSign * adjustment.rightShift);
+    bezier.UpdateControlPoints();
+    m_currentCurve->UpdatePoints(bezier);
+    m_currentCurve->SetRequestedStaffSpace(adjustment.requestedStaffSpace);
+
+    // STEP 6: Adjust the slur shape
+    // Through the control point adjustments in step 4 and 5 it can happen that the slur looses its desired shape.
+    // We correct the shape if the slur is too flat or not convex.
+    if (m_currentCurve->GetDir() != curvature_CURVEDIR_mixed) {
+        this->AdjustSlurShape(bezier, m_currentCurve->GetDir(), unit);
+        m_currentCurve->UpdatePoints(bezier);
+    }
+
+    // Since we are going to redraw it, reset its bounding box
+    m_currentCurve->ResetBoundingBox();
+}
+
+void AdjustSlursFunctor::AdjustOuterSlur(const ArrayOfFloatingCurvePositioners &innerCurves, int unit) const
+{
+    assert(m_currentCurve);
+    assert(m_currentSlur);
+
+    Point points[4];
+    m_currentCurve->GetPoints(points);
+    BezierCurve bezier(points[0], points[1], points[2], points[3]);
+    m_currentSlur->InitBezierControlSides(bezier, m_currentCurve->GetDir());
+    bezier.UpdateControlPointParams();
+
+    const int margin = m_doc->GetOptions()->m_slurMargin.GetValue() * unit;
+    const double flexibility = m_doc->GetOptions()->m_slurEndpointFlexibility.GetValue();
+    const double symmetry = m_doc->GetOptions()->m_slurSymmetry.GetValue();
+
+    // STEP 1: Calculate the vertical adjustment of endpoints. This shifts the slur vertically.
+    // Only collisions near the endpoints are taken into account.
+    int endPointShiftLeft = 0;
+    int endPointShiftRight = 0;
+    std::tie(endPointShiftLeft, endPointShiftRight) = this->CalcEndPointShift(bezier, innerCurves, flexibility, margin);
+    this->ApplyEndPointShift(bezier, endPointShiftLeft, endPointShiftRight);
+
+    // STEP 2: Calculate the vertical shift of the control points.
+    // For each inner slur we formulate some constraints ax + by >= c
+    // where x, y denote the vertical adjustments of the control points and c is the size of the collision.
+    // The coefficients a, b are calculated from the Bezier curve equation.
+    // After collecting all constraints we calculate a solution.
+    const ControlPointAdjustment adjustment = this->CalcControlPointShift(bezier, innerCurves, symmetry, margin);
+    bezier.SetLeftControlHeight(bezier.GetLeftControlHeight() + adjustment.leftShift);
+    bezier.SetRightControlHeight(bezier.GetRightControlHeight() + adjustment.rightShift);
+    bezier.UpdateControlPoints();
+    m_currentCurve->UpdatePoints(bezier);
+
+    // STEP 3: Adjust the slur shape
+    // We correct the shape if the slur is too flat or not convex.
+    if (m_currentCurve->GetDir() != curvature_CURVEDIR_mixed) {
+        this->AdjustSlurShape(bezier, m_currentCurve->GetDir(), unit);
+        m_currentCurve->UpdatePoints(bezier);
+    }
+
+    // Since we are going to redraw it, reset its bounding box
+    m_currentCurve->ResetBoundingBox();
+}
+
+void AdjustSlursFunctor::FilterSpannedElements(const BezierCurve &bezierCurve, int margin) const
+{
+    if (bezierCurve.p1.x >= bezierCurve.p2.x) return;
+
+    const int dist = bezierCurve.p2.x - bezierCurve.p1.x;
+
+    const ArrayOfCurveSpannedElements *spannedElements = m_currentCurve->GetSpannedElements();
+
+    for (CurveSpannedElement *spannedElement : *spannedElements) {
+
+        if (spannedElement->m_discarded) {
+            continue;
+        }
+
+        bool discard = false;
+        const int intersection = m_currentCurve->CalcDirectionalAdjustment(
+            spannedElement->m_boundingBox, spannedElement->m_isBelow, discard, margin);
+        const int xMiddle
+            = (spannedElement->m_boundingBox->GetSelfLeft() + spannedElement->m_boundingBox->GetSelfRight()) / 2.0;
+        const float distanceRatio = float(xMiddle - bezierCurve.p1.x) / float(dist);
+
+        // Check if obstacles completely lie on the other side of the slur
+        const int elementHeight
+            = std::abs(spannedElement->m_boundingBox->GetSelfTop() - spannedElement->m_boundingBox->GetSelfBottom());
+        if (intersection > elementHeight + 4 * margin) {
+            // Ignore elements in a different layer near the endpoints
+            const LayerElement *layerElement = dynamic_cast<const LayerElement *>(spannedElement->m_boundingBox);
+            if (distanceRatio < 0.05) {
+                spannedElement->m_discarded = layerElement
+                    ? (layerElement->GetOriginalLayerN() != m_currentSlur->GetStart()->GetOriginalLayerN())
+                    : true;
+            }
+            else if (distanceRatio > 0.95) {
+                spannedElement->m_discarded = layerElement
+                    ? (layerElement->GetOriginalLayerN() != m_currentSlur->GetEnd()->GetOriginalLayerN())
+                    : true;
+            }
+            // Ignore tuplet numbers
+            if (layerElement && layerElement->Is(TUPLET_NUM)) {
+                spannedElement->m_discarded = true;
+            }
+        }
+    }
+}
+
+NearEndCollision AdjustSlursFunctor::DetectCollisionsNearEnd(const BezierCurve &bezierCurve, int margin) const
+{
+    NearEndCollision nearEndCollision({ 0.0, 0.0, false });
+    if (bezierCurve.p1.x >= bezierCurve.p2.x) return nearEndCollision;
+
+    const ArrayOfCurveSpannedElements *spannedElements = m_currentCurve->GetSpannedElements();
+    for (CurveSpannedElement *spannedElement : *spannedElements) {
+        if (spannedElement->m_discarded) {
+            continue;
+        }
+
+        bool discard = false;
+        int intersectionLeft, intersectionRight;
+        std::tie(intersectionLeft, intersectionRight) = m_currentCurve->CalcDirectionalLeftRightAdjustment(
+            spannedElement->m_boundingBox, spannedElement->m_isBelow, discard, margin);
+
+        if ((intersectionLeft > 0) || (intersectionRight > 0)) {
+            Point points[4];
+            points[0] = bezierCurve.p1;
+            points[1] = bezierCurve.c1;
+            points[2] = bezierCurve.c2;
+            points[3] = bezierCurve.p2;
+
+            // Adjust the collision metrics
+            const int xLeft = std::max(bezierCurve.p1.x, spannedElement->m_boundingBox->GetSelfLeft());
+            Point pLeft(xLeft, BoundingBox::CalcBezierAtPosition(points, xLeft));
+            double distStart = std::max(BoundingBox::CalcDistance(bezierCurve.p1, pLeft), 1.0);
+            double distEnd = std::max(BoundingBox::CalcDistance(bezierCurve.p2, pLeft), 1.0);
+            nearEndCollision.metricAtStart = std::max(intersectionLeft / distStart, nearEndCollision.metricAtStart);
+            nearEndCollision.metricAtEnd = std::max(intersectionLeft / distEnd, nearEndCollision.metricAtEnd);
+
+            const int xRight = std::min(bezierCurve.p2.x, spannedElement->m_boundingBox->GetSelfRight());
+            Point pRight(xRight, BoundingBox::CalcBezierAtPosition(points, xRight));
+            distStart = std::max(BoundingBox::CalcDistance(bezierCurve.p1, pRight), 1.0);
+            distEnd = std::max(BoundingBox::CalcDistance(bezierCurve.p2, pRight), 1.0);
+            nearEndCollision.metricAtStart = std::max(intersectionRight / distStart, nearEndCollision.metricAtStart);
+            nearEndCollision.metricAtEnd = std::max(intersectionRight / distEnd, nearEndCollision.metricAtEnd);
+        }
+    }
+
+    return nearEndCollision;
+}
+
+std::pair<int, int> AdjustSlursFunctor::CalcEndPointShift(
+    const BezierCurve &bezierCurve, double flexibility, int margin) const
+{
+    if (bezierCurve.p1.x >= bezierCurve.p2.x) return { 0, 0 };
+
+    int shiftLeft = 0;
+    int shiftRight = 0;
+
+    const int dist = bezierCurve.p2.x - bezierCurve.p1.x;
+
+    const ArrayOfCurveSpannedElements *spannedElements = m_currentCurve->GetSpannedElements();
+    for (CurveSpannedElement *spannedElement : *spannedElements) {
+
+        if (spannedElement->m_discarded) {
+            continue;
+        }
+
+        bool discard = false;
+        int intersectionLeft, intersectionRight;
+        std::tie(intersectionLeft, intersectionRight) = m_currentCurve->CalcDirectionalLeftRightAdjustment(
+            spannedElement->m_boundingBox, spannedElement->m_isBelow, discard, margin);
+
+        if (discard) {
+            spannedElement->m_discarded = true;
+            continue;
+        }
+
+        if ((intersectionLeft > 0) || (intersectionRight > 0)) {
+            // Now apply the intersections on the left and right hand side of the bounding box
+            const int xLeft = std::max(bezierCurve.p1.x, spannedElement->m_boundingBox->GetSelfLeft());
+            const float distanceRatioLeft = float(xLeft - bezierCurve.p1.x) / float(dist);
+            this->ShiftEndPoints(shiftLeft, shiftRight, distanceRatioLeft, intersectionLeft, flexibility,
+                spannedElement->m_isBelow, m_currentCurve->m_spanningType);
+
+            const int xRight = std::min(bezierCurve.p2.x, spannedElement->m_boundingBox->GetSelfRight());
+            const float distanceRatioRight = float(xRight - bezierCurve.p1.x) / float(dist);
+            this->ShiftEndPoints(shiftLeft, shiftRight, distanceRatioRight, intersectionRight, flexibility,
+                spannedElement->m_isBelow, m_currentCurve->m_spanningType);
+        }
+    }
+
+    return { shiftLeft, shiftRight };
+}
+
+void AdjustSlursFunctor::ApplyEndPointShift(
+    BezierCurve &bezierCurve, int endPointShiftLeft, int endPointShiftRight) const
+{
+    if ((endPointShiftLeft != 0) || (endPointShiftRight != 0)) {
+        const int signLeft = bezierCurve.IsLeftControlAbove() ? 1 : -1;
+        const int signRight = bezierCurve.IsRightControlAbove() ? 1 : -1;
+        bezierCurve.p1.y += signLeft * endPointShiftLeft;
+        bezierCurve.p2.y += signRight * endPointShiftRight;
+        if (bezierCurve.p1.x != bezierCurve.p2.x) {
+            double lambda1, lambda2;
+            std::tie(lambda1, lambda2) = bezierCurve.EstimateCurveParamForControlPoints();
+            bezierCurve.c1.y
+                += signLeft * (1.0 - lambda1) * endPointShiftLeft + signRight * lambda1 * endPointShiftRight;
+            bezierCurve.c2.y
+                += signLeft * (1.0 - lambda2) * endPointShiftLeft + signRight * lambda2 * endPointShiftRight;
+        }
+        bezierCurve.UpdateControlPointParams();
+        m_currentCurve->UpdatePoints(bezierCurve);
+    }
+}
+
+void AdjustSlursFunctor::AdjustSlurFromBulge(BezierCurve &bezierCurve, int unit) const
+{
+    if (bezierCurve.p1.x >= bezierCurve.p2.x) return;
+
+    data_BULGE bulge = m_currentSlur->GetBulge();
+
+    // Filter admissible values
+    bulge.erase(std::remove_if(bulge.begin(), bulge.end(),
+                    [](const data_BULGE::value_type &entry) {
+                        return ((entry.first <= 0.0) || (entry.second <= 0.0) || (entry.second >= 100.0));
+                    }),
+        bulge.end());
+
+    // Get the minimal and maximal lambda
+    double lambdaMin = 0.66;
+    double lambdaMax = 0.33;
+    for (const data_BULGE::value_type &bulgeEntry : bulge) {
+        const double lambda = bulgeEntry.second / 100.0;
+        lambdaMin = std::min(lambda, lambdaMin);
+        lambdaMax = std::max(lambda, lambdaMax);
+    }
+
+    // Horizontal control point adjustment
+    lambdaMin /= 2.0;
+    lambdaMax = 1.0 - (1.0 - lambdaMax) / 2.0;
+    const double xMin = (1.0 - lambdaMin) * bezierCurve.p1.x + lambdaMin * bezierCurve.p2.x;
+    const double xMax = (1.0 - lambdaMax) * bezierCurve.p1.x + lambdaMax * bezierCurve.p2.x;
+    bezierCurve.SetLeftControlOffset(xMin - bezierCurve.p1.x);
+    bezierCurve.SetRightControlOffset(bezierCurve.p2.x - xMax);
+    bezierCurve.UpdateControlPoints();
+    m_currentCurve->UpdatePoints(bezierCurve);
+
+    // Generate a control point constraint for each bulge entry
+    std::list<ControlPointConstraint> constraints;
+    Point points[4];
+    points[0] = bezierCurve.p1;
+    points[1] = bezierCurve.c1;
+    points[2] = bezierCurve.c2;
+    points[3] = bezierCurve.p2;
+
+    for (const data_BULGE::value_type &bulgeEntry : bulge) {
+        const double lambda = bulgeEntry.second / 100.0;
+        const double x = (1.0 - lambda) * bezierCurve.p1.x + lambda * bezierCurve.p2.x;
+        const double t = BoundingBox::CalcBezierParamAtPosition(points, x);
+        constraints.push_back({ 3.0 * pow(1.0 - t, 2.0) * t, 3.0 * (1.0 - t) * pow(t, 2.0), bulgeEntry.first * unit });
+    }
+
+    // Solve these constraints and calculate the vertical control point adjustment
+    int leftShift = 0;
+    int rightShift = 0;
+    std::tie(leftShift, rightShift) = this->SolveControlPointConstraints(constraints);
+    bezierCurve.SetLeftControlHeight(bezierCurve.GetLeftControlHeight() + leftShift);
+    bezierCurve.SetRightControlHeight(bezierCurve.GetRightControlHeight() + rightShift);
+    bezierCurve.UpdateControlPoints();
+    m_currentCurve->UpdatePoints(bezierCurve);
+
+    // Prevent awkward slur shapes
+    this->AdjustSlurShape(bezierCurve, m_currentCurve->GetDir(), unit);
+    m_currentCurve->UpdatePoints(bezierCurve);
+
+    // Since we are going to redraw it, reset its bounding box
+    m_currentCurve->ResetBoundingBox();
+}
+
+bool AdjustSlursFunctor::AllowControlOffsetAdjustment(const BezierCurve &bezierCurve, double symmetry, int unit) const
+{
+    const double distance = BoundingBox::CalcDistance(bezierCurve.p1, bezierCurve.p2);
+
+    return (distance > symmetry * 40 * unit);
+}
+
+std::tuple<bool, int, int> AdjustSlursFunctor::CalcControlPointOffset(const BezierCurve &bezierCurve, int margin) const
+{
+    if (bezierCurve.p1.x >= bezierCurve.p2.x) return { false, 0, 0 };
+
+    // Initially we start with the slopes of the lines P1-C1 and P2-C2
+    double leftSlopeMax = std::abs(BoundingBox::CalcSlope(bezierCurve.p1, bezierCurve.c1));
+    double rightSlopeMax = std::abs(BoundingBox::CalcSlope(bezierCurve.p2, bezierCurve.c2));
+    const ArrayOfCurveSpannedElements *spannedElements = m_currentCurve->GetSpannedElements();
+    for (CurveSpannedElement *spannedElement : *spannedElements) {
+
+        if (spannedElement->m_discarded) {
+            continue;
+        }
+
+        const int bbY = spannedElement->m_isBelow ? spannedElement->m_boundingBox->GetSelfTop()
+                                                  : spannedElement->m_boundingBox->GetSelfBottom();
+        const Point pLeft = { spannedElement->m_boundingBox->GetSelfLeft(), bbY };
+        const Point pRight = { spannedElement->m_boundingBox->GetSelfRight(), bbY };
+
+        // Prefer the (increased) slope of P1-B1, if larger
+        // B1 is the upper left bounding box corner of a colliding obstacle
+        if ((pLeft.x > bezierCurve.p1.x + margin) && (bezierCurve.IsLeftControlAbove() == spannedElement->m_isBelow)) {
+            const double slope = BoundingBox::CalcSlope(bezierCurve.p1, pLeft);
+            if ((slope > 0.0) && bezierCurve.IsLeftControlAbove()) {
+                const double adjustedSlope = this->RotateSlope(slope, 10.0, 2.5, true);
+                leftSlopeMax = std::max(leftSlopeMax, adjustedSlope);
+            }
+            if ((slope < 0.0) && !bezierCurve.IsLeftControlAbove()) {
+                const double adjustedSlope = this->RotateSlope(-slope, 10.0, 2.5, true);
+                leftSlopeMax = std::max(leftSlopeMax, adjustedSlope);
+            }
+        }
+
+        // Prefer the (increased) slope of P2-B2, if larger
+        // B2 is the upper right bounding box corner of a colliding obstacle
+        if ((pRight.x < bezierCurve.p2.x - margin)
+            && (bezierCurve.IsRightControlAbove() == spannedElement->m_isBelow)) {
+            const double slope = BoundingBox::CalcSlope(bezierCurve.p2, pRight);
+            if ((slope < 0.0) && bezierCurve.IsRightControlAbove()) {
+                const double adjustedSlope = this->RotateSlope(-slope, 10.0, 2.5, true);
+                rightSlopeMax = std::max(rightSlopeMax, adjustedSlope);
+            }
+            if ((slope > 0.0) && !bezierCurve.IsRightControlAbove()) {
+                const double adjustedSlope = this->RotateSlope(slope, 10.0, 2.5, true);
+                rightSlopeMax = std::max(rightSlopeMax, adjustedSlope);
+            }
+        }
+    }
+
+    if ((leftSlopeMax == 0.0) || (rightSlopeMax == 0.0)) return { false, 0, 0 };
+
+    // Calculate offset from extremal slope, but use 1/20 of horizontal distance as minimum
+    const int minOffset = (bezierCurve.p2.x - bezierCurve.p1.x) / 20;
+    int leftOffset = minOffset;
+    if (bezierCurve.GetLeftControlOffset() > 0) {
+        leftOffset = std::max<int>(leftOffset, std::abs(bezierCurve.GetLeftControlHeight()) / leftSlopeMax);
+    }
+    int rightOffset = minOffset;
+    if (bezierCurve.GetRightControlOffset() > 0) {
+        rightOffset = std::max<int>(rightOffset, std::abs(bezierCurve.GetRightControlHeight()) / rightSlopeMax);
+    }
+
+    return { true, leftOffset, rightOffset };
+}
+
+ControlPointAdjustment AdjustSlursFunctor::CalcControlPointVerticalShift(
+    const BezierCurve &bezierCurve, double symmetry, int margin) const
+{
+    ControlPointAdjustment adjustment{ 0, 0, false, 0 };
+    if (bezierCurve.p1.x >= bezierCurve.p2.x) return adjustment;
+
+    std::list<ControlPointConstraint> aboveConstraints;
+    std::list<ControlPointConstraint> belowConstraints;
+    int maxIntersectionAbove = 0;
+    int maxIntersectionBelow = 0;
+
+    const int dist = bezierCurve.p2.x - bezierCurve.p1.x;
+
+    const ArrayOfCurveSpannedElements *spannedElements = m_currentCurve->GetSpannedElements();
+
+    for (CurveSpannedElement *spannedElement : *spannedElements) {
+
+        if (spannedElement->m_discarded) {
+            continue;
+        }
+
+        bool discard = false;
+        int intersectionLeft, intersectionRight;
+        std::tie(intersectionLeft, intersectionRight) = m_currentCurve->CalcDirectionalLeftRightAdjustment(
+            spannedElement->m_boundingBox, spannedElement->m_isBelow, discard, margin);
+
+        if (discard) {
+            spannedElement->m_discarded = true;
+            continue;
+        }
+
+        std::list<ControlPointConstraint> &constraints
+            = spannedElement->m_isBelow ? belowConstraints : aboveConstraints;
+        int &maxIntersection = spannedElement->m_isBelow ? maxIntersectionBelow : maxIntersectionAbove;
+
+        if ((intersectionLeft > 0) || (intersectionRight > 0)) {
+            Point points[4];
+            points[0] = bezierCurve.p1;
+            points[1] = bezierCurve.c1;
+            points[2] = bezierCurve.c2;
+            points[3] = bezierCurve.p2;
+
+            // Add constraint for the left boundary of the colliding bounding box
+            const int xLeft = std::max(bezierCurve.p1.x, spannedElement->m_boundingBox->GetSelfLeft());
+            float distanceRatio = float(xLeft - bezierCurve.p1.x) / float(dist);
+            // Ignore obstacles close to the endpoints, because this would result in very large shifts
+            if ((std::abs(0.5 - distanceRatio) < 0.45) && (intersectionLeft > 0)) {
+                const double t = BoundingBox::CalcBezierParamAtPosition(points, xLeft);
+                constraints.push_back(
+                    { 3.0 * pow(1.0 - t, 2.0) * t, 3.0 * (1.0 - t) * pow(t, 2.0), double(intersectionLeft) });
+                maxIntersection = std::max(maxIntersection, intersectionLeft);
+            }
+
+            // Add constraint for the right boundary of the colliding bounding box
+            const int xRight = std::min(bezierCurve.p2.x, spannedElement->m_boundingBox->GetSelfRight());
+            distanceRatio = float(xRight - bezierCurve.p1.x) / float(dist);
+            // Ignore obstacles close to the endpoints, because this would result in very large shifts
+            if ((std::abs(0.5 - distanceRatio) < 0.45) && (intersectionRight > 0)) {
+                const double t = BoundingBox::CalcBezierParamAtPosition(points, xRight);
+                constraints.push_back(
+                    { 3.0 * pow(1.0 - t, 2.0) * t, 3.0 * (1.0 - t) * pow(t, 2.0), double(intersectionRight) });
+                maxIntersection = std::max(maxIntersection, intersectionRight);
+            }
+        }
+    }
+
+    // Solve the constraints and calculate the adjustment
+    if (maxIntersectionAbove > maxIntersectionBelow) {
+        std::tie(adjustment.leftShift, adjustment.rightShift)
+            = this->SolveControlPointConstraints(aboveConstraints, symmetry);
+        adjustment.moveUpwards = false;
+    }
+    else {
+        std::tie(adjustment.leftShift, adjustment.rightShift)
+            = this->SolveControlPointConstraints(belowConstraints, symmetry);
+        adjustment.moveUpwards = true;
+    }
+
+    // Determine the requested staff space
+    if (bezierCurve.IsLeftControlAbove() && !bezierCurve.IsRightControlAbove()) {
+        adjustment.requestedStaffSpace = std::max(bezierCurve.p1.y - bezierCurve.p2.y + 6 * margin, 0);
+    }
+    else if (!bezierCurve.IsLeftControlAbove() && bezierCurve.IsRightControlAbove()) {
+        adjustment.requestedStaffSpace = std::max(bezierCurve.p2.y - bezierCurve.p1.y + 6 * margin, 0);
+    }
+    if ((maxIntersectionAbove > 0) && (maxIntersectionBelow > 0)) {
+        adjustment.requestedStaffSpace
+            = std::max(adjustment.requestedStaffSpace, maxIntersectionAbove + maxIntersectionBelow);
+    }
+
+    return adjustment;
+}
+
+std::pair<int, int> AdjustSlursFunctor::SolveControlPointConstraints(
+    const std::list<ControlPointConstraint> &constraints, double symmetry) const
+{
+    if (constraints.empty()) return { 0, 0 };
+
+    // Each constraint corresponds to a halfplane in the upper right quadrant.
+    // We consider the line through the origin orthogonal to the halfplane's boundary
+    // and average the slopes of these orthogonal lines.
+    double weightSum = 0.0;
+    double weightedAngleSum = 0.0;
+    for (const ControlPointConstraint &constraint : constraints) {
+        // Use the distance of the halfplane's boundary to the origin as weight
+        const double weight = constraint.c / std::hypot(constraint.a, constraint.b);
+        weightedAngleSum += weight * atan(constraint.b / constraint.a);
+        weightSum += weight;
+    }
+    // Depending on symmetry we want the angle to be near PI/4
+    double angle = weightedAngleSum / weightSum;
+    angle = std::max(symmetry * M_PI / 4.0, angle);
+    angle = std::min((2.0 - symmetry) * M_PI / 4.0, angle);
+    const double slope = tan(angle);
+
+    // Now follow the line with the averaged slope until we have hit all halfplanes.
+    // For each constraint we must solve: slope * x = c/b - a/b * x
+    double xMax = 0.0;
+    for (const ControlPointConstraint &constraint : constraints) {
+        const double x = constraint.c / (constraint.a + slope * constraint.b);
+        xMax = std::max(xMax, x);
+    }
+
+    // The point which hits the last halfplane is the desired solution.
+    return { xMax, slope * xMax };
+}
+
+void AdjustSlursFunctor::AdjustSlurShape(BezierCurve &bezierCurve, curvature_CURVEDIR dir, int unit) const
+{
+    if (bezierCurve.p1.x >= bezierCurve.p2.x) return;
+
+    // Normalize the slur via rotation (such that p1-p2 is horizontal)
+    const float angle = atan2(bezierCurve.p2.y - bezierCurve.p1.y, bezierCurve.p2.x - bezierCurve.p1.x);
+    bezierCurve.Rotate(-angle, bezierCurve.p1);
+    bezierCurve.UpdateControlPointParams();
+
+    // *** STEP 1: Ensure MINIMAL HEIGHT ***
+    // <)C1P1P2 should be at least 30 degrees, but allow smaller angles if the midpoint would be lifted more than 6 MEI
+    // units
+    // Similar for <)P1P2C2
+    const int sign = (dir == curvature_CURVEDIR_above) ? 1 : -1;
+    const Point shiftedMidpoint(
+        (bezierCurve.p1.x + bezierCurve.p2.x) / 2, (bezierCurve.p1.y + bezierCurve.p2.y) / 2 + sign * 6 * unit);
+    const float minAngle = this->GetMinControlPointAngle(bezierCurve, angle / M_PI * 180.0, unit);
+    const bool ignoreLeft = (bezierCurve.c1.x <= bezierCurve.p1.x);
+    const bool ignoreRight = (bezierCurve.c2.x >= bezierCurve.p2.x);
+    double slopeLeft = BoundingBox::CalcSlope(bezierCurve.p1, bezierCurve.c1);
+    double slopeRight = BoundingBox::CalcSlope(bezierCurve.p2, bezierCurve.c2);
+    const double slopeBase = BoundingBox::CalcSlope(bezierCurve.p1, bezierCurve.p2);
+
+    if (dir == curvature_CURVEDIR_above) {
+        double minSlopeLeft = this->RotateSlope(slopeBase, minAngle, 1.0, true);
+        minSlopeLeft = std::min(minSlopeLeft, BoundingBox::CalcSlope(bezierCurve.p1, shiftedMidpoint));
+        slopeLeft = std::max(slopeLeft, minSlopeLeft);
+        double minSlopeRight = this->RotateSlope(slopeBase, minAngle, 1.0, false);
+        minSlopeRight = std::max(minSlopeRight, BoundingBox::CalcSlope(bezierCurve.p2, shiftedMidpoint));
+        slopeRight = std::min(slopeRight, minSlopeRight);
+    }
+    else if (dir == curvature_CURVEDIR_below) {
+        double minSlopeLeft = this->RotateSlope(slopeBase, minAngle, 1.0, false);
+        minSlopeLeft = std::max(minSlopeLeft, BoundingBox::CalcSlope(bezierCurve.p1, shiftedMidpoint));
+        slopeLeft = std::min(slopeLeft, minSlopeLeft);
+        double minSlopeRight = this->RotateSlope(slopeBase, minAngle, 1.0, true);
+        minSlopeRight = std::min(minSlopeRight, BoundingBox::CalcSlope(bezierCurve.p2, shiftedMidpoint));
+        slopeRight = std::max(slopeRight, minSlopeRight);
+    }
+
+    // Update control points
+    if (!ignoreLeft) bezierCurve.SetLeftControlHeight(slopeLeft * sign * bezierCurve.GetLeftControlOffset());
+    if (!ignoreRight) bezierCurve.SetRightControlHeight(slopeRight * -sign * bezierCurve.GetRightControlOffset());
+    bezierCurve.UpdateControlPoints();
+
+    // *** STEP 2: Ensure CONVEXITY ***
+    // <)C1P1C2 and <)C1P2C2 should be at least 3 degrees
+    if (dir == curvature_CURVEDIR_above) {
+        const double minSlopeLeft
+            = this->RotateSlope(BoundingBox::CalcSlope(bezierCurve.p1, bezierCurve.c2), 3.0, 10.0, true);
+        slopeLeft = std::max(slopeLeft, minSlopeLeft);
+        const double minSlopeRight
+            = this->RotateSlope(BoundingBox::CalcSlope(bezierCurve.p2, bezierCurve.c1), 3.0, 10.0, false);
+        slopeRight = std::min(slopeRight, minSlopeRight);
+    }
+    else if (dir == curvature_CURVEDIR_below) {
+        const double minSlopeLeft
+            = this->RotateSlope(BoundingBox::CalcSlope(bezierCurve.p1, bezierCurve.c2), 3.0, 10.0, false);
+        slopeLeft = std::min(slopeLeft, minSlopeLeft);
+        const double minSlopeRight
+            = this->RotateSlope(BoundingBox::CalcSlope(bezierCurve.p2, bezierCurve.c1), 3.0, 10.0, true);
+        slopeRight = std::max(slopeRight, minSlopeRight);
+    }
+
+    // Update control points
+    if (!ignoreLeft) bezierCurve.SetLeftControlHeight(slopeLeft * sign * bezierCurve.GetLeftControlOffset());
+    if (!ignoreRight) bezierCurve.SetRightControlHeight(slopeRight * -sign * bezierCurve.GetRightControlOffset());
+    bezierCurve.UpdateControlPoints();
+
+    // Rotate back
+    bezierCurve.Rotate(angle, bezierCurve.p1);
+
+    // Enforce p1.x <= c1.x <= c2.x <= p2.x
+    bezierCurve.c1.x = std::max(bezierCurve.p1.x, bezierCurve.c1.x);
+    bezierCurve.c2.x = std::max(bezierCurve.c1.x, bezierCurve.c2.x);
+    bezierCurve.c2.x = std::min(bezierCurve.p2.x, bezierCurve.c2.x);
+    bezierCurve.c1.x = std::min(bezierCurve.c2.x, bezierCurve.c1.x);
+
+    bezierCurve.UpdateControlPointParams();
+}
+
+ControlPointAdjustment AdjustSlursFunctor::CalcControlPointShift(const BezierCurve &bezierCurve,
+    const ArrayOfFloatingCurvePositioners &innerCurves, double symmetry, int margin) const
+{
+    ControlPointAdjustment adjustment{ 0, 0, false, 0 };
+    if (bezierCurve.p1.x >= bezierCurve.p2.x) return adjustment;
+
+    const int dist = bezierCurve.p2.x - bezierCurve.p1.x;
+    const bool isBelow = (m_currentCurve->GetDir() == curvature_CURVEDIR_above);
+    const int sign = isBelow ? 1 : -1;
+    Point points[4];
+    points[0] = bezierCurve.p1;
+    points[1] = bezierCurve.c1;
+    points[2] = bezierCurve.c2;
+    points[3] = bezierCurve.p2;
+
+    std::list<ControlPointConstraint> constraints;
+    for (FloatingCurvePositioner *innerCurve : innerCurves) {
+        Point innerPoints[4];
+        innerCurve->GetPoints(innerPoints);
+
+        // Create five constraints for each inner slur
+        for (int step = 0; step <= 4; ++step) {
+            const Point innerPoint = BoundingBox::CalcPointAtBezier(innerPoints, 0.25 * step);
+            if ((bezierCurve.p1.x <= innerPoint.x) && (innerPoint.x <= bezierCurve.p2.x)) {
+                const int y = BoundingBox::CalcBezierAtPosition(points, innerPoint.x);
+                const int intersection = (innerPoint.y - y) * sign + margin;
+                const float distanceRatio = float(innerPoint.x - bezierCurve.p1.x) / float(dist);
+
+                // Ignore obstacles close to the endpoints, because this would result in very large shifts
+                if ((std::abs(0.5 - distanceRatio) < 0.45) && (intersection > 0)) {
+                    const double t = BoundingBox::CalcBezierParamAtPosition(points, innerPoint.x);
+                    constraints.push_back(
+                        { 3.0 * pow(1.0 - t, 2.0) * t, 3.0 * (1.0 - t) * pow(t, 2.0), double(intersection) });
+                }
+            }
+        }
+    }
+
+    // Solve the constraints and calculate the adjustment
+    std::tie(adjustment.leftShift, adjustment.rightShift) = this->SolveControlPointConstraints(constraints, symmetry);
+
+    return adjustment;
+}
+
+std::pair<int, int> AdjustSlursFunctor::CalcEndPointShift(const BezierCurve &bezierCurve,
+    const ArrayOfFloatingCurvePositioners &innerCurves, double flexibility, int margin) const
+{
+    if (bezierCurve.p1.x >= bezierCurve.p2.x) return { 0, 0 };
+
+    int shiftLeft = 0;
+    int shiftRight = 0;
+
+    const int dist = bezierCurve.p2.x - bezierCurve.p1.x;
+    const bool isBelow = (m_currentCurve->GetDir() == curvature_CURVEDIR_above);
+    const int sign = isBelow ? 1 : -1;
+    Point points[4];
+    points[0] = bezierCurve.p1;
+    points[1] = bezierCurve.c1;
+    points[2] = bezierCurve.c2;
+    points[3] = bezierCurve.p2;
+
+    for (FloatingCurvePositioner *innerCurve : innerCurves) {
+        Point innerPoints[4];
+        innerCurve->GetPoints(innerPoints);
+
+        // Adjustment for start point of inner slur
+        const int xInnerStart = innerPoints[0].x;
+        if ((bezierCurve.p1.x <= xInnerStart) && (xInnerStart <= bezierCurve.p2.x)) {
+            const int yStart = BoundingBox::CalcBezierAtPosition(points, xInnerStart);
+            const int intersectionStart = (innerPoints[0].y - yStart) * sign + 1.5 * margin;
+            if (intersectionStart > 0) {
+                const float distanceRatioStart = float(xInnerStart - bezierCurve.p1.x) / float(dist);
+                this->ShiftEndPoints(shiftLeft, shiftRight, distanceRatioStart, intersectionStart, flexibility, isBelow,
+                    m_currentCurve->m_spanningType);
+            }
+        }
+
+        // Adjustment for midpoint of inner slur
+        const Point innerMidPoint = BoundingBox::CalcPointAtBezier(innerPoints, 0.5);
+        if ((bezierCurve.p1.x <= innerMidPoint.x) && (innerMidPoint.x <= bezierCurve.p2.x)) {
+            const int yMid = BoundingBox::CalcBezierAtPosition(points, innerMidPoint.x);
+            const int intersectionMid = (innerMidPoint.y - yMid) * sign + 1.5 * margin;
+            if (intersectionMid > 0) {
+                const float distanceRatioMid = float(innerMidPoint.x - bezierCurve.p1.x) / float(dist);
+                this->ShiftEndPoints(shiftLeft, shiftRight, distanceRatioMid, intersectionMid, flexibility, isBelow,
+                    m_currentCurve->m_spanningType);
+            }
+        }
+
+        // Adjustment for end point of inner slur
+        const int xInnerEnd = innerPoints[3].x;
+        if ((bezierCurve.p1.x <= xInnerEnd) && (xInnerEnd <= bezierCurve.p2.x)) {
+            const int yEnd = BoundingBox::CalcBezierAtPosition(points, xInnerEnd);
+            const int intersectionEnd = (innerPoints[3].y - yEnd) * sign + 1.5 * margin;
+            if (intersectionEnd > 0) {
+                const float distanceRatioEnd = float(xInnerEnd - bezierCurve.p1.x) / float(dist);
+                this->ShiftEndPoints(shiftLeft, shiftRight, distanceRatioEnd, intersectionEnd, flexibility, isBelow,
+                    m_currentCurve->m_spanningType);
+            }
+        }
+    }
+
+    return { shiftLeft, shiftRight };
+}
+
+void AdjustSlursFunctor::ShiftEndPoints(int &shiftLeft, int &shiftRight, double ratio, int intersection,
+    double flexibility, bool isBelow, char spanningType) const
+{
+    // Filter collisions near the endpoints
+    // Collisions with ratio beyond the partialShiftRadius do not contribute to shifts
+    // They are compensated later by shifting the control points
+    double fullShiftRadius = 0.0;
+    double partialShiftRadius = 0.0;
+    std::tie(fullShiftRadius, partialShiftRadius) = this->CalcShiftRadii(true, flexibility, spanningType);
+
+    if ((ratio < partialShiftRadius) && (m_currentSlur->HasEndpointAboveStart() == isBelow)) {
+        if (ratio > fullShiftRadius) {
+            // Collisions here only partially contribute to shifts
+            // We multiply with a function that interpolates between 1 and 0
+            intersection *= this->CalcQuadraticInterpolation(partialShiftRadius, fullShiftRadius, ratio);
+        }
+        shiftLeft = std::max(shiftLeft, intersection);
+    }
+
+    std::tie(fullShiftRadius, partialShiftRadius) = this->CalcShiftRadii(false, flexibility, spanningType);
+
+    if ((ratio > 1.0 - partialShiftRadius) && (m_currentSlur->HasEndpointAboveEnd() == isBelow)) {
+        if (ratio < 1.0 - fullShiftRadius) {
+            // Collisions here only partially contribute to shifts
+            // We multiply with a function that interpolates between 0 and 1
+            intersection *= this->CalcQuadraticInterpolation(1.0 - partialShiftRadius, 1.0 - fullShiftRadius, ratio);
+        }
+        shiftRight = std::max(shiftRight, intersection);
+    }
+}
+
+std::pair<double, double> AdjustSlursFunctor::CalcShiftRadii(
+    bool forShiftLeft, double flexibility, char spanningType) const
+{
+    // Use full flexibility for broken slur endpoints
+    if (forShiftLeft) {
+        if ((spanningType == SPANNING_MIDDLE) || (spanningType == SPANNING_END)) {
+            flexibility = 1.0;
+        }
+    }
+    else {
+        if ((spanningType == SPANNING_START) || (spanningType == SPANNING_MIDDLE)) {
+            flexibility = 1.0;
+        }
+    }
+
+    const double fullShiftRadius = 0.05 + flexibility * 0.15;
+    const double partialShiftRadius = fullShiftRadius * 3.0;
+
+    return { fullShiftRadius, partialShiftRadius };
+}
+
+double AdjustSlursFunctor::CalcQuadraticInterpolation(double zeroAt, double oneAt, double arg) const
+{
+    assert(zeroAt != oneAt);
+    const double a = 1.0 / (oneAt - zeroAt);
+    const double b = zeroAt / (zeroAt - oneAt);
+    return pow(a * arg + b, 2.0);
+}
+
+double AdjustSlursFunctor::RotateSlope(double slope, double degrees, double doublingBound, bool upwards) const
+{
+    assert(degrees >= 0.0);
+    assert(doublingBound >= 0.0);
+
+    if (upwards && (slope >= doublingBound)) return slope * 2.0;
+    if (!upwards && (slope <= -doublingBound)) return slope * 2.0;
+    const int sign = upwards ? 1 : -1;
+    return tan(atan(slope) + sign * M_PI * degrees / 180.0);
+}
+
+float AdjustSlursFunctor::GetMinControlPointAngle(const BezierCurve &bezierCurve, float angle, int unit) const
+{
+    angle = abs(angle);
+    const double distance = double(bezierCurve.p2.x - bezierCurve.p1.x) / unit;
+
+    // Increase min angle for short and angled slurs
+    double angleIncrement = std::min(angle / 4.0, 15.0); // values in [0.0, 15.0]
+    double factor = 1.0 - (distance - 8.0) / 8.0;
+    factor = std::min(factor, 1.0);
+    factor = std::max(factor, 0.0); // values in [0.0, 1.0]
+
+    // not if control points are horizontally in a degenerated position
+    if ((bezierCurve.c1.x < bezierCurve.p1.x) || (2.0 * bezierCurve.c1.x > bezierCurve.p1.x + bezierCurve.p2.x)) {
+        angleIncrement = 0.0;
+    }
+    if ((bezierCurve.c2.x > bezierCurve.p2.x) || (2.0 * bezierCurve.c2.x < bezierCurve.p1.x + bezierCurve.p2.x)) {
+        angleIncrement = 0.0;
+    }
+
+    return 30.0 + angleIncrement * factor;
+}
+
 } // namespace vrv
diff --git a/src/adjustsylspacingfunctor.cpp b/src/adjustsylspacingfunctor.cpp
index e95d258b1cd..b9d1f65d5b9 100644
--- a/src/adjustsylspacingfunctor.cpp
+++ b/src/adjustsylspacingfunctor.cpp
@@ -10,6 +10,7 @@
 //----------------------------------------------------------------------------
 
 #include "doc.h"
+#include "label.h"
 #include "labelabbr.h"
 #include "staff.h"
 #include "syl.h"
@@ -168,6 +169,12 @@ FunctorCode AdjustSylSpacingFunctor::VisitVerse(Verse *verse)
     int overlap = m_lastSyl->GetContentRight() - (firstSyl->GetContentLeft() + xShift);
     overlap += m_lastSyl->CalcConnectorSpacing(m_doc, m_staffSize);
 
+    // Check that we also include the space for the label if the verse has a new label
+    Label *label = vrv_cast<Label *>(verse->FindDescendantByType(LABEL));
+    if (label) {
+        overlap += (label->GetContentX2() - label->GetContentX1()) + m_doc->GetDrawingDoubleUnit(m_staffSize);
+    }
+
     int nextFreeSpace = m_previousVerse->AdjustPosition(overlap, m_freeSpace, m_doc);
 
     if (overlap > 0) {
diff --git a/src/adjustxposfunctor.cpp b/src/adjustxposfunctor.cpp
index f0f9d254a86..5436c605497 100644
--- a/src/adjustxposfunctor.cpp
+++ b/src/adjustxposfunctor.cpp
@@ -12,6 +12,7 @@
 #include "doc.h"
 #include "multirest.h"
 #include "rest.h"
+#include "score.h"
 #include "staff.h"
 #include "system.h"
 
@@ -215,7 +216,7 @@ FunctorCode AdjustXPosFunctor::VisitMeasure(Measure *measure)
     const bool hasSystemStartLine = measure->IsFirstInSystem() && system->GetDrawingScoreDef()->HasSystemStartLine();
 
     Filters filters;
-    this->PushFilters(&filters);
+    Filters *previousFilters = this->SetFilters(&filters);
 
     for (auto staffN : m_staffNs) {
         m_minPos = 0;
@@ -247,7 +248,7 @@ FunctorCode AdjustXPosFunctor::VisitMeasure(Measure *measure)
         measure->m_measureAligner.Process(*this);
     }
 
-    this->PopFilters();
+    this->SetFilters(previousFilters);
 
     int minMeasureWidth = m_doc->GetOptions()->m_unit.GetValue() * m_doc->GetOptions()->m_measureMinWidth.GetValue();
     // First try to see if we have a double measure length element
@@ -298,7 +299,7 @@ FunctorCode AdjustXPosFunctor::VisitMeasure(Measure *measure)
 
 FunctorCode AdjustXPosFunctor::VisitScore(Score *score)
 {
-    m_staffNs = m_doc->GetCurrentScoreDef()->GetStaffNs();
+    m_staffNs = score->GetScoreDef()->GetStaffNs();
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/alignfunctor.cpp b/src/alignfunctor.cpp
index 67a1ac84bd7..8a1e1b35e51 100644
--- a/src/alignfunctor.cpp
+++ b/src/alignfunctor.cpp
@@ -160,7 +160,7 @@ FunctorCode AlignHorizontallyFunctor::VisitLayerElement(LayerElement *layerEleme
         // Ligature notes are all aligned with the first note
         Note *note = vrv_cast<Note *>(layerElement);
         assert(note);
-        Note *firstNote = dynamic_cast<Note *>(ligatureParent->GetListFront(ligatureParent));
+        Note *firstNote = dynamic_cast<Note *>(ligatureParent->GetListFront());
         if (firstNote && (firstNote != note)) {
             Alignment *alignment = firstNote->GetAlignment();
             layerElement->SetAlignment(alignment);
@@ -264,12 +264,11 @@ FunctorCode AlignHorizontallyFunctor::VisitLayerElement(LayerElement *layerEleme
     }
     else if (layerElement->Is(SYL)) {
         Staff *staff = layerElement->GetAncestorStaff();
-        if (staff->m_drawingNotationType == NOTATIONTYPE_neume) {
+        Note *note = vrv_cast<Note *>(layerElement->GetFirstAncestor(NOTE));
+        if (!note || (staff->m_drawingNotationType == NOTATIONTYPE_neume)) {
             type = ALIGNMENT_DEFAULT;
         }
         else {
-            Note *note = vrv_cast<Note *>(layerElement->GetFirstAncestor(NOTE));
-            assert(note);
             layerElement->SetAlignment(note->GetAlignment());
         }
     }
@@ -643,6 +642,12 @@ FunctorCode AlignVerticallyFunctor::VisitSystemEnd(System *system)
     m_cumulatedShift = 0;
     m_staffIdx = 0;
 
+    // StaffAlignment are added following the staff element in the measures
+    // We can now reorder them according to the scoreDef order
+    if (system->GetDrawingScoreDef()) {
+        system->m_systemAligner.ReorderBy(system->GetDrawingScoreDef()->GetStaffNs());
+    }
+
     system->m_systemAligner.Process(*this);
 
     return FUNCTOR_SIBLINGS;
diff --git a/src/arpeg.cpp b/src/arpeg.cpp
index c78661ce20b..09863c30f09 100644
--- a/src/arpeg.cpp
+++ b/src/arpeg.cpp
@@ -130,7 +130,7 @@ std::set<const Note *> Arpeg::GetNotes() const
         }
         else if (object->Is(CHORD)) {
             const Chord *chord = vrv_cast<const Chord *>(object);
-            const ListOfConstObjects &childList = chord->GetList(chord);
+            const ListOfConstObjects &childList = chord->GetList();
             for (const Object *child : childList) {
                 const Note *note = vrv_cast<const Note *>(child);
                 assert(note);
diff --git a/src/bboxdevicecontext.cpp b/src/bboxdevicecontext.cpp
index 3ce136e037b..6a772723229 100644
--- a/src/bboxdevicecontext.cpp
+++ b/src/bboxdevicecontext.cpp
@@ -48,7 +48,7 @@ BBoxDeviceContext::BBoxDeviceContext(View *view, int width, int height, unsigned
 BBoxDeviceContext::~BBoxDeviceContext() {}
 
 void BBoxDeviceContext::StartGraphic(
-    Object *object, std::string gClass, std::string gId, GraphicID graphicID, bool prepend)
+    Object *object, const std::string &gClass, const std::string &gId, GraphicID graphicID, bool prepend)
 {
     // add the object object
     object->BoundingBox::ResetBoundingBox();
diff --git a/src/beam.cpp b/src/beam.cpp
index 49aa00c6170..335d7c536fb 100644
--- a/src/beam.cpp
+++ b/src/beam.cpp
@@ -71,7 +71,7 @@ void BeamSegment::Reset()
 
 const ArrayOfBeamElementCoords *BeamSegment::GetElementCoordRefs()
 {
-    // this->GetList(this);
+    // this->GetList();
     return &m_beamElementCoordRefs;
 }
 
@@ -1108,7 +1108,7 @@ void BeamSegment::CalcAdjustPosition(const Staff *staff, const Doc *doc, const B
         }
     }
 
-    m_beamElementCoordRefs.at(0)->m_yBeam += adjust;
+    m_firstNoteOrChord->m_yBeam += adjust;
 
     this->CalcSetValues();
 }
@@ -1457,8 +1457,8 @@ void BeamSegment::CalcPartialFlagPlace()
 
 void BeamSegment::CalcSetValues()
 {
-    int startingX = m_beamElementCoordRefs.at(0)->m_x;
-    int startingY = m_beamElementCoordRefs.at(0)->m_yBeam;
+    const int startingX = m_firstNoteOrChord->m_x;
+    const int startingY = m_firstNoteOrChord->m_yBeam;
 
     for (BeamElementCoord *coord : m_beamElementCoordRefs) {
         coord->m_yBeam = startingY + m_beamSlope * (coord->m_x - startingX);
@@ -1715,11 +1715,6 @@ void Beam::FilterList(ListOfConstObjects &childList) const
                     continue;
                 }
             }
-            // and spaces
-            else if (element->Is(SPACE)) {
-                iter = childList.erase(iter);
-                continue;
-            }
             ++iter;
         }
     }
@@ -1727,7 +1722,7 @@ void Beam::FilterList(ListOfConstObjects &childList) const
 
 const ArrayOfBeamElementCoords *Beam::GetElementCoords()
 {
-    this->GetList(this);
+    this->GetList();
     return &m_beamElementCoords;
 }
 
diff --git a/src/boundingbox.cpp b/src/boundingbox.cpp
index 3949d414565..30f42615d8d 100644
--- a/src/boundingbox.cpp
+++ b/src/boundingbox.cpp
@@ -778,7 +778,8 @@ int BoundingBox::Intersects(const FloatingCurvePositioner *curve, Accessor type,
     return 0;
 }
 
-int BoundingBox::Intersects(const BeamDrawingInterface *beamInterface, Accessor type, const int margin) const
+int BoundingBox::Intersects(
+    const BeamDrawingInterface *beamInterface, Accessor type, int margin, bool fromBeamContentSide) const
 {
     assert(beamInterface);
     assert(beamInterface->HasCoords());
@@ -834,12 +835,15 @@ int BoundingBox::Intersects(const BeamDrawingInterface *beamInterface, Accessor
     }
 
     // calculate vertical overlap of the BB with beam section
-    if (beamInterface->m_drawingPlace == BEAMPLACE_above) {
+    const bool beamAbove = (beamInterface->m_drawingPlace == BEAMPLACE_above);
+    const bool beamBelow = (beamInterface->m_drawingPlace == BEAMPLACE_below);
+
+    if ((beamAbove && !fromBeamContentSide) || (beamBelow && fromBeamContentSide)) {
         const int topY = std::max(leftIntersection.y, rightIntersection.y);
         const int shift = topY - this->GetBottomBy(type) + margin;
         return std::max(shift, 0);
     }
-    else if (beamInterface->m_drawingPlace == BEAMPLACE_below) {
+    else if ((beamBelow && !fromBeamContentSide) || (beamAbove && fromBeamContentSide)) {
         const int bottomY = std::min(leftIntersection.y, rightIntersection.y);
         const int shift = bottomY - this->GetTopBy(type) - margin;
         return std::min(shift, 0);
diff --git a/src/btrem.cpp b/src/btrem.cpp
index 3fbf9e3db69..f26464cc33c 100644
--- a/src/btrem.cpp
+++ b/src/btrem.cpp
@@ -31,11 +31,11 @@ namespace vrv {
 
 static const ClassRegistrar<BTrem> s_factory("btrem", BTREM);
 
-BTrem::BTrem() : LayerElement(BTREM, "btrem-"), AttBTremLog(), AttNumbered(), AttNumberPlacement(), AttTremMeasured()
+BTrem::BTrem() : LayerElement(BTREM, "btrem-"), AttNumbered(), AttNumberPlacement(), AttTremForm(), AttTremMeasured()
 {
-    this->RegisterAttClass(ATT_BTREMLOG);
     this->RegisterAttClass(ATT_NUMBERED);
     this->RegisterAttClass(ATT_NUMBERPLACEMENT);
+    this->RegisterAttClass(ATT_TREMFORM);
     this->RegisterAttClass(ATT_TREMMEASURED);
 
     this->Reset();
@@ -46,9 +46,9 @@ BTrem::~BTrem() {}
 void BTrem::Reset()
 {
     LayerElement::Reset();
-    this->ResetBTremLog();
     this->ResetNumbered();
     this->ResetNumberPlacement();
+    this->ResetTremForm();
     this->ResetTremMeasured();
 }
 
diff --git a/src/calcalignmentpitchposfunctor.cpp b/src/calcalignmentpitchposfunctor.cpp
index 01d92472f2f..697ea7bf548 100644
--- a/src/calcalignmentpitchposfunctor.cpp
+++ b/src/calcalignmentpitchposfunctor.cpp
@@ -15,6 +15,7 @@
 #include "mrest.h"
 #include "nc.h"
 #include "rest.h"
+#include "score.h"
 #include "staff.h"
 #include "tuning.h"
 
@@ -26,7 +27,10 @@ namespace vrv {
 // CalcAlignmentPitchPosFunctor
 //----------------------------------------------------------------------------
 
-CalcAlignmentPitchPosFunctor::CalcAlignmentPitchPosFunctor(Doc *doc) : DocFunctor(doc) {}
+CalcAlignmentPitchPosFunctor::CalcAlignmentPitchPosFunctor(Doc *doc) : DocFunctor(doc)
+{
+    m_octDefault = MEI_UNSET_OCT;
+}
 
 FunctorCode CalcAlignmentPitchPosFunctor::VisitLayerElement(LayerElement *layerElement)
 {
@@ -37,6 +41,15 @@ FunctorCode CalcAlignmentPitchPosFunctor::VisitLayerElement(LayerElement *layerE
     Layer *layerY = vrv_cast<Layer *>(layerElement->GetFirstAncestor(LAYER));
     assert(layerY);
 
+    PitchInterface *pitchInterface = layerElement->GetPitchInterface();
+    if (pitchInterface) {
+        pitchInterface->SetOctDefault(m_octDefault);
+        // Check if there is a octave default for the staff - ignore cross-staff for this and use staffY
+        if (m_octDefaultForStaffN.count(staffY->GetN()) > 0) {
+            pitchInterface->SetOctDefault(m_octDefaultForStaffN.at(staffY->GetN()));
+        }
+    }
+
     if (layerElement->m_crossStaff && layerElement->m_crossLayer) {
         layerElementY = layerElement->m_crossLayer->GetAtPos(layerElement->GetDrawingX());
         staffY = layerElement->m_crossStaff;
@@ -94,7 +107,7 @@ FunctorCode CalcAlignmentPitchPosFunctor::VisitLayerElement(LayerElement *layerE
             loc = staffY->m_drawingTuning->CalcPitchPos(
                 note->GetTabCourse(), staffY->m_drawingNotationType, staffY->m_drawingLines);
         }
-        else if ((note->HasPname() && note->HasOct()) || note->HasLoc()) {
+        else if ((note->HasPname() && (note->HasOct() || note->HasOctDefault())) || note->HasLoc()) {
             loc = PitchInterface::CalcLoc(note, layerY, layerElementY);
         }
         int yRel = staffY->CalcPitchPosYRel(m_doc, loc);
@@ -133,33 +146,38 @@ FunctorCode CalcAlignmentPitchPosFunctor::VisitLayerElement(LayerElement *layerE
         mRest->SetDrawingLoc(loc);
         mRest->SetDrawingYRel(staffY->CalcPitchPosYRel(m_doc, loc));
     }
-    else if (layerElement->Is(REST)) {
-        Rest *rest = vrv_cast<Rest *>(layerElement);
-        assert(rest);
-        int loc = 0;
-        if (rest->HasPloc() && rest->HasOloc()) {
-            loc = PitchInterface::CalcLoc(rest->GetPloc(), rest->GetOloc(), layerY->GetClefLocOffset(layerElementY));
-        }
-        else if (rest->HasLoc()) {
-            loc = rest->GetLoc();
+    else if (layerElement->Is({ REST, SPACE })) {
+        DurationInterface *durInterface = layerElement->GetDurationInterface();
+        assert(durInterface);
+        Rest *rest = NULL;
+        int loc = VRV_UNSET;
+        if (layerElement->Is(REST)) {
+            rest = vrv_cast<Rest *>(layerElement);
+            assert(rest);
+            if (rest->HasPloc() && rest->HasOloc()) {
+                loc = PitchInterface::CalcLoc(
+                    rest->GetPloc(), rest->GetOloc(), layerY->GetClefLocOffset(layerElementY));
+            }
+            else if (rest->HasLoc()) {
+                loc = rest->GetLoc();
+            }
         }
         // Automatically calculate rest position
-        else {
+        if (loc == VRV_UNSET) {
+            loc = 0;
             // set default location to the middle of the staff
-            Staff *staff = rest->GetAncestorStaff();
+            Staff *staff = layerElement->GetAncestorStaff();
             loc = staff->m_drawingLines - 1;
-            if ((rest->GetDur() < DUR_4) && (loc % 2 != 0)) --loc;
+            if ((durInterface->GetDur() < DUR_4) && (loc % 2 != 0)) --loc;
             // Adjust special cases
-            if ((rest->GetDur() == DUR_1) && (staff->m_drawingLines > 1)) loc += 2;
-            if ((rest->GetDur() == DUR_BR) && (staff->m_drawingLines < 2)) loc -= 2;
+            if ((durInterface->GetDur() == DUR_1) && (staff->m_drawingLines > 1)) loc += 2;
+            if ((durInterface->GetDur() == DUR_BR) && (staff->m_drawingLines < 2)) loc -= 2;
 
             // If within a beam, calculate the rest's height based on it's relationship to the notes that surround it
-            Beam *beam = vrv_cast<Beam *>(rest->GetFirstAncestor(BEAM, 1));
+            Beam *beam = vrv_cast<Beam *>(layerElement->GetFirstAncestor(BEAM, 1));
             if (beam) {
-                beam->ResetList(beam);
-
-                const ListOfObjects &beamList = beam->GetList(beam);
-                const int restIndex = beam->GetListIndex(rest);
+                const ListOfObjects &beamList = beam->GetList();
+                const int restIndex = beam->GetListIndex(layerElement);
                 assert(restIndex >= 0);
 
                 int leftLoc = loc;
@@ -205,6 +223,16 @@ FunctorCode CalcAlignmentPitchPosFunctor::VisitLayerElement(LayerElement *layerE
                     }
                 }
 
+                // With a rest or space at the first / last position, use the right / left loc
+                if (restIndex == 0) {
+                    leftLoc = rightLoc;
+                    loc = rightLoc;
+                }
+                else if (restIndex == (int)beamList.size() - 1) {
+                    rightLoc = leftLoc;
+                    loc = leftLoc;
+                }
+
                 // average the left note and right note's locations together to get our rest location
                 const int locAvg = (rightLoc + leftLoc) / 2;
                 if (abs(locAvg - loc) > 3) {
@@ -226,13 +254,13 @@ FunctorCode CalcAlignmentPitchPosFunctor::VisitLayerElement(LayerElement *layerE
                 int bottomAlignedLoc = loc;
                 // 8th note rests are aligned with the top of a 16th note rest, so to bottom align we have to push it
                 // down 2
-                if (rest->GetActualDur() == DURATION_8) bottomAlignedLoc -= 2;
+                if (durInterface->GetActualDur() == DURATION_8) bottomAlignedLoc -= 2;
                 // for durations smaller than 32nd, bottomAlignedLoc will need to decrease by 2 every iteration greater
                 // than from 32 so 32 will be -0, 64 is -2, 128 is -4 (currently not implemented)
 
                 // topAlignedLoc is the location where all of the top of the rests align to form a straight line
                 int topAlignedLoc = loc;
-                if (rest->GetActualDur() == DURATION_32) topAlignedLoc += 2;
+                if (durInterface->GetActualDur() == DURATION_32) topAlignedLoc += 2;
                 // for smaller durations, topAlignedLoc offset will increase by 2 every iteration greater than from 32
                 // so 32 will need to be +2, 64 is +4, 128 is +6, etc.
                 // (currently only implemented for 32nds)
@@ -266,10 +294,14 @@ FunctorCode CalcAlignmentPitchPosFunctor::VisitLayerElement(LayerElement *layerE
             }
 
             Layer *layer = vrv_cast<Layer *>(layerElement->GetFirstAncestor(LAYER));
-            loc = rest->GetOptimalLayerLocation(staff, layer, loc);
+            if (rest) {
+                loc = rest->GetOptimalLayerLocation(staff, layer, loc);
+            }
         }
-        rest->SetDrawingLoc(loc);
-        rest->SetDrawingYRel(staffY->CalcPitchPosYRel(m_doc, loc));
+        if (rest) {
+            rest->SetDrawingLoc(loc);
+        }
+        layerElement->SetDrawingYRel(staffY->CalcPitchPosYRel(m_doc, loc));
     }
     else if (layerElement->Is(TABDURSYM)) {
         int yRel = 0;
@@ -294,4 +326,31 @@ FunctorCode CalcAlignmentPitchPosFunctor::VisitLayerElement(LayerElement *layerE
     return FUNCTOR_CONTINUE;
 }
 
+FunctorCode CalcAlignmentPitchPosFunctor::VisitScore(Score *score)
+{
+    ScoreDef *scoreDef = score->GetScoreDef();
+    if (scoreDef) {
+        scoreDef->Process(*this);
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
+FunctorCode CalcAlignmentPitchPosFunctor::VisitScoreDef(ScoreDef *scoreDef)
+{
+    m_octDefaultForStaffN.clear();
+    m_octDefault = scoreDef->GetOctDefault();
+
+    return FUNCTOR_CONTINUE;
+}
+
+FunctorCode CalcAlignmentPitchPosFunctor::VisitStaffDef(StaffDef *staffDef)
+{
+    if (staffDef->HasOctDefault() && staffDef->HasN()) {
+        m_octDefaultForStaffN[staffDef->GetN()] = staffDef->GetOctDefault();
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 } // namespace vrv
diff --git a/src/calcligaturenoteposfunctor.cpp b/src/calcligaturenoteposfunctor.cpp
index 30d38baa925..52cd1b7d497 100644
--- a/src/calcligaturenoteposfunctor.cpp
+++ b/src/calcligaturenoteposfunctor.cpp
@@ -29,7 +29,7 @@ FunctorCode CalcLigatureNotePosFunctor::VisitLigature(Ligature *ligature)
 
     ligature->m_drawingShapes.clear();
 
-    const ListOfObjects &notes = ligature->GetList(ligature);
+    const ListOfObjects &notes = ligature->GetList();
     Note *lastNote = dynamic_cast<Note *>(notes.back());
     Staff *staff = ligature->GetAncestorStaff();
 
diff --git a/src/calcstemfunctor.cpp b/src/calcstemfunctor.cpp
index 1ed1d161bc1..ffc1d5dcee7 100644
--- a/src/calcstemfunctor.cpp
+++ b/src/calcstemfunctor.cpp
@@ -43,7 +43,7 @@ CalcStemFunctor::CalcStemFunctor(Doc *doc) : DocFunctor(doc)
 
 FunctorCode CalcStemFunctor::VisitBeam(Beam *beam)
 {
-    const ListOfObjects &beamChildren = beam->GetList(beam);
+    const ListOfObjects &beamChildren = beam->GetList();
 
     // Should we assert this at the beginning?
     if (beamChildren.empty()) {
@@ -58,6 +58,7 @@ FunctorCode CalcStemFunctor::VisitBeam(Beam *beam)
     if (!beam->HasCoords()) {
         beam->InitCoords(beamChildren, staff, beam->GetPlace());
         const bool isCue = ((beam->GetCue() == BOOLEAN_true) || beam->GetFirstAncestor(GRACEGRP));
+        beam->InitGraceStemDir(beam->GetFirstAncestor(GRACEGRP));
         beam->InitCue(isCue);
     }
 
@@ -173,7 +174,7 @@ FunctorCode CalcStemFunctor::VisitChord(Chord *chord)
 
 FunctorCode CalcStemFunctor::VisitFTrem(FTrem *fTrem)
 {
-    const ListOfObjects &fTremChildren = fTrem->GetList(fTrem);
+    const ListOfObjects &fTremChildren = fTrem->GetList();
 
     // Should we assert this at the beginning?
     if (fTremChildren.empty()) {
@@ -583,7 +584,7 @@ FunctorCode CalcStemFunctor::VisitTabGrp(TabGrp *tabGrp)
 
 data_STEMDIRECTION CalcStemFunctor::CalcStemDirection(const Chord *chord, int verticalCenter) const
 {
-    const ListOfConstObjects &childList = chord->GetList(chord);
+    const ListOfConstObjects &childList = chord->GetList();
     ListOfConstObjects topNotes, bottomNotes;
 
     // split notes into two vectors - notes above vertical center and below
diff --git a/src/chord.cpp b/src/chord.cpp
index f12f3228607..5fbd0c3aac5 100644
--- a/src/chord.cpp
+++ b/src/chord.cpp
@@ -132,7 +132,7 @@ void Chord::CalculateNoteGroups()
 {
     this->ClearNoteGroups();
 
-    const ListOfObjects &childList = this->GetList(this);
+    const ListOfObjects &childList = this->GetList();
     ListOfObjects::const_iterator iter = childList.begin();
 
     Note *curNote, *lastNote = vrv_cast<Note *>(*iter);
@@ -235,7 +235,7 @@ void Chord::FilterList(ListOfConstObjects &childList) const
 
 int Chord::PositionInChord(const Note *note) const
 {
-    const int size = this->GetListSize(this);
+    const int size = this->GetListSize();
     int position = this->GetListIndex(note);
     assert(position != -1);
     // this is the middle (only if odd)
@@ -247,21 +247,21 @@ int Chord::PositionInChord(const Note *note) const
 void Chord::GetYExtremes(int &yMax, int &yMin) const
 {
     // The first note is the bottom
-    yMin = this->GetListFront(this)->GetDrawingY();
+    yMin = this->GetListFront()->GetDrawingY();
     // The last note is the top
-    yMax = this->GetListBack(this)->GetDrawingY();
+    yMax = this->GetListBack()->GetDrawingY();
 }
 
 int Chord::GetYTop() const
 {
     // The last note is the top
-    return this->GetListBack(this)->GetDrawingY();
+    return this->GetListBack()->GetDrawingY();
 }
 
 int Chord::GetYBottom() const
 {
     // The first note is the bottom
-    return this->GetListFront(this)->GetDrawingY();
+    return this->GetListFront()->GetDrawingY();
 }
 
 Note *Chord::GetTopNote()
@@ -271,7 +271,7 @@ Note *Chord::GetTopNote()
 
 const Note *Chord::GetTopNote() const
 {
-    const Note *topNote = vrv_cast<const Note *>(this->GetListBack(this));
+    const Note *topNote = vrv_cast<const Note *>(this->GetListBack());
     assert(topNote);
     return topNote;
 }
@@ -284,35 +284,31 @@ Note *Chord::GetBottomNote()
 const Note *Chord::GetBottomNote() const
 {
     // The first note is the bottom
-    const Note *bottomNote = vrv_cast<const Note *>(this->GetListFront(this));
+    const Note *bottomNote = vrv_cast<const Note *>(this->GetListFront());
     assert(bottomNote);
     return bottomNote;
 }
 
 int Chord::GetXMin() const
 {
-    const ListOfConstObjects &childList = this->GetList(this); // make sure it's initialized
+    const ListOfConstObjects &childList = this->GetList(); // make sure it's initialized
     assert(childList.size() > 0);
 
     int x = -VRV_UNSET;
-    ListOfConstObjects::const_iterator iter = childList.begin();
-    while (iter != childList.end()) {
-        if ((*iter)->GetDrawingX() < x) x = (*iter)->GetDrawingX();
-        ++iter;
+    for (const Object *child : childList) {
+        x = std::min(child->GetDrawingX(), x);
     }
     return x;
 }
 
 int Chord::GetXMax() const
 {
-    const ListOfConstObjects &childList = this->GetList(this); // make sure it's initialized
+    const ListOfConstObjects &childList = this->GetList(); // make sure it's initialized
     assert(childList.size() > 0);
 
     int x = VRV_UNSET;
-    ListOfConstObjects::const_iterator iter = childList.begin();
-    while (iter != childList.end()) {
-        if ((*iter)->GetDrawingX() > x) x = (*iter)->GetDrawingX();
-        ++iter;
+    for (const Object *child : childList) {
+        x = std::max(child->GetDrawingX(), x);
     }
     return x;
 }
@@ -408,7 +404,7 @@ bool Chord::IsVisible() const
     }
 
     // if the chord doesn't have it, see if all the children are invisible
-    const ListOfConstObjects &notes = this->GetList(this);
+    const ListOfConstObjects &notes = this->GetList();
 
     for (const Object *object : notes) {
         const Note *note = vrv_cast<const Note *>(object);
@@ -440,7 +436,7 @@ bool Chord::HasAdjacentNotesInStaff(const Staff *staff) const
 
 bool Chord::HasNoteWithDots() const
 {
-    const ListOfConstObjects &notes = this->GetList(this);
+    const ListOfConstObjects &notes = this->GetList();
 
     return std::any_of(notes.cbegin(), notes.cend(), [](const Object *object) {
         const Note *note = vrv_cast<const Note *>(object);
@@ -462,11 +458,11 @@ int Chord::AdjustOverlappingLayers(const Doc *doc, const std::vector<LayerElemen
             otherElementLocations.insert(note->GetDrawingLoc());
         }
     }
-    const ListOfObjects &notes = this->GetList(this);
+    const ListOfObjects &notes = this->GetList();
     // get current chord positions
     std::set<int> chordElementLocations;
-    for (const auto iter : notes) {
-        Note *note = vrv_cast<Note *>(iter);
+    for (Object *child : notes) {
+        Note *note = vrv_cast<Note *>(child);
         assert(note);
         chordElementLocations.insert(note->GetDrawingLoc());
     }
@@ -523,7 +519,7 @@ int Chord::AdjustOverlappingLayers(const Doc *doc, const std::vector<LayerElemen
 
 std::list<const Note *> Chord::GetAdjacentNotesList(const Staff *staff, int loc) const
 {
-    const ListOfConstObjects &notes = this->GetList(this);
+    const ListOfConstObjects &notes = this->GetList();
 
     std::list<const Note *> adjacentNotes;
     for (const Object *obj : notes) {
@@ -567,7 +563,7 @@ FunctorCode Chord::AcceptEnd(ConstFunctor &functor) const
 
 MapOfNoteLocs Chord::CalcNoteLocations(NotePredicate predicate) const
 {
-    const ListOfConstObjects &notes = this->GetList(this);
+    const ListOfConstObjects &notes = this->GetList();
 
     MapOfNoteLocs noteLocations;
     for (const Object *obj : notes) {
diff --git a/src/convertfunctor.cpp b/src/convertfunctor.cpp
index 632b87e1bf6..61838252781 100644
--- a/src/convertfunctor.cpp
+++ b/src/convertfunctor.cpp
@@ -295,7 +295,7 @@ FunctorCode ConvertToCastOffMensuralFunctor::VisitMeasure(Measure *measure)
     m_targetSubSystem->AddChild(targetMeasure);
 
     Filters filters;
-    this->PushFilters(&filters);
+    Filters *previousFilters = this->SetFilters(&filters);
 
     // Now we can process by layer and move their content to (measure) segments
     for (const auto &staves : m_layerTree->child) {
@@ -312,7 +312,7 @@ FunctorCode ConvertToCastOffMensuralFunctor::VisitMeasure(Measure *measure)
         }
     }
 
-    this->PopFilters();
+    this->SetFilters(previousFilters);
 
     m_targetMeasure = NULL;
     m_targetSubSystem = NULL;
@@ -541,6 +541,9 @@ FunctorCode ConvertMarkupAnalyticalFunctor::VisitNote(Note *note)
     }
     assert(check);
 
+    Object *currentMeasure = note->GetFirstAncestor(MEASURE);
+    assert(currentMeasure);
+
     std::vector<Note *>::iterator iter = m_currentNotes.begin();
     while (iter != m_currentNotes.end()) {
         // same octave and same pitch - this is the one!
@@ -553,7 +556,14 @@ FunctorCode ConvertMarkupAnalyticalFunctor::VisitNote(Note *note)
                 }
                 tie->SetStartid("#" + (*iter)->GetID());
                 tie->SetEndid("#" + note->GetID());
-                m_controlEvents.push_back(tie);
+                // Add it to the starting measure when we are already in the next one
+                Object *startMeasure = (*iter)->GetFirstAncestor(MEASURE);
+                if (startMeasure && (startMeasure != currentMeasure)) {
+                    startMeasure->AddChild(tie);
+                }
+                else {
+                    m_controlEvents.push_back(tie);
+                }
             }
             else {
                 LogWarning("Expected @tie median or terminal in note '%s', skipping it", note->GetID().c_str());
diff --git a/src/devicecontext.cpp b/src/devicecontext.cpp
index c601d8d6e05..09a868e56ab 100644
--- a/src/devicecontext.cpp
+++ b/src/devicecontext.cpp
@@ -316,6 +316,12 @@ void DeviceContext::AddGlyphToTextExtend(const Glyph *glyph, TextExtend *extend)
     tmp = advX * m_fontStack.top()->GetPointSize();
     advX = ceil(tmp / (double)glyph->GetUnitsPerEm());
 
+    const int letterSpacing = m_fontStack.top()->GetLetterSpacing();
+    // This is not the first letter, add a letter spacing
+    if ((letterSpacing != 0) && (extend->m_width > 0)) {
+        extend->m_width += letterSpacing;
+    }
+
     // Changed because the width should only be the sum of advX
     // Alternatively we could add what is below 0 for the first and what is beyond the advx for the last
     // extend->m_width += std::max(partialWidth + x, advX);
diff --git a/src/divline.cpp b/src/divline.cpp
new file mode 100644
index 00000000000..a47a3fd71f3
--- /dev/null
+++ b/src/divline.cpp
@@ -0,0 +1,88 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        divline.cpp
+// Author:      Yinan Zhou
+// Created:     2021
+// Copyright (c) Authors and others. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+
+#include "divline.h"
+
+//----------------------------------------------------------------------------
+
+#include <assert.h>
+
+//----------------------------------------------------------------------------
+
+#include "doc.h"
+#include "horizontalaligner.h"
+#include "layer.h"
+#include "smufl.h"
+#include "staff.h"
+#include "vrv.h"
+
+namespace vrv {
+
+//----------------------------------------------------------------------------
+// DivLine
+//----------------------------------------------------------------------------
+
+DivLine::DivLine()
+    : LayerElement(DIVLINE, "dline-")
+    , AttColor()
+    , AttDivLineLog()
+    , AttExtSymAuth()
+    , AttExtSymNames()
+    , AttNNumberLike()
+    , AttVisibility()
+{
+    this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_DIVLINELOG);
+    this->RegisterAttClass(ATT_EXTSYMAUTH);
+    this->RegisterAttClass(ATT_EXTSYMNAMES);
+    this->RegisterAttClass(ATT_VISIBILITY);
+
+    this->Reset();
+}
+
+DivLine::~DivLine() {}
+
+void DivLine::Reset()
+{
+    LayerElement::Reset();
+
+    this->ResetColor();
+    this->ResetDivLineLog();
+    this->ResetExtSymAuth();
+    this->ResetExtSymNames();
+    this->ResetVisibility();
+}
+
+std::wstring DivLine::GetSymbolStr() const
+{
+    if (!this->HasForm()) return L"";
+
+    wchar_t symc = GetDivLineGlyph(this->GetForm());
+    std::wstring symbolStr;
+
+    symbolStr.push_back(symc);
+
+    return symbolStr;
+}
+
+wchar_t DivLine::GetDivLineGlyph(divLineLog_FORM divLine)
+{
+    int symc = SMUFL_E8F5_chantDivisioMaxima;
+    switch (divLine) {
+        case divLineLog_FORM_minima: symc = SMUFL_E8F3_chantDivisioMinima; break;
+        case divLineLog_FORM_maior: symc = SMUFL_E8F4_chantDivisioMaior; break;
+        case divLineLog_FORM_maxima: symc = SMUFL_E8F5_chantDivisioMaxima; break;
+        case divLineLog_FORM_finalis: symc = SMUFL_E8F6_chantDivisioFinalis; break;
+        case divLineLog_FORM_caesura: symc = SMUFL_E8F8_chantCaesura; break;
+        case divLineLog_FORM_virgula: symc = SMUFL_E8F7_chantVirgula; break;
+        default: break;
+    }
+    return symc;
+}
+DivLineAttr::~DivLineAttr() {}
+
+} // namespace vrv
diff --git a/src/doc.cpp b/src/doc.cpp
index 1da0c6a7411..e79a92b74b0 100644
--- a/src/doc.cpp
+++ b/src/doc.cpp
@@ -125,13 +125,13 @@ void Doc::Reset()
     m_drawingPageMarginTop = 0;
 
     m_drawingPage = NULL;
-    m_currentScore = NULL;
     m_currentScoreDefDone = false;
     m_dataPreparationDone = false;
     m_timemapTempo = 0.0;
     m_markup = MARKUP_DEFAULT;
     m_isMensuralMusicOnly = false;
     m_isCastOff = false;
+    m_visibleScores.clear();
 
     m_facsimile = NULL;
 
@@ -191,7 +191,8 @@ bool Doc::GenerateDocumentScoreDef()
         return false;
     }
 
-    this->GetCurrentScoreDef()->Reset();
+    ScoreDef *scoreDef = this->GetFirstScoreDef();
+    scoreDef->Reset();
     StaffGrp *staffGrp = new StaffGrp();
     for (Object *object : staves) {
         Staff *staff = vrv_cast<Staff *>(object);
@@ -202,57 +203,57 @@ bool Doc::GenerateDocumentScoreDef()
         if (!measure->IsMeasuredMusic()) staffDef->SetNotationtype(NOTATIONTYPE_mensural);
         staffGrp->AddChild(staffDef);
     }
-    this->GetCurrentScoreDef()->AddChild(staffGrp);
+    scoreDef->AddChild(staffGrp);
 
     LogInfo("ScoreDef generated");
 
     return true;
 }
 
-bool Doc::GenerateFooter()
+void Doc::GenerateFooter()
 {
-    if (this->GetCurrentScoreDef()->FindDescendantByType(PGFOOT)) {
-        return false;
-    }
-
-    PgFoot *pgFoot = new PgFoot();
-    pgFoot->SetFunc(PGFUNC_first);
-    // We mark it as generated for not having it written in the output
-    pgFoot->IsGenerated(true);
-    pgFoot->LoadFooter(this);
-    pgFoot->SetType("autogenerated");
-    this->GetCurrentScoreDef()->AddChild(pgFoot);
+    for (Score *score : this->GetVisibleScores()) {
+        ScoreDef *scoreDef = score->GetScoreDef();
+        if (scoreDef->FindDescendantByType(PGFOOT)) continue;
 
-    PgFoot *pgFoot2 = new PgFoot();
-    pgFoot2->SetFunc(PGFUNC_all);
-    pgFoot2->IsGenerated(true);
-    pgFoot2->LoadFooter(this);
-    pgFoot2->SetType("autogenerated");
-    this->GetCurrentScoreDef()->AddChild(pgFoot2);
+        PgFoot *pgFoot = new PgFoot();
+        pgFoot->SetFunc(PGFUNC_first);
+        // We mark it as generated for not having it written in the output
+        pgFoot->IsGenerated(true);
+        pgFoot->LoadFooter(this);
+        pgFoot->SetType("autogenerated");
+        scoreDef->AddChild(pgFoot);
 
-    return true;
+        PgFoot *pgFoot2 = new PgFoot();
+        pgFoot2->SetFunc(PGFUNC_all);
+        pgFoot2->IsGenerated(true);
+        pgFoot2->LoadFooter(this);
+        pgFoot2->SetType("autogenerated");
+        scoreDef->AddChild(pgFoot2);
+    }
 }
 
-bool Doc::GenerateHeader()
+void Doc::GenerateHeader()
 {
-    if (this->GetCurrentScoreDef()->FindDescendantByType(PGHEAD)) return false;
+    for (Score *score : this->GetVisibleScores()) {
+        ScoreDef *scoreDef = score->GetScoreDef();
+        if (scoreDef->FindDescendantByType(PGHEAD)) continue;
 
-    PgHead *pgHead = new PgHead();
-    pgHead->SetFunc(PGFUNC_first);
-    // We mark it as generated for not having it written in the output
-    pgHead->IsGenerated(true);
-    pgHead->GenerateFromMEIHeader(m_header);
-    pgHead->SetType("autogenerated");
-    this->GetCurrentScoreDef()->AddChild(pgHead);
+        PgHead *pgHead = new PgHead();
+        pgHead->SetFunc(PGFUNC_first);
+        // We mark it as generated for not having it written in the output
+        pgHead->IsGenerated(true);
+        pgHead->GenerateFromMEIHeader(m_header);
+        pgHead->SetType("autogenerated");
+        scoreDef->AddChild(pgHead);
 
-    PgHead *pgHead2 = new PgHead();
-    pgHead2->SetFunc(PGFUNC_all);
-    pgHead2->IsGenerated(true);
-    pgHead2->AddPageNum(HORIZONTALALIGNMENT_center, VERTICALALIGNMENT_top);
-    pgHead2->SetType("autogenerated");
-    this->GetCurrentScoreDef()->AddChild(pgHead2);
-
-    return true;
+        PgHead *pgHead2 = new PgHead();
+        pgHead2->SetFunc(PGFUNC_all);
+        pgHead2->IsGenerated(true);
+        pgHead2->AddPageNum(HORIZONTALALIGNMENT_center, VERTICALALIGNMENT_top);
+        pgHead2->SetType("autogenerated");
+        scoreDef->AddChild(pgHead2);
+    }
 }
 
 void Doc::PrepareMeasureIndices()
@@ -288,11 +289,31 @@ bool Doc::GenerateMeasureNumbers()
 
 void Doc::GenerateMEIHeader(bool meiBasic)
 {
+    // Try to preserve titles if we have an existing header
+    std::list<std::string> titles;
+    pugi::xpath_node_set titlesNodeSet = m_header.select_nodes("//meiHead/fileDesc/titleStmt/title/text()");
+    for (pugi::xpath_node titleXpathNode : titlesNodeSet) {
+        pugi::xml_node titleNode = titleXpathNode.node();
+        if (!titleNode) continue;
+        titles.push_back(titleNode.text().as_string());
+    }
+
     m_header.remove_children();
     pugi::xml_node meiHead = m_header.append_child("meiHead");
     pugi::xml_node fileDesc = meiHead.append_child("fileDesc");
     pugi::xml_node titleStmt = fileDesc.append_child("titleStmt");
-    titleStmt.append_child("title");
+    // Re-add preserved titles
+    if (titles.size() > 0) {
+        for (auto &title : titles) {
+            pugi::xml_node titleNode = titleStmt.append_child("title");
+            pugi::xml_node textNode = titleNode.append_child(pugi::node_pcdata);
+            textNode.text() = title.c_str();
+        }
+    }
+    // Add an empty title for validity
+    else {
+        titleStmt.append_child("title");
+    }
     pugi::xml_node pubStmt = fileDesc.append_child("pubStmt");
     pugi::xml_node date = pubStmt.append_child("date");
 
@@ -345,11 +366,12 @@ void Doc::CalculateTimemap()
     double tempo = MIDI_TEMPO;
 
     // Set tempo
-    if (this->GetCurrentScoreDef()->HasMidiBpm()) {
-        tempo = this->GetCurrentScoreDef()->GetMidiBpm();
+    ScoreDef *scoreDef = this->GetFirstVisibleScore()->GetScoreDef();
+    if (scoreDef->HasMidiBpm()) {
+        tempo = scoreDef->GetMidiBpm();
     }
-    else if (this->GetCurrentScoreDef()->HasMm()) {
-        tempo = Tempo::CalcTempo(this->GetCurrentScoreDef());
+    else if (scoreDef->HasMm()) {
+        tempo = Tempo::CalcTempo(scoreDef);
     }
 
     // We first calculate the maximum duration of each measure
@@ -364,7 +386,7 @@ void Doc::CalculateTimemap()
 
     // Adjust the duration of tied notes
     InitTimemapTiesFunctor initTimemapTies;
-    initTimemapTies.PushDirection(BACKWARD);
+    initTimemapTies.SetDirection(BACKWARD);
     this->Process(initTimemapTies);
 
     m_timemapTempo = m_options->m_midiTempoAdjustment.GetValue();
@@ -372,7 +394,6 @@ void Doc::CalculateTimemap()
 
 void Doc::ExportMIDI(smf::MidiFile *midiFile)
 {
-
     if (!this->HasTimemap()) {
         // generate MIDI timemap before progressing
         CalculateTimemap();
@@ -384,11 +405,12 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
     double tempo = MIDI_TEMPO;
 
     // set MIDI tempo
-    if (this->GetCurrentScoreDef()->HasMidiBpm()) {
-        tempo = this->GetCurrentScoreDef()->GetMidiBpm();
+    ScoreDef *scoreDef = this->GetFirstVisibleScore()->GetScoreDef();
+    if (scoreDef->HasMidiBpm()) {
+        tempo = scoreDef->GetMidiBpm();
     }
-    else if (this->GetCurrentScoreDef()->HasMm()) {
-        tempo = Tempo::CalcTempo(this->GetCurrentScoreDef());
+    else if (scoreDef->HasMm()) {
+        tempo = Tempo::CalcTempo(scoreDef);
     }
     midiFile->addTempo(0, 0, tempo);
 
@@ -417,10 +439,8 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
     int midiTrack = 1;
     Filters filters;
     for (staves = layerTree.child.begin(); staves != layerTree.child.end(); ++staves) {
-
-        ScoreDef *currentScoreDef = this->GetCurrentScoreDef();
         int transSemi = 0;
-        if (StaffDef *staffDef = currentScoreDef->GetStaffDef(staves->first)) {
+        if (StaffDef *staffDef = scoreDef->GetStaffDef(staves->first)) {
             // get the transposition (semi-tone) value for the staff
             if (staffDef->HasTransSemi()) transSemi = staffDef->GetTransSemi();
             midiTrack = staffDef->GetN();
@@ -457,21 +477,21 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
                 label = vrv_cast<Label *>(staffGrp->FindDescendantByType(LABEL, 1));
             }
             if (label) {
-                std::string trackName = UTF32to8(label->GetText(label)).c_str();
+                std::string trackName = UTF32to8(label->GetText()).c_str();
                 if (!trackName.empty()) midiFile->addTrackName(midiTrack, 0, trackName);
             }
             // set MIDI key signature
             KeySig *keySig = vrv_cast<KeySig *>(staffDef->FindDescendantByType(KEYSIG));
-            if (!keySig && (currentScoreDef->HasKeySigInfo())) {
-                keySig = vrv_cast<KeySig *>(currentScoreDef->GetKeySig());
+            if (!keySig && (scoreDef->HasKeySigInfo())) {
+                keySig = vrv_cast<KeySig *>(scoreDef->GetKeySig());
             }
             if (keySig && keySig->HasSig()) {
                 midiFile->addKeySignature(midiTrack, 0, keySig->GetFifthsInt(), (keySig->GetMode() == MODE_minor));
             }
             // set MIDI time signature
             MeterSig *meterSig = vrv_cast<MeterSig *>(staffDef->FindDescendantByType(METERSIG));
-            if (!meterSig && (currentScoreDef->HasMeterSigInfo())) {
-                meterSig = vrv_cast<MeterSig *>(currentScoreDef->GetMeterSig());
+            if (!meterSig && (scoreDef->HasMeterSigInfo())) {
+                meterSig = vrv_cast<MeterSig *>(scoreDef->GetMeterSig());
             }
             if (meterSig && meterSig->HasCount() && meterSig->HasUnit()) {
                 midiFile->addTimeSignature(midiTrack, 0, meterSig->GetTotalCount(), meterSig->GetUnit());
@@ -482,7 +502,7 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
         GenerateMIDIFunctor generateScoreDefMIDI(midiFile);
         generateScoreDefMIDI.SetChannel(midiChannel);
         generateScoreDefMIDI.SetTrack(midiTrack);
-        currentScoreDef->Process(generateScoreDefMIDI);
+        scoreDef->Process(generateScoreDefMIDI);
 
         for (layers = staves->second.child.begin(); layers != staves->second.child.end(); ++layers) {
             filters.Clear();
@@ -493,7 +513,7 @@ void Doc::ExportMIDI(smf::MidiFile *midiFile)
             filters.Add(&matchLayer);
 
             GenerateMIDIFunctor generateMIDI(midiFile);
-            generateMIDI.PushFilters(&filters);
+            generateMIDI.SetFilters(&filters);
 
             generateMIDI.SetChannel(midiChannel);
             generateMIDI.SetTrack(midiTrack);
@@ -574,6 +594,10 @@ void Doc::PrepareData()
 
     this->PrepareMeasureIndices();
 
+    /************ Collect all visible scores ************/
+
+    this->CollectVisibleScores();
+
     /************ Store default durations ************/
 
     PrepareDurationFunctor prepareDuration;
@@ -583,9 +607,8 @@ void Doc::PrepareData()
 
     // Try to match all spanning elements (slur, tie, etc) by processing backwards
     PrepareTimeSpanningFunctor prepareTimeSpanning;
-    prepareTimeSpanning.PushDirection(BACKWARD);
+    prepareTimeSpanning.SetDirection(BACKWARD);
     this->Process(prepareTimeSpanning);
-    prepareTimeSpanning.PopDirection();
     prepareTimeSpanning.SetDataCollectionCompleted();
 
     // First we try backwards because normally the spanning elements are at the end of
@@ -595,6 +618,7 @@ void Doc::PrepareData()
     // but this time without filling the list (that is only will the remaining elements)
     const ListOfSpanningInterOwnerPairs &interfaceOwnerPairs = prepareTimeSpanning.GetInterfaceOwnerPairs();
     if (!interfaceOwnerPairs.empty()) {
+        prepareTimeSpanning.SetDirection(FORWARD);
         this->Process(prepareTimeSpanning);
     }
 
@@ -616,7 +640,7 @@ void Doc::PrepareData()
 
     // Try to match all time pointing elements (tempo, fermata, etc) by processing backwards
     PrepareTimePointingFunctor prepareTimePointing;
-    prepareTimePointing.PushDirection(BACKWARD);
+    prepareTimePointing.SetDirection(BACKWARD);
     this->Process(prepareTimePointing);
 
     /************ Resolve @tstamp / tstamp2 ************/
@@ -640,9 +664,8 @@ void Doc::PrepareData()
 
     // If we have some left process again backward
     if (!prepareLinking.GetSameasIDPairs().empty() || !prepareLinking.GetStemSameasIDPairs().empty()) {
-        prepareLinking.PushDirection(BACKWARD);
+        prepareLinking.SetDirection(BACKWARD);
         this->Process(prepareLinking);
-        prepareLinking.PopDirection();
     }
 
     // If some are still there, then it is probably an issue in the encoding
@@ -685,6 +708,11 @@ void Doc::PrepareData()
     PrepareBeamSpanElementsFunctor prepareBeamSpanElements;
     this->Process(prepareBeamSpanElements);
 
+    /************ Match pedal lines ***********/
+
+    PreparePedalsFunctor preparePedals(this);
+    this->Process(preparePedals);
+
     /************ Prepare processing by staff/layer/verse ************/
 
     // We need to populate processing lists for processing the document by Layer (for matching @tie) and
@@ -718,7 +746,7 @@ void Doc::PrepareData()
             filters.Add(&matchLayer);
 
             PreparePointersByLayerFunctor preparePointersByLayer;
-            preparePointersByLayer.PushFilters(&filters);
+            preparePointersByLayer.SetFilters(&filters);
             this->Process(preparePointersByLayer);
         }
     }
@@ -730,7 +758,6 @@ void Doc::PrepareData()
     prepareDelayedTurns.SetDataCollectionCompleted();
 
     if (!prepareDelayedTurns.GetDelayedTurns().empty()) {
-        prepareDelayedTurns.PushFilters(&filters);
         for (staves = layerTree.child.begin(); staves != layerTree.child.end(); ++staves) {
             for (layers = staves->second.child.begin(); layers != staves->second.child.end(); ++layers) {
                 filters.Clear();
@@ -740,6 +767,7 @@ void Doc::PrepareData()
                 filters.Add(&matchStaff);
                 filters.Add(&matchLayer);
 
+                prepareDelayedTurns.SetFilters(&filters);
                 prepareDelayedTurns.ResetCurrent();
                 this->Process(prepareDelayedTurns);
             }
@@ -765,7 +793,7 @@ void Doc::PrepareData()
                 // The first pass sets m_drawingFirstNote and m_drawingLastNote for each syl
                 // m_drawingLastNote is set only if the syl has a forward connector
                 PrepareLyricsFunctor prepareLyrics;
-                prepareLyrics.PushFilters(&filters);
+                prepareLyrics.SetFilters(&filters);
                 this->Process(prepareLyrics);
             }
         }
@@ -799,7 +827,7 @@ void Doc::PrepareData()
 
             // We set multiNumber to NONE for indicated we need to look at the staffDef when reaching the first staff
             PrepareRptFunctor prepareRpt(this);
-            prepareRpt.PushFilters(&filters);
+            prepareRpt.SetFilters(&filters);
             this->Process(prepareRpt);
         }
     }
@@ -813,7 +841,7 @@ void Doc::PrepareData()
     /************ Resolve floating groups for vertical alignment ************/
 
     // Prepare the floating drawing groups
-    PrepareFloatingGrpsFunctor prepareFloatingGrps(this);
+    PrepareFloatingGrpsFunctor prepareFloatingGrps;
     this->Process(prepareFloatingGrps);
 
     /************ Resolve cue size ************/
@@ -854,8 +882,10 @@ void Doc::PrepareData()
         }
     }
 
-    ScoreDefSetGrpSymFunctor scoreDefSetGrpSym;
-    this->GetCurrentScoreDef()->Process(scoreDefSetGrpSym);
+    for (Score *score : this->GetVisibleScores()) {
+        ScoreDefSetGrpSymFunctor scoreDefSetGrpSym;
+        score->GetScoreDef()->Process(scoreDefSetGrpSym);
+    }
 
     // LogElapsedTimeEnd ("Preparing drawing");
 
@@ -874,12 +904,7 @@ void Doc::ScoreDefSetCurrentDoc(bool force)
     }
 
     // First we need to set Page::m_score and Page::m_scoreEnd
-    // We do it by going BACKWARD, with a depth limit of 3 (we want to hit the Score elements)
     ScoreDefSetCurrentPageFunctor scoreDefSetCurrentPage(this);
-    scoreDefSetCurrentPage.PushDirection(BACKWARD);
-    this->Process(scoreDefSetCurrentPage, 3);
-    scoreDefSetCurrentPage.PopDirection();
-    // Do it again FORWARD to set Page::m_scoreEnd - relies on Page::m_score not being NULL
     this->Process(scoreDefSetCurrentPage, 3);
 
     ScoreDefSetCurrentFunctor scoreDefSetCurrent(this);
@@ -900,10 +925,9 @@ void Doc::ScoreDefOptimizeDoc()
 
 void Doc::ScoreDefSetGrpSymDoc()
 {
-    // Group symbols need to be resolved using scoreDef, since there might be @starid/@endid attributes that determine
+    // Group symbols need to be resolved using scoreDef, since there might be @startid/@endid attributes that determine
     // their positioning
     ScoreDefSetGrpSymFunctor scoreDefSetGrpSym;
-    // this->GetCurrentScoreDef()->Process(scoreDefSetGrpSym);
     this->Process(scoreDefSetGrpSym);
 }
 
@@ -932,7 +956,7 @@ void Doc::CastOffDocBase(bool useSb, bool usePb, bool smart)
         return;
     }
 
-    std::list<Score *> scores = this->GetScores();
+    std::list<Score *> scores = this->GetVisibleScores();
     assert(!scores.empty());
 
     this->ScoreDefSetCurrentDoc();
@@ -1089,7 +1113,7 @@ void Doc::CastOffEncodingDoc()
     this->ScoreDefSetCurrentDoc(true);
 
     // Optimize the doc if one of the score requires optimization
-    for (Score *score : this->GetScores()) {
+    for (Score *score : this->GetVisibleScores()) {
         if (score->ScoreDefNeedsOptimization(m_options->m_condense.GetValue())) {
             this->ScoreDefOptimizeDoc();
             break;
@@ -1345,7 +1369,7 @@ void Doc::ConvertMarkupDoc(bool permanent)
                 filters.Add(&matchLayer);
 
                 ConvertMarkupAnalyticalFunctor convertMarkupAnalytical(permanent);
-                convertMarkupAnalytical.PushFilters(&filters);
+                convertMarkupAnalytical.SetFilters(&filters);
                 this->Process(convertMarkupAnalytical);
 
                 // After having processed one layer, we check if we have open ties - if yes, we
@@ -1442,18 +1466,6 @@ bool Doc::HasPage(int pageIdx) const
     return ((pageIdx >= 0) && (pageIdx < pages->GetChildCount()));
 }
 
-std::list<Score *> Doc::GetScores()
-{
-    std::list<Score *> scores;
-    ListOfObjects objects = this->FindAllDescendantsByType(SCORE, false, 3);
-    for (const auto object : objects) {
-        Score *score = vrv_cast<Score *>(object);
-        assert(score);
-        scores.push_back(score);
-    }
-    return scores;
-}
-
 Pages *Doc::GetPages()
 {
     return vrv_cast<Pages *>(this->FindDescendantByType(PAGES));
@@ -1470,6 +1482,72 @@ int Doc::GetPageCount() const
     return ((pages) ? pages->GetChildCount() : 0);
 }
 
+ScoreDef *Doc::GetFirstScoreDef()
+{
+    return const_cast<ScoreDef *>(std::as_const(*this).GetFirstScoreDef());
+}
+
+const ScoreDef *Doc::GetFirstScoreDef() const
+{
+    const Score *score = vrv_cast<const Score *>(this->FindDescendantByType(SCORE, 3));
+
+    return score ? score->GetScoreDef() : NULL;
+}
+
+std::list<Score *> Doc::GetVisibleScores()
+{
+    if (m_visibleScores.empty()) {
+        this->CollectVisibleScores();
+
+        assert(!m_visibleScores.empty());
+    }
+
+    return m_visibleScores;
+}
+
+Score *Doc::GetFirstVisibleScore()
+{
+    if (m_visibleScores.empty()) {
+        this->CollectVisibleScores();
+
+        assert(!m_visibleScores.empty());
+    }
+
+    return m_visibleScores.front();
+}
+
+Score *Doc::GetCorrespondingScore(const Object *object)
+{
+    return const_cast<Score *>(std::as_const(*this).GetCorrespondingScore(object));
+}
+
+const Score *Doc::GetCorrespondingScore(const Object *object) const
+{
+    assert(!m_visibleScores.empty());
+
+    const Score *correspondingScore = m_visibleScores.front();
+    for (Score *score : m_visibleScores) {
+        if ((score == object) || Object::IsPreOrdered(score, object)) {
+            correspondingScore = score;
+        }
+    }
+    return correspondingScore;
+}
+
+void Doc::CollectVisibleScores()
+{
+    m_visibleScores.clear();
+    ListOfObjects objects = this->FindAllDescendantsByType(SCORE, false, 3);
+    for (Object *object : objects) {
+        Score *score = vrv_cast<Score *>(object);
+        assert(score);
+        // Visible scores have milestone end
+        if (score->GetMilestoneEnd()) {
+            m_visibleScores.push_back(score);
+        }
+    }
+}
+
 int Doc::GetGlyphHeight(char32_t code, int staffSize, bool graceSize) const
 {
     int x, y, w, h;
@@ -1842,32 +1920,34 @@ double Doc::GetTopMargin(const ClassId classId) const
     return m_options->m_defaultTopMargin.GetValue();
 }
 
-data_MEASUREMENTSIGNED Doc::GetStaffDistance(const ClassId classId, int staffIndex, data_STAFFREL staffPosition)
+data_MEASUREMENTSIGNED Doc::GetStaffDistance(const Object *object, int staffIndex, data_STAFFREL staffPosition) const
 {
+    const ScoreDef *scoreDef = this->GetCorrespondingScore(object)->GetScoreDef();
+
     data_MEASUREMENTSIGNED distance;
     if (staffPosition == STAFFREL_above || staffPosition == STAFFREL_below) {
-        if (classId == DIR) {
+        if (object->Is(DIR)) {
             // Inspect the scoreDef attribute
-            if (this->GetCurrentScoreDef()->HasDirDist()) {
-                distance = this->GetCurrentScoreDef()->GetDirDist();
+            if (scoreDef->HasDirDist()) {
+                distance = scoreDef->GetDirDist();
             }
 
             // Inspect the staffDef attributes
-            const StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staffIndex);
+            const StaffDef *staffDef = scoreDef->GetStaffDef(staffIndex);
             if (staffDef != NULL && staffDef->HasDirDist()) {
                 distance = staffDef->GetDirDist();
             }
         }
-        else if (classId == DYNAM) {
+        else if (object->Is(DYNAM)) {
             distance.SetVu(m_options->m_dynamDist.GetDefault());
 
             // Inspect the scoreDef attribute
-            if (this->GetCurrentScoreDef()->HasDynamDist()) {
-                distance = this->GetCurrentScoreDef()->GetDynamDist();
+            if (scoreDef->HasDynamDist()) {
+                distance = scoreDef->GetDynamDist();
             }
 
             // Inspect the staffDef attributes
-            const StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staffIndex);
+            const StaffDef *staffDef = scoreDef->GetStaffDef(staffIndex);
             if (staffDef != NULL && staffDef->HasDynamDist()) {
                 distance = staffDef->GetDynamDist();
             }
@@ -1877,16 +1957,16 @@ data_MEASUREMENTSIGNED Doc::GetStaffDistance(const ClassId classId, int staffInd
                 distance.SetVu(m_options->m_dynamDist.GetValue());
             }
         }
-        else if (classId == HARM) {
+        else if (object->Is(HARM)) {
             distance.SetVu(m_options->m_harmDist.GetDefault());
 
             // Inspect the scoreDef attribute
-            if (this->GetCurrentScoreDef()->HasHarmDist()) {
-                distance = this->GetCurrentScoreDef()->GetHarmDist();
+            if (scoreDef->HasHarmDist()) {
+                distance = scoreDef->GetHarmDist();
             }
 
             // Inspect the staffDef attributes
-            const StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staffIndex);
+            const StaffDef *staffDef = scoreDef->GetStaffDef(staffIndex);
             if (staffDef != NULL && staffDef->HasHarmDist()) {
                 distance = staffDef->GetHarmDist();
             }
@@ -1896,14 +1976,14 @@ data_MEASUREMENTSIGNED Doc::GetStaffDistance(const ClassId classId, int staffInd
                 distance.SetVu(m_options->m_harmDist.GetValue());
             }
         }
-        else if (classId == TEMPO) {
+        else if (object->Is(TEMPO)) {
             // Inspect the scoreDef attribute
-            if (this->GetCurrentScoreDef()->HasTempoDist()) {
-                distance = this->GetCurrentScoreDef()->GetTempoDist();
+            if (scoreDef->HasTempoDist()) {
+                distance = scoreDef->GetTempoDist();
             }
 
             // Inspect the staffDef attributes
-            const StaffDef *staffDef = this->GetCurrentScoreDef()->GetStaffDef(staffIndex);
+            const StaffDef *staffDef = scoreDef->GetStaffDef(staffIndex);
             if (staffDef != NULL && staffDef->HasTempoDist()) {
                 distance = staffDef->GetTempoDist();
             }
@@ -2025,27 +2105,6 @@ int Doc::GetAdjustedDrawingPageWidth() const
     return (contentWidth + m_drawingPageMarginLeft + m_drawingPageMarginRight) / DEFINITION_FACTOR;
 }
 
-Score *Doc::GetCurrentScore()
-{
-    if (!m_currentScore) {
-        m_currentScore = vrv_cast<Score *>(this->FindDescendantByType(SCORE));
-        assert(m_currentScore);
-    }
-    return m_currentScore;
-}
-
-ScoreDef *Doc::GetCurrentScoreDef()
-{
-    if (!m_currentScore) this->GetCurrentScore();
-
-    return m_currentScore->GetScoreDef();
-}
-
-void Doc::SetCurrentScore(Score *score)
-{
-    m_currentScore = score;
-}
-
 //----------------------------------------------------------------------------
 // Doc functors methods
 //----------------------------------------------------------------------------
diff --git a/src/drawinginterface.cpp b/src/drawinginterface.cpp
index 45dd59e2fa6..cc4a339e0b7 100644
--- a/src/drawinginterface.cpp
+++ b/src/drawinginterface.cpp
@@ -261,8 +261,21 @@ void BeamDrawingInterface::InitCue(bool beamCue)
         });
     }
 
+    return;
+}
+
+void BeamDrawingInterface::InitGraceStemDir(bool graceGrp)
+{
+    if (!graceGrp) {
+        graceGrp = std::all_of(m_beamElementCoords.begin(), m_beamElementCoords.end(), [](BeamElementCoord *coord) {
+            if (!coord->m_element) return false;
+            if (coord->m_element->IsGraceNote()) return true;
+            return false;
+        });
+    }
+
     // Always set stem direction to up for grace note beam unless stem direction is provided
-    if (m_cueSize && (m_notesStemDir == STEMDIRECTION_NONE)) {
+    if (graceGrp && (m_notesStemDir == STEMDIRECTION_NONE)) {
         m_notesStemDir = STEMDIRECTION_up;
     }
 }
@@ -463,31 +476,29 @@ bool BeamDrawingInterface::HasOneStepHeight() const
     return (abs(top - bottom) <= 1);
 }
 
-bool BeamDrawingInterface::IsFirstIn(const Object *object, const LayerElement *element) const
+bool BeamDrawingInterface::IsFirstIn(const LayerElement *element) const
 {
-    this->GetList(object);
-    int position = this->GetPosition(object, element);
+    this->GetList();
+    const int position = this->GetPosition(element);
     // This method should be called only if the note is part of a fTrem
     assert(position != -1);
     // this is the first one
-    if (position == 0) return true;
-    return false;
+    return (position == 0);
 }
 
-bool BeamDrawingInterface::IsLastIn(const Object *object, const LayerElement *element) const
+bool BeamDrawingInterface::IsLastIn(const LayerElement *element) const
 {
-    const int size = this->GetListSize(object);
-    int position = this->GetPosition(object, element);
+    const int size = this->GetListSize();
+    const int position = this->GetPosition(element);
     // This method should be called only if the note is part of a beam
     assert(position != -1);
     // this is the last one
-    if (position == (size - 1)) return true;
-    return false;
+    return (position == size - 1);
 }
 
-int BeamDrawingInterface::GetPosition(const Object *object, const LayerElement *element) const
+int BeamDrawingInterface::GetPosition(const LayerElement *element) const
 {
-    this->GetList(object);
+    this->GetList();
     int position = this->GetListIndex(element);
     // Check if this is a note in the chord
     if ((position == -1) && (element->Is(NOTE))) {
@@ -623,7 +634,7 @@ void StaffDefDrawingInterface::SetCurrentMeterSigGrp(const MeterSigGrp *meterSig
 bool StaffDefDrawingInterface::DrawMeterSigGrp() const
 {
     if (m_drawMeterSigGrp) {
-        const int childListSize = m_currentMeterSigGrp.GetListSize(&m_currentMeterSigGrp);
+        const int childListSize = m_currentMeterSigGrp.GetListSize();
         if (childListSize > 1) return true;
     }
     return false;
diff --git a/src/durationinterface.cpp b/src/durationinterface.cpp
index 92308cbc963..27c4ec698e0 100644
--- a/src/durationinterface.cpp
+++ b/src/durationinterface.cpp
@@ -162,7 +162,7 @@ bool DurationInterface::IsFirstInBeam(const LayerElement *noteOrRest) const
     if (!beam) {
         return false;
     }
-    return (noteOrRest == beam->GetListFront(beam));
+    return (noteOrRest == beam->GetListFront());
 }
 
 bool DurationInterface::IsLastInBeam(const LayerElement *noteOrRest) const
@@ -171,7 +171,7 @@ bool DurationInterface::IsLastInBeam(const LayerElement *noteOrRest) const
     if (!beam) {
         return false;
     }
-    return (noteOrRest == beam->GetListBack(beam));
+    return (noteOrRest == beam->GetListBack());
 }
 
 int DurationInterface::GetActualDur() const
diff --git a/src/dynam.cpp b/src/dynam.cpp
index 3b3f770c9ee..242c202775e 100644
--- a/src/dynam.cpp
+++ b/src/dynam.cpp
@@ -89,7 +89,7 @@ bool Dynam::IsSupportedChild(Object *child)
 bool Dynam::IsSymbolOnly() const
 {
     m_symbolStr = U"";
-    std::u32string str = this->GetText(this);
+    std::u32string str = this->GetText();
     if (Dynam::IsSymbolOnly(str)) {
         m_symbolStr = str;
         return true;
diff --git a/src/editortoolkit_cmn.cpp b/src/editortoolkit_cmn.cpp
index 9fa80161ec2..6d8f85f49a8 100644
--- a/src/editortoolkit_cmn.cpp
+++ b/src/editortoolkit_cmn.cpp
@@ -584,7 +584,7 @@ bool EditorToolkitCMN::DeleteNote(Note *note)
             m_chainedId = rest->GetID();
             return true;
         }
-        if (beam->IsFirstIn(beam, note)) {
+        if (beam->IsFirstIn(note)) {
             Rest *rest = new Rest();
             rest->DurationInterface::operator=(*note);
             Object *parent = beam->GetParent();
@@ -594,7 +594,7 @@ bool EditorToolkitCMN::DeleteNote(Note *note)
             m_chainedId = rest->GetID();
             return true;
         }
-        else if (beam->IsLastIn(beam, note)) {
+        else if (beam->IsLastIn(note)) {
             Rest *rest = new Rest();
             rest->DurationInterface::operator=(*note);
             Object *parent = beam->GetParent();
diff --git a/src/editortoolkit_neume.cpp b/src/editortoolkit_neume.cpp
index 98276601013..e355c23fd64 100644
--- a/src/editortoolkit_neume.cpp
+++ b/src/editortoolkit_neume.cpp
@@ -18,14 +18,18 @@
 
 //--------------------------------------------------------------------------------
 
+#include "accid.h"
 #include "clef.h"
 #include "comparison.h"
 #include "custos.h"
+#include "divline.h"
 #include "layer.h"
+#include "liquescent.h"
 #include "nc.h"
 #include "neume.h"
 #include "page.h"
 #include "rend.h"
+#include "score.h"
 #include "staff.h"
 #include "staffdef.h"
 #include "surface.h"
@@ -86,6 +90,27 @@ bool EditorToolkitNeume::ParseEditorAction(const std::string &json_editorAction)
         }
         LogWarning("Could not parse the insert action");
     }
+    else if (action == "insertToSyllable") {
+        std::string elementId;
+        if (this->ParseInsertToSyllableAction(json.get<jsonxx::Object>("param"), &elementId)) {
+            return this->InsertToSyllable(elementId);
+        }
+        LogWarning("Could not parse the insert action");
+    }
+    else if (action == "moveOutsideSyllable") {
+        std::string elementId;
+        if (this->ParseMoveOutsideSyllableAction(json.get<jsonxx::Object>("param"), &elementId)) {
+            return this->MoveOutsideSyllable(elementId);
+        }
+        LogWarning("Could not parse the insert action");
+    }
+    else if (action == "displaceClefOctave") {
+        std::string elementId, direction;
+        if (this->ParseDisplaceClefAction(json.get<jsonxx::Object>("param"), &elementId, &direction)) {
+            return this->DisplaceClefOctave(elementId, direction);
+        }
+        LogWarning("Could not parse the displace clef octave action");
+    }
     else if (action == "set") {
         std::string elementId, attrType, attrValue;
         if (this->ParseSetAction(json.get<jsonxx::Object>("param"), &elementId, &attrType, &attrValue)) {
@@ -152,6 +177,13 @@ bool EditorToolkitNeume::ParseEditorAction(const std::string &json_editorAction)
             return this->Ungroup(groupType, elementIds);
         }
     }
+    else if (action == "splitNeume") {
+        std::string elementId;
+        std::string ncId;
+        if (this->ParseSplitNeumeAction(json.get<jsonxx::Object>("param"), &elementId, &ncId)) {
+            return this->SplitNeume(elementId, ncId);
+        }
+    }
     else if (action == "merge") {
         std::vector<std::string> elementIds;
         if (this->ParseMergeAction(json.get<jsonxx::Object>("param"), &elementIds)) {
@@ -178,8 +210,8 @@ bool EditorToolkitNeume::ParseEditorAction(const std::string &json_editorAction)
     else if (action == "toggleLigature") {
         std::vector<std::string> elementIds;
         std::string isLigature;
-        if (this->ParseToggleLigatureAction(json.get<jsonxx::Object>("param"), &elementIds, &isLigature)) {
-            return this->ToggleLigature(elementIds, isLigature);
+        if (this->ParseToggleLigatureAction(json.get<jsonxx::Object>("param"), &elementIds)) {
+            return this->ToggleLigature(elementIds);
         }
         LogWarning("Could not parse toggle ligature action");
     }
@@ -190,6 +222,13 @@ bool EditorToolkitNeume::ParseEditorAction(const std::string &json_editorAction)
         }
         LogWarning("Could not parse change staff action");
     }
+    else if (action == "changeStaffTo") {
+        std::string elementId, staffId;
+        if (this->ParseChangeStaffToAction(json.get<jsonxx::Object>("param"), &elementId, &staffId)) {
+            return this->ChangeStaffTo(elementId, staffId);
+        }
+        LogWarning("Could not parse change staff action");
+    }
     else {
         LogWarning("Unknown action type '%s'.", action.c_str());
     }
@@ -200,10 +239,11 @@ bool EditorToolkitNeume::ParseEditorAction(const std::string &json_editorAction)
 
 bool EditorToolkitNeume::Chain(jsonxx::Array actions)
 {
+    // LogMessage("%s", actions.get<jsonxx::Object>(0).json().c_str());
     bool status = true;
     jsonxx::Object results;
-    for (int i = 0; i < (int)actions.size(); ++i) {
-        if (!actions.has<jsonxx::Object>(i)) {
+    for (int i = 0; i < (int)actions.size(); i++) {
+        if (!actions.has<jsonxx::Object>(0)) {
             LogError("Action %d was not an object", i);
             m_infoObject.reset();
             m_infoObject.import("status", "FAILURE");
@@ -217,6 +257,218 @@ bool EditorToolkitNeume::Chain(jsonxx::Array actions)
     return status;
 }
 
+//////////////////////////////////////////////////////////////////////////////////////////////////
+// Author: jacob-hutnyk
+//
+// This function is dedicated to ensuring that pitched elements
+// retain their position on the staves by adjusting their pitch position to match their new clefs.
+// With the respect to to this goal there are two main cases. Throughout this comment "this clef"
+// refers to the clef being dragged.
+//
+//  Case 1:
+//      The clef you're dragging stays between the same two bounding clefs. In this case
+//      elements that are newly associated to this clef need to have their pitch changed from
+//      the clef preceding this clef (previousClef) to this clef. The elements that are associated
+//      with this clef before and after the drag need to have their pitch changed only if the line
+//      of the clef changed during the drag.
+//  Case 2:
+//      The clef you're dragging moves across other clefs. In other words the preceding and
+//      subsequent clefs are different before and after the drag. In this case elements that were
+//      associated with this clef before the drag need to be reassociated to the clef that preceded
+//      this clef before the drag. Elements that become newly associated with the clef after the drag
+//      need to be reassociated from the clef that preceeds this clef after the drag to this clef.
+//
+// Extracting the exact elements that need to have their pitch modified in each of these cases is
+// tricky, and required some dicey naming.
+//
+// The clefs we're interested are named precedingClefBefore
+// (meaning the clef that preceded this clef before the drag action), precedingClefAfter (meaning the
+// clef that preceded this clef after the drag action), nextClefBefore (meaning the clef that came
+// after this clef before the drag action), and nextClefAfter. And of course clef just refers to
+// this clef, the clef being dragged.
+//
+// There are also ListOfObjects which refer to which elements
+// were associated to different clefs at different times. with{ClefName} just refers to the pitched
+// elements that were associated to that clef at that time. For example withThisClefBefore refers
+// to the elements that were associated with this clef before the drag action took place.
+//
+// There are also some slightly trickier array names like withNewPrecedingClefBefore.
+// In this case the the before/after part refers to what elements were associated to
+// this clef at what time, while the new/old part refers to the time of the clef having the
+// preceding/next relationship to this clef. Let's take withNewPrecedingClefBefore as an example.
+// Let's say the order of the clefs before the drag is:
+//
+//          A B C D
+//
+// with C being the clef we're dragging. And after the drag action the order of the clefs is:
+//
+//          A C B D
+//
+// withNewPrecedingClefBefore would refer to the elements between A and B, since A is the
+// new preceding clef (it becomes the clef that precedes this clef after the drag action)
+// and before the drag action all the elements between A and B were associated with A.
+// By comparison, withPrecedingClefAfter (or withNewPrecedingClefAfter) would refer to only
+// the elements between A and C in the lower depiction.
+//
+// The final piece of the naming scheme is the naming of the arrays whose pitch values actually
+// need to be changed. These should be pretty clear. stillWithThisClef for example, refers to
+// the elements that were associated with this clef before and after the drag action, and thus whose
+// pitch values only needs to be changed if the line of this clef changed.
+//
+// The algorithm is implemented by finding all of the aforementioned clefs and the elements between
+// them, and then using std::set_difference to find the elements whose pitch values may need to change.
+// For example: in case 2 noLongerWithThisClef is found by taking the difference between
+// withOldPrecedingClefAfter and withPrecedingClefBefore, since that difference is the stuff that
+// became associated with the clef that used to preceed this clef, meaning the stuff that was associated
+// with clef, but no longer is.
+//
+// One other aspect that might seem confusing is exactly when clef->SetLine() gets called. The reason
+// that these calls are oddly placed is that AdjustPitchForNewClef() uses the line of the clef.
+// So if we're changing an element's pitch from this clef to something else, we need the line of
+// this clef to be what it was before the drag. On the other hand, if we're reassociating an element
+// from some clef to the clef we're dragging, we need the line of this clef to be the one it is after
+// the drag action. Each of the clef->SetLine() calls are placed so as to accommodate this.
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+bool EditorToolkitNeume::ClefMovementHandler(Clef *clef, int x, int y)
+{
+
+    Layer *layer = dynamic_cast<Layer *>(clef->GetFirstAncestor(LAYER));
+    if (!layer) return false;
+
+    Staff *staff = dynamic_cast<Staff *>(layer->GetFirstAncestor(STAFF));
+    assert(staff);
+
+    // Note that y param is relative to initial position for clefs
+    int initialClefLine = clef->GetLine();
+    int clefLine = round(((double)y - x * tan(staff->GetDrawingRotate() * M_PI / 180.0))
+            / (double)m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)
+        + initialClefLine);
+
+    int lineDiff = clefLine - initialClefLine;
+
+    ListOfObjects withThisClefBefore;
+    ListOfObjects withPrecedingClefBefore;
+
+    ClassIdComparison ac(CLEF);
+    InterfaceComparison ic(INTERFACE_PITCH);
+
+    Clef *precedingClefBefore = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindPreviousChild(&ac, clef));
+    Clef *nextClefBefore = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindNextChild(&ac, clef));
+
+    m_doc->GetDrawingPage()->FindAllDescendantsBetween(&withThisClefBefore, &ic, clef,
+        (nextClefBefore != layer->GetCurrentClef()) ? nextClefBefore : m_doc->GetDrawingPage()->GetLast());
+    m_doc->GetDrawingPage()->FindAllDescendantsBetween(&withPrecedingClefBefore, &ic, precedingClefBefore, clef);
+
+    // Adjust facsimile for clef (if it exists)
+    if (clef->HasFacs()) {
+        Zone *zone = clef->GetZone();
+        assert(zone);
+        zone->ShiftByXY(x,
+            (clefLine - initialClefLine) * 2 * staff->m_drawingStaffSize
+                - x * tan(staff->GetDrawingRotate() * M_PI / 180.0));
+    }
+
+    layer->ReorderByXPos();
+
+    Clef *precedingClefAfter = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindPreviousChild(&ac, clef));
+    Clef *nextClefAfter = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindNextChild(&ac, clef));
+
+    // case 1
+    if (precedingClefAfter == precedingClefBefore && nextClefAfter == nextClefBefore) {
+        ListOfObjects withThisClefAfter;
+        ListOfObjects withPrecedingClefAfter;
+
+        m_doc->GetDrawingPage()->FindAllDescendantsBetween(&withThisClefAfter, &ic, clef,
+            (nextClefAfter != NULL) ? nextClefAfter : m_doc->GetDrawingPage()->GetLast());
+        m_doc->GetDrawingPage()->FindAllDescendantsBetween(&withPrecedingClefAfter, &ic, precedingClefBefore, clef);
+
+        // moved left
+        if (withPrecedingClefBefore.size() > withPrecedingClefAfter.size()) {
+            ListOfObjects newlyWithThisClef;
+
+            clef->SetLine(clefLine);
+
+            std::set_difference(withPrecedingClefBefore.begin(), withPrecedingClefBefore.end(),
+                withPrecedingClefAfter.begin(), withPrecedingClefAfter.end(),
+                std::inserter(newlyWithThisClef, newlyWithThisClef.begin()));
+
+            for (auto iter = newlyWithThisClef.begin(); iter != newlyWithThisClef.end(); ++iter) {
+                (*iter)->GetPitchInterface()->AdjustPitchForNewClef(
+                    (precedingClefBefore != NULL) ? precedingClefBefore : layer->GetCurrentClef(), clef);
+            }
+            if (lineDiff != 0) {
+                for (auto iter = withThisClefBefore.begin(); iter != withThisClefBefore.end(); ++iter) {
+                    (*iter)->GetPitchInterface()->AdjustPitchByOffset(lineDiff * -2);
+                }
+            }
+        }
+        // moved right
+        else if (withPrecedingClefBefore.size() < withPrecedingClefAfter.size()) {
+            ListOfObjects noLongerWithThisClef;
+
+            std::set_difference(withPrecedingClefAfter.begin(), withPrecedingClefAfter.end(),
+                withPrecedingClefBefore.begin(), withPrecedingClefBefore.end(),
+                std::inserter(noLongerWithThisClef, noLongerWithThisClef.begin()));
+
+            for (auto iter = noLongerWithThisClef.begin(); iter != noLongerWithThisClef.end(); ++iter) {
+                (*iter)->GetPitchInterface()->AdjustPitchForNewClef(
+                    clef, (precedingClefBefore != NULL) ? precedingClefBefore : layer->GetCurrentClef());
+            }
+            if (lineDiff != 0) {
+                for (auto iter = withThisClefAfter.begin(); iter != withThisClefAfter.end(); ++iter) {
+                    (*iter)->GetPitchInterface()->AdjustPitchByOffset(lineDiff * -2);
+                }
+            }
+            clef->SetLine(clefLine);
+        }
+        else {
+            clef->SetLine(clefLine);
+            if (lineDiff != 0) {
+                for (auto iter = withThisClefBefore.begin(); iter != withThisClefBefore.end(); ++iter) {
+                    (*iter)->GetPitchInterface()->AdjustPitchByOffset(lineDiff * -2);
+                }
+            }
+        }
+    }
+    // case 2
+    else {
+        ListOfObjects withOldPrecedingClefAfter;
+        ListOfObjects withNewPrecedingClefBefore;
+        ListOfObjects withNewPrecedingClefAfter;
+        ListOfObjects noLongerWithThisClef;
+        ListOfObjects newlyWithThisClef;
+
+        m_doc->GetDrawingPage()->FindAllDescendantsBetween(&withOldPrecedingClefAfter, &ic, precedingClefBefore,
+            (nextClefBefore != NULL) ? nextClefBefore : m_doc->GetDrawingPage()->GetLast());
+
+        m_doc->GetDrawingPage()->FindAllDescendantsBetween(&withNewPrecedingClefBefore, &ic, precedingClefAfter,
+            (nextClefAfter != NULL) ? nextClefAfter : m_doc->GetDrawingPage()->GetLast());
+
+        m_doc->GetDrawingPage()->FindAllDescendantsBetween(&withNewPrecedingClefAfter, &ic, precedingClefAfter, clef);
+
+        std::set_difference(withOldPrecedingClefAfter.begin(), withOldPrecedingClefAfter.end(),
+            withPrecedingClefBefore.begin(), withPrecedingClefBefore.end(),
+            std::inserter(noLongerWithThisClef, noLongerWithThisClef.begin()));
+
+        std::set_difference(withNewPrecedingClefBefore.begin(), withNewPrecedingClefBefore.end(),
+            withNewPrecedingClefAfter.begin(), withNewPrecedingClefAfter.end(),
+            std::inserter(newlyWithThisClef, newlyWithThisClef.begin()));
+
+        for (auto iter = noLongerWithThisClef.begin(); iter != noLongerWithThisClef.end(); ++iter) {
+            (*iter)->GetPitchInterface()->AdjustPitchForNewClef(
+                clef, (precedingClefBefore != NULL) ? precedingClefBefore : layer->GetCurrentClef());
+        }
+
+        clef->SetLine(clefLine);
+
+        for (auto iter = newlyWithThisClef.begin(); iter != newlyWithThisClef.end(); ++iter) {
+            (*iter)->GetPitchInterface()->AdjustPitchForNewClef(
+                (precedingClefAfter != NULL) ? precedingClefAfter : layer->GetCurrentClef(), clef);
+        }
+    }
+    return true;
+}
+
 bool EditorToolkitNeume::Drag(std::string elementId, int x, int y)
 {
     std::string status = "OK", message = "";
@@ -241,8 +493,18 @@ bool EditorToolkitNeume::Drag(std::string elementId, int x, int y)
     }
     assert(element);
 
-    if (element->HasInterface(INTERFACE_PITCH) || element->Is(NEUME) || element->Is(SYLLABLE)) {
-        Layer *layer = vrv_cast<Layer *>(element->GetFirstAncestor(LAYER));
+    if (element->Is(CUSTOS)) {
+        FacsimileInterface *fi = element->GetFacsimileInterface();
+        assert(fi);
+        Zone *zone = fi->GetZone();
+        assert(zone);
+        zone->ShiftByXY(x, -y);
+
+        AdjustPitchFromPosition(element);
+        ChangeStaff(elementId);
+    }
+    else if (element->HasInterface(INTERFACE_PITCH) || element->Is(NEUME) || element->Is(SYLLABLE)) {
+        Layer *layer = dynamic_cast<Layer *>(element->GetFirstAncestor(LAYER));
         if (!layer) {
             LogError("Element does not have Layer parent. This should not happen.");
             m_infoObject.import("status", "FAILURE");
@@ -253,13 +515,18 @@ bool EditorToolkitNeume::Drag(std::string elementId, int x, int y)
         // clef association is done at the syllable level because of MEI structure
         // also note this will initialize syllable as null in the case of custos
         // which is why all the references to syllable are ternary
-        Syllable *syllable = ((element->Is(SYLLABLE)) ? (vrv_cast<Syllable *>(element))
-                                                      : vrv_cast<Syllable *>(element->GetFirstAncestor(SYLLABLE)));
+
+        Object *syllable = ((element->Is(SYLLABLE) ? (element) : element->GetFirstAncestor(SYLLABLE)));
 
         ClassIdComparison ac(CLEF);
         InterfaceComparison facsIC(INTERFACE_FACSIMILE);
         InterfaceComparison pitchIC(INTERFACE_PITCH);
 
+        // Check for clefs in syllable
+        ListOfObjects clefs;
+        syllable->FindAllDescendantsByComparison(&clefs, &ac);
+        bool hasClef = (clefs.size() != 0);
+
         FacsimileInterface *fi = element->GetFacsimileInterface();
         if (fi && fi->HasFacs()) {
             bool ignoreFacs = false;
@@ -286,230 +553,86 @@ bool EditorToolkitNeume::Drag(std::string elementId, int x, int y)
             ListOfObjects facsChildren;
             element->FindAllDescendantsByComparison(&facsChildren, &facsIC);
             for (auto it = facsChildren.begin(); it != facsChildren.end(); ++it) {
-                // don't change the text bbox position
-                if ((*it)->Is(SYL) || !(*it)->GetFacsimileInterface()->HasFacs()) {
+                // Don't change the text bbox position and skip clefs until later
+                if ((*it)->Is(SYL) || !(*it)->GetFacsimileInterface()->HasFacs() || (*it)->Is(CLEF)) {
                     continue;
                 }
-                (*it)->GetFacsimileInterface()->GetZone()->ShiftByXY(x, -y);
+                else {
+                    (*it)->GetFacsimileInterface()->GetZone()->ShiftByXY(x, -y);
+                }
             }
         }
 
-        layer->ReorderByXPos();
+        if (hasClef) {
+            for (Object *obj : clefs) {
+                Clef *clef = dynamic_cast<Clef *>(obj);
+                ClefMovementHandler(clef, x, 0);
+            }
 
-        if (element->Is(CUSTOS)) {
-            AdjustPitchFromPosition(element);
+            // if syllable contains clef, adjust individual neumes
+            ListOfObjects neumes;
+            ClassIdComparison neumeCompare(NEUME);
+            element->FindAllDescendantsByComparison(&neumes, &neumeCompare);
+            for (auto neume = neumes.begin(); neume != neumes.end(); ++neume) {
+                AdjustPitchFromPosition(*neume);
+            }
         }
         else {
             AdjustPitchFromPosition(syllable);
         }
+
+        layer->ReorderByXPos();
     }
     else if (element->Is(CLEF)) {
-        Clef *clef = vrv_cast<Clef *>(element);
-        assert(clef);
-        Layer *layer = vrv_cast<Layer *>(clef->GetFirstAncestor(LAYER));
-        if (!layer) return false;
-
-        Staff *staff = vrv_cast<Staff *>(layer->GetFirstAncestor(STAFF));
-        assert(staff);
-        // Note that y param is relative to initial position for clefs
-        int initialClefLine = clef->GetLine();
-        int clefLine = round(((double)y - x * tan(staff->GetDrawingRotate() * M_PI / 180.0))
-                / (double)m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)
-            + initialClefLine);
-
-        //////////////////////////////////////////////////////////////////////////////////////////////////////
-        // The rest of this if branch (element->Is(CLEF)) is dedicated to ensuring that pitched elements
-        // retain their position on the staves by adjusting their pitch position to match their new clefs.
-        // With the respect to to this goal there are two main cases. Throughout this comment "this clef"
-        // refers to the clef being dragged.
-        //
-        //  Case 1:
-        //      The clef you're dragging stays between the same two bounding clefs. In this case
-        //      elements that are newly associated to this clef need to have their pitch changed from
-        //      the clef preceding this clef (previousClef) to this clef. The elements that are associated
-        //      with this clef before and after the drag need to have their pitch changed only if the line
-        //      of the clef changed during the drag.
-        //  Case 2:
-        //      The clef you're dragging moves across other clefs. In other words the preceding and
-        //      subsequent clefs are different before and after the drag. In this case elements that were
-        //      associated with this clef before the drag need to be re-associated to the clef that preceded
-        //      this clef before the drag. Elements that become newly associated with the clef after the drag
-        //      need to be re-associated from the clef that precedes this clef after the drag to this clef.
-        //
-        // Extracting the exact elements that need to have their pitch modified in each of these cases is
-        // tricky, and required some dicey naming.
-        //
-        // The clefs we're interested are named precedingClefBefore
-        // (meaning the clef that preceded this clef before the drag action), precedingClefAfter (meaning the
-        // clef that preceded this clef after the drag action), nextClefBefore (meaning the clef that came
-        // after this clef before the drag action), and nextClefAfter. And of course clef just refers to
-        // this clef, the clef being dragged.
-        //
-        // There are also ListOfObjects which refer to which elements
-        // were associated to different clefs at different times. with{ClefName} just refers to the pitched
-        // elements that were associated to that clef at that time. For example withThisClefBefore refers
-        // to the elements that were associated with this clef before the drag action took place.
-        //
-        // There are also some slightly trickier array names like withNewPrecedingClefBefore.
-        // In this case the the before/after part refers to what elements were associated to
-        // this clef at what time, while the new/old part refers to the time of the clef having the
-        // preceding/next relationship to this clef. Let's take withNewPrecedingClefBefore as an example.
-        // Let's say the order of the clefs before the drag is:
-        //
-        //          A B C D
-        //
-        // with C being the clef we're dragging. And after the drag action the order of the clefs is:
-        //
-        //          A C B D
-        //
-        // withNewPrecedingClefBefore would refer to the elements between A and B, since A is the
-        // new preceding clef (it becomes the clef that precedes this clef after the drag action)
-        // and before the drag action all the elements between A and B were associated with A.
-        // By comparison, withPrecedingClefAfter (or withNewPrecedingClefAfter) would refer to only
-        // the elements between A and C in the lower depiction.
-        //
-        // The final piece of the naming scheme is the naming of the arrays whose pitch values actually
-        // need to be changed. These should be pretty clear. stillWithThisClef for example, refers to
-        // the elements that were associated with this clef before and after the drag action, and thus whose
-        // pitch values only needs to be changed if the line of this clef changed.
-        //
-        // The algorithm is implemented by finding all of the aforementioned clefs and the elements between
-        // them, and then using std::set_difference to find the elements whose pitch values may need to change.
-        // For example: in case 2 noLongerWithThisClef is found by taking the difference between
-        // withOldPrecedingClefAfter and withPrecedingClefBefore, since that difference is the stuff that
-        // became associated with the clef that used to precede this clef, meaning the stuff that was associated
-        // with clef, but no longer is.
-        //
-        // One other aspect that might seem confusing is exactly when clef->SetLine() gets called. The reason
-        // that these calls are oddly placed is that AdjustPitchForNewClef() uses the line of the clef.
-        // So if we're changing an element's pitch from this clef to something else, we need the line of
-        // this clef to be what it was before the drag. On the other hand, if we're re-associating an element
-        // from some clef to the clef we're dragging, we need the line of this clef to be the one it is after
-        // the drag action. Each of the clef->SetLine() calls are placed so as to accommodate this.
-        //////////////////////////////////////////////////////////////////////////////////////////////////////
-
-        int lineDiff = clefLine - initialClefLine;
-
-        ListOfObjects withThisClefBefore;
-        ListOfObjects withPrecedingClefBefore;
-
-        ClassIdComparison ac(CLEF);
-        InterfaceComparison ic(INTERFACE_PITCH);
-
-        Clef *precedingClefBefore = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindPreviousChild(&ac, clef));
-        Clef *nextClefBefore = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindNextChild(&ac, clef));
-
-        m_doc->GetDrawingPage()->FindAllDescendantsBetween(&withThisClefBefore, &ic, clef,
-            (nextClefBefore != layer->GetCurrentClef()) ? nextClefBefore : m_doc->GetDrawingPage()->GetLast());
-
-        m_doc->GetDrawingPage()->FindAllDescendantsBetween(&withPrecedingClefBefore, &ic, precedingClefBefore, clef);
-
-        if (clef->HasFacs()) { // adjust facsimile for clef (if it exists)
-            Zone *zone = clef->GetZone();
-            assert(zone);
-            zone->ShiftByXY(x,
-                (clefLine - initialClefLine) * 2 * staff->m_drawingStaffSize
-                    - x * tan(staff->GetDrawingRotate() * M_PI / 180.0));
+        Clef *clef = dynamic_cast<Clef *>(element);
+        if (!clef->HasFacs()) {
+            LogError("Clef dragging is only supported for clefs with facsimiles!");
+            m_infoObject.import("status", "FAILURE");
+            m_infoObject.import("message", "Clef dragging is only supported for clefs with facsimiles.");
+            return false;
         }
-
-        layer->ReorderByXPos();
-
-        Clef *precedingClefAfter = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindPreviousChild(&ac, clef));
-        Clef *nextClefAfter = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindNextChild(&ac, clef));
-
-        // case 1
-        if (precedingClefAfter == precedingClefBefore && nextClefAfter == nextClefBefore) {
-            ListOfObjects withThisClefAfter;
-            ListOfObjects withPrecedingClefAfter;
-
-            m_doc->GetDrawingPage()->FindAllDescendantsBetween(&withThisClefAfter, &ic, clef,
-                (nextClefAfter != NULL) ? nextClefAfter : m_doc->GetDrawingPage()->GetLast());
-            m_doc->GetDrawingPage()->FindAllDescendantsBetween(&withPrecedingClefAfter, &ic, precedingClefBefore, clef);
-
-            if (withPrecedingClefBefore.size() > withPrecedingClefAfter.size()) {
-                ListOfObjects newlyWithThisClef;
-
-                clef->SetLine(clefLine);
-
-                std::set_difference(withPrecedingClefBefore.begin(), withPrecedingClefBefore.end(),
-                    withPrecedingClefAfter.begin(), withPrecedingClefAfter.end(),
-                    std::inserter(newlyWithThisClef, newlyWithThisClef.begin()));
-
-                for (auto iter = newlyWithThisClef.begin(); iter != newlyWithThisClef.end(); ++iter) {
-                    (*iter)->GetPitchInterface()->AdjustPitchForNewClef(
-                        (precedingClefBefore != NULL) ? precedingClefBefore : layer->GetCurrentClef(), clef);
-                }
-
-                if (lineDiff != 0) {
-                    for (auto iter = withThisClefBefore.begin(); iter != withThisClefBefore.end(); ++iter) {
-                        (*iter)->GetPitchInterface()->AdjustPitchByOffset(lineDiff * -2);
-                    }
-                }
+        FacsimileInterface *fi = (*clef).GetFacsimileInterface();
+        assert(fi);
+        // If inside this syllable, moving a clef...
+        // Case 1: BEFORE preceeding syllable(s) -> clef becomes start of this syllable, this syllable reorders before
+        // preceeding syllable(s), preceeding and following syllables abide by this clef. Case 2: INSIDE this syllable
+        // -> following neumes and syllables abide by this clef. Case 3: AFTER this syllable -> clef becomes the end of
+        // this syllable, following syllables abide by this clef still.
+        if (element->GetParent()->Is(SYLLABLE)) {
+            Object *parent = clef->GetParent();
+            assert(parent);
+            Object *lNc;
+            if (parent->GetChildCount(NEUME) == 1) {
+                lNc = parent->GetFirst(NEUME)->GetLast();
             }
-            else if (withPrecedingClefBefore.size() < withPrecedingClefAfter.size()) {
-                ListOfObjects noLongerWithThisClef;
-
-                std::set_difference(withPrecedingClefAfter.begin(), withPrecedingClefAfter.end(),
-                    withPrecedingClefBefore.begin(), withPrecedingClefBefore.end(),
-                    std::inserter(noLongerWithThisClef, noLongerWithThisClef.begin()));
-
-                for (auto iter = noLongerWithThisClef.begin(); iter != noLongerWithThisClef.end(); ++iter) {
-                    (*iter)->GetPitchInterface()->AdjustPitchForNewClef(
-                        clef, (precedingClefBefore != NULL) ? precedingClefBefore : layer->GetCurrentClef());
-                }
+            else {
+                lNc = parent->GetLast(NEUME)->GetLast();
+            }
+            int xRight = lNc->GetFacsimileInterface()->GetZone()->GetLrx();
+            int clefInitial = clef->GetFacsimileInterface()->GetZone()->GetLrx();
+            int clefTarget = clefInitial + x;
 
-                if (lineDiff != 0) {
-                    for (auto iter = withThisClefAfter.begin(); iter != withThisClefAfter.end(); ++iter) {
-                        (*iter)->GetPitchInterface()->AdjustPitchByOffset(lineDiff * -2);
-                    }
-                }
-                clef->SetLine(clefLine);
+            // Case 1 & 2
+            if (clefTarget < xRight) {
+                ClefMovementHandler(clef, x, y);
             }
+            // Case 3
+            // Move to end of syllable and then shift zone so mei position stays at end of syllable
             else {
-                clef->SetLine(clefLine);
-                if (lineDiff != 0) {
-                    for (auto iter = withThisClefBefore.begin(); iter != withThisClefBefore.end(); ++iter) {
-                        (*iter)->GetPitchInterface()->AdjustPitchByOffset(lineDiff * -2);
-                    }
+                int distanceToSyllableEnd = xRight - clefInitial + 1;
+                int distanceRemaining = clefTarget - xRight - 1;
+
+                ClefMovementHandler(clef, distanceToSyllableEnd, y);
+                if (fi->GetZone() != NULL) {
+                    Zone *zone = fi->GetZone();
+                    assert(zone);
+                    zone->ShiftByXY(distanceRemaining, 0);
                 }
             }
         }
-        // case 2
+        // Not inside syllable
         else {
-            ListOfObjects withOldPrecedingClefAfter;
-            ListOfObjects withNewPrecedingClefBefore;
-            ListOfObjects withNewPrecedingClefAfter;
-            ListOfObjects noLongerWithThisClef;
-            ListOfObjects newlyWithThisClef;
-
-            m_doc->GetDrawingPage()->FindAllDescendantsBetween(&withOldPrecedingClefAfter, &ic, precedingClefBefore,
-                (nextClefBefore != NULL) ? nextClefBefore : m_doc->GetDrawingPage()->GetLast());
-
-            m_doc->GetDrawingPage()->FindAllDescendantsBetween(&withNewPrecedingClefBefore, &ic, precedingClefAfter,
-                (nextClefAfter != NULL) ? nextClefAfter : m_doc->GetDrawingPage()->GetLast());
-
-            m_doc->GetDrawingPage()->FindAllDescendantsBetween(
-                &withNewPrecedingClefAfter, &ic, precedingClefAfter, clef);
-
-            std::set_difference(withOldPrecedingClefAfter.begin(), withOldPrecedingClefAfter.end(),
-                withPrecedingClefBefore.begin(), withPrecedingClefBefore.end(),
-                std::inserter(noLongerWithThisClef, noLongerWithThisClef.begin()));
-
-            std::set_difference(withNewPrecedingClefBefore.begin(), withNewPrecedingClefBefore.end(),
-                withNewPrecedingClefAfter.begin(), withNewPrecedingClefAfter.end(),
-                std::inserter(newlyWithThisClef, newlyWithThisClef.begin()));
-
-            for (auto iter = noLongerWithThisClef.begin(); iter != noLongerWithThisClef.end(); ++iter) {
-                (*iter)->GetPitchInterface()->AdjustPitchForNewClef(
-                    clef, (precedingClefBefore != NULL) ? precedingClefBefore : layer->GetCurrentClef());
-            }
-
-            clef->SetLine(clefLine);
-
-            for (auto iter = newlyWithThisClef.begin(); iter != newlyWithThisClef.end(); ++iter) {
-                (*iter)->GetPitchInterface()->AdjustPitchForNewClef(
-                    (precedingClefAfter != NULL) ? precedingClefAfter : layer->GetCurrentClef(), clef);
-            }
+            ClefMovementHandler(clef, x, y);
         }
     }
     else if (element->Is(STAFF)) {
@@ -555,6 +678,40 @@ bool EditorToolkitNeume::Drag(std::string elementId, int x, int y)
             fi->GetZone()->ShiftByXY(x, -y);
         }
     }
+    else if (element->Is(ACCID)) {
+        Accid *accid = dynamic_cast<Accid *>(element);
+        if (!accid->HasFacs()) {
+            LogError("Accid dragging is only supported for accid with facsimiles!");
+            m_infoObject.import("status", "FAILURE");
+            m_infoObject.import("message", "Accid dragging is only supported for accid with facsimiles.");
+            return false;
+        }
+        FacsimileInterface *fi = (*accid).GetFacsimileInterface();
+        assert(fi);
+        if (fi->GetZone() != NULL) {
+            Zone *zone = fi->GetZone();
+            assert(zone);
+            zone->ShiftByXY(x, -y);
+        }
+        ChangeStaff(elementId);
+    }
+    else if (element->Is(DIVLINE)) {
+        DivLine *divLine = dynamic_cast<DivLine *>(element);
+        if (!divLine->HasFacs()) {
+            LogError("DivLine dragging is only supported for divLine with facsimiles!");
+            m_infoObject.import("status", "FAILURE");
+            m_infoObject.import("message", "DivLine dragging is only supported for divLine with facsimiles.");
+            return false;
+        }
+        FacsimileInterface *fi = (*divLine).GetFacsimileInterface();
+        assert(fi);
+        if (fi->GetZone() != NULL) {
+            Zone *zone = fi->GetZone();
+            assert(zone);
+            zone->ShiftByXY(x, -y);
+        }
+        ChangeStaff(elementId);
+    }
     else {
         LogWarning("Unsupported element for dragging.");
         m_infoObject.import("status", "FAILURE");
@@ -629,8 +786,8 @@ bool EditorToolkitNeume::Insert(std::string elementType, std::string staffId, in
             parent = m_doc->GetDrawingPage()->FindDescendantByType(MEASURE);
             assert(parent);
             newStaff = new Staff(1);
-            newStaff->m_drawingStaffDef
-                = vrv_cast<StaffDef *>(m_doc->GetCurrentScoreDef()->FindDescendantByType(STAFFDEF));
+            newStaff->m_drawingStaffDef = vrv_cast<StaffDef *>(
+                m_doc->GetCorrespondingScore(parent)->GetScoreDef()->FindDescendantByType(STAFFDEF));
             newStaff->m_drawingNotationType = NOTATIONTYPE_neume;
             newStaff->m_drawingLines = 4;
         }
@@ -697,6 +854,11 @@ bool EditorToolkitNeume::Insert(std::string elementType, std::string staffId, in
         surface->AddChild(zone);
         zone->SetUlx(ulx);
 
+        Text *text = new Text();
+        std::u32string str = U"";
+        text->SetText(str);
+        syl->AddChild(text);
+
         neume->AddChild(nc);
         syllable->AddChild(neume);
         syllable->AddChild(syl);
@@ -710,22 +872,43 @@ bool EditorToolkitNeume::Insert(std::string elementType, std::string staffId, in
             syl->AddChild(text);
             Zone *sylZone = new Zone();
 
-            // these constants are just to improve visibility of the default boundingbox
-            int offSetUlx = 150;
-            int offSetUly = 50;
-            int offSetLrx = 350;
-            int offSetLry = 250;
-
-            sylZone->SetUlx(ulx + offSetUlx);
-            sylZone->SetUly(uly + offSetUly);
-            sylZone->SetLrx(ulx + offSetLrx);
-            sylZone->SetLry(uly + offSetLry);
+            // calculate bboxUlx and bboxUly wrt rotation using sine rule
+            int draw_w = staff->GetWidth();
+            int draw_h = staff->GetHeight();
+            double theta = staff->GetDrawingRotate();
+            int staffUly = staff->GetDrawingY();
+            int x = ulx - staff->GetDrawingX();
+
+            int bboxUlx = ulx;
+            int bboxUly;
+            // if staff rotates downward to the right
+            if (theta > 0) {
+                int y = (int)((draw_w - x) * tan(theta * M_PI / 180.0));
+                bboxUly = staffUly + draw_h - y;
+            }
+            // if staff rotates upwards to the right
+            else {
+                int y = (int)(x * tan(-theta * M_PI / 180.0));
+                int h = (int)(draw_w * tan(-theta * M_PI / 180.0));
+                bboxUly = staffUly + (draw_h - h) - y;
+            }
+            // width height and offset can be adjusted
+            int bboxWidth = 225;
+            int bboxHeight = 175;
+            int bboxOffsetX = 50;
+
+            sylZone->SetUlx(bboxUlx - bboxOffsetX);
+            sylZone->SetUly(bboxUly);
+            sylZone->SetLrx(bboxUlx + bboxWidth - bboxOffsetX);
+            sylZone->SetLry(bboxUly + bboxHeight);
             surface->AddChild(sylZone);
             fi->AttachZone(sylZone);
         }
 
-        const int noteHeight = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 2);
-        const int noteWidth = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 1.4);
+        const int noteHeight
+            = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_HEIGHT_TO_STAFF_SIZE_RATIO);
+        const int noteWidth
+            = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_WIDTH_TO_STAFF_SIZE_RATIO);
         ulx -= noteWidth / 2;
         // uly -= noteHeight / 2;
         // Set up facsimile
@@ -747,19 +930,35 @@ bool EditorToolkitNeume::Insert(std::string elementType, std::string staffId, in
             return false;
         }
 
-        // Set as inclinatum or virga (if necessary), or get contour for grouping
+        // Set as inclinatum or virga or liquescent (if necessary), or get contour for grouping
         for (auto it = attributes.begin(); it != attributes.end(); ++it) {
             if (it->first == "tilt") {
-                if (it->second == "n") {
-                    nc->SetTilt(COMPASSDIRECTION_n);
+                if (it->second == "s") {
+                    nc->SetTilt(COMPASSDIRECTION_s);
                 }
                 else if (it->second == "se") {
                     nc->SetTilt(COMPASSDIRECTION_se);
                 }
+                else if (it->second == "n") {
+                    nc->SetTilt(COMPASSDIRECTION_n);
+                }
             }
             else if (it->first == "contour") {
                 contour = it->second;
             }
+            else if (it->first == "curve") {
+                Liquescent *liquescent = new Liquescent();
+                curvatureDirection_CURVE curve = curvatureDirection_CURVE_NONE;
+                if (it->second == "a") {
+                    curve = curvatureDirection_CURVE_a;
+                    nc->SetCurve(curve);
+                }
+                else if (it->second == "c") {
+                    curve = curvatureDirection_CURVE_c;
+                    nc->SetCurve(curve);
+                }
+                nc->AddChild(liquescent);
+            }
         }
 
         // If inserting grouping, add the remaining nc children to the neume.
@@ -824,112 +1023,575 @@ bool EditorToolkitNeume::Insert(std::string elementType, std::string staffId, in
     else if (elementType == "clef") {
         delete zone;
 
-        Clef *clef = new Clef();
-        data_CLEFSHAPE clefShape = CLEFSHAPE_NONE;
+        Clef *clef = new Clef();
+        data_CLEFSHAPE clefShape = CLEFSHAPE_NONE;
+
+        for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+            if (it->first == "shape") {
+                if (it->second == "C") {
+                    clefShape = CLEFSHAPE_C;
+                    break;
+                }
+                else if (it->second == "F") {
+                    clefShape = CLEFSHAPE_F;
+                    break;
+                }
+            }
+        }
+        if (clefShape == CLEFSHAPE_NONE) {
+            LogError("A clef shape must be specified.");
+            delete clef;
+
+            m_infoObject.import("status", "FAILURE");
+            m_infoObject.import("message", "A clef shape must be specified.");
+            return false;
+        }
+        clef->SetShape(clefShape);
+        const int staffSize = m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+        int yDiff = -staff->GetDrawingY() + uly;
+        yDiff += ((ulx - staff->GetZone()->GetUlx()))
+            * tan(-staff->GetDrawingRotate() * M_PI / 180.0); // Subtract distance due to rotate.
+        int clefLine = staff->m_drawingLines - round((double)yDiff / (double)staffSize);
+        clef->SetLine(clefLine);
+
+        Zone *zone = new Zone();
+        zone->SetUlx(ulx);
+        zone->SetUly(uly);
+        zone->SetLrx(ulx + staffSize / NOTE_WIDTH_TO_STAFF_SIZE_RATIO);
+        zone->SetLry(uly + staffSize / NOTE_HEIGHT_TO_STAFF_SIZE_RATIO);
+        clef->AttachZone(zone);
+        Surface *surface = dynamic_cast<Surface *>(facsimile->FindDescendantByType(SURFACE));
+        assert(surface);
+        surface->AddChild(zone);
+        layer->AddChild(clef);
+        m_infoObject.import("uuid", clef->GetID());
+        layer->ReorderByXPos();
+
+        // ensure pitched elements associated with this clef keep their x,y positions
+
+        ClassIdComparison ac(CLEF);
+        Clef *previousClef = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindPreviousChild(&ac, clef));
+        Clef *nextClef = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindNextChild(&ac, clef));
+
+        if (previousClef == NULL) {
+            // if there is no previous clef, get the default one from the staff def
+            previousClef = layer->GetCurrentClef();
+        }
+
+        // adjust pitched elements whose clef is changing
+        ListOfObjects elements;
+        InterfaceComparison ic(INTERFACE_PITCH);
+
+        m_doc->GetDrawingPage()->FindAllDescendantsBetween(
+            &elements, &ic, clef, (nextClef != NULL) ? nextClef : m_doc->GetDrawingPage()->GetLast());
+
+        for (auto it = elements.begin(); it != elements.end(); ++it) {
+            PitchInterface *pi = (*it)->GetPitchInterface();
+            assert(pi);
+            pi->AdjustPitchForNewClef(previousClef, clef);
+        }
+    }
+    else if (elementType == "custos") {
+        Custos *custos = new Custos();
+        zone->SetUlx(ulx);
+        Surface *surface = vrv_cast<Surface *>(facsimile->GetFirst(SURFACE));
+        surface->AddChild(zone);
+        custos->AttachZone(zone);
+        layer->AddChild(custos);
+
+        const int noteHeight
+            = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_HEIGHT_TO_STAFF_SIZE_RATIO);
+        const int noteWidth
+            = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_WIDTH_TO_STAFF_SIZE_RATIO);
+
+        ulx -= noteWidth / 2;
+        uly -= noteHeight / 2;
+
+        zone->SetUlx(ulx);
+        zone->SetUly(uly);
+        zone->SetLrx(ulx + noteWidth);
+        zone->SetLry(uly + noteHeight);
+        layer->ReorderByXPos();
+        if (!AdjustPitchFromPosition(custos)) {
+            LogError("Failed to set pitch.");
+
+            m_infoObject.import("status", "FAILURE");
+            m_infoObject.import("message", "Failed to set pitch.");
+            return false;
+        }
+        m_infoObject.import("uuid", custos->GetID());
+    }
+    else if (elementType == "accid") {
+        Accid *accid = new Accid();
+        data_ACCIDENTAL_WRITTEN accidTypeW = ACCIDENTAL_WRITTEN_NONE;
+
+        for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+            if (it->first == "accid") {
+                if (it->second == "f") {
+                    accidTypeW = ACCIDENTAL_WRITTEN_f;
+                    break;
+                }
+                else if (it->second == "n") {
+                    accidTypeW = ACCIDENTAL_WRITTEN_n;
+                }
+            }
+        }
+        if (accidTypeW == ACCIDENTAL_WRITTEN_NONE) {
+            LogError("A accid type must be specified.");
+            delete accid;
+
+            m_infoObject.import("status", "FAILURE");
+            m_infoObject.import("message", "A accid type must be specified.");
+            return false;
+        }
+
+        accid->SetAccid(accidTypeW);
+        zone->SetUlx(ulx);
+        Surface *surface = dynamic_cast<Surface *>(facsimile->GetFirst(SURFACE));
+        surface->AddChild(zone);
+        accid->AttachZone(zone);
+        layer->AddChild(accid);
+
+        const int noteHeight
+            = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_HEIGHT_TO_STAFF_SIZE_RATIO);
+        const int noteWidth
+            = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_WIDTH_TO_STAFF_SIZE_RATIO);
+
+        ulx -= noteWidth / 2;
+        uly -= noteHeight / 2;
+
+        zone->SetUlx(ulx);
+        zone->SetUly(uly);
+        zone->SetLrx(ulx + noteWidth);
+        zone->SetLry(uly + noteHeight);
+        layer->ReorderByXPos();
+
+        m_infoObject.import("uuid", accid->GetID());
+    }
+    else if (elementType == "divLine") {
+        DivLine *divLine = new DivLine();
+        divLineLog_FORM divLineTypeW = divLineLog_FORM_NONE;
+
+        for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+            if (it->first == "form") {
+                if (it->second == "maxima") {
+                    divLineTypeW = divLineLog_FORM_maxima;
+                    break;
+                }
+                else if (it->second == "maior") {
+                    divLineTypeW = divLineLog_FORM_maior;
+                    break;
+                }
+                else if (it->second == "minima") {
+                    divLineTypeW = divLineLog_FORM_minima;
+                    break;
+                }
+                else if (it->second == "finalis") {
+                    divLineTypeW = divLineLog_FORM_finalis;
+                    break;
+                }
+                else if (it->second == "caesura") {
+                    divLineTypeW = divLineLog_FORM_caesura;
+                    break;
+                }
+                else if (it->second == "virgula") {
+                    divLineTypeW = divLineLog_FORM_virgula;
+                    break;
+                }
+            }
+        }
+        if (divLineTypeW == divLineLog_FORM_NONE) {
+            LogError("A divLine type must be specified.");
+            delete divLine;
+
+            m_infoObject.import("status", "FAILURE");
+            m_infoObject.import("message", "A divLine type must be specified.");
+            return false;
+        }
+
+        divLine->SetForm(divLineTypeW);
+        zone->SetUlx(ulx);
+        Surface *surface = dynamic_cast<Surface *>(facsimile->GetFirst(SURFACE));
+        surface->AddChild(zone);
+        divLine->AttachZone(zone);
+        layer->AddChild(divLine);
+
+        const int noteHeight
+            = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_HEIGHT_TO_STAFF_SIZE_RATIO);
+        const int noteWidth
+            = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_WIDTH_TO_STAFF_SIZE_RATIO);
+
+        ulx -= noteWidth / 2;
+        uly -= noteHeight / 2;
+
+        zone->SetUlx(ulx);
+        zone->SetUly(uly);
+        zone->SetLrx(ulx + noteWidth);
+        zone->SetLry(uly + noteHeight);
+        layer->ReorderByXPos();
+
+        m_infoObject.import("uuid", divLine->GetID());
+    }
+    else {
+        delete zone;
+        LogError("Unsupported type '%s' for insertion", elementType.c_str());
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Unsupported type '" + elementType + "' for insertion.");
+        return false;
+    }
+    layer->ReorderByXPos();
+    m_infoObject.import("status", status);
+    m_infoObject.import("message", message);
+    return true;
+}
+
+bool EditorToolkitNeume::InsertToSyllable(std::string elementId)
+{
+    if (!m_doc->GetDrawingPage()) {
+        LogError("Could not get drawing page");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Could not get drawing page.");
+        return false;
+    }
+    if (m_doc->GetType() != Facs) {
+        LogError("Drawing page without facsimile");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Drawing page without facsimile is unsupported.");
+        return false;
+    }
+
+    Object *element = m_doc->GetDrawingPage()->FindDescendantByID(elementId);
+    assert(element);
+    Object *parent = element->GetParent();
+    assert(parent);
+
+    if (element == NULL) {
+        LogError("No element exists with ID '%s'.", elementId.c_str());
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "No element exists with ID" + elementId + ".");
+        return false;
+    }
+    if (!(element->Is(DIVLINE) || element->Is(ACCID) || element->Is(CLEF))) {
+        LogError("Element is of type %s, but only Divlines and Accids can be inserted into syllables.",
+            element->GetClassName().c_str());
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message",
+            "Element is of type " + element->GetClassName()
+                + ", but only DivLines, Accids, and Clefs can be inserted into syllables.");
+        return false;
+    }
+    if (!parent->Is(LAYER)) {
+        LogError("The selected %s is not a child of layer.", element->GetClassName().c_str());
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "The selected " + element->GetClassName() + "is not a child of layer.");
+        return false;
+    }
+
+    // get the position of the selected element
+    int ulx;
+    int uly;
+    if (dynamic_cast<FacsimileInterface *>(element)->HasFacs()) {
+        ulx = element->GetFacsimileInterface()->GetZone()->GetUlx();
+        uly = element->GetFacsimileInterface()->GetZone()->GetUly();
+    }
+    else {
+        LogError("Selected '%s' without facsimile", element->GetClassName().c_str());
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Selected '" + element->GetClassName() + "' without facsimile is unsupported.");
+        return false;
+    }
+
+    Staff *staff = dynamic_cast<Staff *>(element->GetFirstAncestor(STAFF));
+    assert(staff);
+
+    // find closest neume
+    ListOfObjects neumes;
+    ClassIdComparison ac(NEUME);
+    staff->FindAllDescendantsByComparison(&neumes, &ac);
+
+    if (neumes.empty()) {
+        LogError("A syllable must exist in the staff to insert a '%s' into.", element->GetClassName().c_str());
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import(
+            "message", "A syllable must exist in the staff to insert a '" + element->GetClassName() + "' into.");
+        return false;
+    }
+
+    std::vector<Object *> neumesVector(neumes.begin(), neumes.end());
+    ClosestNeume compN;
+    compN.x = ulx;
+    compN.y = uly;
+    std::sort(neumesVector.begin(), neumesVector.end(), compN);
+
+    Object *neume = neumesVector.at(0);
+    assert(neume);
+    // get nearest syllable using nearest neume
+    Object *syllable = neume->GetParent();
+    assert(syllable);
+
+    // Find previous clef preceding following syllable (for is element is clef)
+    ClassIdComparison cc(CLEF);
+    ClassIdComparison sc(SYLLABLE);
+
+    Object *nextSyllable = m_doc->GetDrawingPage()->FindNextChild(&sc, syllable);
+    Clef *clefPrecedingNextSyllableBefore
+        = (nextSyllable) ? dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindPreviousChild(&cc, nextSyllable)) : NULL;
+
+    // Move clef inside syllable
+    element->MoveItselfTo(syllable);
+    syllable->ReorderByXPos();
+    parent->ClearRelinquishedChildren();
+    parent->ReorderByXPos();
+
+    // Adjust pitches of elements following inserted clef inside syllable
+    if (element->Is(CLEF)) {
+        Clef *clef = dynamic_cast<Clef *>(element);
+        Layer *layer = dynamic_cast<Layer *>(clef->GetFirstAncestor(LAYER));
+        assert(layer);
+        InterfaceComparison ic(INTERFACE_PITCH);
+
+        // Get elements after inserted clef until another inserted clef or end of syllable
+        Object *nextClef = m_doc->GetDrawingPage()->FindNextChild(&cc, clef);
+        Object *endElement;
+        if ((nextClef) && (nextClef->GetParent() == syllable)) {
+            endElement = nextClef;
+        }
+        else {
+            endElement = (nextSyllable) ? nextSyllable : m_doc->GetDrawingPage()->GetLast();
+        }
+        ListOfObjects targetedElements;
+        m_doc->GetDrawingPage()->FindAllDescendantsBetween(&targetedElements, &ic, clef, endElement);
+
+        // Adjust pitches for elements in syllable affected by inserted clef
+        Clef *precedingClef = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindPreviousChild(&cc, clef));
+        Clef *previousClef = (precedingClef) ? precedingClef : layer->GetCurrentClef();
+        for (Object *iter : targetedElements) {
+            iter->GetPitchInterface()->AdjustPitchForNewClef(previousClef, clef);
+        }
+
+        // In the case of this clef moving before any clefs outside the syllable in mei
+        if (nextSyllable) {
+            Clef *clefPrecedingNextSyllableAfter = (nextSyllable)
+                ? dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindPreviousChild(&cc, nextSyllable))
+                : NULL;
+            // adjust pitches following new clef accordingly
+            if (clefPrecedingNextSyllableBefore != clefPrecedingNextSyllableAfter) {
+                Clef *nextClef
+                    = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindNextChild(&cc, clefPrecedingNextSyllableAfter));
+                Object *endElement = (nextClef) ? nextClef : m_doc->GetDrawingPage()->GetLast();
+                ListOfObjects followingElements;
+                m_doc->GetDrawingPage()->FindAllDescendantsBetween(&followingElements, &ic, nextSyllable, endElement);
+
+                for (Object *iter : followingElements) {
+                    iter->GetPitchInterface()->AdjustPitchForNewClef(
+                        clefPrecedingNextSyllableBefore, clefPrecedingNextSyllableAfter);
+                }
+            }
+        }
+    }
+
+    m_infoObject.import("status", "OK");
+    m_infoObject.import("message", "");
+    return true;
+}
+
+bool EditorToolkitNeume::MoveOutsideSyllable(std::string elementId)
+{
+    if (!m_doc->GetDrawingPage()) {
+        LogError("Could not get drawing page");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Could not get drawing page.");
+        return false;
+    }
+    if (m_doc->GetType() != Facs) {
+        LogError("Drawing page without facsimile");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Drawing page without facsimile is unsupported.");
+        return false;
+    }
+
+    Object *element = m_doc->GetDrawingPage()->FindDescendantByID(elementId);
+    assert(element);
+    Object *parent = element->GetParent();
+    assert(parent);
+
+    if (element == NULL) {
+        LogError("No element exists with ID '%s'.", elementId.c_str());
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "No element exists with ID" + elementId + ".");
+        return false;
+    }
+    if (!(element->Is(DIVLINE) || element->Is(ACCID) || element->Is(CLEF))) {
+        LogError("Element is of type %s, but only Divlines, Accids, and Clefs can be moved out of syllables.",
+            element->GetClassName().c_str());
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message",
+            "Element is of type " + element->GetClassName()
+                + ", but only DivLines and Accids can be inserted into syllables.");
+        return false;
+    }
+    if (!parent->Is(SYLLABLE)) {
+        LogError("The selected %s is not a child of syllable.", element->GetClassName().c_str());
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "The selected " + element->GetClassName() + "is not a child of syllable.");
+        return false;
+    }
+
+    Object *secondParent = parent->GetParent();
+    assert(secondParent);
+
+    // Track variables for clef handling
+    Object *fNc = parent->GetFirst(NEUME)->GetFirst(NC);
+    Object *lNc;
+    if (parent->GetChildCount(NEUME) == 1) {
+        lNc = parent->GetFirst(NEUME)->GetLast();
+    }
+    else {
+        lNc = parent->GetLast(NEUME)->GetLast();
+    }
+    int xLeft = fNc->GetFacsimileInterface()->GetZone()->GetUlx();
+    int xRight = lNc->GetFacsimileInterface()->GetZone()->GetLrx();
+    int xElement = element->GetFacsimileInterface()->GetZone()->GetLrx();
+
+    // If Clef is BEFORE, INSIDE, or AFTER rest of syllable - move to mei location then use ClefMovementHandler
+    if (element->Is(CLEF)) {
+        Clef *clef = dynamic_cast<Clef *>(element);
+        // BEFORE
+        if (xElement < xLeft) {
+            ClefMovementHandler(clef, (xLeft - xElement), 0);
+        }
+        // AFTER
+        else if (xRight < xElement) {
+            clef->GetFacsimileInterface()->GetZone()->ShiftByXY(xRight - xElement + 1, 0);
+        }
+        // INSIDE do nothing
+
+        Object *syllable = parent;
+        Layer *layer = dynamic_cast<Layer *>(clef->GetFirstAncestor(LAYER));
+        assert(layer);
 
-        for (auto it = attributes.begin(); it != attributes.end(); ++it) {
-            if (it->first == "shape") {
-                if (it->second == "C") {
-                    clefShape = CLEFSHAPE_C;
-                    break;
-                }
-                else if (it->second == "F") {
-                    clefShape = CLEFSHAPE_F;
-                    break;
-                }
-            }
+        // Restore pitches of neumes affected by clef
+        ClassIdComparison cc(CLEF);
+        InterfaceComparison ic(INTERFACE_PITCH);
+        ClassIdComparison sc(SYLLABLE);
+        // Get elements after inserted clef until another inserted clef or end of syllable
+        Object *nextSyllable = m_doc->GetDrawingPage()->FindNextChild(&sc, syllable);
+        Object *nextClef = m_doc->GetDrawingPage()->FindNextChild(&cc, clef);
+        Object *endElement;
+        if ((nextClef) && (nextClef->GetParent() == syllable)) {
+            endElement = nextClef;
         }
-        if (clefShape == CLEFSHAPE_NONE) {
-            LogError("A clef shape must be specified.");
-            delete clef;
-
-            m_infoObject.import("status", "FAILURE");
-            m_infoObject.import("message", "A clef shape must be specified.");
-            return false;
+        else {
+            endElement = (nextSyllable) ? nextSyllable : m_doc->GetDrawingPage()->GetLast();
         }
-        clef->SetShape(clefShape);
-        const int staffSize = m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-        int yDiff = -staff->GetDrawingY() + uly;
-        yDiff += ((ulx - staff->GetZone()->GetUlx()))
-            * tan(-staff->GetDrawingRotate() * M_PI / 180.0); // Subtract distance due to rotate.
-        int clefLine = staff->m_drawingLines - round((double)yDiff / (double)staffSize);
-        clef->SetLine(clefLine);
+        ListOfObjects targetedElements;
+        m_doc->GetDrawingPage()->FindAllDescendantsBetween(&targetedElements, &ic, clef, endElement);
 
-        Zone *zone = new Zone();
-        zone->SetUlx(ulx);
-        zone->SetUly(uly);
-        zone->SetLrx(ulx + staffSize / 1.4);
-        zone->SetLry(uly + staffSize / 2);
-        clef->AttachZone(zone);
-        Surface *surface = vrv_cast<Surface *>(facsimile->FindDescendantByType(SURFACE));
-        assert(surface);
-        surface->AddChild(zone);
-        layer->AddChild(clef);
-        m_infoObject.import("uuid", clef->GetID());
-        layer->ReorderByXPos();
+        Clef *precedingClef = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindPreviousChild(&cc, clef));
+        precedingClef = (precedingClef != NULL) ? precedingClef : layer->GetCurrentClef();
 
-        // ensure pitched elements associated with this clef keep their x,y positions
+        for (Object *iter : targetedElements) {
+            iter->GetPitchInterface()->AdjustPitchForNewClef(clef, precedingClef);
+        }
+    }
 
-        ClassIdComparison ac(CLEF);
-        Clef *previousClef = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindPreviousChild(&ac, clef));
-        Clef *nextClef = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindNextChild(&ac, clef));
+    element->MoveItselfTo(secondParent);
+    secondParent->ReorderByXPos();
+    parent->ClearRelinquishedChildren();
+    parent->ReorderByXPos();
 
-        if (previousClef == NULL) {
-            // if there is no previous clef, get the default one from the staff def
-            previousClef = layer->GetCurrentClef();
+    if (element->Is(CLEF)) {
+        Clef *clef = dynamic_cast<Clef *>(element);
+        // BEFORE
+        if (xElement < xLeft) {
+            ClefMovementHandler(clef, (xElement - xLeft), 0);
         }
+        // AFTER
+        else if (xRight < xElement) {
+            ClefMovementHandler(clef, xElement - xRight - 1, 0);
+        }
+        // INSIDE do nothing
+    }
 
-        // adjust pitched elements whose clef is changing
-        ListOfObjects elements;
-        InterfaceComparison ic(INTERFACE_PITCH);
+    m_infoObject.import("status", "OK");
+    m_infoObject.import("message", "");
+    return true;
+}
 
-        m_doc->GetDrawingPage()->FindAllDescendantsBetween(
-            &elements, &ic, clef, (nextClef != NULL) ? nextClef : m_doc->GetDrawingPage()->GetLast());
+bool EditorToolkitNeume::DisplaceClefOctave(std::string elementId, std::string direction)
+{
+    if (!m_doc->GetDrawingPage()) {
+        LogError("Could not get the drawing page.");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Could not get the drawing page.");
+        return false;
+    }
 
-        for (auto it = elements.begin(); it != elements.end(); ++it) {
-            PitchInterface *pi = (*it)->GetPitchInterface();
-            assert(pi);
-            pi->AdjustPitchForNewClef(previousClef, clef);
-        }
+    if (direction != "above" && direction != "below") {
+        LogError("Direction can only be either \"above\" or \"below\".");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Direction can only be either \"above\" or \"below\".");
+        return false;
     }
-    else if (elementType == "custos") {
-        Custos *custos = new Custos();
-        zone->SetUlx(ulx);
-        Surface *surface = vrv_cast<Surface *>(facsimile->GetFirst(SURFACE));
-        surface->AddChild(zone);
-        custos->AttachZone(zone);
-        layer->AddChild(custos);
 
-        const int noteHeight = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 2);
-        const int noteWidth = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 1.4);
+    Page *page = m_doc->GetDrawingPage();
+    Object *obj = page->FindDescendantByID(elementId);
+    if (obj == NULL || !obj->Is(CLEF)) {
+        LogError("This action can only be done on clefs!");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "This action can only be done on clefs!");
+        return false;
+    }
 
-        ulx -= noteWidth / 2;
-        uly -= noteHeight / 2;
+    // Calculate new octave displacement by converting @dis and @dis.place to
+    // an integer octave value.
+    // Increment or decrement that integer value, then from this new octave
+    // value, set @dis and @dis.place accordingly.
+    Clef *clef = dynamic_cast<Clef *>(obj);
+    int prevDirection = clef->GetDisPlace() == STAFFREL_basic_above ? 1 : -1;
+    int move = direction == "above" ? 1 : -1;
+    int octaveDis = prevDirection * (clef->GetDis() / 7) + move;
 
-        zone->SetUlx(ulx);
-        zone->SetUly(uly);
-        zone->SetLrx(ulx + noteWidth);
-        zone->SetLry(uly + noteHeight);
-        layer->ReorderByXPos();
-        if (!AdjustPitchFromPosition(custos)) {
-            LogError("Failed to set pitch.");
+    if (octaveDis > 3 || octaveDis < -3) {
+        LogError("Clefs can only be displaced 3 octaves.");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Clefs can only be displaced 3 octaves.");
+        return false;
+    }
 
-            m_infoObject.import("status", "FAILURE");
-            m_infoObject.import("message", "Failed to set pitch.");
-            return false;
-        }
-        m_infoObject.import("uuid", custos->GetID());
+    // Set clef's new octave
+    if (octaveDis == 0) {
+        clef->SetDis(OCTAVE_DIS_NONE);
+        clef->SetDisPlace(STAFFREL_basic_NONE);
     }
     else {
-        delete zone;
-        LogError("Unsupported type '%s' for insertion", elementType.c_str());
-        m_infoObject.import("status", "FAILURE");
-        m_infoObject.import("message", "Unsupported type '" + elementType + "' for insertion.");
-        return false;
+        data_OCTAVE_DIS displaced = OCTAVE_DIS_NONE;
+        if (octaveDis == 1 || octaveDis == -1)
+            displaced = OCTAVE_DIS_8;
+        else if (octaveDis == 2 || octaveDis == -2)
+            displaced = OCTAVE_DIS_15;
+        else if (octaveDis == 3 || octaveDis == -3)
+            displaced = OCTAVE_DIS_22;
+
+        clef->SetDis(displaced);
+        clef->SetDisPlace(octaveDis > 0 ? STAFFREL_basic_above : STAFFREL_basic_below);
     }
-    layer->ReorderByXPos();
-    m_infoObject.import("status", status);
-    m_infoObject.import("message", message);
+
+    // Set new octaves for affected neume components
+    ClassIdComparison equalsClef(CLEF);
+    Clef *nextClef = dynamic_cast<Clef *>(page->FindNextChild(&equalsClef, clef));
+
+    ClassIdComparison equalsNcs(NC);
+    ListOfObjects ncs;
+    page->FindAllDescendantsBetween(&ncs, &equalsNcs, clef, nextClef);
+
+    std::for_each(ncs.begin(), ncs.end(), [&](Object *ncObj) {
+        Nc *nc = dynamic_cast<Nc *>(ncObj);
+        nc->SetOct(nc->GetOct() + move);
+    });
+
+    m_infoObject.import("status", "OK");
+    m_infoObject.import("message", "");
     return true;
 }
 
@@ -1120,6 +1782,11 @@ bool EditorToolkitNeume::SetText(std::string elementId, const std::string &text)
         Syl *syl = vrv_cast<Syl *>(syllable->GetFirst(SYL));
         if (syl == NULL) {
             syl = new Syl();
+            Text *text = new Text();
+            std::u32string str = U"";
+            text->SetText(str);
+            syl->AddChild(text);
+
             syllable->AddChild(syl);
             Text *textChild = new Text();
             textChild->SetText(wtext);
@@ -1129,11 +1796,15 @@ bool EditorToolkitNeume::SetText(std::string elementId, const std::string &text)
                 Zone *zone = new Zone();
                 int ulx, uly, lrx, lry;
                 if (syllable->GenerateZoneBounds(&ulx, &uly, &lrx, &lry)) {
+                    // int offSetUlx = 150;
+                    int offSetUly = 50;
+                    int offSetLrx = 50;
+                    int offSetLry = 150;
                     zone->SetUlx(ulx);
-                    zone->SetUly(uly);
-                    zone->SetLrx(lrx);
-                    zone->SetLry(lry);
-                    Surface *surface = vrv_cast<Surface *>(m_doc->GetFacsimile()->FindDescendantByType(SURFACE));
+                    zone->SetUly(uly + offSetUly);
+                    zone->SetLrx(lrx + offSetLrx);
+                    zone->SetLry(lry + offSetLry);
+                    Surface *surface = dynamic_cast<Surface *>(m_doc->GetFacsimile()->FindDescendantByType(SURFACE));
                     surface->AddChild(zone);
                     syl->AttachZone(zone);
                 }
@@ -1424,12 +2095,13 @@ bool EditorToolkitNeume::Remove(std::string elementId)
         parent = parent->GetParent();
         if (obj->FindDescendantByType(NC) == NULL) {
             // Check if it is part of a linked/split syllable and unlink
-            Syllable *li = vrv_cast<Syllable *>(obj);
+            Syllable *li = dynamic_cast<Syllable *>(obj);
             assert(li);
             if (li->HasPrecedes() || li->HasFollows()) {
                 std::string linkedID = (li->HasPrecedes() ? li->GetPrecedes() : li->GetFollows());
                 if (linkedID.compare(0, 1, "#") == 0) linkedID.erase(0, 1);
-                Syllable *linkedSyllable = vrv_cast<Syllable *>(m_doc->GetDrawingPage()->FindDescendantByID(linkedID));
+                Syllable *linkedSyllable
+                    = dynamic_cast<Syllable *>(m_doc->GetDrawingPage()->FindDescendantByID(linkedID));
                 if (linkedSyllable != NULL) {
                     if (linkedSyllable->HasPrecedes()) linkedSyllable->SetPrecedes("");
                     if (linkedSyllable->HasFollows()) linkedSyllable->SetFollows("");
@@ -1507,10 +2179,24 @@ bool EditorToolkitNeume::Resize(std::string elementId, int ulx, int uly, int lrx
         }
         Zone *zone = syl->GetZone();
         assert(zone);
-        zone->SetUlx(ulx);
-        zone->SetUly(uly);
-        zone->SetLrx(lrx);
-        zone->SetLry(lry);
+        if (ulx < lrx) {
+            zone->SetUlx(ulx);
+            zone->SetLrx(lrx);
+        }
+        else {
+            zone->SetUlx(lrx);
+            zone->SetLrx(ulx);
+        }
+
+        if (uly < lry) {
+            zone->SetUly(uly);
+            zone->SetLry(lry);
+        }
+        else {
+            zone->SetUly(lry);
+            zone->SetLry(uly);
+        }
+
         if (!isnan(rotate)) {
             zone->SetRotate(rotate);
         }
@@ -1595,6 +2281,67 @@ bool EditorToolkitNeume::Group(std::string groupType, std::vector<std::string> e
             m_infoObject.import("message", "Parent of " + el->GetID() + " is null.");
             return false;
         }
+
+        if (par->GetClassId() == SYLLABLE) {
+            // Check if it is part of a linked/split syllable
+            // unlink, group into two new syllables, and link resulting syllables
+            Syllable *parSyllable = dynamic_cast<Syllable *>(par);
+            assert(parSyllable);
+            std::string linkedID;
+            if (parSyllable->HasFollows()) {
+                linkedID = parSyllable->GetFollows();
+                if (linkedID.compare(0, 1, "#") == 0) linkedID.erase(0, 1);
+
+                // unlink
+                Set(parSyllable->GetID(), "follows", "");
+                Set(linkedID, "precedes", "");
+
+                // group into two new syllables
+                int idx = static_cast<int>(std::distance(elementIds.begin(), it));
+                std::string resultId0;
+                std::string resultId1;
+
+                // LogMessage("%s", chainArray.get<jsonxx::Object>(0).json().c_str());
+                // for_each(elementIds.begin(), elementIds.begin()+idx,[](std::string s){LogMessage("%s", s.c_str());});
+
+                std::vector<std::string> elementIds0 = { elementIds.begin(), elementIds.begin() + idx };
+                Group("neume", elementIds0);
+                if (m_infoObject.get<jsonxx::String>("status") == "FAILURE") {
+                    resultId0 = linkedID;
+                }
+                else {
+                    resultId0 = m_infoObject.get<jsonxx::String>("uuid");
+                }
+
+                std::vector<std::string> elementIds1 = { elementIds.begin() + idx, elementIds.end() };
+                Group("neume", elementIds1);
+                if (m_infoObject.get<jsonxx::String>("status") == "FAILURE") {
+                    resultId1 = par->GetID();
+                }
+                else {
+                    resultId1 = m_infoObject.get<jsonxx::String>("uuid");
+                    par = m_doc->GetDrawingPage()->FindDescendantByID(resultId1);
+                }
+
+                // link resulting syllables
+                Set(resultId0, "precedes", "#" + resultId1);
+                Set(resultId1, "follows", "#" + resultId0);
+                Object *resultSyl1 = dynamic_cast<Object *>(par->FindDescendantByType(SYL));
+                if (resultSyl1 != NULL) {
+                    Remove(resultSyl1->GetID());
+                }
+
+                jsonxx::Array uuidArray;
+                uuidArray << resultId0;
+                uuidArray << resultId1;
+
+                m_infoObject.import("uuid", uuidArray);
+                m_infoObject.import("status", status);
+                m_infoObject.import("message", message);
+                return true;
+            }
+        }
+
         if (doubleParent == NULL) {
             doubleParent = par->GetParent();
             if (doubleParent == NULL) {
@@ -1622,6 +2369,29 @@ bool EditorToolkitNeume::Group(std::string groupType, std::vector<std::string> e
         elements.insert(el);
     }
 
+    if (parents.size() == 0) {
+        LogError("Could not get the parent.");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Could not get the parent.");
+        return false;
+    }
+    else if (parents.size() == 1) {
+        LogError("The selected elements are already grouped.");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "The selected elements are already grouped.");
+        return false;
+    }
+
+    // auto it = elementIds.begin();
+    // Object *el = m_doc->GetDrawingPage()->FindDescendantByID(*it);
+    // Layer *layer = dynamic_cast<Layer *>(el->GetFirstAncestor(LAYER));
+    // if (!layer) {
+    //     LogError("Elements does not have Layer parent. This should not happen.");
+    //     m_infoObject.import("status", "FAILURE");
+    //     m_infoObject.import("message", "Elements does not have Layer parent.");
+    //     return false;
+    // }
+
     std::copy(elements.begin(), elements.end(), std::back_inserter(sortedElements));
     std::stable_sort(sortedElements.begin(), sortedElements.end(), Object::sortByUlx);
 
@@ -1692,6 +2462,8 @@ bool EditorToolkitNeume::Group(std::string groupType, std::vector<std::string> e
             // Ensure a syl is created so text can be added to syllable
             Syl *syl = new Syl();
             Text *text = new Text();
+            std::u32string str = U"";
+            text->SetText(str);
             syl->AddChild(text);
             parent->AddChild(syl);
 
@@ -1782,10 +2554,21 @@ bool EditorToolkitNeume::Group(std::string groupType, std::vector<std::string> e
                 for (auto it = elements.begin(); it != elements.end(); ++it) {
                     if ((*it)->GetParent() != parent && !(*it)->Is(SYL)) {
                         (*it)->MoveItselfTo(parent);
+                        parent->ReorderByXPos();
                     }
                 }
                 doubleParent->AddChild(parent);
             }
+
+            Layer *layer = dynamic_cast<Layer *>(parent->GetFirstAncestor(LAYER));
+            if (!layer) {
+                LogError("Elements does not have Layer parent. This should not happen.");
+                m_infoObject.import("status", "FAILURE");
+                m_infoObject.import("message", "Elements does not have Layer parent.");
+                return false;
+            }
+
+            layer->ReorderByXPos();
         }
         else {
             std::sort(fullParents.begin(), fullParents.end(), Object::sortByUlx);
@@ -1795,15 +2578,17 @@ bool EditorToolkitNeume::Group(std::string groupType, std::vector<std::string> e
             // construct concatenated string of all the syls
             std::u32string fullString = U"";
             for (auto it = fullParents.begin(); it != fullParents.end(); ++it) {
-                Syl *syl = vrv_cast<Syl *>((*it)->FindDescendantByType(SYL));
-                if (syl == NULL) continue;
-                if (fullSyl == NULL) {
-                    fullSyl = syl;
-                }
-                Text *text = vrv_cast<Text *>(syl->FindDescendantByType(TEXT));
-                if (text != NULL) {
-                    std::u32string currentString = text->GetText();
-                    fullString = fullString + currentString;
+                Syl *syl = dynamic_cast<Syl *>((*it)->FindDescendantByType(SYL));
+                if (syl != NULL) {
+                    if (fullSyl == NULL) {
+                        fullSyl = syl;
+                    }
+
+                    Text *text = dynamic_cast<Text *>(syl->FindDescendantByType(TEXT));
+                    if (text != NULL) {
+                        std::u32string currentString = text->GetText();
+                        fullString = fullString + currentString;
+                    }
                 }
             }
             // find the new boundingbox comprising all of the text
@@ -1813,22 +2598,28 @@ bool EditorToolkitNeume::Group(std::string groupType, std::vector<std::string> e
                 assert(par);
                 Syl *descSyl = vrv_cast<Syl *>(par->FindDescendantByType(SYL));
                 assert(descSyl);
-                FacsimileInterface *facsInter = descSyl->GetFacsimileInterface();
-
-                if (facsInter != NULL) {
-                    // Update bb to valid extremes
-                    const int newUlx = facsInter->GetDrawingX();
-                    const int newUly = facsInter->GetDrawingY();
-                    const int newLrx = facsInter->GetWidth() + newUlx;
-                    const int newLry = facsInter->GetHeight() + newUly;
-                    if ((ulx > newUlx) || (ulx < 0)) {
-                        ulx = newUlx;
-                    }
-                    if ((uly > newUly) || (uly < 0)) {
-                        uly = newUly;
+                // FacsimileInterface *facsInter = dynamic_cast<FacsimileInterface *>
+                // ((*it)->FindDescendantByType(SYL)->GetFacsimileInterface());
+                if (descSyl != NULL) {
+                    FacsimileInterface *facsInter
+                        = dynamic_cast<FacsimileInterface *>(descSyl->GetFacsimileInterface());
+
+                    if (facsInter != NULL) {
+                        if (ulx == -1 || ulx > facsInter->GetDrawingX()) {
+                            ulx = facsInter->GetDrawingX();
+                        }
+
+                        if (lrx < facsInter->GetWidth() + facsInter->GetDrawingX()) {
+                            lrx = facsInter->GetWidth() + facsInter->GetDrawingX();
+                        }
+
+                        if (uly == -1 || uly > facsInter->GetDrawingY()) {
+                            uly = facsInter->GetDrawingY();
+                        }
+                        if (lry < facsInter->GetHeight() + facsInter->GetDrawingY()) {
+                            lry = facsInter->GetHeight() + facsInter->GetDrawingY();
+                        }
                     }
-                    lrx = std::max(lrx, newLrx);
-                    lry = std::max(lry, newLry);
                 }
             }
             assert(fullSyl);
@@ -1837,11 +2628,14 @@ bool EditorToolkitNeume::Group(std::string groupType, std::vector<std::string> e
             text->SetText(fullString);
             assert(fullSyllable);
             fullSyllable->AddChild(fullSyl);
+
+            // Move elements to the new group syllable
             for (auto it = elements.begin(); it != elements.end(); ++it) {
                 if ((*it)->GetParent() != fullSyllable && !(*it)->Is(SYL)) {
                     (*it)->MoveItselfTo(fullSyllable);
                 }
             }
+
             if (doubleParent == NULL) {
                 LogError("No second level parent!");
                 return false;
@@ -1894,10 +2688,27 @@ bool EditorToolkitNeume::Group(std::string groupType, std::vector<std::string> e
             }
             doubleParent->DeleteChild(obj);
         }
-        else if (obj->GetChildCount() == obj->GetChildCount(SYL)) {
-            Object *syl;
-            while ((syl = obj->FindDescendantByType(SYL)) != NULL) {
-                obj->DeleteChild(syl);
+        else if (obj->GetChildCount()
+            == (obj->GetChildCount(SYL) + obj->GetChildCount(DIVLINE) + obj->GetChildCount(ACCID)
+                + obj->GetChildCount(CLEF))) {
+            Object *leftover;
+            while ((leftover = obj->FindDescendantByType(SYL)) != NULL) {
+                obj->DeleteChild(leftover);
+            }
+            while ((leftover = obj->FindDescendantByType(DIVLINE)) != NULL) {
+                leftover->MoveItselfTo(parent);
+                parent->ReorderByXPos();
+                obj->ClearRelinquishedChildren();
+            }
+            while ((leftover = obj->FindDescendantByType(ACCID)) != NULL) {
+                leftover->MoveItselfTo(parent);
+                parent->ReorderByXPos();
+                obj->ClearRelinquishedChildren();
+            }
+            while ((leftover = obj->FindDescendantByType(CLEF)) != NULL) {
+                leftover->MoveItselfTo(parent);
+                parent->ReorderByXPos();
+                obj->ClearRelinquishedChildren();
             }
             if (doubleParent == NULL) {
                 LogError("No second level parent!");
@@ -1925,8 +2736,16 @@ bool EditorToolkitNeume::Ungroup(std::string groupType, std::vector<std::string>
     Object *fparent = NULL; // Parent one level up (first parent)
     Object *sparent = NULL; // Parent two levels up (second parent)
     Object *currentParent = NULL;
-    int ligCount = 0; // track ligature components. groupType=nc only.
-    Clef *oldClef = NULL; // clef element originally applied to neumes. groupType=neume only.
+    Object *newParent = NULL;
+
+    Nc *firstNc = NULL;
+    Nc *secondNc = NULL;
+    bool success1, success2;
+    int ligCount = 0; // for ungroup ligature into nc
+    int ligNum = 0; // for ligature in ungroupNcs
+    int firstIsLig = false;
+    bool firstIsSyl = false;
+    Clef *oldClef = NULL;
     ClassIdComparison ac(CLEF);
     ListOfObjects syllables; // List of syllables used. groupType=neume only.
 
@@ -1939,15 +2758,109 @@ bool EditorToolkitNeume::Ungroup(std::string groupType, std::vector<std::string>
         m_infoObject.import("message", "Could not get the drawing page.");
         return false;
     }
+
     for (auto it = elementIds.begin(); it != elementIds.end(); ++it) {
         Object *el = m_doc->GetDrawingPage()->FindDescendantByID(*it);
 
-        if (groupType == "neume") {
-            // Keep the syl attached to the original syllable.
+        // Check for ligatures and toggle them before ungrouping
+        // only if the ligature is the entire selection
+        if (groupType == "nc" && elementIds.size() == 2) {
+            Nc *nc = dynamic_cast<Nc *>(el);
+            assert(nc);
+            if (nc->HasLigated() && nc->GetLigated() == BOOLEAN_true) {
+                nc->SetLigated(BOOLEAN_false);
+                ligCount++;
+                if (ligCount == 1) {
+                    firstNc = nc;
+                    assert(firstNc);
+                }
+                else if (ligCount == 2) {
+                    secondNc = nc;
+                    assert(secondNc);
+                    Zone *zone = new Zone();
+
+                    Staff *staff = dynamic_cast<Staff *>(firstNc->GetFirstAncestor(STAFF));
+                    assert(staff);
+                    Facsimile *facsimile = m_doc->GetFacsimile();
+                    assert(facsimile);
+                    Surface *surface = dynamic_cast<Surface *>(facsimile->FindDescendantByType(SURFACE));
+                    assert(surface);
+
+                    const int noteHeight = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)
+                        / NOTE_HEIGHT_TO_STAFF_SIZE_RATIO);
+                    const int noteWidth = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)
+                        / NOTE_WIDTH_TO_STAFF_SIZE_RATIO);
+
+                    if (AttModule::SetNeumes(firstNc, "ligated", "false")) success1 = true;
+
+                    int ligUlx = firstNc->GetZone()->GetUlx();
+                    int ligUly = firstNc->GetZone()->GetUly();
+                    int ligLrx = firstNc->GetZone()->GetLrx();
+                    int ligLry = firstNc->GetZone()->GetLry();
+
+                    zone->SetUlx(ligUlx + noteWidth);
+                    zone->SetUly(ligUly + noteHeight);
+                    zone->SetLrx(ligLrx + noteWidth);
+                    zone->SetLry(ligLry + noteHeight);
+
+                    Zone *origZoneUuid = secondNc->GetZone();
+                    surface->DeleteChild(origZoneUuid);
+
+                    secondNc->AttachZone(zone);
+                    // secondNc->ResetFacsimile();
+
+                    if (AttModule::SetNeumes(secondNc, "ligated", "false")) success2 = true;
+                    if (success1 && success2) {
+                        ligCount = 0;
+                        firstNc = NULL;
+                        secondNc = NULL;
+                    }
+                    else {
+                        LogError("Unable to toggle ligature within ungroup ncs!");
+                        m_infoObject.import("status", "FAILURE");
+                        m_infoObject.import("message", "Unable to toggle ligature within ungroup ncs.");
+                        return false;
+                    }
+                }
+            }
+        }
+        if (el->Is(ACCID) || el->Is(DIVLINE) || el->Is(CLEF)) {
+            fparent = el->GetFirstAncestor(SYLLABLE);
+            sparent = el->GetFirstAncestor(LAYER);
+            if (fparent && sparent) {
+                el->MoveItselfTo(sparent);
+                sparent->ReorderByXPos();
+                fparent->ClearRelinquishedChildren();
+                fparent->ReorderByXPos();
+            }
+            continue;
+        }
+        if (elementIds.begin() == it || firstIsSyl) {
+            // if the element is a syl we want it to stay attached to the first element
+            // we'll still need to initialize all the parents, thus the bool
             if (el->Is(SYL)) {
+                firstIsSyl = true;
                 continue;
             }
-            if (currentParent == NULL) {
+            else if (groupType == "nc") {
+                // Check if the first nc is ligature
+                Nc *nc = dynamic_cast<Nc *>(el);
+                assert(nc);
+                if (nc->HasLigated() && nc->GetLigated() == BOOLEAN_true) {
+                    // ligNum++;
+                    firstIsLig = true;
+                }
+
+                fparent = el->GetFirstAncestor(NEUME);
+                assert(fparent);
+                uuidArray << fparent->GetID();
+                sparent = fparent->GetFirstAncestor(SYLLABLE);
+                assert(sparent);
+                currentParent = dynamic_cast<Neume *>(fparent);
+                assert(currentParent);
+                firstIsSyl = false;
+            }
+            else if (groupType == "neume") {
                 fparent = el->GetFirstAncestor(SYLLABLE);
                 assert(fparent);
                 uuidArray << fparent->GetID();
@@ -1955,6 +2868,7 @@ bool EditorToolkitNeume::Ungroup(std::string groupType, std::vector<std::string>
                 assert(sparent);
                 currentParent = vrv_cast<Syllable *>(fparent);
                 assert(currentParent);
+                firstIsSyl = false;
 
                 // Get clef for clef changes
                 oldClef = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindPreviousChild(&ac, currentParent));
@@ -1964,19 +2878,56 @@ bool EditorToolkitNeume::Ungroup(std::string groupType, std::vector<std::string>
             }
 
             else {
-                // Create a new parent
-                Object *newParent = currentParent->Clone();
+                LogError("Invalid groupType for ungrouping");
+                m_infoObject.import("status", "FAILURE");
+                m_infoObject.import("message", "Invalid groupType for ungrouping.");
+                return false;
+            }
+        }
+        else if (currentParent) {
+
+            // if the element is a syl then we want to keep it attached to the first node
+            if (el->Is(SYL)) {
+                continue;
+            }
+
+            // if (el->Is(DIVLINE) || el->Is(ACCID)) {
+            //     el->MoveItselfTo(sparent);
+            //     fparent->ClearRelinquishedChildren();
+            //     continue;
+            // }
+
+            if (groupType == "nc") {
+                Nc *nc = dynamic_cast<Nc *>(el);
+                assert(nc);
+                // if (nc->HasLigated()) continue;
+
+                if (firstIsLig) {
+                    // if 1st is ligature, neglect 2nd, go to the next nc
+                    firstIsLig = false;
+                    continue;
+                }
+
+                if (nc->HasLigated() && nc->GetLigated() == BOOLEAN_true) ligNum++;
+            }
+
+            if (ligNum != 2) {
+                // if not 2nd ligature, create new parent
+                newParent = currentParent->Clone();
                 newParent->CloneReset();
                 assert(newParent);
                 newParent->ClearChildren();
+            }
 
-                // Reassign neume
-                el->MoveItselfTo(newParent);
-                fparent->ClearRelinquishedChildren();
+            el->MoveItselfTo(newParent);
+            fparent->ClearRelinquishedChildren();
 
+            if (newParent->Is(SYLLABLE)) {
                 syllables.push_back(newParent);
                 Syl *syl = new Syl();
                 Text *text = new Text();
+                std::u32string str = U"";
+                text->SetText(str);
                 syl->AddChild(text);
                 newParent->AddChild(syl);
 
@@ -2034,74 +2985,28 @@ bool EditorToolkitNeume::Ungroup(std::string groupType, std::vector<std::string>
                     zone->SetLrx(zone->GetLrx() + 100);
                     zone->SetLry(zone->GetLry() + 200);
 
-                    assert(m_doc->GetFacsimile());
-                    FacsimileInterface *fi = syl->GetFacsimileInterface();
-                    assert(fi);
-                    Object *surface = m_doc->GetFacsimile()->FindDescendantByType(SURFACE);
-                    if (surface != NULL) {
-                        surface->AddChild(zone);
-                        fi->AttachZone(zone);
-                    }
-                    else {
-                        delete zone;
-                    }
-                }
-                uuidArray << newParent->GetID();
-                sparent->AddChild(newParent);
-                sparent->ReorderByXPos();
-            }
-        }
-        else if (groupType == "nc") {
-            // Only ungroup ligatures if the entire neume is a ligature!
-            Nc *nc = vrv_cast<Nc *>(el);
-            assert(nc);
-            if (elementIds.size() == 2 && nc->GetLigated() == BOOLEAN_true) {
-                this->ToggleLigature(elementIds, "true");
-            }
-            // Keep track of existing ligatures
-            if (nc->GetLigated() == BOOLEAN_true) {
-                ligCount += 1;
-            }
-
-            if (elementIds.begin() == it) {
-                fparent = el->GetFirstAncestor(NEUME);
-                assert(fparent);
-                uuidArray << fparent->GetID();
-                sparent = fparent->GetFirstAncestor(SYLLABLE);
-                assert(sparent);
-                currentParent = vrv_cast<Neume *>(fparent);
-                assert(currentParent);
-            }
-            else {
-                // Maintain ligatures
-                if (ligCount == 2) {
-                    if (currentParent != fparent) {
-                        el->MoveItselfTo(currentParent);
-                        fparent->ClearRelinquishedChildren();
-                    }
-                    ligCount = 0;
-                }
-                else {
-                    Object *newParent = currentParent->Clone();
-                    newParent->CloneReset();
-                    assert(newParent);
-                    newParent->ClearChildren();
-
-                    el->MoveItselfTo(newParent);
-                    fparent->ClearRelinquishedChildren();
-                    uuidArray << newParent->GetID();
-                    sparent->AddChild(newParent);
-                    sparent->ReorderByXPos();
-
-                    currentParent = newParent;
+                    assert(m_doc->GetFacsimile());
+                    m_doc->GetFacsimile()->FindDescendantByType(SURFACE)->AddChild(zone);
+                    FacsimileInterface *fi = syl->GetFacsimileInterface();
+                    assert(fi);
+                    fi->AttachZone(zone);
+
+                    // syl->ResetFacsimile();
+                    // syl->SetFacs(zone->GetID());
                 }
             }
-        }
-        else {
-            LogError("Invalid groupType: %s", groupType.c_str());
-            m_infoObject.import("status", "FAILURE");
-            m_infoObject.import("message", "Invalid groupType for ungrouping.");
-            return false;
+
+            if (ligNum != 1) {
+                // if not 1st nc in ligature, add child
+
+                uuidArray << newParent->GetID();
+
+                sparent->AddChild(newParent);
+                sparent->ReorderByXPos();
+            }
+
+            // reset ligNum
+            if (ligNum == 2) ligNum = 0;
         }
     }
 
@@ -2131,6 +3036,84 @@ bool EditorToolkitNeume::Ungroup(std::string groupType, std::vector<std::string>
     return true;
 }
 
+bool EditorToolkitNeume::SplitNeume(std::string neumeId, std::string ncId)
+{
+    // Check if you can get drawing page
+    if (!m_doc->GetDrawingPage()) {
+        LogError("Could not get the drawing page.");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Could not get the drawing page.");
+        return false;
+    }
+
+    jsonxx::Array uuidArray;
+
+    // target nc
+    Object *elNc = m_doc->GetDrawingPage()->FindDescendantByID(ncId);
+
+    // neume: first parent
+    Object *fparent = m_doc->GetDrawingPage()->FindDescendantByID(neumeId);
+    assert(fparent);
+    uuidArray << fparent->GetID();
+
+    // syllable: second parent
+    Object *sparent = fparent->GetFirstAncestor(SYLLABLE);
+    assert(sparent);
+
+    // get index
+    int nLen = fparent->GetChildCount();
+    if (nLen == 0) {
+        LogError("The selected neume has no children.");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "The selected neume has no children.");
+        return false;
+    }
+
+    // get the index of selected nc in the neume
+    int fIdx = fparent->GetChildIndex(elNc);
+    if (fIdx == -1) {
+        LogError("The selected neume component is not a child of the selected neume.");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "The selected neume component is not a child of the selected neume.");
+        return false;
+    }
+    // if click on a ligature, ncId point to the second nc in the ligature, thus minus 1
+    if (elNc->HasAttribute("ligated", "true")) fIdx -= 1;
+
+    Object *newParent = fparent->Clone();
+    newParent->CloneReset();
+    assert(newParent);
+
+    // old method
+    // int i = fIdx;
+    // while (i > 0) {
+    //     newParent->DeleteChild(newParent->GetChild(0));
+    //     i -= 1;
+    // }
+
+    // i = nLen - fIdx;
+    // while (i > 0) {
+    //     fparent->DeleteChild(fparent->GetLast());
+    //     i -= 1;
+    // }
+
+    newParent->ClearChildren();
+    Object *it = fparent->GetChild(fIdx);
+    while (it) {
+        it->MoveItselfTo(newParent);
+        fparent->ClearRelinquishedChildren();
+        it = fparent->GetChild(fIdx);
+    }
+
+    // insert newParent to sparent
+    sparent->InsertAfter(fparent, newParent);
+
+    m_infoObject.import("status", "OK");
+    m_infoObject.import("message", "");
+    m_infoObject.import("uuid", uuidArray);
+    return true;
+}
+
 bool EditorToolkitNeume::ChangeGroup(std::string elementId, std::string contour)
 {
     // Check if you can get drawing page
@@ -2173,8 +3156,10 @@ bool EditorToolkitNeume::ChangeGroup(std::string elementId, std::string contour)
     Staff *staff = el->GetAncestorStaff();
     Facsimile *facsimile = m_doc->GetFacsimile();
 
-    const int noteHeight = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 2);
-    const int noteWidth = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 1.4);
+    const int noteHeight
+        = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_HEIGHT_TO_STAFF_SIZE_RATIO);
+    const int noteWidth
+        = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_WIDTH_TO_STAFF_SIZE_RATIO);
     prevNc = firstChild;
 
     // Iterate throught the contour and build the new grouping.
@@ -2236,7 +3221,7 @@ bool EditorToolkitNeume::ChangeGroup(std::string elementId, std::string contour)
     return true;
 }
 
-bool EditorToolkitNeume::ToggleLigature(std::vector<std::string> elementIds, std::string isLigature)
+bool EditorToolkitNeume::ToggleLigature(std::vector<std::string> elementIds)
 {
     assert(elementIds.size() == 2);
     bool success1 = false;
@@ -2259,20 +3244,46 @@ bool EditorToolkitNeume::ToggleLigature(std::vector<std::string> elementIds, std
     assert(firstNc);
     Nc *secondNc = vrv_cast<Nc *>(m_doc->GetDrawingPage()->FindDescendantByID(secondNcId));
     assert(secondNc);
+
+    // check if two ncs are adjacent
+    int firstIdx = firstNc->GetIdx();
+    int secondIdx = secondNc->GetIdx();
+    if (std::abs(firstIdx - secondIdx) != 1) {
+        LogError("The selected ncs are not adjacent.");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "The selected ncs are not adjacent.");
+        return false;
+    }
+
+    bool isLigature;
+    if (firstNc->HasAttribute("ligated", "true") && secondNc->HasAttribute("ligated", "true")) {
+        isLigature = true;
+    }
+    else {
+        isLigature = false;
+        Set(firstNc->GetID(), "tilt", "");
+        Set(secondNc->GetID(), "tilt", "");
+        Set(firstNc->GetID(), "curve", "");
+        Set(secondNc->GetID(), "curve", "");
+    }
+
     Zone *zone = new Zone();
     // set ligature to false and update zone of second Nc
-    if (isLigature == "true") {
+    if (isLigature) {
         if (AttModule::SetNeumes(firstNc, "ligated", "false")) success1 = true;
 
-        const int ligUlx = firstNc->GetZone()->GetUlx();
-        const int ligUly = firstNc->GetZone()->GetUly();
-        const int ligLrx = firstNc->GetZone()->GetLrx();
-        const int ligLry = firstNc->GetZone()->GetLry();
+        int ligUlx = firstNc->GetZone()->GetUlx();
+        int ligUly = firstNc->GetZone()->GetUly();
+        int ligLrx = firstNc->GetZone()->GetLrx();
+        int ligLry = firstNc->GetZone()->GetLry();
 
-        Staff *staff = firstNc->GetAncestorStaff();
+        Staff *staff = dynamic_cast<Staff *>(firstNc->GetFirstAncestor(STAFF));
+        assert(staff);
 
-        const int noteHeight = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 2);
-        const int noteWidth = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 1.4);
+        const int noteHeight
+            = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_HEIGHT_TO_STAFF_SIZE_RATIO);
+        const int noteWidth
+            = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_WIDTH_TO_STAFF_SIZE_RATIO);
 
         zone->SetUlx(ligUlx + noteWidth);
         zone->SetUly(ligUly + noteHeight);
@@ -2284,7 +3295,7 @@ bool EditorToolkitNeume::ToggleLigature(std::vector<std::string> elementIds, std
         if (AttModule::SetNeumes(secondNc, "ligated", "false")) success2 = true;
     }
     // set ligature to true and update zones to be the same
-    else if (isLigature == "false") {
+    else if (!isLigature) {
         if (AttModule::SetNeumes(firstNc, "ligated", "true")) success1 = true;
 
         zone->SetUlx(firstNc->GetZone()->GetUlx());
@@ -2296,13 +3307,12 @@ bool EditorToolkitNeume::ToggleLigature(std::vector<std::string> elementIds, std
 
         if (AttModule::SetNeumes(secondNc, "ligated", "true")) success2 = true;
     }
-    else {
-        LogError("isLigature is invalid!");
-        delete zone;
-        m_infoObject.import("status", "FAILURE");
-        m_infoObject.import("message", "isLigature value '" + isLigature + "' is invalid.");
-        return false;
-    }
+    // else {
+    //     LogError("isLigature is invalid!");
+    //     m_infoObject.import("status", "FAILURE");
+    //     m_infoObject.import("message", "isLigature value '" + isLigature + "' is invalid.");
+    //     return false;
+    // }
     if (success1 && success2 && m_doc->GetType() != Facs) {
         m_doc->PrepareData();
         m_doc->GetDrawingPage()->LayOut(true);
@@ -2344,13 +3354,14 @@ bool EditorToolkitNeume::ChangeStaff(std::string elementId)
         return false;
     }
 
-    if (!(element->Is(SYLLABLE) || element->Is(CUSTOS) || element->Is(CLEF))) {
-        LogError("Element is of type %s, but only Syllables, Custos, and Clefs can change staves.",
+    if (!(element->Is(SYLLABLE) || element->Is(CUSTOS) || element->Is(CLEF) || element->Is(DIVLINE)
+            || element->Is(ACCID))) {
+        LogError("Element is of type %s, but only Syllables, Custos, Clefs, Divlines, and Accids can change staves.",
             element->GetClassName().c_str());
         m_infoObject.import("status", "FAILURE");
         m_infoObject.import("message",
             "Element is of type " + element->GetClassName()
-                + ", but only Syllables, Custos, and Clefs can change staves.");
+                + ", but only Syllables, Custos, Clefs, DivLines, and Accids can change staves.");
         return false;
     }
 
@@ -2364,7 +3375,6 @@ bool EditorToolkitNeume::ChangeStaff(std::string elementId)
         comp.x = element->GetFacsimileInterface()->GetZone()->GetUlx();
         comp.y = element->GetFacsimileInterface()->GetZone()->GetUly();
     }
-
     else if (element->Is(SYLLABLE)) {
         int ulx, uly, lrx, lry;
         LayerElement *layerElement = dynamic_cast<LayerElement *>(element);
@@ -2377,7 +3387,6 @@ bool EditorToolkitNeume::ChangeStaff(std::string elementId)
         comp.x = (lrx + ulx) / 2;
         comp.y = (uly + lry) / 2;
     }
-
     else {
         LogError("This element does not have a facsimile.");
         m_infoObject.import("status", "FAILURE");
@@ -2387,6 +3396,7 @@ bool EditorToolkitNeume::ChangeStaff(std::string elementId)
 
     Staff *staff = NULL;
 
+    // find the nearest staff line
     if (staves.size() > 0) {
         std::sort(staves.begin(), staves.end(), comp);
         staff = dynamic_cast<Staff *>(staves.front());
@@ -2425,9 +3435,25 @@ bool EditorToolkitNeume::ChangeStaff(std::string elementId)
         return true;
     }
 
+    if (element->Is(ACCID) || element->Is(DIVLINE)) {
+        // if accid or divLine is inside the syllable
+        // move it out
+        if (element->GetParent()->Is(SYLLABLE)) {
+            Object *par = element->GetParent();
+            assert(par);
+            Object *sPar = par->GetParent();
+            assert(sPar);
+
+            element->MoveItselfTo(sPar);
+            sPar->ReorderByXPos();
+            par->ClearRelinquishedChildren();
+            par->ReorderByXPos();
+        }
+    }
+
     // Adjust pitch/staff line.
     if (element->Is(CLEF)) {
-        Clef *clef = vrv_cast<Clef *>(element);
+        Clef *clef = dynamic_cast<Clef *>(element);
         assert(clef);
 
         Clef *previousClefBefore;
@@ -2484,20 +3510,181 @@ bool EditorToolkitNeume::ChangeStaff(std::string elementId)
             pi->AdjustPitchForNewClef(previousClefAfter, clef);
         }
     }
-    // custos or syllable
     else {
         element->MoveItselfTo(layer);
         layer->ReorderByXPos();
         parent->ClearRelinquishedChildren();
         parent->ReorderByXPos();
-        if (!AdjustPitchFromPosition(element)) {
-            LogError("Could not adjust pitch of %s", element->GetID().c_str());
+        if (!(element->Is(ACCID) || element->Is(DIVLINE))) {
+            if (!AdjustPitchFromPosition(element)) {
+                LogError("Could not adjust pitch of %s", element->GetID().c_str());
+                m_infoObject.import("status", "FAILURE");
+                m_infoObject.import("message", "Failed to properly set pitch.");
+                m_infoObject.import("elementId", element->GetID());
+                m_infoObject.import("newStaffId", staff->GetID());
+                return false;
+            }
+        }
+    }
+
+    m_infoObject.import("status", "OK");
+    m_infoObject.import("message", "");
+    m_infoObject.import("elementId", elementId);
+    m_infoObject.import("newStaffId", staff->GetID());
+    return true;
+}
+
+bool EditorToolkitNeume::ChangeStaffTo(std::string elementId, std::string staffId)
+{
+    if (!m_doc->GetDrawingPage()) {
+        LogError("Could not get the drawing page");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Could not get the drawing page.");
+        return false;
+    }
+
+    if (m_doc->GetType() != Facs) {
+        LogWarning("Staff re-association is only available in facsimile mode.");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Staff re-association is only available in facsimile mode.");
+        return false;
+    }
+
+    Object *element = m_doc->GetDrawingPage()->FindDescendantByID(elementId);
+    assert(element);
+    if (element == NULL) {
+        LogError("No element exists with ID '%s'.", elementId.c_str());
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "No element exists with ID" + elementId + ".");
+        return false;
+    }
+
+    if (!(element->Is(CLEF) || element->Is(DIVLINE) || element->Is(ACCID))) {
+        LogError("Element is of type %s, but only Clefs, Divlines, and Accids can change to a specified staff.",
+            element->GetClassName().c_str());
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message",
+            "Element is of type " + element->GetClassName()
+                + ", but only Clefs, Divlines, and Accids can change to a specified staff.");
+        return false;
+    }
+
+    Staff *staff = dynamic_cast<Staff *>(m_doc->GetDrawingPage()->FindDescendantByID(staffId));
+
+    if (!staff) {
+        LogError("Could not find any staves. This should not happen");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Could not find any staves. This should not happen");
+        return false;
+    }
+
+    Layer *parent = dynamic_cast<Layer *>(element->GetFirstAncestor(LAYER));
+    Staff *sParent = dynamic_cast<Staff *>(parent->GetFirstAncestor(STAFF));
+    assert(parent);
+    if (parent == NULL || sParent == NULL) {
+        LogError("Couldn't find staff parent of element with id '%s'", elementId.c_str());
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Couldn't find staff parent of element with id " + elementId);
+        return false;
+    }
+
+    Layer *layer = dynamic_cast<Layer *>(staff->FindDescendantByType(LAYER));
+    assert(LAYER);
+    if (layer == NULL) {
+        LogError("Couldn't find layer child of staff. This should not happen");
+        m_infoObject.import("status", "FAILURE");
+        m_infoObject.import("message", "Couldn't find layer child of staff. This should not happen");
+        return false;
+    }
+
+    if (layer == parent) {
+        m_infoObject.import("status", "WARNING");
+        m_infoObject.import("message", "Moving to the same staff as before.");
+        m_infoObject.import("elementId", elementId);
+        m_infoObject.import("newStaffId", staff->GetID());
+        return true;
+    }
+
+    if (element->Is(ACCID) || element->Is(DIVLINE)) {
+        // if accid or divLine is inside the syllable
+        // move it out
+        if (element->GetParent()->Is(SYLLABLE)) {
+            Object *par = element->GetParent();
+            assert(par);
+            Object *sPar = par->GetParent();
+            assert(sPar);
+
+            element->MoveItselfTo(sPar);
+            sPar->ReorderByXPos();
+            par->ClearRelinquishedChildren();
+            par->ReorderByXPos();
+        }
+    }
+
+    // Adjust pitch/staff line.
+    if (element->Is(CLEF)) {
+        Clef *clef = dynamic_cast<Clef *>(element);
+        assert(clef);
+
+        Clef *previousClefBefore;
+        Clef *nextClefBefore;
+        ListOfObjects oldPitchChildren;
+        InterfaceComparison ic(INTERFACE_PITCH);
+        ClassIdComparison cic(CLEF);
+
+        previousClefBefore = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindPreviousChild(&cic, element));
+
+        if (previousClefBefore == NULL) {
+            previousClefBefore = layer->GetCurrentClef();
+        }
+
+        nextClefBefore = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindNextChild(&cic, element));
+
+        m_doc->GetDrawingPage()->FindAllDescendantsBetween(&oldPitchChildren, &ic, clef,
+            (nextClefBefore != NULL) ? nextClefBefore : m_doc->GetDrawingPage()->GetLast());
+
+        PitchInterface *pi;
+
+        for (auto it = oldPitchChildren.begin(); it != oldPitchChildren.end(); ++it) {
+            pi = (*it)->GetPitchInterface();
+            assert(pi);
+            pi->AdjustPitchForNewClef(clef, previousClefBefore);
+        }
+
+        element->MoveItselfTo(layer);
+        layer->ReorderByXPos();
+        parent->ClearRelinquishedChildren();
+        parent->ReorderByXPos();
+
+        // Adjust clefline
+        if (!AdjustClefLineFromPosition(dynamic_cast<Clef *>(element), staff)) {
+            LogError("Could not adjust clef line of %s", element->GetID().c_str());
             m_infoObject.import("status", "FAILURE");
-            m_infoObject.import("message", "Failed to properly set pitch.");
-            m_infoObject.import("elementId", element->GetID());
-            m_infoObject.import("newStaffId", staff->GetID());
+            m_infoObject.import("message", "Failed to set clef line from facsimile.");
             return false;
         }
+
+        // apply pitch interface changes to any elements whose clef may have changed
+        ListOfObjects newPitchChildren;
+        Clef *previousClefAfter = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindPreviousChild(&cic, element));
+        if (previousClefAfter == NULL) {
+            previousClefAfter = layer->GetCurrentClef();
+        }
+        Clef *nextClefAfter = dynamic_cast<Clef *>(m_doc->GetDrawingPage()->FindNextChild(&cic, element));
+        m_doc->GetDrawingPage()->FindAllDescendantsBetween(
+            &newPitchChildren, &ic, clef, (nextClefAfter != NULL) ? nextClefAfter : m_doc->GetDrawingPage()->GetLast());
+
+        for (auto it = newPitchChildren.begin(); it != newPitchChildren.end(); ++it) {
+            pi = (*it)->GetPitchInterface();
+            assert(pi);
+            pi->AdjustPitchForNewClef(previousClefAfter, clef);
+        }
+    }
+    else {
+        element->MoveItselfTo(layer);
+        layer->ReorderByXPos();
+        parent->ClearRelinquishedChildren();
+        parent->ReorderByXPos();
     }
 
     m_infoObject.import("status", "OK");
@@ -2566,6 +3753,29 @@ bool EditorToolkitNeume::ParseInsertAction(jsonxx::Object param, std::string *el
     return true;
 }
 
+bool EditorToolkitNeume::ParseInsertToSyllableAction(jsonxx::Object param, std::string *elementId)
+{
+    if (!param.has<jsonxx::String>("elementId")) return false;
+    (*elementId) = param.get<jsonxx::String>("elementId");
+    return true;
+}
+
+bool EditorToolkitNeume::ParseMoveOutsideSyllableAction(jsonxx::Object param, std::string *elementId)
+{
+    if (!param.has<jsonxx::String>("elementId")) return false;
+    (*elementId) = param.get<jsonxx::String>("elementId");
+    return true;
+}
+
+bool EditorToolkitNeume::ParseDisplaceClefAction(jsonxx::Object param, std::string *elementId, std::string *direction)
+{
+    if (!param.has<jsonxx::String>("elementId") || !param.has<jsonxx::String>("direction")) return false;
+    *elementId = param.get<jsonxx::String>("elementId");
+    *direction = param.get<jsonxx::String>("direction");
+
+    return true;
+}
+
 bool EditorToolkitNeume::ParseMergeAction(jsonxx::Object param, std::vector<std::string> *elementIds)
 {
     if (!param.has<jsonxx::Array>("elementIds")) return false;
@@ -2713,6 +3923,23 @@ bool EditorToolkitNeume::ParseUngroupAction(
     return true;
 }
 
+bool EditorToolkitNeume::ParseSplitNeumeAction(jsonxx::Object param, std::string *elementId, std::string *ncId)
+{
+    if (!param.has<jsonxx::String>("elementId")) {
+        LogWarning("Could not parse 'elementId'.");
+        return false;
+    }
+    (*elementId) = param.get<jsonxx::String>("elementId");
+
+    if (!param.has<jsonxx::String>("ncId")) {
+        LogWarning("Could not parse 'ncId'.");
+        return false;
+    }
+    (*ncId) = param.get<jsonxx::String>("ncId");
+
+    return true;
+}
+
 bool EditorToolkitNeume::ParseChangeGroupAction(jsonxx::Object param, std::string *elementId, std::string *contour)
 {
     if (!param.has<jsonxx::String>("elementId")) return false;
@@ -2722,17 +3949,13 @@ bool EditorToolkitNeume::ParseChangeGroupAction(jsonxx::Object param, std::strin
     return true;
 }
 
-bool EditorToolkitNeume::ParseToggleLigatureAction(
-    jsonxx::Object param, std::vector<std::string> *elementIds, std::string *isLigature)
+bool EditorToolkitNeume::ParseToggleLigatureAction(jsonxx::Object param, std::vector<std::string> *elementIds)
 {
     if (!param.has<jsonxx::Array>("elementIds")) return false;
     jsonxx::Array array = param.get<jsonxx::Array>("elementIds");
     for (int i = 0; i < (int)array.size(); ++i) {
         elementIds->push_back(array.get<jsonxx::String>(i));
     }
-    if (!param.has<jsonxx::String>("isLigature")) return false;
-    (*isLigature) = param.get<jsonxx::String>("isLigature");
-
     return true;
 }
 
@@ -2744,12 +3967,20 @@ bool EditorToolkitNeume::ParseChangeStaffAction(jsonxx::Object param, std::strin
     return true;
 }
 
+bool EditorToolkitNeume::ParseChangeStaffToAction(jsonxx::Object param, std::string *elementId, std::string *staffId)
+{
+    if (!param.has<jsonxx::String>("elementId")) return false;
+    (*elementId) = param.get<jsonxx::String>("elementId");
+    if (!param.has<jsonxx::String>("staffId")) return false;
+    (*staffId) = param.get<jsonxx::String>("staffId");
+
+    return true;
+}
+
 bool EditorToolkitNeume::AdjustPitchFromPosition(Object *obj, Clef *clef)
 {
-    // remember to ReorderByXPos! (not called in function so that it can be used in loops)
-    // clef re-association is done at the syllable level (not neume or nc)
-    // so this function should only be called on custos or syllables
-    // it should also only be called in cases where finding the old clef is not required
+    // remember to reorderbyxpos! (not called in function so that it can be used in loops)
+    // this should only be called in cases where finding the old clef is not required
     // since doing it based only on clefs is much more efficient than based on position
     // also if you are calling this function in a loop you should always be passing a clef argument
     // since repeatedly finding the previous clef is very inefficient
@@ -2800,30 +4031,30 @@ bool EditorToolkitNeume::AdjustPitchFromPosition(Object *obj, Clef *clef)
         }
         pi->SetOct(3);
 
-        // glyphs in Verovio are actually not centered, but are in the top left corner of a giant box
-        const int centerY = fi->GetZone()->GetUly();
-        const int centerX = fi->GetZone()->GetUlx();
-
         const int staffSize = m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-        const int pitchDifference = round(
-            (double)(staff->GetZone()->GetUly() + (2 * staffSize * (staff->m_drawingLines - clef->GetLine())) - centerY
-                - ((centerX - staff->GetZone()->GetUlx()) * tan(-staff->GetDrawingRotate() * M_PI / 180.0)))
-            / (double)(staffSize));
+
+        // Use the same pitchDifference equation for both syllables and custos
+        const int pitchDifference
+            = round((double)(staff->GetDrawingY() + (2 * staffSize * (staff->m_drawingLines - clef->GetLine()))
+                        - fi->GetZone()->GetUly()
+                        - ((fi->GetZone()->GetUlx() - staff->GetZone()->GetUlx())
+                            * tan(-staff->GetDrawingRotate() * M_PI / 180.0)))
+                / (double)(staffSize));
 
         pi->AdjustPitchByOffset(pitchDifference);
         return true;
     }
 
-    else if (obj->Is(SYLLABLE)) {
-        Syllable *syl = dynamic_cast<Syllable *>(obj);
-        Staff *staff = syl->GetAncestorStaff();
+    else if (obj->Is(SYLLABLE) || obj->Is(NEUME)) {
+        Staff *staff = dynamic_cast<Staff *>(obj->GetFirstAncestor(STAFF));
+        assert(staff);
 
         ListOfObjects pitchedChildren;
         InterfaceComparison ic(INTERFACE_PITCH);
-        syl->FindAllDescendantsByComparison(&pitchedChildren, &ic);
+        obj->FindAllDescendantsByComparison(&pitchedChildren, &ic);
 
         if (pitchedChildren.empty()) {
-            LogWarning("Syllable had no pitched children to reorder for syllable %s", obj->GetID().c_str());
+            LogWarning("Syllable/neume had no pitched children to reorder for syllable/neume %s", obj->GetID().c_str());
             return true;
         }
 
@@ -2861,13 +4092,17 @@ bool EditorToolkitNeume::AdjustPitchFromPosition(Object *obj, Clef *clef)
             PitchInterface *pi = (*it)->GetPitchInterface();
             assert(pi);
             pi->SetPname(pname);
-            pi->SetOct(3);
 
-            /*int pitchDifference = round((double) (staff->GetZone()->GetUly() +
-                (2 * staffSize * (staff->m_drawingLines - clef->GetLine())) -
-                fi->GetZone()->GetUly() - ((fi->GetZone()->GetUlx() - staff->GetZone()->GetUlx()) *
-                tan(-staff->GetDrawingRotate() * M_PI / 180.0))) / (double) (staffSize));*/
-            int pitchDifference
+            // The default octave = 3, but the actual octave is calculated by
+            // taking into account the displacement of the clef
+            int octave = 3;
+            if (clef->GetDis() && clef->GetDisPlace()) {
+                octave += (clef->GetDisPlace() == STAFFREL_basic_above ? 1 : -1) * (clef->GetDis() / 7);
+            }
+            pi->SetOct(octave);
+
+            // Use the same pitchDifference equation for both syllables and custos
+            const int pitchDifference
                 = round((double)(staff->GetDrawingY() + (2 * staffSize * (staff->m_drawingLines - clef->GetLine()))
                             - fi->GetZone()->GetUly()
                             - ((fi->GetZone()->GetUlx() - staff->GetZone()->GetUlx())
diff --git a/src/ending.cpp b/src/ending.cpp
index b98534f944c..48745b32a28 100644
--- a/src/ending.cpp
+++ b/src/ending.cpp
@@ -40,7 +40,7 @@ Ending::Ending()
     this->RegisterAttClass(ATT_LABELLED);
     this->RegisterAttClass(ATT_LINEREND);
     this->RegisterAttClass(ATT_LINERENDBASE);
-    this->RegisterAttClass(ATT_NINTEGER);
+    this->RegisterAttClass(ATT_NNUMBERLIKE);
 
     this->Reset();
 }
diff --git a/src/floatingobject.cpp b/src/floatingobject.cpp
index c6e46b59f62..a2b126315f9 100644
--- a/src/floatingobject.cpp
+++ b/src/floatingobject.cpp
@@ -445,7 +445,7 @@ int FloatingPositioner::GetAdmissibleHorizOverlapMargin(const BoundingBox *bbox,
 }
 
 void FloatingPositioner::CalcDrawingYRel(
-    Doc *doc, const StaffAlignment *staffAlignment, const BoundingBox *horizOverlappingBBox)
+    const Doc *doc, const StaffAlignment *staffAlignment, const BoundingBox *horizOverlappingBBox)
 {
     assert(doc);
     assert(staffAlignment);
@@ -460,8 +460,7 @@ void FloatingPositioner::CalcDrawingYRel(
         int staffIndex = staffAlignment->GetStaff()->GetN();
 
         int minStaffDistance = 0.0;
-        data_MEASUREMENTSIGNED minStaffDistanceMeasurement
-            = doc->GetStaffDistance(m_object->GetClassId(), staffIndex, m_place);
+        data_MEASUREMENTSIGNED minStaffDistanceMeasurement = doc->GetStaffDistance(m_object, staffIndex, m_place);
 
         if (minStaffDistanceMeasurement.HasValue()) {
             if (minStaffDistanceMeasurement.GetType() == MEASUREMENTTYPE_px) {
diff --git a/src/ftrem.cpp b/src/ftrem.cpp
index 97108b97ea4..f89d56e183b 100644
--- a/src/ftrem.cpp
+++ b/src/ftrem.cpp
@@ -74,7 +74,7 @@ bool FTrem::IsSupportedChild(Object *child)
 
 const ArrayOfBeamElementCoords *FTrem::GetElementCoords()
 {
-    this->GetList(this);
+    this->GetList();
 
     return &m_beamElementCoords;
 }
diff --git a/src/horizontalaligner.cpp b/src/horizontalaligner.cpp
index aab53f4a49c..676eb8ef54b 100644
--- a/src/horizontalaligner.cpp
+++ b/src/horizontalaligner.cpp
@@ -664,7 +664,7 @@ void Alignment::GetLeftRight(int staffN, int &minLeft, int &maxRight, const std:
         Filters filters;
         AttNIntegerComparison matchStaff(ALIGNMENT_REFERENCE, staffN);
         filters.Add(&matchStaff);
-        getAlignmentLeftRight.PushFilters(&filters);
+        getAlignmentLeftRight.SetFilters(&filters);
         this->Process(getAlignmentLeftRight);
     }
     else {
diff --git a/src/hum/.download b/src/hum/.download
index 4537d1e8881..95fd2d41672 100755
--- a/src/hum/.download
+++ b/src/hum/.download
@@ -1,2 +1,2 @@
-wget https://raw.githubusercontent.com/craigsapp/humlib/master/src/humlib.cpp -O humlib.cpp
+wget https://raw.githubusercontent.com/craigsapp/humlib/master/min/humlib.cpp -O humlib.cpp
 
diff --git a/src/hum/humlib.cpp b/src/hum/humlib.cpp
index f381f3b51e3..74d086f6ac6 100644
--- a/src/hum/humlib.cpp
+++ b/src/hum/humlib.cpp
@@ -1,9 +1,9 @@
 //
 // Programmer:    Craig Stuart Sapp <craig@ccrma.stanford.edu>
 // Creation Date: Sat Aug  8 12:24:49 PDT 2015
-// Last Modified: Sat Apr 15 11:52:53 PDT 2023
-// Filename:      /include/humlib.cpp
-// URL:           https://github.com/craigsapp/humlib/blob/master/src/humlib.cpp
+// Last Modified: Tue Dec 12 11:01:04 PST 2023
+// Filename:      min/humlib.cpp
+// URL:           https://github.com/craigsapp/humlib/blob/master/min/humlib.cpp
 // Syntax:        C++11
 // vim:           ts=3
 //
@@ -444,6 +444,243 @@ vector<int> Convert::harmToBase40(const string& harm, int keyroot, int keymode)
 
 
 
+//////////////////////////////
+//
+// Convert::getInstrumentList -- List from https://bit.ly/humdrum-instrument-codes
+//
+
+vector<pair<string, string> > Convert::getInstrumentList(void) {
+	return vector<pair<string, string> > {
+		{"accor",	"klav"},
+		{"alto",	"vox"},
+		{"anvil",	"idio"},
+		{"archl",	"str"},
+		{"armon",	"ww"},
+		{"arpa",	"str"},
+		{"bagpI",	"ww"},
+		{"bagpS",	"ww"},
+		{"banjo",	"str"},
+		{"bansu",	"ww"},
+		{"barit",	"vox"},
+		{"baset",	"ww"},
+		{"bass",	"vox"},
+		{"bdrum",	"idio"},
+		{"bguit",	"str"},
+		{"biwa",	"str"},
+		{"brush",	"idio"},
+		{"bscan",	"vox"},
+		{"bspro",	"vox"},
+		{"bugle",	"bras"},
+		{"calam",	"ww"},
+		{"calpe",	"ww"},
+		{"calto",	"vox"},
+		{"campn",	"idio"},
+		{"cangl",	"ww"},
+		{"canto",	"vox"},
+		{"caril",	"idio"},
+		{"castr",	"vox"},
+		{"casts",	"idio"},
+		{"cbass",	"str"},
+		{"cello",	"str"},
+		{"cemba",	"klav"},
+		{"cetra",	"str"},
+		{"chain",	"idio"},
+		{"chcym",	"idio"},
+		{"chime",	"idio"},
+		{"chlma",	"ww"},
+		{"chlms",	"ww"},
+		{"chlmt",	"ww"},
+		{"clap",	"idio"},
+		{"clara",	"ww"},
+		{"clarb",	"ww"},
+		{"claro",	"ww"},
+		{"clarp",	"ww"},
+		{"clars",	"ww"},
+		{"clave",	"idio"},
+		{"clavi",	"klav"},
+		{"clest",	"klav"},
+		{"clrno",	"bras"},
+		{"colsp",	"vox"},
+		{"conga",	"idio"},
+		{"cor",	"bras"},
+		{"cornm",	"ww"},
+		{"corno",	"ww"},
+		{"cornt",	"bras"},
+		{"coro",	"vox"},
+		{"crshc",	"idio"},
+		{"ctenor",	"vox"},
+		{"ctina",	"klav"},
+		{"drmsp",	"vox"},
+		{"drum",	"idio"},
+		{"drumP",	"idio"},
+		{"dulc",	"str"},
+		{"eguit",	"str"},
+		{"fag_c",	"ww"},
+		{"fagot",	"ww"},
+		{"false",	"vox"},
+		{"fdrum",	"idio"},
+		{"feme",	"vox"},
+		{"fife",	"ww"},
+		{"fingc",	"idio"},
+		{"flex",	"idio"},
+		{"flt",	"ww"},
+		{"flt_a",	"ww"},
+		{"flt_b",	"ww"},
+		{"fltda",	"ww"},
+		{"fltdb",	"ww"},
+		{"fltdn",	"ww"},
+		{"fltds",	"ww"},
+		{"fltdt",	"ww"},
+		{"flugh",	"bras"},
+		{"forte",	"klav"},
+		{"gen",	"gen"},
+		{"genB",	"gen"},
+		{"genT",	"gen"},
+		{"glock",	"idio"},
+		{"gong",	"idio"},
+		{"guitr",	"str"},
+		{"hammd",	"klav"},
+		{"hbell",	"idio"},
+		{"heck",	"ww"},
+		{"heltn",	"vox"},
+		{"hichi",	"ww"},
+		{"hurdy",	"str"},
+		{"kitv",	"str"},
+		{"klav",	"klav"},
+		{"kokyu",	"str"},
+		{"komun",	"str"},
+		{"koto",	"str"},
+		{"kruma",	"ww"},
+		{"krumb",	"ww"},
+		{"krums",	"ww"},
+		{"krumt",	"ww"},
+		{"lion",	"idio"},
+		{"liuto",	"str"},
+		{"lyrsp",	"vox"},
+		{"lyrtn",	"vox"},
+		{"male",	"vox"},
+		{"mando",	"str"},
+		{"marac",	"idio"},
+		{"marim",	"idio"},
+		{"mbari",	"vox"},
+		{"mezzo",	"vox"},
+		{"nfant",	"vox"},
+		{"nokan",	"ww"},
+		{"oboe",	"ww"},
+		{"oboeD",	"ww"},
+		{"ocari",	"ww"},
+		{"ondes",	"klav"},
+		{"ophic",	"bras"},
+		{"organ",	"klav"},
+		{"oud",	"str"},
+		{"paila",	"idio"},
+		{"panpi",	"ww"},
+		{"pbell",	"idio"},
+		{"pguit",	"str"},
+		{"physh",	"klav"},
+		{"piano",	"klav"},
+		{"piatt",	"idio"},
+		{"picco",	"ww"},
+		{"pipa",	"str"},
+		{"piri",	"ww"},
+		{"porta",	"klav"},
+		{"psalt",	"str"},
+		{"qin",	"str"},
+		{"quinto",	"vox"},
+		{"quitr",	"str"},
+		{"rackt",	"ww"},
+		{"ratch",	"idio"},
+		{"ratl",	"idio"},
+		{"rebec",	"str"},
+		{"recit",	"vox"},
+		{"reedo",	"klav"},
+		{"rhode",	"klav"},
+		{"ridec",	"idio"},
+		{"sarod",	"str"},
+		{"sarus",	"ww"},
+		{"saxA",	"ww"},
+		{"saxB",	"ww"},
+		{"saxC",	"ww"},
+		{"saxN",	"ww"},
+		{"saxR",	"ww"},
+		{"saxS",	"ww"},
+		{"saxT",	"ww"},
+		{"sbell",	"idio"},
+		{"sdrum",	"idio"},
+		{"serp",	"bras"},
+		{"sesto",	"vox"},
+		{"shaku",	"ww"},
+		{"shami",	"str"},
+		{"sheng",	"ww"},
+		{"sho",	"ww"},
+		{"siren",	"idio"},
+		{"sitar",	"str"},
+		{"slap",	"idio"},
+		{"soprn",	"vox"},
+		{"spok",	"vox"},
+		{"spokF",	"vox"},
+		{"spokM",	"vox"},
+		{"spshc",	"idio"},
+		{"steel",	"idio"},
+		{"stim",	"vox"},
+		{"stimA",	"vox"},
+		{"stimB",	"vox"},
+		{"stimC",	"vox"},
+		{"stimR",	"vox"},
+		{"stimS",	"vox"},
+		{"strdr",	"idio"},
+		{"sxhA",	"bras"},
+		{"sxhB",	"bras"},
+		{"sxhC",	"bras"},
+		{"sxhR",	"bras"},
+		{"sxhS",	"bras"},
+		{"sxhT",	"bras"},
+		{"synth",	"klav"},
+		{"tabla",	"idio"},
+		{"tambn",	"idio"},
+		{"tambu",	"str"},
+		{"tanbr",	"str"},
+		{"tblok",	"idio"},
+		{"tdrum",	"idio"},
+		{"tenor",	"vox"},
+		{"timpa",	"idio"},
+		{"tiorb",	"str"},
+		{"tom",	"idio"},
+		{"trngl",	"idio"},
+		{"tromP",	"bras"},
+		{"troma",	"bras"},
+		{"tromb",	"bras"},
+		{"tromp",	"bras"},
+		{"tromt",	"bras"},
+		{"trumB",	"bras"},
+		{"tuba",	"bras"},
+		{"tubaB",	"bras"},
+		{"tubaC",	"bras"},
+		{"tubaT",	"bras"},
+		{"tubaU",	"bras"},
+		{"ukule",	"str"},
+		{"vibra",	"idio"},
+		{"vina",	"str"},
+		{"viola",	"str"},
+		{"violb",	"str"},
+		{"viold",	"str"},
+		{"viole",	"str"},
+		{"violn",	"str"},
+		{"violp",	"str"},
+		{"viols",	"str"},
+		{"violt",	"str"},
+		{"vox",	"vox"},
+		{"wblok",	"idio"},
+		{"xylo",	"idio"},
+		{"zithr",	"str"},
+		{"zurna",	"ww"}
+	};
+}
+
+
+
+
+
 //////////////////////////////
 //
 // Convert::isKernRest -- Returns true if the input string represents
@@ -467,6 +704,9 @@ bool Convert::isKernRest(const string& kerndata) {
 //
 
 bool Convert::isKernNote(const string& kerndata) {
+	if (isKernRest(kerndata)) {
+		return false;
+	}
 	char ch;
 	for (int i=0; i < (int)kerndata.size(); i++) {
 		ch = std::tolower(kerndata[i]);
@@ -4411,6 +4651,7 @@ string Convert::getLanguageName(const string& abbreviation) {
 
 
 
+
 //////////////////////////////
 //
 // Convert::recipToDuration -- Convert **recip rhythmic values into
@@ -9349,7 +9590,9 @@ int  HumGrid::getPartCount(void) {
 
 //////////////////////////////
 //
-// HumGrid::getStaffCount --
+// HumGrid::getStaffCount -- Get the number of staves in a
+//    given part.  Most parts will be single staff, but grand staff
+//    parts with have two staves.  Organ may have 3 staves.
 //
 
 int HumGrid::getStaffCount(int partindex) {
@@ -9361,6 +9604,7 @@ int HumGrid::getStaffCount(int partindex) {
 		return 0;
 	}
 
+	// return (int)this->at(0)->front()->at(partindex)->size();
 	return (int)this->at(0)->back()->at(partindex)->size();
 }
 
@@ -11210,7 +11454,7 @@ void HumGrid::checkForNullDataHoles(void) {
 							if (v >= (int)sp->size() - 1) {
 								// Found a data line with no data at given voice, so
 								// add slice duration to cumulative duration.
-								duration += slicep->getDuration();
+								// duration += slicep->getDuration();
 								continue;
 							}
 							vp = sp->at(v);
@@ -21976,26 +22220,6 @@ int HumdrumFileBase::getMeasureNumber(int line) {
 
 
 
-//////////////////////////////
-//
-// HumdrumFileBase::initializeArray -- adjust the size of the input array
-//     to the same dimensions as the HumdrumFile, filling in each cell of the
-//     array with the given value as a default.
-//
-
-template <class TYPE>
-void HumdrumFileBase::initializeArray(vector<vector<TYPE>>& array, TYPE value) {
-	HumdrumFileBase& infile = *this;
-	array.clear();
-	array.resize(infile.getLineCount());
-	for (int i=0; i<infile.getLineCount(); i++) {
-		array[i].resize(infile[i].getFieldCount());
-		fill(array[i].begin(), array[i].end(), value);
-	}
-}
-
-
-
 //////////////////////////////
 //
 // HumdrumFileBase::getReferenceRecord --
@@ -23907,7 +24131,7 @@ void HumdrumFileContent::prepareStaffBelowNoteStems(HTp token) {
 int HumdrumFileContent::getNoteCount(void) {
 	HumdrumFileContent& infile = *this;
 	int counter = 0;
-	
+
 	int scount = infile.getStrandCount();
 	for (int i=0; i<scount; i++) {
 		HTp sstart = infile.getStrandStart(i);
@@ -29062,7 +29286,7 @@ void HumdrumLine::getMidiPitchesSortHL(std::vector<int>& output) {
 		}
 	);
 }
-	
+
 
 std::vector<int> HumdrumLine::getMidiPitchesSortHL(void) {
 	vector<int> output;
@@ -33578,26 +33802,59 @@ bool HumdrumToken::isModernMensurationSymbol(void) {
 //////////////////////////////
 //
 // HumdrumToken::isInstrumentDesignation -- Such as *Iclars for B-flat clarinet.
+//   Instrument codes can also contain "_" characters and capital letters
+//   as long as they are not at the start of the code after "I".
+//   This algorithm does not check past the first letter of the code,
+//   which has to be lower case letter.
 //
 
 bool HumdrumToken::isInstrumentDesignation(void) {
 	if (this->compare(0, 2, "*I") != 0) {
 		return false;
 	}
-	for (int i=2; i<(int)this->size(); i++) {
-		if (!isalpha(this->at(i))) {
-			return false;
-		}
-		if (!islower(this->at(i))) {
-			return false;
-		}
+	if (this->size() < 3) {
+		return false;
+	}
+	if (!islower(this->at(2))) {
+		return false;
 	}
-
 	return true;
 }
 
 
 
+//////////////////////////////
+//
+// HumdrumToken::isInstrumentClass -- Instrument classes start with "*IC",
+//   such as "*ICww" for woodwinds.
+//
+
+bool HumdrumToken::isInstrumentClass(void) {
+	if (this->compare(0, 3, "*IC") == 0) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+
+
+//////////////////////////////
+//
+// HumdrumToken::isInstrumentGroup -- Instrument groups start with "*IG",
+//   such as "*IGsolo" for the soloist(s).
+//
+
+bool HumdrumToken::isInstrumentGroup(void) {
+	if (this->compare(0, 3, "*IG") == 0) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+
+
 //////////////////////////////
 //
 // HumdrumToken::isInstrumentName -- True if an instrument name token.
@@ -33646,6 +33903,7 @@ bool HumdrumToken::isOriginalInstrumentName(void) {
 //////////////////////////////
 //
 // HumdrumToken::isInstrumentAbbreviation -- True if an instrument abbreviation token.
+//    Checks to ensure the first three letters are *I' .
 //
 
 bool HumdrumToken::isInstrumentAbbreviation(void) {
@@ -45569,6 +45827,13 @@ bool MxmlEvent::isInvisible(void) {
 
 int MxmlEvent::getStaffIndex(void) const {
 	if (m_staff > 0) {
+		vector<pair<int, int>> mapping = getOwner()->getOwner()->getVoiceMapping();
+		if (getVoiceNumber() < (int)mapping.size()) {
+			const auto& [mappingStaffIndex, mappingVoiceIndex] = mapping[getVoiceNumber()];
+			if (m_staff - 1 != mappingStaffIndex) {
+				return mappingStaffIndex;
+			}
+		}
 		return m_staff - 1;
 	}
 	if (m_owner) {
@@ -45588,6 +45853,24 @@ int MxmlEvent::getStaffIndex(void) const {
 
 
 
+//////////////////////////////
+//
+// MxmlEvent::getCrossStaffOffset --
+//
+
+int MxmlEvent::getCrossStaffOffset(void) const {
+	if (m_staff > 0) {
+		vector<pair<int, int>> mapping = getOwner()->getOwner()->getVoiceMapping();
+		if (getVoiceNumber() < (int)mapping.size()) {
+			const auto& [mappingStaffIndex, mappingVoiceIndex] = mapping[getVoiceNumber()];
+			return m_staff - 1 - mappingStaffIndex;
+		}
+	}
+	return 0;
+}
+
+
+
 //////////////////////////////
 //
 // MxmlEvent::setVoiceNumber --
@@ -46278,6 +46561,12 @@ string MxmlEvent::getPostfixNoteInfo(bool primarynote, const string& recip) cons
 		ss << "]";
 	}
 
+	if (getCrossStaffOffset() > 0) {
+		ss << "<";
+	} else if (getCrossStaffOffset() < 0) {
+		ss << ">";
+	}
+
 	return ss.str();
 }
 
@@ -51985,6 +52274,310 @@ ostream& operator<<(ostream& out, PixelColor apixel) {
 
 
 
+/////////////////////////////////
+//
+// Tool_addic::Tool_addic -- Set the recognized options for the tool.
+//
+
+Tool_addic::Tool_addic(void) {
+	define("f|fix=b", "Fix instrument class values if different from expected for instrument code.");
+}
+
+
+
+/////////////////////////////////
+//
+// Tool_addic::run -- Do the main work of the tool.
+//
+
+bool Tool_addic::run(HumdrumFileSet& infiles) {
+	bool status = true;
+	for (int i=0; i<infiles.getCount(); i++) {
+		status &= run(infiles[i]);
+	}
+	return status;
+}
+
+
+bool Tool_addic::run(const string& indata, ostream& out) {
+	HumdrumFile infile(indata);
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
+	}
+	return status;
+}
+
+
+bool Tool_addic::run(HumdrumFile& infile, ostream& out) {
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
+	}
+	return status;
+}
+
+
+bool Tool_addic::run(HumdrumFile& infile) {
+	initialize();
+	processFile(infile);
+	return true;
+}
+
+
+//////////////////////////////
+//
+// Tool_addic::initialize --
+//
+
+void Tool_addic::initialize(void) {
+	m_instrumentList = Convert::getInstrumentList();
+	m_fixQ = getBoolean("fix");
+}
+
+
+
+//////////////////////////////
+//
+// Tool_addic::processFile --
+//
+
+void Tool_addic::processFile(HumdrumFile& infile) {
+
+	int codeIndex = getInstrumentCodeIndex(infile);
+	int classIndex = getInstrumentClassIndex(infile);
+
+	if (!codeIndex) {
+		// No code index, so nothing to do.
+		m_humdrum_text << infile;
+	}
+	if (classIndex) {
+		// Instrument class line already exists so adjust it:
+		updateInstrumentClassLine(infile, codeIndex, classIndex);
+		m_humdrum_text << infile;
+	} else {
+		string classLine = makeClassLine(infile, codeIndex);
+		for (int i=0; i<infile.getLineCount(); i++) {
+			if (i == codeIndex) {
+				m_humdrum_text << classLine << endl;
+			}
+			m_humdrum_text << infile[i] << endl;
+		}
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_addic::makeClassLine --
+//
+
+string Tool_addic::makeClassLine(HumdrumFile& infile, int codeIndex) {
+	string output;
+	HumRegex hre;
+	int count = infile[codeIndex].getFieldCount();
+	for (int i=0; i<count; i++) {
+		HTp codeToken = infile.token(codeIndex, i);
+		if (!hre.search(codeToken, "^\\*I([a-z].*)")) {
+			output += "*";
+			if (i < count - 1) {
+				output += "\t";
+			}
+			continue;
+		}
+		string code = hre.getMatch(1);
+		string iclass = getInstrumentClass(code);
+		if (iclass.empty()) {
+			output += "*UNKNOWN";
+			if (i < count - 1) {
+				output += "\t";
+			}
+			continue;
+		}
+		string text = "*IC" + iclass;
+		output += text;
+		if (i < count - 1) {
+			output += "\t";
+		}
+	}
+	return output;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_addic::updateInstrumentClassLine --
+//
+
+void Tool_addic::updateInstrumentClassLine(HumdrumFile& infile, int codeIndex,
+		int classIndex) {
+
+	int codeSize  = infile[codeIndex].getFieldCount();
+	int classSize = infile[classIndex].getFieldCount();
+	if (codeSize != classSize) {
+		cerr << "Instrument code line length does not match that of class line" << endl;
+		return;
+	}
+
+	HumRegex hre;
+	for (int i=0; i<infile[codeIndex].getFieldCount(); i++) {
+		HTp codeToken  = infile.token(codeIndex, i);
+		HTp classToken = infile.token(classIndex, i);
+		if (*codeToken == "*") {
+			continue;
+		}
+		if ((*classToken != "*") && !hre.search(classToken, "^\\*IC")) {
+			cerr << "Not overwriting non-class content: " << classToken << endl;
+			continue;
+		}
+		if ((!m_fixQ) && hre.search(classToken, "^\\*IC")) {
+			// There is already an instrument class, but don't check to see if it
+			// is correct.
+			continue;
+		}
+		if (!hre.search(codeToken, "^\\*I([a-z].*)")) {
+			continue;
+		}
+		string code = hre.getMatch(1);
+		string iclass = getInstrumentClass(code);
+		if (iclass.empty()) {
+			continue;
+		}
+		string text = "*IC" + iclass;
+		classToken->setText(text);
+	}
+	infile[classIndex].createLineFromTokens();
+}
+
+
+
+//////////////////////////////
+//
+// Tool_addic::getInstrumentCodeIndex --
+//
+
+int Tool_addic::getInstrumentCodeIndex(HumdrumFile& infile) {
+	HumRegex hre;
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].hasSpines()) {
+			continue;
+		}
+		if (infile[i].isData()) {
+			break;
+		}
+		if (!infile[i].isInterpretation()) {
+			continue;
+		}
+		for (int j=0; j<infile[i].getFieldCount(); j++) {
+			HTp token = infile.token(i, j);
+			if (*token == "*") {
+				continue;
+			}
+			if (hre.search(token, "^\\*I[a-z]")) {
+				return i;
+			}
+		}
+	}
+	return 0;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_addic::getInstrumentClassIndex --
+//
+
+int Tool_addic::getInstrumentClassIndex(HumdrumFile& infile) {
+	HumRegex hre;
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].hasSpines()) {
+			continue;
+		}
+		if (infile[i].isData()) {
+			break;
+		}
+		if (!infile[i].isInterpretation()) {
+			continue;
+		}
+		for (int j=0; j<infile[i].getFieldCount(); j++) {
+			HTp token = infile.token(i, j);
+			if (*token == "*") {
+				continue;
+			}
+			if (hre.search(token, "^\\*IC[a-z]")) {
+				return i;
+			}
+		}
+	}
+	return 0;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_addic::getInstrumentClass --
+//
+
+string Tool_addic::getInstrumentClass(const string& code) {
+	HumRegex hre;
+	string code1 = code;
+	string code2;
+	string divider;
+	int count = 1;
+	if (hre.search(code, "([^I]+)([&|])I(.*)")) {
+		count   = 2;
+		code1   = hre.getMatch(1);
+		divider = hre.getMatch(2);
+		code2   = hre.getMatch(3);
+	}
+
+	string class1 = "";
+	string class2 = "";
+
+	for (int i=0; i<(int)m_instrumentList.size(); i++) {
+		if (code1 == m_instrumentList[i].first) {
+			class1 = m_instrumentList[i].second;
+		}
+		if (count == 2) {
+			if (code2 == m_instrumentList[i].first) {
+				class2 = m_instrumentList[i].second;
+			}
+		}
+	}
+
+	if (count == 1) {
+		if (class1 == "") {
+			return "UNKNOWN" + code1;
+		}
+	} else {
+		if ((class1 == "") && (class2 == "")) {
+			return "UNKNOWN" + code1;
+		}
+	}
+
+	if (count == 1) {
+		return class1;
+	}
+
+	if (class1 == class2) {
+		return class1;
+	}
+
+	// return two instrument classes:
+	return class1 + divider + "IC" + class2;
+}
+
+
+
+
 /////////////////////////////////
 //
 // Tool_autoaccid::Tool_autoaccid -- Set the recognized options for the tool.
@@ -57659,13 +58252,14 @@ void Tool_cint::printLattice(vector<vector<NoteNode> >& notes, HumdrumFile& infi
 		if (!(rawQ || raw2Q)) {
 			m_humdrum_text << infile[i];
 		}
-		if (infile.token(i, 0)->compare(0, 2, "**") == 0) {
+		HTp ltok = infile.token(i, 0);
+		if (ltok->compare(0, 2, "**") == 0) {
 			if (!(rawQ || raw2Q)) {
 				m_humdrum_text << "\t**cint\n";
 			}
-			continue;
-		}
-		if (infile[i].isData()) {
+		} else if (*ltok == "*-") {
+				m_humdrum_text << "\t*-\n";
+		} else if (infile[i].isData()) {
 			if (!(rawQ || raw2Q)) {
 				m_humdrum_text << "\t";
 			}
@@ -57677,25 +58271,21 @@ void Tool_cint::printLattice(vector<vector<NoteNode> >& notes, HumdrumFile& infi
 			if (!(rawQ || raw2Q)) {
 				m_humdrum_text << "\n";
 			}
-			continue;
-		}
-		if (infile[i].isBarline()) {
+		} else if (infile[i].isBarline()) {
 			if (!(rawQ || raw2Q)) {
-				m_humdrum_text << "\t" << infile.token(i, 0) << "\n";
+				m_humdrum_text << "\t" << ltok << "\n";
 			}
-			continue;
-		}
-		if (infile[i].isInterpretation()) {
+		} else if (infile[i].isInterpretation()) {
 			if (!(rawQ || raw2Q)) {
 				m_humdrum_text << "\t*\n";
 			}
-			continue;
-		}
-		if (infile[i].isLocalComment()) {
+		} else if (infile[i].isLocalComment()) {
 			if (!(rawQ || raw2Q)) {
 				m_humdrum_text << "\t!\n";
 			}
-			continue;
+		} else {
+			// null, global comment or reference record
+			m_humdrum_text << "\n";
 		}
 	}
 
@@ -61623,7 +62213,7 @@ string Tool_cmr::getLocalLabelToken(int number, int dir) {
 Tool_colorgroups::Tool_colorgroups(void) {
 	define("A=s:crimson",    "Color for group A");
 	define("B=s:dodgerblue", "Color for group B");
-	define("C=s:limegreen",  "Color for group C");
+	define("C=s:purple",     "Color for group C");
 	define("command=b",     "print shed command only");
 }
 
@@ -61723,278 +62313,6 @@ void Tool_colorgroups::processFile(HumdrumFile& infile) {
 
 
 
-/////////////////////////////////
-//
-// Tool_colorthirds::Tool_colorthirds -- Set the recognized options for the tool.
-//
-
-Tool_colorthirds::Tool_colorthirds(void) {
-	define("d|double=b", "highlight only doubled notes in triads");
-	define("3|no-thirds=b", "do not color thirds");
-	define("5|no-fifths=b", "do not color fifths");
-	define("T|no-triads=b", "do not color full triads");
-}
-
-
-
-/////////////////////////////////
-//
-// Tool_colorthirds::run -- Do the main work of the tool.
-//
-
-bool Tool_colorthirds::run(HumdrumFileSet& infiles) {
-	bool status = true;
-	for (int i=0; i<infiles.getCount(); i++) {
-		status &= run(infiles[i]);
-	}
-	return status;
-}
-
-
-bool Tool_colorthirds::run(const string& indata, ostream& out) {
-	HumdrumFile infile(indata);
-	bool status = run(infile);
-	if (hasAnyText()) {
-		getAllText(out);
-	} else {
-		out << infile;
-	}
-	return status;
-}
-
-
-bool Tool_colorthirds::run(HumdrumFile& infile, ostream& out) {
-	bool status = run(infile);
-	if (hasAnyText()) {
-		getAllText(out);
-	} else {
-		out << infile;
-	}
-	return status;
-}
-
-
-bool Tool_colorthirds::run(HumdrumFile& infile) {
-	initialize();
-	processFile(infile);
-	return true;
-}
-
-
-
-//////////////////////////////
-//
-// Tool_colorthirds::initialize -- Setup to do before processing a file.
-//
-
-void Tool_colorthirds::initialize(void) {
-	m_colorThirds = !getBoolean("no-thirds");
-	m_colorFifths = !getBoolean("no-thirds");
-	m_colorTriads = !getBoolean("no-triads");
-}
-
-
-
-//////////////////////////////
-//
-// Tool_colorthirds::processFile -- Analyze an input file.
-//
-
-void Tool_colorthirds::processFile(HumdrumFile& infile) {
-	// Algorithm go line by line in the infile, extracting the notes that are active
-	// check to see if the list of notes form a triad
-	// label the root third and fifth notes of the triad
-
-	vector<HTp> kernNotes;
-	vector<int> midiNotes;
-	vector<int> chordPositions;
-
-	for (int i=0; i<infile.getLineCount(); i++) {
-		if (!infile[i].isData()) { // if no notes in the line
-			continue;
-		}
-		// iterate along the line looking at each field, and creating a '
-		//     list of tokens that are notes.
-		kernNotes.clear();
-		midiNotes.clear();
-		chordPositions.clear();
-		for (int j=0; j<infile[i].getFieldCount(); j++) {
-			HTp token = infile.token(i, j); // get ptr to cell
-			// if not a **kern token, then skip:
-			if (!token->isKern()) {
-				continue;
-			}
-
-			if (token->isRest()) {
-				continue;
-			}
-
-			HTp resolvedToken = NULL;
-			if (token->isNull()) {
-				resolvedToken = token->resolveNull();
-				if (!resolvedToken || resolvedToken->isRest()) {
-					continue;
-				}
-			}
-			if (resolvedToken) {
-				kernNotes.push_back(resolvedToken);
-			} else {
-				kernNotes.push_back(token);
-			}
-		}
-		midiNotes = getMidiNotes(kernNotes);
-		chordPositions = getChordPositions(midiNotes);
-		labelChordPositions(kernNotes, chordPositions);
-	}
-
-	infile.createLinesFromTokens();
-
-	m_humdrum_text << infile;
-
-	m_humdrum_text << "!!!RDF**kern: " << m_root_marker
-		<< " = marked note, root position, color=\"" << m_root_color << "\"" << endl;
-
-	m_humdrum_text << "!!!RDF**kern: " << m_third_marker
-		<< " = marked note, third position, color=\"" << m_third_color << "\"" << endl;
-
-	m_humdrum_text << "!!!RDF**kern: " << m_fifth_marker
-		<< " = marked note, third position, color=\"" << m_fifth_color << "\"" << endl;
-}
-
-
-
-//////////////////////////////
-//
-// Tool_colorthirds::labelChordPositions -- Mark the scale degree of notes:
-//       0: not in triadic sonority so no label.
-//       1 == @: root (such as C in C major triad)
-//       3 == N third (such as E in C major triad)
-//       5 == Z fifth (such as G in C major triad)
-//
-
-void Tool_colorthirds::labelChordPositions(vector<HTp>& kernNotes, vector<int>& chordPositions) {
-	for (int i=0; i<(int)kernNotes.size(); i++) {
-		int position = chordPositions.at(i);
-		if (position == 0) {
-			continue;
-		}
-		string label;
-		switch (position) {
-			case 1: label = m_root_marker; break;
-			case 3: label = m_third_marker; break;
-			case 5: label = m_fifth_marker; break;
-		}
-		if (label.empty()) {
-			continue;
-		}
-		string text = *kernNotes.at(i);
-		text += label;
-		kernNotes.at(i)->setText(text);
-	}
-}
-
-//////////////////////////////
-//
-// Tool_colorthirds::getChordPositions -- Identify if the sonority is a triad, and if so, place
-//    the position of the note in the chord:
-//       0: not in triadic sonority.
-//       1: root (such as C in C major triad)
-//       3: third (such as E in C major triad)
-//       5: fifth (such as G in C major triad)
-//
-vector<int> Tool_colorthirds::getChordPositions(vector<int>& midiNotes) {
-	vector<int> output(midiNotes.size(), 0);
-	if (midiNotes.empty()) {
-		return output;
-	}
-
-	// create modulo 12 arr
-	vector<int> pitchClasses(12, 0);
-	for (int i = 0; i < (int)midiNotes.size(); i++) {
-		int index = midiNotes.at(i) % 12;
-		pitchClasses.at(index)++; // add one to the pitch
-	}
-
-	vector<int> noteMods;
-
-	for (int i = 0; i < (int)pitchClasses.size(); i++) {
-		if (pitchClasses.at(i) != 0) { // not zero
-			noteMods.push_back(i); // add the index
-		}
-	}
-
-	if (noteMods.size() != 3) { // not a triad
-		return output;
-	}
-
-	int bint = noteMods.at(1) - noteMods.at(0);
-	int tint = noteMods.at(2) - noteMods.at(1);
-
-	int rootClass = -1; // curr uninitialized
-	int thirdClass = -1;
-	int fifthClass = -1;
-
-	// NOTE: right now, noteMods is not in the order that the og notes in the score are in
-	// aka --> these inversions are not correct
-	if ((bint == 3 && tint == 4) || (bint == 4 && tint == 3) || (bint == 3 && tint == 3)) { // root pos
-		rootClass = noteMods.at(0);
-		thirdClass = noteMods.at(1);
-		fifthClass = noteMods.at(2);
-	} else if ((bint == 4 && tint == 5) || (bint == 3 && tint == 5) || (bint == 3 && tint == 6)) { // first inv
-		rootClass = noteMods.at(2);
-		thirdClass = noteMods.at(0);
-		fifthClass = noteMods.at(1);
-	} else if ((bint == 5 && tint == 3) || (bint == 5 && tint == 4) || (bint == 6 && tint == 3)) { // sec inv
-		rootClass = noteMods.at(1);
-		thirdClass = noteMods.at(2);
-		fifthClass = noteMods.at(0);
-	}
-
-	if (rootClass == -1) {
-		return output;
-	}
-
-	for (int i = 0; i < (int)midiNotes.size(); i++) {
-		if (midiNotes.at(i) % 12 == rootClass) {
-			output.at(i) = 1;
-		}
-		else if (midiNotes.at(i) % 12 == thirdClass) {
-			output.at(i) = 3;
-		}
-		else if (midiNotes.at(i) % 12 == fifthClass) {
-			output.at(i) = 5;
-		}
-	}
-
-	return output;
-}
-
-
-//////////////////////////////
-//
-// Tool_colorthirds::getMidiNotes -- Convert kern notes to MIDI note numbers.
-//    If the note is sustaining, then make the MIDI note number negative.
-//
-
-vector<int> Tool_colorthirds::getMidiNotes(vector<HTp>& kernNotes) {
-	vector<int> output(kernNotes.size());
-	if (kernNotes.empty()) {
-		return output;
-	}
-	for (int i=0; i<(int)kernNotes.size(); i++) {
-		int midiNote = kernNotes.at(i)->getMidiPitch();
-		if (midiNote < 0) {
-			// negative values indicate sustained note.
-			midiNote = -midiNote;
-		}
-		output.at(i) = midiNote;
-	}
-	return output;
-}
-
-
-
-
 /////////////////////////////////
 //
 // Tool_colortriads::Tool_colortriads -- Set the recognized options for the tool.
@@ -62579,8 +62897,8 @@ void Tool_composite::checkForAutomaticGrouping(HumdrumFile& infile) {
 	}
 
 	// No Groupings found in score, so add *grp:A to the first kern spine
-	// and *grp:B to the second kern spine (from left-to-right). 
-	
+	// and *grp:B to the second kern spine (from left-to-right).
+
 	vector<HTp> sstarts;
 	infile.getSpineStartList(sstarts, "**kern");
 	if (sstarts.size() != 2) {
@@ -62608,7 +62926,7 @@ void Tool_composite::checkForAutomaticGrouping(HumdrumFile& infile) {
 		// something strange
 		return;
 	}
-	
+
 	infile.insertNullInterpretationLineAboveIndex(addline);
 	for (int i=0; i< (int)sstarts.size(); i++) {
 		int track = sstarts[i]->getTrack();
@@ -62736,7 +63054,6 @@ void Tool_composite::prepareOutput(HumdrumFile& infile) {
 	HumRegex hre;
 
 	for (int i=0; i<infile.getLineCount(); i++) {
-
 		if (m_verseLabelIndex && (m_verseLabelIndex == -i)) {
 			string labelLine = generateVerseLabelLine(output, infile, i);
 			if (!labelLine.empty()) {
@@ -63752,7 +64069,6 @@ void Tool_composite::analyzeCoincidenceRhythms(HumdrumFile& infile) {
 	vector<int> groupAstates;
 	vector<int> groupBstates;
 
-
 	// -2 = sustain tied note -1 = sustain, 0 = rest (or non-data), +1 = note attack
 	getNumericGroupStates(groupAstates, infile, "A");
 	getNumericGroupStates(groupBstates, infile, "B");
@@ -63777,6 +64093,9 @@ void Tool_composite::analyzeCoincidenceRhythms(HumdrumFile& infile) {
 		}
 	}
 
+	bool foundFirstAttackA = false;
+	bool foundFirstAttackB = false;
+
 	m_coincidence.resize(infile.getLineCount());
 	for (int i=0; i<infile.getLineCount(); i++) {
 		m_coincidence[i] = "";
@@ -63790,7 +64109,21 @@ void Tool_composite::analyzeCoincidenceRhythms(HumdrumFile& infile) {
 			continue;
 		}
 		lastValue = currValue;
-		currValue = merged[i];
+		if (groupAstates[i] > 0) {
+			foundFirstAttackA = true;
+		}
+		if (groupBstates[i] > 0) {
+			foundFirstAttackB = true;
+		}
+		int value = merged[i];
+		if (!foundFirstAttackA) {
+			value = 0;
+		}
+		if (!foundFirstAttackB) {
+			value = 0;
+		}
+		currValue = value;
+
 		if (currValue == 1) {
 			noteAttack[i] = 1;
 		} else if (currValue == -2) {
@@ -63945,6 +64278,8 @@ void Tool_composite::getNumericGroupStates(vector<int>& states,
 		if (!infile[i].isData()) {
 			continue;
 		}
+		vector<int> linestates;
+		linestates.clear();
 		for (int j=0; j<infile[i].getFieldCount(); j++) {
 			HTp token = infile.token(i, j);
 			if (!token->isKern()) {
@@ -63968,7 +64303,8 @@ void Tool_composite::getNumericGroupStates(vector<int>& states,
 				continue;
 			}
 			vector<string> subtoks = token->getSubtokens();
-			bool sus2 = true;
+			bool suschord = true;
+			bool attackchord = false;
 			for (int k=0; k<(int)subtoks.size(); k++) {
 				if (subtoks[k].find("r") != string::npos) {
 					continue;
@@ -63979,7 +64315,8 @@ void Tool_composite::getNumericGroupStates(vector<int>& states,
 				}
 				if ((subtoks[k].find("]") == string::npos) &&
 						(subtoks[k].find("_") == string::npos)) {
-					sus2 = false;
+					suschord = false;
+					attackchord = true;
 				}
 				if (!nullSustain) {
 					if ((subtoks[k].find("]") != string::npos) ||
@@ -63991,24 +64328,46 @@ void Tool_composite::getNumericGroupStates(vector<int>& states,
 				} else {
 					tieNote = false;
 				}
-
-				if (sus2 && nullSustain) {
-					states[i] = -1;
-				} else if (nullSustain) {
-					if (states[i] <= 0) {
-						states[i] = -1;
-					}
-				} else if (sus2) {
-					if (tieNote) {
-						states[i] = -2;
-					} else {
-						states[i] = -1;
-					}
+			} // end of chord analysis
+			if (attackchord) {
+				suschord = false;
+			}
+			if (suschord && nullSustain) {
+				linestates.push_back(-1);
+			} else if (nullSustain) {
+				linestates.push_back(-1);
+			} else if (suschord) {
+				if (tieNote) {
+					linestates.push_back(-2);
 				} else {
-					states[i] = 1;
+					linestates.push_back(-1);
 				}
+			} else {
+				linestates.push_back(1);
+			}
+		} // end of line analysis
+
+		bool allZero = true;
+		for (int m=0; m<(int)linestates.size(); m++) {
+			if (linestates[m] != 0) {
+				allZero = false;
+				break;
 			}
 		}
+		bool hasAttack = false;
+		for (int m=0; m<(int)linestates.size(); m++) {
+			if (linestates[m] > 0) {
+				hasAttack = true;
+				break;
+			}
+		}
+		if (hasAttack) {
+			states[i] = 1;
+		} else if (allZero) {
+			states[i] = 0;
+		} else {
+			states[i] = -1;
+		}
 	}
 }
 
@@ -64183,7 +64542,6 @@ void Tool_composite::analyzeGroupCompositeRhythms(HumdrumFile& infile) {
 				recip2 += pstring;
 			}
 		}
-
 		m_groups[0][i] = recip;
 		m_groups[1][i] = recip2;
 	}
@@ -65188,9 +65546,9 @@ void Tool_composite::addTimeSignatureChanges(HumdrumFile& output, HumdrumFile& i
 		if (!infile[i].isInterpretation()) {
 			continue;
 		}
-		timesig    = "";
-		groupAsig  = "";
-		groupBsig  = "";
+		timesig    = "*";
+		groupAsig  = "*";
+		groupBsig  = "*";
 
 		bool foundtime = false;
 
@@ -65260,7 +65618,7 @@ void Tool_composite::addMeterSignatureChanges(HumdrumFile& output, HumdrumFile&
 		if (!infile[i].isInterpretation()) {
 			continue;
 		}
-		metersig    = "";
+		metersig   = "";
 		groupAsig  = "";
 		groupBsig  = "";
 
@@ -67448,7 +67806,7 @@ void Tool_compositeold::getGroupRhythms(vector<string>& rhythms, vector<HumNum>&
 }
 
 
- 
+
 //////////////////////////////
 //
 // Tool_compositeold::getGroupDurations --
@@ -69070,7 +69428,7 @@ void Tool_compositeold::addStria(HumdrumFile& infile, HTp spinestart) {
 	}
 
 	if (striaLine) {
-		// place stria token on line 
+		// place stria token on line
 		int track;
 		for (int j=0; j<striaLine->getFieldCount(); j++) {
 			HTp token = striaLine->token(j);
@@ -69183,7 +69541,7 @@ void Tool_compositeold::addVerseLabels2(HumdrumFile& infile, HTp spinestart) {
 	}
 
 	if (labelLine) {
-		// place verse label token on line 
+		// place verse label token on line
 		int track;
 		for (int j=0; j<labelLine->getFieldCount(); j++) {
 			HTp token = labelLine->token(j);
@@ -71725,7 +72083,7 @@ Tool_dissonant::Tool_dissonant(void) {
 	define("debug=b",                 "print grid cell information");
 	define("u|undirected=b",          "use undirected dissonance labels");
 	define("c|count=b",               "count dissonances by category");
-	define("i|x|e|exinterp=s:**cdata","specify exinterp for **cdata spine");
+	define("i|x|e|exinterp=s:**cdata-rdiss","specify exinterp for **diss spines");
 	define("color|colorize|color-by-rhythm=b", "color dissonant notes by beat level");
 	define("color2|colorize2|color-by-interval=b", "color dissonant notes by dissonant interval");
 }
@@ -74673,36 +75031,7 @@ void Tool_esac2hum::convertEsacToHumdrum(ostream& output, istream& infile) {
 			cerr << "Got a song ..." << endl;
 		}
 		init = 1;
-/*
-		if (splitQ) {
-			outfilename = namebase);
-			outfilename += to_string(filecounter);
-			if (filecounter < 1000) {
-				outfilename += "0";
-			}
-			if (filecounter < 100) {
-				outfilename += "0";
-			}
-			if (filecounter < 10) {
-				outfilename += "0";
-			}
-			outfilename += numberstring;
-			outfilename += fileextension;
-			filecounter++;
-
-			outfile.open(outfilename);
-
-			if (!outfile.is_open()) {
-				cerr << "Error: cannot write to file: " << outfilename << endl;
-			}
-			convertSong(song, outfile);
-			outfile.close();
-		} else {
-*/
-			convertSong(song, output);
-/*
-		}
-*/
+		convertSong(song, output);
 	}
 }
 
@@ -74710,23 +75039,21 @@ void Tool_esac2hum::convertEsacToHumdrum(ostream& output, istream& infile) {
 
 //////////////////////////////
 //
-// Tool_esac2hum::getSong -- get a song from the ESac file
+// Tool_esac2hum::getSong -- get a song from the EsAC file
 //
 
 bool Tool_esac2hum::getSong(vector<string>& song, istream& infile, int init) {
-	static char holdbuffer[10000] = {0};
-
+	string holdbuffer;
 	song.resize(0);
 	if (init) {
 		// do nothing holdbuffer has the CUT[] information
 	} else {
-		strcpy(holdbuffer, "");
-		while (!infile.eof() && strncmp(holdbuffer, "CUT[", 4) != 0) {
-			infile.getline(holdbuffer, 256, '\n');
+		while (!infile.eof() && holdbuffer.compare(0, 4, "CUT[") != 0) {
+			getline(infile, holdbuffer);
 			if (verboseQ) {
 				cerr << "Contents: " << holdbuffer << endl;
 			}
-			if (strncmp(holdbuffer, "!!", 2) == 0) {
+			if (holdbuffer.compare(0, 2, "!!") == 0) {
 				song.push_back(holdbuffer);
 			}
 		}
@@ -74741,15 +75068,15 @@ bool Tool_esac2hum::getSong(vector<string>& song, istream& infile, int init) {
 		return false;
 	}
 
-	infile.getline(holdbuffer, 256, '\n');
+	getline(infile, holdbuffer);
 	chopExtraInfo(holdbuffer);
 	inputline++;
 	if (verboseQ) {
 		cerr << "READ LINE: " << holdbuffer << endl;
 	}
-	while (!infile.eof() && strncmp(holdbuffer, "CUT[", 4) != 0) {
+	while (!infile.eof() && (holdbuffer.compare(0, 4, "CUT[", 4) != 0)) {
 		song.push_back(holdbuffer);
-		infile.getline(holdbuffer, 256, '\n');
+		getline(infile, holdbuffer);
 		chopExtraInfo(holdbuffer);
 		inputline++;
 		if (verboseQ) {
@@ -74767,21 +75094,10 @@ bool Tool_esac2hum::getSong(vector<string>& song, istream& infile, int init) {
 // Tool_esac2hum::chopExtraInfo -- remove phrase number information from Luxembourg data.
 //
 
-void Tool_esac2hum::chopExtraInfo(char* holdbuffer) {
-	int length = (int)strlen(holdbuffer);
-	int i;
-	int spacecount = 0;
-	for (i=length-2; i>=0; i--) {
-		if (holdbuffer[i] == ' ') {
-			spacecount++;
-			if (spacecount > 10) {
-				holdbuffer[i] = '\0';
-				break;
-			}
-		} else {
-			spacecount = 0;
-		}
-	}
+void Tool_esac2hum::chopExtraInfo(string& buffer) {
+	HumRegex hre;
+	hre.replaceDestructive(buffer, "", "^\\s+");
+	hre.replaceDestructive(buffer, "", "\\s+$");
 }
 
 
@@ -75288,6 +75604,8 @@ bool Tool_esac2hum::printTitleInfo(vector<string>& song, ostream& out) {
 //
 
 void Tool_esac2hum::printChar(unsigned char c, ostream& out) {
+	out << c;
+/*
 	if (c < 128) {
 		out << c;
 	} else {
@@ -75335,6 +75653,7 @@ void Tool_esac2hum::printChar(unsigned char c, ostream& out) {
 			default:    out << c;
 		}
 	}
+*/
 }
 
 
@@ -75669,37 +75988,22 @@ void Tool_esac2hum::postProcessSongData(vector<NoteData>& songdata, vector<int>&
 
 void Tool_esac2hum::getMeterInfo(string& meter, vector<int>& numerator,
 		vector<int>& denominator) {
-	char buffer[256] = {0};
-	strcpy(buffer, meter.c_str());
-	numerator.resize(0);
-	denominator.resize(0);
-	int num = -1;
-	int denom = -1;
-	char* ptr;
-	ptr = strtok(buffer, " \t\n");
-	while (ptr != NULL) {
-		if (strcmp(ptr, "frei") == 0 || strcmp(ptr, "Frei") == 0) {
-			num = -1;
-			denom = -1;
-			numerator.push_back(num);
-			denominator.push_back(denom);
-		} else {
-			if (strchr(ptr, '/') != NULL) {
-				num = -1;
-				denom = 4;
-				sscanf(ptr, "%d/%d", &num, &denom);
-				numerator.push_back(num);
-				denominator.push_back(denom);
-			} else {
-				num = atoi(ptr);
-				denom = 4;
-				numerator.push_back(num);
-				denominator.push_back(denom);
-			}
-		}
-		ptr = strtok(NULL, " \t\n");
+	numerator.clear();
+	denominator.clear();
+	HumRegex hre;
+	hre.replaceDestructive(meter, "", "^\\s+");
+	hre.replaceDestructive(meter, "", "\\s+$");
+	if (hre.search(meter, "^(\\d+)/(\\d+)$")) {
+		numerator.push_back(hre.getMatchInt(1));
+		denominator.push_back(hre.getMatchInt(2));
+		return;
 	}
-
+	if (hre.search(meter, "^frei$", "i")) {
+		numerator.push_back(-1);
+		denominator.push_back(-1);
+		return;
+	}
+	cerr << "NEED TO DEAL WITH METER: " << meter << endl;
 }
 
 
@@ -78406,6 +78710,7 @@ Tool_fb::Tool_fb(void) {
 	define("rate=s:",                    "Rate to display the numbers (use a **recip value, e.g. 4, 4.)");
 	define("k|kern-tracks=s",            "Process only the specified kern spines");
 	define("s|spine-tracks|spine|spines|track|tracks=s", "Process only the specified spines");
+	define("hint=b",                     "Determine harmonic intervals with interval quality");
 }
 
 
@@ -78454,7 +78759,7 @@ bool Tool_fb::run(HumdrumFile &infile) {
 
 //////////////////////////////
 //
-// Tool_fb::initialize -- 
+// Tool_fb::initialize --
 //
 
 void Tool_fb::initialize(void) {
@@ -78472,6 +78777,7 @@ void Tool_fb::initialize(void) {
 	m_showNegativeQ  = getBoolean("negative");
 	m_aboveQ         = getBoolean("above");
 	m_rateQ          = getString("rate");
+	m_hintQ          = getBoolean("hint");
 
 	if (getBoolean("spine-tracks")) {
 		m_spineTracks = getString("spine-tracks");
@@ -78498,13 +78804,18 @@ void Tool_fb::initialize(void) {
 		m_accidentalsQ = true;
 		m_hideThreeQ = true;
 	}
+
+	if (m_hintQ) {
+		m_showNegativeQ = true;
+		// m_lowestQ = true;
+	}
 }
 
 
 
 //////////////////////////////
 //
-// Tool_fb::processFile -- 
+// Tool_fb::processFile --
 //
 
 void Tool_fb::processFile(HumdrumFile& infile) {
@@ -78567,7 +78878,6 @@ void Tool_fb::processFile(HumdrumFile& infile) {
 				// Handle spine splits
 				do {
 					HTp resolvedToken = currentToken->resolveNull();
-					
 					int lowest = getLowestBase40Pitch(resolvedToken->getBase40Pitches());
 
 					if (abs(lowest) < lowestNotePitch) {
@@ -78614,7 +78924,6 @@ void Tool_fb::processFile(HumdrumFile& infile) {
 		// Handle spine splits
 		do {
 			HTp resolvedToken = currentToken->resolveNull();
-			
 			int lowest = getLowestBase40Pitch(resolvedToken->getBase40Pitches());
 
 			// Ignore if base is a rest or silent note
@@ -78654,14 +78963,13 @@ void Tool_fb::processFile(HumdrumFile& infile) {
 			// Handle spine splits
 			do {
 				HTp resolvedToken = currentToken->resolveNull();
-				
 				for (int subtokenBase40: resolvedToken->getBase40Pitches()) {
 
 					// Ignore if target is a rest or silent note
 					if ((subtokenBase40 == 0) || (subtokenBase40 == -1000) || (subtokenBase40 == -2000)) {
 						continue;
 					}
-					
+
 					// Ignore if same pitch as base voice
 					if ((abs(lowestBaseNoteBase40Pitch) == abs(subtokenBase40)) && (baseCell->getToken()->getTrack() == initialTokenTrack)) {
 						continue;
@@ -78684,7 +78992,7 @@ void Tool_fb::processFile(HumdrumFile& infile) {
 			} while (currentToken);
 
 			// Sort chord numbers by size
-			sort(chordNumbers.begin(), chordNumbers.end(), [](FiguredBassNumber* a, FiguredBassNumber* b) -> bool { 
+			sort(chordNumbers.begin(), chordNumbers.end(), [](FiguredBassNumber* a, FiguredBassNumber* b) -> bool {
 				return a->m_number > b->m_number;
 			});
 
@@ -78698,13 +79006,17 @@ void Tool_fb::processFile(HumdrumFile& infile) {
 				numbers.push_back(num);
 			}
 		}
-		
+
 		// Set current numbers as the new last numbers
 		lastNumbers = currentNumbers;
 	}
 
 	string exinterp = m_aboveQ ? "**fba" : "**fb";
 
+	if (m_hintQ) {
+		exinterp = "**hint";
+	}
+
 	if (m_intervallsatzQ) {
 		// Create **fb spine for each voice
 		for (int voiceIndex = 0; voiceIndex < grid.getVoiceCount(); voiceIndex++) {
@@ -78868,7 +79180,9 @@ FiguredBassNumber* Tool_fb::createFiguredBassNumber(int basePitchBase40, int tar
 		}
 	}
 
-	FiguredBassNumber* number = new FiguredBassNumber(num, accid, showAccid, voiceIndex, lineIndex, isAttack, m_intervallsatzQ);
+	string intervalQuality = getIntervalQuality(basePitchBase40, targetPitchBase40);
+
+	FiguredBassNumber* number = new FiguredBassNumber(num, accid, showAccid, voiceIndex, lineIndex, isAttack, m_intervallsatzQ, intervalQuality, m_hintQ);
 
 	return number;
 }
@@ -78883,7 +79197,7 @@ FiguredBassNumber* Tool_fb::createFiguredBassNumber(int basePitchBase40, int tar
 vector<FiguredBassNumber*> Tool_fb::filterNegativeNumbers(vector<FiguredBassNumber*> numbers) {
 
 	vector<FiguredBassNumber*> filteredNumbers;
-	
+
 	bool mQ = m_showNegativeQ;
 	copy_if(numbers.begin(), numbers.end(), back_inserter(filteredNumbers), [mQ](FiguredBassNumber* num) {
 		return mQ ? true : (num->m_number > 0);
@@ -78909,8 +79223,8 @@ vector<FiguredBassNumber*> Tool_fb::filterFiguredBassNumbersForLine(vector<Figur
 	});
 
 	// sort by voiceIndex
-	sort(filteredNumbers.begin(), filteredNumbers.end(), [](FiguredBassNumber* a, FiguredBassNumber* b) -> bool { 
-		return a->m_voiceIndex > b->m_voiceIndex; 
+	sort(filteredNumbers.begin(), filteredNumbers.end(), [](FiguredBassNumber* a, FiguredBassNumber* b) -> bool {
+		return a->m_voiceIndex > b->m_voiceIndex;
 	});
 
 	return filterNegativeNumbers(filteredNumbers);
@@ -78933,8 +79247,8 @@ vector<FiguredBassNumber*> Tool_fb::filterFiguredBassNumbersForLineAndVoice(vect
 	});
 
 	// sort by voiceIndex (probably not needed here)
-	sort(filteredNumbers.begin(), filteredNumbers.end(), [](FiguredBassNumber* a, FiguredBassNumber* b) -> bool { 
-		return a->m_voiceIndex > b->m_voiceIndex; 
+	sort(filteredNumbers.begin(), filteredNumbers.end(), [](FiguredBassNumber* a, FiguredBassNumber* b) -> bool {
+		return a->m_voiceIndex > b->m_voiceIndex;
 	});
 
 	return filterNegativeNumbers(filteredNumbers);
@@ -78959,7 +79273,7 @@ string Tool_fb::formatFiguredBassNumbers(const vector<FiguredBassNumber*>& numbe
 			return ((num->getNumberWithinOctave() != 8) && (num->getNumberWithinOctave() != 1)) || (aQ && num->m_showAccidentals);
 		});
 		// sort by size
-		sort(formattedNumbers.begin(), formattedNumbers.end(), [](FiguredBassNumber* a, FiguredBassNumber* b) -> bool { 
+		sort(formattedNumbers.begin(), formattedNumbers.end(), [](FiguredBassNumber* a, FiguredBassNumber* b) -> bool {
 			return a->getNumberWithinOctave() < b->getNumberWithinOctave();
 		});
 		// remove duplicate numbers
@@ -78987,7 +79301,7 @@ string Tool_fb::formatFiguredBassNumbers(const vector<FiguredBassNumber*>& numbe
 	// Sort numbers by size
 	if (m_sortQ) {
 		bool cQ = m_compoundQ;
-		sort(formattedNumbers.begin(), formattedNumbers.end(), [cQ](FiguredBassNumber* a, FiguredBassNumber* b) -> bool { 
+		sort(formattedNumbers.begin(), formattedNumbers.end(), [cQ](FiguredBassNumber* a, FiguredBassNumber* b) -> bool {
 			// sort by getNumberWithinOctave if compoundQ is true otherwise sort by number
 			return (cQ) ? a->getNumberWithinOctave() > b->getNumberWithinOctave() : a->m_number > b->m_number;
 		});
@@ -79062,7 +79376,7 @@ vector<FiguredBassNumber*> Tool_fb::analyzeChordNumbers(const vector<FiguredBass
 		return number->getNumberWithinOctave() == 3;
 	});
 	if (it != analyzedNumbers.end()) {
-		for (auto &number : analyzedNumbers) {  
+		for (auto &number : analyzedNumbers) {
 			number->m_convert2To9 = true;
 		}
 	}
@@ -79079,7 +79393,7 @@ vector<FiguredBassNumber*> Tool_fb::analyzeChordNumbers(const vector<FiguredBass
 
 string Tool_fb::getNumberString(vector<FiguredBassNumber*> numbers) {
 	// Sort numbers by size
-	sort(numbers.begin(), numbers.end(), [](FiguredBassNumber* a, FiguredBassNumber* b) -> bool { 
+	sort(numbers.begin(), numbers.end(), [](FiguredBassNumber* a, FiguredBassNumber* b) -> bool {
 		return a->getNumberWithinOctave() > b->getNumberWithinOctave();
 	});
 	// join numbers
@@ -79091,7 +79405,7 @@ string Tool_fb::getNumberString(vector<FiguredBassNumber*> numbers) {
 			if (!first) str += " ";
 			first = false;
 			str += to_string(num);
-		}	
+		}
 	}
 	return str;
 }
@@ -79144,12 +79458,95 @@ int Tool_fb::getLowestBase40Pitch(vector<int> base40Pitches) {
 }
 
 
+
+//////////////////////////////
+//
+// Tool_fb::getIntervalQuality -- Return interval quality prefix string
+//
+
+string Tool_fb::getIntervalQuality(int basePitchBase40, int targetPitchBase40) {
+
+	int diff = (targetPitchBase40 - basePitchBase40) % 40;
+
+	diff = diff < -2 ? abs(diff) : diff;
+
+	// See https://wiki.ccarh.org/wiki/Base_40
+	string quality;
+	switch (diff) {
+		// 1
+		case -2:
+		case 38:
+			quality = "dd"; break;
+		case -1:
+		case 39:
+			quality = "d"; break;
+		case 0: quality = "P"; break;
+		case 1: quality = "A"; break;
+		case 2: quality = "AA"; break;
+
+		// 2
+		case 3: quality = "dd"; break;
+		case 4: quality = "d"; break;
+		case 5: quality = "m"; break;
+		case 6: quality = "M"; break;
+		case 7: quality = "A"; break;
+		case 8: quality = "AA"; break;
+
+		// 3
+		case 9: quality = "dd"; break;
+		case 10: quality = "d"; break;
+		case 11: quality = "m"; break;
+		case 12: quality = "M"; break;
+		case 13: quality = "A"; break;
+		case 14: quality = "AA"; break;
+
+		// 4
+		case 15: quality = "dd"; break;
+		case 16: quality = "d"; break;
+		case 17: quality = "P"; break;
+		case 18: quality = "A"; break;
+		case 19: quality = "AA"; break;
+
+		case 20: quality = "<unused>"; break;
+
+		// 5
+		case 21: quality = "dd"; break;
+		case 22: quality = "d"; break;
+		case 23: quality = "P"; break;
+		case 24: quality = "A"; break;
+		case 25: quality = "AA"; break;
+
+		// 6
+		case 26: quality = "dd"; break;
+		case 27: quality = "d"; break;
+		case 28: quality = "m"; break;
+		case 29: quality = "M"; break;
+		case 30: quality = "A"; break;
+		case 31: quality = "AA"; break;
+
+		// 7
+		case 32: quality = "dd"; break;
+		case 33: quality = "d"; break;
+		case 34: quality = "m"; break;
+		case 35: quality = "M"; break;
+		case 36: quality = "A"; break;
+		case 37: quality = "AA"; break;
+
+		default: quality = "?"; break;
+	}
+
+	return quality;
+
+}
+
+
+
 //////////////////////////////
 //
 // FiguredBassNumber::FiguredBassNumber -- Constructor
 //
 
-FiguredBassNumber::FiguredBassNumber(int num, string accid, bool showAccid, int voiceIdx, int lineIdx, bool isAtk, bool intervallsatz) {
+FiguredBassNumber::FiguredBassNumber(int num, string accid, bool showAccid, int voiceIdx, int lineIdx, bool isAtk, bool intervallsatz, string intervalQuality, bool hint) {
 	m_number          = num;
 	m_accidentals     = accid;
 	m_voiceIndex      = voiceIdx;
@@ -79157,6 +79554,8 @@ FiguredBassNumber::FiguredBassNumber(int num, string accid, bool showAccid, int
 	m_showAccidentals = showAccid;
 	m_isAttack        = isAtk;
 	m_intervallsatz   = intervallsatz;
+	m_intervalQuality = intervalQuality;
+	m_hint            = hint;
 }
 
 
@@ -79168,6 +79567,9 @@ FiguredBassNumber::FiguredBassNumber(int num, string accid, bool showAccid, int
 
 string FiguredBassNumber::toString(bool compoundQ, bool accidentalsQ, bool hideThreeQ) {
 	int num = (compoundQ) ? getNumberWithinOctave() : m_number;
+	if (m_hint) {
+		return m_intervalQuality + to_string(abs(num));
+	}
 	string accid = (accidentalsQ && m_showAccidentals) ? m_accidentals : "";
 	if (((num == 3) || (num == -3)) && accidentalsQ && m_showAccidentals && hideThreeQ) {
 		return accid;
@@ -79202,7 +79604,7 @@ int FiguredBassNumber::getNumberWithinOctave(void) {
 	// Replace 1 with 8 and -8
 	if (abs(num) == 1) {
 		// Allow unisono in intervallsatz
-		if (m_intervallsatz) {
+		if (m_intervallsatz || m_hint) {
 			if (abs(m_number) == 1) {
 				return 1;
 			}
@@ -79385,7 +79787,9 @@ bool Tool_filter::run(HumdrumFileSet& infiles) {
 	vector<pair<string, string> > commands;
 	getCommandList(commands, infile);
 	for (int i=0; i<(int)commands.size(); i++) {
-		if (commands[i].first == "autoaccid") {
+		if (commands[i].first == "addic") {
+			RUNTOOL(addic, infile, commands[i].second, status);
+		} else if (commands[i].first == "autoaccid") {
 			RUNTOOL(autoaccid, infile, commands[i].second, status);
 		} else if (commands[i].first == "autobeam") {
 			RUNTOOL(autobeam, infile, commands[i].second, status);
@@ -79441,14 +79845,22 @@ bool Tool_filter::run(HumdrumFileSet& infiles) {
 			RUNTOOL(melisma, infile, commands[i].second, status);
 		} else if (commands[i].first == "mens2kern") {
 			RUNTOOL(mens2kern, infile, commands[i].second, status);
+		} else if (commands[i].first == "meter") {
+			RUNTOOL(meter, infile, commands[i].second, status);
 		} else if (commands[i].first == "metlev") {
 			RUNTOOL(metlev, infile, commands[i].second, status);
 		} else if (commands[i].first == "modori") {
 			RUNTOOL(modori, infile, commands[i].second, status);
 		} else if (commands[i].first == "msearch") {
 			RUNTOOL(msearch, infile, commands[i].second, status);
+		} else if (commands[i].first == "nproof") {
+			RUNTOOL(nproof, infile, commands[i].second, status);
+		} else if (commands[i].first == "ordergps") {
+			RUNTOOL(ordergps, infile, commands[i].second, status);
 		} else if (commands[i].first == "phrase") {
 			RUNTOOL(phrase, infile, commands[i].second, status);
+		} else if (commands[i].first == "pline") {
+			RUNTOOL(pline, infile, commands[i].second, status);
 		} else if (commands[i].first == "recip") {
 			RUNTOOL(recip, infile, commands[i].second, status);
 		} else if (commands[i].first == "restfill") {
@@ -79481,8 +79893,12 @@ bool Tool_filter::run(HumdrumFileSet& infiles) {
 			RUNTOOL(tassoize, infile, commands[i].second, status);
 		} else if (commands[i].first == "tasso") {
 			RUNTOOL(tassoize, infile, commands[i].second, status);
+		} else if (commands[i].first == "textdur") {
+			RUNTOOL(textdur, infile, commands[i].second, status);
 		} else if (commands[i].first == "tie") {
 			RUNTOOL(tie, infile, commands[i].second, status);
+		} else if (commands[i].first == "tspos") {
+			RUNTOOL(tspos, infile, commands[i].second, status);
 		} else if (commands[i].first == "transpose") {
 			RUNTOOL(transpose, infile, commands[i].second, status);
 		} else if (commands[i].first == "tremolo") {
@@ -79499,10 +79915,10 @@ bool Tool_filter::run(HumdrumFileSet& infiles) {
 			RUNTOOL(colortriads, infile, commands[i].second, status);
 
 		} else if (commands[i].first == "colorthirds") {
-			RUNTOOL(colorthirds, infile, commands[i].second, status);
+			RUNTOOL(tspos, infile, commands[i].second, status);
 		} else if (commands[i].first == "colourthirds") {
 			// British spelling
-			RUNTOOL(colorthirds, infile, commands[i].second, status);
+			RUNTOOL(tspos, infile, commands[i].second, status);
 
 		} else if (commands[i].first == "colorgroups") {
 			RUNTOOL(colorgroups, infile, commands[i].second, status);
@@ -86132,9 +86548,11 @@ int Tool_imitation::compareSequences(vector<NoteCell*>& attack1,
 Tool_kern2mens::Tool_kern2mens(void) {
 	define("N|no-measure-numbers=b", "remove measure numbers");
 	define("M|no-measures=b",        "remove measures ");
-	define("I|not-invisible=b",       "keep measures visible");
-	define("D|no-double-bar=b",       "keep thick final barlines");
-	define("c|clef=s",                "clef to use in mensural notation");
+	define("I|not-invisible=b",      "keep measures visible");
+	define("D|no-double-bar=b",      "keep thick final barlines");
+	define("c|clef=s",               "clef to use in mensural notation");
+	define("V|no-verovio=b",         "don't add verovio styling");
+	define("e|evenNoteSpacing|even-note-spacing=b", "add evenNoteSpacing option");
 }
 
 
@@ -86180,7 +86598,11 @@ bool Tool_kern2mens::run(HumdrumFile& infile) {
 	m_measuresQ  = !getBoolean("no-measures");
 	m_invisibleQ = !getBoolean("not-invisible");
 	m_doublebarQ = !getBoolean("no-double-bar");
-	m_clef       = getString("clef");
+	m_noverovioQ =  getBoolean("no-verovio");
+	m_clef       =  getString("clef");
+	m_evenNoteSpacingQ = getBoolean("even-note-spacing");
+	storeKernEditorialAccidental(infile);
+	storeKernTerminalLong(infile);
 	convertToMens(infile);
 	return true;
 }
@@ -86193,6 +86615,7 @@ bool Tool_kern2mens::run(HumdrumFile& infile) {
 //
 
 void Tool_kern2mens::convertToMens(HumdrumFile& infile) {
+	analyzeColoration(infile);
 	int maxtrack = infile.getMaxTrack();
 	for (int i=0; i<infile.getLineCount(); i++) {
 		if (infile[i].isBarline()) {
@@ -86200,7 +86623,13 @@ void Tool_kern2mens::convertToMens(HumdrumFile& infile) {
 			continue;
 		}
 		if (!infile[i].hasSpines()) {
-			m_humdrum_text << infile[i] << "\n";
+			if (i == m_kernEdAccLineIndex) {
+				m_humdrum_text << m_mensEdAccLine << endl;
+			} else if (i == m_kernTerminalLongIndex) {
+				m_humdrum_text << m_mensTerminalLongLine << endl;
+			} else {
+				m_humdrum_text << infile[i] << "\n";
+			}
 			continue;
 		}
 		if ((maxtrack == 1) && infile[i].isAllNull()) {
@@ -86215,6 +86644,45 @@ void Tool_kern2mens::convertToMens(HumdrumFile& infile) {
 		}
 		m_humdrum_text << "\n";
 	}
+	if (!m_noverovioQ) {
+		addVerovioStyling(infile);
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_kern2mens::addVerovioStyling --  Add a spacing of 0.3, 0.5 if no
+//   spacing is already found in the data.  Use the -V option to no add any
+//   spacing options (to use the defaults in verovio).
+//
+
+void Tool_kern2mens::addVerovioStyling(HumdrumFile& infile) {
+	HumRegex hre;
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (infile[i].hasSpines()) {
+			continue;
+		}
+		HTp token = infile[i].token(0);
+		if (hre.search(token, "!!!verovio:\\s*evenNoteSpacing")) {
+			return;
+		}
+		if (!m_evenNoteSpacingQ) {
+			if (hre.search(token, "!!!verovio:\\s*spacingLinear")) {
+				return;
+			}
+			if (hre.search(token, "!!!verovio:\\s*spacingNonLinear")) {
+				return;
+			}
+		}
+	}
+	if (m_evenNoteSpacingQ) {
+		m_humdrum_text << "!!!verovio: evenNoteSpacing\n";
+	} else {
+		m_humdrum_text << "!!!verovio: spacingLinear 0.3\n";
+		m_humdrum_text << "!!!verovio: spacingNonLinear 0.5\n";
+	}
 }
 
 
@@ -86243,6 +86711,9 @@ string Tool_kern2mens::convertKernTokenToMens(HTp token) {
 				data += m_clef;
 				return data;
 			}
+		} else if (hre.search(token, "^\\*[mo]?clef")) {
+			string value = getClefConversion(token);
+			return value;
 		}
 	}
 	if (!token->isData()) {
@@ -86268,7 +86739,10 @@ string Tool_kern2mens::convertKernTokenToMens(HTp token) {
 	if (rhythm.find('.') != std::string::npos) {
 		perfect = true;
 	}
-	hre.replaceDestructive(data, rhythm, "\\d+\\.*");
+	hre.replaceDestructive(data, rhythm, "\\d+%?\\d*\\.*");
+	hre.replaceDestructive(data, "S", "3\\%4");
+	hre.replaceDestructive(data, "s", "3\\%2");
+	hre.replaceDestructive(data, "M", "3");
 	hre.replaceDestructive(data, "X", "000");
 	hre.replaceDestructive(data, "L", "00");
 	hre.replaceDestructive(data, "S", "0");
@@ -86283,6 +86757,27 @@ string Tool_kern2mens::convertKernTokenToMens(HTp token) {
 	} else {
 		hre.replaceDestructive(data, "$1i", "([XLSsMmUu]+)");
 	}
+
+	// transfer editorial accidental
+	if (!m_kernEditorialAccidental.empty()) {
+		if (token->find(m_kernEditorialAccidental) != string::npos) {
+			hre.replaceDestructive(data, "$1z", "([#-n]+)", "g");
+		}
+	}
+
+	// transfer terminal longs
+	if (!m_kernTerminalLong.empty()) {
+		string searchTerm = "(" + m_kernTerminalLong + "+)";
+		if (hre.search(token, searchTerm)) {
+			data += hre.getMatch(1);
+		}
+	}
+
+	bool coloration = token->getValueBool("auto", "coloration");
+	if (coloration) {
+		data += "~";
+	}
+
 	return data;
 }
 
@@ -86363,6 +86858,197 @@ void Tool_kern2mens::printBarline(HumdrumFile& infile, int line) {
 
 
 
+//////////////////////////////
+//
+// Tool_kern2mens::getClefConversion --
+//    If token is *oclef and there is an adjacent *clef,
+//        convert *oclef to *clef and *clef to *mclef; otherwise,
+//        return the given clef.
+//
+//
+
+string Tool_kern2mens::getClefConversion(HTp token) {
+
+	vector<HTp> clefs;
+	vector<HTp> oclefs;
+	vector<HTp> mclefs;
+
+	HumRegex hre;
+
+	HTp current = token->getNextToken();
+	while (current) {
+		if (current->isData()) {
+			break;
+		}
+		if (current->compare(0, 5, "*clef") == 0) {
+			clefs.push_back(current);
+		}
+		if (current->compare(0, 6, "*oclef") == 0) {
+			oclefs.push_back(current);
+		}
+		if (current->compare(0, 6, "*mclef") == 0) {
+			mclefs.push_back(current);
+		}
+		current = current->getNextToken();
+	}
+
+	current = token->getPreviousToken();
+	while (current) {
+		if (current->isData()) {
+			break;
+		}
+		if (current->compare(0, 5, "*clef") == 0) {
+			clefs.push_back(current);
+		}
+		if (current->compare(0, 6, "*oclef") == 0) {
+			oclefs.push_back(current);
+		}
+		if (current->compare(0, 6, "*mclef") == 0) {
+			mclefs.push_back(current);
+		}
+		current = current->getPreviousToken();
+	}
+
+	if (token->compare(0, 5, "*clef") == 0) {
+		if (oclefs.size() > 0) {
+			string value = *token;
+			hre.replaceDestructive(value, "mclef", "clef");
+			return value;
+		}
+	}
+
+	if (token->compare(0, 6, "*oclef") == 0) {
+		if (clefs.size() > 0) {
+			string value = *token;
+			hre.replaceDestructive(value, "clef", "oclef");
+			return value;
+		}
+	}
+
+	return *token;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_kern2mens::storeKernEditorialAccidental --
+//
+
+void Tool_kern2mens::storeKernEditorialAccidental(HumdrumFile& infile) {
+	for (int i=infile.getLineCount() - 1; i>= 0; i--) {
+		if (infile[i].hasSpines()) {
+			continue;
+		}
+		if (!infile[i].isReferenceRecord()) {
+			continue;
+		}
+		string key = infile[i].getReferenceKey();
+		if (key != "RDF**kern") {
+			continue;
+		}
+		HumRegex hre;
+		string value = infile[i].getReferenceValue();
+		if (hre.search(value, "^\\s*([^\\s]+)\\s*=\\s*(.*)\\s*$")) {
+			string signifier = hre.getMatch(1);
+			string definition = hre.getMatch(2);
+			if (hre.search(definition, "editorial\\s+accidental")) {
+				m_kernEditorialAccidental = signifier;
+				m_kernEdAccLineIndex = i;
+				m_mensEdAccLine = "!!!RDF**mens: z = ";
+				m_mensEdAccLine += definition;
+				break;
+			}
+		}
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_kern2mens::storeKernTerminalLong --
+//
+
+void Tool_kern2mens::storeKernTerminalLong(HumdrumFile& infile) {
+	for (int i=infile.getLineCount() - 1; i>= 0; i--) {
+		if (infile[i].hasSpines()) {
+			continue;
+		}
+		if (!infile[i].isReferenceRecord()) {
+			continue;
+		}
+		string key = infile[i].getReferenceKey();
+		if (key != "RDF**kern") {
+			continue;
+		}
+		HumRegex hre;
+		string value = infile[i].getReferenceValue();
+		if (hre.search(value, "^\\s*([^\\s]+)\\s*=\\s*(.*)\\s*$")) {
+			string signifier = hre.getMatch(1);
+			string definition = hre.getMatch(2);
+
+			if (hre.search(definition, "terminal\\s+long")) {
+				m_kernTerminalLong = signifier;
+				m_kernTerminalLongIndex = i;
+				m_mensTerminalLongLine = "!!!RDF**mens: " + signifier + " = ";
+				m_mensTerminalLongLine += definition;
+				break;
+			} else if (hre.search(definition, "long\\s+note")) {
+				m_kernTerminalLong = signifier;
+				m_kernTerminalLongIndex = i;
+				m_mensTerminalLongLine = "!!!RDF**mens: " + signifier + " = ";
+				m_mensTerminalLongLine += definition;
+				break;
+			}
+
+		}
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_kern2mens::analyzeColoration --
+//
+
+void Tool_kern2mens::analyzeColoration(HumdrumFile& infile) {
+	vector<HTp> spinestarts = infile.getKernSpineStartList();
+	for (int i=0; i<(int)spinestarts.size(); i++) {
+		analyzeColoration(spinestarts[i]);
+	}
+}
+
+void Tool_kern2mens::analyzeColoration(HTp stok) {
+	HTp current = stok->getNextToken();
+	bool coloration = false;
+	while (current) {
+		if (current->isInterpretation()) {
+			if (*current == "*col") {
+				coloration = true;
+			} else if (*current == "*Xcol") {
+				coloration = false;
+			}
+		}
+		if (!current->isData()) {
+			current = current->getNextToken();
+			continue;
+		}
+		if (current->isNull()) {
+			current = current->getNextToken();
+			continue;
+		}
+		if (coloration) {
+			current->setValue("auto", "coloration", 1);
+		}
+		current = current->getNextToken();
+	}
+}
+
+
+
+
 
 /////////////////////////////////
 //
@@ -92909,28 +93595,39 @@ string Tool_mens2kern::mens2kernRhythm(const string& rhythm, bool altera, bool p
 
 /////////////////////////////////
 //
-// Tool_gridtest::Tool_metlev -- Set the recognized options for the tool.
+// Tool_meter::Tool_meter -- Set the recognized options for the tool.
 //
 
-Tool_metlev::Tool_metlev(void) {
-	define("a|append=b",          "append data analysis to input file");
-	define("p|prepend=b",         "prepend data analysis to input file");
-	define("c|composite=b",       "generate composite rhythm");
-	define("i|integer=b",         "quantize metric levels to int values");
-	define("x|attacks-only=b",    "only mark lines with note attacks");
-	define("G|no-grace-notes=b",  "do not mark grace note lines");
-	define("k|kern-spine=i:1",    "analyze only given kern spine");
-	define("e|exinterp=s:blev",   "exclusive interpretation type for output");
+Tool_meter::Tool_meter(void) {
+
+	define("c|comma=b", "display decimal points as commas");
+	define("d|denominator=b", "display denominator spine");
+	define("e|eighth=b", "metric positions in eighth notes rather than beats");
+	define("f|float=b", "floating-point beat values instead of rational numbers");
+	define("h|half=b", "metric positions in half notes rather than beats");
+	define("j|join=b", "join time signature information and metric positions into a single token");
+	define("n|numerator=b", "display numerator spine");
+	define("q|quarter=b", "metric positions in quarter notes rather than beats");
+	define("r|rest=b", "add meteric positions of rests");
+	define("s|sixteenth=b", "metric positions in sixteenth notes rather than beats");
+	define("t|time-signature|tsig|m|meter=b", "display active time signature for each note");
+	define("w|whole=b", "metric positions in whole notes rather than beats");
+	define("z|zero=b", "start of measure is beat 0 rather than beat 1");
+
+	define("B|no-beat=b", "Do not display metric positions (beats)");
+	define("D|digits=i:0", "number of digits after decimal point");
+	define("L|no-label=b", "do not add labels to analysis spines");
+
 }
 
 
 
-///////////////////////////////
+/////////////////////////////////
 //
-// Tool_metlev::run -- Primary interfaces to the tool.
+// Tool_meter::run -- Do the main work of the tool.
 //
 
-bool Tool_metlev::run(HumdrumFileSet& infiles) {
+bool Tool_meter::run(HumdrumFileSet& infiles) {
 	bool status = true;
 	for (int i=0; i<infiles.getCount(); i++) {
 		status &= run(infiles[i]);
@@ -92939,220 +93636,1052 @@ bool Tool_metlev::run(HumdrumFileSet& infiles) {
 }
 
 
-bool Tool_metlev::run(const string& indata, ostream& out) {
+bool Tool_meter::run(const string& indata, ostream& out) {
 	HumdrumFile infile(indata);
-	return run(infile, out);
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
+	}
+	return status;
 }
 
 
-bool Tool_metlev::run(HumdrumFile& infile, ostream& out) {
+bool Tool_meter::run(HumdrumFile& infile, ostream& out) {
 	bool status = run(infile);
-	out << infile;
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
+	}
 	return status;
 }
 
 
-bool Tool_metlev::run(HumdrumFile& infile) {
-	int lineCount = infile.getLineCount();
-	if (lineCount == 0) {
-		m_error_text << "No input data";
-		return false;
+bool Tool_meter::run(HumdrumFile& infile) {
+	initialize();
+	processFile(infile);
+	return true;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_meter::initialize --
+//
+
+void Tool_meter::initialize(void) {
+
+	m_commaQ       = getBoolean("comma");
+	m_denominatorQ = getBoolean("denominator");
+	m_digits       = getInteger("digits");
+	m_floatQ       = getBoolean("float");
+	m_halfQ        = getBoolean("half");
+	m_joinQ        = getBoolean("join");
+	m_nobeatQ      = getBoolean("no-beat");
+	m_nolabelQ     = getBoolean("no-label");
+	m_numeratorQ   = getBoolean("numerator");
+	m_quarterQ     = getBoolean("quarter");
+	m_halfQ        = getBoolean("half");
+	m_eighthQ      = getBoolean("eighth");
+	m_sixteenthQ   = getBoolean("sixteenth");
+	m_restQ        = getBoolean("rest");
+	m_tsigQ        = getBoolean("meter");
+	m_wholeQ       = getBoolean("whole");
+	m_zeroQ        = getBoolean("zero");
+
+	if (m_digits < 0) {
+		m_digits = 0;
+	}
+	if (m_digits > 15) {
+		m_digits = 15;
 	}
 
-	string exinterp = getString("exinterp");
-	if (exinterp.empty()) {
-		exinterp = "**blev";
-	} else if (exinterp[0] != '*') {
-		exinterp.insert(0, "*");
+	if (m_joinQ && !(m_tsigQ || m_numeratorQ || m_denominatorQ)) {
+		m_tsigQ = true;
 	}
-	if (exinterp[1] != '*') {
-		exinterp.insert(0, "*");
+	if (m_joinQ) {
+		m_nobeatQ = false;
+	}
+	if (m_joinQ && m_numeratorQ && m_denominatorQ) {
+		m_tsigQ = true;
 	}
 
-	m_kernspines = infile.getKernSpineStartList();
+	if (m_tsigQ) {
+		m_numeratorQ = true;
+		m_denominatorQ = true;
+	}
 
-	vector<double> beatlev(lineCount, NAN);
-	int track = 0;
-	if (m_kernspines.size() > 0) {
-		track = m_kernspines[0]->getTrack();
-	} else {
-		m_error_text << "No **kern spines in input file" << endl;
-		return false;
+	// Only one fix-width metric position allowed, prioritize
+	// largest given duration:
+	if (m_wholeQ) {
+		m_halfQ      = false;
+		m_quarterQ   = false;
+		m_eighthQ    = false;
+		m_sixteenthQ = false;
+	} else if (m_halfQ) {
+		m_wholeQ     = false;
+		m_quarterQ   = false;
+		m_eighthQ    = false;
+		m_sixteenthQ = false;
+	} else if (m_quarterQ) {
+		m_wholeQ     = false;
+		m_halfQ      = false;
+		m_eighthQ    = false;
+		m_sixteenthQ = false;
+	} else if (m_eighthQ) {
+		m_wholeQ     = false;
+		m_halfQ      = false;
+		m_quarterQ   = false;
+		m_sixteenthQ = false;
+	} else if (m_sixteenthQ) {
+		m_wholeQ     = false;
+		m_halfQ      = false;
+		m_quarterQ   = false;
+		m_eighthQ    = false;
 	}
-	infile.getMetricLevels(beatlev, track, NAN);
 
-	for (int i=0; i<lineCount; i++) {
-		if (!infile[i].isData()) {
+}
+
+
+
+//////////////////////////////
+//
+// Tool_meter::processFile --
+//
+
+void Tool_meter::processFile(HumdrumFile& infile) {
+	analyzePickupMeasures(infile);
+	getMeterData(infile);
+	printMeterData(infile);
+}
+
+
+//////////////////////////////
+//
+// Tool_meter::analyzePickupMeasures --
+//
+
+void Tool_meter::analyzePickupMeasures(HumdrumFile& infile) {
+	vector<HTp> sstarts;
+	infile.getKernSpineStartList(sstarts);
+	for (int i=0; i<(int)sstarts.size(); i++) {
+		analyzePickupMeasures(sstarts[i]);
+	}
+}
+
+
+void Tool_meter::analyzePickupMeasures(HTp sstart) {
+	// First dimension are visible barlines.
+	// Second dimension are time signature(s) within the barlines.
+	vector<vector<HTp>> barandtime;
+	barandtime.reserve(1000);
+	barandtime.resize(1);
+	barandtime[0].push_back(sstart);
+	HTp current = sstart->getNextToken();
+	while (current) {
+		if (current->isTimeSignature()) {
+			barandtime.back().push_back(current);
+		} else if (current->isBarline()) {
+			if (current->find("-") != std::string::npos) {
+				current = current->getNextToken();
 				continue;
+			}
+			barandtime.resize(barandtime.size() + 1);
+			barandtime.back().push_back(current);
+		} else if (*current == "*-") {
+			barandtime.resize(barandtime.size() + 1);
+			barandtime.back().push_back(current);
+			break;
 		}
-		if (getBoolean("no-grace-notes") && (infile[i].getDuration() == 0)) {
-			beatlev[i] = NAN;
+		current = current->getNextToken();
+	}
+
+	// Extract the actual duration of measures:
+	vector<HumNum> bardur(barandtime.size(), 0);
+	for (int i=0; i<(int)barandtime.size() - 1; i++) {
+		HumNum starttime = barandtime[i][0]->getDurationFromStart();
+		HumNum endtime = barandtime.at(i+1)[0]->getDurationFromStart();
+		HumNum duration = endtime - starttime;
+		bardur.at(i) = duration;
+	}
+
+	// Extract the expected duration of measures:
+	vector<HumNum> tsigdur(barandtime.size(), 0);
+	int firstmeasure = -1;
+	HumNum active = 0;
+	for (int i=0; i<(int)barandtime.size() - 1; i++) {
+		if (firstmeasure < 0) {
+			if (bardur.at(i) > 0) {
+				firstmeasure = i;
+			}
+		}
+		if (barandtime[i].size() < 2) {
+			tsigdur.at(i) = active;
 			continue;
 		}
-		if (getBoolean("attacks-only")) {
-			if (!infile[i].getKernNoteAttacks()) {
-				beatlev[i] = NAN;
+		active = getTimeSigDuration(barandtime.at(i).at(1));
+		tsigdur.at(i) = active;
+	}
+
+	vector<bool> pickup(barandtime.size(), false);
+	for (int i=0; i<(int)barandtime.size() - 1; i++) {
+		if (tsigdur.at(i) == bardur.at(i)) {
+			// actual and expected are the same
+			continue;
+		}
+		if (tsigdur.at(i) == tsigdur.at(i+1)) {
+			if (bardur.at(i) + bardur.at(i+1) == tsigdur.at(i)) {
+				pickup.at(i+1) = true;
+				i++;
 				continue;
 			}
 		}
-		if (beatlev[i] - (int)beatlev[i] != 0.0) {
-			if (getBoolean("integer")) {
-					beatlev[i] = floor(beatlev[i]);
-			} else {
-				beatlev[i] = Convert::significantDigits(beatlev[i], 2);
-			}
+	}
+
+	// check for first-measure pickup
+	if (firstmeasure >= 0) {
+		if (bardur.at(firstmeasure) < tsigdur.at(firstmeasure)) {
+			pickup.at(firstmeasure) = true;
 		}
 	}
 
-	if (getBoolean("kern-spine")) {
-		int kspine = getInteger("kern-spine") - 1;
-		if ((kspine >= 0) && (kspine < (int)m_kernspines.size())) {
-			vector<vector<double> > results;
-			fillVoiceResults(results, infile, beatlev);
-			if (kspine == (int)m_kernspines.size() - 1) {
-				infile.appendDataSpine(results.back(), "nan", exinterp);
-			} else {
-				int track = m_kernspines[kspine+1]->getTrack();
-				infile.insertDataSpineBefore(track, results[kspine],
-						"nan", exinterp);
+	if (m_debugQ) {
+		cerr << "============================" << endl;
+		for (int i=0; i<(int)barandtime.size(); i++) {
+			cerr << pickup.at(i);
+			cerr << "\t";
+			cerr << bardur.at(i);
+			cerr << "\t";
+			cerr << tsigdur.at(i);
+			cerr << "\t";
+			for (int j=0; j<(int)barandtime[i].size(); j++) {
+				cerr << barandtime.at(i).at(j) << "\t";
 			}
-			infile.createLinesFromTokens();
-			return true;
+			cerr << endl;
 		}
-	} else if (getBoolean("append")) {
-		infile.appendDataSpine(beatlev, "nan", exinterp);
-		infile.createLinesFromTokens();
-		return true;
-	} else if (getBoolean("prepend")) {
-		infile.prependDataSpine(beatlev, "nan", exinterp);
-		infile.createLinesFromTokens();
-		return true;
-	} else if (getBoolean("composite")) {
-		infile.prependDataSpine(beatlev, "nan", exinterp);
-		infile.printFieldIndex(0, m_humdrum_text);
-		infile.clear();
-		infile.readString(m_humdrum_text.str());
-	} else {
-		vector<vector<double> > results;
-		fillVoiceResults(results, infile, beatlev);
-		infile.appendDataSpine(results.back(), "nan", exinterp);
-		for (int i = (int)results.size()-1; i>0; i--) {
-			int track = m_kernspines[i]->getTrack();
-			infile.insertDataSpineBefore(track, results[i-1], "nan", exinterp);
+		cerr << endl;
+	}
+
+	// Markup pickup measure notes/rests
+	for (int i=0; i<(int)pickup.size() - 1; i++) {
+		if (!pickup[i]) {
+			continue;
 		}
-		infile.createLinesFromTokens();
-		return true;
+		markPickupContent(barandtime.at(i).at(0), barandtime.at(i+1).at(0));
 	}
 
-	return false;
+	// Pickup/incomplete measures covering three or more barlines are not considered
+	// (these could be used with dashed barlines or similar).
+
 }
 
 
 
 //////////////////////////////
 //
-// Tool_metlev::fillVoiceResults -- Split the metric level analysis into values
-//     for each voice.
+// Tool_meter::markPickupContent --
 //
 
-void Tool_metlev::fillVoiceResults(vector<vector<double> >& results,
-		HumdrumFile& infile, vector<double>& beatlev) {
-
-	results.resize(m_kernspines.size());
-	for (int i=0; i<(int)results.size(); i++) {
-		results[i].resize(beatlev.size());
-		fill(results[i].begin(), results[i].end(), NAN);
-	}
-	int track;
-	vector<int> rtracks(infile.getTrackCount() + 1, -1);
-	for (int i=0; i<(int)m_kernspines.size(); i++) {
-		int track = m_kernspines[i]->getTrack();
-		rtracks[track] = i;
-	}
-
-	bool attacksQ = getBoolean("attacks-only");
-	vector<int> nonnullcount(m_kernspines.size(), 0);
-	vector<int> attackcount(m_kernspines.size(), 0);
-	HTp token;
-	int voice;
-	int i, j;
-	for (i=0; i<infile.getLineCount(); i++) {
-		if (!infile[i].isData()) {
-			continue;
-		}
-		for (j=0; j<infile[i].getFieldCount(); j++) {
-			token = infile.token(i, j);
-			if (!token->isKern()) {
-				continue;
-			}
-			if (token->isNull()) {
-				continue;
-			}
-			track = token->getTrack();
-			voice = rtracks[track];
-			nonnullcount[voice]++;
-			if (token->isNoteAttack()) {
-				attackcount[voice]++;
-			}
+void Tool_meter::markPickupContent(HTp stok, HTp etok) {
+	int endline = etok->getLineIndex();
+	HTp current = stok;
+	while (current) {
+		int line = current->getLineIndex();
+		if (line > endline) {
+			break;
 		}
-		for (int v=0; v<(int)m_kernspines.size(); v++) {
-			if (attacksQ) {
-				if (attackcount[v]) {
-					results[v][i] = beatlev[i];
-					attackcount[v] = 0;
+		if (current->isData()) {
+			HTp field = current;
+			int track = field->getTrack();
+			while (field) {
+				int ttrack = field->getTrack();
+				if (ttrack != track) {
+					break;
 				}
-			} else {
-				if (nonnullcount[v]) {
-					results[v][i] = beatlev[i];
+				if (field->isNull()) {
+					field = field->getNextFieldToken();
+					continue;
 				}
-				nonnullcount[v] = 0;
+				field->setValue("auto", "pickup", 1);
+				HumNum nbt = etok->getDurationFromStart() - field->getDurationFromStart();
+				stringstream ntime;
+				ntime.str("");
+				ntime << nbt.getNumerator() << "/" << nbt.getDenominator();
+				field->setValue("auto", "nextBarTime", ntime.str());
+				field = field->getNextFieldToken();
 			}
 		}
+		if (current == etok) {
+			break;
+		}
+		current = current->getNextToken();
 	}
 }
 
 
 
-
-/////////////////////////////////
+//////////////////////////////
 //
-// Tool_modori::Tool_modori -- Set the recognized options for the tool.
+// Tool_meter::getTimeSigDuration --
 //
 
-Tool_modori::Tool_modori(void) {
-	define("m|modern=b",    "prepare score for modern style");
-	define("o|original=b", "prepare score for original style");
-	define("d|info=b", "display key/clef/mensuration information");
-	define("I|no-instrument-name|no-instrument-names=b", "Do not change part labels");
-	define("A|no-instrument-abbreviation|no-instrument-abbreviations=b", "Do not change part label abbreviations");
-	define("C|no-clef|no-clefs=b", "Do not change clefs");
-	define("K|no-key|no-keys=b", "Do not change key signatures");
-	define("L|no-lyrics=b", "Do not change **text exclusive interpretations");
-	define("M|no-mensuration|no-mensurations=b", "Do not change mensurations");
-	define("R|no-references=b", "Do not change reference records keys");
-	define("T|no-text=b",    "Do not change !LO:(TX|DY) layout parameters");
+HumNum Tool_meter::getTimeSigDuration(HTp tsig) {
+	HumNum output = 0;
+	HumRegex hre;
+	if (hre.search(tsig, "^\\*M(\\d+)/(\\d+%?\\d*)")) {
+		int top = hre.getMatchInt(1);
+		string bot = hre.getMatch(2);
+		HumNum botdur = Convert::recipToDuration(bot);
+		output = botdur * top;
+	}
+	return output;
 }
 
 
 
-/////////////////////////////////
+//////////////////////////////
 //
-// Tool_modori::run -- Do the main work of the tool.
+// Tool_meter::printMeterData --
 //
 
-bool Tool_modori::run(HumdrumFileSet& infiles) {
-	bool status = true;
-	for (int i=0; i<infiles.getCount(); i++) {
-		status &= run(infiles[i]);
-	}
-	return status;
-}
+void Tool_meter::printMeterData(HumdrumFile& infile) {
+	bool foundLabel = false;
+	bool foundData  = false;
 
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].hasSpines()) {
+			m_humdrum_text << infile[i] << endl;
+			continue;
+		}
 
-bool Tool_modori::run(const string& indata, ostream& out) {
-	HumdrumFile infile(indata);
-	bool status = run(infile);
-	if (hasAnyText()) {
+		if ((!foundData) && (!foundLabel) && (!m_nolabelQ) && infile[i].isData()) {
+			printLabelLine(infile[i]);
+			foundData = true;
+		}
+
+		bool hasLabel = false;
+		if ((!m_nolabelQ) && (!foundLabel) && (!foundData)) {
+			if (searchForLabels(infile[i])) {
+				hasLabel = true;
+				foundLabel = true;
+			}
+		}
+		printHumdrumLine(infile[i], hasLabel);
+	}
+}
+
+
+
+//////////////////////////////
+//
+// printLabelLine --
+//
+
+void Tool_meter::printLabelLine(HumdrumLine& line) {
+	bool forceInterpretation = true;
+	bool printLabels = true;
+	for (int i=0; i<line.getFieldCount(); i++) {
+		HTp token = line.token(i);
+		if (token->isKern()) {
+			i = printKernAndAnalysisSpine(line, i, printLabels, forceInterpretation);
+		} else {
+			m_humdrum_text << "*";
+		}
+		if (i < line.getFieldCount() - 1) {
+			m_humdrum_text << "\t";
+		}
+	}
+	m_humdrum_text << "\n";
+}
+
+
+
+//////////////////////////////
+//
+// Tool_meter::printHumdrumLine --
+//
+
+void Tool_meter::printHumdrumLine(HumdrumLine& line, bool printLabels) {
+
+	for (int i=0; i<line.getFieldCount(); i++) {
+		HTp token = line.token(i);
+		if (token->isKern()) {
+			i = printKernAndAnalysisSpine(line, i, printLabels);
+		} else {
+			m_humdrum_text << token;
+		}
+		if (i < line.getFieldCount() - 1) {
+			m_humdrum_text << "\t";
+		}
+	}
+	m_humdrum_text << "\n";
+}
+
+
+
+//////////////////////////////
+//
+// Tool_meter::searchForLabels --
+//
+
+bool Tool_meter::searchForLabels(HumdrumLine& line) {
+	if (!line.isInterpretation()) {
+		return false;
+	}
+	HumRegex hre;
+	for (int i=0; i<line.getFieldCount(); i++) {
+		HTp token = line.token(i);
+		if (hre.search(token, "^\\*v[ibB]*:")) {
+			return true;
+		}
+	}
+	return false;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_meter::getHumNum --
+//
+
+HumNum Tool_meter::getHumNum(HTp token, const string& parameter) {
+	HumRegex hre;
+	HumNum output;
+	string value = token->getValue("auto", parameter);
+	if (hre.search(value, "(\\d+)/(\\d+)")) {
+		output = hre.getMatchInt(1);
+		output /=  hre.getMatchInt(2);
+	} else if (hre.search(value, "(\\d+)")) {
+		output = hre.getMatchInt(1);
+	}
+	return output;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_meter::getHumNumString --
+//
+
+string Tool_meter::getHumNumString(HumNum input) {
+	stringstream tem;
+	input.printTwoPart(tem);
+	return tem.str();
+}
+
+
+
+//////////////////////////////
+//
+// Tool_meter::printKernAndAnalysisSpine --
+//
+
+int Tool_meter::printKernAndAnalysisSpine(HumdrumLine& line, int index, bool printLabels, bool forceInterpretation) {
+	HTp starttok = line.token(index);
+	int track = starttok->getTrack();
+	int counter = 0;
+
+	string analysis = ".";
+	string numerator = ".";
+	string denominator = ".";
+	string meter = ".";
+	bool hasNote = false;
+	bool hasRest = false;
+
+	for (int i=index; i<line.getFieldCount(); i++) {
+		HTp token = line.token(i);
+		int ttrack = token->getTrack();
+		if (ttrack != track) {
+			break;
+		}
+		if (counter > 0) {
+			m_humdrum_text << "\t";
+		}
+		counter++;
+		if (forceInterpretation) {
+			m_humdrum_text << "*";
+		} else {
+			m_humdrum_text << token;
+		}
+
+		if (line.isData() && !forceInterpretation) {
+			if (token->isNull()) {
+				// analysis = ".";
+			} else if (token->isRest() && !m_restQ) {
+				// analysis = ".";
+			} else if ((!token->isNoteAttack()) && !(m_restQ && token->isRest())) {
+				// analysis = ".";
+			} else if ((analysis == ".") && (token->getValueBool("auto", "hasData"))) {
+				string data = token->getValue("auto", "zeroBeat");
+				if (m_restQ) {
+					if (token->isRest()) {
+						hasRest = true;
+					} else {
+						hasNote = true;
+					}
+				}
+				HumNum value;
+				HumNum nvalue;
+				HumNum dvalue;
+				if (!data.empty()) {
+					value = getHumNum(token, "zeroBeat");
+					if (m_numeratorQ) {
+						nvalue = getHumNum(token, "numerator");
+						numerator = getHumNumString(nvalue);
+					}
+					if (m_denominatorQ) {
+						dvalue = getHumNum(token, "denominator");
+						denominator = getHumNumString(dvalue);
+					}
+					if (m_tsigQ) {
+						meter = numerator;
+						meter += "/";
+						meter += denominator;
+					}
+				}
+				if (!m_zeroQ) {
+					value += 1;
+				}
+				if (m_floatQ) {
+					stringstream tem;
+					if (m_digits) {
+						tem << std::setprecision(m_digits + 1) << value.getFloat();
+					} else {
+						tem << value.getFloat();
+					}
+					analysis = tem.str();
+					if (m_commaQ) {
+						HumRegex hre;
+						hre.replaceDestructive(analysis, ",", "\\.");
+					}
+				} else {
+					analysis = getHumNumString(value);
+				}
+			}
+		} else if (line.isInterpretation() || forceInterpretation) {
+			if (token->compare(0, 2, "**") == 0) {
+				analysis = "**cdata-beat";
+				if (m_tsigQ) {
+					meter = "**cdata-tsig";
+				}
+				if (m_numeratorQ) {
+					numerator = "**cdata-num";
+				}
+				if (m_denominatorQ) {
+					denominator = "**cdata-den";
+				}
+			} else if (*token == "*-") {
+				analysis = "*-";
+				numerator = "*-";
+				denominator = "*-";
+				meter = "*-";
+			} else if (token->isTimeSignature()) {
+				analysis = *token;
+			} else {
+				analysis = "*";
+				numerator = "*";
+				denominator = "*";
+				meter = "*";
+				if (printLabels) {
+					if (m_quarterQ) {
+						analysis = "*vi:4ths:";
+					} else if (m_eighthQ) {
+						analysis = "*vi:8ths:";
+					} else if (m_halfQ) {
+						analysis = "*vi:half:";
+					} else if (m_wholeQ) {
+						analysis = "*vi:whole:";
+					} else if (m_sixteenthQ) {
+						analysis = "*vi:16ths:";
+					} else {
+						analysis = "*vi:beat:";
+					}
+					numerator = "*vi:top:";
+					denominator = "*vi:bot:";
+					meter = "*vi:tsig:";
+					if (m_joinQ) {
+						numerator = "";
+						denominator = "";
+						meter = "";
+					}
+				}
+			}
+		} else if (line.isBarline()) {
+			analysis = *token;
+			numerator = *token;
+			denominator = *token;
+			meter = *token;
+		} else if (line.isCommentLocal()) {
+			analysis = "!";
+			numerator = "!";
+			denominator = "!";
+			meter = "!";
+		} else {
+			cerr << "STRANGE LINE: " << line << endl;
+		}
+	}
+
+	if (m_joinQ) {
+		if (line.isData() && !forceInterpretation) {
+			if (m_tsigQ) {
+					m_humdrum_text << "\t" << meter;
+			} else {
+				if (m_numeratorQ) {
+					m_humdrum_text << "\t" << numerator;
+				}
+				if (m_denominatorQ) {
+					m_humdrum_text << "\t" << denominator;
+				}
+			}
+		}
+		if (!m_nobeatQ) {
+			if (line.isData() && !forceInterpretation) {
+				m_humdrum_text << ":";
+			} else {
+				m_humdrum_text << "\t";
+			}
+			m_humdrum_text << analysis;
+			if (line.isData() && hasRest && !hasNote) {
+				m_humdrum_text << "r";
+			}
+		}
+	} else {
+		if (!m_nobeatQ) {
+			m_humdrum_text << "\t" << analysis;
+			if (line.isData() && hasRest && !hasNote) {
+				m_humdrum_text << "r";
+			}
+		}
+		if (m_tsigQ) {
+				m_humdrum_text << "\t" << meter;
+		} else {
+			if (m_numeratorQ) {
+				m_humdrum_text << "\t" << numerator;
+			}
+			if (m_denominatorQ) {
+				m_humdrum_text << "\t" << denominator;
+			}
+		}
+
+	}
+
+	return index + counter - 1;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_meter::getMeterData --
+//
+
+void Tool_meter::getMeterData(HumdrumFile& infile) {
+
+	int maxtrack = infile.getMaxTrack();
+	vector<HumNum> curNum(maxtrack + 1, 0);
+	vector<HumNum> curDen(maxtrack + 1, 0);
+	vector<HumNum> curBeat(maxtrack + 1, 0);
+	vector<HumNum> curBarTime(maxtrack + 1, 0);
+
+	for (int i=0; i<infile.getLineCount(); i++) {
+		processLine(infile[i], curNum, curDen, curBeat, curBarTime);
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_meter::processLine --
+//
+
+void Tool_meter::processLine(HumdrumLine& line, vector<HumNum>& curNum,
+		vector<HumNum>& curDen, vector<HumNum>& curBeat,
+		vector<HumNum>& curBarTime) {
+
+	int fieldCount = line.getFieldCount();
+
+	if (!line.hasSpines()) {
+		return;
+	}
+
+	HumRegex hre;
+	if (line.isBarline()) {
+		for (int i=0; i<fieldCount; i++) {
+			HTp token = line.token(i);
+			if (!token->isKern()) {
+				continue;
+			}
+			if (hre.search(token, "-")) {
+				// invisible barline: ignore
+				continue;
+			}
+			int track = token->getTrack();
+			HumNum curTime = token->getDurationFromStart();
+			curBarTime.at(track) = curTime;
+		}
+		return;
+	}
+
+	if (line.isInterpretation()) {
+		// check for time signatures
+		for (int i=0; i<fieldCount; i++) {
+			HTp token = line.token(i);
+			if (!token->isKern()) {
+				continue;
+			}
+			if (hre.search(token, "^\\*M(\\d+)/(\\d+)")) {
+				int top = hre.getMatchInt(1);
+				int bot = hre.getMatchInt(2);
+				int track = token->getTrack();
+				curNum.at(track) = top;
+				curDen.at(track) = bot;
+				curBeat.at(track) = 0;
+			} else if (hre.search(token, "^\\*beat:\\s*([\\d.%]+)\\s*$")) {
+				int track = token->getTrack();
+				string recip = hre.getMatch(1);
+				curBeat.at(track) = Convert::recipToDuration(recip);
+			}
+		}
+		return;
+	}
+
+	if (line.isData()) {
+		// check for time signatures
+		for (int i=0; i<fieldCount; i++) {
+			HTp token = line.token(i);
+			if (!token->isKern()) {
+				continue;
+			}
+			if (token->isNull()) {
+				continue;
+			}
+			if ((!m_restQ) && token->isRest()) {
+				continue;
+			}
+			if (!token->isNoteAttack() && !(m_restQ && token->isRest())) {
+				continue;
+			}
+			int pickup = token->getValueInt("auto", "pickup");
+			int track = token->getTrack();
+			stringstream value;
+			value.str("");
+			value << curNum.at(track);
+			token->setValue("auto", "numerator", value.str());
+			value.str("");
+			value << curDen.at(track);
+			token->setValue("auto", "denominator", value.str());
+			HumNum curTime = token->getDurationFromStart();
+			HumNum q;
+			if (pickup) {
+				HumNum meterDur = curNum.at(track);
+				meterDur /= curDen.at(track);
+				meterDur *= 4;
+				HumNum nbt = getHumNum(token, "nextBarTime");
+				q = meterDur - nbt;
+			} else {
+				q = curTime - curBarTime.at(track);
+			}
+			value.str("");
+			value << q;
+			token->setValue("auto", "q", value.str());
+			bool compound = false;
+			int multiple = curNum.at(track).getNumerator() / 3;
+			int remainder = curNum.at(track).getNumerator() % 3;
+			int bottom = curDen.at(track).getNumerator();
+			if ((curBeat.at(track) == 0) && (bottom >= 8) && (multiple > 1) && (remainder == 0)) {
+				compound = true;
+			}
+
+			HumNum qq = q;
+			if (m_quarterQ) {
+				// do nothing (prior calculations are done in quarter notes)
+			} else if (m_halfQ) {
+				qq /= 2;
+			} else if (m_wholeQ) {
+				qq /= 4;
+			} else if (m_eighthQ) {
+				qq *= 2;
+			} else if (m_sixteenthQ) {
+				qq *= 4;
+			} else {
+				// convert quarter note metric positions into beat positions
+				if (compound) {
+					qq *= curDen.at(track);
+					qq /= 4;
+					qq /= 3;
+				} else if (curBeat.at(track) > 0) {
+					qq /= curBeat.at(track);
+				} else {
+					qq *= curDen.at(track);
+					qq /= 4;
+				}
+			}
+
+			value.str("");
+			value << qq;
+			token->setValue("auto", "zeroBeat", value.str());
+			token->setValue("auto", "hasData", 1);
+
+		}
+		return;
+	}
+}
+
+
+
+
+/////////////////////////////////
+//
+// Tool_gridtest::Tool_metlev -- Set the recognized options for the tool.
+//
+
+Tool_metlev::Tool_metlev(void) {
+	define("a|append=b",          "append data analysis to input file");
+	define("p|prepend=b",         "prepend data analysis to input file");
+	define("c|composite=b",       "generate composite rhythm");
+	define("i|integer=b",         "quantize metric levels to int values");
+	define("x|attacks-only=b",    "only mark lines with note attacks");
+	define("G|no-grace-notes=b",  "do not mark grace note lines");
+	define("k|kern-spine=i:1",    "analyze only given kern spine");
+	define("e|exinterp=s:blev",   "exclusive interpretation type for output");
+}
+
+
+
+///////////////////////////////
+//
+// Tool_metlev::run -- Primary interfaces to the tool.
+//
+
+bool Tool_metlev::run(HumdrumFileSet& infiles) {
+	bool status = true;
+	for (int i=0; i<infiles.getCount(); i++) {
+		status &= run(infiles[i]);
+	}
+	return status;
+}
+
+
+bool Tool_metlev::run(const string& indata, ostream& out) {
+	HumdrumFile infile(indata);
+	return run(infile, out);
+}
+
+
+bool Tool_metlev::run(HumdrumFile& infile, ostream& out) {
+	bool status = run(infile);
+	out << infile;
+	return status;
+}
+
+
+bool Tool_metlev::run(HumdrumFile& infile) {
+	int lineCount = infile.getLineCount();
+	if (lineCount == 0) {
+		m_error_text << "No input data";
+		return false;
+	}
+
+	string exinterp = getString("exinterp");
+	if (exinterp.empty()) {
+		exinterp = "**blev";
+	} else if (exinterp[0] != '*') {
+		exinterp.insert(0, "*");
+	}
+	if (exinterp[1] != '*') {
+		exinterp.insert(0, "*");
+	}
+
+	m_kernspines = infile.getKernSpineStartList();
+
+	vector<double> beatlev(lineCount, NAN);
+	int track = 0;
+	if (m_kernspines.size() > 0) {
+		track = m_kernspines[0]->getTrack();
+	} else {
+		m_error_text << "No **kern spines in input file" << endl;
+		return false;
+	}
+	infile.getMetricLevels(beatlev, track, NAN);
+
+	for (int i=0; i<lineCount; i++) {
+		if (!infile[i].isData()) {
+				continue;
+		}
+		if (getBoolean("no-grace-notes") && (infile[i].getDuration() == 0)) {
+			beatlev[i] = NAN;
+			continue;
+		}
+		if (getBoolean("attacks-only")) {
+			if (!infile[i].getKernNoteAttacks()) {
+				beatlev[i] = NAN;
+				continue;
+			}
+		}
+		if (beatlev[i] - (int)beatlev[i] != 0.0) {
+			if (getBoolean("integer")) {
+					beatlev[i] = floor(beatlev[i]);
+			} else {
+				beatlev[i] = Convert::significantDigits(beatlev[i], 2);
+			}
+		}
+	}
+
+	if (getBoolean("kern-spine")) {
+		int kspine = getInteger("kern-spine") - 1;
+		if ((kspine >= 0) && (kspine < (int)m_kernspines.size())) {
+			vector<vector<double> > results;
+			fillVoiceResults(results, infile, beatlev);
+			if (kspine == (int)m_kernspines.size() - 1) {
+				infile.appendDataSpine(results.back(), "nan", exinterp);
+			} else {
+				int track = m_kernspines[kspine+1]->getTrack();
+				infile.insertDataSpineBefore(track, results[kspine],
+						"nan", exinterp);
+			}
+			infile.createLinesFromTokens();
+			return true;
+		}
+	} else if (getBoolean("append")) {
+		infile.appendDataSpine(beatlev, "nan", exinterp);
+		infile.createLinesFromTokens();
+		return true;
+	} else if (getBoolean("prepend")) {
+		infile.prependDataSpine(beatlev, "nan", exinterp);
+		infile.createLinesFromTokens();
+		return true;
+	} else if (getBoolean("composite")) {
+		infile.prependDataSpine(beatlev, "nan", exinterp);
+		infile.printFieldIndex(0, m_humdrum_text);
+		infile.clear();
+		infile.readString(m_humdrum_text.str());
+	} else {
+		vector<vector<double> > results;
+		fillVoiceResults(results, infile, beatlev);
+		infile.appendDataSpine(results.back(), "nan", exinterp);
+		for (int i = (int)results.size()-1; i>0; i--) {
+			int track = m_kernspines[i]->getTrack();
+			infile.insertDataSpineBefore(track, results[i-1], "nan", exinterp);
+		}
+		infile.createLinesFromTokens();
+		return true;
+	}
+
+	return false;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_metlev::fillVoiceResults -- Split the metric level analysis into values
+//     for each voice.
+//
+
+void Tool_metlev::fillVoiceResults(vector<vector<double> >& results,
+		HumdrumFile& infile, vector<double>& beatlev) {
+
+	results.resize(m_kernspines.size());
+	for (int i=0; i<(int)results.size(); i++) {
+		results[i].resize(beatlev.size());
+		fill(results[i].begin(), results[i].end(), NAN);
+	}
+	int track;
+	vector<int> rtracks(infile.getTrackCount() + 1, -1);
+	for (int i=0; i<(int)m_kernspines.size(); i++) {
+		int track = m_kernspines[i]->getTrack();
+		rtracks[track] = i;
+	}
+
+	bool attacksQ = getBoolean("attacks-only");
+	vector<int> nonnullcount(m_kernspines.size(), 0);
+	vector<int> attackcount(m_kernspines.size(), 0);
+	HTp token;
+	int voice;
+	int i, j;
+	for (i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isData()) {
+			continue;
+		}
+		for (j=0; j<infile[i].getFieldCount(); j++) {
+			token = infile.token(i, j);
+			if (!token->isKern()) {
+				continue;
+			}
+			if (token->isNull()) {
+				continue;
+			}
+			track = token->getTrack();
+			voice = rtracks[track];
+			nonnullcount[voice]++;
+			if (token->isNoteAttack()) {
+				attackcount[voice]++;
+			}
+		}
+		for (int v=0; v<(int)m_kernspines.size(); v++) {
+			if (attacksQ) {
+				if (attackcount[v]) {
+					results[v][i] = beatlev[i];
+					attackcount[v] = 0;
+				}
+			} else {
+				if (nonnullcount[v]) {
+					results[v][i] = beatlev[i];
+				}
+				nonnullcount[v] = 0;
+			}
+		}
+	}
+}
+
+
+
+
+/////////////////////////////////
+//
+// Tool_modori::Tool_modori -- Set the recognized options for the tool.
+//
+
+Tool_modori::Tool_modori(void) {
+	define("m|modern=b",    "prepare score for modern style");
+	define("o|original=b", "prepare score for original style");
+	define("d|info=b", "display key/clef/mensuration information");
+	define("I|no-instrument-name|no-instrument-names=b", "Do not change part labels");
+	define("A|no-instrument-abbreviation|no-instrument-abbreviations=b", "Do not change part label abbreviations");
+	define("C|no-clef|no-clefs=b", "Do not change clefs");
+	define("K|no-key|no-keys=b", "Do not change key signatures");
+	define("L|no-lyrics=b", "Do not change **text exclusive interpretations");
+	define("M|no-mensuration|no-mensurations=b", "Do not change mensurations");
+	define("R|no-references=b", "Do not change reference records keys");
+	define("T|no-text=b",    "Do not change !LO:(TX|DY) layout parameters");
+}
+
+
+
+/////////////////////////////////
+//
+// Tool_modori::run -- Do the main work of the tool.
+//
+
+bool Tool_modori::run(HumdrumFileSet& infiles) {
+	bool status = true;
+	for (int i=0; i<infiles.getCount(); i++) {
+		status &= run(infiles[i]);
+	}
+	return status;
+}
+
+
+bool Tool_modori::run(const string& indata, ostream& out) {
+	HumdrumFile infile(indata);
+	bool status = run(infile);
+	if (hasAnyText()) {
 		getAllText(out);
 	} else {
 		out << infile;
@@ -94738,7 +96267,7 @@ Tool_msearch::Tool_msearch(void) {
 	define("c|color=s",             "highlight color");
 	define("m|mark|marker=s:@",     "marking character");
 	define("M|no-mark|no-marker=b", "do not mark matches");
-	define("Q|quiet=b",             "quite mode: do not summarize matches");
+	define("Q|quiet=b",             "quiet mode: do not summarize matches");
 }
 
 
@@ -97475,6 +99004,7 @@ bool Tool_musicxml2hum::convert(ostream& out, xml_document& doc) {
 
 	m_current_dynamic.resize(partids.size());
 	m_current_brackets.resize(partids.size());
+	m_current_figured_bass.resize(partids.size());
 	m_stop_char.resize(partids.size(), "[");
 
 	getPartContent(partcontent, partids, doc);
@@ -97551,7 +99081,7 @@ bool Tool_musicxml2hum::convert(ostream& out, xml_document& doc) {
 		bool fbstate = partdata[p].hasFiguredBass();
 		if (fbstate) {
 			outdata.setFiguredBassPresent(p);
-			break;
+			// break;
 		}
 	}
 
@@ -97634,10 +99164,10 @@ bool Tool_musicxml2hum::convert(ostream& out, xml_document& doc) {
 	}
 
 	// add RDFs
-	if (m_slurabove) {
+	if (m_slurabove || m_staffabove) {
 		out << "!!!RDF**kern: > = above" << endl;
 	}
-	if (m_slurbelow) {
+	if (m_slurbelow || m_staffbelow) {
 		out << "!!!RDF**kern: < = below" << endl;
 	}
 
@@ -98672,12 +100202,19 @@ bool Tool_musicxml2hum::insertMeasure(HumGrid& outdata, int mnum,
 		}
 		status &= convertNowEvents(outdata.back(),
 				nowevents, nowparts, processtime, partdata, partstaves);
+
+		// Remove all figured bass numbers for this nowtime so that they are not
+		// accidentally displayed in the next nowtime, which can currently
+		// happen if there are no nonzerodur events in the same part
+		for (int i=0; i<(int)m_current_figured_bass.size(); i++) {
+			m_current_figured_bass[i].clear();
+		}
 	}
 
 	if (offsetHarmony.size() > 0) {
 		insertOffsetHarmonyIntoMeasure(outdata.back());
 	}
-	if (offsetFiguredBass.size() > 0) {
+	if (m_offsetFiguredBass.size() > 0) {
 		insertOffsetFiguredBassIntoMeasure(outdata.back());
 	}
 	return status;
@@ -98691,7 +100228,7 @@ bool Tool_musicxml2hum::insertMeasure(HumGrid& outdata, int mnum,
 //
 
 void Tool_musicxml2hum::insertOffsetFiguredBassIntoMeasure(GridMeasure* gm) {
-	if (offsetFiguredBass.empty()) {
+	if (m_offsetFiguredBass.empty()) {
 		return;
 	}
 
@@ -98703,18 +100240,18 @@ void Tool_musicxml2hum::insertOffsetFiguredBassIntoMeasure(GridMeasure* gm) {
 			continue;
 		}
 		HumNum timestamp = gs->getTimestamp();
-		for (int i=0; i<(int)offsetFiguredBass.size(); i++) {
-			if (offsetFiguredBass[i].token == NULL) {
+		for (int i=0; i<(int)m_offsetFiguredBass.size(); i++) {
+			if (m_offsetFiguredBass[i].token == NULL) {
 				continue;
  			}
-			if (offsetFiguredBass[i].timestamp == timestamp) {
+			if (m_offsetFiguredBass[i].timestamp == timestamp) {
 				// this is the slice to insert the harmony
-				gs->at(offsetFiguredBass[i].partindex)->setFiguredBass(offsetFiguredBass[i].token);
-				offsetFiguredBass[i].token = NULL;
-			} else if (offsetFiguredBass[i].timestamp < timestamp) {
+				gs->at(m_offsetFiguredBass[i].partindex)->setFiguredBass(m_offsetFiguredBass[i].token);
+				m_offsetFiguredBass[i].token = NULL;
+			} else if (m_offsetFiguredBass[i].timestamp < timestamp) {
 				if (beginQ) {
-					cerr << "Error: Cannot insert harmony " << offsetFiguredBass[i].token
-					     << " at timestamp " << offsetFiguredBass[i].timestamp
+					cerr << "Error: Cannot insert harmony " << m_offsetFiguredBass[i].token
+					     << " at timestamp " << m_offsetFiguredBass[i].timestamp
 					     << " since first timestamp in measure is " << timestamp << endl;
 				} else {
 					m_forceRecipQ = true;
@@ -98729,11 +100266,11 @@ void Tool_musicxml2hum::insertOffsetFiguredBassIntoMeasure(GridMeasure* gm) {
 						}
 						int partcount = (int)(*tempit)->size();
 						tempit++;
-						GridSlice* newgs = new GridSlice(gm, offsetFiguredBass[i].timestamp,
+						GridSlice* newgs = new GridSlice(gm, m_offsetFiguredBass[i].timestamp,
 								SliceType::Notes, partcount);
-						newgs->at(offsetFiguredBass[i].partindex)->setFiguredBass(offsetFiguredBass[i].token);
+						newgs->at(m_offsetFiguredBass[i].partindex)->setFiguredBass(m_offsetFiguredBass[i].token);
 						gm->insert(tempit, newgs);
-						offsetFiguredBass[i].token = NULL;
+						m_offsetFiguredBass[i].token = NULL;
 						break;
 					}
 				}
@@ -98743,19 +100280,19 @@ void Tool_musicxml2hum::insertOffsetFiguredBassIntoMeasure(GridMeasure* gm) {
 	}
 	// If there are still valid harmonies in the input list, apppend
 	// them to the end of the measure.
-	for (int i=0; i<(int)offsetFiguredBass.size(); i++) {
-		if (offsetFiguredBass[i].token == NULL) {
+	for (int i=0; i<(int)m_offsetFiguredBass.size(); i++) {
+		if (m_offsetFiguredBass[i].token == NULL) {
 			continue;
  		}
 		m_forceRecipQ = true;
 		int partcount = (int)gm->back()->size();
-		GridSlice* newgs = new GridSlice(gm, offsetFiguredBass[i].timestamp,
+		GridSlice* newgs = new GridSlice(gm, m_offsetFiguredBass[i].timestamp,
 				SliceType::Notes, partcount);
-		newgs->at(offsetFiguredBass[i].partindex)->setFiguredBass(offsetFiguredBass[i].token);
+		newgs->at(m_offsetFiguredBass[i].partindex)->setFiguredBass(m_offsetFiguredBass[i].token);
 		gm->insert(gm->end(), newgs);
-		offsetFiguredBass[i].token = NULL;
+		m_offsetFiguredBass[i].token = NULL;
 	}
-	offsetFiguredBass.clear();
+	m_offsetFiguredBass.clear();
 }
 
 
@@ -98931,7 +100468,14 @@ bool Tool_musicxml2hum::convertNowEvents(GridMeasure* outdata,
 
 	appendZeroEvents(outdata, nowevents, nowtime, partdata);
 
-	if (nowevents[0]->nonzerodur.size() == 0) {
+	bool hasNonZeroDurElements = false;
+	for (const SimultaneousEvents* event : nowevents) {
+		if (event->nonzerodur.size() != 0) {
+			hasNonZeroDurElements = true;
+			break;
+		}
+	}
+	if (!hasNonZeroDurElements) {
 		// no duration events (should be a terminal barline)
 		// ignore and deal with in calling function.
 		return true;
@@ -98939,11 +100483,45 @@ bool Tool_musicxml2hum::convertNowEvents(GridMeasure* outdata,
 
 	appendNonZeroEvents(outdata, nowevents, nowtime, partdata);
 
+	handleFiguredBassWithoutNonZeroEvent(nowevents, nowtime);
+
 	return true;
 }
 
 
 
+/////////////////////////////
+//
+// Tool_musicxml2hum::handleFiguredBassWithoutNonZeroEvent --
+//
+
+void Tool_musicxml2hum::handleFiguredBassWithoutNonZeroEvent(vector<SimultaneousEvents*>& nowevents, HumNum nowtime) {
+	vector<int> nonZeroParts;
+	vector<MxmlEvent> floatingFiguredBass;
+	for (const SimultaneousEvents* sevent : nowevents) {
+		for (MxmlEvent* mxmlEvent : sevent->nonzerodur) {
+			nonZeroParts.push_back(mxmlEvent->getPartIndex());
+		}
+		for (MxmlEvent* mxmlEvent : sevent->zerodur) {
+			if ("figured-bass" == mxmlEvent->getElementName()) {
+				if (std::find(nonZeroParts.begin(), nonZeroParts.end(), mxmlEvent->getPartIndex()) == nonZeroParts.end()) {
+					// cerr << mxmlEvent->getNode() << "\n";
+					string fstring = getFiguredBassString(mxmlEvent->getNode());
+					HTp ftok = new HumdrumToken(fstring);
+					MusicXmlFiguredBassInfo finfo;
+					finfo.timestamp = nowtime;
+					finfo.partindex = mxmlEvent->getPartIndex();
+					finfo.token = ftok;
+					m_offsetFiguredBass.push_back(finfo);
+					// cerr << "ADD FLOATING FB NUM " << fstring << " " << nowtime << "\n";
+				}
+			}
+		}
+	}
+}
+
+
+
 /////////////////////////////
 //
 // Tool_musicxml2hum::appendNonZeroEvents --
@@ -99096,6 +100674,12 @@ void Tool_musicxml2hum::addEvent(GridSlice* slice, GridMeasure* outdata, MxmlEve
 		}
 	}
 
+	if (event->getCrossStaffOffset() > 0) {
+		m_staffbelow = true;
+	} else if (event->getCrossStaffOffset() < 0) {
+		m_staffabove = true;
+	}
+
 	stringstream ss;
 	if (event->isFloating()) {
 		ss << ".";
@@ -99126,7 +100710,7 @@ void Tool_musicxml2hum::addEvent(GridSlice* slice, GridMeasure* outdata, MxmlEve
 		cerr << "!!TOKEN: " << ss.str();
 		cerr << "\tTS: "    << event->getStartTime();
 		cerr << "\tDUR: "   << event->getDuration();
-		cerr << "\tSTi: "   << event->getStaffNumber();
+		cerr << "\tSTn: "   << event->getStaffNumber();
 		cerr << "\tVn: "    << event->getVoiceNumber();
 		cerr << "\tSTi: "   << event->getStaffIndex();
 		cerr << "\tVi: "    << event->getVoiceIndex();
@@ -100088,7 +101672,7 @@ string Tool_musicxml2hum::convertFiguredBassNumber(const xml_node& figure) {
 		accidental = "--";
 	} else if (prefix == "flat") {
 		accidental = "-";
-	} else if (prefix == "double-sharp") {
+	} else if (prefix == "double-sharp" || prefix == "sharp-sharp") {
 		accidental = "##";
 	} else if (prefix == "sharp") {
 		accidental = "#";
@@ -100098,7 +101682,7 @@ string Tool_musicxml2hum::convertFiguredBassNumber(const xml_node& figure) {
 		accidental = "--r";
 	} else if (suffix == "flat") {
 		accidental = "-r";
-	} else if (suffix == "double-sharp") {
+	} else if (suffix == "double-sharp" || suffix == "sharp-sharp") {
 		accidental = "##r";
 	} else if (suffix == "sharp") {
 		accidental = "#r";
@@ -100111,12 +101695,12 @@ string Tool_musicxml2hum::convertFiguredBassNumber(const xml_node& figure) {
 	// could be a flat).  At the moment do not assign the accidental, but
 	// in the future assign an accidental to the slashed figure, probably
 	// with a post-processing tool.
-	if (suffix == "cross" || prefix == "cross") {
+	if (suffix == "cross" || prefix == "cross" || suffix == "vertical" || prefix == "vertical") {
 		slash = "|";
 		if (accidental.empty()) {
 			accidental = "#";
 		}
-	} else if ((suffix == "backslash") || (prefix == "backslash")) {
+	} else if ((suffix == "backslash" || suffix == "back-slash") || (prefix == "backslash" || prefix == "back-slash")) {
 		slash = "\\";
 		if (accidental.empty()) {
 			accidental = "#";
@@ -100351,13 +101935,13 @@ string Tool_musicxml2hum::getDynamicString(xml_node element) {
 //
 
 int Tool_musicxml2hum::addFiguredBass(GridPart* part, MxmlEvent* event, HumNum nowtime, int partindex) {
-	if (m_current_figured_bass.empty()) {
+	if (m_current_figured_bass[partindex].empty()) {
 		return 0;
 	}
 
 	int dursum = 0;
-	for (int i=0; i<(int)m_current_figured_bass.size(); i++) {
-		xml_node fnode = m_current_figured_bass.at(i);
+	for (int i=0; i<(int)m_current_figured_bass[partindex].size(); i++) {
+		xml_node fnode = m_current_figured_bass[partindex].at(i);
 		if (!fnode) {
 			// strange problem
 			continue;
@@ -100376,13 +101960,13 @@ int Tool_musicxml2hum::addFiguredBass(GridPart* part, MxmlEvent* event, HumNum n
 			finfo.timestamp += nowtime;
 			finfo.partindex = partindex;
 			finfo.token = ftok;
-			offsetFiguredBass.push_back(finfo);
+			m_offsetFiguredBass.push_back(finfo);
 		}
-		if (i < (int)m_current_figured_bass.size() - 1) {
+		if (i < (int)m_current_figured_bass[partindex].size() - 1) {
 			dursum += getFiguredBassDuration(fnode);
 		}
 	}
-	m_current_figured_bass.clear();
+	m_current_figured_bass[partindex].clear();
 
 	return 1;
 
@@ -100433,6 +102017,18 @@ string Tool_musicxml2hum::getFiguredBassString(xml_node fnode) {
 		}
 	}
 
+	HumRegex hre;
+	hre.replaceDestructive(output, "", R"(^\s+|\s+$)");
+
+	if (output.empty()) {
+		if (children.size()) {
+			cerr << "WARNING: figured bass string is empty but has "
+				<< children.size() << " figure elements as children. "
+				<< "The output has been replaced with \".\"" << endl;
+		}
+		output = ".";
+	}
+
 	return output;
 
 	// HTp fbtok = new HumdrumToken(fbstring);
@@ -101027,7 +102623,7 @@ void Tool_musicxml2hum::appendZeroEvents(GridMeasure* outdata,
 					}
 				}
 			} else if (nodeType(element, "figured-bass")) {
-				m_current_figured_bass.push_back(element);
+				m_current_figured_bass[pindex].push_back(element);
 			} else if (nodeType(element, "note")) {
 				if (foundnongrace) {
 					addEventToList(graceafter, nowevents[i]->zerodur[j]);
@@ -102921,7 +104517,7 @@ void Tool_myank::processFile(HumdrumFile& infile) {
 vector<int> Tool_myank::analyzeBarNumbers(HumdrumFile& infile) {
 	vector<int> m_barnum;
 	m_barnum.resize(infile.getLineCount());
-	int current = -1;
+	int current = 0;
 	HumRegex hre;
 	for (int i=0; i<infile.getLineCount(); i++) {
 		if (!infile[i].isBarline()) {
@@ -104520,6 +106116,15 @@ void Tool_myank::getMeasureStartStop(vector<MeasureInfo>& measurelist, HumdrumFi
 		measurelist.push_back(current);
 	}
 
+	// allow "myank -l" when there are no measure numbers
+	if (getBoolean("lines") && measurelist.size() == 0) {
+		current.clear();
+		current.num = 0;
+		current.start = 0;
+		current.stop = dataend;
+		current.file = &infile;
+		measurelist.push_back(current);
+	}
 
 }
 
@@ -104627,7 +106232,7 @@ void Tool_myank::insertZerothMeasure(vector<MeasureInfo>& measurelist,
 	int startline = -1;
 	int stopline = -1;
 	int i;
-	for (i=9; i<infile.getLineCount(); i++) {
+	for (i=0; i<infile.getLineCount(); i++) {
 		if ((exinterpline < 0) && infile[i].isInterpretation()) {
 			exinterpline = i;
 		}
@@ -104657,9 +106262,10 @@ void Tool_myank::insertZerothMeasure(vector<MeasureInfo>& measurelist,
 	MeasureInfo current;
 	current.clear();
 	current.num = 0;
-	// current.start = startline;
-	current.start = exinterpline+1;
+	current.start = startline;
+	// current.start = exinterpline+1;
 	current.stop = stopline;
+	current.file = &infile;
 	measurelist.push_back(current);
 }
 
@@ -104687,7 +106293,7 @@ void Tool_myank::expandMeasureOutList(vector<MeasureInfo>& measureout,
 			minmeasure = measurein[i].num;
 		}
 	}
-	if (maxmeasure <= 0) {
+	if (maxmeasure <= 0 && !getBoolean("lines")) {
 		cerr << "Error: There are no measure numbers present in the data" << endl;
 		exit(1);
 	}
@@ -105324,35 +106930,37 @@ void Tool_myank::usage(const string& ommand) {
 
 /////////////////////////////////
 //
-// Tool_gridtest::Tool_pccount -- Set the recognized options for the tool.
+// Tool_nproof::Tool_nproof -- Set the recognized options for the tool.
 //
 
-Tool_pccount::Tool_pccount(void) {
-	define("a|attacks=b", "count attacks instead of durations");
-	define("d|data|vega-data=b", "display the vega-lite template.");
-	define("f|full=b", "full count attacks all single sharps and flats.");
-	define("ff|double-full=b", "full count attacks all double sharps and flats.");
-	define("h|html=b", "generate vega-lite HTML content");
-	define("i|id=s:id", "ID for use as variable and in plot title");
-	define("K|no-key|no-final=b", "Do not label key tonic or final");
-	define("m|maximum=b", "normalize by maximum count");
-	define("n|normalize=b", "normalize counts");
-	define("p|page=b", "generate vega-lite stand-alone HTML page");
-	define("r|ratio|aspect-ratio=d:0.67", "width*ratio=height of vega-lite plot");
-	define("s|script|vega-script=b", "generate vega-lite javascript content");
-	define("title=s", "Title for plot");
-	define("t|template|vega-template=b", "display the vega-lite template.");
-	define("w|width=i:400", "width of vega-lite plot");
+Tool_nproof::Tool_nproof(void) {
+	define("B|no-blank|no-blanks=b", "Do not check for blank lines.\n");
+	define("b|only-blank|only-blanks=b", "Only check for blank lines.\n");
+
+	define("I|no-instrument|no-instruments=b", "Do not check instrument interpretations.\n");
+	define("i|only-instrument|only-instruments=b", "Only check instrument interpretations.\n");
+
+	define("K|no-key=b", "Do not check for !!!key: manual initial key designation.\n");
+	define("k|only-key=b", "Only check for !!!key: manual initial key designation.\n");
+
+	define("R|no-reference=b", "Do not check for reference records.\n");
+	define("r|only-reference=b", "Only check for reference records.\n");
+
+	define("T|no-termination|no-terminations=b", "Do not check spine terminations.\n");
+	define("t|only-termination|only-terminations=b", "Only check spine terminations.\n");
+
+	define("file|filename=b", "Print filename with raw count (if available).\n");
+	define("raw=b", "Only print error count.\n");
 }
 
 
 
-///////////////////////////////
+/////////////////////////////////
 //
-// Tool_pccount::run -- Primary interfaces to the tool.
+// Tool_nproof::run -- Do the main work of the tool.
 //
 
-bool Tool_pccount::run(HumdrumFileSet& infiles) {
+bool Tool_nproof::run(HumdrumFileSet& infiles) {
 	bool status = true;
 	for (int i=0; i<infiles.getCount(); i++) {
 		status &= run(infiles[i]);
@@ -105361,20 +106969,31 @@ bool Tool_pccount::run(HumdrumFileSet& infiles) {
 }
 
 
-bool Tool_pccount::run(const string& indata, ostream& out) {
+bool Tool_nproof::run(const string& indata, ostream& out) {
 	HumdrumFile infile(indata);
-	return run(infile, out);
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
+	}
+	return status;
 }
 
 
-bool Tool_pccount::run(HumdrumFile& infile, ostream& out) {
+bool Tool_nproof::run(HumdrumFile& infile, ostream& out) {
 	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
+	}
 	return status;
 }
 
 
-bool Tool_pccount::run(HumdrumFile& infile) {
-   initialize(infile);
+bool Tool_nproof::run(HumdrumFile& infile) {
+	initialize();
 	processFile(infile);
 	return true;
 }
@@ -105383,161 +107002,94 @@ bool Tool_pccount::run(HumdrumFile& infile) {
 
 //////////////////////////////
 //
-// Tool_pccount::initialize --
+// Tool_nproof::initialize --
 //
 
-void Tool_pccount::initialize(HumdrumFile& infile) {
-	m_attack     = getBoolean("attacks");
-	m_full       = getBoolean("full");
-	m_doublefull = getBoolean("double-full");
-	m_normalize  = getBoolean("normalize");
-	m_maximum    = getBoolean("maximum");
-	m_template   = getBoolean("vega-template");
-	m_data       = getBoolean("vega-data");
-	m_script     = getBoolean("vega-script");
-	m_width      = getInteger("width");
-	m_ratio      = getDouble("aspect-ratio");
-	m_key        = !getBoolean("no-key");
-	if (getBoolean("title")) {
-		m_title = getString("title");
-	}
-	m_html       = getBoolean("html");
-	m_page       = getBoolean("page");
-	if (getBoolean("id")) {
-		m_id = getString("id");
-	} else {
-		string filename = infile.getFilename();
-	 	auto pos = filename.rfind("/");
-		if (pos != string::npos) {
-			filename = filename.substr(pos+1);
-		}
-		pos = filename.find("-");
-		if (pos != string::npos) {
-			m_id = filename.substr(0, pos);
-		}
-	}
-	m_parttracks.clear();
-	m_names.clear();
-	m_abbreviations.clear();
-	initializePartInfo(infile);
-
-
-	// https://encycolorpedia.com/36cd27
-	m_vcolor.clear();
-
-	m_vcolor["Canto"]		=	"#e49689";
-	m_vcolor["Canto (Canto I)"]	=	"#e49689";
-	m_vcolor["Canto I"]		=	"#e49689";
-	m_vcolor["Canto Primo"]		=	"#e49689";
-	m_vcolor["[Canto 1]"]		=	"#e49689";
-	m_vcolor["[Canto]"]		=	"#e49689";
-	m_vcolor["[Soprano o Tenore]"]	=	"#e49689";
-	m_vcolor["Soprano"]		=	"#e49689";
-
-	m_vcolor["Canto 2."]		=	"#d67365";
-	m_vcolor["Canto II"]		=	"#d67365";
-	m_vcolor["Canto II [Sesto]"]	=	"#d67365";
-	m_vcolor["Canto Sec."]		=	"#d67365";
-	m_vcolor["Canto Secondo"]	=	"#d67365";
-	m_vcolor["Canto secondo"]	=	"#d67365";
-	m_vcolor["[Canto 2]"]		=	"#d67365";
-
-	m_vcolor["Canto III [Settimo]"]	=	"#c54f43";
-
-	m_vcolor["Alto"]		=	"#f4c6a1";
-	m_vcolor["Alti"]		=	"#f4c6a1";
-	m_vcolor["Alto (Canto III)"]	=	"#f4c6a1";
-
-	m_vcolor["Alto II"]		=	"#edb383";
-
-	m_vcolor["Tenor"]		=	"#ecdf7a";
-	m_vcolor["Tenore"]		=	"#ecdf7a";
-	m_vcolor["Tenore over Canto"]	=	"#ecdf7a";
-	m_vcolor["[Tenore]"]		=	"#ecdf7a";
-
-	m_vcolor["Sesto"]		=	"#c8f0bb";
-	m_vcolor["Sesto (Canto II)"]	=	"#c8f0bb";
-	m_vcolor["Sesto Canto II"]	=	"#c8f0bb";
-
-	m_vcolor["Quinto"]		=	"#e3f5f8";
-	m_vcolor["Qvinto"]		=	"#e3f5f8";
-
-	m_vcolor["Ottava parte [Ottavo]"]	=	"#e0e4f7";
-
-	m_vcolor["Nona parte [Nono]"]	=	"#a39ce5";
+void Tool_nproof::initialize(void) {
+	m_noblankQ       = getBoolean("no-blank");
+	m_noinstrumentQ  = getBoolean("no-instrument");
+	m_nokeyQ         = getBoolean("no-key");
+	m_noreferenceQ   = getBoolean("no-reference");
+	m_noterminationQ = getBoolean("no-termination");
 
-	m_vcolor["Basso"]		=	"#d2aef7";
-	m_vcolor["Bass"]		=	"#d2aef7";
+	bool onlyBlank       = getBoolean("only-blank");
+	bool onlyInstrument  = getBoolean("only-instrument");
+	bool onlyKey         = getBoolean("only-key");
+	bool onlyReference   = getBoolean("only-reference");
+	bool onlyTermination = getBoolean("only-termination");
 
-	m_vcolor["Basso II"]		=	"#c69af5";
-	m_vcolor["Basso II [Decimo]"]	=	"#c69af5";
+	if (onlyBlank || onlyInstrument || onlyKey || onlyReference || onlyTermination) {
+		m_noblankQ       = !onlyBlank;
+		m_noinstrumentQ  = !onlyInstrument;
+		m_nokeyQ         = !onlyKey;
+		m_noreferenceQ   = !onlyReference;
+		m_noterminationQ = !onlyTermination;
+	}
 
-	m_vcolor["Basso Continuo"]	=	"#a071ec";
-	m_vcolor["Basso continuo"]	=	"#a071ec";
-	m_vcolor["[B. C.]"]		=	"#a071ec";
-	m_vcolor["[Basso Continuo]"]	=	"#a071ec";
-	m_vcolor["[Basso continuo]"]	=	"#a071ec";
-	m_vcolor["B.C."]		=	"#a071ec";
-	m_vcolor["B.c."]		=	"#a071ec";
+	m_fileQ          = getBoolean("file");
+	m_rawQ           = getBoolean("raw");
 }
 
 
 
 //////////////////////////////
 //
-// Tool_pccount::getFinal -- Extract the last unparenthesed letter from a ref record like this:
-//
-// !!!final: (A)D
+// Tool_nproof::processFile --
 //
 
-string Tool_pccount::getFinal(HumdrumFile& infile) {
-	string finalref = infile.getReferenceRecord("final");
-	HumRegex hre;
-	hre.replaceDestructive(finalref, "", "\\(.*?\\)", "g");
-	hre.replaceDestructive(finalref, "", "\\s+", "g");
-	if (hre.search(finalref, "^[A-G]$", "i")) {
-		return finalref;
-	} else {
-		return "";
-	}
-}
-
-
-
-//////////////////////////////
-//
-// Tool_pccount::processFile --
-//
+void Tool_nproof::processFile(HumdrumFile& infile) {
+	m_errorCount = 0;
+	m_errorList = "";
+	m_errorHtml = "";
 
-void Tool_pccount::processFile(HumdrumFile& infile) {
-	countPitches(infile);
+	if (!m_noblankQ) {
+		checkForBlankLines(infile);
+	}
+	if (!m_nokeyQ) {
+		checkKeyInformation(infile);
+	}
+	if (!m_noinstrumentQ) {
+		checkInstrumentInformation(infile);
+	}
+	if (!m_noreferenceQ) {
+		checkReferenceRecords(infile);
+	}
+	if (!m_noterminationQ) {
+		checkSpineTerminations(infile);
+	}
 
-	string datavar;
-	string target;
-	string jsonvar;
+	m_humdrum_text << infile;
 
-	if (m_attack) {
-		datavar = "data_" + m_id + "_count";
-		target = "id_" + m_id + "_count";
-		jsonvar = "vega_" + m_id + "_count";
-	} else {
-		datavar = "data_" + m_id + "_dur";
-		target = "id_" + m_id + "_dur";
-		jsonvar = "vega_" + m_id + "_dur";
+	if (m_rawQ) {
+		// print error count only.
+		if (m_fileQ) {
+			m_free_text << infile.getFilename() << "\t";
+		}
+		m_free_text << m_errorCount << endl;
+		return;
 	}
 
-	if (m_template) {
-		printVegaLiteJsonTemplate(datavar, infile);
-	} else if (m_data) {
-		printVegaLiteJsonData();
-	} else if (m_script) {
-		printVegaLiteScript(jsonvar, target, datavar, infile);
-	} else if (m_html) {
-		printVegaLiteHtml(jsonvar, target, datavar, infile);
-	} else if (m_page) {
-		printVegaLitePage(jsonvar, target, datavar, infile);
+	if (m_errorCount > 0) {
+		m_humdrum_text << m_errorList;
+		m_humdrum_text << "!!!TOOL-nproof-error-count: " << m_errorCount << endl;
+		m_humdrum_text << "!!@@BEGIN: PREHTML\n";
+		m_humdrum_text << "!!@TOOL: nproof\n";
+		m_humdrum_text << "!!@CONTENT:\n";
+		m_humdrum_text << "!! <h2 style='color:red'> @{TOOL-nproof-error-count} problem";
+		if (m_errorCount != 1) {
+			m_humdrum_text << "s";
+		}
+		m_humdrum_text << " detected </h2>\n";
+		m_humdrum_text << "!! <ul style='color:darkred'>\n";
+		m_humdrum_text << m_errorHtml;
+		m_humdrum_text << "!! </ul>\n";
+		m_humdrum_text << "!!@@END: PREHTML\n";
 	} else {
-		printHumdrumTable();
+		m_humdrum_text << "!!@@BEGIN: PREHTML\n";
+		m_humdrum_text << "!!@TOOL: nproof\n";
+		m_humdrum_text << "!!@CONTENT:\n";
+		m_humdrum_text << "!! <h2 style='color:red'> No problems detected </h2>\n";
+		m_humdrum_text << "!!@@END: PREHTML\n";
 	}
 }
 
@@ -105545,131 +107097,185 @@ void Tool_pccount::processFile(HumdrumFile& infile) {
 
 //////////////////////////////
 //
-// Tool_pccount::printVegaLitePage --
+// Tool_nproof::checkForBlankLines --
 //
 
-void Tool_pccount::printVegaLitePage(const string& jsonvar,
-		const string& target, const string& datavar, HumdrumFile& infile) {
-	stringstream& out = m_free_text;
+void Tool_nproof::checkForBlankLines(HumdrumFile& infile) {
+	vector<int> blanks;
+	// -1: Not checking for a blank line at the very end of the score.
+	for (int i=0; i<infile.getLineCount() - 1; i++) {
+		if (infile[i].hasSpines()) {
+			continue;
+		}
+		HTp token = infile.token(i, 0);
+		if (*token == "") {
+			blanks.push_back(i+1);
+		}
+	}
 
-	out << "<!DOCTYPE html>\n";
-	out << "<html>\n";
-	out << "  <head>\n";
-	out << "    <title>Vega-Lite Bar Chart</title>\n";
-	out << "    <meta charset=\"utf-8\" />\n";
-	out << "\n";
-	out << "    <script src=\"https://cdn.jsdelivr.net/npm/vega@5.4.0\"></script>\n";
-	out << "    <script src=\"https://cdn.jsdelivr.net/npm/vega-lite@4.0.0-beta.1\"></script>\n";
-	out << "    <script src=\"https://cdn.jsdelivr.net/npm/vega-embed@5\"></script>\n";
-	out << "\n";
-	out << "    <style media=\"screen\">\n";
-	out << "      /* Add space between Vega-Embed links  */\n";
-	out << "      .vega-actions a {\n";
-	out << "        margin-right: 5px;\n";
-	out << "      }\n";
-	out << "    </style>\n";
-	out << "  </head>\n";
-	out << "  <body>\n";
-	out << "    <h1>Pitch-class histogram</h1>\n";
-	printVegaLiteHtml(jsonvar, target, datavar, infile);
-	out << "</body>\n";
-	out << "</html>\n";
+	if (blanks.empty()) {
+		return;
+	}
+
+	m_errorCount++;
+	m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": Blank lines on row";
+	if (blanks.size() != 1) {
+		m_errorList += "s";
+	}
+	m_errorList += ": ";
+	for (int i=0; i<(int)blanks.size(); i++) {
+		m_errorList += to_string(blanks[i]);
+		if (i < (int)blanks.size() - 1) {
+			m_errorList += ", ";
+		}
+	}
+	m_errorList += ".\n";
+	m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
 }
 
 
 
 //////////////////////////////
 //
-// Tool_pccount::printVegaLiteHtml --
+// Tool_nproof::checkForValidInstrumentCode --
 //
 
-void Tool_pccount::printVegaLiteHtml(const string& jsonvar,
-		const string& target, const string& datavar, HumdrumFile& infile) {
-	stringstream& out = m_free_text;
+void Tool_nproof::checkForValidInstrumentCode(HTp token,
+		vector<pair<string, string>>& instrumentList) {
 
-	out << "<div class=\"vega-svg\" id=\"" << target << "\"></div>\n";
-	out << "\n";
-	out << "<script>\n";
-	printVegaLiteScript(jsonvar, target, datavar, infile);
-	out << "</script>\n";
-}
+	if ((token->find("&") == string::npos) && (token->find("|") == string::npos)) {
+		string code = token->substr(2);
+		for (int i=0; i<(int)instrumentList.size(); i++) {
+			if (instrumentList[i].first == code) {
+				return;
+			}
+		}
 
+		m_errorCount++;
+		m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": Unknown instrument code \"" + code + "\" on line " + to_string(token->getLineNumber()) + ", field " + to_string(token->getFieldNumber()) + ". See list of codes at <a target='_blank' href='https://bit.ly/humdrum-instrument-codes'>https://bit.ly/humdrum-instrument-codes</a>.\n";
+		m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+		return;
+	}
 
+	bool found1 = false;
+	bool found2 = false;
+	string inst1;
+	string inst2;
+	HumRegex hre;
+	if (hre.match(token, "^\\*I(.*)[&|](I.*)")) {
+		inst1 = hre.getMatch(1);
+		inst2 = hre.getMatch(2);
 
-//////////////////////////////
-//
-// Tool_pccount::printVegaLiteScript --
-//
+		for (int i=0; i<(int)instrumentList.size(); i++) {
+			if (instrumentList[i].first == inst1) {
+				found1 = true;
+			}
+			if (instrumentList[i].first == inst2) {
+				found2 = true;
+			}
+		}
+	}
 
-void Tool_pccount::printVegaLiteScript(const string& jsonvar,
-		const string& target, const string& datavar, HumdrumFile& infile) {
-	stringstream& out = m_free_text;
+	if (!found1) {
+		m_errorCount++;
+		m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": Unknown instrument code \"" + inst1 + "\" in token " + *token + " on line " + to_string(token->getLineNumber()) + ", field " + to_string(token->getFieldNumber()) + ". See list of codes at <a target='_blank' href='https://bit.ly/humdrum-instrument-codes'>https://bit.ly/humdrum-instrument-codes</a>.\n";
+		m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+	}
+
+	if (!found2) {
+		m_errorCount++;
+		m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": Unknown instrument code \"" + inst2 + "\" in token " + *token + " on line " + to_string(token->getLineNumber()) + ", field " + to_string(token->getFieldNumber()) + ". See list of codes at <a target='_blank' href='https://bit.ly/humdrum-instrument-codes'>https://bit.ly/humdrum-instrument-codes</a>.\n";
+		m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+	}
 
-	out << "var " << datavar << " =\n";
-	printVegaLiteJsonData();
-	out << ";\n";
-	out << "\n";
-	out << "var " << jsonvar << " =\n";
-	printVegaLiteJsonTemplate(datavar, infile);
-	out << ";\n";
-	out << "vegaEmbed('#" << target << "', " << jsonvar << ");\n";
 }
 
 
 
 //////////////////////////////
 //
-// Tool_pccount::printVegaLiteJsonData --
+// Tool_nproof::checkInstrumentInformation --
 //
 
-void Tool_pccount::printVegaLiteJsonData(void) {
-	stringstream& out = m_free_text;
+void Tool_nproof::checkInstrumentInformation(HumdrumFile& infile) {
+	int codeLine = -1;
+	int classLine = -1;
+	HumRegex hre;
 
-	m_maxpc = 0;
-	for (int i=0; i<(int)m_counts[0].size(); i++) {
-		if (m_counts[0][i] > m_maxpc) {
-			m_maxpc = m_counts[0][i];
+	vector<pair<string, string>> instrumentList = Convert::getInstrumentList();
+
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (infile[i].isData()) {
+			break;
 		}
-	}
-	out << "[\n";
-	int commacounter = 0;
-	double percent = 100.0;
-	for (int i=1; i<(int)m_counts.size(); i++) {
-		for (int j=0; j<(int)m_counts[i].size(); j++) {
-			if (m_counts[i][j] == 0.0) {
+		if (!infile[i].isInterpretation()) {
+			continue;
+		}
+		if (infile[i].isManipulator()) {
+			continue;
+		}
+		for (int j=0; j<infile[i].getFieldCount(); j++) {
+			HTp token = infile.token(i, j);
+			if (!token->isKern()) {
 				continue;
 			}
-			if (commacounter > 0) {
-				out << ",\n\t";
-			} else {
-				out << "\t";
+			if (token->compare(0, 3, "*IC") == 0) {
+				if (classLine < 0) {
+					classLine = i;
+				}
+			} else if (hre.search(token, "^\\*I[a-z]")) {
+				if (codeLine < 0) {
+					codeLine = i;
+				}
 			}
-			commacounter++;
-			if (m_attack) {
-				out << "{\"count\":" << m_counts[i][j] << ", ";
+		}
+	}
+
+	if (codeLine < 0) {
+		m_errorCount++;
+		m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": No instrument code line.\n";
+		m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+	} else {
+		for (int i=0; i<infile[codeLine].getFieldCount(); i++) {
+			HTp token = infile.token(codeLine, i);
+			if (token->isKern()) {
+				if (!hre.search(token, "^\\*I[a-z]")) {
+					m_errorCount++;
+					m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": expected instrument code on line " + to_string(token->getLineNumber()) + ", field " + to_string(token->getFieldNumber()) + ".\n";
+					m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+				} else {
+					checkForValidInstrumentCode(token, instrumentList);
+				}
 			} else {
-				out << "{\"percent\":" << m_counts[i][j]/m_maxpc*percent << ", ";
+				if (*token != "*") {
+					m_errorCount++;
+					m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": Expected null interpretation on instrument code line " + to_string(token->getLineNumber()) + ", field " + to_string(token->getFieldNumber()) + ".\n";
+					m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+				}
 			}
-			out << "\"pitch class\":\"" << getPitchClassString(j) << "\", ";
-			out << "\"voice\":\"" << m_names[i] << "\"";
-			out << "}";
 		}
 	}
-	out << "\n]\n";
-}
-
-
-
-//////////////////////////////
-//
-// Tool_pccount::setFactorMaximum -- normalize by the maximum pitch-class value.
-//
 
-void Tool_pccount::setFactorMaximum(void) {
-	m_factor = 0.0;
-	for (int i=0; i<(int)m_counts[0].size(); i++) {
-		if (m_counts[0][i] > m_factor) {
-			m_factor = m_counts[0][i];
+	if (classLine < 0) {
+		m_errorCount++;
+		m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": No instrument class line.\n";
+		m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+	} else {
+		for (int i=0; i<infile[classLine].getFieldCount(); i++) {
+			HTp token = infile.token(classLine, i);
+			if (token->isKern()) {
+				if (!hre.search(token, "^\\*IC[a-z]")) {
+					m_errorCount++;
+					m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": expected instrument class on line " + to_string(token->getLineNumber()) + ", field " + to_string(token->getFieldNumber()) + ".\n";
+					m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+				}
+			} else {
+				if (*token != "*") {
+					m_errorCount++;
+					m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": Expected null interpretation on instrument class line " + to_string(token->getLineNumber()) + ", field " + to_string(token->getFieldNumber()) + ".\n";
+					m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+				}
+			}
 		}
 	}
 }
@@ -105678,390 +107284,614 @@ void Tool_pccount::setFactorMaximum(void) {
 
 //////////////////////////////
 //
-// Tool_pccount::setFactorNormalize -- normalize by the sum of all pitch class values.
+// Tool_nproof::checkReferenceRecords --
 //
 
-void Tool_pccount::setFactorNormalize(void) {
-	m_factor = 0.0;
-	for (int i=0; i<(int)m_counts[0].size(); i++) {
-		m_factor += m_counts[0][i];
-	}
-}
-
-
+void Tool_nproof::checkReferenceRecords(HumdrumFile& infile) {
+	vector<int> foundENC;  // Musescore encoder's name
+	vector<int> foundEND;  // Musescore encdoer's date
+	vector<int> foundEED;  // VHV editor's name
+	vector<int> foundEEV;  // VHV editor's date
 
-//////////////////////////////
-//
-// Tool_pccount::printHumdrumTable --
-//
+	HumRegex hre;
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isReferenceRecord()) {
+			continue;
+		}
+		string key = infile[i].getReferenceKey();
 
-void Tool_pccount::printHumdrumTable(void) {
+		if (hre.search(key, "^EED\\d*$")) {
+			if (key == "EED") {
+				foundEED.push_back(i);
+			}
+			string value = infile[i].getReferenceValue();
+			if (hre.search(value, "^\\d\\d\\d\\d")) {
+				m_errorCount++;
+				m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": For EED (Electronic EDitor) record on line " + to_string(i+1) + ", found a date rather than a name: " + value + ".\n";
+				m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+			}
+		}
+		if (hre.search(key, "^EEV\\d*$")) {
+			if (key == "EEV") {
+				foundEEV.push_back(i);;
+			}
+			string value = infile[i].getReferenceValue();
+			if (!hre.search(value, "^\\d\\d\\d\\d-\\d\\d-\\d\\d")) {
+				m_errorCount++;
+				m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": For EEV (ElEctronic Version) record on line " + to_string(i+1) + ", found a name rather than a date (or invalid date): " + value + ".\n";
+				m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+			}
+		}
+		if (hre.search(key, "^ENC\\d*(-modern|-iiif)?$")) {
+			string value = infile[i].getReferenceValue();
+			if (hre.search(value, "^\\d\\d\\d\\d-\\d\\d-\\d\\d")) {
+				m_errorCount++;
+				m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": For ENC (Electronic eNCoder) record on line " + to_string(i+1) + ", found a date rather than a name: " + value + ".\n";
+				m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+			}
+		}
+		if (hre.search(key, "^END\\d*(-modern|-iiif)?$")) {
+			string value = infile[i].getReferenceValue();
+			if (!hre.search(value, "^\\d\\d\\d\\d-\\d\\d-\\d\\d")) {
+				m_errorCount++;
+				m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": For END (Electronic eNcoding Date) record on line " + to_string(i+1) + ", found a name rather than a date (or an invalid date): " + value + ".\n";
+				m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+			}
+		}
+		if (hre.search(key, "^ENC(\\d*.*)$")) {
+				if (key == "ENC") {
+					foundENC.push_back(i);
+				}
+		}
+		if (hre.search(key, "^ENC-(\\d+.*)$")) {
+				string newvalue = "ENC" + hre.getMatch(1);
+				m_errorCount++;
+				m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": " + key + " reference record on line " + to_string(i+1) + " should not include a dash and instead be: " + newvalue + ".\n";
+				m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+		}
+		if (hre.search(key, "END(\\d*.*)")) {
+				if (key == "END") {
+					foundEND.push_back(i);
+				}
+		}
+		if (hre.search(key, "^END-(\\d+.*)$")) {
+				string newvalue = "END" + hre.getMatch(1);
+				m_errorCount++;
+				m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": " + key + " reference record on line " + to_string(i+1) + " should not include a dash and instead be: " + newvalue + ".\n";
+				m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+		}
+		if (key == "filter-") {
+				m_errorCount++;
+				m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": \"filter-\" reference record on line " + to_string(i+1) + " should probably be \"filter-modern\" instead.\n";
+				m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+		}
+		if (key == "ENC-mod") {
+				m_errorCount++;
+				m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": ENC-mod reference record on line " + to_string(i+1) + " should be ENC-modern instead.\n";
+				m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+		}
+		if (key == "END-mod") {
+				m_errorCount++;
+				m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": END-mod reference record on line " + to_string(i+1) + " should be END-modern instead.\n";
+				m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+		}
+		if (key == "AIN-mod") {
+				m_errorCount++;
+				m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": AIN-mod reference record on line " + to_string(i+1) + " should be AIN-modern instead.\n";
+				m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+		}
+		if (hre.search(key, "^(.*)-ori$")) {
+				string piece = hre.getMatch(1);
+				m_errorCount++;
+				m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": " + key + " reference record on line " + to_string(i+1) + " should not be used (either use " + piece + "-mod or don't add -ori qualifier to " + piece + ").\n";
+				m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+		}
+	}
 
-	double factor = 0.0;
+	// vector<int> foundENC;  // Musescore encoder's name
+	// vector<int> foundEND;  // Musescore encdoer's date
+	// vector<int> foundEED;  // VHV editor's name
+	// vector<int> foundEEV;  // VHV editor's date
 
-	if (m_maximum) {
-		setFactorMaximum();
-		m_free_text << "!!!MAX: " << m_factor << endl;
-	} else if (m_normalize) {
-		setFactorNormalize();
-		m_free_text << "!!!TOTAL: " << factor << endl;
+	if (foundENC.empty()) {
+		m_errorCount++;
+		m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": Missing ENC (initial encoder's name) reference record.\n";
+		m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
 	}
-
-	// exclusive interpretation
-	m_free_text << "**kern";
-	m_free_text << "\t**all";
-	for (int i=0; i<(int)m_counts.size() - 1; i++) {
-		m_free_text << "\t**part";
+	if (foundEND.empty()) {
+		m_errorCount++;
+		m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": Missing END (initial encoding date) reference record.\n";
+		m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+	}
+	if (foundEED.empty()) {
+		m_errorCount++;
+		m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": Missing EED (Humdrum electronic editor's name) reference record.\n";
+		m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+	}
+	if (foundEEV.empty()) {
+		m_errorCount++;
+		m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": Missing EEV (Humdrum electronic edition date) reference record.\n";
+		m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
 	}
-	m_free_text << endl;
 
-	// part names
-	m_free_text << "*";
-	for (int i=0; i<(int)m_counts.size(); i++) {
-		if (i < (int)m_names.size()) {
-			m_free_text << "\t*I\"" << m_names.at(i);
-		} else {
-			m_free_text << "\t*";
+	if ((foundENC.size() == 1) && (foundEED.size() == 1)) {
+		if (foundENC[0] > foundEED[0]) {
+			m_errorCount++;
+			m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": ENC reference record on line " + to_string(foundENC[0]+1) + " should come before EED reference record on line " + to_string(foundEED[0]+1) + "\n";
+			m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
 		}
 	}
-	m_free_text << endl;
 
-	if (!m_abbreviations.empty()) {
-
-		// part abbreviation
-		m_free_text << "*";
-		for (int i=0; i<(int)m_counts.size(); i++) {
-			if (i < (int)m_abbreviations.size()) {
-				m_free_text << "\t*I\'" << m_abbreviations.at(i);
-			} else {
-				m_free_text << "\t*";
-			}
+	if ((foundEND.size() == 1) && (foundEEV.size() == 1)) {
+		if (foundEND[0] > foundEEV[0]) {
+			m_errorCount++;
+			m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": END reference record on line " + to_string(foundEND[0]+1) + " should come before EEV reference record on line " + to_string(foundEEV[0]+1) + "\n";
+			m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
 		}
-		m_free_text << endl;
 	}
 
-	for (int i=0; i<(int)m_counts[0].size(); i++) {
-		if (m_counts[0][i] == 0) {
-			continue;
-		}
-		if ((i == 5) || (i == 11) || (i == 22) || (i == 28) || (i == 34)) {
-			continue;
-		}
-		string pitch = Convert::base40ToKern(i + 4*40);
-		m_free_text << pitch;
-		for (int j=0; j<(int)m_counts.size(); j++) {
-			if (m_normalize) {
-				m_free_text << "\t" << m_counts[j][i] / m_factor;
-			} else if (m_maximum) {
-				m_free_text << "\t" << m_counts[j][i] / m_factor;
-			} else {
-				m_free_text << "\t" << m_counts[j][i];
+
+	if ((foundENC.size() == 2) && (foundEED.size() == 0)) {
+		string date1;
+		string date2;
+		if (foundEND.size() == 2) {
+			date1 = infile[foundEND[0]].getReferenceValue();
+			date2 = infile[foundEND[1]].getReferenceValue();
+			hre.replaceDestructive(date1, "", "-", "g");
+			hre.replaceDestructive(date2, "", "-", "g");
+			int number1 = 0;
+			int number2 = 0;
+			if (hre.search(date1, "^(20\\d{6})$")) {
+				number1 = hre.getMatchInt(1);
 			}
+			if (hre.search(date2, "^(20\\d{6})$")) {
+				number2 = hre.getMatchInt(1);
+			}
+			if ((number1 > 0) && (number2 > 0)) {
+				if (number1 > number2) {
+					m_errorCount++;
+					m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": Second ENC reference record on line " + to_string(foundENC[1]+1) + " should probably be changed to EED reference record (and second END reference record on line " + to_string(foundEND[1]+1) + " changed to EEV).\n";
+					m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+				}
+			}
+		} else {
+			m_errorCount++;
+			m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": There are two ENC records on lines " + to_string(foundENC[0]+1) + " and " + to_string(foundENC[1]+1) + ". The Humdrum editor's name should be changed to EED, and the editing date should be changed from END to EEV if necessary.\n";
+			m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
 		}
-		m_free_text << endl;
 	}
 
-	int columns = (int)m_counts.size() + 1;
-	for (int i=0; i<columns; i++) {
-		m_free_text << "*-";
-		if (i < columns - 1) {
-			m_free_text << "\t";
-		}
-	}
-	m_free_text << endl;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_pccount::countPitches --
+// Tool_nproof::checkKeyInformation --
 //
 
-void Tool_pccount::countPitches(HumdrumFile& infile) {
-	if (m_parttracks.size() == 0) {
-		return;
+void Tool_nproof::checkKeyInformation(HumdrumFile& infile) {
+	int foundKey = -1;
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (infile[i].hasSpines()) {
+			continue;
+		}
+		HTp token = infile.token(i, 0);
+		if (token->compare(0, 7, "!!!key:") == 0) {
+			foundKey = i;
+			break;
+		}
 	}
-	m_counts.clear();
-	m_counts.resize(m_parttracks.size());
-	for (int i=0; i<(int)m_parttracks.size(); i++) {
-		m_counts[i].resize(40);
-		fill(m_counts[i].begin(), m_counts[i].end(), 0.0);
+
+	if (foundKey < 0) {
+		m_errorCount++;
+		m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": No <tt>!!!key:</tt> reference record.\n";
+		m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+		return;
 	}
-	for (int i=0; i<infile.getStrandCount(); i++) {
-		HTp sstart = infile.getStrandStart(i);
-		HTp send = infile.getStrandEnd(i);
-		addCounts(sstart, send);
+
+	string value = infile[foundKey].getReferenceValue();
+	if (value.empty()) {
+		m_errorCount++;
+		m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": <tt>!!!key:</tt> reference record on line " + to_string(foundKey+1) + " should not be empty.  If no key, then use \"none\".\n";
+		m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+		return;
 	}
 
-	// fill in sum for all parts
-	for (int i=0; i<(int)m_counts[0].size(); i++) {
-		for (int j=1; j<(int)m_counts.size(); j++) {
-			m_counts[0][i] += m_counts[j][i];
+	HumRegex hre;
+	if (hre.search(value, "^([a-gA-G][#-n]?):(dor|phr|lyd|mix|aeo|loc|ion)$")) {
+		string tonic = hre.getMatch(1);
+		string mode  = hre.getMatch(2);
+		int major = 0;
+		if ((mode == "lyd") || (mode == "mix") || (mode == "ion")) {
+			major = 1;
 		}
+		int uppercase = isupper(tonic[0]);
+		if ((major == 1) && (uppercase == 0)) {
+			tonic[0] = toupper(tonic[0]);
+			string correct = tonic + ":" + mode;
+			m_errorCount++;
+			m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": <tt>!!!key:</tt> reference record on line " + to_string(foundKey + 1) + " should be \"" + correct + "\".\n";
+			m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+		} else if ((major == 0) && (uppercase == 1)) {
+			tonic[0] = tolower(tonic[0]);
+			string correct = tonic + ":" + mode;
+			m_errorCount++;
+			m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": <tt>!!!key:</tt> reference record on line " + to_string(foundKey + 1) + " should be \"" + correct + "\".\n";
+			m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+		}
+	} else if (hre.search(value, "([a-gA-G][#-n]?):(.+)")) {
+		string mode = hre.getMatch(2);
+		m_errorCount++;
+		m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": Unknown mode in <tt>!!!key:</tt> reference record contents on line " + to_string(foundKey + 1) + ": \"" + mode + "\".\n";
+		m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
+	} else if (!hre.search(value, "([a-gA-G][#-n]?):?")) {
+		m_errorCount++;
+		m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": Unknown key designation in <tt>!!!key:</tt> reference record contents on line " + to_string(foundKey + 1) + ": \"" + value + "\".\n";
+		m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
 	}
 
 }
 
 
+
 //////////////////////////////
 //
-// Tool_pccount::addCounts --
+// Tool_nproof::checkSpineTerminations --
 //
 
-void Tool_pccount::addCounts(HTp sstart, HTp send) {
-	if (!sstart) {
-		return;
+void Tool_nproof::checkSpineTerminations(HumdrumFile& infile) {
+	int foundTerminal = 0;
+	for (int i=infile.getLineCount() - 1; i>0; i--) {
+		if (!infile[i].isInterpretation()) {
+			continue;
+		}
+		HTp token = infile.token(i, 0);
+		if (*token == "*-") {
+			foundTerminal = i;
+			break;
+		}
 	}
-	if (!sstart->isKern()) {
+
+	if (!foundTerminal) {
+		m_errorCount++;
+		m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": No spine terminators.\n";
+		m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
 		return;
 	}
-	int track = sstart->getTrack();
-	int kindex = m_rkern[track];
-	HTp current = sstart;
-	while (current && (current != send)) {
-		if (!current->isData()) {
-			current = current->getNextToken();
-			continue;
-		}
-		if (current->isNull() || current->isRest()) {
-			current = current->getNextToken();
-			continue;
+
+	bool problem = false;
+	for (int i=0; i<infile[foundTerminal].getFieldCount(); i++) {
+		HTp token = infile[foundTerminal].token(i);
+		string value = token->getSpineInfo();
+		if (value.find(" ") != string::npos) {
+			problem = true;
+			break;
 		}
-		vector<string> subtokens = current->getSubtokens();
-		for (int i=0; i<(int)subtokens.size(); i++) {
-			if (m_attack) {
-				// ignore sustained parts of notes when counting attacks
-				if (subtokens[i].find("_") != string::npos) {
-					continue;
-				}
-				if (subtokens[i].find("]") != string::npos) {
-					continue;
-				}
-			}
-			int b40 = Convert::kernToBase40(subtokens[i]);
-			if (m_attack) {
-				m_counts[kindex][b40%40]++;
-			} else {
-				double duration = Convert::recipToDuration(subtokens[i]).getFloat();
-				m_counts[kindex][b40%40] += duration;
-			}
+	}
+
+	if (!problem) {
+		return;
+	}
+
+	m_errorCount++;
+	m_errorList += "!!!TOOL-nproof-error-" + to_string(m_errorCount) + ": Incorrect spine merger(s): ";
+	for (int i=0; i<infile[foundTerminal].getFieldCount(); i++) {
+		HTp token = infile[foundTerminal].token(i);
+		m_errorList += "<" + token->getSpineInfo() + ">";
+		if (i < infile[foundTerminal].getFieldCount() - 1) {
+			m_errorList += " ";
 		}
-		current = current->getNextToken();
 	}
+	m_errorList += "\n";
+	m_errorHtml += "!! <li> @{TOOL-nproof-error-" + to_string(m_errorCount) + "} </li>\n";
 }
 
 
 
 
-//////////////////////////////
+
+/////////////////////////////////
 //
-// Tool_pccount::initializePartInfo --
+// Tool_ordergps::Tool_ordergps -- Set the recognized options for the tool.
 //
 
-void Tool_pccount::initializePartInfo(HumdrumFile& infile) {
-	m_names.clear();
-	m_abbreviations.clear();
-	m_parttracks.clear();
-	m_rkern.clear();
-
-	m_rkern.resize(infile.getTrackCount() + 1);
-	fill(m_rkern.begin(), m_rkern.end(), -1);
+Tool_ordergps::Tool_ordergps(void) {
+	define("e|empty=b",   "list files that have no group/part/staff (used with -p option).");
+	define("f|file=b",    "list input files only.");
+	define("l|list=b",    "list files that will be changed.");
+	define("p|problem=b", "list files that have mixed content for *group, *part, *staff info.");
+	define("r|reverse=b", "order *staff, *part, *group");
+	define("s|staff=b",   "Add staff line if none present already in score.");
+	define("t|top=b",     "Place group/part/staff lines first after exinterp.");
+}
 
-	m_parttracks.push_back(-1);
-	m_names.push_back("all");
-	m_abbreviations.push_back("all");
 
-	vector<HTp> starts = infile.getKernSpineStartList();
 
-	int foundpart = false;
-	int foundabbr = false;
+/////////////////////////////////
+//
+// Tool_ordergps::run -- Do the main work of the tool.
+//
 
-	int track = 0;
-	for (int i=0; i<(int)starts.size(); i++) {
-		track = starts[i]->getTrack();
-		m_rkern[track] = i+1;
-		m_parttracks.push_back(track);
-		HTp current = starts[i];
-		foundpart = false;
-		foundabbr = false;
-		if (!current->isKern()) {
-			continue;
-		}
-		while (current) {
-			if (current->isData()) {
-				break;
-			}
-			if ((!foundpart) && (current->compare(0, 3, "*I\"") == 0)) {
-				m_names.emplace_back(current->substr(3));
-				foundpart = true;
-			} else if ((!foundabbr) && (current->compare(0, 3, "*I\'") == 0)) {
-				m_abbreviations.emplace_back(current->substr(3));
-				foundabbr = true;
-			}
-			current = current->getNextToken();
-		}
-		//if (!foundpart) {
-		//		m_names.emplace_back("");
-		//}
-		//if (!foundabbr) {
-		//		m_names.emplace_back("");
-		//}
+bool Tool_ordergps::run(HumdrumFileSet& infiles) {
+	bool status = true;
+	for (int i=0; i<infiles.getCount(); i++) {
+		status &= run(infiles[i]);
 	}
-
+	return status;
 }
 
 
-//////////////////////////////
-//
-// printVegaLiteJsonTemplate --
-//
-
-void Tool_pccount::printVegaLiteJsonTemplate(const string& datavariable, HumdrumFile& infile) {
-	stringstream& out = m_free_text;
-
-	string idinfo;
-	if (m_id.empty() || m_id == "id") {
-		// do nothing
-	} else {
-		idinfo = "for " + m_id;
-	}
-	out << "{\n";
-	out << "	\"$schema\": \"https://vega.github.io/schema/vega-lite/v4.0.0-beta.1.json\",\n";
-	out << "	\"data\": {\"values\": " << datavariable << "},\n";
-	if (getBoolean("title")) {
-		out << "	\"title\": \"" << m_title << "\",\n";
-	} else {
-		if (m_attack) {
-			out << "	\"title\": \"Note-count pitch-class distribution " << idinfo <<" \",\n";
-		} else {
-			out << "	\"title\": \"Duration-weighted pitch-class distribution " << idinfo <<" \",\n";
-		}
-	}
-	out << "	\"width\": " << m_width << ",\n";
-	out << "	\"height\": " << int(m_width * m_ratio) << ",\n";
-	out << "	\"encoding\": {\n";
-	out << "		\"y\": {\n";
-	if (m_attack) {
-		out << "			\"field\": \"count\",\n";
-		out << "			\"title\": \"Number of note attacks\",\n";
-	} else {
-		out << "			\"field\": \"percent\",\n";
-		out << "			\"title\": \"Percent of maximum pitch class\",\n";
-	}
-	out << "			\"type\": \"quantitative\",\n";
-	if (m_attack) {
-		out << "			\"scale\": {\"domain\": [0, " << m_maxpc << "]},\n";
-	} else {
-		out << "			\"scale\": {\"domain\": [0, 100]},\n";
-	}
-	out << "			\"aggregate\": \"sum\"\n";
-	out << "		},\n";
-	out << "		\"x\": {\n";
-	out << "			\"field\": \"pitch class\",\n";
-	out << "			\"type\": \"nominal\",\n";
-	out << "			\"scale\": {\n";
-	out << "				\"domain\": [";
-		printPitchClassList();
-		out << "]\n";
-	out << "			},\n";
-	out << "			\"axis\": {\n";
-	out << "				\"labelAngle\": 0\n";
-	out << "			}\n";
-	out << "		},\n";
-	out << "		\"order\": {\"type\": \"quantitative\"},\n";
-	out << "		\"color\": {\n";
-	out << "			\"field\": \"voice\",\n";
-	out << "			\"type\": \"nominal\",\n";
-	if (m_counts.size() == 2) {
-		out << "			\"legend\": {\"title\": \"Voice\"},\n";
+bool Tool_ordergps::run(const string& indata, ostream& out) {
+	HumdrumFile infile(indata);
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
 	} else {
-		out << "			\"legend\": {\"title\": \"Voices\"},\n";
+		out << infile;
 	}
-	out << "			\"scale\": {\n";
-  	out << "				\"domain\": [";
-		printVoiceList();
-		out << "],\n";
- 	out << "				\"range\": [";
-		printColorList();
-		out << "],\n";
- 	out << "				}\n";
-	out << "		}\n";
-	out << "	},\n";
+	return status;
+}
 
-	out << "	\"layer\": [\n";
-	out << "		{\"mark\": \"bar\"}";
 
-	string final = getFinal(infile);
-	if (m_key && !final.empty()) {
-		out << ",\n";
-		out << "		{\n";
-		out << "			\"mark\": {\"type\":\"text\", \"align\":\"center\", \"fill\":\"black\", \"baseline\":\"bottom\"},\n";
-		if (m_attack) {
-			int count = getCount(final);
-			out << "			\"data\": {\"values\": [ {\"pitch class\":\"" << final << "\", \"count\":" << count << "}]},\n";
-		} else {
-			double percent = getPercent(final);
-			out << "			\"data\": {\"values\": [ {\"pitch class\":\"" << final << "\", \"percent\":" << percent << "}]},\n";
-		}
-		out << "			\"encoding\": {\"text\": {\"value\":\"final\"}}\n";
-		out << "		}\n";
+bool Tool_ordergps::run(HumdrumFile& infile, ostream& out) {
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
 	}
+	return status;
+}
 
-	out << "	]\n";
-	out << "}\n";
 
+bool Tool_ordergps::run(HumdrumFile& infile) {
+	initialize();
+	processFile(infile);
+	return true;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_pccount::getCount --
+// Tool_ordergps::initialize -- Setup to do before processing a file.
 //
 
-int Tool_pccount::getCount(const string& pitchclass) {
-	int b40 = Convert::kernToBase40(pitchclass);
-	int index = b40 % 40;
-	int output = (int)m_counts[0][index];
-	return output;
+void Tool_ordergps::initialize(void) {
+	m_emptyQ   = getBoolean("empty");
+	m_fileQ    = getBoolean("file");
+	m_listQ    = getBoolean("list");
+	m_problemQ = getBoolean("problem");
+	m_reverseQ = getBoolean("reverse");
+	m_staffQ   = getBoolean("staff");
+	m_topQ     = getBoolean("top");
 }
 
 
 
 //////////////////////////////
 //
-// Tool_pccount::getPercent --
+// Tool_ordergps::processFile -- Analyze an input file.
 //
 
-double Tool_pccount::getPercent(const string& pitchclass) {
-	setFactorMaximum();
-	int b40 = Convert::kernToBase40(pitchclass);
-	int index = b40 % 40;
-	double output = m_counts[0][index] / m_factor * 100.0;
-	return output;
+void Tool_ordergps::processFile(HumdrumFile& infile) {
+	vector<int> groupIndex;
+	vector<int> partIndex;
+	vector<int> staffIndex;
+	bool foundProblem = false;
+
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (infile[i].isData()) {
+			break;
+		}
+		if (infile[i].isManipulator()) {
+			// Don't deall with spine splits/mergers/exchanges/additions.
+			if (!infile[i].isExclusiveInterpretation()) {
+				break;
+			}
+		}
+		if (infile[i].isCommentLocal()) {
+			// Don't process after local comments.   The file header
+			// is too complex perhaps, so do not alter anything
+			// after the local comment.  This can be related to modori
+			// assignment for groups, for example.
+			break;
+		}
+		if (!infile[i].hasSpines()) {
+			continue;
+		}
+		if (infile[i].isExclusiveInterpretation()) {
+			continue;
+		}
+		if (!infile[i].isInterpretation()) {
+			continue;
+		}
+		int hasGroup = false;
+		int hasPart  = false;
+		int hasStaff = false;
+		int hasOther = false;
+		for (int j=0; j<infile[i].getFieldCount(); j++) {
+			HTp token = infile.token(i, j);
+			if (*token == "*") {
+				continue;
+			}
+			if (token->compare(0, 6, "*group") == 0) {
+				hasGroup = true;
+			} else if (token->compare(0, 5, "*part") == 0) {
+				hasPart = true;
+			} else if (token->compare(0, 6, "*staff") == 0) {
+				hasStaff = true;
+			} else {
+				hasOther = true;
+			}
+		}
+
+		if (hasOther && hasGroup) {
+			foundProblem = true;
+			if (m_problemQ) {
+				cerr << infile.getFilename() << " HAS MIXED GROUP LINE:" << endl;
+				cerr << "\t" << infile[i] << endl;
+			}
+		}
+
+		if (hasOther && hasPart) {
+			foundProblem = true;
+			if (m_problemQ) {
+				cerr << infile.getFilename() << " HAS MIXED PART LINE:" << endl;
+				cerr << "\t" << infile[i] << endl;
+			}
+		}
+
+		if (hasOther && hasStaff) {
+			foundProblem = true;
+			if (m_problemQ) {
+				cerr << infile.getFilename() << " HAS MIXED STAFF LINE:" << endl;
+				cerr << "\t" << infile[i] << endl;
+			}
+		}
+
+		if (hasOther) {
+			continue;
+		}
+
+		if (hasGroup && hasPart) {
+			foundProblem = true;
+			if (m_problemQ) {
+				cerr << infile.getFilename() << " HAS MIXED GROUP AND PART LINE:" << endl;
+				cerr << "\t" << infile[i] << endl;
+			}
+		}
+
+		if (hasGroup && hasStaff) {
+			foundProblem = true;
+			if (m_problemQ) {
+				cerr << infile.getFilename() << " HAS MIXED GROUP AND STAFF LINE:" << endl;
+				cerr << "\t" << infile[i] << endl;
+			}
+		}
+
+		if (hasPart && hasStaff) {
+			foundProblem = true;
+			if (m_problemQ) {
+				cerr << infile.getFilename() << " HAS MIXED PART AND STAFF LINE:" << endl;
+				cerr << "\t" << infile[i] << endl;
+			}
+		}
+
+		if (hasGroup) {
+			groupIndex.push_back(i);
+		}
+
+		if (hasPart)  {
+			partIndex.push_back(i);
+		}
+
+		if (hasStaff) {
+			staffIndex.push_back(i);
+		}
+	}
+
+	if (groupIndex.size() > 1) {
+		foundProblem = true;
+		if (m_problemQ) {
+			cerr << infile.getFilename() << " HAS MORE THAN ONE GROUP LINE:" << endl;
+			for (int i=0; i<(int)groupIndex.size(); i++) {
+				cerr << "\t" << infile[groupIndex[i]] << endl;
+			}
+		}
+	}
+
+	if (partIndex.size() > 1) {
+		foundProblem = true;
+		if (m_problemQ) {
+			cerr << infile.getFilename() << " HAS MORE THAN ONE PART LINE:" << endl;
+			for (int i=0; i<(int)partIndex.size(); i++) {
+				cerr << "\t" << infile[partIndex[i]] << endl;
+			}
+		}
+	}
+
+	if (staffIndex.size() > 1) {
+		foundProblem = true;
+		if (m_problemQ) {
+			cerr << infile.getFilename() << " HAS MORE THAN ONE STAFF LINE:" << endl;
+			for (int i=0; i<(int)staffIndex.size(); i++) {
+				cerr << "\t" << infile[staffIndex[i]] << endl;
+			}
+		}
+	}
+
+	if (m_problemQ) {
+		if (m_emptyQ) {
+			if (groupIndex.empty() && partIndex.empty() && staffIndex.empty()) {
+				cerr << infile.getFilename() << " HAS NO GROUP/PART/STAFF INFO" << endl;
+			}
+		}
+	} else {
+		if (foundProblem) {
+			// Don try to fix anything, just echo the input:
+			m_humdrum_text << infile;
+		} else {
+			if (m_staffQ && groupIndex.empty() && partIndex.empty() && staffIndex.empty()) {
+				printStaffLine(infile);
+			} else {
+				// Process further here
+				// Check the order of the group/part/staff lines.
+				int gindex = groupIndex.empty() ? -1 : groupIndex.at(0);
+				int pindex = partIndex.empty() ? -1 : partIndex.at(0);
+				int sindex = staffIndex.empty() ? -1 : staffIndex.at(0);
+				if (m_topQ) {
+					printFileTop(infile, gindex, pindex, sindex);
+				} else {
+					printFile(infile, gindex, pindex, sindex);
+				}
+			}
+		}
+	}
 }
 
 
 
 //////////////////////////////
 //
-// Tool_pccount::printColorList --
+// Tool_ordergps::printFileTop -- Print group/part/staff first after exclusive
+//     interpretations.
 //
 
-void Tool_pccount::printColorList(void) {
-	stringstream& out = m_free_text;
-	for (int i=(int)m_names.size() - 1; i>0; i--) {
-		string color = m_vcolor[m_names[i]];
-		out << "\"";
-		if (color.empty()) {
-			out << "black";
+void Tool_ordergps::printFileTop(HumdrumFile& infile, int gindex, int pindex, int sindex) {
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (i == gindex) {
+			continue;
+		} else if (i == pindex) {
+			continue;
+		} else if (i == sindex) {
+			continue;
+		} else if (infile[i].isExclusiveInterpretation()) {
+			m_humdrum_text << infile[i] << endl;
+			if (m_reverseQ) {
+				if (sindex >= 0) {
+					m_humdrum_text << infile[sindex] << endl;
+				}
+				if (pindex >= 0) {
+					m_humdrum_text << infile[pindex] << endl;
+				}
+				if (gindex >= 0) {
+					m_humdrum_text << infile[gindex] << endl;
+				}
+			} else {
+				if (gindex >= 0) {
+					m_humdrum_text << infile[gindex] << endl;
+				}
+				if (pindex >= 0) {
+					m_humdrum_text << infile[pindex] << endl;
+				}
+				if (sindex >= 0) {
+					m_humdrum_text << infile[sindex] << endl;
+				}
+			}
 		} else {
-			out << color;
-		}
-		out << "\"";
-		if (i > 1) {
-			out << ", ";
+			m_humdrum_text << infile[i] << endl;
 		}
 	}
 }
@@ -106070,17 +107900,65 @@ void Tool_pccount::printColorList(void) {
 
 //////////////////////////////
 //
-// Tool_pccount::printVoiceList --
+// Tool_ordergps::printFile -- Check to see if the group/part/staff
+//    lines need to be adjusted, and the print the file.  Lines
+//    will be ordered group/part/staff, placing the lines where
+//    the first of group/part/staff is found.
 //
 
-void Tool_pccount::printVoiceList(void) {
-	stringstream& out = m_free_text;
-	for (int i=(int)m_names.size() - 1; i>0; i--) {
-		out << "\"";
-		out << m_names[i];
-		out << "\"";
-		if (i > 1) {
-			out << ", ";
+void Tool_ordergps::printFile(HumdrumFile& infile, int gindex, int pindex, int sindex) {
+	int startIndex = gindex;
+	if (pindex >= 0) {
+		if (startIndex < 0) {
+			startIndex = pindex;
+		} else if (pindex < startIndex) {
+			startIndex = pindex;
+		}
+	}
+	if (sindex >= 0) {
+		if (startIndex < 0) {
+			startIndex = sindex;
+		} else if (sindex < startIndex) {
+			startIndex = sindex;
+		}
+	}
+	if (startIndex < 0) {
+		// no group/part/staff lines in file, so just print it:
+		m_humdrum_text << infile;
+		return;
+	}
+
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (i == startIndex) {
+			if (m_reverseQ) {
+				if (sindex >= 0) {
+					m_humdrum_text << infile[sindex] << endl;
+				}
+				if (pindex >= 0) {
+					m_humdrum_text << infile[pindex] << endl;
+				}
+				if (gindex >= 0) {
+					m_humdrum_text << infile[gindex] << endl;
+				}
+			} else {
+				if (gindex >= 0) {
+					m_humdrum_text << infile[gindex] << endl;
+				}
+				if (pindex >= 0) {
+					m_humdrum_text << infile[pindex] << endl;
+				}
+				if (sindex >= 0) {
+					m_humdrum_text << infile[sindex] << endl;
+				}
+			}
+		} else if (i == gindex) {
+			continue;
+		} else if (i == pindex) {
+			continue;
+		} else if (i == sindex) {
+			continue;
+		} else {
+			m_humdrum_text << infile[i] << endl;
 		}
 	}
 }
@@ -106089,267 +107967,389 @@ void Tool_pccount::printVoiceList(void) {
 
 //////////////////////////////
 //
-// Tool_pccount::printReverseVoiceList --
-//
+// Tool_ordergps::printStaffLine --  Add a *staff at the start of the
+//     data since none was detected.  Does not label staff-like spines
+//     other than **kern (such as **kernyy, **kern-mod, **mens).
 
-void Tool_pccount::printReverseVoiceList(void) {
-	stringstream& out = m_free_text;
-	for (int i=1; i<(int)m_names.size(); i++) {
-		out << "\"";
-		out << m_names[i];
-		out << "\"";
-		if (i < (int)m_names.size() - 1) {
-			out << ", ";
+void Tool_ordergps::printStaffLine(HumdrumFile& infile) {
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isExclusiveInterpretation()) {
+			m_humdrum_text << infile[i] << endl;
+			continue;
+		}
+		m_humdrum_text << infile[i] << endl;
+		vector<string> staffLine(infile[i].getFieldCount(), "*");
+		int counter = 0;
+		for (int j=infile[i].getFieldCount() - 1; j>=0; j--) {
+			HTp token = infile.token(i, j);
+			if (token->isKern()) {
+				counter++;
+				string text = "*staff" + to_string(counter);
+				staffLine.at(j) = text;
+			}
+		}
+		for (int j=0; j<(int)staffLine.size(); j++) {
+			m_humdrum_text << staffLine[j];
+			if (j < (int)staffLine.size() - 1) {
+				m_humdrum_text << '\t';
+			}
 		}
+		m_humdrum_text << endl;
 	}
 }
 
 
 
-//////////////////////////////
+
+/////////////////////////////////
 //
-// Tool_pccount::printPitchClassList --
+// Tool_gridtest::Tool_pccount -- Set the recognized options for the tool.
 //
 
-void Tool_pccount::printPitchClassList(void) {
-	stringstream& out = m_free_text;
+Tool_pccount::Tool_pccount(void) {
+	define("a|attacks=b", "count attacks instead of durations");
+	define("d|data|vega-data=b", "display the vega-lite template.");
+	define("f|full=b", "full count attacks all single sharps and flats.");
+	define("ff|double-full=b", "full count attacks all double sharps and flats.");
+	define("h|html=b", "generate vega-lite HTML content");
+	define("i|id=s:id", "ID for use as variable and in plot title");
+	define("K|no-key|no-final=b", "Do not label key tonic or final");
+	define("m|maximum=b", "normalize by maximum count");
+	define("n|normalize=b", "normalize counts");
+	define("p|page=b", "generate vega-lite stand-alone HTML page");
+	define("r|ratio|aspect-ratio=d:0.67", "width*ratio=height of vega-lite plot");
+	define("s|script|vega-script=b", "generate vega-lite javascript content");
+	define("title=s", "Title for plot");
+	define("t|template|vega-template=b", "display the vega-lite template.");
+	define("w|width=i:400", "width of vega-lite plot");
+}
 
-	if (m_counts[0][0] > 0.0)  { out << "\"C♭♭\", "; }
-	if (m_counts[0][1] > 0.0)  { out << "\"C♭\", "; }
-	out << "\"C\"";
-	if (m_counts[0][3] > 0.0)  { out << ", \"C♯\""; }
-	if (m_counts[0][4] > 0.0)  { out << ", \"C♯♯\""; }
-	// 5 is empty
 
-	if (m_counts[0][6] > 0.0)  { out << ", \"D♭♭\""; }
-	if (m_counts[0][7] > 0.0)  { out << ", \"D♭\""; }
-	out << ", \"D\"";
-	if (m_counts[0][9] > 0.0)  { out << ", \"D♯\""; }
-	if (m_counts[0][10] > 0.0) { out << ", \"D♯♯\""; }
-	// 11 is empty
 
-	if (m_counts[0][12] > 0.0) { out << ", \"E♭♭\""; }
-	if (m_counts[0][13] > 0.0) { out << ", \"E♭\""; }
-	out << ", \"E\"";
-	if (m_counts[0][15] > 0.0) { out << ", \"E♯\""; }
-	if (m_counts[0][16] > 0.0) { out << ", \"E♯♯\""; }
+///////////////////////////////
+//
+// Tool_pccount::run -- Primary interfaces to the tool.
+//
 
-	if (m_counts[0][17] > 0.0) { out << ", \"F♭♭\""; }
-	if (m_counts[0][18] > 0.0) { out << ", \"F♭\""; }
-	out << ", \"F\"";
-	if (m_counts[0][20] > 0.0) { out << ", \"F♯\""; }
-	if (m_counts[0][21] > 0.0) { out << ", \"F♯♯\""; }
-	// 22 is empty
+bool Tool_pccount::run(HumdrumFileSet& infiles) {
+	bool status = true;
+	for (int i=0; i<infiles.getCount(); i++) {
+		status &= run(infiles[i]);
+	}
+	return status;
+}
 
-	if (m_counts[0][23] > 0.0) { out << ", \"G♭♭\""; }
-	if (m_counts[0][24] > 0.0) { out << ", \"G♭\""; }
-	out << ", \"G\"";
-	if (m_counts[0][26] > 0.0) { out << ", \"G♯\""; }
-	if (m_counts[0][27] > 0.0) { out << ", \"G♯♯\""; }
-	// 28 is empty
 
-	if (m_counts[0][29] > 0.0) { out << ", \"A♭♭\""; }
-	if (m_counts[0][30] > 0.0) { out << ", \"A♭\""; }
-	out << ", \"A\"";
-	if (m_counts[0][32] > 0.0) { out << ", \"A♯\""; }
-	if (m_counts[0][33] > 0.0) { out << ", \"A♯♯\""; }
-	// 34 is empty
+bool Tool_pccount::run(const string& indata, ostream& out) {
+	HumdrumFile infile(indata);
+	return run(infile, out);
+}
 
-	if (m_counts[0][35] > 0.0) { out << ", \"B♭♭\""; }
-	if (m_counts[0][36] > 0.0) { out << ", \"B♭\""; }
-	out << ", \"B\"";
-	if (m_counts[0][38] > 0.0) { out << ", \"B♯\""; }
-	if (m_counts[0][39] > 0.0) { out << ", \"B♯♯\""; }
 
+bool Tool_pccount::run(HumdrumFile& infile, ostream& out) {
+	bool status = run(infile);
+	return status;
+}
+
+
+bool Tool_pccount::run(HumdrumFile& infile) {
+   initialize(infile);
+	processFile(infile);
+	return true;
 }
 
 
+
 //////////////////////////////
 //
-// Tool_pccount::getPitchClassString --
+// Tool_pccount::initialize --
 //
 
-string Tool_pccount::getPitchClassString(int b40) {
-	switch (b40%40) {
-		case 0: return "C♭♭";
-		case 1: return "C♭";
-		case 2: return "C";
-		case 3: return "C♯";
-		case 4: return "C♯♯";
-		// 5 is empty
-		case 6: return "D♭♭";
-		case 7: return "D♭";
-		case 8: return "D";
-		case 9: return "D♯";
-		case 10: return "D♯♯";
-		// 11 is empty
-		case 12: return "E♭♭";
-		case 13: return "E♭";
-		case 14: return "E";
-		case 15: return "E♯";
-		case 16: return "E♯♯";
-		case 17: return "F♭♭";
-		case 18: return "F♭";
-		case 19: return "F";
-		case 20: return "F♯";
-		case 21: return "F♯♯";
-		// 22 is empty
-		case 23: return "G♭♭";
-		case 24: return "G♭";
-		case 25: return "G";
-		case 26: return "G♯";
-		case 27: return "G♯♯";
-		// 28 is empty
-		case 29: return "A♭♭";
-		case 30: return "A♭";
-		case 31: return "A";
-		case 32: return "A♯";
-		case 33: return "A♯♯";
-		// 34 is empty
-		case 35: return "B♭♭";
-		case 36: return "B♭";
-		case 37: return "B";
-		case 38: return "B♯";
-		case 39: return "B♯♯";
+void Tool_pccount::initialize(HumdrumFile& infile) {
+	m_attack     = getBoolean("attacks");
+	m_full       = getBoolean("full");
+	m_doublefull = getBoolean("double-full");
+	m_normalize  = getBoolean("normalize");
+	m_maximum    = getBoolean("maximum");
+	m_template   = getBoolean("vega-template");
+	m_data       = getBoolean("vega-data");
+	m_script     = getBoolean("vega-script");
+	m_width      = getInteger("width");
+	m_ratio      = getDouble("aspect-ratio");
+	m_key        = !getBoolean("no-key");
+	if (getBoolean("title")) {
+		m_title = getString("title");
+	}
+	m_html       = getBoolean("html");
+	m_page       = getBoolean("page");
+	if (getBoolean("id")) {
+		m_id = getString("id");
+	} else {
+		string filename = infile.getFilename();
+	 	auto pos = filename.rfind("/");
+		if (pos != string::npos) {
+			filename = filename.substr(pos+1);
+		}
+		pos = filename.find("-");
+		if (pos != string::npos) {
+			m_id = filename.substr(0, pos);
+		}
 	}
+	m_parttracks.clear();
+	m_names.clear();
+	m_abbreviations.clear();
+	initializePartInfo(infile);
 
-	return "?";
-}
 
+	// https://encycolorpedia.com/36cd27
+	m_vcolor.clear();
+
+	m_vcolor["Canto"]		=	"#e49689";
+	m_vcolor["Canto (Canto I)"]	=	"#e49689";
+	m_vcolor["Canto I"]		=	"#e49689";
+	m_vcolor["Canto Primo"]		=	"#e49689";
+	m_vcolor["[Canto 1]"]		=	"#e49689";
+	m_vcolor["[Canto]"]		=	"#e49689";
+	m_vcolor["[Soprano o Tenore]"]	=	"#e49689";
+	m_vcolor["Soprano"]		=	"#e49689";
+
+	m_vcolor["Canto 2."]		=	"#d67365";
+	m_vcolor["Canto II"]		=	"#d67365";
+	m_vcolor["Canto II [Sesto]"]	=	"#d67365";
+	m_vcolor["Canto Sec."]		=	"#d67365";
+	m_vcolor["Canto Secondo"]	=	"#d67365";
+	m_vcolor["Canto secondo"]	=	"#d67365";
+	m_vcolor["[Canto 2]"]		=	"#d67365";
+
+	m_vcolor["Canto III [Settimo]"]	=	"#c54f43";
 
+	m_vcolor["Alto"]		=	"#f4c6a1";
+	m_vcolor["Alti"]		=	"#f4c6a1";
+	m_vcolor["Alto (Canto III)"]	=	"#f4c6a1";
 
+	m_vcolor["Alto II"]		=	"#edb383";
 
+	m_vcolor["Tenor"]		=	"#ecdf7a";
+	m_vcolor["Tenore"]		=	"#ecdf7a";
+	m_vcolor["Tenore over Canto"]	=	"#ecdf7a";
+	m_vcolor["[Tenore]"]		=	"#ecdf7a";
 
+	m_vcolor["Sesto"]		=	"#c8f0bb";
+	m_vcolor["Sesto (Canto II)"]	=	"#c8f0bb";
+	m_vcolor["Sesto Canto II"]	=	"#c8f0bb";
 
-/////////////////////////////////
-//
-// Tool_periodicity::Tool_periodicity -- Set the recognized options for the tool.
-//
+	m_vcolor["Quinto"]		=	"#e3f5f8";
+	m_vcolor["Qvinto"]		=	"#e3f5f8";
 
-Tool_periodicity::Tool_periodicity(void) {
-	define("m|min=b", "minimum time unit (other than grace notes)");
-	define("n|max-rows=i:-1", "maxumum number of rows in svg analysis display");
-	define("t|track=i:0", "track to analyze");
-	define("attacks=b", "extract attack grid)");
-	define("raw=b", "show only raw period data");
-	define("s|svg=b", "output svg image");
-	define("p|power=d:2.0", "scaling power for visual display");
-	define("1|one=b", "composite rhythms are not weighted by attack");
+	m_vcolor["Ottava parte [Ottavo]"]	=	"#e0e4f7";
+
+	m_vcolor["Nona parte [Nono]"]	=	"#a39ce5";
+
+	m_vcolor["Basso"]		=	"#d2aef7";
+	m_vcolor["Bass"]		=	"#d2aef7";
+
+	m_vcolor["Basso II"]		=	"#c69af5";
+	m_vcolor["Basso II [Decimo]"]	=	"#c69af5";
+
+	m_vcolor["Basso Continuo"]	=	"#a071ec";
+	m_vcolor["Basso continuo"]	=	"#a071ec";
+	m_vcolor["[B. C.]"]		=	"#a071ec";
+	m_vcolor["[Basso Continuo]"]	=	"#a071ec";
+	m_vcolor["[Basso continuo]"]	=	"#a071ec";
+	m_vcolor["B.C."]		=	"#a071ec";
+	m_vcolor["B.c."]		=	"#a071ec";
 }
 
 
 
-/////////////////////////////////
+//////////////////////////////
 //
-// Tool_periodicity::run -- Primary interfaces to the tool.
+// Tool_pccount::getFinal -- Extract the last unparenthesed letter from a ref record like this:
+//
+// !!!final: (A)D
 //
 
-bool Tool_periodicity::run(HumdrumFileSet& infiles) {
-	bool status = true;
-	for (int i=0; i<infiles.getCount(); i++) {
-		status &= run(infiles[i]);
+string Tool_pccount::getFinal(HumdrumFile& infile) {
+	string finalref = infile.getReferenceRecord("final");
+	HumRegex hre;
+	hre.replaceDestructive(finalref, "", "\\(.*?\\)", "g");
+	hre.replaceDestructive(finalref, "", "\\s+", "g");
+	if (hre.search(finalref, "^[A-G]$", "i")) {
+		return finalref;
+	} else {
+		return "";
 	}
-	return status;
 }
 
 
-bool Tool_periodicity::run(const string& indata, ostream& out) {
-	HumdrumFile infile(indata);
-	bool status;
-	status = run(infile);
-	if (hasAnyText()) {
-		getAllText(out);
+
+//////////////////////////////
+//
+// Tool_pccount::processFile --
+//
+
+void Tool_pccount::processFile(HumdrumFile& infile) {
+	countPitches(infile);
+
+	string datavar;
+	string target;
+	string jsonvar;
+
+	if (m_attack) {
+		datavar = "data_" + m_id + "_count";
+		target = "id_" + m_id + "_count";
+		jsonvar = "vega_" + m_id + "_count";
 	} else {
-		out << infile;
+		datavar = "data_" + m_id + "_dur";
+		target = "id_" + m_id + "_dur";
+		jsonvar = "vega_" + m_id + "_dur";
 	}
-	return status;
-}
 
-
-bool Tool_periodicity::run(HumdrumFile& infile, ostream& out) {
-	bool status;
-	status = run(infile);
-	if (hasAnyText()) {
-		getAllText(out);
+	if (m_template) {
+		printVegaLiteJsonTemplate(datavar, infile);
+	} else if (m_data) {
+		printVegaLiteJsonData();
+	} else if (m_script) {
+		printVegaLiteScript(jsonvar, target, datavar, infile);
+	} else if (m_html) {
+		printVegaLiteHtml(jsonvar, target, datavar, infile);
+	} else if (m_page) {
+		printVegaLitePage(jsonvar, target, datavar, infile);
 	} else {
-		out << infile;
+		printHumdrumTable();
 	}
-	return status;
 }
 
+
+
+//////////////////////////////
 //
-// In-place processing of file:
+// Tool_pccount::printVegaLitePage --
 //
 
-bool Tool_periodicity::run(HumdrumFile& infile) {
-	processFile(infile);
-	return true;
+void Tool_pccount::printVegaLitePage(const string& jsonvar,
+		const string& target, const string& datavar, HumdrumFile& infile) {
+	stringstream& out = m_free_text;
+
+	out << "<!DOCTYPE html>\n";
+	out << "<html>\n";
+	out << "  <head>\n";
+	out << "    <title>Vega-Lite Bar Chart</title>\n";
+	out << "    <meta charset=\"utf-8\" />\n";
+	out << "\n";
+	out << "    <script src=\"https://cdn.jsdelivr.net/npm/vega@5.4.0\"></script>\n";
+	out << "    <script src=\"https://cdn.jsdelivr.net/npm/vega-lite@4.0.0-beta.1\"></script>\n";
+	out << "    <script src=\"https://cdn.jsdelivr.net/npm/vega-embed@5\"></script>\n";
+	out << "\n";
+	out << "    <style media=\"screen\">\n";
+	out << "      /* Add space between Vega-Embed links  */\n";
+	out << "      .vega-actions a {\n";
+	out << "        margin-right: 5px;\n";
+	out << "      }\n";
+	out << "    </style>\n";
+	out << "  </head>\n";
+	out << "  <body>\n";
+	out << "    <h1>Pitch-class histogram</h1>\n";
+	printVegaLiteHtml(jsonvar, target, datavar, infile);
+	out << "</body>\n";
+	out << "</html>\n";
 }
 
 
 
 //////////////////////////////
 //
-// Tool_periodicity::processFile --
+// Tool_pccount::printVegaLiteHtml --
 //
 
-void Tool_periodicity::processFile(HumdrumFile& infile) {
-	HumNum minrhy = infile.tpq() * 4;
-	if (getBoolean("min")) {
-		m_free_text << minrhy << endl;
-		return;
-	}
+void Tool_pccount::printVegaLiteHtml(const string& jsonvar,
+		const string& target, const string& datavar, HumdrumFile& infile) {
+	stringstream& out = m_free_text;
 
-	vector<vector<double>> attackgrids;
-	attackgrids.resize(infile.getTrackCount()+1);
-	fillAttackGrids(infile, attackgrids, minrhy);
-	if (getBoolean("attacks")) {
-		printAttackGrid(m_free_text, infile, attackgrids, minrhy);
-		return;
-	}
+	out << "<div class=\"vega-svg\" id=\"" << target << "\"></div>\n";
+	out << "\n";
+	out << "<script>\n";
+	printVegaLiteScript(jsonvar, target, datavar, infile);
+	out << "</script>\n";
+}
 
-	int atrack = getInteger("track");
-	vector<vector<double>> analysis;
-	doPeriodicityAnalysis(analysis, attackgrids[atrack], minrhy);
 
-	if (getBoolean("raw")) {
-		printPeriodicityAnalysis(m_free_text, analysis);
-		return;
-	}
 
-	printSvgAnalysis(m_free_text, analysis, minrhy);
+//////////////////////////////
+//
+// Tool_pccount::printVegaLiteScript --
+//
+
+void Tool_pccount::printVegaLiteScript(const string& jsonvar,
+		const string& target, const string& datavar, HumdrumFile& infile) {
+	stringstream& out = m_free_text;
+
+	out << "var " << datavar << " =\n";
+	printVegaLiteJsonData();
+	out << ";\n";
+	out << "\n";
+	out << "var " << jsonvar << " =\n";
+	printVegaLiteJsonTemplate(datavar, infile);
+	out << ";\n";
+	out << "vegaEmbed('#" << target << "', " << jsonvar << ");\n";
 }
 
 
 
 //////////////////////////////
 //
-// Tool_periodicity::printPeriodicityAnalysis --
+// Tool_pccount::printVegaLiteJsonData --
 //
 
-void Tool_periodicity::printPeriodicityAnalysis(ostream& out, vector<vector<double>>& analysis) {
-	for (int i=0; i<(int)analysis.size(); i++) {
-		for (int j=0; j<(int)analysis[i].size(); j++) {
-			out << analysis[i][j];
-			if (j < (int)analysis[i].size() - 1) {
+void Tool_pccount::printVegaLiteJsonData(void) {
+	stringstream& out = m_free_text;
+
+	m_maxpc = 0;
+	for (int i=0; i<(int)m_counts[0].size(); i++) {
+		if (m_counts[0][i] > m_maxpc) {
+			m_maxpc = m_counts[0][i];
+		}
+	}
+	out << "[\n";
+	int commacounter = 0;
+	double percent = 100.0;
+	for (int i=1; i<(int)m_counts.size(); i++) {
+		for (int j=0; j<(int)m_counts[i].size(); j++) {
+			if (m_counts[i][j] == 0.0) {
+				continue;
+			}
+			if (commacounter > 0) {
+				out << ",\n\t";
+			} else {
 				out << "\t";
 			}
+			commacounter++;
+			if (m_attack) {
+				out << "{\"count\":" << m_counts[i][j] << ", ";
+			} else {
+				out << "{\"percent\":" << m_counts[i][j]/m_maxpc*percent << ", ";
+			}
+			out << "\"pitch class\":\"" << getPitchClassString(j) << "\", ";
+			out << "\"voice\":\"" << m_names[i] << "\"";
+			out << "}";
 		}
-		out << "\n";
 	}
+	out << "\n]\n";
 }
 
 
 
 //////////////////////////////
 //
-// Tool_periodicity::doPeriodicAnalysis --
+// Tool_pccount::setFactorMaximum -- normalize by the maximum pitch-class value.
 //
 
-void Tool_periodicity::doPeriodicityAnalysis(vector<vector<double>> &analysis, vector<double>& grid, HumNum minrhy) {
-	analysis.resize(minrhy.getNumerator());
-	for (int i=0; i<(int)analysis.size(); i++) {
-		doAnalysis(analysis, i, grid);
+void Tool_pccount::setFactorMaximum(void) {
+	m_factor = 0.0;
+	for (int i=0; i<(int)m_counts[0].size(); i++) {
+		if (m_counts[0][i] > m_factor) {
+			m_factor = m_counts[0][i];
+		}
 	}
 }
 
@@ -106357,19 +108357,13 @@ void Tool_periodicity::doPeriodicityAnalysis(vector<vector<double>> &analysis, v
 
 //////////////////////////////
 //
-// Tool_periodicity::doAnalysis --
+// Tool_pccount::setFactorNormalize -- normalize by the sum of all pitch class values.
 //
 
-void Tool_periodicity::doAnalysis(vector<vector<double>>& analysis, int level, vector<double>& grid) {
-	int period = level + 1;
-	analysis[level].resize(period);
-	std::fill(analysis[level].begin(), analysis[level].end(), 0.0);
-	for (int i=0; i<period; i++) {
-		int j = i;
-		while (j < (int)grid.size()) {
-			analysis[level][i] += grid[j];
-			j += period;
-		}
+void Tool_pccount::setFactorNormalize(void) {
+	m_factor = 0.0;
+	for (int i=0; i<(int)m_counts[0].size(); i++) {
+		m_factor += m_counts[0][i];
 	}
 }
 
@@ -106377,263 +108371,559 @@ void Tool_periodicity::doAnalysis(vector<vector<double>>& analysis, int level, v
 
 //////////////////////////////
 //
-// Tool_periodicity::printAttackGrid --
+// Tool_pccount::printHumdrumTable --
 //
 
-void Tool_periodicity::printAttackGrid(ostream& out, HumdrumFile& infile, vector<vector<double>>& grids, HumNum minrhy) {
-	out << "!!!minrhy: " << minrhy << endl;
-	out << "**all";
-	for (int i=1; i<(int)grids.size(); i++) {
-		out << "\t**track";
+void Tool_pccount::printHumdrumTable(void) {
+
+	double factor = 0.0;
+
+	if (m_maximum) {
+		setFactorMaximum();
+		m_free_text << "!!!MAX: " << m_factor << endl;
+	} else if (m_normalize) {
+		setFactorNormalize();
+		m_free_text << "!!!TOTAL: " << factor << endl;
 	}
-	out << "\n";
-	for (int j=0; j<(int)grids[0].size(); j++) {
-		for (int i=0; i<(int)grids.size(); i++) {
-			out << grids[i][j];
-			if (i < (int)grids.size() - 1) {
-				out << "\t";
+
+	// exclusive interpretation
+	m_free_text << "**kern";
+	m_free_text << "\t**all";
+	for (int i=0; i<(int)m_counts.size() - 1; i++) {
+		m_free_text << "\t**part";
+	}
+	m_free_text << endl;
+
+	// part names
+	m_free_text << "*";
+	for (int i=0; i<(int)m_counts.size(); i++) {
+		if (i < (int)m_names.size()) {
+			m_free_text << "\t*I\"" << m_names.at(i);
+		} else {
+			m_free_text << "\t*";
+		}
+	}
+	m_free_text << endl;
+
+	if (!m_abbreviations.empty()) {
+
+		// part abbreviation
+		m_free_text << "*";
+		for (int i=0; i<(int)m_counts.size(); i++) {
+			if (i < (int)m_abbreviations.size()) {
+				m_free_text << "\t*I\'" << m_abbreviations.at(i);
+			} else {
+				m_free_text << "\t*";
 			}
 		}
-		out << "\n";
+		m_free_text << endl;
 	}
-	for (int i=0; i<(int)grids.size(); i++) {
-		out << "*-";
-		if (i < (int)grids.size() - 1) {
-			out << "\t";
+
+	for (int i=0; i<(int)m_counts[0].size(); i++) {
+		if (m_counts[0][i] == 0) {
+			continue;
+		}
+		if ((i == 5) || (i == 11) || (i == 22) || (i == 28) || (i == 34)) {
+			continue;
+		}
+		string pitch = Convert::base40ToKern(i + 4*40);
+		m_free_text << pitch;
+		for (int j=0; j<(int)m_counts.size(); j++) {
+			if (m_normalize) {
+				m_free_text << "\t" << m_counts[j][i] / m_factor;
+			} else if (m_maximum) {
+				m_free_text << "\t" << m_counts[j][i] / m_factor;
+			} else {
+				m_free_text << "\t" << m_counts[j][i];
+			}
 		}
+		m_free_text << endl;
 	}
-	out << "\n";
 
+	int columns = (int)m_counts.size() + 1;
+	for (int i=0; i<columns; i++) {
+		m_free_text << "*-";
+		if (i < columns - 1) {
+			m_free_text << "\t";
+		}
+	}
+	m_free_text << endl;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_periodicity::fillAttackGrids --
+// Tool_pccount::countPitches --
 //
 
-void Tool_periodicity::fillAttackGrids(HumdrumFile& infile, vector<vector<double>>& grids, HumNum minrhy) {
-	HumNum elements = minrhy * infile.getScoreDuration() / 4;
+void Tool_pccount::countPitches(HumdrumFile& infile) {
+	if (m_parttracks.size() == 0) {
+		return;
+	}
+	m_counts.clear();
+	m_counts.resize(m_parttracks.size());
+	for (int i=0; i<(int)m_parttracks.size(); i++) {
+		m_counts[i].resize(40);
+		fill(m_counts[i].begin(), m_counts[i].end(), 0.0);
+	}
+	for (int i=0; i<infile.getStrandCount(); i++) {
+		HTp sstart = infile.getStrandStart(i);
+		HTp send = infile.getStrandEnd(i);
+		addCounts(sstart, send);
+	}
 
-	for (int t=0; t<(int)grids.size(); t++) {
-		grids[t].resize(elements.getNumerator());
+	// fill in sum for all parts
+	for (int i=0; i<(int)m_counts[0].size(); i++) {
+		for (int j=1; j<(int)m_counts.size(); j++) {
+			m_counts[0][i] += m_counts[j][i];
+		}
 	}
 
-	for (int i=0; i<infile.getLineCount(); i++) {
-		if (!infile[i].isData()) {
+}
+
+
+//////////////////////////////
+//
+// Tool_pccount::addCounts --
+//
+
+void Tool_pccount::addCounts(HTp sstart, HTp send) {
+	if (!sstart) {
+		return;
+	}
+	if (!sstart->isKern()) {
+		return;
+	}
+	int track = sstart->getTrack();
+	int kindex = m_rkern[track];
+	HTp current = sstart;
+	while (current && (current != send)) {
+		if (!current->isData()) {
+			current = current->getNextToken();
 			continue;
 		}
-		HumNum position = infile[i].getDurationFromStart() / 4 * minrhy;
-		for (int j=0; j<infile[i].getFieldCount(); j++) {
-			HTp token = infile.token(i, j);
-			if (!token->isKern()) {
-				continue;
-			}
-			if (token->isNull()) {
-				continue;
-			}
-			if (!token->isNoteAttack()) {
-				continue;
-			}
-			int track = token->getTrack();
-			grids.at(track).at(position.getNumerator()) += 1;
+		if (current->isNull() || current->isRest()) {
+			current = current->getNextToken();
+			continue;
 		}
-	}
-
-	bool oneQ = getBoolean("one");
-	for (int j=0; j<(int)grids.at(0).size(); j++) {
-		grids.at(0).at(j) = 0;
-		for (int i=0; i<(int)grids.size(); i++) {
-			if (!grids.at(i).at(j)) {
-				continue;
+		vector<string> subtokens = current->getSubtokens();
+		for (int i=0; i<(int)subtokens.size(); i++) {
+			if (m_attack) {
+				// ignore sustained parts of notes when counting attacks
+				if (subtokens[i].find("_") != string::npos) {
+					continue;
+				}
+				if (subtokens[i].find("]") != string::npos) {
+					continue;
+				}
 			}
-			if (oneQ) {
-				grids.at(0).at(j) = 1;
+			int b40 = Convert::kernToBase40(subtokens[i]);
+			if (m_attack) {
+				m_counts[kindex][b40%40]++;
 			} else {
-				grids.at(0).at(j) += grids.at(i).at(j);
+				double duration = Convert::recipToDuration(subtokens[i]).getFloat();
+				m_counts[kindex][b40%40] += duration;
 			}
 		}
+		current = current->getNextToken();
 	}
 }
 
 
 
+
 //////////////////////////////
 //
-// Tool_periodicity::printSvgAnalysis --
+// Tool_pccount::initializePartInfo --
 //
 
-void Tool_periodicity::printSvgAnalysis(ostream& out, vector<vector<double>>& analysis, HumNum minrhy) {
-	pugi::xml_document image;
-	auto declaration = image.prepend_child(pugi::node_declaration);
-	declaration.append_attribute("version") = "1.0";
-	declaration.append_attribute("encoding") = "UTF-8";
-	declaration.append_attribute("standalone") = "no";
+void Tool_pccount::initializePartInfo(HumdrumFile& infile) {
+	m_names.clear();
+	m_abbreviations.clear();
+	m_parttracks.clear();
+	m_rkern.clear();
 
-	auto svgnode = image.append_child("svg");
-	svgnode.append_attribute("version") = "1.1";
-	svgnode.append_attribute("xmlns") = "http://www.w3.org/2000/svg";
-	svgnode.append_attribute("xmlns:xlink") = "http://www.w3.org/1999/xlink";
-	svgnode.append_attribute("overflow") = "visible";
-	svgnode.append_attribute("viewBox") = "0 0 1000 1000";
-	svgnode.append_attribute("width") = "1000px";
-	svgnode.append_attribute("height") = "1000px";
+	m_rkern.resize(infile.getTrackCount() + 1);
+	fill(m_rkern.begin(), m_rkern.end(), -1);
 
-	auto style = svgnode.append_child("style");
-	style.text().set(".label { font: 14px sans-serif; alignment-baseline: middle; text-anchor: left; }");
+	m_parttracks.push_back(-1);
+	m_names.push_back("all");
+	m_abbreviations.push_back("all");
 
-	auto grid = svgnode.append_child("g");
-	grid.append_attribute("id") = "grid";
+	vector<HTp> starts = infile.getKernSpineStartList();
 
-	auto labels = svgnode.append_child("g");
+	int foundpart = false;
+	int foundabbr = false;
 
-	double hue = 0.0;
-	double saturation = 100;
-	double lightness = 75;
+	int track = 0;
+	for (int i=0; i<(int)starts.size(); i++) {
+		track = starts[i]->getTrack();
+		m_rkern[track] = i+1;
+		m_parttracks.push_back(track);
+		HTp current = starts[i];
+		foundpart = false;
+		foundabbr = false;
+		if (!current->isKern()) {
+			continue;
+		}
+		while (current) {
+			if (current->isData()) {
+				break;
+			}
+			if ((!foundpart) && (current->compare(0, 3, "*I\"") == 0)) {
+				m_names.emplace_back(current->substr(3));
+				foundpart = true;
+			} else if ((!foundabbr) && (current->compare(0, 3, "*I\'") == 0)) {
+				m_abbreviations.emplace_back(current->substr(3));
+				foundabbr = true;
+			}
+			current = current->getNextToken();
+		}
+		//if (!foundpart) {
+		//		m_names.emplace_back("");
+		//}
+		//if (!foundabbr) {
+		//		m_names.emplace_back("");
+		//}
+	}
 
-	pugi::xml_node crect;
-	double width;
-	double height;
+}
 
-	stringstream ss;
-	stringstream ssl;
-	//stringstream css;
-	double x;
-	double y;
 
-	double imagewidth = 1000.0;
-	double imageheight = 1000.0;
+//////////////////////////////
+//
+// printVegaLiteJsonTemplate --
+//
 
-	int maxrow = getInteger("max-rows");
-	if (maxrow <= 0) {
-		maxrow = (int)analysis.back().size();
-	}
+void Tool_pccount::printVegaLiteJsonTemplate(const string& datavariable, HumdrumFile& infile) {
+	stringstream& out = m_free_text;
 
+	string idinfo;
+	if (m_id.empty() || m_id == "id") {
+		// do nothing
+	} else {
+		idinfo = "for " + m_id;
+	}
+	out << "{\n";
+	out << "	\"$schema\": \"https://vega.github.io/schema/vega-lite/v4.0.0-beta.1.json\",\n";
+	out << "	\"data\": {\"values\": " << datavariable << "},\n";
+	if (getBoolean("title")) {
+		out << "	\"title\": \"" << m_title << "\",\n";
+	} else {
+		if (m_attack) {
+			out << "	\"title\": \"Note-count pitch-class distribution " << idinfo <<" \",\n";
+		} else {
+			out << "	\"title\": \"Duration-weighted pitch-class distribution " << idinfo <<" \",\n";
+		}
+	}
+	out << "	\"width\": " << m_width << ",\n";
+	out << "	\"height\": " << int(m_width * m_ratio) << ",\n";
+	out << "	\"encoding\": {\n";
+	out << "		\"y\": {\n";
+	if (m_attack) {
+		out << "			\"field\": \"count\",\n";
+		out << "			\"title\": \"Number of note attacks\",\n";
+	} else {
+		out << "			\"field\": \"percent\",\n";
+		out << "			\"title\": \"Percent of maximum pitch class\",\n";
+	}
+	out << "			\"type\": \"quantitative\",\n";
+	if (m_attack) {
+		out << "			\"scale\": {\"domain\": [0, " << m_maxpc << "]},\n";
+	} else {
+		out << "			\"scale\": {\"domain\": [0, 100]},\n";
+	}
+	out << "			\"aggregate\": \"sum\"\n";
+	out << "		},\n";
+	out << "		\"x\": {\n";
+	out << "			\"field\": \"pitch class\",\n";
+	out << "			\"type\": \"nominal\",\n";
+	out << "			\"scale\": {\n";
+	out << "				\"domain\": [";
+		printPitchClassList();
+		out << "]\n";
+	out << "			},\n";
+	out << "			\"axis\": {\n";
+	out << "				\"labelAngle\": 0\n";
+	out << "			}\n";
+	out << "		},\n";
+	out << "		\"order\": {\"type\": \"quantitative\"},\n";
+	out << "		\"color\": {\n";
+	out << "			\"field\": \"voice\",\n";
+	out << "			\"type\": \"nominal\",\n";
+	if (m_counts.size() == 2) {
+		out << "			\"legend\": {\"title\": \"Voice\"},\n";
+	} else {
+		out << "			\"legend\": {\"title\": \"Voices\"},\n";
+	}
+	out << "			\"scale\": {\n";
+  	out << "				\"domain\": [";
+		printVoiceList();
+		out << "],\n";
+ 	out << "				\"range\": [";
+		printColorList();
+		out << "],\n";
+ 	out << "				}\n";
+	out << "		}\n";
+	out << "	},\n";
 
-	// double sdur = (double)analysis.back().size();
-	double sdur = (double)maxrow;
+	out << "	\"layer\": [\n";
+	out << "		{\"mark\": \"bar\"}";
 
-	double maxscore = 0.0;
-	for (int i=0; i<maxrow; i++) {
-		for (int j=0; j<(int)analysis[i].size(); j++) {
-			if (maxscore < analysis[i][j]) {
-				maxscore = analysis[i][j];
-			}
+	string final = getFinal(infile);
+	if (m_key && !final.empty()) {
+		out << ",\n";
+		out << "		{\n";
+		out << "			\"mark\": {\"type\":\"text\", \"align\":\"center\", \"fill\":\"black\", \"baseline\":\"bottom\"},\n";
+		if (m_attack) {
+			int count = getCount(final);
+			out << "			\"data\": {\"values\": [ {\"pitch class\":\"" << final << "\", \"count\":" << count << "}]},\n";
+		} else {
+			double percent = getPercent(final);
+			out << "			\"data\": {\"values\": [ {\"pitch class\":\"" << final << "\", \"percent\":" << percent << "}]},\n";
 		}
+		out << "			\"encoding\": {\"text\": {\"value\":\"final\"}}\n";
+		out << "		}\n";
 	}
 
-	double power = getDouble("power");
-	for (int i=0; i<maxrow; i++) {
-		for (int j=0; j<(int)analysis[i].size(); j++) {
-			width = 1 / sdur * imagewidth;
-			height = 1 / sdur * imageheight;
+	out << "	]\n";
+	out << "}\n";
 
-			x = j/sdur * imageheight;
-			y = i/sdur * imagewidth;
+}
 
-			double value = analysis[i][j]/maxscore;
-			value = pow(value, 1.0/power);
 
-			getColorMapping(value, hue, saturation, lightness);
-			ss << "hsl(" << hue << "," << saturation << "%," << lightness << "%)";
-			crect = grid.append_child("rect");
-			crect.append_attribute("x") = to_string(x).c_str();
-			crect.append_attribute("y") = to_string(y).c_str();
-			crect.append_attribute("width") = to_string(width*0.99).c_str();
-			crect.append_attribute("height") = to_string(height*0.99).c_str();
-			crect.append_attribute("fill") = ss.str().c_str();
-			//css << "Xm" << getMeasure1(i) << " Ym" << getMeasure2(j);
-			//css << " X" << getQon1(i)     << " Y" << getQon2(j);
-			//css << " X" << getQoff1(i)    << " Y" << getQoff2(j);
-			//crect.append_attribute("class") = css.str().c_str();
-			ss.str("");
-			//css.str("");
-		}
 
-		pugi::xml_node label = labels.append_child("text");
-		label.append_attribute("class") = "label";
+//////////////////////////////
+//
+// Tool_pccount::getCount --
+//
 
-		HumNum rval = (i+1);
-		rval /= minrhy;
-		rval *= 4;
+int Tool_pccount::getCount(const string& pitchclass) {
+	int b40 = Convert::kernToBase40(pitchclass);
+	int index = b40 % 40;
+	int output = (int)m_counts[0][index];
+	return output;
+}
 
-		std::string rhythm = Convert::durationToRecip(rval);
-		rhythm += " (" + to_string(i+1) + ")";
-		label.text().set(rhythm.c_str());
-		x = (i+1+0.5)/sdur * imageheight;
-		y = (i+0.5)/sdur * imagewidth;
-		label.append_attribute("x") = to_string(x).c_str();
-		label.append_attribute("y") = to_string(y).c_str();
-	}
 
-	image.save(out);
+
+//////////////////////////////
+//
+// Tool_pccount::getPercent --
+//
+
+double Tool_pccount::getPercent(const string& pitchclass) {
+	setFactorMaximum();
+	int b40 = Convert::kernToBase40(pitchclass);
+	int index = b40 % 40;
+	double output = m_counts[0][index] / m_factor * 100.0;
+	return output;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_periodicity::getColorMapping --
+// Tool_pccount::printColorList --
 //
 
-void Tool_periodicity::getColorMapping(double input, double& hue,
-		double& saturation, double& lightness) {
-	double maxhue = 0.75 * 360.0;
-	hue = input;
-	if (hue < 0.0) {
-		hue = 0.0;
-	}
-	hue = hue * hue;
-	if (hue != 1.0) {
-		hue *= 0.95;
+void Tool_pccount::printColorList(void) {
+	stringstream& out = m_free_text;
+	for (int i=(int)m_names.size() - 1; i>0; i--) {
+		string color = m_vcolor[m_names[i]];
+		out << "\"";
+		if (color.empty()) {
+			out << "black";
+		} else {
+			out << color;
+		}
+		out << "\"";
+		if (i > 1) {
+			out << ", ";
+		}
 	}
+}
 
-	hue = (1.0 - hue) * 360.0;
-	if (hue == 0.0) {
-		// avoid -0.0;
-		hue = 0.0;
-	}
 
-	if (hue > maxhue) {
-		hue = maxhue;
+
+//////////////////////////////
+//
+// Tool_pccount::printVoiceList --
+//
+
+void Tool_pccount::printVoiceList(void) {
+	stringstream& out = m_free_text;
+	for (int i=(int)m_names.size() - 1; i>0; i--) {
+		out << "\"";
+		out << m_names[i];
+		out << "\"";
+		if (i > 1) {
+			out << ", ";
+		}
 	}
-	if (hue < 0.0) {
-		hue = maxhue;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_pccount::printReverseVoiceList --
+//
+
+void Tool_pccount::printReverseVoiceList(void) {
+	stringstream& out = m_free_text;
+	for (int i=1; i<(int)m_names.size(); i++) {
+		out << "\"";
+		out << m_names[i];
+		out << "\"";
+		if (i < (int)m_names.size() - 1) {
+			out << ", ";
+		}
 	}
+}
 
-	saturation = 100.0;
-	lightness = 50.0;
 
-	if (hue > 60) {
-		lightness = lightness - (hue-60) / (maxhue-60) * lightness / 1.5;
+
+//////////////////////////////
+//
+// Tool_pccount::printPitchClassList --
+//
+
+void Tool_pccount::printPitchClassList(void) {
+	stringstream& out = m_free_text;
+
+	if (m_counts[0][0] > 0.0)  { out << "\"C♭♭\", "; }
+	if (m_counts[0][1] > 0.0)  { out << "\"C♭\", "; }
+	out << "\"C\"";
+	if (m_counts[0][3] > 0.0)  { out << ", \"C♯\""; }
+	if (m_counts[0][4] > 0.0)  { out << ", \"C♯♯\""; }
+	// 5 is empty
+
+	if (m_counts[0][6] > 0.0)  { out << ", \"D♭♭\""; }
+	if (m_counts[0][7] > 0.0)  { out << ", \"D♭\""; }
+	out << ", \"D\"";
+	if (m_counts[0][9] > 0.0)  { out << ", \"D♯\""; }
+	if (m_counts[0][10] > 0.0) { out << ", \"D♯♯\""; }
+	// 11 is empty
+
+	if (m_counts[0][12] > 0.0) { out << ", \"E♭♭\""; }
+	if (m_counts[0][13] > 0.0) { out << ", \"E♭\""; }
+	out << ", \"E\"";
+	if (m_counts[0][15] > 0.0) { out << ", \"E♯\""; }
+	if (m_counts[0][16] > 0.0) { out << ", \"E♯♯\""; }
+
+	if (m_counts[0][17] > 0.0) { out << ", \"F♭♭\""; }
+	if (m_counts[0][18] > 0.0) { out << ", \"F♭\""; }
+	out << ", \"F\"";
+	if (m_counts[0][20] > 0.0) { out << ", \"F♯\""; }
+	if (m_counts[0][21] > 0.0) { out << ", \"F♯♯\""; }
+	// 22 is empty
+
+	if (m_counts[0][23] > 0.0) { out << ", \"G♭♭\""; }
+	if (m_counts[0][24] > 0.0) { out << ", \"G♭\""; }
+	out << ", \"G\"";
+	if (m_counts[0][26] > 0.0) { out << ", \"G♯\""; }
+	if (m_counts[0][27] > 0.0) { out << ", \"G♯♯\""; }
+	// 28 is empty
+
+	if (m_counts[0][29] > 0.0) { out << ", \"A♭♭\""; }
+	if (m_counts[0][30] > 0.0) { out << ", \"A♭\""; }
+	out << ", \"A\"";
+	if (m_counts[0][32] > 0.0) { out << ", \"A♯\""; }
+	if (m_counts[0][33] > 0.0) { out << ", \"A♯♯\""; }
+	// 34 is empty
+
+	if (m_counts[0][35] > 0.0) { out << ", \"B♭♭\""; }
+	if (m_counts[0][36] > 0.0) { out << ", \"B♭\""; }
+	out << ", \"B\"";
+	if (m_counts[0][38] > 0.0) { out << ", \"B♯\""; }
+	if (m_counts[0][39] > 0.0) { out << ", \"B♯♯\""; }
+
+}
+
+
+//////////////////////////////
+//
+// Tool_pccount::getPitchClassString --
+//
+
+string Tool_pccount::getPitchClassString(int b40) {
+	switch (b40%40) {
+		case 0: return "C♭♭";
+		case 1: return "C♭";
+		case 2: return "C";
+		case 3: return "C♯";
+		case 4: return "C♯♯";
+		// 5 is empty
+		case 6: return "D♭♭";
+		case 7: return "D♭";
+		case 8: return "D";
+		case 9: return "D♯";
+		case 10: return "D♯♯";
+		// 11 is empty
+		case 12: return "E♭♭";
+		case 13: return "E♭";
+		case 14: return "E";
+		case 15: return "E♯";
+		case 16: return "E♯♯";
+		case 17: return "F♭♭";
+		case 18: return "F♭";
+		case 19: return "F";
+		case 20: return "F♯";
+		case 21: return "F♯♯";
+		// 22 is empty
+		case 23: return "G♭♭";
+		case 24: return "G♭";
+		case 25: return "G";
+		case 26: return "G♯";
+		case 27: return "G♯♯";
+		// 28 is empty
+		case 29: return "A♭♭";
+		case 30: return "A♭";
+		case 31: return "A";
+		case 32: return "A♯";
+		case 33: return "A♯♯";
+		// 34 is empty
+		case 35: return "B♭♭";
+		case 36: return "B♭";
+		case 37: return "B";
+		case 38: return "B♯";
+		case 39: return "B♯♯";
 	}
+
+	return "?";
 }
 
 
 
 
+
+
 /////////////////////////////////
 //
-// Tool_gridtest::Tool_phrase -- Set the recognized options for the tool.
+// Tool_periodicity::Tool_periodicity -- Set the recognized options for the tool.
 //
 
-Tool_phrase::Tool_phrase(void) {
-	define("A|no-average=b", "do not do average phrase-length analysis");
-	define("R|remove2=b", "remove phrase boundaries in data and do not do analysis");
-	define("m|mark=b", "mark phrase boundaries based on rests");
-	define("r|remove=b", "remove phrase boundaries in data");
-	define("c|color=s", "display color of analysis data");
+Tool_periodicity::Tool_periodicity(void) {
+	define("m|min=b", "minimum time unit (other than grace notes)");
+	define("n|max-rows=i:-1", "maxumum number of rows in svg analysis display");
+	define("t|track=i:0", "track to analyze");
+	define("attacks=b", "extract attack grid)");
+	define("raw=b", "show only raw period data");
+	define("s|svg=b", "output svg image");
+	define("p|power=d:2.0", "scaling power for visual display");
+	define("1|one=b", "composite rhythms are not weighted by attack");
 }
 
 
 
-///////////////////////////////
+/////////////////////////////////
 //
-// Tool_phrase::run -- Primary interfaces to the tool.
+// Tool_periodicity::run -- Primary interfaces to the tool.
 //
 
-bool Tool_phrase::run(HumdrumFileSet& infiles) {
+bool Tool_periodicity::run(HumdrumFileSet& infiles) {
 	bool status = true;
 	for (int i=0; i<infiles.getCount(); i++) {
 		status &= run(infiles[i]);
@@ -106642,37 +108932,36 @@ bool Tool_phrase::run(HumdrumFileSet& infiles) {
 }
 
 
-bool Tool_phrase::run(const string& indata, ostream& out) {
+bool Tool_periodicity::run(const string& indata, ostream& out) {
 	HumdrumFile infile(indata);
-	return run(infile, out);
+	bool status;
+	status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
+	}
+	return status;
 }
 
 
-bool Tool_phrase::run(HumdrumFile& infile, ostream& out) {
-	bool status = run(infile);
+bool Tool_periodicity::run(HumdrumFile& infile, ostream& out) {
+	bool status;
+	status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
+	}
 	return status;
 }
 
+//
+// In-place processing of file:
+//
 
-bool Tool_phrase::run(HumdrumFile& infile) {
-	initialize(infile);
-	for (int i=0; i<(int)m_starts.size(); i++) {
-		if (m_removeQ) {
-			removePhraseMarks(m_starts[i]);
-		}
-		if (m_remove2Q) {
-			continue;
-		}
-		if (hasPhraseMarks(m_starts[i])) {
-			analyzeSpineByPhrase(i);
-		} else {
-			analyzeSpineByRests(i);
-		}
-	}
-	if (!m_remove2Q) {
-		prepareAnalysis(infile);
-	}
-	infile.createLinesFromTokens();
+bool Tool_periodicity::run(HumdrumFile& infile) {
+	processFile(infile);
 	return true;
 }
 
@@ -106680,24 +108969,414 @@ bool Tool_phrase::run(HumdrumFile& infile) {
 
 //////////////////////////////
 //
-// Tool_phrase::prepareAnalysis --
+// Tool_periodicity::processFile --
 //
 
-void Tool_phrase::prepareAnalysis(HumdrumFile& infile) {
-	string exinterp = "**cdata";
-	infile.appendDataSpine(m_results.back(), "", exinterp);
-	for (int i = (int)m_results.size()-1; i>0; i--) {
-		int track = m_starts[i]->getTrack();
-		infile.insertDataSpineBefore(track, m_results[i-1], "", exinterp);
-	}
-	if (m_averageQ) {
-		addAverageLines(infile);
+void Tool_periodicity::processFile(HumdrumFile& infile) {
+	HumNum minrhy = infile.tpq() * 4;
+	if (getBoolean("min")) {
+		m_free_text << minrhy << endl;
+		return;
 	}
-	if (!m_color.empty()) {
-		int insertline = -1;
-		for (int i=0; i<infile.getLineCount(); i++) {
-			if (infile[i].isData() || infile[i].isBarline()) {
-				insertline = i;
+
+	vector<vector<double>> attackgrids;
+	attackgrids.resize(infile.getTrackCount()+1);
+	fillAttackGrids(infile, attackgrids, minrhy);
+	if (getBoolean("attacks")) {
+		printAttackGrid(m_free_text, infile, attackgrids, minrhy);
+		return;
+	}
+
+	int atrack = getInteger("track");
+	vector<vector<double>> analysis;
+	doPeriodicityAnalysis(analysis, attackgrids[atrack], minrhy);
+
+	if (getBoolean("raw")) {
+		printPeriodicityAnalysis(m_free_text, analysis);
+		return;
+	}
+
+	printSvgAnalysis(m_free_text, analysis, minrhy);
+}
+
+
+
+//////////////////////////////
+//
+// Tool_periodicity::printPeriodicityAnalysis --
+//
+
+void Tool_periodicity::printPeriodicityAnalysis(ostream& out, vector<vector<double>>& analysis) {
+	for (int i=0; i<(int)analysis.size(); i++) {
+		for (int j=0; j<(int)analysis[i].size(); j++) {
+			out << analysis[i][j];
+			if (j < (int)analysis[i].size() - 1) {
+				out << "\t";
+			}
+		}
+		out << "\n";
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_periodicity::doPeriodicAnalysis --
+//
+
+void Tool_periodicity::doPeriodicityAnalysis(vector<vector<double>> &analysis, vector<double>& grid, HumNum minrhy) {
+	analysis.resize(minrhy.getNumerator());
+	for (int i=0; i<(int)analysis.size(); i++) {
+		doAnalysis(analysis, i, grid);
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_periodicity::doAnalysis --
+//
+
+void Tool_periodicity::doAnalysis(vector<vector<double>>& analysis, int level, vector<double>& grid) {
+	int period = level + 1;
+	analysis[level].resize(period);
+	std::fill(analysis[level].begin(), analysis[level].end(), 0.0);
+	for (int i=0; i<period; i++) {
+		int j = i;
+		while (j < (int)grid.size()) {
+			analysis[level][i] += grid[j];
+			j += period;
+		}
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_periodicity::printAttackGrid --
+//
+
+void Tool_periodicity::printAttackGrid(ostream& out, HumdrumFile& infile, vector<vector<double>>& grids, HumNum minrhy) {
+	out << "!!!minrhy: " << minrhy << endl;
+	out << "**all";
+	for (int i=1; i<(int)grids.size(); i++) {
+		out << "\t**track";
+	}
+	out << "\n";
+	for (int j=0; j<(int)grids[0].size(); j++) {
+		for (int i=0; i<(int)grids.size(); i++) {
+			out << grids[i][j];
+			if (i < (int)grids.size() - 1) {
+				out << "\t";
+			}
+		}
+		out << "\n";
+	}
+	for (int i=0; i<(int)grids.size(); i++) {
+		out << "*-";
+		if (i < (int)grids.size() - 1) {
+			out << "\t";
+		}
+	}
+	out << "\n";
+
+}
+
+
+
+//////////////////////////////
+//
+// Tool_periodicity::fillAttackGrids --
+//
+
+void Tool_periodicity::fillAttackGrids(HumdrumFile& infile, vector<vector<double>>& grids, HumNum minrhy) {
+	HumNum elements = minrhy * infile.getScoreDuration() / 4;
+
+	for (int t=0; t<(int)grids.size(); t++) {
+		grids[t].resize(elements.getNumerator());
+	}
+
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isData()) {
+			continue;
+		}
+		HumNum position = infile[i].getDurationFromStart() / 4 * minrhy;
+		for (int j=0; j<infile[i].getFieldCount(); j++) {
+			HTp token = infile.token(i, j);
+			if (!token->isKern()) {
+				continue;
+			}
+			if (token->isNull()) {
+				continue;
+			}
+			if (!token->isNoteAttack()) {
+				continue;
+			}
+			int track = token->getTrack();
+			grids.at(track).at(position.getNumerator()) += 1;
+		}
+	}
+
+	bool oneQ = getBoolean("one");
+	for (int j=0; j<(int)grids.at(0).size(); j++) {
+		grids.at(0).at(j) = 0;
+		for (int i=0; i<(int)grids.size(); i++) {
+			if (!grids.at(i).at(j)) {
+				continue;
+			}
+			if (oneQ) {
+				grids.at(0).at(j) = 1;
+			} else {
+				grids.at(0).at(j) += grids.at(i).at(j);
+			}
+		}
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_periodicity::printSvgAnalysis --
+//
+
+void Tool_periodicity::printSvgAnalysis(ostream& out, vector<vector<double>>& analysis, HumNum minrhy) {
+	pugi::xml_document image;
+	auto declaration = image.prepend_child(pugi::node_declaration);
+	declaration.append_attribute("version") = "1.0";
+	declaration.append_attribute("encoding") = "UTF-8";
+	declaration.append_attribute("standalone") = "no";
+
+	auto svgnode = image.append_child("svg");
+	svgnode.append_attribute("version") = "1.1";
+	svgnode.append_attribute("xmlns") = "http://www.w3.org/2000/svg";
+	svgnode.append_attribute("xmlns:xlink") = "http://www.w3.org/1999/xlink";
+	svgnode.append_attribute("overflow") = "visible";
+	svgnode.append_attribute("viewBox") = "0 0 1000 1000";
+	svgnode.append_attribute("width") = "1000px";
+	svgnode.append_attribute("height") = "1000px";
+
+	auto style = svgnode.append_child("style");
+	style.text().set(".label { font: 14px sans-serif; alignment-baseline: middle; text-anchor: left; }");
+
+	auto grid = svgnode.append_child("g");
+	grid.append_attribute("id") = "grid";
+
+	auto labels = svgnode.append_child("g");
+
+	double hue = 0.0;
+	double saturation = 100;
+	double lightness = 75;
+
+	pugi::xml_node crect;
+	double width;
+	double height;
+
+	stringstream ss;
+	stringstream ssl;
+	//stringstream css;
+	double x;
+	double y;
+
+	double imagewidth = 1000.0;
+	double imageheight = 1000.0;
+
+	int maxrow = getInteger("max-rows");
+	if (maxrow <= 0) {
+		maxrow = (int)analysis.back().size();
+	}
+
+
+	// double sdur = (double)analysis.back().size();
+	double sdur = (double)maxrow;
+
+	double maxscore = 0.0;
+	for (int i=0; i<maxrow; i++) {
+		for (int j=0; j<(int)analysis[i].size(); j++) {
+			if (maxscore < analysis[i][j]) {
+				maxscore = analysis[i][j];
+			}
+		}
+	}
+
+	double power = getDouble("power");
+	for (int i=0; i<maxrow; i++) {
+		for (int j=0; j<(int)analysis[i].size(); j++) {
+			width = 1 / sdur * imagewidth;
+			height = 1 / sdur * imageheight;
+
+			x = j/sdur * imageheight;
+			y = i/sdur * imagewidth;
+
+			double value = analysis[i][j]/maxscore;
+			value = pow(value, 1.0/power);
+
+			getColorMapping(value, hue, saturation, lightness);
+			ss << "hsl(" << hue << "," << saturation << "%," << lightness << "%)";
+			crect = grid.append_child("rect");
+			crect.append_attribute("x") = to_string(x).c_str();
+			crect.append_attribute("y") = to_string(y).c_str();
+			crect.append_attribute("width") = to_string(width*0.99).c_str();
+			crect.append_attribute("height") = to_string(height*0.99).c_str();
+			crect.append_attribute("fill") = ss.str().c_str();
+			//css << "Xm" << getMeasure1(i) << " Ym" << getMeasure2(j);
+			//css << " X" << getQon1(i)     << " Y" << getQon2(j);
+			//css << " X" << getQoff1(i)    << " Y" << getQoff2(j);
+			//crect.append_attribute("class") = css.str().c_str();
+			ss.str("");
+			//css.str("");
+		}
+
+		pugi::xml_node label = labels.append_child("text");
+		label.append_attribute("class") = "label";
+
+		HumNum rval = (i+1);
+		rval /= minrhy;
+		rval *= 4;
+
+		std::string rhythm = Convert::durationToRecip(rval);
+		rhythm += " (" + to_string(i+1) + ")";
+		label.text().set(rhythm.c_str());
+		x = (i+1+0.5)/sdur * imageheight;
+		y = (i+0.5)/sdur * imagewidth;
+		label.append_attribute("x") = to_string(x).c_str();
+		label.append_attribute("y") = to_string(y).c_str();
+	}
+
+	image.save(out);
+}
+
+
+
+//////////////////////////////
+//
+// Tool_periodicity::getColorMapping --
+//
+
+void Tool_periodicity::getColorMapping(double input, double& hue,
+		double& saturation, double& lightness) {
+	double maxhue = 0.75 * 360.0;
+	hue = input;
+	if (hue < 0.0) {
+		hue = 0.0;
+	}
+	hue = hue * hue;
+	if (hue != 1.0) {
+		hue *= 0.95;
+	}
+
+	hue = (1.0 - hue) * 360.0;
+	if (hue == 0.0) {
+		// avoid -0.0;
+		hue = 0.0;
+	}
+
+	if (hue > maxhue) {
+		hue = maxhue;
+	}
+	if (hue < 0.0) {
+		hue = maxhue;
+	}
+
+	saturation = 100.0;
+	lightness = 50.0;
+
+	if (hue > 60) {
+		lightness = lightness - (hue-60) / (maxhue-60) * lightness / 1.5;
+	}
+}
+
+
+
+
+/////////////////////////////////
+//
+// Tool_gridtest::Tool_phrase -- Set the recognized options for the tool.
+//
+
+Tool_phrase::Tool_phrase(void) {
+	define("A|no-average=b", "do not do average phrase-length analysis");
+	define("R|remove2=b", "remove phrase boundaries in data and do not do analysis");
+	define("m|mark=b", "mark phrase boundaries based on rests");
+	define("r|remove=b", "remove phrase boundaries in data");
+	define("c|color=s", "display color of analysis data");
+}
+
+
+
+///////////////////////////////
+//
+// Tool_phrase::run -- Primary interfaces to the tool.
+//
+
+bool Tool_phrase::run(HumdrumFileSet& infiles) {
+	bool status = true;
+	for (int i=0; i<infiles.getCount(); i++) {
+		status &= run(infiles[i]);
+	}
+	return status;
+}
+
+
+bool Tool_phrase::run(const string& indata, ostream& out) {
+	HumdrumFile infile(indata);
+	return run(infile, out);
+}
+
+
+bool Tool_phrase::run(HumdrumFile& infile, ostream& out) {
+	bool status = run(infile);
+	return status;
+}
+
+
+bool Tool_phrase::run(HumdrumFile& infile) {
+	initialize(infile);
+	for (int i=0; i<(int)m_starts.size(); i++) {
+		if (m_removeQ) {
+			removePhraseMarks(m_starts[i]);
+		}
+		if (m_remove2Q) {
+			continue;
+		}
+		if (hasPhraseMarks(m_starts[i])) {
+			analyzeSpineByPhrase(i);
+		} else {
+			analyzeSpineByRests(i);
+		}
+	}
+	if (!m_remove2Q) {
+		prepareAnalysis(infile);
+	}
+	infile.createLinesFromTokens();
+	return true;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_phrase::prepareAnalysis --
+//
+
+void Tool_phrase::prepareAnalysis(HumdrumFile& infile) {
+	string exinterp = "**cdata";
+	infile.appendDataSpine(m_results.back(), "", exinterp);
+	for (int i = (int)m_results.size()-1; i>0; i--) {
+		int track = m_starts[i]->getTrack();
+		infile.insertDataSpineBefore(track, m_results[i-1], "", exinterp);
+	}
+	if (m_averageQ) {
+		addAverageLines(infile);
+	}
+	if (!m_color.empty()) {
+		int insertline = -1;
+		for (int i=0; i<infile.getLineCount(); i++) {
+			if (infile[i].isData() || infile[i].isBarline()) {
+				insertline = i;
 				break;
 			}
 		}
@@ -107000,27 +109679,22 @@ bool Tool_phrase::hasPhraseMarks(HTp start) {
 
 /////////////////////////////////
 //
-// Tool_gridtest::Tool_pnum -- Set the recognized options for the tool.
+// Tool_pline::Tool_pline -- Set the recognized options for the tool.
 //
 
-Tool_pnum::Tool_pnum(void) {
-	define("b|base=i:midi",      "numeric base of pitch to extract");
-	define("D|no-duration=b",    "do not include duration");
-	define("c|pitch-class=b",    "give numeric pitch-class rather than pitch");
-	define("o|octave=b",         "give octave rather than pitch");
-	define("r|rest=s:0",         "representation string for rests");
-	define("R|no-rests=b",       "do not include rests in conversion");
-	define("x|attacks-only=b",   "only mark lines with note attacks");
+Tool_pline::Tool_pline(void) {
+	define("c|color=b", "color poetic lines (currently only by notes)");
+	define("o|overlap=b", "do overlap analysis/markup");
 }
 
 
 
-///////////////////////////////
+/////////////////////////////////
 //
-// Tool_pnum::run -- Primary interfaces to the tool.
+// Tool_pline::run -- Do the main work of the tool.
 //
 
-bool Tool_pnum::run(HumdrumFileSet& infiles) {
+bool Tool_pline::run(HumdrumFileSet& infiles) {
 	bool status = true;
 	for (int i=0; i<infiles.getCount(); i++) {
 		status &= run(infiles[i]);
@@ -107029,92 +109703,90 @@ bool Tool_pnum::run(HumdrumFileSet& infiles) {
 }
 
 
-bool Tool_pnum::run(const string& indata, ostream& out) {
+bool Tool_pline::run(const string& indata, ostream& out) {
 	HumdrumFile infile(indata);
-	return run(infile, out);
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
+	}
+	return status;
 }
 
 
-bool Tool_pnum::run(HumdrumFile& infile, ostream& out) {
+bool Tool_pline::run(HumdrumFile& infile, ostream& out) {
 	bool status = run(infile);
-	out << infile;
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
+	}
 	return status;
 }
 
 
-bool Tool_pnum::run(HumdrumFile& infile) {
-   initialize(infile);
+bool Tool_pline::run(HumdrumFile& infile) {
+	initialize();
 	processFile(infile);
-	infile.createLinesFromTokens();
 	return true;
 }
 
 
-
 //////////////////////////////
 //
-// Tool_pnum::initialize --
+// Tool_pline::initialize --
 //
 
-void Tool_pnum::initialize(HumdrumFile& infile) {
-	m_midiQ = false;
-	if (getString("base") == "midi") {
-		m_base = 12;
-		m_midiQ = true;
-	} else {
-		// check base for valid numbers, but for now default to 12 if unknown
-		m_base = getInteger("base");
-	}
+void Tool_pline::initialize(void) {
+	m_colors.resize(14);
 
-	m_durationQ = !getBoolean("no-duration");
-	m_classQ    =  getBoolean("pitch-class");
-	m_octaveQ   =  getBoolean("octave");
-	m_attacksQ  =  getBoolean("attacks-only");
-	m_rest      =  getString("rest");
-	m_restQ     = !getBoolean("no-rests");
+	m_colors[0] = "red";        // red
+	m_colors[1] = "darkorange"; // orange
+	m_colors[2] = "gold";       // yellow
+	m_colors[3] = "limegreen";  // green
+	m_colors[4] = "skyblue";    // light blue
+	m_colors[5] = "mediumblue"; // dark blue
+	m_colors[6] = "purple";     // purple
+
+	m_colors[7]  = "darkred";        // red
+	m_colors[8]  = "lightsalmon";    // orange
+	m_colors[9]  = "darkgoldenrod";  // yellow
+	m_colors[10] = "olivedrab";      // green
+	m_colors[11] = "darkturquoise";  // light blue
+	m_colors[12] = "darkblue";       // dark blue
+	m_colors[13] = "indigo";         // purple
+
+	// lighter colors for staff highlighting:
+	//m_colors[0] = "#ffaaaa";  // red
+	//m_colors[1] = "#ffbb00";  // orange
+	//m_colors[2] = "#eeee00";  // yellow
+	//m_colors[3] = "#99cc01";  // green
+	//m_colors[4] = "#bbddff";  // light blue
+	//m_colors[5] = "#88aaff";  // dark blue
+	//m_colors[6] = "#cc88ff";  // purple
+
+	m_colorQ = getBoolean("color");
+	m_colorQ = true;  // default behavior for now.
 }
 
 
 
 //////////////////////////////
 //
-// Tool_pnum::processFile --
+// Tool_pline::processFile --
 //
 
-void Tool_pnum::processFile(HumdrumFile& infile) {
-	vector<HTp> kex;
-
-	for (int i=0; i<infile.getLineCount(); i++) {
-		if (!infile[i].hasSpines()) {
-			continue;
-		}
-		for (int j=0; j<infile[i].getFieldCount(); j++) {
-			HTp token = infile.token(i, j);
-			if (!token->isKern()) {
-				continue;
-			}
-			if (*token == "**kern") {
-				kex.push_back(token);
-				continue;
-			}
-			if (!token->isData()) {
-				continue;
-			}
-			if (token->isNull()) {
-				continue;
-			}
-			convertTokenToBase(token);
-		}
+void Tool_pline::processFile(HumdrumFile& infile) {
+	getPlineInterpretations(infile, m_ptokens);
+	fillLineInfo(infile, m_lineInfo);
+	if (m_colorQ) {
+		plineToColor(infile, m_ptokens);
 	}
-
-	string newex;
-	for (int i=0; i<(int)kex.size(); i++) {
-		if (m_midiQ) {
-			newex = "**pmid";
-		} else {
-			newex = "**b" + to_string(m_base);
-		}
-		kex[i]->setText(newex);
+	infile.createLinesFromTokens();
+	m_humdrum_text << infile;
+	if (m_colorQ) {
+		m_humdrum_text << "!!!RDF**kern: 😀 = marked note, color=black" << endl;
 	}
 }
 
@@ -107122,38 +109794,315 @@ void Tool_pnum::processFile(HumdrumFile& infile) {
 
 //////////////////////////////
 //
-// Tool_pnum::convertTokenToBase --
+// Tool_pline::markRests --
 //
 
-void Tool_pnum::convertTokenToBase(HTp token) {
-	string output;
-	int scount = token->getSubtokenCount();
-	for (int i=0; i<scount; i++) {
-		string subtok = token->getSubtoken(i);
-		output += convertSubtokenToBase(subtok);
-		if (i < scount - 1) {
-			output += " ";
+void Tool_pline::markRests(HumdrumFile& infile) {
+	vector<HTp> spinestops;
+	infile.getSpineStopList(spinestops);
+	for (int i=0; i<(int)spinestops.size(); i++) {
+		if (!spinestops[i]->isKern()) {
+			continue;
 		}
+		markSpineRests(spinestops[i]);
 	}
-	token->setText(output);
 }
 
 
-
 //////////////////////////////
 //
-// Tool_pnum::convertSubtokenToBase --
+// Tool_pline::markSpineRests --
 //
 
-string Tool_pnum::convertSubtokenToBase(const string& text) {
-	int pitch = 0;
-	if (text.find("r") == string::npos) {
-		switch (m_base) {
-			case 7:
-				pitch = Convert::kernToBase7(text);
-				break;
-			case 40:
-				pitch = Convert::kernToBase40(text);
+void Tool_pline::markSpineRests(HTp spineStop) {
+	string marker = "😀";
+	int track = spineStop->getTrack();
+	int lastValue = -1;
+	HTp current = spineStop->getPreviousToken();
+	int  line;
+	int  cvalue;
+	while (current) {
+		if (!current->isData()) {
+			current = current->getPreviousToken();
+			continue;
+		}
+		if (current->isNull()) {
+			current = current->getPreviousToken();
+			continue;
+		}
+
+		line = current->getLineIndex();
+		cvalue = m_lineInfo.at(line).at(track);
+
+		if (current->isRest() && (cvalue != lastValue)) {
+			string text = *current;
+			text += marker;
+			current->setText(text);
+		} else {
+			lastValue = cvalue;
+			string text = *current;
+			text += "@" + to_string(cvalue);
+			current->setText(text);
+		}
+		current = current->getPreviousToken();
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_pline::fillLineInfo --
+//
+
+void Tool_pline::fillLineInfo(HumdrumFile& infile, vector<vector<int>>& lineinfo) {
+	lineinfo.clear();
+	lineinfo.resize(infile.getLineCount());
+	int maxtrack = infile.getMaxTrack();
+	HumRegex hre;
+	for (int i=0; i<infile.getLineCount(); i++) {
+		lineinfo[i].resize(maxtrack + 1);
+		fill(lineinfo[i].begin(), lineinfo[i].end(), 0);
+		if (!infile[i].isInterpretation()) {
+			continue;
+		}
+		for (int j=0; j<infile[i].getFieldCount(); j++) {
+			HTp token = infile.token(i, j);
+			if (hre.search(token, "^\\*pline:\\s*(\\d+)")) {
+				int digit = hre.getMatchInt(1);
+				int track = token->getTrack();
+				lineinfo[i][track] = digit;
+			}
+		}
+	}
+
+	for (int i=1; i<(int)lineinfo.size() - 1; i++) {
+		for (int j=1; j<=maxtrack; j++) {
+			if (lineinfo.at(i).at(j)) {
+				continue;
+			} else {
+				lineinfo.at(i).at(j) = lineinfo.at(i-1).at(j);
+			}
+		}
+	}
+
+	// for (int i=0; i<(int)lineinfo.size() - 1; i++) {
+	// 	for (int j=1; j<=maxtrack; j++) {
+	// 		cerr << lineinfo[i][j] << "\t";
+	// 	}
+	// 	cerr << endl;
+	// }
+
+}
+
+
+
+//////////////////////////////
+//
+// Tool_pline::plineToColor --
+//
+
+void Tool_pline::plineToColor(HumdrumFile& infile, vector<HTp>& tokens) {
+	HumRegex hre;
+	markRests(infile);
+	for (int i=0; i<(int)tokens.size(); i++) {
+		if (!hre.search(tokens[i], "^\\*pline:\\s*(\\d+)")) {
+			continue;
+		}
+		int lineNum = hre.getMatchInt(1);
+		int colorIndex = (lineNum - 1) % m_colors.size();
+		string color = m_colors.at(colorIndex);
+		string text = "*color:";
+		text += color;
+		tokens[i]->setText(text);
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_pline::getPlineInterpretations --
+//
+
+void Tool_pline::getPlineInterpretations(HumdrumFile& infile, vector<HTp>& tokens) {
+	HumRegex hre;
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isInterpretation()) {
+			continue;
+		}
+		for (int j=0; j<infile[i].getFieldCount(); j++) {
+			HTp token = infile.token(i, j);
+			if (!token->isKern()) {
+				continue;
+			}
+			if (hre.search(token, "^\\*pline:\\s*(\\d+)")) {
+				tokens.push_back(token);
+			}
+		}
+	}
+}
+
+
+
+
+
+/////////////////////////////////
+//
+// Tool_gridtest::Tool_pnum -- Set the recognized options for the tool.
+//
+
+Tool_pnum::Tool_pnum(void) {
+	define("b|base=i:midi",      "numeric base of pitch to extract");
+	define("D|no-duration=b",    "do not include duration");
+	define("c|pitch-class=b",    "give numeric pitch-class rather than pitch");
+	define("o|octave=b",         "give octave rather than pitch");
+	define("r|rest=s:0",         "representation string for rests");
+	define("R|no-rests=b",       "do not include rests in conversion");
+	define("x|attacks-only=b",   "only mark lines with note attacks");
+}
+
+
+
+///////////////////////////////
+//
+// Tool_pnum::run -- Primary interfaces to the tool.
+//
+
+bool Tool_pnum::run(HumdrumFileSet& infiles) {
+	bool status = true;
+	for (int i=0; i<infiles.getCount(); i++) {
+		status &= run(infiles[i]);
+	}
+	return status;
+}
+
+
+bool Tool_pnum::run(const string& indata, ostream& out) {
+	HumdrumFile infile(indata);
+	return run(infile, out);
+}
+
+
+bool Tool_pnum::run(HumdrumFile& infile, ostream& out) {
+	bool status = run(infile);
+	out << infile;
+	return status;
+}
+
+
+bool Tool_pnum::run(HumdrumFile& infile) {
+   initialize(infile);
+	processFile(infile);
+	infile.createLinesFromTokens();
+	return true;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_pnum::initialize --
+//
+
+void Tool_pnum::initialize(HumdrumFile& infile) {
+	m_midiQ = false;
+	if (getString("base") == "midi") {
+		m_base = 12;
+		m_midiQ = true;
+	} else {
+		// check base for valid numbers, but for now default to 12 if unknown
+		m_base = getInteger("base");
+	}
+
+	m_durationQ = !getBoolean("no-duration");
+	m_classQ    =  getBoolean("pitch-class");
+	m_octaveQ   =  getBoolean("octave");
+	m_attacksQ  =  getBoolean("attacks-only");
+	m_rest      =  getString("rest");
+	m_restQ     = !getBoolean("no-rests");
+}
+
+
+
+//////////////////////////////
+//
+// Tool_pnum::processFile --
+//
+
+void Tool_pnum::processFile(HumdrumFile& infile) {
+	vector<HTp> kex;
+
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].hasSpines()) {
+			continue;
+		}
+		for (int j=0; j<infile[i].getFieldCount(); j++) {
+			HTp token = infile.token(i, j);
+			if (!token->isKern()) {
+				continue;
+			}
+			if (*token == "**kern") {
+				kex.push_back(token);
+				continue;
+			}
+			if (!token->isData()) {
+				continue;
+			}
+			if (token->isNull()) {
+				continue;
+			}
+			convertTokenToBase(token);
+		}
+	}
+
+	string newex;
+	for (int i=0; i<(int)kex.size(); i++) {
+		if (m_midiQ) {
+			newex = "**pmid";
+		} else {
+			newex = "**b" + to_string(m_base);
+		}
+		kex[i]->setText(newex);
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_pnum::convertTokenToBase --
+//
+
+void Tool_pnum::convertTokenToBase(HTp token) {
+	string output;
+	int scount = token->getSubtokenCount();
+	for (int i=0; i<scount; i++) {
+		string subtok = token->getSubtoken(i);
+		output += convertSubtokenToBase(subtok);
+		if (i < scount - 1) {
+			output += " ";
+		}
+	}
+	token->setText(output);
+}
+
+
+
+//////////////////////////////
+//
+// Tool_pnum::convertSubtokenToBase --
+//
+
+string Tool_pnum::convertSubtokenToBase(const string& text) {
+	int pitch = 0;
+	if (text.find("r") == string::npos) {
+		switch (m_base) {
+			case 7:
+				pitch = Convert::kernToBase7(text);
+				break;
+			case 40:
+				pitch = Convert::kernToBase40(text);
 				break;
 			default:
 				pitch = Convert::kernToBase12(text);
@@ -110521,7 +113470,7 @@ void Tool_shed::searchAndReplaceGlobalComment(HumdrumFile& infile) {
 			continue;
 		}
 		if (hre.search(token, isearch, m_grepoptions)) {
-			string text = token->getText().substr(1);
+			string text = token->getText().substr(2);
 			hre.replaceDestructive(text, m_replace, m_search, m_grepoptions);
 			hre.replaceDestructive(text, "", "^!+");
 			text = "!!" + text;
@@ -113775,24 +116724,25 @@ string Tool_tassoize::getDate(void) {
 
 /////////////////////////////////
 //
-// Tool_thru::Tool_thru -- Set the recognized options for the tool.
+// Tool_textdur::Tool_textdur -- Set the recognized options for the tool.
 //
 
-Tool_thru::Tool_thru(void) {
-	define("v|variation=s:",   "Choose the expansion variation");
-	define("l|list=b:",        "Print list of labels in file");
-	define("k|keep=b:",        "Keep variation interpretations");
-	define("i|info=b:",        "Print info list of labels in file");
-	define("r|realization=s:", "Alternate relaization label sequence");
+Tool_textdur::Tool_textdur(void) {
+	// add command-line options here
+	define("a|analysis=b", "calculate and display analyses");
+	define("m|melisma=b", "Count number of notes for each syllable");
+	define("d|duration=b", "Duration of each syllable");
+	define("i|interleave=b", "Preserve original text, and place analyses below text");
 }
 
 
+
 /////////////////////////////////
 //
-// Tool_thru::run -- Do the main work of the tool.
+// Tool_textdur::run -- Do the main work of the tool.
 //
 
-bool Tool_thru::run(HumdrumFileSet& infiles) {
+bool Tool_textdur::run(HumdrumFileSet& infiles) {
 	bool status = true;
 	for (int i=0; i<infiles.getCount(); i++) {
 		status &= run(infiles[i]);
@@ -113801,7 +116751,7 @@ bool Tool_thru::run(HumdrumFileSet& infiles) {
 }
 
 
-bool Tool_thru::run(const string& indata, ostream& out) {
+bool Tool_textdur::run(const string& indata, ostream& out) {
 	HumdrumFile infile(indata);
 	bool status = run(infile);
 	if (hasAnyText()) {
@@ -113813,7 +116763,7 @@ bool Tool_thru::run(const string& indata, ostream& out) {
 }
 
 
-bool Tool_thru::run(HumdrumFile& infile, ostream& out) {
+bool Tool_textdur::run(HumdrumFile& infile, ostream& out) {
 	bool status = run(infile);
 	if (hasAnyText()) {
 		getAllText(out);
@@ -113824,70 +116774,98 @@ bool Tool_thru::run(HumdrumFile& infile, ostream& out) {
 }
 
 
-bool Tool_thru::run(HumdrumFile& infile) {
+bool Tool_textdur::run(HumdrumFile& infile) {
 	initialize();
 	processFile(infile);
 	return true;
 }
 
 
-
 //////////////////////////////
 //
-// Tool_thru::initialize --  Initializations that only have to be done once
-//    for all HumdrumFile segments.
+// Tool_textdur::initialize --
 //
 
-void Tool_thru::initialize(void) {
-	m_variation   = getString("variation");
-	m_realization = getString("realization");
-	m_listQ       = getBoolean("list");
-	m_infoQ       = getBoolean("info");
-	m_keepQ       = getBoolean("keep");
+void Tool_textdur::initialize(void) {
+	m_analysisQ = getBoolean("analysis");
+	m_melismaQ = getBoolean("melisma");
+	if (m_melismaQ) {
+		m_durationQ = false;
+	}
+	if (getBoolean("duration")) {
+		m_durationQ = true;
+	}
+	m_interleaveQ = getBoolean("interleave");
 }
 
 
 
 //////////////////////////////
 //
-// Tool_thru::processFile --
+// Tool_textdur::processFile --
 //
 
-void Tool_thru::processFile(HumdrumFile& infile) {
-	if (m_listQ) {
-		printLabelList(infile);
-		return;
-	} else if (m_infoQ) {
-		printLabelInfo(infile);
+void Tool_textdur::processFile(HumdrumFile& infile) {
+	getTextSpineStarts(infile, m_textStarts);
+	fillInstrumentNameInfo();
+
+	if (m_textStarts.empty()) {
 		return;
 	}
-	processData(infile);
 
-	// analyze the input file according to command-line options
-	// infiles[i].printNonemptySegmentLabel(m_humdrum_text);
+	m_syllables.clear();
+	m_syllables.resize(m_textStarts.size());
+
+	m_durations.clear();
+	m_durations.resize(m_textStarts.size());
+
+	m_melismas.clear();
+	m_melismas.resize(m_textStarts.size());
+
+	for (int i=0; i<(int)m_textStarts.size(); i++) {
+		processTextSpine(m_textStarts, i);
+	}
+
+	if (!m_interleaveQ) {
+		for (int i=0; i<(int)m_textStarts.size(); i++) {
+			string text = *m_textStarts[i];
+			if (m_melismaQ) {
+				text += "-melisma";
+			} else {
+				text += "-duration";
+			}
+			m_textStarts[i]->setText(text);
+		}
+	}
+
+	if (!m_interleaveQ) {
+		if (m_melismaQ) {
+			printMelismas(infile);
+		} else {
+			printDurations(infile);
+		}
+	} else {
+		printInterleaved(infile);
+	}
+
+	if (m_analysisQ) {
+		printAnalysis();
+	}
+
 }
 
 
 
 //////////////////////////////
 //
-// Tool_thru::printLabelList -- print a list of the thru labels.
+// Tool_textdur::fillInstrumentNameInfo --
 //
 
-void Tool_thru::printLabelList(HumdrumFile& infile) {
-	for (int i=0; i<infile.getLineCount(); i++) {
-		if (!infile[i].isInterpretation()) {
-			continue;
-		}
-		HTp token = infile.token(i, 0);
-		if (token->compare(0, 2, "*>") != 0) {
-			continue;   // ignore non-labels
-		}
-		//if (token->find('[') != NULL) {
-		//   continue;   // ignore realizations
-		//}
-		m_humdrum_text << token->substr(2);
-		m_humdrum_text << '\n';
+void Tool_textdur::fillInstrumentNameInfo(void) {
+	m_columnName.clear();
+	m_columnName.resize(m_textStarts.size());
+	for (int i=0; i<(int)m_columnName.size(); i++) {
+		m_columnName[i] = getColumnName(m_textStarts[i]);
 	}
 }
 
@@ -113895,405 +116873,689 @@ void Tool_thru::printLabelList(HumdrumFile& infile) {
 
 //////////////////////////////
 //
-// Tool_thru::printLabelInfo -- print a list of the thru labels.
+// Tool_textdur::getColumnName --
 //
 
-void Tool_thru::printLabelInfo(HumdrumFile& infile) {
-	// infile.analyzeRhythm();
-	vector<int> labellines;
-	labellines.reserve(1000);
-
-	for (int i=0; i<infile.getLineCount(); i++) {
-		if (!infile[i].isInterpretation()) {
-			continue;
-		}
-		HTp token = infile.token(i, 0);
+string Tool_textdur::getColumnName(HTp token) {
+	HTp kerntok = getTandemKernToken(token);
+	if (!kerntok) {
+		return "unknown";
+	}
+	int track = kerntok->getTrack();
+	string output = "Track ";
+	output += to_string(track);
 
-		if (token->compare(0, 2, "*>") != 0) {
-			continue;   // ignore non-labels
+	HTp current = kerntok->getNextToken();
+	HumRegex hre;
+	while (current) {
+		if (current->isData()) {
+			break;
 		}
-		if (token->find('[') != string::npos) {
-			m_humdrum_text << "!!>";
-			m_humdrum_text << token->substr(2) << endl;
-			m_humdrum_text << '\n';
-			continue;   // ignore realizations
+		if (hre.search(current, "^\\*I\\\"(.*)\\s*$")) {
+			output = hre.getMatch(1);
+			break;
 		}
-		labellines.push_back(i);
+		current = current->getNextToken();
 	}
+	return output;
+}
 
-	vector<int> barlines(1000, -1);
-	for (int i=0; i<(int)labellines.size(); i++) {
-		barlines[i] = getBarline(infile, labellines[i]);
-	}
 
-	if (barlines.size() > 0) {
-		barlines[0] = adjustFirstBarline(infile);
+
+
+//////////////////////////////
+//
+// Tool_textdur::printAnalysis --
+//
+
+void Tool_textdur::printAnalysis(void) {
+	if (m_melismaQ) {
+		printMelismaAverage();
+	}
+	if (m_durationQ) {
+		printDurationAverage();
 	}
+	printHtmlContent();
+}
 
-	int startline;
-	int endline;
-	HumNum startbeat;
-	HumNum endbeat;
-	HumNum duration;
 
-	m_humdrum_text << "**label\t**sline\t**eline\t**sbeat\t**ebeat\t**dur\t**bar\n";
-	for (int i=0; i<(int)labellines.size(); i++) {
-		startline = labellines[i];
-		if (i<(int)labellines.size()-1) {
-			endline = labellines[i+1]-1;
-		} else {
-			endline = infile.getLineCount() - 1;
-		}
-		startbeat = infile[startline].getDurationFromStart();
-		endbeat = infile[endline].getDurationFromStart();
-		duration = endbeat - startbeat;
-		duration = int(duration.getFloat() * 10000.0 + 0.5) / 10000.0;
-		HTp token = infile.token(startline, 0);
-		m_humdrum_text << token->substr(2);
-		m_humdrum_text << '\t';
-		m_humdrum_text << startline + 1;
-		m_humdrum_text << '\t';
-		m_humdrum_text << endline + 1;
-		m_humdrum_text << '\t';
-		m_humdrum_text << startbeat;
-		m_humdrum_text << '\t';
-		m_humdrum_text << endbeat;
-		m_humdrum_text << '\t';
-		m_humdrum_text << duration;
-		m_humdrum_text << '\t';
-		m_humdrum_text << barlines[i];
-		m_humdrum_text << '\n';
 
+//////////////////////////////
+//
+// Tool_textdur::printHtmlContent --
+//
+
+void Tool_textdur::printHtmlContent(void) {
+
+	m_humdrum_text << "!!@@BEGIN: PREHTML" << endl;
+	m_humdrum_text << "!!@CONTENT: " << endl;
+	m_humdrum_text << "!! <h1> Syllable length analysis </h1>" << endl;
+
+	m_humdrum_text << "!! <details open> <summary> " << endl;
+	m_humdrum_text << "!! <h3> Number of syllables: @{TOOL-textdur-total-syllables} </h3>" << endl;
+	m_humdrum_text << "!! </summary>" << endl;
+	m_humdrum_text << "!! <table style='margin-left:50px;width:400px;'> " << endl;
+
+	int sum = 0;
+	for (int i=0; i<(int)m_melismas.size(); i++) {
+		sum += (int)m_melismas[i].size();
 	}
-	m_humdrum_text << "*-\t*-\t*-\t*-\t*-\t*-\t*-\n";
 
-}
+	for (int i=(int)m_melismas.size() - 1; i>=0; i--) {
+		double percent = 1.0 * m_melismas.at(i).size() / sum;
+		percent = int(percent * 10000.0 + 0.5) / 100.0;
+		m_humdrum_text << "!! <tr><td> " << m_columnName.at(i) << "</td>"
+		               << "<td style='padding-left:20px; text-align:right;'>" << m_melismas.at(i).size()
+		               << "</td><td style='width:100%;'> (" << percent << "%) </td></tr>" << endl;
+	}
+	m_humdrum_text << "!! </table> " << endl;
+	m_humdrum_text << "!! </details>" << endl;
+
+	if (m_melismaQ) {
+		m_humdrum_text << "!! <h3> Average syllable note length: @{TOOL-textdur-average-notes-per-syllable} </h3>" << endl;
+		m_humdrum_text << "!! <div style='margin-left:50px'></div>" << endl;
+		printMelismaHtmlHistogram();
+		m_humdrum_text << "!! </div>" << endl;
+	}
+	if (m_durationQ) {
+		m_humdrum_text << "!! <div style='height:50px;'></div>" << endl;
+		m_humdrum_text << "!! <h3> Average syllable duration: @{TOOL-textdur-average-syllable-duration} quarter notes </h3>" << endl;
+		printDurationHtmlHistogram();
+	}
+	m_humdrum_text << "!!@@END: PREHTML" << endl;
 
+}
 
 
 //////////////////////////////
 //
-// Tool_thru::adjustFirstBarline --
+// Tool_textdur::printDurationHtmlHistogram --
 //
 
-int Tool_thru::adjustFirstBarline(HumdrumFile& infile) {
-	int number = 0;
-	HumRegex hre;
-	for (int i=0; i<infile.getLineCount(); i++) {
-		if (!infile[i].isBarline()) {
-			continue;
-		}
-		if (infile[i].getDurationFromStart() > 0) {
-			break;
+void Tool_textdur::printDurationHtmlHistogram(void) {
+
+	map<HumNum, int> durinfo;
+	double total = 0;
+	for (int i=0; i<(int)m_durations.size(); i++) {
+		// -1 on next line for *- terminator?
+		for (int j=0; j<(int)m_durations[i].size() -1 ; j++) {
+			HumNum dur = m_durations[i][j];
+			int value = durinfo[dur];
+			durinfo[dur] = value + 1;
+			total += 1.0;
 		}
-		HTp token = infile.token(i, 0);
-		if (hre.search(token, "=.*(\\d+)")) {
-			number = hre.getMatchInt(1);
+	}
+
+	double maxlen = 0;
+	for (auto it = durinfo.begin(); it != durinfo.end(); it++) {
+		if (it->second > maxlen) {
+			maxlen = it->second;
 		}
-		break;
 	}
-	return number;
+
+	m_humdrum_text << "!! <table class='duration-histogram'>" << endl;
+	m_humdrum_text << "!! <tr> <th style='white-space:pre; text-align:center;'> Duration (quarter notes)</th> <th style='padding-left:10px; width:100%;'> Syllable count </th> </tr> " << endl;
+	stringstream value;
+	for (auto it = durinfo.begin(); it != durinfo.end(); it++) {
+		double length = 1.0 * it->second / maxlen * 400;
+		double percent = 1.0 * it->second / total * 100.0;
+		percent = (int)(percent * 100.0 + 0.5) / 100.0;
+		value.str("");
+		it->first.printMixedFraction(value, "+");
+		m_humdrum_text << "!! <tr><td style='padding-left:100px;'> " << value.str() << "</td><td style='padding-left:10px;white-space:pre;'>";
+		m_humdrum_text << " <span style='display:inline-block;background-color:black;height:100%;width:" << length << "px;'>&nbsp;</span>";
+		m_humdrum_text << "&nbsp;" << it->second << "&nbsp;(" << percent << "%)</td></tr>" << endl;
+	}
+	m_humdrum_text << "!! </table>" << endl;
 }
 
 
 
+
+
+
 //////////////////////////////
 //
-// Tool_thru::getBarline --
+// Tool_textdur::printMelismaHtmlHistogram --
+//    default value = -1 (meaning all voices);
 //
 
-int Tool_thru::getBarline(HumdrumFile& infile, int line) {
+void Tool_textdur::printMelismaHtmlHistogram(void) {
 
-	if (infile[line].getDurationFromStart() == 0) {
-		return 0;
+	map<int, int> melinfo;
+	double total = 0;
+	for (int i=0; i<(int)m_melismas.size(); i++) {
+		// -1 on next line for *- terminator?
+		for (int j=0; j<(int)m_melismas[i].size() -1 ; j++) {
+			int count = m_melismas[i][j];
+			int value = melinfo[count];
+			melinfo[count] = value + 1;
+			total += 1.0;
+		}
 	}
 
-	int missingcount = 0;
-	int number = -1;
-	HumRegex hre;
-	for (int i=line; i>0; i--) {
-		if (!infile[i].isBarline()) {
-			continue;
+	double maxlen = 0;
+	for (auto it = melinfo.begin(); it != melinfo.end(); it++) {
+		if (it->second > maxlen) {
+			maxlen = it->second;
 		}
-		HTp token = infile.token(i, 0);
+	}
 
-		if (hre.search(token, "=.*(\\d+)")) {
-			number = hre.getMatchInt(1);
-			break;
-		} else {
-			missingcount++;
-		}
-		if (missingcount > 1) {
-			break;
-		}
+	m_humdrum_text << "!! <table class='melisma-histogram'>" << endl;
+	m_humdrum_text << "!! <tr> <th style='text-align:center;'> Syllable&nbsp;notes </th> <th style='padding-left:10px;'> Syllable count </th> </tr> " << endl;
+	for (auto it = melinfo.begin(); it != melinfo.end(); it++) {
+		double length = 1.0 * it->second / maxlen * 400;
+		double percent = 1.0 * it->second / total * 100.0;
+		percent = (int)(percent * 100.0 + 0.5) / 100.0;
+		m_humdrum_text << "!! <tr><td style='text-align:center;'> " << it->first << "</td><td style='padding-left:10px;white-space:pre;'>";
+		m_humdrum_text << " <span style='display:inline-block;background-color:black;height:100%;width:" << length << "px;'>&nbsp;</span>";
+		m_humdrum_text << "&nbsp;" << it->second << "&nbsp;(" << percent << "%)</td></tr>" << endl;
 	}
+	m_humdrum_text << "!! </table>" << endl;
+}
+
+
+// Print individual histograms for each voice:
+
+void printMelismaHtmlHistogram(int index, int maxVal) {
+
+/*
+	map<int, int> melinfo;
+	double total = maxVal;
+	double maxlen = maxVal;
+
+// ggg
+
+	m_humdrum_text << "!! <table class='melisma-histogram-" << index << "'>" << endl;
+	m_humdrum_text << "!! <tr> <th style='text-align:center;'> Syllable&nbsp;notes </th> <th style='padding-left:10px;'> Syllable count </th> </tr> " << endl;
+	for (auto it = melinfo.begin(); it != melinfo.end(); it++) {
+		double length = 1.0 * it->second / maxlen * 400;
+		double percent = 1.0 * it->second / total * 100.0;
+		percent = (int)(percent * 100.0 + 0.5) / 100.0;
+		m_humdrum_text << "!! <tr><td style='text-align:center;'> " << it->first << "</td><td style='padding-left:10px;white-space:pre;'>";
+		m_humdrum_text << " <span style='display:inline-block;background-color:black;height:100%;width:" << length << "px;'>&nbsp;</span>";
+		m_humdrum_text << "&nbsp;" << it->second << "&nbsp;(" << percent << "%)</td></tr>" << endl;
+	}
+	m_humdrum_text << "!! </table>" << endl;
+}
+
+*/
 
-	return number;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_thru::processData --
+// printMelismaAverage --
 //
 
-void Tool_thru::processData(HumdrumFile& infile) {
-	vector<string> labelsequence;
-	labelsequence.reserve(1000);
+void Tool_textdur::printMelismaAverage() {
+	double sum = 0.0;
+	int counter = 0;
+	for (int i=0; i<(int)m_melismas.size(); i++) {
+		// -1 on next line for *- terminator?
+		for (int j=0; j<(int)m_melismas[i].size() - 1; j++) {
+			sum += m_melismas.at(i).at(j);
+			counter++;
+		}
+	}
+	if (!counter) {
+		return;
+	}
+	double average = sum / counter;
+	average = int(average * 100.0 + 0.5) / 100.0;
+	m_humdrum_text << "!!!TOOL-textdur-average-notes-per-syllable: " << average << endl;
+	m_humdrum_text << "!!!TOOL-textdur-total-syllables: " << counter << endl;
+}
 
-	vector<string> labels;
-	labels.reserve(1000);
 
-	vector<int> startline;
-	startline.reserve(1000);
 
-	vector<int> stopline;
-	stopline.reserve(1000);
+//////////////////////////////
+//
+// printDurationAverage --
+//
 
-	int header = -1;
-	int footer = -1;
-	string labelsearch;
-	labelsearch = "*>";
-	labelsearch += m_variation;
-	labelsearch += "[";
+void Tool_textdur::printDurationAverage(void) {
+	HumNum sum = 0;
+	int counter = 0;
+	for (int i=0; i<(int)m_durations.size(); i++) {
+		// -1 on next line for *- terminator?
+		for (int j=0; j<(int)m_durations[i].size() - 1; j++) {
+			sum += m_durations.at(i).at(j);
+			counter++;
+		}
+	}
+	if (!counter) {
+		return;
+	}
+	double average = sum.getFloat() / counter;
+	average = int(average * 100.0 + 0.5) / 100.0;
+	m_humdrum_text << "!!!TOOL-textdur-average-syllable-duration: " << average << endl;
+}
 
-	// check for label to expand
-	int foundlabel = 0;
-	string tempseq;
-	if (m_realization.size()  == 0) {
-		for (int i=0; i<infile.getLineCount(); i++) {
-			if (!infile[i].isInterpretation()) {
-				continue;
-			}
-			HTp token = infile.token(i, 0);
-			if (token->compare(0, labelsearch.size(), labelsearch) != 0) {
-				continue;
-			}
 
-			tempseq = token->substr(labelsearch.size());
-			getLabelSequence(labelsequence, tempseq);
-			foundlabel = 1;
-			break;
+//////////////////////////////
+//
+// Tool_textdur::printInterleaved --
+//
+
+void Tool_textdur::printInterleaved(HumdrumFile& infile) {
+	vector<bool> textTrack(infile.getMaxTrack() + 1, false);
+	for (int i=0; i<(int)m_textStarts.size(); i++) {
+		int track = m_textStarts[i]->getTrack();
+		textTrack.at(track) = true;
+	}
+
+
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].hasSpines()) {
+			m_humdrum_text << infile[i] << endl;
+			continue;
 		}
-	} else {
-		foundlabel = 1;
-		getLabelSequence(labelsequence, m_realization);
+		printInterleavedLine(infile[i], textTrack);
 	}
+}
 
-	if (foundlabel == 0) {
-		// did not find the label to expand, so echo the data back
-		for (int i=0; i<infile.getLineCount(); i++) {
-			HTp token = infile.token(i, 0);
-			if (*token == "*thru") {
-				continue;
+
+
+//////////////////////////////
+//
+// Tool_textdur::printInterleavedLine --
+//
+
+void Tool_textdur::printInterleavedLine(HumdrumLine& line, vector<bool>& textTrack) {
+	for (int i=0; i<line.getFieldCount(); i++) {
+		HTp token = line.token(i);
+		int track = token->getTrack();
+		m_humdrum_text << token;
+		if (textTrack.at(track)) {
+			printTokenAnalysis(token);
+		}
+		if (i < line.getFieldCount() - 1) {
+			m_humdrum_text << "\t";
+		}
+	}
+	m_humdrum_text << "\n";
+}
+
+
+
+//////////////////////////////
+//
+// Tool_textdur::printTokenAnalysis --
+//
+
+void Tool_textdur::printTokenAnalysis(HTp token) {
+	if (token->compare(0, 2, "**") == 0) {
+		if (m_melismaQ) {
+			m_humdrum_text << "\t**text-melisma";
+		}
+		if (m_durationQ) {
+			m_humdrum_text << "\t**text-duration";
+		}
+		return;
+	}
+
+	if (*token == "*-") {
+		if (m_melismaQ) {
+			m_humdrum_text << "\t*-";
+		}
+		if (m_durationQ) {
+			m_humdrum_text << "\t*-";
+		}
+		return;
+	}
+
+	if (token->compare(0, 1, "*") == 0) {
+
+		HTp tandem = getTandemKernToken(token);
+		if (tandem->compare(0, 3, "*I\"") == 0) {
+			if (m_melismaQ) {
+				m_humdrum_text << "\t*v:mel:";
 			}
-			m_humdrum_text << infile[i] << "\n";
-			if (token->compare(0, 2, "**") == 0) {
-				for (int j=0; j<infile[i].getFieldCount(); j++) {
-					m_humdrum_text << "*thru";
-					if (j < infile[i].getFieldCount() - 1) {
-						m_humdrum_text << "\t";
-					}
-				}
-				m_humdrum_text << "\n";
+			if (m_durationQ) {
+				m_humdrum_text << "\t*v:dur:";
 			}
+			return;
+		}
+
+		if (m_melismaQ) {
+			m_humdrum_text << "\t*";
+		}
+		if (m_durationQ) {
+			m_humdrum_text << "\t*";
 		}
 		return;
 	}
 
-	// for (i=0; i<(int)labelsequence.size(); i++) {
-	//    m_humdrum_text << i+1 << "\t=\t" << labelsequence[i] << endl;
-	// }
+	if (token->compare(0, 1, "!") == 0) {
+		if (m_melismaQ) {
+			m_humdrum_text << "\t!";
+		}
+		if (m_durationQ) {
+			m_humdrum_text << "\t!";
+		}
+		return;
+	}
 
-	// search for the labeled sections in the music
-	string label;
-	int location;
-	int index;
-	for (int i=0; i<infile.getLineCount(); i++) {
-		if (!infile[i].isInterpretation()) {
-			continue;
+	if (token->compare(0, 1, "=") == 0) {
+		if (m_melismaQ) {
+			m_humdrum_text << "\t" << token;
 		}
-		HTp token = infile.token(i, 0);
-		if (*token == "*-") {
-			location = i-1;
-			footer = i;
-			stopline.push_back(location);
+		if (m_durationQ) {
+			m_humdrum_text << "\t" << token;
 		}
-		if (token->compare(0, 2, "*>") != 0) {
-			continue;
+		return;
+	}
+
+	if (*token == ".") {
+		if (m_melismaQ) {
+			m_humdrum_text << "\t.";
 		}
-		if (token->find('[') != string::npos) {
-			continue;
+		if (m_durationQ) {
+			m_humdrum_text << "\t.";
 		}
-		if (token->find(']') != string::npos) {
-			continue;
+		return;
+	}
+
+	if (!token->isData()) {
+		cerr << "WARNING: DATA TOKEN IS NOT DATA: " << token << endl;
+		return;
+	}
+
+	int index = -1;
+	if (token->isDefined("auto", "index")) {
+		index = token->getValueInt("auto", "index");
+	} else {
+		if (m_melismaQ) {
+			m_humdrum_text << "\t.";
 		}
+		if (m_durationQ) {
+			m_humdrum_text << "\t.";
+		}
+		return;
+	}
 
-		if (labels.size() == 0) {
-			header = i-1;
+	// Have data analysis to print:
+
+	int track = token->getTrack();
+	int column = m_track2column.at(track);
+
+	if (m_melismaQ) {
+		int melisma = m_melismas.at(column).at(index);
+		m_humdrum_text << "\t" << melisma;
+	}
+	if (m_durationQ) {
+		HumNum duration = m_durations.at(column).at(index);
+		m_humdrum_text << "\t" << duration;
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_textdur::printMelismas --
+//
+
+void Tool_textdur::printMelismas(HumdrumFile& infile) {
+	// replace text with melisma data:
+	for (int i=0; i<(int)m_syllables.size(); i++) {
+		// -1 on next line for *- placeholder at end of spine.
+		for (int j=0; j<(int)m_syllables.at(i).size() - 1; j++) {
+			HTp token = m_syllables.at(i).at(j);
+			int jj = token->getValueInt("auto", "index");
+			string replacement = to_string(m_melismas.at(i).at(jj));
+			token->setText(replacement);
 		}
+	}
 
-		label = token->substr(2);
-		index = (int)labels.size();
-		location = i-1;
-		if (startline.size() > 0) {
-			stopline.push_back(location);
+	infile.createLinesFromTokens();
+	m_humdrum_text << infile;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_textdur::printDurations --
+//
+
+void Tool_textdur::printDurations(HumdrumFile& infile) {
+	// replace text with duration data:
+	stringstream replacement;
+	for (int i=0; i<(int)m_syllables.size(); i++) {
+		// -1 on next line for *- placeholder at end of spine.
+		for (int j=0; j<(int)m_syllables.at(i).size() - 1; j++) {
+			HTp token = m_syllables.at(i).at(j);
+			int jj = token->getValueInt("auto", "index");
+			replacement << m_durations.at(i).at(jj);
+			token->setText(replacement.str());
+			replacement.str("");
 		}
-		labels.resize(index+1);
-		labels[index] = label;
-		startline.push_back(i);
 	}
 
-	// m_humdrum_text << "FOOTER = " << footer << endl;
-	// m_humdrum_text << "HEADER = " << header << endl;
-	// for (i=0; i<(int)labels.size(); i++) {
-	//    m_humdrum_text << "\t" << i << "\t=\t" << labels[i]
-	//         << "\t" << startline[i] << "\t" << stopline[i]
-	//         << endl;
-	// }
+	infile.createLinesFromTokens();
+	m_humdrum_text << infile;
+}
 
-	// now ready to copy the labeled segements into a final file.
 
 
-	// print header:
-	for (int i=0; i<=header; i++) {
-		HTp token = infile.token(i, 0);
-		if (*token == "*thru") {
-			continue;
+//////////////////////////////
+//
+// Tool_textdur::getTextSpineStarts --
+//
+
+void Tool_textdur::getTextSpineStarts(HumdrumFile& infile, vector<HTp>& starts) {
+	starts.clear();
+	vector<HTp> allSpineStarts;
+	infile.getSpineStartList(allSpineStarts);
+	for (int i=0; i<(int)allSpineStarts.size(); i++) {
+		HTp token = allSpineStarts.at(i);
+		if (*token == "**text") {
+			starts.push_back(token);
+			token->setValue("auto", "index", i);
+		} else if (*token == "**sylba") {
+			starts.push_back(token);
+			token->setValue("auto", "index", i);
 		}
+	}
 
-		if (!m_keepQ) {
-			if (infile[i].isInterpretation()) {
-				if (token->compare(0, 2, "*>") == 0) {
-					if (token->find('[') != string::npos) {
-						continue;
-					}
-				}
+	// Setup m_track2column
+	m_track2column.resize(infile.getMaxTrack() + 1);
+	fill(m_track2column.begin(), m_track2column.end(), -1);
+	for (int i=0; i<(int)starts.size(); i++) {
+		int track = starts[i]->getTrack();
+		m_track2column.at(track) = i;
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_textdur::processTextSpine --
+//
+
+void Tool_textdur::processTextSpine(vector<HTp>& starts, int index) {
+	HTp current = starts.at(index);
+	current->getNextToken();
+	while (current) {
+		if (!current->isData()) {
+			if (*current == "*-") {
+				// store data terminator (for calculating duration of last note):
+				current->setValue("auto", "index", to_string(m_syllables.at(index).size()));
+				m_syllables.at(index).push_back(current);
+				m_durations.at(index).push_back(-1000);
+				m_melismas.at(index).push_back(-1000);
+				break;
 			}
+			current = current->getNextToken();
+			continue;
 		}
 
-		m_humdrum_text << infile[i] << "\n";
-		if (token->compare(0, 2, "**") == 0) {
-			for (int j=0; j<infile[i].getFieldCount(); j++) {
-				m_humdrum_text << "*thru";
-				if (j < infile[i].getFieldCount() - 1) {
-					m_humdrum_text << "\t";
-				}
-			}
-			m_humdrum_text << "\n";
+		if (current->isNull()) {
+			current = current->getNextToken();
+			continue;
 		}
+
+		current->setValue("auto", "index", to_string(m_syllables.at(index).size()));
+		m_syllables.at(index).push_back(current);
+		m_durations.at(index).push_back(-1);        // store dummy duration
+		m_melismas.at(index).push_back(-1);         // store dummy melisma
+
+
+		current = current->getNextToken();
 	}
 
-	int start;
-	int stop;
-	for (int i=0; i<(int)labelsequence.size(); i++) {
-		index = getLabelIndex(labels, labelsequence[i]);
-		if (index < 0) {
-			m_humdrum_text << "!! THRU ERROR: label " << labelsequence[i]
-				  << " does not exist, skipping.\n";
-		}
-		start = startline[index];
-		stop  = stopline[index];
-		for (int j=start; j<=stop; j++) {
-			if (!m_keepQ) {
-				if (infile[j].isInterpretation()) {
-					HTp token = infile.token(j, 0);
-					if (token->compare(0, 2, "*>") == 0) {
-						if (token->find('[') != string::npos) {
-							continue;
-						}
-					}
-				}
+	for (int i=0; i<(int)m_syllables.size(); i++) {
+		for (int j=0; j<(int)m_syllables[i].size() - 1; j++) {
+			if (m_melismaQ) {
+				m_melismas.at(i).at(j) = getMelisma(m_syllables.at(i).at(j), m_syllables.at(i).at(j+1));
+			}
+			if (m_durationQ) {
+				m_durations.at(i).at(j) = getDuration(m_syllables.at(i).at(j), m_syllables.at(i).at(j+1));
 			}
-			m_humdrum_text << infile[j] << "\n";
 		}
 	}
+}
 
-	// print footer:
-	for (int i=footer; i<infile.getLineCount(); i++) {
-		if (!m_keepQ) {
-			if (infile[i].isInterpretation()) {
-				HTp token = infile.token(i, 0);
-				if (token->compare(0, 2, "*>") == 0) {
-					if (token->find('[') != string::npos) {
-						continue;
-					}
-				}
+
+
+//////////////////////////////
+//
+// Tool_textdur::getMelisma --  Not counting syllable starts on secondary tied notes.
+//
+
+int Tool_textdur::getMelisma(HTp tok1, HTp tok2) {
+	int stopIndex = tok2->getLineIndex();
+	HTp current = getTandemKernToken(tok1);
+	if (!current) {
+		return 0;
+	}
+	if (current->isNull()) {
+		cerr << "Strange case for syllable " << tok1 << " on line " << tok1->getLineNumber();
+		cerr << ", field " << tok1->getFieldNumber() <<" which does not start on a note" << endl;
+		return 0;
+	}
+	int cline = current->getLineIndex();
+	int counter = 0;
+	while (current && cline < stopIndex) {
+		if (!current->isData()) {
+			current = current->getNextToken();
+			if (current) {
+				cline = current->getLineIndex();
 			}
+			continue;
+		}
+		if (current->isNull()) {
+			current = current->getNextToken();
+			if (current) {
+				cline = current->getLineIndex();
+			}
+			continue;
+		}
+		if (current->isNoteAttack()) {
+			counter++;
+		}
+		current = current->getNextToken();
+		if (current) {
+			cline = current->getLineIndex();
 		}
-		m_humdrum_text << infile[i] << "\n";
 	}
 
+	return counter;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_thru::getLabelIndex --
+// Tool_textdur::getTandemKernToken --  Search to the left for the
+//    first **kern spine.  Returns NULL if none found.
 //
 
-int Tool_thru::getLabelIndex(vector<string>& labels, string& key) {
-	for (int i=0; i<(int)labels.size(); i++) {
-		if (key == labels[i]) {
-			return i;
-		}
+HTp Tool_textdur::getTandemKernToken(HTp token) {
+	HTp current = token->getPreviousFieldToken();
+	while (current && !current->isKern()) {
+		current = current->getPreviousFieldToken();
 	}
-	return -1;
+	return current;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_thru::getLabelSequence --
+// Tool_textdur::getDuration --  Not counting rests at end of first syllable.
 //
 
-void Tool_thru::getLabelSequence(vector<string>& labelsequence,
-		const string& astring) {
-	int slength = (int)astring.size();
-	char* sdata = new char[slength+1];
-	strcpy(sdata, astring.c_str());
-	const char* ignorecharacters = ", [] ";
-	int index;
+HumNum Tool_textdur::getDuration(HTp tok1, HTp tok2) {
+	int startIndex = tok1->getLineIndex();
+	HTp current = getTandemKernToken(tok2);
+	if (!current) {
+		return 0;
+	}
+	if (current->isNull()) {
+		cerr << "Strange case for syllable " << tok1 << " on line " << tok1->getLineNumber();
+		cerr << ", field " << tok1->getFieldNumber() <<" which does not start on a note" << endl;
+		return 0;
+	}
+	HTp lastNoteEnd = current;
+	current = current->getPreviousToken();
+	int cline = current->getLineIndex();
+	while (current && cline > startIndex) {
+		if (!current->isData()) {
+			current = current->getPreviousToken();
+			continue;
+		}
+		if (current->isNull()) {
+			current = current->getPreviousToken();
+			continue;
+		}
+		cline = current->getLineIndex();
+		if (!current->isRest()) {
+			break;
+		} else {
+			lastNoteEnd = current;
+		}
+		current = current->getPreviousToken();
+	}
 
-	char* strptr = strtok(sdata, ignorecharacters);
-	while (strptr != NULL) {
-		labelsequence.resize((int)labelsequence.size() + 1);
-		index = (int)labelsequence.size() - 1;
-		labelsequence[index] = strptr;
-		strptr = strtok(NULL, ignorecharacters);
+	if (!lastNoteEnd) {
+		return 0;
 	}
 
-	delete [] sdata;
+	HumNum duration = lastNoteEnd->getDurationFromStart() - tok1->getDurationFromStart();
+
+	return duration;
 }
 
 
 
 
+
 /////////////////////////////////
 //
-// Tool_tie::Tool_tie -- Set the recognized options for the tool.
+// Tool_thru::Tool_thru -- Set the recognized options for the tool.
 //
 
-Tool_tie::Tool_tie(void) {
-	define("s|split=b", "split overfill notes into tied notes across barlines.");
-	define("m|merge=b", "merge tied notes into a single note.");
-	define("p|printable=b", "merge tied notes only if single note is a printable note.");
-	define("M|mark=b", "Mark overfill notes.");
-	define("i|invisible=b", "Mark overfill barlines invisible.");
-	define("I|skip-invisible=b", "Skip invisible measures when splitting overfill durations.");
+Tool_thru::Tool_thru(void) {
+	define("v|variation=s:",   "Choose the expansion variation");
+	define("l|list=b:",        "Print list of labels in file");
+	define("k|keep=b:",        "Keep variation interpretations");
+	define("i|info=b:",        "Print info list of labels in file");
+	define("r|realization=s:", "Alternate relaization label sequence");
 }
 
 
-
 /////////////////////////////////
 //
-// Tool_tie::run -- Do the main work of the tool.
+// Tool_thru::run -- Do the main work of the tool.
 //
 
-bool Tool_tie::run(HumdrumFileSet& infiles) {
+bool Tool_thru::run(HumdrumFileSet& infiles) {
 	bool status = true;
 	for (int i=0; i<infiles.getCount(); i++) {
 		status &= run(infiles[i]);
@@ -114302,7 +117564,7 @@ bool Tool_tie::run(HumdrumFileSet& infiles) {
 }
 
 
-bool Tool_tie::run(const string& indata, ostream& out) {
+bool Tool_thru::run(const string& indata, ostream& out) {
 	HumdrumFile infile(indata);
 	bool status = run(infile);
 	if (hasAnyText()) {
@@ -114314,7 +117576,7 @@ bool Tool_tie::run(const string& indata, ostream& out) {
 }
 
 
-bool Tool_tie::run(HumdrumFile& infile, ostream& out) {
+bool Tool_thru::run(HumdrumFile& infile, ostream& out) {
 	bool status = run(infile);
 	if (hasAnyText()) {
 		getAllText(out);
@@ -114325,11 +117587,9 @@ bool Tool_tie::run(HumdrumFile& infile, ostream& out) {
 }
 
 
-bool Tool_tie::run(HumdrumFile& infile) {
+bool Tool_thru::run(HumdrumFile& infile) {
 	initialize();
 	processFile(infile);
-	infile.createLinesFromTokens();
-	m_humdrum_text << infile;
 	return true;
 }
 
@@ -114337,39 +117597,1843 @@ bool Tool_tie::run(HumdrumFile& infile) {
 
 //////////////////////////////
 //
-// Tool_tie::initialize --
+// Tool_thru::initialize --  Initializations that only have to be done once
+//    for all HumdrumFile segments.
 //
 
-void Tool_tie::initialize(void) {
-	m_printQ         = getBoolean("printable");
-	m_mergeQ         = getBoolean("merge");
-	m_splitQ         = getBoolean("split");
-	m_markQ          = getBoolean("mark");
-	m_invisibleQ     = getBoolean("invisible");
-	m_skipInvisibleQ = getBoolean("skip-invisible");
+void Tool_thru::initialize(void) {
+	m_variation   = getString("variation");
+	m_realization = getString("realization");
+	m_listQ       = getBoolean("list");
+	m_infoQ       = getBoolean("info");
+	m_keepQ       = getBoolean("keep");
 }
 
 
 
 //////////////////////////////
 //
-// Tool_tie::processFile --
+// Tool_thru::processFile --
 //
 
-void Tool_tie::processFile(HumdrumFile& infile) {
-	if (m_mergeQ) {
-		mergeTies(infile);
-	} else if (m_splitQ) {
-		splitOverfills(infile);
-	} else if (m_markQ) {
-		int count = markOverfills(infile);
-		if (count > 0) {
-			string rdfline = "!!!RDF**kern: ";
-			rdfline += m_mark;
-			rdfline += " = marked note, overfill (total: ";
-			rdfline += to_string(count);
-			rdfline += ")";
-			infile.appendLine(rdfline);
+void Tool_thru::processFile(HumdrumFile& infile) {
+	if (m_listQ) {
+		printLabelList(infile);
+		return;
+	} else if (m_infoQ) {
+		printLabelInfo(infile);
+		return;
+	}
+	processData(infile);
+
+	// analyze the input file according to command-line options
+	// infiles[i].printNonemptySegmentLabel(m_humdrum_text);
+}
+
+
+
+//////////////////////////////
+//
+// Tool_thru::printLabelList -- print a list of the thru labels.
+//
+
+void Tool_thru::printLabelList(HumdrumFile& infile) {
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isInterpretation()) {
+			continue;
+		}
+		HTp token = infile.token(i, 0);
+		if (token->compare(0, 2, "*>") != 0) {
+			continue;   // ignore non-labels
+		}
+		//if (token->find('[') != NULL) {
+		//   continue;   // ignore realizations
+		//}
+		m_humdrum_text << token->substr(2);
+		m_humdrum_text << '\n';
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_thru::printLabelInfo -- print a list of the thru labels.
+//
+
+void Tool_thru::printLabelInfo(HumdrumFile& infile) {
+	// infile.analyzeRhythm();
+	vector<int> labellines;
+	labellines.reserve(1000);
+
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isInterpretation()) {
+			continue;
+		}
+		HTp token = infile.token(i, 0);
+
+		if (token->compare(0, 2, "*>") != 0) {
+			continue;   // ignore non-labels
+		}
+		if (token->find('[') != string::npos) {
+			m_humdrum_text << "!!>";
+			m_humdrum_text << token->substr(2) << endl;
+			m_humdrum_text << '\n';
+			continue;   // ignore realizations
+		}
+		labellines.push_back(i);
+	}
+
+	vector<int> barlines(1000, -1);
+	for (int i=0; i<(int)labellines.size(); i++) {
+		barlines[i] = getBarline(infile, labellines[i]);
+	}
+
+	if (barlines.size() > 0) {
+		barlines[0] = adjustFirstBarline(infile);
+	}
+
+	int startline;
+	int endline;
+	HumNum startbeat;
+	HumNum endbeat;
+	HumNum duration;
+
+	m_humdrum_text << "**label\t**sline\t**eline\t**sbeat\t**ebeat\t**dur\t**bar\n";
+	for (int i=0; i<(int)labellines.size(); i++) {
+		startline = labellines[i];
+		if (i<(int)labellines.size()-1) {
+			endline = labellines[i+1]-1;
+		} else {
+			endline = infile.getLineCount() - 1;
+		}
+		startbeat = infile[startline].getDurationFromStart();
+		endbeat = infile[endline].getDurationFromStart();
+		duration = endbeat - startbeat;
+		duration = int(duration.getFloat() * 10000.0 + 0.5) / 10000.0;
+		HTp token = infile.token(startline, 0);
+		m_humdrum_text << token->substr(2);
+		m_humdrum_text << '\t';
+		m_humdrum_text << startline + 1;
+		m_humdrum_text << '\t';
+		m_humdrum_text << endline + 1;
+		m_humdrum_text << '\t';
+		m_humdrum_text << startbeat;
+		m_humdrum_text << '\t';
+		m_humdrum_text << endbeat;
+		m_humdrum_text << '\t';
+		m_humdrum_text << duration;
+		m_humdrum_text << '\t';
+		m_humdrum_text << barlines[i];
+		m_humdrum_text << '\n';
+
+	}
+	m_humdrum_text << "*-\t*-\t*-\t*-\t*-\t*-\t*-\n";
+
+}
+
+
+
+//////////////////////////////
+//
+// Tool_thru::adjustFirstBarline --
+//
+
+int Tool_thru::adjustFirstBarline(HumdrumFile& infile) {
+	int number = 0;
+	HumRegex hre;
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isBarline()) {
+			continue;
+		}
+		if (infile[i].getDurationFromStart() > 0) {
+			break;
+		}
+		HTp token = infile.token(i, 0);
+		if (hre.search(token, "=.*(\\d+)")) {
+			number = hre.getMatchInt(1);
+		}
+		break;
+	}
+	return number;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_thru::getBarline --
+//
+
+int Tool_thru::getBarline(HumdrumFile& infile, int line) {
+
+	if (infile[line].getDurationFromStart() == 0) {
+		return 0;
+	}
+
+	int missingcount = 0;
+	int number = -1;
+	HumRegex hre;
+	for (int i=line; i>0; i--) {
+		if (!infile[i].isBarline()) {
+			continue;
+		}
+		HTp token = infile.token(i, 0);
+
+		if (hre.search(token, "=.*(\\d+)")) {
+			number = hre.getMatchInt(1);
+			break;
+		} else {
+			missingcount++;
+		}
+		if (missingcount > 1) {
+			break;
+		}
+	}
+
+	return number;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_thru::processData --
+//
+
+void Tool_thru::processData(HumdrumFile& infile) {
+	vector<string> labelsequence;
+	labelsequence.reserve(1000);
+
+	vector<string> labels;
+	labels.reserve(1000);
+
+	vector<int> startline;
+	startline.reserve(1000);
+
+	vector<int> stopline;
+	stopline.reserve(1000);
+
+	int header = -1;
+	int footer = -1;
+	string labelsearch;
+	labelsearch = "*>";
+	labelsearch += m_variation;
+	labelsearch += "[";
+
+	// check for label to expand
+	int foundlabel = 0;
+	string tempseq;
+	if (m_realization.size()  == 0) {
+		for (int i=0; i<infile.getLineCount(); i++) {
+			if (!infile[i].isInterpretation()) {
+				continue;
+			}
+			HTp token = infile.token(i, 0);
+			if (token->compare(0, labelsearch.size(), labelsearch) != 0) {
+				continue;
+			}
+
+			tempseq = token->substr(labelsearch.size());
+			getLabelSequence(labelsequence, tempseq);
+			foundlabel = 1;
+			break;
+		}
+	} else {
+		foundlabel = 1;
+		getLabelSequence(labelsequence, m_realization);
+	}
+
+	if (foundlabel == 0) {
+		// did not find the label to expand, so echo the data back
+		for (int i=0; i<infile.getLineCount(); i++) {
+			HTp token = infile.token(i, 0);
+			if (*token == "*thru") {
+				continue;
+			}
+			m_humdrum_text << infile[i] << "\n";
+			if (token->compare(0, 2, "**") == 0) {
+				for (int j=0; j<infile[i].getFieldCount(); j++) {
+					m_humdrum_text << "*thru";
+					if (j < infile[i].getFieldCount() - 1) {
+						m_humdrum_text << "\t";
+					}
+				}
+				m_humdrum_text << "\n";
+			}
+		}
+		return;
+	}
+
+	// for (i=0; i<(int)labelsequence.size(); i++) {
+	//    m_humdrum_text << i+1 << "\t=\t" << labelsequence[i] << endl;
+	// }
+
+	// search for the labeled sections in the music
+	string label;
+	int location;
+	int index;
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isInterpretation()) {
+			continue;
+		}
+		HTp token = infile.token(i, 0);
+		if (*token == "*-") {
+			location = i-1;
+			footer = i;
+			stopline.push_back(location);
+		}
+		if (token->compare(0, 2, "*>") != 0) {
+			continue;
+		}
+		if (token->find('[') != string::npos) {
+			continue;
+		}
+		if (token->find(']') != string::npos) {
+			continue;
+		}
+
+		if (labels.size() == 0) {
+			header = i-1;
+		}
+
+		label = token->substr(2);
+		index = (int)labels.size();
+		location = i-1;
+		if (startline.size() > 0) {
+			stopline.push_back(location);
+		}
+		labels.resize(index+1);
+		labels[index] = label;
+		startline.push_back(i);
+	}
+
+	// m_humdrum_text << "FOOTER = " << footer << endl;
+	// m_humdrum_text << "HEADER = " << header << endl;
+	// for (i=0; i<(int)labels.size(); i++) {
+	//    m_humdrum_text << "\t" << i << "\t=\t" << labels[i]
+	//         << "\t" << startline[i] << "\t" << stopline[i]
+	//         << endl;
+	// }
+
+	// now ready to copy the labeled segements into a final file.
+
+
+	// print header:
+	for (int i=0; i<=header; i++) {
+		HTp token = infile.token(i, 0);
+		if (*token == "*thru") {
+			continue;
+		}
+
+		if (!m_keepQ) {
+			if (infile[i].isInterpretation()) {
+				if (token->compare(0, 2, "*>") == 0) {
+					if (token->find('[') != string::npos) {
+						continue;
+					}
+				}
+			}
+		}
+
+		m_humdrum_text << infile[i] << "\n";
+		if (token->compare(0, 2, "**") == 0) {
+			for (int j=0; j<infile[i].getFieldCount(); j++) {
+				m_humdrum_text << "*thru";
+				if (j < infile[i].getFieldCount() - 1) {
+					m_humdrum_text << "\t";
+				}
+			}
+			m_humdrum_text << "\n";
+		}
+	}
+
+	int start;
+	int stop;
+	for (int i=0; i<(int)labelsequence.size(); i++) {
+		index = getLabelIndex(labels, labelsequence[i]);
+		if (index < 0) {
+			m_humdrum_text << "!! THRU ERROR: label " << labelsequence[i]
+				  << " does not exist, skipping.\n";
+		}
+		start = startline[index];
+		stop  = stopline[index];
+		for (int j=start; j<=stop; j++) {
+			if (!m_keepQ) {
+				if (infile[j].isInterpretation()) {
+					HTp token = infile.token(j, 0);
+					if (token->compare(0, 2, "*>") == 0) {
+						if (token->find('[') != string::npos) {
+							continue;
+						}
+					}
+				}
+			}
+			m_humdrum_text << infile[j] << "\n";
+		}
+	}
+
+	// print footer:
+	for (int i=footer; i<infile.getLineCount(); i++) {
+		if (!m_keepQ) {
+			if (infile[i].isInterpretation()) {
+				HTp token = infile.token(i, 0);
+				if (token->compare(0, 2, "*>") == 0) {
+					if (token->find('[') != string::npos) {
+						continue;
+					}
+				}
+			}
+		}
+		m_humdrum_text << infile[i] << "\n";
+	}
+
+}
+
+
+
+//////////////////////////////
+//
+// Tool_thru::getLabelIndex --
+//
+
+int Tool_thru::getLabelIndex(vector<string>& labels, string& key) {
+	for (int i=0; i<(int)labels.size(); i++) {
+		if (key == labels[i]) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_thru::getLabelSequence --
+//
+
+void Tool_thru::getLabelSequence(vector<string>& labelsequence,
+		const string& astring) {
+	int slength = (int)astring.size();
+	char* sdata = new char[slength+1];
+	strcpy(sdata, astring.c_str());
+	const char* ignorecharacters = ", [] ";
+	int index;
+
+	char* strptr = strtok(sdata, ignorecharacters);
+	while (strptr != NULL) {
+		labelsequence.resize((int)labelsequence.size() + 1);
+		index = (int)labelsequence.size() - 1;
+		labelsequence[index] = strptr;
+		strptr = strtok(NULL, ignorecharacters);
+	}
+
+	delete [] sdata;
+}
+
+
+
+
+/////////////////////////////////
+//
+// Tool_tie::Tool_tie -- Set the recognized options for the tool.
+//
+
+Tool_tie::Tool_tie(void) {
+	define("s|split=b", "split overfill notes into tied notes across barlines.");
+	define("m|merge=b", "merge tied notes into a single note.");
+	define("p|printable=b", "merge tied notes only if single note is a printable note.");
+	define("M|mark=b", "Mark overfill notes.");
+	define("i|invisible=b", "Mark overfill barlines invisible.");
+	define("I|skip-invisible=b", "Skip invisible measures when splitting overfill durations.");
+}
+
+
+
+/////////////////////////////////
+//
+// Tool_tie::run -- Do the main work of the tool.
+//
+
+bool Tool_tie::run(HumdrumFileSet& infiles) {
+	bool status = true;
+	for (int i=0; i<infiles.getCount(); i++) {
+		status &= run(infiles[i]);
+	}
+	return status;
+}
+
+
+bool Tool_tie::run(const string& indata, ostream& out) {
+	HumdrumFile infile(indata);
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
+	}
+	return status;
+}
+
+
+bool Tool_tie::run(HumdrumFile& infile, ostream& out) {
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
+	}
+	return status;
+}
+
+
+bool Tool_tie::run(HumdrumFile& infile) {
+	initialize();
+	processFile(infile);
+	infile.createLinesFromTokens();
+	m_humdrum_text << infile;
+	return true;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_tie::initialize --
+//
+
+void Tool_tie::initialize(void) {
+	m_printQ         = getBoolean("printable");
+	m_mergeQ         = getBoolean("merge");
+	m_splitQ         = getBoolean("split");
+	m_markQ          = getBoolean("mark");
+	m_invisibleQ     = getBoolean("invisible");
+	m_skipInvisibleQ = getBoolean("skip-invisible");
+}
+
+
+
+//////////////////////////////
+//
+// Tool_tie::processFile --
+//
+
+void Tool_tie::processFile(HumdrumFile& infile) {
+	if (m_mergeQ) {
+		mergeTies(infile);
+	} else if (m_splitQ) {
+		splitOverfills(infile);
+	} else if (m_markQ) {
+		int count = markOverfills(infile);
+		if (count > 0) {
+			string rdfline = "!!!RDF**kern: ";
+			rdfline += m_mark;
+			rdfline += " = marked note, overfill (total: ";
+			rdfline += to_string(count);
+			rdfline += ")";
+			infile.appendLine(rdfline);
+		}
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_tie::splitOverfills -- Both notes and rests that extend
+//    past the end of the measure are split into two or more notes/rests,
+//    with the notes connected with ties.
+//
+
+void Tool_tie::splitOverfills(HumdrumFile& infile) {
+
+	for (int i=0; i<infile.getStrandCount(); i++) {
+		HTp stok = infile.getStrandStart(i);
+		if (!stok->isKern()) {
+			continue;
+		}
+		HTp etok = infile.getStrandEnd(i);
+		HTp tok = stok;
+		while (tok && (tok != etok)) {
+			if (!tok->isData()) {
+				tok = tok->getNextToken();
+				continue;
+			}
+			if (tok->isNull()) {
+				tok = tok->getNextToken();
+				continue;
+			}
+			bool overQ = checkForOverfill(tok);
+			if (overQ) {
+				splitToken(tok);
+			}
+			tok = tok->getNextToken();
+		}
+	}
+	infile.createLinesFromTokens();
+
+
+}
+
+
+
+//////////////////////////////
+//
+// Tool_tie::splitToken --
+//
+
+void Tool_tie::splitToken(HTp tok) {
+	HumNum duration = tok->getDuration();
+	HumNum toBarline = getDurationToNextBarline(tok);
+	HumNum newdur = toBarline;
+	duration = duration - toBarline;
+	string text = "[";
+	text += tok->getText();
+	HumRegex hre;
+	string recip = Convert::durationToRecip(newdur);
+	hre.replaceDestructive(text, recip, "\\d+(?:%\\d+)?\\.*", "g");
+	tok->setText(text);
+	carryForwardLeftoverDuration(duration, tok);
+}
+
+
+
+//////////////////////////////
+//
+// Tool_tie::carryForwardLeftoverDuration --
+//
+
+void Tool_tie::carryForwardLeftoverDuration(HumNum duration, HTp tok) {
+	if (duration <= 0) {
+		return;
+	}
+	HTp current = tok->getNextToken();
+	// find next barline:
+	while (current) {
+		if (current->isBarline()) {
+			if (m_skipInvisibleQ) {
+				if (current->find("-") == string::npos) {
+					break;
+				}
+			} else {
+				break;
+			}
+		}
+		current = current->getNextToken();
+	}
+	if (!current) {
+		// strange problem: no next barline
+		return;
+	}
+	if (!current->isBarline()) {
+		// strange problem that cannot happen
+		return;
+	}
+	HTp barline = current;
+	if (m_invisibleQ && (barline->find('-') != string::npos)) {
+		HumRegex hre;
+		string text = *barline;
+		hre.replaceDestructive(text, "", "-", "g");
+		barline->setText(text);
+	}
+	HumNum bardur = getDurationToNextBarline(current);
+
+	// find first null token after barline (that is not on a grace-note line)
+	// if the original note is an overfill note, there must be
+	// a null data token.
+	current = current->getNextToken();
+	bool foundQ = false;
+	while (current) {
+		if (current->isNull()) {
+			HLp line = current->getOwner();
+			if (!line) {
+				// strange error
+				return;
+			}
+			if (line->getDuration() > 0) {
+				// non-grace note null token to exit loop
+				foundQ = true;
+				break;
+			}
+		}
+		current = current->getNextToken();
+	}
+	if (!foundQ) {
+		// strange error
+		return;
+	}
+	if (!current->isNull()) {
+		// strange error
+		return;
+	}
+	HTp storage = current;
+	// get next note or barline after null token
+	current = current->getNextToken();
+	foundQ = 0;
+	while (current) {
+		if (current->isBarline()) {
+			if (m_skipInvisibleQ) {
+				if (current->find("-") == string::npos) {
+					foundQ = true;
+					break;
+				}
+			} else {
+				foundQ = true;
+				break;
+			}
+		}
+		if (current->isData()) {
+			if (!current->isNull()) {
+				foundQ = true;
+				break;
+			}
+		}
+		current = current->getNextToken();
+	}
+
+	if (!foundQ) {
+		// strange error
+		return;
+	}
+	HumNum barstart = barline->getDurationFromStart();
+	HumNum nextstart = current->getDurationFromStart();
+	HumNum available = nextstart - barstart;
+	if (duration < available) {
+		cerr << "DURATION " << duration << " IS LESS THAN AVAILABLE " << available << endl;
+		// strange error
+		return;
+	}
+
+	string text = *tok;
+	HumRegex hre;
+	hre.replaceDestructive(text, "", "[_[]", "g");
+	string recip = Convert::durationToRecip(available);
+	hre.replaceDestructive(text, recip, "\\d+(?:%\\d+)?\\.*", "g");
+
+	if (available == duration) {
+		// this is the last note in the tie group;
+		text += ']';
+		storage->setText(text);
+		return;
+	}
+
+	// There is some more space for the remaining duration, but not
+	// big enough for all of it.  Place the piece that can fit here
+	// and then kick the can down the road for the remainder.
+	text += '_';
+	storage->setText(text);
+	duration = duration - available;
+	carryForwardLeftoverDuration(duration, storage);
+}
+
+
+
+//////////////////////////////
+//
+// Tool_tie::mergeTies --
+//
+
+void Tool_tie::mergeTies(HumdrumFile& infile) {
+	// infile.analyzeKernTies();
+
+	for (int i=0; i<infile.getStrandCount(); i++) {
+		HTp stok = infile.getStrandStart(i);
+		if (!stok->isKern()) {
+			continue;
+		}
+		HTp etok = infile.getStrandEnd(i);
+		HTp tok = stok;
+		while (tok && (tok != etok)) {
+			if (!tok->isData()) {
+				tok = tok->getNextToken();
+				continue;
+			}
+			if (tok->isNull()) {
+				tok = tok->getNextToken();
+				continue;
+			}
+			if (tok->find('[') == string::npos) {
+				tok = tok->getNextToken();
+				continue;
+			}
+			mergeTie(tok);
+			tok = tok->getNextToken();
+		}
+	}
+	infile.createLinesFromTokens();
+
+}
+
+
+
+//////////////////////////////
+//
+// Tool_tie::mergeTie --
+//
+
+void Tool_tie::mergeTie(HTp token) {
+	if (token->find('[') == string::npos) {
+		return;
+	}
+
+	vector<HTp> tiednotes;
+
+	HumNum totaldur = token->getDuration();
+	HTp current = token->getNextToken();
+	while (current) {
+		if (!current->isData()) {
+			current = current->getNextToken();
+			continue;
+		}
+		if (current->isNull()) {
+			current = current->getNextToken();
+			continue;
+		}
+		bool isMiddle = current->find('_') != string::npos;
+		bool isEnd    = current->find(']') != string::npos;
+		if (!(isMiddle ^ isEnd)) {
+			// strange problem so don't merge any more notes
+			break;
+		}
+		tiednotes.push_back(current);
+		totaldur += current->getDuration();
+		if (isEnd) {
+			break;
+		}
+		current = current->getNextToken();
+	}
+
+	string recip = Convert::durationToRecip(totaldur);
+
+	// cerr << "TOTAL DURATION OF " << token << " IS " << totaldur <<  " RECIP " << recip << endl;
+
+	bool makeinvis = false;
+	if (m_invisibleQ) {
+		makeinvis = checkForInvisible(token);
+	}
+
+	for (int i=0; i<(int)tiednotes.size(); i++) {
+		if (m_invisibleQ) {
+			if (checkForInvisible(tiednotes[i])) {
+				markNextBarlineInvisible(tiednotes[i]);
+			}
+		}
+		tiednotes[i]->setText(".");
+	}
+	// set initial tied notes with updated recip.
+	string text = *token;
+	HumRegex hre;
+	hre.replaceDestructive(text, recip, "\\d+(?:%\\d+)?\\.*", "g");
+	hre.replaceDestructive(text, "", "\\[", "g");
+	token->setText(text);
+	if (makeinvis) {
+		markNextBarlineInvisible(token);
+	}
+
+}
+
+
+
+//////////////////////////////
+//
+// Tool_tie::markNextBarlineInvisible --  Multiple layers are not dealt with yet.
+//
+
+void Tool_tie::markNextBarlineInvisible(HTp tok) {
+	HTp current = tok;
+	while (current) {
+		if (!current->isBarline()) {
+			current = current->getNextToken();
+			continue;
+		}
+		if (current->find('-') != string::npos) {
+			// Already invisible
+			break;
+		}
+		string text = *current;
+		text += '-';
+		current->setText(text);
+		break;
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_tie::markOverfills --
+//
+
+int Tool_tie::markOverfills(HumdrumFile& infile) {
+	int counter = 0;
+
+	for (int i=0; i<infile.getStrandCount(); i++) {
+		HTp stok = infile.getStrandStart(i);
+		if (!stok->isKern()) {
+			continue;
+		}
+		HTp etok = infile.getStrandEnd(i);
+		HTp tok = stok;
+		while (tok && (tok != etok)) {
+			if (!tok->isData()) {
+				tok = tok->getNextToken();
+				continue;
+			}
+			if (tok->isNull()) {
+				tok = tok->getNextToken();
+				continue;
+			}
+			bool overQ = checkForOverfill(tok);
+			if (overQ) {
+				string text = *tok;
+				text += m_mark;
+				tok->setText(text);
+				counter++;
+			}
+
+			tok = tok->getNextToken();
+		}
+	}
+	return counter;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_tie::checkForInvisible --
+//
+
+bool Tool_tie::checkForInvisible(HTp tok) {
+	HumNum duration = tok->getDuration();
+	HumNum tobarline = tok->getDurationToBarline();
+	if ((tok->find('[') != string::npos) ||
+	   (tok->find('_') != string::npos)) {
+		if (duration >= tobarline) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	if (duration > tobarline) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_tie::checkForOverfill --
+//
+
+bool Tool_tie::checkForOverfill(HTp tok) {
+	HumNum duration = tok->getDuration();
+	HumNum tobarline = getDurationToNextBarline(tok);
+	if (duration > tobarline) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_tie::getDurationToNextVisibleBarline --
+//
+
+HumNum Tool_tie::getDurationToNextVisibleBarline(HTp tok) {
+	HTp current = tok;
+	HTp barline = NULL;
+	while (current) {
+		if (!current->isBarline()) {
+			current = current->getNextToken();
+			continue;
+		}
+		if (current->find("-") != string::npos) {
+			// invisible so skip this barline
+			current = current->getNextToken();
+			continue;
+		}
+		barline = current;
+		break;
+	}
+
+	if (!barline) {
+		return tok->getDurationToEnd();
+	}
+	HumNum startpos   = tok->getDurationFromStart();
+	HumNum endpos     = barline->getDurationFromStart();
+	HumNum difference = endpos - startpos;
+	return difference;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_tie::getDurationToNextBarline --
+//
+
+HumNum Tool_tie::getDurationToNextBarline(HTp tok) {
+	if (m_skipInvisibleQ) {
+		return getDurationToNextVisibleBarline(tok);
+	} else {
+		return tok->getDurationToBarline();
+	}
+}
+
+
+
+
+/////////////////////////////////
+//
+// Tool_timebase::Tool_timebase -- Set the recognized options for the tool.
+//
+
+Tool_timebase::Tool_timebase(void) {
+	define("g|grace=b",       "Keep grace notes");
+	define("m|min=b",         "Use minimum time in score for timebase");
+	define("t|timebase=s:16", "Timebase rhythm");
+	define("q|quiet=b",       "Quite mode: Do not output warnings");
+}
+
+
+
+///////////////////////////////
+//
+// Tool_timebase::run -- Primary interfaces to the tool.
+//
+
+bool Tool_timebase::run(HumdrumFileSet& infiles) {
+	bool status = true;
+	for (int i=0; i<infiles.getCount(); i++) {
+		status &= run(infiles[i]);
+	}
+	return status;
+}
+
+bool Tool_timebase::run(const string& indata, ostream& out) {
+	HumdrumFile infile(indata);
+	return run(infile, out);
+}
+
+
+bool Tool_timebase::run(HumdrumFile& infile, ostream& out) {
+	bool status = run(infile);
+	return status;
+}
+
+
+bool Tool_timebase::run(HumdrumFile& infile) {
+	processFile(infile);
+	return true;
+}
+
+
+
+///////////////////////////////
+//
+// Tool_timebase::processFile -- Adjust intervals of ornaments.
+//
+
+void Tool_timebase::processFile(HumdrumFile& infile) {
+	m_grace   = getBoolean("grace");
+	m_quiet   = getBoolean("quiet");
+	if (!getBoolean("timebase")) {
+		m_basedur = getMinimumTime(infile);
+	} else {
+		m_basedur = Convert::recipToDuration(getString("timebase"));
+	}
+	if (m_basedur == 0) {
+		// some problem so don't do anything (return input data)
+		return;
+	}
+	expandScore(infile, m_basedur);
+}
+
+
+//////////////////////////////
+//
+// Tool_timebase::expandScore --
+//
+
+void Tool_timebase::expandScore(HumdrumFile& infile, HumNum mindur) {
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isData()) {
+			m_humdrum_text << infile[i] << endl;
+			continue;
+		}
+		HumNum duration = infile[i].getDuration();
+		if (duration == 0) {
+			if (m_grace) {
+				m_humdrum_text << infile[i] << endl;
+			}
+			continue;
+		}
+		HumNum count = duration / mindur;
+		if (count < 1) {
+			if (!m_quiet) {
+				m_humdrum_text << "!!Warning: following commented line was too short to be included in timebase output:\n";
+				m_humdrum_text << "!! " << infile[i] << endl;
+			}
+			continue;
+		} else if (count.getDenominator() != 1) {
+			if (!m_quiet) {
+				m_humdrum_text << "!!Warning: next line does not have proper duration for representing with timebase: " << count.getFloat() << endl;
+			}
+		}
+		m_humdrum_text << infile[i] << endl;
+		int repeats = int(count.getFloat()) - 1;
+		for (int j=0; j<repeats; j++) {
+			for (int k=0; k<infile[i].getFieldCount(); k++) {
+				m_humdrum_text << ".";
+				if (k < infile[i].getFieldCount() - 1) {
+					m_humdrum_text << "\t";
+				}
+			}
+			m_humdrum_text << endl;
+		}
+	}
+	if (!m_quiet) {
+		HumNum rhythm = Convert::durationToRecip(mindur);
+		m_humdrum_text << "!!timebased: " << rhythm << endl;
+	}
+
+}
+
+
+
+
+///////////////////////////////
+//
+// Tool_timebase::getMinimumTime -- Get the minimum time unit
+//    in the file.  This is the smallest non-zero line duration.
+//
+
+HumNum Tool_timebase::getMinimumTime(HumdrumFile& infile) {
+	HumNum minimum(0, 1);
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isData()) {
+			continue;
+		}
+		HumNum duration = infile[i].getDuration();
+		if (minimum == 0) {
+			minimum = duration;
+			continue;
+		}
+		if (minimum > duration) {
+			minimum = duration;
+		}
+	}
+	// minimum is in units of quarter notes.
+	return minimum;
+}
+
+
+
+
+
+
+
+#define STYLE_CONCERT 0
+#define STYLE_WRITTEN 1
+
+/////////////////////////////////
+//
+// Tool_transpose::Tool_transpose -- Set the recognized options for the tool.
+//
+
+Tool_transpose::Tool_transpose(void) {
+	define("b|base40=i:0",    "the base-40 transposition value");
+	define("d|diatonic=i:0",  "the diatonic transposition value");
+	define("c|chromatic=i:0", "the chromatic transposition value");
+	define("o|octave=i:0",    "the octave addition to tranpose value");
+	define("t|transpose=s",   "musical interval transposition value");
+	define("k|settonic=s",    "transpose to the given key/tonic (mode will not change)");
+	define("auto=b",          "auto. trans. inst. parts to concert pitch");
+	define("debug=b",         "print debugging statements");
+	define("s|spines=s:",     "transpose only specified spines");
+	// quiet reversed with -T option (actively need to request transposition code now)
+	// define("q|quiet=b",       "suppress *Tr interpretations in output");
+	define("T|transcode=b",   "include transposition code to reverse transposition");
+	define("I|instrument=b",  "insert instrument code (*ITr) as well");
+	define("C|concert=b",     "transpose written score to concert pitch");
+	define("W|written=b",     "trans. concert pitch score to written score");
+	define("n|negate=b",      "negate transposition indications");
+	define("rotation=b",      "display transposition in half-steps");
+
+	define("author=b",   "author of program");
+	define("version=b",  "compilation info");
+	define("example=b",  "example usages");
+	define("help=b",     "short description");
+}
+
+
+
+/////////////////////////////////
+//
+// Tool_transpose::run -- Do the main work of the tool.
+//
+
+bool Tool_transpose::run(HumdrumFileSet& infiles) {
+	bool status = true;
+	for (int i=0; i<infiles.getCount(); i++) {
+		status &= run(infiles[i]);
+	}
+	return status;
+}
+
+
+bool Tool_transpose::run(const string& indata, ostream& out) {
+	HumdrumFile infile(indata);
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
+	}
+	return status;
+}
+
+
+bool Tool_transpose::run(HumdrumFile& infile, ostream& out) {
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
+	}
+	return status;
+}
+
+//
+// In-place processing of file:
+//
+
+bool Tool_transpose::run(HumdrumFile& infile) {
+	initialize(infile);
+
+	if (ssettonicQ) {
+		transval = calculateTranspositionFromKey(ssettonic, infile);
+		transval = transval + octave * 40;
+		if (debugQ) {
+			m_humdrum_text << "!!Key TRANSVAL = " << transval;
+		}
+	}
+
+	if (getBoolean("rotation")) {
+		// returns the base-12 pitch transposition for use in conjunction
+		// with the mkeyscape --rotate option
+		int value = 60 - Convert::base40ToMidiNoteNumber(162 - transval);
+		m_free_text << value << endl;
+		return false;
+	}
+
+	if (concertQ) {
+		convertScore(infile, STYLE_CONCERT);
+	} else if (writtenQ) {
+		convertScore(infile, STYLE_WRITTEN);
+	} else if (autoQ) {
+		doAutoTransposeAnalysis(infile);
+	} else {
+		vector<bool> spineprocess;
+		infile.makeBooleanTrackList(spineprocess, spinestring);
+		// filter out non-kern spines so they are not analyzed.
+		// but now also allowing for *mxhm spines (musicxml harmony)
+		for (int t=1; t<=infile.getMaxTrack(); t++) {
+			if (!(infile.getTrackStart(t)->isKern() ||
+					infile.getTrackStart(t)->isDataType("mxhm"))) {
+				spineprocess[t] = false;
+			}
+		}
+		processFile(infile, spineprocess);
+	}
+
+	return true;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_transpose::convertScore -- create a concert pitch score from
+//     a written pitch score.  The function will search for *Tr
+//     interpretations in spines, and convert them to *ITr interpretations
+//     as well as transposing notes, and transposing key signatures and
+//     key interpretations.  Or create a written score from a
+//     concert pitch score based on the style parameter.
+//
+
+void Tool_transpose::convertScore(HumdrumFile& infile, int style) {
+	// transposition values for each spine
+	vector<int> tvals(infile.getMaxTrack()+1, 0);
+
+	int ptrack;
+	int i, j;
+	for (i=0; i<infile.getLineCount(); i++) {
+		if (infile[i].isInterpretation()) {
+				// scan the line for transposition codes
+				// as well as key signatures and key markers
+				processInterpretationLine(infile, i, tvals, style);
+		} else if (infile[i].isData()) {
+			// transpose notes according to tvals data
+			for (j=0; j<infile[i].getFieldCount(); j++) {
+				if (!infile.token(i, j)->isKern()) {
+					m_humdrum_text << infile.token(i, j);
+					if (j < infile[i].getFieldCount() - 1) {
+					 		m_humdrum_text << "\t";
+					}
+					continue;
+				}
+				ptrack = infile.token(i, j)->getTrack();
+				if (tvals[ptrack] == 0) {
+					  m_humdrum_text << infile.token(i, j);
+				} else {
+					  printTransposedToken(infile, i, j, tvals[ptrack]);
+				}
+				if (j < infile[i].getFieldCount() - 1) {
+					  m_humdrum_text << "\t";
+				}
+			}
+			m_humdrum_text << "\n";
+		} else {
+			m_humdrum_text << infile[i] << "\n";
+		}
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_transpose::processInterpretationLine --  Used in converting between
+//   concert pitch and written pitch scores.  Has some duplicate code that
+//   is not used here.
+//
+
+void Tool_transpose::processInterpretationLine(HumdrumFile& infile, int line,
+	  vector<int>& tvals, int style) {
+
+	if (hasTrMarkers(infile, line)) {
+		switch (style) {
+			case STYLE_CONCERT:
+				convertToConcertPitches(infile, line, tvals);
+				break;
+			case STYLE_WRITTEN:
+				convertToWrittenPitches(infile, line, tvals);
+				break;
+			default: m_humdrum_text << infile[line];
+		}
+		m_humdrum_text << "\n";
+		return;
+	}
+
+	for (int j=0; j<infile[line].getFieldCount(); j++) {
+		int ptrack = infile.token(line, j)->getTrack();
+		if (ptrack < 0) {
+			cerr << "Track is negative on line " << (line+1) << ", spine " << (j+1) << endl;
+			return;
+		}
+
+		// check for *ITr or *Tr markers
+		// ignore *ITr markers when creating a Concert-pitch score
+		// ignore *Tr  markers when creating a Written-pitch score
+		HumRegex hre;
+		if (hre.search(infile.token(line, j), "^\\*k\\[([a-gA-G\\#-]*)\\]", "")) {
+			// transpose *k[] markers if necessary
+			if (tvals.at(ptrack) != 0) {
+				string value = hre.getMatch(1);
+				printNewKeySignature(value, tvals[ptrack]);
+			} else {
+				m_humdrum_text << infile.token(line, j);
+			}
+		} else if (isKeyMarker(*infile.token(line, j))) {
+			// transpose *C: markers and like if necessary
+			if (tvals[ptrack] != 0) {
+				printNewKeyInterpretation(infile[line], j, tvals[ptrack]);
+			} else if (transval != 0) {
+				// maybe not quite right for all possible cases
+				printNewKeyInterpretation(infile[line], j, transval);
+			} else {
+				m_humdrum_text << infile.token(line, j);
+			}
+		} else {
+			// other interpretations just echoed to output:
+			m_humdrum_text << infile.token(line, j);
+		}
+		if (j<infile[line].getFieldCount()-1) {
+			m_humdrum_text << "\t";
+		}
+	}
+	m_humdrum_text << "\n";
+
+}
+
+
+
+//////////////////////////////
+//
+// Tool_transpose::convertToWrittenPitches --
+//
+
+void Tool_transpose::convertToWrittenPitches(HumdrumFile& infile, int line,
+		vector<int>& tvals) {
+	HumRegex hre;
+	int j;
+	int base;
+	int ptrack;
+	for (j=0; j<infile[line].getFieldCount(); j++) {
+		if (!infile.token(line, j)->isKern()) {
+			m_humdrum_text << infile.token(line, j);
+			if (j < infile[line].getFieldCount() - 1) {
+				m_humdrum_text << "\t";
+			}
+			continue;
+		}
+		if (hre.search(infile.token(line, j), "^\\*ITrd[+-]?\\d+c[+-]?\\d+$", "")) {
+			base = Convert::transToBase40(*infile.token(line, j));
+
+			string output = "*Tr";
+			output += Convert::base40ToTrans(base);
+			m_humdrum_text << output;
+			ptrack = infile.token(line, j)->getTrack();
+			tvals[ptrack] = base;
+		} else {
+			m_humdrum_text << infile.token(line, j);
+		}
+		if (j < infile[line].getFieldCount() - 1) {
+			m_humdrum_text << "\t";
+		}
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_transpose::convertToConcertPitches --
+//
+
+void Tool_transpose::convertToConcertPitches(HumdrumFile& infile, int line, vector<int>& tvals) {
+	HumRegex hre;
+	int j;
+	int base;
+	int ptrack;
+	for (j=0; j<infile[line].getFieldCount(); j++) {
+		if (!infile.token(line, j)->isKern()) {
+			m_humdrum_text << infile.token(line, j);
+			if (j < infile[line].getFieldCount() - 1) {
+				m_humdrum_text << "\t";
+			}
+			continue;
+		}
+		if (hre.search(infile.token(line, j),
+				"^\\*Trd[+-]?\\d+c[+-]?\\d+$", "")) {
+			base = Convert::transToBase40(*infile.token(line, j));
+			string output = "*ITr";
+			output += Convert::base40ToTrans(base);
+			m_humdrum_text << output;
+			ptrack = infile.token(line, j)->getTrack();
+			tvals[ptrack] = -base;
+		} else {
+			m_humdrum_text << infile.token(line, j);
+		}
+		if (j < infile[line].getFieldCount() - 1) {
+			m_humdrum_text << "\t";
+		}
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_transpose::hasTrMarkers -- returns true if there are any tokens
+//    which start with *ITr or *Tr and contains c and d
+//    with numbers after each of them.
+//
+
+int Tool_transpose::hasTrMarkers(HumdrumFile& infile, int line) {
+	HumRegex hre;
+	int j;
+	for (j=0; j<infile[line].getFieldCount(); j++) {
+		if (!infile.token(line, j)->isKern()) {
+			continue;
+		}
+		if (hre.search(infile.token(line, j),
+				"^\\*I?Trd[+-]?\\d+c[+-]?\\d+$", "")) {
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_transpose::isKeyMarker -- returns true if the interpretation is
+//    a key description, such as *C: for C major, or *a:.
+//
+
+int Tool_transpose::isKeyMarker(const string& str) {
+	HumRegex hre;
+	return hre.search(str, "^\\*[a-g]?[\\#-]?:", "i");
+}
+
+
+
+//////////////////////////////
+//
+// Tool_transpose::printTransposedToken -- print a Humdrum token with the given
+//    base-40 transposition value applied.  Only **kern data is
+//    know now to transpose, other data types are currently not
+//    allowed to be transposed (but could be added here later).
+//
+
+void Tool_transpose::printTransposedToken(HumdrumFile& infile, int row, int col, int transval) {
+	if (!infile.token(row, col)->isKern()) {
+		// don't know how to transpose this type of data, so leave it as is
+		m_humdrum_text << infile.token(row, col);
+	} else {
+		printHumdrumKernToken(infile[row], col, transval);
+	}
+}
+
+
+
+//////////////////////////////
+//
+// Tool_transpose::calculateTranspositionFromKey --
+//
+
+int Tool_transpose::calculateTranspositionFromKey(int targetkey,
+		HumdrumFile& infile) {
+	HumRegex hre;
+	int base40 = 0;
+	int currentkey = 0;
+	int mode = 0;
+	int found = 0;
+
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (infile[i].isData()) {
+			// no initial key label was found, so don't transpose.
+			// in the future, maybe allow an automatic key analysis
+			// to be performed on the data if there is not explicit
+			// key designation.
+			return 0;
+		}
+		if (!infile[i].isInterpretation()) {
+			continue;
+		}
+		for (int j=0; j<infile[i].getFieldCount(); j++) {
+			if (!infile.token(i, j)->isKern()) {
+				continue;
+			}
+			if (!hre.search(infile.token(i, j), "^\\*([A-G][#-]?):", "i")) {
+				continue;
+			}
+
+			mode = 0;  // major key
+			if (islower(infile.token(i, j)->at(1))) {
+				mode = 1;  // minor key
+			}
+			base40 = Convert::kernToBase40(infile.token(i, j));
+			// base40 = base40 + transval;
+			base40 = base40 + 4000;
+			base40 = base40 % 40;
+			base40 = base40 + (3 + mode) * 40;
+			currentkey = base40;
+	 		found = 1;
+			break;
+		}
+		if (found) {
+			break;
+		}
+	}
+
+	int trans = (targetkey%40 - currentkey%40);
+	// base40 = targetkey + (3 + mode) * 40;
+	if (trans > 40) {
+		trans -= 40;
+	}
+	if (trans > 20) {
+		trans = 40 - trans;
+		trans = -trans;
+	}
+	if (trans < -40) {
+		trans += 40;
+	}
+	if (trans < -20) {
+		trans = -40 - trans;
+		trans = -trans;
+	}
+
+	return trans;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_transpose::printTransposeInformation -- collect and print *Tr interpretations
+//      at the start of the spine.  Looks for *Tr markers at the start
+//      of the file before any data.
+//
+
+void Tool_transpose::printTransposeInformation(HumdrumFile& infile,
+		vector<bool>& spineprocess, int line, int transval) {
+	int j;
+	int ptrack;
+
+	vector<int> startvalues(infile.getMaxTrack()+1);
+	vector<int> finalvalues(infile.getMaxTrack()+1);
+
+	for (j=0; j<infile[line].getFieldCount(); j++) {
+		if (!infile.token(line, j)->isKern()) {
+			continue;
+		}
+		ptrack = infile.token(line, j)->getTrack();
+		startvalues[ptrack] = getTransposeInfo(infile, line, j);
+		// m_humdrum_text << "Found transpose value " << startvalues[ptrack] << endl;
+	}
+
+	int entry = 0;
+	// check if any spine will be transposed after final processing
+	for (j=0; j<infile[line].getFieldCount(); j++) {
+		if (!infile.token(line, j)->isKern()) {
+			continue;
+		}
+		ptrack = infile.token(line, j)->getTrack();
+		if (spineprocess[ptrack]) {
+		finalvalues[ptrack] = transval;
+		if (!instrumentQ) {
+			finalvalues[ptrack] += startvalues[ptrack];
+		}
+		if (finalvalues[ptrack] != 0) {
+			entry = 1;
+		}
+	} else {
+			finalvalues[ptrack] = startvalues[ptrack];
+			if (finalvalues[ptrack] != 0) {
+				entry = 1;
+			}
+		}
+	}
+
+	if (!entry) {
+		return;
+	}
+
+	for (j=0; j<infile[line].getFieldCount(); j++) {
+		if (!infile.token(line, j)->isKern()) {
+			m_humdrum_text << "*";
+			if (j < infile[line].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+			continue;
+		}
+		ptrack = infile.token(line, j)->getTrack();
+		if (finalvalues[ptrack] == 0) {
+			m_humdrum_text << "*";
+		} else {
+			if (instrumentQ) {
+				m_humdrum_text << "*ITr";
+				m_humdrum_text << Convert::base40ToTrans(-finalvalues[ptrack]);
+			} else {
+				m_humdrum_text << "*Tr";
+				m_humdrum_text << Convert::base40ToTrans(finalvalues[ptrack]);
+			}
+		}
+		if (j < infile[line].getFieldCount()-1) {
+			m_humdrum_text << "\t";
+		}
+
+	}
+	m_humdrum_text << "\n";
+}
+
+
+
+//////////////////////////////
+//
+// getTransposeInfo -- returns the Transpose information found in
+//    the specified spine starting at the current line, and searching
+//    until data is found (or a *- record is found). Return value is a
+//    base-40 number.
+//
+
+int Tool_transpose::getTransposeInfo(HumdrumFile& infile, int row, int col) {
+	int track = infile.token(row, col)->getTrack();
+	int ptrack;
+	HumRegex hre;
+	int base;
+	int output = 0;
+
+	for (int i=row; i<infile.getLineCount(); i++) {
+		if (infile[i].isData()) {
+			break;
+		}
+		if (!infile[i].isInterpretation()) {
+			continue;
+		}
+		for (int j=0; j<infile[i].getFieldCount(); j++) {
+			if (!infile.token(i, j)->isKern()) {
+				continue;
+			}
+			ptrack = infile.token(i, j)->getTrack();
+			if (ptrack != track) {
+				continue;
+			}
+			if (hre.search(infile.token(i, j),
+					"^\\*Trd[+-]?\\d+c[+-]?\\d+$", "")) {
+				base = Convert::transToBase40(*infile.token(i, j));
+				output += base;
+				// erase the *Tr value because it will be printed elsewhere
+				infile.token(i, j)->setText("*XTr");
+				// ggg
+			}
+		}
+	}
+
+	return output;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_transpose::checkForDeletedLine -- check to see if a "*deletedTr
+//
+
+int Tool_transpose::checkForDeletedLine(HumdrumFile& infile, int line) {
+	int j;
+	if (!infile[line].isInterpretation()) {
+		return 0;
+	}
+
+	int present = 0;
+	int composite = 0;
+	for (j=0; j<infile[line].getFieldCount(); j++) {
+		if (!infile.token(line, j)->isKern()) {
+			continue;
+		}
+		if (infile.token(line, j)->find("deletedTr") != string::npos) {
+			present = 1;
+		} else if (infile.token(line, j)->isNull()) {
+			// do nothing: not composite
+		} else {
+			// not a *deletedTr token or a * token, so have to print line later
+			composite = 1;
+		}
+	}
+
+	if (present == 0) {
+		// no *deletedTr records found on the currnet line, so process normally
+		return 0;
+	}
+
+	if (composite == 0) {
+		// *deletedTr found, but no other important data found on line.
+		return 1;
+	}
+
+	// print non-deleted elements in line.
+	for (j=0; j<infile[line].getFieldCount(); j++) {;
+		if ((string)(*infile.token(line, j)) == "deletedTr") {
+			m_humdrum_text << "*";
+		} else {
+			m_humdrum_text << infile.token(line, j);
+		}
+		if (j < infile[line].getFieldCount() - 1) {
+			m_humdrum_text << "\t";
+		}
+	}
+	m_humdrum_text << "\n";
+
+	return 1;
+}
+
+
+
+//////////////////////////////
+//
+// Tool_transpose::processFile --
+//
+
+void Tool_transpose::processFile(HumdrumFile& infile,
+		vector<bool>& spineprocess) {
+	int i;
+	int diatonic;
+	int j;
+	HumRegex hre;
+	int interpstart = 0;
+
+	for (i=0; i<infile.getLineCount(); i++) {
+		if (!quietQ && (interpstart == 1)) {
+			interpstart = 2;
+			printTransposeInformation(infile, spineprocess, i, transval);
+		}
+		if (checkForDeletedLine(infile, i)) {
+			continue;
+		}
+
+		if (infile[i].isData()) {
+			printHumdrumDataRecord(infile[i], spineprocess);
+			m_humdrum_text << "\n";
+		} else if (infile[i].isInterpretation()) {
+			for (j=0; j<infile[i].getFieldCount(); j++) {
+
+				if (infile.token(i, j)->compare(0, 2, "**") == 0) {
+						interpstart = 1;
+				}
+
+				// check for key signature in a spine which is being
+				// transposed, and adjust it.
+				// Should also check tandem spines for updating
+				// key signatures in non-kern spines.
+				if (spineprocess[infile.token(i, j)->getTrack()] &&
+						hre.search(infile.token(i, j),
+							"^\\*k\\[([a-gA-G#-]*)\\]", "i")) {
+						string value = hre.getMatch(1);
+						printNewKeySignature(value, transval);
+						if (j<infile[i].getFieldCount()-1) {
+						m_humdrum_text << "\t";
+						}
+						continue;
+				}
+
+				// Check for key designations and tranpose
+				// if the spine data is being transposed.
+				// Should also check tandem spines for updating
+				// key designations in non-kern spines.
+				if (spineprocess[infile.token(i, j)->getTrack()] &&
+						hre.search(infile.token(i, j), "^\\*([A-G])[#-]?:", "i")) {
+					diatonic = tolower(hre.getMatch(1)[0]) - 'a';
+					if (diatonic >= 0 && diatonic <= 6) {
+					  	printNewKeyInterpretation(infile[i], j, transval);
+					  	if (j<infile[i].getFieldCount()-1) {
+							m_humdrum_text << "\t";
+					  	}
+					  	continue;
+					}
+				}
+				m_humdrum_text << infile.token(i, j);
+				if (j<infile[i].getFieldCount()-1) {
+					m_humdrum_text << "\t";
+				}
+			}
+			m_humdrum_text << "\n";
+
+		} else {
+			m_humdrum_text << infile[i] << "\n";
 		}
 	}
 }
@@ -114378,912 +119442,838 @@ void Tool_tie::processFile(HumdrumFile& infile) {
 
 //////////////////////////////
 //
-// Tool_tie::splitOverfills -- Both notes and rests that extend
-//    past the end of the measure are split into two or more notes/rests,
-//    with the notes connected with ties.
+// Tool_transpose::printNewKeySignature --
 //
 
-void Tool_tie::splitOverfills(HumdrumFile& infile) {
-
-	for (int i=0; i<infile.getStrandCount(); i++) {
-		HTp stok = infile.getStrandStart(i);
-		if (!stok->isKern()) {
-			continue;
-		}
-		HTp etok = infile.getStrandEnd(i);
-		HTp tok = stok;
-		while (tok && (tok != etok)) {
-			if (!tok->isData()) {
-				tok = tok->getNextToken();
-				continue;
-			}
-			if (tok->isNull()) {
-				tok = tok->getNextToken();
-				continue;
-			}
-			bool overQ = checkForOverfill(tok);
-			if (overQ) {
-				splitToken(tok);
-			}
-			tok = tok->getNextToken();
+void Tool_transpose::printNewKeySignature(const string& keysig, int trans) {
+	int counter = 0;
+	int len = (int)keysig.size();
+	for (int i=0; i<len; i++) {
+		switch(keysig[i]) {
+			case '-': counter--; break;
+			case '#': counter++; break;
 		}
 	}
-	infile.createLinesFromTokens();
-
 
+	int xxx = Convert::base40IntervalToLineOfFifths(trans);
+	int newkey = xxx + counter;
+	m_humdrum_text << Convert::keyNumberToKern(newkey);
 }
 
 
 
 //////////////////////////////
 //
-// Tool_tie::splitToken --
+// Tool_transpose::printNewKeyInterpretation --
 //
 
-void Tool_tie::splitToken(HTp tok) {
-	HumNum duration = tok->getDuration();
-	HumNum toBarline = getDurationToNextBarline(tok);
-	HumNum newdur = toBarline;
-	duration = duration - toBarline;
-	string text = "[";
-	text += tok->getText();
+void Tool_transpose::printNewKeyInterpretation(HumdrumLine& aRecord,
+		int index, int transval) {
+	int mode = 0;
+	if (islower(aRecord.token(index)->at(1))) {
+		mode = 1;
+	}
+	int base40 = Convert::kernToBase40(*aRecord.token(index));
+	currentkey = base40;
+	base40 = base40 + transval;
+	base40 = base40 + 4000;
+	base40 = base40 % 40;
+	base40 = base40 + (3 + mode) * 40;
+
+	m_humdrum_text << "*" << Convert::base40ToKern(base40) << ":";
+
 	HumRegex hre;
-	string recip = Convert::durationToRecip(newdur);
-	hre.replaceDestructive(text, recip, "\\d+(?:%\\d+)?\\.*", "g");
-	tok->setText(text);
-	carryForwardLeftoverDuration(duration, tok);
+	string tvalue = *aRecord.token(index);
+	if (hre.search(tvalue, ":(.+)$", "")) {
+		string value = hre.getMatch(1);
+		m_humdrum_text << value;
+	}
 }
 
 
 
 //////////////////////////////
 //
-// Tool_tie::carryForwardLeftoverDuration --
+// Tool_transpose::printHumdrumDataRecord --
 //
 
-void Tool_tie::carryForwardLeftoverDuration(HumNum duration, HTp tok) {
-	if (duration <= 0) {
-		return;
-	}
-	HTp current = tok->getNextToken();
-	// find next barline:
-	while (current) {
-		if (current->isBarline()) {
-			if (m_skipInvisibleQ) {
-				if (current->find("-") == string::npos) {
-					break;
-				}
-			} else {
-				break;
-			}
-		}
-		current = current->getNextToken();
-	}
-	if (!current) {
-		// strange problem: no next barline
-		return;
-	}
-	if (!current->isBarline()) {
-		// strange problem that cannot happen
-		return;
-	}
-	HTp barline = current;
-	if (m_invisibleQ && (barline->find('-') != string::npos)) {
-		HumRegex hre;
-		string text = *barline;
-		hre.replaceDestructive(text, "", "-", "g");
-		barline->setText(text);
-	}
-	HumNum bardur = getDurationToNextBarline(current);
-
-	// find first null token after barline (that is not on a grace-note line)
-	// if the original note is an overfill note, there must be
-	// a null data token.
-	current = current->getNextToken();
-	bool foundQ = false;
-	while (current) {
-		if (current->isNull()) {
-			HLp line = current->getOwner();
-			if (!line) {
-				// strange error
-				return;
-			}
-			if (line->getDuration() > 0) {
-				// non-grace note null token to exit loop
-				foundQ = true;
-				break;
-			}
-		}
-		current = current->getNextToken();
-	}
-	if (!foundQ) {
-		// strange error
-		return;
-	}
-	if (!current->isNull()) {
-		// strange error
-		return;
-	}
-	HTp storage = current;
-	// get next note or barline after null token
-	current = current->getNextToken();
-	foundQ = 0;
-	while (current) {
-		if (current->isBarline()) {
-			if (m_skipInvisibleQ) {
-				if (current->find("-") == string::npos) {
-					foundQ = true;
-					break;
-				}
-			} else {
-				foundQ = true;
-				break;
+void Tool_transpose::printHumdrumDataRecord(HumdrumLine& record,
+		vector<bool>& spineprocess) {
+	int i;
+	for (i=0; i<record.getFieldCount(); i++) {
+		if (!(record.token(i)->isKern() ||
+				record.token(i)->isDataType("mxhm"))) {
+			// don't try to transpose non-kern and non-mxhm spines
+			m_humdrum_text << record.token(i);
+			if (i<record.getFieldCount()-1) {
+				m_humdrum_text << "\t";
 			}
+			continue;
 		}
-		if (current->isData()) {
-			if (!current->isNull()) {
-				foundQ = true;
-				break;
+		if (!spineprocess[record.token(i)->getTrack()]) {
+			// don't try to transpose spines which were not indicated.
+			m_humdrum_text << record.token(i);
+			if (i<record.getFieldCount()-1) {
+				m_humdrum_text << "\t";
 			}
+			continue;
 		}
-		current = current->getNextToken();
-	}
-
-	if (!foundQ) {
-		// strange error
-		return;
-	}
-	HumNum barstart = barline->getDurationFromStart();
-	HumNum nextstart = current->getDurationFromStart();
-	HumNum available = nextstart - barstart;
-	if (duration < available) {
-		cerr << "DURATION " << duration << " IS LESS THAN AVAILABLE " << available << endl;
-		// strange error
-		return;
-	}
 
-	string text = *tok;
-	HumRegex hre;
-	hre.replaceDestructive(text, "", "[_[]", "g");
-	string recip = Convert::durationToRecip(available);
-	hre.replaceDestructive(text, recip, "\\d+(?:%\\d+)?\\.*", "g");
+		if (record.token(i)->isKern()) {
+			printHumdrumKernToken(record, i, transval);
+		} else if (record.token(i)->isDataType("mxhm")) {
+			printHumdrumMxhmToken(record, i, transval);
+		} else {
+			m_humdrum_text << record.token(i);
+		}
 
-	if (available == duration) {
-		// this is the last note in the tie group;
-		text += ']';
-		storage->setText(text);
-		return;
+		if (i<record.getFieldCount()-1) {
+			m_humdrum_text << "\t";
+		}
+		continue;
 	}
 
-	// There is some more space for the remaining duration, but not
-	// big enough for all of it.  Place the piece that can fit here
-	// and then kick the can down the road for the remainder.
-	text += '_';
-	storage->setText(text);
-	duration = duration - available;
-	carryForwardLeftoverDuration(duration, storage);
 }
 
 
 
 //////////////////////////////
 //
-// Tool_tie::mergeTies --
+// Tool_transpose::printHumdrumKernToken --
 //
 
-void Tool_tie::mergeTies(HumdrumFile& infile) {
-	// infile.analyzeKernTies();
-
-	for (int i=0; i<infile.getStrandCount(); i++) {
-		HTp stok = infile.getStrandStart(i);
-		if (!stok->isKern()) {
-			continue;
-		}
-		HTp etok = infile.getStrandEnd(i);
-		HTp tok = stok;
-		while (tok && (tok != etok)) {
-			if (!tok->isData()) {
-				tok = tok->getNextToken();
-				continue;
-			}
-			if (tok->isNull()) {
-				tok = tok->getNextToken();
-				continue;
-			}
-			if (tok->find('[') == string::npos) {
-				tok = tok->getNextToken();
-				continue;
-			}
-			mergeTie(tok);
-			tok = tok->getNextToken();
+void Tool_transpose::printHumdrumKernToken(HumdrumLine& record, int index,
+		int transval) {
+	if (record.token(index)->isNull()) {
+		// null record element (no pitch).
+		m_humdrum_text << record.token(index);
+		return;
+	}
+	if (!record.token(index)->isKern()) {
+		m_humdrum_text << record.token(index);
+		return;
+	}
+	string buffer;
+	int tokencount = record.token(index)->getSubtokenCount();
+	for (int k=0; k<tokencount; k++) {
+		buffer = record.token(index)->getSubtoken(k);
+		printNewKernString(buffer, transval);
+		if (k<tokencount-1) {
+			m_humdrum_text << " ";
 		}
 	}
-	infile.createLinesFromTokens();
-
 }
 
 
 
 //////////////////////////////
 //
-// Tool_tie::mergeTie --
+// Tool_transpose::printHumdrumMxhmToken --
 //
 
-void Tool_tie::mergeTie(HTp token) {
-	if (token->find('[') == string::npos) {
+void Tool_transpose::printHumdrumMxhmToken(HumdrumLine& record, int index,
+		int transval) {
+	if (record.token(index)->isNull()) {
+		// null record element (nothing to do)
+		m_humdrum_text << record.token(index);
+		return;
+	}
+	if (!record.token(index)->isDataType("mxhm")) {
+		m_humdrum_text << record.token(index);
+		return;
+	}
+	HumRegex hre;
+	if (hre.search(record.token(index), "N\\.C\\.")) {
+		// no pitch information so just echo the text:
+		m_humdrum_text << record.token(index);
+	} else if (hre.search(record.token(index), "([A-Ga-g]+[n#-]{0,2})")) {
+		string pitch = hre.getMatch(1);
+		int b40 = Convert::kernToBase40(pitch) + transval;
+cerr << "B40 = " << b40 << "\t" << pitch << endl;
+		b40 = b40 % 40 + 120;
+		pitch = Convert::base40ToKern(b40);
+		string newtext = *record.token(index);
+		hre.replaceDestructive(newtext, pitch, "([A-Ga-g]+[n#-]{0,2})");
+		m_humdrum_text << newtext;
+	} else {
+		m_humdrum_text << record.token(index);
 		return;
 	}
+}
 
-	vector<HTp> tiednotes;
 
-	HumNum totaldur = token->getDuration();
-	HTp current = token->getNextToken();
-	while (current) {
-		if (!current->isData()) {
-			current = current->getNextToken();
-			continue;
-		}
-		if (current->isNull()) {
-			current = current->getNextToken();
-			continue;
-		}
-		bool isMiddle = current->find('_') != string::npos;
-		bool isEnd    = current->find(']') != string::npos;
-		if (!(isMiddle ^ isEnd)) {
-			// strange problem so don't merge any more notes
-			break;
-		}
-		tiednotes.push_back(current);
-		totaldur += current->getDuration();
-		if (isEnd) {
-			break;
-		}
-		current = current->getNextToken();
-	}
 
-	string recip = Convert::durationToRecip(totaldur);
 
-	// cerr << "TOTAL DURATION OF " << token << " IS " << totaldur <<  " RECIP " << recip << endl;
+//////////////////////////////
+//
+// Tool_transpose::printNewKernString --
+//
 
-	bool makeinvis = false;
-	if (m_invisibleQ) {
-		makeinvis = checkForInvisible(token);
-	}
+void Tool_transpose::printNewKernString(const string& input, int transval) {
 
-	for (int i=0; i<(int)tiednotes.size(); i++) {
-		if (m_invisibleQ) {
-			if (checkForInvisible(tiednotes[i])) {
-				markNextBarlineInvisible(tiednotes[i]);
-			}
-		}
-		tiednotes[i]->setText(".");
-	}
-	// set initial tied notes with updated recip.
-	string text = *token;
 	HumRegex hre;
-	hre.replaceDestructive(text, recip, "\\d+(?:%\\d+)?\\.*", "g");
-	hre.replaceDestructive(text, "", "\\[", "g");
-	token->setText(text);
-	if (makeinvis) {
-		markNextBarlineInvisible(token);
+	if (input == ".") {
+		// Don't transpose null tokens.
+		m_humdrum_text << input;
+		return;
+	} else if (input.rfind('R') != string::npos) {
+		// Don't transpose unpitched notes (percussion parts).
+		m_humdrum_text << input;
+		return;
+	} else if (input.rfind('r') != string::npos) {
+		// Transpose rests only if they contain a pitch component.
+		string output = input;
+		if (hre.search(input, "([A-Ga-g]+[#n-]*)")) {
+			// Transpose pitch portion of rest (indicating vertical position).
+			string pitch = hre.getMatch(1);
+			int base40 = Convert::kernToBase40(pitch);
+cerr << "XPITCH " << pitch << "\tbase40 = " << base40 << endl;
+			string newpitch = Convert::base40ToKern(base40 + transval);
+cerr << "\tNEWPITCH " << pitch << endl;
+			hre.replaceDestructive(newpitch, "", "[-#n]+");
+			hre.replaceDestructive(output, newpitch, "([A-Ga-g]+[#n-]*)");
+		}
+		// don't transpose rests...
+		m_humdrum_text << output;
+		return;
+	} else if (!hre.search(input, "([A-Ga-g]+[#n-]*)")) {
+		// This is a form of invisible rest with no "r", just **recip.
+		m_humdrum_text << input;
+		return;
 	}
 
+	// Now the only thing left are regular pitches.
+
+	int base40 = Convert::kernToBase40(input);
+	string newpitch = Convert::base40ToKern(base40 + transval);
+
+	// consider interaction of #X -X n interaction vs. nX.
+	string output;
+	if (hre.search(input, "([A-Ga-g#n-]+)")) {
+		string oldpitch = hre.getMatch(1);
+		output = hre.replaceCopy(input, newpitch, oldpitch);
+	}
+	m_humdrum_text << output;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_tie::markNextBarlineInvisible --  Multiple layers are not dealt with yet.
+// Tool_transpose::getBase40ValueFromInterval -- note: only ninth interval range allowed
 //
 
-void Tool_tie::markNextBarlineInvisible(HTp tok) {
-	HTp current = tok;
-	while (current) {
-		if (!current->isBarline()) {
-			current = current->getNextToken();
-			continue;
-		}
-		if (current->find('-') != string::npos) {
-			// Already invisible
-			break;
-		}
-		string text = *current;
-		text += '-';
-		current->setText(text);
-		break;
+int Tool_transpose::getBase40ValueFromInterval(const string& interval) {
+	int sign = 1;
+	if (interval.find('-') != string::npos) {
+		sign = -1;
 	}
-}
 
+	string icopy = interval;
+	for (int i=0; i<(int)icopy.size(); i++) {
+		if (icopy[i] == 'p') { icopy[i] = 'P'; }
+		if (icopy[i] == 'a') { icopy[i] = 'A'; }
+		if (icopy[i] == 'D') { icopy[i] = 'd'; }
+	}
 
+	int output = 0;
 
-//////////////////////////////
-//
-// Tool_tie::markOverfills --
-//
+	if (icopy.find("dd1") != string::npos)      { output = -2; }
+	else if (icopy.find("d1") != string::npos)  { output = -1; }
+	else if (icopy.find("P1") != string::npos)  { output =  0; }
+	else if (icopy.find("AA1") != string::npos) { output =  2; }
+	else if (icopy.find("A1") != string::npos)  { output =  1; }
 
-int Tool_tie::markOverfills(HumdrumFile& infile) {
-	int counter = 0;
+	else if (icopy.find("dd2") != string::npos) { output =  3; }
+	else if (icopy.find("d2") != string::npos)  { output =  4; }
+	else if (icopy.find("m2") != string::npos)  { output =  5; }
+	else if (icopy.find("M2") != string::npos)  { output =  6; }
+	else if (icopy.find("AA2") != string::npos) { output =  8; }
+	else if (icopy.find("A2") != string::npos)  { output =  7; }
 
-	for (int i=0; i<infile.getStrandCount(); i++) {
-		HTp stok = infile.getStrandStart(i);
-		if (!stok->isKern()) {
-			continue;
-		}
-		HTp etok = infile.getStrandEnd(i);
-		HTp tok = stok;
-		while (tok && (tok != etok)) {
-			if (!tok->isData()) {
-				tok = tok->getNextToken();
-				continue;
-			}
-			if (tok->isNull()) {
-				tok = tok->getNextToken();
-				continue;
-			}
-			bool overQ = checkForOverfill(tok);
-			if (overQ) {
-				string text = *tok;
-				text += m_mark;
-				tok->setText(text);
-				counter++;
-			}
+	else if (icopy.find("dd3") != string::npos) { output =  9; }
+	else if (icopy.find("d3") != string::npos)  { output = 10; }
+	else if (icopy.find("m3") != string::npos)  { output = 11; }
+	else if (icopy.find("M3") != string::npos)  { output = 12; }
+	else if (icopy.find("AA3") != string::npos) { output = 14; }
+	else if (icopy.find("A3") != string::npos)  { output = 13; }
 
-			tok = tok->getNextToken();
-		}
-	}
-	return counter;
-}
+	else if (icopy.find("dd4") != string::npos) { output = 15; }
+	else if (icopy.find("d4") != string::npos)  { output = 16; }
+	else if (icopy.find("P4") != string::npos)  { output = 17; }
+	else if (icopy.find("AA4") != string::npos) { output = 19; }
+	else if (icopy.find("A4") != string::npos)  { output = 18; }
 
+	else if (icopy.find("dd5") != string::npos) { output = 21; }
+	else if (icopy.find("d5") != string::npos)  { output = 22; }
+	else if (icopy.find("P5") != string::npos)  { output = 23; }
+	else if (icopy.find("AA5") != string::npos) { output = 25; }
+	else if (icopy.find("A5") != string::npos)  { output = 24; }
 
+	else if (icopy.find("dd6") != string::npos) { output = 26; }
+	else if (icopy.find("d6") != string::npos)  { output = 27; }
+	else if (icopy.find("m6") != string::npos)  { output = 28; }
+	else if (icopy.find("M6") != string::npos)  { output = 29; }
+	else if (icopy.find("AA6") != string::npos) { output = 31; }
+	else if (icopy.find("A6") != string::npos)  { output = 30; }
 
-//////////////////////////////
-//
-// Tool_tie::checkForInvisible --
-//
+	else if (icopy.find("dd7") != string::npos) { output = 32; }
+	else if (icopy.find("d7") != string::npos)  { output = 33; }
+	else if (icopy.find("m7") != string::npos)  { output = 34; }
+	else if (icopy.find("M7") != string::npos)  { output = 35; }
+	else if (icopy.find("AA7") != string::npos) { output = 37; }
+	else if (icopy.find("A7") != string::npos)  { output = 36; }
 
-bool Tool_tie::checkForInvisible(HTp tok) {
-	HumNum duration = tok->getDuration();
-	HumNum tobarline = tok->getDurationToBarline();
-	if ((tok->find('[') != string::npos) ||
-	   (tok->find('_') != string::npos)) {
-		if (duration >= tobarline) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-	if (duration > tobarline) {
-		return true;
-	} else {
-		return false;
-	}
+	else if (icopy.find("dd8") != string::npos) { output = 38; }
+	else if (icopy.find("d8") != string::npos)  { output = 39; }
+	else if (icopy.find("P8") != string::npos)  { output = 40; }
+	else if (icopy.find("AA8") != string::npos) { output = 42; }
+	else if (icopy.find("A8") != string::npos)  { output = 41; }
+
+	else if (icopy.find("dd9") != string::npos) { output = 43; }
+	else if (icopy.find("d9") != string::npos)  { output = 44; }
+	else if (icopy.find("m9") != string::npos)  { output = 45; }
+	else if (icopy.find("M9") != string::npos)  { output = 46; }
+	else if (icopy.find("AA9") != string::npos) { output = 48; }
+	else if (icopy.find("A9") != string::npos)  { output = 47; }
+
+	return output * sign;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_tie::checkForOverfill --
+// Tool_transpose::example --
 //
 
-bool Tool_tie::checkForOverfill(HTp tok) {
-	HumNum duration = tok->getDuration();
-	HumNum tobarline = getDurationToNextBarline(tok);
-	if (duration > tobarline) {
-		return true;
-	} else {
-		return false;
-	}
+void Tool_transpose::example(void) {
+
+
 }
 
 
 
 //////////////////////////////
 //
-// Tool_tie::getDurationToNextVisibleBarline --
+// Tool_transpose::usage --
 //
 
-HumNum Tool_tie::getDurationToNextVisibleBarline(HTp tok) {
-	HTp current = tok;
-	HTp barline = NULL;
-	while (current) {
-		if (!current->isBarline()) {
-			current = current->getNextToken();
-			continue;
-		}
-		if (current->find("-") != string::npos) {
-			// invisible so skip this barline
-			current = current->getNextToken();
-			continue;
-		}
-		barline = current;
-		break;
-	}
+void Tool_transpose::usage(const string& command) {
 
-	if (!barline) {
-		return tok->getDurationToEnd();
-	}
-	HumNum startpos   = tok->getDurationFromStart();
-	HumNum endpos     = barline->getDurationFromStart();
-	HumNum difference = endpos - startpos;
-	return difference;
 }
 
 
 
-//////////////////////////////
+///////////////////////////////////////////////////////////////////////////
 //
-// Tool_tie::getDurationToNextBarline --
+// Automatic transposition functions
 //
 
-HumNum Tool_tie::getDurationToNextBarline(HTp tok) {
-	if (m_skipInvisibleQ) {
-		return getDurationToNextVisibleBarline(tok);
-	} else {
-		return tok->getDurationToBarline();
-	}
-}
 
+//////////////////////////////
+//
+// Tool_transpose::doAutoTransposeAnalysis --
+//
 
+void Tool_transpose::doAutoTransposeAnalysis(HumdrumFile& infile) {
+	vector<int> ktracks(infile.getMaxTrack()+1, 0);
 
+	vector<HTp> tracks;
+	infile.getTrackStartList(tracks);
+	int i;
+	for (i=0; i<(int)tracks.size(); i++) {
+		if (tracks[i]->isKern()) {
+			ktracks[i] = tracks[i]->getTrack();
+		} else {
+			ktracks[i] = 0;
+		}
+	}
 
-/////////////////////////////////
-//
-// Tool_timebase::Tool_timebase -- Set the recognized options for the tool.
-//
+	int segments = int(infile.getScoreDuration().getFloat()+0.5);
+	if (segments < 1) {
+		segments = 1;
+	}
 
-Tool_timebase::Tool_timebase(void) {
-	define("g|grace=b",       "Keep grace notes");
-	define("m|min=b",         "Use minimum time in score for timebase");
-	define("t|timebase=s:16", "Timebase rhythm");
-	define("q|quiet=b",       "Quite mode: Do not output warnings");
-}
+	vector<vector<vector<double> > > trackhist;
+	trackhist.resize(ktracks.size());
 
+	for (i=1; i<(int)trackhist.size(); i++) {
+		if (ktracks[i]) {
+			storeHistogramForTrack(trackhist[i], infile, i, segments);
+		}
+	}
 
+	if (debugQ) {
+		m_free_text << "Segment pitch histograms: " << endl;
+		printHistograms(segments, ktracks, trackhist);
+	}
 
-///////////////////////////////
-//
-// Tool_timebase::run -- Primary interfaces to the tool.
-//
+	int level = 16;
+	int hop   = 8;
+	int count = segments / hop;
 
-bool Tool_timebase::run(HumdrumFileSet& infiles) {
-	bool status = true;
-	for (int i=0; i<infiles.getCount(); i++) {
-		status &= run(infiles[i]);
+	if (segments < count * level / (double)hop) {
+		level = level / 2;
+		hop   = hop / 2;
+	}
+	if (segments < count * level / (double)hop) {
+		count = count / 2;
 	}
-	return status;
-}
 
-bool Tool_timebase::run(const string& indata, ostream& out) {
-	HumdrumFile infile(indata);
-	return run(infile, out);
-}
+	if (segments < count * level / (double)hop) {
+		level = level / 2;
+		hop   = hop / 2;
+	}
+	if (segments < count * level / (double)hop) {
+		count = count / 2;
+	}
 
+	vector<vector<vector<double> > > analysis;
 
-bool Tool_timebase::run(HumdrumFile& infile, ostream& out) {
-	bool status = run(infile);
-	return status;
-}
+	doAutoKeyAnalysis(analysis, level, hop, count, segments, ktracks, trackhist);
 
+	// print analyses raw results
 
-bool Tool_timebase::run(HumdrumFile& infile) {
-	processFile(infile);
-	return true;
+	m_free_text << "Raw key analysis by track:" << endl;
+	printRawTrackAnalysis(analysis, ktracks);
+
+	doTranspositionAnalysis(analysis);
 }
 
 
 
-///////////////////////////////
+//////////////////////////////
 //
-// Tool_timebase::processFile -- Adjust intervals of ornaments.
+// Tool_transpose::doTranspositionAnalysis --
 //
 
-void Tool_timebase::processFile(HumdrumFile& infile) {
-	m_grace   = getBoolean("grace");
-	m_quiet   = getBoolean("quiet");
-	if (!getBoolean("timebase")) {
-		m_basedur = getMinimumTime(infile);
-	} else {
-		m_basedur = Convert::recipToDuration(getString("timebase"));
-	}
-	if (m_basedur == 0) {
-		// some problem so don't do anything (return input data)
-		return;
+void Tool_transpose::doTranspositionAnalysis(vector<vector<vector<double> > >& analysis) {
+	int i, j, k;
+	int value1;
+	int value2;
+	int value;
+
+	for (i=0; i<1; i++) {
+		for (j=2; j<3; j++) {
+			for (k=0; k<(int)analysis[i].size(); k++) {
+				if (analysis[i][k][24] >= 0 && analysis[j][k][24] >= 0) {
+					value1 = (int)analysis[i][k][25];
+	 				if (value1 >= 12) {
+						  value1 = value1 - 12;
+					}
+					value2 = (int)analysis[j][k][25];
+	 				if (value2 >= 12) {
+						  value2 = value2 - 12;
+					}
+					value = value1 - value2;
+					if (value < 0) {
+						  value = value + 12;
+					}
+					if (value > 6) {
+						  value = 12 - value;
+					}
+					m_free_text << value << endl;
+				}
+			}
+		}
 	}
-	expandScore(infile, m_basedur);
 }
 
 
+
 //////////////////////////////
 //
-// Tool_timebase::expandScore --
+// Tool_transpose::printRawTrackAnalysis --
 //
 
-void Tool_timebase::expandScore(HumdrumFile& infile, HumNum mindur) {
-	for (int i=0; i<infile.getLineCount(); i++) {
-		if (!infile[i].isData()) {
-			m_humdrum_text << infile[i] << endl;
-			continue;
-		}
-		HumNum duration = infile[i].getDuration();
-		if (duration == 0) {
-			if (m_grace) {
-				m_humdrum_text << infile[i] << endl;
-			}
-			continue;
-		}
-		HumNum count = duration / mindur;
-		if (count < 1) {
-			if (!m_quiet) {
-				m_humdrum_text << "!!Warning: following commented line was too short to be included in timebase output:\n";
-				m_humdrum_text << "!! " << infile[i] << endl;
-			}
-			continue;
-		} else if (count.getDenominator() != 1) {
-			if (!m_quiet) {
-				m_humdrum_text << "!!Warning: next line does not have proper duration for representing with timebase: " << count.getFloat() << endl;
+void Tool_transpose::printRawTrackAnalysis(vector<vector<vector<double> > >& analysis,
+		vector<int>& ktracks) {
+
+	int i, j;
+	int value;
+	int value2;
+
+	for (i=0; i<(int)analysis[0].size(); i++) {
+		m_free_text << "Frame\t" << i << ":";
+		for (j=0; j<(int)analysis.size(); j++) {
+			m_free_text << "\t";
+	 		value = (int)analysis[j][i][24];
+	 		if (value >= 12) {
+				value = value - 12;
 			}
-		}
-		m_humdrum_text << infile[i] << endl;
-		int repeats = int(count.getFloat()) - 1;
-		for (int j=0; j<repeats; j++) {
-			for (int k=0; k<infile[i].getFieldCount(); k++) {
-				m_humdrum_text << ".";
-				if (k < infile[i].getFieldCount() - 1) {
-					m_humdrum_text << "\t";
-				}
+	 		value2 = (int)analysis[j][i][25];
+	 		if (value2 >= 12) {
+				value2 = value2 - 12;
 			}
-			m_humdrum_text << endl;
+			m_free_text << value;
+	 		// if (value != value2) {
+	 		//    m_free_text << "," << value2;
+			// }
 		}
+		m_free_text << "\n";
 	}
-	if (!m_quiet) {
-		HumNum rhythm = Convert::durationToRecip(mindur);
-		m_humdrum_text << "!!timebased: " << rhythm << endl;
-	}
-
 }
 
 
 
-
-///////////////////////////////
+//////////////////////////////
 //
-// Tool_timebase::getMinimumTime -- Get the minimum time unit
-//    in the file.  This is the smallest non-zero line duration.
+// doAutoKeyAnalysis --
 //
 
-HumNum Tool_timebase::getMinimumTime(HumdrumFile& infile) {
-	HumNum minimum(0, 1);
-	for (int i=0; i<infile.getLineCount(); i++) {
-		if (!infile[i].isData()) {
-			continue;
+void Tool_transpose::doAutoKeyAnalysis(vector<vector<vector<double> > >& analysis, int level,
+		int hop, int count, int segments, vector<int>& ktracks,
+		vector<vector<vector<double> > >& trackhist) {
+
+	vector<double> majorweights;
+	vector<double> minorweights;
+	fillWeightsWithKostkaPayne(majorweights, minorweights);
+
+	int size = 0;
+	int i;
+	for (i=1; i<(int)ktracks.size(); i++) {
+		if (ktracks[i]) {
+			size++;
 		}
-		HumNum duration = infile[i].getDuration();
-		if (minimum == 0) {
-			minimum = duration;
+	}
+
+	analysis.resize(size);
+	for (i=0; i<(int)analysis.size(); i++) {
+		analysis[i].reserve(count);
+	}
+
+	int aindex = 0;
+	for (i=1; i<(int)ktracks.size(); i++) {
+		if (!ktracks[i]) {
 			continue;
 		}
-		if (minimum > duration) {
-			minimum = duration;
-		}
+		doTrackKeyAnalysis(analysis[aindex++], level, hop, count,
+				trackhist[i], majorweights, minorweights);
 	}
-	// minimum is in units of quarter notes.
-	return minimum;
 }
 
 
 
+//////////////////////////////
+//
+// Tool_transpose::doTrackKeyAnalysis -- Do individual key analyses of sections of the
+//   given track.
+//
 
+void Tool_transpose::doTrackKeyAnalysis(vector<vector<double> >& analysis, int level, int hop,
+		int count, vector<vector<double> >& trackhist,
+		vector<double>& majorweights, vector<double>& minorweights) {
 
+	int i;
+	for (i=0; i<count; i++) {
+		if (i * hop + level > (int)trackhist.size()) {
+			break;
+		}
+		analysis.resize(i+1);
+		doSingleAnalysis(analysis[analysis.size()-1], i*hop+level, level,
+				trackhist, majorweights, minorweights);
+	}
+}
 
 
-#define STYLE_CONCERT 0
-#define STYLE_WRITTEN 1
 
-/////////////////////////////////
+//////////////////////////////
 //
-// Tool_transpose::Tool_transpose -- Set the recognized options for the tool.
+// Tool_transpose::doSingleAnalysis --
 //
 
-Tool_transpose::Tool_transpose(void) {
-	define("b|base40=i:0",    "the base-40 transposition value");
-	define("d|diatonic=i:0",  "the diatonic transposition value");
-	define("c|chromatic=i:0", "the chromatic transposition value");
-	define("o|octave=i:0",    "the octave addition to tranpose value");
-	define("t|transpose=s",   "musical interval transposition value");
-	define("k|settonic=s",    "transpose to the given key/tonic (mode will not change)");
-	define("auto=b",          "auto. trans. inst. parts to concert pitch");
-	define("debug=b",         "print debugging statements");
-	define("s|spines=s:",     "transpose only specified spines");
-	// quiet reversed with -T option (actively need to request transposition code now)
-	// define("q|quiet=b",       "suppress *Tr interpretations in output");
-	define("T|transcode=b",   "include transposition code to reverse transposition");
-	define("I|instrument=b",  "insert instrument code (*ITr) as well");
-	define("C|concert=b",     "transpose written score to concert pitch");
-	define("W|written=b",     "trans. concert pitch score to written score");
-	define("n|negate=b",      "negate transposition indications");
-	define("rotation=b",      "display transposition in half-steps");
+void Tool_transpose::doSingleAnalysis(vector<double>& analysis, int startindex, int length,
+		vector<vector<double> >& trackhist, vector<double>& majorweights,
+		vector<double>& minorweights) {
+	vector<double> histsum(12, 0);
 
-	define("author=b",   "author of program");
-	define("version=b",  "compilation info");
-	define("example=b",  "example usages");
-	define("help=b",     "short description");
+	for (int i=0; (i<length) && (startindex+i+length<(int)trackhist.size()); i++) {
+		for (int k=0; k<12; k++) {
+			histsum[k] += trackhist[i+startindex][k];
+		}
+	}
+
+	identifyKey(analysis, histsum, majorweights, minorweights);
 }
 
 
 
-/////////////////////////////////
+///////////////////////////////
 //
-// Tool_transpose::run -- Do the main work of the tool.
+// Tool_transpose::fillWeightsWithKostkaPayne --
 //
 
-bool Tool_transpose::run(HumdrumFileSet& infiles) {
-	bool status = true;
-	for (int i=0; i<infiles.getCount(); i++) {
-		status &= run(infiles[i]);
-	}
-	return status;
-}
-
+void Tool_transpose::fillWeightsWithKostkaPayne(vector<double>& maj, vector<double>& min) {
+	maj.resize(12);
+	min.resize(12);
 
-bool Tool_transpose::run(const string& indata, ostream& out) {
-	HumdrumFile infile(indata);
-	bool status = run(infile);
-	if (hasAnyText()) {
-		getAllText(out);
-	} else {
-		out << infile;
-	}
-	return status;
+	// found in David Temperley: Music and Probability 2006
+	maj[0]  = 0.748;	// C major weights
+	maj[1]  = 0.060;	// C#
+	maj[2]  = 0.488;	// D
+	maj[3]  = 0.082;	// D#
+	maj[4]  = 0.670;	// E
+	maj[5]  = 0.460;	// F
+	maj[6]  = 0.096;	// F#
+	maj[7]  = 0.715;	// G
+	maj[8]  = 0.104;	// G#
+	maj[9]  = 0.366;	// A
+	maj[10] = 0.057;	// A#
+	maj[11] = 0.400;	// B
+	min[0]  = 0.712;	// c minor weights
+	min[1]  = 0.084;	// c#
+	min[2]  = 0.474;	// d
+	min[3]  = 0.618;	// d#
+	min[4]  = 0.049;	// e
+	min[5]  = 0.460;	// f
+	min[6]  = 0.105;	// f#
+	min[7]  = 0.747;	// g
+	min[8]  = 0.404;	// g#
+	min[9]  = 0.067;	// a
+	min[10] = 0.133;	// a#
+	min[11] = 0.330;	// b
 }
 
 
-bool Tool_transpose::run(HumdrumFile& infile, ostream& out) {
-	bool status = run(infile);
-	if (hasAnyText()) {
-		getAllText(out);
-	} else {
-		out << infile;
-	}
-	return status;
-}
 
+////////////////////////////////////////
 //
-// In-place processing of file:
+// identifyKey -- correls contains the 12 major key correlation
+//      values, then the 12 minor key correlation values, then two
+//      more values: index=24 is the best key, and index=25 is the
+//      second best key.  If [24] or [25] is -1, then that means that
+//      all entries in the original histogram were zero (all rests).
 //
 
-bool Tool_transpose::run(HumdrumFile& infile) {
-	initialize(infile);
+void Tool_transpose::identifyKey(vector<double>& correls,
+		vector<double>& histogram, vector<double>& majorweights,
+		vector<double>& minorweights) {
 
-	if (ssettonicQ) {
-		transval = calculateTranspositionFromKey(ssettonic, infile);
-		transval = transval + octave * 40;
-		if (debugQ) {
-			m_humdrum_text << "!!Key TRANSVAL = " << transval;
+	correls.clear();
+	correls.reserve(26);
+
+	double testsum = 0.0;
+	for (int i=0; i<12; i++) {
+		testsum += histogram[i];
+	}
+	if (testsum == 0.0) {
+		correls.resize(26);
+		fill(correls.begin(), correls.end(), -1);
+		correls[24] = -1;
+		correls[25] = -1;
+		return;
+	}
+
+	vector<double> majorcorrels;
+	vector<double> minorcorrels;
+	for (int i=0; i<12; i++) {
+		majorcorrels[i] = Convert::pearsonCorrelation(majorweights, histogram);
+		minorcorrels[i] = Convert::pearsonCorrelation(minorweights, histogram);
+	}
+
+	// find max value
+	int besti;
+	int majorbesti = 0;
+	int minorbesti = 0;
+	for (int i=1; i<12; i++) {
+		if (majorcorrels[i] > majorcorrels[majorbesti]) {
+			majorbesti = i;
+		}
+		if (minorcorrels[i] > minorcorrels[minorbesti]) {
+			minorbesti = i;
 		}
 	}
+	besti = majorbesti;
+	if (majorcorrels[majorbesti] < minorcorrels[minorbesti]) {
+		besti = minorbesti + 12;
+	}
 
-	if (getBoolean("rotation")) {
-		// returns the base-12 pitch transposition for use in conjunction
-		// with the mkeyscape --rotate option
-		int value = 60 - Convert::base40ToMidiNoteNumber(162 - transval);
-		m_free_text << value << endl;
-		return false;
+	// find second best major key
+	int majorsecondbesti = 0;
+	if (majorbesti == 0) {
+		majorsecondbesti = 1;
+	}
+	for (int i=1; i<12; i++) {
+		if (i == majorbesti) {
+			continue;
+		}
+		if (majorcorrels[i] > majorcorrels[majorsecondbesti]) {
+			majorsecondbesti = i;
+		}
 	}
 
-	if (concertQ) {
-		convertScore(infile, STYLE_CONCERT);
-	} else if (writtenQ) {
-		convertScore(infile, STYLE_WRITTEN);
-	} else if (autoQ) {
-		doAutoTransposeAnalysis(infile);
-	} else {
-		vector<bool> spineprocess;
-		infile.makeBooleanTrackList(spineprocess, spinestring);
-		// filter out non-kern spines so they are not analyzed.
-		// but now also allowing for *mxhm spines (musicxml harmony)
-		for (int t=1; t<=infile.getMaxTrack(); t++) {
-			if (!(infile.getTrackStart(t)->isKern() ||
-					infile.getTrackStart(t)->isDataType("mxhm"))) {
-				spineprocess[t] = false;
-			}
+	// find second best minor key
+	int minorsecondbesti = 0;
+	if (minorbesti == 0) {
+		minorsecondbesti = 1;
+	}
+	for (int i=1; i<12; i++) {
+		if (i == minorbesti) {
+			continue;
+		}
+		if (minorcorrels[i] > minorcorrels[minorsecondbesti]) {
+			minorsecondbesti = i;
 		}
-		processFile(infile, spineprocess);
 	}
 
-	return true;
+	int secondbesti = majorsecondbesti;
+	if (majorcorrels[majorsecondbesti] < minorcorrels[minorsecondbesti]) {
+		secondbesti = minorsecondbesti;
+	}
+	secondbesti += 12;
+
+	correls = majorcorrels;
+	correls.insert(correls.end(), minorcorrels.begin(), minorcorrels.end());
+	correls.push_back(besti);
+	correls.push_back(secondbesti);
 }
 
 
 
 //////////////////////////////
 //
-// Tool_transpose::convertScore -- create a concert pitch score from
-//     a written pitch score.  The function will search for *Tr
-//     interpretations in spines, and convert them to *ITr interpretations
-//     as well as transposing notes, and transposing key signatures and
-//     key interpretations.  Or create a written score from a
-//     concert pitch score based on the style parameter.
+// Tool_transpose::printHistograms --
 //
 
-void Tool_transpose::convertScore(HumdrumFile& infile, int style) {
-	// transposition values for each spine
-	vector<int> tvals(infile.getMaxTrack()+1, 0);
+void Tool_transpose::printHistograms(int segments, vector<int> ktracks,
+vector<vector<vector<double> > >& trackhist) {
+	int i, j, k;
+	int start;
 
-	int ptrack;
-	int i, j;
-	for (i=0; i<infile.getLineCount(); i++) {
-		if (infile[i].isInterpretation()) {
-				// scan the line for transposition codes
-				// as well as key signatures and key markers
-				processInterpretationLine(infile, i, tvals, style);
-		} else if (infile[i].isData()) {
-			// transpose notes according to tvals data
-			for (j=0; j<infile[i].getFieldCount(); j++) {
-				if (!infile.token(i, j)->isKern()) {
-					m_humdrum_text << infile.token(i, j);
-					if (j < infile[i].getFieldCount() - 1) {
-					 		m_humdrum_text << "\t";
-					}
+	for (i=0; i<segments; i++) {
+//m_free_text << "i=" << i << endl;
+		m_free_text << "segment " << i
+				<< " ==========================================\n";
+		for (j=0; j<12; j++) {
+			start = 0;
+//m_free_text << "j=" << i << endl;
+			for (k=1; k<(int)ktracks.size(); k++) {
+//m_free_text << "k=" << i << endl;
+				if (!ktracks[k]) {
 					continue;
 				}
-				ptrack = infile.token(i, j)->getTrack();
-				if (tvals[ptrack] == 0) {
-					  m_humdrum_text << infile.token(i, j);
-				} else {
-					  printTransposedToken(infile, i, j, tvals[ptrack]);
-				}
-				if (j < infile[i].getFieldCount() - 1) {
-					  m_humdrum_text << "\t";
+				if (!start) {
+					m_free_text << j;
+					start = 1;
 				}
+				m_free_text << "\t";
+				m_free_text << trackhist[k][i][j];
+			}
+	 if (start) {
+				m_free_text << "\n";
 			}
-			m_humdrum_text << "\n";
-		} else {
-			m_humdrum_text << infile[i] << "\n";
 		}
 	}
+	m_free_text << "==========================================\n";
 }
 
 
 
 //////////////////////////////
 //
-// Tool_transpose::processInterpretationLine --  Used in converting between
-//   concert pitch and written pitch scores.  Has some duplicate code that
-//   is not used here.
+// Tool_transpose::storeHistogramForTrack --
 //
 
-void Tool_transpose::processInterpretationLine(HumdrumFile& infile, int line,
-	  vector<int>& tvals, int style) {
+double Tool_transpose::storeHistogramForTrack(vector<vector<double> >& histogram,
+		HumdrumFile& infile, int track, int segments) {
 
-	if (hasTrMarkers(infile, line)) {
-		switch (style) {
-			case STYLE_CONCERT:
-				convertToConcertPitches(infile, line, tvals);
-				break;
-			case STYLE_WRITTEN:
-				convertToWrittenPitches(infile, line, tvals);
-				break;
-			default: m_humdrum_text << infile[line];
-		}
-		m_humdrum_text << "\n";
-		return;
+	histogram.clear();
+	histogram.reserve(segments);
+
+	int i;
+	int j;
+	int k;
+
+	for (i=0; i<(int)histogram.size(); i++) {
+		histogram[i].resize(12);
+		fill(histogram[i].begin(), histogram[i].end(), 0);
 	}
 
-	for (int j=0; j<infile[line].getFieldCount(); j++) {
-		int ptrack = infile.token(line, j)->getTrack();
-		if (ptrack < 0) {
-			cerr << "Track is negative on line " << (line+1) << ", spine " << (j+1) << endl;
-			return;
-		}
+	double totalduration = infile.getScoreDuration().getFloat();
 
-		// check for *ITr or *Tr markers
-		// ignore *ITr markers when creating a Concert-pitch score
-		// ignore *Tr  markers when creating a Written-pitch score
-		HumRegex hre;
-		if (hre.search(infile.token(line, j), "^\\*k\\[([a-gA-G\\#-]*)\\]", "")) {
-			// transpose *k[] markers if necessary
-			if (tvals.at(ptrack) != 0) {
-				string value = hre.getMatch(1);
-				printNewKeySignature(value, tvals[ptrack]);
-			} else {
-				m_humdrum_text << infile.token(line, j);
+	double duration;
+	string buffer;
+	int pitch;
+	double start;
+	int tokencount;
+	for (i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isData()) {
+			continue;
+		}
+		start = infile[i].getDurationFromStart().getFloat();
+		for (j=0; j<infile[i].getFieldCount(); j++) {
+			if (!infile.token(i, j)->isKern()) {
+				continue;
 			}
-		} else if (isKeyMarker(*infile.token(line, j))) {
-			// transpose *C: markers and like if necessary
-			if (tvals[ptrack] != 0) {
-				printNewKeyInterpretation(infile[line], j, tvals[ptrack]);
-			} else if (transval != 0) {
-				// maybe not quite right for all possible cases
-				printNewKeyInterpretation(infile[line], j, transval);
-			} else {
-				m_humdrum_text << infile.token(line, j);
+	 		if (infile.token(i, j)->getTrack() != track) {
+				continue;
+			}
+			if (!infile.token(i, j)->isKern()) {
+				continue;
+			}
+			if (!infile.token(i, j)->isNull()) {
+				continue;
+			}
+			tokencount = infile.token(i, j)->getSubtokenCount();
+			for (k=0; k<tokencount; k++) {
+				buffer = *infile.token(j, k);
+				if (buffer == ".") {
+					continue;  // ignore illegal inline null tokens
+				}
+				pitch = Convert::kernToMidiNoteNumber(buffer);
+				if (pitch < 0) {
+					continue;  // ignore rests or strange objects
+				}
+				pitch = pitch % 12;  // convert to chromatic pitch-class
+				duration = Convert::recipToDuration(buffer).getFloat();
+				if (duration <= 0.0) {
+					continue;   // ignore grace notes and strange objects
+				}
+				addToHistogramDouble(histogram, pitch,
+						  start, duration, totalduration, segments);
 			}
-		} else {
-			// other interpretations just echoed to output:
-			m_humdrum_text << infile.token(line, j);
-		}
-		if (j<infile[line].getFieldCount()-1) {
-			m_humdrum_text << "\t";
 		}
 	}
-	m_humdrum_text << "\n";
 
+	return totalduration;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_transpose::convertToWrittenPitches --
+// Tool_transpose::addToHistogramDouble -- fill the pitch histogram in the right spots.
 //
 
-void Tool_transpose::convertToWrittenPitches(HumdrumFile& infile, int line,
-		vector<int>& tvals) {
-	HumRegex hre;
-	int j;
-	int base;
-	int ptrack;
-	for (j=0; j<infile[line].getFieldCount(); j++) {
-		if (!infile.token(line, j)->isKern()) {
-			m_humdrum_text << infile.token(line, j);
-			if (j < infile[line].getFieldCount() - 1) {
-				m_humdrum_text << "\t";
-			}
-			continue;
-		}
-		if (hre.search(infile.token(line, j), "^\\*ITrd[+-]?\\d+c[+-]?\\d+$", "")) {
-			base = Convert::transToBase40(*infile.token(line, j));
+void Tool_transpose::addToHistogramDouble(vector<vector<double> >& histogram, int pc,
+		double start, double dur, double tdur, int segments) {
 
-			string output = "*Tr";
-			output += Convert::base40ToTrans(base);
-			m_humdrum_text << output;
-			ptrack = infile.token(line, j)->getTrack();
-			tvals[ptrack] = base;
-		} else {
-			m_humdrum_text << infile.token(line, j);
-		}
-		if (j < infile[line].getFieldCount() - 1) {
-			m_humdrum_text << "\t";
-		}
-	}
-}
+	pc = (pc + 12) % 12;
 
+	double startseg = start / tdur * segments;
+	double startfrac = startseg - (int)startseg;
 
+	double segdur = dur / tdur * segments;
 
-//////////////////////////////
-//
-// Tool_transpose::convertToConcertPitches --
-//
+	if (segdur <= 1.0 - startfrac) {
+		histogram[(int)startseg][pc] += segdur;
+		return;
+	} else if (1.0 - startfrac > 0.0) {
+		histogram[(int)startseg][pc] += (1.0 - startfrac);
+		segdur -= (1.0 - startfrac);
+	}
 
-void Tool_transpose::convertToConcertPitches(HumdrumFile& infile, int line, vector<int>& tvals) {
-	HumRegex hre;
-	int j;
-	int base;
-	int ptrack;
-	for (j=0; j<infile[line].getFieldCount(); j++) {
-		if (!infile.token(line, j)->isKern()) {
-			m_humdrum_text << infile.token(line, j);
-			if (j < infile[line].getFieldCount() - 1) {
-				m_humdrum_text << "\t";
-			}
-			continue;
-		}
-		if (hre.search(infile.token(line, j),
-				"^\\*Trd[+-]?\\d+c[+-]?\\d+$", "")) {
-			base = Convert::transToBase40(*infile.token(line, j));
-			string output = "*ITr";
-			output += Convert::base40ToTrans(base);
-			m_humdrum_text << output;
-			ptrack = infile.token(line, j)->getTrack();
-			tvals[ptrack] = -base;
+	int i = (int)(startseg + 1);
+	while (segdur > 0.0 && i < (int)histogram.size()) {
+		if (segdur < 1.0) {
+			histogram[i][pc] += segdur;
+			segdur = 0.0;
 		} else {
-			m_humdrum_text << infile.token(line, j);
-		}
-		if (j < infile[line].getFieldCount() - 1) {
-			m_humdrum_text << "\t";
+			histogram[i][pc] += 1.0;
+			segdur -= 1.0;
 		}
+		i++;
 	}
 }
 
@@ -115291,513 +120281,608 @@ void Tool_transpose::convertToConcertPitches(HumdrumFile& infile, int line, vect
 
 //////////////////////////////
 //
-// Tool_transpose::hasTrMarkers -- returns true if there are any tokens
-//    which start with *ITr or *Tr and contains c and d
-//    with numbers after each of them.
+// Tool_transpose::initialize --
 //
 
-int Tool_transpose::hasTrMarkers(HumdrumFile& infile, int line) {
-	HumRegex hre;
-	int j;
-	for (j=0; j<infile[line].getFieldCount(); j++) {
-		if (!infile.token(line, j)->isKern()) {
-			continue;
-		}
-		if (hre.search(infile.token(line, j),
-				"^\\*I?Trd[+-]?\\d+c[+-]?\\d+$", "")) {
-			return 1;
-		}
+void Tool_transpose::initialize(HumdrumFile& infile) {
+
+	// handle basic options:
+	if (getBoolean("author")) {
+		m_free_text << "Written by Craig Stuart Sapp, "
+			  << "craig@ccrma.stanford.edu, 12 Apr 2004" << endl;
+		exit(0);
+	} else if (getBoolean("version")) {
+		m_free_text << getArg(0) << ", version: 10 Dec 2016" << endl;
+		m_free_text << "compiled: " << __DATE__ << endl;
+		exit(0);
+	} else if (getBoolean("help")) {
+		usage(getArg(0));
+		exit(0);
+	} else if (getBoolean("example")) {
+		example();
+		exit(0);
 	}
 
-	return 0;
-}
+	transval     =  getInteger("base40");
+	ssettonicQ   =  getBoolean("settonic");
+	ssettonic    =  Convert::kernToBase40(getString("settonic").c_str());
+	autoQ        =  getBoolean("auto");
+	debugQ       =  getBoolean("debug");
+	spinestring  =  getString("spines");
+	octave       =  getInteger("octave");
+	concertQ     =  getBoolean("concert");
+	writtenQ     =  getBoolean("written");
+	quietQ       = !getBoolean("transcode");
+	instrumentQ  =  getBoolean("instrument");
 
+	switch (getBoolean("diatonic") + getBoolean("chromatic")) {
+		case 1:
+			cerr << "Error: both -d and -c options must be specified" << endl;
+			exit(1);
+			break;
+		case 2:
+			{
+				char buffer[128] = {0};
+				snprintf(buffer, 128, "d%dc%d", getInt("d"), getInt("c"));
+				transval = Convert::transToBase40(buffer);
+			}
+			break;
+	}
 
+	ssettonic = ssettonic % 40;
 
-//////////////////////////////
-//
-// Tool_transpose::isKeyMarker -- returns true if the interpretation is
-//    a key description, such as *C: for C major, or *a:.
-//
+	if (getBoolean("transpose")) {
+		transval = getBase40ValueFromInterval(getString("transpose").c_str());
+	}
 
-int Tool_transpose::isKeyMarker(const string& str) {
-	HumRegex hre;
-	return hre.search(str, "^\\*[a-g]?[\\#-]?:", "i");
+	transval += 40 * octave;
 }
 
 
 
-//////////////////////////////
+
+/////////////////////////////////
 //
-// Tool_transpose::printTransposedToken -- print a Humdrum token with the given
-//    base-40 transposition value applied.  Only **kern data is
-//    know now to transpose, other data types are currently not
-//    allowed to be transposed (but could be added here later).
+// Tool_tremolo::Tool_tremolo -- Set the recognized options for the tool.
 //
 
-void Tool_transpose::printTransposedToken(HumdrumFile& infile, int row, int col, int transval) {
-	if (!infile.token(row, col)->isKern()) {
-		// don't know how to transpose this type of data, so leave it as is
-		m_humdrum_text << infile.token(row, col);
-	} else {
-		printHumdrumKernToken(infile[row], col, transval);
-	}
+Tool_tremolo::Tool_tremolo(void) {
+	define("k|keep=b", "Keep tremolo rhythm markup");
+	define("F|no-fill=b", "Do not fill in tremolo spaces");
+	define("T|no-tremolo-interpretation=b", "Do not add *tremolo/*Xtremolo marks");
 }
 
 
 
-//////////////////////////////
+/////////////////////////////////
 //
-// Tool_transpose::calculateTranspositionFromKey --
+// Tool_tremolo::run -- Do the main work of the tool.
 //
 
-int Tool_transpose::calculateTranspositionFromKey(int targetkey,
-		HumdrumFile& infile) {
-	HumRegex hre;
-	int base40 = 0;
-	int currentkey = 0;
-	int mode = 0;
-	int found = 0;
-
-	for (int i=0; i<infile.getLineCount(); i++) {
-		if (infile[i].isData()) {
-			// no initial key label was found, so don't transpose.
-			// in the future, maybe allow an automatic key analysis
-			// to be performed on the data if there is not explicit
-			// key designation.
-			return 0;
-		}
-		if (!infile[i].isInterpretation()) {
-			continue;
-		}
-		for (int j=0; j<infile[i].getFieldCount(); j++) {
-			if (!infile.token(i, j)->isKern()) {
-				continue;
-			}
-			if (!hre.search(infile.token(i, j), "^\\*([A-G][#-]?):", "i")) {
-				continue;
-			}
-
-			mode = 0;  // major key
-			if (islower(infile.token(i, j)->at(1))) {
-				mode = 1;  // minor key
-			}
-			base40 = Convert::kernToBase40(infile.token(i, j));
-			// base40 = base40 + transval;
-			base40 = base40 + 4000;
-			base40 = base40 % 40;
-			base40 = base40 + (3 + mode) * 40;
-			currentkey = base40;
-	 		found = 1;
-			break;
-		}
-		if (found) {
-			break;
-		}
-	}
-
-	int trans = (targetkey%40 - currentkey%40);
-	// base40 = targetkey + (3 + mode) * 40;
-	if (trans > 40) {
-		trans -= 40;
-	}
-	if (trans > 20) {
-		trans = 40 - trans;
-		trans = -trans;
-	}
-	if (trans < -40) {
-		trans += 40;
-	}
-	if (trans < -20) {
-		trans = -40 - trans;
-		trans = -trans;
+bool Tool_tremolo::run(HumdrumFileSet& infiles) {
+	bool status = true;
+	for (int i=0; i<infiles.getCount(); i++) {
+		status &= run(infiles[i]);
 	}
-
-	return trans;
+	return status;
 }
 
 
-
-//////////////////////////////
-//
-// Tool_transpose::printTransposeInformation -- collect and print *Tr interpretations
-//      at the start of the spine.  Looks for *Tr markers at the start
-//      of the file before any data.
-//
-
-void Tool_transpose::printTransposeInformation(HumdrumFile& infile,
-		vector<bool>& spineprocess, int line, int transval) {
-	int j;
-	int ptrack;
-
-	vector<int> startvalues(infile.getMaxTrack()+1);
-	vector<int> finalvalues(infile.getMaxTrack()+1);
-
-	for (j=0; j<infile[line].getFieldCount(); j++) {
-		if (!infile.token(line, j)->isKern()) {
-			continue;
-		}
-		ptrack = infile.token(line, j)->getTrack();
-		startvalues[ptrack] = getTransposeInfo(infile, line, j);
-		// m_humdrum_text << "Found transpose value " << startvalues[ptrack] << endl;
+bool Tool_tremolo::run(const string& indata, ostream& out) {
+	HumdrumFile infile(indata);
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
 	}
+	return status;
+}
 
-	int entry = 0;
-	// check if any spine will be transposed after final processing
-	for (j=0; j<infile[line].getFieldCount(); j++) {
-		if (!infile.token(line, j)->isKern()) {
-			continue;
-		}
-		ptrack = infile.token(line, j)->getTrack();
-		if (spineprocess[ptrack]) {
-		finalvalues[ptrack] = transval;
-		if (!instrumentQ) {
-			finalvalues[ptrack] += startvalues[ptrack];
-		}
-		if (finalvalues[ptrack] != 0) {
-			entry = 1;
-		}
+
+bool Tool_tremolo::run(HumdrumFile& infile, ostream& out) {
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
 	} else {
-			finalvalues[ptrack] = startvalues[ptrack];
-			if (finalvalues[ptrack] != 0) {
-				entry = 1;
-			}
-		}
+		out << infile;
 	}
+	return status;
+}
 
-	if (!entry) {
-		return;
-	}
 
-	for (j=0; j<infile[line].getFieldCount(); j++) {
-		if (!infile.token(line, j)->isKern()) {
-			m_humdrum_text << "*";
-			if (j < infile[line].getFieldCount()-1) {
-				m_humdrum_text << "\t";
-			}
-			continue;
-		}
-		ptrack = infile.token(line, j)->getTrack();
-		if (finalvalues[ptrack] == 0) {
-			m_humdrum_text << "*";
-		} else {
-			if (instrumentQ) {
-				m_humdrum_text << "*ITr";
-				m_humdrum_text << Convert::base40ToTrans(-finalvalues[ptrack]);
-			} else {
-				m_humdrum_text << "*Tr";
-				m_humdrum_text << Convert::base40ToTrans(finalvalues[ptrack]);
-			}
-		}
-		if (j < infile[line].getFieldCount()-1) {
-			m_humdrum_text << "\t";
-		}
+bool Tool_tremolo::run(HumdrumFile& infile) {
+	processFile(infile);
+
+	// Force reprocessing of file for now (does not seem to be
+	// completely updated in javascript):
+	stringstream ss;
+	ss << infile;
+	infile.readString(ss.str());
 
-	}
-	m_humdrum_text << "\n";
+	return true;
 }
 
 
 
 //////////////////////////////
 //
-// getTransposeInfo -- returns the Transpose information found in
-//    the specified spine starting at the current line, and searching
-//    until data is found (or a *- record is found). Return value is a
-//    base-40 number.
+// Tool_tremolo::processFile --
 //
 
-int Tool_transpose::getTransposeInfo(HumdrumFile& infile, int row, int col) {
-	int track = infile.token(row, col)->getTrack();
-	int ptrack;
+void Tool_tremolo::processFile(HumdrumFile& infile) {
+	m_keepQ = getBoolean("keep");
+	m_first_tremolo_time.clear();
+	m_last_tremolo_time.clear();
+	int maxtrack = infile.getMaxTrack();
+	m_first_tremolo_time.resize(maxtrack+1);
+	m_last_tremolo_time.resize(maxtrack+1);
+	fill(m_first_tremolo_time.begin(), m_first_tremolo_time.end(), -1);
+	fill(m_last_tremolo_time.begin(), m_last_tremolo_time.end(), -1);
 	HumRegex hre;
-	int base;
-	int output = 0;
-
-	for (int i=row; i<infile.getLineCount(); i++) {
-		if (infile[i].isData()) {
-			break;
+	m_markup_tokens.reserve(1000);
+	for (int i=infile.getLineCount()-1; i>=0; i--) {
+		if (!infile[i].isData()) {
+			continue;
 		}
-		if (!infile[i].isInterpretation()) {
+		if (infile[i].getDuration() == 0) {
+			// don't deal with grace notes
 			continue;
 		}
 		for (int j=0; j<infile[i].getFieldCount(); j++) {
-			if (!infile.token(i, j)->isKern()) {
+			HTp token = infile.token(i, j);
+			if (!token->isKern()) {
 				continue;
 			}
-			ptrack = infile.token(i, j)->getTrack();
-			if (ptrack != track) {
+			if (token->isNull()) {
 				continue;
 			}
-			if (hre.search(infile.token(i, j),
-					"^\\*Trd[+-]?\\d+c[+-]?\\d+$", "")) {
-				base = Convert::transToBase40(*infile.token(i, j));
-				output += base;
-				// erase the *Tr value because it will be printed elsewhere
-				infile.token(i, j)->setText("*XTr");
-				// ggg
+
+			if (hre.search(token, "@(\\d+)@")) {
+				m_markup_tokens.push_back(token);
+				int value = hre.getMatchInt(1);
+				HumNum duration = Convert::recipToDuration(token);
+				HumNum count = duration;
+				count *= value;
+				count /= 4;
+				HumNum increment = 4;
+				increment /= value;
+
+				if (token->find("@@") != string::npos) {
+					count *= 2;
+				}
+
+				if (!count.isInteger()) {
+					cerr << "Error: time value cannot be used: " << value << endl;
+					continue;
+				}
+				int kcount = count.getNumerator();
+				HumNum starttime = token->getDurationFromStart();
+				HumNum timestamp;
+				for (int k=1; k<kcount; k++) {
+					timestamp = starttime + (increment * k);
+					infile.insertNullDataLine(timestamp);
+				}
 			}
+
 		}
 	}
 
-	return output;
+	if (!getBoolean("no-fill")) {
+		expandTremolos();
+		if (!getBoolean("no-tremolo-interpretation")) {
+			addTremoloInterpretations(infile);
+		}
+	} else if (!m_keepQ) {
+		removeMarkup();
+	}
+
+	if (m_modifiedQ) {
+		infile.createLinesFromTokens();
+	}
+
+	// m_humdrum_text << infile;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_transpose::checkForDeletedLine -- check to see if a "*deletedTr
+// Tool_tremolo::addTremoloInterpretations --
 //
 
-int Tool_transpose::checkForDeletedLine(HumdrumFile& infile, int line) {
-	int j;
-	if (!infile[line].isInterpretation()) {
-		return 0;
-	}
+void Tool_tremolo::addTremoloInterpretations(HumdrumFile& infile) {
 
-	int present = 0;
-	int composite = 0;
-	for (j=0; j<infile[line].getFieldCount(); j++) {
-		if (!infile.token(line, j)->isKern()) {
+	// Insert starting *tremolo
+	for (int i=0; i<(int)m_first_tremolo_time.size(); i++) {
+		if (m_first_tremolo_time[i] < 0) {
 			continue;
 		}
-		if (infile.token(line, j)->find("deletedTr") != string::npos) {
-			present = 1;
-		} else if (infile.token(line, j)->isNull()) {
-			// do nothing: not composite
-		} else {
-			// not a *deletedTr token or a * token, so have to print line later
-			composite = 1;
+		HLp line = infile.insertNullInterpretationLine(m_first_tremolo_time[i]);
+		if (line != NULL) {
+			for (int j=0; j<line->getFieldCount(); j++) {
+				HTp token = line->token(j);
+				int track = token->getTrack();
+				int subtrack = token->getSubtrack();
+				if (subtrack > 1) {
+					// Currently *tremolo affects all subtracks, but this
+					// will probably change in the future.
+					continue;
+				}
+				if (track == i) {
+					token->setText("*tremolo");
+					line->createLineFromTokens();
+				}
+			}
 		}
 	}
 
-	if (present == 0) {
-		// no *deletedTr records found on the currnet line, so process normally
-		return 0;
+	// Insert ending *Xtremolo
+	for (int i=0; i<(int)m_last_tremolo_time.size(); i++) {
+		if (m_last_tremolo_time[i] < 0) {
+			continue;
+		}
+		HLp line = infile.insertNullInterpretationLineAbove(m_last_tremolo_time[i]);
+		if (line != NULL) {
+			for (int j=0; j<line->getFieldCount(); j++) {
+				HTp token = line->token(j);
+				int track = token->getTrack();
+				int subtrack = token->getSubtrack();
+				if (subtrack > 1) {
+					// Currently *tremolo affects all subtracks, but this
+					// will probably change in the future.
+					continue;
+				}
+				if (track == i) {
+					token->setText("*Xtremolo");
+					line->createLineFromTokens();
+				}
+			}
+		}
 	}
+}
 
-	if (composite == 0) {
-		// *deletedTr found, but no other important data found on line.
-		return 1;
-	}
 
-	// print non-deleted elements in line.
-	for (j=0; j<infile[line].getFieldCount(); j++) {;
-		if ((string)(*infile.token(line, j)) == "deletedTr") {
-			m_humdrum_text << "*";
+
+//////////////////////////////
+//
+// Tool_tremolo::expandTremolos --
+//
+
+void Tool_tremolo::expandTremolos(void) {
+	for (int i=0; i<(int)m_markup_tokens.size(); i++) {
+		if (m_markup_tokens[i]->find("@@") != string::npos) {
+			expandFingerTremolo(m_markup_tokens[i]);
 		} else {
-			m_humdrum_text << infile.token(line, j);
-		}
-		if (j < infile[line].getFieldCount() - 1) {
-			m_humdrum_text << "\t";
+			expandTremolo(m_markup_tokens[i]);
 		}
 	}
-	m_humdrum_text << "\n";
-
-	return 1;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_transpose::processFile --
+// Tool_tremolo::expandTremolo --
 //
 
-void Tool_transpose::processFile(HumdrumFile& infile,
-		vector<bool>& spineprocess) {
-	int i;
-	int diatonic;
-	int j;
+void Tool_tremolo::expandTremolo(HTp token) {
 	HumRegex hre;
-	int interpstart = 0;
-
-	for (i=0; i<infile.getLineCount(); i++) {
-		if (!quietQ && (interpstart == 1)) {
-			interpstart = 2;
-			printTransposeInformation(infile, spineprocess, i, transval);
+	HumNum value = 0;
+	HumNum duration;
+	HumNum repeat;
+	HumNum increment;
+	bool addBeam = false;
+	int tnotes = -1;
+	if (hre.search(token, "@(\\d+)@")) {
+		value = hre.getMatchInt(1);
+		duration = Convert::recipToDuration(token);
+		HumNum count = duration * value / 4;
+		if (!count.isInteger()) {
+			cerr << "Error: non-integer number of tremolo notes: " << token << endl;
+			return;
 		}
-		if (checkForDeletedLine(infile, i)) {
-			continue;
+		if (value < 8) {
+			cerr << "Error: tremolo notes can only be eighth-notes or shorter" << endl;
+			return;
+		}
+		if (duration.getFloat() > 0.5) {
+			// needs to be less that one for tuplet quarter note tremolos
+			addBeam = true;
 		}
 
-		if (infile[i].isData()) {
-			printHumdrumDataRecord(infile[i], spineprocess);
-			m_humdrum_text << "\n";
-		} else if (infile[i].isInterpretation()) {
-			for (j=0; j<infile[i].getFieldCount(); j++) {
+		// There are cases where duration < 1 need added beams
+		// when the note is not already in a beam.  Such as
+		// a plain 8th note with a slash.  This needs to be
+		// converted into two 16th notes with a beam so that
+		// *tremolo can reduce it back into a tremolo, since
+		// it will only reduce beam groups.
 
-				if (infile.token(i, j)->compare(0, 2, "**") == 0) {
-						interpstart = 1;
-				}
+		repeat = duration;
+		repeat *= value;
+		repeat /= 4;
+		increment = 4;
+		increment /= value;
+		if (!repeat.isInteger()) {
+			cerr << "Error: tremolo repetition count must be an integer: " << token << endl;
+			return;
+		}
+		tnotes = repeat.getNumerator();
+	} else {
+		return;
+	}
 
-				// check for key signature in a spine which is being
-				// transposed, and adjust it.
-				// Should also check tandem spines for updating
-				// key signatures in non-kern spines.
-				if (spineprocess[infile.token(i, j)->getTrack()] &&
-						hre.search(infile.token(i, j),
-							"^\\*k\\[([a-gA-G#-]*)\\]", "i")) {
-						string value = hre.getMatch(1);
-						printNewKeySignature(value, transval);
-						if (j<infile[i].getFieldCount()-1) {
-						m_humdrum_text << "\t";
-						}
-						continue;
-				}
+	storeFirstTremoloNoteInfo(token);
 
-				// Check for key designations and tranpose
-				// if the spine data is being transposed.
-				// Should also check tandem spines for updating
-				// key designations in non-kern spines.
-				if (spineprocess[infile.token(i, j)->getTrack()] &&
-						hre.search(infile.token(i, j), "^\\*([A-G])[#-]?:", "i")) {
-					diatonic = tolower(hre.getMatch(1)[0]) - 'a';
-					if (diatonic >= 0 && diatonic <= 6) {
-					  	printNewKeyInterpretation(infile[i], j, transval);
-					  	if (j<infile[i].getFieldCount()-1) {
-							m_humdrum_text << "\t";
-					  	}
-					  	continue;
-					}
-				}
-				m_humdrum_text << infile.token(i, j);
-				if (j<infile[i].getFieldCount()-1) {
-					m_humdrum_text << "\t";
-				}
-			}
-			m_humdrum_text << "\n";
+	int beams = log((double)(value.getFloat()))/log(2.0) - 2;
+	string markup = "@" + to_string(value.getNumerator()) + "@";
+	string base = token->getText();
+	hre.replaceDestructive(base, "", markup, "g");
+
+	// complicated beamings are not allowed yet (no internal L/J markers in tremolo beam)
+	bool hasBeamStart = base.find('L') != string::npos;
+	bool hasBeamStop  = base.find('J') != string::npos;
+
+	if (addBeam) {
+		hasBeamStart = true;
+		hasBeamStop = true;
+	}
+
+	// Currently not allowed to add tremolo to beamed notes, so remove all beaming:
+	hre.replaceDestructive(base, "", "[LJKk]+", "g");
+	string startbeam;
+	string endbeam;
+	for (int i=0; i<beams; i++) {
+		startbeam += 'L';
+		endbeam   += 'J';
+	}
+	// Set the rhythm of the tremolo notes.
+	// Augmentation dot is expected adjacent to regular rhythm value.
+	// Maybe allow anywhere?
+	hre.replaceDestructive(base, to_string(value.getNumerator()), "\\d+%?\\d*\\.*", "g");
+	string initial = base;
+	if (hasBeamStart) {
+		initial += startbeam;
+	}
+	string terminal = base;
+	if (hasBeamStop) {
+		terminal += endbeam;
+	}
+	// remove slur end from start of tremolo:
+	hre.replaceDestructive(initial, "", "[)]+[<>]?", "g");
+	if (m_keepQ) {
+		initial += markup;
+	}
+	// remove slur start information from end of tremolo:
+	hre.replaceDestructive(terminal, "", "[(]+[<>]?", "g");
+
+	// remove slur information from middle of tremolo:
+	hre.replaceDestructive(base, "", "[()]+[<>]?", "g");
+
+	token->setText(initial);
+	token->getOwner()->createLineFromTokens();
 
+	// Now fill in the rest of the tremolos.
+	HumNum starttime = token->getDurationFromStart();
+	HumNum timestamp = starttime + increment;
+	HTp current = token->getNextToken();
+	int counter = 1;
+	while (current) {
+		if (!current->isData()) {
+			current = current->getNextToken();
+			continue;
+		}
+		HumNum duration = current->getOwner()->getDuration();
+		if (duration == 0) {
+			// grace note line, so skip
+			current = current->getNextToken();
+			continue;
+		}
+		HumNum cstamp = current->getDurationFromStart();
+		if (cstamp < timestamp) {
+			current = current->getNextToken();
+			continue;
+		}
+		if (cstamp > timestamp) {
+			cerr << "\tWarning: terminating tremolo insertion early" << endl;
+			cerr << "\tCSTAMP : " << cstamp << " TSTAMP " << timestamp << endl;
+			break;
+		}
+		counter++;
+		if (tnotes == counter) {
+			current->setText(terminal);
+			storeLastTremoloNoteInfo(current);
 		} else {
-			m_humdrum_text << infile[i] << "\n";
+			current->setText(base);
+		}
+		current->getOwner()->createLineFromTokens();
+		if (counter >= tnotes) {
+			// done with inserting of tremolo notes.
+			break;
 		}
+		timestamp += increment;
+		current = current->getNextToken();
 	}
 }
 
 
-
 //////////////////////////////
 //
-// Tool_transpose::printNewKeySignature --
+// Tool_tremolo::getNextNote --
 //
 
-void Tool_transpose::printNewKeySignature(const string& keysig, int trans) {
-	int counter = 0;
-	int len = (int)keysig.size();
-	for (int i=0; i<len; i++) {
-		switch(keysig[i]) {
-			case '-': counter--; break;
-			case '#': counter++; break;
+HTp Tool_tremolo::getNextNote(HTp token) {
+	HTp output = NULL;
+	HTp current = token->getNextToken();
+	while (current) {
+		if (!current->isData()) {
+			current = current->getNextToken();
+			continue;
+		}
+		if (current->getDuration() == 0) {
+			// ignore grace notes
+			current = current->getNextToken();
+			continue;
+		}
+		if (current->isNull() || current->isRest()) {
+			current = current->getNextToken();
+			continue;
 		}
+		output = current;
+		break;
 	}
 
-	int xxx = Convert::base40IntervalToLineOfFifths(trans);
-	int newkey = xxx + counter;
-	m_humdrum_text << Convert::keyNumberToKern(newkey);
+	return output;
 }
 
 
-
 //////////////////////////////
 //
-// Tool_transpose::printNewKeyInterpretation --
+// Tool_tremolo::expandFingerTremolos --
 //
 
-void Tool_transpose::printNewKeyInterpretation(HumdrumLine& aRecord,
-		int index, int transval) {
-	int mode = 0;
-	if (islower(aRecord.token(index)->at(1))) {
-		mode = 1;
+void Tool_tremolo::expandFingerTremolo(HTp token1) {
+	HTp token2 = getNextNote(token1);
+	if (token2 == NULL) {
+		return;
 	}
-	int base40 = Convert::kernToBase40(*aRecord.token(index));
-	currentkey = base40;
-	base40 = base40 + transval;
-	base40 = base40 + 4000;
-	base40 = base40 % 40;
-	base40 = base40 + (3 + mode) * 40;
+	HumRegex hre;
+	int value = 0;
+	HumNum duration;
+	HumNum repeat;
+	HumNum increment;
+	int tnotes = -1;
+	if (hre.search(token1, "@@(\\d+)@@")) {
+		value = hre.getMatchInt(1);
+		if (!Convert::isPowerOfTwo(value)) {
+			cerr << "Error: not a power of two: " << token1 << endl;
+			return;
+		}
+		if (value < 8) {
+			cerr << "Error: tremolo can only be eighth-notes or shorter" << endl;
+			return;
+		}
+		duration = Convert::recipToDuration(token1);
+		HumNum count = duration;
 
-	m_humdrum_text << "*" << Convert::base40ToKern(base40) << ":";
+		count *= value;
+		count /= 4;
+		if (!count.isInteger()) {
+			cerr << "Error: tremolo repetition count must be an integer: " << token1 << endl;
+			return;
+		}
+		increment = 4;
+		increment /= value;
 
-	HumRegex hre;
-	string tvalue = *aRecord.token(index);
-	if (hre.search(tvalue, ":(.+)$", "")) {
-		string value = hre.getMatch(1);
-		m_humdrum_text << value;
+		tnotes = count.getNumerator() * 2;
+	} else {
+		return;
 	}
-}
 
+	storeFirstTremoloNoteInfo(token1);
 
+	int beams = log((double)(value))/log(2.0) - 2;
+	string markup = "@@" + to_string(value) + "@@";
 
-//////////////////////////////
-//
-// Tool_transpose::printHumdrumDataRecord --
-//
+	string base1 = token1->getText();
+	hre.replaceDestructive(base1, "", markup, "g");
+	// Currently not allowed to add tremolo to beamed notes, so remove all beaming:
+	hre.replaceDestructive(base1, "", "[LJKk]+", "g");
+	string startbeam;
+	string endbeam;
+	for (int i=0; i<beams; i++) {
+		startbeam += 'L';
+		endbeam   += 'J';
+	}
 
-void Tool_transpose::printHumdrumDataRecord(HumdrumLine& record,
-		vector<bool>& spineprocess) {
-	int i;
-	for (i=0; i<record.getFieldCount(); i++) {
-		if (!(record.token(i)->isKern() ||
-				record.token(i)->isDataType("mxhm"))) {
-			// don't try to transpose non-kern and non-mxhm spines
-			m_humdrum_text << record.token(i);
-			if (i<record.getFieldCount()-1) {
-				m_humdrum_text << "\t";
-			}
+	// Set the rhythm of the tremolo notes.
+	// Augmentation dot is expected adjacent to regular rhythm value.
+	// Maybe allow anywhere?
+	hre.replaceDestructive(base1, to_string(value), "\\d+%?\\d*\\.*", "g");
+	string initial = base1 + startbeam;
+	// remove slur end from start of tremolo:
+	hre.replaceDestructive(initial, "", "[)]+[<>]?", "g");
+	if (m_keepQ) {
+		initial += markup;
+	}
+
+	// remove slur information from middle of tremolo:
+	hre.replaceDestructive(base1, "", "[()]+[<>]?", "g");
+
+	token1->setText(initial);
+	token1->getOwner()->createLineFromTokens();
+
+	string base2 = token2->getText();
+	hre.replaceDestructive(base2, "", "[LJKk]+", "g");
+	hre.replaceDestructive(base2, to_string(value), "\\d+%?\\d*\\.*", "g");
+
+	string terminal = base2 + endbeam;
+	// remove slur start information from end of tremolo:
+	hre.replaceDestructive(terminal, "", "[(]+[<>]?", "g");
+
+	bool state = false;
+
+	// Now fill in the rest of the tremolos.
+	HumNum starttime = token1->getDurationFromStart();
+	HumNum timestamp = starttime + increment;
+	HTp current = token1->getNextToken();
+	int counter = 1;
+	while (current) {
+		if (!current->isData()) {
+			// Also check if line is non-zero duration (not a grace-note line).
+			current = current->getNextToken();
 			continue;
 		}
-		if (!spineprocess[record.token(i)->getTrack()]) {
-			// don't try to transpose spines which were not indicated.
-			m_humdrum_text << record.token(i);
-			if (i<record.getFieldCount()-1) {
-				m_humdrum_text << "\t";
-			}
+		HumNum cstamp = current->getDurationFromStart();
+		if (cstamp < timestamp) {
+			current = current->getNextToken();
 			continue;
 		}
-
-		if (record.token(i)->isKern()) {
-			printHumdrumKernToken(record, i, transval);
-		} else if (record.token(i)->isDataType("mxhm")) {
-			printHumdrumMxhmToken(record, i, transval);
+		if (cstamp > timestamp) {
+			cerr << "\tWarning: terminating tremolo insertion early" << endl;
+			cerr << "\tCSTAMP : " << cstamp << " TSTAMP " << timestamp << endl;
+			break;
+		}
+		counter++;
+		if (tnotes == counter) {
+			current->setText(terminal);
+			storeLastTremoloNoteInfo(current);
 		} else {
-			m_humdrum_text << record.token(i);
+			if (state) {
+				current->setText(base1);
+			} else {
+				current->setText(base2);
+			}
+			state = !state;
 		}
-
-		if (i<record.getFieldCount()-1) {
-			m_humdrum_text << "\t";
+		current->getOwner()->createLineFromTokens();
+		if (counter >= tnotes) {
+			// done with inserting of tremolo notes.
+			break;
 		}
-		continue;
+		timestamp += increment;
+		current = current->getNextToken();
 	}
-
 }
 
 
 
 //////////////////////////////
 //
-// Tool_transpose::printHumdrumKernToken --
+// Tool_tremolo::removeMarkup --  Remove markup such as "@16@" from tokens.
 //
 
-void Tool_transpose::printHumdrumKernToken(HumdrumLine& record, int index,
-		int transval) {
-	if (record.token(index)->isNull()) {
-		// null record element (no pitch).
-		m_humdrum_text << record.token(index);
-		return;
-	}
-	if (!record.token(index)->isKern()) {
-		m_humdrum_text << record.token(index);
+void Tool_tremolo::removeMarkup(void) {
+	if (m_markup_tokens.empty()) {
 		return;
 	}
-	string buffer;
-	int tokencount = record.token(index)->getSubtokenCount();
-	for (int k=0; k<tokencount; k++) {
-		buffer = record.token(index)->getSubtoken(k);
-		printNewKernString(buffer, transval);
-		if (k<tokencount-1) {
-			m_humdrum_text << " ";
-		}
+	HumRegex hre;
+	for (int i=0; i<(int)m_markup_tokens.size(); i++) {
+		HTp token = m_markup_tokens[i];
+		string text = *token;
+		hre.replaceDestructive(text, "", "@+\\d+@+");
+		token->setText(text);
+		token->getOwner()->createLineFromTokens();
 	}
 }
 
@@ -115805,385 +120890,342 @@ void Tool_transpose::printHumdrumKernToken(HumdrumLine& record, int index,
 
 //////////////////////////////
 //
-// Tool_transpose::printHumdrumMxhmToken --
+// Tool_tremolo::storeFirstTremoloNote --
 //
 
-void Tool_transpose::printHumdrumMxhmToken(HumdrumLine& record, int index,
-		int transval) {
-	if (record.token(index)->isNull()) {
-		// null record element (nothing to do)
-		m_humdrum_text << record.token(index);
-		return;
-	}
-	if (!record.token(index)->isDataType("mxhm")) {
-		m_humdrum_text << record.token(index);
-		return;
-	}
-	HumRegex hre;
-	if (hre.search(record.token(index), "N\\.C\\.")) {
-		// no pitch information so just echo the text:
-		m_humdrum_text << record.token(index);
-	} else if (hre.search(record.token(index), "([A-Ga-g]+[n#-]{0,2})")) {
-		string pitch = hre.getMatch(1);
-		int b40 = Convert::kernToBase40(pitch) + transval;
-		b40 = b40 % 40 + 120;
-		pitch = Convert::base40ToKern(b40);
-		string newtext = *record.token(index);
-		hre.replaceDestructive(newtext, pitch, "([A-Ga-g]+[n#-]{0,2})");
-		m_humdrum_text << newtext;
-	} else {
-		m_humdrum_text << record.token(index);
-		return;
+void Tool_tremolo::storeFirstTremoloNoteInfo(HTp token) {
+	int track = token->getTrack();
+	HumNum timestamp = token->getDurationFromStart();
+	if (m_first_tremolo_time.at(track) < 0) {
+		m_first_tremolo_time.at(track) = timestamp;
+	} else if (timestamp < m_first_tremolo_time.at(track)) {
+		// This case is probably not necessary.
+		m_first_tremolo_time.at(track) = timestamp;
 	}
 }
 
 
 
-
 //////////////////////////////
 //
-// Tool_transpose::printNewKernString --
+// Tool_tremolo::storeLastTremoloNote --
 //
 
-void Tool_transpose::printNewKernString(const string& input, int transval) {
-
-	HumRegex hre;
-	if (input == ".") {
-		// Don't transpose null tokens.
-		m_humdrum_text << input;
-		return;
-	} else if (input.rfind('R') != string::npos) {
-		// Don't transpose unpitched notes (percussion parts).
-		m_humdrum_text << input;
-		return;
-	} else if (input.rfind('r') != string::npos) {
-		// Transpose rests only if they contain a pitch component.
-		string output = input;
-		if (hre.search(input, "([A-Ga-g]+[#n-]*)")) {
-			// Transpose pitch portion of rest (indicating vertical position).
-			string pitch = hre.getMatch(1);
-			int base40 = Convert::kernToBase40(pitch);
-			string newpitch = Convert::base40ToKern(base40 + transval);
-			hre.replaceDestructive(newpitch, "", "[-#n]+");
-			hre.replaceDestructive(output, newpitch, "([A-Ga-g]+[#n-]*)");
-		}
-		// don't transpose rests...
-		m_humdrum_text << output;
+void Tool_tremolo::storeLastTremoloNoteInfo(HTp token) {
+	if (!token) {
 		return;
-	} else if (!hre.search(input, "([A-Ga-g]+[#n-]*)")) {
-		// This is a form of invisible rest with no "r", just **recip.
-		m_humdrum_text << input;
+	}
+	int track = token->getTrack();
+	if (track < 1) {
+		cerr << "Track is not set for token: " << track << endl;
 		return;
 	}
-
-	// Now the only thing left are regular pitches.
-
-	int base40 = Convert::kernToBase40(input);
-	string newpitch = Convert::base40ToKern(base40 + transval);
-
-	// consider interaction of #X -X n interaction vs. nX.
-	string output;
-	if (hre.search(input, "([A-Ga-g#n-]+)")) {
-		string oldpitch = hre.getMatch(1);
-		output = hre.replaceCopy(input, newpitch, oldpitch);
+	HumNum timestamp = token->getDurationFromStart();
+	timestamp += Convert::recipToDuration(token);
+	if (m_last_tremolo_time.at(track) < 0) {
+		m_last_tremolo_time.at(track) = timestamp;
+	} else if (timestamp > m_last_tremolo_time.at(track)) {
+		m_last_tremolo_time.at(track) = timestamp;
 	}
-	m_humdrum_text << output;
 }
 
 
 
-//////////////////////////////
-//
-// Tool_transpose::getBase40ValueFromInterval -- note: only ninth interval range allowed
-//
-
-int Tool_transpose::getBase40ValueFromInterval(const string& interval) {
-	int sign = 1;
-	if (interval.find('-') != string::npos) {
-		sign = -1;
-	}
-
-	string icopy = interval;
-	for (int i=0; i<(int)icopy.size(); i++) {
-		if (icopy[i] == 'p') { icopy[i] = 'P'; }
-		if (icopy[i] == 'a') { icopy[i] = 'A'; }
-		if (icopy[i] == 'D') { icopy[i] = 'd'; }
-	}
-
-	int output = 0;
-
-	if (icopy.find("dd1") != string::npos)      { output = -2; }
-	else if (icopy.find("d1") != string::npos)  { output = -1; }
-	else if (icopy.find("P1") != string::npos)  { output =  0; }
-	else if (icopy.find("AA1") != string::npos) { output =  2; }
-	else if (icopy.find("A1") != string::npos)  { output =  1; }
-
-	else if (icopy.find("dd2") != string::npos) { output =  3; }
-	else if (icopy.find("d2") != string::npos)  { output =  4; }
-	else if (icopy.find("m2") != string::npos)  { output =  5; }
-	else if (icopy.find("M2") != string::npos)  { output =  6; }
-	else if (icopy.find("AA2") != string::npos) { output =  8; }
-	else if (icopy.find("A2") != string::npos)  { output =  7; }
-
-	else if (icopy.find("dd3") != string::npos) { output =  9; }
-	else if (icopy.find("d3") != string::npos)  { output = 10; }
-	else if (icopy.find("m3") != string::npos)  { output = 11; }
-	else if (icopy.find("M3") != string::npos)  { output = 12; }
-	else if (icopy.find("AA3") != string::npos) { output = 14; }
-	else if (icopy.find("A3") != string::npos)  { output = 13; }
-
-	else if (icopy.find("dd4") != string::npos) { output = 15; }
-	else if (icopy.find("d4") != string::npos)  { output = 16; }
-	else if (icopy.find("P4") != string::npos)  { output = 17; }
-	else if (icopy.find("AA4") != string::npos) { output = 19; }
-	else if (icopy.find("A4") != string::npos)  { output = 18; }
-
-	else if (icopy.find("dd5") != string::npos) { output = 21; }
-	else if (icopy.find("d5") != string::npos)  { output = 22; }
-	else if (icopy.find("P5") != string::npos)  { output = 23; }
-	else if (icopy.find("AA5") != string::npos) { output = 25; }
-	else if (icopy.find("A5") != string::npos)  { output = 24; }
-
-	else if (icopy.find("dd6") != string::npos) { output = 26; }
-	else if (icopy.find("d6") != string::npos)  { output = 27; }
-	else if (icopy.find("m6") != string::npos)  { output = 28; }
-	else if (icopy.find("M6") != string::npos)  { output = 29; }
-	else if (icopy.find("AA6") != string::npos) { output = 31; }
-	else if (icopy.find("A6") != string::npos)  { output = 30; }
-
-	else if (icopy.find("dd7") != string::npos) { output = 32; }
-	else if (icopy.find("d7") != string::npos)  { output = 33; }
-	else if (icopy.find("m7") != string::npos)  { output = 34; }
-	else if (icopy.find("M7") != string::npos)  { output = 35; }
-	else if (icopy.find("AA7") != string::npos) { output = 37; }
-	else if (icopy.find("A7") != string::npos)  { output = 36; }
 
-	else if (icopy.find("dd8") != string::npos) { output = 38; }
-	else if (icopy.find("d8") != string::npos)  { output = 39; }
-	else if (icopy.find("P8") != string::npos)  { output = 40; }
-	else if (icopy.find("AA8") != string::npos) { output = 42; }
-	else if (icopy.find("A8") != string::npos)  { output = 41; }
 
-	else if (icopy.find("dd9") != string::npos) { output = 43; }
-	else if (icopy.find("d9") != string::npos)  { output = 44; }
-	else if (icopy.find("m9") != string::npos)  { output = 45; }
-	else if (icopy.find("M9") != string::npos)  { output = 46; }
-	else if (icopy.find("AA9") != string::npos) { output = 48; }
-	else if (icopy.find("A9") != string::npos)  { output = 47; }
+/////////////////////////////////
+//
+// Tool_trillspell::Tool_trillspell -- Set the recognized options for the tool.
+//
 
-	return output * sign;
+Tool_trillspell::Tool_trillspell(void) {
+	define("x=b", "mark trills with x (interpretation)");
 }
 
 
 
-//////////////////////////////
+///////////////////////////////
 //
-// Tool_transpose::example --
+// Tool_trillspell::run -- Primary interfaces to the tool.
 //
 
-void Tool_transpose::example(void) {
-
-
+bool Tool_trillspell::run(HumdrumFileSet& infiles) {
+	bool status = true;
+	for (int i=0; i<infiles.getCount(); i++) {
+		status &= run(infiles[i]);
+	}
+	return status;
 }
 
+bool Tool_trillspell::run(const string& indata, ostream& out) {
+	HumdrumFile infile(indata);
+	return run(infile, out);
+}
 
 
-//////////////////////////////
-//
-// Tool_transpose::usage --
-//
+bool Tool_trillspell::run(HumdrumFile& infile, ostream& out) {
+	bool status = run(infile);
+	return status;
+}
 
-void Tool_transpose::usage(const string& command) {
 
+bool Tool_trillspell::run(HumdrumFile& infile) {
+	processFile(infile);
+	infile.createLinesFromTokens();
+	return true;
 }
 
 
 
-///////////////////////////////////////////////////////////////////////////
+///////////////////////////////
 //
-// Automatic transposition functions
+// Tool_trillspell::processFile -- Adjust intervals of ornaments.
 //
 
+void Tool_trillspell::processFile(HumdrumFile& infile) {
+	m_xmark = getBoolean("x");
+	analyzeOrnamentAccidentals(infile);
+}
+
+
 
 //////////////////////////////
 //
-// Tool_transpose::doAutoTransposeAnalysis --
+// Tool_trillspell::analyzeOrnamentAccidentals --
 //
 
-void Tool_transpose::doAutoTransposeAnalysis(HumdrumFile& infile) {
-	vector<int> ktracks(infile.getMaxTrack()+1, 0);
-
-	vector<HTp> tracks;
-	infile.getTrackStartList(tracks);
-	int i;
-	for (i=0; i<(int)tracks.size(); i++) {
-		if (tracks[i]->isKern()) {
-			ktracks[i] = tracks[i]->getTrack();
-		} else {
-			ktracks[i] = 0;
-		}
-	}
-
-	int segments = int(infile.getScoreDuration().getFloat()+0.5);
-	if (segments < 1) {
-		segments = 1;
-	}
-
-	vector<vector<vector<double> > > trackhist;
-	trackhist.resize(ktracks.size());
-
-	for (i=1; i<(int)trackhist.size(); i++) {
-		if (ktracks[i]) {
-			storeHistogramForTrack(trackhist[i], infile, i, segments);
-		}
-	}
+bool Tool_trillspell::analyzeOrnamentAccidentals(HumdrumFile& infile) {
+	int i, j, k;
+	int kindex;
+	int track;
 
-	if (debugQ) {
-		m_free_text << "Segment pitch histograms: " << endl;
-		printHistograms(segments, ktracks, trackhist);
+	// ktracks == List of **kern spines in data.
+	// rtracks == Reverse mapping from track to ktrack index (part/staff index).
+	vector<HTp> ktracks = infile.getKernSpineStartList();
+	vector<int> rtracks(infile.getMaxTrack()+1, -1);
+	for (i=0; i<(int)ktracks.size(); i++) {
+		track = ktracks[i]->getTrack();
+		rtracks[track] = i;
 	}
+	int kcount = (int)ktracks.size();
 
-	int level = 16;
-	int hop   = 8;
-	int count = segments / hop;
-
-	if (segments < count * level / (double)hop) {
-		level = level / 2;
-		hop   = hop / 2;
-	}
-	if (segments < count * level / (double)hop) {
-		count = count / 2;
+	// keysigs == key signature spellings of diatonic pitch classes.  This array
+	// is duplicated into dstates after each barline.
+	vector<vector<int> > keysigs;
+	keysigs.resize(kcount);
+	for (i=0; i<kcount; i++) {
+		keysigs[i].resize(7);
+		std::fill(keysigs[i].begin(), keysigs[i].end(), 0);
 	}
 
-	if (segments < count * level / (double)hop) {
-		level = level / 2;
-		hop   = hop / 2;
-	}
-	if (segments < count * level / (double)hop) {
-		count = count / 2;
+	// dstates == diatonic states for every pitch in a spine.
+	// sub-spines are considered as a single unit, although there are
+	// score conventions which would keep a separate voices on a staff
+	// with different accidental states (i.e., two parts superimposed
+	// on the same staff, but treated as if on separate staves).
+	// Eventually this algorithm should be adjusted for dealing with
+	// cross-staff notes, where the cross-staff notes should be following
+	// the accidentals of a different spine...
+	vector<vector<int> > dstates; // diatonic states
+	dstates.resize(kcount);
+	for (i=0; i<kcount; i++) {
+		dstates[i].resize(70);     // 10 octave limit for analysis
+			                        // may cause problems; maybe fix later.
+		std::fill(dstates[i].begin(), dstates[i].end(), 0);
 	}
 
-	vector<vector<vector<double> > > analysis;
-
-	doAutoKeyAnalysis(analysis, level, hop, count, segments, ktracks, trackhist);
-
-	// print analyses raw results
-
-	m_free_text << "Raw key analysis by track:" << endl;
-	printRawTrackAnalysis(analysis, ktracks);
+	for (i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].hasSpines()) {
+			continue;
+		}
+		if (infile[i].isInterpretation()) {
+			for (j=0; j<infile[i].getFieldCount(); j++) {
+				if (!infile[i].token(j)->isKern()) {
+					continue;
+				}
+				if (infile[i].token(j)->compare(0, 3, "*k[") == 0) {
+					track = infile[i].token(j)->getTrack();
+					kindex = rtracks[track];
+					fillKeySignature(keysigs[kindex], *infile[i].token(j));
+					// resetting key states of current measure.  What to do if this
+					// key signature is in the middle of a measure?
+					resetDiatonicStatesWithKeySignature(dstates[kindex],
+							keysigs[kindex]);
+				}
+			}
+		} else if (infile[i].isBarline()) {
+			for (j=0; j<infile[i].getFieldCount(); j++) {
+				if (!infile[i].token(j)->isKern()) {
+					continue;
+				}
+				if (infile[i].token(j)->isInvisible()) {
+					continue;
+				}
+				track = infile[i].token(j)->getTrack();
+				kindex = rtracks[track];
+				// reset the accidental states in dstates to match keysigs.
+				resetDiatonicStatesWithKeySignature(dstates[kindex],
+						keysigs[kindex]);
+			}
+		}
 
-	doTranspositionAnalysis(analysis);
-}
+		if (!infile[i].isData()) {
+			continue;
+		}
 
+		for (j=0; j<infile[i].getFieldCount(); j++) {
+			if (!infile[i].token(j)->isKern()) {
+				continue;
+			}
+			if (infile[i].token(j)->isNull()) {
+				continue;
+			}
+			if (infile[i].token(j)->isRest()) {
+				continue;
+			}
 
+			int subcount = infile[i].token(j)->getSubtokenCount();
+			track = infile[i].token(j)->getTrack();
 
-//////////////////////////////
-//
-// Tool_transpose::doTranspositionAnalysis --
-//
+			HumRegex hre;
+			int rindex = rtracks[track];
+			for (k=0; k<subcount; k++) {
+				string subtok = infile[i].token(j)->getSubtoken(k);
+				int b40 = Convert::kernToBase40(subtok);
+				int diatonic = Convert::kernToBase7(subtok);
+				if (diatonic < 0) {
+					// Deal with extra-low notes later.
+					continue;
+				}
+				int accid = Convert::kernToAccidentalCount(subtok);
+				dstates.at(rindex).at(diatonic) = accid;
 
-void Tool_transpose::doTranspositionAnalysis(vector<vector<vector<double> > >& analysis) {
-	int i, j, k;
-	int value1;
-	int value2;
-	int value;
+				// check for accidentals on trills, mordents and turns.
+				// N.B.: augmented-second intervals are not considered.
 
-	for (i=0; i<1; i++) {
-		for (j=2; j<3; j++) {
-			for (k=0; k<(int)analysis[i].size(); k++) {
-				if (analysis[i][k][24] >= 0 && analysis[j][k][24] >= 0) {
-					value1 = (int)analysis[i][k][25];
-	 				if (value1 >= 12) {
-						  value1 = value1 - 12;
+				if ((subtok.find("t") != string::npos) && !hre.search(subtok, "[tT]x")) {
+					int nextup = getBase40(diatonic + 1, dstates[rindex][diatonic+1]);
+					int interval = nextup - b40;
+					if (interval == 6) {
+						// Set to major-second trill
+						hre.replaceDestructive(subtok, "T", "t", "g");
+						if (m_xmark) {
+							hre.replaceDestructive(subtok, "$1x", "([Tt]+)", "g");
+						}
+						infile[i].token(j)->replaceSubtoken(k, subtok);
+					} else {
+						if (m_xmark) {
+							hre.replaceDestructive(subtok, "$1x", "([Tt]+)", "g");
+						}
+						infile[i].token(j)->replaceSubtoken(k, subtok);
 					}
-					value2 = (int)analysis[j][k][25];
-	 				if (value2 >= 12) {
-						  value2 = value2 - 12;
+				} else if ((subtok.find("T") != string::npos) && !hre.search(subtok, "[tT]x")) {
+					int nextup = getBase40(diatonic + 1, dstates[rindex][diatonic+1]);
+					int interval = nextup - b40;
+					if (interval == 5) {
+						// Set to minor-second trill
+						hre.replaceDestructive(subtok, "t", "T", "g");
+						if (m_xmark) {
+							hre.replaceDestructive(subtok, "$1x", "([Tt]+)", "g");
+						}
+						infile[i].token(j)->replaceSubtoken(k, subtok);
+					} else {
+						if (m_xmark) {
+							hre.replaceDestructive(subtok, "$1x", "([Tt]+)", "g");
+						}
+						infile[i].token(j)->replaceSubtoken(k, subtok);
+					}
+				} else if ((subtok.find("M") != string::npos) && !hre.search(subtok, "[Mm]x")) {
+					// major-second upper mordent
+					int nextup = getBase40(diatonic + 1, dstates[rindex][diatonic+1]);
+					int interval = nextup - b40;
+					if (interval == 5) {
+						// Set to minor-second upper mordent
+						hre.replaceDestructive(subtok, "m", "M", "g");
+						if (m_xmark) {
+							hre.replaceDestructive(subtok, "$1x", "([Mm]+)", "g");
+						}
+						infile[i].token(j)->replaceSubtoken(k, subtok);
+					} else {
+						if (m_xmark) {
+							hre.replaceDestructive(subtok, "$1x", "([Mm]+)", "g");
+						}
+						infile[i].token(j)->replaceSubtoken(k, subtok);
+					}
+				} else if ((subtok.find("m") != string::npos) && !hre.search(subtok, "[Mm]x")) {
+					// minor-second upper mordent
+					int nextup = getBase40(diatonic + 1, dstates[rindex][diatonic+1]);
+					int interval = nextup - b40;
+					if (interval == 6) {
+						// Set to major-second upper mordent
+						hre.replaceDestructive(subtok, "M", "m", "g");
+						if (m_xmark) {
+							hre.replaceDestructive(subtok, "$1x", "([Mm]+)", "g");
+						}
+						infile[i].token(j)->replaceSubtoken(k, subtok);
+					} else {
+						if (m_xmark) {
+							hre.replaceDestructive(subtok, "$1x", "([Mm]+)", "g");
+						}
+						infile[i].token(j)->replaceSubtoken(k, subtok);
 					}
-					value = value1 - value2;
-					if (value < 0) {
-						  value = value + 12;
+				} else if ((subtok.find("W") != string::npos) && !hre.search(subtok, "[Ww]x")) {
+					// major-second lower mordent
+					int nextdn = getBase40(diatonic - 1, dstates[rindex][diatonic-1]);
+					int interval = b40 - nextdn;
+					if (interval == 5) {
+						// Set to minor-second lower mordent
+						hre.replaceDestructive(subtok, "w", "W", "g");
+						if (m_xmark) {
+							hre.replaceDestructive(subtok, "$1x", "([Ww]+)", "g");
+						}
+						infile[i].token(j)->replaceSubtoken(k, subtok);
+					} else {
+						if (m_xmark) {
+							hre.replaceDestructive(subtok, "$1x", "([Ww]+)", "g");
+						}
+						infile[i].token(j)->replaceSubtoken(k, subtok);
 					}
-					if (value > 6) {
-						  value = 12 - value;
+				} else if ((subtok.find("w") != string::npos) && !hre.search(subtok, "[Ww]x")) {
+					// minor-second lower mordent
+					int nextdn = getBase40(diatonic - 1, dstates[rindex][diatonic-1]);
+					int interval = b40 - nextdn;
+					if (interval == 6) {
+						// Set to major-second lower mordent
+						hre.replaceDestructive(subtok, "W", "w", "g");
+						if (m_xmark) {
+							hre.replaceDestructive(subtok, "$1x", "([Ww]+)", "g");
+						}
+						infile[i].token(j)->replaceSubtoken(k, subtok);
+					} else {
+						if (m_xmark) {
+							hre.replaceDestructive(subtok, "$1x", "([Ww]+)", "g");
+						}
+						infile[i].token(j)->replaceSubtoken(k, subtok);
 					}
-					m_free_text << value << endl;
 				}
-			}
-		}
-	}
-}
-
-
-
-//////////////////////////////
-//
-// Tool_transpose::printRawTrackAnalysis --
-//
-
-void Tool_transpose::printRawTrackAnalysis(vector<vector<vector<double> > >& analysis,
-		vector<int>& ktracks) {
-
-	int i, j;
-	int value;
-	int value2;
+				// deal with turns and inverted turns here.
 
-	for (i=0; i<(int)analysis[0].size(); i++) {
-		m_free_text << "Frame\t" << i << ":";
-		for (j=0; j<(int)analysis.size(); j++) {
-			m_free_text << "\t";
-	 		value = (int)analysis[j][i][24];
-	 		if (value >= 12) {
-				value = value - 12;
 			}
-	 		value2 = (int)analysis[j][i][25];
-	 		if (value2 >= 12) {
-				value2 = value2 - 12;
-			}
-			m_free_text << value;
-	 		// if (value != value2) {
-	 		//    m_free_text << "," << value2;
-			// }
 		}
-		m_free_text << "\n";
 	}
+
+	return true;
 }
 
 
 
 //////////////////////////////
 //
-// doAutoKeyAnalysis --
+// Tool_trillspell::resetDiatonicStatesWithKeySignature -- Only used in
+//     Tool_trillspell::analyzeKernAccidentals().  Resets the accidental
+//     states for notes
 //
 
-void Tool_transpose::doAutoKeyAnalysis(vector<vector<vector<double> > >& analysis, int level,
-		int hop, int count, int segments, vector<int>& ktracks,
-		vector<vector<vector<double> > >& trackhist) {
-
-	vector<double> majorweights;
-	vector<double> minorweights;
-	fillWeightsWithKostkaPayne(majorweights, minorweights);
-
-	int size = 0;
-	int i;
-	for (i=1; i<(int)ktracks.size(); i++) {
-		if (ktracks[i]) {
-			size++;
-		}
-	}
-
-	analysis.resize(size);
-	for (i=0; i<(int)analysis.size(); i++) {
-		analysis[i].reserve(count);
-	}
-
-	int aindex = 0;
-	for (i=1; i<(int)ktracks.size(); i++) {
-		if (!ktracks[i]) {
-			continue;
-		}
-		doTrackKeyAnalysis(analysis[aindex++], level, hop, count,
-				trackhist[i], majorweights, minorweights);
+void Tool_trillspell::resetDiatonicStatesWithKeySignature(vector<int>&
+		states, vector<int>& signature) {
+	for (int i=0; i<(int)states.size(); i++) {
+		states[i] = signature[i % 7];
 	}
 }
 
@@ -116191,323 +121233,269 @@ void Tool_transpose::doAutoKeyAnalysis(vector<vector<vector<double> > >& analysi
 
 //////////////////////////////
 //
-// Tool_transpose::doTrackKeyAnalysis -- Do individual key analyses of sections of the
-//   given track.
+// Tool_trillspell::fillKeySignature -- Read key signature notes and
+//    assign +1 to sharps, -1 to flats in the diatonic input array.  Used
+//    only by Tool_trillspell::analyzeOrnamentAccidentals().
 //
 
-void Tool_transpose::doTrackKeyAnalysis(vector<vector<double> >& analysis, int level, int hop,
-		int count, vector<vector<double> >& trackhist,
-		vector<double>& majorweights, vector<double>& minorweights) {
-
-	int i;
-	for (i=0; i<count; i++) {
-		if (i * hop + level > (int)trackhist.size()) {
-			break;
-		}
-		analysis.resize(i+1);
-		doSingleAnalysis(analysis[analysis.size()-1], i*hop+level, level,
-				trackhist, majorweights, minorweights);
-	}
+void Tool_trillspell::fillKeySignature(vector<int>& states,
+		const string& keysig) {
+	std::fill(states.begin(), states.end(), 0);
+	if (keysig.find("f#") != string::npos) { states[3] = +1; }
+	if (keysig.find("c#") != string::npos) { states[0] = +1; }
+	if (keysig.find("g#") != string::npos) { states[4] = +1; }
+	if (keysig.find("d#") != string::npos) { states[1] = +1; }
+	if (keysig.find("a#") != string::npos) { states[5] = +1; }
+	if (keysig.find("e#") != string::npos) { states[2] = +1; }
+	if (keysig.find("b#") != string::npos) { states[6] = +1; }
+	if (keysig.find("b-") != string::npos) { states[6] = -1; }
+	if (keysig.find("e-") != string::npos) { states[2] = -1; }
+	if (keysig.find("a-") != string::npos) { states[5] = -1; }
+	if (keysig.find("d-") != string::npos) { states[1] = -1; }
+	if (keysig.find("g-") != string::npos) { states[4] = -1; }
+	if (keysig.find("c-") != string::npos) { states[0] = -1; }
+	if (keysig.find("f-") != string::npos) { states[3] = -1; }
 }
 
 
 
 //////////////////////////////
 //
-// Tool_transpose::doSingleAnalysis --
+// Tool_trillspell::getBase40 --
 //
 
-void Tool_transpose::doSingleAnalysis(vector<double>& analysis, int startindex, int length,
-		vector<vector<double> >& trackhist, vector<double>& majorweights,
-		vector<double>& minorweights) {
-	vector<double> histsum(12, 0);
-
-	for (int i=0; (i<length) && (startindex+i+length<(int)trackhist.size()); i++) {
-		for (int k=0; k<12; k++) {
-			histsum[k] += trackhist[i+startindex][k];
-		}
-	}
-
-	identifyKey(analysis, histsum, majorweights, minorweights);
+int Tool_trillspell::getBase40(int diatonic, int accidental) {
+	return Convert::base7ToBase40(diatonic) + accidental;
 }
 
 
 
-///////////////////////////////
+
+/////////////////////////////////
 //
-// Tool_transpose::fillWeightsWithKostkaPayne --
+// Tool_tspos::Tool_tspos -- Set the recognized options for the tool.
 //
 
-void Tool_transpose::fillWeightsWithKostkaPayne(vector<double>& maj, vector<double>& min) {
-	maj.resize(12);
-	min.resize(12);
-
-	// found in David Temperley: Music and Probability 2006
-	maj[0]  = 0.748;	// C major weights
-	maj[1]  = 0.060;	// C#
-	maj[2]  = 0.488;	// D
-	maj[3]  = 0.082;	// D#
-	maj[4]  = 0.670;	// E
-	maj[5]  = 0.460;	// F
-	maj[6]  = 0.096;	// F#
-	maj[7]  = 0.715;	// G
-	maj[8]  = 0.104;	// G#
-	maj[9]  = 0.366;	// A
-	maj[10] = 0.057;	// A#
-	maj[11] = 0.400;	// B
-	min[0]  = 0.712;	// c minor weights
-	min[1]  = 0.084;	// c#
-	min[2]  = 0.474;	// d
-	min[3]  = 0.618;	// d#
-	min[4]  = 0.049;	// e
-	min[5]  = 0.460;	// f
-	min[6]  = 0.105;	// f#
-	min[7]  = 0.747;	// g
-	min[8]  = 0.404;	// g#
-	min[9]  = 0.067;	// a
-	min[10] = 0.133;	// a#
-	min[11] = 0.330;	// b
+Tool_tspos::Tool_tspos(void) {
+	define("d|double=b", "highlight only doubled notes in triads");
+	define("3|no-thirds=b", "do not color thirds");
+	define("5|no-fifths=b", "do not color fifths");
+	define("T|no-triads=b", "do not color full triads");
+	define("m|minor-triads=b", "only analyze major triad");
+	define("M|major-triads=b", "only analyze minor triads");
+	define("x|attacks=b", "only process sonorities with three unique triadic pitch classes attacking at once (sustains in additional voices are allowed)");
+	define("v|voice-count=i:0", "Only analyze sonorities with given voice count");
+	define("c|compressed=b", "Compress music to see more on each system");
+	define("top=b", "mark top voice in analysis output");
+	define("t|table=b", "add analysis table above score");
+	define("V|all-voices=b", "Require all voices in score to be sounding");
+	define("Q|no-question=b", "Do not show question mark in table header");
 }
 
 
 
-////////////////////////////////////////
+/////////////////////////////////
 //
-// identifyKey -- correls contains the 12 major key correlation
-//      values, then the 12 minor key correlation values, then two
-//      more values: index=24 is the best key, and index=25 is the
-//      second best key.  If [24] or [25] is -1, then that means that
-//      all entries in the original histogram were zero (all rests).
+// Tool_tspos::run -- Do the main work of the tool.
 //
 
-void Tool_transpose::identifyKey(vector<double>& correls,
-		vector<double>& histogram, vector<double>& majorweights,
-		vector<double>& minorweights) {
-
-	correls.clear();
-	correls.reserve(26);
-
-	double testsum = 0.0;
-	for (int i=0; i<12; i++) {
-		testsum += histogram[i];
-	}
-	if (testsum == 0.0) {
-		correls.resize(26);
-		fill(correls.begin(), correls.end(), -1);
-		correls[24] = -1;
-		correls[25] = -1;
-		return;
+bool Tool_tspos::run(HumdrumFileSet& infiles) {
+	bool status = true;
+	for (int i=0; i<infiles.getCount(); i++) {
+		status &= run(infiles[i]);
 	}
+	return status;
+}
 
-	vector<double> majorcorrels;
-	vector<double> minorcorrels;
-	for (int i=0; i<12; i++) {
-		majorcorrels[i] = Convert::pearsonCorrelation(majorweights, histogram);
-		minorcorrels[i] = Convert::pearsonCorrelation(minorweights, histogram);
-	}
 
-	// find max value
-	int besti;
-	int majorbesti = 0;
-	int minorbesti = 0;
-	for (int i=1; i<12; i++) {
-		if (majorcorrels[i] > majorcorrels[majorbesti]) {
-			majorbesti = i;
-		}
-		if (minorcorrels[i] > minorcorrels[minorbesti]) {
-			minorbesti = i;
-		}
-	}
-	besti = majorbesti;
-	if (majorcorrels[majorbesti] < minorcorrels[minorbesti]) {
-		besti = minorbesti + 12;
+bool Tool_tspos::run(const string& indata, ostream& out) {
+	HumdrumFile infile(indata);
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
 	}
+	return status;
+}
 
-	// find second best major key
-	int majorsecondbesti = 0;
-	if (majorbesti == 0) {
-		majorsecondbesti = 1;
-	}
-	for (int i=1; i<12; i++) {
-		if (i == majorbesti) {
-			continue;
-		}
-		if (majorcorrels[i] > majorcorrels[majorsecondbesti]) {
-			majorsecondbesti = i;
-		}
-	}
 
-	// find second best minor key
-	int minorsecondbesti = 0;
-	if (minorbesti == 0) {
-		minorsecondbesti = 1;
-	}
-	for (int i=1; i<12; i++) {
-		if (i == minorbesti) {
-			continue;
-		}
-		if (minorcorrels[i] > minorcorrels[minorsecondbesti]) {
-			minorsecondbesti = i;
-		}
+bool Tool_tspos::run(HumdrumFile& infile, ostream& out) {
+	bool status = run(infile);
+	if (hasAnyText()) {
+		getAllText(out);
+	} else {
+		out << infile;
 	}
+	return status;
+}
 
-	int secondbesti = majorsecondbesti;
-	if (majorcorrels[majorsecondbesti] < minorcorrels[minorsecondbesti]) {
-		secondbesti = minorsecondbesti;
-	}
-	secondbesti += 12;
 
-	correls = majorcorrels;
-	correls.insert(correls.end(), minorcorrels.begin(), minorcorrels.end());
-	correls.push_back(besti);
-	correls.push_back(secondbesti);
+bool Tool_tspos::run(HumdrumFile& infile) {
+	initialize(infile);
+	processFile(infile);
+	return true;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_transpose::printHistograms --
+// Tool_tspos::initialize -- Setup to do before processing a file.
 //
 
-void Tool_transpose::printHistograms(int segments, vector<int> ktracks,
-vector<vector<vector<double> > >& trackhist) {
-	int i, j, k;
-	int start;
-
-	for (i=0; i<segments; i++) {
-//m_free_text << "i=" << i << endl;
-		m_free_text << "segment " << i
-				<< " ==========================================\n";
-		for (j=0; j<12; j++) {
-			start = 0;
-//m_free_text << "j=" << i << endl;
-			for (k=1; k<(int)ktracks.size(); k++) {
-//m_free_text << "k=" << i << endl;
-				if (!ktracks[k]) {
-					continue;
-				}
-				if (!start) {
-					m_free_text << j;
-					start = 1;
-				}
-				m_free_text << "\t";
-				m_free_text << trackhist[k][i][j];
-			}
-	 if (start) {
-				m_free_text << "\n";
-			}
-		}
+void Tool_tspos::initialize(HumdrumFile& infile) {
+	m_colorThirds = !getBoolean("no-thirds");
+	m_colorFifths = !getBoolean("no-fifths");
+	m_colorTriads = !getBoolean("no-triads");
+	m_doubleQ = getBoolean("double");
+	m_topQ = getBoolean("top");
+	m_tableQ = getBoolean("table");
+	m_compressedQ = getBoolean("compressed");
+	m_voice = getInteger("voice-count");
+	if (getBoolean("all-voices")) {
+		vector<HTp> kernSpines =  infile.getKernSpineStartList();
+		m_voice = (int)kernSpines.size();
 	}
-	m_free_text << "==========================================\n";
+	m_triadAttack = getBoolean("attacks");
+	m_majorQ = true;
+	m_minorQ = true;
+	if (getBoolean("major-triads")) {
+		m_majorQ = true;
+		m_minorQ = false;
+	}
+	if (getBoolean("minor-triads")) {
+		m_majorQ = false;
+		m_minorQ = true;
+	}
+	m_questionQ = !getBoolean("no-question");
 }
 
 
 
 //////////////////////////////
 //
-// Tool_transpose::storeHistogramForTrack --
+// Tool_tspos::processFile -- Analyze an input file.
 //
 
-double Tool_transpose::storeHistogramForTrack(vector<vector<double> >& histogram,
-		HumdrumFile& infile, int track, int segments) {
+void Tool_tspos::processFile(HumdrumFile& infile) {
+	// Algorithm go line by line in the infile, extracting the notes that are active
+	// check to see if the list of notes form a triad
+	// label the root third and fifth notes of the triad
 
-	histogram.clear();
-	histogram.reserve(segments);
+	m_toolCount = getToolCounter(infile);
 
-	int i;
-	int j;
-	int k;
+	m_used_markers.resize(7);
+	fill(m_used_markers.begin(), m_used_markers.end(), 0);
 
-	for (i=0; i<(int)histogram.size(); i++) {
-		histogram[i].resize(12);
-		fill(histogram[i].begin(), histogram[i].end(), 0);
+	avoidRdfCollisions(infile);
+	analyzeVoiceCount(infile);
+
+	m_partTriadPositions.resize(infile.getMaxTrack() + 1);
+	for (int i = 0; i < (int)infile.getMaxTrack() + 1; i++) {
+		m_partTriadPositions.at(i).resize(m_positionCount);
+		fill(m_partTriadPositions.at(i).begin(), m_partTriadPositions.at(i).end(), 0);
 	}
 
-	double totalduration = infile.getScoreDuration().getFloat();
+	m_triadState.clear();
+	m_triadState.resize(infile.getLineCount());
 
-	double duration;
-	string buffer;
-	int pitch;
-	double start;
-	int tokencount;
-	for (i=0; i<infile.getLineCount(); i++) {
-		if (!infile[i].isData()) {
+	vector<HTp> kernNotes;
+	vector<int> midiNotes;
+	vector<int> chordPositions;
+	vector<int> thirdPositions;
+	vector<int> fifthPositions;
+
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isData()) { // if no notes in the line
 			continue;
 		}
-		start = infile[i].getDurationFromStart().getFloat();
-		for (j=0; j<infile[i].getFieldCount(); j++) {
-			if (!infile.token(i, j)->isKern()) {
-				continue;
-			}
-	 		if (infile.token(i, j)->getTrack() != track) {
+		if ((m_voice > 0)&& (m_voiceCount.at(i) != m_voice)) {
+			// Ignore sonorities that do not have the required number of
+			// voices.  m_voices==0 means consider all voice counts.
+			continue;
+		}
+		if (m_triadAttack) {
+			if (!hasFullTriadAttack(infile[i])) {
 				continue;
 			}
-			if (!infile.token(i, j)->isKern()) {
+		}
+
+		// iterate along the line looking at each field, and creating a
+		//     list of tokens that are notes.
+		kernNotes.clear();
+		midiNotes.clear();
+		chordPositions.clear();
+		thirdPositions.clear();
+		fifthPositions.clear();
+		for (int j=0; j<infile[i].getFieldCount(); j++) {
+			HTp token = infile.token(i, j); // get ptr to cell
+			// if not a **kern token, then skip:
+			if (!token->isKern()) {
 				continue;
 			}
-			if (!infile.token(i, j)->isNull()) {
+
+			if (token->isRest()) {
 				continue;
 			}
-			tokencount = infile.token(i, j)->getSubtokenCount();
-			for (k=0; k<tokencount; k++) {
-				buffer = *infile.token(j, k);
-				if (buffer == ".") {
-					continue;  // ignore illegal inline null tokens
-				}
-				pitch = Convert::kernToMidiNoteNumber(buffer);
-				if (pitch < 0) {
-					continue;  // ignore rests or strange objects
-				}
-				pitch = pitch % 12;  // convert to chromatic pitch-class
-				duration = Convert::recipToDuration(buffer).getFloat();
-				if (duration <= 0.0) {
-					continue;   // ignore grace notes and strange objects
+
+			HTp resolvedToken = NULL;
+			if (token->isNull()) {
+				resolvedToken = token->resolveNull();
+				if (!resolvedToken || resolvedToken->isRest()) {
+					continue;
 				}
-				addToHistogramDouble(histogram, pitch,
-						  start, duration, totalduration, segments);
+			}
+			if (resolvedToken) {
+				kernNotes.push_back(resolvedToken);
+			} else {
+				kernNotes.push_back(token);
 			}
 		}
-	}
+		midiNotes = getMidiNotes(kernNotes);
 
-	return totalduration;
-}
+		if (m_colorThirds) { // thirds
+			thirdPositions = getThirds(midiNotes);
+			checkForTriadicSonority(thirdPositions, i);
 
+			if (m_doubleQ) { // label only doubles if prompted
+				keepOnlyDoubles(thirdPositions);
+			}
 
+			labelThirds(kernNotes, thirdPositions);
+		}
 
-//////////////////////////////
-//
-// Tool_transpose::addToHistogramDouble -- fill the pitch histogram in the right spots.
-//
+		if (m_colorFifths) { // fifths
+			fifthPositions = getFifths(midiNotes);
+			checkForTriadicSonority(fifthPositions, i);
 
-void Tool_transpose::addToHistogramDouble(vector<vector<double> >& histogram, int pc,
-		double start, double dur, double tdur, int segments) {
+			if (m_doubleQ) { // label only doubles if prompted
+				keepOnlyDoubles(fifthPositions);
+			}
 
-	pc = (pc + 12) % 12;
+			labelFifths(kernNotes, fifthPositions);
+		}
 
-	double startseg = start / tdur * segments;
-	double startfrac = startseg - (int)startseg;
+		if (m_colorTriads) { // triads
+		  	chordPositions = getChordPositions(midiNotes);
+			checkForTriadicSonority(chordPositions, i);
+			if (m_doubleQ) { // label only doubles if prompted
+				keepOnlyDoubles(chordPositions);
+			}
+	 		labelChordPositions(kernNotes, chordPositions);
+		}
+	}
 
-	double segdur = dur / tdur * segments;
+	infile.createLinesFromTokens();
 
-	if (segdur <= 1.0 - startfrac) {
-		histogram[(int)startseg][pc] += segdur;
-		return;
-	} else if (1.0 - startfrac > 0.0) {
-		histogram[(int)startseg][pc] += (1.0 - startfrac);
-		segdur -= (1.0 - startfrac);
-	}
+	m_humdrum_text << infile;
 
-	int i = (int)(startseg + 1);
-	while (segdur > 0.0 && i < (int)histogram.size()) {
-		if (segdur < 1.0) {
-			histogram[i][pc] += segdur;
-			segdur = 0.0;
-		} else {
-			histogram[i][pc] += 1.0;
-			segdur -= 1.0;
-		}
-		i++;
+	printUsedMarkers();
+
+	string statistics = generateStatistics(infile);
+	m_humdrum_text << statistics;
+	if (m_compressedQ) {
+		m_humdrum_text << "!!!verovio: evenNoteSpacing\n";
 	}
 }
 
@@ -116515,587 +121503,717 @@ void Tool_transpose::addToHistogramDouble(vector<vector<double> >& histogram, in
 
 //////////////////////////////
 //
-// Tool_transpose::initialize --
+// Tool_tspos::printUsedMarkers --
 //
 
-void Tool_transpose::initialize(HumdrumFile& infile) {
+void Tool_tspos::printUsedMarkers(void) {
+	for (int i=0; i<(int)m_used_markers.size(); i++) {
+		if (!m_used_markers[i]) {
+			continue;
+		}
+		switch (i) {
 
-	// handle basic options:
-	if (getBoolean("author")) {
-		m_free_text << "Written by Craig Stuart Sapp, "
-			  << "craig@ccrma.stanford.edu, 12 Apr 2004" << endl;
-		exit(0);
-	} else if (getBoolean("version")) {
-		m_free_text << getArg(0) << ", version: 10 Dec 2016" << endl;
-		m_free_text << "compiled: " << __DATE__ << endl;
-		exit(0);
-	} else if (getBoolean("help")) {
-		usage(getArg(0));
-		exit(0);
-	} else if (getBoolean("example")) {
-		example();
-		exit(0);
-	}
+			case 0:
+				m_humdrum_text << "!!!RDF**kern: " << m_root_marker
+		 		<< " = marked note, "
+				<< "type=\"root position\" "
+				<< "count=\"" << m_used_markers[i] << " "
+				<< "color=\"" << m_root_color << "\"" << endl;
+				break;
 
-	transval     =  getInteger("base40");
-	ssettonicQ   =  getBoolean("settonic");
-	ssettonic    =  Convert::kernToBase40(getString("settonic").c_str());
-	autoQ        =  getBoolean("auto");
-	debugQ       =  getBoolean("debug");
-	spinestring  =  getString("spines");
-	octave       =  getInteger("octave");
-	concertQ     =  getBoolean("concert");
-	writtenQ     =  getBoolean("written");
-	quietQ       = !getBoolean("transcode");
-	instrumentQ  =  getBoolean("instrument");
+			case 1:
+				m_humdrum_text << "!!!RDF**kern: " << m_third_marker
+		 		<< " = marked note, "
+				<< "type=\"third position\" "
+				<< "count=\"" << m_used_markers[i] << " "
+				<< "color=\"" << m_third_color << "\"" << endl;
+				break;
 
-	switch (getBoolean("diatonic") + getBoolean("chromatic")) {
-		case 1:
-			cerr << "Error: both -d and -c options must be specified" << endl;
-			exit(1);
-			break;
-		case 2:
-			{
-				char buffer[128] = {0};
-				snprintf(buffer, 128, "d%dc%d", getInt("d"), getInt("c"));
-				transval = Convert::transToBase40(buffer);
-			}
-			break;
-	}
+			case 2:
+				m_humdrum_text << "!!!RDF**kern: " << m_fifth_marker
+		 		<< " = marked note, "
+				<< "type=\"fifth position\" "
+				<< "count=\"" << m_used_markers[i] << " "
+				<< "color=\"" << m_fifth_color << "\"" << endl;
+				break;
 
-	ssettonic = ssettonic % 40;
+			case 3:
+				m_humdrum_text << "!!!RDF**kern: " << m_3rd_root_marker
+		 		<< " = marked note, "
+				<< "type=\"open third root position\" "
+				<< "count=\"" << m_used_markers[i] << " "
+				<< "color=\"" << m_3rd_root_color << "\"" << endl;
+				break;
 
-	if (getBoolean("transpose")) {
-		transval = getBase40ValueFromInterval(getString("transpose").c_str());
-	}
+			case 4:
+				m_humdrum_text << "!!!RDF**kern: " << m_3rd_third_marker
+		 		<< " = marked note, "
+				<< "type=\"open third, third position\" "
+				<< "count=\"" << m_used_markers[i] << " "
+				<< "color=\"" << m_3rd_third_color << "\"" << endl;
+				break;
 
-	transval += 40 * octave;
-}
+			case 5:
+				m_humdrum_text << "!!!RDF**kern: " << m_5th_root_marker
+		 		<< " = marked note, "
+				<< "type=\"open fifth, root position\" "
+				<< "count=\"" << m_used_markers[i] << " "
+				<< "color=\"" << m_5th_root_color << "\"" << endl;
+				break;
 
+			case 6:
+				m_humdrum_text << "!!!RDF**kern: " << m_5th_fifth_marker
+		 		<< " = marked note, "
+				<< "type=\"open fifth, fifth position\" "
+				<< "count=\"" << m_used_markers[i] << " "
+				<< "color=\"" << m_5th_fifth_color << "\"" << endl;
+				break;
+		}
+	}
+}
 
 
 
-/////////////////////////////////
+//////////////////////////////
 //
-// Tool_tremolo::Tool_tremolo -- Set the recognized options for the tool.
+// Tool_tspos::hasFullTriadAttack --
 //
 
-Tool_tremolo::Tool_tremolo(void) {
-	define("k|keep=b", "Keep tremolo rhythm markup");
-	define("F|no-fill=b", "Do not fill in tremolo spaces");
-	define("T|no-tremolo-interpretation=b", "Do not add *tremolo/*Xtremolo marks");
+bool Tool_tspos::hasFullTriadAttack(HumdrumLine& line) {
+	vector<int> midiPitches = line.getMidiPitchesSortLH();
+	vector<int> positive(24, 0);
+	int count = 0;
+	for (int i=0; i<(int)midiPitches.size(); i++) {
+		if (midiPitches[i] > 0) {
+			if (!positive[midiPitches[i] % 12]) {
+				positive[midiPitches[i] % 12]++;
+				positive[midiPitches[i] % 12 + 12]++;
+				count++;
+			}
+		}
+	}
+
+	if (count != 3) {
+		return false;
+	}
+
+	for (int i=0; i<12; i++) {
+		if (!positive[i]) {
+			continue;
+		}
+		if (positive[i+3]) {
+			if (positive[i+3+3]) { // diminished triad pitch-classes present
+				return true;
+			} else if (positive[i+3+4]) { // minor
+				return true;
+			}
+		} else if (positive[i+4]) {
+			if (positive[i+4+3]) { // major
+				return true;
+			} else if (positive[i+4+4]) { // augmented
+				return true;
+			}
+		}
+	}
+
+	return false;
 }
 
 
 
-/////////////////////////////////
+
+//////////////////////////////
 //
-// Tool_tremolo::run -- Do the main work of the tool.
+// Tool_tspos:analyzeVoiceCount -- Chords count as a single voice.
 //
 
-bool Tool_tremolo::run(HumdrumFileSet& infiles) {
-	bool status = true;
-	for (int i=0; i<infiles.getCount(); i++) {
-		status &= run(infiles[i]);
+void Tool_tspos::analyzeVoiceCount(HumdrumFile& infile) {
+	vector<int>& voices = m_voiceCount;
+	voices.resize(infile.getLineCount());
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isData()) {
+			voices[i] = 0;
+			continue;
+		}
+		voices[i] = countVoicesOnLine(infile, i);
 	}
-	return status;
 }
 
 
-bool Tool_tremolo::run(const string& indata, ostream& out) {
-	HumdrumFile infile(indata);
-	bool status = run(infile);
-	if (hasAnyText()) {
-		getAllText(out);
-	} else {
-		out << infile;
-	}
-	return status;
-}
 
+//////////////////////////////
+//
+// Tool_tspos::checkForTriadicSonority -- Mark the given line in the file as a triadic sonority
+//     of all MIDI note numbers are positive.
+//
 
-bool Tool_tremolo::run(HumdrumFile& infile, ostream& out) {
-	bool status = run(infile);
-	if (hasAnyText()) {
-		getAllText(out);
-	} else {
-		out << infile;
+void Tool_tspos::checkForTriadicSonority(vector<int>& positions, int line) {
+	for (int i=0; i<(int)positions.size(); i++) {
+		if (positions[i] > 0) {
+			m_triadState.at(line) = true;
+			break;
+		}
 	}
-	return status;
 }
 
 
-bool Tool_tremolo::run(HumdrumFile& infile) {
-	processFile(infile);
 
-	// Force reprocessing of file for now (does not seem to be
-	// completely updated in javascript):
-	stringstream ss;
-	ss << infile;
-	infile.readString(ss.str());
+//////////////////////////////
+//
+// Tool_tspos::countVoicesOnLine --
+//
 
-	return true;
+int Tool_tspos::countVoicesOnLine(HumdrumFile& infile, int line) {
+	int output = 0;
+	for (int j=0; j<infile[line].getFieldCount(); j++) {
+		HTp token = infile.token(line, j);
+		if (!token->isKern()) {
+			continue;
+		}
+		if (token->isNull()) {
+			token = token->resolveNull();
+			if (!token) {
+				continue;
+			}
+			if (token->isNull()) {
+				continue;
+			}
+		}
+		if (token->isRest()) {
+			continue;
+		}
+		output++;
+	}
+	return output;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_tremolo::processFile --
+// Tool_tspos::generateStatistics --
 //
 
-void Tool_tremolo::processFile(HumdrumFile& infile) {
-	m_keepQ = getBoolean("keep");
-	m_first_tremolo_time.clear();
-	m_last_tremolo_time.clear();
-	int maxtrack = infile.getMaxTrack();
-	m_first_tremolo_time.resize(maxtrack+1);
-	m_last_tremolo_time.resize(maxtrack+1);
-	fill(m_first_tremolo_time.begin(), m_first_tremolo_time.end(), -1);
-	fill(m_last_tremolo_time.begin(), m_last_tremolo_time.end(), -1);
-	HumRegex hre;
-	m_markup_tokens.reserve(1000);
-	for (int i=infile.getLineCount()-1; i>=0; i--) {
+string Tool_tspos::generateStatistics(HumdrumFile& infile) {
+	int sonorityCount = 0;  // total number of sonorities
+	int triadCount = 0;     // sonorities that are triads
+	HumNum triadDuration = 0;
+	for (int i=0; i<infile.getLineCount(); i++) {
 		if (!infile[i].isData()) {
 			continue;
 		}
-		if (infile[i].getDuration() == 0) {
-			// don't deal with grace notes
+		if (m_triadState.at(i)) {
+			triadDuration += infile[i].getDuration();
+		}
+		int attacks = infile[i].getKernNoteAttacks();
+		if (attacks == 0) {
 			continue;
 		}
-		for (int j=0; j<infile[i].getFieldCount(); j++) {
-			HTp token = infile.token(i, j);
-			if (!token->isKern()) {
-				continue;
-			}
-			if (token->isNull()) {
-				continue;
-			}
+		sonorityCount++;
+		if (m_triadState.at(i)) {
+			triadCount++;
+		}
+	}
 
-			if (hre.search(token, "@(\\d+)@")) {
-				m_markup_tokens.push_back(token);
-				int value = hre.getMatchInt(1);
-				HumNum duration = Convert::recipToDuration(token);
-				HumNum count = duration;
-				count *= value;
-				count /= 4;
-				HumNum increment = 4;
-				increment /= value;
+	string toolPrefix = "!!!TOOL-";
+	if (m_toolCount > 0) {
+		toolPrefix += to_string(m_toolCount) + "-";
+	}
+	toolPrefix += m_toolName + "-";
 
-				if (token->find("@@") != string::npos) {
-					count *= 2;
-				}
+	stringstream out;
+	out << toolPrefix << "sonority-count: " << sonorityCount << endl;
+	out << toolPrefix << "sonority-duration: " << infile.getScoreDuration().getFloat() << endl;
+	out << toolPrefix << "triadic-count: " << triadCount << endl;
+	out << toolPrefix << "triadic-duration: " << triadDuration.getFloat() << endl;
 
-				if (!count.isInteger()) {
-					cerr << "Error: time value cannot be used: " << value << endl;
-					continue;
-				}
-				int kcount = count.getNumerator();
-				HumNum starttime = token->getDurationFromStart();
-				HumNum timestamp;
-				for (int k=1; k<kcount; k++) {
-					timestamp = starttime + (increment * k);
-					infile.insertNullDataLine(timestamp);
-				}
-			}
+	double percentage = 100.0 * (double)triadCount / (double)sonorityCount;
+	percentage = int(percentage * 100.0 + 0.5) / 100.0;
+	out << toolPrefix << "count-ratio: " << percentage << "%" << endl;
 
+	percentage = 100.0 * triadDuration.getFloat() / infile.getScoreDuration().getFloat();
+	percentage = int(percentage * 100.0 + 0.5) / 100.0;
+	out << toolPrefix << "duration-ratio: " << percentage << "%" << endl;
+
+	// Report triads positions by voice:
+	vector<string> names = getTrackNames(infile);
+
+	for (int i=1; i<(int)names.size(); i++) {
+		out << toolPrefix << m_toolName << "track-name-" << to_string(i) << ": " << names[i] << endl;
+	}
+	vector<HTp> kernstarts;
+	infile.getKernSpineStartList(kernstarts);
+	if (!kernstarts.empty()) {
+		out << toolPrefix << "first-kern-track: " << kernstarts[0]->getTrack() << endl;
+		out << toolPrefix << "last-kern-track: " << kernstarts.back()->getTrack() << endl;
+	}
+	out << toolPrefix << "kern-count: " << kernstarts.size() << endl;
+	out << toolPrefix << "kern-tracks: ";
+	for (int i=0; i<(int)kernstarts.size(); i++) {
+		out << kernstarts[i]->getTrack();
+		if (i < (int)kernstarts.size() - 1) {
+			out << " ";
 		}
 	}
+	out << endl;
+	int topTrack = kernstarts.back()->getTrack();
 
-	if (!getBoolean("no-fill")) {
-		expandTremolos();
-		if (!getBoolean("no-tremolo-interpretation")) {
-			addTremoloInterpretations(infile);
+	for (int i=1; i<(int)m_partTriadPositions.size(); i++) {
+		vector<int>& entry = m_partTriadPositions[i];
+		int sum = getVectorSum(entry);
+		if (sum == 0) {
+			continue;
 		}
-	} else if (!m_keepQ) {
-		removeMarkup();
+		string name = names[i];
+		int rootCount = 0;
+		int thirdCount = 0;
+		int fifthCount = 0;
+		rootCount += entry[0] + entry[3] + entry[5];
+		thirdCount += entry[1] + entry[4];
+		fifthCount += entry[2] + entry[6];
+		double rootPercent = int(rootCount * 1000.0 / sum + 0.5) / 10.0;
+		double thirdPercent = int(thirdCount * 1000.0 / sum + 0.5) / 10.0;
+		double fifthPercent = int(fifthCount * 1000.0 / sum + 0.5) / 10.0;
+		if (m_topQ && (topTrack == i)) {
+			name = "top-" + name;
+		}
+		out << toolPrefix << "count-sum-" << i << "-" << name << ": " << sum << endl;
+		out << toolPrefix << "root-count-" << i << "-" << name << ": " << rootCount << " (" << rootPercent << "%)" << endl;
+		out << toolPrefix << "third-count-" << i << "-" << name << ": " << thirdCount << " (" << thirdPercent << "%)" << endl;
+		out << toolPrefix << "fifth-count-" << i << "-" << name << ": " << fifthCount << " (" << fifthPercent << "%)" << endl;
 	}
 
-	if (m_modifiedQ) {
-		infile.createLinesFromTokens();
+	if (m_tableQ) {
+		out << generateTable(infile, names);
 	}
 
-	// m_humdrum_text << infile;
+	return out.str();
 }
 
 
 
 //////////////////////////////
 //
-// Tool_tremolo::addTremoloInterpretations --
+// Tool_tspos::generateTable -- Create an HTML table that the statistics
+//     will be filled into.
 //
 
-void Tool_tremolo::addTremoloInterpretations(HumdrumFile& infile) {
+string Tool_tspos::generateTable(HumdrumFile& infile, vector<string>& names) {
 
-	// Insert starting *tremolo
-	for (int i=0; i<(int)m_first_tremolo_time.size(); i++) {
-		if (m_first_tremolo_time[i] < 0) {
-			continue;
-		}
-		HLp line = infile.insertNullInterpretationLine(m_first_tremolo_time[i]);
-		if (line != NULL) {
-			for (int j=0; j<line->getFieldCount(); j++) {
-				HTp token = line->token(j);
-				int track = token->getTrack();
-				int subtrack = token->getSubtrack();
-				if (subtrack > 1) {
-					// Currently *tremolo affects all subtracks, but this
-					// will probably change in the future.
-					continue;
-				}
-				if (track == i) {
-					token->setText("*tremolo");
-					line->createLineFromTokens();
-				}
-			}
-		}
+	string toolPrefix = "TOOL-";
+	if (m_toolCount > 0) {
+		toolPrefix += to_string(m_toolCount) + "-";
 	}
+	toolPrefix += m_toolName + "-";
 
-	// Insert ending *Xtremolo
-	for (int i=0; i<(int)m_last_tremolo_time.size(); i++) {
-		if (m_last_tremolo_time[i] < 0) {
-			continue;
-		}
-		HLp line = infile.insertNullInterpretationLineAbove(m_last_tremolo_time[i]);
-		if (line != NULL) {
-			for (int j=0; j<line->getFieldCount(); j++) {
-				HTp token = line->token(j);
-				int track = token->getTrack();
-				int subtrack = token->getSubtrack();
-				if (subtrack > 1) {
-					// Currently *tremolo affects all subtracks, but this
-					// will probably change in the future.
-					continue;
-				}
-				if (track == i) {
-					token->setText("*Xtremolo");
-					line->createLineFromTokens();
-				}
-			}
+	vector<HTp> spinestarts;
+	infile.getSpineStartList(spinestarts);
+	stringstream out;
+	out << "!!@@BEGIN: PREHTML\n";
+	out << "!!@CONTENT:\n";
+	out << "!!<div class='tool-" << m_toolName << "'>\n";
+	out << "!!<h2 class='header-tool-" << m_toolName << "'>";
+	if (m_majorQ && !m_minorQ) {
+		out << "Major triadic";
+	} else if (!m_majorQ && m_minorQ) {
+		out << "Minor triadic";
+	} else {
+		out << "Triadic";
+	}
+	out << " sonority position analysis";
+	if (m_questionQ) {
+		out <<  " <a class='info-" << m_toolName
+				<< "' target='_blank' href='https://doc.verovio.humdrum.org/filter/"
+				<< m_toolName
+				<< "'>?</a>";
+	}
+	out << "</h2>\n";
+	out << "!!<table class='analysis'>\n";
+	out << "!!<tr><th class='voice'>Voice</th>"
+			<< "<th class='root'>Root</th><th class='third'>Third</th>"
+			<< "<th class='fifth'>Fifth</th><th class='total'>Total</th></td>\n";
+
+	int rootSum = 0;
+	int thirdSum = 0;
+	int fifthSum = 0;
+
+	std::vector<vector<int>>& pt =  m_partTriadPositions;
+	for (int i=(int)names.size() - 1; i>0; i--) {
+		int track = i;
+		if (!spinestarts.at(i-1)->isKern()) {
+			continue;
+		}
+		out << "!!<tr>\n";
+		int sum = 0;
+		for (int j=0; j<(int)pt[i].size(); j++) {
+			sum += pt[i][j];
+		}
+
+		int rootCount  = pt.at(i)[0] + pt.at(i)[3] + pt.at(i)[5];
+		int thirdCount = pt.at(i)[1] + pt.at(i)[4];
+		int fifthCount = pt.at(i)[2] + pt.at(i)[6];
+
+		rootSum  += rootCount;
+		thirdSum += thirdCount;
+		fifthSum += fifthCount;
+
+		// Requires the colors to be hex:
+		string oc1 = makeOpacityColor(m_root_color,  rootCount,  sum);
+		string oc3 = makeOpacityColor(m_third_color, thirdCount, sum);
+		string oc5 = makeOpacityColor(m_fifth_color, fifthCount, sum);
+
+		out << "!!   <td class='voice'>" << m_fullNames[i] << "</td>\n";
+		out << "!!   <td class='root'  style='background-color:" << oc1
+			<< ";'>@{" << toolPrefix << "root-count-"  << to_string(track)
+			<< "-" << names[track] << "}</td>\n";
+		out << "!!   <td class='third' style='background-color:" << oc3
+			<< ";'>@{" << toolPrefix << "third-count-" << to_string(track)
+			<< "-" << names[track] << "}</td>\n";
+		out << "!!   <td class='fifth' style='background-color:" << oc5
+				<< ";'>@{" << toolPrefix << "fifth-count-" << to_string(track)
+				<< "-" << names[track] << "}</td>\n";
+		out << "!!   <td class='total'>@{" << toolPrefix << "count-sum-"
+				<< to_string(track) << "-" << names[track] << "}</td>\n";
+		out << "!!</tr>\n";
+	}
+
+	int totalSum = rootSum + thirdSum + fifthSum;
+
+	string p1 = makePercentString(rootSum,  totalSum, 1);
+	string p3 = makePercentString(thirdSum, totalSum, 1);
+	string p5 = makePercentString(fifthSum, totalSum, 1);
+
+	string oc1 = makeOpacityColor(m_root_color,  rootSum,  totalSum);
+	string oc3 = makeOpacityColor(m_third_color, thirdSum, totalSum);
+	string oc5 = makeOpacityColor(m_fifth_color, fifthSum, totalSum);
+
+	// print column sum table
+	out << "!!<tr>\n";
+	out << "!!<td style='text-align:right; font-style:italic;'>\n";
+	out << "!!   sum:\n";
+	out << "!!</td>\n";
+
+	// root sum:
+	out << "!!<td class='root' style='background-color:" << oc1 << ";'>\n";
+	out << "!!   " << rootSum << " (" << p1 << "%)" << endl;
+	out << "!!</td>\n";
+
+	// third sum:
+	out << "!!<td class='third' style='background-color:" << oc3 << ";'>\n";
+	out << "!!   " << thirdSum << " (" << p3 << "%)" << endl;
+	out << "!!</td>\n";
+
+	// fifth sum:
+	out << "!!<td class='fifth' style='background-color:" << oc5 << ";'>\n";
+	out << "!!   " << fifthSum << " (" << p5 << "%)" << endl;
+	out << "!!</td>\n";
+
+	// total sum:
+	out << "!!<td class='total'>\n";
+	out << "!!   " << totalSum << endl;
+	out << "!!</td>\n";
+
+	out << "!!</tr>\n";
+
+	out << "!!</table>\n";
+
+	stringstream options;
+	int licount = 0;
+	options << "!!<ul>\n";
+
+	// Print summary of options used:
+	if (m_voice > 0) {
+		options << "!!<li> Only sonorities with " << m_voice << " sounding voices analyzed</li>\n";
+		licount++;
+	}
+
+	if (m_triadAttack) {
+		options << "!!<li> Only sonorities with at least three unique pitch-class attacks are analyzed</li>\n";
+		licount++;
+	}
+
+	if (!(m_colorThirds && m_colorFifths && m_colorTriads)) {
+		if (m_colorTriads && m_colorThirds && m_colorFifths) {
+			options << "!!<li> Sonorities with two or three triadic positions analyzed</li>\n";
+			licount++;
+		} else if (m_colorTriads && !m_colorThirds && !m_colorFifths) {
+			options << "!!<li> Only sonorities with all three triadic positions analyzed</li>\n";
+			licount++;
+		} else if (!m_colorTriads && m_colorThirds && m_colorFifths) {
+			options << "!!<li> Only sonorities with two triadic positions analyzed</li>\n";
+			licount++;
+		} else if (!m_colorTriads && m_colorThirds && !m_colorFifths) {
+			options << "!!<li> Only sonorities with open thirds analyzed</li>\n";
+			licount++;
+		} else if (!m_colorTriads && !m_colorThirds && m_colorFifths) {
+			options << "!!<li> Only sonorities with open fifths analyzed</li>\n";
+			licount++;
+		} else if (m_colorTriads && m_colorThirds && !m_colorFifths) {
+			options << "!!<li> Ignoring open fifths </li>\n";
+			licount++;
+		} else if (m_colorTriads && !m_colorThirds && m_colorFifths) {
+			options << "!!<li> Ignoring open thirds </li>\n";
+			licount++;
 		}
+	} else {
+		// print a message about both two- and three-pitch-class sonorities?
+	}
+
+	options << "!!</ul>\n";
+	if (licount) {
+		out << options.str();
 	}
+
+	out << "!!</div>\n";
+
+	// Styling of table:
+	out << "!!<style>\n";
+	out << "!!div.tool-" << m_toolName << " { padding-left: 20px;}\n";
+	out << "!!div.tool-" << m_toolName << " table tr:hover { background: orange; }\n";
+	out << "!!div.tool-" << m_toolName << " table {\n";
+	out << "!!   border-collapse: collapse;\n";
+	out << "!!   border: 1px solid orange;\n";
+	out << "!!   margin: 10px;\n";
+	out << "!!   max-width: 800px;\n";
+	out << "!!}\n";
+	out << "!!div.tool-" << m_toolName << " table td.total, div.tool-" << m_toolName
+			<< " table th.total { text-align: center; }\n";
+	out << "!!th { background-color: bisque; }\n";
+	out << "!!div.tool-" << m_toolName << "table th, div.tool-" << m_toolName
+			<< " table td { padding: 5px; }\n";
+	out << "!!a.info-" << m_toolName << " {\n"
+			 << "!!   text-decoration:none;\n"
+			 << "!!   font-size:70%;\n"
+			 << "!!   display:inline-block;\n"
+			 << "!!   background:#ffaa0070;\n"
+			 << "!!   text-align:center;\n"
+			 << "!!   border: 1px solid orange;\n"
+			 << "!!   border-radius:12px;\n"
+			 << "!!   width:25px;\n"
+			 << "!!   height:25px;\n"
+			 << "!!}\n";
+	out << "!! a.info-" << m_toolName << ":link, a.info-"
+			<< m_toolName << ":visited, a.info-"
+			<< m_toolName << ":active { background:orange; }\n";
+	out << "!! a.info-" << m_toolName
+			<< ":hover { color: white; background-color: purple; }\n";
+	out << "!!</style>\n";
+
+	out << "!!@@END: PREHTML\n";
+	return out.str();
 }
 
 
 
 //////////////////////////////
 //
-// Tool_tremolo::expandTremolos --
+// Tool_tspos::makeOpacityColor --
 //
 
-void Tool_tremolo::expandTremolos(void) {
-	for (int i=0; i<(int)m_markup_tokens.size(); i++) {
-		if (m_markup_tokens[i]->find("@@") != string::npos) {
-			expandFingerTremolo(m_markup_tokens[i]);
-		} else {
-			expandTremolo(m_markup_tokens[i]);
-		}
-	}
+string Tool_tspos::makeOpacityColor(string& color, double value, double total) {
+	stringstream output;
+	int percent  = int(value / total * 255.49 + 0.5);
+	output << color << std::hex << std::setw(2) << std::setfill('0') << percent << std::dec;
+	return output.str();
 }
 
 
 
 //////////////////////////////
 //
-// Tool_tremolo::expandTremolo --
+// Tool_tspos::makePercentString --
 //
 
-void Tool_tremolo::expandTremolo(HTp token) {
-	HumRegex hre;
-	HumNum value = 0;
-	HumNum duration;
-	HumNum repeat;
-	HumNum increment;
-	bool addBeam = false;
-	int tnotes = -1;
-	if (hre.search(token, "@(\\d+)@")) {
-		value = hre.getMatchInt(1);
-		duration = Convert::recipToDuration(token);
-		HumNum count = duration * value / 4;
-		if (!count.isInteger()) {
-			cerr << "Error: non-integer number of tremolo notes: " << token << endl;
-			return;
-		}
-		if (value < 8) {
-			cerr << "Error: tremolo notes can only be eighth-notes or shorter" << endl;
-			return;
-		}
-		if (duration.getFloat() > 0.5) {
-			// needs to be less that one for tuplet quarter note tremolos
-			addBeam = true;
-		}
-
-		// There are cases where duration < 1 need added beams
-		// when the note is not already in a beam.  Such as
-		// a plain 8th note with a slash.  This needs to be
-		// converted into two 16th notes with a beam so that
-		// *tremolo can reduce it back into a tremolo, since
-		// it will only reduce beam groups.
-
-		repeat = duration;
-		repeat *= value;
-		repeat /= 4;
-		increment = 4;
-		increment /= value;
-		if (!repeat.isInteger()) {
-			cerr << "Error: tremolo repetition count must be an integer: " << token << endl;
-			return;
-		}
-		tnotes = repeat.getNumerator();
-	} else {
-		return;
+string Tool_tspos::makePercentString(double value, double total, int digits) {
+	double percent = int(value / total * 100.0 * std::pow(10, digits) + 0.5) / std::pow(10, digits);
+	stringstream output;
+	output << percent;
+	if ((percent - int(percent)) < 1.0 / std::pow(10, digits) / 10.0) {
+		output << ".0";
 	}
+	return output.str();
+}
 
-	storeFirstTremoloNoteInfo(token);
 
-	int beams = log((double)(value.getFloat()))/log(2.0) - 2;
-	string markup = "@" + to_string(value.getNumerator()) + "@";
-	string base = token->getText();
-	hre.replaceDestructive(base, "", markup, "g");
 
-	// complicated beamings are not allowed yet (no internal L/J markers in tremolo beam)
-	bool hasBeamStart = base.find('L') != string::npos;
-	bool hasBeamStop  = base.find('J') != string::npos;
+//////////////////////////////
+//
+// Tool_tspos::getVectorSum --
+//
 
-	if (addBeam) {
-		hasBeamStart = true;
-		hasBeamStop = true;
+int Tool_tspos::getVectorSum(vector<int>& input) {
+	int sum = 0;
+	for (int i=0; i<(int)input.size(); i++) {
+		sum += input[i];
 	}
+	return sum;
+}
 
-	// Currently not allowed to add tremolo to beamed notes, so remove all beaming:
-	hre.replaceDestructive(base, "", "[LJKk]+", "g");
-	string startbeam;
-	string endbeam;
-	for (int i=0; i<beams; i++) {
-		startbeam += 'L';
-		endbeam   += 'J';
-	}
-	// Set the rhythm of the tremolo notes.
-	// Augmentation dot is expected adjacent to regular rhythm value.
-	// Maybe allow anywhere?
-	hre.replaceDestructive(base, to_string(value.getNumerator()), "\\d+%?\\d*\\.*", "g");
-	string initial = base;
-	if (hasBeamStart) {
-		initial += startbeam;
-	}
-	string terminal = base;
-	if (hasBeamStop) {
-		terminal += endbeam;
-	}
-	// remove slur end from start of tremolo:
-	hre.replaceDestructive(initial, "", "[)]+[<>]?", "g");
-	if (m_keepQ) {
-		initial += markup;
-	}
-	// remove slur start information from end of tremolo:
-	hre.replaceDestructive(terminal, "", "[(]+[<>]?", "g");
 
-	// remove slur information from middle of tremolo:
-	hre.replaceDestructive(base, "", "[()]+[<>]?", "g");
 
-	token->setText(initial);
-	token->getOwner()->createLineFromTokens();
+//////////////////////////////
+//
+// Tool_tspos::getTrackNames --
+//
 
-	// Now fill in the rest of the tremolos.
-	HumNum starttime = token->getDurationFromStart();
-	HumNum timestamp = starttime + increment;
-	HTp current = token->getNextToken();
-	int counter = 1;
-	while (current) {
-		if (!current->isData()) {
-			current = current->getNextToken();
-			continue;
-		}
-		HumNum duration = current->getOwner()->getDuration();
-		if (duration == 0) {
-			// grace note line, so skip
-			current = current->getNextToken();
-			continue;
-		}
-		HumNum cstamp = current->getDurationFromStart();
-		if (cstamp < timestamp) {
-			current = current->getNextToken();
-			continue;
-		}
-		if (cstamp > timestamp) {
-			cerr << "\tWarning: terminating tremolo insertion early" << endl;
-			cerr << "\tCSTAMP : " << cstamp << " TSTAMP " << timestamp << endl;
+vector<string> Tool_tspos::getTrackNames(HumdrumFile& infile) {
+	int tracks = infile.getTrackCount();
+	m_fullNames.clear();
+	m_fullNames.resize(tracks+1);
+	vector<string> output(tracks+1);
+	for (int i=1; i<(int)output.size(); i++) {
+		output[i] = "Spine " + to_string(i);
+	}
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (infile[i].isData()) {
 			break;
 		}
-		counter++;
-		if (tnotes == counter) {
-			current->setText(terminal);
-			storeLastTremoloNoteInfo(current);
-		} else {
-			current->setText(base);
-		}
-		current->getOwner()->createLineFromTokens();
-		if (counter >= tnotes) {
-			// done with inserting of tremolo notes.
-			break;
+		for (int j=0; j<infile[i].getFieldCount(); j++) {
+			HTp token = infile.token(i, j);
+			if (token->compare(0, 3, "*I\"") == 0) {
+				string value = token->substr(3);
+				if (!value.empty()) {
+					int track = token->getTrack();
+					output.at(track) = value;
+				}
+			}
 		}
-		timestamp += increment;
-		current = current->getNextToken();
 	}
+	// Remove colons from names and convert spaces into underscores:
+	HumRegex hre;
+	for (int i=1; i<(int)output.size(); i++) {
+		m_fullNames[i] = output[i];
+		hre.replaceDestructive(output[i], "", "^\\s+");
+		hre.replaceDestructive(output[i], "", "\\s+$");
+		hre.replaceDestructive(output[i], "_", "\\s+", "g");
+		hre.replaceDestructive(output[i], "", ":", "g");
+	}
+	return output;
 }
 
 
+
 //////////////////////////////
 //
-// Tool_tremolo::getNextNote --
+// Tool_tspos::labelChordPositions -- Mark the scale degree of notes:
+//       0: not in triadic sonority so no label.
+//       1 == @: root (such as C in C major triad)
+//       3 == N third (such as E in C major triad)
+//       5 == Z fifth (such as G in C major triad)
 //
 
-HTp Tool_tremolo::getNextNote(HTp token) {
-	HTp output = NULL;
-	HTp current = token->getNextToken();
-	while (current) {
-		if (!current->isData()) {
-			current = current->getNextToken();
+void Tool_tspos::labelChordPositions(vector<HTp>& kernNotes, vector<int>& chordPositions) {
+	for (int i=0; i<(int)kernNotes.size(); i++) {
+		int position = chordPositions.at(i);
+		if (position == 0) {
 			continue;
 		}
-		if (current->getDuration() == 0) {
-			// ignore grace notes
-			current = current->getNextToken();
-			continue;
+
+		int track = kernNotes[i]->getTrack(); // get part
+		string label;
+		switch (position) {
+			case 1:
+				label = m_root_marker;
+				m_used_markers[0]++;
+				m_partTriadPositions.at(track).at(0)++;
+				break;
+			case 3:
+				label = m_third_marker;
+				m_used_markers[1]++;
+				m_partTriadPositions.at(track).at(1)++;
+				break;
+			case 5:
+				label = m_fifth_marker;
+				m_used_markers[2]++;
+				m_partTriadPositions.at(track).at(2)++;
+				break;
 		}
-		if (current->isNull() || current->isRest()) {
-			current = current->getNextToken();
+		if (label.empty()) {
 			continue;
 		}
-		output = current;
-		break;
+		string text = *kernNotes.at(i);
+		text += label;
+		kernNotes.at(i)->setText(text);
 	}
-
-	return output;
 }
 
 
+
 //////////////////////////////
 //
-// Tool_tremolo::expandFingerTremolos --
-//
+// Tool_tspos::labelThirds -- Mark the scale degree of notes:
+//       0: not in interval sonority so no label.
+//       1 == @: root (bottom of the interval)
+//       3 == N: third (top of the interval)
 
-void Tool_tremolo::expandFingerTremolo(HTp token1) {
-	HTp token2 = getNextNote(token1);
-	if (token2 == NULL) {
-		return;
-	}
-	HumRegex hre;
-	int value = 0;
-	HumNum duration;
-	HumNum repeat;
-	HumNum increment;
-	int tnotes = -1;
-	if (hre.search(token1, "@@(\\d+)@@")) {
-		value = hre.getMatchInt(1);
-		if (!Convert::isPowerOfTwo(value)) {
-			cerr << "Error: not a power of two: " << token1 << endl;
-			return;
-		}
-		if (value < 8) {
-			cerr << "Error: tremolo can only be eighth-notes or shorter" << endl;
-			return;
+void Tool_tspos::labelThirds(vector<HTp>& kernNotes, vector<int>& thirdPositions) {
+	for (int i = 0; i < (int)kernNotes.size(); i++) {
+		int position = thirdPositions.at(i);
+		if (position == 0) {
+			continue;
 		}
-		duration = Convert::recipToDuration(token1);
-		HumNum count = duration;
 
-		count *= value;
-		count /= 4;
-		if (!count.isInteger()) {
-			cerr << "Error: tremolo repetition count must be an integer: " << token1 << endl;
-			return;
+		int track = kernNotes.at(i)->getTrack(); // get part
+		string label;
+		switch (position) {
+			case 1:
+				label = m_3rd_root_marker;
+				m_used_markers[3]++;
+				m_partTriadPositions.at(track).at(3)++;
+				break;
+			case 3:
+				label = m_3rd_third_marker;
+				m_used_markers[4]++;
+				m_partTriadPositions.at(track).at(4)++;
+				break;
 		}
-		increment = 4;
-		increment /= value;
-
-		tnotes = count.getNumerator() * 2;
-	} else {
-		return;
-	}
-
-	storeFirstTremoloNoteInfo(token1);
-
-	int beams = log((double)(value))/log(2.0) - 2;
-	string markup = "@@" + to_string(value) + "@@";
-
-	string base1 = token1->getText();
-	hre.replaceDestructive(base1, "", markup, "g");
-	// Currently not allowed to add tremolo to beamed notes, so remove all beaming:
-	hre.replaceDestructive(base1, "", "[LJKk]+", "g");
-	string startbeam;
-	string endbeam;
-	for (int i=0; i<beams; i++) {
-		startbeam += 'L';
-		endbeam   += 'J';
-	}
-
-	// Set the rhythm of the tremolo notes.
-	// Augmentation dot is expected adjacent to regular rhythm value.
-	// Maybe allow anywhere?
-	hre.replaceDestructive(base1, to_string(value), "\\d+%?\\d*\\.*", "g");
-	string initial = base1 + startbeam;
-	// remove slur end from start of tremolo:
-	hre.replaceDestructive(initial, "", "[)]+[<>]?", "g");
-	if (m_keepQ) {
-		initial += markup;
-	}
 
-	// remove slur information from middle of tremolo:
-	hre.replaceDestructive(base1, "", "[()]+[<>]?", "g");
-
-	token1->setText(initial);
-	token1->getOwner()->createLineFromTokens();
+		if (label.empty()) {
+			continue;
+		}
+		string text = *kernNotes.at(i);
+		text += label;
+		kernNotes.at(i)->setText(text);
+	}
+}
 
-	string base2 = token2->getText();
-	hre.replaceDestructive(base2, "", "[LJKk]+", "g");
-	hre.replaceDestructive(base2, to_string(value), "\\d+%?\\d*\\.*", "g");
 
-	string terminal = base2 + endbeam;
-	// remove slur start information from end of tremolo:
-	hre.replaceDestructive(terminal, "", "[(]+[<>]?", "g");
 
-	bool state = false;
+//////////////////////////////
+//
+// Tool_tspos::labelFifths -- Mark the scale degree of notes:
+//       0: not in interval sonority so no label.
+//       1 == @: root (bottom of the interval)
+//       5 == Z: fifth (top of the interval)
 
-	// Now fill in the rest of the tremolos.
-	HumNum starttime = token1->getDurationFromStart();
-	HumNum timestamp = starttime + increment;
-	HTp current = token1->getNextToken();
-	int counter = 1;
-	while (current) {
-		if (!current->isData()) {
-			// Also check if line is non-zero duration (not a grace-note line).
-			current = current->getNextToken();
-			continue;
-		}
-		HumNum cstamp = current->getDurationFromStart();
-		if (cstamp < timestamp) {
-			current = current->getNextToken();
+void Tool_tspos::labelFifths(vector<HTp>& kernNotes, vector<int>& fifthPositions) {
+	for (int i = 0; i < (int)kernNotes.size(); i++) {
+		int position = fifthPositions.at(i);
+		if (position == 0) {
 			continue;
 		}
-		if (cstamp > timestamp) {
-			cerr << "\tWarning: terminating tremolo insertion early" << endl;
-			cerr << "\tCSTAMP : " << cstamp << " TSTAMP " << timestamp << endl;
-			break;
-		}
-		counter++;
-		if (tnotes == counter) {
-			current->setText(terminal);
-			storeLastTremoloNoteInfo(current);
-		} else {
-			if (state) {
-				current->setText(base1);
-			} else {
-				current->setText(base2);
-			}
-			state = !state;
+
+		int track = kernNotes.at(i)->getTrack(); // get part
+		string label;
+		switch (position) {
+			case 1:
+				label = m_5th_root_marker;
+				m_used_markers[5]++;
+				m_partTriadPositions.at(track).at(5)++;
+				break;
+			case 5:
+				label = m_5th_fifth_marker;
+				m_used_markers[6]++;
+				m_partTriadPositions.at(track).at(6)++;
+				break;
 		}
-		current->getOwner()->createLineFromTokens();
-		if (counter >= tnotes) {
-			// done with inserting of tremolo notes.
-			break;
+
+		if (label.empty()) {
+			continue;
 		}
-		timestamp += increment;
-		current = current->getNextToken();
+		string text = *kernNotes.at(i);
+		text += label;
+		kernNotes.at(i)->setText(text);
 	}
 }
 
@@ -117103,403 +122221,389 @@ void Tool_tremolo::expandFingerTremolo(HTp token1) {
 
 //////////////////////////////
 //
-// Tool_tremolo::removeMarkup --  Remove markup such as "@16@" from tokens.
+// Tool_tspos::getNoteMods -- Identify if the sonority is a triad, and if so, place
+//    the position of the note in the chord:
+//       0: not in triadic sonority.
+//       1: root (such as C in C major triad)
+//       3: third (such as E in C major triad)
+//       5: fifth (such as G in C major triad)
 //
 
-void Tool_tremolo::removeMarkup(void) {
-	if (m_markup_tokens.empty()) {
-		return;
+vector<int> Tool_tspos::getNoteMods(vector<int>& midiNotes) {
+	// create modulo 12 arr
+	vector<int> pitchClasses(12, 0);
+	for (int i = 0; i < (int)midiNotes.size(); i++) {
+		int index = midiNotes.at(i) % 12;
+		pitchClasses.at(index)++; // add one to the pitch
 	}
-	HumRegex hre;
-	for (int i=0; i<(int)m_markup_tokens.size(); i++) {
-		HTp token = m_markup_tokens[i];
-		string text = *token;
-		hre.replaceDestructive(text, "", "@+\\d+@+");
-		token->setText(text);
-		token->getOwner()->createLineFromTokens();
+
+	vector<int> noteMods;
+
+	for (int i = 0; i < (int)pitchClasses.size(); i++) {
+		if (pitchClasses.at(i) != 0) { // not zero
+			noteMods.push_back(i); // add the index
+		}
 	}
+
+	return noteMods;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_tremolo::storeFirstTremoloNote --
-//
+// Tool_tspos::getThirds -- Identify if the sonority is a third interval, and if so,
+//    place the position of the note in the output.
+//       0: not in the sonority
+//       1: root (bottom of the interval)
+//       3: third (top of the interval)
 
-void Tool_tremolo::storeFirstTremoloNoteInfo(HTp token) {
-	int track = token->getTrack();
-	HumNum timestamp = token->getDurationFromStart();
-	if (m_first_tremolo_time.at(track) < 0) {
-		m_first_tremolo_time.at(track) = timestamp;
-	} else if (timestamp < m_first_tremolo_time.at(track)) {
-		// This case is probably not necessary.
-		m_first_tremolo_time.at(track) = timestamp;
+vector<int> Tool_tspos::getThirds(vector<int>& midiNotes) {
+	vector<int> output(midiNotes.size(), 0);
+
+	if (midiNotes.empty()) {
+		return output;
 	}
-}
 
+	vector<int> noteMods = getNoteMods(midiNotes); // we know noteMods is sorted
+	if (noteMods.size() != 2) {
+		return output;
+	}
 
+	int interval = noteMods[1] - noteMods[0];
+	int rootClass = -1; // currently uninitialized
+	int thirdClass = -1;
 
-//////////////////////////////
-//
-// Tool_tremolo::storeLastTremoloNote --
-//
+	if (m_majorQ && m_minorQ) {
+
+		if (interval == 3 || interval == 4) { // third is found
+			rootClass = noteMods.at(0);
+			thirdClass = noteMods.at(1);
+		}
+		else if (interval == 8 || interval == 9) { // third is found (inversion)
+			rootClass = noteMods.at(1);
+			thirdClass = noteMods.at(0);
+		}
 
-void Tool_tremolo::storeLastTremoloNoteInfo(HTp token) {
-	if (!token) {
-		return;
-	}
-	int track = token->getTrack();
-	if (track < 1) {
-		cerr << "Track is not set for token: " << track << endl;
-		return;
 	}
-	HumNum timestamp = token->getDurationFromStart();
-	timestamp += Convert::recipToDuration(token);
-	if (m_last_tremolo_time.at(track) < 0) {
-		m_last_tremolo_time.at(track) = timestamp;
-	} else if (timestamp > m_last_tremolo_time.at(track)) {
-		m_last_tremolo_time.at(track) = timestamp;
+
+	else if (!m_majorQ && m_minorQ) {
+		if (interval == 3) { // minor third is found
+			rootClass = noteMods.at(0);
+			thirdClass = noteMods.at(1);
+		}
+		else if (interval == 9) { // major sixth is found (inversion)
+			rootClass = noteMods.at(1);
+			thirdClass = noteMods.at(0);
+		}
 	}
-}
 
+	else if (m_majorQ && !m_minorQ) {
 
+		if (interval == 4) { // major third is found
+			rootClass = noteMods.at(0);
+			thirdClass = noteMods.at(1);
+		}
+		else if (interval == 8) { // minor sixth is found (inversion)
+			rootClass = noteMods.at(1);
+			thirdClass = noteMods.at(0);
+		}
 
+	}
 
+	if (rootClass == -1) { // third was not found
+		return output;
+	}
 
-/////////////////////////////////
-//
-// Tool_trillspell::Tool_trillspell -- Set the recognized options for the tool.
-//
+	// populate output
+	for (int i = 0; i < (int)midiNotes.size(); i++) {
+		if (midiNotes.at(i) % 12 == rootClass) {
+		output.at(i) = 1;
+		} else if (midiNotes.at(i) % 12 == thirdClass) {
+			output.at(i) = 3;
+		}
+	}
 
-Tool_trillspell::Tool_trillspell(void) {
-	define("x=b", "mark trills with x (interpretation)");
+	return output;
 }
 
 
 
-///////////////////////////////
-//
-// Tool_trillspell::run -- Primary interfaces to the tool.
+//////////////////////////////
 //
+// Tool_tspos::getFifths -- Identify if the sonority is a fifth interval, and if so,
+//    place the position of the note in the output.
+//       0: not in the sonority
+//       1: root (bottom of the interval)
+//       5: fifth (top of the interval)
 
-bool Tool_trillspell::run(HumdrumFileSet& infiles) {
-	bool status = true;
-	for (int i=0; i<infiles.getCount(); i++) {
-		status &= run(infiles[i]);
+vector<int> Tool_tspos::getFifths(vector<int>& midiNotes) {
+	vector<int> output(midiNotes.size(), 0);
+
+	if (midiNotes.empty()) {
+		return output;
 	}
-	return status;
-}
 
-bool Tool_trillspell::run(const string& indata, ostream& out) {
-	HumdrumFile infile(indata);
-	return run(infile, out);
-}
+	vector<int> noteMods = getNoteMods(midiNotes);
+	if (noteMods.size() != 2) {
+		return output;
+	}
 
+	int interval = noteMods.at(1) - noteMods.at(0);
+	int rootClass = -1; // currently uninitialized
+	int fifthClass = -1;
 
-bool Tool_trillspell::run(HumdrumFile& infile, ostream& out) {
-	bool status = run(infile);
-	return status;
-}
+	if ((interval == 7) || (interval == 6)) { // fifth found
+		rootClass = noteMods.at(0);
+		fifthClass = noteMods.at(1);
+	}
 
+	if (interval == 5) { // inverted fifth found
+		rootClass = noteMods.at(1);
+		fifthClass = noteMods.at(0);
+	}
 
-bool Tool_trillspell::run(HumdrumFile& infile) {
-	processFile(infile);
-	infile.createLinesFromTokens();
-	return true;
+	if (rootClass == -1) { // fifth not found
+		return output;
+	}
+
+	// populate output
+	for (int i = 0; i < (int)midiNotes.size(); i++) {
+		if (midiNotes.at(i) % 12 == rootClass) {
+			output.at(i) = 1;
+		}
+		else if (midiNotes.at(i) % 12 == fifthClass) {
+			output.at(i) = 5;
+		}
+	}
+
+	return output;
 }
 
 
 
 ///////////////////////////////
 //
-// Tool_trillspell::processFile -- Adjust intervals of ornaments.
+// Tool_tspos::getChordPositions --
 //
 
-void Tool_trillspell::processFile(HumdrumFile& infile) {
-	m_xmark = getBoolean("x");
-	analyzeOrnamentAccidentals(infile);
-}
-
+vector<int> Tool_tspos::getChordPositions(vector<int>& midiNotes) {
+	vector<int> output(midiNotes.size(), 0);
+	if (midiNotes.empty()) {
+		return output;
+	}
 
+	vector<int> noteMods = getNoteMods(midiNotes);
 
-//////////////////////////////
-//
-// Tool_trillspell::analyzeOrnamentAccidentals --
-//
+	if (noteMods.size() != 3) { // not a triad
+		return output;
+	}
 
-bool Tool_trillspell::analyzeOrnamentAccidentals(HumdrumFile& infile) {
-	int i, j, k;
-	int kindex;
-	int track;
+	int bint = noteMods.at(1) - noteMods.at(0);
+	int tint = noteMods.at(2) - noteMods.at(1);
 
-	// ktracks == List of **kern spines in data.
-	// rtracks == Reverse mapping from track to ktrack index (part/staff index).
-	vector<HTp> ktracks = infile.getKernSpineStartList();
-	vector<int> rtracks(infile.getMaxTrack()+1, -1);
-	for (i=0; i<(int)ktracks.size(); i++) {
-		track = ktracks[i]->getTrack();
-		rtracks[track] = i;
-	}
-	int kcount = (int)ktracks.size();
+	int rootClass = -1; // curr uninitialized
+	int thirdClass = -1;
+	int fifthClass = -1;
 
-	// keysigs == key signature spellings of diatonic pitch classes.  This array
-	// is duplicated into dstates after each barline.
-	vector<vector<int> > keysigs;
-	keysigs.resize(kcount);
-	for (i=0; i<kcount; i++) {
-		keysigs[i].resize(7);
-		std::fill(keysigs[i].begin(), keysigs[i].end(), 0);
+	if (m_majorQ && m_minorQ) {
+
+		if ((bint == 3 && tint == 4) || (bint == 4 && tint == 3) || (bint == 3 && tint == 3)) { // root pos
+			rootClass = noteMods.at(0);
+			thirdClass = noteMods.at(1);
+			fifthClass = noteMods.at(2);
+		} else if ((bint == 4 && tint == 5) || (bint == 3 && tint == 5) || (bint == 3 && tint == 6)) { // first inv
+			rootClass = noteMods.at(2);
+			thirdClass = noteMods.at(0);
+			fifthClass = noteMods.at(1);
+		} else if ((bint == 5 && tint == 3) || (bint == 5 && tint == 4) || (bint == 6 && tint == 3)) { // sec inv
+			rootClass = noteMods.at(1);
+			thirdClass = noteMods.at(2);
+			fifthClass = noteMods.at(0);
+		}
+	}
+
+	else if (!m_majorQ && m_minorQ) {
+		if (bint == 3 && tint == 4) {// minor root pos
+			rootClass = noteMods.at(0);
+			thirdClass = noteMods.at(1);
+			fifthClass = noteMods.at(2);
+		} else if (bint == 4 && tint == 5) { // minor first inv
+			rootClass = noteMods.at(2);
+			thirdClass = noteMods.at(0);
+			fifthClass = noteMods.at(1);
+		} else if (bint == 5 && tint == 3) { // minor sec inv
+			rootClass = noteMods.at(1);
+			thirdClass = noteMods.at(2);
+			fifthClass = noteMods.at(0);
+		}
+	}
+
+	else if (m_majorQ && !m_minorQ) {
+		if (bint == 4 && tint == 3) {// major root pos
+			rootClass = noteMods.at(0);
+			thirdClass = noteMods.at(1);
+			fifthClass = noteMods.at(2);
+		} else if (bint == 3 && tint == 5) { // major first inv
+			rootClass = noteMods.at(2);
+			thirdClass = noteMods.at(0);
+			fifthClass = noteMods.at(1);
+		} else if (bint == 5 && tint == 4) { // major sec inv
+			rootClass = noteMods.at(1);
+			thirdClass = noteMods.at(2);
+			fifthClass = noteMods.at(0);
+		}
 	}
 
-	// dstates == diatonic states for every pitch in a spine.
-	// sub-spines are considered as a single unit, although there are
-	// score conventions which would keep a separate voices on a staff
-	// with different accidental states (i.e., two parts superimposed
-	// on the same staff, but treated as if on separate staves).
-	// Eventually this algorithm should be adjusted for dealing with
-	// cross-staff notes, where the cross-staff notes should be following
-	// the accidentals of a different spine...
-	vector<vector<int> > dstates; // diatonic states
-	dstates.resize(kcount);
-	for (i=0; i<kcount; i++) {
-		dstates[i].resize(70);     // 10 octave limit for analysis
-			                        // may cause problems; maybe fix later.
-		std::fill(dstates[i].begin(), dstates[i].end(), 0);
+	if (rootClass == -1) {
+		return output;
 	}
 
-	for (i=0; i<infile.getLineCount(); i++) {
-		if (!infile[i].hasSpines()) {
-			continue;
+	for (int i = 0; i < (int)midiNotes.size(); i++) {
+		if (midiNotes.at(i) % 12 == rootClass) {
+			output.at(i) = 1;
 		}
-		if (infile[i].isInterpretation()) {
-			for (j=0; j<infile[i].getFieldCount(); j++) {
-				if (!infile[i].token(j)->isKern()) {
-					continue;
-				}
-				if (infile[i].token(j)->compare(0, 3, "*k[") == 0) {
-					track = infile[i].token(j)->getTrack();
-					kindex = rtracks[track];
-					fillKeySignature(keysigs[kindex], *infile[i].token(j));
-					// resetting key states of current measure.  What to do if this
-					// key signature is in the middle of a measure?
-					resetDiatonicStatesWithKeySignature(dstates[kindex],
-							keysigs[kindex]);
-				}
-			}
-		} else if (infile[i].isBarline()) {
-			for (j=0; j<infile[i].getFieldCount(); j++) {
-				if (!infile[i].token(j)->isKern()) {
-					continue;
-				}
-				if (infile[i].token(j)->isInvisible()) {
-					continue;
-				}
-				track = infile[i].token(j)->getTrack();
-				kindex = rtracks[track];
-				// reset the accidental states in dstates to match keysigs.
-				resetDiatonicStatesWithKeySignature(dstates[kindex],
-						keysigs[kindex]);
-			}
+		else if (midiNotes.at(i) % 12 == thirdClass) {
+			output.at(i) = 3;
 		}
-
-		if (!infile[i].isData()) {
-			continue;
+		else if (midiNotes.at(i) % 12 == fifthClass) {
+			output.at(i) = 5;
 		}
+	}
 
-		for (j=0; j<infile[i].getFieldCount(); j++) {
-			if (!infile[i].token(j)->isKern()) {
-				continue;
-			}
-			if (infile[i].token(j)->isNull()) {
-				continue;
-			}
-			if (infile[i].token(j)->isRest()) {
-				continue;
-			}
+	if (m_doubleQ) {
+		keepOnlyDoubles(output); // call some function that marks only doubles
+	}
 
-			int subcount = infile[i].token(j)->getSubtokenCount();
-			track = infile[i].token(j)->getTrack();
+	return output;
+}
 
-			HumRegex hre;
-			int rindex = rtracks[track];
-			for (k=0; k<subcount; k++) {
-				string subtok = infile[i].token(j)->getSubtoken(k);
-				int b40 = Convert::kernToBase40(subtok);
-				int diatonic = Convert::kernToBase7(subtok);
-				if (diatonic < 0) {
-					// Deal with extra-low notes later.
-					continue;
-				}
-				int accid = Convert::kernToAccidentalCount(subtok);
-				dstates.at(rindex).at(diatonic) = accid;
 
-				// check for accidentals on trills, mordents and turns.
-				// N.B.: augmented-second intervals are not considered.
 
-				if ((subtok.find("t") != string::npos) && !hre.search(subtok, "[tT]x")) {
-					int nextup = getBase40(diatonic + 1, dstates[rindex][diatonic+1]);
-					int interval = nextup - b40;
-					if (interval == 6) {
-						// Set to major-second trill
-						hre.replaceDestructive(subtok, "T", "t", "g");
-						if (m_xmark) {
-							hre.replaceDestructive(subtok, "$1x", "([Tt]+)", "g");
-						}
-						infile[i].token(j)->replaceSubtoken(k, subtok);
-					} else {
-						if (m_xmark) {
-							hre.replaceDestructive(subtok, "$1x", "([Tt]+)", "g");
-						}
-						infile[i].token(j)->replaceSubtoken(k, subtok);
-					}
-				} else if ((subtok.find("T") != string::npos) && !hre.search(subtok, "[tT]x")) {
-					int nextup = getBase40(diatonic + 1, dstates[rindex][diatonic+1]);
-					int interval = nextup - b40;
-					if (interval == 5) {
-						// Set to minor-second trill
-						hre.replaceDestructive(subtok, "t", "T", "g");
-						if (m_xmark) {
-							hre.replaceDestructive(subtok, "$1x", "([Tt]+)", "g");
-						}
-						infile[i].token(j)->replaceSubtoken(k, subtok);
-					} else {
-						if (m_xmark) {
-							hre.replaceDestructive(subtok, "$1x", "([Tt]+)", "g");
-						}
-						infile[i].token(j)->replaceSubtoken(k, subtok);
-					}
-				} else if ((subtok.find("M") != string::npos) && !hre.search(subtok, "[Mm]x")) {
-					// major-second upper mordent
-					int nextup = getBase40(diatonic + 1, dstates[rindex][diatonic+1]);
-					int interval = nextup - b40;
-					if (interval == 5) {
-						// Set to minor-second upper mordent
-						hre.replaceDestructive(subtok, "m", "M", "g");
-						if (m_xmark) {
-							hre.replaceDestructive(subtok, "$1x", "([Mm]+)", "g");
-						}
-						infile[i].token(j)->replaceSubtoken(k, subtok);
-					} else {
-						if (m_xmark) {
-							hre.replaceDestructive(subtok, "$1x", "([Mm]+)", "g");
-						}
-						infile[i].token(j)->replaceSubtoken(k, subtok);
-					}
-				} else if ((subtok.find("m") != string::npos) && !hre.search(subtok, "[Mm]x")) {
-					// minor-second upper mordent
-					int nextup = getBase40(diatonic + 1, dstates[rindex][diatonic+1]);
-					int interval = nextup - b40;
-					if (interval == 6) {
-						// Set to major-second upper mordent
-						hre.replaceDestructive(subtok, "M", "m", "g");
-						if (m_xmark) {
-							hre.replaceDestructive(subtok, "$1x", "([Mm]+)", "g");
-						}
-						infile[i].token(j)->replaceSubtoken(k, subtok);
-					} else {
-						if (m_xmark) {
-							hre.replaceDestructive(subtok, "$1x", "([Mm]+)", "g");
-						}
-						infile[i].token(j)->replaceSubtoken(k, subtok);
-					}
-				} else if ((subtok.find("W") != string::npos) && !hre.search(subtok, "[Ww]x")) {
-					// major-second lower mordent
-					int nextdn = getBase40(diatonic - 1, dstates[rindex][diatonic-1]);
-					int interval = b40 - nextdn;
-					if (interval == 5) {
-						// Set to minor-second lower mordent
-						hre.replaceDestructive(subtok, "w", "W", "g");
-						if (m_xmark) {
-							hre.replaceDestructive(subtok, "$1x", "([Ww]+)", "g");
-						}
-						infile[i].token(j)->replaceSubtoken(k, subtok);
-					} else {
-						if (m_xmark) {
-							hre.replaceDestructive(subtok, "$1x", "([Ww]+)", "g");
-						}
-						infile[i].token(j)->replaceSubtoken(k, subtok);
-					}
-				} else if ((subtok.find("w") != string::npos) && !hre.search(subtok, "[Ww]x")) {
-					// minor-second lower mordent
-					int nextdn = getBase40(diatonic - 1, dstates[rindex][diatonic-1]);
-					int interval = b40 - nextdn;
-					if (interval == 6) {
-						// Set to major-second lower mordent
-						hre.replaceDestructive(subtok, "W", "w", "g");
-						if (m_xmark) {
-							hre.replaceDestructive(subtok, "$1x", "([Ww]+)", "g");
-						}
-						infile[i].token(j)->replaceSubtoken(k, subtok);
-					} else {
-						if (m_xmark) {
-							hre.replaceDestructive(subtok, "$1x", "([Ww]+)", "g");
-						}
-						infile[i].token(j)->replaceSubtoken(k, subtok);
-					}
-				}
-				// deal with turns and inverted turns here.
+//////////////////////////////
+//
+// Tool_tspos::keepOnlyDoubles --
+//
 
-			}
+void Tool_tspos::keepOnlyDoubles(vector<int>& output) {
+	map<int, int> positionCounts = {{1, 0}, {3, 0}, {5, 0}};
+
+	for (int i = 0; i < (int)output.size(); i++) { // create hashmap of counts
+		if (output[i] == 1) {
+			positionCounts[1]++;
+		}
+		else if (output[i] == 3) {
+			positionCounts[3]++;
+		}
+		else if (output[i] == 5) {
+			positionCounts[5]++;
 		}
 	}
 
-	return true;
+	for (auto positionCount : positionCounts) {
+		if (positionCount.second == 1) { // if only appears once
+		replace(output.begin(), output.end(), positionCount.first, 0); // replace with 0
+		}
+	}
+
+	return;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_trillspell::resetDiatonicStatesWithKeySignature -- Only used in
-//     Tool_trillspell::analyzeKernAccidentals().  Resets the accidental
-//     states for notes
+// Tool_tspos::getMidiNotes -- Convert kern notes to MIDI note numbers.
+//    If the note is sustaining, then make the MIDI note number negative.
 //
 
-void Tool_trillspell::resetDiatonicStatesWithKeySignature(vector<int>&
-		states, vector<int>& signature) {
-	for (int i=0; i<(int)states.size(); i++) {
-		states[i] = signature[i % 7];
+vector<int> Tool_tspos::getMidiNotes(vector<HTp>& kernNotes) {
+	vector<int> output(kernNotes.size());
+	if (kernNotes.empty()) {
+		return output;
+	}
+	for (int i=0; i<(int)kernNotes.size(); i++) {
+		int midiNote = kernNotes.at(i)->getMidiPitch();
+		if (midiNote < 0) {
+			// negative values indicate sustained note.
+			midiNote = -midiNote;
+		}
+		output.at(i) = midiNote;
 	}
+	return output;
 }
 
 
 
 //////////////////////////////
 //
-// Tool_trillspell::fillKeySignature -- Read key signature notes and
-//    assign +1 to sharps, -1 to flats in the diatonic input array.  Used
-//    only by Tool_trillspell::analyzeOrnamentAccidentals().
+// Tool_tspos::avoidRdfCollisions -- Adjust markers if they are already
+//      defined in the file.
 //
 
-void Tool_trillspell::fillKeySignature(vector<int>& states,
-		const string& keysig) {
-	std::fill(states.begin(), states.end(), 0);
-	if (keysig.find("f#") != string::npos) { states[3] = +1; }
-	if (keysig.find("c#") != string::npos) { states[0] = +1; }
-	if (keysig.find("g#") != string::npos) { states[4] = +1; }
-	if (keysig.find("d#") != string::npos) { states[1] = +1; }
-	if (keysig.find("a#") != string::npos) { states[5] = +1; }
-	if (keysig.find("e#") != string::npos) { states[2] = +1; }
-	if (keysig.find("b#") != string::npos) { states[6] = +1; }
-	if (keysig.find("b-") != string::npos) { states[6] = -1; }
-	if (keysig.find("e-") != string::npos) { states[2] = -1; }
-	if (keysig.find("a-") != string::npos) { states[5] = -1; }
-	if (keysig.find("d-") != string::npos) { states[1] = -1; }
-	if (keysig.find("g-") != string::npos) { states[4] = -1; }
-	if (keysig.find("c-") != string::npos) { states[0] = -1; }
-	if (keysig.find("f-") != string::npos) { states[3] = -1; }
+void Tool_tspos::avoidRdfCollisions(HumdrumFile& infile) {
+	map<string, bool> rdfs;
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (!infile[i].isReferenceRecord()) {
+			continue;
+		}
+		string value = infile[i].getReferenceValue();
+		HumRegex hre;
+		if (hre.search(value, "^\\s*([^\\s]+)\\s*=\\s*(.*)\\s*$")) {
+			string rdf = hre.getMatch(1);
+			rdfs[rdf] = true;
+		}
+	}
+
+	vector<string> replacement(7);
+	replacement[0] = "😀";
+	replacement[1] = "😄";
+	replacement[2] = "😉";
+	replacement[3] = "😍";
+	replacement[4] = "😂";
+	replacement[5] = "😎";
+	replacement[6] = "😗";
+
+	if (rdfs[m_root_marker]) {
+		m_root_marker = replacement[0];
+	}
+	if (rdfs[m_third_marker]) {
+		m_third_marker = replacement[1];
+	}
+	if (rdfs[m_fifth_marker]) {
+		m_fifth_marker = replacement[2];
+	}
+	if (rdfs[m_3rd_root_marker]) {
+		m_3rd_root_marker = replacement[3];
+	}
+	if (rdfs[m_3rd_third_marker]) {
+		m_3rd_third_marker = replacement[4];
+	}
+	if (rdfs[m_5th_root_marker]) {
+		m_5th_root_marker = replacement[5];
+	}
+	if (rdfs[m_5th_fifth_marker]) {
+		m_5th_fifth_marker = replacement[6];
+	}
+
 }
 
 
 
 //////////////////////////////
 //
-// Tool_trillspell::getBase40 --
+// Tool_tspos::getToolCounter --
 //
 
-int Tool_trillspell::getBase40(int diatonic, int accidental) {
-	return Convert::base7ToBase40(diatonic) + accidental;
+int Tool_tspos::getToolCounter(HumdrumFile& infile) {
+	int counter = 0;
+	HumRegex hre;
+	for (int i=0; i<infile.getLineCount(); i++) {
+		if (hre.search(infile[i], "^!!@@BEGIN:\\s*PREHTML\\s*$")) {
+			counter++;
+		}
+	}
+	return counter;
 }
 
 
diff --git a/src/ioabc.cpp b/src/ioabc.cpp
index 5ce7bdae43d..a7473bdae60 100644
--- a/src/ioabc.cpp
+++ b/src/ioabc.cpp
@@ -224,7 +224,7 @@ int ABCInput::SetBarLine(const std::string &musicCode, int i)
 
 void ABCInput::CalcUnitNoteLength()
 {
-    MeterSig *meterSig = vrv_cast<MeterSig *>(m_doc->GetCurrentScoreDef()->FindDescendantByType(METERSIG));
+    MeterSig *meterSig = vrv_cast<MeterSig *>(m_doc->GetFirstScoreDef()->FindDescendantByType(METERSIG));
     if (!meterSig || !meterSig->HasUnit() || double(meterSig->GetTotalCount()) / double(meterSig->GetUnit()) >= 0.75) {
         m_unitDur = 8;
         m_durDefault = DURATION_8;
diff --git a/src/iodarms.cpp b/src/iodarms.cpp
index 36082e95284..debf3f3181a 100644
--- a/src/iodarms.cpp
+++ b/src/iodarms.cpp
@@ -521,7 +521,7 @@ bool DarmsInput::Import(const std::string &data_str)
     StaffDef *staffDef = new StaffDef();
     staffDef->SetN(1);
     staffGrp->AddChild(staffDef);
-    m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
+    m_doc->GetFirstScoreDef()->AddChild(staffGrp);
 
     m_doc->ConvertToPageBasedDoc();
 
diff --git a/src/iohumdrum.cpp b/src/iohumdrum.cpp
index fcc530446b3..4353e83816a 100644
--- a/src/iohumdrum.cpp
+++ b/src/iohumdrum.cpp
@@ -27,6 +27,7 @@ using namespace std;
 #include <algorithm>
 #include <cassert>
 #include <cctype>
+#include <climits>
 #include <cmath>
 #include <locale>
 #include <regex>
@@ -68,6 +69,7 @@ using namespace std;
 #include "fb.h"
 #include "fermata.h"
 #include "fig.h"
+#include "fing.h"
 #include "ftrem.h"
 #include "gliss.h"
 #include "hairpin.h"
@@ -624,19 +626,34 @@ bool HumdrumInput::Import(const std::string &content)
             }
         }
 
-        bool result;
-        if (comma <= tab) {
-            result = m_infiles.readString(content);
+        // Check for obvious problems
+        if (content.size() < 2000) {
+            hum::HumRegex hre;
+            if (!hre.search(content, R"(\*\*[A-Za-z0-9_-])")) {
+                std::string dummy = "**kern\n*stria1\n*clefXyy\n1ryy\n*-\n";
+                // bool result = m_infiles.readString(dummy);
+                m_infiles.readString(dummy);
+            }
+            else {
+                // bool result = m_infiles.readString(content);
+                m_infiles.readString(content);
+            }
         }
         else {
-            result = m_infiles.readStringCsv(content);
-        }
-
-        if (!result) {
-            return false;
+            bool result;
+            if (comma <= tab) {
+                result = m_infiles.readString(content);
+            }
+            else {
+                result = m_infiles.readStringCsv(content);
+            }
+            if (!result) {
+                return false;
+            }
         }
 
-        return convertHumdrum();
+        bool result = convertHumdrum();
+        return result;
     }
     catch (char *str) {
         LogError("%s", str);
@@ -760,10 +777,16 @@ bool HumdrumInput::convertHumdrum()
     infile.analyzeKernAccidentals();
     infile.analyzeTextRepetition();
     parseSignifiers(infile);
-    if (m_signifiers.terminallong) {
+    if (!m_signifiers.kernTerminalLong.empty()) {
+        hideTerminalBarlines(infile);
+    }
+    else if (!m_signifiers.kernTerminalBreve.empty()) {
+        hideTerminalBarlines(infile);
+    }
+    else if (!m_signifiers.mensTerminalLong.empty()) {
         hideTerminalBarlines(infile);
     }
-    if (m_signifiers.terminalbreve) {
+    else if (!m_signifiers.mensTerminalBreve.empty()) {
         hideTerminalBarlines(infile);
     }
     checkForColorSpine(infile);
@@ -860,6 +883,17 @@ bool HumdrumInput::convertHumdrum()
             m_degree = true;
         }
         else if (it->getDataType().compare(0, 7, "**cdata") == 0) {
+            analyzeHarmInterpretations(it);
+            m_harm = true;
+        }
+        else if (it->getDataType().compare(0, 7, "**adata") == 0) {
+            // cdata spines, place above the staff by default
+            analyzeHarmInterpretations(it);
+            m_harm = true;
+        }
+        else if (it->getDataType().compare(0, 7, "**bdata") == 0) {
+            // cdata spines, place below the staff by default
+            analyzeHarmInterpretations(it);
             m_harm = true;
         }
         else if (it->isDataType("**fb")) {
@@ -891,8 +925,16 @@ bool HumdrumInput::convertHumdrum()
         return status;
     }
 
+    if (m_fing) {
+        analyzeFingerings(infile);
+    }
+
+    bool needSpineReverse = checkIfReversedSpineOrder(staffstarts);
+
     // Reverse the order, since top part is last spine.
-    reverse(staffstarts.begin(), staffstarts.end());
+    if (needSpineReverse) {
+        reverse(staffstarts.begin(), staffstarts.end());
+    }
     calculateReverseKernIndex();
 
     m_staffstates.resize(staffstarts.size());
@@ -944,6 +986,177 @@ bool HumdrumInput::convertHumdrum()
     return status;
 }
 
+//////////////////////////////
+//
+// HumdrumInput::checkIfReversedSpineOrder -- Return true of the lowest staff maps to the
+//     left-most staff-like spine in the data. False if there are *staff# in the header
+//     that increase to the right.
+//
+
+bool HumdrumInput::checkIfReversedSpineOrder(std::vector<hum::HTp> &staffstarts)
+{
+    std::vector<int> staffnums(staffstarts.size(), -1000);
+    for (int i = 0; i < (int)staffstarts.size(); i++) {
+        if (staffstarts[i]->isStaffLike()) {
+            staffnums[i] = getStaffNumForSpine(staffstarts[i]);
+        }
+    }
+    int minstaff = -1000;
+    for (int i = 0; i < (int)staffnums.size(); i++) {
+        if (staffnums[i] > 0) {
+            if ((minstaff < 0) || (minstaff > staffnums[i])) {
+                minstaff = staffnums[i];
+            }
+        }
+    }
+    int lastnum = -1000;
+    int counter = 0;
+    for (int i = 0; i < (int)staffnums.size(); i++) {
+        if (staffnums[i] < 0) {
+            continue;
+        }
+        counter++;
+        if (lastnum < 0) {
+            lastnum = staffnums[i];
+            continue;
+        }
+        if (lastnum > staffnums[i]) {
+            return true;
+        }
+        lastnum = staffnums[i];
+    }
+
+    if (counter == 0) {
+        return true;
+    }
+    else {
+        return false;
+    }
+}
+
+//////////////////////////////
+//
+// HumdrumInput::getStaffNumForSpine -- Return the # of *staff# tandem interpretations.
+//     # should be 1 or greater (but for now 0 is allowed). Returns -1000 if no staff
+//     number found in spine header.
+//
+
+int HumdrumInput::getStaffNumForSpine(hum::HTp token)
+{
+    hum::HTp current = token;
+    hum::HumRegex hre;
+    while (current && !current->isData()) {
+        if (current->isInterpretation()) {
+            if (hre.search(current, "^\\*staff(\\d+)")) {
+                return hre.getMatchInt(1);
+            }
+        }
+        current = current->getNextToken();
+    }
+    return -1000;
+}
+
+//////////////////////////////
+//
+// HumdrumInput::analyzeFingerings -- Analyze stylings for fingering
+//    (not checking spine splits yet).
+//
+
+void HumdrumInput::analyzeFingerings(hum::HumdrumFile &infile)
+{
+    std::vector<hum::HTp> spinestarts;
+    infile.getSpineStartList(spinestarts);
+    for (int i = 0; i < (int)spinestarts.size(); i++) {
+        analyzeFingerings(spinestarts[i]);
+    }
+}
+
+void HumdrumInput::analyzeFingerings(hum::HTp sstart)
+{
+    hum::HTp current = sstart;
+    hum::HumRegex hre;
+    std::string fontsize = "";
+    std::string color = "";
+    bool boldQ = true;
+    bool italicQ = false;
+    while (current) {
+        current = current->getNextToken();
+        if (!current) {
+            break;
+        }
+        if (*current == ".") {
+            continue;
+        }
+        if (*current == "*") {
+            continue;
+        }
+        if (current->isInterpretation()) {
+            if (hre.search(current, "^\\*fs:\\s*(.*?)\\s*$")) {
+                string testfont = hre.getMatch(1);
+                if (testfont == "small") {
+                    fontsize = "x-small"; // -1 size
+                }
+                else if (testfont == "large") {
+                    fontsize = "normal"; // +1 size
+                }
+                else {
+                    fontsize = "";
+                }
+            }
+
+            if (hre.search(current, "^\\*color:\\s*(.*?)\\s*$")) {
+                std::string testcolor = hre.getMatch(1);
+                if (testcolor == "black") {
+                    color = "";
+                }
+                else if (testcolor == "#000000") {
+                    color = "";
+                }
+                else if (testcolor == "#000") {
+                    color = "";
+                }
+                else {
+                    color = testcolor;
+                }
+            }
+
+            if (*current == "*bold") {
+                boldQ = true;
+            }
+            else if (*current == "*Xbold") {
+                boldQ = false;
+            }
+
+            if (*current == "*italic") {
+                italicQ = true;
+            }
+            else if (*current == "*Xitalic") {
+                italicQ = false;
+            }
+            // add enclosure stylings here
+
+            continue;
+        }
+
+        if (!current->isData()) {
+            continue;
+        }
+
+        if (fontsize != "") {
+            current->setValue("auto", "fontsize", fontsize);
+        }
+        if (color != "") {
+            current->setValue("auto", "color", color);
+        }
+        if (!boldQ) {
+            current->setValue("auto", "unbold", 1);
+        }
+        if (italicQ) {
+            current->setValue("auto", "italic", 1);
+        }
+    }
+}
+
 //////////////////////////////
 //
 // HumdrumInput::hasNoStaves --
@@ -975,8 +1188,18 @@ bool HumdrumInput::hasNoStaves(hum::HumdrumFile &infile)
 void HumdrumInput::analyzeHarmInterpretations(hum::HTp starttok)
 {
     bool aboveQ = false;
+    hum::HumRegex hre;
+    if (hre.search(starttok->getDataType(), "^\\*\\*adata")) {
+        aboveQ = true;
+    }
     hum::HTp keydesig = NULL;
+    hum::HTp verselabel = NULL;
     hum::HTp current = starttok;
+    std::string initialLabel = "";
+    if (hre.search(current->getDataType(), "^\\*\\*[ab]data-(.*)")) {
+        initialLabel = hre.getMatch(1);
+    }
+
     while (current) {
         current = current->getNextToken();
         if (!current) {
@@ -986,9 +1209,31 @@ void HumdrumInput::analyzeHarmInterpretations(hum::HTp starttok)
             if (aboveQ) {
                 current->setValue("auto", "above", 1);
             }
-            else if (keydesig) {
-                current->setValue("auto", "keylabel", keydesig->substr(1));
+            if (keydesig && !keydesig->empty()) {
+                std::string label = keydesig->substr(1);
+                if (!label.empty()) {
+                    current->setValue("auto", "keyLabel", label);
+                }
+                keydesig = NULL;
+                verselabel = NULL;
+            }
+            else if (verselabel) {
+                if (hre.search(verselabel, "^\\*v([ib]*):(.+)$")) {
+                    string style = hre.getMatch(1);
+                    string label = hre.getMatch(2);
+                    current->setValue("auto", "keyLabel", label);
+                    if (!style.empty()) {
+                        current->setValue("auto", "keyLabelStyle", style);
+                    }
+                }
                 keydesig = NULL;
+                verselabel = NULL;
+            }
+            else if (!initialLabel.empty()) {
+                std::string label = initialLabel;
+                label += ":";
+                current->setValue("auto", "keyLabel", label);
+                initialLabel.clear();
             }
         }
         if (!current->isInterpretation()) {
@@ -1003,6 +1248,9 @@ void HumdrumInput::analyzeHarmInterpretations(hum::HTp starttok)
         else if (current->isKeyDesignation()) {
             keydesig = current;
         }
+        else if (hre.search(current, "^\\*v[bi]*:")) {
+            verselabel = current;
+        }
     }
 }
 
@@ -1128,7 +1376,7 @@ void HumdrumInput::analyzeDegreeInterpretations(hum::HTp starttok)
             if (keydesig) {
                 // add key designation as a label on the next
                 // scale degree found in the data
-                current->setValue("auto", "keylabel", keydesig->substr(1));
+                current->setValue("auto", "keyLabel", keydesig->substr(1));
                 keydesig = NULL;
             }
             if (minorQ) {
@@ -1367,7 +1615,7 @@ void HumdrumInput::analyzeTextInterpretation(hum::HTp starttok)
                 continue;
             }
             std::string text = *current;
-            hre.replaceDestructive(text, "&nbsp;", " ", "g");
+            hre.replaceDestructive(text, "&#160;", " ", "g");
             current->setValue("auto", "text", text);
         }
 
@@ -1780,10 +2028,20 @@ void HumdrumInput::processHangingTieStart(humaux::HumdrumTie &tieinfo)
         // This is a hanging tie for no apparent reason.  Display it, but make
         // it red unless it is an l.v. tie.
 
-        if (m_signifiers.terminallong && (token->find(m_signifiers.terminallong) != std::string::npos)) {
+        if (!m_signifiers.kernTerminalLong.empty()
+            && (token->find(m_signifiers.kernTerminalLong) != std::string::npos)) {
+            // suppress hanging tie (because it was removed)
+        }
+        else if (!m_signifiers.kernTerminalBreve.empty()
+            && (token->find(m_signifiers.kernTerminalBreve) != std::string::npos)) {
+            // suppress hanging tie (because it was removed)
+        }
+        else if (!m_signifiers.mensTerminalLong.empty()
+            && (token->find(m_signifiers.mensTerminalLong) != std::string::npos)) {
             // suppress hanging tie (because it was removed)
         }
-        else if (m_signifiers.terminalbreve && (token->find(m_signifiers.terminalbreve) != std::string::npos)) {
+        else if (!m_signifiers.mensTerminalBreve.empty()
+            && (token->find(m_signifiers.mensTerminalBreve) != std::string::npos)) {
             // suppress hanging tie (because it was removed)
         }
         else {
@@ -1878,7 +2136,7 @@ Tie *HumdrumInput::addHangingTieToNextItem(hum::HTp token, int subindex, hum::Hu
     }
 
     hum::HumNum tstamp;
-    if (trackend->isData()) {
+    if (trackend && trackend->isData()) {
         hum::HumNum frombar = trackend->getDurationFromBarline();
         tstamp = frombar;
         tstamp *= meterunit;
@@ -2495,548 +2753,2455 @@ void HumdrumInput::initializeSpineColor(hum::HumdrumFile &infile)
 //
 // HumdrumInput::createHeader --
 //
-// References:
-//      http://music-encoding.org/wp-content/uploads/2015/03/CheatSheetHeader.pdf
-//      http://music-encoding.org/support/tutorials/mei-1st/exploring-the-mei-header
-//
-// <meiHead>
-//     <altId>  . . . . . . . . . . Alternate bibliographic identifier.
-//     <fileDesc> . . . . . . . . . Full bibliographic description of file.
-//        <titleStmt> (required) == Title and responsibility container.
-//           <title>  (required) == Title of bibliographic entry.
-//           <respStmt>          == Names of those repsonsible for
-// intellectual/artistic content.
-//        <pubStmt>   (required) == Pub. name, address, date and related info.
-//
-//        <sourceDesc>           == Sources used to create electronic file.
-//           <source n="1">
-//              <identifier> <titleStmt> <editionStmt> <putStmt> <physDesc>
-//              <seriesStmt> <noteStmt> <history> <langUsage> <key> <tempo>
-//              <meter> <perfMedium> <classification> <contents> <relatedItem>
-//
-//      <encodingDesc>  . . . . . . Relation of file to sources and how it was
-// created.
-//         <appInfo>? <editorialDecl>?
-//
-// changed to <workList> in MEI 4.0:
-//     <workDesc>  . . . . . . . . Groupling for non-bibliograhpic aspects of
-// text.
-//        <identifier> <titleStmt> <history> <langUsage> <key> <tempo> <meter>
-//        <perfMedium> <notesStmt> <classification> <castList> <incipit>
-//        <contents> <relatedItem>
-//
-//     <revisionDesc>  . . . . . . Alterations to the file.
-//        <change>
-//
-
 void HumdrumInput::createHeader()
 {
     hum::HumdrumFile &infile = m_infiles[0];
-    std::vector<hum::HumdrumLine *> references = infile.getReferenceRecords();
-    std::vector<std::vector<std::string>> respPeople;
-    getRespPeople(respPeople, references);
+    m_humdrumLineReferences = infile.getReferenceRecords();
+    m_references = getAllReferenceItems(infile);
+    createSimpleTitleElement();
+    createSimpleComposerElements();
+
     pugi::xml_node meiHead = m_doc->m_header.append_child("meiHead");
+    createFileDesc(meiHead);
+    createEncodingDesc(meiHead);
+    createWorkList(meiHead);
+    createHumdrumVerbatimExtMeta(meiHead);
+    createBackMatter();
+}
 
-    // <fileDesc> /////////////
+//////////////////////////////
+//
+// HumdrumInput:: createFileDesc --
+//
+
+void HumdrumInput::createFileDesc(pugi::xml_node meiHead)
+{
     pugi::xml_node fileDesc = meiHead.append_child("fileDesc");
-    pugi::xml_node fileTitle = fileDesc.append_child("titleStmt");
+    pugi::xml_node titleStmt = fileDesc.append_child("titleStmt");
+    titleStmt.append_copy(m_simpleTitle);
+
+    pugi::xml_node pubStmt = fileDesc.append_child("pubStmt");
+    pugi::xml_node unpub = pubStmt.append_child("unpub");
+    appendText(unpub,
+        "This MEI file was created by Verovio's Humdrum converter. When published, this unpub element "
+        "should be removed, and the enclosing pubStmt element should be properly filled out.");
+
+    // If sourceDesc ends up with no children, we will fileDesc.remove_child(sourceDesc) to avoid an empty
+    // <sourceDesc/>.
+    pugi::xml_node sourceDesc = fileDesc.append_child("sourceDesc");
+    createDigitalSource(sourceDesc);
+    createPrintedSource(sourceDesc);
+    pugi::xml_node digitalSource = sourceDesc.find_child_by_attribute("source", "type", "digital");
+    pugi::xml_node printedSource = sourceDesc.find_child_by_attribute("source", "type", "printed");
+    if (!digitalSource.empty() && !printedSource.empty()) {
+        pugi::xml_node digitalSourceBibl = digitalSource.child("bibl");
+        digitalSourceBibl.append_attribute("xml:id") = "source0_digital";
 
-    std::string OTL = getReferenceValue("OTL", references);
-    pugi::xml_node title = fileTitle.append_child("title");
-    if (!OTL.empty()) {
-        title.append_child(pugi::node_pcdata).set_value(unescapeHtmlEntities(OTL).c_str());
+        pugi::xml_node printedSourceBibl = printedSource.child("bibl");
+        printedSourceBibl.append_attribute("xml:id") = "source1_printed";
+
+        pugi::xml_node digitalRelatedItem = digitalSourceBibl.append_child("relatedItem");
+        digitalRelatedItem.append_attribute("rel") = "otherFormat";
+        digitalRelatedItem.append_attribute("target") = "#source1_printed";
+
+        pugi::xml_node printedRelatedItem = printedSourceBibl.append_child("relatedItem");
+        printedRelatedItem.append_attribute("rel") = "otherFormat";
+        printedRelatedItem.append_attribute("target") = "#source0_digital";
     }
 
-    // <pubStmt> /////////////
-    pugi::xml_node pubRespStmt;
-    pugi::xml_node pubStmt = fileDesc.append_child("pubStmt");
-    pugi::xml_document availability;
-    for (int i = 0; i < (int)references.size(); ++i) {
-        std::string refKey = references[i]->getReferenceKey();
-        if (refKey.compare(0, 2, "YE") && refKey.compare(0, 3, "EED") && refKey.compare(0, 3, "PED")) {
-            continue;
-        }
-        else if (refKey.compare(0, 3, "EED") == 0) {
-            if (!pubRespStmt) {
-                pubRespStmt = pubStmt.prepend_child("respStmt");
-            }
-            pugi::xml_node editor = pubRespStmt.append_child("persName");
-            editor.append_attribute("xml:id") = StringFormat("persname-L%d", references[i]->getLineNumber()).c_str();
-            editor.append_attribute("analog") = "humdrum:EED";
-            editor.append_attribute("role") = "digital editor";
-            editor.append_child(pugi::node_pcdata).set_value(references[i]->getReferenceValue().c_str());
-        }
-        else if (refKey.compare(0, 3, "PED") == 0) {
-            if (!pubRespStmt) {
-                pubRespStmt = pubStmt.prepend_child("respStmt");
-            }
-            pugi::xml_node editor = pubRespStmt.append_child("persName");
-            editor.append_attribute("xml:id") = StringFormat("persname-L%d", references[i]->getLineNumber()).c_str();
-            editor.append_attribute("analog") = "humdrum:PED";
-            editor.append_attribute("role") = "source editor";
-            editor.append_child(pugi::node_pcdata).set_value(references[i]->getReferenceValue().c_str());
-        }
-        else if (refKey.compare(2, 1, "C") == 0) {
-            pugi::xml_node useRestrict = availability.append_child("useRestrict");
-            useRestrict.append_attribute("xml:id")
-                = StringFormat("userestrict-L%d", references[i]->getLineNumber()).c_str();
-            useRestrict.append_attribute("analog") = "humdrum:YEC";
-            useRestrict.append_child(pugi::node_pcdata).set_value(references[i]->getReferenceValue().c_str());
-        }
-        else if (refKey.compare(2, 1, "M") == 0) {
-            pugi::xml_node useRestrict = availability.append_child("useRestrict");
-            useRestrict.append_attribute("xml:id")
-                = StringFormat("userestrict-L%d", references[i]->getLineNumber()).c_str();
-            useRestrict.append_attribute("analog") = "humdrum:YEM";
-            useRestrict.append_child(pugi::node_pcdata).set_value(references[i]->getReferenceValue().c_str());
-        }
-        else if (refKey.compare(2, 1, "N") == 0) {
-            pugi::xml_node pubPlace = pubStmt.append_child("pubPlace");
-            pubPlace.append_attribute("xml:id") = StringFormat("pubplace-L%d", references[i]->getLineNumber()).c_str();
-            pubPlace.append_attribute("analog") = "humdrum:YEN";
-            pubPlace.append_child(pugi::node_pcdata).set_value(references[i]->getReferenceValue().c_str());
-        }
-        else if (refKey.compare(2, 1, "P") == 0) {
-            pugi::xml_node publisher = pubStmt.append_child("publisher");
-            publisher.append_attribute("xml:id")
-                = StringFormat("publisher-L%d", references[i]->getLineNumber()).c_str();
-            publisher.append_attribute("analog") = "humdrum:YEP";
-            publisher.append_child(pugi::node_pcdata).set_value(references[i]->getReferenceValue().c_str());
-        }
-        else if (refKey.compare(2, 1, "R") == 0) {
-            pugi::xml_node pubDate = pubStmt.append_child("date");
-            pubDate.append_attribute("xml:id") = StringFormat("date-L%d", references[i]->getLineNumber()).c_str();
-            pubDate.append_attribute("analog") = "humdrum:YER";
-            pubDate.append_child(pugi::node_pcdata).set_value(references[i]->getReferenceValue().c_str());
-        }
-    }
-    if (availability.first_child()) {
-        pugi::xml_node copyright = pubStmt.append_child("availability");
-        for (pugi::xml_node child = availability.first_child(); child; child = child.next_sibling()) {
-            copyright.append_copy(child);
-        }
-        availability.reset();
-    }
-
-    // <encodingDesc> /////////
-    pugi::xml_node encodingDesc = meiHead.append_child("encodingDesc");
+    createRecordedSource(sourceDesc);
+    createUnpublishedSource(sourceDesc);
+
+    pugi::xml_node firstSource = sourceDesc.child("source");
+    if (firstSource.empty()) {
+        // delete <sourceDesc>, it's unneeded
+        fileDesc.remove_child(sourceDesc);
+    }
+}
+
+//////////////////////////////
+//
+// HumdrumInput:: createDigitalSource --
+//
+
+void HumdrumInput::createDigitalSource(pugi::xml_node sourceDesc)
+{
+    std::vector<string> keysThatGoHere
+        = { "EED", "ENC", "EEV", "EFL", "YEP", "YER", "END", "YEC", "YEM", "YEN", "TXL", "ONB" };
+
+    if (!anyReferenceItemsExist(keysThatGoHere)) {
+        return;
+    }
+
+    std::vector<HumdrumReferenceItem> editors = getReferenceItems("EED");
+    std::vector<HumdrumReferenceItem> encoders = getReferenceItems("ENC");
+    std::vector<HumdrumReferenceItem> versions = getReferenceItems("EEV");
+    std::vector<HumdrumReferenceItem> fileNumbers = getReferenceItems("EFL");
+    std::vector<HumdrumReferenceItem> publishers = getReferenceItems("YEP");
+    std::vector<HumdrumReferenceItem> releaseDates = getReferenceItems("YER");
+    std::vector<HumdrumReferenceItem> encodingDates = getReferenceItems("END");
+    std::vector<HumdrumReferenceItem> copyrights = getReferenceItems("YEC");
+    std::vector<HumdrumReferenceItem> copyrightStatements = getReferenceItems("YEM");
+    std::vector<HumdrumReferenceItem> copyrightCountries = getReferenceItems("YEN");
+    std::vector<HumdrumReferenceItem> textLanguages = getReferenceItems("TXL");
+    std::vector<HumdrumReferenceItem> notes = getReferenceItems("ONB");
+
+    pugi::xml_node source = sourceDesc.append_child("source");
+    source.append_attribute("type") = "digital";
+    pugi::xml_node bibl = source.append_child("bibl");
+    bibl.append_copy(m_simpleTitle);
+    for (pugi::xml_node_iterator childIt = m_simpleComposersDoc.begin(); childIt != m_simpleComposersDoc.end();
+         ++childIt) {
+        bibl.append_copy(*childIt);
+    }
+
+    for (auto const &editor : editors) {
+        pugi::xml_node editorEl = bibl.append_child("editor");
+        editorEl.append_attribute("analog") = "humdrum:EED";
+        appendText(editorEl, editor.value);
+    }
+
+    if (!encoders.empty()) {
+        pugi::xml_node respStmt = bibl.append_child("respStmt");
+        for (auto const &encoder : encoders) {
+            pugi::xml_node respEl = respStmt.append_child("resp");
+            appendText(respEl, "encoder");
+            pugi::xml_node persNameEl = respStmt.append_child("persName");
+            persNameEl.append_attribute("analog") = "humdrum:ENC";
+            appendText(persNameEl, encoder.value);
+        }
+    }
+
+    for (auto const &version : versions) {
+        pugi::xml_node versionEl = bibl.append_child("edition");
+        versionEl.append_attribute("type") = "version";
+        versionEl.append_attribute("analog") = "humdrum:EEV";
+        appendText(versionEl, version.value);
+    }
+
+    for (auto const &fileNumber : fileNumbers) {
+        pugi::xml_node fileNumberEl = bibl.append_child("extent");
+        fileNumberEl.append_attribute("type") = "fileNumber";
+        fileNumberEl.append_attribute("unit") = "file";
+        fileNumberEl.append_attribute("analog") = "humdrum:EFL";
+        appendText(fileNumberEl, fileNumber.value);
+    }
+
+    if (!publishers.empty() || !releaseDates.empty() || !encodingDates.empty()) {
+        pugi::xml_node imprint = bibl.append_child("imprint");
+        for (auto const &publisher : publishers) {
+            pugi::xml_node publisherEl = imprint.append_child("publisher");
+            publisherEl.append_attribute("analog") = "humdrum:YEP";
+            appendText(publisherEl, publisher.value);
+        }
+        for (auto const &releaseDate : releaseDates) {
+            pugi::xml_node releaseDateEl = imprint.append_child("date");
+            releaseDateEl.append_attribute("type") = "releaseDate";
+            releaseDateEl.append_attribute("analog") = "humdrum:YER";
+            fillInIsoDate(releaseDateEl, releaseDate.value);
+            appendText(releaseDateEl, releaseDate.value);
+        }
+        for (auto const &encodingDate : encodingDates) {
+            pugi::xml_node encodingDateEl = imprint.append_child("date");
+            encodingDateEl.append_attribute("type") = "encodingDate";
+            encodingDateEl.append_attribute("analog") = "humdrum:END";
+            fillInIsoDate(encodingDateEl, encodingDate.value);
+            appendText(encodingDateEl, encodingDate.value);
+        }
+    }
+    if (!copyrights.empty() || !copyrightStatements.empty() || !copyrightCountries.empty()) {
+        pugi::xml_node availability = bibl.append_child("availability");
+        for (auto const &copyright : copyrights) {
+            pugi::xml_node copyrightEl = availability.append_child("useRestrict");
+            copyrightEl.append_attribute("type") = "copyright";
+            copyrightEl.append_attribute("analog") = "humdrum:YEC";
+            appendText(copyrightEl, copyright.value);
+        }
+        for (auto const &copyrightStatement : copyrightStatements) {
+            pugi::xml_node copyrightStatementEl = availability.append_child("useRestrict");
+            copyrightStatementEl.append_attribute("type") = "copyrightStatement";
+            copyrightStatementEl.append_attribute("analog") = "humdrum:YEM";
+            appendText(copyrightStatementEl, copyrightStatement.value);
+        }
+        for (auto const &copyrightCountry : copyrightCountries) {
+            pugi::xml_node copyrightCountryEl = availability.append_child("useRestrict");
+            copyrightCountryEl.append_attribute("type") = "copyrightCountry";
+            copyrightCountryEl.append_attribute("analog") = "humdrum:YEN";
+            appendText(copyrightCountryEl, copyrightCountry.value);
+        }
+    }
+    if (!notes.empty()) {
+        pugi::xml_node annot = bibl.append_child("annot");
+        std::string languageForAll = getTextListLanguage(notes);
+        pugi::xml_node lineGroup = annot.append_child("lg");
+        if (!languageForAll.empty()) {
+            lineGroup.append_attribute("xml:lang") = languageForAll.c_str();
+        }
+        for (auto const &note : notes) {
+            pugi::xml_node line = lineGroup.append_child("l");
+            // <l> does not take @analog, so use @type instead (says Perry)
+            line.append_attribute("type") = "humdrum:ONB";
+            appendText(line, note.value);
+            if (languageForAll.empty() && !note.language.empty()) {
+                line.append_attribute("xml:lang") = note.language.c_str();
+            }
+        }
+    }
+
+    for (auto const &textLanguage : textLanguages) {
+        pugi::xml_node textLanguageEl = bibl.append_child("textLang");
+        textLanguageEl.append_attribute("analog") = "humdrum:TXL";
+        appendText(textLanguageEl, textLanguage.value);
+    }
+}
+
+//////////////////////////////
+//
+// HumdrumInput::getTextListLanguage --
+//
+
+std::string HumdrumInput::getTextListLanguage(const std::vector<HumdrumReferenceItem> &textItems)
+{
+    // returns empty string if there is no common language (or there are no languages at all)
+    std::string theLanguage;
+    for (auto const &textItem : textItems) {
+        if (theLanguage.empty() && !textItem.language.empty()) {
+            theLanguage = textItem.language;
+            continue;
+        }
+        if (!theLanguage.empty() && !textItem.language.empty()) {
+            if (theLanguage != textItem.language) {
+                theLanguage = std::string();
+                break;
+            }
+        }
+    }
+    return theLanguage;
+}
+
+//////////////////////////////
+//
+// HumdrumInput::fillInIsoDate --
+//
+
+void HumdrumInput::fillInIsoDate(pugi::xml_node element, const std::string &dateString)
+{
+    std::map<std::string, std::string> attribs = isoDateAttributesFromHumdrumDate(dateString);
+    if (attribs.size() == 2 && attribs.count("startdate") == 1 && attribs.count("enddate") == 1) {
+        // for human readability, put startdate before enddate (map sorts alphabetically by key, so it would be
+        // backward)
+        element.append_attribute("startdate") = attribs.at("startdate").c_str();
+        element.append_attribute("enddate") = attribs.at("enddate").c_str();
+        return;
+    }
+
+    for (auto const &attrib : attribs) {
+        element.append_attribute(attrib.first.c_str()) = attrib.second.c_str();
+    }
+}
+
+//////////////////////////////
+//
+// HumdrumInput::isoDateAttributesFromHumdrumDate --
+//
+
+std::map<std::string, std::string> HumdrumInput::isoDateAttributesFromHumdrumDate(
+    const std::string &inHumdrumDate, bool edtf)
+{
+    // if edtf is true, the map returned will be {"edtf", "an edtf date"} or
+    // {"startedtf", "an edtf date", "endedtf", "an edtf date"}.
+    // The latter is only used if it's a nested range (for example if the
+    // start date of the range is a range, and/or the end date is a range).
+    // if edtf is false, the map returned can be {"isodate", "an isodate"} or
+    // {"notbefore", "an isodate"}, etc.
+    // Note that MEI doesn't use edtf dates (yet), but the <mads> data we emit
+    // in <work><extMeta> does.
+    std::map<std::string, std::string> attribs;
+
+    if (inHumdrumDate.empty()) {
+        return attribs;
+    }
+
+    std::string humdrumDate = inHumdrumDate;
+    DateConstruct dateConstruct = dateConstructFromHumdrumDate(humdrumDate);
+    if (dateConstruct.constructType.empty()) {
+        return attribs;
+    }
+
+    attribs = isoDateAttributesFromDateConstruct(dateConstruct, edtf);
+    return attribs;
+}
+
+//////////////////////////////
+//
+// HumdrumInput::dateWithErrorsFromHumdrumDate --
+//
+
+DateWithErrors HumdrumInput::dateWithErrorsFromHumdrumDate(const std::string &humdrumDate)
+{
+    DateWithErrors date;
+    std::string dateString = humdrumDate;
+
+    // check if there's an error for the whole date
+    if (!dateString.empty()) {
+        if (dateString[0] == '~') {
+            dateString.erase(0, 1);
+            date.dateError = "approximate";
+        }
+        else if (dateString[0] == '?') {
+            dateString.erase(0, 1);
+            date.dateError = "uncertain";
+        }
+    }
+
+    std::vector<std::string> dateSubStrs;
+    std::vector<int> values = { INT_MIN, INT_MIN, INT_MIN, INT_MIN, INT_MIN, INT_MIN };
+    std::vector<std::string> errors = { "", "", "", "", "", "" };
+    hum::HumRegex hre;
+    hre.replaceDestructive(dateString, "/", ":");
+    hre.replaceDestructive(dateString, "", " ");
+    hre.split(dateSubStrs, dateString, "/");
+
+    for (int i = 0; i < (int)dateSubStrs.size(); i++) {
+        std::string value = dateSubStrs[i];
+        std::string error = stripDateError(value);
+        if (i == 0 && value.size() >= 2) {
+            if (value[0] == '@') {
+                // year with prepended '@' is B.C.E. so replace with '-'
+                value[0] = '-';
+            }
+        }
+        if (i == 5) {
+            // second is a float, but we truncate to int
+            size_t idx = value.find_first_of(".");
+            if (idx != std::string::npos) {
+                value = value.substr(0, idx);
+            }
+        }
+        try {
+            if (value.size() > 0) {
+                // reject value that has extra chars that stoi will ignore silently
+                // (e.g. stoi("1910 (rev. 1923)") returns 1910).
+                if (!hre.match(value, "^\\d+$")) {
+                    date.valid = false;
+                    return date;
+                }
+                values[i] = stoi(value);
+            }
+        }
+        catch (...) {
+            date.valid = false;
+            return date;
+        }
+        errors[i] = error;
+    }
+
+    bool gotOne = sanityCheckDate(values[0], values[1], values[2], values[3], values[4], values[5]);
+
+    if (gotOne) {
+        date.valid = true;
+        date.year = values[0];
+        date.yearError = errors[0];
+        date.month = values[1];
+        date.monthError = errors[1];
+        date.day = values[2];
+        date.dayError = errors[2];
+        date.hour = values[3];
+        date.hourError = errors[3];
+        date.minute = values[4];
+        date.minuteError = errors[4];
+        date.second = values[5];
+        date.secondError = errors[5];
+    }
+    return date;
+}
+
+//////////////////////////////
+//
+// HumdrumInput::dateConstructFromHumdrumDate --
+//
+
+DateConstruct HumdrumInput::dateConstructFromHumdrumDate(const std::string &inHumdrumDate)
+{
+    DateConstruct result;
+    std::string typeNeeded;
+    std::string relativeType;
+    std::string dateError;
+    std::string humdrumDate = inHumdrumDate;
+    std::vector<std::string> dateStrings;
+
+    if (humdrumDate.empty()) {
+        return result;
+    }
+
+    if (humdrumDate.find_first_of("-") != std::string::npos) {
+        // This is a range between two dates, and if those dates are simple enough,
+        // we can describe this with a "DateBetween", which can be represented with
+        // a single isodate of the form date1/date2. But there are a bunch of cases
+        // (see below) where this won't work, and this range will need to be
+        // described as a "DateConstructRange", which can only be represented with
+        // two isodates.
+        typeNeeded = "DateBetween";
+        hum::HumRegex hre;
+        hre.split(dateStrings, humdrumDate, "-");
+        if (dateStrings.size() != 2) {
+            // not parseable: return empty DateConstruct
+            return result;
+        }
+
+        if (dateStrings[0].find_first_of("^") != std::string::npos
+            || dateStrings[1].find_first_of("^") != std::string::npos || dateStrings[0][0] == '~'
+            || dateStrings[0][0] == '?' || dateStrings[0][0] == '<' || dateStrings[0][0] == '>'
+            || dateStrings[1][0] == '~' || dateStrings[1][0] == '?' || dateStrings[1][0] == '<'
+            || dateStrings[1][0] == '>') {
+            // It will require two DateConstructs to describe this date range, because one or both ends of
+            // the range are either DateBetweens themselves (or DateRelatives), or have full date errors.
+            typeNeeded = "DateConstructRange";
+        }
+    }
+    else if (humdrumDate.find_first_of("^") != std::string::npos) {
+        typeNeeded = "DateBetween";
+        hum::HumRegex hre;
+        hre.split(dateStrings, humdrumDate, "\\^");
+    }
+    else if (humdrumDate.find_first_of("|") != std::string::npos) {
+        typeNeeded = "DateSelection";
+        hum::HumRegex hre;
+        hre.split(dateStrings, humdrumDate, "\\|");
+    }
+    else if (humdrumDate[0] == '<') {
+        typeNeeded = "DateRelative";
+        humdrumDate.erase(0, 1);
+        relativeType = "before";
+        dateStrings.push_back(humdrumDate);
+    }
+    else if (humdrumDate[0] == '>') {
+        typeNeeded = "DateRelative";
+        humdrumDate.erase(0, 1);
+        relativeType = "after";
+        dateStrings.push_back(humdrumDate);
+    }
+    else {
+        typeNeeded = "DateSingle";
+        dateStrings.push_back(humdrumDate);
+    }
+
+    if (typeNeeded == "DateConstructRange") {
+        std::vector<DateConstruct> dateConstructs;
+        for (auto const &dateString : dateStrings) {
+            DateConstruct dateConstruct = dateConstructFromHumdrumDate(dateString);
+            if (dateConstruct.constructType.empty()) {
+                return DateConstruct();
+            }
+            dateConstructs.push_back(dateConstruct);
+        }
+
+        result.constructType = "DateConstructRange";
+        result.dateConstructs = dateConstructs;
+    }
+    else {
+        std::vector<DateWithErrors> dates;
+        for (auto const &dateString : dateStrings) {
+            DateWithErrors date = dateWithErrorsFromHumdrumDate(dateString);
+            if (date.valid == false) {
+                // give up on this whole Humdrum date, and return empty attribs
+                return result;
+            }
+            dates.push_back(date);
+        }
+
+        result.constructType = typeNeeded;
+        result.dates = dates;
+        if (typeNeeded == "DateRelative") {
+            result.qualifier = relativeType;
+        }
+    }
+
+    return result;
+}
+
+//////////////////////////////
+//
+// HumdrumInput::isoDateAttributesFromDateConstruct --
+//
+
+std::map<std::string, std::string> HumdrumInput::isoDateAttributesFromDateConstruct(
+    const DateConstruct &dateConstruct, bool edtf, bool isEdgeOfDateConstructRange)
+{
+    std::map<std::string, std::string> attribs;
+
+    // Produce isodates for every date found.
+    std::vector<std::string> isodates;
+    if (dateConstruct.constructType == "DateConstructRange") {
+        // special case of complex date range, can only be handled by two edtf attributes
+        if (!edtf) {
+            return attribs;
+        }
+        std::map<std::string, std::string> attribStart
+            = isoDateAttributesFromDateConstruct(dateConstruct.dateConstructs[0], edtf, true);
+        std::map<std::string, std::string> attribEnd
+            = isoDateAttributesFromDateConstruct(dateConstruct.dateConstructs[1], edtf, true);
+        attribs["startedtf"] = attribStart["edtf"];
+        attribs["endedtf"] = attribEnd["edtf"];
+        return attribs;
+    }
+
+    // all other (simpler) types
+    for (auto const &date : dateConstruct.dates) {
+        std::string isodate = isoDateFromDateWithErrors(date, edtf);
+        if (isodate.empty()) {
+            // date not representable as isodate; bail on all isodates for this piece of metadata
+            return attribs;
+        }
+        isodates.push_back(isodate);
+    }
+
+    // set up and return attribs
+    if (dateConstruct.constructType == "DateSingle") {
+        if (edtf) {
+            attribs["edtf"] = isodates[0];
+        }
+        else {
+            attribs["isodate"] = isodates[0];
+        }
+    }
+    else if (dateConstruct.constructType == "DateRelative") {
+        if (dateConstruct.qualifier == "before") {
+            if (edtf) {
+                attribs["edtf"] = "../" + isodates[0];
+            }
+            else {
+                attribs["notafter"] = isodates[0];
+            }
+        }
+        else if (dateConstruct.qualifier == "after") {
+            if (edtf) {
+                attribs["edtf"] = isodates[0] + "/..";
+            }
+            else {
+                attribs["notbefore"] = isodates[0];
+            }
+        }
+    }
+    else if (dateConstruct.constructType == "DateBetween") {
+        if (edtf) {
+            if (isEdgeOfDateConstructRange) {
+                // DateBetween is actually a selection (one date, somewhere between these two dates)
+                attribs["edtf"] = "[" + isodates[0] + ".." + isodates[1] + "]";
+            }
+            else {
+                // DateBetween is a proper range (this entire range of dates)
+                attribs["edtf"] = isodates[0] + "/" + isodates[1];
+            }
+        }
+        else {
+            attribs["startdate"] = isodates[0];
+            attribs["enddate"] = isodates[1];
+        }
+    }
+    else if (dateConstruct.constructType == "DateSelection") {
+        if (edtf) {
+            std::string combinedDates;
+            for (int i = 0; i < (int)isodates.size(); i++) {
+                if (i == 0) {
+                    if (dateConstruct.qualifier == "and") {
+                        combinedDates += "{";
+                    }
+                    else {
+                        combinedDates += "[";
+                    }
+                }
+                else {
+                    combinedDates += ",";
+                }
+
+                combinedDates += isodates[i];
+
+                if (i == (int)isodates.size() - 1) {
+                    if (dateConstruct.qualifier == "and") {
+                        combinedDates += "}";
+                    }
+                    else {
+                        combinedDates += "]";
+                    }
+                }
+            }
+            attribs["edtf"] = combinedDates;
+        }
+        else {
+            // pre-EDTF ISO dates can't describe date selection lists. Leave attribs blank.
+        }
+    }
+
+    return attribs;
+}
+//////////////////////////////
+//
+// HumdrumInput::isoDateFromDateWithErrors --
+//
+
+std::string HumdrumInput::isoDateFromDateWithErrors(const DateWithErrors &date, bool edtf)
+{
+    if (!date.valid) {
+        return "";
+    }
+    if (!date.dateError.empty()) {
+        if (!edtf) {
+            // non-EDTF isodates can't represent uncertain/approximate dates,
+            // so don't return anything.
+            return "";
+        }
+    }
+
+    std::vector<std::string> dateParts;
+    // We do this as a loop so we can break out at first missing date part.
+    for (int i = 0; i < 6; i++) {
+        int value = INT_MIN;
+        std::string error;
+        if (i == 0) {
+            value = date.year;
+            error = date.yearError;
+        }
+        else if (i == 1) {
+            value = date.month;
+            error = date.monthError;
+        }
+        else if (i == 2) {
+            value = date.day;
+            error = date.dayError;
+        }
+        else if (i == 3) {
+            value = date.hour;
+            error = date.hourError;
+        }
+        else if (i == 4) {
+            value = date.minute;
+            error = date.minuteError;
+        }
+        else if (i == 5) {
+            value = date.second;
+            error = date.secondError;
+        }
+        if (value == INT_MIN) {
+            // ignore this and anything after this
+            break;
+        }
+        std::string prefix = "";
+        if (!error.empty()) {
+            if (!edtf) {
+                // non-EDTF ISO dates can't describe approximate/uncertain values.
+                return "";
+            }
+            if (error == "uncertain") {
+                prefix = "?";
+            }
+            else if (error == "approximate") {
+                prefix = "~";
+            }
+        }
+        if (i == 0) {
+            std::string yearStr = StringFormat("%s%d", prefix.c_str(), value);
+            dateParts.push_back(yearStr);
+        }
+        else {
+            std::string numStr = StringFormat("%s%02d", prefix.c_str(), value);
+            dateParts.push_back(numStr);
+        }
+    }
+
+    std::string isodate;
+
+    for (int i = 0; i < 3; i++) {
+        if (i >= (int)dateParts.size()) {
+            break;
+        }
+        if (i > 0) {
+            isodate += "-";
+        }
+        isodate += dateParts[i];
+    }
+
+    // If dateParts.size() is < 6, ignore the time (3..5) (this date+time should have been rejected in sanityCheckDate).
+    // We only emit a time if all three parts of the time are present.
+    if (dateParts.size() == 6) {
+        for (int i = 3; i < 6; i++) {
+            if (i == 3) {
+                isodate += "T";
+            }
+            else {
+                isodate += ":";
+            }
+            isodate += dateParts[i];
+        }
+    }
+
+    if (date.dateError == "approximate") {
+        isodate += "~";
+    }
+    else if (date.dateError == "uncertain") {
+        isodate += "?";
+    }
+
+    return isodate;
+}
+
+//////////////////////////////
+//
+// HumdrumInput::sanityCheckDate --
+//
+
+bool HumdrumInput::sanityCheckDate(int year, int month, int day, int hour, int minute, int second)
+{
+    // sanity check the integers
+
+    // year has to be there, the others are optional.
+    if (year == INT_MIN) {
+        return false;
+    }
+
+    if (month != INT_MIN) {
+        if (month < 1 || month > 12) {
+            return false;
+        }
+    }
+
+    if (day != INT_MIN) {
+        if (month == INT_MIN) {
+            // if month is missing, so must day be missing
+            return false;
+        }
+        if (day < 1 || day > 31) {
+            return false;
+        }
+        if (month == 4 || month == 6 || month == 9 || month == 11) {
+            if (day == 31) {
+                return false;
+            }
+        }
+        if (month == 2) {
+            if (day > 29) {
+                return false;
+            }
+            // 29 is a fail during non-leap years.  Not checking Gregorian
+            // leap year rules, since they change historically.
+            if (day == 29) {
+                if (year % 4 != 0) {
+                    return false;
+                }
+            }
+        }
+    }
+
+    if (hour != INT_MIN) {
+        if (day == INT_MIN) {
+            // if day is missing, so must hour be missing
+            return false;
+        }
+        if (minute == INT_MIN || second == INT_MIN) {
+            // if hour is there, minute and second must also be there (unlike year/month/day, which can be year or
+            // year/month).
+            return false;
+        }
+        if (hour < 0 || hour > 23) {
+            return false;
+        }
+    }
+
+    if (minute != INT_MIN) {
+        if (hour == INT_MIN) {
+            // if hour is missing, so must minute be missing
+            return false;
+        }
+        if (minute < 0 || minute > 59) {
+            return false;
+        }
+    }
+
+    if (second != INT_MIN) {
+        if (minute == INT_MIN) {
+            // if minute is missing, so must second be missing
+            return false;
+        }
+        if (second < 0 || second > 59) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+//////////////////////////////
+//
+// HumdrumInput::stripDateError --
+//
+
+std::string HumdrumInput::stripDateError(std::string &value)
+{
+    std::string approxSyms = "~x";
+    std::string uncertainSyms = "?z";
+    std::string allErrorSyms = approxSyms + uncertainSyms;
+    size_t idx = value.find_first_of(allErrorSyms);
+    if (idx == SIZE_MAX) {
+        return "";
+    }
+    std::string errorStr;
+    if (value[idx] == '?') {
+        // we have to escape it (twice) to put it in a regex
+        errorStr = "\\?";
+    }
+    else {
+        char chars[2];
+        chars[0] = value[idx];
+        chars[1] = 0;
+        errorStr = chars;
+    }
+
+    hum::HumRegex hre;
+    hre.replaceDestructive(value, "", errorStr);
+    if (errorStr[0] == '~' || errorStr[0] == 'x') {
+        return "approximate";
+    }
+    return "uncertain";
+}
+
+//////////////////////////////
+//
+// HumdrumInput::createPrintedSource --
+//
+
+void HumdrumInput::createPrintedSource(pugi::xml_node sourceDesc)
+{
+    std::vector<string> keysThatGoHere
+        = { "LAR", "PED", "LOR", "TRN", "OCL", "OVM", "PTL", "PPR", "PDT", "PPP", "PC#" };
+
+    if (!anyReferenceItemsExist(keysThatGoHere)) {
+        return;
+    }
+
+    std::vector<HumdrumReferenceItem> arrangers = getReferenceItems("LAR");
+    std::vector<HumdrumReferenceItem> editors = getReferenceItems("PED");
+    std::vector<HumdrumReferenceItem> orchestrators = getReferenceItems("LOR");
+    std::vector<HumdrumReferenceItem> translators = getReferenceItems("TRN");
+    std::vector<HumdrumReferenceItem> collectors = getReferenceItems("OCL");
+    std::vector<HumdrumReferenceItem> volumeNumbers = getReferenceItems("OVM");
+    std::vector<HumdrumReferenceItem> volumeNames = getReferenceItems("PTL");
+    std::vector<HumdrumReferenceItem> publishers = getReferenceItems("PPR");
+    std::vector<HumdrumReferenceItem> datesPublished = getReferenceItems("PDT");
+    std::vector<HumdrumReferenceItem> locationsPublished = getReferenceItems("PPP");
+    std::vector<HumdrumReferenceItem> publisherCatalogNumbers = getReferenceItems("PC#");
+
+    pugi::xml_node source = sourceDesc.append_child("source");
+    source.append_attribute("type") = "printed";
+    pugi::xml_node bibl = source.append_child("bibl");
+
+    for (auto const &publisherCatalogNumber : publisherCatalogNumbers) {
+        pugi::xml_node identifierEl = bibl.append_child("identifier");
+        identifierEl.append_attribute("type") = "catalogNumber";
+        identifierEl.append_attribute("analog") = "humdrum:PC#";
+        appendText(identifierEl, publisherCatalogNumber.value);
+    }
+
+    bibl.append_copy(m_simpleTitle);
+    for (pugi::xml_node_iterator childIt = m_simpleComposersDoc.begin(); childIt != m_simpleComposersDoc.end();
+         ++childIt) {
+        bibl.append_copy(*childIt);
+    }
+
+    for (auto const &editor : editors) {
+        pugi::xml_node editorEl = bibl.append_child("editor");
+        editorEl.append_attribute("analog") = "humdrum:PED";
+        appendText(editorEl, editor.value);
+    }
+
+    if (!arrangers.empty() || !orchestrators.empty() || !translators.empty() || !collectors.empty()) {
+        // arrangers could technically go outside <respStmt>, but
+        // Perry requests that they go inside <respStmt> for ease
+        // of conversion to his proposed v. 6.
+        pugi::xml_node respStmt = bibl.append_child("respStmt");
+
+        for (auto const &arranger : arrangers) {
+            pugi::xml_node respEl = respStmt.append_child("resp");
+            appendText(respEl, "arranger");
+            pugi::xml_node persNameEl = respStmt.append_child("persName");
+            persNameEl.append_attribute("analog") = "humdrum:LAR";
+            appendText(persNameEl, arranger.value);
+        }
+
+        for (auto const &orchestrator : orchestrators) {
+            pugi::xml_node respEl = respStmt.append_child("resp");
+            appendText(respEl, "orchestrator");
+            pugi::xml_node persNameEl = respStmt.append_child("persName");
+            persNameEl.append_attribute("analog") = "humdrum:LOR";
+            appendText(persNameEl, orchestrator.value);
+        }
+
+        for (auto const &translator : translators) {
+            pugi::xml_node respEl = respStmt.append_child("resp");
+            appendText(respEl, "translator");
+            pugi::xml_node persNameEl = respStmt.append_child("persName");
+            persNameEl.append_attribute("analog") = "humdrum:TRN";
+            appendText(persNameEl, translator.value);
+        }
+
+        for (auto const &collector : collectors) {
+            pugi::xml_node respEl = respStmt.append_child("resp");
+            appendText(respEl, "collector/transcriber");
+            pugi::xml_node nameEl = respStmt.append_child("name");
+            nameEl.append_attribute("analog") = "humdrum:OCL";
+            appendText(nameEl, collector.value);
+        }
+    }
+
+    if (!publishers.empty() || !datesPublished.empty() || !locationsPublished.empty()) {
+        pugi::xml_node imprint = bibl.append_child("imprint");
+        for (auto const &publisher : publishers) {
+            pugi::xml_node publisherEl = imprint.append_child("publisher");
+            publisherEl.append_attribute("analog") = "humdrum:PPR";
+            appendText(publisherEl, publisher.value);
+        }
+
+        for (auto const &datePublished : datesPublished) {
+            pugi::xml_node dateEl = imprint.append_child("date");
+            dateEl.append_attribute("type") = "datePublished";
+            dateEl.append_attribute("analog") = "humdrum:PDT";
+            fillInIsoDate(dateEl, datePublished.value);
+            appendText(dateEl, datePublished.value);
+        }
+
+        for (auto const &locationPublished : locationsPublished) {
+            pugi::xml_node geogNameEl = imprint.append_child("geogName");
+            geogNameEl.append_attribute("role") = "locationPublished";
+            geogNameEl.append_attribute("analog") = "humdrum:PPP";
+            appendText(geogNameEl, locationPublished.value);
+        }
+    }
+
+    size_t numberOfVolumesWithNameAndNumber = min(volumeNames.size(), volumeNumbers.size());
+    for (size_t i = 0; i < numberOfVolumesWithNameAndNumber; i++) {
+        HumdrumReferenceItem *volumeName = &volumeNames[i];
+        HumdrumReferenceItem *volumeNumber = &volumeNumbers[i];
+        pugi::xml_node relatedItem = bibl.append_child("relatedItem");
+        relatedItem.append_attribute("rel") = "host";
+        pugi::xml_node relBibl = relatedItem.append_child("bibl");
+
+        pugi::xml_node titleElement = relBibl.append_child("title");
+        titleElement.append_attribute("analog") = "humdrum:PTL";
+        appendText(titleElement, volumeName->value);
+
+        pugi::xml_node biblScope = relBibl.append_child("biblScope");
+        biblScope.append_attribute("analog") = "humdrum:OVM";
+        appendText(biblScope, volumeNumber->value);
+    }
+
+    if (volumeNames.size() > volumeNumbers.size()) {
+        // we ignore any extra volume numbers, since a number without a name
+        // isn't interesting.
+        for (size_t i = volumeNumbers.size(); i < volumeNames.size(); i++) {
+            HumdrumReferenceItem *volumeName = &volumeNames[i];
+            pugi::xml_node relatedItem = bibl.append_child("relatedItem");
+            relatedItem.append_attribute("rel") = "host";
+            pugi::xml_node relBibl = relatedItem.append_child("bibl");
+
+            pugi::xml_node titleElement = relBibl.append_child("title");
+            titleElement.append_attribute("analog") = "humdrum:PTL";
+            appendText(titleElement, volumeName->value);
+        }
+    }
+}
+
+//////////////////////////////
+//
+// HumdrumInput::createRecordedSource --
+//
+
+void HumdrumInput::createRecordedSource(pugi::xml_node sourceDesc)
+{
+    std::vector<string> keysThatGoHere
+        = { "RTL", "RC#", "MGN", "MPN", "MPS", "RNP", "MCN", "RMM", "RRD", "RLC", "RDT", "RT#" };
+
+    if (!anyReferenceItemsExist(keysThatGoHere)) {
+        return;
+    }
+
+    std::vector<HumdrumReferenceItem> albumTitles = getReferenceItems("RTL");
+    std::vector<HumdrumReferenceItem> albumCatalogNumbers = getReferenceItems("RC#");
+    std::vector<HumdrumReferenceItem> ensembleNames = getReferenceItems("MGN");
+    std::vector<HumdrumReferenceItem> performerNames = getReferenceItems("MPN");
+    std::vector<HumdrumReferenceItem> suspectedPerformerNames = getReferenceItems("MPS");
+    std::vector<HumdrumReferenceItem> producers = getReferenceItems("RNP");
+    std::vector<HumdrumReferenceItem> conductors = getReferenceItems("MCN");
+    std::vector<HumdrumReferenceItem> manufacturers = getReferenceItems("RMM");
+    std::vector<HumdrumReferenceItem> releaseDates = getReferenceItems("RRD");
+    std::vector<HumdrumReferenceItem> recordingLocations = getReferenceItems("RLC");
+    std::vector<HumdrumReferenceItem> recordingDates = getReferenceItems("RDT");
+    std::vector<HumdrumReferenceItem> trackNumbers = getReferenceItems("RT#");
+
+    size_t longestLen = albumTitles.size();
+    longestLen = max(longestLen, albumCatalogNumbers.size());
+    longestLen = max(longestLen, ensembleNames.size());
+    longestLen = max(longestLen, performerNames.size());
+    longestLen = max(longestLen, suspectedPerformerNames.size());
+    longestLen = max(longestLen, producers.size());
+    longestLen = max(longestLen, conductors.size());
+    longestLen = max(longestLen, manufacturers.size());
+    longestLen = max(longestLen, releaseDates.size());
+    longestLen = max(longestLen, recordingLocations.size());
+    longestLen = max(longestLen, recordingDates.size());
+    longestLen = max(longestLen, trackNumbers.size());
+
+    pugi::xml_node source = sourceDesc.append_child("source");
+    source.append_attribute("type") = "recording";
+    pugi::xml_node biblStruct = source.append_child("biblStruct");
+
+    for (size_t i = 0; i < longestLen; i++) {
+        if (i < trackNumbers.size()) {
+            pugi::xml_node analytic = biblStruct.append_child("analytic");
+            analytic.append_copy(m_simpleTitle);
+
+            pugi::xml_node biblScope = analytic.append_child("biblScope");
+            biblScope.append_attribute("type") = "trackNumber";
+            biblScope.append_attribute("unit") = "track";
+            biblScope.append_attribute("analog") = "humdrum:RT#";
+            appendText(biblScope, trackNumbers[i].value);
+        }
+
+        if (i < albumTitles.size() || i < albumCatalogNumbers.size() || i < ensembleNames.size()
+            || i < performerNames.size() || i < suspectedPerformerNames.size() || i < producers.size()
+            || i < conductors.size() || i < manufacturers.size() || i < releaseDates.size()
+            || i < recordingLocations.size() || i < recordingDates.size()) {
+            pugi::xml_node monogr = biblStruct.append_child("monogr");
+
+            if (i < albumTitles.size()) {
+                HumdrumReferenceItem *albumTitle = &albumTitles[i];
+                pugi::xml_node albumTitleEl = monogr.append_child("title");
+                albumTitleEl.append_attribute("analog") = "humdrum:RTL";
+                appendText(albumTitleEl, albumTitle->value);
+            }
+
+            if (i < albumCatalogNumbers.size()) {
+                HumdrumReferenceItem *albumCatalogNumber = &albumCatalogNumbers[i];
+                pugi::xml_node albumCatalogNumberEl = monogr.append_child("identifier");
+                albumCatalogNumberEl.append_attribute("type") = "albumCatalogNumber";
+                albumCatalogNumberEl.append_attribute("analog") = "humdrum:RC#";
+                appendText(albumCatalogNumberEl, albumCatalogNumber->value);
+            }
+
+            if (i < ensembleNames.size() || i < performerNames.size() || i < suspectedPerformerNames.size()
+                || i < producers.size() || i < conductors.size()) {
+                pugi::xml_node respStmt = monogr.append_child("respStmt");
+
+                if (i < ensembleNames.size()) {
+                    HumdrumReferenceItem *ensembleName = &ensembleNames[i];
+                    pugi::xml_node respEl = respStmt.append_child("resp");
+                    appendText(respEl, "performer");
+                    pugi::xml_node nameEl = respStmt.append_child("corpName");
+                    nameEl.append_attribute("type") = "ensembleName";
+                    nameEl.append_attribute("analog") = "humdrum:MGN";
+                    appendText(nameEl, ensembleName->value);
+                }
+
+                if (i < performerNames.size()) {
+                    HumdrumReferenceItem *performerName = &performerNames[i];
+                    pugi::xml_node respEl = respStmt.append_child("resp");
+                    appendText(respEl, "performer");
+                    pugi::xml_node nameEl = respStmt.append_child("persName");
+                    nameEl.append_attribute("analog") = "humdrum:MPN";
+                    appendText(nameEl, performerName->value);
+                }
+
+                if (i < suspectedPerformerNames.size()) {
+                    HumdrumReferenceItem *suspectedPerformerName = &suspectedPerformerNames[i];
+                    pugi::xml_node respEl = respStmt.append_child("resp");
+                    appendText(respEl, "performer");
+                    pugi::xml_node nameEl = respStmt.append_child("persName");
+                    nameEl.append_attribute("cert") = "medium";
+                    nameEl.append_attribute("analog") = "humdrum:MPS";
+                    appendText(nameEl, suspectedPerformerName->value);
+                }
+
+                if (i < producers.size()) {
+                    HumdrumReferenceItem *producer = &producers[i];
+                    pugi::xml_node respEl = respStmt.append_child("resp");
+                    appendText(respEl, "producer");
+                    pugi::xml_node nameEl = respStmt.append_child("name");
+                    nameEl.append_attribute("analog") = "humdrum:RNP";
+                    appendText(nameEl, producer->value);
+                }
+
+                if (i < conductors.size()) {
+                    HumdrumReferenceItem *conductor = &conductors[i];
+                    pugi::xml_node respEl = respStmt.append_child("resp");
+                    appendText(respEl, "conductor");
+                    pugi::xml_node nameEl = respStmt.append_child("persName");
+                    nameEl.append_attribute("analog") = "humdrum:MCN";
+                    appendText(nameEl, conductor->value);
+                }
+            }
+
+            if (i < manufacturers.size() || i < releaseDates.size() || i < recordingLocations.size()
+                || i < recordingDates.size()) {
+                pugi::xml_node imprint = monogr.append_child("imprint");
+
+                if (i < manufacturers.size()) {
+                    HumdrumReferenceItem *manufacturer = &manufacturers[i];
+                    pugi::xml_node nameEl = imprint.append_child("corpName");
+                    nameEl.append_attribute("role") = "production/distribution";
+                    nameEl.append_attribute("analog") = "humdrum:RMM";
+                    appendText(nameEl, manufacturer->value);
+                }
+
+                if (i < releaseDates.size()) {
+                    HumdrumReferenceItem *releaseDate = &releaseDates[i];
+                    pugi::xml_node dateEl = imprint.append_child("date");
+                    dateEl.append_attribute("type") = "releaseDate";
+                    dateEl.append_attribute("analog") = "humdrum:RRD";
+                    fillInIsoDate(dateEl, releaseDate->value);
+                    appendText(dateEl, releaseDate->value);
+                }
+
+                if (i < recordingLocations.size()) {
+                    HumdrumReferenceItem *recordingLocation = &recordingLocations[i];
+                    pugi::xml_node geogNameEl = imprint.append_child("geogName");
+                    geogNameEl.append_attribute("role") = "recordingLocation";
+                    geogNameEl.append_attribute("analog") = "humdrum:RLC";
+                    appendText(geogNameEl, recordingLocation->value);
+                }
+
+                if (i < recordingDates.size()) {
+                    HumdrumReferenceItem *recordingDate = &recordingDates[i];
+                    pugi::xml_node dateEl = imprint.append_child("date");
+                    dateEl.append_attribute("type") = "recordingDate";
+                    dateEl.append_attribute("analog") = "humdrum:RDT";
+                    fillInIsoDate(dateEl, recordingDate->value);
+                    appendText(dateEl, recordingDate->value);
+                }
+            }
+        }
+    }
+}
+
+//////////////////////////////
+//
+// HumdrumInput::createUnpublishedSource --
+//
+
+void HumdrumInput::createUnpublishedSource(pugi::xml_node sourceDesc)
+{
+    std::vector<string> keysThatGoHere = { "SMS", "YOR", "SML", "YOO", "YOE", "YOY", "SMA" };
+
+    if (!anyReferenceItemsExist(keysThatGoHere)) {
+        return;
+    }
+
+    std::vector<HumdrumReferenceItem> manuscriptNames = getReferenceItems("SMS");
+    std::vector<HumdrumReferenceItem> moreManuscriptNames = getReferenceItems("YOR");
+    std::vector<HumdrumReferenceItem> manuscriptLocations = getReferenceItems("SML");
+    std::vector<HumdrumReferenceItem> manuscriptOwners = getReferenceItems("YOO");
+    std::vector<HumdrumReferenceItem> editors = getReferenceItems("YOE");
+    std::vector<HumdrumReferenceItem> copyrightDates = getReferenceItems("YOY");
+    std::vector<HumdrumReferenceItem> acknowledgments = getReferenceItems("SMA");
+
+    pugi::xml_node source = sourceDesc.append_child("source");
+    source.append_attribute("type") = "unpub";
+    pugi::xml_node bibl = source.append_child("bibl");
+
+    for (auto const &manuscriptName : manuscriptNames) {
+        pugi::xml_node identifierEl = bibl.append_child("identifier");
+        identifierEl.append_attribute("analog") = "humdrum:SMS";
+        appendText(identifierEl, manuscriptName.value);
+    }
+
+    for (auto const &manuscriptName : moreManuscriptNames) {
+        pugi::xml_node identifierEl = bibl.append_child("identifier");
+        identifierEl.append_attribute("analog") = "humdrum:YOR";
+        appendText(identifierEl, manuscriptName.value);
+    }
+
+    // do both again as <title>
+    for (auto const &manuscriptName : manuscriptNames) {
+        pugi::xml_node titleEl = bibl.append_child("title");
+        titleEl.append_attribute("analog") = "humdrum:SMS";
+        appendText(titleEl, manuscriptName.value);
+    }
+
+    for (auto const &manuscriptName : moreManuscriptNames) {
+        pugi::xml_node titleEl = bibl.append_child("title");
+        titleEl.append_attribute("analog") = "humdrum:YOR";
+        appendText(titleEl, manuscriptName.value);
+    }
+
+    for (auto const &manuscriptLocation : manuscriptLocations) {
+        pugi::xml_node repositoryEl = bibl.append_child("repository");
+        repositoryEl.append_attribute("analog") = "humdrum:SML";
+        appendText(repositoryEl, manuscriptLocation.value);
+    }
+
+    for (auto const &manuscriptOwner : manuscriptOwners) {
+        pugi::xml_node nameEl = bibl.append_child("name");
+        nameEl.append_attribute("role") = "manuscriptOwner";
+        nameEl.append_attribute("analog") = "humdrum:YOO";
+        appendText(nameEl, manuscriptOwner.value);
+    }
+
+    for (auto const &editor : editors) {
+        pugi::xml_node editorEl = bibl.append_child("editor");
+        editorEl.append_attribute("analog") = "humdrum:YOE";
+        appendText(editorEl, editor.value);
+    }
+
+    for (auto const &copyrightDate : copyrightDates) {
+        pugi::xml_node dateEl = bibl.append_child("date");
+        dateEl.append_attribute("type") = "copyrightDate";
+        dateEl.append_attribute("analog") = "humdrum:YOY";
+        fillInIsoDate(dateEl, copyrightDate.value);
+        appendText(dateEl, copyrightDate.value);
+    }
+
+    if (!acknowledgments.empty()) {
+        pugi::xml_node annot = bibl.append_child("annot");
+        annot.append_attribute("type") = "manuscriptAccessAcknowledgment";
+        std::string languageForAll = getTextListLanguage(acknowledgments);
+        pugi::xml_node lineGroup = annot.append_child("lg");
+        if (!languageForAll.empty()) {
+            lineGroup.append_attribute("xml:lang") = languageForAll.c_str();
+        }
+
+        for (auto const &acknowledgment : acknowledgments) {
+            pugi::xml_node line = lineGroup.append_child("l");
+            // <l> does not take @analog, so use @type instead (says Perry)
+            line.append_attribute("type") = "humdrum:SMA";
+            if (!acknowledgment.language.empty() && languageForAll.empty()) {
+                line.append_attribute("xml:lang") = acknowledgment.language.c_str();
+            }
+            appendText(line, acknowledgment.value);
+        }
+    }
+}
+
+//////////////////////////////
+//
+// HumdrumInput::createEncodingDesc --
+//
+
+void HumdrumInput::createEncodingDesc(pugi::xml_node meiHead)
+{
+    pugi::xml_node encodingDesc = meiHead.append_child("encodingDesc");
+
+    // Humdrum has no <appInfo> equivalent, so nothing to bring over, we just need to mention ourselves
+    pugi::xml_node appInfo = encodingDesc.append_child("appInfo");
+    pugi::xml_node application = appInfo.append_child("application");
+    application.append_attribute("isodate") = getDateString().c_str();
+    application.append_attribute("version") = GetVersion().c_str();
+    pugi::xml_node name = application.append_child("name");
+    appendText(name, "Verovio");
+    pugi::xml_node p1 = application.append_child("p");
+    appendText(p1, "Transcoded from Humdrum");
+
+    std::vector<HumdrumReferenceItem> encodingNotes = getReferenceItems("RNB");
+    std::vector<HumdrumReferenceItem> encodingWarnings = getReferenceItems("RWB");
+
+    if (!encodingNotes.empty() || !encodingWarnings.empty()) {
+        pugi::xml_node editorialDecl = encodingDesc.append_child("editorialDecl");
+        pugi::xml_node p = editorialDecl.append_child("p");
+
+        if (!encodingNotes.empty()) {
+            std::string languageForAll = getTextListLanguage(encodingNotes);
+            pugi::xml_node lineGroup = p.append_child("lg");
+            if (!languageForAll.empty()) {
+                lineGroup.append_attribute("xml:lang") = languageForAll.c_str();
+            }
+
+            for (auto const &note : encodingNotes) {
+                pugi::xml_node line = lineGroup.append_child("l");
+                // <l> does not take @analog, so use @type instead (says Perry)
+                line.append_attribute("type") = "humdrum:RNB";
+                if (!note.language.empty() && languageForAll.empty()) {
+                    line.append_attribute("xml:lang") = note.language.c_str();
+                }
+                appendText(line, note.value);
+            }
+        }
+
+        if (!encodingWarnings.empty()) {
+            std::string languageForAll = getTextListLanguage(encodingWarnings);
+            pugi::xml_node lineGroup = p.append_child("lg");
+            if (!languageForAll.empty()) {
+                lineGroup.append_attribute("xml:lang") = languageForAll.c_str();
+            }
+
+            for (auto const &warning : encodingWarnings) {
+                pugi::xml_node line = lineGroup.append_child("l");
+                // <l> does not take @analog, so use @type instead (says Perry)
+                line.append_attribute("type") = "humdrum:RWB";
+                if (!warning.language.empty() && languageForAll.empty()) {
+                    line.append_attribute("xml:lang") = warning.language.c_str();
+                }
+                appendText(line, warning.value);
+            }
+        }
+    }
+}
+
+//////////////////////////////
+//
+// HumdrumInput::createWorkList --
+//
+
+void HumdrumInput::createWorkList(pugi::xml_node meiHead)
+{
+    // the main (encoded) work
+    std::vector<HumdrumReferenceItem> catalogNumbers = getReferenceItems("SCA");
+    std::vector<HumdrumReferenceItem> catalogAbbrevNumbers = getReferenceItems("SCT");
+    std::vector<HumdrumReferenceItem> opusNumbers = getReferenceItems("OPS");
+    std::vector<HumdrumReferenceItem> creationDates = getReferenceItems("ODT");
+    std::vector<HumdrumReferenceItem> creationCountries = getReferenceItems("OCY");
+    std::vector<HumdrumReferenceItem> creationSettlements = getReferenceItems("OPC");
+    std::vector<HumdrumReferenceItem> creationRegions = getReferenceItems("ARE");
+    std::vector<HumdrumReferenceItem> creationLatLongs = getReferenceItems("ARL");
+    std::vector<HumdrumReferenceItem> lyricists = getReferenceItems("LYR");
+    std::vector<HumdrumReferenceItem> librettists = getReferenceItems("LIB");
+    std::vector<HumdrumReferenceItem> dedicatees = getReferenceItems("ODE");
+    std::vector<HumdrumReferenceItem> funders = getReferenceItems("OCO");
+    std::vector<HumdrumReferenceItem> languages = getReferenceItems("TXO");
+    std::vector<HumdrumReferenceItem> histories = getReferenceItems("HAO");
+    std::vector<HumdrumReferenceItem> instrumentLists = getReferenceItems("AIN");
+    std::vector<HumdrumReferenceItem> forms = getReferenceItems("AFR");
+    std::vector<HumdrumReferenceItem> genres = getReferenceItems("AGN");
+    std::vector<HumdrumReferenceItem> modes = getReferenceItems("AMD");
+    std::vector<HumdrumReferenceItem> meters = getReferenceItems("AMT");
+    std::vector<HumdrumReferenceItem> styles = getReferenceItems("AST");
+    std::vector<HumdrumReferenceItem> firstPerformanceDates = getReferenceItems("MPD");
+    // MRD is documented as "date of performance", but MDT is often used instead.
+    std::vector<HumdrumReferenceItem> performanceDates = getReferenceItems("MDT");
+    std::vector<HumdrumReferenceItem> morePerformanceDates = getReferenceItems("MRD");
+    performanceDates.insert(performanceDates.end(), morePerformanceDates.begin(), morePerformanceDates.end());
+    std::vector<HumdrumReferenceItem> performanceLocations = getReferenceItems("MLC");
+
+    // related works
+    std::vector<HumdrumReferenceItem> parentWorkTitles = getReferenceItems("OPR");
+    std::vector<HumdrumReferenceItem> groupWorkTitles = getReferenceItems("GTL");
+    std::vector<HumdrumReferenceItem> associatedWorkTitles = getReferenceItems("GAW");
+    // GCO and ACO have the same definition: "Collection designation, such as
+    // Norton Scores, Smithsonian Collection, etc."
+    std::vector<HumdrumReferenceItem> collectionWorkTitles = getReferenceItems("GCO");
+    std::vector<HumdrumReferenceItem> moreCollectionWorkTitles = getReferenceItems("ACO");
+    collectionWorkTitles.insert(
+        collectionWorkTitles.end(), moreCollectionWorkTitles.begin(), moreCollectionWorkTitles.end());
+
+    pugi::xml_node workList;
+    std::string parentWorkXmlId;
+    std::string groupWorkXmlId;
+    std::string associatedWorkXmlId;
+    std::string collectionWorkXmlId;
+
+    int workNumber = 0;
+
+    // the parent work
+    if (!parentWorkTitles.empty()) {
+        if (workList.empty()) {
+            workList = meiHead.append_child("workList");
+        }
+
+        parentWorkXmlId = StringFormat("work%d_parent", workNumber++);
+        pugi::xml_node parentWork = workList.append_child("work");
+        parentWork.append_attribute("xml:id") = parentWorkXmlId.c_str();
+        parentWork.append_attribute("type") = "parent";
+
+        for (auto const &parentWorkTitle : parentWorkTitles) {
+            pugi::xml_node titleEl = parentWork.append_child("title");
+            titleEl.append_attribute("analog") = "humdrum:OPR";
+            appendText(titleEl, parentWorkTitle.value);
+        }
+    }
+
+    // the group work
+    if (!groupWorkTitles.empty()) {
+        if (workList.empty()) {
+            workList = meiHead.append_child("workList");
+        }
+
+        groupWorkXmlId = StringFormat("work%d_group", workNumber++);
+        pugi::xml_node groupWork = workList.append_child("work");
+        groupWork.append_attribute("xml:id") = groupWorkXmlId.c_str();
+        groupWork.append_attribute("type") = "group";
+
+        for (auto const &groupWorkTitle : groupWorkTitles) {
+            pugi::xml_node titleEl = groupWork.append_child("title");
+            titleEl.append_attribute("analog") = "humdrum:GTL";
+            appendText(titleEl, groupWorkTitle.value);
+        }
+    }
+
+    // the associated work
+    if (!associatedWorkTitles.empty()) {
+        if (workList.empty()) {
+            workList = meiHead.append_child("workList");
+        }
+
+        associatedWorkXmlId = StringFormat("work%d_associated", workNumber++);
+        pugi::xml_node associatedWork = workList.append_child("work");
+        associatedWork.append_attribute("xml:id") = associatedWorkXmlId.c_str();
+        associatedWork.append_attribute("type") = "associated";
+
+        for (auto const &associatedWorkTitle : associatedWorkTitles) {
+            pugi::xml_node titleEl = associatedWork.append_child("title");
+            titleEl.append_attribute("analog") = "humdrum:GAW";
+            appendText(titleEl, associatedWorkTitle.value);
+        }
+    }
+
+    // the collection work
+    if (!collectionWorkTitles.empty()) {
+        if (workList.empty()) {
+            workList = meiHead.append_child("workList");
+        }
+
+        collectionWorkXmlId = StringFormat("work%d_collection", workNumber++);
+        pugi::xml_node collectionWork = workList.append_child("work");
+        collectionWork.append_attribute("xml:id") = collectionWorkXmlId.c_str();
+        collectionWork.append_attribute("type") = "collection";
+
+        for (auto const &collectionWorkTitle : collectionWorkTitles) {
+            pugi::xml_node titleEl = collectionWork.append_child("title");
+            titleEl.append_attribute("analog") = "humdrum:GCO";
+            appendText(titleEl, collectionWorkTitle.value);
+        }
+    }
+
+    // the main (encoded) work
+    std::vector<string> titleInfoKeys = { "OTL", "OTA", "OTP", "ONM", "OMV", "OMD", "OPS", "OAC", "OSC" };
+    std::vector<string> composerInfoKeys = { "COM", "COA", "COS", "COC", "COL", "CDT", "CBL", "CDL", "CNT" };
+
+    if (!catalogNumbers.empty() || !catalogNumbers.empty() || !opusNumbers.empty()
+        || anyReferenceItemsExist(titleInfoKeys) || !creationDates.empty() || !creationCountries.empty()
+        || !creationSettlements.empty() || !creationRegions.empty() || !creationLatLongs.empty()
+        || anyReferenceItemsExist(composerInfoKeys) || !lyricists.empty() || !librettists.empty() || !dedicatees.empty()
+        || !funders.empty() || !languages.empty() || !histories.empty() || !instrumentLists.empty() || !forms.empty()
+        || !genres.empty() || !modes.empty() || !meters.empty() || !styles.empty() || !firstPerformanceDates.empty()
+        || !performanceDates.empty() || !performanceLocations.empty()) {
+        if (workList.empty()) {
+            workList = meiHead.append_child("workList");
+        }
+        pugi::xml_node theWork = workList.append_child("work");
+        std::string xmlId = StringFormat("work%d_encoded", workNumber++);
+        theWork.append_attribute("xml:id") = xmlId.c_str();
+        m_doc->m_musicDecls = "#" + xmlId;
+        theWork.append_attribute("type") = "encoded";
+
+        // <identifier>
+        for (auto const &catalogNumber : catalogNumbers) {
+            pugi::xml_node identifierEl = theWork.append_child("identifier");
+            identifierEl.append_attribute("analog") = "humdrum:SCA";
+            appendText(identifierEl, catalogNumber.value);
+        }
+
+        for (auto const &catalogAbbrevNumber : catalogAbbrevNumbers) {
+            pugi::xml_node identifierEl = theWork.append_child("identifier");
+            identifierEl.append_attribute("analog") = "humdrum:SCT";
+            appendText(identifierEl, catalogAbbrevNumber.value);
+        }
+
+        for (auto const &opusNumber : opusNumbers) {
+            pugi::xml_node identifierEl = theWork.append_child("identifier");
+            identifierEl.append_attribute("analog") = "humdrum:OPS";
+            appendText(identifierEl, opusNumber.value);
+        }
+
+        // all titles
+        createTitleElements(theWork);
+
+        // all composers (and biographical info)
+        createComposerElements(theWork);
+
+        // lyricists
+        for (auto const &lyricist : lyricists) {
+            pugi::xml_node lyricistEl = theWork.append_child("lyricist");
+            pugi::xml_node name = lyricistEl.append_child("persName");
+            name.append_attribute("analog") = "humdrum:LYR";
+            appendText(name, lyricist.value);
+        }
+
+        // librettists
+        for (auto const &librettist : librettists) {
+            pugi::xml_node librettistEl = theWork.append_child("librettist");
+            pugi::xml_node name = librettistEl.append_child("persName");
+            name.append_attribute("analog") = "humdrum:LIB";
+            appendText(name, librettist.value);
+        }
+
+        // funders
+        for (auto const &funder : funders) {
+            pugi::xml_node funderEl = theWork.append_child("funder");
+            pugi::xml_node name = funderEl.append_child("name");
+            name.append_attribute("analog") = "humdrum:OCO";
+            appendText(name, funder.value);
+        }
+
+        // <creation> et al
+        if (!creationDates.empty() || !creationCountries.empty() || !creationSettlements.empty()
+            || !creationRegions.empty() || !creationLatLongs.empty() || !dedicatees.empty()) {
+            pugi::xml_node creation = theWork.append_child("creation");
+
+            for (auto const &creationDate : creationDates) {
+                pugi::xml_node date = creation.append_child("date");
+                date.append_attribute("analog") = "humdrum:ODT";
+                fillInIsoDate(date, creationDate.value);
+                appendText(date, creationDate.value);
+            }
+
+            for (auto const &creationCountry : creationCountries) {
+                pugi::xml_node country = creation.append_child("country");
+                country.append_attribute("analog") = "humdrum:OCY";
+                appendText(country, creationCountry.value);
+            }
+
+            for (auto const &creationSettlement : creationSettlements) {
+                pugi::xml_node settlement = creation.append_child("settlement");
+                settlement.append_attribute("analog") = "humdrum:OPC";
+                appendText(settlement, creationSettlement.value);
+            }
+
+            for (auto const &creationRegion : creationRegions) {
+                pugi::xml_node geogName = creation.append_child("geogName");
+                geogName.append_attribute("analog") = "humdrum:ARE";
+                appendText(geogName, creationRegion.value);
+            }
+
+            for (auto const &creationLatLong : creationLatLongs) {
+                pugi::xml_node geogName = creation.append_child("geogName");
+                geogName.append_attribute("type") = "coordinates";
+                geogName.append_attribute("analog") = "humdrum:ARL";
+                appendText(geogName, creationLatLong.value);
+            }
+
+            for (auto const &dedicatee : dedicatees) {
+                pugi::xml_node dedicateeEl = creation.append_child("dedicatee");
+                dedicateeEl.append_attribute("analog") = "humdrum:ODE";
+                appendText(dedicateeEl, dedicatee.value);
+            }
+        }
+
+        // <history>
+        if (!histories.empty()) {
+            std::string languageForAll = getTextListLanguage(histories);
+            pugi::xml_node historyEl = theWork.append_child("history");
+            pugi::xml_node lineGroup = historyEl.append_child("lg");
+            if (!languageForAll.empty()) {
+                lineGroup.append_attribute("xml:lang") = languageForAll.c_str();
+            }
+
+            for (auto const &history : histories) {
+                pugi::xml_node line = lineGroup.append_child("l");
+                line.append_attribute("type") = "humdrum:HAO";
+                if (!history.language.empty() && languageForAll.empty()) {
+                    line.append_attribute("xml:lang") = history.language.c_str();
+                }
+                appendText(line, history.value);
+            }
+        }
+
+        // <langUsage>
+        if (!languages.empty()) {
+            pugi::xml_node langUsage = theWork.append_child("langUsage");
+
+            for (auto const &language : languages) {
+                pugi::xml_node languageEl = langUsage.append_child("language");
+                languageEl.append_attribute("analog") = "humdrum:TXO";
+                appendText(languageEl, language.value);
+            }
+        }
+
+        // TODO: <perfMedium><perfResList> from instrumentLists (AIN).
+
+        // <classification>
+        if (!forms.empty() || !genres.empty() || !modes.empty() || !meters.empty() || !styles.empty()) {
+            pugi::xml_node classification = theWork.append_child("classification");
+            pugi::xml_node termList = classification.append_child("termList");
+
+            for (auto const &form : forms) {
+                pugi::xml_node termEl = termList.append_child("term");
+                termEl.append_attribute("label") = "form";
+                termEl.append_attribute("analog") = "humdrum:AFR";
+                appendText(termEl, form.value);
+            }
+
+            for (auto const &genre : genres) {
+                pugi::xml_node termEl = termList.append_child("term");
+                termEl.append_attribute("label") = "genre";
+                termEl.append_attribute("analog") = "humdrum:AGN";
+                appendText(termEl, genre.value);
+            }
+
+            for (auto const &mode : modes) {
+                pugi::xml_node termEl = termList.append_child("term");
+                termEl.append_attribute("label") = "mode";
+                termEl.append_attribute("analog") = "humdrum:AMD";
+                appendText(termEl, mode.value);
+            }
+
+            for (auto const &meter : meters) {
+                pugi::xml_node termEl = termList.append_child("term");
+                termEl.append_attribute("label") = "meter";
+                termEl.append_attribute("analog") = "humdrum:AMT";
+                appendText(termEl, meter.value);
+            }
+
+            for (auto const &style : styles) {
+                pugi::xml_node termEl = termList.append_child("term");
+                termEl.append_attribute("label") = "style";
+                termEl.append_attribute("analog") = "humdrum:AST";
+                appendText(termEl, style.value);
+            }
+        }
+
+        // <expressionList>
+        if (!firstPerformanceDates.empty() || !performanceDates.empty()) {
+            pugi::xml_node expressionList = theWork.append_child("expressionList");
+
+            if (!firstPerformanceDates.empty()) {
+                pugi::xml_node expression = expressionList.append_child("expression");
+                pugi::xml_node title = expression.append_child("title");
+                appendText(title, "First performance");
+                pugi::xml_node creation = expression.append_child("creation");
+
+                for (auto const &firstPerformanceDate : firstPerformanceDates) {
+                    pugi::xml_node date = creation.append_child("date");
+                    date.append_attribute("type") = "firstPerformance";
+                    date.append_attribute("analog") = "humdrum:MPD";
+                    fillInIsoDate(date, firstPerformanceDate.value);
+                    appendText(date, firstPerformanceDate.value);
+                }
+            }
+
+            if (!performanceDates.empty()) {
+                for (size_t i = 0; i < performanceDates.size(); i++) {
+                    HumdrumReferenceItem *performanceDate = &performanceDates[i];
+
+                    pugi::xml_node expression = expressionList.append_child("expression");
+                    pugi::xml_node title = expression.append_child("title");
+                    appendText(title, "Performance");
+                    pugi::xml_node creation = expression.append_child("creation");
+                    pugi::xml_node date = creation.append_child("date");
+                    date.append_attribute("type") = "performance";
+                    date.append_attribute("analog") = "humdrum:MDT";
+                    fillInIsoDate(date, performanceDate->value);
+                    appendText(date, performanceDate->value);
+
+                    if (i < performanceLocations.size()) {
+                        HumdrumReferenceItem *performanceLocation = &performanceLocations[i];
+
+                        pugi::xml_node geogName = creation.append_child("geogName");
+                        geogName.append_attribute("role") = "performanceLocation";
+                        geogName.append_attribute("analog") = "humdrum:MLC";
+                        appendText(geogName, performanceLocation->value);
+                    }
+                }
+            }
+        }
+
+        // relationList (relationships between the encoded work and up to four related works)
+        if (!parentWorkXmlId.empty() || !groupWorkXmlId.empty() || !associatedWorkXmlId.empty()
+            || !collectionWorkXmlId.empty()) {
+            pugi::xml_node relationList = theWork.append_child("relationList");
+
+            if (!parentWorkXmlId.empty()) {
+                pugi::xml_node relation = relationList.append_child("relation");
+                relation.append_attribute("rel") = "isPartOf";
+                relation.append_attribute("type") = "isChildOfParent";
+                relation.append_attribute("target") = StringFormat("#%s", parentWorkXmlId.c_str()).c_str();
+            }
+
+            if (!groupWorkXmlId.empty()) {
+                pugi::xml_node relation = relationList.append_child("relation");
+                relation.append_attribute("rel") = "isPartOf";
+                relation.append_attribute("type") = "isMemberOfGroup";
+                relation.append_attribute("target") = StringFormat("#%s", groupWorkXmlId.c_str()).c_str();
+            }
+
+            if (!associatedWorkXmlId.empty()) {
+                pugi::xml_node relation = relationList.append_child("relation");
+                relation.append_attribute("rel") = "isVersionOf";
+                relation.append_attribute("type") = "isAssociatedWith";
+                relation.append_attribute("target") = StringFormat("#%s", associatedWorkXmlId.c_str()).c_str();
+            }
+
+            if (!collectionWorkXmlId.empty()) {
+                pugi::xml_node relation = relationList.append_child("relation");
+                relation.append_attribute("rel") = "isPartOf";
+                relation.append_attribute("type") = "isMemberOfCollection";
+                relation.append_attribute("target") = StringFormat("#%s", collectionWorkXmlId.c_str()).c_str();
+            }
+        }
+
+        // when all done, append <extMeta><madsCollection> if necessary
+        if (!m_madsCollection.empty()) {
+            pugi::xml_node extMeta = theWork.append_child("extMeta");
+            extMeta.append_copy(m_madsCollection);
+        }
+    }
+}
+
+//////////////////////////////
+//
+// HumdrumInput::appendText --
+//
+
+void HumdrumInput::appendText(pugi::xml_node element, std::string text)
+{
+    hum::HumRegex hre;
+    std::vector<std::string> strings;
+    hre.split(strings, text, "\\\\n");
+    for (size_t i = 0; i < strings.size(); i++) {
+        std::string s = strings[i];
+        if (i > 0) {
+            element.append_child("lb");
+        }
+        element.append_child(pugi::node_pcdata).set_value(s.c_str());
+    }
+}
+
+//////////////////////////////
+//
+// HumdrumInput::createTitleElements --
+//
+
+void HumdrumInput::createTitleElements(pugi::xml_node work)
+{
+    std::vector<HumdrumReferenceItem> mainTitles = getReferenceItems("OTL");
+    std::vector<HumdrumReferenceItem> alternativeTitles = getReferenceItems("OTA");
+    std::vector<HumdrumReferenceItem> popularTitles = getReferenceItems("OTP");
+    std::vector<HumdrumReferenceItem> plainNumbers = getReferenceItems("ONM");
+    std::vector<HumdrumReferenceItem> movementNumbers = getReferenceItems("OMV");
+    std::vector<HumdrumReferenceItem> movementNames = getReferenceItems("OMD");
+    std::vector<HumdrumReferenceItem> opusNumbers = getReferenceItems("OPS");
+    std::vector<HumdrumReferenceItem> actNumbers = getReferenceItems("OAC");
+    std::vector<HumdrumReferenceItem> sceneNumbers = getReferenceItems("OSC");
+
+    // Untranslated and translated title elements (in that order).
+    // If either/both of them end up empty, we will work.child_remove() it/them.
+    pugi::xml_node untranslatedTitleEl = work.append_child("title");
+    pugi::xml_node translatedTitleEl = work.append_child("title");
+
+    bool untranslatedTitleIsEmpty = true;
+    bool translatedTitleIsEmpty = true;
+
+    // First any main title(s) (OTL).
+    for (auto const &mainTitle : mainTitles) {
+        pugi::xml_node titlePart;
+        if (mainTitle.isTranslated) {
+            translatedTitleIsEmpty = false;
+            titlePart = translatedTitleEl.append_child("titlePart");
+            titlePart.append_attribute("type") = "translated";
+        }
+        else {
+            untranslatedTitleIsEmpty = false;
+            titlePart = untranslatedTitleEl.append_child("titlePart");
+            titlePart.append_attribute("type") = "main";
+        }
+        titlePart.append_attribute("analog") = "humdrum:OTL";
+        if (!mainTitle.language.empty()) {
+            titlePart.append_attribute("xml:lang") = mainTitle.language.c_str();
+        }
+        appendText(titlePart, mainTitle.value);
+    }
+
+    // Then any movement name(s) (OMD).
+    for (auto const &movementName : movementNames) {
+        pugi::xml_node titlePart;
+        if (movementName.isTranslated) {
+            translatedTitleIsEmpty = false;
+            titlePart = translatedTitleEl.append_child("titlePart");
+        }
+        else {
+            untranslatedTitleIsEmpty = false;
+            titlePart = untranslatedTitleEl.append_child("titlePart");
+        }
+        titlePart.append_attribute("type") = "movementName";
+        titlePart.append_attribute("analog") = "humdrum:OMD";
+        if (!movementName.language.empty()) {
+            titlePart.append_attribute("xml:lang") = movementName.language.c_str();
+        }
+        appendText(titlePart, movementName.value);
+    }
+
+    // Then any number(s) (ONM).
+    for (auto const &plainNumber : plainNumbers) {
+        pugi::xml_node titlePart;
+        if (plainNumber.isTranslated) {
+            translatedTitleIsEmpty = false;
+            titlePart = translatedTitleEl.append_child("titlePart");
+        }
+        else {
+            untranslatedTitleIsEmpty = false;
+            titlePart = untranslatedTitleEl.append_child("titlePart");
+        }
+        titlePart.append_attribute("type") = "number";
+        titlePart.append_attribute("analog") = "humdrum:ONM";
+        if (!plainNumber.language.empty()) {
+            titlePart.append_attribute("xml:lang") = plainNumber.language.c_str();
+        }
+        appendText(titlePart, plainNumber.value);
+    }
+
+    // Then any movement number(s) (OMV).
+    for (auto const &movementNumber : movementNumbers) {
+        pugi::xml_node titlePart;
+        if (movementNumber.isTranslated) {
+            translatedTitleIsEmpty = false;
+            titlePart = translatedTitleEl.append_child("titlePart");
+        }
+        else {
+            untranslatedTitleIsEmpty = false;
+            titlePart = untranslatedTitleEl.append_child("titlePart");
+        }
+        titlePart.append_attribute("type") = "movementNumber";
+        titlePart.append_attribute("analog") = "humdrum:OMV";
+        if (!movementNumber.language.empty()) {
+            titlePart.append_attribute("xml:lang") = movementNumber.language.c_str();
+        }
+        appendText(titlePart, movementNumber.value);
+    }
+
+    // Then any opus number(s) (OPS).
+    for (auto const &opusNumber : opusNumbers) {
+        pugi::xml_node titlePart;
+        if (opusNumber.isTranslated) {
+            translatedTitleIsEmpty = false;
+            titlePart = translatedTitleEl.append_child("titlePart");
+        }
+        else {
+            untranslatedTitleIsEmpty = false;
+            titlePart = untranslatedTitleEl.append_child("titlePart");
+        }
+        titlePart.append_attribute("type") = "opusNumber";
+        titlePart.append_attribute("analog") = "humdrum:OPS";
+        if (!opusNumber.language.empty()) {
+            titlePart.append_attribute("xml:lang") = opusNumber.language.c_str();
+        }
+        appendText(titlePart, opusNumber.value);
+    }
+
+    // Then any act number(s) (OAC).
+    for (auto const &actNumber : actNumbers) {
+        pugi::xml_node titlePart;
+        if (actNumber.isTranslated) {
+            translatedTitleIsEmpty = false;
+            titlePart = translatedTitleEl.append_child("titlePart");
+        }
+        else {
+            untranslatedTitleIsEmpty = false;
+            titlePart = untranslatedTitleEl.append_child("titlePart");
+        }
+        titlePart.append_attribute("type") = "actNumber";
+        titlePart.append_attribute("analog") = "humdrum:OAC";
+        if (!actNumber.language.empty()) {
+            titlePart.append_attribute("xml:lang") = actNumber.language.c_str();
+        }
+        appendText(titlePart, actNumber.value);
+    }
+
+    // Then any scene number(s) (OSC).
+    for (auto const &sceneNumber : sceneNumbers) {
+        pugi::xml_node titlePart;
+        if (sceneNumber.isTranslated) {
+            translatedTitleIsEmpty = false;
+            titlePart = translatedTitleEl.append_child("titlePart");
+        }
+        else {
+            untranslatedTitleIsEmpty = false;
+            titlePart = untranslatedTitleEl.append_child("titlePart");
+        }
+        titlePart.append_attribute("type") = "sceneNumber";
+        titlePart.append_attribute("analog") = "humdrum:OSC";
+        if (!sceneNumber.language.empty()) {
+            titlePart.append_attribute("xml:lang") = sceneNumber.language.c_str();
+        }
+        appendText(titlePart, sceneNumber.value);
+    }
+
+    // Separately, any alternative title(s) (OTA) (no titleParts).
+    for (auto const &alternativeTitle : alternativeTitles) {
+        pugi::xml_node alternativeTitleEl = work.append_child("title");
+        alternativeTitleEl.append_attribute("type") = "alternative";
+        alternativeTitleEl.append_attribute("analog") = "humdrum:OTA";
+        if (!alternativeTitle.language.empty()) {
+            alternativeTitleEl.append_attribute("xml:lang") = alternativeTitle.language.c_str();
+        }
+        appendText(alternativeTitleEl, alternativeTitle.value);
+    }
+
+    // Separately, any popular title(s) (OTP) (no titleParts).
+    for (auto const &popularTitle : popularTitles) {
+        pugi::xml_node popularTitleEl = work.append_child("title");
+        popularTitleEl.append_attribute("type") = "popular";
+        popularTitleEl.append_attribute("analog") = "humdrum:OTP";
+        if (!popularTitle.language.empty()) {
+            popularTitleEl.append_attribute("xml:lang") = popularTitle.language.c_str();
+        }
+        appendText(popularTitleEl, popularTitle.value);
+    }
+
+    // if untranslatedTitleEl or translatedTitleEl are empty, remove them, else give them a type
+    if (untranslatedTitleIsEmpty) {
+        work.remove_child(untranslatedTitleEl);
+    }
+    else {
+        untranslatedTitleEl.append_attribute("type") = "uniform";
+    }
+
+    if (translatedTitleIsEmpty) {
+        work.remove_child(translatedTitleEl);
+    }
+    else {
+        translatedTitleEl.append_attribute("type") = "translated";
+    }
+}
+
+//////////////////////////////
+//
+// HumdrumInput::createComposerEleents --
+//
+
+void HumdrumInput::createComposerElements(pugi::xml_node work)
+{
+    // emits all the composer-related elements.  This includes emitting
+    // any <mads> XML for composer personal information (e.g. birth and
+    // death dates/places, nationality), stashing them in m_madsElements
+    // to emit at the end of the <work type="encoded">.
+    std::vector<HumdrumReferenceItem> composers = getReferenceItems("COM");
+    std::vector<HumdrumReferenceItem> attributedComposers = getReferenceItems("COA");
+    std::vector<HumdrumReferenceItem> suspectedComposers = getReferenceItems("COS");
+    std::vector<HumdrumReferenceItem> corporateComposers = getReferenceItems("COC");
+    std::vector<HumdrumReferenceItem> composerAliases = getReferenceItems("COL");
+    std::vector<HumdrumReferenceItem> composerDates = getReferenceItems("CDT");
+    std::vector<HumdrumReferenceItem> composerBirthPlaces = getReferenceItems("CBL");
+    std::vector<HumdrumReferenceItem> composerDeathPlaces = getReferenceItems("CDL");
+    std::vector<HumdrumReferenceItem> composerNationalities = getReferenceItems("CNT");
+
+    std::vector<HumdrumReferenceItem> allComposers;
+    allComposers.insert(allComposers.end(), composers.begin(), composers.end());
+    allComposers.insert(allComposers.end(), attributedComposers.begin(), attributedComposers.end());
+    allComposers.insert(allComposers.end(), suspectedComposers.begin(), suspectedComposers.end());
+    allComposers.insert(allComposers.end(), corporateComposers.begin(), corporateComposers.end());
+
+    int madsXmlIdIndex = 0;
+    for (size_t i = 0; i < allComposers.size(); i++) {
+        HumdrumReferenceItem *composer = &allComposers[i];
+
+        HumdrumReferenceItem *composerAlias = NULL;
+        HumdrumReferenceItem *composerBirthAndDeathDate = NULL;
+        HumdrumReferenceItem *composerBirthPlace = NULL;
+        HumdrumReferenceItem *composerDeathPlace = NULL;
+        HumdrumReferenceItem *composerNationality = NULL;
+
+        if (i < composerAliases.size()) {
+            composerAlias = &composerAliases[i];
+        }
+        if (i < composerDates.size()) {
+            composerBirthAndDeathDate = &composerDates[i];
+        }
+        if (i < composerBirthPlaces.size()) {
+            composerBirthPlace = &composerBirthPlaces[i];
+        }
+        if (i < composerDeathPlaces.size()) {
+            composerDeathPlace = &composerDeathPlaces[i];
+        }
+        if (i < composerNationalities.size()) {
+            composerNationality = &composerNationalities[i];
+        }
+
+        pugi::xml_node composerEl = work.append_child("composer");
+
+        // composer persName ("COM"/"COA"/"COS")
+        std::string composerAnalog = "humdrum:COM";
+        std::string composerCert;
+        std::string composerNameElementName = "persName";
+        if (composer->key == "COA") {
+            composerAnalog = "humdrum:COA";
+            composerCert = "medium";
+        }
+        else if (composer->key == "COS") {
+            composerAnalog = "humdrum:COS";
+            composerCert = "low";
+        }
+        else if (composer->key == "COC") {
+            composerAnalog = "humdrum:COC";
+            composerNameElementName = "corpName";
+        }
+
+        if (!composerCert.empty()) {
+            // We put @cert on <composer>, not on <persName>.
+            // The uncertainty is about whether this composer was involved,
+            // not about this composer's name.
+            composerEl.append_attribute("cert") = composerCert.c_str();
+        }
+
+        pugi::xml_node nameEl = composerEl.append_child(composerNameElementName.c_str());
+        nameEl.append_attribute("analog") = composerAnalog.c_str();
+        appendText(nameEl, composer->value);
+
+        // MADS-style authority records (personal info about a composer)
+        if (!composerBirthAndDeathDate && !composerBirthPlace && !composerDeathPlace && !composerNationality) {
+            // nothing for MADS
+            continue;
+        }
+
+        std::string madsXmlId = StringFormat("mads%d", madsXmlIdIndex++);
+
+        // reference <mads> element from composer's name element
+        nameEl.append_attribute("auth.uri") = StringFormat("#%s", madsXmlId.c_str()).c_str();
+
+        // There is extra info about the composer, that will need to go
+        // in <work><extMeta><madsCollection><mads>
+        if (m_madsCollection.empty()) {
+            m_madsCollection = m_madsDoc.append_child("madsCollection");
+            m_madsCollection.append_attribute("xmlns:xsi") = "http://www.w3.org/2001/XMLSchema-instance";
+            m_madsCollection.append_attribute("xsi:schemaLocation")
+                = "http://www.loc.gov/mads/v2 https://www.loc.gov/standards/mads/mads-2-1.xsd";
+            m_madsCollection.append_attribute("xmlns") = "http://www.loc.gov/mads/v2";
+        }
+
+        pugi::xml_node mads = m_madsCollection.append_child("mads");
+        mads.append_attribute("ID") = madsXmlId.c_str();
+        pugi::xml_node authority = mads.append_child("authority");
+        pugi::xml_node name = authority.append_child("name");
+        if (composerNameElementName == "corpName") {
+            name.append_attribute("type") = "corporate";
+        }
+        pugi::xml_node namePart = name.append_child("namePart");
+        appendText(namePart, composer->value);
+
+        // composerAlias ("humdrum:COL") goes in <mads><variant>
+        if (composerAlias) {
+            pugi::xml_node variant = mads.append_child("variant");
+            variant.append_attribute("type") = "other";
+            variant.append_attribute("otherType") = "humdrum:COL";
+            pugi::xml_node name = variant.append_child("name");
+            pugi::xml_node namePart = name.append_child("namePart");
+            appendText(namePart, composerAlias->value);
+        }
+
+        // extra info goes in <mads><personInfo>
+        if (composerBirthAndDeathDate || composerBirthPlace || composerDeathPlace || composerNationality) {
+            pugi::xml_node personInfo = mads.append_child("personInfo");
+            if (composerBirthAndDeathDate) {
+                std::map<std::string, std::string> attribs
+                    = isoDateAttributesFromHumdrumDate(composerBirthAndDeathDate->value, true);
+                std::string isodate;
+                std::string isodateBirth;
+                std::string isodateDeath;
+                if (attribs.count("edtf") > 0 || (attribs.count("startedtf") > 0 && attribs.count("endedtf") > 0)) {
+                    // either "edtf" will be there (use it), or "startedtf"/"endedtf" will both be there (use them)
+                    if (attribs.count("edtf") > 0) {
+                        isodate = attribs.at("edtf");
+                    }
+                    else {
+                        isodateBirth = attribs.at("startedtf");
+                        isodateDeath = attribs.at("endedtf");
+                    }
+                }
+                if (!isodate.empty()) {
+                    hum::HumRegex hre;
+                    std::vector<std::string> isodates;
+                    hre.split(isodates, isodate, "/");
+                    pugi::xml_node birthDate = personInfo.append_child("birthDate");
+                    birthDate.append_attribute("encoding") = "edtf";
+                    appendText(birthDate, isodates[0]);
+
+                    if (isodates.size() > 1) {
+                        pugi::xml_node deathDate = personInfo.append_child("deathDate");
+                        deathDate.append_attribute("encoding") = "edtf";
+                        appendText(deathDate, isodates[1]);
+                    }
+                }
+                else if (!isodateBirth.empty() && !isodateDeath.empty()) {
+                    pugi::xml_node birthDate = personInfo.append_child("birthDate");
+                    birthDate.append_attribute("encoding") = "edtf";
+                    appendText(birthDate, isodateBirth);
+
+                    pugi::xml_node deathDate = personInfo.append_child("deathDate");
+                    deathDate.append_attribute("encoding") = "edtf";
+                    appendText(deathDate, isodateDeath);
+                }
+            }
 
-    // <appInfo> /////////
-    pugi::xml_node appInfo = encodingDesc.append_child("appInfo");
-    pugi::xml_node application = appInfo.append_child("application");
-    application.append_attribute("isodate") = getDateString().c_str();
-    application.append_attribute("version") = GetVersion().c_str();
-    pugi::xml_node name = application.append_child("name");
-    name.append_child(pugi::node_pcdata).set_value("Verovio");
-    pugi::xml_node p1 = application.append_child("p");
-    p1.append_child(pugi::node_pcdata).set_value("Transcoded from Humdrum");
-    // <editorialDecl> /////////
-    std::string RNB = getReferenceValue("RNB", references);
-    std::string RWG = getReferenceValue("RWG", references);
-    if (!RNB.empty() || !RWG.empty()) {
-        pugi::xml_node editorialDecl = encodingDesc.append_child("editorialDecl");
-        for (int i = 0; i < (int)references.size(); ++i) {
-            std::string key = references[i]->getReferenceKey();
-            if (key == "RNB") {
-                pugi::xml_node note = editorialDecl.append_child("p");
-                note.append_child(pugi::node_pcdata).set_value(references[i]->getReferenceValue().c_str());
-                note.append_attribute("label") = "note";
-            }
-            if (key == "RWG") {
-                pugi::xml_node warning = editorialDecl.append_child("p");
-                warning.append_child(pugi::node_pcdata).set_value(references[i]->getReferenceValue().c_str());
-                warning.append_attribute("label") = "warning";
-            }
-        }
-    }
-    // <projectDesc> /////////
-    std::string ENC = getReferenceValue("ENC", references);
-    std::string EEV = getReferenceValue("EEV", references);
-    if (!ENC.empty() || !EEV.empty()) {
-        pugi::xml_node projectDesc = encodingDesc.append_child("projectDesc");
-        if (!ENC.empty()) {
-            ENC = "Encoded by: " + ENC;
-            pugi::xml_node p2 = projectDesc.append_child("p");
-            p2.append_child(pugi::node_pcdata).set_value(ENC.c_str());
-        }
-        if (!EEV.empty()) {
-            EEV = "Version: " + EEV;
-            pugi::xml_node p3 = projectDesc.append_child("p");
-            p3.append_child(pugi::node_pcdata).set_value(EEV.c_str());
-        }
-    }
-
-    // <sourceDesc> /////////
-
-    // <workDesc> /////////////
-    // <workDesc> changed to <workList> in MEI 4.0
-    // pugi::xml_node workDesc = meiHead.append_child("workDesc");
-    pugi::xml_node workList = meiHead.append_child("workList");
-    // pugi::xml_node work = workDesc.append_child("work");
-    pugi::xml_node work = workList.append_child("work");
-
-    std::string SCT = getReferenceValue("SCT", references);
-    if (!SCT.empty()) {
-        pugi::xml_node identifier = work.append_child("identifier");
-        identifier.append_attribute("analog") = "humdrum:SCT";
-        identifier.append_child(pugi::node_pcdata).set_value(SCT.c_str());
-    }
-    // <titleStmt> removed in MEI 4.0
-    // pugi::xml_node titleStmt = work.append_child("titleStmt");
-    // pugi::xml_node titleStmt = work.append_child("titleStmt");
-    // insertTitle(titleStmt, references);
-    insertTitle(work, references);
-    if (respPeople.size() > 0) {
-        // insertRespStmt(titleStmt, respPeople);
-        // Update for MEI 4.0:
-        insertPeople(work, respPeople);
-    }
-    std::string ODT = getReferenceValue("ODT", references);
-    std::string OCY = getReferenceValue("OCY", references);
-    std::string OPC = getReferenceValue("OPC", references);
-    if (!ODT.empty() || !OCY.empty() || !OPC.empty()) {
-        pugi::xml_node creation = work.append_child("creation");
-        if (!ODT.empty()) {
-            pugi::xml_node date = creation.append_child("date");
-            date.append_attribute("analog") = "humdrum:ODT";
-            date.append_child(pugi::node_pcdata).set_value(ODT.c_str());
-        }
-        if (!OCY.empty()) {
-            pugi::xml_node country = creation.append_child("geogName");
-            country.append_attribute("analog") = "humdrum:OCY";
-            country.append_child(pugi::node_pcdata).set_value(OCY.c_str());
-        }
-        if (!OPC.empty()) {
-            pugi::xml_node place = creation.append_child("geogName");
-            place.append_attribute("analog") = "humdrum:OPC";
-            place.append_child(pugi::node_pcdata).set_value(OPC.c_str());
-        }
-    }
-    std::string HAO = getReferenceValue("HAO", references);
-    if (!HAO.empty()) {
-        pugi::xml_node history = work.append_child("history");
-        history.append_attribute("analog") = "humdrum:HAO";
-        for (int i = 0; i < (int)references.size(); ++i) {
-            std::string refKey = references[i]->getReferenceKey();
-            if (refKey.compare(0, 3, "HAO")) {
-                continue;
+            if (composerBirthPlace) {
+                pugi::xml_node birthPlace = personInfo.append_child("birthPlace");
+                appendText(birthPlace, composerBirthPlace->value);
             }
-            else {
-                pugi::xml_node histLine = history.append_child("p");
-                histLine.append_attribute("xml:id") = StringFormat("p-L%d", references[i]->getLineNumber()).c_str();
-                histLine.append_child(pugi::node_pcdata).set_value(references[i]->getReferenceValue().c_str());
+
+            if (composerDeathPlace) {
+                pugi::xml_node deathPlace = personInfo.append_child("deathPlace");
+                appendText(deathPlace, composerDeathPlace->value);
             }
-        }
-    }
 
-    // <extMeta> /////////////
-    if (references.size() > 0) {
-        insertExtMeta(references);
+            if (composerNationality) {
+                pugi::xml_node nationality = personInfo.append_child("nationality");
+                appendText(nationality, composerNationality->value);
+            }
+        }
     }
-
-    // pugi::xml_node creation = work.append_child("creation");
 }
 
 //////////////////////////////
 //
-// HumdrumInput::getReferenceValue --
+// HumdrumInput::createHumdrumVerbatimExtMeta --
 //
 
-string HumdrumInput::getReferenceValue(const std::string &key, std::vector<hum::HumdrumLine *> &references)
+void HumdrumInput::createHumdrumVerbatimExtMeta(pugi::xml_node meiHead)
 {
-    for (int i = 0; i < (int)references.size(); ++i) {
-        if (key == references[i]->getReferenceKey()) {
-            return references[i]->getReferenceValue();
-        }
+    // for now do not print for **mens data, since timestamps are used
+    if (m_mens) {
+        return;
+    }
+    std::stringstream xmldata;
+    xmldata << "<extMeta>\n";
+    xmldata << "\t<frames xmlns=\"http://www.humdrum.org/ns/humxml\">\n";
+    for (int i = 0; i < (int)m_humdrumLineReferences.size(); ++i) {
+        std::string refKey = m_humdrumLineReferences[i]->getReferenceKey();
+        // Keep all reference records for round-trip conversions:
+        // if (!(refKey.compare(0, 3, "EED") && refKey.compare(0, 2, "HA") && refKey.compare(0, 2, "OT")
+        //         && refKey.compare(0, 2, "YE") && refKey.compare(0, 1, "X"))) {
+        //     continue;
+        // }
+        m_humdrumLineReferences[i]->printXml(xmldata, 4);
+    }
+    xmldata << "\t</frames>\n";
+    xmldata << "</extMeta>\n";
+
+    pugi::xml_document tmpdoc;
+    pugi::xml_parse_result result = tmpdoc.load_string(xmldata.str().c_str());
+    if (!result) {
+        // some sort of error, so give up;
+        cerr << "ExtMeta parse error: " << result.description() << endl;
+        cerr << xmldata.str();
+        return;
     }
-    std::string empty;
-    return empty;
+
+    meiHead.append_copy(tmpdoc.document_element());
 }
 
 //////////////////////////////
 //
-// HumdrumInput::getDateSting -- Return the current time and date as a std::string.
+// HumdrumInput::createBackMatter --
 //
 
-string HumdrumInput::getDateString()
+void HumdrumInput::createBackMatter()
 {
-    time_t t = time(0); // get time now
-    struct tm *now = localtime(&t);
-    std::string dateStr = StringFormat("%d-%02d-%02dT%02d:%02d:%02d", now->tm_year + 1900, now->tm_mon + 1,
-        now->tm_mday, now->tm_hour, now->tm_min, now->tm_sec);
-    return dateStr;
+    // There's one bit of metadata that goes in music/back/div@type="textTranslation":
+    // humdrum:HTX
+    std::vector<HumdrumReferenceItem> htxItems = getReferenceItems("HTX");
+    if (htxItems.empty()) {
+        return;
+    }
+    std::string languageForAll = getTextListLanguage(htxItems);
+    pugi::xml_node back = m_doc->m_back.child("back");
+    if (back.empty()) {
+        back = m_doc->m_back.append_child("back");
+    }
+    pugi::xml_node div = back.append_child("div");
+    div.append_attribute("type") = "textTranslation";
+    pugi::xml_node lineGroup = div.append_child("lg");
+    if (!languageForAll.empty()) {
+        lineGroup.append_attribute("xml:lang") = languageForAll.c_str();
+    }
+
+    for (auto const &htxItem : htxItems) {
+        pugi::xml_node line = lineGroup.append_child("l");
+        // <l> can't take @analog, so use @type instead (says Perry)
+        line.append_attribute("type") = "humdrum:HTX";
+        if (languageForAll.empty() && !htxItem.language.empty()) {
+            line.append_attribute("xml:lang") = htxItem.language.c_str();
+        }
+        appendText(line, htxItem.value.c_str());
+    }
 }
 
 //////////////////////////////
 //
-// HumdrumInput::insertRespStmt -- Print a list of composer and/or lyricist.
-//     This is for MEI 3.0 and no longer used, so should eventually be deleted.
+// HumdrumInput::createSimpleTitleElement --
 //
 
-void HumdrumInput::insertRespStmt(pugi::xml_node &titleStmt, std::vector<std::vector<std::string>> &respPeople)
+void HumdrumInput::createSimpleTitleElement()
 {
-    if (respPeople.size() == 0) {
+    std::vector<HumdrumReferenceItem> titles = getReferenceItems("OTL");
+    std::vector<HumdrumReferenceItem> movementNames = getReferenceItems("OMD");
+    m_simpleTitle = m_simpleTitleDoc.append_child("title");
+    std::string firstLang;
+    int bestTitleIdx = getBestItem(titles, std::string());
+    if (bestTitleIdx >= 0 && !titles[bestTitleIdx].language.empty()) {
+        firstLang = titles[bestTitleIdx].language;
+    }
+    int bestMovementNameIdx = getBestItem(movementNames, std::string());
+    if ((bestTitleIdx < 0) && (bestMovementNameIdx >= 0) && !movementNames[bestMovementNameIdx].language.empty()) {
+        firstLang = movementNames[bestMovementNameIdx].language;
+    }
+
+    if (bestTitleIdx < 0 && bestMovementNameIdx < 0) {
+        // m_simpleTitle is just <title/>
         return;
     }
-    pugi::xml_node respStmt = titleStmt.append_child("respStmt");
-    for (int i = 0; i < (int)respPeople.size(); ++i) {
-        pugi::xml_node person = respStmt.append_child("persName");
-        person.append_attribute("xml:id") = StringFormat("persname-L%s", respPeople[i][3].c_str()).c_str();
-        person.append_attribute("analog") = StringFormat("humdrum:%s", respPeople[i][2].c_str()).c_str();
-        person.append_attribute("role") = unescapeHtmlEntities(respPeople[i][1]).c_str();
-        person.text().set(unescapeHtmlEntities(respPeople[i][0]).c_str());
+
+    if (!firstLang.empty()) {
+        m_simpleTitle.append_attribute("xml:lang") = firstLang.c_str();
+    }
+
+    if (bestTitleIdx >= 0 && bestMovementNameIdx >= 0
+        && titles[bestTitleIdx].value != movementNames[bestMovementNameIdx].value) {
+        std::string combinedName
+            = titles[bestTitleIdx].value + std::string(", ") + movementNames[bestMovementNameIdx].value;
+        appendText(m_simpleTitle, combinedName);
+    }
+    else if (bestTitleIdx >= 0) {
+        appendText(m_simpleTitle, titles[bestTitleIdx].value);
+    }
+    else if (bestMovementNameIdx >= 0) {
+        appendText(m_simpleTitle, movementNames[bestMovementNameIdx].value);
     }
 }
 
 //////////////////////////////
 //
-// HumdrumInput::insertPeople -- Print a list of composer and/or lyricist.
-//    Adapted from HumdrumInput::insertRespStmt().
-//    Each entry in respPeople:
-//   [0] = Person's name
-//   [1] = role:
-//          COM = composer
-//          COA = attributed composer
-//          COS = suspected composer
-//          LYR = lyricist composer
-//          see definition of getRespPeople() for more roles.
-//   [2] = @analog
-//   [3] = Line number for xml:id creation
+// HumdrumInput::createSimpleComposerElements --
 //
 
-void HumdrumInput::insertPeople(pugi::xml_node &work, std::vector<std::vector<std::string>> &respPeople)
+void HumdrumInput::createSimpleComposerElements()
 {
-    if (respPeople.size() == 0) {
+    // Just all the COMs.  If no COMs, then do the COCs (corporate), the COAs (attributed),
+    // the COSs (suspected), or the COLs (aliases), in that order of preference.
+    std::vector<HumdrumReferenceItem> composers = getReferenceItems("COM");
+    if (composers.empty()) {
+        composers = getReferenceItems("COC");
+    }
+    if (composers.empty()) {
+        composers = getReferenceItems("COA");
+    }
+    if (composers.empty()) {
+        composers = getReferenceItems("COS");
+    }
+    if (composers.empty()) {
+        composers = getReferenceItems("COL");
+    }
+    if (composers.empty()) {
         return;
     }
-    // pugi::xml_node respStmt = titleStmt.append_child("respStmt");
-    bool created = false;
-    pugi::xml_node person;
-    for (int i = 0; i < (int)respPeople.size(); ++i) {
-        created = false;
-        if (respPeople[i][1] == "composer") {
-            person = work.append_child("composer");
-            created = true;
+
+    for (auto const &composer : composers) {
+        pugi::xml_node composerEl = m_simpleComposersDoc.append_child("composer");
+        std::string composerCert;
+        if (composer.key == "COA") {
+            composerCert = "medium";
         }
-        if (respPeople[i][1] == "attributed composer") {
-            person = work.append_child("composer");
-            person.append_attribute("cert") = "unknown";
-            created = true;
+        else if (composer.key == "COS") {
+            composerCert = "low";
         }
-        if (respPeople[i][1] == "suspected composer") {
-            person = work.append_child("composer");
-            person.append_attribute("cert") = "unknown";
-            created = true;
+        if (!composerCert.empty()) {
+            // We put @cert on <composer>, not on <persName>.
+            // The uncertainty is about whether this composer was involved,
+            // not about what this composer's name was.
+            composerEl.append_attribute("cert") = composerCert.c_str();
         }
-        else if (respPeople[i][1] == "lyricist") {
-            person = work.append_child("lyricist");
-            created = true;
+
+        pugi::xml_node nameEl;
+        if (composer.key == "COC") {
+            nameEl = composerEl.append_child("corpName");
         }
-        else if (respPeople[i][1] == "librettist") {
-            person = work.append_child("librettist");
-            created = true;
+        else {
+            nameEl = composerEl.append_child("persName");
         }
 
-        if (created) {
-            person.text().set(unescapeHtmlEntities(respPeople[i][0]).c_str());
-            if (!respPeople[i][2].empty()) {
-                person.append_attribute("analog") = StringFormat("humdrum:%s", respPeople[i][2].c_str()).c_str();
-            }
-            person.append_attribute("xml:id") = StringFormat("person-L%s", respPeople[i][3].c_str()).c_str();
+        if (composer.key == "COL") {
+            nameEl.append_attribute("type") = "alias";
         }
+        appendText(nameEl, composer.value);
     }
 }
 
 //////////////////////////////
 //
-// HumdrumInput::getRespPeople -- Get the respStmnt people, such as the composer
-// and/or lyricist.
-//
-// Roles (4th parameter in addPerson(), is free-form, but should use the roles
-// are listed in these two webpages:
-//    http://www.loc.gov/marc/relators/relacode.html
-//       list of three-letter relator codes
-//    http://www.loc.gov/marc/relators/relaterm.html
-//       short descriptions of relator codes
+// HumdrumInput::getBestItem --
 //
 
-void HumdrumInput::getRespPeople(
-    std::vector<std::vector<std::string>> &respPeople, std::vector<hum::HumdrumLine *> &references)
+int HumdrumInput::getBestItem(const std::vector<HumdrumReferenceItem> &titles, const std::string &requiredLanguage)
 {
+    // If requiredLanguage is set, return the first item with that language,
+    // otherwise return the first item that is untranslated.
+    // If nothing is found that has the right language/is untranslated,
+    // just return the first item.
+    bool noRequiredLanguage = requiredLanguage.empty();
+
+    for (int i = 0; i < (int)titles.size(); i++) {
+        const HumdrumReferenceItem *title = &titles[i];
+        if (noRequiredLanguage) {
+            // best title is first non-translated title
+            if (!title->isTranslated) {
+                return i;
+            }
+        }
+        else {
+            // best title is first title in the required language
+            if (title->language == requiredLanguage) {
+                return i;
+            }
+        }
+    }
 
-    // precalculate a reference map here to make more O(N) rather than O(N^2)
-    addPerson(respPeople, references, "COM", "composer"); // cmp
-    addPerson(respPeople, references, "COA", "attributed composer");
-    addPerson(respPeople, references, "COS", "suspected composer");
-    addPerson(respPeople, references, "LYR", "lyricist"); // lyr
-    addPerson(respPeople, references, "LIB", "librettist"); // lbt
-    addPerson(respPeople, references, "LAR", "arranger"); // arr
-    addPerson(respPeople, references, "LOR", "adapter"); // orchestrator, adp
-    addPerson(respPeople, references, "RPN", "producer"); // pro
-    addPerson(respPeople, references, "MPN", "performer"); // prf, also: Singer/Instrumentalist
-    addPerson(respPeople, references, "MCN", "conductor"); // cnd
-    addPerson(respPeople, references, "ODE", "dedicatee"); // dte
-    addPerson(respPeople, references, "OCO", "patron"); // commissioner, pat
-    addPerson(respPeople, references, "OCL", "collector"); // col
-    addPerson(respPeople, references, "PED", "source editor");
-    addPerson(respPeople, references, "EED", "digital editor");
-    addPerson(respPeople, references, "ENC", "encoder"); // mrk,
-    // Markup editor
+    if (!titles.empty()) {
+        return 0;
+    }
+
+    return -1;
 }
 
 //////////////////////////////
 //
-// HumdrumInput::addPerson --
+// HumdrumInput::getAllReferenceItems --
 //
 
-void HumdrumInput::addPerson(std::vector<std::vector<std::string>> &respPeople,
-    std::vector<hum::HumdrumLine *> &references, const std::string &key, const std::string &role)
+std::map<std::string, std::vector<HumdrumReferenceItem>> HumdrumInput::getAllReferenceItems(hum::HumdrumFile &infile)
 {
-    for (int i = 0; i < (int)references.size(); ++i) {
-        if (references[i]->getReferenceKey() == key) {
-            respPeople.resize(respPeople.size() + 1);
-            respPeople.back().resize(4);
-            respPeople.back()[0] = references[i]->getReferenceValue();
-            respPeople.back()[1] = role;
-            respPeople.back()[2] = key;
-            respPeople.back()[3] = std::to_string(references[i]->getLineNumber());
+    int firstDataLineIdx = infile.getLineCount();
+    for (int lineIdx = 0; lineIdx < infile.getLineCount(); lineIdx++) {
+        if (infile[lineIdx].isData()) {
+            firstDataLineIdx = lineIdx;
+            break;
+        }
+    }
+
+    std::map<std::string, std::vector<HumdrumReferenceItem>> items;
+    for (int i = 0; i < (int)m_humdrumLineReferences.size(); ++i) {
+        hum::HumRegex hre;
+        std::string baseKey = m_humdrumLineReferences[i]->getReferenceKey();
+        std::string baseValue = m_humdrumLineReferences[i]->getReferenceValue();
+        std::string key;
+        std::string value;
+        bool isParseable = false;
+        bool isHumdrumKey = false;
+        std::string language;
+        bool isTranslated = false;
+        int index = 0;
+
+        if (baseKey.compare(0, 5, "RDF**") == 0 || baseKey == "system-decoration") {
+            continue;
+        }
+
+        if (hre.search(baseKey, "^([^0-9@ \t]*)([0-9]*)?((@{1,2})([a-zA-Z]*))?$")) {
+            isParseable = true;
+            key = hre.getMatch(1);
+            index = hre.getMatchInt(2);
+            language = hre.getMatch(5);
+            std::transform(language.begin(), language.end(), language.begin(), ::tolower);
+            isTranslated = !language.empty() && hre.getMatch(4) != "@@";
+            isHumdrumKey = (key.size() >= 3) && isStandardHumdrumKey(key.substr(0, 3));
+        }
+
+        value = unescapeHtmlEntities(baseValue);
+
+        if (key == "OMD") {
+            // Only take OMDs before the firstDataLineIdx as movementName in metadata,
+            // because after the first data line, they're not movementNames, just
+            // tempo changes.  And of the ones that are early enough to take, skip the
+            // ones that have metronome info but no tempo name.
+            if (m_humdrumLineReferences[i]->getLineIndex() > firstDataLineIdx) {
+                continue;
+            }
+
+            if (hre.search(baseValue,
+                    // With parens, e.g. 'Allegro M.M. ([quarter] = 128.0)'
+                    "(.*?)\\s*(M\\.M\\.|M\\. M\\.|M\\:M\\:|M M)?\\s*\\(\\[([^=\\]]*)\\]\\s*=\\s*(\\d+\\.?\\d*)")
+                || hre.search(baseValue,
+                    // Without parens, e.g. 'Allegro M.M. [quarter] = 128.0'
+                    "(.*?)\\s*(M\\.M\\.|M\\. M\\.|M\\:M\\:|M M)?\\s*\\[([^=\\]]*)\\]\\s*=\\s*(\\d+\\.?\\d*)")) {
+                // It has metronome info.
+                if (hre.getMatch(1) != "") {
+                    // it has a tempo name and some other metronome-like info.  Strip off the metronome info and
+                    // just use the tempo name as the movement name.  (Strip off leading and trailing white-space, too.)
+                    value = hre.getMatch(1);
+                    value.erase(0, value.find_first_not_of(" \t"));
+                    value.erase(value.find_last_not_of(" \t") + 1);
+                }
+                else {
+                    // It has metronome info, but has no tempo name;
+                    // you can't use "[quarter] = 128" as a movement name
+                    continue;
+                }
+            }
+        }
+        HumdrumReferenceItem item;
+        item.lineText = m_humdrumLineReferences[i]->getText();
+        item.key = key;
+        item.value = value;
+        item.isParseable = isParseable;
+        item.isHumdrumKey = isHumdrumKey;
+        item.isTranslated = isTranslated;
+        item.language = language;
+        item.index = index;
+        std::vector<HumdrumReferenceItem> oldItemVec;
+        if (auto search = items.find(key); search != items.end()) {
+            oldItemVec = items.at(key);
         }
+        oldItemVec.push_back(item);
+        items[key] = oldItemVec;
     }
+
+    return items;
 }
 
 //////////////////////////////
 //
-// HumdrumInput::insertExtMeta -- Print Humdrum reference records as XML into
-//     <extMeta> element.
+// HumdrumInput::isStandardHumdrumKey --
 //
 
-void HumdrumInput::insertExtMeta(std::vector<hum::HumdrumLine *> &references)
+bool HumdrumInput::isStandardHumdrumKey(const std::string &key)
 {
-    // for now do not print for **mens data, since timestamps are used
-    if (m_mens) {
-        return;
-    }
-    std::stringstream xmldata;
-    xmldata << "<extMeta>\n";
-    xmldata << "\t<frames xmlns=\"http://www.humdrum.org/ns/humxml\">\n";
-    for (int i = 0; i < (int)references.size(); ++i) {
-        std::string refKey = references[i]->getReferenceKey();
-        // Keep all reference records for round-trip conversions:
-        // if (!(refKey.compare(0, 3, "EED") && refKey.compare(0, 2, "HA") && refKey.compare(0, 2, "OT")
-        //         && refKey.compare(0, 2, "YE") && refKey.compare(0, 1, "X"))) {
-        //     continue;
-        // }
-        references[i]->printXml(xmldata, 4);
-    }
-    xmldata << "\t</frames>\n";
-    xmldata << "</extMeta>\n";
-
-    pugi::xml_document tmpdoc;
-    pugi::xml_parse_result result = tmpdoc.load_string(xmldata.str().c_str());
-    if (!result) {
-        // some sort of error, so give up;
-        cerr << "ExtMeta parse error: " << result.description() << endl;
-        cerr << xmldata.str();
-        return;
+    if ((key[0] == 'X') && (key.size() == 3)) {
+        // translated title
+        return true;
     }
-
-    m_doc->m_header.first_child().append_copy(tmpdoc.document_element());
+    return std::find(m_standardHumdrumKeys.begin(), m_standardHumdrumKeys.end(), key) != m_standardHumdrumKeys.end();
 }
 
 //////////////////////////////
 //
-// HumdrumInput::insertTitle --
+// HumdrumInput::getReferenceItems --
 //
 
-void HumdrumInput::insertTitle(pugi::xml_node &work, const std::vector<hum::HumdrumLine *> &references)
+std::vector<HumdrumReferenceItem> HumdrumInput::getReferenceItems(const std::string &key)
 {
-    std::string key;
-    std::string value;
-    bool lang;
-    bool plang;
-    std::string language;
-
-    int titlecount = 0;
-
-    for (int i = 0; i < (int)references.size(); ++i) {
-        plang = false;
-        lang = false;
-        key = references[i]->getReferenceKey();
-        if (key.compare(0, 2, "OT") && key.compare(0, 1, "X")) {
-            continue;
-        }
-        value = references[i]->getReferenceValue();
-        if (value.empty()) {
-            continue;
-        }
-        auto loc = key.find("@");
-        if (loc != std::string::npos) {
-            lang = true;
-            if (key.find("@@") != std::string::npos) {
-                plang = true;
-                language = key.substr(loc + 2);
-                if (language.empty()) {
-                    plang = false;
-                    lang = false;
-                }
-            }
-            else {
-                language = key.substr(loc + 1);
-                if (language.empty()) {
-                    plang = false;
-                    lang = false;
-                }
-            }
-        }
+    std::vector<HumdrumReferenceItem> items;
+    if (auto search = m_references.find(key); search != m_references.end()) {
+        items = m_references[key];
+    }
+    return items;
+}
 
-        for (int j = 0; j < (int)language.size(); ++j) {
-            if (language[j] == '-') {
-                // don't force to lower case after first dash
-                // as BCP 47 country codes are in upper case, and
-                // variant codes usually start capitalized.
-                break;
-            }
-            language[j] = std::tolower(language[j]);
-        }
+//////////////////////////////
+//
+// HumdrumInput::anyReferenceItemsExist --
+//
 
-        pugi::xml_node title = work.append_child("title");
-        titlecount++;
-        title.text().set(unescapeHtmlEntities(value).c_str());
-        title.append_attribute("xml:id") = StringFormat("title-L%d", references[i]->getLineNumber()).c_str();
-        title.append_attribute("analog") = StringFormat("humdrum:%s", key.substr(0, 3).c_str()).c_str();
-        if (key.compare(0, 3, "OTL") == 0) {
-            if (!lang || plang) {
-                title.append_attribute("type") = "main";
-            }
-            else {
-                title.append_attribute("type") = "translated";
-            }
-            if (lang) {
-                title.append_attribute("xml:lang") = language.c_str();
-            }
-        }
-        else if (key.compare(0, 3, "OTA") == 0) {
-            title.append_attribute("type") = "alternative";
-            if (lang) {
-                title.append_attribute("xml:lang") = language.c_str();
-            }
-        }
-        else if (key.compare(0, 3, "OTP") == 0) {
-            title.append_attribute("type") = "alternative";
-            title.append_attribute("label") = "popular";
-            if (lang) {
-                title.append_attribute("xml:lang") = language.c_str();
-            }
-        }
-        else {
-            title.append_attribute("type") = "translated";
+bool HumdrumInput::anyReferenceItemsExist(const std::vector<std::string> &keys)
+{
+    for (auto const &key : keys) {
+        if (auto items = m_references.find(key); items != m_references.end()) {
+            return true;
         }
     }
+    return false;
+}
 
-    if (!titlecount) {
-        // Put in a required empty <title/> tag:
-        work.append_child("title");
-    }
+//////////////////////////////
+//
+// HumdrumInput::getDateString -- Return the current time and date as a std::string.
+//
+
+std::string HumdrumInput::getDateString()
+{
+    time_t t = time(0); // get time now
+    struct tm *now = localtime(&t);
+    std::string dateStr = StringFormat("%d-%02d-%02dT%02d:%02d:%02d", now->tm_year + 1900, now->tm_mon + 1,
+        now->tm_mday, now->tm_hour, now->tm_min, now->tm_sec);
+    return dateStr;
 }
 
 //////////////////////////////
@@ -3187,7 +5352,7 @@ void HumdrumInput::prepareStaffGroups(int top, int bot)
     const std::vector<hum::HTp> &staffstarts = m_staffstarts;
 
     if (staffstarts.size() > 0) {
-        addMidiTempo(m_doc->GetCurrentScoreDef(), staffstarts[0], top, bot);
+        addMidiTempo(m_doc->GetFirstScoreDef(), staffstarts[0], top, bot);
     }
     hum::HumRegex hre;
     for (int i = 0; i < (int)staffstarts.size(); ++i) {
@@ -3221,7 +5386,7 @@ void HumdrumInput::prepareStaffGroups(int top, int bot)
         // If there is one staff, then no extra decoration.
         else if (staffstarts.size() == 1) {
             StaffGrp *sg = new StaffGrp();
-            m_doc->GetCurrentScoreDef()->AddChild(sg);
+            m_doc->GetFirstScoreDef()->AddChild(sg);
             sg->AddChild(m_staffdef[0]);
         }
         // do something if there is no staff in the score?
@@ -3230,7 +5395,7 @@ void HumdrumInput::prepareStaffGroups(int top, int bot)
         bool status = processStaffDecoration(decoration);
         if (!status) {
             StaffGrp *sg = new StaffGrp();
-            m_doc->GetCurrentScoreDef()->AddChild(sg);
+            m_doc->GetFirstScoreDef()->AddChild(sg);
             sg->SetBarThru(BOOLEAN_false);
             // setGroupSymbol(sg, staffGroupingSym_SYMBOL_bracket);
             for (int i = 0; i < (int)m_staffdef.size(); ++i) {
@@ -3257,7 +5422,7 @@ void HumdrumInput::prepareStaffGroups(int top, int bot)
 
 void HumdrumInput::promoteInstrumentNamesToGroup()
 {
-    ScoreDef *sdf = m_doc->GetCurrentScoreDef();
+    ScoreDef *sdf = m_doc->GetFirstScoreDef();
     int count = sdf->GetChildCount();
     for (int i = 0; i < count; ++i) {
         Object *obj = sdf->GetChild(i);
@@ -3331,7 +5496,7 @@ void HumdrumInput::promoteInstrumentsForStaffGroup(StaffGrp *group)
 
 void HumdrumInput::promoteInstrumentAbbreviationsToGroup()
 {
-    ScoreDef *sdf = m_doc->GetCurrentScoreDef();
+    ScoreDef *sdf = m_doc->GetFirstScoreDef();
     int count = sdf->GetChildCount();
 
     for (int i = 0; i < count; ++i) {
@@ -3783,14 +5948,14 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
         // There is no barline across the staves in this case.
         root = new StaffGrp();
         root->SetBarThru(BOOLEAN_false);
-        m_doc->GetCurrentScoreDef()->AddChild(root);
+        m_doc->GetFirstScoreDef()->AddChild(root);
     }
     else if (d[0] == '(') {
         // The outer group is not bracketed, but bar goes all of
         // the way through system.
         root = new StaffGrp();
         root->SetBarThru(BOOLEAN_true);
-        m_doc->GetCurrentScoreDef()->AddChild(root);
+        m_doc->GetFirstScoreDef()->AddChild(root);
     }
     else if (pairing.back() == 0) {
         skipfirst = true;
@@ -3806,7 +5971,7 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
         else if (d[0] == '[') {
             setGroupSymbol(root, staffGroupingSym_SYMBOL_bracket);
         }
-        m_doc->GetCurrentScoreDef()->AddChild(root);
+        m_doc->GetFirstScoreDef()->AddChild(root);
     }
 
     std::vector<int> spine; // kernstart index
@@ -4047,7 +6212,7 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
             root->AddChild(sg);
         }
         else {
-            m_doc->GetCurrentScoreDef()->AddChild(sg);
+            m_doc->GetFirstScoreDef()->AddChild(sg);
         }
         for (int i = 0; i < (int)m_staffdef.size(); ++i) {
             sg->AddChild(m_staffdef[i]);
@@ -4070,7 +6235,7 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
                 root->AddChild(sg);
             }
             else {
-                m_doc->GetCurrentScoreDef()->AddChild(sg);
+                m_doc->GetFirstScoreDef()->AddChild(sg);
             }
         }
 
@@ -4147,7 +6312,7 @@ bool HumdrumInput::processStaffDecoration(const std::string &decoration)
         }
         else {
             root_sg = new StaffGrp();
-            m_doc->GetCurrentScoreDef()->AddChild(root_sg);
+            m_doc->GetFirstScoreDef()->AddChild(root_sg);
             root_sg->SetBarThru(BOOLEAN_false);
         }
         for (int i = 0; i < (int)newgroups.size(); ++i) {
@@ -4633,7 +6798,7 @@ bool HumdrumInput::prepareFooter(
     // std::cout << "MEI CONTENT " << meicontent << std::endl;
 
     AttFormeworkComparison comparison(PGFOOT, PGFUNC_first);
-    Object *pgfoot = tempdoc.GetCurrentScoreDef()->FindDescendantByComparison(&comparison);
+    Object *pgfoot = tempdoc.GetFirstScoreDef()->FindDescendantByComparison(&comparison);
     if (pgfoot == NULL) {
         return false;
     }
@@ -4651,10 +6816,10 @@ bool HumdrumInput::prepareFooter(
         return false;
     }
 
-    m_doc->GetCurrentScoreDef()->AddChild(pgfoot);
+    m_doc->GetFirstScoreDef()->AddChild(pgfoot);
 
     AttFormeworkComparison comparison2(PGFOOT, PGFUNC_all);
-    Object *pgfoot2 = tempdoc.GetCurrentScoreDef()->FindDescendantByComparison(&comparison2);
+    Object *pgfoot2 = tempdoc.GetFirstScoreDef()->FindDescendantByComparison(&comparison2);
     if (pgfoot2 == NULL) {
         return true;
     }
@@ -4672,7 +6837,7 @@ bool HumdrumInput::prepareFooter(
         return true;
     }
 
-    m_doc->GetCurrentScoreDef()->AddChild(pgfoot2);
+    m_doc->GetFirstScoreDef()->AddChild(pgfoot2);
 
     return true;
 }
@@ -4808,7 +6973,7 @@ bool HumdrumInput::prepareHeader(
     // std::string meicontent = meioutput.GetOutput();
     // std::cout << "MEI CONTENT " << meicontent << std::endl;
 
-    Object *pghead = tempdoc.GetCurrentScoreDef()->FindDescendantByType(ClassId::PGHEAD);
+    Object *pghead = tempdoc.GetFirstScoreDef()->FindDescendantByType(ClassId::PGHEAD);
     if (pghead == NULL) {
         return false;
     }
@@ -4826,7 +6991,7 @@ bool HumdrumInput::prepareHeader(
         return false;
     }
 
-    m_doc->GetCurrentScoreDef()->AddChild(pghead);
+    m_doc->GetFirstScoreDef()->AddChild(pghead);
 
     return true;
 }
@@ -5241,8 +7406,11 @@ void HumdrumInput::addMidiTempo(ScoreDef *scoreDef, hum::HTp kernpart, int top,
             break;
         }
         kernpart = kernpart->getNextToken();
+        if (!kernpart) {
+            break;
+        }
     }
-    if (!foundtempo) {
+    if (kernpart && !foundtempo) {
         hum::HumdrumFile &infile = *(kernpart->getOwner()->getOwner());
         hum::HumRegex hre;
         hum::HTp omd = NULL;
@@ -5273,14 +7441,14 @@ void HumdrumInput::addMidiTempo(ScoreDef *scoreDef, hum::HTp kernpart, int top,
 
 //////////////////////////////
 //
-// HumdrumInput::addDefaultTempo --  Add MM400 if average rhythm is more than
+// HumdrumInput::addDefaultTempo --  Add MM400 if average hhythm is more than
 //    a half note (for basic Renaissance default tempo).
 //
 
 void HumdrumInput::addDefaultTempo(ScoreDef *scoreDef)
 {
     if (m_mens) {
-        scoreDef->SetMidiBpm(400.0 * m_globalTempoScaling);
+        scoreDef->SetMidiBpm(280.0 * m_globalTempoScaling);
         return;
     }
     double sum = 0.0;
@@ -5360,13 +7528,16 @@ void HumdrumInput::fillStaffInfo(hum::HTp staffstart, int staffnumber, int staff
         if (part->compare(0, 5, "*clef") == 0) {
             if (cleftok) {
                 if (clef == *part) {
-                    // there is already a clef found, and it is the same
+                    // There is already a clef found, and it is the same
                     // as this one, so ignore the second one.
                 }
                 else {
-                    // mark clef as a clef change to print in the layer
-                    part->setValue("auto", "clefChange", 1);
-                    markOtherClefsAsChange(part);
+                    // Mark clef as a clef change to print in the layer:
+                    if (part->isKern()) {
+                        // Don't mark as clef change in **mens.
+                        part->setValue("auto", "clefChange", 1);
+                        markOtherClefsAsChange(part);
+                    }
                 }
                 part = part->getNextToken();
                 continue;
@@ -5377,7 +7548,7 @@ void HumdrumInput::fillStaffInfo(hum::HTp staffstart, int staffnumber, int staff
                 cleftok = part;
             }
             else if (part->find("clefX") != std::string::npos) {
-                // allow percussion clef to not have a line number since it is unpitched.
+                // Allow percussion clef to not have a line number since it is unpitched.
                 clef = *part;
                 cleftok = part;
             }
@@ -5482,7 +7653,7 @@ void HumdrumInput::fillStaffInfo(hum::HTp staffstart, int staffnumber, int staff
             ss[staffindex].meter_bottom = bot;
             ss[staffindex].meter_top = top;
             if (bot == 0) {
-                // Can't to breve meters, so switch to semibreve meter (whole notes).
+                // Can't do breve meters, so switch to semibreve meter (whole notes).
                 ss[staffindex].meter_bottom = 1;
                 ss[staffindex].meter_top *= 2;
             }
@@ -5538,7 +7709,10 @@ void HumdrumInput::fillStaffInfo(hum::HTp staffstart, int staffnumber, int staff
     // short-circuit *met with *omet for **mens data
     if (staffstart->isMensLike()) {
         if ((!m_omet.empty()) && (staffnumber == m_omet.back().first)) {
-            metersig = *m_omet.back().second;
+            auto ploc = m_omet.back().second->rfind(")");
+            if (ploc != std::string::npos) {
+                metersig = m_omet.back().second->substr(6, ploc - 6);
+            }
             metertok = m_omet.back().second;
         }
     }
@@ -6232,8 +8406,14 @@ void HumdrumInput::setMensurationSymbol(
     if (mensurtok) {
         setLocationId(vrvmensur, mensurtok);
     }
-    if (metersig == "*met(C)" || metersig == "C") {
+
+    string metdata = metersig;
+    hre.replaceDestructive(metdata, "$1", "^\\*o?met\\((.*)\\)");
+
+    if (metdata == "C") {
         if (m_mens) {
+            vrvmensur->SetModusmaior(MODUSMAIOR_2);
+            vrvmensur->SetModusminor(MODUSMINOR_2);
             vrvmensur->SetTempus(TEMPUS_2);
             vrvmensur->SetProlatio(PROLATIO_2);
         }
@@ -6242,9 +8422,11 @@ void HumdrumInput::setMensurationSymbol(
         tempus = 2;
         prolatio = 2;
     }
-    else if (metersig == "*met(C3)" || metersig == "C3") {
+    else if (metdata == "C3") { // non-sesquialtera
         if (m_mens) {
-            vrvmensur->SetTempus(TEMPUS_2);
+            vrvmensur->SetModusmaior(MODUSMAIOR_2);
+            vrvmensur->SetModusminor(MODUSMINOR_2);
+            vrvmensur->SetTempus(TEMPUS_3);
             vrvmensur->SetProlatio(PROLATIO_2);
         }
         maximodus = 2;
@@ -6252,8 +8434,10 @@ void HumdrumInput::setMensurationSymbol(
         tempus = 3;
         prolatio = 2;
     }
-    else if (metersig == "*met(C|)" || metersig == "C|") {
+    else if (metdata == "C|") {
         if (m_mens) {
+            vrvmensur->SetModusmaior(MODUSMAIOR_2);
+            vrvmensur->SetModusminor(MODUSMINOR_2);
             vrvmensur->SetTempus(TEMPUS_2);
             vrvmensur->SetProlatio(PROLATIO_2);
         }
@@ -6263,7 +8447,7 @@ void HumdrumInput::setMensurationSymbol(
         tempus = 2;
         prolatio = 2;
     }
-    else if (metersig == "*met(C|3)" || metersig == "C|3") {
+    else if (metdata == "C|3") { // fix for regular and sesquialtera
         if (m_mens) {
             vrvmensur->SetTempus(TEMPUS_2);
             vrvmensur->SetProlatio(PROLATIO_2);
@@ -6275,8 +8459,10 @@ void HumdrumInput::setMensurationSymbol(
         tempus = 2;
         prolatio = 2;
     }
-    else if (metersig == "*met(O)" || metersig == "O") {
+    else if (metdata == "O") {
         if (m_mens) {
+            vrvmensur->SetModusmaior(MODUSMAIOR_2);
+            vrvmensur->SetModusminor(MODUSMINOR_2);
             vrvmensur->SetTempus(TEMPUS_3);
             vrvmensur->SetProlatio(PROLATIO_2);
         }
@@ -6285,8 +8471,10 @@ void HumdrumInput::setMensurationSymbol(
         tempus = 3;
         prolatio = 2;
     }
-    else if (metersig == "*met(O3)" || metersig == "O3") {
+    else if (metdata == "O3") { // also add sesquialtera interpretation
         if (m_mens) {
+            vrvmensur->SetModusmaior(MODUSMAIOR_3);
+            vrvmensur->SetModusminor(MODUSMINOR_3);
             vrvmensur->SetTempus(TEMPUS_3);
             vrvmensur->SetProlatio(PROLATIO_2);
         }
@@ -6295,8 +8483,10 @@ void HumdrumInput::setMensurationSymbol(
         tempus = 3;
         prolatio = 2;
     }
-    else if (metersig == "*met(O|)" || metersig == "O|") {
+    else if (metdata == "O|") {
         if (m_mens) {
+            vrvmensur->SetModusmaior(MODUSMAIOR_2);
+            vrvmensur->SetModusminor(MODUSMINOR_2);
             vrvmensur->SetTempus(TEMPUS_3);
             vrvmensur->SetProlatio(PROLATIO_2);
         }
@@ -6306,8 +8496,10 @@ void HumdrumInput::setMensurationSymbol(
         tempus = 3;
         prolatio = 2;
     }
-    else if (metersig == "*met(O|3)" || metersig == "O|3") {
+    else if (metdata == "O|3") { // also add sesquialtera interpretation
         if (m_mens) {
+            vrvmensur->SetModusmaior(MODUSMAIOR_3);
+            vrvmensur->SetModusminor(MODUSMINOR_3);
             vrvmensur->SetTempus(TEMPUS_3);
             vrvmensur->SetProlatio(PROLATIO_2);
         }
@@ -6317,8 +8509,10 @@ void HumdrumInput::setMensurationSymbol(
         tempus = 3;
         prolatio = 2;
     }
-    else if (metersig == "*met(O.)" || metersig == "O.") {
+    else if (metdata == "O.") {
         if (m_mens) {
+            vrvmensur->SetModusmaior(MODUSMAIOR_2);
+            vrvmensur->SetModusminor(MODUSMINOR_2);
             vrvmensur->SetTempus(TEMPUS_3);
             vrvmensur->SetProlatio(PROLATIO_3);
         }
@@ -6327,8 +8521,10 @@ void HumdrumInput::setMensurationSymbol(
         tempus = 3;
         prolatio = 3;
     }
-    else if (metersig == "*met(O.|)" || metersig == "O.|") {
+    else if (metdata == "O.|") {
         if (m_mens) {
+            vrvmensur->SetModusmaior(MODUSMAIOR_2);
+            vrvmensur->SetModusminor(MODUSMINOR_2);
             vrvmensur->SetTempus(TEMPUS_3);
             vrvmensur->SetProlatio(PROLATIO_3);
         }
@@ -6338,8 +8534,10 @@ void HumdrumInput::setMensurationSymbol(
         tempus = 3;
         prolatio = 3;
     }
-    else if (metersig == "*met(C.)" || metersig == "C.") {
+    else if (metdata == "C.") {
         if (m_mens) {
+            vrvmensur->SetModusmaior(MODUSMAIOR_2);
+            vrvmensur->SetModusminor(MODUSMINOR_2);
             vrvmensur->SetTempus(TEMPUS_2);
             vrvmensur->SetProlatio(PROLATIO_3);
         }
@@ -6348,8 +8546,10 @@ void HumdrumInput::setMensurationSymbol(
         tempus = 2;
         prolatio = 3;
     }
-    else if (metersig == "*met(C.|)" || metersig == "C.|") {
+    else if (metdata == "C.|") {
         if (m_mens) {
+            vrvmensur->SetModusmaior(MODUSMAIOR_2);
+            vrvmensur->SetModusminor(MODUSMINOR_2);
             vrvmensur->SetTempus(TEMPUS_2);
             vrvmensur->SetProlatio(PROLATIO_3);
         }
@@ -6359,8 +8559,10 @@ void HumdrumInput::setMensurationSymbol(
         tempus = 2;
         prolatio = 3;
     }
-    else if (metersig == "*met(C|3/2)" || metersig == "C|3/2") {
+    else if (metdata == "C|3/2") {
         if (m_mens) {
+            vrvmensur->SetModusmaior(MODUSMAIOR_2);
+            vrvmensur->SetModusminor(MODUSMINOR_2);
             vrvmensur->SetTempus(TEMPUS_2);
             vrvmensur->SetProlatio(PROLATIO_2);
         }
@@ -6371,55 +8573,55 @@ void HumdrumInput::setMensurationSymbol(
         prolatio = 2;
     }
 
-    if (metersig.find('C') != std::string::npos) {
+    if (metdata.find('C') != std::string::npos) {
         vrvmensur->SetSign(MENSURATIONSIGN_C);
-        if (metersig.find("3/2") != std::string::npos) {
+        if (metdata.find("3/2") != std::string::npos) {
             vrvmensur->SetNum(3);
             vrvmensur->SetNumbase(2);
         }
-        else if (metersig.find("C2") != std::string::npos) {
+        else if (metdata.find("C2") != std::string::npos) {
             vrvmensur->SetNum(2);
         }
-        else if (metersig.find("C3") != std::string::npos) {
+        else if (metdata.find("C3") != std::string::npos) {
             vrvmensur->SetNum(3);
         }
     }
-    else if (metersig.find('O') != std::string::npos) {
+    else if (metdata.find('O') != std::string::npos) {
         vrvmensur->SetSign(MENSURATIONSIGN_O);
-        if (metersig.find("3/2") != std::string::npos) {
+        if (metdata.find("3/2") != std::string::npos) {
             vrvmensur->SetNum(3);
             vrvmensur->SetNumbase(2);
         }
-        else if (metersig.find("O2") != std::string::npos) {
+        else if (metdata.find("O2") != std::string::npos) {
             vrvmensur->SetNum(2);
         }
-        else if (metersig.find("O3") != std::string::npos) {
+        else if (metdata.find("O3") != std::string::npos) {
             vrvmensur->SetNum(3);
         }
     }
     else {
-        std::cerr << "Warning: do not understand mensuration " << metersig << std::endl;
+        std::cerr << "Warning: do not understand mensuration " << metdata << std::endl;
         return;
     }
 
-    if (metersig.find('|') != std::string::npos) {
+    if (metdata.find('|') != std::string::npos) {
         vrvmensur->SetSlash(1);
     }
-    if (metersig.find('.') != std::string::npos) {
+    if (metdata.find('.') != std::string::npos) {
         vrvmensur->SetDot(BOOLEAN_true);
     }
-    if (metersig.find('r') != std::string::npos) {
+    if (metdata.find('r') != std::string::npos) {
         vrvmensur->SetOrient(ORIENTATION_reversed);
     }
 
-    if (hre.search(metersig, "(\\d+)/(\\d+)")) {
+    if (hre.search(metdata, "(\\d+)/(\\d+)")) {
         vrvmensur->SetNum(hre.getMatchInt(1));
         vrvmensur->SetNumbase(hre.getMatchInt(2));
     }
-    else if (hre.search(metersig, "/(\\d+)")) {
+    else if (hre.search(metdata, "/(\\d+)")) {
         vrvmensur->SetNumbase(hre.getMatchInt(1));
     }
-    else if (hre.search(metersig, "(\\d+).*\\)")) {
+    else if (hre.search(metdata, "(\\d+).*\\)")) {
         vrvmensur->SetNum(hre.getMatchInt(1));
     }
 
@@ -6526,6 +8728,9 @@ void HumdrumInput::setTimeSig(StaffDef *part, const std::string &timesig, const
             vrvmeter->SetVisible(BOOLEAN_false);
         }
     }
+    if (timetok && timetok->find("yy") != std::string::npos) {
+        vrvmeter->SetVisible(BOOLEAN_false);
+    }
 
     // Don't store time signature if there is a mensuration to show
     // (verivio will display both mensuration and time signature.
@@ -6537,6 +8742,7 @@ void HumdrumInput::setTimeSig(StaffDef *part, const std::string &timesig, const
         mensuration = true;
     }
 
+    hum::HumRegex hre;
     int top = -1000;
     int bot = -1000;
     int bot2 = -1000;
@@ -6575,6 +8781,20 @@ void HumdrumInput::setTimeSig(StaffDef *part, const std::string &timesig, const
                 vrvmeter->SetUnit(bot);
                 vrvmeter->SetForm(METERFORM_num);
             }
+            else if (hre.search(metersig, "^(\\d+)$")) {
+                int value = hre.getMatchInt(1);
+                vrvmeter->SetCount({ { value }, MeterCountSign::None });
+                if (bot > 0) {
+                    vrvmeter->SetUnit(bot);
+                }
+                else {
+                    // Borrow bottom of time signature if available, otherwise
+                    // assume a quarter note unit for now:
+                    vrvmeter->SetUnit(4);
+                }
+                vrvmeter->SetForm(METERFORM_num);
+            }
+
             else {
                 vrvmeter->SetCount({ { top }, MeterCountSign::None });
                 vrvmeter->SetUnit(bot);
@@ -6622,12 +8842,13 @@ void HumdrumInput::setTimeSig(ELEMENT element, hum::HTp timesigtok, hum::HTp met
     }
     else if (timesigtok && regex_search(*timesigtok, matches, regex("^\\*M(\\d+)/(\\d+)"))) {
         count = stoi(matches[1]);
+        unit = stoi(matches[2]);
+        if (unit == 0) {
+            // Breve time signature not possible in MEI, so change to whole note unit:
+            count *= 2;
+            unit = 1;
+        }
         if (!metersigtok) {
-            unit = stoi(matches[2]);
-            if (unit == 0) {
-                count *= 2;
-                unit = 1;
-            }
             MeterSig *vrvmetersig = getMeterSig(element);
             vrvmetersig->SetCount({ { count }, MeterCountSign::None });
             vrvmetersig->SetUnit(unit);
@@ -6751,30 +8972,12 @@ hum::HTp HumdrumInput::getVisualKeySignature(hum::HTp keysigtok)
 
 //////////////////////////////
 //
-// HumdrumInput::setKeySig -- Convert a Humdrum keysig to an MEI keysig.
-//    If there is a visual key sig, such as "*vk[f#]" within the same timestamp
-//    (in the same spine), then display that instead with @type="visual-key-signature".
+// HumdrumInput::getKeySignatureNumber -- Example *k[f#c#] => +2
 //
 
-template <class ELEMENT>
-void HumdrumInput::setKeySig(
-    int staffindex, ELEMENT element, const std::string &keysig, hum::HTp keysigtok, hum::HTp keytok, bool secondary)
+int HumdrumInput::getKeySignatureNumber(const std::string &humkeysig)
 {
-
-    std::string ks;
-    hum::HTp zkeysigtok;
-    hum::HTp vkeysigtok = getVisualKeySignature(keysigtok);
-    bool visualType;
-    if (vkeysigtok) {
-        zkeysigtok = vkeysigtok;
-        ks = *zkeysigtok;
-        visualType = true;
-    }
-    else {
-        zkeysigtok = keysigtok;
-        ks = keysig;
-        visualType = false;
-    }
+    std::string ks = humkeysig;
 
     auto pos = ks.find("]");
     if (pos != std::string::npos) {
@@ -6816,22 +9019,105 @@ void HumdrumInput::setKeySig(
     else if (ks == "b-e-a-d-g-") {
         keynum = -5;
     }
-    else if (ks == "f#c#g#d#a#") {
-        keynum = +5;
+    else if (ks == "f#c#g#d#a#") {
+        keynum = +5;
+    }
+    else if (ks == "b-e-a-d-g-c-") {
+        keynum = -6;
+    }
+    else if (ks == "f#c#g#d#a#e#") {
+        keynum = +6;
+    }
+    else if (ks == "b-e-a-d-g-c-f-") {
+        keynum = -7;
+    }
+    else if (ks == "f#c#g#d#a#e#b#") {
+        keynum = +7;
+    }
+
+    return keynum;
+}
+
+//////////////////////////////
+//
+// insertMidMeasureKeySignature --
+//
+
+void HumdrumInput::insertMidMeasureKeySignature(
+    int staffindex, std::vector<std::string> &elements, std::vector<void *> &pointers, hum::HTp token)
+{
+    KeySig *keysig = new KeySig();
+    appendElement(elements, pointers, keysig);
+    setLocationId(keysig, token);
+    keysig->SetType("mid-measure");
+
+    int keynum = getKeySignatureNumber(*token);
+    int fifthsAdjust = 0;
+    if (staffindex >= 0) {
+        fifthsAdjust = hum::Convert::base40IntervalToLineOfFifths(m_transpose[staffindex]);
+    }
+    keynum += fifthsAdjust;
+    int keyvalue = keynum;
+
+    if ((keyvalue >= -7) && (keyvalue <= +7)) {
+        // standard key signature
+        if (keyvalue < 0) {
+            keysig->SetSig(std::make_pair(-keyvalue, ACCIDENTAL_WRITTEN_f));
+        }
+        else if (keyvalue > 0) {
+            keysig->SetSig(std::make_pair(keyvalue, ACCIDENTAL_WRITTEN_s));
+        }
+        else if (keyvalue == 0) {
+            keysig->SetSig(std::make_pair(keyvalue, ACCIDENTAL_WRITTEN_NONE));
+        }
+        else {
+            keysig->SetSig(std::make_pair(-1, ACCIDENTAL_WRITTEN_NONE));
+        }
+    }
+    else {
+        // Non-standard keysignature, so give a NONE style (deal with it later).
     }
-    else if (ks == "b-e-a-d-g-c-") {
-        keynum = -6;
+
+    bool secondary = true;
+    if (secondary && (keyvalue == 0)) {
+        // Force cancellation keysignature when there are no
+        // sharps/flats in key signature change.
+        keysig->SetCancelaccid(CANCELACCID_before);
     }
-    else if (ks == "f#c#g#d#a#e#") {
-        keynum = +6;
+    else if (m_show_cautionary_keysig) {
+        keysig->SetCancelaccid(CANCELACCID_before);
     }
-    else if (ks == "b-e-a-d-g-c-f-") {
-        keynum = -7;
+}
+
+//////////////////////////////
+//
+// HumdrumInput::setKeySig -- Convert a Humdrum keysig to an MEI keysig.
+//    If there is a visual key sig, such as "*vk[f#]" within the same timestamp
+//    (in the same spine), then display that instead with @type="visual-key-signature".
+//
+
+template <class ELEMENT>
+void HumdrumInput::setKeySig(
+    int staffindex, ELEMENT element, const std::string &keysig, hum::HTp keysigtok, hum::HTp keytok, bool secondary)
+{
+
+    std::string ks;
+    hum::HTp zkeysigtok;
+    hum::HTp vkeysigtok = getVisualKeySignature(keysigtok);
+    bool visualType;
+    if (vkeysigtok) {
+        zkeysigtok = vkeysigtok;
+        ks = *zkeysigtok;
+        visualType = true;
     }
-    else if (ks == "f#c#g#d#a#e#b#") {
-        keynum = +7;
+    else {
+        zkeysigtok = keysigtok;
+        ks = keysig;
+        visualType = false;
     }
 
+    int keynum = getKeySignatureNumber(ks);
+
     int fifthsAdjust = 0;
     if (staffindex >= 0) {
         fifthsAdjust = hum::Convert::base40IntervalToLineOfFifths(m_transpose[staffindex]);
@@ -7087,18 +9373,6 @@ void HumdrumInput::setClef(StaffDef *staff, const std::string &clef, hum::HTp cl
         setLocationId(vrvclef, cleftok);
     }
 
-    if (clef.find("clefGG") != std::string::npos) {
-        vrvclef->SetShape(CLEFSHAPE_GG);
-    }
-    else if (clef.find("clefG") != std::string::npos) {
-        vrvclef->SetShape(CLEFSHAPE_G);
-    }
-    else if (clef.find("clefF") != std::string::npos) {
-        vrvclef->SetShape(CLEFSHAPE_F);
-    }
-    else if (clef.find("clefC") != std::string::npos) {
-        vrvclef->SetShape(CLEFSHAPE_C);
-    }
     if (clef.find("clefX") != std::string::npos) {
         vrvclef->SetShape(CLEFSHAPE_perc);
         hum::HumRegex hre;
@@ -7121,6 +9395,11 @@ void HumdrumInput::setClef(StaffDef *staff, const std::string &clef, hum::HTp cl
     std::string tok;
     if (cleftok) {
         tok = *cleftok;
+        if (cleftok->isMens()) {
+            if (*cleftok == "*clefGv2") {
+                tok = "*clefC4";
+            }
+        }
     }
     else {
         tok = clef;
@@ -7627,12 +9906,9 @@ void HumdrumInput::storeStaffLayerTokensForMeasure(int startline, int endline)
             lt[staffindex][layerindex].push_back(token);
 
             if ((layerindex == 0) && (token->isClef())) {
-
                 int layercount = getCurrentLayerCount(token);
-
                 // Duplicate clef in all layers (needed for cases when
                 // a secondary layer ends before the end of a measure.
-
                 for (int k = layercount; k < (int)lt[staffindex].size(); k++) {
                     lt[staffindex][k].push_back(token);
                 }
@@ -8102,41 +10378,69 @@ void HumdrumInput::insertFingerNumberInMeasure(
     const std::string &text, int staffindex, hum::HTp token, int maxstaff, bool aboveQ)
 {
 
-    Dir *dir = new Dir();
+    Fing *fing = new Fing();
     int xstaffindex = 0;
     if (staffindex >= 0) {
         xstaffindex = staffindex;
-        setStaff(dir, staffindex + 1);
+        setStaff(fing, staffindex + 1);
     }
     else {
         // data is not attached to a **kern spine since it comes before
         // any **kern data.  Treat it as attached to the bottom staff.
         // (or the top staff depending on @place="above|below".
         xstaffindex = maxstaff - 1;
-        setStaff(dir, xstaffindex + 1);
+        setStaff(fing, xstaffindex + 1);
     }
 
     Rend *rend = new Rend();
-    data_FONTSIZE fs;
-    fs.SetTerm(FONTSIZETERM_x_small);
-    rend->SetFontsize(fs);
-    rend->SetFontstyle(FONTSTYLE_normal);
     addTextElement(rend, text);
-    dir->AddChild(rend);
-    appendTypeTag(dir, "fingering");
+    fing->AddChild(rend);
+
+    std::string fontsize = token->getValue("auto", "fontsize");
+    if (fontsize == "") {
+        // default fingering size
+        data_FONTSIZE fs;
+        fs.SetTerm(FONTSIZETERM_small);
+        rend->SetFontsize(fs);
+    }
+    else if (fontsize == "x-small") {
+        // small fingering size
+        data_FONTSIZE fs;
+        fs.SetTerm(FONTSIZETERM_x_small);
+        rend->SetFontsize(fs);
+    }
+    else if (fontsize == "normal") {
+        // large fingering size (verovio default style)
+    }
+
+    std::string color = token->getValue("auto", "color");
+    if (color != "") {
+        rend->SetColor(color);
+    }
+
+    bool unboldQ = token->getValueBool("auto", "unbold");
+    bool italicQ = token->getValueBool("auto", "italic");
+
+    if (unboldQ) {
+        rend->SetFontweight(FONTWEIGHT_normal);
+    }
+    if (italicQ) {
+        rend->SetFontstyle(FONTSTYLE_italic);
+    }
+
     if (aboveQ) {
-        setPlaceRelStaff(dir, "above", false);
+        setPlaceRelStaff(fing, "above", false);
     }
     else {
-        setPlaceRelStaff(dir, "below", false);
+        setPlaceRelStaff(fing, "below", false);
     }
-    addChildMeasureOrSection(dir);
-    setLocationId(dir, token);
+    addChildMeasureOrSection(fing);
+    setLocationId(fing, token);
 
     // Previously used @tstamp, now use @startid of note/chord;
     // hum::HumNum tstamp = getMeasureTstamp(token, xstaffindex);
-    // dir->SetTstamp(tstamp.getFloat());
-    linkFingeringToNote(dir, token, xstaffindex);
+    // fing->SetTstamp(tstamp.getFloat());
+    linkFingeringToNote(fing, token, xstaffindex);
 }
 
 //////////////////////////////
@@ -8147,7 +10451,7 @@ void HumdrumInput::insertFingerNumberInMeasure(
 //    use a @tstamp rather than a @startid to place the fingering.
 //
 
-void HumdrumInput::linkFingeringToNote(Dir *dir, hum::HTp token, int xstaffindex)
+void HumdrumInput::linkFingeringToNote(Fing *fing, hum::HTp token, int xstaffindex)
 {
     // token should be a **fing, so search for the **kern that it
     // matches to the left, and then search for the last non-null
@@ -8182,7 +10486,7 @@ void HumdrumInput::linkFingeringToNote(Dir *dir, hum::HTp token, int xstaffindex
     if (!linkednote) {
         // use a timestamp to place the fingering
         hum::HumNum tstamp = getMeasureTstamp(token, xstaffindex);
-        dir->SetTstamp(tstamp.getFloat());
+        fing->SetTstamp(tstamp.getFloat());
     }
     else {
         std::string startid;
@@ -8192,7 +10496,7 @@ void HumdrumInput::linkFingeringToNote(Dir *dir, hum::HTp token, int xstaffindex
         else {
             startid = getLocationId("note", linkednote);
         }
-        dir->SetStartid("#" + startid);
+        fing->SetStartid("#" + startid);
     }
 }
 
@@ -8350,8 +10654,12 @@ void HumdrumInput::addHarmFloatsForMeasure(int startline, int endline)
                 continue;
             }
 
+            hum::HumRegex hre;
             // isCData -- is free-form harmony data.
-            bool isCData = token->getDataType().compare(0, 7, "**cdata") == 0;
+            bool isCData = false;
+            if (hre.search(token->getDataType(), "^\\*\\*[abc]data")) {
+                isCData = true;
+            }
 
             // isDegree -- is degree type data.
             bool isDegree = (token->isDataType("**deg") || token->isDataType("**degree"));
@@ -8490,10 +10798,11 @@ void HumdrumInput::addHarmFloatsForMeasure(int startline, int endline)
             setPlaceRelStaff(harm, place, false);
 
             // Add key label (for harm/rhrm/deg/degree data)
-            if (isHarm || isDegree) {
-                std::string keylabel = token->getValue("auto", "keylabel");
-                if (!keylabel.empty()) {
-                    addHarmLabel(tstamp, keylabel, tracktext, place, xstaffindex + 1);
+            if (isCData || isHarm || isDegree) {
+                std::string keyLabel = token->getValue("auto", "keyLabel");
+                std::string keyLabelStyle = token->getValue("auto", "keyLabelStyle");
+                if (!keyLabel.empty()) {
+                    addHarmLabel(tstamp, keyLabel, keyLabelStyle, tracktext, place, xstaffindex + 1);
                 }
             }
 
@@ -8685,8 +10994,8 @@ void HumdrumInput::setFontsizeForHarm(Harm *harm, const std::string &fontsize)
 // HumdrumInput::addHarmLabel --
 //
 
-void HumdrumInput::addHarmLabel(
-    hum::HumNum timestamp, const std::string &label, const std::string &n, const std::string &place, int staffNum)
+void HumdrumInput::addHarmLabel(hum::HumNum timestamp, const std::string &label, const std::string &labelStyle,
+    const std::string &n, const std::string &place, int staffNum)
 {
     if (label.empty()) {
         return;
@@ -8711,21 +11020,34 @@ void HumdrumInput::addHarmLabel(
     // hardwire style to circle, for now at least:
     // rend2->SetRend(TEXTRENDITION_circle);
     // and hardwire the font to sans-serif, at least for now:
-    rend2->SetColor("darkred");
-    rend2->SetFontname("sans-serif");
+    // rend2->SetColor("darkred");
+    // rend2->SetFontname("sans-serif");
+    // But now use the following line in the Humdrum data to control the style:
+    //    !!!verovio: svgCss g.key-label { fill:darkred; font-family:sans-serif; }
 
     std::u32string output;
     std::string tempChar;
     for (int i = 0; i < (int)label.size(); i++) {
         switch (label[i]) {
-            case '#': output += output += U"\u266f"; break; // unicode sharp
-            case '-': output += output += U"\u266d"; break; // unicode flat
+            case '#': output += U"\u266f"; break; // unicode sharp
+            case '-': output += U"\u266d"; break; // unicode flat
             default: tempChar = label[i]; output += UTF8to32(tempChar);
         }
     }
     // output += U"\u00a0"; // non-breaking space
     text->SetText(output);
 
+    // Add italic/bold styling if needed:
+    if (labelStyle.find("i") != std::string::npos) {
+        rend->SetFontstyle(FONTSTYLE_italic);
+    }
+    if (labelStyle.find("b") != std::string::npos) {
+        rend->SetFontweight(FONTWEIGHT_bold);
+    }
+    else if (labelStyle.find("B") != std::string::npos) {
+        rend->SetFontweight(FONTWEIGHT_bold);
+    }
+
     // add some extra space to separate from chord:
     Text *stext = new Text();
     rend->AddChild(stext);
@@ -10570,6 +12892,15 @@ bool HumdrumInput::checkForTremolo(
     notes[lasti]->setValue("auto", "tremoloAux", "1");
     notes[lasti]->setValue("auto", "recip", recip);
 
+    // Migrate visual accidental of second note of tremolo to the last note of fTrem:
+    // Only dealing with a single note for now (deal with chords later).
+    if (lasti > 1) {
+        std::string visacc = notes[1]->getValue("auto", "0", "visualAccidental");
+        if (visacc == "true") {
+            notes[lasti]->setValue("auto", "0", "visualAccidental", "true");
+        }
+    }
+
     for (int i = 1; i < (int)notes.size(); ++i) {
         notes[i]->setValue("auto", "suppress", "1");
     }
@@ -10655,16 +12986,16 @@ void HumdrumInput::handleGroupStarts(const std::vector<humaux::HumdrumBeamAndTup
 
     int direction = 0;
     if (tg.beamstart || tg.gbeamstart) {
-        if (m_signifiers.above) {
+        if (!m_signifiers.above.empty()) {
             std::string pattern = "[LJKk]+";
-            pattern.push_back(m_signifiers.above);
+            pattern += m_signifiers.above;
             if (regex_search(*token, regex(pattern))) {
                 direction = 1;
             }
         }
-        if (m_signifiers.below) {
+        if (!m_signifiers.below.empty()) {
             std::string pattern = "[LJKk]+";
-            pattern.push_back(m_signifiers.below);
+            pattern += m_signifiers.below;
             if (regex_search(*token, regex(pattern))) {
                 direction = -1;
             }
@@ -11276,8 +13607,8 @@ bool HumdrumInput::fillContentsOfLayer(int track, int startline, int endline, in
                         convertMRest(mrest, trest, -1, staffindex);
                     }
                     else {
-                        // Duration of rest does not matches duration of meter so use a rest instead.
-                        // This code currently cannot handle non-power-of-two rests such as
+                        // Duration of rest does not matches duration of meter so use a rest
+                        // instead. This code currently cannot handle non-power-of-two rests such as
                         // a full measure rest of 5/8.
                         if (trest->find("yy") != std::string::npos) {
                             Space *irest = new Space();
@@ -11488,9 +13819,21 @@ bool HumdrumInput::fillContentsOfLayer(int track, int startline, int endline, in
                 }
             }
 
+            bool notAtStart = isNotAtStartOfMeasure(layerdata, i);
+
+            bool isKeySignature = layerdata[i]->isKeySignature();
+            if (notAtStart && isKeySignature) {
+                insertMidMeasureKeySignature(staffindex, elements, pointers, token);
+            }
+
+            bool isTimeSignature = layerdata[i]->isTimeSignature();
+            if (notAtStart && isTimeSignature) {
+                insertMeterSigElement(elements, pointers, layerdata, i);
+            }
+
             bool forceClefChange = false;
             if (token->isClef() || (*token == "*")) {
-                if (!(token->isMensLike() && token->getDurationFromStart() == 0)) {
+                if (!(token->isMensLike() && notAtStart)) {
                     if (token->getValueBool("auto", "clefChange")) {
                         forceClefChange = true;
                     }
@@ -11507,7 +13850,10 @@ bool HumdrumInput::fillContentsOfLayer(int track, int startline, int endline, in
                     }
                 }
                 if (m_mens) {
-                    if (token->isMensurationSymbol()) {
+                    if (token->compare(0, 6, "*omet(") == 0) {
+                        setMensurationSymbol(m_layer, *token, staffindex, token);
+                    }
+                    else if (token->isMensurationSymbol()) {
                         // add mensuration change to layer.
                         setMensurationSymbol(m_layer, *token, staffindex, token);
                     }
@@ -11517,7 +13863,7 @@ bool HumdrumInput::fillContentsOfLayer(int track, int startline, int endline, in
                     setMensurationSymbol(m_layer, *token, staffindex, token);
                 }
             }
-            else if (forceClefChange || (token->getDurationFromStart() != 0)) {
+            else if (forceClefChange || notAtStart) {
                 if (token->isClef()) {
                     int subtrack = token->getSubtrack();
                     if (subtrack) {
@@ -11528,7 +13874,7 @@ bool HumdrumInput::fillContentsOfLayer(int track, int startline, int endline, in
                     hum::HumNum durFromBarline = token->getDurationFromBarline();
 
                     Clef *clef = NULL;
-                    if ((durFromStart > 0) && (durFromBarline == 0)) {
+                    if ((durFromStart > 0) && (durFromBarline == 0) && !notAtStart) {
                         // This clef will be inserted into a staffDef for the current
                         // staff, which is handled elsewhere.
                     }
@@ -11603,9 +13949,7 @@ bool HumdrumInput::fillContentsOfLayer(int track, int startline, int endline, in
                 }
             }
             if (token->isTimeSignature()) {
-                // Now done at the measure level.  This location might
-                // be good for time signatures which change in the
-                // middle of measures.
+                // Now done further above.
                 // insertMeterSigElement(elements, pointers, layerdata, i);
                 processDirections(token, staffindex);
             }
@@ -12021,13 +14365,13 @@ bool HumdrumInput::fillContentsOfLayer(int track, int startline, int endline, in
             processPhrases(token);
             processDynamics(token, staffindex);
             assignAutomaticStem(note, token, staffindex);
-            if (m_signifiers.nostem && token->find(m_signifiers.nostem) != std::string::npos) {
+            if (!m_signifiers.nostem.empty() && token->find(m_signifiers.nostem) != std::string::npos) {
                 note->SetStemVisible(BOOLEAN_false);
             }
-            if (m_signifiers.hairpinAccent && token->find(m_signifiers.hairpinAccent) != std::string::npos) {
+            if (!m_signifiers.hairpinAccent.empty() && token->find(m_signifiers.hairpinAccent) != std::string::npos) {
                 addHairpinAccent(token);
             }
-            if (m_signifiers.cuesize && token->find(m_signifiers.cuesize) != std::string::npos) {
+            if (!m_signifiers.cuesize.empty() && token->find(m_signifiers.cuesize) != std::string::npos) {
                 note->SetCue(BOOLEAN_true);
             }
             else if (m_staffstates.at(staffindex).cue_size.at(m_currentlayer)) {
@@ -12116,6 +14460,29 @@ bool HumdrumInput::fillContentsOfLayer(int track, int startline, int endline, in
     return true;
 }
 
+//////////////////////////////
+//
+// HumdrumInput::isNotAtStartOfMeasure -- returns whether or not the
+//      token is at the start of the measure which means that there is
+//      some non-null data before it in the layer.
+//
+
+bool HumdrumInput::isNotAtStartOfMeasure(std::vector<hum::HTp> &layerdata, int index)
+{
+    if (layerdata.size() == 0) {
+        return false;
+    }
+    if (layerdata.size() == 1) {
+        return false;
+    }
+    for (int i = index - 1; i >= 0; i--) {
+        if (layerdata[i]->isData()) {
+            return true;
+        }
+    }
+    return false;
+}
+
 //////////////////////////////
 //
 // HumdrumInput::isExpressibleDuration -- returns whether or not this
@@ -12208,17 +14575,19 @@ data_DURATION HumdrumInput::oneOverDenominatorToDur(int denominator)
 
 //////////////////////////////
 //
-// HumdrumInput::isExpressibleDuration -- returns MEI @dur/@dots attributes
-//      for a duration.
+// HumdrumInput::getDurAndDots -- returns MEI @dur/@dots attributes
+//      for a duration.  Input duration is required to have the
+//      tuplet component present, and it will be removed when calculating
+//      the output (tupletless) duration and dots.
 //
 
 pair<data_DURATION, int> HumdrumInput::getDurAndDots(hum::HumNum duration)
 {
     pair<data_DURATION, int> output;
 
-    // convert to whole note units
+    // Convert to whole-note units:
     hum::HumNum dur = duration / 4;
-    // take into account current tuplet scaling
+    // Remove active tuplet factor(s) from note:
     dur *= m_tupletscaling;
 
     if (dur.getDenominator() == 1) {
@@ -12553,7 +14922,8 @@ void HumdrumInput::addHairpinAccent(hum::HTp token)
     int position = -1; // place below by default (may change based on layer position later).
     bool setpos = false;
     if ((int)pos < (int)token->size() - 1) {
-        if (m_signifiers.above == token->at(pos + 1)) {
+        if (!m_signifiers.above.empty()
+            && (token->compare(pos + 1, m_signifiers.above.size(), m_signifiers.above) == 0)) {
             position = +1;
             setpos = true;
         }
@@ -12685,7 +15055,7 @@ void HumdrumInput::addExplicitStemDirection(FTrem *ftrem, hum::HTp start)
     }
     else {
         hum::HumRegex hre;
-        if (m_signifiers.above) {
+        if (!m_signifiers.above.empty()) {
             std::string value = "[LJkK]+";
             value += m_signifiers.above;
             if (hre.search(start, value)) {
@@ -12693,7 +15063,7 @@ void HumdrumInput::addExplicitStemDirection(FTrem *ftrem, hum::HTp start)
                 showplace = true;
             }
         }
-        else if (m_signifiers.below) {
+        else if (!m_signifiers.below.empty()) {
             std::string value = "[LJkK]+";
             value += m_signifiers.below;
             if (hre.search(start, value)) {
@@ -13331,6 +15701,7 @@ void HumdrumInput::convertMensuralToken(
 
         if (token->find(':') != std::string::npos) {
             Dot *dot = new Dot();
+            dot->SetForm(dotLog_FORM_aug);
             appendElement(elements, pointers, dot);
         }
     }
@@ -13487,12 +15858,19 @@ template <class ELEMENT> void HumdrumInput::addArticulations(ELEMENT element, hu
             continue;
         }
         posch = i < tsize - 1 ? nohidden.at(i + 1) : 0;
+
+        // string version of posch:
+        std::string poschstr = "";
+        poschstr += posch;
+
         if ((ch == '^') && (posch == '^')) {
             // use 6 slot in array for "^^" (heavy accent)
             ch = 6;
             intch = 6;
             articloc.at(intch) = i + 1;
             posch = i < tsize - 2 ? nohidden.at(i + 2) : 'g';
+            poschstr = "";
+            poschstr += posch;
             i++;
         }
         if ((ch == '"') && (posch == '"')) {
@@ -13501,10 +15879,12 @@ template <class ELEMENT> void HumdrumInput::addArticulations(ELEMENT element, hu
             intch = 9;
             articloc.at(intch) = i + 1;
             posch = i < tsize - 2 ? nohidden.at(i + 2) : 'g';
-            if (posch == m_signifiers.below) {
+            poschstr = "";
+            poschstr += posch;
+            if (poschstr == m_signifiers.below) {
                 articpos.at(intch) = -1;
             }
-            else if (posch == m_signifiers.above) {
+            else if (poschstr == m_signifiers.above) {
                 articpos.at(intch) = +1;
             }
             i++;
@@ -13515,6 +15895,8 @@ template <class ELEMENT> void HumdrumInput::addArticulations(ELEMENT element, hu
             ch = '`';
             intch = (unsigned char)ch;
             posch = i < tsize - 2 ? nohidden.at(i + 2) : 'g';
+            poschstr = "";
+            poschstr += posch;
             i++;
         }
         else if ((ch == '~') && (posch == '~')) {
@@ -13522,17 +15904,19 @@ template <class ELEMENT> void HumdrumInput::addArticulations(ELEMENT element, hu
             textTenuto = true;
             i++;
             posch = i < tsize - 1 ? nohidden.at(i + 1) : 0;
-            if (m_signifiers.below && (posch == m_signifiers.below)) {
+            std::string poschstr = "";
+            poschstr += posch;
+            if (!m_signifiers.below.empty() && (poschstr == m_signifiers.below)) {
                 textTenutoBelow = true;
             }
             continue;
         }
-        if (m_signifiers.verticalStroke == ch) {
+        if (!m_signifiers.verticalStroke.empty() && (m_signifiers.verticalStroke[0] == ch)) {
             // use 7 slot in array for vertical strokes
             ch = 7;
             intch = 7;
         }
-        if (m_signifiers.lhpizz == ch) {
+        if (!(m_signifiers.lhpizz.empty()) && (m_signifiers.lhpizz[0] == ch)) {
             // use 8 slot in array for left-hand pizzicato symbol
             ch = 8;
             intch = 8;
@@ -13550,19 +15934,21 @@ template <class ELEMENT> void HumdrumInput::addArticulations(ELEMENT element, hu
             if ((posch == 'y') && (pos2ch != 'y')) {
                 articges[ch] = 1;
             }
-            else if (m_signifiers.above && (posch == m_signifiers.above) && (pos2ch == 'y') && (pos3ch != 'y')) {
+            else if (!m_signifiers.above.empty() && (poschstr == m_signifiers.above) && (pos2ch == 'y')
+                && (pos3ch != 'y')) {
                 articges[ch] = 1;
             }
-            else if (m_signifiers.below && (posch == m_signifiers.below) && (pos2ch == 'y') && (pos3ch != 'y')) {
+            else if (!m_signifiers.below.empty() && (poschstr == m_signifiers.below) && (pos2ch == 'y')
+                && (pos3ch != 'y')) {
                 articges[ch] = 1;
             }
         }
 
-        if ((posch != 0) && (posch == m_signifiers.above)) {
+        if (!poschstr.empty() && (poschstr == m_signifiers.above)) {
             articpos.at(intch) = 1;
             showpos.at(intch) = true;
         }
-        else if ((posch != 0) && (posch == m_signifiers.below)) {
+        else if (!poschstr.empty() && (poschstr == m_signifiers.below)) {
             articpos.at(intch) = -1;
             showpos.at(intch) = true;
         }
@@ -13742,17 +16128,17 @@ int HumdrumInput::getDirection(const std::string &token, const std::string &targ
 {
     std::string newtarget;
 
-    if (m_signifiers.above) {
+    if (!m_signifiers.above.empty()) {
         newtarget = target;
-        newtarget.push_back(m_signifiers.above);
+        newtarget += m_signifiers.above;
         if (token.find(newtarget) != std::string::npos) {
             return +1;
         }
     }
 
-    if (m_signifiers.below) {
+    if (!m_signifiers.below.empty()) {
         newtarget = target;
-        newtarget.push_back(m_signifiers.below);
+        newtarget += m_signifiers.below;
         if (token.find(newtarget) != std::string::npos) {
             return -1;
         }
@@ -14259,20 +16645,44 @@ void HumdrumInput::addSpace(std::vector<std::string> &elements, std::vector<void
 
 void HumdrumInput::processTerminalLong(hum::HTp token)
 {
-    if (!m_signifiers.terminallong) {
+    if (token->isKern() && m_signifiers.kernTerminalLong.empty()) {
         return;
     }
-    if (token->find(m_signifiers.terminallong) == std::string::npos) {
+    if (token->isMens() && m_signifiers.mensTerminalLong.empty()) {
         return;
     }
+
+    if (token->isKern() && (token->find(m_signifiers.kernTerminalLong) == std::string::npos)) {
+        return;
+    }
+    if (token->isMens() && (token->find(m_signifiers.mensTerminalLong) == std::string::npos)) {
+        return;
+    }
+
     std::string doublelong;
-    doublelong += m_signifiers.terminallong;
-    doublelong += m_signifiers.terminallong;
+    if (token->isKern()) {
+        doublelong += m_signifiers.kernTerminalLong;
+        doublelong += m_signifiers.kernTerminalLong;
+    }
+    else if (token->isMens()) {
+        doublelong += m_signifiers.mensTerminalLong;
+        doublelong += m_signifiers.mensTerminalLong;
+    }
     if (token->find(doublelong) != std::string::npos) {
-        token->setValue("LO", "N", "vis", "000");
+        if (token->isKern()) {
+            token->setValue("LO", "N", "vis", "000");
+        }
+        else if (token->isMens()) {
+            token->setValue("LO", "N", "vis", "X");
+        }
     }
     else {
-        token->setValue("LO", "N", "vis", "00");
+        if (token->isKern()) {
+            token->setValue("LO", "N", "vis", "00");
+        }
+        else if (token->isMens()) {
+            token->setValue("LO", "N", "vis", "L");
+        }
     }
     if ((token->find('[') != std::string::npos) || (token->find('_') != std::string::npos)) {
         removeCharacter(token, '[');
@@ -14322,10 +16732,10 @@ void HumdrumInput::processTerminalLong(hum::HTp token)
 
 void HumdrumInput::processTerminalBreve(hum::HTp token)
 {
-    if (!m_signifiers.terminalbreve) {
+    if (m_signifiers.kernTerminalBreve.empty()) {
         return;
     }
-    if (token->find(m_signifiers.terminalbreve) == std::string::npos) {
+    if (token->find(m_signifiers.kernTerminalBreve) == std::string::npos) {
         return;
     }
     token->setValue("LO", "N", "vis", "0");
@@ -14475,15 +16885,15 @@ void HumdrumInput::removeCharacter(hum::HTp token, char removechar)
 
 void HumdrumInput::processChordSignifiers(Chord *chord, hum::HTp token, int staffindex)
 {
-    if (m_signifiers.nostem && token->find(m_signifiers.nostem) != std::string::npos) {
+    if (!m_signifiers.nostem.empty() && token->find(m_signifiers.nostem) != std::string::npos) {
         chord->SetStemVisible(BOOLEAN_false);
     }
 
-    if (m_signifiers.cuesize) {
+    if (!m_signifiers.cuesize.empty()) {
         int tcount = 1;
         int cuecount = 0;
         for (int i = 0; i < (int)token->size(); ++i) {
-            if ((*token)[i] == m_signifiers.cuesize) {
+            if (token->compare(i, m_signifiers.cuesize.size(), m_signifiers.cuesize) == 0) {
                 cuecount++;
             }
             if ((*token)[i] == ' ') {
@@ -15240,6 +17650,10 @@ void HumdrumInput::processLinkedDirection(int index, hum::HTp token, int staffin
     if (problemQ) {
         italic = false;
         bold = false;
+        text = "&#9888;";
+    }
+    if (sicQ) {
+        text = "&#9888;";
     }
 
     bool plain = !(italic || bold);
@@ -16127,7 +18541,11 @@ void HumdrumInput::processDynamics(hum::HTp token, int staffindex)
             }
             else {
                 forceBelowQ = true;
-                staffadj2 = 1;
+                // Don't know what the following adjustment is for.
+                // Probably for two-staff parts?  If so then have
+                // separate cases for single/double staff parts.
+                // Similar case below search for "What is this here".
+                // staffadj2 = 1;
             }
         }
 
@@ -16553,7 +18971,8 @@ void HumdrumInput::addDynamicsMark(hum::HTp dyntok, hum::HTp token, hum::HLp lin
         }
         else {
             defaultBelowQ = true;
-            staffadj2 = 1;
+            // Why is this here?:
+            // staffadj2 = 1;
         }
     }
 
@@ -16576,11 +18995,19 @@ void HumdrumInput::addDynamicsMark(hum::HTp dyntok, hum::HTp token, hum::HLp lin
         std::string dyntext = getLayoutParameter(dyntok, "DY", "t", "", "");
         if (!dyntext.empty()) {
             hum::HumRegex hre;
-            hre.replaceDestructive(dyntext, dynamic, "%s", "g");
+            hre.replaceDestructive(dyntext, dynamic + " ", "%s", "g");
             dynamic = dyntext;
         }
 
-        bool aboveQ = hasAboveParameter(dyntok, "DY", staffadj);
+        bool aboveQ = false;
+
+        if (hasAboveParameter(dyntok, "DY", staffadj)) {
+            aboveQ = true;
+        }
+        else if (ss[si].verse) {
+            aboveQ = true;
+        }
+
         bool belowQ = false;
         bool showplace = aboveQ;
         if (!aboveQ) {
@@ -16729,7 +19156,7 @@ void HumdrumInput::addDynamicsMark(hum::HTp dyntok, hum::HTp token, hum::HLp lin
             fs.SetTerm(FONTSIZETERM_large);
             rend->SetFontsize(fs);
             // addTextElement(rend, prefix);
-            std::string newtext = dynamic + "&#160;";
+            std::string newtext = dynamic;
             addTextElement(rend, newtext);
             // addTextElement(rend, postfix);
             if (!dcolor.empty()) {
@@ -16910,12 +19337,14 @@ void HumdrumInput::addSforzandoToNote(hum::HTp token, int staffindex)
     }
 
     // This code block should probably be deleted.
-    if (m_signifiers.below && (loc < token->size() - 1) && (token->at(loc + 1) == m_signifiers.below)) {
+    if (!m_signifiers.below.empty() && (loc < token->size() - 1)
+        && (token->compare(loc + 1, m_signifiers.below.size(), m_signifiers.below) == 0)) {
         aboveQ = false;
         belowQ = true;
         showpos = true;
     }
-    if (m_signifiers.above && (loc < token->size() - 1) && (token->at(loc + 1) == m_signifiers.above)) {
+    if (!m_signifiers.above.empty() && (loc < token->size() - 1)
+        && (token->compare(loc + 1, m_signifiers.above.size(), m_signifiers.above) == 0)) {
         aboveQ = true;
         belowQ = false;
         showpos = true;
@@ -17526,11 +19955,24 @@ hum::HTp HumdrumInput::getHairpinEnd(hum::HTp token, const std::string &endchar)
     if (token == NULL) {
         return NULL;
     }
+    int subtrack = token->getSubtrack();
+    if (subtrack == 0) {
+        subtrack = 1;
+    }
     token = token->getNextNonNullDataToken();
     int badtoken = 0;
     while (token != NULL) {
         if (token->find(endchar) != std::string::npos) {
-            return token;
+            int esubtrack = token->getSubtrack();
+            if (esubtrack == 0) {
+                esubtrack = 1;
+            }
+            if (subtrack == esubtrack) {
+                return token;
+            }
+            else {
+                return NULL;
+            }
         }
         badtoken = 0;
         for (int i = 0; i < (int)token->size(); ++i) {
@@ -17568,7 +20010,10 @@ hum::HumNum HumdrumInput::getMeasureTstamp(hum::HTp token, int staffindex, hum::
         // what is this for? Causes problems with pedal markings.
         // qbeat += fract * token->getDuration().getAbs();
     }
-    hum::HumNum mfactor = ss[staffindex].meter_bottom / 4;
+    // Below is temporary fix for issue https://github.com/rism-digital/verovio/issues/3515
+    hum::HumNum mfactor = ss.back().meter_bottom / 4;
+    // hum::HumNum mfactor = ss[staffindex].meter_bottom / 4;
+
     // if (ss[staffindex].meter_bottom == 0) {
     //  mfactor = 1;
     //  mfactor /= 8;
@@ -17686,6 +20131,7 @@ template <class ELEMENT> void HumdrumInput::addMusicSymbol(ELEMENT *element, con
 //
 // HumdumInput::addTextElement -- Append text to a regular element.
 //   default value: fontstyle == ""
+//   default value: addSpacer == true
 //
 
 template <class ELEMENT>
@@ -17708,9 +20154,21 @@ void HumdrumInput::addTextElement(
 
     if (element->GetClassName() == "Syl") {
         // Approximate centering of single-letter text on noteheads.
-        // currently the text is left justified to the left edge of the notehead.
-        if ((data.size() == 1) && addSpacer) {
-            data = "&#160;" + data;
+        // currently the text is left justified to before the left edge of the notehead.
+        hum::HumRegex hre;
+        if (addSpacer) {
+            if (data.size() == 1) {
+                // Single-byte character:
+                data = "&#160;" + data;
+            }
+            else if (hre.search(data, "^&[^&;\\s]+;$")) {
+                // Some single-letter HTML/numeric entity
+                data = "&#160;" + data;
+            }
+            else if ((data.size() == 2) && (data[0] < 0)) {
+                // Some two-byte single character UTF-8 symbol:
+                data = "&#160;" + data;
+            }
         }
     }
 
@@ -17958,7 +20416,7 @@ void HumdrumInput::processSlurs(hum::HTp slurend)
             // do not specify the staff attribute, but later
             // add a list of the two staves involved.
             int staff = m_currentstaff;
-            if (m_signifiers.above) {
+            if (!m_signifiers.above.empty()) {
                 std::string sabove = "[a-g]+[-n#]*[xy]*";
                 sabove += m_signifiers.above;
                 if (hre.search(slurstart, sabove)) {
@@ -17968,7 +20426,7 @@ void HumdrumInput::processSlurs(hum::HTp slurend)
                     }
                 }
             }
-            if (m_signifiers.below) {
+            if (!m_signifiers.below.empty()) {
                 std::string sbelow = "[a-g]+[-n#]*[xy]*";
                 sbelow += m_signifiers.below;
                 if (hre.search(slurstart, sbelow)) {
@@ -18012,14 +20470,14 @@ void HumdrumInput::processSlurs(hum::HTp slurend)
             }
         }
 
-        if (m_signifiers.above) {
+        if (!m_signifiers.above.empty()) {
             int count = 0;
             for (int k = 0; k < (int)slurstart->size() - 1; k++) {
                 if (slurstart->at(k) == '(') {
                     count++;
                 }
                 if (count == slurstartnumber) {
-                    if (slurstart->at(k + 1) == m_signifiers.above) {
+                    if (slurstart->compare(k + 1, m_signifiers.above.size(), m_signifiers.above) == 0) {
                         slur->SetCurvedir(curvature_CURVEDIR_above);
                         appendTypeTag(slur, "placed");
                     }
@@ -18027,14 +20485,14 @@ void HumdrumInput::processSlurs(hum::HTp slurend)
                 }
             }
         }
-        if (m_signifiers.below) {
+        if (!m_signifiers.below.empty()) {
             int count = 0;
             for (int k = 0; k < (int)slurstart->size() - 1; k++) {
                 if (slurstart->at(k) == '(') {
                     count++;
                 }
                 if (count == slurstartnumber) {
-                    if (slurstart->at(k + 1) == m_signifiers.below) {
+                    if (slurstart->compare(k + 1, m_signifiers.below.size(), m_signifiers.below) == 0) {
                         slur->SetCurvedir(curvature_CURVEDIR_below);
                         appendTypeTag(slur, "placed");
                     }
@@ -18590,25 +21048,25 @@ void HumdrumInput::addTieLineStyle(Tie *tie, hum::HTp token, int noteindex)
     std::string marker3 = "_";
     std::string marker4 = "_";
 
-    if (m_signifiers.above) {
+    if (!m_signifiers.above.empty()) {
         marker1 += m_signifiers.above;
         marker3 += m_signifiers.above;
     }
-    if (m_signifiers.below) {
+    if (!m_signifiers.below.empty()) {
         marker2 += m_signifiers.below;
         marker4 += m_signifiers.below;
     }
 
-    if (m_signifiers.above && tstring.find(marker1) != std::string::npos) {
+    if (!m_signifiers.above.empty() && tstring.find(marker1) != std::string::npos) {
         tie->SetCurvedir(curvature_CURVEDIR_above);
     }
-    else if (m_signifiers.below && tstring.find(marker2) != std::string::npos) {
+    else if (!m_signifiers.below.empty() && tstring.find(marker2) != std::string::npos) {
         tie->SetCurvedir(curvature_CURVEDIR_below);
     }
-    else if (m_signifiers.above && tstring.find(marker3) != std::string::npos) {
+    else if (!m_signifiers.above.empty() && tstring.find(marker3) != std::string::npos) {
         tie->SetCurvedir(curvature_CURVEDIR_above);
     }
-    else if (m_signifiers.below && tstring.find(marker4) != std::string::npos) {
+    else if (!m_signifiers.below.empty() && tstring.find(marker4) != std::string::npos) {
         tie->SetCurvedir(curvature_CURVEDIR_below);
     }
 }
@@ -19457,7 +21915,10 @@ Clef *HumdrumInput::insertClefElement(
 
 void HumdrumInput::setClefBasicShape(Clef *clef, const std::string &tok)
 {
-    if (tok.find("clefG") != std::string::npos) {
+    if (tok.find("clefGG") != std::string::npos) {
+        clef->SetShape(CLEFSHAPE_GG);
+    }
+    else if (tok.find("clefG") != std::string::npos) {
         clef->SetShape(CLEFSHAPE_G);
     }
     else if (tok.find("clefF") != std::string::npos) {
@@ -19837,8 +22298,9 @@ void HumdrumInput::analyzeLayerBeams(
     // int beamendindex = -1;
     if (beamstate.size() > 0) {
         if (beamstate.back() > 0) {
-            // Extra beam start(s) at the end of the measure.  Remove all positive numbers at the back of the
-            // beamstate list until a zero is found (for the end of an in-measure beam end).
+            // Extra beam start(s) at the end of the measure.  Remove all positive numbers at the
+            // back of the beamstate list until a zero is found (for the end of an in-measure beam
+            // end).
             for (int i = (int)beamstate.size() - 1; i >= 0; i--) {
                 if (beamstate[i] == 0) {
                     // beamstartindex = i + 1;
@@ -20231,6 +22693,11 @@ Beam *HumdrumInput::insertBeam(
     std::vector<std::string> &elements, std::vector<void *> &pointers, const humaux::HumdrumBeamAndTuplet &tg)
 {
     Beam *beam = new Beam();
+    if (tg.token->find("yy") != std::string::npos) {
+        // Ignore beam when token is suppressed with yy signifier
+        beam->SetType("invisible");
+        beam->SetColor("transparent");
+    }
     appendElement(elements, pointers, beam);
     elements.push_back("beam");
     pointers.push_back((void *)beam);
@@ -20239,13 +22706,18 @@ Beam *HumdrumInput::insertBeam(
 
 //////////////////////////////
 //
-// HumdrumInput::insertGBeam --
+// HumdrumInput::insertGBeam -- insert beam for grace notes
 //
 
 Beam *HumdrumInput::insertGBeam(
     std::vector<std::string> &elements, std::vector<void *> &pointers, const humaux::HumdrumBeamAndTuplet &tg)
 {
     Beam *gbeam = new Beam();
+    if (tg.token->find("yy") != std::string::npos) {
+        // Ignore grace note beam when token is suppressed with yy signifier
+        gbeam->SetType("invisible");
+        gbeam->SetColor("transparent");
+    }
     appendElement(elements, pointers, gbeam);
     elements.push_back("gbeam");
     pointers.push_back((void *)gbeam);
@@ -22350,8 +24822,8 @@ void HumdrumInput::convertChord(Chord *chord, hum::HTp token, int staffindex)
     }
 
     int stemslashes = 0;
-    if (m_signifiers.tremolo) {
-        stemslashes = (int)std::count(token->begin(), token->end(), m_signifiers.tremolo);
+    if (!m_signifiers.tremolo.empty()) {
+        stemslashes = (int)std::count(token->begin(), token->end(), m_signifiers.tremolo[0]);
     }
     if (stemslashes) {
         chord->SetStemMod(chord->AttStems::StrToStemmodifier(std::to_string(stemslashes) + "slash"));
@@ -22864,9 +25336,9 @@ void HumdrumInput::convertRest(Rest *rest, hum::HTp token, int subtoken, int sta
     }
     // addDurRecip(rest, tstring);
 
-    if (m_signifiers.above) {
+    if (!m_signifiers.above.empty()) {
         std::string pattern = "[ra-gA-G]+[-#nxXyY\\/]*";
-        pattern.push_back(m_signifiers.above);
+        pattern += m_signifiers.above;
         if (regex_search(tstring, regex(pattern))) {
             int newstaff = m_currentstaff - 1;
             if ((newstaff > 0) && (newstaff <= (int)m_staffstarts.size())) {
@@ -22874,9 +25346,9 @@ void HumdrumInput::convertRest(Rest *rest, hum::HTp token, int subtoken, int sta
             }
         }
     }
-    if (m_signifiers.below) {
+    if (!m_signifiers.below.empty()) {
         std::string pattern = "[ra-gA-G]+[-#nxXyY\\/]*";
-        pattern.push_back(m_signifiers.below);
+        pattern += m_signifiers.below;
         if (regex_search(tstring, regex(pattern))) {
             int newstaff = m_currentstaff + 1;
             if ((newstaff > 0) && (newstaff <= (int)m_staffstarts.size())) {
@@ -23006,9 +25478,9 @@ void HumdrumInput::convertNote(Note *note, hum::HTp token, int staffadj, int sta
         }
     }
 
+    processTerminalLong(token); // do this before assigning rhythmic value.
+    processTerminalBreve(token); // do this before assigning rhythmic value.
     if (!m_mens) {
-        processTerminalLong(token); // do this before assigning rhythmic value.
-        processTerminalBreve(token); // do this before assigning rhythmic value.
         processOverfillingNotes(token);
     }
 
@@ -23230,15 +25702,39 @@ void HumdrumInput::convertNote(Note *note, hum::HTp token, int staffadj, int sta
     bool editorialQ = false;
 
     std::string edittype;
-    if (!m_signifiers.editacc.empty()) {
-        for (int x = 0; x < (int)m_signifiers.editacc.size(); ++x) {
-            if (tstring.find(m_signifiers.editacc[x]) != std::string::npos) {
-                editorialQ = true;
-                edittype = m_signifiers.edittype[x];
-                break;
+
+    bool doubleQ = false; // Used for mensural editorial+visual accidentals.
+
+    if (token->isKern()) {
+        if (!m_signifiers.editaccKern.empty()) {
+            for (int x = 0; x < (int)m_signifiers.editaccKern.size(); ++x) {
+                if (tstring.find(m_signifiers.editaccKern[x]) != std::string::npos) {
+                    editorialQ = true;
+                    edittype = m_signifiers.edittypeKern[x];
+                    break;
+                }
+            }
+        }
+    }
+    else if (token->isMens()) {
+        string doubleSignifier;
+        if (!m_signifiers.editaccMens.empty()) {
+            for (int x = 0; x < (int)m_signifiers.editaccMens.size(); ++x) {
+                doubleSignifier = m_signifiers.editaccMens[x];
+                doubleSignifier += m_signifiers.editaccMens[x];
+                if (tstring.find(m_signifiers.editaccMens[x]) != std::string::npos) {
+                    editorialQ = true;
+                    edittype = m_signifiers.edittypeMens[x];
+                    if (tstring.find(doubleSignifier) != std::string::npos) {
+                        // Show accidental as regular and editorial.
+                        doubleQ = true;
+                    }
+                    break;
+                }
             }
         }
     }
+
     std::string edittype2 = token->getLayoutParameter("A", "edit", subtoken);
     if (edittype.empty() && !edittype2.empty()) {
         editorialQ = true;
@@ -23246,8 +25742,15 @@ void HumdrumInput::convertNote(Note *note, hum::HTp token, int staffadj, int sta
             // default editorial accidental type
             edittype = "";
             // use the first editorial accidental RDF style in file if present
-            if (!m_signifiers.editacc.empty()) {
-                edittype = m_signifiers.edittype[0];
+            if (token->isKern()) {
+                if (!m_signifiers.editaccKern.empty()) {
+                    edittype = m_signifiers.edittypeKern[0];
+                }
+            }
+            else if (token->isMens()) {
+                if (!m_signifiers.editaccMens.empty()) {
+                    edittype = m_signifiers.edittypeMens[0];
+                }
             }
         }
         else {
@@ -23256,8 +25759,8 @@ void HumdrumInput::convertNote(Note *note, hum::HTp token, int staffadj, int sta
     }
 
     int stemslashes = 0;
-    if ((!token->isChord()) && m_signifiers.tremolo) {
-        stemslashes = (int)std::count(tstring.begin(), tstring.end(), m_signifiers.tremolo);
+    if ((!token->isChord()) && !m_signifiers.tremolo.empty()) {
+        stemslashes = (int)std::count(tstring.begin(), tstring.end(), m_signifiers.tremolo.at(0));
     }
 
     bool removeStemQ = getBooleanParameter(token, "N", "xstem");
@@ -23450,33 +25953,42 @@ void HumdrumInput::convertNote(Note *note, hum::HTp token, int staffadj, int sta
                         break;
                 }
             }
-            else {
+
+            if ((!editorialQ) || doubleQ) {
+
+                Accid *myaccid = accid;
+                if (doubleQ) {
+                    myaccid = new Accid;
+                    appendElement(note, myaccid);
+                }
 
                 switch (accidCount) {
-                    case +3: accid->SetAccid(ACCIDENTAL_WRITTEN_xs); break;
-                    case +2: accid->SetAccid(ACCIDENTAL_WRITTEN_x); break;
-                    case +1: accid->SetAccid(ACCIDENTAL_WRITTEN_s); break;
+                    case +3: myaccid->SetAccid(ACCIDENTAL_WRITTEN_xs); break;
+                    case +2: myaccid->SetAccid(ACCIDENTAL_WRITTEN_x); break;
+                    case +1: myaccid->SetAccid(ACCIDENTAL_WRITTEN_s); break;
                     case 0:
                         // mensural music does not have a natural sign
                         // and accidentals are relative
                         switch (diatonic % 7) {
-                            case 0: accid->SetAccid(ACCIDENTAL_WRITTEN_f); break; // C# -> Cn
-                            case 1: accid->SetAccid(ACCIDENTAL_WRITTEN_f); break; // D# -> Dn
-                            case 2: accid->SetAccid(ACCIDENTAL_WRITTEN_s); break; // E- -> En
-                            case 3: accid->SetAccid(ACCIDENTAL_WRITTEN_f); break; // F# -> Fn
-                            case 4: accid->SetAccid(ACCIDENTAL_WRITTEN_f); break; // G# -> Gn
-                            case 5: accid->SetAccid(ACCIDENTAL_WRITTEN_s); break; // A- -> An
-                            case 6: accid->SetAccid(ACCIDENTAL_WRITTEN_s); break; // B- -> Bn
+                            case 0: myaccid->SetAccid(ACCIDENTAL_WRITTEN_f); break; // C# -> Cn
+                            case 1: myaccid->SetAccid(ACCIDENTAL_WRITTEN_f); break; // D# -> Dn
+                            case 2: myaccid->SetAccid(ACCIDENTAL_WRITTEN_s); break; // E- -> En
+                            case 3: myaccid->SetAccid(ACCIDENTAL_WRITTEN_f); break; // F# -> Fn
+                            case 4: myaccid->SetAccid(ACCIDENTAL_WRITTEN_f); break; // G# -> Gn
+                            case 5: myaccid->SetAccid(ACCIDENTAL_WRITTEN_s); break; // A- -> An
+                            case 6: myaccid->SetAccid(ACCIDENTAL_WRITTEN_s); break; // B- -> Bn
                         }
+                        myaccid->SetAccidGes(ACCIDENTAL_GESTURAL_n);
                         break;
-                    case -1: accid->SetAccid(ACCIDENTAL_WRITTEN_f); break;
-                    case -2: accid->SetAccid(ACCIDENTAL_WRITTEN_ff); break;
-                    case -3: accid->SetAccid(ACCIDENTAL_WRITTEN_tf); break;
+                        break;
+                    case -1: myaccid->SetAccid(ACCIDENTAL_WRITTEN_f); break;
+                    case -2: myaccid->SetAccid(ACCIDENTAL_WRITTEN_ff); break;
+                    case -3: myaccid->SetAccid(ACCIDENTAL_WRITTEN_tf); break;
                     default: std::cerr << "Do not know how to convert accidental: " << accidCount << endl;
                 }
 
                 if (accidlevel != 0) {
-                    accid->SetFunc(accidLog_FUNC_edit);
+                    myaccid->SetFunc(accidLog_FUNC_edit);
                 }
             }
         }
@@ -23683,7 +26195,6 @@ void HumdrumInput::convertNote(Note *note, hum::HTp token, int staffadj, int sta
         }
     }
 
-    // alterted notes (MEI 5):
     if (mensit) {
         addMensuralQuality(note, token);
     }
@@ -23708,9 +26219,9 @@ void HumdrumInput::convertNote(Note *note, hum::HTp token, int staffadj, int sta
         }
     }
 
-    if (m_signifiers.above) {
+    if (!m_signifiers.above.empty()) {
         std::string pattern = "[ra-gA-G]+[-#nxXyY]*";
-        pattern.push_back(m_signifiers.above);
+        pattern += m_signifiers.above;
         if (regex_search(tstring, regex(pattern))) {
             int newstaff = m_currentstaff - 1;
             if ((staffadj == 0) && (newstaff > 0) && (newstaff <= (int)m_staffstarts.size())) {
@@ -23718,9 +26229,9 @@ void HumdrumInput::convertNote(Note *note, hum::HTp token, int staffadj, int sta
             }
         }
     }
-    if (m_signifiers.below) {
+    if (!m_signifiers.below.empty()) {
         std::string pattern = "[ra-gA-G]+[-#nxXyY]*";
-        pattern.push_back(m_signifiers.below);
+        pattern += m_signifiers.below;
         if (regex_search(tstring, regex(pattern))) {
             int newstaff = m_currentstaff + 1;
             if ((staffadj == 0) && (newstaff > 0) && (newstaff <= (int)m_staffstarts.size())) {
@@ -23741,7 +26252,7 @@ void HumdrumInput::convertNote(Note *note, hum::HTp token, int staffadj, int sta
     }
 
     // check for cue-size signifier:
-    if (m_signifiers.cuesize && tstring.find(m_signifiers.cuesize) != std::string::npos) {
+    if (!m_signifiers.cuesize.empty() && tstring.find(m_signifiers.cuesize) != std::string::npos) {
         note->SetCue(BOOLEAN_true);
     }
     else if (m_staffstates.at(staffindex).cue_size.at(m_currentlayer)) {
@@ -23854,7 +26365,7 @@ bool HumdrumInput::checkForJoin(Note *note, hum::HTp token)
 //////////////////////////////
 //
 // HumdrumInput::addMensuralQuality -- Add explicit @num and @numbase for mensural notes
-//     that doe not match the mensuration.  This can be removed later when verovio does
+//     that do not match the mensuration.  This can be removed later when verovio does
 //     this on its own.
 //
 //     maximodus   splits maxima    into 2 or 3 longas
@@ -23881,15 +26392,16 @@ void HumdrumInput::addMensuralQuality(Note *note, hum::HTp token)
     bool longa = token->find("L") == std::string::npos ? false : true;
     bool breve = token->find("S") == std::string::npos ? false : true;
     bool semibreve = token->find("s") == std::string::npos ? false : true;
+    bool minima = token->find("M") == std::string::npos ? false : true;
+    bool semiminima = token->find("m") == std::string::npos ? false : true;
+    bool fusa = token->find("U") == std::string::npos ? false : true;
+    bool semifusa = token->find("u") == std::string::npos ? false : true;
 
-    if (!(maxima || longa || breve || semibreve)) {
-        // minim, semiminim, fusa, and semifusa should always be imperfect
-        return;
-    }
-
-    // Do not put @num/@numbase on notes/rests that match the mensuration:
+    // Do not put @dur.quality on notes/rests that match the mensuration:
     int staffindex = m_currentstaff - 1;
+
     humaux::StaffStateVariables &ss = m_staffstates.at(staffindex);
+
     if (maxima && perfect && (ss.maximodus == 3)) {
         return;
     }
@@ -23914,19 +26426,26 @@ void HumdrumInput::addMensuralQuality(Note *note, hum::HTp token)
     else if (semibreve && imperfect && (ss.prolatio == 2)) {
         return;
     }
+    else if (minima && imperfect) {
+        return;
+    }
+    else if (semiminima && imperfect) {
+        return;
+    }
+    else if (fusa && imperfect) {
+        return;
+    }
+    else if (semifusa) {
+        // not allowed to be perfected
+        return;
+    }
 
     // Mark note/rest as perfect/imperfect:
     if (token->find("i") != std::string::npos) {
         note->SetDurQuality(DURQUALITY_mensural_imperfecta);
-        // imperfect time adjustment:
-        note->SetNum(3);
-        note->SetNumbase(2);
     }
     if (token->find("p") != std::string::npos) {
         note->SetDurQuality(DURQUALITY_mensural_perfecta);
-        // perfect time adjustment:
-        note->SetNum(2);
-        note->SetNumbase(3);
     }
 }
 
@@ -24272,7 +26791,13 @@ template <class ELEMENT> void HumdrumInput::convertVerses(ELEMENT element, hum::
             hre.replaceDestructive(value, "&#xFC;", "u2", "g"); // u-umlaut
             hre.replaceDestructive(value, "&#xE4;", "a2", "g"); // a-umlaut
             hre.replaceDestructive(value, "&#xF6;", "o2", "g"); // o-umlaut
-            vtexts.push_back(value);
+            hre.replaceDestructive(value, "", "\\s+$"); // trailing spaces
+            hre.replaceDestructive(value, "", "^\\s+"); // leading spaces
+            hre.replaceDestructive(value, "-", "\\s+-$"); // trailing space before hyphen
+            hre.replaceDestructive(value, "-", "^-\\s+"); // leaning spaces after hyphen
+            if (!value.empty()) {
+                vtexts.push_back(value);
+            }
         }
         else {
             vtoks.push_back(token);
@@ -24280,7 +26805,13 @@ template <class ELEMENT> void HumdrumInput::convertVerses(ELEMENT element, hum::
             if (value.empty()) {
                 value = *token;
             }
-            vtexts.push_back(value);
+            hre.replaceDestructive(value, "", "\\s+$"); // trailing spaces
+            hre.replaceDestructive(value, "", "^\\s+"); // leading spaces
+            hre.replaceDestructive(value, "-", "\\s+-$"); // trailing space before hyphen
+            hre.replaceDestructive(value, "-", "^-\\s+"); // leaning spaces after hyphen
+            if (!value.empty()) {
+                vtexts.push_back(value);
+            }
         }
         if (vvdataQ) {
             splitSyllableBySpaces(vtexts);
@@ -24288,6 +26819,10 @@ template <class ELEMENT> void HumdrumInput::convertVerses(ELEMENT element, hum::
 
         for (int j = 0; j < (int)vtexts.size(); ++j) {
             content = vtexts[j];
+            bool addSpacer = true;
+            if (content.find(" ") != std::string::npos) {
+                addSpacer = false;
+            }
             vtoken = vtoks[j];
             versenum++;
             if (content == "") {
@@ -24500,15 +27035,11 @@ template <class ELEMENT> void HumdrumInput::convertVerses(ELEMENT element, hum::
                     id += "S" + to_string(m + 1);
                     syls[m]->SetID(id);
                 }
-                bool spacer = false;
-                if ((contents.size() == 1) && (contents[0].size() == 1)) {
-                    spacer = true;
-                }
 
                 if (ij) {
                     Rend *rend = new Rend();
                     rend->SetFontstyle(FONTSTYLE_italic);
-                    addTextElement(rend, contents[m], "", spacer);
+                    addTextElement(rend, contents[m], "", addSpacer);
                     syls[m]->AddChild(rend);
                     std::string ijbegin = vtoken->getValue("auto", "ij-begin");
                     bool ijbeginQ = !ijbegin.empty();
@@ -24528,7 +27059,7 @@ template <class ELEMENT> void HumdrumInput::convertVerses(ELEMENT element, hum::
                     }
                 }
                 else {
-                    addTextElement(syls[m], contents[m], "", spacer);
+                    addTextElement(syls[m], contents[m], "", addSpacer);
                 }
             }
         }
@@ -24733,6 +27264,7 @@ template <class ELEMENT> void HumdrumInput::setRhythmFromDuration(ELEMENT elemen
 template <class ELEMENT>
 void HumdrumInput::setVisualAndGesturalRhythmFromDuration(ELEMENT element, hum::HumNum visdur, hum::HumNum gesdur)
 {
+    bool durGesSet = false;
     pair<data_DURATION, int> visDurAndDots = getDurAndDots(visdur);
     element->SetDur(visDurAndDots.first);
     if (visDurAndDots.second != 0) {
@@ -24741,8 +27273,14 @@ void HumdrumInput::setVisualAndGesturalRhythmFromDuration(ELEMENT element, hum::
     pair<data_DURATION, int> gesDurAndDots = getDurAndDots(gesdur);
     if (gesDurAndDots.first != visDurAndDots.first) {
         element->SetDurGes(gesDurAndDots.first);
+        durGesSet = true;
+    }
+    if (!durGesSet) {
+        if (gesDurAndDots.second != visDurAndDots.second) {
+            element->SetDotsGes(gesDurAndDots.second);
+        }
     }
-    if (gesDurAndDots.second != visDurAndDots.second) {
+    else {
         element->SetDotsGes(gesDurAndDots.second);
     }
 }
@@ -24799,14 +27337,15 @@ template <class ELEMENT> hum::HumNum HumdrumInput::convertRhythm(ELEMENT element
 
     if (!vstring.empty()) {
         int visualdotcount = characterCountInSubtoken(vstring, '.');
-        if (visualdotcount > 0) {
-            element->SetDots(visualdotcount);
-        }
         int gesturaldotcount = characterCountInSubtoken(tstring, '.');
-        if (gesturaldotcount != visualdotcount) {
-            element->SetDotsGes(gesturaldotcount);
+        // It would be prettier to avoid @dots.ges="0" if @dots is not set,
+        // but we cannot tell from here whether @dots will be set (the
+        // call to setRhythmFromDuration() can set @dots unexpectedly).
+        // So we always set @dots.ges if @dur.ges is going to be set.
+        if (visualdotcount != 0) {
             element->SetDots(visualdotcount);
         }
+        element->SetDotsGes(gesturaldotcount);
     }
     else {
         int dotcount = characterCountInSubtoken(tstring, '.');
@@ -24830,9 +27369,10 @@ template <class ELEMENT> hum::HumNum HumdrumInput::convertRhythm(ELEMENT element
         dur /= 4; // convert duration to whole-note units
         int logicaldurdots = (int)std::count(logicaldur.begin(), logicaldur.end(), '.');
         int visualdurdots = (int)std::count(visualdur.begin(), visualdur.end(), '.');
-        if (visualdurdots != logicaldurdots) {
-            element->SetDotsGes(logicaldurdots);
+        if (visualdurdots != 0) {
+            element->SetDots(visualdurdots);
         }
+        element->SetDotsGes(logicaldurdots);
         std::string typestring = token->getValue("auto", "MEI", "type");
         if (typestring.empty()) {
             element->SetType("overfill");
@@ -24845,6 +27385,9 @@ template <class ELEMENT> hum::HumNum HumdrumInput::convertRhythm(ELEMENT element
         dur = hum::Convert::recipToDurationNoDots(tstring);
         dur /= 4; // convert duration to whole-note units
         if (!grace) {
+            // Remove tuplet component of duration (if any).
+            // This should convert duration to a power of two
+            // plus duration related to augmentation dots.
             dur *= m_tupletscaling;
         }
     }
@@ -24852,6 +27395,9 @@ template <class ELEMENT> hum::HumNum HumdrumInput::convertRhythm(ELEMENT element
         dur = hum::Convert::recipToDurationNoDots(vstring);
         dur /= 4; // convert duration to whole-note units
         if (!grace) {
+            // Remove tuplet component of duration (if any).
+            // This should convert duration to a power of two
+            // plus duration related to augmentation dots.
             dur *= m_tupletscaling;
         }
 
@@ -24933,6 +27479,9 @@ template <class ELEMENT> hum::HumNum HumdrumInput::convertRhythm(ELEMENT element
         }
         hum::HumNum newdur = hum::Convert::recipToDuration(vstring);
         // See note eDcRfV
+        // Restore the tuplet factors before calling setRhythmFromDuration
+        // as they will be removed (again) in getDurAndDots().
+        newdur /= m_tupletscaling;
         setRhythmFromDuration(element, newdur);
         return newdur;
     }
@@ -25025,7 +27574,7 @@ int HumdrumInput::getStaffAdjustment(hum::HTp token)
     upquery += m_signifiers.above;
     std::string downquery = "[A-Ga-gr][#n-]*[xXyY]*";
     downquery += m_signifiers.below;
-    if (m_signifiers.above) {
+    if (!m_signifiers.above.empty()) {
         for (int i = 0; i < scount; ++i) {
             if (!hre.search(subtokens[i], upquery)) {
                 allabove = false;
@@ -25036,7 +27585,7 @@ int HumdrumInput::getStaffAdjustment(hum::HTp token)
     else {
         allabove = false;
     }
-    if (m_signifiers.below && !allabove) {
+    if (!m_signifiers.below.empty() && !allabove) {
         for (int i = 0; i < scount; ++i) {
             if (!hre.search(subtokens[i], downquery)) {
                 allbelow = false;
@@ -25485,9 +28034,16 @@ void HumdrumInput::addTurn(hum::HTp token, const string &tok, int noteIndex)
         }
     }
 
-    if (turnstart == turnend) {
+    if (turnstart == -1) {
         return;
     }
+    bool singleQ = false;
+    if (turnstart == turnend) {
+        LogWarning(
+            "Humdrum: Single turn character on line %d, field, %d\n", token->getLineNumber(), token->getFieldNumber());
+        singleQ = true;
+    }
+
     std::string turnstr = tok.substr(turnstart, turnend - turnstart + 1);
 
     if (turnstr.empty()) {
@@ -25511,6 +28067,9 @@ void HumdrumInput::addTurn(hum::HTp token, const string &tok, int noteIndex)
     Turn *turn = new Turn();
     appendElement(m_measure, turn);
     setStaff(turn, staff);
+    if (singleQ) {
+        turn->SetColor("red");
+    }
 
     if (delayedQ) {
         turn->SetDelayed(BOOLEAN_true);
@@ -25519,18 +28078,18 @@ void HumdrumInput::addTurn(hum::HTp token, const string &tok, int noteIndex)
     std::string noteid = getLocationId("note", token, noteIndex);
     turn->SetStartid("#" + noteid);
 
-    turn->SetForm(invertedQ ? turnLog_FORM_lower : turnLog_FORM_lower);
+    turn->SetForm(invertedQ ? turnLog_FORM_lower : turnLog_FORM_upper);
 
-    if (m_signifiers.above) {
+    if (!m_signifiers.above.empty()) {
         if (turnend < (int)token->size() - 1) {
-            if ((*token)[turnend + 1] == m_signifiers.above) {
+            if (token->compare(turnend + 1, m_signifiers.above.size(), m_signifiers.above) == 0) {
                 setPlaceRelStaff(turn, "above", true);
             }
         }
     }
-    if (m_signifiers.below) {
+    if (!m_signifiers.below.empty()) {
         if (turnend < (int)token->size() - 1) {
-            if ((*token)[turnend + 1] == m_signifiers.below) {
+            if (token->compare(turnend + 1, m_signifiers.below.size(), m_signifiers.below) == 0) {
                 setPlaceRelStaff(turn, "below", true);
             }
         }
@@ -25753,10 +28312,10 @@ void HumdrumInput::addMordent(Object *linked, hum::HTp token)
     std::string query = "(";
     query += "[wWmM]+";
     query += "[y";
-    if (m_signifiers.above) {
+    if (!m_signifiers.above.empty()) {
         query += m_signifiers.above;
     }
-    if (m_signifiers.below) {
+    if (!m_signifiers.below.empty()) {
         query += m_signifiers.below;
     }
     query += "]*";
@@ -25837,12 +28396,12 @@ void HumdrumInput::addMordent(Object *linked, hum::HTp token)
         }
         // Set any explicit placement of the mordent:
         int direction = mplace.at(i);
-        if (m_signifiers.above) {
+        if (!m_signifiers.above.empty()) {
             if (mstring.at(i).find(m_signifiers.above) != std::string::npos) {
                 direction = +1;
             }
         }
-        if (m_signifiers.below) {
+        if (!m_signifiers.below.empty()) {
             if (mstring.at(i).find(m_signifiers.below) != std::string::npos) {
                 direction = -1;
             }
@@ -25947,14 +28506,14 @@ void HumdrumInput::addMordent(Object *linked, hum::HTp token)
 int HumdrumInput::getNoteStaff(hum::HTp token, int homestaff)
 {
     hum::HumRegex hre;
-    if (m_signifiers.above) {
+    if (!m_signifiers.above.empty()) {
         std::string sstring = "[a-g]+[-#n]*";
         sstring += m_signifiers.above;
         if (hre.search(token, sstring)) {
             return homestaff - 1;
         }
     }
-    if (m_signifiers.below) {
+    if (!m_signifiers.below.empty()) {
         std::string sstring = "[a-g]+[-#n]*";
         sstring += m_signifiers.below;
         if (hre.search(token, sstring)) {
@@ -26030,16 +28589,16 @@ void HumdrumInput::addTrill(Object *linked, hum::HTp token)
 
     setLocationId(trill, token, subtok);
 
-    if (m_signifiers.above) {
+    if (!m_signifiers.above.empty()) {
         if (tpos < token->size() - 1) {
-            if ((*token)[tpos + 1] == m_signifiers.above) {
+            if (token->compare(tpos + 1, m_signifiers.above.size(), m_signifiers.above) == 0) {
                 setPlaceRelStaff(trill, "above", true);
             }
         }
     }
-    if (m_signifiers.below) {
+    if (!m_signifiers.below.empty()) {
         if (tpos < token->size() - 1) {
-            if ((*token)[tpos + 1] == m_signifiers.below) {
+            if (token->compare(tpos + 1, m_signifiers.below.size(), m_signifiers.below) == 0) {
                 setPlaceRelStaff(trill, "below", true);
             }
         }
@@ -26252,6 +28811,10 @@ void HumdrumInput::addTrill(Object *linked, hum::HTp token)
 
 void HumdrumInput::processTieStart(Note *note, hum::HTp token, const std::string &tstring, int subindex)
 {
+    // Ignore tie when token is suppressed with yy signifier
+    if (token->find("yy") != std::string::npos) {
+        return;
+    }
     if (token->isMensLike()) {
         return;
     }
@@ -26318,22 +28881,22 @@ void HumdrumInput::processTieStart(Note *note, hum::HTp token, const std::string
     ss[rtrack].tiestarts.back().setStart(
         noteid, m_measure, cl, tstring, pitch, timestamp, endtime, subindex, token, metertop, meterbot);
 
-    if (m_signifiers.above) {
+    if (!m_signifiers.above.empty()) {
         std::string marker = "[";
         if (tstring.find("_") != std::string::npos) {
             marker = "_";
         }
-        marker.push_back(m_signifiers.above);
+        marker += m_signifiers.above;
         if (tstring.find(marker) != std::string::npos) {
             ss[rtrack].tiestarts.back().setTieAbove();
         }
     }
-    if (m_signifiers.below) {
+    if (!m_signifiers.below.empty()) {
         std::string marker = "[";
         if (tstring.find("_") != std::string::npos) {
             marker = "_";
         }
-        marker.push_back(m_signifiers.below);
+        marker += m_signifiers.below;
         if (tstring.find(marker) != std::string::npos) {
             ss[rtrack].tiestarts.back().setTieBelow();
         }
@@ -27746,7 +30309,7 @@ void HumdrumInput::setLocationIdNSuffix(Object *object, hum::HTp token, int numb
 void HumdrumInput::checkBeamWith(
     Beam *beam, const std::vector<humaux::HumdrumBeamAndTuplet> &tgs, std::vector<hum::HTp> &layerdata, int startindex)
 {
-    if (!(m_signifiers.above || m_signifiers.below)) {
+    if (m_signifiers.above.empty() && m_signifiers.below.empty()) {
         return;
     }
     hum::HumRegex hre;
@@ -28040,17 +30603,14 @@ void HumdrumInput::parseSignifiers(hum::HumdrumFile &infile)
             continue;
         }
 
-        char signifier = 0;
-        for (int j = 0; j < (int)equals; ++j) {
-            if (isspace(value[j])) {
-                continue;
-            }
-            signifier = value[j];
-            break;
+        string signifier = "";
+        if (hre.search(value, "^\\s*([^\\s=]+)\\s*=")) {
+            signifier = hre.getMatch(1);
         }
-        if (!signifier) {
+        else {
             continue;
         }
+
         // check for known signifier meanings:
 
         if (((key == "RDF**silbe") || (key == "RDF**text")) && hre.search(value, "marked text|matched text")) {
@@ -28089,7 +30649,7 @@ void HumdrumInput::parseSignifiers(hum::HumdrumFile &infile)
             }
         }
         else if (key == "RDF**dynam") {
-            if (signifier == '>') {
+            if (signifier == ">") {
                 if (hre.search(afterequals, "^\\s*\"\\s*([^\"]+)\\s*\"")) {
                     m_signifiers.decresctext = hre.getMatch(1);
                 }
@@ -28104,7 +30664,7 @@ void HumdrumInput::parseSignifiers(hum::HumdrumFile &infile)
                     }
                 }
             }
-            else if (signifier == '<') {
+            else if (signifier == "<") {
                 if (hre.search(afterequals, "^\\s*\"\\s*([^\"]+)\\s*\"")) {
                     m_signifiers.cresctext = hre.getMatch(1);
                 }
@@ -28121,6 +30681,54 @@ void HumdrumInput::parseSignifiers(hum::HumdrumFile &infile)
             }
         }
 
+        if (key == "RDF**mens") {
+
+            // editorial accidentals:
+            if (value.find("editorial accidental", equals) != std::string::npos) {
+                m_signifiers.editaccMens.push_back(signifier);
+                if (value.find("brack") != std::string::npos) {
+                    if (value.find("up") != std::string::npos) {
+                        m_signifiers.edittypeMens.push_back("brack-up");
+                    }
+                    else {
+                        m_signifiers.edittypeMens.push_back("brack");
+                    }
+                }
+                else if (value.find("paren") != std::string::npos) {
+                    if (value.find("up") != std::string::npos) {
+                        m_signifiers.edittypeMens.push_back("paren-up");
+                    }
+                    else {
+                        m_signifiers.edittypeMens.push_back("paren");
+                    }
+                }
+                else if (value.find("none") != std::string::npos) {
+                    m_signifiers.edittypeMens.push_back("none");
+                }
+                else {
+                    m_signifiers.edittypeMens.push_back("");
+                }
+            }
+
+            // terminal longs
+            // !!!RDF**mens: l = terminal long
+            if (value.find("terminal long", equals) != std::string::npos) {
+                m_signifiers.mensTerminalLong = signifier;
+            }
+            else if (value.find("long note", equals) != std::string::npos) {
+                m_signifiers.mensTerminalLong = signifier;
+            }
+
+            // terminal breves
+            // !!!RDF**mens: l = terminal breve
+            if (value.find("terminal breve", equals) != std::string::npos) {
+                m_signifiers.mensTerminalBreve = signifier;
+            }
+            else if (value.find("breve note", equals) != std::string::npos) {
+                m_signifiers.mensTerminalBreve = signifier;
+            }
+        }
+
         if (key != "RDF**kern") {
             continue;
         }
@@ -28172,19 +30780,19 @@ void HumdrumInput::parseSignifiers(hum::HumdrumFile &infile)
         // terminal longs
         // !!!RDF**kern: i = terminal long
         if (value.find("terminal long", equals) != std::string::npos) {
-            m_signifiers.terminallong = signifier;
+            m_signifiers.kernTerminalLong = signifier;
         }
         else if (value.find("long note", equals) != std::string::npos) {
-            m_signifiers.terminallong = signifier;
+            m_signifiers.kernTerminalLong = signifier;
         }
 
         // terminal breves
         // !!!RDF**kern: i = terminal breve
         if (value.find("terminal breve", equals) != std::string::npos) {
-            m_signifiers.terminalbreve = signifier;
+            m_signifiers.kernTerminalBreve = signifier;
         }
         else if (value.find("breve note", equals) != std::string::npos) {
-            m_signifiers.terminalbreve = signifier;
+            m_signifiers.kernTerminalBreve = signifier;
         }
 
         // slur directions
@@ -28197,28 +30805,28 @@ void HumdrumInput::parseSignifiers(hum::HumdrumFile &infile)
 
         // editorial accidentals:
         if (value.find("editorial accidental", equals) != std::string::npos) {
-            m_signifiers.editacc.push_back(signifier);
+            m_signifiers.editaccKern.push_back(signifier);
             if (value.find("brack") != std::string::npos) {
                 if (value.find("up") != std::string::npos) {
-                    m_signifiers.edittype.push_back("brack-up");
+                    m_signifiers.edittypeKern.push_back("brack-up");
                 }
                 else {
-                    m_signifiers.edittype.push_back("brack");
+                    m_signifiers.edittypeKern.push_back("brack");
                 }
             }
             else if (value.find("paren") != std::string::npos) {
                 if (value.find("up") != std::string::npos) {
-                    m_signifiers.edittype.push_back("paren-up");
+                    m_signifiers.edittypeKern.push_back("paren-up");
                 }
                 else {
-                    m_signifiers.edittype.push_back("paren");
+                    m_signifiers.edittypeKern.push_back("paren");
                 }
             }
             else if (value.find("none") != std::string::npos) {
-                m_signifiers.edittype.push_back("none");
+                m_signifiers.edittypeKern.push_back("none");
             }
             else {
-                m_signifiers.edittype.push_back("");
+                m_signifiers.edittypeKern.push_back("");
             }
         }
 
@@ -28819,11 +31427,23 @@ void HumdrumInput::hideTerminalBarlines(hum::HumdrumFile &infile)
                 tok = tok->getNextToken();
                 continue;
             }
-            if (m_signifiers.terminallong && (tok->find(m_signifiers.terminallong) == std::string::npos)) {
+            if (!m_signifiers.kernTerminalLong.empty()
+                && (tok->find(m_signifiers.kernTerminalLong) == std::string::npos)) {
+                tok = tok->getNextToken();
+                continue;
+            }
+            else if (!m_signifiers.kernTerminalBreve.empty()
+                && (tok->find(m_signifiers.kernTerminalBreve) == std::string::npos)) {
                 tok = tok->getNextToken();
                 continue;
             }
-            else if (m_signifiers.terminalbreve && (tok->find(m_signifiers.terminalbreve) == std::string::npos)) {
+            else if (!m_signifiers.mensTerminalLong.empty()
+                && (tok->find(m_signifiers.mensTerminalLong) == std::string::npos)) {
+                tok = tok->getNextToken();
+                continue;
+            }
+            else if (!m_signifiers.mensTerminalBreve.empty()
+                && (tok->find(m_signifiers.mensTerminalBreve) == std::string::npos)) {
                 tok = tok->getNextToken();
                 continue;
             }
@@ -28942,7 +31562,6 @@ void HumdrumInput::markAdjacentNullsWithClef(hum::HTp clef)
 
 void HumdrumInput::markOtherClefsAsChange(hum::HTp clef)
 {
-
     int ctrack = clef->getTrack();
     int track;
 
diff --git a/src/iomei.cpp b/src/iomei.cpp
index b5bdbf9f706..aaa69f00c64 100644
--- a/src/iomei.cpp
+++ b/src/iomei.cpp
@@ -41,6 +41,7 @@
 #include "del.h"
 #include "dir.h"
 #include "div.h"
+#include "divline.h"
 #include "dot.h"
 #include "dynam.h"
 #include "editorial.h"
@@ -218,13 +219,13 @@ bool MEIOutput::Export()
         // schema processing instruction
         std::string schema;
         if (this->IsPageBasedMEI()) {
-            schema = "https://www.verovio.org/schema/dev/mei-verovio.rng";
+            schema = "https://www.verovio.org/schema/5.0/mei-verovio.rng";
         }
         else if (this->GetBasic()) {
-            schema = "https://music-encoding.org/schema/dev/mei-basic.rng";
+            schema = "https://music-encoding.org/schema/5.0/mei-basic.rng";
         }
         else {
-            schema = "https://music-encoding.org/schema/dev/mei-all.rng";
+            schema = "https://music-encoding.org/schema/5.0/mei-all.rng";
         }
 
         decl = meiDoc.append_child(pugi::node_declaration);
@@ -245,8 +246,8 @@ bool MEIOutput::Export()
         m_mei = meiDoc.append_child("mei");
         m_mei.append_attribute("xmlns") = "http://www.music-encoding.org/ns/mei";
         AttConverter converter;
-        meiVersion_MEIVERSION meiVersion = meiVersion_MEIVERSION(meiVersion_MEIVERSION_MAX - 1);
-        if (this->GetBasic()) meiVersion = meiVersion_MEIVERSION_5_0_0_devplusbasic;
+        meiVersion_MEIVERSION meiVersion = meiVersion_MEIVERSION_5_0;
+        if (this->GetBasic()) meiVersion = meiVersion_MEIVERSION_5_0plusbasic;
         m_mei.append_attribute("meiversion") = (converter.MeiVersionMeiversionToStr(meiVersion)).c_str();
 
         // If the document is mensural, we have to undo the mensural (segments) cast off
@@ -617,6 +618,10 @@ bool MEIOutput::WriteObjectInternal(Object *object, bool useCustomScoreDef)
             m_currentNode = m_currentNode.append_child("custos");
             this->WriteCustos(m_currentNode, vrv_cast<Custos *>(object));
         }
+        else if (object->Is(DIVLINE)) {
+            m_currentNode = m_currentNode.append_child("divLine");
+            this->WriteDivLine(m_currentNode, vrv_cast<DivLine *>(object));
+        }
         else if (object->Is(DOT)) {
             m_currentNode = m_currentNode.append_child("dot");
             this->WriteDot(m_currentNode, vrv_cast<Dot *>(object));
@@ -909,12 +914,13 @@ bool MEIOutput::WriteObjectInternal(Object *object, bool useCustomScoreDef)
     if (this->IsTreeObject(object)) m_nodeStack.push_back(m_currentNode);
 
     if (object->Is(SCORE)) {
+        ScoreDef *scoreDef = vrv_cast<Score *>(object)->GetScoreDef();
         if (useCustomScoreDef) {
-            this->WriteCustomScoreDef();
+            this->WriteCustomScoreDef(scoreDef);
         }
         else {
             // Save the main scoreDef
-            m_doc->GetCurrentScoreDef()->SaveObject(this, this->GetBasic());
+            scoreDef->SaveObject(this, this->GetBasic());
         }
     }
 
@@ -1273,7 +1279,7 @@ void MEIOutput::WriteStackedObjectsEnd()
         [this](Object *object) { this->WriteObjectInternalEnd(object); });
 }
 
-void MEIOutput::WriteCustomScoreDef()
+void MEIOutput::WriteCustomScoreDef(ScoreDef *scoreDef)
 {
     // Determine the first measure with respect to the first filter match
     Measure *measure = NULL;
@@ -1300,8 +1306,8 @@ void MEIOutput::WriteCustomScoreDef()
     if (measure && refScoreDef) {
         // Create a copy of the reference scoredef and adjust it to keep track of clef changes, key signature changes,
         // etc.
-        ScoreDef *scoreDef = vrv_cast<ScoreDef *>(refScoreDef->Clone());
-        ListOfObjects staffDefs = scoreDef->FindAllDescendantsByType(STAFFDEF);
+        ScoreDef *customScoreDef = vrv_cast<ScoreDef *>(refScoreDef->Clone());
+        ListOfObjects staffDefs = customScoreDef->FindAllDescendantsByType(STAFFDEF);
         for (Object *staffDef : staffDefs) {
             this->AdjustStaffDef(vrv_cast<StaffDef *>(staffDef), measure);
         }
@@ -1314,7 +1320,7 @@ void MEIOutput::WriteCustomScoreDef()
         }
         if (!drawLabels) {
             // If not, replace labels by abbreviation or delete them
-            ListOfObjects labels = scoreDef->FindAllDescendantsByType(LABEL);
+            ListOfObjects labels = customScoreDef->FindAllDescendantsByType(LABEL);
             for (Object *label : labels) {
                 if (!this->AdjustLabel(vrv_cast<Label *>(label))) {
                     label->GetParent()->DeleteChild(label);
@@ -1323,11 +1329,11 @@ void MEIOutput::WriteCustomScoreDef()
         }
 
         // Save the adjusted score def and delete it afterwards
-        scoreDef->SaveObject(this, this->GetBasic());
-        delete scoreDef;
+        customScoreDef->SaveObject(this, this->GetBasic());
+        delete customScoreDef;
     }
     else {
-        m_doc->GetCurrentScoreDef()->SaveObject(this, this->GetBasic());
+        scoreDef->SaveObject(this, this->GetBasic());
     }
 }
 
@@ -1410,7 +1416,7 @@ bool MEIOutput::AdjustLabel(Label *label)
     if (abbr && (label->GetChildCount(TEXT) == 1)) {
         Text *text = vrv_cast<Text *>(label->GetChild(0, TEXT));
         if (text) {
-            text->SetText(abbr->GetText(abbr));
+            text->SetText(abbr->GetText());
             return true;
         }
     }
@@ -1441,7 +1447,7 @@ bool MEIOutput::WriteDoc(Doc *doc)
 
     // ---- header ----
     if (!m_ignoreHeader) {
-        if (!m_doc->m_header.first_child()) m_doc->GenerateMEIHeader(this->GetBasic());
+        if (this->GetBasic() || !m_doc->m_header.first_child()) m_doc->GenerateMEIHeader(this->GetBasic());
         m_mei.append_copy(m_doc->m_header.first_child());
         // Add transposition in the revision list but not in mei-basic
         if (!this->GetBasic() && !m_doc->GetOptions()->m_transpose.GetValue().empty()) {
@@ -1452,8 +1458,12 @@ bool MEIOutput::WriteDoc(Doc *doc)
     // ---- music ----
 
     pugi::xml_node music = m_mei.append_child("music");
+    if (!m_doc->m_musicDecls.empty()) {
+        music.append_attribute("decls") = m_doc->m_musicDecls.c_str();
+    }
+
     Facsimile *facs = doc->GetFacsimile();
-    if ((facs != NULL) && (facs->GetChildCount() > 0)) {
+    if (!this->GetBasic() && (facs != NULL) && (facs->GetChildCount() > 0)) {
         pugi::xml_node facsimile = music.append_child("facsimile");
         this->WriteFacsimile(facsimile, facs);
         m_nodeStack.push_back(facsimile);
@@ -1704,9 +1714,6 @@ void MEIOutput::WriteScoreDefElement(pugi::xml_node currentNode, ScoreDefElement
     assert(scoreDefElement);
 
     this->WriteXmlId(currentNode, scoreDefElement);
-    scoreDefElement->WriteMeasureNumbers(currentNode);
-    scoreDefElement->WriteSpacing(currentNode);
-    scoreDefElement->WriteSystems(currentNode);
     scoreDefElement->WriteTyped(currentNode);
 }
 
@@ -2083,7 +2090,7 @@ void MEIOutput::WriteLv(pugi::xml_node currentNode, Lv *lv)
     this->WriteTimeSpanningInterface(currentNode, lv);
     lv->WriteColor(currentNode);
     lv->WriteCurvature(currentNode);
-    lv->WriteCurveRend(currentNode);
+    lv->WriteLineRendBase(currentNode);
 }
 
 void MEIOutput::WriteMNum(pugi::xml_node currentNode, MNum *mNum)
@@ -2134,8 +2141,6 @@ void MEIOutput::WriteOrnam(pugi::xml_node currentNode, Ornam *ornam)
     this->WriteTextDirInterface(currentNode, ornam);
     this->WriteTimePointInterface(currentNode, ornam);
     ornam->WriteColor(currentNode);
-    ornam->WriteExtSymAuth(currentNode);
-    ornam->WriteExtSymNames(currentNode);
     ornam->WriteOrnamentAccid(currentNode);
 }
 
@@ -2202,8 +2207,8 @@ void MEIOutput::WriteSlur(pugi::xml_node currentNode, Slur *slur)
     this->WriteTimeSpanningInterface(currentNode, slur);
     slur->WriteColor(currentNode);
     slur->WriteCurvature(currentNode);
-    slur->WriteCurveRend(currentNode);
     slur->WriteLayerIdent(currentNode);
+    slur->WriteLineRendBase(currentNode);
 }
 
 void MEIOutput::WriteStaff(pugi::xml_node currentNode, Staff *staff)
@@ -2244,7 +2249,7 @@ void MEIOutput::WriteTie(pugi::xml_node currentNode, Tie *tie)
     this->WriteTimeSpanningInterface(currentNode, tie);
     tie->WriteColor(currentNode);
     tie->WriteCurvature(currentNode);
-    tie->WriteCurveRend(currentNode);
+    tie->WriteLineRendBase(currentNode);
 }
 
 void MEIOutput::WriteTrill(pugi::xml_node currentNode, Trill *trill)
@@ -2314,8 +2319,9 @@ void MEIOutput::WriteAccid(pugi::xml_node currentNode, Accid *accid)
         return;
     }
 
-    this->WriteLayerElement(currentNode, accid);
-    this->WritePositionInterface(currentNode, accid);
+    WriteLayerElement(currentNode, accid);
+    WriteFacsimileInterface(currentNode, accid);
+    WritePositionInterface(currentNode, accid);
     accid->WriteAccidental(currentNode);
     accid->WriteAccidentalGes(currentNode);
     accid->WriteAccidLog(currentNode);
@@ -2385,9 +2391,9 @@ void MEIOutput::WriteBTrem(pugi::xml_node currentNode, BTrem *bTrem)
     assert(bTrem);
 
     this->WriteLayerElement(currentNode, bTrem);
-    bTrem->WriteBTremLog(currentNode);
     bTrem->WriteNumbered(currentNode);
     bTrem->WriteNumberPlacement(currentNode);
+    bTrem->WriteTremForm(currentNode);
     bTrem->WriteTremMeasured(currentNode);
 }
 
@@ -2454,6 +2460,19 @@ void MEIOutput::WriteCustos(pugi::xml_node currentNode, Custos *custos)
     custos->WriteExtSymNames(currentNode);
 }
 
+void MEIOutput::WriteDivLine(pugi::xml_node currentNode, DivLine *divLine)
+{
+    assert(divLine);
+
+    this->WriteLayerElement(currentNode, divLine);
+    this->WriteFacsimileInterface(currentNode, divLine);
+    divLine->WriteDivLineLog(currentNode);
+    divLine->WriteColor(currentNode);
+    divLine->WriteVisibility(currentNode);
+    divLine->WriteExtSymAuth(currentNode);
+    divLine->WriteExtSymNames(currentNode);
+}
+
 void MEIOutput::WriteDot(pugi::xml_node currentNode, Dot *dot)
 {
     assert(dot);
@@ -2512,7 +2531,7 @@ void MEIOutput::WriteKeySig(pugi::xml_node currentNode, KeySig *keySig)
     // Only write att values if representing an attribute or in MEI basic
     if (!this->IsTreeObject(keySig)) {
         InstKeySigDefaultAnl attKeySigDefaultAnl;
-        // Broken in MEI 5.0.0-dev - waiting for a fix
+        // Broken in MEI 5.0 - waiting for a fix
         // attKeySigDefaultAnl.SetKeyAccid(keySig->GetAccid());
         attKeySigDefaultAnl.SetKeyMode(keySig->GetMode());
         attKeySigDefaultAnl.SetKeyPname(keySig->GetPname());
@@ -2531,11 +2550,11 @@ void MEIOutput::WriteKeySig(pugi::xml_node currentNode, KeySig *keySig)
 
     this->WriteLayerElement(currentNode, keySig);
     keySig->WriteAccidental(currentNode);
-    keySig->WritePitch(currentNode);
-    keySig->WriteKeySigAnl(currentNode);
     keySig->WriteColor(currentNode);
+    keySig->WriteKeyMode(currentNode);
     keySig->WriteKeySigLog(currentNode);
     keySig->WriteKeySigVis(currentNode);
+    keySig->WritePitch(currentNode);
     keySig->WriteVisibility(currentNode);
 }
 
@@ -3037,6 +3056,7 @@ void MEIOutput::WritePitchInterface(pugi::xml_node element, PitchInterface *inte
     interface->WriteNoteGes(element);
     interface->WriteOctave(element);
     interface->WritePitch(element);
+    interface->WritePitchGes(element);
 }
 
 void MEIOutput::WritePlistInterface(pugi::xml_node element, PlistInterface *interface)
@@ -3061,10 +3081,14 @@ void MEIOutput::WriteScoreDefInterface(pugi::xml_node element, ScoreDefInterface
     interface->WriteBarring(element);
     interface->WriteDurationDefault(element);
     interface->WriteLyricStyle(element);
+    interface->WriteMeasureNumbers(element);
     interface->WriteMidiTempo(element);
     interface->WriteMmTempo(element);
     interface->WriteMultinumMeasures(element);
+    interface->WriteOctaveDefault(element);
     interface->WritePianoPedals(element);
+    interface->WriteSpacing(element);
+    interface->WriteSystems(element);
 }
 
 void MEIOutput::WriteTextDirInterface(pugi::xml_node element, TextDirInterface *interface)
@@ -3706,7 +3730,16 @@ bool MEIInput::IsAllowed(std::string element, Object *filterParent)
     }
     // filter for syllable
     else if (filterParent->Is(SYLLABLE)) {
-        if (element == "neume") {
+        if (element == "accid") {
+            return true;
+        }
+        else if (element == "clef") {
+            return true;
+        }
+        else if (element == "divLine") {
+            return true;
+        }
+        else if (element == "neume") {
             return true;
         }
         else if (element == "syl") {
@@ -3822,10 +3855,10 @@ bool MEIInput::ReadDoc(pugi::xml_node root)
         AttConverter converter;
         m_meiversion = converter.StrToMeiVersionMeiversion(version);
     }
-    else {
-        // default to MEI 5
-        LogWarning("No meiversion found, falling back to MEI5 (dev)");
-        m_meiversion = meiVersion_MEIVERSION_5_0_0_dev;
+    // Default to MEI 5.0
+    if (m_meiversion == meiVersion_MEIVERSION_NONE) {
+        LogWarning("MEI version found or not known, falling back to MEI 5.0");
+        m_meiversion = meiVersion_MEIVERSION_5_0;
     }
 
     // only try to handle meiHead if we have a full MEI document
@@ -3909,7 +3942,7 @@ bool MEIInput::ReadDoc(pugi::xml_node root)
         m_readingScoreBased = false;
     }
     // Old page-based files. We skip the mdiv and load the pages element.
-    // The mdiv and score boundaries are added by UpgradePageTo_5_0_0.
+    // The mdiv and score boundaries are added by UpgradePageTo_5_0.
     // This work only for single page files
     else if (m_selectedMdiv.child("pages") && (m_meiversion == meiVersion_MEIVERSION_2013)) {
         pages = m_selectedMdiv.child("pages");
@@ -4153,7 +4186,7 @@ bool MEIInput::ReadPage(Object *parent, pugi::xml_node page)
     }
 
     if ((m_doc->GetType() == Transcription) && (m_meiversion == meiVersion_MEIVERSION_2013)) {
-        UpgradePageTo_5_0_0(vrvPage);
+        UpgradePageTo_5_0(vrvPage);
     }
 
     this->ReadUnsupportedAttr(page, vrvPage);
@@ -4643,13 +4676,10 @@ bool MEIInput::ReadSystemMilestoneEnd(Object *parent, pugi::xml_node milestoneEn
 bool MEIInput::ReadScoreDefElement(pugi::xml_node element, ScoreDefElement *object)
 {
     this->SetMeiID(element, object);
-    object->ReadMeasureNumbers(element);
-    object->ReadSpacing(element);
-    object->ReadSystems(element);
     object->ReadTyped(element);
 
-    if (m_meiversion <= meiVersion_MEIVERSION_5_0_0_dev) {
-        UpgradeScoreDefElementTo_5_0_0(element);
+    if (m_meiversion <= meiVersion_MEIVERSION_5_0) {
+        UpgradeScoreDefElementTo_5_0(element);
     }
 
     InstCleffingLog cleffingLog;
@@ -4714,8 +4744,8 @@ bool MEIInput::ReadScoreDefElement(pugi::xml_node element, ScoreDefElement *obje
         vrvMensur->SetColor(mensuralVis.GetMensurColor());
         vrvMensur->SetOrient(mensuralVis.GetMensurOrient());
 
-        if (m_meiversion < meiVersion_MEIVERSION_5_0_0_dev) {
-            UpgradeMensurTo_5_0_0(element, vrvMensur);
+        if (m_meiversion < meiVersion_MEIVERSION_5_0) {
+            UpgradeMensurTo_5_0(element, vrvMensur);
         }
 
         object->AddChild(vrvMensur);
@@ -4815,26 +4845,26 @@ bool MEIInput::ReadScoreDefChildren(Object *parent, pugi::xml_node parentNode)
         }
         // headers and footers
         else if (std::string(current.name()) == "pgFoot") {
-            if (m_meiversion <= meiVersion_MEIVERSION_5_0_0_dev) {
-                UpgradePgHeadFootTo_5_0_0(current);
+            if (m_meiversion <= meiVersion_MEIVERSION_5_0) {
+                UpgradePgHeadFootTo_5_0(current);
             }
             success = this->ReadPgFoot(parent, current);
         }
         else if (std::string(current.name()) == "pgFoot2") {
-            if (m_meiversion <= meiVersion_MEIVERSION_5_0_0_dev) {
-                UpgradePgHeadFootTo_5_0_0(current);
+            if (m_meiversion <= meiVersion_MEIVERSION_5_0) {
+                UpgradePgHeadFootTo_5_0(current);
             }
             success = this->ReadPgFoot(parent, current);
         }
         else if (std::string(current.name()) == "pgHead") {
-            if (m_meiversion <= meiVersion_MEIVERSION_5_0_0_dev) {
-                UpgradePgHeadFootTo_5_0_0(current);
+            if (m_meiversion <= meiVersion_MEIVERSION_5_0) {
+                UpgradePgHeadFootTo_5_0(current);
             }
             success = this->ReadPgHead(parent, current);
         }
         else if (std::string(current.name()) == "pgHead2") {
-            if (m_meiversion <= meiVersion_MEIVERSION_5_0_0_dev) {
-                UpgradePgHeadFootTo_5_0_0(current);
+            if (m_meiversion <= meiVersion_MEIVERSION_5_0) {
+                UpgradePgHeadFootTo_5_0(current);
             }
             success = this->ReadPgHead(parent, current);
         }
@@ -5319,7 +5349,7 @@ bool MEIInput::ReadMeasure(Object *parent, pugi::xml_node measure)
     vrvMeasure->ReadTyped(measure);
 
     if ((m_doc->GetType() == Transcription) && (m_meiversion == meiVersion_MEIVERSION_2013)) {
-        UpgradeMeasureTo_5_0_0(measure);
+        UpgradeMeasureTo_5_0(measure);
     }
 
     if (measure.attribute("coord.x1") && measure.attribute("coord.x2") && (m_doc->GetType() == Transcription)) {
@@ -5717,7 +5747,7 @@ bool MEIInput::ReadLv(Object *parent, pugi::xml_node lv)
     this->ReadTimeSpanningInterface(lv, vrvLv);
     vrvLv->ReadColor(lv);
     vrvLv->ReadCurvature(lv);
-    vrvLv->ReadCurveRend(lv);
+    vrvLv->ReadLineRendBase(lv);
 
     parent->AddChild(vrvLv);
     this->ReadUnsupportedAttr(lv, vrvLv);
@@ -5787,8 +5817,6 @@ bool MEIInput::ReadOrnam(Object *parent, pugi::xml_node ornam)
     this->ReadTextDirInterface(ornam, vrvOrnam);
     this->ReadTimePointInterface(ornam, vrvOrnam);
     vrvOrnam->ReadColor(ornam);
-    vrvOrnam->ReadExtSymAuth(ornam);
-    vrvOrnam->ReadExtSymNames(ornam);
     vrvOrnam->ReadOrnamentAccid(ornam);
 
     parent->AddChild(vrvOrnam);
@@ -5823,8 +5851,8 @@ bool MEIInput::ReadPhrase(Object *parent, pugi::xml_node phrase)
     this->ReadTimeSpanningInterface(phrase, vrvPhrase);
     vrvPhrase->ReadColor(phrase);
     vrvPhrase->ReadCurvature(phrase);
-    vrvPhrase->ReadCurveRend(phrase);
     vrvPhrase->ReadLayerIdent(phrase);
+    vrvPhrase->ReadLineRendBase(phrase);
 
     parent->AddChild(vrvPhrase);
     this->ReadUnsupportedAttr(phrase, vrvPhrase);
@@ -5884,8 +5912,8 @@ bool MEIInput::ReadSlur(Object *parent, pugi::xml_node slur)
     this->ReadTimeSpanningInterface(slur, vrvSlur);
     vrvSlur->ReadColor(slur);
     vrvSlur->ReadCurvature(slur);
-    vrvSlur->ReadCurveRend(slur);
     vrvSlur->ReadLayerIdent(slur);
+    vrvSlur->ReadLineRendBase(slur);
 
     parent->AddChild(vrvSlur);
     this->ReadUnsupportedAttr(slur, vrvSlur);
@@ -5917,7 +5945,7 @@ bool MEIInput::ReadTie(Object *parent, pugi::xml_node tie)
     this->ReadTimeSpanningInterface(tie, vrvTie);
     vrvTie->ReadColor(tie);
     vrvTie->ReadCurvature(tie);
-    vrvTie->ReadCurveRend(tie);
+    vrvTie->ReadLineRendBase(tie);
 
     parent->AddChild(vrvTie);
     this->ReadUnsupportedAttr(tie, vrvTie);
@@ -6015,7 +6043,7 @@ bool MEIInput::ReadStaff(Object *parent, pugi::xml_node staff)
     vrvStaff->ReadVisibility(staff);
 
     if ((m_doc->GetType() == Transcription) && (m_meiversion == meiVersion_MEIVERSION_2013)) {
-        UpgradeStaffTo_5_0_0(staff);
+        UpgradeStaffTo_5_0(staff);
     }
 
     if (staff.attribute("coord.y1") && (m_doc->GetType() == Transcription)) {
@@ -6132,6 +6160,9 @@ bool MEIInput::ReadLayerChildren(Object *parent, pugi::xml_node parentNode, Obje
         else if (elementName == "custos") {
             success = this->ReadCustos(parent, xmlElement);
         }
+        else if (elementName == "divLine") {
+            success = this->ReadDivLine(parent, xmlElement);
+        }
         else if (elementName == "dot") {
             success = this->ReadDot(parent, xmlElement);
         }
@@ -6251,7 +6282,7 @@ bool MEIInput::ReadLayerElement(pugi::xml_node element, LayerElement *object)
     object->ReadTyped(element);
 
     if ((m_doc->GetType() == Transcription) && (m_meiversion == meiVersion_MEIVERSION_2013)) {
-        UpgradeLayerElementTo_5_0_0(element);
+        UpgradeLayerElementTo_5_0(element);
     }
 
     if (element.attribute("coord.x1") && (m_doc->GetType() == Transcription)) {
@@ -6267,7 +6298,8 @@ bool MEIInput::ReadAccid(Object *parent, pugi::xml_node accid)
     Accid *vrvAccid = new Accid();
     this->ReadLayerElement(accid, vrvAccid);
 
-    this->ReadPositionInterface(accid, vrvAccid);
+    ReadPositionInterface(accid, vrvAccid);
+    ReadFacsimileInterface(accid, vrvAccid);
     vrvAccid->ReadAccidental(accid);
     vrvAccid->ReadAccidentalGes(accid);
     vrvAccid->ReadAccidLog(accid);
@@ -6358,7 +6390,7 @@ bool MEIInput::ReadBTrem(Object *parent, pugi::xml_node bTrem)
     BTrem *vrvBTrem = new BTrem();
     this->ReadLayerElement(bTrem, vrvBTrem);
 
-    vrvBTrem->ReadBTremLog(bTrem);
+    vrvBTrem->ReadTremForm(bTrem);
     vrvBTrem->ReadNumbered(bTrem);
     vrvBTrem->ReadNumberPlacement(bTrem);
     vrvBTrem->ReadTremMeasured(bTrem);
@@ -6465,6 +6497,23 @@ bool MEIInput::ReadCustos(Object *parent, pugi::xml_node custos)
     return this->ReadLayerChildren(vrvCustos, custos, vrvCustos);
 }
 
+bool MEIInput::ReadDivLine(Object *parent, pugi::xml_node divLine)
+{
+    DivLine *vrvDivLine = new DivLine();
+    this->ReadLayerElement(divLine, vrvDivLine);
+
+    this->ReadFacsimileInterface(divLine, vrvDivLine);
+    vrvDivLine->ReadDivLineLog(divLine);
+    vrvDivLine->ReadColor(divLine);
+    vrvDivLine->ReadVisibility(divLine);
+    vrvDivLine->ReadExtSymAuth(divLine);
+    vrvDivLine->ReadExtSymNames(divLine);
+
+    parent->AddChild(vrvDivLine);
+    this->ReadUnsupportedAttr(divLine, vrvDivLine);
+    return true;
+}
+
 bool MEIInput::ReadDot(Object *parent, pugi::xml_node dot)
 {
     Dot *vrvDot = new Dot();
@@ -6545,16 +6594,16 @@ bool MEIInput::ReadKeySig(Object *parent, pugi::xml_node keySig)
     KeySig *vrvKeySig = new KeySig();
     this->ReadLayerElement(keySig, vrvKeySig);
 
-    if (m_meiversion <= meiVersion_MEIVERSION_5_0_0_dev) {
-        UpgradeKeySigTo_5_0_0(keySig);
+    if (m_meiversion <= meiVersion_MEIVERSION_5_0) {
+        UpgradeKeySigTo_5_0(keySig);
     }
 
     vrvKeySig->ReadAccidental(keySig);
-    vrvKeySig->ReadPitch(keySig);
-    vrvKeySig->ReadKeySigAnl(keySig);
     vrvKeySig->ReadColor(keySig);
+    vrvKeySig->ReadKeyMode(keySig);
     vrvKeySig->ReadKeySigLog(keySig);
     vrvKeySig->ReadKeySigVis(keySig);
+    vrvKeySig->ReadPitch(keySig);
     vrvKeySig->ReadVisibility(keySig);
 
     parent->AddChild(vrvKeySig);
@@ -6605,8 +6654,8 @@ bool MEIInput::ReadMensur(Object *parent, pugi::xml_node mensur)
     vrvMensur->ReadSlashCount(mensur);
     vrvMensur->ReadStaffLoc(mensur);
 
-    if (m_meiversion < meiVersion_MEIVERSION_5_0_0_dev) {
-        UpgradeMensurTo_5_0_0(mensur, vrvMensur);
+    if (m_meiversion < meiVersion_MEIVERSION_5_0) {
+        UpgradeMensurTo_5_0(mensur, vrvMensur);
     }
 
     parent->AddChild(vrvMensur);
@@ -6619,8 +6668,8 @@ bool MEIInput::ReadMeterSig(Object *parent, pugi::xml_node meterSig)
     MeterSig *vrvMeterSig = new MeterSig();
     this->ReadLayerElement(meterSig, vrvMeterSig);
 
-    if (m_meiversion <= meiVersion_MEIVERSION_5_0_0_dev) {
-        this->UpgradeMeterSigTo_5_0_0(meterSig, vrvMeterSig);
+    if (m_meiversion <= meiVersion_MEIVERSION_5_0) {
+        this->UpgradeMeterSigTo_5_0(meterSig, vrvMeterSig);
     }
 
     vrvMeterSig->ReadEnclosingChars(meterSig);
@@ -6890,6 +6939,10 @@ bool MEIInput::ReadStem(Object *parent, pugi::xml_node stem)
 
 bool MEIInput::ReadSyl(Object *parent, pugi::xml_node syl)
 {
+    // Add empty text node for empty syl element for invisible bbox in neume notation
+    if (!syl.first_child() && (m_doc->GetType() == Facs) && (m_doc->m_notationType == NOTATIONTYPE_neume)) {
+        syl.text().set("");
+    }
     Syl *vrvSyl = new Syl();
     this->ReadLayerElement(syl, vrvSyl);
 
@@ -7127,8 +7180,8 @@ bool MEIInput::ReadNum(Object *parent, pugi::xml_node num)
 
 bool MEIInput::ReadRend(Object *parent, pugi::xml_node rend)
 {
-    if (m_meiversion <= meiVersion_MEIVERSION_5_0_0_dev) {
-        UpgradeRendTo_5_0_0(rend);
+    if (m_meiversion <= meiVersion_MEIVERSION_5_0) {
+        UpgradeRendTo_5_0(rend);
     }
 
     Rend *vrvRend = new Rend();
@@ -7279,6 +7332,7 @@ bool MEIInput::ReadPitchInterface(pugi::xml_node element, PitchInterface *interf
     interface->ReadNoteGes(element);
     interface->ReadOctave(element);
     interface->ReadPitch(element);
+    interface->ReadPitchGes(element);
     return true;
 }
 
@@ -7300,10 +7354,14 @@ bool MEIInput::ReadScoreDefInterface(pugi::xml_node element, ScoreDefInterface *
     interface->ReadBarring(element);
     interface->ReadDurationDefault(element);
     interface->ReadLyricStyle(element);
+    interface->ReadMeasureNumbers(element);
     interface->ReadMidiTempo(element);
     interface->ReadMmTempo(element);
     interface->ReadMultinumMeasures(element);
+    interface->ReadOctaveDefault(element);
     interface->ReadPianoPedals(element);
+    interface->ReadSpacing(element);
+    interface->ReadSystems(element);
     return true;
 }
 
@@ -7995,7 +8053,7 @@ bool MEIInput::ReadTupletSpanAsTuplet(Measure *measure, pugi::xml_node tupletSpa
     // LogDebug("%d %d %s!", startIdx, endIdx, start->GetID().c_str());
     for (int i = endIdx; i >= startIdx; --i) {
         LayerElement *element = dynamic_cast<LayerElement *>(parentLayer->DetachChild(i));
-        if (element) tuplet->AddChild(element);
+        if (element) tuplet->InsertChild(element, 0);
     }
     parentLayer->InsertChild(tuplet, startIdx);
 
@@ -8078,7 +8136,7 @@ void MEIInput::NormalizeAttributes(pugi::xml_node &xmlElement)
     }
 }
 
-void MEIInput::UpgradeKeySigTo_5_0_0(pugi::xml_node keySig)
+void MEIInput::UpgradeKeySigTo_5_0(pugi::xml_node keySig)
 {
     InstKeySigLog keySigLog;
 
@@ -8094,7 +8152,7 @@ void MEIInput::UpgradeKeySigTo_5_0_0(pugi::xml_node keySig)
     }
 }
 
-void MEIInput::UpgradePageTo_5_0_0(Page *page)
+void MEIInput::UpgradePageTo_5_0(Page *page)
 {
     assert(page);
 
@@ -8114,7 +8172,7 @@ void MEIInput::UpgradePageTo_5_0_0(Page *page)
     page->AddChild(mdivEnd);
 }
 
-void MEIInput::UpgradePgHeadFootTo_5_0_0(pugi::xml_node element)
+void MEIInput::UpgradePgHeadFootTo_5_0(pugi::xml_node element)
 {
     if ((std::string(element.name()) == "pgFoot") && !element.attribute("func")) {
         element.append_attribute("func") = "first";
@@ -8132,7 +8190,7 @@ void MEIInput::UpgradePgHeadFootTo_5_0_0(pugi::xml_node element)
     }
 }
 
-void MEIInput::UpgradeMeasureTo_5_0_0(pugi::xml_node measure)
+void MEIInput::UpgradeMeasureTo_5_0(pugi::xml_node measure)
 {
     if (measure.attribute("ulx")) {
         measure.attribute("ulx").set_name("coord.x1");
@@ -8142,7 +8200,7 @@ void MEIInput::UpgradeMeasureTo_5_0_0(pugi::xml_node measure)
     }
 }
 
-void MEIInput::UpgradeMeterSigTo_5_0_0(pugi::xml_node meterSig, MeterSig *vrvMeterSig)
+void MEIInput::UpgradeMeterSigTo_5_0(pugi::xml_node meterSig, MeterSig *vrvMeterSig)
 {
     if (meterSig.attribute("form")) {
         std::string value = meterSig.attribute("form").value();
@@ -8153,7 +8211,7 @@ void MEIInput::UpgradeMeterSigTo_5_0_0(pugi::xml_node meterSig, MeterSig *vrvMet
     }
 }
 
-void MEIInput::UpgradeScoreDefElementTo_5_0_0(pugi::xml_node scoreDefElement)
+void MEIInput::UpgradeScoreDefElementTo_5_0(pugi::xml_node scoreDefElement)
 {
     InstKeySigLog keySigLog;
 
@@ -8182,21 +8240,21 @@ void MEIInput::UpgradeScoreDefElementTo_5_0_0(pugi::xml_node scoreDefElement)
     }
 }
 
-void MEIInput::UpgradeStaffTo_5_0_0(pugi::xml_node staff)
+void MEIInput::UpgradeStaffTo_5_0(pugi::xml_node staff)
 {
     if (staff.attribute("uly")) {
         staff.attribute("uly").set_name("coord.y1");
     }
 }
 
-void MEIInput::UpgradeLayerElementTo_5_0_0(pugi::xml_node element)
+void MEIInput::UpgradeLayerElementTo_5_0(pugi::xml_node element)
 {
     if (element.attribute("ulx")) {
         element.attribute("ulx").set_name("coord.x1");
     }
 }
 
-void MEIInput::UpgradeRendTo_5_0_0(pugi::xml_node element)
+void MEIInput::UpgradeRendTo_5_0(pugi::xml_node element)
 {
     if (element.attribute("fontfam")) {
         std::string value = element.attribute("fontfam").value();
@@ -8251,7 +8309,12 @@ void MEIInput::UpgradeDurGesTo_4_0_0(pugi::xml_node element, DurationInterface *
         }
         else if (durGes.back() == 's') {
             durGes.pop_back();
-            interface->SetDurReal(std::stof(durGes));
+            try {
+                interface->SetDurReal(std::stof(durGes));
+            }
+            catch (const std::invalid_argument &ia) {
+                LogError("Upgrading to 4.0.0: %s", ia.what());
+            }
         }
         element.remove_attribute("dur.ges");
     }
@@ -8265,7 +8328,7 @@ void MEIInput::UpgradeFTremTo_4_0_0(pugi::xml_node fTrem, FTrem *vrvFTrem)
     }
 }
 
-void MEIInput::UpgradeMensurTo_5_0_0(pugi::xml_node mensur, Mensur *vrvMensur)
+void MEIInput::UpgradeMensurTo_5_0(pugi::xml_node mensur, Mensur *vrvMensur)
 {
     if (vrvMensur->HasTempus() && !vrvMensur->HasSign()) {
         vrvMensur->SetSign((vrvMensur->GetTempus() == TEMPUS_3) ? MENSURATIONSIGN_O : MENSURATIONSIGN_C);
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 2b2c3f8ab33..7fa4fb31d3c 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -888,23 +888,23 @@ bool MusicXmlInput::ReadMusicXml(pugi::xml_node root)
             }
         }
         if (head) {
-            m_doc->GetCurrentScoreDef()->AddChild(head);
+            score->GetScoreDef()->AddChild(head);
         }
         if (foot) {
-            m_doc->GetCurrentScoreDef()->AddChild(foot);
+            score->GetScoreDef()->AddChild(foot);
         }
     }
 
     std::vector<StaffGrp *> m_staffGrpStack;
     StaffGrp *staffGrp = new StaffGrp();
-    m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
+    score->GetScoreDef()->AddChild(staffGrp);
     m_staffGrpStack.push_back(staffGrp);
 
     short int staffOffset = 0;
     m_octDis.push_back(0);
 
     pugi::xpath_node scoreMidiBpm = root.select_node("/score-partwise/part[1]/measure[1]/sound[@tempo][1]");
-    if (scoreMidiBpm) m_doc->GetCurrentScoreDef()->SetMidiBpm(scoreMidiBpm.node().attribute("tempo").as_double());
+    if (scoreMidiBpm) score->GetScoreDef()->SetMidiBpm(scoreMidiBpm.node().attribute("tempo").as_double());
 
     pugi::xpath_node_set partListChildren = root.select_nodes("/score-partwise/part-list/*");
     for (pugi::xpath_node_set::const_iterator it = partListChildren.begin(); it != partListChildren.end(); ++it) {
@@ -1708,6 +1708,9 @@ bool MusicXmlInput::ReadMusicXmlMeasure(
 
     this->MatchTies(true);
     if (!m_tieStack.empty()) this->MatchTies(false);
+    for (auto openTie : m_tieStack) {
+        openTie.m_note->SetScoreTimeOnset(-1); // make scoreTimeOnset small for next measure
+    }
 
     // clear stop stacks after each measure
     m_hairpinStopStack.clear();
@@ -1764,7 +1767,6 @@ void MusicXmlInput::MatchTies(bool matchLayers)
             m_tieStopStack.erase(jter);
         }
         else {
-            iter->m_note->SetScoreTimeOnset(-1); // make scoreTimeOnset small for next measure
             ++iter;
         }
     }
@@ -2103,6 +2105,7 @@ void MusicXmlInput::ReadMusicXmlDirection(
     if (containsWords && !containsTempo && !containsDynamics) {
         pugi::xpath_node_set words = node.select_nodes("direction-type/*[self::words or self::coda or self::segno]");
         defaultY = words.first().node().attribute("default-y").as_int();
+        defaultY = (defaultY * 10) + words.first().node().attribute("relative-y").as_int();
         std::string wordStr = words.first().node().text().as_string();
         if (wordStr.rfind("cresc", 0) == 0 || wordStr.rfind("dim", 0) == 0 || wordStr.rfind("decresc", 0) == 0) {
             containsDynamics = true;
@@ -2128,7 +2131,7 @@ void MusicXmlInput::ReadMusicXmlDirection(
             }
 
             TextRendition(words, dir);
-            defaultY = (defaultY < 0) ? std::abs(defaultY) : defaultY + 200;
+            defaultY = (defaultY < 0) ? std::abs(defaultY) : defaultY + 2000;
             dir->SetVgrp(defaultY);
             m_controlElements.push_back({ measureNum, dir });
             m_dirStack.push_back(dir);
@@ -2183,9 +2186,12 @@ void MusicXmlInput::ReadMusicXmlDirection(
         }
 
         TextRendition(dynamics, dynam);
-        if (defaultY == 0) defaultY = dynamics.first().node().attribute("default-y").as_int();
+        if (defaultY == 0) {
+            defaultY = dynamics.first().node().attribute("default-y").as_int();
+            defaultY = (defaultY * 10) + dynamics.first().node().attribute("relative-y").as_int();
+        }
         // parse the default_y attribute and transform to vgrp value, to vertically align dynamics and directives
-        defaultY = (defaultY < 0) ? std::abs(defaultY) : defaultY + 200;
+        defaultY = (defaultY < 0) ? std::abs(defaultY) : defaultY + 2000;
         dynam->SetVgrp(defaultY);
         m_controlElements.push_back({ measureNum, dynam });
         m_dynamStack.push_back(dynam);
@@ -2285,8 +2291,9 @@ void MusicXmlInput::ReadMusicXmlDirection(
                 hairpin->SetStaff(hairpin->AttStaffIdent::StrToXsdPositiveIntegerList(std::to_string(1 + staffOffset)));
             }
             int defaultY = wedge->node().attribute("default-y").as_int();
+            defaultY = (defaultY * 10) + wedge->node().attribute("relative-y").as_int();
             // parse the default_y attribute and transform to vgrp value, to vertically align hairpins
-            defaultY = (defaultY < 0) ? std::abs(defaultY) : defaultY + 200;
+            defaultY = (defaultY < 0) ? std::abs(defaultY) : defaultY + 2000;
             hairpin->SetVgrp(defaultY);
             // match new hairpin to existing hairpin stop
             for (auto iter = m_hairpinStopStack.begin(); iter != m_hairpinStopStack.end(); ++iter) {
@@ -2364,13 +2371,13 @@ void MusicXmlInput::ReadMusicXmlDirection(
             pedal->SetDir(ConvertPedalTypeToDir(pedalType));
             if (pedalLine) pedal->SetForm(PEDALSTYLE_line);
             if (xmlPedal.attribute("abbreviated")) {
-                AttModule::SetExternalsymbols(pedal, "glyph.auth", "smufl");
+                pedal->SetGlyphAuth("smufl");
                 AttModule::SetExternalsymbols(pedal, "glyph.num", "U+E651");
             }
             if (pedalType == "sostenuto") {
                 pedal->SetFunc("sostenuto");
                 if (xmlPedal.attribute("abbreviated")) {
-                    AttModule::SetExternalsymbols(pedal, "glyph.auth", "smufl");
+                    pedal->SetGlyphAuth("smufl");
                     AttModule::SetExternalsymbols(pedal, "glyph.num", "U+E65A");
                 }
             }
@@ -2388,8 +2395,9 @@ void MusicXmlInput::ReadMusicXmlDirection(
             pedal->SetTstamp(timeStamp);
             if (pedalType == "stop") pedal->SetTstamp(timeStamp - 0.1);
             int defaultY = xmlPedal.attribute("default-y").as_int();
+            defaultY = (defaultY * 10) + xmlPedal.attribute("relative-y").as_int();
             // parse the default_y attribute and transform to vgrp value, to vertically align pedal starts and stops
-            defaultY = (defaultY < 0) ? std::abs(defaultY) : defaultY + 200;
+            defaultY = (defaultY < 0) ? std::abs(defaultY) : defaultY + 2000;
             pedal->SetVgrp(defaultY);
             m_controlElements.push_back({ measureNum, pedal });
             m_pedalStack.push_back(pedal);
@@ -2620,7 +2628,7 @@ void MusicXmlInput::ReadMusicXmlNote(
     // find staff's staffDef
     // TODO Tablature: is this the correct way to find a staff's staffDef?
     AttNIntegerComparison cnc(STAFFDEF, staff->GetN());
-    StaffDef *staffDef = vrv_cast<StaffDef *>(m_doc->GetCurrentScoreDef()->FindDescendantByComparison(&cnc));
+    StaffDef *staffDef = vrv_cast<StaffDef *>(m_doc->GetFirstScoreDef()->FindDescendantByComparison(&cnc));
     bool isTablature = false;
     Tuning *tuning = NULL;
 
@@ -2696,11 +2704,11 @@ void MusicXmlInput::ReadMusicXmlNote(
                 AddLayerElement(layer, bTrem);
                 m_elementStackMap.at(layer).push_back(bTrem);
                 if (HasAttributeWithValue(tremolo.node(), "type", "unmeasured")) {
-                    bTrem->SetForm(bTremLog_FORM_unmeas);
+                    bTrem->SetForm(tremForm_FORM_unmeas);
                     tremSlashNum = 0;
                 }
                 else {
-                    bTrem->SetForm(bTremLog_FORM_meas);
+                    bTrem->SetForm(tremForm_FORM_meas);
                 }
             }
         }
@@ -2870,6 +2878,13 @@ void MusicXmlInput::ReadMusicXmlNote(
                 note->SetOct(octaveNum);
             }
         }
+        else if (node.child("unpitched")) {
+            pugi::xml_node unpitched = node.child("unpitched");
+            const std::string stepStr = unpitched.child("display-step").text().as_string();
+            const int octaveNum = unpitched.child("display-octave").text().as_int();
+            const int loc = note->CalcLoc(ConvertStepToPitchName(stepStr), octaveNum, -2);
+            note->SetLoc(loc);
+        }
 
         // dynamics (MIDI velocity)
         const float dynamics = node.attribute("dynamics").as_float(-1.0);
@@ -2883,6 +2898,7 @@ void MusicXmlInput::ReadMusicXmlNote(
             note->SetHeadColor(notehead.attribute("color").as_string());
             note->SetHeadShape(ConvertNotehead(notehead.text().as_string()));
             if (notehead.attribute("parentheses").as_bool()) note->SetHeadMod(NOTEHEADMODIFIER_paren);
+            note->SetGlyphName(notehead.attribute("smufl").as_string());
             auto noteHeadFill = notehead.attribute("filled");
             if (noteHeadFill) note->SetHeadFill(noteHeadFill.as_bool() ? FILL_solid : FILL_void);
             if (!std::strncmp(notehead.text().as_string(), "none", 4)) note->SetHeadVisible(BOOLEAN_false);
@@ -2915,6 +2931,7 @@ void MusicXmlInput::ReadMusicXmlNote(
                 chord->SetDurPpq(duration);
                 if (dots > 0) chord->SetDots(dots);
                 chord->SetStemDir(stemDir);
+                if (!strcmp(notehead.text().as_string(), "cluster")) chord->SetCluster(CLUSTER_white);
                 if (stemText == "none") chord->SetStemVisible(BOOLEAN_false);
                 if (tremSlashNum > 0) {
                     chord->SetStemMod(chord->AttStems::StrToStemmodifier(std::to_string(tremSlashNum) + "slash"));
@@ -3121,7 +3138,7 @@ void MusicXmlInput::ReadMusicXmlNote(
                 // color
                 meiSlur->SetColor(slur.attribute("color").as_string());
                 // lineform
-                meiSlur->SetLform(meiSlur->AttCurveRend::StrToLineform(slur.attribute("line-type").as_string()));
+                meiSlur->SetLform(meiSlur->AttLineRendBase::StrToLineform(slur.attribute("line-type").as_string()));
                 if (slur.attribute("id")) meiSlur->SetID(slur.attribute("id").as_string());
                 meiSlur->SetStartid("#" + note->GetID());
                 // add it to the stack
@@ -3288,7 +3305,8 @@ void MusicXmlInput::ReadMusicXmlNote(
         // place
         dynam->SetPlace(dynam->AttPlacementRelStaff::StrToStaffrel(xmlDynam.attribute("placement").as_string()));
         int defaultY = xmlDynam.attribute("default-y").as_int();
-        defaultY = (defaultY < 0) ? std::abs(defaultY) : defaultY + 200;
+        defaultY = (defaultY * 10) + xmlDynam.attribute("relative-y").as_int();
+        defaultY = (defaultY < 0) ? std::abs(defaultY) : defaultY + 2000;
         dynam->SetVgrp(defaultY);
         std::string dynamStr;
         for (pugi::xml_node xmlDynamPart : xmlDynam.children()) {
@@ -3676,14 +3694,18 @@ void MusicXmlInput::ReadMusicXmlPrint(pugi::xml_node node, Section *section)
     assert(node);
     assert(section);
 
-    if (HasAttributeWithValue(node, "new-system", "yes")) {
+    if (node.attribute("new-page").as_bool()) {
+        Pb *pb = new Pb();
+        section->AddChild(pb);
+    }
+
+    if (node.attribute("new-system").as_bool()) {
         Sb *sb = new Sb();
         section->AddChild(sb);
     }
 
-    if (HasAttributeWithValue(node, "new-page", "yes")) {
-        Pb *pb = new Pb();
-        section->AddChild(pb);
+    if (std::string(node.child("measure-numbering").text().as_string()) == "none") {
+        m_doc->GetFirstScoreDef()->SetMnumVisible(BOOLEAN_false);
     }
 }
 
@@ -3828,7 +3850,7 @@ void MusicXmlInput::ReadMusicXmlTies(
             tie->SetColor(xmlTie.attribute("color").as_string());
             // placement and orientation
             tie->SetCurvedir(InferCurvedir(xmlTie));
-            tie->SetLform(tie->AttCurveRend::StrToLineform(xmlTie.attribute("line-type").as_string()));
+            tie->SetLform(tie->AttLineRendBase::StrToLineform(xmlTie.attribute("line-type").as_string()));
             if (xmlTie.attribute("id")) tie->SetID(xmlTie.attribute("id").as_string());
             // add it to the stack
             m_controlElements.push_back({ measureNum, tie });
@@ -3841,7 +3863,7 @@ void MusicXmlInput::ReadMusicXmlTies(
             lv->SetColor(xmlTie.attribute("color").as_string());
             // placement and orientation
             lv->SetCurvedir(InferCurvedir(xmlTie));
-            lv->SetLform(lv->AttCurveRend::StrToLineform(xmlTie.attribute("line-type").as_string()));
+            lv->SetLform(lv->AttLineRendBase::StrToLineform(xmlTie.attribute("line-type").as_string()));
             if (xmlTie.attribute("id")) lv->SetID(xmlTie.attribute("id").as_string());
             // add it to the stack
             m_controlElements.push_back({ measureNum, lv });
@@ -3934,7 +3956,7 @@ KeySig *MusicXmlInput::ConvertKey(const pugi::xml_node &key)
         if (key.child("mode")) {
             const std::string xmlMode = key.child("mode").text().as_string();
             if (std::strncmp(xmlMode.c_str(), "none", 4)) {
-                keySig->SetMode(keySig->AttKeySigLog::StrToMode(xmlMode));
+                keySig->SetMode(keySig->AttKeyMode::StrToMode(xmlMode));
             }
         }
     }
@@ -3948,6 +3970,10 @@ KeySig *MusicXmlInput::ConvertKey(const pugi::xml_node &key)
                 if (std::strncmp(keyStep.next_sibling().next_sibling().name(), "key-accidental", 14) == 0) {
                     keyAccid->SetAccid(
                         ConvertAccidentalToAccid(keyStep.next_sibling().next_sibling().text().as_string()));
+                    keyAccid->SetGlyphName(keyStep.next_sibling().next_sibling().attribute("smufl").as_string());
+                }
+                else if (!keyAccid->HasAccid()) {
+                    LogWarning("MusicXML import: Could not properly set keyAccid");
                 }
             }
             keySig->AddChild(keyAccid);
@@ -4004,7 +4030,7 @@ curvature_CURVEDIR MusicXmlInput::CombineCurvedir(curvature_CURVEDIR startDir, c
 
 data_ACCIDENTAL_WRITTEN MusicXmlInput::ConvertAccidentalToAccid(const std::string &value)
 {
-    static const std::map<std::string, data_ACCIDENTAL_WRITTEN> Accidental2Accid{
+    static const std::map<std::string, data_ACCIDENTAL_WRITTEN> Accidental2Accid{ //
         { "sharp", ACCIDENTAL_WRITTEN_s }, //
         { "natural", ACCIDENTAL_WRITTEN_n }, //
         { "flat", ACCIDENTAL_WRITTEN_f }, //
@@ -4023,12 +4049,19 @@ data_ACCIDENTAL_WRITTEN MusicXmlInput::ConvertAccidentalToAccid(const std::strin
         { "natural-up", ACCIDENTAL_WRITTEN_nu }, //
         { "flat-down", ACCIDENTAL_WRITTEN_fd }, //
         { "flat-up", ACCIDENTAL_WRITTEN_fu }, //
+        { "double-sharp-down", ACCIDENTAL_WRITTEN_xd }, //
+        { "double-sharp-up", ACCIDENTAL_WRITTEN_xu }, //
+        { "flat-flat-down", ACCIDENTAL_WRITTEN_ffd }, //
+        { "flat-flat-up", ACCIDENTAL_WRITTEN_ffu }, //
         { "triple-sharp", ACCIDENTAL_WRITTEN_ts }, //
         { "triple-flat", ACCIDENTAL_WRITTEN_tf }, //
         { "slash-quarter-sharp", ACCIDENTAL_WRITTEN_bms }, //
         { "slash-sharp", ACCIDENTAL_WRITTEN_ks }, //
         { "slash-flat", ACCIDENTAL_WRITTEN_bf }, //
-        { "double-slash-flat", ACCIDENTAL_WRITTEN_bmf } //
+        { "double-slash-flat", ACCIDENTAL_WRITTEN_bmf }, //
+        { "sori", ACCIDENTAL_WRITTEN_sori }, //
+        { "koron", ACCIDENTAL_WRITTEN_koron }, //
+        { "other", ACCIDENTAL_WRITTEN_NONE }
     };
 
     const auto result = Accidental2Accid.find(value);
@@ -4044,6 +4077,7 @@ data_ACCIDENTAL_GESTURAL MusicXmlInput::ConvertAlterToAccid(const float value)
 {
     static const std::map<float, data_ACCIDENTAL_GESTURAL> Alter2Accid{
         { -3, ACCIDENTAL_GESTURAL_tf }, //
+        { -2.5, ACCIDENTAL_GESTURAL_ffd }, //
         { -2, ACCIDENTAL_GESTURAL_ff }, //
         { -1.5, ACCIDENTAL_GESTURAL_fd }, //
         { -1, ACCIDENTAL_GESTURAL_f }, //
@@ -4053,6 +4087,7 @@ data_ACCIDENTAL_GESTURAL MusicXmlInput::ConvertAlterToAccid(const float value)
         { 1, ACCIDENTAL_GESTURAL_s }, //
         { 1.5, ACCIDENTAL_GESTURAL_su }, //
         { 2, ACCIDENTAL_GESTURAL_ss }, //
+        { 2.5, ACCIDENTAL_GESTURAL_xu }, //
         { 2, ACCIDENTAL_GESTURAL_ts } //
     };
 
@@ -4061,7 +4096,6 @@ data_ACCIDENTAL_GESTURAL MusicXmlInput::ConvertAlterToAccid(const float value)
         return result->second;
     }
 
-    LogWarning("MusicXML import: Unsupported alter value '%.1f'", value);
     return ACCIDENTAL_GESTURAL_NONE;
 }
 
diff --git a/src/iopae.cpp b/src/iopae.cpp
index 0d508be5c12..888dfb0b62d 100644
--- a/src/iopae.cpp
+++ b/src/iopae.cpp
@@ -73,7 +73,7 @@ bool PAEOutput::Export(std::string &output)
     m_currentDots = -1;
     m_grace = false;
 
-    m_doc->GetCurrentScoreDef()->SaveObject(this, false);
+    m_doc->GetFirstScoreDef()->SaveObject(this, false);
 
     m_docScoreDef = false;
 
@@ -1019,20 +1019,20 @@ void PAEInput::parsePlainAndEasy(std::istream &infile)
         staffDef->AddChild(staffDefClef);
     }
     if (scoreDefKeySig) {
-        m_doc->GetCurrentScoreDef()->AddChild(scoreDefKeySig);
+        score->GetScoreDef()->AddChild(scoreDefKeySig);
     }
     if (scoreDefMeterSig) {
         // Make it an attribute for now
         scoreDefMeterSig->IsAttribute(true);
-        m_doc->GetCurrentScoreDef()->AddChild(scoreDefMeterSig);
+        score->GetScoreDef()->AddChild(scoreDefMeterSig);
     }
     if (scoreDefMensur) {
         // Make it an attribute for now
         scoreDefMensur->IsAttribute(true);
-        m_doc->GetCurrentScoreDef()->AddChild(scoreDefMensur);
+        score->GetScoreDef()->AddChild(scoreDefMensur);
     }
 
-    m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
+    score->GetScoreDef()->AddChild(staffGrp);
 
     if (m_tie != NULL) {
         LogWarning("Open tie will not render because tstamp2 is missing");
@@ -2303,7 +2303,7 @@ const std::map<int, std::string> PAEInput::s_errCodes{
     { ERR_026_GRACE_NESTED, "The appoggiatura must be closed with 'r' before starting a new one." },
     { ERR_027_GRACE_CLOSING, "An extra 'r' is present to close an appoggiatura" },
     { ERR_028_GRACE_OPEN, "The appoggiatura must be closed with 'r' before the end of the measure." },
-    { ERR_029_GRACE_UNRESOLVED, "An appoggiatura cannot be started using 'q' before completing the previous one." },
+    { ERR_029_GRACE_UNRESOLVED, "A grace note cannot be started with 'g' or 'q' before completing the previous one." },
     { ERR_030_GRACE_DURATION, "No rhythmic value can be entered when using an acciaccatura with 'g'." },
     { ERR_031_GRACE_NO_NOTE, "A grace note using 'g' or 'q' must be followed by a note." },
     { ERR_032_TUPLET_NESTED, "A special rhythm group cannot be started with '(' before closing the previous one." },
@@ -2966,7 +2966,7 @@ bool PAEInput::Parse()
     staffDef->SetN(1);
     staffDef->SetLines(5);
     staffGrp->AddChild(staffDef);
-    m_doc->GetCurrentScoreDef()->AddChild(staffGrp);
+    score->GetScoreDef()->AddChild(staffGrp);
 
     if (m_isMensural) {
         staffDef->SetNotationtype(NOTATIONTYPE_mensural);
@@ -2977,17 +2977,17 @@ bool PAEInput::Parse()
         staffDef->AddChild(m_clef.Clone());
     }
     if (m_hasKeySig) {
-        m_doc->GetCurrentScoreDef()->AddChild(m_keySig.Clone());
+        score->GetScoreDef()->AddChild(m_keySig.Clone());
     }
     if (m_hasMeterSig) {
         // Make it an attribute for now
         m_meterSig.IsAttribute(true);
-        m_doc->GetCurrentScoreDef()->AddChild(m_meterSig.Clone());
+        score->GetScoreDef()->AddChild(m_meterSig.Clone());
     }
     if (m_hasMensur) {
         // Make it an attribute for now
         m_mensur.IsAttribute(true);
-        m_doc->GetCurrentScoreDef()->AddChild(m_mensur.Clone());
+        score->GetScoreDef()->AddChild(m_mensur.Clone());
     }
 
     // A stack to which layer element are added. At least a Layer, but then Beam, GraceGrp, Chord, etc.
diff --git a/src/keysig.cpp b/src/keysig.cpp
index cb33e92aba5..f5c7c296148 100644
--- a/src/keysig.cpp
+++ b/src/keysig.cpp
@@ -76,18 +76,18 @@ KeySig::KeySig()
     , ObjectListInterface()
     , AttAccidental()
     , AttColor()
-    , AttPitch()
-    , AttKeySigAnl()
+    , AttKeyMode()
     , AttKeySigLog()
     , AttKeySigVis()
+    , AttPitch()
     , AttVisibility()
 {
     this->RegisterAttClass(ATT_ACCIDENTAL);
     this->RegisterAttClass(ATT_COLOR);
-    this->RegisterAttClass(ATT_PITCH);
-    this->RegisterAttClass(ATT_KEYSIGANL);
+    this->RegisterAttClass(ATT_KEYMODE);
     this->RegisterAttClass(ATT_KEYSIGLOG);
     this->RegisterAttClass(ATT_KEYSIGVIS);
+    this->RegisterAttClass(ATT_PITCH);
     this->RegisterAttClass(ATT_VISIBILITY);
 
     this->Reset();
@@ -100,10 +100,10 @@ void KeySig::Reset()
     LayerElement::Reset();
     this->ResetAccidental();
     this->ResetColor();
-    this->ResetPitch();
-    this->ResetKeySigAnl();
+    this->ResetKeyMode();
     this->ResetKeySigLog();
     this->ResetKeySigVis();
+    this->ResetPitch();
     this->ResetVisibility();
 
     // key change drawing values
@@ -149,7 +149,7 @@ int KeySig::GetAccidCount(bool fromAttribute) const
         return this->HasSig() ? (this->GetSig().first) : 0;
     }
     else {
-        return this->GetListSize(this);
+        return this->GetListSize();
     }
 }
 
@@ -165,7 +165,7 @@ data_ACCIDENTAL_WRITTEN KeySig::GetAccidType() const
 
 bool KeySig::HasNonAttribKeyAccidChildren() const
 {
-    const ListOfConstObjects &childList = this->GetList(this);
+    const ListOfConstObjects &childList = this->GetList();
     return std::any_of(childList.begin(), childList.end(), [](const Object *child) { return !child->IsAttribute(); });
 }
 
@@ -174,7 +174,7 @@ void KeySig::GenerateKeyAccidAttribChildren()
     IsAttributeComparison isAttribute(KEYACCID);
     this->DeleteChildrenByComparison(&isAttribute);
 
-    if (this->HasEmptyList(this)) {
+    if (this->HasEmptyList()) {
         for (int i = 0; i < this->GetAccidCount(true); ++i) {
             std::optional<KeyAccidInfo> info = this->GetKeyAccidInfoAt(i);
             if (info) {
@@ -196,7 +196,7 @@ void KeySig::FillMap(MapOfOctavedPitchAccid &mapOfPitchAccid) const
 {
     mapOfPitchAccid.clear();
 
-    const ListOfConstObjects &childList = this->GetList(this); // make sure it's initialized
+    const ListOfConstObjects &childList = this->GetList(); // make sure it's initialized
     if (!childList.empty()) {
         for (const Object *child : childList) {
             const KeyAccid *keyAccid = vrv_cast<const KeyAccid *>(child);
@@ -249,7 +249,7 @@ int KeySig::GetFifthsInt() const
 data_KEYSIGNATURE KeySig::ConvertToSig() const
 {
     data_KEYSIGNATURE sig = std::make_pair(-1, ACCIDENTAL_WRITTEN_NONE);
-    const ListOfConstObjects &childList = this->GetList(this);
+    const ListOfConstObjects &childList = this->GetList();
     if (childList.size() > 1) {
         data_ACCIDENTAL_WRITTEN accidType = ACCIDENTAL_WRITTEN_NONE;
         bool isCommon = true;
diff --git a/src/layer.cpp b/src/layer.cpp
index 9dd3ad94e93..a2ea2da1ba4 100644
--- a/src/layer.cpp
+++ b/src/layer.cpp
@@ -19,6 +19,7 @@
 #include "clef.h"
 #include "comparison.h"
 #include "custos.h"
+#include "divline.h"
 #include "doc.h"
 #include "editorial.h"
 #include "findlayerelementsfunctor.h"
@@ -182,8 +183,8 @@ LayerElement *Layer::GetPrevious(const LayerElement *element)
 
 const LayerElement *Layer::GetPrevious(const LayerElement *element) const
 {
-    this->ResetList(this);
-    if (!element || this->HasEmptyList(this)) return NULL;
+    this->ResetList();
+    if (!element || this->HasEmptyList()) return NULL;
 
     return dynamic_cast<const LayerElement *>(this->GetListPrevious(element));
 }
@@ -246,7 +247,7 @@ const Clef *Layer::GetClef(const LayerElement *test) const
     }
 
     // make sure list is set
-    this->ResetList(this);
+    this->ResetList();
     if (!test->Is(CLEF)) {
         testObject = this->GetListFirstBackward(testObject, CLEF);
     }
@@ -293,7 +294,7 @@ int Layer::GetClefLocOffset(const LayerElement *test) const
 int Layer::GetCrossStaffClefLocOffset(const LayerElement *element, int currentOffset) const
 {
     if (element->m_crossStaff) {
-        ResetList(this);
+        this->ResetList();
         if (!element->Is(CLEF)) {
             const Clef *clef = vrv_cast<const Clef *>(GetListFirstBackward(element, CLEF));
             if (clef && clef->m_crossStaff) {
@@ -399,7 +400,7 @@ std::set<int> Layer::GetLayersNInTimeSpan(double time, double duration, const Me
     Filters filters;
     AttNIntegerComparison matchStaff(ALIGNMENT_REFERENCE, staff);
     filters.Add(&matchStaff);
-    layersInTimeSpan.PushFilters(&filters);
+    layersInTimeSpan.SetFilters(&filters);
 
     measure->m_measureAligner.Process(layersInTimeSpan);
 
@@ -440,8 +441,8 @@ ListOfConstObjects Layer::GetLayerElementsForTimeSpanOf(const LayerElement *elem
     else if (element->Is(BEAM)) {
         const Beam *beam = vrv_cast<const Beam *>(element);
 
-        const LayerElement *first = vrv_cast<const LayerElement *>(beam->GetListFront(beam));
-        const LayerElement *last = vrv_cast<const LayerElement *>(beam->GetListBack(beam));
+        const LayerElement *first = vrv_cast<const LayerElement *>(beam->GetListFront());
+        const LayerElement *last = vrv_cast<const LayerElement *>(beam->GetListBack());
 
         if (!first || !last) return {};
 
@@ -481,7 +482,7 @@ ListOfConstObjects Layer::GetLayerElementsInTimeSpan(
     Filters filters;
     AttNIntegerComparison matchStaff(ALIGNMENT_REFERENCE, staff);
     filters.Add(&matchStaff);
-    layerElementsInTimeSpan.PushFilters(&filters);
+    layerElementsInTimeSpan.SetFilters(&filters);
 
     measure->m_measureAligner.Process(layerElementsInTimeSpan);
 
diff --git a/src/layerelement.cpp b/src/layerelement.cpp
index 36f9ee24b2d..589bc8e4dd9 100644
--- a/src/layerelement.cpp
+++ b/src/layerelement.cpp
@@ -250,7 +250,7 @@ const Beam *LayerElement::GetAncestorBeam() const
             assert(graceElement);
         }
         // Make sure the object list is set
-        beamParent->GetList(beamParent);
+        beamParent->GetList();
         // If the note is part of the beam parent, this means we have a beam of graced notes
         if (beamParent->GetListIndex(graceElement) > -1) {
             return beamParent;
@@ -995,7 +995,7 @@ int LayerElement::CalcLayerOverlap(const Doc *doc, int direction, int y1, int y2
             const int currentBottom = this->GetDrawingBottom(doc, staff->m_drawingStaffSize);
             if (currentBottom >= elementTop) continue;
             const StemmedDrawingInterface *stemInterface = layerElement->GetStemmedDrawingInterface();
-            if (sameDirElement || (stemInterface && (stemInterface->GetDrawingStemDir() == STEMDIRECTION_up))) {
+            if (stemInterface && (sameDirElement || (stemInterface->GetDrawingStemDir() == STEMDIRECTION_up))) {
                 if (elementBottom - stemInterface->GetDrawingStemLen() < currentBottom) continue;
                 leftMargin = unit + y1 - elementBottom;
                 rightMargin = unit + y2 - elementBottom;
diff --git a/src/ligature.cpp b/src/ligature.cpp
index 87134ce41e3..93145f51846 100644
--- a/src/ligature.cpp
+++ b/src/ligature.cpp
@@ -69,7 +69,7 @@ Note *Ligature::GetFirstNote()
 
 const Note *Ligature::GetFirstNote() const
 {
-    const Note *firstNote = vrv_cast<const Note *>(this->GetListFront(this));
+    const Note *firstNote = vrv_cast<const Note *>(this->GetListFront());
     assert(firstNote);
     return firstNote;
 }
@@ -82,7 +82,7 @@ Note *Ligature::GetLastNote()
 const Note *Ligature::GetLastNote() const
 {
     // The first note is the bottom
-    const Note *lastNote = vrv_cast<const Note *>(this->GetListBack(this));
+    const Note *lastNote = vrv_cast<const Note *>(this->GetListBack());
     assert(lastNote);
     return lastNote;
 }
diff --git a/src/metersiggrp.cpp b/src/metersiggrp.cpp
index 4aa1fd70127..78785634642 100644
--- a/src/metersiggrp.cpp
+++ b/src/metersiggrp.cpp
@@ -69,7 +69,7 @@ void MeterSigGrp::AddAlternatingMeasureToVector(const Measure *measure)
 MeterSig *MeterSigGrp::GetSimplifiedMeterSig() const
 {
     MeterSig *newMeterSig = NULL;
-    const ListOfConstObjects &childList = this->GetList(this);
+    const ListOfConstObjects &childList = this->GetList();
     switch (this->GetFunc()) {
         // For alternating meterSig group alternate between children sequentially
         case meterSigGrpLog_FUNC_alternating: {
diff --git a/src/midifunctor.cpp b/src/midifunctor.cpp
index 7696aa445aa..cdff91503cc 100644
--- a/src/midifunctor.cpp
+++ b/src/midifunctor.cpp
@@ -158,6 +158,12 @@ FunctorCode InitOnsetOffsetFunctor::VisitLayerElement(LayerElement *layerElement
         m_currentScoreTime += incrementScoreTime;
         m_currentRealTimeSeconds += incrementScoreTime * 60.0 / m_currentTempo;
     }
+    else if (layerElement->Is(MENSUR)) {
+        this->m_currentMensur = vrv_cast<Mensur *>(layerElement);
+    }
+    else if (layerElement->Is(METERSIG)) {
+        this->m_currentMeterSig = vrv_cast<MeterSig *>(layerElement);
+    }
 
     return FUNCTOR_CONTINUE;
 }
@@ -386,7 +392,7 @@ FunctorCode GenerateMIDIFunctor::VisitBeatRpt(const BeatRpt *beatRpt)
 FunctorCode GenerateMIDIFunctor::VisitBTrem(const BTrem *bTrem)
 {
     // Do nothing if the tremolo is unmeasured
-    if (bTrem->GetForm() == bTremLog_FORM_unmeas) {
+    if (bTrem->GetForm() == tremForm_FORM_unmeas) {
         return FUNCTOR_CONTINUE;
     }
 
@@ -443,7 +449,7 @@ FunctorCode GenerateMIDIFunctor::VisitChord(const Chord *chord)
     // Handle grace chords
     if (chord->IsGraceNote()) {
         std::set<int> pitches;
-        const ListOfConstObjects &notes = chord->GetList(chord);
+        const ListOfConstObjects &notes = chord->GetList();
         for (const Object *obj : notes) {
             const Note *note = vrv_cast<const Note *>(obj);
             assert(note);
@@ -758,8 +764,8 @@ FunctorCode GenerateMIDIFunctor::VisitScoreDef(const ScoreDef *scoreDef)
     if (scoreDef->HasKeySigInfo()) {
         const KeySig *keySig = vrv_cast<const KeySig *>(scoreDef->GetKeySig());
         if (keySig && keySig->HasSig()) {
-            m_midiFile->addKeySignature(
-                m_midiTrack, currentTick, keySig->GetFifthsInt(), (keySig->GetMode() == MODE_minor));
+            // m_midiFile->addKeySignature(
+            //     m_midiTrack, currentTick, keySig->GetFifthsInt(), (keySig->GetMode() == MODE_minor));
         }
     }
     // set MIDI time signature
@@ -793,8 +799,7 @@ FunctorCode GenerateMIDIFunctor::VisitStaffDef(const StaffDef *staffDef)
 FunctorCode GenerateMIDIFunctor::VisitSyl(const Syl *syl)
 {
     const int startTime = m_totalTime + m_lastNote->GetScoreTimeOnset();
-    const Text *text = vrv_cast<const Text *>(syl->GetChild(0, TEXT));
-    const std::string sylText = UTF32to8(text->GetText());
+    const std::string sylText = UTF32to8(syl->GetText());
 
     m_midiFile->addLyric(m_midiTrack, startTime * m_midiFile->getTPQ(), sylText);
 
@@ -819,7 +824,7 @@ void GenerateMIDIFunctor::DeferMIDINote(const Note *refNote, double shift, bool
     // Recursive call for chords
     const Chord *chord = refNote->IsChordTone();
     if (chord && includeChordSiblings) {
-        const ListOfConstObjects &notes = chord->GetList(chord);
+        const ListOfConstObjects &notes = chord->GetList();
 
         for (const Object *obj : notes) {
             const Note *note = vrv_cast<const Note *>(obj);
diff --git a/src/nc.cpp b/src/nc.cpp
index e187b52cb13..6afdfd1dfc3 100644
--- a/src/nc.cpp
+++ b/src/nc.cpp
@@ -35,6 +35,7 @@ Nc::Nc()
     , PitchInterface()
     , PositionInterface()
     , AttColor()
+    , AttCurvatureDirection()
     , AttIntervalMelodic()
     , AttNcForm()
 
@@ -43,6 +44,7 @@ Nc::Nc()
     this->RegisterInterface(PitchInterface::GetAttClasses(), PitchInterface::IsInterface());
     this->RegisterInterface(PositionInterface::GetAttClasses(), PositionInterface::IsInterface());
     this->RegisterAttClass(ATT_COLOR);
+    this->RegisterAttClass(ATT_CURVATUREDIRECTION);
     this->RegisterAttClass(ATT_INTERVALMELODIC);
     this->RegisterAttClass(ATT_NCFORM);
 
@@ -58,6 +60,7 @@ void Nc::Reset()
     PitchInterface::Reset();
     PositionInterface::Reset();
     this->ResetColor();
+    this->ResetCurvatureDirection();
     this->ResetIntervalMelodic();
     this->ResetNcForm();
 }
diff --git a/src/neume.cpp b/src/neume.cpp
index 1e5cf0d385e..656e1e3fc04 100644
--- a/src/neume.cpp
+++ b/src/neume.cpp
@@ -71,14 +71,30 @@ bool Neume::IsSupportedChild(Object *child)
 
 int Neume::GetPosition(const LayerElement *element) const
 {
-    this->GetList(this);
-    int position = this->GetListIndex(element);
-    return position;
+    this->GetList();
+    return this->GetListIndex(element);
+}
+
+int Neume::GetLigatureCount(int position)
+{
+    int ligCount = 0;
+    this->GetList();
+    for (int pos = 0; pos <= position; pos++) {
+        Object *posObj = this->GetChild(pos);
+        if (posObj != NULL) {
+            Nc *posNc = dynamic_cast<Nc *>(posObj);
+            assert(posNc);
+            if (posNc->GetLigated() == BOOLEAN_true) { // first part of the ligature
+                ligCount += 1;
+            }
+        }
+    }
+    return ligCount;
 }
 
 bool Neume::IsLastInNeume(const LayerElement *element) const
 {
-    const int size = this->GetListSize(this);
+    const int size = this->GetListSize();
     int position = this->GetPosition(element);
 
     // This method should be called only if the note is part of a neume
diff --git a/src/note.cpp b/src/note.cpp
index 5e41b1c5132..ae0175f3ea1 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -549,8 +549,14 @@ char32_t Note::GetNoteheadGlyph(const int duration) const
         // case HEADSHAPE_circle: return SMUFL_E0B3_noteheadCircleX;
         case HEADSHAPE_plus: return SMUFL_E0AF_noteheadPlusBlack;
         case HEADSHAPE_diamond: {
-            if (DUR_4 > duration) return SMUFL_E0D9_noteheadDiamondHalf;
-            return SMUFL_E0DB_noteheadDiamondBlack;
+            if (duration < DUR_4) {
+                return (this->GetHeadFill() == FILL_solid) ? SMUFL_E0DB_noteheadDiamondBlack
+                                                           : SMUFL_E0D9_noteheadDiamondHalf;
+            }
+            else {
+                return (this->GetHeadFill() == FILL_void) ? SMUFL_E0D9_noteheadDiamondHalf
+                                                          : SMUFL_E0DB_noteheadDiamondBlack;
+            }
         }
         // case HEADSHAPE_isotriangle: return SMUFL_E0BC_noteheadTriangleUpHalf;
         // case HEADSHAPE_oval: return SMUFL_noteheadOval;
@@ -579,8 +585,13 @@ char32_t Note::GetNoteheadGlyph(const int duration) const
 
     if (DUR_BR == duration) return SMUFL_E0A1_noteheadDoubleWholeSquare;
     if (DUR_1 == duration) return SMUFL_E0A2_noteheadWhole;
-    if (DUR_2 == duration) return SMUFL_E0A3_noteheadHalf;
-    return SMUFL_E0A4_noteheadBlack;
+    // We support solid on half notes or void on quarter and shorter notes
+    if (DUR_2 == duration) {
+        return (this->GetHeadFill() == FILL_solid) ? SMUFL_E0A4_noteheadBlack : SMUFL_E0A3_noteheadHalf;
+    }
+    else {
+        return (this->GetHeadFill() == FILL_void) ? SMUFL_E0A3_noteheadHalf : SMUFL_E0A4_noteheadBlack;
+    }
 }
 
 bool Note::IsVisible() const
diff --git a/src/object.cpp b/src/object.cpp
index 17b6f97426c..bd6a76b6c67 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -118,7 +118,7 @@ Object::Object(const Object &object) : BoundingBox(object)
     // New id
     this->GenerateID();
     // For now do not copy them
-    // m_unsupported = object.m_unsupported;
+    m_unsupported = object.m_unsupported;
 
     if (!object.CopyChildren()) {
         return;
@@ -164,7 +164,7 @@ Object &Object::operator=(const Object &object)
         // New id
         this->GenerateID();
         // For now do now copy them
-        // m_unsupported = object.m_unsupported;
+        m_unsupported = object.m_unsupported;
         LinkingInterface *link = this->GetLinkingInterface();
         if (link) link->AddBackLink(&object);
 
@@ -590,7 +590,7 @@ Object *Object::FindDescendantByID(const std::string &id, int deepness, bool dir
 const Object *Object::FindDescendantByID(const std::string &id, int deepness, bool direction) const
 {
     FindByIDFunctor findByID(id);
-    findByID.PushDirection(direction);
+    findByID.SetDirection(direction);
     this->Process(findByID, deepness, true);
     return findByID.GetElement();
 }
@@ -614,7 +614,7 @@ Object *Object::FindDescendantByComparison(Comparison *comparison, int deepness,
 const Object *Object::FindDescendantByComparison(Comparison *comparison, int deepness, bool direction) const
 {
     FindByComparisonFunctor findByComparison(comparison);
-    findByComparison.PushDirection(direction);
+    findByComparison.SetDirection(direction);
     this->Process(findByComparison, deepness, true);
     return findByComparison.GetElement();
 }
@@ -628,7 +628,7 @@ Object *Object::FindDescendantExtremeByComparison(Comparison *comparison, int de
 const Object *Object::FindDescendantExtremeByComparison(Comparison *comparison, int deepness, bool direction) const
 {
     FindExtremeByComparisonFunctor findExtremeByComparison(comparison);
-    findExtremeByComparison.PushDirection(direction);
+    findExtremeByComparison.SetDirection(direction);
     this->Process(findExtremeByComparison, deepness, true);
     return findExtremeByComparison.GetElement();
 }
@@ -661,7 +661,7 @@ void Object::FindAllDescendantsByComparison(
     if (clear) objects->clear();
 
     FindAllByComparisonFunctor findAllByComparison(comparison, objects);
-    findAllByComparison.PushDirection(direction);
+    findAllByComparison.SetDirection(direction);
     this->Process(findAllByComparison, deepness, true);
 }
 
@@ -672,7 +672,7 @@ void Object::FindAllDescendantsByComparison(
     if (clear) objects->clear();
 
     FindAllConstByComparisonFunctor findAllConstByComparison(comparison, objects);
-    findAllConstByComparison.PushDirection(direction);
+    findAllConstByComparison.SetDirection(direction);
     this->Process(findAllConstByComparison, deepness, true);
 }
 
@@ -1018,9 +1018,6 @@ void Object::Process(Functor &functor, int deepness, bool skipFirst)
         return;
     }
 
-    // Update the current score stored in the document
-    this->UpdateDocumentScore(functor.GetDirection());
-
     if (!skipFirst) {
         FunctorCode code = this->Accept(functor);
         functor.SetCode(code);
@@ -1075,9 +1072,6 @@ void Object::Process(ConstFunctor &functor, int deepness, bool skipFirst) const
         return;
     }
 
-    // Update the current score stored in the document
-    const_cast<Object *>(this)->UpdateDocumentScore(functor.GetDirection());
-
     if (!skipFirst) {
         FunctorCode code = this->Accept(functor);
         functor.SetCode(code);
@@ -1146,26 +1140,6 @@ FunctorCode Object::AcceptEnd(ConstFunctor &functor) const
     return functor.VisitObjectEnd(this);
 }
 
-void Object::UpdateDocumentScore(bool direction)
-{
-    // When we are starting a new score, we need to update the current score in the document
-    if (direction == FORWARD && this->Is(SCORE)) {
-        Score *score = vrv_cast<Score *>(this);
-        assert(score);
-        score->SetAsCurrent();
-    }
-    // We need to do the same in backward direction through the PageMilestoneEnd::m_start
-    else if (direction == BACKWARD && this->Is(PAGE_MILESTONE_END)) {
-        PageMilestoneEnd *elementEnd = vrv_cast<PageMilestoneEnd *>(this);
-        assert(elementEnd);
-        if (elementEnd->GetStart() && elementEnd->GetStart()->Is(SCORE)) {
-            Score *score = vrv_cast<Score *>(elementEnd->GetStart());
-            assert(score);
-            score->SetAsCurrent();
-        }
-    }
-}
-
 bool Object::SkipChildren(bool visibleOnly) const
 {
     if (visibleOnly) {
@@ -1360,68 +1334,69 @@ ObjectListInterface &ObjectListInterface::operator=(const ObjectListInterface &i
     return *this;
 }
 
-void ObjectListInterface::ResetList(const Object *node) const
+void ObjectListInterface::ResetList() const
 {
     // nothing to do, the list if up to date
-    if (!node->IsModified()) {
+    const Object *owner = this->GetInterfaceOwner();
+    if (!owner->IsModified()) {
         return;
     }
 
-    node->Modify(false);
+    owner->Modify(false);
     m_list.clear();
-    node->FillFlatList(m_list);
+    owner->FillFlatList(m_list);
     this->FilterList(m_list);
 }
 
-const ListOfConstObjects &ObjectListInterface::GetList(const Object *node) const
+const ListOfConstObjects &ObjectListInterface::GetList() const
 {
-    this->ResetList(node);
+    this->ResetList();
     return m_list;
 }
 
-ListOfObjects ObjectListInterface::GetList(const Object *node)
+ListOfObjects ObjectListInterface::GetList()
 {
-    this->ResetList(node);
+    this->ResetList();
     ListOfObjects result;
     std::transform(m_list.begin(), m_list.end(), std::back_inserter(result),
         [](const Object *obj) { return const_cast<Object *>(obj); });
     return result;
 }
 
-bool ObjectListInterface::HasEmptyList(const Object *node) const
+bool ObjectListInterface::HasEmptyList() const
 {
-    this->ResetList(node);
+    this->ResetList();
     return m_list.empty();
 }
 
-int ObjectListInterface::GetListSize(const Object *node) const
+int ObjectListInterface::GetListSize() const
 {
-    this->ResetList(node);
+    this->ResetList();
     return static_cast<int>(m_list.size());
 }
 
-const Object *ObjectListInterface::GetListFront(const Object *node) const
+const Object *ObjectListInterface::GetListFront() const
 {
-    this->ResetList(node);
+    this->ResetList();
     assert(!m_list.empty());
     return m_list.front();
 }
 
-Object *ObjectListInterface::GetListFront(const Object *node)
+Object *ObjectListInterface::GetListFront()
 {
-    return const_cast<Object *>(std::as_const(*this).GetListFront(node));
+    return const_cast<Object *>(std::as_const(*this).GetListFront());
 }
 
-const Object *ObjectListInterface::GetListBack(const Object *node) const
+const Object *ObjectListInterface::GetListBack() const
 {
-    this->ResetList(node);
+    this->ResetList();
     assert(!m_list.empty());
     return m_list.back();
 }
 
-Object *ObjectListInterface::GetListBack(const Object *node)
+Object *ObjectListInterface::GetListBack()
 {
-    return const_cast<Object *>(std::as_const(*this).GetListBack(node));
+    return const_cast<Object *>(std::as_const(*this).GetListBack());
 }
 
 int ObjectListInterface::GetListIndex(const Object *listElement) const
@@ -1511,38 +1486,47 @@ Object *ObjectListInterface::GetListNext(const Object *listElement)
     return const_cast<Object *>(std::as_const(*this).GetListNext(listElement));
 }
 
+const Object *ObjectListInterface::GetInterfaceOwner() const
+{
+    if (!m_owner) {
+        m_owner = dynamic_cast<const Object *>(this);
+        assert(m_owner);
+    }
+    return m_owner;
+}
+
 //----------------------------------------------------------------------------
 // TextListInterface
 //----------------------------------------------------------------------------
 
-std::u32string TextListInterface::GetText(const Object *node) const
+std::u32string TextListInterface::GetText() const
 {
     // alternatively we could cache the concatString in the interface and instantiate it in FilterList
     std::u32string concatText;
-    const ListOfConstObjects &childList = this->GetList(node); // make sure it's initialized
-    for (ListOfConstObjects::const_iterator it = childList.begin(); it != childList.end(); ++it) {
-        if ((*it)->Is(LB)) {
+    const ListOfConstObjects &childList = this->GetList(); // make sure it's initialized
+    for (const Object *child : childList) {
+        if (child->Is(LB)) {
             continue;
         }
-        const Text *text = vrv_cast<const Text *>(*it);
+        const Text *text = vrv_cast<const Text *>(child);
         assert(text);
         concatText += text->GetText();
     }
     return concatText;
 }
 
-void TextListInterface::GetTextLines(const Object *node, std::vector<std::u32string> &lines) const
+void TextListInterface::GetTextLines(std::vector<std::u32string> &lines) const
 {
     // alternatively we could cache the concatString in the interface and instantiate it in FilterList
     std::u32string concatText;
-    const ListOfConstObjects &childList = this->GetList(node); // make sure it's initialized
-    for (ListOfConstObjects::const_iterator it = childList.begin(); it != childList.end(); ++it) {
-        if ((*it)->Is(LB) && !concatText.empty()) {
+    const ListOfConstObjects &childList = this->GetList(); // make sure it's initialized
+    for (const Object *child : childList) {
+        if (child->Is(LB) && !concatText.empty()) {
             lines.push_back(concatText);
             concatText.clear();
             continue;
         }
-        const Text *text = vrv_cast<const Text *>(*it);
+        const Text *text = vrv_cast<const Text *>(child);
         assert(text);
         concatText += text->GetText();
     }
diff --git a/src/options.cpp b/src/options.cpp
index 3ff2b8508df..08aa84dad59 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -1047,14 +1047,6 @@ Options::Options()
     m_landscape.Init(false);
     this->Register(&m_landscape, "landscape", &m_general);
 
-    m_ligatureAsBracket.SetInfo("Ligature as bracket", "Render ligatures as bracket instead of original notation");
-    m_ligatureAsBracket.Init(false);
-    this->Register(&m_ligatureAsBracket, "ligatureAsBracket", &m_general);
-
-    m_mensuralToMeasure.SetInfo("Mensural to measure", "Convert mensural sections to measure-based MEI");
-    m_mensuralToMeasure.Init(false);
-    this->Register(&m_mensuralToMeasure, "mensuralToMeasure", &m_general);
-
     m_minLastJustification.SetInfo("Minimum last-system-justification width",
         "The last system is only justified if the unjustified width is greater than this percent");
     m_minLastJustification.Init(0.8, 0.0, 1.0);
@@ -1380,7 +1372,7 @@ Options::Options()
     this->Register(&m_lyricTopMinMargin, "lyricTopMinMargin", &m_generalLayout);
 
     m_lyricWordSpace.SetInfo("Lyric word space", "The lyric word space length");
-    m_lyricWordSpace.Init(1.20, 0.50, 3.00);
+    m_lyricWordSpace.Init(1.20, 0.00, 10.00);
     this->Register(&m_lyricWordSpace, "lyricWordSpace", &m_generalLayout);
 
     m_lyricVerseCollapse.SetInfo("Lyric verse collapse", "Collapse empty verse lines in lyrics");
@@ -1806,6 +1798,20 @@ Options::Options()
     m_midiTempoAdjustment.Init(1.0, 0.2, 4.0);
     this->Register(&m_midiTempoAdjustment, "midiTempoAdjustment", &m_midi);
 
+    /********* General *********/
+
+    m_mensural.SetLabel("Mensural notation options", "6-mensural");
+    m_mensural.SetCategory(OptionsCategory::Mensural);
+    m_grps.push_back(&m_mensural);
+
+    m_ligatureAsBracket.SetInfo("Ligature as bracket", "Render ligatures as bracket instead of original notation");
+    m_ligatureAsBracket.Init(false);
+    this->Register(&m_ligatureAsBracket, "ligatureAsBracket", &m_mensural);
+
+    m_mensuralToMeasure.SetInfo("Mensural to measure", "Convert mensural sections to measure-based MEI");
+    m_mensuralToMeasure.Init(false);
+    this->Register(&m_mensuralToMeasure, "mensuralToMeasure", &m_mensural);
+
     /********* Deprecated options *********/
 
     /*
diff --git a/src/ornam.cpp b/src/ornam.cpp
index 54e1fe96fc6..89ec0506128 100644
--- a/src/ornam.cpp
+++ b/src/ornam.cpp
@@ -35,15 +35,11 @@ Ornam::Ornam()
     , TextDirInterface()
     , TimePointInterface()
     , AttColor()
-    , AttExtSymAuth()
-    , AttExtSymNames()
     , AttOrnamentAccid()
 {
     this->RegisterInterface(TextDirInterface::GetAttClasses(), TextDirInterface::IsInterface());
     this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
     this->RegisterAttClass(ATT_COLOR);
-    this->RegisterAttClass(ATT_EXTSYMAUTH);
-    this->RegisterAttClass(ATT_EXTSYMNAMES);
     this->RegisterAttClass(ATT_ORNAMENTACCID);
 
     this->Reset();
@@ -57,8 +53,6 @@ void Ornam::Reset()
     TextDirInterface::Reset();
     TimePointInterface::Reset();
     this->ResetColor();
-    this->ResetExtSymAuth();
-    this->ResetExtSymNames();
     this->ResetOrnamentAccid();
 }
 
@@ -76,25 +70,6 @@ bool Ornam::IsSupportedChild(Object *child)
     return true;
 }
 
-char32_t Ornam::GetOrnamGlyph() const
-{
-    const Resources *resources = this->GetDocResources();
-    if (!resources) return 0;
-
-    // If there is glyph.num, prioritize it
-    if (this->HasGlyphNum()) {
-        char32_t code = this->GetGlyphNum();
-        if (NULL != resources->GetGlyph(code)) return code;
-    }
-    // If there is glyph.name (second priority)
-    else if (this->HasGlyphName()) {
-        char32_t code = resources->GetGlyphCode(this->GetGlyphName());
-        if (NULL != resources->GetGlyph(code)) return code;
-    }
-
-    return SMUFL_E567_ornamentTurn;
-}
-
 //----------------------------------------------------------------------------
 // Ornam functor methods
 //----------------------------------------------------------------------------
diff --git a/src/page.cpp b/src/page.cpp
index cc122c44468..5e3bb7ff276 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -378,6 +378,9 @@ void Page::LayOutHorizontally()
     view.SetPage(this->GetIdx(), false);
     view.DrawCurrentPage(&bBoxDC, false);
 
+    // Get the scoreDef at the beginning of the page
+    ScoreDef *scoreDef = m_score->GetScoreDef();
+
     // Adjust the position of outside articulations
     AdjustArticFunctor adjustArtic(doc);
     this->Process(adjustArtic);
@@ -385,16 +388,16 @@ void Page::LayOutHorizontally()
     // Adjust the x position of the LayerElement where multiple layers collide
     // Look at each LayerElement and change the m_xShift if the bounding box is overlapping
     // For the first iteration align elements without taking dots into consideration
-    AdjustLayersFunctor adjustLayers(doc, doc->GetCurrentScoreDef()->GetStaffNs());
+    AdjustLayersFunctor adjustLayers(doc, scoreDef->GetStaffNs());
     this->Process(adjustLayers);
 
     // Adjust dots for the multiple layers. Try to align dots that can be grouped together when layers collide,
     // otherwise keep their relative positioning
-    AdjustDotsFunctor adjustDots(doc, doc->GetCurrentScoreDef()->GetStaffNs());
+    AdjustDotsFunctor adjustDots(doc, scoreDef->GetStaffNs());
     this->Process(adjustDots);
 
     // Adjust layers again, this time including dots positioning
-    AdjustLayersFunctor adjustLayersWithDots(doc, doc->GetCurrentScoreDef()->GetStaffNs());
+    AdjustLayersFunctor adjustLayersWithDots(doc, scoreDef->GetStaffNs());
     adjustLayersWithDots.IgnoreDots(false);
     this->Process(adjustLayersWithDots);
 
@@ -404,7 +407,7 @@ void Page::LayOutHorizontally()
 
     // Adjust the X shift of the Alignment looking at the bounding boxes
     // Look at each LayerElement and change the m_xShift if the bounding box is overlapping
-    AdjustXPosFunctor adjustXPos(doc, doc->GetCurrentScoreDef()->GetStaffNs());
+    AdjustXPosFunctor adjustXPos(doc, scoreDef->GetStaffNs());
     adjustXPos.SetExcluded({ TABDURSYM });
     this->Process(adjustXPos);
 
@@ -416,7 +419,7 @@ void Page::LayOutHorizontally()
 
     // Adjust the X shift of the Alignment looking at the bounding boxes
     // Look at each LayerElement and change the m_xShift if the bounding box is overlapping
-    AdjustGraceXPosFunctor adjustGraceXPos(doc, doc->GetCurrentScoreDef()->GetStaffNs());
+    AdjustGraceXPosFunctor adjustGraceXPos(doc, scoreDef->GetStaffNs());
     this->Process(adjustGraceXPos);
 
     // Adjust the spacing of clef changes since they are skipped in AdjustXPos
@@ -552,8 +555,6 @@ void Page::LayOutVertically()
         this->Process(adjustSlurs);
     }
 
-    doc->SetCurrentScore(this->m_score);
-
     if (this->GetHeader()) {
         this->GetHeader()->AdjustRunningElementYPos();
     }
@@ -757,7 +758,7 @@ void Page::AdjustSylSpacingByVerse(const IntTree &verseTree, Doc *doc)
                 filters = { &matchStaff, &matchLayer, &matchVerse };
 
                 AdjustSylSpacingFunctor adjustSylSpacing(doc);
-                adjustSylSpacing.PushFilters(&filters);
+                adjustSylSpacing.SetFilters(&filters);
                 this->Process(adjustSylSpacing);
             }
         }
diff --git a/src/pitchinterface.cpp b/src/pitchinterface.cpp
index 864e379e837..893e928d57d 100644
--- a/src/pitchinterface.cpp
+++ b/src/pitchinterface.cpp
@@ -27,11 +27,12 @@ namespace vrv {
 // PitchInterface
 //----------------------------------------------------------------------------
 
-PitchInterface::PitchInterface() : Interface(), AttNoteGes(), AttOctave(), AttPitch()
+PitchInterface::PitchInterface() : Interface(), AttNoteGes(), AttOctave(), AttPitch(), AttPitchGes()
 {
     this->RegisterInterfaceAttClass(ATT_NOTEGES);
     this->RegisterInterfaceAttClass(ATT_OCTAVE);
     this->RegisterInterfaceAttClass(ATT_PITCH);
+    this->RegisterInterfaceAttClass(ATT_PITCHGES);
 
     this->Reset();
 }
@@ -43,6 +44,9 @@ void PitchInterface::Reset()
     this->ResetNoteGes();
     this->ResetOctave();
     this->ResetPitch();
+    this->ResetPitchGes();
+
+    m_octDefault = MEI_UNSET_OCT;
 }
 
 bool PitchInterface::HasIdenticalPitchInterface(const PitchInterface *otherPitchInterface) const
@@ -153,13 +157,14 @@ int PitchInterface::CalcLoc(
         if (note->HasLoc()) {
             return note->GetLoc();
         }
-        else if (note->HasPname() && note->HasOct()) {
+        else if (note->HasPname() && (note->HasOct() || note->HasOctDefault())) {
             int offset = layer->GetClefLocOffset(crossStaffElement);
             const Layer *parentLayer = vrv_cast<const Layer *>(layerElement->GetFirstAncestor(LAYER));
             if (parentLayer != layer) {
                 offset = parentLayer->GetCrossStaffClefLocOffset(layerElement, offset);
             }
-            return PitchInterface::CalcLoc(note->GetPname(), note->GetOct(), offset);
+            const data_OCTAVE oct = (note->HasOct()) ? note->GetOct() : note->GetOctDefault();
+            return PitchInterface::CalcLoc(note->GetPname(), oct, offset);
         }
         else {
             return 0;
diff --git a/src/preparedatafunctor.cpp b/src/preparedatafunctor.cpp
index 2be72cd8c40..e33f0daa2fd 100644
--- a/src/preparedatafunctor.cpp
+++ b/src/preparedatafunctor.cpp
@@ -70,7 +70,7 @@ FunctorCode PrepareDataInitializationFunctor::VisitDiv(Div *div)
 
 FunctorCode PrepareDataInitializationFunctor::VisitChord(Chord *chord)
 {
-    if (chord->HasEmptyList(chord)) {
+    if (chord->HasEmptyList()) {
         LogWarning("Chord '%s' has no child note - a default note is added", chord->GetID().c_str());
         Note *rescueNote = new Note();
         chord->AddChild(rescueNote);
@@ -123,13 +123,13 @@ FunctorCode PrepareDataInitializationFunctor::VisitTextLayoutElement(TextLayoutE
     textLayoutElement->ResetCells();
     textLayoutElement->ResetDrawingScaling();
 
-    const ListOfObjects &childList = textLayoutElement->GetList(textLayoutElement);
-    for (ListOfObjects::const_iterator iter = childList.begin(); iter != childList.end(); ++iter) {
+    const ListOfObjects &childList = textLayoutElement->GetList();
+    for (Object *child : childList) {
         int pos = 0;
-        AreaPosInterface *interface = dynamic_cast<AreaPosInterface *>(*iter);
+        AreaPosInterface *interface = dynamic_cast<AreaPosInterface *>(child);
         assert(interface);
         pos = textLayoutElement->GetAlignmentPos(interface->GetHalign(), interface->GetValign());
-        TextElement *text = vrv_cast<TextElement *>(*iter);
+        TextElement *text = vrv_cast<TextElement *>(child);
         assert(text);
         textLayoutElement->AppendTextToCell(pos, text);
     }
@@ -873,6 +873,55 @@ FunctorCode PrepareTimestampsFunctor::VisitMeasureEnd(Measure *measure)
     return FUNCTOR_CONTINUE;
 }
 
+//----------------------------------------------------------------------------
+// PreparePedalsFunctor
+//----------------------------------------------------------------------------
+
+PreparePedalsFunctor::PreparePedalsFunctor(Doc *doc) : DocFunctor(doc) {}
+
+FunctorCode PreparePedalsFunctor::VisitMeasureEnd(Measure *measure)
+{
+    // Match down and up pedal lines
+    using PedalIter = std::list<Pedal *>::iterator;
+    PedalIter iter = m_pedalLines.begin();
+    while (iter != m_pedalLines.end()) {
+        if ((*iter)->GetDir() != pedalLog_DIR_down) {
+            ++iter;
+            continue;
+        }
+        PedalIter up = std::find_if(m_pedalLines.begin(), m_pedalLines.end(), [&iter](Pedal *pedal) {
+            return (((*iter)->GetStaff() == pedal->GetStaff()) && (pedal->GetDir() != pedalLog_DIR_down));
+        });
+        if (up != m_pedalLines.end()) {
+            (*iter)->SetEnd((*up)->GetStart());
+            if ((*up)->GetDir() == pedalLog_DIR_bounce) {
+                (*iter)->EndsWithBounce(true);
+            }
+            m_pedalLines.erase(up);
+            iter = m_pedalLines.erase(iter);
+        }
+        else {
+            ++iter;
+        }
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
+FunctorCode PreparePedalsFunctor::VisitPedal(Pedal *pedal)
+{
+    if (!pedal->HasDir()) return FUNCTOR_CONTINUE;
+
+    System *system = vrv_cast<System *>(pedal->GetFirstAncestor(SYSTEM));
+    assert(system);
+    data_PEDALSTYLE form = pedal->GetPedalForm(m_doc, system);
+    if ((form == PEDALSTYLE_line) || (form == PEDALSTYLE_pedline)) {
+        m_pedalLines.push_back(pedal);
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 //----------------------------------------------------------------------------
 // PreparePointersByLayerFunctor
 //----------------------------------------------------------------------------
@@ -911,6 +960,16 @@ FunctorCode PreparePointersByLayerFunctor::VisitLayerElement(LayerElement *layer
     return FUNCTOR_CONTINUE;
 }
 
+FunctorCode PreparePointersByLayerFunctor::VisitMeasureEnd(Measure *measure)
+{
+    if (m_lastDot) {
+        m_lastDot->m_drawingNextElement = measure->GetRightBarLine();
+        m_lastDot = NULL;
+    }
+
+    return FUNCTOR_CONTINUE;
+}
+
 //----------------------------------------------------------------------------
 // PrepareLyricsFunctor
 //----------------------------------------------------------------------------
@@ -1020,11 +1079,7 @@ FunctorCode PrepareLayerElementPartsFunctor::VisitChord(Chord *chord)
     Flag *currentFlag = NULL;
     if (currentStem) currentFlag = vrv_cast<Flag *>(currentStem->GetFirst(FLAG));
 
-    if (!currentStem) {
-        currentStem = new Stem();
-        currentStem->IsAttribute(true);
-        chord->AddChild(currentStem);
-    }
+    currentStem = this->EnsureStemExists(currentStem, chord);
     currentStem->AttGraced::operator=(*chord);
     currentStem->FillAttributes(*chord);
 
@@ -1033,19 +1088,8 @@ FunctorCode PrepareLayerElementPartsFunctor::VisitChord(Chord *chord)
         currentStem->IsVirtual(true);
     }
 
-    if ((duration > DUR_4) && !chord->IsInBeam() && !chord->GetAncestorFTrem()) {
-        // We should have a stem at this stage
-        assert(currentStem);
-        if (!currentFlag) {
-            currentFlag = new Flag();
-            currentStem->AddChild(currentFlag);
-        }
-    }
-    // This will happen only if the duration has changed (no flag required anymore)
-    else if (currentFlag) {
-        assert(currentStem);
-        if (currentStem->DeleteChild(currentFlag)) currentFlag = NULL;
-    }
+    const bool shouldHaveFlag = ((duration > DUR_4) && !chord->IsInBeam() && !chord->GetAncestorFTrem());
+    currentFlag = this->ProcessFlag(currentFlag, currentStem, shouldHaveFlag);
 
     chord->SetDrawingStem(currentStem);
 
@@ -1053,10 +1097,10 @@ FunctorCode PrepareLayerElementPartsFunctor::VisitChord(Chord *chord)
     if (!chord->HasCluster()) chord->CalculateNoteGroups();
 
     // Also set the drawing stem object (or NULL) to all child notes
-    const ListOfObjects &childList = chord->GetList(chord);
-    for (ListOfObjects::const_iterator it = childList.begin(); it != childList.end(); ++it) {
-        assert((*it)->Is(NOTE));
-        Note *note = vrv_cast<Note *>(*it);
+    const ListOfObjects &childList = chord->GetList();
+    for (Object *child : childList) {
+        assert(child->Is(NOTE));
+        Note *note = vrv_cast<Note *>(child);
         assert(note);
         note->SetDrawingStem(currentStem);
     }
@@ -1065,19 +1109,8 @@ FunctorCode PrepareLayerElementPartsFunctor::VisitChord(Chord *chord)
 
     Dots *currentDots = vrv_cast<Dots *>(chord->FindDescendantByType(DOTS, 1));
 
-    if (chord->GetDots() > 0) {
-        if (!currentDots) {
-            currentDots = new Dots();
-            chord->AddChild(currentDots);
-        }
-        currentDots->AttAugmentDots::operator=(*chord);
-    }
-    // This will happen only if the duration has changed
-    else if (currentDots) {
-        if (chord->DeleteChild(currentDots)) {
-            currentDots = NULL;
-        }
-    }
+    const bool shouldHaveDots = (chord->GetDots() > 0);
+    currentDots = this->ProcessDots(currentDots, chord, shouldHaveDots);
 
     /************ Prepare the drawing cue size ************/
 
@@ -1095,11 +1128,7 @@ FunctorCode PrepareLayerElementPartsFunctor::VisitNote(Note *note)
     if (currentStem) currentFlag = vrv_cast<Flag *>(currentStem->GetFirst(FLAG));
 
     if (!note->IsChordTone() && !note->IsTabGrpNote()) {
-        if (!currentStem) {
-            currentStem = new Stem();
-            currentStem->IsAttribute(true);
-            note->AddChild(currentStem);
-        }
+        currentStem = this->EnsureStemExists(currentStem, note);
         currentStem->AttGraced::operator=(*note);
         currentStem->FillAttributes(*note);
 
@@ -1119,44 +1148,23 @@ FunctorCode PrepareLayerElementPartsFunctor::VisitNote(Note *note)
     // We don't care about flags or dots in mensural notes
     if (note->IsMensuralDur()) return FUNCTOR_CONTINUE;
 
-    if ((note->GetActualDur() > DUR_4) && !note->IsInBeam() && !note->GetAncestorFTrem() && !note->IsChordTone()
-        && !note->IsTabGrpNote()) {
-        // We should have a stem at this stage
-        assert(currentStem);
-        if (!currentFlag) {
-            currentFlag = new Flag();
-            currentStem->AddChild(currentFlag);
-        }
-    }
-    // This will happen only if the duration has changed (no flag required anymore)
-    else if (currentFlag) {
-        assert(currentStem);
-        if (currentStem->DeleteChild(currentFlag)) currentFlag = NULL;
-    }
+    if (currentStem) {
+        const bool shouldHaveFlag = ((note->GetActualDur() > DUR_4) && !note->IsInBeam() && !note->GetAncestorFTrem()
+            && !note->IsChordTone() && !note->IsTabGrpNote());
+        currentFlag = this->ProcessFlag(currentFlag, currentStem, shouldHaveFlag);
 
-    if (!chord) note->SetDrawingStem(currentStem);
+        if (!chord) note->SetDrawingStem(currentStem);
+    }
 
     /************ dots ***********/
 
     Dots *currentDots = vrv_cast<Dots *>(note->FindDescendantByType(DOTS, 1));
 
-    if (note->GetDots() > 0) {
-        if (chord && (chord->GetDots() == note->GetDots())) {
-            LogWarning(
-                "Note '%s' with a @dots attribute with the same value as its chord parent", note->GetID().c_str());
-        }
-        if (!currentDots) {
-            currentDots = new Dots();
-            note->AddChild(currentDots);
-        }
-        currentDots->AttAugmentDots::operator=(*note);
-    }
-    // This will happen only if the duration has changed
-    else if (currentDots) {
-        if (note->DeleteChild(currentDots)) {
-            currentDots = NULL;
-        }
+    const bool shouldHaveDots = (note->GetDots() > 0);
+    if (shouldHaveDots && chord && (chord->GetDots() == note->GetDots())) {
+        LogWarning("Note '%s' with a @dots attribute with the same value as its chord parent", note->GetID().c_str());
     }
+    currentDots = this->ProcessDots(currentDots, note, shouldHaveDots);
 
     /************ Prepare the drawing cue size ************/
 
@@ -1170,19 +1178,8 @@ FunctorCode PrepareLayerElementPartsFunctor::VisitRest(Rest *rest)
 {
     Dots *currentDots = vrv_cast<Dots *>(rest->FindDescendantByType(DOTS, 1));
 
-    if ((rest->GetDur() > DUR_BR) && (rest->GetDots() > 0)) {
-        if (!currentDots) {
-            currentDots = new Dots();
-            rest->AddChild(currentDots);
-        }
-        currentDots->AttAugmentDots::operator=(*rest);
-    }
-    // This will happen only if the duration has changed
-    else if (currentDots) {
-        if (rest->DeleteChild(currentDots)) {
-            currentDots = NULL;
-        }
-    }
+    const bool shouldHaveDots = (rest->GetDur() > DUR_BR) && (rest->GetDots() > 0);
+    currentDots = this->ProcessDots(currentDots, rest, shouldHaveDots);
 
     /************ Prepare the drawing cue size ************/
 
@@ -1198,11 +1195,7 @@ FunctorCode PrepareLayerElementPartsFunctor::VisitTabDurSym(TabDurSym *tabDurSym
     Flag *currentFlag = NULL;
     if (currentStem) currentFlag = vrv_cast<Flag *>(currentStem->GetFirst(FLAG));
 
-    if (!currentStem) {
-        currentStem = new Stem();
-        currentStem->IsAttribute(true);
-        tabDurSym->AddChild(currentStem);
-    }
+    currentStem = this->EnsureStemExists(currentStem, tabDurSym);
     tabDurSym->SetDrawingStem(currentStem);
 
     /************ flags ***********/
@@ -1211,19 +1204,8 @@ FunctorCode PrepareLayerElementPartsFunctor::VisitTabDurSym(TabDurSym *tabDurSym
     assert(tabGrp);
 
     // No flag within beam for durations longer than 8th notes
-    if (!tabDurSym->IsInBeam() && tabGrp->GetActualDur() > DUR_4) {
-        // We must have a stem at this stage
-        assert(currentStem);
-        if (!currentFlag) {
-            currentFlag = new Flag();
-            currentStem->AddChild(currentFlag);
-        }
-    }
-    // This will happen only if the duration has changed (no flag required anymore)
-    else if (currentFlag) {
-        assert(currentStem);
-        if (currentStem->DeleteChild(currentFlag)) currentFlag = NULL;
-    }
+    const bool shouldHaveFlag = (!tabDurSym->IsInBeam() && (tabGrp->GetActualDur() > DUR_4));
+    currentFlag = this->ProcessFlag(currentFlag, currentStem, shouldHaveFlag);
 
     return FUNCTOR_SIBLINGS;
 }
@@ -1291,6 +1273,56 @@ FunctorCode PrepareLayerElementPartsFunctor::VisitTuplet(Tuplet *tuplet)
     return FUNCTOR_CONTINUE;
 }
 
+Stem *PrepareLayerElementPartsFunctor::EnsureStemExists(Stem *stem, Object *parent) const
+{
+    assert(parent);
+
+    if (!stem) {
+        stem = new Stem();
+        stem->IsAttribute(true);
+        parent->AddChild(stem);
+    }
+    return stem;
+}
+
+Dots *PrepareLayerElementPartsFunctor::ProcessDots(Dots *dots, Object *parent, bool shouldExist) const
+{
+    assert(parent);
+    assert(parent->GetDurationInterface());
+
+    if (shouldExist) {
+        if (!dots) {
+            dots = new Dots();
+            parent->AddChild(dots);
+        }
+        dots->AttAugmentDots::operator=(*parent->GetDurationInterface());
+    }
+    else if (dots) {
+        if (parent->DeleteChild(dots)) {
+            dots = NULL;
+        }
+    }
+    return dots;
+}
+
+Flag *PrepareLayerElementPartsFunctor::ProcessFlag(Flag *flag, Object *parent, bool shouldExist) const
+{
+    assert(parent);
+
+    if (shouldExist) {
+        if (!flag) {
+            flag = new Flag();
+            parent->AddChild(flag);
+        }
+    }
+    else if (flag) {
+        if (parent->DeleteChild(flag)) {
+            flag = NULL;
+        }
+    }
+    return flag;
+}
+
 //----------------------------------------------------------------------------
 // PrepareRptFunctor
 //----------------------------------------------------------------------------
@@ -1338,10 +1370,10 @@ FunctorCode PrepareRptFunctor::VisitStaff(Staff *staff)
     }
 
     // This is happening only for the first staff element of the staff @n
-    if (StaffDef *staffDef = m_doc->GetCurrentScoreDef()->GetStaffDef(staff->GetN())) {
+    ScoreDef *scoreDef = m_doc->GetCorrespondingScore(staff)->GetScoreDef();
+    if (StaffDef *staffDef = scoreDef->GetStaffDef(staff->GetN())) {
         const bool hideNumber = (staffDef->GetMultiNumber() == BOOLEAN_false)
-            || ((staffDef->GetMultiNumber() != BOOLEAN_true)
-                && (m_doc->GetCurrentScoreDef()->GetMultiNumber() == BOOLEAN_false));
+            || ((staffDef->GetMultiNumber() != BOOLEAN_true) && (scoreDef->GetMultiNumber() == BOOLEAN_false));
         if (hideNumber) {
             // Set it just in case, but stopping the functor should do it for this staff @n
             m_multiNumber = BOOLEAN_false;
@@ -1503,7 +1535,7 @@ FunctorCode PrepareMilestonesFunctor::VisitSystemMilestone(SystemMilestoneEnd *s
 // PrepareFloatingGrpsFunctor
 //----------------------------------------------------------------------------
 
-PrepareFloatingGrpsFunctor::PrepareFloatingGrpsFunctor(Doc *doc) : DocFunctor(doc)
+PrepareFloatingGrpsFunctor::PrepareFloatingGrpsFunctor()
 {
     m_previousEnding = NULL;
 }
@@ -1655,30 +1687,6 @@ FunctorCode PrepareFloatingGrpsFunctor::VisitMeasureEnd(Measure *measure)
         }
     }
 
-    // Match down and up pedal lines
-    using pedalIter = std::list<Pedal *>::iterator;
-    pedalIter pIter = m_pedalLines.begin();
-    while (pIter != m_pedalLines.end()) {
-        if ((*pIter)->GetDir() != pedalLog_DIR_down) {
-            ++pIter;
-            continue;
-        }
-        pedalIter up = std::find_if(m_pedalLines.begin(), m_pedalLines.end(), [&pIter](Pedal *pedal) {
-            return (((*pIter)->GetStaff() == pedal->GetStaff()) && (pedal->GetDir() != pedalLog_DIR_down));
-        });
-        if (up != m_pedalLines.end()) {
-            (*pIter)->SetEnd((*up)->GetStart());
-            if ((*up)->GetDir() == pedalLog_DIR_bounce) {
-                (*pIter)->EndsWithBounce(true);
-            }
-            m_pedalLines.erase(up);
-            pIter = m_pedalLines.erase(pIter);
-        }
-        else {
-            ++pIter;
-        }
-    }
-
     return FUNCTOR_CONTINUE;
 }
 
@@ -1688,15 +1696,6 @@ FunctorCode PrepareFloatingGrpsFunctor::VisitPedal(Pedal *pedal)
         pedal->SetDrawingGrpId(-pedal->GetVgrp());
     }
 
-    if (!pedal->HasDir()) return FUNCTOR_CONTINUE;
-
-    System *system = vrv_cast<System *>(pedal->GetFirstAncestor(SYSTEM));
-    assert(system);
-    data_PEDALSTYLE form = pedal->GetPedalForm(m_doc, system);
-    if (form == PEDALSTYLE_line || form == PEDALSTYLE_pedline) {
-        m_pedalLines.push_back(pedal);
-    }
-
     return FUNCTOR_CONTINUE;
 }
 
diff --git a/src/pugi/pugixml.cpp b/src/pugi/pugixml.cpp
index 653f125dccf..89123c75d0b 100644
--- a/src/pugi/pugixml.cpp
+++ b/src/pugi/pugixml.cpp
@@ -1,13158 +1,13226 @@
-/**
- * pugixml parser - version 1.13
- * --------------------------------------------------------
- * Copyright (C) 2006-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
- * Report bugs and download new versions at https://pugixml.org/
- *
- * This library is distributed under the MIT License. See notice at the end
- * of this file.
- *
- * This work is based on the pugxml parser, which is:
- * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
- */
-
-#ifndef SOURCE_PUGIXML_CPP
-#define SOURCE_PUGIXML_CPP
-
-#include "pugixml.hpp"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <limits.h>
-
-#ifdef PUGIXML_WCHAR_MODE
-#	include <wchar.h>
-#endif
-
-#ifndef PUGIXML_NO_XPATH
-#	include <math.h>
-#	include <float.h>
-#endif
-
-#ifndef PUGIXML_NO_STL
-#	include <istream>
-#	include <ostream>
-#	include <string>
-#endif
-
-// For placement new
-#include <new>
-
-#ifdef _MSC_VER
-#	pragma warning(push)
-#	pragma warning(disable: 4127) // conditional expression is constant
-#	pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#	pragma warning(disable: 4702) // unreachable code
-#	pragma warning(disable: 4996) // this function or variable may be unsafe
-#endif
-
-#if defined(_MSC_VER) && defined(__c2__)
-#	pragma clang diagnostic push
-#	pragma clang diagnostic ignored "-Wdeprecated" // this function or variable may be unsafe
-#endif
-
-#ifdef __INTEL_COMPILER
-#	pragma warning(disable: 177) // function was declared but never referenced
-#	pragma warning(disable: 279) // controlling expression is constant
-#	pragma warning(disable: 1478 1786) // function was declared "deprecated"
-#	pragma warning(disable: 1684) // conversion from pointer to same-sized integral type
-#endif
-
-#if defined(__BORLANDC__) && defined(PUGIXML_HEADER_ONLY)
-#	pragma warn -8080 // symbol is declared but never used; disabling this inside push/pop bracket does not make the warning go away
-#endif
-
-#ifdef __BORLANDC__
-#	pragma option push
-#	pragma warn -8008 // condition is always false
-#	pragma warn -8066 // unreachable code
-#endif
-
-#ifdef __SNC__
-// Using diag_push/diag_pop does not disable the warnings inside templates due to a compiler bug
-#	pragma diag_suppress=178 // function was declared but never referenced
-#	pragma diag_suppress=237 // controlling expression is constant
-#endif
-
-#ifdef __TI_COMPILER_VERSION__
-#	pragma diag_suppress 179 // function was declared but never referenced
-#endif
-
-// Inlining controls
-#if defined(_MSC_VER) && _MSC_VER >= 1300
-#	define PUGI__NO_INLINE __declspec(noinline)
-#elif defined(__GNUC__)
-#	define PUGI__NO_INLINE __attribute__((noinline))
-#else
-#	define PUGI__NO_INLINE
-#endif
-
-// Branch weight controls
-#if defined(__GNUC__) && !defined(__c2__)
-#	define PUGI__UNLIKELY(cond) __builtin_expect(cond, 0)
-#else
-#	define PUGI__UNLIKELY(cond) (cond)
-#endif
-
-// Simple static assertion
-#define PUGI__STATIC_ASSERT(cond) { static const char condition_failed[(cond) ? 1 : -1] = {0}; (void)condition_failed[0]; }
-
-// Digital Mars C++ bug workaround for passing char loaded from memory via stack
-#ifdef __DMC__
-#	define PUGI__DMC_VOLATILE volatile
-#else
-#	define PUGI__DMC_VOLATILE
-#endif
-
-// Integer sanitizer workaround; we only apply this for clang since gcc8 has no_sanitize but not unsigned-integer-overflow and produces "attribute directive ignored" warnings
-#if defined(__clang__) && defined(__has_attribute)
-#	if __has_attribute(no_sanitize)
-#		define PUGI__UNSIGNED_OVERFLOW __attribute__((no_sanitize("unsigned-integer-overflow")))
-#	else
-#		define PUGI__UNSIGNED_OVERFLOW
-#	endif
-#else
-#	define PUGI__UNSIGNED_OVERFLOW
-#endif
-
-// Borland C++ bug workaround for not defining ::memcpy depending on header include order (can't always use std::memcpy because some compilers don't have it at all)
-#if defined(__BORLANDC__) && !defined(__MEM_H_USING_LIST)
-using std::memcpy;
-using std::memmove;
-using std::memset;
-#endif
-
-// Some MinGW/GCC versions have headers that erroneously omit LLONG_MIN/LLONG_MAX/ULLONG_MAX definitions from limits.h in some configurations
-#if defined(PUGIXML_HAS_LONG_LONG) && defined(__GNUC__) && !defined(LLONG_MAX) && !defined(LLONG_MIN) && !defined(ULLONG_MAX)
-#	define LLONG_MIN (-LLONG_MAX - 1LL)
-#	define LLONG_MAX __LONG_LONG_MAX__
-#	define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
-#endif
-
-// In some environments MSVC is a compiler but the CRT lacks certain MSVC-specific features
-#if defined(_MSC_VER) && !defined(__S3E__) && !defined(_WIN32_WCE)
-#	define PUGI__MSVC_CRT_VERSION _MSC_VER
-#elif defined(_WIN32_WCE)
-#	define PUGI__MSVC_CRT_VERSION 1310 // MSVC7.1
-#endif
-
-// Not all platforms have snprintf; we define a wrapper that uses snprintf if possible. This only works with buffers with a known size.
-#if __cplusplus >= 201103
-#	define PUGI__SNPRINTF(buf, ...) snprintf(buf, sizeof(buf), __VA_ARGS__)
-#elif defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400
-#	define PUGI__SNPRINTF(buf, ...) _snprintf_s(buf, _countof(buf), _TRUNCATE, __VA_ARGS__)
-#else
-#	define PUGI__SNPRINTF sprintf
-#endif
-
-// We put implementation details into an anonymous namespace in source mode, but have to keep it in non-anonymous namespace in header-only mode to prevent binary bloat.
-#ifdef PUGIXML_HEADER_ONLY
-#	define PUGI__NS_BEGIN namespace pugi { namespace impl {
-#	define PUGI__NS_END } }
-#	define PUGI__FN inline
-#	define PUGI__FN_NO_INLINE inline
-#else
-#	if defined(_MSC_VER) && _MSC_VER < 1300 // MSVC6 seems to have an amusing bug with anonymous namespaces inside namespaces
-#		define PUGI__NS_BEGIN namespace pugi { namespace impl {
-#		define PUGI__NS_END } }
-#	else
-#		define PUGI__NS_BEGIN namespace pugi { namespace impl { namespace {
-#		define PUGI__NS_END } } }
-#	endif
-#	define PUGI__FN
-#	define PUGI__FN_NO_INLINE PUGI__NO_INLINE
-#endif
-
-// uintptr_t
-#if (defined(_MSC_VER) && _MSC_VER < 1600) || (defined(__BORLANDC__) && __BORLANDC__ < 0x561)
-namespace pugi
-{
-#	ifndef _UINTPTR_T_DEFINED
-	typedef size_t uintptr_t;
-#	endif
-
-	typedef unsigned __int8 uint8_t;
-	typedef unsigned __int16 uint16_t;
-	typedef unsigned __int32 uint32_t;
-}
-#else
-#	include <stdint.h>
-#endif
-
-// Memory allocation
-PUGI__NS_BEGIN
-	PUGI__FN void* default_allocate(size_t size)
-	{
-		return malloc(size);
-	}
-
-	PUGI__FN void default_deallocate(void* ptr)
-	{
-		free(ptr);
-	}
-
-	template <typename T>
-	struct xml_memory_management_function_storage
-	{
-		static allocation_function allocate;
-		static deallocation_function deallocate;
-	};
-
-	// Global allocation functions are stored in class statics so that in header mode linker deduplicates them
-	// Without a template<> we'll get multiple definitions of the same static
-	template <typename T> allocation_function xml_memory_management_function_storage<T>::allocate = default_allocate;
-	template <typename T> deallocation_function xml_memory_management_function_storage<T>::deallocate = default_deallocate;
-
-	typedef xml_memory_management_function_storage<int> xml_memory;
-PUGI__NS_END
-
-// String utilities
-PUGI__NS_BEGIN
-	// Get string length
-	PUGI__FN size_t strlength(const char_t* s)
-	{
-		assert(s);
-
-	#ifdef PUGIXML_WCHAR_MODE
-		return wcslen(s);
-	#else
-		return strlen(s);
-	#endif
-	}
-
-	// Compare two strings
-	PUGI__FN bool strequal(const char_t* src, const char_t* dst)
-	{
-		assert(src && dst);
-
-	#ifdef PUGIXML_WCHAR_MODE
-		return wcscmp(src, dst) == 0;
-	#else
-		return strcmp(src, dst) == 0;
-	#endif
-	}
-
-	// Compare lhs with [rhs_begin, rhs_end)
-	PUGI__FN bool strequalrange(const char_t* lhs, const char_t* rhs, size_t count)
-	{
-		for (size_t i = 0; i < count; ++i)
-			if (lhs[i] != rhs[i])
-				return false;
-
-		return lhs[count] == 0;
-	}
-
-	// Get length of wide string, even if CRT lacks wide character support
-	PUGI__FN size_t strlength_wide(const wchar_t* s)
-	{
-		assert(s);
-
-	#ifdef PUGIXML_WCHAR_MODE
-		return wcslen(s);
-	#else
-		const wchar_t* end = s;
-		while (*end) end++;
-		return static_cast<size_t>(end - s);
-	#endif
-	}
-PUGI__NS_END
-
-// auto_ptr-like object for exception recovery
-PUGI__NS_BEGIN
-	template <typename T> struct auto_deleter
-	{
-		typedef void (*D)(T*);
-
-		T* data;
-		D deleter;
-
-		auto_deleter(T* data_, D deleter_): data(data_), deleter(deleter_)
-		{
-		}
-
-		~auto_deleter()
-		{
-			if (data) deleter(data);
-		}
-
-		T* release()
-		{
-			T* result = data;
-			data = 0;
-			return result;
-		}
-	};
-PUGI__NS_END
-
-#ifdef PUGIXML_COMPACT
-PUGI__NS_BEGIN
-	class compact_hash_table
-	{
-	public:
-		compact_hash_table(): _items(0), _capacity(0), _count(0)
-		{
-		}
-
-		void clear()
-		{
-			if (_items)
-			{
-				xml_memory::deallocate(_items);
-				_items = 0;
-				_capacity = 0;
-				_count = 0;
-			}
-		}
-
-		void* find(const void* key)
-		{
-			if (_capacity == 0) return 0;
-
-			item_t* item = get_item(key);
-			assert(item);
-			assert(item->key == key || (item->key == 0 && item->value == 0));
-
-			return item->value;
-		}
-
-		void insert(const void* key, void* value)
-		{
-			assert(_capacity != 0 && _count < _capacity - _capacity / 4);
-
-			item_t* item = get_item(key);
-			assert(item);
-
-			if (item->key == 0)
-			{
-				_count++;
-				item->key = key;
-			}
-
-			item->value = value;
-		}
-
-		bool reserve(size_t extra = 16)
-		{
-			if (_count + extra >= _capacity - _capacity / 4)
-				return rehash(_count + extra);
-
-			return true;
-		}
-
-	private:
-		struct item_t
-		{
-			const void* key;
-			void* value;
-		};
-
-		item_t* _items;
-		size_t _capacity;
-
-		size_t _count;
-
-		bool rehash(size_t count);
-
-		item_t* get_item(const void* key)
-		{
-			assert(key);
-			assert(_capacity > 0);
-
-			size_t hashmod = _capacity - 1;
-			size_t bucket = hash(key) & hashmod;
-
-			for (size_t probe = 0; probe <= hashmod; ++probe)
-			{
-				item_t& probe_item = _items[bucket];
-
-				if (probe_item.key == key || probe_item.key == 0)
-					return &probe_item;
-
-				// hash collision, quadratic probing
-				bucket = (bucket + probe + 1) & hashmod;
-			}
-
-			assert(false && "Hash table is full"); // unreachable
-			return 0;
-		}
-
-		static PUGI__UNSIGNED_OVERFLOW unsigned int hash(const void* key)
-		{
-			unsigned int h = static_cast<unsigned int>(reinterpret_cast<uintptr_t>(key) & 0xffffffff);
-
-			// MurmurHash3 32-bit finalizer
-			h ^= h >> 16;
-			h *= 0x85ebca6bu;
-			h ^= h >> 13;
-			h *= 0xc2b2ae35u;
-			h ^= h >> 16;
-
-			return h;
-		}
-	};
-
-	PUGI__FN_NO_INLINE bool compact_hash_table::rehash(size_t count)
-	{
-		size_t capacity = 32;
-		while (count >= capacity - capacity / 4)
-			capacity *= 2;
-
-		compact_hash_table rt;
-		rt._capacity = capacity;
-		rt._items = static_cast<item_t*>(xml_memory::allocate(sizeof(item_t) * capacity));
-
-		if (!rt._items)
-			return false;
-
-		memset(rt._items, 0, sizeof(item_t) * capacity);
-
-		for (size_t i = 0; i < _capacity; ++i)
-			if (_items[i].key)
-				rt.insert(_items[i].key, _items[i].value);
-
-		if (_items)
-			xml_memory::deallocate(_items);
-
-		_capacity = capacity;
-		_items = rt._items;
-
-		assert(_count == rt._count);
-
-		return true;
-	}
-
-PUGI__NS_END
-#endif
-
-PUGI__NS_BEGIN
-#ifdef PUGIXML_COMPACT
-	static const uintptr_t xml_memory_block_alignment = 4;
-#else
-	static const uintptr_t xml_memory_block_alignment = sizeof(void*);
-#endif
-
-	// extra metadata bits
-	static const uintptr_t xml_memory_page_contents_shared_mask = 64;
-	static const uintptr_t xml_memory_page_name_allocated_mask = 32;
-	static const uintptr_t xml_memory_page_value_allocated_mask = 16;
-	static const uintptr_t xml_memory_page_type_mask = 15;
-
-	// combined masks for string uniqueness
-	static const uintptr_t xml_memory_page_name_allocated_or_shared_mask = xml_memory_page_name_allocated_mask | xml_memory_page_contents_shared_mask;
-	static const uintptr_t xml_memory_page_value_allocated_or_shared_mask = xml_memory_page_value_allocated_mask | xml_memory_page_contents_shared_mask;
-
-#ifdef PUGIXML_COMPACT
-	#define PUGI__GETHEADER_IMPL(object, page, flags) // unused
-	#define PUGI__GETPAGE_IMPL(header) (header).get_page()
-#else
-	#define PUGI__GETHEADER_IMPL(object, page, flags) (((reinterpret_cast<char*>(object) - reinterpret_cast<char*>(page)) << 8) | (flags))
-	// this macro casts pointers through void* to avoid 'cast increases required alignment of target type' warnings
-	#define PUGI__GETPAGE_IMPL(header) static_cast<impl::xml_memory_page*>(const_cast<void*>(static_cast<const void*>(reinterpret_cast<const char*>(&header) - (header >> 8))))
-#endif
-
-	#define PUGI__GETPAGE(n) PUGI__GETPAGE_IMPL((n)->header)
-	#define PUGI__NODETYPE(n) static_cast<xml_node_type>((n)->header & impl::xml_memory_page_type_mask)
-
-	struct xml_allocator;
-
-	struct xml_memory_page
-	{
-		static xml_memory_page* construct(void* memory)
-		{
-			xml_memory_page* result = static_cast<xml_memory_page*>(memory);
-
-			result->allocator = 0;
-			result->prev = 0;
-			result->next = 0;
-			result->busy_size = 0;
-			result->freed_size = 0;
-
-		#ifdef PUGIXML_COMPACT
-			result->compact_string_base = 0;
-			result->compact_shared_parent = 0;
-			result->compact_page_marker = 0;
-		#endif
-
-			return result;
-		}
-
-		xml_allocator* allocator;
-
-		xml_memory_page* prev;
-		xml_memory_page* next;
-
-		size_t busy_size;
-		size_t freed_size;
-
-	#ifdef PUGIXML_COMPACT
-		char_t* compact_string_base;
-		void* compact_shared_parent;
-		uint32_t* compact_page_marker;
-	#endif
-	};
-
-	static const size_t xml_memory_page_size =
-	#ifdef PUGIXML_MEMORY_PAGE_SIZE
-		(PUGIXML_MEMORY_PAGE_SIZE)
-	#else
-		32768
-	#endif
-		- sizeof(xml_memory_page);
-
-	struct xml_memory_string_header
-	{
-		uint16_t page_offset; // offset from page->data
-		uint16_t full_size; // 0 if string occupies whole page
-	};
-
-	struct xml_allocator
-	{
-		xml_allocator(xml_memory_page* root): _root(root), _busy_size(root->busy_size)
-		{
-		#ifdef PUGIXML_COMPACT
-			_hash = 0;
-		#endif
-		}
-
-		xml_memory_page* allocate_page(size_t data_size)
-		{
-			size_t size = sizeof(xml_memory_page) + data_size;
-
-			// allocate block with some alignment, leaving memory for worst-case padding
-			void* memory = xml_memory::allocate(size);
-			if (!memory) return 0;
-
-			// prepare page structure
-			xml_memory_page* page = xml_memory_page::construct(memory);
-			assert(page);
-
-			assert(this == _root->allocator);
-			page->allocator = this;
-
-			return page;
-		}
-
-		static void deallocate_page(xml_memory_page* page)
-		{
-			xml_memory::deallocate(page);
-		}
-
-		void* allocate_memory_oob(size_t size, xml_memory_page*& out_page);
-
-		void* allocate_memory(size_t size, xml_memory_page*& out_page)
-		{
-			if (PUGI__UNLIKELY(_busy_size + size > xml_memory_page_size))
-				return allocate_memory_oob(size, out_page);
-
-			void* buf = reinterpret_cast<char*>(_root) + sizeof(xml_memory_page) + _busy_size;
-
-			_busy_size += size;
-
-			out_page = _root;
-
-			return buf;
-		}
-
-	#ifdef PUGIXML_COMPACT
-		void* allocate_object(size_t size, xml_memory_page*& out_page)
-		{
-			void* result = allocate_memory(size + sizeof(uint32_t), out_page);
-			if (!result) return 0;
-
-			// adjust for marker
-			ptrdiff_t offset = static_cast<char*>(result) - reinterpret_cast<char*>(out_page->compact_page_marker);
-
-			if (PUGI__UNLIKELY(static_cast<uintptr_t>(offset) >= 256 * xml_memory_block_alignment))
-			{
-				// insert new marker
-				uint32_t* marker = static_cast<uint32_t*>(result);
-
-				*marker = static_cast<uint32_t>(reinterpret_cast<char*>(marker) - reinterpret_cast<char*>(out_page));
-				out_page->compact_page_marker = marker;
-
-				// since we don't reuse the page space until we reallocate it, we can just pretend that we freed the marker block
-				// this will make sure deallocate_memory correctly tracks the size
-				out_page->freed_size += sizeof(uint32_t);
-
-				return marker + 1;
-			}
-			else
-			{
-				// roll back uint32_t part
-				_busy_size -= sizeof(uint32_t);
-
-				return result;
-			}
-		}
-	#else
-		void* allocate_object(size_t size, xml_memory_page*& out_page)
-		{
-			return allocate_memory(size, out_page);
-		}
-	#endif
-
-		void deallocate_memory(void* ptr, size_t size, xml_memory_page* page)
-		{
-			if (page == _root) page->busy_size = _busy_size;
-
-			assert(ptr >= reinterpret_cast<char*>(page) + sizeof(xml_memory_page) && ptr < reinterpret_cast<char*>(page) + sizeof(xml_memory_page) + page->busy_size);
-			(void)!ptr;
-
-			page->freed_size += size;
-			assert(page->freed_size <= page->busy_size);
-
-			if (page->freed_size == page->busy_size)
-			{
-				if (page->next == 0)
-				{
-					assert(_root == page);
-
-					// top page freed, just reset sizes
-					page->busy_size = 0;
-					page->freed_size = 0;
-
-				#ifdef PUGIXML_COMPACT
-					// reset compact state to maximize efficiency
-					page->compact_string_base = 0;
-					page->compact_shared_parent = 0;
-					page->compact_page_marker = 0;
-				#endif
-
-					_busy_size = 0;
-				}
-				else
-				{
-					assert(_root != page);
-					assert(page->prev);
-
-					// remove from the list
-					page->prev->next = page->next;
-					page->next->prev = page->prev;
-
-					// deallocate
-					deallocate_page(page);
-				}
-			}
-		}
-
-		char_t* allocate_string(size_t length)
-		{
-			static const size_t max_encoded_offset = (1 << 16) * xml_memory_block_alignment;
-
-			PUGI__STATIC_ASSERT(xml_memory_page_size <= max_encoded_offset);
-
-			// allocate memory for string and header block
-			size_t size = sizeof(xml_memory_string_header) + length * sizeof(char_t);
-
-			// round size up to block alignment boundary
-			size_t full_size = (size + (xml_memory_block_alignment - 1)) & ~(xml_memory_block_alignment - 1);
-
-			xml_memory_page* page;
-			xml_memory_string_header* header = static_cast<xml_memory_string_header*>(allocate_memory(full_size, page));
-
-			if (!header) return 0;
-
-			// setup header
-			ptrdiff_t page_offset = reinterpret_cast<char*>(header) - reinterpret_cast<char*>(page) - sizeof(xml_memory_page);
-
-			assert(page_offset % xml_memory_block_alignment == 0);
-			assert(page_offset >= 0 && static_cast<size_t>(page_offset) < max_encoded_offset);
-			header->page_offset = static_cast<uint16_t>(static_cast<size_t>(page_offset) / xml_memory_block_alignment);
-
-			// full_size == 0 for large strings that occupy the whole page
-			assert(full_size % xml_memory_block_alignment == 0);
-			assert(full_size < max_encoded_offset || (page->busy_size == full_size && page_offset == 0));
-			header->full_size = static_cast<uint16_t>(full_size < max_encoded_offset ? full_size / xml_memory_block_alignment : 0);
-
-			// round-trip through void* to avoid 'cast increases required alignment of target type' warning
-			// header is guaranteed a pointer-sized alignment, which should be enough for char_t
-			return static_cast<char_t*>(static_cast<void*>(header + 1));
-		}
-
-		void deallocate_string(char_t* string)
-		{
-			// this function casts pointers through void* to avoid 'cast increases required alignment of target type' warnings
-			// we're guaranteed the proper (pointer-sized) alignment on the input string if it was allocated via allocate_string
-
-			// get header
-			xml_memory_string_header* header = static_cast<xml_memory_string_header*>(static_cast<void*>(string)) - 1;
-			assert(header);
-
-			// deallocate
-			size_t page_offset = sizeof(xml_memory_page) + header->page_offset * xml_memory_block_alignment;
-			xml_memory_page* page = reinterpret_cast<xml_memory_page*>(static_cast<void*>(reinterpret_cast<char*>(header) - page_offset));
-
-			// if full_size == 0 then this string occupies the whole page
-			size_t full_size = header->full_size == 0 ? page->busy_size : header->full_size * xml_memory_block_alignment;
-
-			deallocate_memory(header, full_size, page);
-		}
-
-		bool reserve()
-		{
-		#ifdef PUGIXML_COMPACT
-			return _hash->reserve();
-		#else
-			return true;
-		#endif
-		}
-
-		xml_memory_page* _root;
-		size_t _busy_size;
-
-	#ifdef PUGIXML_COMPACT
-		compact_hash_table* _hash;
-	#endif
-	};
-
-	PUGI__FN_NO_INLINE void* xml_allocator::allocate_memory_oob(size_t size, xml_memory_page*& out_page)
-	{
-		const size_t large_allocation_threshold = xml_memory_page_size / 4;
-
-		xml_memory_page* page = allocate_page(size <= large_allocation_threshold ? xml_memory_page_size : size);
-		out_page = page;
-
-		if (!page) return 0;
-
-		if (size <= large_allocation_threshold)
-		{
-			_root->busy_size = _busy_size;
-
-			// insert page at the end of linked list
-			page->prev = _root;
-			_root->next = page;
-			_root = page;
-
-			_busy_size = size;
-		}
-		else
-		{
-			// insert page before the end of linked list, so that it is deleted as soon as possible
-			// the last page is not deleted even if it's empty (see deallocate_memory)
-			assert(_root->prev);
-
-			page->prev = _root->prev;
-			page->next = _root;
-
-			_root->prev->next = page;
-			_root->prev = page;
-
-			page->busy_size = size;
-		}
-
-		return reinterpret_cast<char*>(page) + sizeof(xml_memory_page);
-	}
-PUGI__NS_END
-
-#ifdef PUGIXML_COMPACT
-PUGI__NS_BEGIN
-	static const uintptr_t compact_alignment_log2 = 2;
-	static const uintptr_t compact_alignment = 1 << compact_alignment_log2;
-
-	class compact_header
-	{
-	public:
-		compact_header(xml_memory_page* page, unsigned int flags)
-		{
-			PUGI__STATIC_ASSERT(xml_memory_block_alignment == compact_alignment);
-
-			ptrdiff_t offset = (reinterpret_cast<char*>(this) - reinterpret_cast<char*>(page->compact_page_marker));
-			assert(offset % compact_alignment == 0 && static_cast<uintptr_t>(offset) < 256 * compact_alignment);
-
-			_page = static_cast<unsigned char>(offset >> compact_alignment_log2);
-			_flags = static_cast<unsigned char>(flags);
-		}
-
-		void operator&=(uintptr_t mod)
-		{
-			_flags &= static_cast<unsigned char>(mod);
-		}
-
-		void operator|=(uintptr_t mod)
-		{
-			_flags |= static_cast<unsigned char>(mod);
-		}
-
-		uintptr_t operator&(uintptr_t mod) const
-		{
-			return _flags & mod;
-		}
-
-		xml_memory_page* get_page() const
-		{
-			// round-trip through void* to silence 'cast increases required alignment of target type' warnings
-			const char* page_marker = reinterpret_cast<const char*>(this) - (_page << compact_alignment_log2);
-			const char* page = page_marker - *reinterpret_cast<const uint32_t*>(static_cast<const void*>(page_marker));
-
-			return const_cast<xml_memory_page*>(reinterpret_cast<const xml_memory_page*>(static_cast<const void*>(page)));
-		}
-
-	private:
-		unsigned char _page;
-		unsigned char _flags;
-	};
-
-	PUGI__FN xml_memory_page* compact_get_page(const void* object, int header_offset)
-	{
-		const compact_header* header = reinterpret_cast<const compact_header*>(static_cast<const char*>(object) - header_offset);
-
-		return header->get_page();
-	}
-
-	template <int header_offset, typename T> PUGI__FN_NO_INLINE T* compact_get_value(const void* object)
-	{
-		return static_cast<T*>(compact_get_page(object, header_offset)->allocator->_hash->find(object));
-	}
-
-	template <int header_offset, typename T> PUGI__FN_NO_INLINE void compact_set_value(const void* object, T* value)
-	{
-		compact_get_page(object, header_offset)->allocator->_hash->insert(object, value);
-	}
-
-	template <typename T, int header_offset, int start = -126> class compact_pointer
-	{
-	public:
-		compact_pointer(): _data(0)
-		{
-		}
-
-		void operator=(const compact_pointer& rhs)
-		{
-			*this = rhs + 0;
-		}
-
-		void operator=(T* value)
-		{
-			if (value)
-			{
-				// value is guaranteed to be compact-aligned; 'this' is not
-				// our decoding is based on 'this' aligned to compact alignment downwards (see operator T*)
-				// so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to
-				// compensate for arithmetic shift rounding for negative values
-				ptrdiff_t diff = reinterpret_cast<char*>(value) - reinterpret_cast<char*>(this);
-				ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) - start;
-
-				if (static_cast<uintptr_t>(offset) <= 253)
-					_data = static_cast<unsigned char>(offset + 1);
-				else
-				{
-					compact_set_value<header_offset>(this, value);
-
-					_data = 255;
-				}
-			}
-			else
-				_data = 0;
-		}
-
-		operator T*() const
-		{
-			if (_data)
-			{
-				if (_data < 255)
-				{
-					uintptr_t base = reinterpret_cast<uintptr_t>(this) & ~(compact_alignment - 1);
-
-					return reinterpret_cast<T*>(base + (_data - 1 + start) * compact_alignment);
-				}
-				else
-					return compact_get_value<header_offset, T>(this);
-			}
-			else
-				return 0;
-		}
-
-		T* operator->() const
-		{
-			return *this;
-		}
-
-	private:
-		unsigned char _data;
-	};
-
-	template <typename T, int header_offset> class compact_pointer_parent
-	{
-	public:
-		compact_pointer_parent(): _data(0)
-		{
-		}
-
-		void operator=(const compact_pointer_parent& rhs)
-		{
-			*this = rhs + 0;
-		}
-
-		void operator=(T* value)
-		{
-			if (value)
-			{
-				// value is guaranteed to be compact-aligned; 'this' is not
-				// our decoding is based on 'this' aligned to compact alignment downwards (see operator T*)
-				// so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to
-				// compensate for arithmetic shift behavior for negative values
-				ptrdiff_t diff = reinterpret_cast<char*>(value) - reinterpret_cast<char*>(this);
-				ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) + 65533;
-
-				if (static_cast<uintptr_t>(offset) <= 65533)
-				{
-					_data = static_cast<unsigned short>(offset + 1);
-				}
-				else
-				{
-					xml_memory_page* page = compact_get_page(this, header_offset);
-
-					if (PUGI__UNLIKELY(page->compact_shared_parent == 0))
-						page->compact_shared_parent = value;
-
-					if (page->compact_shared_parent == value)
-					{
-						_data = 65534;
-					}
-					else
-					{
-						compact_set_value<header_offset>(this, value);
-
-						_data = 65535;
-					}
-				}
-			}
-			else
-			{
-				_data = 0;
-			}
-		}
-
-		operator T*() const
-		{
-			if (_data)
-			{
-				if (_data < 65534)
-				{
-					uintptr_t base = reinterpret_cast<uintptr_t>(this) & ~(compact_alignment - 1);
-
-					return reinterpret_cast<T*>(base + (_data - 1 - 65533) * compact_alignment);
-				}
-				else if (_data == 65534)
-					return static_cast<T*>(compact_get_page(this, header_offset)->compact_shared_parent);
-				else
-					return compact_get_value<header_offset, T>(this);
-			}
-			else
-				return 0;
-		}
-
-		T* operator->() const
-		{
-			return *this;
-		}
-
-	private:
-		uint16_t _data;
-	};
-
-	template <int header_offset, int base_offset> class compact_string
-	{
-	public:
-		compact_string(): _data(0)
-		{
-		}
-
-		void operator=(const compact_string& rhs)
-		{
-			*this = rhs + 0;
-		}
-
-		void operator=(char_t* value)
-		{
-			if (value)
-			{
-				xml_memory_page* page = compact_get_page(this, header_offset);
-
-				if (PUGI__UNLIKELY(page->compact_string_base == 0))
-					page->compact_string_base = value;
-
-				ptrdiff_t offset = value - page->compact_string_base;
-
-				if (static_cast<uintptr_t>(offset) < (65535 << 7))
-				{
-					// round-trip through void* to silence 'cast increases required alignment of target type' warnings
-					uint16_t* base = reinterpret_cast<uint16_t*>(static_cast<void*>(reinterpret_cast<char*>(this) - base_offset));
-
-					if (*base == 0)
-					{
-						*base = static_cast<uint16_t>((offset >> 7) + 1);
-						_data = static_cast<unsigned char>((offset & 127) + 1);
-					}
-					else
-					{
-						ptrdiff_t remainder = offset - ((*base - 1) << 7);
-
-						if (static_cast<uintptr_t>(remainder) <= 253)
-						{
-							_data = static_cast<unsigned char>(remainder + 1);
-						}
-						else
-						{
-							compact_set_value<header_offset>(this, value);
-
-							_data = 255;
-						}
-					}
-				}
-				else
-				{
-					compact_set_value<header_offset>(this, value);
-
-					_data = 255;
-				}
-			}
-			else
-			{
-				_data = 0;
-			}
-		}
-
-		operator char_t*() const
-		{
-			if (_data)
-			{
-				if (_data < 255)
-				{
-					xml_memory_page* page = compact_get_page(this, header_offset);
-
-					// round-trip through void* to silence 'cast increases required alignment of target type' warnings
-					const uint16_t* base = reinterpret_cast<const uint16_t*>(static_cast<const void*>(reinterpret_cast<const char*>(this) - base_offset));
-					assert(*base);
-
-					ptrdiff_t offset = ((*base - 1) << 7) + (_data - 1);
-
-					return page->compact_string_base + offset;
-				}
-				else
-				{
-					return compact_get_value<header_offset, char_t>(this);
-				}
-			}
-			else
-				return 0;
-		}
-
-	private:
-		unsigned char _data;
-	};
-PUGI__NS_END
-#endif
-
-#ifdef PUGIXML_COMPACT
-namespace pugi
-{
-	struct xml_attribute_struct
-	{
-		xml_attribute_struct(impl::xml_memory_page* page): header(page, 0), namevalue_base(0)
-		{
-			PUGI__STATIC_ASSERT(sizeof(xml_attribute_struct) == 8);
-		}
-
-		impl::compact_header header;
-
-		uint16_t namevalue_base;
-
-		impl::compact_string<4, 2> name;
-		impl::compact_string<5, 3> value;
-
-		impl::compact_pointer<xml_attribute_struct, 6> prev_attribute_c;
-		impl::compact_pointer<xml_attribute_struct, 7, 0> next_attribute;
-	};
-
-	struct xml_node_struct
-	{
-		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): header(page, type), namevalue_base(0)
-		{
-			PUGI__STATIC_ASSERT(sizeof(xml_node_struct) == 12);
-		}
-
-		impl::compact_header header;
-
-		uint16_t namevalue_base;
-
-		impl::compact_string<4, 2> name;
-		impl::compact_string<5, 3> value;
-
-		impl::compact_pointer_parent<xml_node_struct, 6> parent;
-
-		impl::compact_pointer<xml_node_struct, 8, 0> first_child;
-
-		impl::compact_pointer<xml_node_struct,  9>    prev_sibling_c;
-		impl::compact_pointer<xml_node_struct, 10, 0> next_sibling;
-
-		impl::compact_pointer<xml_attribute_struct, 11, 0> first_attribute;
-	};
-}
-#else
-namespace pugi
-{
-	struct xml_attribute_struct
-	{
-		xml_attribute_struct(impl::xml_memory_page* page): name(0), value(0), prev_attribute_c(0), next_attribute(0)
-		{
-			header = PUGI__GETHEADER_IMPL(this, page, 0);
-		}
-
-		uintptr_t header;
-
-		char_t*	name;
-		char_t*	value;
-
-		xml_attribute_struct* prev_attribute_c;
-		xml_attribute_struct* next_attribute;
-	};
-
-	struct xml_node_struct
-	{
-		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): name(0), value(0), parent(0), first_child(0), prev_sibling_c(0), next_sibling(0), first_attribute(0)
-		{
-			header = PUGI__GETHEADER_IMPL(this, page, type);
-		}
-
-		uintptr_t header;
-
-		char_t* name;
-		char_t* value;
-
-		xml_node_struct* parent;
-
-		xml_node_struct* first_child;
-
-		xml_node_struct* prev_sibling_c;
-		xml_node_struct* next_sibling;
-
-		xml_attribute_struct* first_attribute;
-	};
-}
-#endif
-
-PUGI__NS_BEGIN
-	struct xml_extra_buffer
-	{
-		char_t* buffer;
-		xml_extra_buffer* next;
-	};
-
-	struct xml_document_struct: public xml_node_struct, public xml_allocator
-	{
-		xml_document_struct(xml_memory_page* page): xml_node_struct(page, node_document), xml_allocator(page), buffer(0), extra_buffers(0)
-		{
-		}
-
-		const char_t* buffer;
-
-		xml_extra_buffer* extra_buffers;
-
-	#ifdef PUGIXML_COMPACT
-		compact_hash_table hash;
-	#endif
-	};
-
-	template <typename Object> inline xml_allocator& get_allocator(const Object* object)
-	{
-		assert(object);
-
-		return *PUGI__GETPAGE(object)->allocator;
-	}
-
-	template <typename Object> inline xml_document_struct& get_document(const Object* object)
-	{
-		assert(object);
-
-		return *static_cast<xml_document_struct*>(PUGI__GETPAGE(object)->allocator);
-	}
-PUGI__NS_END
-
-// Low-level DOM operations
-PUGI__NS_BEGIN
-	inline xml_attribute_struct* allocate_attribute(xml_allocator& alloc)
-	{
-		xml_memory_page* page;
-		void* memory = alloc.allocate_object(sizeof(xml_attribute_struct), page);
-		if (!memory) return 0;
-
-		return new (memory) xml_attribute_struct(page);
-	}
-
-	inline xml_node_struct* allocate_node(xml_allocator& alloc, xml_node_type type)
-	{
-		xml_memory_page* page;
-		void* memory = alloc.allocate_object(sizeof(xml_node_struct), page);
-		if (!memory) return 0;
-
-		return new (memory) xml_node_struct(page, type);
-	}
-
-	inline void destroy_attribute(xml_attribute_struct* a, xml_allocator& alloc)
-	{
-		if (a->header & impl::xml_memory_page_name_allocated_mask)
-			alloc.deallocate_string(a->name);
-
-		if (a->header & impl::xml_memory_page_value_allocated_mask)
-			alloc.deallocate_string(a->value);
-
-		alloc.deallocate_memory(a, sizeof(xml_attribute_struct), PUGI__GETPAGE(a));
-	}
-
-	inline void destroy_node(xml_node_struct* n, xml_allocator& alloc)
-	{
-		if (n->header & impl::xml_memory_page_name_allocated_mask)
-			alloc.deallocate_string(n->name);
-
-		if (n->header & impl::xml_memory_page_value_allocated_mask)
-			alloc.deallocate_string(n->value);
-
-		for (xml_attribute_struct* attr = n->first_attribute; attr; )
-		{
-			xml_attribute_struct* next = attr->next_attribute;
-
-			destroy_attribute(attr, alloc);
-
-			attr = next;
-		}
-
-		for (xml_node_struct* child = n->first_child; child; )
-		{
-			xml_node_struct* next = child->next_sibling;
-
-			destroy_node(child, alloc);
-
-			child = next;
-		}
-
-		alloc.deallocate_memory(n, sizeof(xml_node_struct), PUGI__GETPAGE(n));
-	}
-
-	inline void append_node(xml_node_struct* child, xml_node_struct* node)
-	{
-		child->parent = node;
-
-		xml_node_struct* head = node->first_child;
-
-		if (head)
-		{
-			xml_node_struct* tail = head->prev_sibling_c;
-
-			tail->next_sibling = child;
-			child->prev_sibling_c = tail;
-			head->prev_sibling_c = child;
-		}
-		else
-		{
-			node->first_child = child;
-			child->prev_sibling_c = child;
-		}
-	}
-
-	inline void prepend_node(xml_node_struct* child, xml_node_struct* node)
-	{
-		child->parent = node;
-
-		xml_node_struct* head = node->first_child;
-
-		if (head)
-		{
-			child->prev_sibling_c = head->prev_sibling_c;
-			head->prev_sibling_c = child;
-		}
-		else
-			child->prev_sibling_c = child;
-
-		child->next_sibling = head;
-		node->first_child = child;
-	}
-
-	inline void insert_node_after(xml_node_struct* child, xml_node_struct* node)
-	{
-		xml_node_struct* parent = node->parent;
-
-		child->parent = parent;
-
-		xml_node_struct* next = node->next_sibling;
-
-		if (next)
-			next->prev_sibling_c = child;
-		else
-			parent->first_child->prev_sibling_c = child;
-
-		child->next_sibling = next;
-		child->prev_sibling_c = node;
-
-		node->next_sibling = child;
-	}
-
-	inline void insert_node_before(xml_node_struct* child, xml_node_struct* node)
-	{
-		xml_node_struct* parent = node->parent;
-
-		child->parent = parent;
-
-		xml_node_struct* prev = node->prev_sibling_c;
-
-		if (prev->next_sibling)
-			prev->next_sibling = child;
-		else
-			parent->first_child = child;
-
-		child->prev_sibling_c = prev;
-		child->next_sibling = node;
-
-		node->prev_sibling_c = child;
-	}
-
-	inline void remove_node(xml_node_struct* node)
-	{
-		xml_node_struct* parent = node->parent;
-
-		xml_node_struct* next = node->next_sibling;
-		xml_node_struct* prev = node->prev_sibling_c;
-
-		if (next)
-			next->prev_sibling_c = prev;
-		else
-			parent->first_child->prev_sibling_c = prev;
-
-		if (prev->next_sibling)
-			prev->next_sibling = next;
-		else
-			parent->first_child = next;
-
-		node->parent = 0;
-		node->prev_sibling_c = 0;
-		node->next_sibling = 0;
-	}
-
-	inline void append_attribute(xml_attribute_struct* attr, xml_node_struct* node)
-	{
-		xml_attribute_struct* head = node->first_attribute;
-
-		if (head)
-		{
-			xml_attribute_struct* tail = head->prev_attribute_c;
-
-			tail->next_attribute = attr;
-			attr->prev_attribute_c = tail;
-			head->prev_attribute_c = attr;
-		}
-		else
-		{
-			node->first_attribute = attr;
-			attr->prev_attribute_c = attr;
-		}
-	}
-
-	inline void prepend_attribute(xml_attribute_struct* attr, xml_node_struct* node)
-	{
-		xml_attribute_struct* head = node->first_attribute;
-
-		if (head)
-		{
-			attr->prev_attribute_c = head->prev_attribute_c;
-			head->prev_attribute_c = attr;
-		}
-		else
-			attr->prev_attribute_c = attr;
-
-		attr->next_attribute = head;
-		node->first_attribute = attr;
-	}
-
-	inline void insert_attribute_after(xml_attribute_struct* attr, xml_attribute_struct* place, xml_node_struct* node)
-	{
-		xml_attribute_struct* next = place->next_attribute;
-
-		if (next)
-			next->prev_attribute_c = attr;
-		else
-			node->first_attribute->prev_attribute_c = attr;
-
-		attr->next_attribute = next;
-		attr->prev_attribute_c = place;
-		place->next_attribute = attr;
-	}
-
-	inline void insert_attribute_before(xml_attribute_struct* attr, xml_attribute_struct* place, xml_node_struct* node)
-	{
-		xml_attribute_struct* prev = place->prev_attribute_c;
-
-		if (prev->next_attribute)
-			prev->next_attribute = attr;
-		else
-			node->first_attribute = attr;
-
-		attr->prev_attribute_c = prev;
-		attr->next_attribute = place;
-		place->prev_attribute_c = attr;
-	}
-
-	inline void remove_attribute(xml_attribute_struct* attr, xml_node_struct* node)
-	{
-		xml_attribute_struct* next = attr->next_attribute;
-		xml_attribute_struct* prev = attr->prev_attribute_c;
-
-		if (next)
-			next->prev_attribute_c = prev;
-		else
-			node->first_attribute->prev_attribute_c = prev;
-
-		if (prev->next_attribute)
-			prev->next_attribute = next;
-		else
-			node->first_attribute = next;
-
-		attr->prev_attribute_c = 0;
-		attr->next_attribute = 0;
-	}
-
-	PUGI__FN_NO_INLINE xml_node_struct* append_new_node(xml_node_struct* node, xml_allocator& alloc, xml_node_type type = node_element)
-	{
-		if (!alloc.reserve()) return 0;
-
-		xml_node_struct* child = allocate_node(alloc, type);
-		if (!child) return 0;
-
-		append_node(child, node);
-
-		return child;
-	}
-
-	PUGI__FN_NO_INLINE xml_attribute_struct* append_new_attribute(xml_node_struct* node, xml_allocator& alloc)
-	{
-		if (!alloc.reserve()) return 0;
-
-		xml_attribute_struct* attr = allocate_attribute(alloc);
-		if (!attr) return 0;
-
-		append_attribute(attr, node);
-
-		return attr;
-	}
-PUGI__NS_END
-
-// Helper classes for code generation
-PUGI__NS_BEGIN
-	struct opt_false
-	{
-		enum { value = 0 };
-	};
-
-	struct opt_true
-	{
-		enum { value = 1 };
-	};
-PUGI__NS_END
-
-// Unicode utilities
-PUGI__NS_BEGIN
-	inline uint16_t endian_swap(uint16_t value)
-	{
-		return static_cast<uint16_t>(((value & 0xff) << 8) | (value >> 8));
-	}
-
-	inline uint32_t endian_swap(uint32_t value)
-	{
-		return ((value & 0xff) << 24) | ((value & 0xff00) << 8) | ((value & 0xff0000) >> 8) | (value >> 24);
-	}
-
-	struct utf8_counter
-	{
-		typedef size_t value_type;
-
-		static value_type low(value_type result, uint32_t ch)
-		{
-			// U+0000..U+007F
-			if (ch < 0x80) return result + 1;
-			// U+0080..U+07FF
-			else if (ch < 0x800) return result + 2;
-			// U+0800..U+FFFF
-			else return result + 3;
-		}
-
-		static value_type high(value_type result, uint32_t)
-		{
-			// U+10000..U+10FFFF
-			return result + 4;
-		}
-	};
-
-	struct utf8_writer
-	{
-		typedef uint8_t* value_type;
-
-		static value_type low(value_type result, uint32_t ch)
-		{
-			// U+0000..U+007F
-			if (ch < 0x80)
-			{
-				*result = static_cast<uint8_t>(ch);
-				return result + 1;
-			}
-			// U+0080..U+07FF
-			else if (ch < 0x800)
-			{
-				result[0] = static_cast<uint8_t>(0xC0 | (ch >> 6));
-				result[1] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
-				return result + 2;
-			}
-			// U+0800..U+FFFF
-			else
-			{
-				result[0] = static_cast<uint8_t>(0xE0 | (ch >> 12));
-				result[1] = static_cast<uint8_t>(0x80 | ((ch >> 6) & 0x3F));
-				result[2] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
-				return result + 3;
-			}
-		}
-
-		static value_type high(value_type result, uint32_t ch)
-		{
-			// U+10000..U+10FFFF
-			result[0] = static_cast<uint8_t>(0xF0 | (ch >> 18));
-			result[1] = static_cast<uint8_t>(0x80 | ((ch >> 12) & 0x3F));
-			result[2] = static_cast<uint8_t>(0x80 | ((ch >> 6) & 0x3F));
-			result[3] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
-			return result + 4;
-		}
-
-		static value_type any(value_type result, uint32_t ch)
-		{
-			return (ch < 0x10000) ? low(result, ch) : high(result, ch);
-		}
-	};
-
-	struct utf16_counter
-	{
-		typedef size_t value_type;
-
-		static value_type low(value_type result, uint32_t)
-		{
-			return result + 1;
-		}
-
-		static value_type high(value_type result, uint32_t)
-		{
-			return result + 2;
-		}
-	};
-
-	struct utf16_writer
-	{
-		typedef uint16_t* value_type;
-
-		static value_type low(value_type result, uint32_t ch)
-		{
-			*result = static_cast<uint16_t>(ch);
-
-			return result + 1;
-		}
-
-		static value_type high(value_type result, uint32_t ch)
-		{
-			uint32_t msh = static_cast<uint32_t>(ch - 0x10000) >> 10;
-			uint32_t lsh = static_cast<uint32_t>(ch - 0x10000) & 0x3ff;
-
-			result[0] = static_cast<uint16_t>(0xD800 + msh);
-			result[1] = static_cast<uint16_t>(0xDC00 + lsh);
-
-			return result + 2;
-		}
-
-		static value_type any(value_type result, uint32_t ch)
-		{
-			return (ch < 0x10000) ? low(result, ch) : high(result, ch);
-		}
-	};
-
-	struct utf32_counter
-	{
-		typedef size_t value_type;
-
-		static value_type low(value_type result, uint32_t)
-		{
-			return result + 1;
-		}
-
-		static value_type high(value_type result, uint32_t)
-		{
-			return result + 1;
-		}
-	};
-
-	struct utf32_writer
-	{
-		typedef uint32_t* value_type;
-
-		static value_type low(value_type result, uint32_t ch)
-		{
-			*result = ch;
-
-			return result + 1;
-		}
-
-		static value_type high(value_type result, uint32_t ch)
-		{
-			*result = ch;
-
-			return result + 1;
-		}
-
-		static value_type any(value_type result, uint32_t ch)
-		{
-			*result = ch;
-
-			return result + 1;
-		}
-	};
-
-	struct latin1_writer
-	{
-		typedef uint8_t* value_type;
-
-		static value_type low(value_type result, uint32_t ch)
-		{
-			*result = static_cast<uint8_t>(ch > 255 ? '?' : ch);
-
-			return result + 1;
-		}
-
-		static value_type high(value_type result, uint32_t ch)
-		{
-			(void)ch;
-
-			*result = '?';
-
-			return result + 1;
-		}
-	};
-
-	struct utf8_decoder
-	{
-		typedef uint8_t type;
-
-		template <typename Traits> static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits)
-		{
-			const uint8_t utf8_byte_mask = 0x3f;
-
-			while (size)
-			{
-				uint8_t lead = *data;
-
-				// 0xxxxxxx -> U+0000..U+007F
-				if (lead < 0x80)
-				{
-					result = Traits::low(result, lead);
-					data += 1;
-					size -= 1;
-
-					// process aligned single-byte (ascii) blocks
-					if ((reinterpret_cast<uintptr_t>(data) & 3) == 0)
-					{
-						// round-trip through void* to silence 'cast increases required alignment of target type' warnings
-						while (size >= 4 && (*static_cast<const uint32_t*>(static_cast<const void*>(data)) & 0x80808080) == 0)
-						{
-							result = Traits::low(result, data[0]);
-							result = Traits::low(result, data[1]);
-							result = Traits::low(result, data[2]);
-							result = Traits::low(result, data[3]);
-							data += 4;
-							size -= 4;
-						}
-					}
-				}
-				// 110xxxxx -> U+0080..U+07FF
-				else if (static_cast<unsigned int>(lead - 0xC0) < 0x20 && size >= 2 && (data[1] & 0xc0) == 0x80)
-				{
-					result = Traits::low(result, ((lead & ~0xC0) << 6) | (data[1] & utf8_byte_mask));
-					data += 2;
-					size -= 2;
-				}
-				// 1110xxxx -> U+0800-U+FFFF
-				else if (static_cast<unsigned int>(lead - 0xE0) < 0x10 && size >= 3 && (data[1] & 0xc0) == 0x80 && (data[2] & 0xc0) == 0x80)
-				{
-					result = Traits::low(result, ((lead & ~0xE0) << 12) | ((data[1] & utf8_byte_mask) << 6) | (data[2] & utf8_byte_mask));
-					data += 3;
-					size -= 3;
-				}
-				// 11110xxx -> U+10000..U+10FFFF
-				else if (static_cast<unsigned int>(lead - 0xF0) < 0x08 && size >= 4 && (data[1] & 0xc0) == 0x80 && (data[2] & 0xc0) == 0x80 && (data[3] & 0xc0) == 0x80)
-				{
-					result = Traits::high(result, ((lead & ~0xF0) << 18) | ((data[1] & utf8_byte_mask) << 12) | ((data[2] & utf8_byte_mask) << 6) | (data[3] & utf8_byte_mask));
-					data += 4;
-					size -= 4;
-				}
-				// 10xxxxxx or 11111xxx -> invalid
-				else
-				{
-					data += 1;
-					size -= 1;
-				}
-			}
-
-			return result;
-		}
-	};
-
-	template <typename opt_swap> struct utf16_decoder
-	{
-		typedef uint16_t type;
-
-		template <typename Traits> static inline typename Traits::value_type process(const uint16_t* data, size_t size, typename Traits::value_type result, Traits)
-		{
-			while (size)
-			{
-				uint16_t lead = opt_swap::value ? endian_swap(*data) : *data;
-
-				// U+0000..U+D7FF
-				if (lead < 0xD800)
-				{
-					result = Traits::low(result, lead);
-					data += 1;
-					size -= 1;
-				}
-				// U+E000..U+FFFF
-				else if (static_cast<unsigned int>(lead - 0xE000) < 0x2000)
-				{
-					result = Traits::low(result, lead);
-					data += 1;
-					size -= 1;
-				}
-				// surrogate pair lead
-				else if (static_cast<unsigned int>(lead - 0xD800) < 0x400 && size >= 2)
-				{
-					uint16_t next = opt_swap::value ? endian_swap(data[1]) : data[1];
-
-					if (static_cast<unsigned int>(next - 0xDC00) < 0x400)
-					{
-						result = Traits::high(result, 0x10000 + ((lead & 0x3ff) << 10) + (next & 0x3ff));
-						data += 2;
-						size -= 2;
-					}
-					else
-					{
-						data += 1;
-						size -= 1;
-					}
-				}
-				else
-				{
-					data += 1;
-					size -= 1;
-				}
-			}
-
-			return result;
-		}
-	};
-
-	template <typename opt_swap> struct utf32_decoder
-	{
-		typedef uint32_t type;
-
-		template <typename Traits> static inline typename Traits::value_type process(const uint32_t* data, size_t size, typename Traits::value_type result, Traits)
-		{
-			while (size)
-			{
-				uint32_t lead = opt_swap::value ? endian_swap(*data) : *data;
-
-				// U+0000..U+FFFF
-				if (lead < 0x10000)
-				{
-					result = Traits::low(result, lead);
-					data += 1;
-					size -= 1;
-				}
-				// U+10000..U+10FFFF
-				else
-				{
-					result = Traits::high(result, lead);
-					data += 1;
-					size -= 1;
-				}
-			}
-
-			return result;
-		}
-	};
-
-	struct latin1_decoder
-	{
-		typedef uint8_t type;
-
-		template <typename Traits> static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits)
-		{
-			while (size)
-			{
-				result = Traits::low(result, *data);
-				data += 1;
-				size -= 1;
-			}
-
-			return result;
-		}
-	};
-
-	template <size_t size> struct wchar_selector;
-
-	template <> struct wchar_selector<2>
-	{
-		typedef uint16_t type;
-		typedef utf16_counter counter;
-		typedef utf16_writer writer;
-		typedef utf16_decoder<opt_false> decoder;
-	};
-
-	template <> struct wchar_selector<4>
-	{
-		typedef uint32_t type;
-		typedef utf32_counter counter;
-		typedef utf32_writer writer;
-		typedef utf32_decoder<opt_false> decoder;
-	};
-
-	typedef wchar_selector<sizeof(wchar_t)>::counter wchar_counter;
-	typedef wchar_selector<sizeof(wchar_t)>::writer wchar_writer;
-
-	struct wchar_decoder
-	{
-		typedef wchar_t type;
-
-		template <typename Traits> static inline typename Traits::value_type process(const wchar_t* data, size_t size, typename Traits::value_type result, Traits traits)
-		{
-			typedef wchar_selector<sizeof(wchar_t)>::decoder decoder;
-
-			return decoder::process(reinterpret_cast<const typename decoder::type*>(data), size, result, traits);
-		}
-	};
-
-#ifdef PUGIXML_WCHAR_MODE
-	PUGI__FN void convert_wchar_endian_swap(wchar_t* result, const wchar_t* data, size_t length)
-	{
-		for (size_t i = 0; i < length; ++i)
-			result[i] = static_cast<wchar_t>(endian_swap(static_cast<wchar_selector<sizeof(wchar_t)>::type>(data[i])));
-	}
-#endif
-PUGI__NS_END
-
-PUGI__NS_BEGIN
-	enum chartype_t
-	{
-		ct_parse_pcdata = 1,	// \0, &, \r, <
-		ct_parse_attr = 2,		// \0, &, \r, ', "
-		ct_parse_attr_ws = 4,	// \0, &, \r, ', ", \n, tab
-		ct_space = 8,			// \r, \n, space, tab
-		ct_parse_cdata = 16,	// \0, ], >, \r
-		ct_parse_comment = 32,	// \0, -, >, \r
-		ct_symbol = 64,			// Any symbol > 127, a-z, A-Z, 0-9, _, :, -, .
-		ct_start_symbol = 128	// Any symbol > 127, a-z, A-Z, _, :
-	};
-
-	static const unsigned char chartype_table[256] =
-	{
-		55,  0,   0,   0,   0,   0,   0,   0,      0,   12,  12,  0,   0,   63,  0,   0,   // 0-15
-		0,   0,   0,   0,   0,   0,   0,   0,      0,   0,   0,   0,   0,   0,   0,   0,   // 16-31
-		8,   0,   6,   0,   0,   0,   7,   6,      0,   0,   0,   0,   0,   96,  64,  0,   // 32-47
-		64,  64,  64,  64,  64,  64,  64,  64,     64,  64,  192, 0,   1,   0,   48,  0,   // 48-63
-		0,   192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 64-79
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 0,   0,   16,  0,   192, // 80-95
-		0,   192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 96-111
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 0, 0, 0, 0, 0,           // 112-127
-
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 128+
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192
-	};
-
-	enum chartypex_t
-	{
-		ctx_special_pcdata = 1,   // Any symbol >= 0 and < 32 (except \t, \r, \n), &, <, >
-		ctx_special_attr = 2,     // Any symbol >= 0 and < 32, &, <, ", '
-		ctx_start_symbol = 4,	  // Any symbol > 127, a-z, A-Z, _
-		ctx_digit = 8,			  // 0-9
-		ctx_symbol = 16			  // Any symbol > 127, a-z, A-Z, 0-9, _, -, .
-	};
-
-	static const unsigned char chartypex_table[256] =
-	{
-		3,  3,  3,  3,  3,  3,  3,  3,     3,  2,  2,  3,  3,  2,  3,  3,     // 0-15
-		3,  3,  3,  3,  3,  3,  3,  3,     3,  3,  3,  3,  3,  3,  3,  3,     // 16-31
-		0,  0,  2,  0,  0,  0,  3,  2,     0,  0,  0,  0,  0, 16, 16,  0,     // 32-47
-		24, 24, 24, 24, 24, 24, 24, 24,    24, 24, 0,  0,  3,  0,  1,  0,     // 48-63
-
-		0,  20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 64-79
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 0,  0,  0,  0,  20,    // 80-95
-		0,  20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 96-111
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 0,  0,  0,  0,  0,     // 112-127
-
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 128+
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20
-	};
-
-#ifdef PUGIXML_WCHAR_MODE
-	#define PUGI__IS_CHARTYPE_IMPL(c, ct, table) ((static_cast<unsigned int>(c) < 128 ? table[static_cast<unsigned int>(c)] : table[128]) & (ct))
-#else
-	#define PUGI__IS_CHARTYPE_IMPL(c, ct, table) (table[static_cast<unsigned char>(c)] & (ct))
-#endif
-
-	#define PUGI__IS_CHARTYPE(c, ct) PUGI__IS_CHARTYPE_IMPL(c, ct, chartype_table)
-	#define PUGI__IS_CHARTYPEX(c, ct) PUGI__IS_CHARTYPE_IMPL(c, ct, chartypex_table)
-
-	PUGI__FN bool is_little_endian()
-	{
-		unsigned int ui = 1;
-
-		return *reinterpret_cast<unsigned char*>(&ui) == 1;
-	}
-
-	PUGI__FN xml_encoding get_wchar_encoding()
-	{
-		PUGI__STATIC_ASSERT(sizeof(wchar_t) == 2 || sizeof(wchar_t) == 4);
-
-		if (sizeof(wchar_t) == 2)
-			return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
-		else
-			return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
-	}
-
-	PUGI__FN bool parse_declaration_encoding(const uint8_t* data, size_t size, const uint8_t*& out_encoding, size_t& out_length)
-	{
-	#define PUGI__SCANCHAR(ch) { if (offset >= size || data[offset] != ch) return false; offset++; }
-	#define PUGI__SCANCHARTYPE(ct) { while (offset < size && PUGI__IS_CHARTYPE(data[offset], ct)) offset++; }
-
-		// check if we have a non-empty XML declaration
-		if (size < 6 || !((data[0] == '<') & (data[1] == '?') & (data[2] == 'x') & (data[3] == 'm') & (data[4] == 'l') && PUGI__IS_CHARTYPE(data[5], ct_space)))
-			return false;
-
-		// scan XML declaration until the encoding field
-		for (size_t i = 6; i + 1 < size; ++i)
-		{
-			// declaration can not contain ? in quoted values
-			if (data[i] == '?')
-				return false;
-
-			if (data[i] == 'e' && data[i + 1] == 'n')
-			{
-				size_t offset = i;
-
-				// encoding follows the version field which can't contain 'en' so this has to be the encoding if XML is well formed
-				PUGI__SCANCHAR('e'); PUGI__SCANCHAR('n'); PUGI__SCANCHAR('c'); PUGI__SCANCHAR('o');
-				PUGI__SCANCHAR('d'); PUGI__SCANCHAR('i'); PUGI__SCANCHAR('n'); PUGI__SCANCHAR('g');
-
-				// S? = S?
-				PUGI__SCANCHARTYPE(ct_space);
-				PUGI__SCANCHAR('=');
-				PUGI__SCANCHARTYPE(ct_space);
-
-				// the only two valid delimiters are ' and "
-				uint8_t delimiter = (offset < size && data[offset] == '"') ? '"' : '\'';
-
-				PUGI__SCANCHAR(delimiter);
-
-				size_t start = offset;
-
-				out_encoding = data + offset;
-
-				PUGI__SCANCHARTYPE(ct_symbol);
-
-				out_length = offset - start;
-
-				PUGI__SCANCHAR(delimiter);
-
-				return true;
-			}
-		}
-
-		return false;
-
-	#undef PUGI__SCANCHAR
-	#undef PUGI__SCANCHARTYPE
-	}
-
-	PUGI__FN xml_encoding guess_buffer_encoding(const uint8_t* data, size_t size)
-	{
-		// skip encoding autodetection if input buffer is too small
-		if (size < 4) return encoding_utf8;
-
-		uint8_t d0 = data[0], d1 = data[1], d2 = data[2], d3 = data[3];
-
-		// look for BOM in first few bytes
-		if (d0 == 0 && d1 == 0 && d2 == 0xfe && d3 == 0xff) return encoding_utf32_be;
-		if (d0 == 0xff && d1 == 0xfe && d2 == 0 && d3 == 0) return encoding_utf32_le;
-		if (d0 == 0xfe && d1 == 0xff) return encoding_utf16_be;
-		if (d0 == 0xff && d1 == 0xfe) return encoding_utf16_le;
-		if (d0 == 0xef && d1 == 0xbb && d2 == 0xbf) return encoding_utf8;
-
-		// look for <, <? or <?xm in various encodings
-		if (d0 == 0 && d1 == 0 && d2 == 0 && d3 == 0x3c) return encoding_utf32_be;
-		if (d0 == 0x3c && d1 == 0 && d2 == 0 && d3 == 0) return encoding_utf32_le;
-		if (d0 == 0 && d1 == 0x3c && d2 == 0 && d3 == 0x3f) return encoding_utf16_be;
-		if (d0 == 0x3c && d1 == 0 && d2 == 0x3f && d3 == 0) return encoding_utf16_le;
-
-		// look for utf16 < followed by node name (this may fail, but is better than utf8 since it's zero terminated so early)
-		if (d0 == 0 && d1 == 0x3c) return encoding_utf16_be;
-		if (d0 == 0x3c && d1 == 0) return encoding_utf16_le;
-
-		// no known BOM detected; parse declaration
-		const uint8_t* enc = 0;
-		size_t enc_length = 0;
-
-		if (d0 == 0x3c && d1 == 0x3f && d2 == 0x78 && d3 == 0x6d && parse_declaration_encoding(data, size, enc, enc_length))
-		{
-			// iso-8859-1 (case-insensitive)
-			if (enc_length == 10
-				&& (enc[0] | ' ') == 'i' && (enc[1] | ' ') == 's' && (enc[2] | ' ') == 'o'
-				&& enc[3] == '-' && enc[4] == '8' && enc[5] == '8' && enc[6] == '5' && enc[7] == '9'
-				&& enc[8] == '-' && enc[9] == '1')
-				return encoding_latin1;
-
-			// latin1 (case-insensitive)
-			if (enc_length == 6
-				&& (enc[0] | ' ') == 'l' && (enc[1] | ' ') == 'a' && (enc[2] | ' ') == 't'
-				&& (enc[3] | ' ') == 'i' && (enc[4] | ' ') == 'n'
-				&& enc[5] == '1')
-				return encoding_latin1;
-		}
-
-		return encoding_utf8;
-	}
-
-	PUGI__FN xml_encoding get_buffer_encoding(xml_encoding encoding, const void* contents, size_t size)
-	{
-		// replace wchar encoding with utf implementation
-		if (encoding == encoding_wchar) return get_wchar_encoding();
-
-		// replace utf16 encoding with utf16 with specific endianness
-		if (encoding == encoding_utf16) return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
-
-		// replace utf32 encoding with utf32 with specific endianness
-		if (encoding == encoding_utf32) return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
-
-		// only do autodetection if no explicit encoding is requested
-		if (encoding != encoding_auto) return encoding;
-
-		// try to guess encoding (based on XML specification, Appendix F.1)
-		const uint8_t* data = static_cast<const uint8_t*>(contents);
-
-		return guess_buffer_encoding(data, size);
-	}
-
-	PUGI__FN bool get_mutable_buffer(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
-	{
-		size_t length = size / sizeof(char_t);
-
-		if (is_mutable)
-		{
-			out_buffer = static_cast<char_t*>(const_cast<void*>(contents));
-			out_length = length;
-		}
-		else
-		{
-			char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
-			if (!buffer) return false;
-
-			if (contents)
-				memcpy(buffer, contents, length * sizeof(char_t));
-			else
-				assert(length == 0);
-
-			buffer[length] = 0;
-
-			out_buffer = buffer;
-			out_length = length + 1;
-		}
-
-		return true;
-	}
-
-#ifdef PUGIXML_WCHAR_MODE
-	PUGI__FN bool need_endian_swap_utf(xml_encoding le, xml_encoding re)
-	{
-		return (le == encoding_utf16_be && re == encoding_utf16_le) || (le == encoding_utf16_le && re == encoding_utf16_be) ||
-			   (le == encoding_utf32_be && re == encoding_utf32_le) || (le == encoding_utf32_le && re == encoding_utf32_be);
-	}
-
-	PUGI__FN bool convert_buffer_endian_swap(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
-	{
-		const char_t* data = static_cast<const char_t*>(contents);
-		size_t length = size / sizeof(char_t);
-
-		if (is_mutable)
-		{
-			char_t* buffer = const_cast<char_t*>(data);
-
-			convert_wchar_endian_swap(buffer, data, length);
-
-			out_buffer = buffer;
-			out_length = length;
-		}
-		else
-		{
-			char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
-			if (!buffer) return false;
-
-			convert_wchar_endian_swap(buffer, data, length);
-			buffer[length] = 0;
-
-			out_buffer = buffer;
-			out_length = length + 1;
-		}
-
-		return true;
-	}
-
-	template <typename D> PUGI__FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
-	{
-		const typename D::type* data = static_cast<const typename D::type*>(contents);
-		size_t data_length = size / sizeof(typename D::type);
-
-		// first pass: get length in wchar_t units
-		size_t length = D::process(data, data_length, 0, wchar_counter());
-
-		// allocate buffer of suitable length
-		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
-		if (!buffer) return false;
-
-		// second pass: convert utf16 input to wchar_t
-		wchar_writer::value_type obegin = reinterpret_cast<wchar_writer::value_type>(buffer);
-		wchar_writer::value_type oend = D::process(data, data_length, obegin, wchar_writer());
-
-		assert(oend == obegin + length);
-		*oend = 0;
-
-		out_buffer = buffer;
-		out_length = length + 1;
-
-		return true;
-	}
-
-	PUGI__FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
-	{
-		// get native encoding
-		xml_encoding wchar_encoding = get_wchar_encoding();
-
-		// fast path: no conversion required
-		if (encoding == wchar_encoding)
-			return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
-
-		// only endian-swapping is required
-		if (need_endian_swap_utf(encoding, wchar_encoding))
-			return convert_buffer_endian_swap(out_buffer, out_length, contents, size, is_mutable);
-
-		// source encoding is utf8
-		if (encoding == encoding_utf8)
-			return convert_buffer_generic(out_buffer, out_length, contents, size, utf8_decoder());
-
-		// source encoding is utf16
-		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
-
-			return (native_encoding == encoding) ?
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_false>()) :
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_true>());
-		}
-
-		// source encoding is utf32
-		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
-
-			return (native_encoding == encoding) ?
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_false>()) :
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_true>());
-		}
-
-		// source encoding is latin1
-		if (encoding == encoding_latin1)
-			return convert_buffer_generic(out_buffer, out_length, contents, size, latin1_decoder());
-
-		assert(false && "Invalid encoding"); // unreachable
-		return false;
-	}
-#else
-	template <typename D> PUGI__FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
-	{
-		const typename D::type* data = static_cast<const typename D::type*>(contents);
-		size_t data_length = size / sizeof(typename D::type);
-
-		// first pass: get length in utf8 units
-		size_t length = D::process(data, data_length, 0, utf8_counter());
-
-		// allocate buffer of suitable length
-		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
-		if (!buffer) return false;
-
-		// second pass: convert utf16 input to utf8
-		uint8_t* obegin = reinterpret_cast<uint8_t*>(buffer);
-		uint8_t* oend = D::process(data, data_length, obegin, utf8_writer());
-
-		assert(oend == obegin + length);
-		*oend = 0;
-
-		out_buffer = buffer;
-		out_length = length + 1;
-
-		return true;
-	}
-
-	PUGI__FN size_t get_latin1_7bit_prefix_length(const uint8_t* data, size_t size)
-	{
-		for (size_t i = 0; i < size; ++i)
-			if (data[i] > 127)
-				return i;
-
-		return size;
-	}
-
-	PUGI__FN bool convert_buffer_latin1(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
-	{
-		const uint8_t* data = static_cast<const uint8_t*>(contents);
-		size_t data_length = size;
-
-		// get size of prefix that does not need utf8 conversion
-		size_t prefix_length = get_latin1_7bit_prefix_length(data, data_length);
-		assert(prefix_length <= data_length);
-
-		const uint8_t* postfix = data + prefix_length;
-		size_t postfix_length = data_length - prefix_length;
-
-		// if no conversion is needed, just return the original buffer
-		if (postfix_length == 0) return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
-
-		// first pass: get length in utf8 units
-		size_t length = prefix_length + latin1_decoder::process(postfix, postfix_length, 0, utf8_counter());
-
-		// allocate buffer of suitable length
-		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
-		if (!buffer) return false;
-
-		// second pass: convert latin1 input to utf8
-		memcpy(buffer, data, prefix_length);
-
-		uint8_t* obegin = reinterpret_cast<uint8_t*>(buffer);
-		uint8_t* oend = latin1_decoder::process(postfix, postfix_length, obegin + prefix_length, utf8_writer());
-
-		assert(oend == obegin + length);
-		*oend = 0;
-
-		out_buffer = buffer;
-		out_length = length + 1;
-
-		return true;
-	}
-
-	PUGI__FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
-	{
-		// fast path: no conversion required
-		if (encoding == encoding_utf8)
-			return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
-
-		// source encoding is utf16
-		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
-
-			return (native_encoding == encoding) ?
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_false>()) :
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_true>());
-		}
-
-		// source encoding is utf32
-		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
-
-			return (native_encoding == encoding) ?
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_false>()) :
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_true>());
-		}
-
-		// source encoding is latin1
-		if (encoding == encoding_latin1)
-			return convert_buffer_latin1(out_buffer, out_length, contents, size, is_mutable);
-
-		assert(false && "Invalid encoding"); // unreachable
-		return false;
-	}
-#endif
-
-	PUGI__FN size_t as_utf8_begin(const wchar_t* str, size_t length)
-	{
-		// get length in utf8 characters
-		return wchar_decoder::process(str, length, 0, utf8_counter());
-	}
-
-	PUGI__FN void as_utf8_end(char* buffer, size_t size, const wchar_t* str, size_t length)
-	{
-		// convert to utf8
-		uint8_t* begin = reinterpret_cast<uint8_t*>(buffer);
-		uint8_t* end = wchar_decoder::process(str, length, begin, utf8_writer());
-
-		assert(begin + size == end);
-		(void)!end;
-		(void)!size;
-	}
-
-#ifndef PUGIXML_NO_STL
-	PUGI__FN std::string as_utf8_impl(const wchar_t* str, size_t length)
-	{
-		// first pass: get length in utf8 characters
-		size_t size = as_utf8_begin(str, length);
-
-		// allocate resulting string
-		std::string result;
-		result.resize(size);
-
-		// second pass: convert to utf8
-		if (size > 0) as_utf8_end(&result[0], size, str, length);
-
-		return result;
-	}
-
-	PUGI__FN std::basic_string<wchar_t> as_wide_impl(const char* str, size_t size)
-	{
-		const uint8_t* data = reinterpret_cast<const uint8_t*>(str);
-
-		// first pass: get length in wchar_t units
-		size_t length = utf8_decoder::process(data, size, 0, wchar_counter());
-
-		// allocate resulting string
-		std::basic_string<wchar_t> result;
-		result.resize(length);
-
-		// second pass: convert to wchar_t
-		if (length > 0)
-		{
-			wchar_writer::value_type begin = reinterpret_cast<wchar_writer::value_type>(&result[0]);
-			wchar_writer::value_type end = utf8_decoder::process(data, size, begin, wchar_writer());
-
-			assert(begin + length == end);
-			(void)!end;
-		}
-
-		return result;
-	}
-#endif
-
-	template <typename Header>
-	inline bool strcpy_insitu_allow(size_t length, const Header& header, uintptr_t header_mask, char_t* target)
-	{
-		// never reuse shared memory
-		if (header & xml_memory_page_contents_shared_mask) return false;
-
-		size_t target_length = strlength(target);
-
-		// always reuse document buffer memory if possible
-		if ((header & header_mask) == 0) return target_length >= length;
-
-		// reuse heap memory if waste is not too great
-		const size_t reuse_threshold = 32;
-
-		return target_length >= length && (target_length < reuse_threshold || target_length - length < target_length / 2);
-	}
-
-	template <typename String, typename Header>
-	PUGI__FN bool strcpy_insitu(String& dest, Header& header, uintptr_t header_mask, const char_t* source, size_t source_length)
-	{
-		if (source_length == 0)
-		{
-			// empty string and null pointer are equivalent, so just deallocate old memory
-			xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator;
-
-			if (header & header_mask) alloc->deallocate_string(dest);
-
-			// mark the string as not allocated
-			dest = 0;
-			header &= ~header_mask;
-
-			return true;
-		}
-		else if (dest && strcpy_insitu_allow(source_length, header, header_mask, dest))
-		{
-			// we can reuse old buffer, so just copy the new data (including zero terminator)
-			memcpy(dest, source, source_length * sizeof(char_t));
-			dest[source_length] = 0;
-
-			return true;
-		}
-		else
-		{
-			xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator;
-
-			if (!alloc->reserve()) return false;
-
-			// allocate new buffer
-			char_t* buf = alloc->allocate_string(source_length + 1);
-			if (!buf) return false;
-
-			// copy the string (including zero terminator)
-			memcpy(buf, source, source_length * sizeof(char_t));
-			buf[source_length] = 0;
-
-			// deallocate old buffer (*after* the above to protect against overlapping memory and/or allocation failures)
-			if (header & header_mask) alloc->deallocate_string(dest);
-
-			// the string is now allocated, so set the flag
-			dest = buf;
-			header |= header_mask;
-
-			return true;
-		}
-	}
-
-	struct gap
-	{
-		char_t* end;
-		size_t size;
-
-		gap(): end(0), size(0)
-		{
-		}
-
-		// Push new gap, move s count bytes further (skipping the gap).
-		// Collapse previous gap.
-		void push(char_t*& s, size_t count)
-		{
-			if (end) // there was a gap already; collapse it
-			{
-				// Move [old_gap_end, new_gap_start) to [old_gap_start, ...)
-				assert(s >= end);
-				memmove(end - size, end, reinterpret_cast<char*>(s) - reinterpret_cast<char*>(end));
-			}
-
-			s += count; // end of current gap
-
-			// "merge" two gaps
-			end = s;
-			size += count;
-		}
-
-		// Collapse all gaps, return past-the-end pointer
-		char_t* flush(char_t* s)
-		{
-			if (end)
-			{
-				// Move [old_gap_end, current_pos) to [old_gap_start, ...)
-				assert(s >= end);
-				memmove(end - size, end, reinterpret_cast<char*>(s) - reinterpret_cast<char*>(end));
-
-				return s - size;
-			}
-			else return s;
-		}
-	};
-
-	PUGI__FN char_t* strconv_escape(char_t* s, gap& g)
-	{
-		char_t* stre = s + 1;
-
-		switch (*stre)
-		{
-			case '#':	// &#...
-			{
-				unsigned int ucsc = 0;
-
-				if (stre[1] == 'x') // &#x... (hex code)
-				{
-					stre += 2;
-
-					char_t ch = *stre;
-
-					if (ch == ';') return stre;
-
-					for (;;)
-					{
-						if (static_cast<unsigned int>(ch - '0') <= 9)
-							ucsc = 16 * ucsc + (ch - '0');
-						else if (static_cast<unsigned int>((ch | ' ') - 'a') <= 5)
-							ucsc = 16 * ucsc + ((ch | ' ') - 'a' + 10);
-						else if (ch == ';')
-							break;
-						else // cancel
-							return stre;
-
-						ch = *++stre;
-					}
-
-					++stre;
-				}
-				else	// &#... (dec code)
-				{
-					char_t ch = *++stre;
-
-					if (ch == ';') return stre;
-
-					for (;;)
-					{
-						if (static_cast<unsigned int>(ch - '0') <= 9)
-							ucsc = 10 * ucsc + (ch - '0');
-						else if (ch == ';')
-							break;
-						else // cancel
-							return stre;
-
-						ch = *++stre;
-					}
-
-					++stre;
-				}
-
-			#ifdef PUGIXML_WCHAR_MODE
-				s = reinterpret_cast<char_t*>(wchar_writer::any(reinterpret_cast<wchar_writer::value_type>(s), ucsc));
-			#else
-				s = reinterpret_cast<char_t*>(utf8_writer::any(reinterpret_cast<uint8_t*>(s), ucsc));
-			#endif
-
-				g.push(s, stre - s);
-				return stre;
-			}
-
-			case 'a':	// &a
-			{
-				++stre;
-
-				if (*stre == 'm') // &am
-				{
-					if (*++stre == 'p' && *++stre == ';') // &amp;
-					{
-						*s++ = '&';
-						++stre;
-
-						g.push(s, stre - s);
-						return stre;
-					}
-				}
-				else if (*stre == 'p') // &ap
-				{
-					if (*++stre == 'o' && *++stre == 's' && *++stre == ';') // &apos;
-					{
-						*s++ = '\'';
-						++stre;
-
-						g.push(s, stre - s);
-						return stre;
-					}
-				}
-				break;
-			}
-
-			case 'g': // &g
-			{
-				if (*++stre == 't' && *++stre == ';') // &gt;
-				{
-					*s++ = '>';
-					++stre;
-
-					g.push(s, stre - s);
-					return stre;
-				}
-				break;
-			}
-
-			case 'l': // &l
-			{
-				if (*++stre == 't' && *++stre == ';') // &lt;
-				{
-					*s++ = '<';
-					++stre;
-
-					g.push(s, stre - s);
-					return stre;
-				}
-				break;
-			}
-
-			case 'q': // &q
-			{
-				if (*++stre == 'u' && *++stre == 'o' && *++stre == 't' && *++stre == ';') // &quot;
-				{
-					*s++ = '"';
-					++stre;
-
-					g.push(s, stre - s);
-					return stre;
-				}
-				break;
-			}
-
-			default:
-				break;
-		}
-
-		return stre;
-	}
-
-	// Parser utilities
-	#define PUGI__ENDSWITH(c, e)        ((c) == (e) || ((c) == 0 && endch == (e)))
-	#define PUGI__SKIPWS()              { while (PUGI__IS_CHARTYPE(*s, ct_space)) ++s; }
-	#define PUGI__OPTSET(OPT)           ( optmsk & (OPT) )
-	#define PUGI__PUSHNODE(TYPE)        { cursor = append_new_node(cursor, *alloc, TYPE); if (!cursor) PUGI__THROW_ERROR(status_out_of_memory, s); }
-	#define PUGI__POPNODE()             { cursor = cursor->parent; }
-	#define PUGI__SCANFOR(X)            { while (*s != 0 && !(X)) ++s; }
-	#define PUGI__SCANWHILE(X)          { while (X) ++s; }
-	#define PUGI__SCANWHILE_UNROLL(X)   { for (;;) { char_t ss = s[0]; if (PUGI__UNLIKELY(!(X))) { break; } ss = s[1]; if (PUGI__UNLIKELY(!(X))) { s += 1; break; } ss = s[2]; if (PUGI__UNLIKELY(!(X))) { s += 2; break; } ss = s[3]; if (PUGI__UNLIKELY(!(X))) { s += 3; break; } s += 4; } }
-	#define PUGI__ENDSEG()              { ch = *s; *s = 0; ++s; }
-	#define PUGI__THROW_ERROR(err, m)   return error_offset = m, error_status = err, static_cast<char_t*>(0)
-	#define PUGI__CHECK_ERROR(err, m)   { if (*s == 0) PUGI__THROW_ERROR(err, m); }
-
-	PUGI__FN char_t* strconv_comment(char_t* s, char_t endch)
-	{
-		gap g;
-
-		while (true)
-		{
-			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_comment));
-
-			if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
-			{
-				*s++ = '\n'; // replace first one with 0x0a
-
-				if (*s == '\n') g.push(s, 1);
-			}
-			else if (s[0] == '-' && s[1] == '-' && PUGI__ENDSWITH(s[2], '>')) // comment ends here
-			{
-				*g.flush(s) = 0;
-
-				return s + (s[2] == '>' ? 3 : 2);
-			}
-			else if (*s == 0)
-			{
-				return 0;
-			}
-			else ++s;
-		}
-	}
-
-	PUGI__FN char_t* strconv_cdata(char_t* s, char_t endch)
-	{
-		gap g;
-
-		while (true)
-		{
-			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_cdata));
-
-			if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
-			{
-				*s++ = '\n'; // replace first one with 0x0a
-
-				if (*s == '\n') g.push(s, 1);
-			}
-			else if (s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>')) // CDATA ends here
-			{
-				*g.flush(s) = 0;
-
-				return s + 1;
-			}
-			else if (*s == 0)
-			{
-				return 0;
-			}
-			else ++s;
-		}
-	}
-
-	typedef char_t* (*strconv_pcdata_t)(char_t*);
-
-	template <typename opt_trim, typename opt_eol, typename opt_escape> struct strconv_pcdata_impl
-	{
-		static char_t* parse(char_t* s)
-		{
-			gap g;
-
-			char_t* begin = s;
-
-			while (true)
-			{
-				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_pcdata));
-
-				if (*s == '<') // PCDATA ends here
-				{
-					char_t* end = g.flush(s);
-
-					if (opt_trim::value)
-						while (end > begin && PUGI__IS_CHARTYPE(end[-1], ct_space))
-							--end;
-
-					*end = 0;
-
-					return s + 1;
-				}
-				else if (opt_eol::value && *s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
-				{
-					*s++ = '\n'; // replace first one with 0x0a
-
-					if (*s == '\n') g.push(s, 1);
-				}
-				else if (opt_escape::value && *s == '&')
-				{
-					s = strconv_escape(s, g);
-				}
-				else if (*s == 0)
-				{
-					char_t* end = g.flush(s);
-
-					if (opt_trim::value)
-						while (end > begin && PUGI__IS_CHARTYPE(end[-1], ct_space))
-							--end;
-
-					*end = 0;
-
-					return s;
-				}
-				else ++s;
-			}
-		}
-	};
-
-	PUGI__FN strconv_pcdata_t get_strconv_pcdata(unsigned int optmask)
-	{
-		PUGI__STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_trim_pcdata == 0x0800);
-
-		switch (((optmask >> 4) & 3) | ((optmask >> 9) & 4)) // get bitmask for flags (trim eol escapes); this simultaneously checks 3 options from assertion above
-		{
-		case 0: return strconv_pcdata_impl<opt_false, opt_false, opt_false>::parse;
-		case 1: return strconv_pcdata_impl<opt_false, opt_false, opt_true>::parse;
-		case 2: return strconv_pcdata_impl<opt_false, opt_true, opt_false>::parse;
-		case 3: return strconv_pcdata_impl<opt_false, opt_true, opt_true>::parse;
-		case 4: return strconv_pcdata_impl<opt_true, opt_false, opt_false>::parse;
-		case 5: return strconv_pcdata_impl<opt_true, opt_false, opt_true>::parse;
-		case 6: return strconv_pcdata_impl<opt_true, opt_true, opt_false>::parse;
-		case 7: return strconv_pcdata_impl<opt_true, opt_true, opt_true>::parse;
-		default: assert(false); return 0; // unreachable
-		}
-	}
-
-	typedef char_t* (*strconv_attribute_t)(char_t*, char_t);
-
-	template <typename opt_escape> struct strconv_attribute_impl
-	{
-		static char_t* parse_wnorm(char_t* s, char_t end_quote)
-		{
-			gap g;
-
-			// trim leading whitespaces
-			if (PUGI__IS_CHARTYPE(*s, ct_space))
-			{
-				char_t* str = s;
-
-				do ++str;
-				while (PUGI__IS_CHARTYPE(*str, ct_space));
-
-				g.push(s, str - s);
-			}
-
-			while (true)
-			{
-				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr_ws | ct_space));
-
-				if (*s == end_quote)
-				{
-					char_t* str = g.flush(s);
-
-					do *str-- = 0;
-					while (PUGI__IS_CHARTYPE(*str, ct_space));
-
-					return s + 1;
-				}
-				else if (PUGI__IS_CHARTYPE(*s, ct_space))
-				{
-					*s++ = ' ';
-
-					if (PUGI__IS_CHARTYPE(*s, ct_space))
-					{
-						char_t* str = s + 1;
-						while (PUGI__IS_CHARTYPE(*str, ct_space)) ++str;
-
-						g.push(s, str - s);
-					}
-				}
-				else if (opt_escape::value && *s == '&')
-				{
-					s = strconv_escape(s, g);
-				}
-				else if (!*s)
-				{
-					return 0;
-				}
-				else ++s;
-			}
-		}
-
-		static char_t* parse_wconv(char_t* s, char_t end_quote)
-		{
-			gap g;
-
-			while (true)
-			{
-				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr_ws));
-
-				if (*s == end_quote)
-				{
-					*g.flush(s) = 0;
-
-					return s + 1;
-				}
-				else if (PUGI__IS_CHARTYPE(*s, ct_space))
-				{
-					if (*s == '\r')
-					{
-						*s++ = ' ';
-
-						if (*s == '\n') g.push(s, 1);
-					}
-					else *s++ = ' ';
-				}
-				else if (opt_escape::value && *s == '&')
-				{
-					s = strconv_escape(s, g);
-				}
-				else if (!*s)
-				{
-					return 0;
-				}
-				else ++s;
-			}
-		}
-
-		static char_t* parse_eol(char_t* s, char_t end_quote)
-		{
-			gap g;
-
-			while (true)
-			{
-				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr));
-
-				if (*s == end_quote)
-				{
-					*g.flush(s) = 0;
-
-					return s + 1;
-				}
-				else if (*s == '\r')
-				{
-					*s++ = '\n';
-
-					if (*s == '\n') g.push(s, 1);
-				}
-				else if (opt_escape::value && *s == '&')
-				{
-					s = strconv_escape(s, g);
-				}
-				else if (!*s)
-				{
-					return 0;
-				}
-				else ++s;
-			}
-		}
-
-		static char_t* parse_simple(char_t* s, char_t end_quote)
-		{
-			gap g;
-
-			while (true)
-			{
-				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr));
-
-				if (*s == end_quote)
-				{
-					*g.flush(s) = 0;
-
-					return s + 1;
-				}
-				else if (opt_escape::value && *s == '&')
-				{
-					s = strconv_escape(s, g);
-				}
-				else if (!*s)
-				{
-					return 0;
-				}
-				else ++s;
-			}
-		}
-	};
-
-	PUGI__FN strconv_attribute_t get_strconv_attribute(unsigned int optmask)
-	{
-		PUGI__STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_wconv_attribute == 0x40 && parse_wnorm_attribute == 0x80);
-
-		switch ((optmask >> 4) & 15) // get bitmask for flags (wnorm wconv eol escapes); this simultaneously checks 4 options from assertion above
-		{
-		case 0:  return strconv_attribute_impl<opt_false>::parse_simple;
-		case 1:  return strconv_attribute_impl<opt_true>::parse_simple;
-		case 2:  return strconv_attribute_impl<opt_false>::parse_eol;
-		case 3:  return strconv_attribute_impl<opt_true>::parse_eol;
-		case 4:  return strconv_attribute_impl<opt_false>::parse_wconv;
-		case 5:  return strconv_attribute_impl<opt_true>::parse_wconv;
-		case 6:  return strconv_attribute_impl<opt_false>::parse_wconv;
-		case 7:  return strconv_attribute_impl<opt_true>::parse_wconv;
-		case 8:  return strconv_attribute_impl<opt_false>::parse_wnorm;
-		case 9:  return strconv_attribute_impl<opt_true>::parse_wnorm;
-		case 10: return strconv_attribute_impl<opt_false>::parse_wnorm;
-		case 11: return strconv_attribute_impl<opt_true>::parse_wnorm;
-		case 12: return strconv_attribute_impl<opt_false>::parse_wnorm;
-		case 13: return strconv_attribute_impl<opt_true>::parse_wnorm;
-		case 14: return strconv_attribute_impl<opt_false>::parse_wnorm;
-		case 15: return strconv_attribute_impl<opt_true>::parse_wnorm;
-		default: assert(false); return 0; // unreachable
-		}
-	}
-
-	inline xml_parse_result make_parse_result(xml_parse_status status, ptrdiff_t offset = 0)
-	{
-		xml_parse_result result;
-		result.status = status;
-		result.offset = offset;
-
-		return result;
-	}
-
-	struct xml_parser
-	{
-		xml_allocator* alloc;
-		char_t* error_offset;
-		xml_parse_status error_status;
-
-		xml_parser(xml_allocator* alloc_): alloc(alloc_), error_offset(0), error_status(status_ok)
-		{
-		}
-
-		// DOCTYPE consists of nested sections of the following possible types:
-		// <!-- ... -->, <? ... ?>, "...", '...'
-		// <![...]]>
-		// <!...>
-		// First group can not contain nested groups
-		// Second group can contain nested groups of the same type
-		// Third group can contain all other groups
-		char_t* parse_doctype_primitive(char_t* s)
-		{
-			if (*s == '"' || *s == '\'')
-			{
-				// quoted string
-				char_t ch = *s++;
-				PUGI__SCANFOR(*s == ch);
-				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
-
-				s++;
-			}
-			else if (s[0] == '<' && s[1] == '?')
-			{
-				// <? ... ?>
-				s += 2;
-				PUGI__SCANFOR(s[0] == '?' && s[1] == '>'); // no need for ENDSWITH because ?> can't terminate proper doctype
-				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
-
-				s += 2;
-			}
-			else if (s[0] == '<' && s[1] == '!' && s[2] == '-' && s[3] == '-')
-			{
-				s += 4;
-				PUGI__SCANFOR(s[0] == '-' && s[1] == '-' && s[2] == '>'); // no need for ENDSWITH because --> can't terminate proper doctype
-				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
-
-				s += 3;
-			}
-			else PUGI__THROW_ERROR(status_bad_doctype, s);
-
-			return s;
-		}
-
-		char_t* parse_doctype_ignore(char_t* s)
-		{
-			size_t depth = 0;
-
-			assert(s[0] == '<' && s[1] == '!' && s[2] == '[');
-			s += 3;
-
-			while (*s)
-			{
-				if (s[0] == '<' && s[1] == '!' && s[2] == '[')
-				{
-					// nested ignore section
-					s += 3;
-					depth++;
-				}
-				else if (s[0] == ']' && s[1] == ']' && s[2] == '>')
-				{
-					// ignore section end
-					s += 3;
-
-					if (depth == 0)
-						return s;
-
-					depth--;
-				}
-				else s++;
-			}
-
-			PUGI__THROW_ERROR(status_bad_doctype, s);
-		}
-
-		char_t* parse_doctype_group(char_t* s, char_t endch)
-		{
-			size_t depth = 0;
-
-			assert((s[0] == '<' || s[0] == 0) && s[1] == '!');
-			s += 2;
-
-			while (*s)
-			{
-				if (s[0] == '<' && s[1] == '!' && s[2] != '-')
-				{
-					if (s[2] == '[')
-					{
-						// ignore
-						s = parse_doctype_ignore(s);
-						if (!s) return s;
-					}
-					else
-					{
-						// some control group
-						s += 2;
-						depth++;
-					}
-				}
-				else if (s[0] == '<' || s[0] == '"' || s[0] == '\'')
-				{
-					// unknown tag (forbidden), or some primitive group
-					s = parse_doctype_primitive(s);
-					if (!s) return s;
-				}
-				else if (*s == '>')
-				{
-					if (depth == 0)
-						return s;
-
-					depth--;
-					s++;
-				}
-				else s++;
-			}
-
-			if (depth != 0 || endch != '>') PUGI__THROW_ERROR(status_bad_doctype, s);
-
-			return s;
-		}
-
-		char_t* parse_exclamation(char_t* s, xml_node_struct* cursor, unsigned int optmsk, char_t endch)
-		{
-			// parse node contents, starting with exclamation mark
-			++s;
-
-			if (*s == '-') // '<!-...'
-			{
-				++s;
-
-				if (*s == '-') // '<!--...'
-				{
-					++s;
-
-					if (PUGI__OPTSET(parse_comments))
-					{
-						PUGI__PUSHNODE(node_comment); // Append a new node on the tree.
-						cursor->value = s; // Save the offset.
-					}
-
-					if (PUGI__OPTSET(parse_eol) && PUGI__OPTSET(parse_comments))
-					{
-						s = strconv_comment(s, endch);
-
-						if (!s) PUGI__THROW_ERROR(status_bad_comment, cursor->value);
-					}
-					else
-					{
-						// Scan for terminating '-->'.
-						PUGI__SCANFOR(s[0] == '-' && s[1] == '-' && PUGI__ENDSWITH(s[2], '>'));
-						PUGI__CHECK_ERROR(status_bad_comment, s);
-
-						if (PUGI__OPTSET(parse_comments))
-							*s = 0; // Zero-terminate this segment at the first terminating '-'.
-
-						s += (s[2] == '>' ? 3 : 2); // Step over the '\0->'.
-					}
-				}
-				else PUGI__THROW_ERROR(status_bad_comment, s);
-			}
-			else if (*s == '[')
-			{
-				// '<![CDATA[...'
-				if (*++s=='C' && *++s=='D' && *++s=='A' && *++s=='T' && *++s=='A' && *++s == '[')
-				{
-					++s;
-
-					if (PUGI__OPTSET(parse_cdata))
-					{
-						PUGI__PUSHNODE(node_cdata); // Append a new node on the tree.
-						cursor->value = s; // Save the offset.
-
-						if (PUGI__OPTSET(parse_eol))
-						{
-							s = strconv_cdata(s, endch);
-
-							if (!s) PUGI__THROW_ERROR(status_bad_cdata, cursor->value);
-						}
-						else
-						{
-							// Scan for terminating ']]>'.
-							PUGI__SCANFOR(s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>'));
-							PUGI__CHECK_ERROR(status_bad_cdata, s);
-
-							*s++ = 0; // Zero-terminate this segment.
-						}
-					}
-					else // Flagged for discard, but we still have to scan for the terminator.
-					{
-						// Scan for terminating ']]>'.
-						PUGI__SCANFOR(s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>'));
-						PUGI__CHECK_ERROR(status_bad_cdata, s);
-
-						++s;
-					}
-
-					s += (s[1] == '>' ? 2 : 1); // Step over the last ']>'.
-				}
-				else PUGI__THROW_ERROR(status_bad_cdata, s);
-			}
-			else if (s[0] == 'D' && s[1] == 'O' && s[2] == 'C' && s[3] == 'T' && s[4] == 'Y' && s[5] == 'P' && PUGI__ENDSWITH(s[6], 'E'))
-			{
-				s -= 2;
-
-				if (cursor->parent) PUGI__THROW_ERROR(status_bad_doctype, s);
-
-				char_t* mark = s + 9;
-
-				s = parse_doctype_group(s, endch);
-				if (!s) return s;
-
-				assert((*s == 0 && endch == '>') || *s == '>');
-				if (*s) *s++ = 0;
-
-				if (PUGI__OPTSET(parse_doctype))
-				{
-					while (PUGI__IS_CHARTYPE(*mark, ct_space)) ++mark;
-
-					PUGI__PUSHNODE(node_doctype);
-
-					cursor->value = mark;
-				}
-			}
-			else if (*s == 0 && endch == '-') PUGI__THROW_ERROR(status_bad_comment, s);
-			else if (*s == 0 && endch == '[') PUGI__THROW_ERROR(status_bad_cdata, s);
-			else PUGI__THROW_ERROR(status_unrecognized_tag, s);
-
-			return s;
-		}
-
-		char_t* parse_question(char_t* s, xml_node_struct*& ref_cursor, unsigned int optmsk, char_t endch)
-		{
-			// load into registers
-			xml_node_struct* cursor = ref_cursor;
-			char_t ch = 0;
-
-			// parse node contents, starting with question mark
-			++s;
-
-			// read PI target
-			char_t* target = s;
-
-			if (!PUGI__IS_CHARTYPE(*s, ct_start_symbol)) PUGI__THROW_ERROR(status_bad_pi, s);
-
-			PUGI__SCANWHILE(PUGI__IS_CHARTYPE(*s, ct_symbol));
-			PUGI__CHECK_ERROR(status_bad_pi, s);
-
-			// determine node type; stricmp / strcasecmp is not portable
-			bool declaration = (target[0] | ' ') == 'x' && (target[1] | ' ') == 'm' && (target[2] | ' ') == 'l' && target + 3 == s;
-
-			if (declaration ? PUGI__OPTSET(parse_declaration) : PUGI__OPTSET(parse_pi))
-			{
-				if (declaration)
-				{
-					// disallow non top-level declarations
-					if (cursor->parent) PUGI__THROW_ERROR(status_bad_pi, s);
-
-					PUGI__PUSHNODE(node_declaration);
-				}
-				else
-				{
-					PUGI__PUSHNODE(node_pi);
-				}
-
-				cursor->name = target;
-
-				PUGI__ENDSEG();
-
-				// parse value/attributes
-				if (ch == '?')
-				{
-					// empty node
-					if (!PUGI__ENDSWITH(*s, '>')) PUGI__THROW_ERROR(status_bad_pi, s);
-					s += (*s == '>');
-
-					PUGI__POPNODE();
-				}
-				else if (PUGI__IS_CHARTYPE(ch, ct_space))
-				{
-					PUGI__SKIPWS();
-
-					// scan for tag end
-					char_t* value = s;
-
-					PUGI__SCANFOR(s[0] == '?' && PUGI__ENDSWITH(s[1], '>'));
-					PUGI__CHECK_ERROR(status_bad_pi, s);
-
-					if (declaration)
-					{
-						// replace ending ? with / so that 'element' terminates properly
-						*s = '/';
-
-						// we exit from this function with cursor at node_declaration, which is a signal to parse() to go to LOC_ATTRIBUTES
-						s = value;
-					}
-					else
-					{
-						// store value and step over >
-						cursor->value = value;
-
-						PUGI__POPNODE();
-
-						PUGI__ENDSEG();
-
-						s += (*s == '>');
-					}
-				}
-				else PUGI__THROW_ERROR(status_bad_pi, s);
-			}
-			else
-			{
-				// scan for tag end
-				PUGI__SCANFOR(s[0] == '?' && PUGI__ENDSWITH(s[1], '>'));
-				PUGI__CHECK_ERROR(status_bad_pi, s);
-
-				s += (s[1] == '>' ? 2 : 1);
-			}
-
-			// store from registers
-			ref_cursor = cursor;
-
-			return s;
-		}
-
-		char_t* parse_tree(char_t* s, xml_node_struct* root, unsigned int optmsk, char_t endch)
-		{
-			strconv_attribute_t strconv_attribute = get_strconv_attribute(optmsk);
-			strconv_pcdata_t strconv_pcdata = get_strconv_pcdata(optmsk);
-
-			char_t ch = 0;
-			xml_node_struct* cursor = root;
-			char_t* mark = s;
-
-			while (*s != 0)
-			{
-				if (*s == '<')
-				{
-					++s;
-
-				LOC_TAG:
-					if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) // '<#...'
-					{
-						PUGI__PUSHNODE(node_element); // Append a new node to the tree.
-
-						cursor->name = s;
-
-						PUGI__SCANWHILE_UNROLL(PUGI__IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
-						PUGI__ENDSEG(); // Save char in 'ch', terminate & step over.
-
-						if (ch == '>')
-						{
-							// end of tag
-						}
-						else if (PUGI__IS_CHARTYPE(ch, ct_space))
-						{
-						LOC_ATTRIBUTES:
-							while (true)
-							{
-								PUGI__SKIPWS(); // Eat any whitespace.
-
-								if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) // <... #...
-								{
-									xml_attribute_struct* a = append_new_attribute(cursor, *alloc); // Make space for this attribute.
-									if (!a) PUGI__THROW_ERROR(status_out_of_memory, s);
-
-									a->name = s; // Save the offset.
-
-									PUGI__SCANWHILE_UNROLL(PUGI__IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
-									PUGI__ENDSEG(); // Save char in 'ch', terminate & step over.
-
-									if (PUGI__IS_CHARTYPE(ch, ct_space))
-									{
-										PUGI__SKIPWS(); // Eat any whitespace.
-
-										ch = *s;
-										++s;
-									}
-
-									if (ch == '=') // '<... #=...'
-									{
-										PUGI__SKIPWS(); // Eat any whitespace.
-
-										if (*s == '"' || *s == '\'') // '<... #="...'
-										{
-											ch = *s; // Save quote char to avoid breaking on "''" -or- '""'.
-											++s; // Step over the quote.
-											a->value = s; // Save the offset.
-
-											s = strconv_attribute(s, ch);
-
-											if (!s) PUGI__THROW_ERROR(status_bad_attribute, a->value);
-
-											// After this line the loop continues from the start;
-											// Whitespaces, / and > are ok, symbols and EOF are wrong,
-											// everything else will be detected
-											if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) PUGI__THROW_ERROR(status_bad_attribute, s);
-										}
-										else PUGI__THROW_ERROR(status_bad_attribute, s);
-									}
-									else PUGI__THROW_ERROR(status_bad_attribute, s);
-								}
-								else if (*s == '/')
-								{
-									++s;
-
-									if (*s == '>')
-									{
-										PUGI__POPNODE();
-										s++;
-										break;
-									}
-									else if (*s == 0 && endch == '>')
-									{
-										PUGI__POPNODE();
-										break;
-									}
-									else PUGI__THROW_ERROR(status_bad_start_element, s);
-								}
-								else if (*s == '>')
-								{
-									++s;
-
-									break;
-								}
-								else if (*s == 0 && endch == '>')
-								{
-									break;
-								}
-								else PUGI__THROW_ERROR(status_bad_start_element, s);
-							}
-
-							// !!!
-						}
-						else if (ch == '/') // '<#.../'
-						{
-							if (!PUGI__ENDSWITH(*s, '>')) PUGI__THROW_ERROR(status_bad_start_element, s);
-
-							PUGI__POPNODE(); // Pop.
-
-							s += (*s == '>');
-						}
-						else if (ch == 0)
-						{
-							// we stepped over null terminator, backtrack & handle closing tag
-							--s;
-
-							if (endch != '>') PUGI__THROW_ERROR(status_bad_start_element, s);
-						}
-						else PUGI__THROW_ERROR(status_bad_start_element, s);
-					}
-					else if (*s == '/')
-					{
-						++s;
-
-						mark = s;
-
-						char_t* name = cursor->name;
-						if (!name) PUGI__THROW_ERROR(status_end_element_mismatch, mark);
-
-						while (PUGI__IS_CHARTYPE(*s, ct_symbol))
-						{
-							if (*s++ != *name++) PUGI__THROW_ERROR(status_end_element_mismatch, mark);
-						}
-
-						if (*name)
-						{
-							if (*s == 0 && name[0] == endch && name[1] == 0) PUGI__THROW_ERROR(status_bad_end_element, s);
-							else PUGI__THROW_ERROR(status_end_element_mismatch, mark);
-						}
-
-						PUGI__POPNODE(); // Pop.
-
-						PUGI__SKIPWS();
-
-						if (*s == 0)
-						{
-							if (endch != '>') PUGI__THROW_ERROR(status_bad_end_element, s);
-						}
-						else
-						{
-							if (*s != '>') PUGI__THROW_ERROR(status_bad_end_element, s);
-							++s;
-						}
-					}
-					else if (*s == '?') // '<?...'
-					{
-						s = parse_question(s, cursor, optmsk, endch);
-						if (!s) return s;
-
-						assert(cursor);
-						if (PUGI__NODETYPE(cursor) == node_declaration) goto LOC_ATTRIBUTES;
-					}
-					else if (*s == '!') // '<!...'
-					{
-						s = parse_exclamation(s, cursor, optmsk, endch);
-						if (!s) return s;
-					}
-					else if (*s == 0 && endch == '?') PUGI__THROW_ERROR(status_bad_pi, s);
-					else PUGI__THROW_ERROR(status_unrecognized_tag, s);
-				}
-				else
-				{
-					mark = s; // Save this offset while searching for a terminator.
-
-					PUGI__SKIPWS(); // Eat whitespace if no genuine PCDATA here.
-
-					if (*s == '<' || !*s)
-					{
-						// We skipped some whitespace characters because otherwise we would take the tag branch instead of PCDATA one
-						assert(mark != s);
-
-						if (!PUGI__OPTSET(parse_ws_pcdata | parse_ws_pcdata_single) || PUGI__OPTSET(parse_trim_pcdata))
-						{
-							continue;
-						}
-						else if (PUGI__OPTSET(parse_ws_pcdata_single))
-						{
-							if (s[0] != '<' || s[1] != '/' || cursor->first_child) continue;
-						}
-					}
-
-					if (!PUGI__OPTSET(parse_trim_pcdata))
-						s = mark;
-
-					if (cursor->parent || PUGI__OPTSET(parse_fragment))
-					{
-						if (PUGI__OPTSET(parse_embed_pcdata) && cursor->parent && !cursor->first_child && !cursor->value)
-						{
-							cursor->value = s; // Save the offset.
-						}
-						else
-						{
-							PUGI__PUSHNODE(node_pcdata); // Append a new node on the tree.
-
-							cursor->value = s; // Save the offset.
-
-							PUGI__POPNODE(); // Pop since this is a standalone.
-						}
-
-						s = strconv_pcdata(s);
-
-						if (!*s) break;
-					}
-					else
-					{
-						PUGI__SCANFOR(*s == '<'); // '...<'
-						if (!*s) break;
-
-						++s;
-					}
-
-					// We're after '<'
-					goto LOC_TAG;
-				}
-			}
-
-			// check that last tag is closed
-			if (cursor != root) PUGI__THROW_ERROR(status_end_element_mismatch, s);
-
-			return s;
-		}
-
-	#ifdef PUGIXML_WCHAR_MODE
-		static char_t* parse_skip_bom(char_t* s)
-		{
-			unsigned int bom = 0xfeff;
-			return (s[0] == static_cast<wchar_t>(bom)) ? s + 1 : s;
-		}
-	#else
-		static char_t* parse_skip_bom(char_t* s)
-		{
-			return (s[0] == '\xef' && s[1] == '\xbb' && s[2] == '\xbf') ? s + 3 : s;
-		}
-	#endif
-
-		static bool has_element_node_siblings(xml_node_struct* node)
-		{
-			while (node)
-			{
-				if (PUGI__NODETYPE(node) == node_element) return true;
-
-				node = node->next_sibling;
-			}
-
-			return false;
-		}
-
-		static xml_parse_result parse(char_t* buffer, size_t length, xml_document_struct* xmldoc, xml_node_struct* root, unsigned int optmsk)
-		{
-			// early-out for empty documents
-			if (length == 0)
-				return make_parse_result(PUGI__OPTSET(parse_fragment) ? status_ok : status_no_document_element);
-
-			// get last child of the root before parsing
-			xml_node_struct* last_root_child = root->first_child ? root->first_child->prev_sibling_c + 0 : 0;
-
-			// create parser on stack
-			xml_parser parser(static_cast<xml_allocator*>(xmldoc));
-
-			// save last character and make buffer zero-terminated (speeds up parsing)
-			char_t endch = buffer[length - 1];
-			buffer[length - 1] = 0;
-
-			// skip BOM to make sure it does not end up as part of parse output
-			char_t* buffer_data = parse_skip_bom(buffer);
-
-			// perform actual parsing
-			parser.parse_tree(buffer_data, root, optmsk, endch);
-
-			xml_parse_result result = make_parse_result(parser.error_status, parser.error_offset ? parser.error_offset - buffer : 0);
-			assert(result.offset >= 0 && static_cast<size_t>(result.offset) <= length);
-
-			if (result)
-			{
-				// since we removed last character, we have to handle the only possible false positive (stray <)
-				if (endch == '<')
-					return make_parse_result(status_unrecognized_tag, length - 1);
-
-				// check if there are any element nodes parsed
-				xml_node_struct* first_root_child_parsed = last_root_child ? last_root_child->next_sibling + 0 : root->first_child+ 0;
-
-				if (!PUGI__OPTSET(parse_fragment) && !has_element_node_siblings(first_root_child_parsed))
-					return make_parse_result(status_no_document_element, length - 1);
-			}
-			else
-			{
-				// roll back offset if it occurs on a null terminator in the source buffer
-				if (result.offset > 0 && static_cast<size_t>(result.offset) == length - 1 && endch == 0)
-					result.offset--;
-			}
-
-			return result;
-		}
-	};
-
-	// Output facilities
-	PUGI__FN xml_encoding get_write_native_encoding()
-	{
-	#ifdef PUGIXML_WCHAR_MODE
-		return get_wchar_encoding();
-	#else
-		return encoding_utf8;
-	#endif
-	}
-
-	PUGI__FN xml_encoding get_write_encoding(xml_encoding encoding)
-	{
-		// replace wchar encoding with utf implementation
-		if (encoding == encoding_wchar) return get_wchar_encoding();
-
-		// replace utf16 encoding with utf16 with specific endianness
-		if (encoding == encoding_utf16) return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
-
-		// replace utf32 encoding with utf32 with specific endianness
-		if (encoding == encoding_utf32) return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
-
-		// only do autodetection if no explicit encoding is requested
-		if (encoding != encoding_auto) return encoding;
-
-		// assume utf8 encoding
-		return encoding_utf8;
-	}
-
-	template <typename D, typename T> PUGI__FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T)
-	{
-		PUGI__STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
-
-		typename T::value_type end = D::process(reinterpret_cast<const typename D::type*>(data), length, dest, T());
-
-		return static_cast<size_t>(end - dest) * sizeof(*dest);
-	}
-
-	template <typename D, typename T> PUGI__FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T, bool opt_swap)
-	{
-		PUGI__STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
-
-		typename T::value_type end = D::process(reinterpret_cast<const typename D::type*>(data), length, dest, T());
-
-		if (opt_swap)
-		{
-			for (typename T::value_type i = dest; i != end; ++i)
-				*i = endian_swap(*i);
-		}
-
-		return static_cast<size_t>(end - dest) * sizeof(*dest);
-	}
-
-#ifdef PUGIXML_WCHAR_MODE
-	PUGI__FN size_t get_valid_length(const char_t* data, size_t length)
-	{
-		if (length < 1) return 0;
-
-		// discard last character if it's the lead of a surrogate pair
-		return (sizeof(wchar_t) == 2 && static_cast<unsigned int>(static_cast<uint16_t>(data[length - 1]) - 0xD800) < 0x400) ? length - 1 : length;
-	}
-
-	PUGI__FN size_t convert_buffer_output(char_t* r_char, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
-	{
-		// only endian-swapping is required
-		if (need_endian_swap_utf(encoding, get_wchar_encoding()))
-		{
-			convert_wchar_endian_swap(r_char, data, length);
-
-			return length * sizeof(char_t);
-		}
-
-		// convert to utf8
-		if (encoding == encoding_utf8)
-			return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), utf8_writer());
-
-		// convert to utf16
-		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
-
-			return convert_buffer_output_generic(r_u16, data, length, wchar_decoder(), utf16_writer(), native_encoding != encoding);
-		}
-
-		// convert to utf32
-		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
-
-			return convert_buffer_output_generic(r_u32, data, length, wchar_decoder(), utf32_writer(), native_encoding != encoding);
-		}
-
-		// convert to latin1
-		if (encoding == encoding_latin1)
-			return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), latin1_writer());
-
-		assert(false && "Invalid encoding"); // unreachable
-		return 0;
-	}
-#else
-	PUGI__FN size_t get_valid_length(const char_t* data, size_t length)
-	{
-		if (length < 5) return 0;
-
-		for (size_t i = 1; i <= 4; ++i)
-		{
-			uint8_t ch = static_cast<uint8_t>(data[length - i]);
-
-			// either a standalone character or a leading one
-			if ((ch & 0xc0) != 0x80) return length - i;
-		}
-
-		// there are four non-leading characters at the end, sequence tail is broken so might as well process the whole chunk
-		return length;
-	}
-
-	PUGI__FN size_t convert_buffer_output(char_t* /* r_char */, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
-	{
-		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
-
-			return convert_buffer_output_generic(r_u16, data, length, utf8_decoder(), utf16_writer(), native_encoding != encoding);
-		}
-
-		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
-
-			return convert_buffer_output_generic(r_u32, data, length, utf8_decoder(), utf32_writer(), native_encoding != encoding);
-		}
-
-		if (encoding == encoding_latin1)
-			return convert_buffer_output_generic(r_u8, data, length, utf8_decoder(), latin1_writer());
-
-		assert(false && "Invalid encoding"); // unreachable
-		return 0;
-	}
-#endif
-
-	class xml_buffered_writer
-	{
-		xml_buffered_writer(const xml_buffered_writer&);
-		xml_buffered_writer& operator=(const xml_buffered_writer&);
-
-	public:
-		xml_buffered_writer(xml_writer& writer_, xml_encoding user_encoding): writer(writer_), bufsize(0), encoding(get_write_encoding(user_encoding))
-		{
-			PUGI__STATIC_ASSERT(bufcapacity >= 8);
-		}
-
-		size_t flush()
-		{
-			flush(buffer, bufsize);
-			bufsize = 0;
-			return 0;
-		}
-
-		void flush(const char_t* data, size_t size)
-		{
-			if (size == 0) return;
-
-			// fast path, just write data
-			if (encoding == get_write_native_encoding())
-				writer.write(data, size * sizeof(char_t));
-			else
-			{
-				// convert chunk
-				size_t result = convert_buffer_output(scratch.data_char, scratch.data_u8, scratch.data_u16, scratch.data_u32, data, size, encoding);
-				assert(result <= sizeof(scratch));
-
-				// write data
-				writer.write(scratch.data_u8, result);
-			}
-		}
-
-		void write_direct(const char_t* data, size_t length)
-		{
-			// flush the remaining buffer contents
-			flush();
-
-			// handle large chunks
-			if (length > bufcapacity)
-			{
-				if (encoding == get_write_native_encoding())
-				{
-					// fast path, can just write data chunk
-					writer.write(data, length * sizeof(char_t));
-					return;
-				}
-
-				// need to convert in suitable chunks
-				while (length > bufcapacity)
-				{
-					// get chunk size by selecting such number of characters that are guaranteed to fit into scratch buffer
-					// and form a complete codepoint sequence (i.e. discard start of last codepoint if necessary)
-					size_t chunk_size = get_valid_length(data, bufcapacity);
-					assert(chunk_size);
-
-					// convert chunk and write
-					flush(data, chunk_size);
-
-					// iterate
-					data += chunk_size;
-					length -= chunk_size;
-				}
-
-				// small tail is copied below
-				bufsize = 0;
-			}
-
-			memcpy(buffer + bufsize, data, length * sizeof(char_t));
-			bufsize += length;
-		}
-
-		void write_buffer(const char_t* data, size_t length)
-		{
-			size_t offset = bufsize;
-
-			if (offset + length <= bufcapacity)
-			{
-				memcpy(buffer + offset, data, length * sizeof(char_t));
-				bufsize = offset + length;
-			}
-			else
-			{
-				write_direct(data, length);
-			}
-		}
-
-		void write_string(const char_t* data)
-		{
-			// write the part of the string that fits in the buffer
-			size_t offset = bufsize;
-
-			while (*data && offset < bufcapacity)
-				buffer[offset++] = *data++;
-
-			// write the rest
-			if (offset < bufcapacity)
-			{
-				bufsize = offset;
-			}
-			else
-			{
-				// backtrack a bit if we have split the codepoint
-				size_t length = offset - bufsize;
-				size_t extra = length - get_valid_length(data - length, length);
-
-				bufsize = offset - extra;
-
-				write_direct(data - extra, strlength(data) + extra);
-			}
-		}
-
-		void write(char_t d0)
-		{
-			size_t offset = bufsize;
-			if (offset > bufcapacity - 1) offset = flush();
-
-			buffer[offset + 0] = d0;
-			bufsize = offset + 1;
-		}
-
-		void write(char_t d0, char_t d1)
-		{
-			size_t offset = bufsize;
-			if (offset > bufcapacity - 2) offset = flush();
-
-			buffer[offset + 0] = d0;
-			buffer[offset + 1] = d1;
-			bufsize = offset + 2;
-		}
-
-		void write(char_t d0, char_t d1, char_t d2)
-		{
-			size_t offset = bufsize;
-			if (offset > bufcapacity - 3) offset = flush();
-
-			buffer[offset + 0] = d0;
-			buffer[offset + 1] = d1;
-			buffer[offset + 2] = d2;
-			bufsize = offset + 3;
-		}
-
-		void write(char_t d0, char_t d1, char_t d2, char_t d3)
-		{
-			size_t offset = bufsize;
-			if (offset > bufcapacity - 4) offset = flush();
-
-			buffer[offset + 0] = d0;
-			buffer[offset + 1] = d1;
-			buffer[offset + 2] = d2;
-			buffer[offset + 3] = d3;
-			bufsize = offset + 4;
-		}
-
-		void write(char_t d0, char_t d1, char_t d2, char_t d3, char_t d4)
-		{
-			size_t offset = bufsize;
-			if (offset > bufcapacity - 5) offset = flush();
-
-			buffer[offset + 0] = d0;
-			buffer[offset + 1] = d1;
-			buffer[offset + 2] = d2;
-			buffer[offset + 3] = d3;
-			buffer[offset + 4] = d4;
-			bufsize = offset + 5;
-		}
-
-		void write(char_t d0, char_t d1, char_t d2, char_t d3, char_t d4, char_t d5)
-		{
-			size_t offset = bufsize;
-			if (offset > bufcapacity - 6) offset = flush();
-
-			buffer[offset + 0] = d0;
-			buffer[offset + 1] = d1;
-			buffer[offset + 2] = d2;
-			buffer[offset + 3] = d3;
-			buffer[offset + 4] = d4;
-			buffer[offset + 5] = d5;
-			bufsize = offset + 6;
-		}
-
-		// utf8 maximum expansion: x4 (-> utf32)
-		// utf16 maximum expansion: x2 (-> utf32)
-		// utf32 maximum expansion: x1
-		enum
-		{
-			bufcapacitybytes =
-			#ifdef PUGIXML_MEMORY_OUTPUT_STACK
-				PUGIXML_MEMORY_OUTPUT_STACK
-			#else
-				10240
-			#endif
-			,
-			bufcapacity = bufcapacitybytes / (sizeof(char_t) + 4)
-		};
-
-		char_t buffer[bufcapacity];
-
-		union
-		{
-			uint8_t data_u8[4 * bufcapacity];
-			uint16_t data_u16[2 * bufcapacity];
-			uint32_t data_u32[bufcapacity];
-			char_t data_char[bufcapacity];
-		} scratch;
-
-		xml_writer& writer;
-		size_t bufsize;
-		xml_encoding encoding;
-	};
-
-	PUGI__FN void text_output_escaped(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags)
-	{
-		while (*s)
-		{
-			const char_t* prev = s;
-
-			// While *s is a usual symbol
-			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPEX(ss, type));
-
-			writer.write_buffer(prev, static_cast<size_t>(s - prev));
-
-			switch (*s)
-			{
-				case 0: break;
-				case '&':
-					writer.write('&', 'a', 'm', 'p', ';');
-					++s;
-					break;
-				case '<':
-					writer.write('&', 'l', 't', ';');
-					++s;
-					break;
-				case '>':
-					writer.write('&', 'g', 't', ';');
-					++s;
-					break;
-				case '"':
-					if (flags & format_attribute_single_quote)
-						writer.write('"');
-					else
-						writer.write('&', 'q', 'u', 'o', 't', ';');
-					++s;
-					break;
-				case '\'':
-					if (flags & format_attribute_single_quote)
-						writer.write('&', 'a', 'p', 'o', 's', ';');
-					else
-						writer.write('\'');
-					++s;
-					break;
-				default: // s is not a usual symbol
-				{
-					unsigned int ch = static_cast<unsigned int>(*s++);
-					assert(ch < 32);
-
-					if (!(flags & format_skip_control_chars))
-						writer.write('&', '#', static_cast<char_t>((ch / 10) + '0'), static_cast<char_t>((ch % 10) + '0'), ';');
-				}
-			}
-		}
-	}
-
-	PUGI__FN void text_output(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags)
-	{
-		if (flags & format_no_escapes)
-			writer.write_string(s);
-		else
-			text_output_escaped(writer, s, type, flags);
-	}
-
-	PUGI__FN void text_output_cdata(xml_buffered_writer& writer, const char_t* s)
-	{
-		do
-		{
-			writer.write('<', '!', '[', 'C', 'D');
-			writer.write('A', 'T', 'A', '[');
-
-			const char_t* prev = s;
-
-			// look for ]]> sequence - we can't output it as is since it terminates CDATA
-			while (*s && !(s[0] == ']' && s[1] == ']' && s[2] == '>')) ++s;
-
-			// skip ]] if we stopped at ]]>, > will go to the next CDATA section
-			if (*s) s += 2;
-
-			writer.write_buffer(prev, static_cast<size_t>(s - prev));
-
-			writer.write(']', ']', '>');
-		}
-		while (*s);
-	}
-
-	PUGI__FN void text_output_indent(xml_buffered_writer& writer, const char_t* indent, size_t indent_length, unsigned int depth)
-	{
-		switch (indent_length)
-		{
-		case 1:
-		{
-			for (unsigned int i = 0; i < depth; ++i)
-				writer.write(indent[0]);
-			break;
-		}
-
-		case 2:
-		{
-			for (unsigned int i = 0; i < depth; ++i)
-				writer.write(indent[0], indent[1]);
-			break;
-		}
-
-		case 3:
-		{
-			for (unsigned int i = 0; i < depth; ++i)
-				writer.write(indent[0], indent[1], indent[2]);
-			break;
-		}
-
-		case 4:
-		{
-			for (unsigned int i = 0; i < depth; ++i)
-				writer.write(indent[0], indent[1], indent[2], indent[3]);
-			break;
-		}
-
-		default:
-		{
-			for (unsigned int i = 0; i < depth; ++i)
-				writer.write_buffer(indent, indent_length);
-		}
-		}
-	}
-
-	PUGI__FN void node_output_comment(xml_buffered_writer& writer, const char_t* s)
-	{
-		writer.write('<', '!', '-', '-');
-
-		while (*s)
-		{
-			const char_t* prev = s;
-
-			// look for -\0 or -- sequence - we can't output it since -- is illegal in comment body
-			while (*s && !(s[0] == '-' && (s[1] == '-' || s[1] == 0))) ++s;
-
-			writer.write_buffer(prev, static_cast<size_t>(s - prev));
-
-			if (*s)
-			{
-				assert(*s == '-');
-
-				writer.write('-', ' ');
-				++s;
-			}
-		}
-
-		writer.write('-', '-', '>');
-	}
-
-	PUGI__FN void node_output_pi_value(xml_buffered_writer& writer, const char_t* s)
-	{
-		while (*s)
-		{
-			const char_t* prev = s;
-
-			// look for ?> sequence - we can't output it since ?> terminates PI
-			while (*s && !(s[0] == '?' && s[1] == '>')) ++s;
-
-			writer.write_buffer(prev, static_cast<size_t>(s - prev));
-
-			if (*s)
-			{
-				assert(s[0] == '?' && s[1] == '>');
-
-				writer.write('?', ' ', '>');
-				s += 2;
-			}
-		}
-	}
-
-	PUGI__FN void node_output_attributes(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
-	{
-		const char_t* default_name = PUGIXML_TEXT(":anonymous");
-		const char_t enquotation_char = (flags & format_attribute_single_quote) ? '\'' : '"';
-
-		for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
-		{
-			if ((flags & (format_indent_attributes | format_raw)) == format_indent_attributes)
-			{
-				writer.write('\n');
-
-				text_output_indent(writer, indent, indent_length, depth + 1);
-			}
-			else
-			{
-				writer.write(' ');
-			}
-
-			writer.write_string(a->name ? a->name + 0 : default_name);
-			writer.write('=', enquotation_char);
-
-			if (a->value)
-				text_output(writer, a->value, ctx_special_attr, flags);
-
-			writer.write(enquotation_char);
-		}
-	}
-
-	PUGI__FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
-	{
-		const char_t* default_name = PUGIXML_TEXT(":anonymous");
-		const char_t* name = node->name ? node->name + 0 : default_name;
-
-		writer.write('<');
-		writer.write_string(name);
-
-		if (node->first_attribute)
-			node_output_attributes(writer, node, indent, indent_length, flags, depth);
-
-		// element nodes can have value if parse_embed_pcdata was used
-		if (!node->value)
-		{
-			if (!node->first_child)
-			{
-				if (flags & format_no_empty_element_tags)
-				{
-					writer.write('>', '<', '/');
-					writer.write_string(name);
-					writer.write('>');
-
-					return false;
-				}
-				else
-				{
-					if ((flags & format_raw) == 0)
-						writer.write(' ');
-
-					writer.write('/', '>');
-
-					return false;
-				}
-			}
-			else
-			{
-				writer.write('>');
-
-				return true;
-			}
-		}
-		else
-		{
-			writer.write('>');
-
-			text_output(writer, node->value, ctx_special_pcdata, flags);
-
-			if (!node->first_child)
-			{
-				writer.write('<', '/');
-				writer.write_string(name);
-				writer.write('>');
-
-				return false;
-			}
-			else
-			{
-				return true;
-			}
-		}
-	}
-
-	PUGI__FN void node_output_end(xml_buffered_writer& writer, xml_node_struct* node)
-	{
-		const char_t* default_name = PUGIXML_TEXT(":anonymous");
-		const char_t* name = node->name ? node->name + 0 : default_name;
-
-		writer.write('<', '/');
-		writer.write_string(name);
-		writer.write('>');
-	}
-
-	PUGI__FN void node_output_simple(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags)
-	{
-		const char_t* default_name = PUGIXML_TEXT(":anonymous");
-
-		switch (PUGI__NODETYPE(node))
-		{
-			case node_pcdata:
-				text_output(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""), ctx_special_pcdata, flags);
-				break;
-
-			case node_cdata:
-				text_output_cdata(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""));
-				break;
-
-			case node_comment:
-				node_output_comment(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""));
-				break;
-
-			case node_pi:
-				writer.write('<', '?');
-				writer.write_string(node->name ? node->name + 0 : default_name);
-
-				if (node->value)
-				{
-					writer.write(' ');
-					node_output_pi_value(writer, node->value);
-				}
-
-				writer.write('?', '>');
-				break;
-
-			case node_declaration:
-				writer.write('<', '?');
-				writer.write_string(node->name ? node->name + 0 : default_name);
-				node_output_attributes(writer, node, PUGIXML_TEXT(""), 0, flags | format_raw, 0);
-				writer.write('?', '>');
-				break;
-
-			case node_doctype:
-				writer.write('<', '!', 'D', 'O', 'C');
-				writer.write('T', 'Y', 'P', 'E');
-
-				if (node->value)
-				{
-					writer.write(' ');
-					writer.write_string(node->value);
-				}
-
-				writer.write('>');
-				break;
-
-			default:
-				assert(false && "Invalid node type"); // unreachable
-		}
-	}
-
-	enum indent_flags_t
-	{
-		indent_newline = 1,
-		indent_indent = 2
-	};
-
-	PUGI__FN void node_output(xml_buffered_writer& writer, xml_node_struct* root, const char_t* indent, unsigned int flags, unsigned int depth)
-	{
-		size_t indent_length = ((flags & (format_indent | format_indent_attributes)) && (flags & format_raw) == 0) ? strlength(indent) : 0;
-		unsigned int indent_flags = indent_indent;
-
-		xml_node_struct* node = root;
-
-		do
-		{
-			assert(node);
-
-			// begin writing current node
-			if (PUGI__NODETYPE(node) == node_pcdata || PUGI__NODETYPE(node) == node_cdata)
-			{
-				node_output_simple(writer, node, flags);
-
-				indent_flags = 0;
-			}
-			else
-			{
-				if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
-					writer.write('\n');
-
-				if ((indent_flags & indent_indent) && indent_length)
-					text_output_indent(writer, indent, indent_length, depth);
-
-				if (PUGI__NODETYPE(node) == node_element)
-				{
-					indent_flags = indent_newline | indent_indent;
-
-					if (node_output_start(writer, node, indent, indent_length, flags, depth))
-					{
-						// element nodes can have value if parse_embed_pcdata was used
-						if (node->value)
-							indent_flags = 0;
-
-						node = node->first_child;
-						depth++;
-						continue;
-					}
-				}
-				else if (PUGI__NODETYPE(node) == node_document)
-				{
-					indent_flags = indent_indent;
-
-					if (node->first_child)
-					{
-						node = node->first_child;
-						continue;
-					}
-				}
-				else
-				{
-					node_output_simple(writer, node, flags);
-
-					indent_flags = indent_newline | indent_indent;
-				}
-			}
-
-			// continue to the next node
-			while (node != root)
-			{
-				if (node->next_sibling)
-				{
-					node = node->next_sibling;
-					break;
-				}
-
-				node = node->parent;
-
-				// write closing node
-				if (PUGI__NODETYPE(node) == node_element)
-				{
-					depth--;
-
-					if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
-						writer.write('\n');
-
-					if ((indent_flags & indent_indent) && indent_length)
-						text_output_indent(writer, indent, indent_length, depth);
-
-					node_output_end(writer, node);
-
-					indent_flags = indent_newline | indent_indent;
-				}
-			}
-		}
-		while (node != root);
-
-		if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
-			writer.write('\n');
-	}
-
-	PUGI__FN bool has_declaration(xml_node_struct* node)
-	{
-		for (xml_node_struct* child = node->first_child; child; child = child->next_sibling)
-		{
-			xml_node_type type = PUGI__NODETYPE(child);
-
-			if (type == node_declaration) return true;
-			if (type == node_element) return false;
-		}
-
-		return false;
-	}
-
-	PUGI__FN bool is_attribute_of(xml_attribute_struct* attr, xml_node_struct* node)
-	{
-		for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
-			if (a == attr)
-				return true;
-
-		return false;
-	}
-
-	PUGI__FN bool allow_insert_attribute(xml_node_type parent)
-	{
-		return parent == node_element || parent == node_declaration;
-	}
-
-	PUGI__FN bool allow_insert_child(xml_node_type parent, xml_node_type child)
-	{
-		if (parent != node_document && parent != node_element) return false;
-		if (child == node_document || child == node_null) return false;
-		if (parent != node_document && (child == node_declaration || child == node_doctype)) return false;
-
-		return true;
-	}
-
-	PUGI__FN bool allow_move(xml_node parent, xml_node child)
-	{
-		// check that child can be a child of parent
-		if (!allow_insert_child(parent.type(), child.type()))
-			return false;
-
-		// check that node is not moved between documents
-		if (parent.root() != child.root())
-			return false;
-
-		// check that new parent is not in the child subtree
-		xml_node cur = parent;
-
-		while (cur)
-		{
-			if (cur == child)
-				return false;
-
-			cur = cur.parent();
-		}
-
-		return true;
-	}
-
-	template <typename String, typename Header>
-	PUGI__FN void node_copy_string(String& dest, Header& header, uintptr_t header_mask, char_t* source, Header& source_header, xml_allocator* alloc)
-	{
-		assert(!dest && (header & header_mask) == 0);
-
-		if (source)
-		{
-			if (alloc && (source_header & header_mask) == 0)
-			{
-				dest = source;
-
-				// since strcpy_insitu can reuse document buffer memory we need to mark both source and dest as shared
-				header |= xml_memory_page_contents_shared_mask;
-				source_header |= xml_memory_page_contents_shared_mask;
-			}
-			else
-				strcpy_insitu(dest, header, header_mask, source, strlength(source));
-		}
-	}
-
-	PUGI__FN void node_copy_contents(xml_node_struct* dn, xml_node_struct* sn, xml_allocator* shared_alloc)
-	{
-		node_copy_string(dn->name, dn->header, xml_memory_page_name_allocated_mask, sn->name, sn->header, shared_alloc);
-		node_copy_string(dn->value, dn->header, xml_memory_page_value_allocated_mask, sn->value, sn->header, shared_alloc);
-
-		for (xml_attribute_struct* sa = sn->first_attribute; sa; sa = sa->next_attribute)
-		{
-			xml_attribute_struct* da = append_new_attribute(dn, get_allocator(dn));
-
-			if (da)
-			{
-				node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc);
-				node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc);
-			}
-		}
-	}
-
-	PUGI__FN void node_copy_tree(xml_node_struct* dn, xml_node_struct* sn)
-	{
-		xml_allocator& alloc = get_allocator(dn);
-		xml_allocator* shared_alloc = (&alloc == &get_allocator(sn)) ? &alloc : 0;
-
-		node_copy_contents(dn, sn, shared_alloc);
-
-		xml_node_struct* dit = dn;
-		xml_node_struct* sit = sn->first_child;
-
-		while (sit && sit != sn)
-		{
-			// loop invariant: dit is inside the subtree rooted at dn
-			assert(dit);
-
-			// when a tree is copied into one of the descendants, we need to skip that subtree to avoid an infinite loop
-			if (sit != dn)
-			{
-				xml_node_struct* copy = append_new_node(dit, alloc, PUGI__NODETYPE(sit));
-
-				if (copy)
-				{
-					node_copy_contents(copy, sit, shared_alloc);
-
-					if (sit->first_child)
-					{
-						dit = copy;
-						sit = sit->first_child;
-						continue;
-					}
-				}
-			}
-
-			// continue to the next node
-			do
-			{
-				if (sit->next_sibling)
-				{
-					sit = sit->next_sibling;
-					break;
-				}
-
-				sit = sit->parent;
-				dit = dit->parent;
-
-				// loop invariant: dit is inside the subtree rooted at dn while sit is inside sn
-				assert(sit == sn || dit);
-			}
-			while (sit != sn);
-		}
-
-		assert(!sit || dit == dn->parent);
-	}
-
-	PUGI__FN void node_copy_attribute(xml_attribute_struct* da, xml_attribute_struct* sa)
-	{
-		xml_allocator& alloc = get_allocator(da);
-		xml_allocator* shared_alloc = (&alloc == &get_allocator(sa)) ? &alloc : 0;
-
-		node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc);
-		node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc);
-	}
-
-	inline bool is_text_node(xml_node_struct* node)
-	{
-		xml_node_type type = PUGI__NODETYPE(node);
-
-		return type == node_pcdata || type == node_cdata;
-	}
-
-	// get value with conversion functions
-	template <typename U> PUGI__FN PUGI__UNSIGNED_OVERFLOW U string_to_integer(const char_t* value, U minv, U maxv)
-	{
-		U result = 0;
-		const char_t* s = value;
-
-		while (PUGI__IS_CHARTYPE(*s, ct_space))
-			s++;
-
-		bool negative = (*s == '-');
-
-		s += (*s == '+' || *s == '-');
-
-		bool overflow = false;
-
-		if (s[0] == '0' && (s[1] | ' ') == 'x')
-		{
-			s += 2;
-
-			// since overflow detection relies on length of the sequence skip leading zeros
-			while (*s == '0')
-				s++;
-
-			const char_t* start = s;
-
-			for (;;)
-			{
-				if (static_cast<unsigned>(*s - '0') < 10)
-					result = result * 16 + (*s - '0');
-				else if (static_cast<unsigned>((*s | ' ') - 'a') < 6)
-					result = result * 16 + ((*s | ' ') - 'a' + 10);
-				else
-					break;
-
-				s++;
-			}
-
-			size_t digits = static_cast<size_t>(s - start);
-
-			overflow = digits > sizeof(U) * 2;
-		}
-		else
-		{
-			// since overflow detection relies on length of the sequence skip leading zeros
-			while (*s == '0')
-				s++;
-
-			const char_t* start = s;
-
-			for (;;)
-			{
-				if (static_cast<unsigned>(*s - '0') < 10)
-					result = result * 10 + (*s - '0');
-				else
-					break;
-
-				s++;
-			}
-
-			size_t digits = static_cast<size_t>(s - start);
-
-			PUGI__STATIC_ASSERT(sizeof(U) == 8 || sizeof(U) == 4 || sizeof(U) == 2);
-
-			const size_t max_digits10 = sizeof(U) == 8 ? 20 : sizeof(U) == 4 ? 10 : 5;
-			const char_t max_lead = sizeof(U) == 8 ? '1' : sizeof(U) == 4 ? '4' : '6';
-			const size_t high_bit = sizeof(U) * 8 - 1;
-
-			overflow = digits >= max_digits10 && !(digits == max_digits10 && (*start < max_lead || (*start == max_lead && result >> high_bit)));
-		}
-
-		if (negative)
-		{
-			// Workaround for crayc++ CC-3059: Expected no overflow in routine.
-		#ifdef _CRAYC
-			return (overflow || result > ~minv + 1) ? minv : ~result + 1;
-		#else
-			return (overflow || result > 0 - minv) ? minv : 0 - result;
-		#endif
-		}
-		else
-			return (overflow || result > maxv) ? maxv : result;
-	}
-
-	PUGI__FN int get_value_int(const char_t* value)
-	{
-		return string_to_integer<unsigned int>(value, static_cast<unsigned int>(INT_MIN), INT_MAX);
-	}
-
-	PUGI__FN unsigned int get_value_uint(const char_t* value)
-	{
-		return string_to_integer<unsigned int>(value, 0, UINT_MAX);
-	}
-
-	PUGI__FN double get_value_double(const char_t* value)
-	{
-	#ifdef PUGIXML_WCHAR_MODE
-		return wcstod(value, 0);
-	#else
-		return strtod(value, 0);
-	#endif
-	}
-
-	PUGI__FN float get_value_float(const char_t* value)
-	{
-	#ifdef PUGIXML_WCHAR_MODE
-		return static_cast<float>(wcstod(value, 0));
-	#else
-		return static_cast<float>(strtod(value, 0));
-	#endif
-	}
-
-	PUGI__FN bool get_value_bool(const char_t* value)
-	{
-		// only look at first char
-		char_t first = *value;
-
-		// 1*, t* (true), T* (True), y* (yes), Y* (YES)
-		return (first == '1' || first == 't' || first == 'T' || first == 'y' || first == 'Y');
-	}
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI__FN long long get_value_llong(const char_t* value)
-	{
-		return string_to_integer<unsigned long long>(value, static_cast<unsigned long long>(LLONG_MIN), LLONG_MAX);
-	}
-
-	PUGI__FN unsigned long long get_value_ullong(const char_t* value)
-	{
-		return string_to_integer<unsigned long long>(value, 0, ULLONG_MAX);
-	}
-#endif
-
-	template <typename U> PUGI__FN PUGI__UNSIGNED_OVERFLOW char_t* integer_to_string(char_t* begin, char_t* end, U value, bool negative)
-	{
-		char_t* result = end - 1;
-		U rest = negative ? 0 - value : value;
-
-		do
-		{
-			*result-- = static_cast<char_t>('0' + (rest % 10));
-			rest /= 10;
-		}
-		while (rest);
-
-		assert(result >= begin);
-		(void)begin;
-
-		*result = '-';
-
-		return result + !negative;
-	}
-
-	// set value with conversion functions
-	template <typename String, typename Header>
-	PUGI__FN bool set_value_ascii(String& dest, Header& header, uintptr_t header_mask, char* buf)
-	{
-	#ifdef PUGIXML_WCHAR_MODE
-		char_t wbuf[128];
-		assert(strlen(buf) < sizeof(wbuf) / sizeof(wbuf[0]));
-
-		size_t offset = 0;
-		for (; buf[offset]; ++offset) wbuf[offset] = buf[offset];
-
-		return strcpy_insitu(dest, header, header_mask, wbuf, offset);
-	#else
-		return strcpy_insitu(dest, header, header_mask, buf, strlen(buf));
-	#endif
-	}
-
-	template <typename U, typename String, typename Header>
-	PUGI__FN bool set_value_integer(String& dest, Header& header, uintptr_t header_mask, U value, bool negative)
-	{
-		char_t buf[64];
-		char_t* end = buf + sizeof(buf) / sizeof(buf[0]);
-		char_t* begin = integer_to_string(buf, end, value, negative);
-
-		return strcpy_insitu(dest, header, header_mask, begin, end - begin);
-	}
-
-	template <typename String, typename Header>
-	PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, float value, int precision)
-	{
-		char buf[128];
-		PUGI__SNPRINTF(buf, "%.*g", precision, double(value));
-
-		return set_value_ascii(dest, header, header_mask, buf);
-	}
-
-	template <typename String, typename Header>
-	PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, double value, int precision)
-	{
-		char buf[128];
-		PUGI__SNPRINTF(buf, "%.*g", precision, value);
-
-		return set_value_ascii(dest, header, header_mask, buf);
-	}
-
-	template <typename String, typename Header>
-	PUGI__FN bool set_value_bool(String& dest, Header& header, uintptr_t header_mask, bool value)
-	{
-		return strcpy_insitu(dest, header, header_mask, value ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"), value ? 4 : 5);
-	}
-
-	PUGI__FN xml_parse_result load_buffer_impl(xml_document_struct* doc, xml_node_struct* root, void* contents, size_t size, unsigned int options, xml_encoding encoding, bool is_mutable, bool own, char_t** out_buffer)
-	{
-		// check input buffer
-		if (!contents && size) return make_parse_result(status_io_error);
-
-		// get actual encoding
-		xml_encoding buffer_encoding = impl::get_buffer_encoding(encoding, contents, size);
-
-		// if convert_buffer below throws bad_alloc, we still need to deallocate contents if we own it
-		auto_deleter<void> contents_guard(own ? contents : 0, xml_memory::deallocate);
-
-		// get private buffer
-		char_t* buffer = 0;
-		size_t length = 0;
-
-		// coverity[var_deref_model]
-		if (!impl::convert_buffer(buffer, length, buffer_encoding, contents, size, is_mutable)) return impl::make_parse_result(status_out_of_memory);
-
-		// after this we either deallocate contents (below) or hold on to it via doc->buffer, so we don't need to guard it
-		contents_guard.release();
-
-		// delete original buffer if we performed a conversion
-		if (own && buffer != contents && contents) impl::xml_memory::deallocate(contents);
-
-		// grab onto buffer if it's our buffer, user is responsible for deallocating contents himself
-		if (own || buffer != contents) *out_buffer = buffer;
-
-		// store buffer for offset_debug
-		doc->buffer = buffer;
-
-		// parse
-		xml_parse_result res = impl::xml_parser::parse(buffer, length, doc, root, options);
-
-		// remember encoding
-		res.encoding = buffer_encoding;
-
-		return res;
-	}
-
-	// we need to get length of entire file to load it in memory; the only (relatively) sane way to do it is via seek/tell trick
-	PUGI__FN xml_parse_status get_file_size(FILE* file, size_t& out_result)
-	{
-	#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400
-		// there are 64-bit versions of fseek/ftell, let's use them
-		typedef __int64 length_type;
-
-		_fseeki64(file, 0, SEEK_END);
-		length_type length = _ftelli64(file);
-		_fseeki64(file, 0, SEEK_SET);
-	#elif defined(__MINGW32__) && !defined(__NO_MINGW_LFS) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR))
-		// there are 64-bit versions of fseek/ftell, let's use them
-		typedef off64_t length_type;
-
-		fseeko64(file, 0, SEEK_END);
-		length_type length = ftello64(file);
-		fseeko64(file, 0, SEEK_SET);
-	#else
-		// if this is a 32-bit OS, long is enough; if this is a unix system, long is 64-bit, which is enough; otherwise we can't do anything anyway.
-		typedef long length_type;
-
-		fseek(file, 0, SEEK_END);
-		length_type length = ftell(file);
-		fseek(file, 0, SEEK_SET);
-	#endif
-
-		// check for I/O errors
-		if (length < 0) return status_io_error;
-
-		// check for overflow
-		size_t result = static_cast<size_t>(length);
-
-		if (static_cast<length_type>(result) != length) return status_out_of_memory;
-
-		// finalize
-		out_result = result;
-
-		return status_ok;
-	}
-
-	// This function assumes that buffer has extra sizeof(char_t) writable bytes after size
-	PUGI__FN size_t zero_terminate_buffer(void* buffer, size_t size, xml_encoding encoding)
-	{
-		// We only need to zero-terminate if encoding conversion does not do it for us
-	#ifdef PUGIXML_WCHAR_MODE
-		xml_encoding wchar_encoding = get_wchar_encoding();
-
-		if (encoding == wchar_encoding || need_endian_swap_utf(encoding, wchar_encoding))
-		{
-			size_t length = size / sizeof(char_t);
-
-			static_cast<char_t*>(buffer)[length] = 0;
-			return (length + 1) * sizeof(char_t);
-		}
-	#else
-		if (encoding == encoding_utf8)
-		{
-			static_cast<char*>(buffer)[size] = 0;
-			return size + 1;
-		}
-	#endif
-
-		return size;
-	}
-
-	PUGI__FN xml_parse_result load_file_impl(xml_document_struct* doc, FILE* file, unsigned int options, xml_encoding encoding, char_t** out_buffer)
-	{
-		if (!file) return make_parse_result(status_file_not_found);
-
-		// get file size (can result in I/O errors)
-		size_t size = 0;
-		xml_parse_status size_status = get_file_size(file, size);
-		if (size_status != status_ok) return make_parse_result(size_status);
-
-		size_t max_suffix_size = sizeof(char_t);
-
-		// allocate buffer for the whole file
-		char* contents = static_cast<char*>(xml_memory::allocate(size + max_suffix_size));
-		if (!contents) return make_parse_result(status_out_of_memory);
-
-		// read file in memory
-		size_t read_size = fread(contents, 1, size, file);
-
-		if (read_size != size)
-		{
-			xml_memory::deallocate(contents);
-			return make_parse_result(status_io_error);
-		}
-
-		xml_encoding real_encoding = get_buffer_encoding(encoding, contents, size);
-
-		return load_buffer_impl(doc, doc, contents, zero_terminate_buffer(contents, size, real_encoding), options, real_encoding, true, true, out_buffer);
-	}
-
-	PUGI__FN void close_file(FILE* file)
-	{
-		fclose(file);
-	}
-
-#ifndef PUGIXML_NO_STL
-	template <typename T> struct xml_stream_chunk
-	{
-		static xml_stream_chunk* create()
-		{
-			void* memory = xml_memory::allocate(sizeof(xml_stream_chunk));
-			if (!memory) return 0;
-
-			return new (memory) xml_stream_chunk();
-		}
-
-		static void destroy(xml_stream_chunk* chunk)
-		{
-			// free chunk chain
-			while (chunk)
-			{
-				xml_stream_chunk* next_ = chunk->next;
-
-				xml_memory::deallocate(chunk);
-
-				chunk = next_;
-			}
-		}
-
-		xml_stream_chunk(): next(0), size(0)
-		{
-		}
-
-		xml_stream_chunk* next;
-		size_t size;
-
-		T data[xml_memory_page_size / sizeof(T)];
-	};
-
-	template <typename T> PUGI__FN xml_parse_status load_stream_data_noseek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
-	{
-		auto_deleter<xml_stream_chunk<T> > chunks(0, xml_stream_chunk<T>::destroy);
-
-		// read file to a chunk list
-		size_t total = 0;
-		xml_stream_chunk<T>* last = 0;
-
-		while (!stream.eof())
-		{
-			// allocate new chunk
-			xml_stream_chunk<T>* chunk = xml_stream_chunk<T>::create();
-			if (!chunk) return status_out_of_memory;
-
-			// append chunk to list
-			if (last) last = last->next = chunk;
-			else chunks.data = last = chunk;
-
-			// read data to chunk
-			stream.read(chunk->data, static_cast<std::streamsize>(sizeof(chunk->data) / sizeof(T)));
-			chunk->size = static_cast<size_t>(stream.gcount()) * sizeof(T);
-
-			// read may set failbit | eofbit in case gcount() is less than read length, so check for other I/O errors
-			if (stream.bad() || (!stream.eof() && stream.fail())) return status_io_error;
-
-			// guard against huge files (chunk size is small enough to make this overflow check work)
-			if (total + chunk->size < total) return status_out_of_memory;
-			total += chunk->size;
-		}
-
-		size_t max_suffix_size = sizeof(char_t);
-
-		// copy chunk list to a contiguous buffer
-		char* buffer = static_cast<char*>(xml_memory::allocate(total + max_suffix_size));
-		if (!buffer) return status_out_of_memory;
-
-		char* write = buffer;
-
-		for (xml_stream_chunk<T>* chunk = chunks.data; chunk; chunk = chunk->next)
-		{
-			assert(write + chunk->size <= buffer + total);
-			memcpy(write, chunk->data, chunk->size);
-			write += chunk->size;
-		}
-
-		assert(write == buffer + total);
-
-		// return buffer
-		*out_buffer = buffer;
-		*out_size = total;
-
-		return status_ok;
-	}
-
-	template <typename T> PUGI__FN xml_parse_status load_stream_data_seek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
-	{
-		// get length of remaining data in stream
-		typename std::basic_istream<T>::pos_type pos = stream.tellg();
-		stream.seekg(0, std::ios::end);
-		std::streamoff length = stream.tellg() - pos;
-		stream.seekg(pos);
-
-		if (stream.fail() || pos < 0) return status_io_error;
-
-		// guard against huge files
-		size_t read_length = static_cast<size_t>(length);
-
-		if (static_cast<std::streamsize>(read_length) != length || length < 0) return status_out_of_memory;
-
-		size_t max_suffix_size = sizeof(char_t);
-
-		// read stream data into memory (guard against stream exceptions with buffer holder)
-		auto_deleter<void> buffer(xml_memory::allocate(read_length * sizeof(T) + max_suffix_size), xml_memory::deallocate);
-		if (!buffer.data) return status_out_of_memory;
-
-		stream.read(static_cast<T*>(buffer.data), static_cast<std::streamsize>(read_length));
-
-		// read may set failbit | eofbit in case gcount() is less than read_length (i.e. line ending conversion), so check for other I/O errors
-		if (stream.bad() || (!stream.eof() && stream.fail())) return status_io_error;
-
-		// return buffer
-		size_t actual_length = static_cast<size_t>(stream.gcount());
-		assert(actual_length <= read_length);
-
-		*out_buffer = buffer.release();
-		*out_size = actual_length * sizeof(T);
-
-		return status_ok;
-	}
-
-	template <typename T> PUGI__FN xml_parse_result load_stream_impl(xml_document_struct* doc, std::basic_istream<T>& stream, unsigned int options, xml_encoding encoding, char_t** out_buffer)
-	{
-		void* buffer = 0;
-		size_t size = 0;
-		xml_parse_status status = status_ok;
-
-		// if stream has an error bit set, bail out (otherwise tellg() can fail and we'll clear error bits)
-		if (stream.fail()) return make_parse_result(status_io_error);
-
-		// load stream to memory (using seek-based implementation if possible, since it's faster and takes less memory)
-		if (stream.tellg() < 0)
-		{
-			stream.clear(); // clear error flags that could be set by a failing tellg
-			status = load_stream_data_noseek(stream, &buffer, &size);
-		}
-		else
-			status = load_stream_data_seek(stream, &buffer, &size);
-
-		if (status != status_ok) return make_parse_result(status);
-
-		xml_encoding real_encoding = get_buffer_encoding(encoding, buffer, size);
-
-		return load_buffer_impl(doc, doc, buffer, zero_terminate_buffer(buffer, size, real_encoding), options, real_encoding, true, true, out_buffer);
-	}
-#endif
-
-#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__) || (defined(__MINGW32__) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR)))
-	PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
-	{
-#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400
-		FILE* file = 0;
-		return _wfopen_s(&file, path, mode) == 0 ? file : 0;
-#else
-		return _wfopen(path, mode);
-#endif
-	}
-#else
-	PUGI__FN char* convert_path_heap(const wchar_t* str)
-	{
-		assert(str);
-
-		// first pass: get length in utf8 characters
-		size_t length = strlength_wide(str);
-		size_t size = as_utf8_begin(str, length);
-
-		// allocate resulting string
-		char* result = static_cast<char*>(xml_memory::allocate(size + 1));
-		if (!result) return 0;
-
-		// second pass: convert to utf8
-		as_utf8_end(result, size, str, length);
-
-		// zero-terminate
-		result[size] = 0;
-
-		return result;
-	}
-
-	PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
-	{
-		// there is no standard function to open wide paths, so our best bet is to try utf8 path
-		char* path_utf8 = convert_path_heap(path);
-		if (!path_utf8) return 0;
-
-		// convert mode to ASCII (we mirror _wfopen interface)
-		char mode_ascii[4] = {0};
-		for (size_t i = 0; mode[i]; ++i) mode_ascii[i] = static_cast<char>(mode[i]);
-
-		// try to open the utf8 path
-		FILE* result = fopen(path_utf8, mode_ascii);
-
-		// free dummy buffer
-		xml_memory::deallocate(path_utf8);
-
-		return result;
-	}
-#endif
-
-	PUGI__FN FILE* open_file(const char* path, const char* mode)
-	{
-#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400
-		FILE* file = 0;
-		return fopen_s(&file, path, mode) == 0 ? file : 0;
-#else
-		return fopen(path, mode);
-#endif
-	}
-
-	PUGI__FN bool save_file_impl(const xml_document& doc, FILE* file, const char_t* indent, unsigned int flags, xml_encoding encoding)
-	{
-		if (!file) return false;
-
-		xml_writer_file writer(file);
-		doc.save(writer, indent, flags, encoding);
-
-		return fflush(file) == 0 && ferror(file) == 0;
-	}
-
-	struct name_null_sentry
-	{
-		xml_node_struct* node;
-		char_t* name;
-
-		name_null_sentry(xml_node_struct* node_): node(node_), name(node_->name)
-		{
-			node->name = 0;
-		}
-
-		~name_null_sentry()
-		{
-			node->name = name;
-		}
-	};
-PUGI__NS_END
-
-namespace pugi
-{
-	PUGI__FN xml_writer_file::xml_writer_file(void* file_): file(file_)
-	{
-	}
-
-	PUGI__FN void xml_writer_file::write(const void* data, size_t size)
-	{
-		size_t result = fwrite(data, 1, size, static_cast<FILE*>(file));
-		(void)!result; // unfortunately we can't do proper error handling here
-	}
-
-#ifndef PUGIXML_NO_STL
-	PUGI__FN xml_writer_stream::xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream): narrow_stream(&stream), wide_stream(0)
-	{
-	}
-
-	PUGI__FN xml_writer_stream::xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream): narrow_stream(0), wide_stream(&stream)
-	{
-	}
-
-	PUGI__FN void xml_writer_stream::write(const void* data, size_t size)
-	{
-		if (narrow_stream)
-		{
-			assert(!wide_stream);
-			narrow_stream->write(reinterpret_cast<const char*>(data), static_cast<std::streamsize>(size));
-		}
-		else
-		{
-			assert(wide_stream);
-			assert(size % sizeof(wchar_t) == 0);
-
-			wide_stream->write(reinterpret_cast<const wchar_t*>(data), static_cast<std::streamsize>(size / sizeof(wchar_t)));
-		}
-	}
-#endif
-
-	PUGI__FN xml_tree_walker::xml_tree_walker(): _depth(0)
-	{
-	}
-
-	PUGI__FN xml_tree_walker::~xml_tree_walker()
-	{
-	}
-
-	PUGI__FN int xml_tree_walker::depth() const
-	{
-		return _depth;
-	}
-
-	PUGI__FN bool xml_tree_walker::begin(xml_node&)
-	{
-		return true;
-	}
-
-	PUGI__FN bool xml_tree_walker::end(xml_node&)
-	{
-		return true;
-	}
-
-	PUGI__FN xml_attribute::xml_attribute(): _attr(0)
-	{
-	}
-
-	PUGI__FN xml_attribute::xml_attribute(xml_attribute_struct* attr): _attr(attr)
-	{
-	}
-
-	PUGI__FN static void unspecified_bool_xml_attribute(xml_attribute***)
-	{
-	}
-
-	PUGI__FN xml_attribute::operator xml_attribute::unspecified_bool_type() const
-	{
-		return _attr ? unspecified_bool_xml_attribute : 0;
-	}
-
-	PUGI__FN bool xml_attribute::operator!() const
-	{
-		return !_attr;
-	}
-
-	PUGI__FN bool xml_attribute::operator==(const xml_attribute& r) const
-	{
-		return (_attr == r._attr);
-	}
-
-	PUGI__FN bool xml_attribute::operator!=(const xml_attribute& r) const
-	{
-		return (_attr != r._attr);
-	}
-
-	PUGI__FN bool xml_attribute::operator<(const xml_attribute& r) const
-	{
-		return (_attr < r._attr);
-	}
-
-	PUGI__FN bool xml_attribute::operator>(const xml_attribute& r) const
-	{
-		return (_attr > r._attr);
-	}
-
-	PUGI__FN bool xml_attribute::operator<=(const xml_attribute& r) const
-	{
-		return (_attr <= r._attr);
-	}
-
-	PUGI__FN bool xml_attribute::operator>=(const xml_attribute& r) const
-	{
-		return (_attr >= r._attr);
-	}
-
-	PUGI__FN xml_attribute xml_attribute::next_attribute() const
-	{
-		if (!_attr) return xml_attribute();
-		return xml_attribute(_attr->next_attribute);
-	}
-
-	PUGI__FN xml_attribute xml_attribute::previous_attribute() const
-	{
-		if (!_attr) return xml_attribute();
-		xml_attribute_struct* prev = _attr->prev_attribute_c;
-		return prev->next_attribute ? xml_attribute(prev) : xml_attribute();
-	}
-
-	PUGI__FN const char_t* xml_attribute::as_string(const char_t* def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? value : def;
-	}
-
-	PUGI__FN int xml_attribute::as_int(int def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? impl::get_value_int(value) : def;
-	}
-
-	PUGI__FN unsigned int xml_attribute::as_uint(unsigned int def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? impl::get_value_uint(value) : def;
-	}
-
-	PUGI__FN double xml_attribute::as_double(double def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? impl::get_value_double(value) : def;
-	}
-
-	PUGI__FN float xml_attribute::as_float(float def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? impl::get_value_float(value) : def;
-	}
-
-	PUGI__FN bool xml_attribute::as_bool(bool def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? impl::get_value_bool(value) : def;
-	}
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI__FN long long xml_attribute::as_llong(long long def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? impl::get_value_llong(value) : def;
-	}
-
-	PUGI__FN unsigned long long xml_attribute::as_ullong(unsigned long long def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? impl::get_value_ullong(value) : def;
-	}
-#endif
-
-	PUGI__FN bool xml_attribute::empty() const
-	{
-		return !_attr;
-	}
-
-	PUGI__FN const char_t* xml_attribute::name() const
-	{
-		if (!_attr) return PUGIXML_TEXT("");
-		const char_t* name = _attr->name;
-		return name ? name : PUGIXML_TEXT("");
-	}
-
-	PUGI__FN const char_t* xml_attribute::value() const
-	{
-		if (!_attr) return PUGIXML_TEXT("");
-		const char_t* value = _attr->value;
-		return value ? value : PUGIXML_TEXT("");
-	}
-
-	PUGI__FN size_t xml_attribute::hash_value() const
-	{
-		return static_cast<size_t>(reinterpret_cast<uintptr_t>(_attr) / sizeof(xml_attribute_struct));
-	}
-
-	PUGI__FN xml_attribute_struct* xml_attribute::internal_object() const
-	{
-		return _attr;
-	}
-
-	PUGI__FN xml_attribute& xml_attribute::operator=(const char_t* rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_attribute& xml_attribute::operator=(int rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned int rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_attribute& xml_attribute::operator=(long rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned long rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_attribute& xml_attribute::operator=(double rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_attribute& xml_attribute::operator=(float rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_attribute& xml_attribute::operator=(bool rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI__FN xml_attribute& xml_attribute::operator=(long long rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned long long rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-#endif
-
-	PUGI__FN bool xml_attribute::set_name(const char_t* rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::strcpy_insitu(_attr->name, _attr->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs));
-	}
-
-	PUGI__FN bool xml_attribute::set_value(const char_t* rhs, size_t sz)
-	{
-		if (!_attr) return false;
-
-		return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, sz);
-	}
-
-	PUGI__FN bool xml_attribute::set_value(const char_t* rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs));
-	}
-
-	PUGI__FN bool xml_attribute::set_value(int rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_integer<unsigned int>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
-	}
-
-	PUGI__FN bool xml_attribute::set_value(unsigned int rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_integer<unsigned int>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
-	}
-
-	PUGI__FN bool xml_attribute::set_value(long rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_integer<unsigned long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
-	}
-
-	PUGI__FN bool xml_attribute::set_value(unsigned long rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_integer<unsigned long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
-	}
-
-	PUGI__FN bool xml_attribute::set_value(double rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, default_double_precision);
-	}
-
-	PUGI__FN bool xml_attribute::set_value(double rhs, int precision)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, precision);
-	}
-
-	PUGI__FN bool xml_attribute::set_value(float rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, default_float_precision);
-	}
-
-	PUGI__FN bool xml_attribute::set_value(float rhs, int precision)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, precision);
-	}
-
-	PUGI__FN bool xml_attribute::set_value(bool rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_bool(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs);
-	}
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI__FN bool xml_attribute::set_value(long long rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_integer<unsigned long long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
-	}
-
-	PUGI__FN bool xml_attribute::set_value(unsigned long long rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_integer<unsigned long long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
-	}
-#endif
-
-#ifdef __BORLANDC__
-	PUGI__FN bool operator&&(const xml_attribute& lhs, bool rhs)
-	{
-		return (bool)lhs && rhs;
-	}
-
-	PUGI__FN bool operator||(const xml_attribute& lhs, bool rhs)
-	{
-		return (bool)lhs || rhs;
-	}
-#endif
-
-	PUGI__FN xml_node::xml_node(): _root(0)
-	{
-	}
-
-	PUGI__FN xml_node::xml_node(xml_node_struct* p): _root(p)
-	{
-	}
-
-	PUGI__FN static void unspecified_bool_xml_node(xml_node***)
-	{
-	}
-
-	PUGI__FN xml_node::operator xml_node::unspecified_bool_type() const
-	{
-		return _root ? unspecified_bool_xml_node : 0;
-	}
-
-	PUGI__FN bool xml_node::operator!() const
-	{
-		return !_root;
-	}
-
-	PUGI__FN xml_node::iterator xml_node::begin() const
-	{
-		return iterator(_root ? _root->first_child + 0 : 0, _root);
-	}
-
-	PUGI__FN xml_node::iterator xml_node::end() const
-	{
-		return iterator(0, _root);
-	}
-
-	PUGI__FN xml_node::attribute_iterator xml_node::attributes_begin() const
-	{
-		return attribute_iterator(_root ? _root->first_attribute + 0 : 0, _root);
-	}
-
-	PUGI__FN xml_node::attribute_iterator xml_node::attributes_end() const
-	{
-		return attribute_iterator(0, _root);
-	}
-
-	PUGI__FN xml_object_range<xml_node_iterator> xml_node::children() const
-	{
-		return xml_object_range<xml_node_iterator>(begin(), end());
-	}
-
-	PUGI__FN xml_object_range<xml_named_node_iterator> xml_node::children(const char_t* name_) const
-	{
-		return xml_object_range<xml_named_node_iterator>(xml_named_node_iterator(child(name_)._root, _root, name_), xml_named_node_iterator(0, _root, name_));
-	}
-
-	PUGI__FN xml_object_range<xml_attribute_iterator> xml_node::attributes() const
-	{
-		return xml_object_range<xml_attribute_iterator>(attributes_begin(), attributes_end());
-	}
-
-	PUGI__FN bool xml_node::operator==(const xml_node& r) const
-	{
-		return (_root == r._root);
-	}
-
-	PUGI__FN bool xml_node::operator!=(const xml_node& r) const
-	{
-		return (_root != r._root);
-	}
-
-	PUGI__FN bool xml_node::operator<(const xml_node& r) const
-	{
-		return (_root < r._root);
-	}
-
-	PUGI__FN bool xml_node::operator>(const xml_node& r) const
-	{
-		return (_root > r._root);
-	}
-
-	PUGI__FN bool xml_node::operator<=(const xml_node& r) const
-	{
-		return (_root <= r._root);
-	}
-
-	PUGI__FN bool xml_node::operator>=(const xml_node& r) const
-	{
-		return (_root >= r._root);
-	}
-
-	PUGI__FN bool xml_node::empty() const
-	{
-		return !_root;
-	}
-
-	PUGI__FN const char_t* xml_node::name() const
-	{
-		if (!_root) return PUGIXML_TEXT("");
-		const char_t* name = _root->name;
-		return name ? name : PUGIXML_TEXT("");
-	}
-
-	PUGI__FN xml_node_type xml_node::type() const
-	{
-		return _root ? PUGI__NODETYPE(_root) : node_null;
-	}
-
-	PUGI__FN const char_t* xml_node::value() const
-	{
-		if (!_root) return PUGIXML_TEXT("");
-		const char_t* value = _root->value;
-		return value ? value : PUGIXML_TEXT("");
-	}
-
-	PUGI__FN xml_node xml_node::child(const char_t* name_) const
-	{
-		if (!_root) return xml_node();
-
-		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
-		{
-			const char_t* iname = i->name;
-			if (iname && impl::strequal(name_, iname))
-				return xml_node(i);
-		}
-
-		return xml_node();
-	}
-
-	PUGI__FN xml_attribute xml_node::attribute(const char_t* name_) const
-	{
-		if (!_root) return xml_attribute();
-
-		for (xml_attribute_struct* i = _root->first_attribute; i; i = i->next_attribute)
-		{
-			const char_t* iname = i->name;
-			if (iname && impl::strequal(name_, iname))
-				return xml_attribute(i);
-		}
-
-		return xml_attribute();
-	}
-
-	PUGI__FN xml_node xml_node::next_sibling(const char_t* name_) const
-	{
-		if (!_root) return xml_node();
-
-		for (xml_node_struct* i = _root->next_sibling; i; i = i->next_sibling)
-		{
-			const char_t* iname = i->name;
-			if (iname && impl::strequal(name_, iname))
-				return xml_node(i);
-		}
-
-		return xml_node();
-	}
-
-	PUGI__FN xml_node xml_node::next_sibling() const
-	{
-		return _root ? xml_node(_root->next_sibling) : xml_node();
-	}
-
-	PUGI__FN xml_node xml_node::previous_sibling(const char_t* name_) const
-	{
-		if (!_root) return xml_node();
-
-		for (xml_node_struct* i = _root->prev_sibling_c; i->next_sibling; i = i->prev_sibling_c)
-		{
-			const char_t* iname = i->name;
-			if (iname && impl::strequal(name_, iname))
-				return xml_node(i);
-		}
-
-		return xml_node();
-	}
-
-	PUGI__FN xml_attribute xml_node::attribute(const char_t* name_, xml_attribute& hint_) const
-	{
-		xml_attribute_struct* hint = hint_._attr;
-
-		// if hint is not an attribute of node, behavior is not defined
-		assert(!hint || (_root && impl::is_attribute_of(hint, _root)));
-
-		if (!_root) return xml_attribute();
-
-		// optimistically search from hint up until the end
-		for (xml_attribute_struct* i = hint; i; i = i->next_attribute)
-		{
-			const char_t* iname = i->name;
-			if (iname && impl::strequal(name_, iname))
-			{
-				// update hint to maximize efficiency of searching for consecutive attributes
-				hint_._attr = i->next_attribute;
-
-				return xml_attribute(i);
-			}
-		}
-
-		// wrap around and search from the first attribute until the hint
-		// 'j' null pointer check is technically redundant, but it prevents a crash in case the assertion above fails
-		for (xml_attribute_struct* j = _root->first_attribute; j && j != hint; j = j->next_attribute)
-		{
-			const char_t* jname = j->name;
-			if (jname && impl::strequal(name_, jname))
-			{
-				// update hint to maximize efficiency of searching for consecutive attributes
-				hint_._attr = j->next_attribute;
-
-				return xml_attribute(j);
-			}
-		}
-
-		return xml_attribute();
-	}
-
-	PUGI__FN xml_node xml_node::previous_sibling() const
-	{
-		if (!_root) return xml_node();
-		xml_node_struct* prev = _root->prev_sibling_c;
-		return prev->next_sibling ? xml_node(prev) : xml_node();
-	}
-
-	PUGI__FN xml_node xml_node::parent() const
-	{
-		return _root ? xml_node(_root->parent) : xml_node();
-	}
-
-	PUGI__FN xml_node xml_node::root() const
-	{
-		return _root ? xml_node(&impl::get_document(_root)) : xml_node();
-	}
-
-	PUGI__FN xml_text xml_node::text() const
-	{
-		return xml_text(_root);
-	}
-
-	PUGI__FN const char_t* xml_node::child_value() const
-	{
-		if (!_root) return PUGIXML_TEXT("");
-
-		// element nodes can have value if parse_embed_pcdata was used
-		if (PUGI__NODETYPE(_root) == node_element && _root->value)
-			return _root->value;
-
-		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
-		{
-			const char_t* ivalue = i->value;
-			if (impl::is_text_node(i) && ivalue)
-				return ivalue;
-		}
-
-		return PUGIXML_TEXT("");
-	}
-
-	PUGI__FN const char_t* xml_node::child_value(const char_t* name_) const
-	{
-		return child(name_).child_value();
-	}
-
-	PUGI__FN xml_attribute xml_node::first_attribute() const
-	{
-		if (!_root) return xml_attribute();
-		return xml_attribute(_root->first_attribute);
-	}
-
-	PUGI__FN xml_attribute xml_node::last_attribute() const
-	{
-		if (!_root) return xml_attribute();
-		xml_attribute_struct* first = _root->first_attribute;
-		return first ? xml_attribute(first->prev_attribute_c) : xml_attribute();
-	}
-
-	PUGI__FN xml_node xml_node::first_child() const
-	{
-		if (!_root) return xml_node();
-		return xml_node(_root->first_child);
-	}
-
-	PUGI__FN xml_node xml_node::last_child() const
-	{
-		if (!_root) return xml_node();
-		xml_node_struct* first = _root->first_child;
-		return first ? xml_node(first->prev_sibling_c) : xml_node();
-	}
-
-	PUGI__FN bool xml_node::set_name(const char_t* rhs)
-	{
-		xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null;
-
-		if (type_ != node_element && type_ != node_pi && type_ != node_declaration)
-			return false;
-
-		return impl::strcpy_insitu(_root->name, _root->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs));
-	}
-
-	PUGI__FN bool xml_node::set_value(const char_t* rhs, size_t sz)
-	{
-		xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null;
-
-		if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype)
-			return false;
-
-		return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs, sz);
-	}
-
-	PUGI__FN bool xml_node::set_value(const char_t* rhs)
-	{
-		xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null;
-
-		if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype)
-			return false;
-
-		return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs));
-	}
-
-	PUGI__FN xml_attribute xml_node::append_attribute(const char_t* name_)
-	{
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::append_attribute(a._attr, _root);
-
-		a.set_name(name_);
-
-		return a;
-	}
-
-	PUGI__FN xml_attribute xml_node::prepend_attribute(const char_t* name_)
-	{
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::prepend_attribute(a._attr, _root);
-
-		a.set_name(name_);
-
-		return a;
-	}
-
-	PUGI__FN xml_attribute xml_node::insert_attribute_after(const char_t* name_, const xml_attribute& attr)
-	{
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::insert_attribute_after(a._attr, attr._attr, _root);
-
-		a.set_name(name_);
-
-		return a;
-	}
-
-	PUGI__FN xml_attribute xml_node::insert_attribute_before(const char_t* name_, const xml_attribute& attr)
-	{
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::insert_attribute_before(a._attr, attr._attr, _root);
-
-		a.set_name(name_);
-
-		return a;
-	}
-
-	PUGI__FN xml_attribute xml_node::append_copy(const xml_attribute& proto)
-	{
-		if (!proto) return xml_attribute();
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::append_attribute(a._attr, _root);
-		impl::node_copy_attribute(a._attr, proto._attr);
-
-		return a;
-	}
-
-	PUGI__FN xml_attribute xml_node::prepend_copy(const xml_attribute& proto)
-	{
-		if (!proto) return xml_attribute();
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::prepend_attribute(a._attr, _root);
-		impl::node_copy_attribute(a._attr, proto._attr);
-
-		return a;
-	}
-
-	PUGI__FN xml_attribute xml_node::insert_copy_after(const xml_attribute& proto, const xml_attribute& attr)
-	{
-		if (!proto) return xml_attribute();
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::insert_attribute_after(a._attr, attr._attr, _root);
-		impl::node_copy_attribute(a._attr, proto._attr);
-
-		return a;
-	}
-
-	PUGI__FN xml_attribute xml_node::insert_copy_before(const xml_attribute& proto, const xml_attribute& attr)
-	{
-		if (!proto) return xml_attribute();
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::insert_attribute_before(a._attr, attr._attr, _root);
-		impl::node_copy_attribute(a._attr, proto._attr);
-
-		return a;
-	}
-
-	PUGI__FN xml_node xml_node::append_child(xml_node_type type_)
-	{
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::append_node(n._root, _root);
-
-		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
-
-		return n;
-	}
-
-	PUGI__FN xml_node xml_node::prepend_child(xml_node_type type_)
-	{
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::prepend_node(n._root, _root);
-
-		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
-
-		return n;
-	}
-
-	PUGI__FN xml_node xml_node::insert_child_before(xml_node_type type_, const xml_node& node)
-	{
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-		if (!node._root || node._root->parent != _root) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::insert_node_before(n._root, node._root);
-
-		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
-
-		return n;
-	}
-
-	PUGI__FN xml_node xml_node::insert_child_after(xml_node_type type_, const xml_node& node)
-	{
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-		if (!node._root || node._root->parent != _root) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::insert_node_after(n._root, node._root);
-
-		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
-
-		return n;
-	}
-
-	PUGI__FN xml_node xml_node::append_child(const char_t* name_)
-	{
-		xml_node result = append_child(node_element);
-
-		result.set_name(name_);
-
-		return result;
-	}
-
-	PUGI__FN xml_node xml_node::prepend_child(const char_t* name_)
-	{
-		xml_node result = prepend_child(node_element);
-
-		result.set_name(name_);
-
-		return result;
-	}
-
-	PUGI__FN xml_node xml_node::insert_child_after(const char_t* name_, const xml_node& node)
-	{
-		xml_node result = insert_child_after(node_element, node);
-
-		result.set_name(name_);
-
-		return result;
-	}
-
-	PUGI__FN xml_node xml_node::insert_child_before(const char_t* name_, const xml_node& node)
-	{
-		xml_node result = insert_child_before(node_element, node);
-
-		result.set_name(name_);
-
-		return result;
-	}
-
-	PUGI__FN xml_node xml_node::append_copy(const xml_node& proto)
-	{
-		xml_node_type type_ = proto.type();
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::append_node(n._root, _root);
-		impl::node_copy_tree(n._root, proto._root);
-
-		return n;
-	}
-
-	PUGI__FN xml_node xml_node::prepend_copy(const xml_node& proto)
-	{
-		xml_node_type type_ = proto.type();
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::prepend_node(n._root, _root);
-		impl::node_copy_tree(n._root, proto._root);
-
-		return n;
-	}
-
-	PUGI__FN xml_node xml_node::insert_copy_after(const xml_node& proto, const xml_node& node)
-	{
-		xml_node_type type_ = proto.type();
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-		if (!node._root || node._root->parent != _root) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::insert_node_after(n._root, node._root);
-		impl::node_copy_tree(n._root, proto._root);
-
-		return n;
-	}
-
-	PUGI__FN xml_node xml_node::insert_copy_before(const xml_node& proto, const xml_node& node)
-	{
-		xml_node_type type_ = proto.type();
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-		if (!node._root || node._root->parent != _root) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::insert_node_before(n._root, node._root);
-		impl::node_copy_tree(n._root, proto._root);
-
-		return n;
-	}
-
-	PUGI__FN xml_node xml_node::append_move(const xml_node& moved)
-	{
-		if (!impl::allow_move(*this, moved)) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
-		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
-
-		impl::remove_node(moved._root);
-		impl::append_node(moved._root, _root);
-
-		return moved;
-	}
-
-	PUGI__FN xml_node xml_node::prepend_move(const xml_node& moved)
-	{
-		if (!impl::allow_move(*this, moved)) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
-		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
-
-		impl::remove_node(moved._root);
-		impl::prepend_node(moved._root, _root);
-
-		return moved;
-	}
-
-	PUGI__FN xml_node xml_node::insert_move_after(const xml_node& moved, const xml_node& node)
-	{
-		if (!impl::allow_move(*this, moved)) return xml_node();
-		if (!node._root || node._root->parent != _root) return xml_node();
-		if (moved._root == node._root) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
-		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
-
-		impl::remove_node(moved._root);
-		impl::insert_node_after(moved._root, node._root);
-
-		return moved;
-	}
-
-	PUGI__FN xml_node xml_node::insert_move_before(const xml_node& moved, const xml_node& node)
-	{
-		if (!impl::allow_move(*this, moved)) return xml_node();
-		if (!node._root || node._root->parent != _root) return xml_node();
-		if (moved._root == node._root) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
-		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
-
-		impl::remove_node(moved._root);
-		impl::insert_node_before(moved._root, node._root);
-
-		return moved;
-	}
-
-	PUGI__FN bool xml_node::remove_attribute(const char_t* name_)
-	{
-		return remove_attribute(attribute(name_));
-	}
-
-	PUGI__FN bool xml_node::remove_attribute(const xml_attribute& a)
-	{
-		if (!_root || !a._attr) return false;
-		if (!impl::is_attribute_of(a._attr, _root)) return false;
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return false;
-
-		impl::remove_attribute(a._attr, _root);
-		impl::destroy_attribute(a._attr, alloc);
-
-		return true;
-	}
-
-	PUGI__FN bool xml_node::remove_attributes()
-	{
-		if (!_root) return false;
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return false;
-
-		for (xml_attribute_struct* attr = _root->first_attribute; attr; )
-		{
-			xml_attribute_struct* next = attr->next_attribute;
-
-			impl::destroy_attribute(attr, alloc);
-
-			attr = next;
-		}
-
-		_root->first_attribute = 0;
-
-		return true;
-	}
-
-	PUGI__FN bool xml_node::remove_child(const char_t* name_)
-	{
-		return remove_child(child(name_));
-	}
-
-	PUGI__FN bool xml_node::remove_child(const xml_node& n)
-	{
-		if (!_root || !n._root || n._root->parent != _root) return false;
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return false;
-
-		impl::remove_node(n._root);
-		impl::destroy_node(n._root, alloc);
-
-		return true;
-	}
-
-	PUGI__FN bool xml_node::remove_children()
-	{
-		if (!_root) return false;
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return false;
-
-		for (xml_node_struct* cur = _root->first_child; cur; )
-		{
-			xml_node_struct* next = cur->next_sibling;
-
-			impl::destroy_node(cur, alloc);
-
-			cur = next;
-		}
-
-		_root->first_child = 0;
-
-		return true;
-	}
-
-	PUGI__FN xml_parse_result xml_node::append_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
-	{
-		// append_buffer is only valid for elements/documents
-		if (!impl::allow_insert_child(type(), node_element)) return impl::make_parse_result(status_append_invalid_root);
-
-		// get document node
-		impl::xml_document_struct* doc = &impl::get_document(_root);
-
-		// disable document_buffer_order optimization since in a document with multiple buffers comparing buffer pointers does not make sense
-		doc->header |= impl::xml_memory_page_contents_shared_mask;
-
-		// get extra buffer element (we'll store the document fragment buffer there so that we can deallocate it later)
-		impl::xml_memory_page* page = 0;
-		impl::xml_extra_buffer* extra = static_cast<impl::xml_extra_buffer*>(doc->allocate_memory(sizeof(impl::xml_extra_buffer) + sizeof(void*), page));
-		(void)page;
-
-		if (!extra) return impl::make_parse_result(status_out_of_memory);
-
-	#ifdef PUGIXML_COMPACT
-		// align the memory block to a pointer boundary; this is required for compact mode where memory allocations are only 4b aligned
-		// note that this requires up to sizeof(void*)-1 additional memory, which the allocation above takes into account
-		extra = reinterpret_cast<impl::xml_extra_buffer*>((reinterpret_cast<uintptr_t>(extra) + (sizeof(void*) - 1)) & ~(sizeof(void*) - 1));
-	#endif
-
-		// add extra buffer to the list
-		extra->buffer = 0;
-		extra->next = doc->extra_buffers;
-		doc->extra_buffers = extra;
-
-		// name of the root has to be NULL before parsing - otherwise closing node mismatches will not be detected at the top level
-		impl::name_null_sentry sentry(_root);
-
-		return impl::load_buffer_impl(doc, _root, const_cast<void*>(contents), size, options, encoding, false, false, &extra->buffer);
-	}
-
-	PUGI__FN xml_node xml_node::find_child_by_attribute(const char_t* name_, const char_t* attr_name, const char_t* attr_value) const
-	{
-		if (!_root) return xml_node();
-
-		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
-		{
-			const char_t* iname = i->name;
-			if (iname && impl::strequal(name_, iname))
-			{
-				for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute)
-				{
-					const char_t* aname = a->name;
-					if (aname && impl::strequal(attr_name, aname))
-					{
-						const char_t* avalue = a->value;
-						if (impl::strequal(attr_value, avalue ? avalue : PUGIXML_TEXT("")))
-							return xml_node(i);
-					}
-				}
-			}
-		}
-
-		return xml_node();
-	}
-
-	PUGI__FN xml_node xml_node::find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const
-	{
-		if (!_root) return xml_node();
-
-		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
-			for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute)
-			{
-				const char_t* aname = a->name;
-				if (aname && impl::strequal(attr_name, aname))
-				{
-					const char_t* avalue = a->value;
-					if (impl::strequal(attr_value, avalue ? avalue : PUGIXML_TEXT("")))
-						return xml_node(i);
-				}
-			}
-
-		return xml_node();
-	}
-
-#ifndef PUGIXML_NO_STL
-	PUGI__FN string_t xml_node::path(char_t delimiter) const
-	{
-		if (!_root) return string_t();
-
-		size_t offset = 0;
-
-		for (xml_node_struct* i = _root; i; i = i->parent)
-		{
-			const char_t* iname = i->name;
-			offset += (i != _root);
-			offset += iname ? impl::strlength(iname) : 0;
-		}
-
-		string_t result;
-		result.resize(offset);
-
-		for (xml_node_struct* j = _root; j; j = j->parent)
-		{
-			if (j != _root)
-				result[--offset] = delimiter;
-
-			const char_t* jname = j->name;
-			if (jname)
-			{
-				size_t length = impl::strlength(jname);
-
-				offset -= length;
-				memcpy(&result[offset], jname, length * sizeof(char_t));
-			}
-		}
-
-		assert(offset == 0);
-
-		return result;
-	}
-#endif
-
-	PUGI__FN xml_node xml_node::first_element_by_path(const char_t* path_, char_t delimiter) const
-	{
-		xml_node context = path_[0] == delimiter ? root() : *this;
-
-		if (!context._root) return xml_node();
-
-		const char_t* path_segment = path_;
-
-		while (*path_segment == delimiter) ++path_segment;
-
-		const char_t* path_segment_end = path_segment;
-
-		while (*path_segment_end && *path_segment_end != delimiter) ++path_segment_end;
-
-		if (path_segment == path_segment_end) return context;
-
-		const char_t* next_segment = path_segment_end;
-
-		while (*next_segment == delimiter) ++next_segment;
-
-		if (*path_segment == '.' && path_segment + 1 == path_segment_end)
-			return context.first_element_by_path(next_segment, delimiter);
-		else if (*path_segment == '.' && *(path_segment+1) == '.' && path_segment + 2 == path_segment_end)
-			return context.parent().first_element_by_path(next_segment, delimiter);
-		else
-		{
-			for (xml_node_struct* j = context._root->first_child; j; j = j->next_sibling)
-			{
-				const char_t* jname = j->name;
-				if (jname && impl::strequalrange(jname, path_segment, static_cast<size_t>(path_segment_end - path_segment)))
-				{
-					xml_node subsearch = xml_node(j).first_element_by_path(next_segment, delimiter);
-
-					if (subsearch) return subsearch;
-				}
-			}
-
-			return xml_node();
-		}
-	}
-
-	PUGI__FN bool xml_node::traverse(xml_tree_walker& walker)
-	{
-		walker._depth = -1;
-
-		xml_node arg_begin(_root);
-		if (!walker.begin(arg_begin)) return false;
-
-		xml_node_struct* cur = _root ? _root->first_child + 0 : 0;
-
-		if (cur)
-		{
-			++walker._depth;
-
-			do
-			{
-				xml_node arg_for_each(cur);
-				if (!walker.for_each(arg_for_each))
-					return false;
-
-				if (cur->first_child)
-				{
-					++walker._depth;
-					cur = cur->first_child;
-				}
-				else if (cur->next_sibling)
-					cur = cur->next_sibling;
-				else
-				{
-					while (!cur->next_sibling && cur != _root && cur->parent)
-					{
-						--walker._depth;
-						cur = cur->parent;
-					}
-
-					if (cur != _root)
-						cur = cur->next_sibling;
-				}
-			}
-			while (cur && cur != _root);
-		}
-
-		assert(walker._depth == -1);
-
-		xml_node arg_end(_root);
-		return walker.end(arg_end);
-	}
-
-	PUGI__FN size_t xml_node::hash_value() const
-	{
-		return static_cast<size_t>(reinterpret_cast<uintptr_t>(_root) / sizeof(xml_node_struct));
-	}
-
-	PUGI__FN xml_node_struct* xml_node::internal_object() const
-	{
-		return _root;
-	}
-
-	PUGI__FN void xml_node::print(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
-	{
-		if (!_root) return;
-
-		impl::xml_buffered_writer buffered_writer(writer, encoding);
-
-		impl::node_output(buffered_writer, _root, indent, flags, depth);
-
-		buffered_writer.flush();
-	}
-
-#ifndef PUGIXML_NO_STL
-	PUGI__FN void xml_node::print(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
-	{
-		xml_writer_stream writer(stream);
-
-		print(writer, indent, flags, encoding, depth);
-	}
-
-	PUGI__FN void xml_node::print(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent, unsigned int flags, unsigned int depth) const
-	{
-		xml_writer_stream writer(stream);
-
-		print(writer, indent, flags, encoding_wchar, depth);
-	}
-#endif
-
-	PUGI__FN ptrdiff_t xml_node::offset_debug() const
-	{
-		if (!_root) return -1;
-
-		impl::xml_document_struct& doc = impl::get_document(_root);
-
-		// we can determine the offset reliably only if there is exactly once parse buffer
-		if (!doc.buffer || doc.extra_buffers) return -1;
-
-		switch (type())
-		{
-		case node_document:
-			return 0;
-
-		case node_element:
-		case node_declaration:
-		case node_pi:
-			return _root->name && (_root->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0 ? _root->name - doc.buffer : -1;
-
-		case node_pcdata:
-		case node_cdata:
-		case node_comment:
-		case node_doctype:
-			return _root->value && (_root->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0 ? _root->value - doc.buffer : -1;
-
-		default:
-			assert(false && "Invalid node type"); // unreachable
-			return -1;
-		}
-	}
-
-#ifdef __BORLANDC__
-	PUGI__FN bool operator&&(const xml_node& lhs, bool rhs)
-	{
-		return (bool)lhs && rhs;
-	}
-
-	PUGI__FN bool operator||(const xml_node& lhs, bool rhs)
-	{
-		return (bool)lhs || rhs;
-	}
-#endif
-
-	PUGI__FN xml_text::xml_text(xml_node_struct* root): _root(root)
-	{
-	}
-
-	PUGI__FN xml_node_struct* xml_text::_data() const
-	{
-		if (!_root || impl::is_text_node(_root)) return _root;
-
-		// element nodes can have value if parse_embed_pcdata was used
-		if (PUGI__NODETYPE(_root) == node_element && _root->value)
-			return _root;
-
-		for (xml_node_struct* node = _root->first_child; node; node = node->next_sibling)
-			if (impl::is_text_node(node))
-				return node;
-
-		return 0;
-	}
-
-	PUGI__FN xml_node_struct* xml_text::_data_new()
-	{
-		xml_node_struct* d = _data();
-		if (d) return d;
-
-		return xml_node(_root).append_child(node_pcdata).internal_object();
-	}
-
-	PUGI__FN xml_text::xml_text(): _root(0)
-	{
-	}
-
-	PUGI__FN static void unspecified_bool_xml_text(xml_text***)
-	{
-	}
-
-	PUGI__FN xml_text::operator xml_text::unspecified_bool_type() const
-	{
-		return _data() ? unspecified_bool_xml_text : 0;
-	}
-
-	PUGI__FN bool xml_text::operator!() const
-	{
-		return !_data();
-	}
-
-	PUGI__FN bool xml_text::empty() const
-	{
-		return _data() == 0;
-	}
-
-	PUGI__FN const char_t* xml_text::get() const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return PUGIXML_TEXT("");
-		const char_t* value = d->value;
-		return value ? value : PUGIXML_TEXT("");
-	}
-
-	PUGI__FN const char_t* xml_text::as_string(const char_t* def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? value : def;
-	}
-
-	PUGI__FN int xml_text::as_int(int def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? impl::get_value_int(value) : def;
-	}
-
-	PUGI__FN unsigned int xml_text::as_uint(unsigned int def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? impl::get_value_uint(value) : def;
-	}
-
-	PUGI__FN double xml_text::as_double(double def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? impl::get_value_double(value) : def;
-	}
-
-	PUGI__FN float xml_text::as_float(float def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? impl::get_value_float(value) : def;
-	}
-
-	PUGI__FN bool xml_text::as_bool(bool def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? impl::get_value_bool(value) : def;
-	}
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI__FN long long xml_text::as_llong(long long def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? impl::get_value_llong(value) : def;
-	}
-
-	PUGI__FN unsigned long long xml_text::as_ullong(unsigned long long def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? impl::get_value_ullong(value) : def;
-	}
-#endif
-
-	PUGI__FN bool xml_text::set(const char_t* rhs, size_t sz)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, sz) : false;
-	}
-
-	PUGI__FN bool xml_text::set(const char_t* rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs)) : false;
-	}
-
-	PUGI__FN bool xml_text::set(int rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_integer<unsigned int>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
-	}
-
-	PUGI__FN bool xml_text::set(unsigned int rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_integer<unsigned int>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
-	}
-
-	PUGI__FN bool xml_text::set(long rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_integer<unsigned long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
-	}
-
-	PUGI__FN bool xml_text::set(unsigned long rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_integer<unsigned long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
-	}
-
-	PUGI__FN bool xml_text::set(float rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, default_float_precision) : false;
-	}
-
-	PUGI__FN bool xml_text::set(float rhs, int precision)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, precision) : false;
-	}
-
-	PUGI__FN bool xml_text::set(double rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, default_double_precision) : false;
-	}
-
-	PUGI__FN bool xml_text::set(double rhs, int precision)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, precision) : false;
-	}
-
-	PUGI__FN bool xml_text::set(bool rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_bool(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
-	}
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI__FN bool xml_text::set(long long rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_integer<unsigned long long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
-	}
-
-	PUGI__FN bool xml_text::set(unsigned long long rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_integer<unsigned long long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
-	}
-#endif
-
-	PUGI__FN xml_text& xml_text::operator=(const char_t* rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_text& xml_text::operator=(int rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_text& xml_text::operator=(unsigned int rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_text& xml_text::operator=(long rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_text& xml_text::operator=(unsigned long rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_text& xml_text::operator=(double rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_text& xml_text::operator=(float rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_text& xml_text::operator=(bool rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI__FN xml_text& xml_text::operator=(long long rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI__FN xml_text& xml_text::operator=(unsigned long long rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-#endif
-
-	PUGI__FN xml_node xml_text::data() const
-	{
-		return xml_node(_data());
-	}
-
-#ifdef __BORLANDC__
-	PUGI__FN bool operator&&(const xml_text& lhs, bool rhs)
-	{
-		return (bool)lhs && rhs;
-	}
-
-	PUGI__FN bool operator||(const xml_text& lhs, bool rhs)
-	{
-		return (bool)lhs || rhs;
-	}
-#endif
-
-	PUGI__FN xml_node_iterator::xml_node_iterator()
-	{
-	}
-
-	PUGI__FN xml_node_iterator::xml_node_iterator(const xml_node& node): _wrap(node), _parent(node.parent())
-	{
-	}
-
-	PUGI__FN xml_node_iterator::xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
-	{
-	}
-
-	PUGI__FN bool xml_node_iterator::operator==(const xml_node_iterator& rhs) const
-	{
-		return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root;
-	}
-
-	PUGI__FN bool xml_node_iterator::operator!=(const xml_node_iterator& rhs) const
-	{
-		return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root;
-	}
-
-	PUGI__FN xml_node& xml_node_iterator::operator*() const
-	{
-		assert(_wrap._root);
-		return _wrap;
-	}
-
-	PUGI__FN xml_node* xml_node_iterator::operator->() const
-	{
-		assert(_wrap._root);
-		return const_cast<xml_node*>(&_wrap); // BCC5 workaround
-	}
-
-	PUGI__FN xml_node_iterator& xml_node_iterator::operator++()
-	{
-		assert(_wrap._root);
-		_wrap._root = _wrap._root->next_sibling;
-		return *this;
-	}
-
-	PUGI__FN xml_node_iterator xml_node_iterator::operator++(int)
-	{
-		xml_node_iterator temp = *this;
-		++*this;
-		return temp;
-	}
-
-	PUGI__FN xml_node_iterator& xml_node_iterator::operator--()
-	{
-		_wrap = _wrap._root ? _wrap.previous_sibling() : _parent.last_child();
-		return *this;
-	}
-
-	PUGI__FN xml_node_iterator xml_node_iterator::operator--(int)
-	{
-		xml_node_iterator temp = *this;
-		--*this;
-		return temp;
-	}
-
-	PUGI__FN xml_attribute_iterator::xml_attribute_iterator()
-	{
-	}
-
-	PUGI__FN xml_attribute_iterator::xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent): _wrap(attr), _parent(parent)
-	{
-	}
-
-	PUGI__FN xml_attribute_iterator::xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
-	{
-	}
-
-	PUGI__FN bool xml_attribute_iterator::operator==(const xml_attribute_iterator& rhs) const
-	{
-		return _wrap._attr == rhs._wrap._attr && _parent._root == rhs._parent._root;
-	}
-
-	PUGI__FN bool xml_attribute_iterator::operator!=(const xml_attribute_iterator& rhs) const
-	{
-		return _wrap._attr != rhs._wrap._attr || _parent._root != rhs._parent._root;
-	}
-
-	PUGI__FN xml_attribute& xml_attribute_iterator::operator*() const
-	{
-		assert(_wrap._attr);
-		return _wrap;
-	}
-
-	PUGI__FN xml_attribute* xml_attribute_iterator::operator->() const
-	{
-		assert(_wrap._attr);
-		return const_cast<xml_attribute*>(&_wrap); // BCC5 workaround
-	}
-
-	PUGI__FN xml_attribute_iterator& xml_attribute_iterator::operator++()
-	{
-		assert(_wrap._attr);
-		_wrap._attr = _wrap._attr->next_attribute;
-		return *this;
-	}
-
-	PUGI__FN xml_attribute_iterator xml_attribute_iterator::operator++(int)
-	{
-		xml_attribute_iterator temp = *this;
-		++*this;
-		return temp;
-	}
-
-	PUGI__FN xml_attribute_iterator& xml_attribute_iterator::operator--()
-	{
-		_wrap = _wrap._attr ? _wrap.previous_attribute() : _parent.last_attribute();
-		return *this;
-	}
-
-	PUGI__FN xml_attribute_iterator xml_attribute_iterator::operator--(int)
-	{
-		xml_attribute_iterator temp = *this;
-		--*this;
-		return temp;
-	}
-
-	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(): _name(0)
-	{
-	}
-
-	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(const xml_node& node, const char_t* name): _wrap(node), _parent(node.parent()), _name(name)
-	{
-	}
-
-	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name): _wrap(ref), _parent(parent), _name(name)
-	{
-	}
-
-	PUGI__FN bool xml_named_node_iterator::operator==(const xml_named_node_iterator& rhs) const
-	{
-		return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root;
-	}
-
-	PUGI__FN bool xml_named_node_iterator::operator!=(const xml_named_node_iterator& rhs) const
-	{
-		return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root;
-	}
-
-	PUGI__FN xml_node& xml_named_node_iterator::operator*() const
-	{
-		assert(_wrap._root);
-		return _wrap;
-	}
-
-	PUGI__FN xml_node* xml_named_node_iterator::operator->() const
-	{
-		assert(_wrap._root);
-		return const_cast<xml_node*>(&_wrap); // BCC5 workaround
-	}
-
-	PUGI__FN xml_named_node_iterator& xml_named_node_iterator::operator++()
-	{
-		assert(_wrap._root);
-		_wrap = _wrap.next_sibling(_name);
-		return *this;
-	}
-
-	PUGI__FN xml_named_node_iterator xml_named_node_iterator::operator++(int)
-	{
-		xml_named_node_iterator temp = *this;
-		++*this;
-		return temp;
-	}
-
-	PUGI__FN xml_named_node_iterator& xml_named_node_iterator::operator--()
-	{
-		if (_wrap._root)
-			_wrap = _wrap.previous_sibling(_name);
-		else
-		{
-			_wrap = _parent.last_child();
-
-			if (!impl::strequal(_wrap.name(), _name))
-				_wrap = _wrap.previous_sibling(_name);
-		}
-
-		return *this;
-	}
-
-	PUGI__FN xml_named_node_iterator xml_named_node_iterator::operator--(int)
-	{
-		xml_named_node_iterator temp = *this;
-		--*this;
-		return temp;
-	}
-
-	PUGI__FN xml_parse_result::xml_parse_result(): status(status_internal_error), offset(0), encoding(encoding_auto)
-	{
-	}
-
-	PUGI__FN xml_parse_result::operator bool() const
-	{
-		return status == status_ok;
-	}
-
-	PUGI__FN const char* xml_parse_result::description() const
-	{
-		switch (status)
-		{
-		case status_ok: return "No error";
-
-		case status_file_not_found: return "File was not found";
-		case status_io_error: return "Error reading from file/stream";
-		case status_out_of_memory: return "Could not allocate memory";
-		case status_internal_error: return "Internal error occurred";
-
-		case status_unrecognized_tag: return "Could not determine tag type";
-
-		case status_bad_pi: return "Error parsing document declaration/processing instruction";
-		case status_bad_comment: return "Error parsing comment";
-		case status_bad_cdata: return "Error parsing CDATA section";
-		case status_bad_doctype: return "Error parsing document type declaration";
-		case status_bad_pcdata: return "Error parsing PCDATA section";
-		case status_bad_start_element: return "Error parsing start element tag";
-		case status_bad_attribute: return "Error parsing element attribute";
-		case status_bad_end_element: return "Error parsing end element tag";
-		case status_end_element_mismatch: return "Start-end tags mismatch";
-
-		case status_append_invalid_root: return "Unable to append nodes: root is not an element or document";
-
-		case status_no_document_element: return "No document element found";
-
-		default: return "Unknown error";
-		}
-	}
-
-	PUGI__FN xml_document::xml_document(): _buffer(0)
-	{
-		_create();
-	}
-
-	PUGI__FN xml_document::~xml_document()
-	{
-		_destroy();
-	}
-
-#ifdef PUGIXML_HAS_MOVE
-	PUGI__FN xml_document::xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT: _buffer(0)
-	{
-		_create();
-		_move(rhs);
-	}
-
-	PUGI__FN xml_document& xml_document::operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
-	{
-		if (this == &rhs) return *this;
-
-		_destroy();
-		_create();
-		_move(rhs);
-
-		return *this;
-	}
-#endif
-
-	PUGI__FN void xml_document::reset()
-	{
-		_destroy();
-		_create();
-	}
-
-	PUGI__FN void xml_document::reset(const xml_document& proto)
-	{
-		reset();
-
-		impl::node_copy_tree(_root, proto._root);
-	}
-
-	PUGI__FN void xml_document::_create()
-	{
-		assert(!_root);
-
-	#ifdef PUGIXML_COMPACT
-		// space for page marker for the first page (uint32_t), rounded up to pointer size; assumes pointers are at least 32-bit
-		const size_t page_offset = sizeof(void*);
-	#else
-		const size_t page_offset = 0;
-	#endif
-
-		// initialize sentinel page
-		PUGI__STATIC_ASSERT(sizeof(impl::xml_memory_page) + sizeof(impl::xml_document_struct) + page_offset <= sizeof(_memory));
-
-		// prepare page structure
-		impl::xml_memory_page* page = impl::xml_memory_page::construct(_memory);
-		assert(page);
-
-		page->busy_size = impl::xml_memory_page_size;
-
-		// setup first page marker
-	#ifdef PUGIXML_COMPACT
-		// round-trip through void* to avoid 'cast increases required alignment of target type' warning
-		page->compact_page_marker = reinterpret_cast<uint32_t*>(static_cast<void*>(reinterpret_cast<char*>(page) + sizeof(impl::xml_memory_page)));
-		*page->compact_page_marker = sizeof(impl::xml_memory_page);
-	#endif
-
-		// allocate new root
-		_root = new (reinterpret_cast<char*>(page) + sizeof(impl::xml_memory_page) + page_offset) impl::xml_document_struct(page);
-		_root->prev_sibling_c = _root;
-
-		// setup sentinel page
-		page->allocator = static_cast<impl::xml_document_struct*>(_root);
-
-		// setup hash table pointer in allocator
-	#ifdef PUGIXML_COMPACT
-		page->allocator->_hash = &static_cast<impl::xml_document_struct*>(_root)->hash;
-	#endif
-
-		// verify the document allocation
-		assert(reinterpret_cast<char*>(_root) + sizeof(impl::xml_document_struct) <= _memory + sizeof(_memory));
-	}
-
-	PUGI__FN void xml_document::_destroy()
-	{
-		assert(_root);
-
-		// destroy static storage
-		if (_buffer)
-		{
-			impl::xml_memory::deallocate(_buffer);
-			_buffer = 0;
-		}
-
-		// destroy extra buffers (note: no need to destroy linked list nodes, they're allocated using document allocator)
-		for (impl::xml_extra_buffer* extra = static_cast<impl::xml_document_struct*>(_root)->extra_buffers; extra; extra = extra->next)
-		{
-			if (extra->buffer) impl::xml_memory::deallocate(extra->buffer);
-		}
-
-		// destroy dynamic storage, leave sentinel page (it's in static memory)
-		impl::xml_memory_page* root_page = PUGI__GETPAGE(_root);
-		assert(root_page && !root_page->prev);
-		assert(reinterpret_cast<char*>(root_page) >= _memory && reinterpret_cast<char*>(root_page) < _memory + sizeof(_memory));
-
-		for (impl::xml_memory_page* page = root_page->next; page; )
-		{
-			impl::xml_memory_page* next = page->next;
-
-			impl::xml_allocator::deallocate_page(page);
-
-			page = next;
-		}
-
-	#ifdef PUGIXML_COMPACT
-		// destroy hash table
-		static_cast<impl::xml_document_struct*>(_root)->hash.clear();
-	#endif
-
-		_root = 0;
-	}
-
-#ifdef PUGIXML_HAS_MOVE
-	PUGI__FN void xml_document::_move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
-	{
-		impl::xml_document_struct* doc = static_cast<impl::xml_document_struct*>(_root);
-		impl::xml_document_struct* other = static_cast<impl::xml_document_struct*>(rhs._root);
-
-		// save first child pointer for later; this needs hash access
-		xml_node_struct* other_first_child = other->first_child;
-
-	#ifdef PUGIXML_COMPACT
-		// reserve space for the hash table up front; this is the only operation that can fail
-		// if it does, we have no choice but to throw (if we have exceptions)
-		if (other_first_child)
-		{
-			size_t other_children = 0;
-			for (xml_node_struct* node = other_first_child; node; node = node->next_sibling)
-				other_children++;
-
-			// in compact mode, each pointer assignment could result in a hash table request
-			// during move, we have to relocate document first_child and parents of all children
-			// normally there's just one child and its parent has a pointerless encoding but
-			// we assume the worst here
-			if (!other->_hash->reserve(other_children + 1))
-			{
-			#ifdef PUGIXML_NO_EXCEPTIONS
-				return;
-			#else
-				throw std::bad_alloc();
-			#endif
-			}
-		}
-	#endif
-
-		// move allocation state
-		// note that other->_root may point to the embedded document page, in which case we should keep original (empty) state
-		if (other->_root != PUGI__GETPAGE(other))
-		{
-			doc->_root = other->_root;
-			doc->_busy_size = other->_busy_size;
-		}
-
-		// move buffer state
-		doc->buffer = other->buffer;
-		doc->extra_buffers = other->extra_buffers;
-		_buffer = rhs._buffer;
-
-	#ifdef PUGIXML_COMPACT
-		// move compact hash; note that the hash table can have pointers to other but they will be "inactive", similarly to nodes removed with remove_child
-		doc->hash = other->hash;
-		doc->_hash = &doc->hash;
-
-		// make sure we don't access other hash up until the end when we reinitialize other document
-		other->_hash = 0;
-	#endif
-
-		// move page structure
-		impl::xml_memory_page* doc_page = PUGI__GETPAGE(doc);
-		assert(doc_page && !doc_page->prev && !doc_page->next);
-
-		impl::xml_memory_page* other_page = PUGI__GETPAGE(other);
-		assert(other_page && !other_page->prev);
-
-		// relink pages since root page is embedded into xml_document
-		if (impl::xml_memory_page* page = other_page->next)
-		{
-			assert(page->prev == other_page);
-
-			page->prev = doc_page;
-
-			doc_page->next = page;
-			other_page->next = 0;
-		}
-
-		// make sure pages point to the correct document state
-		for (impl::xml_memory_page* page = doc_page->next; page; page = page->next)
-		{
-			assert(page->allocator == other);
-
-			page->allocator = doc;
-
-		#ifdef PUGIXML_COMPACT
-			// this automatically migrates most children between documents and prevents ->parent assignment from allocating
-			if (page->compact_shared_parent == other)
-				page->compact_shared_parent = doc;
-		#endif
-		}
-
-		// move tree structure
-		assert(!doc->first_child);
-
-		doc->first_child = other_first_child;
-
-		for (xml_node_struct* node = other_first_child; node; node = node->next_sibling)
-		{
-		#ifdef PUGIXML_COMPACT
-			// most children will have migrated when we reassigned compact_shared_parent
-			assert(node->parent == other || node->parent == doc);
-
-			node->parent = doc;
-		#else
-			assert(node->parent == other);
-			node->parent = doc;
-		#endif
-		}
-
-		// reset other document
-		new (other) impl::xml_document_struct(PUGI__GETPAGE(other));
-		rhs._buffer = 0;
-	}
-#endif
-
-#ifndef PUGIXML_NO_STL
-	PUGI__FN xml_parse_result xml_document::load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options, xml_encoding encoding)
-	{
-		reset();
-
-		return impl::load_stream_impl(static_cast<impl::xml_document_struct*>(_root), stream, options, encoding, &_buffer);
-	}
-
-	PUGI__FN xml_parse_result xml_document::load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options)
-	{
-		reset();
-
-		return impl::load_stream_impl(static_cast<impl::xml_document_struct*>(_root), stream, options, encoding_wchar, &_buffer);
-	}
-#endif
-
-	PUGI__FN xml_parse_result xml_document::load_string(const char_t* contents, unsigned int options)
-	{
-		// Force native encoding (skip autodetection)
-	#ifdef PUGIXML_WCHAR_MODE
-		xml_encoding encoding = encoding_wchar;
-	#else
-		xml_encoding encoding = encoding_utf8;
-	#endif
-
-		return load_buffer(contents, impl::strlength(contents) * sizeof(char_t), options, encoding);
-	}
-
-	PUGI__FN xml_parse_result xml_document::load(const char_t* contents, unsigned int options)
-	{
-		return load_string(contents, options);
-	}
-
-	PUGI__FN xml_parse_result xml_document::load_file(const char* path_, unsigned int options, xml_encoding encoding)
-	{
-		reset();
-
-		using impl::auto_deleter; // MSVC7 workaround
-		auto_deleter<FILE> file(impl::open_file(path_, "rb"), impl::close_file);
-
-		return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
-	}
-
-	PUGI__FN xml_parse_result xml_document::load_file(const wchar_t* path_, unsigned int options, xml_encoding encoding)
-	{
-		reset();
-
-		using impl::auto_deleter; // MSVC7 workaround
-		auto_deleter<FILE> file(impl::open_file_wide(path_, L"rb"), impl::close_file);
-
-		return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
-	}
-
-	PUGI__FN xml_parse_result xml_document::load_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
-	{
-		reset();
-
-		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, const_cast<void*>(contents), size, options, encoding, false, false, &_buffer);
-	}
-
-	PUGI__FN xml_parse_result xml_document::load_buffer_inplace(void* contents, size_t size, unsigned int options, xml_encoding encoding)
-	{
-		reset();
-
-		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, false, &_buffer);
-	}
-
-	PUGI__FN xml_parse_result xml_document::load_buffer_inplace_own(void* contents, size_t size, unsigned int options, xml_encoding encoding)
-	{
-		reset();
-
-		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, true, &_buffer);
-	}
-
-	PUGI__FN void xml_document::save(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding) const
-	{
-		impl::xml_buffered_writer buffered_writer(writer, encoding);
-
-		if ((flags & format_write_bom) && encoding != encoding_latin1)
-		{
-			// BOM always represents the codepoint U+FEFF, so just write it in native encoding
-		#ifdef PUGIXML_WCHAR_MODE
-			unsigned int bom = 0xfeff;
-			buffered_writer.write(static_cast<wchar_t>(bom));
-		#else
-			buffered_writer.write('\xef', '\xbb', '\xbf');
-		#endif
-		}
-
-		if (!(flags & format_no_declaration) && !impl::has_declaration(_root))
-		{
-			buffered_writer.write_string(PUGIXML_TEXT("<?xml version=\"1.0\""));
-			if (encoding == encoding_latin1) buffered_writer.write_string(PUGIXML_TEXT(" encoding=\"ISO-8859-1\""));
-			buffered_writer.write('?', '>');
-			if (!(flags & format_raw)) buffered_writer.write('\n');
-		}
-
-		impl::node_output(buffered_writer, _root, indent, flags, 0);
-
-		buffered_writer.flush();
-	}
-
-#ifndef PUGIXML_NO_STL
-	PUGI__FN void xml_document::save(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding) const
-	{
-		xml_writer_stream writer(stream);
-
-		save(writer, indent, flags, encoding);
-	}
-
-	PUGI__FN void xml_document::save(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent, unsigned int flags) const
-	{
-		xml_writer_stream writer(stream);
-
-		save(writer, indent, flags, encoding_wchar);
-	}
-#endif
-
-	PUGI__FN bool xml_document::save_file(const char* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
-	{
-		using impl::auto_deleter; // MSVC7 workaround
-		auto_deleter<FILE> file(impl::open_file(path_, (flags & format_save_file_text) ? "w" : "wb"), impl::close_file);
-
-		return impl::save_file_impl(*this, file.data, indent, flags, encoding) && fclose(file.release()) == 0;
-	}
-
-	PUGI__FN bool xml_document::save_file(const wchar_t* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
-	{
-		using impl::auto_deleter; // MSVC7 workaround
-		auto_deleter<FILE> file(impl::open_file_wide(path_, (flags & format_save_file_text) ? L"w" : L"wb"), impl::close_file);
-
-		return impl::save_file_impl(*this, file.data, indent, flags, encoding) && fclose(file.release()) == 0;
-	}
-
-	PUGI__FN xml_node xml_document::document_element() const
-	{
-		assert(_root);
-
-		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
-			if (PUGI__NODETYPE(i) == node_element)
-				return xml_node(i);
-
-		return xml_node();
-	}
-
-#ifndef PUGIXML_NO_STL
-	PUGI__FN std::string PUGIXML_FUNCTION as_utf8(const wchar_t* str)
-	{
-		assert(str);
-
-		return impl::as_utf8_impl(str, impl::strlength_wide(str));
-	}
-
-	PUGI__FN std::string PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t>& str)
-	{
-		return impl::as_utf8_impl(str.c_str(), str.size());
-	}
-
-	PUGI__FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const char* str)
-	{
-		assert(str);
-
-		return impl::as_wide_impl(str, strlen(str));
-	}
-
-	PUGI__FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const std::string& str)
-	{
-		return impl::as_wide_impl(str.c_str(), str.size());
-	}
-#endif
-
-	PUGI__FN void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate)
-	{
-		impl::xml_memory::allocate = allocate;
-		impl::xml_memory::deallocate = deallocate;
-	}
-
-	PUGI__FN allocation_function PUGIXML_FUNCTION get_memory_allocation_function()
-	{
-		return impl::xml_memory::allocate;
-	}
-
-	PUGI__FN deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function()
-	{
-		return impl::xml_memory::deallocate;
-	}
-}
-
-#if !defined(PUGIXML_NO_STL) && (defined(_MSC_VER) || defined(__ICC))
-namespace std
-{
-	// Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier)
-	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_node_iterator&)
-	{
-		return std::bidirectional_iterator_tag();
-	}
-
-	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_attribute_iterator&)
-	{
-		return std::bidirectional_iterator_tag();
-	}
-
-	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_named_node_iterator&)
-	{
-		return std::bidirectional_iterator_tag();
-	}
-}
-#endif
-
-#if !defined(PUGIXML_NO_STL) && defined(__SUNPRO_CC)
-namespace std
-{
-	// Workarounds for (non-standard) iterator category detection
-	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_node_iterator&)
-	{
-		return std::bidirectional_iterator_tag();
-	}
-
-	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_attribute_iterator&)
-	{
-		return std::bidirectional_iterator_tag();
-	}
-
-	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_named_node_iterator&)
-	{
-		return std::bidirectional_iterator_tag();
-	}
-}
-#endif
-
-#ifndef PUGIXML_NO_XPATH
-// STL replacements
-PUGI__NS_BEGIN
-	struct equal_to
-	{
-		template <typename T> bool operator()(const T& lhs, const T& rhs) const
-		{
-			return lhs == rhs;
-		}
-	};
-
-	struct not_equal_to
-	{
-		template <typename T> bool operator()(const T& lhs, const T& rhs) const
-		{
-			return lhs != rhs;
-		}
-	};
-
-	struct less
-	{
-		template <typename T> bool operator()(const T& lhs, const T& rhs) const
-		{
-			return lhs < rhs;
-		}
-	};
-
-	struct less_equal
-	{
-		template <typename T> bool operator()(const T& lhs, const T& rhs) const
-		{
-			return lhs <= rhs;
-		}
-	};
-
-	template <typename T> inline void swap(T& lhs, T& rhs)
-	{
-		T temp = lhs;
-		lhs = rhs;
-		rhs = temp;
-	}
-
-	template <typename I, typename Pred> PUGI__FN I min_element(I begin, I end, const Pred& pred)
-	{
-		I result = begin;
-
-		for (I it = begin + 1; it != end; ++it)
-			if (pred(*it, *result))
-				result = it;
-
-		return result;
-	}
-
-	template <typename I> PUGI__FN void reverse(I begin, I end)
-	{
-		while (end - begin > 1)
-			swap(*begin++, *--end);
-	}
-
-	template <typename I> PUGI__FN I unique(I begin, I end)
-	{
-		// fast skip head
-		while (end - begin > 1 && *begin != *(begin + 1))
-			begin++;
-
-		if (begin == end)
-			return begin;
-
-		// last written element
-		I write = begin++;
-
-		// merge unique elements
-		while (begin != end)
-		{
-			if (*begin != *write)
-				*++write = *begin++;
-			else
-				begin++;
-		}
-
-		// past-the-end (write points to live element)
-		return write + 1;
-	}
-
-	template <typename T, typename Pred> PUGI__FN void insertion_sort(T* begin, T* end, const Pred& pred)
-	{
-		if (begin == end)
-			return;
-
-		for (T* it = begin + 1; it != end; ++it)
-		{
-			T val = *it;
-			T* hole = it;
-
-			// move hole backwards
-			while (hole > begin && pred(val, *(hole - 1)))
-			{
-				*hole = *(hole - 1);
-				hole--;
-			}
-
-			// fill hole with element
-			*hole = val;
-		}
-	}
-
-	template <typename I, typename Pred> inline I median3(I first, I middle, I last, const Pred& pred)
-	{
-		if (pred(*middle, *first))
-			swap(middle, first);
-		if (pred(*last, *middle))
-			swap(last, middle);
-		if (pred(*middle, *first))
-			swap(middle, first);
-
-		return middle;
-	}
-
-	template <typename T, typename Pred> PUGI__FN void partition3(T* begin, T* end, T pivot, const Pred& pred, T** out_eqbeg, T** out_eqend)
-	{
-		// invariant: array is split into 4 groups: = < ? > (each variable denotes the boundary between the groups)
-		T* eq = begin;
-		T* lt = begin;
-		T* gt = end;
-
-		while (lt < gt)
-		{
-			if (pred(*lt, pivot))
-				lt++;
-			else if (*lt == pivot)
-				swap(*eq++, *lt++);
-			else
-				swap(*lt, *--gt);
-		}
-
-		// we now have just 4 groups: = < >; move equal elements to the middle
-		T* eqbeg = gt;
-
-		for (T* it = begin; it != eq; ++it)
-			swap(*it, *--eqbeg);
-
-		*out_eqbeg = eqbeg;
-		*out_eqend = gt;
-	}
-
-	template <typename I, typename Pred> PUGI__FN void sort(I begin, I end, const Pred& pred)
-	{
-		// sort large chunks
-		while (end - begin > 16)
-		{
-			// find median element
-			I middle = begin + (end - begin) / 2;
-			I median = median3(begin, middle, end - 1, pred);
-
-			// partition in three chunks (< = >)
-			I eqbeg, eqend;
-			partition3(begin, end, *median, pred, &eqbeg, &eqend);
-
-			// loop on larger half
-			if (eqbeg - begin > end - eqend)
-			{
-				sort(eqend, end, pred);
-				end = eqbeg;
-			}
-			else
-			{
-				sort(begin, eqbeg, pred);
-				begin = eqend;
-			}
-		}
-
-		// insertion sort small chunk
-		insertion_sort(begin, end, pred);
-	}
-
-	PUGI__FN bool hash_insert(const void** table, size_t size, const void* key)
-	{
-		assert(key);
-
-		unsigned int h = static_cast<unsigned int>(reinterpret_cast<uintptr_t>(key));
-
-		// MurmurHash3 32-bit finalizer
-		h ^= h >> 16;
-		h *= 0x85ebca6bu;
-		h ^= h >> 13;
-		h *= 0xc2b2ae35u;
-		h ^= h >> 16;
-
-		size_t hashmod = size - 1;
-		size_t bucket = h & hashmod;
-
-		for (size_t probe = 0; probe <= hashmod; ++probe)
-		{
-			if (table[bucket] == 0)
-			{
-				table[bucket] = key;
-				return true;
-			}
-
-			if (table[bucket] == key)
-				return false;
-
-			// hash collision, quadratic probing
-			bucket = (bucket + probe + 1) & hashmod;
-		}
-
-		assert(false && "Hash table is full"); // unreachable
-		return false;
-	}
-PUGI__NS_END
-
-// Allocator used for AST and evaluation stacks
-PUGI__NS_BEGIN
-	static const size_t xpath_memory_page_size =
-	#ifdef PUGIXML_MEMORY_XPATH_PAGE_SIZE
-		PUGIXML_MEMORY_XPATH_PAGE_SIZE
-	#else
-		4096
-	#endif
-		;
-
-	static const uintptr_t xpath_memory_block_alignment = sizeof(double) > sizeof(void*) ? sizeof(double) : sizeof(void*);
-
-	struct xpath_memory_block
-	{
-		xpath_memory_block* next;
-		size_t capacity;
-
-		union
-		{
-			char data[xpath_memory_page_size];
-			double alignment;
-		};
-	};
-
-	struct xpath_allocator
-	{
-		xpath_memory_block* _root;
-		size_t _root_size;
-		bool* _error;
-
-		xpath_allocator(xpath_memory_block* root, bool* error = 0): _root(root), _root_size(0), _error(error)
-		{
-		}
-
-		void* allocate(size_t size)
-		{
-			// round size up to block alignment boundary
-			size = (size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
-
-			if (_root_size + size <= _root->capacity)
-			{
-				void* buf = &_root->data[0] + _root_size;
-				_root_size += size;
-				return buf;
-			}
-			else
-			{
-				// make sure we have at least 1/4th of the page free after allocation to satisfy subsequent allocation requests
-				size_t block_capacity_base = sizeof(_root->data);
-				size_t block_capacity_req = size + block_capacity_base / 4;
-				size_t block_capacity = (block_capacity_base > block_capacity_req) ? block_capacity_base : block_capacity_req;
-
-				size_t block_size = block_capacity + offsetof(xpath_memory_block, data);
-
-				xpath_memory_block* block = static_cast<xpath_memory_block*>(xml_memory::allocate(block_size));
-				if (!block)
-				{
-					if (_error) *_error = true;
-					return 0;
-				}
-
-				block->next = _root;
-				block->capacity = block_capacity;
-
-				_root = block;
-				_root_size = size;
-
-				return block->data;
-			}
-		}
-
-		void* reallocate(void* ptr, size_t old_size, size_t new_size)
-		{
-			// round size up to block alignment boundary
-			old_size = (old_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
-			new_size = (new_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
-
-			// we can only reallocate the last object
-			assert(ptr == 0 || static_cast<char*>(ptr) + old_size == &_root->data[0] + _root_size);
-
-			// try to reallocate the object inplace
-			if (ptr && _root_size - old_size + new_size <= _root->capacity)
-			{
-				_root_size = _root_size - old_size + new_size;
-				return ptr;
-			}
-
-			// allocate a new block
-			void* result = allocate(new_size);
-			if (!result) return 0;
-
-			// we have a new block
-			if (ptr)
-			{
-				// copy old data (we only support growing)
-				assert(new_size >= old_size);
-				memcpy(result, ptr, old_size);
-
-				// free the previous page if it had no other objects
-				assert(_root->data == result);
-				assert(_root->next);
-
-				if (_root->next->data == ptr)
-				{
-					// deallocate the whole page, unless it was the first one
-					xpath_memory_block* next = _root->next->next;
-
-					if (next)
-					{
-						xml_memory::deallocate(_root->next);
-						_root->next = next;
-					}
-				}
-			}
-
-			return result;
-		}
-
-		void revert(const xpath_allocator& state)
-		{
-			// free all new pages
-			xpath_memory_block* cur = _root;
-
-			while (cur != state._root)
-			{
-				xpath_memory_block* next = cur->next;
-
-				xml_memory::deallocate(cur);
-
-				cur = next;
-			}
-
-			// restore state
-			_root = state._root;
-			_root_size = state._root_size;
-		}
-
-		void release()
-		{
-			xpath_memory_block* cur = _root;
-			assert(cur);
-
-			while (cur->next)
-			{
-				xpath_memory_block* next = cur->next;
-
-				xml_memory::deallocate(cur);
-
-				cur = next;
-			}
-		}
-	};
-
-	struct xpath_allocator_capture
-	{
-		xpath_allocator_capture(xpath_allocator* alloc): _target(alloc), _state(*alloc)
-		{
-		}
-
-		~xpath_allocator_capture()
-		{
-			_target->revert(_state);
-		}
-
-		xpath_allocator* _target;
-		xpath_allocator _state;
-	};
-
-	struct xpath_stack
-	{
-		xpath_allocator* result;
-		xpath_allocator* temp;
-	};
-
-	struct xpath_stack_data
-	{
-		xpath_memory_block blocks[2];
-		xpath_allocator result;
-		xpath_allocator temp;
-		xpath_stack stack;
-		bool oom;
-
-		xpath_stack_data(): result(blocks + 0, &oom), temp(blocks + 1, &oom), oom(false)
-		{
-			blocks[0].next = blocks[1].next = 0;
-			blocks[0].capacity = blocks[1].capacity = sizeof(blocks[0].data);
-
-			stack.result = &result;
-			stack.temp = &temp;
-		}
-
-		~xpath_stack_data()
-		{
-			result.release();
-			temp.release();
-		}
-	};
-PUGI__NS_END
-
-// String class
-PUGI__NS_BEGIN
-	class xpath_string
-	{
-		const char_t* _buffer;
-		bool _uses_heap;
-		size_t _length_heap;
-
-		static char_t* duplicate_string(const char_t* string, size_t length, xpath_allocator* alloc)
-		{
-			char_t* result = static_cast<char_t*>(alloc->allocate((length + 1) * sizeof(char_t)));
-			if (!result) return 0;
-
-			memcpy(result, string, length * sizeof(char_t));
-			result[length] = 0;
-
-			return result;
-		}
-
-		xpath_string(const char_t* buffer, bool uses_heap_, size_t length_heap): _buffer(buffer), _uses_heap(uses_heap_), _length_heap(length_heap)
-		{
-		}
-
-	public:
-		static xpath_string from_const(const char_t* str)
-		{
-			return xpath_string(str, false, 0);
-		}
-
-		static xpath_string from_heap_preallocated(const char_t* begin, const char_t* end)
-		{
-			assert(begin <= end && *end == 0);
-
-			return xpath_string(begin, true, static_cast<size_t>(end - begin));
-		}
-
-		static xpath_string from_heap(const char_t* begin, const char_t* end, xpath_allocator* alloc)
-		{
-			assert(begin <= end);
-
-			if (begin == end)
-				return xpath_string();
-
-			size_t length = static_cast<size_t>(end - begin);
-			const char_t* data = duplicate_string(begin, length, alloc);
-
-			return data ? xpath_string(data, true, length) : xpath_string();
-		}
-
-		xpath_string(): _buffer(PUGIXML_TEXT("")), _uses_heap(false), _length_heap(0)
-		{
-		}
-
-		void append(const xpath_string& o, xpath_allocator* alloc)
-		{
-			// skip empty sources
-			if (!*o._buffer) return;
-
-			// fast append for constant empty target and constant source
-			if (!*_buffer && !_uses_heap && !o._uses_heap)
-			{
-				_buffer = o._buffer;
-			}
-			else
-			{
-				// need to make heap copy
-				size_t target_length = length();
-				size_t source_length = o.length();
-				size_t result_length = target_length + source_length;
-
-				// allocate new buffer
-				char_t* result = static_cast<char_t*>(alloc->reallocate(_uses_heap ? const_cast<char_t*>(_buffer) : 0, (target_length + 1) * sizeof(char_t), (result_length + 1) * sizeof(char_t)));
-				if (!result) return;
-
-				// append first string to the new buffer in case there was no reallocation
-				if (!_uses_heap) memcpy(result, _buffer, target_length * sizeof(char_t));
-
-				// append second string to the new buffer
-				memcpy(result + target_length, o._buffer, source_length * sizeof(char_t));
-				result[result_length] = 0;
-
-				// finalize
-				_buffer = result;
-				_uses_heap = true;
-				_length_heap = result_length;
-			}
-		}
-
-		const char_t* c_str() const
-		{
-			return _buffer;
-		}
-
-		size_t length() const
-		{
-			return _uses_heap ? _length_heap : strlength(_buffer);
-		}
-
-		char_t* data(xpath_allocator* alloc)
-		{
-			// make private heap copy
-			if (!_uses_heap)
-			{
-				size_t length_ = strlength(_buffer);
-				const char_t* data_ = duplicate_string(_buffer, length_, alloc);
-
-				if (!data_) return 0;
-
-				_buffer = data_;
-				_uses_heap = true;
-				_length_heap = length_;
-			}
-
-			return const_cast<char_t*>(_buffer);
-		}
-
-		bool empty() const
-		{
-			return *_buffer == 0;
-		}
-
-		bool operator==(const xpath_string& o) const
-		{
-			return strequal(_buffer, o._buffer);
-		}
-
-		bool operator!=(const xpath_string& o) const
-		{
-			return !strequal(_buffer, o._buffer);
-		}
-
-		bool uses_heap() const
-		{
-			return _uses_heap;
-		}
-	};
-PUGI__NS_END
-
-PUGI__NS_BEGIN
-	PUGI__FN bool starts_with(const char_t* string, const char_t* pattern)
-	{
-		while (*pattern && *string == *pattern)
-		{
-			string++;
-			pattern++;
-		}
-
-		return *pattern == 0;
-	}
-
-	PUGI__FN const char_t* find_char(const char_t* s, char_t c)
-	{
-	#ifdef PUGIXML_WCHAR_MODE
-		return wcschr(s, c);
-	#else
-		return strchr(s, c);
-	#endif
-	}
-
-	PUGI__FN const char_t* find_substring(const char_t* s, const char_t* p)
-	{
-	#ifdef PUGIXML_WCHAR_MODE
-		// MSVC6 wcsstr bug workaround (if s is empty it always returns 0)
-		return (*p == 0) ? s : wcsstr(s, p);
-	#else
-		return strstr(s, p);
-	#endif
-	}
-
-	// Converts symbol to lower case, if it is an ASCII one
-	PUGI__FN char_t tolower_ascii(char_t ch)
-	{
-		return static_cast<unsigned int>(ch - 'A') < 26 ? static_cast<char_t>(ch | ' ') : ch;
-	}
-
-	PUGI__FN xpath_string string_value(const xpath_node& na, xpath_allocator* alloc)
-	{
-		if (na.attribute())
-			return xpath_string::from_const(na.attribute().value());
-		else
-		{
-			xml_node n = na.node();
-
-			switch (n.type())
-			{
-			case node_pcdata:
-			case node_cdata:
-			case node_comment:
-			case node_pi:
-				return xpath_string::from_const(n.value());
-
-			case node_document:
-			case node_element:
-			{
-				xpath_string result;
-
-				// element nodes can have value if parse_embed_pcdata was used
-				if (n.value()[0])
-					result.append(xpath_string::from_const(n.value()), alloc);
-
-				xml_node cur = n.first_child();
-
-				while (cur && cur != n)
-				{
-					if (cur.type() == node_pcdata || cur.type() == node_cdata)
-						result.append(xpath_string::from_const(cur.value()), alloc);
-
-					if (cur.first_child())
-						cur = cur.first_child();
-					else if (cur.next_sibling())
-						cur = cur.next_sibling();
-					else
-					{
-						while (!cur.next_sibling() && cur != n)
-							cur = cur.parent();
-
-						if (cur != n) cur = cur.next_sibling();
-					}
-				}
-
-				return result;
-			}
-
-			default:
-				return xpath_string();
-			}
-		}
-	}
-
-	PUGI__FN bool node_is_before_sibling(xml_node_struct* ln, xml_node_struct* rn)
-	{
-		assert(ln->parent == rn->parent);
-
-		// there is no common ancestor (the shared parent is null), nodes are from different documents
-		if (!ln->parent) return ln < rn;
-
-		// determine sibling order
-		xml_node_struct* ls = ln;
-		xml_node_struct* rs = rn;
-
-		while (ls && rs)
-		{
-			if (ls == rn) return true;
-			if (rs == ln) return false;
-
-			ls = ls->next_sibling;
-			rs = rs->next_sibling;
-		}
-
-		// if rn sibling chain ended ln must be before rn
-		return !rs;
-	}
-
-	PUGI__FN bool node_is_before(xml_node_struct* ln, xml_node_struct* rn)
-	{
-		// find common ancestor at the same depth, if any
-		xml_node_struct* lp = ln;
-		xml_node_struct* rp = rn;
-
-		while (lp && rp && lp->parent != rp->parent)
-		{
-			lp = lp->parent;
-			rp = rp->parent;
-		}
-
-		// parents are the same!
-		if (lp && rp) return node_is_before_sibling(lp, rp);
-
-		// nodes are at different depths, need to normalize heights
-		bool left_higher = !lp;
-
-		while (lp)
-		{
-			lp = lp->parent;
-			ln = ln->parent;
-		}
-
-		while (rp)
-		{
-			rp = rp->parent;
-			rn = rn->parent;
-		}
-
-		// one node is the ancestor of the other
-		if (ln == rn) return left_higher;
-
-		// find common ancestor... again
-		while (ln->parent != rn->parent)
-		{
-			ln = ln->parent;
-			rn = rn->parent;
-		}
-
-		return node_is_before_sibling(ln, rn);
-	}
-
-	PUGI__FN bool node_is_ancestor(xml_node_struct* parent, xml_node_struct* node)
-	{
-		while (node && node != parent) node = node->parent;
-
-		return parent && node == parent;
-	}
-
-	PUGI__FN const void* document_buffer_order(const xpath_node& xnode)
-	{
-		xml_node_struct* node = xnode.node().internal_object();
-
-		if (node)
-		{
-			if ((get_document(node).header & xml_memory_page_contents_shared_mask) == 0)
-			{
-				if (node->name && (node->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0) return node->name;
-				if (node->value && (node->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return node->value;
-			}
-
-			return 0;
-		}
-
-		xml_attribute_struct* attr = xnode.attribute().internal_object();
-
-		if (attr)
-		{
-			if ((get_document(attr).header & xml_memory_page_contents_shared_mask) == 0)
-			{
-				if ((attr->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0) return attr->name;
-				if ((attr->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return attr->value;
-			}
-
-			return 0;
-		}
-
-		return 0;
-	}
-
-	struct document_order_comparator
-	{
-		bool operator()(const xpath_node& lhs, const xpath_node& rhs) const
-		{
-			// optimized document order based check
-			const void* lo = document_buffer_order(lhs);
-			const void* ro = document_buffer_order(rhs);
-
-			if (lo && ro) return lo < ro;
-
-			// slow comparison
-			xml_node ln = lhs.node(), rn = rhs.node();
-
-			// compare attributes
-			if (lhs.attribute() && rhs.attribute())
-			{
-				// shared parent
-				if (lhs.parent() == rhs.parent())
-				{
-					// determine sibling order
-					for (xml_attribute a = lhs.attribute(); a; a = a.next_attribute())
-						if (a == rhs.attribute())
-							return true;
-
-					return false;
-				}
-
-				// compare attribute parents
-				ln = lhs.parent();
-				rn = rhs.parent();
-			}
-			else if (lhs.attribute())
-			{
-				// attributes go after the parent element
-				if (lhs.parent() == rhs.node()) return false;
-
-				ln = lhs.parent();
-			}
-			else if (rhs.attribute())
-			{
-				// attributes go after the parent element
-				if (rhs.parent() == lhs.node()) return true;
-
-				rn = rhs.parent();
-			}
-
-			if (ln == rn) return false;
-
-			if (!ln || !rn) return ln < rn;
-
-			return node_is_before(ln.internal_object(), rn.internal_object());
-		}
-	};
-
-	PUGI__FN double gen_nan()
-	{
-	#if defined(__STDC_IEC_559__) || ((FLT_RADIX - 0 == 2) && (FLT_MAX_EXP - 0 == 128) && (FLT_MANT_DIG - 0 == 24))
-		PUGI__STATIC_ASSERT(sizeof(float) == sizeof(uint32_t));
-		typedef uint32_t UI; // BCC5 workaround
-		union { float f; UI i; } u;
-		u.i = 0x7fc00000;
-		return double(u.f);
-	#else
-		// fallback
-		const volatile double zero = 0.0;
-		return zero / zero;
-	#endif
-	}
-
-	PUGI__FN bool is_nan(double value)
-	{
-	#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__)
-		return !!_isnan(value);
-	#elif defined(fpclassify) && defined(FP_NAN)
-		return fpclassify(value) == FP_NAN;
-	#else
-		// fallback
-		const volatile double v = value;
-		return v != v;
-	#endif
-	}
-
-	PUGI__FN const char_t* convert_number_to_string_special(double value)
-	{
-	#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__)
-		if (_finite(value)) return (value == 0) ? PUGIXML_TEXT("0") : 0;
-		if (_isnan(value)) return PUGIXML_TEXT("NaN");
-		return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
-	#elif defined(fpclassify) && defined(FP_NAN) && defined(FP_INFINITE) && defined(FP_ZERO)
-		switch (fpclassify(value))
-		{
-		case FP_NAN:
-			return PUGIXML_TEXT("NaN");
-
-		case FP_INFINITE:
-			return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
-
-		case FP_ZERO:
-			return PUGIXML_TEXT("0");
-
-		default:
-			return 0;
-		}
-	#else
-		// fallback
-		const volatile double v = value;
-
-		if (v == 0) return PUGIXML_TEXT("0");
-		if (v != v) return PUGIXML_TEXT("NaN");
-		if (v * 2 == v) return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
-		return 0;
-	#endif
-	}
-
-	PUGI__FN bool convert_number_to_boolean(double value)
-	{
-		return (value != 0 && !is_nan(value));
-	}
-
-	PUGI__FN void truncate_zeros(char* begin, char* end)
-	{
-		while (begin != end && end[-1] == '0') end--;
-
-		*end = 0;
-	}
-
-	// gets mantissa digits in the form of 0.xxxxx with 0. implied and the exponent
-#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400
-	PUGI__FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
-	{
-		// get base values
-		int sign, exponent;
-		_ecvt_s(buffer, sizeof(buffer), value, DBL_DIG + 1, &exponent, &sign);
-
-		// truncate redundant zeros
-		truncate_zeros(buffer, buffer + strlen(buffer));
-
-		// fill results
-		*out_mantissa = buffer;
-		*out_exponent = exponent;
-	}
-#else
-	PUGI__FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
-	{
-		// get a scientific notation value with IEEE DBL_DIG decimals
-		PUGI__SNPRINTF(buffer, "%.*e", DBL_DIG, value);
-
-		// get the exponent (possibly negative)
-		char* exponent_string = strchr(buffer, 'e');
-		assert(exponent_string);
-
-		int exponent = atoi(exponent_string + 1);
-
-		// extract mantissa string: skip sign
-		char* mantissa = buffer[0] == '-' ? buffer + 1 : buffer;
-		assert(mantissa[0] != '0' && mantissa[1] == '.');
-
-		// divide mantissa by 10 to eliminate integer part
-		mantissa[1] = mantissa[0];
-		mantissa++;
-		exponent++;
-
-		// remove extra mantissa digits and zero-terminate mantissa
-		truncate_zeros(mantissa, exponent_string);
-
-		// fill results
-		*out_mantissa = mantissa;
-		*out_exponent = exponent;
-	}
-#endif
-
-	PUGI__FN xpath_string convert_number_to_string(double value, xpath_allocator* alloc)
-	{
-		// try special number conversion
-		const char_t* special = convert_number_to_string_special(value);
-		if (special) return xpath_string::from_const(special);
-
-		// get mantissa + exponent form
-		char mantissa_buffer[32];
-
-		char* mantissa;
-		int exponent;
-		convert_number_to_mantissa_exponent(value, mantissa_buffer, &mantissa, &exponent);
-
-		// allocate a buffer of suitable length for the number
-		size_t result_size = strlen(mantissa_buffer) + (exponent > 0 ? exponent : -exponent) + 4;
-		char_t* result = static_cast<char_t*>(alloc->allocate(sizeof(char_t) * result_size));
-		if (!result) return xpath_string();
-
-		// make the number!
-		char_t* s = result;
-
-		// sign
-		if (value < 0) *s++ = '-';
-
-		// integer part
-		if (exponent <= 0)
-		{
-			*s++ = '0';
-		}
-		else
-		{
-			while (exponent > 0)
-			{
-				assert(*mantissa == 0 || static_cast<unsigned int>(*mantissa - '0') <= 9);
-				*s++ = *mantissa ? *mantissa++ : '0';
-				exponent--;
-			}
-		}
-
-		// fractional part
-		if (*mantissa)
-		{
-			// decimal point
-			*s++ = '.';
-
-			// extra zeroes from negative exponent
-			while (exponent < 0)
-			{
-				*s++ = '0';
-				exponent++;
-			}
-
-			// extra mantissa digits
-			while (*mantissa)
-			{
-				assert(static_cast<unsigned int>(*mantissa - '0') <= 9);
-				*s++ = *mantissa++;
-			}
-		}
-
-		// zero-terminate
-		assert(s < result + result_size);
-		*s = 0;
-
-		return xpath_string::from_heap_preallocated(result, s);
-	}
-
-	PUGI__FN bool check_string_to_number_format(const char_t* string)
-	{
-		// parse leading whitespace
-		while (PUGI__IS_CHARTYPE(*string, ct_space)) ++string;
-
-		// parse sign
-		if (*string == '-') ++string;
-
-		if (!*string) return false;
-
-		// if there is no integer part, there should be a decimal part with at least one digit
-		if (!PUGI__IS_CHARTYPEX(string[0], ctx_digit) && (string[0] != '.' || !PUGI__IS_CHARTYPEX(string[1], ctx_digit))) return false;
-
-		// parse integer part
-		while (PUGI__IS_CHARTYPEX(*string, ctx_digit)) ++string;
-
-		// parse decimal part
-		if (*string == '.')
-		{
-			++string;
-
-			while (PUGI__IS_CHARTYPEX(*string, ctx_digit)) ++string;
-		}
-
-		// parse trailing whitespace
-		while (PUGI__IS_CHARTYPE(*string, ct_space)) ++string;
-
-		return *string == 0;
-	}
-
-	PUGI__FN double convert_string_to_number(const char_t* string)
-	{
-		// check string format
-		if (!check_string_to_number_format(string)) return gen_nan();
-
-		// parse string
-	#ifdef PUGIXML_WCHAR_MODE
-		return wcstod(string, 0);
-	#else
-		return strtod(string, 0);
-	#endif
-	}
-
-	PUGI__FN bool convert_string_to_number_scratch(char_t (&buffer)[32], const char_t* begin, const char_t* end, double* out_result)
-	{
-		size_t length = static_cast<size_t>(end - begin);
-		char_t* scratch = buffer;
-
-		if (length >= sizeof(buffer) / sizeof(buffer[0]))
-		{
-			// need to make dummy on-heap copy
-			scratch = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
-			if (!scratch) return false;
-		}
-
-		// copy string to zero-terminated buffer and perform conversion
-		memcpy(scratch, begin, length * sizeof(char_t));
-		scratch[length] = 0;
-
-		*out_result = convert_string_to_number(scratch);
-
-		// free dummy buffer
-		if (scratch != buffer) xml_memory::deallocate(scratch);
-
-		return true;
-	}
-
-	PUGI__FN double round_nearest(double value)
-	{
-		return floor(value + 0.5);
-	}
-
-	PUGI__FN double round_nearest_nzero(double value)
-	{
-		// same as round_nearest, but returns -0 for [-0.5, -0]
-		// ceil is used to differentiate between +0 and -0 (we return -0 for [-0.5, -0] and +0 for +0)
-		return (value >= -0.5 && value <= 0) ? ceil(value) : floor(value + 0.5);
-	}
-
-	PUGI__FN const char_t* qualified_name(const xpath_node& node)
-	{
-		return node.attribute() ? node.attribute().name() : node.node().name();
-	}
-
-	PUGI__FN const char_t* local_name(const xpath_node& node)
-	{
-		const char_t* name = qualified_name(node);
-		const char_t* p = find_char(name, ':');
-
-		return p ? p + 1 : name;
-	}
-
-	struct namespace_uri_predicate
-	{
-		const char_t* prefix;
-		size_t prefix_length;
-
-		namespace_uri_predicate(const char_t* name)
-		{
-			const char_t* pos = find_char(name, ':');
-
-			prefix = pos ? name : 0;
-			prefix_length = pos ? static_cast<size_t>(pos - name) : 0;
-		}
-
-		bool operator()(xml_attribute a) const
-		{
-			const char_t* name = a.name();
-
-			if (!starts_with(name, PUGIXML_TEXT("xmlns"))) return false;
-
-			return prefix ? name[5] == ':' && strequalrange(name + 6, prefix, prefix_length) : name[5] == 0;
-		}
-	};
-
-	PUGI__FN const char_t* namespace_uri(xml_node node)
-	{
-		namespace_uri_predicate pred = node.name();
-
-		xml_node p = node;
-
-		while (p)
-		{
-			xml_attribute a = p.find_attribute(pred);
-
-			if (a) return a.value();
-
-			p = p.parent();
-		}
-
-		return PUGIXML_TEXT("");
-	}
-
-	PUGI__FN const char_t* namespace_uri(xml_attribute attr, xml_node parent)
-	{
-		namespace_uri_predicate pred = attr.name();
-
-		// Default namespace does not apply to attributes
-		if (!pred.prefix) return PUGIXML_TEXT("");
-
-		xml_node p = parent;
-
-		while (p)
-		{
-			xml_attribute a = p.find_attribute(pred);
-
-			if (a) return a.value();
-
-			p = p.parent();
-		}
-
-		return PUGIXML_TEXT("");
-	}
-
-	PUGI__FN const char_t* namespace_uri(const xpath_node& node)
-	{
-		return node.attribute() ? namespace_uri(node.attribute(), node.parent()) : namespace_uri(node.node());
-	}
-
-	PUGI__FN char_t* normalize_space(char_t* buffer)
-	{
-		char_t* write = buffer;
-
-		for (char_t* it = buffer; *it; )
-		{
-			char_t ch = *it++;
-
-			if (PUGI__IS_CHARTYPE(ch, ct_space))
-			{
-				// replace whitespace sequence with single space
-				while (PUGI__IS_CHARTYPE(*it, ct_space)) it++;
-
-				// avoid leading spaces
-				if (write != buffer) *write++ = ' ';
-			}
-			else *write++ = ch;
-		}
-
-		// remove trailing space
-		if (write != buffer && PUGI__IS_CHARTYPE(write[-1], ct_space)) write--;
-
-		// zero-terminate
-		*write = 0;
-
-		return write;
-	}
-
-	PUGI__FN char_t* translate(char_t* buffer, const char_t* from, const char_t* to, size_t to_length)
-	{
-		char_t* write = buffer;
-
-		while (*buffer)
-		{
-			PUGI__DMC_VOLATILE char_t ch = *buffer++;
-
-			const char_t* pos = find_char(from, ch);
-
-			if (!pos)
-				*write++ = ch; // do not process
-			else if (static_cast<size_t>(pos - from) < to_length)
-				*write++ = to[pos - from]; // replace
-		}
-
-		// zero-terminate
-		*write = 0;
-
-		return write;
-	}
-
-	PUGI__FN unsigned char* translate_table_generate(xpath_allocator* alloc, const char_t* from, const char_t* to)
-	{
-		unsigned char table[128] = {0};
-
-		while (*from)
-		{
-			unsigned int fc = static_cast<unsigned int>(*from);
-			unsigned int tc = static_cast<unsigned int>(*to);
-
-			if (fc >= 128 || tc >= 128)
-				return 0;
-
-			// code=128 means "skip character"
-			if (!table[fc])
-				table[fc] = static_cast<unsigned char>(tc ? tc : 128);
-
-			from++;
-			if (tc) to++;
-		}
-
-		for (int i = 0; i < 128; ++i)
-			if (!table[i])
-				table[i] = static_cast<unsigned char>(i);
-
-		void* result = alloc->allocate(sizeof(table));
-		if (!result) return 0;
-
-		memcpy(result, table, sizeof(table));
-
-		return static_cast<unsigned char*>(result);
-	}
-
-	PUGI__FN char_t* translate_table(char_t* buffer, const unsigned char* table)
-	{
-		char_t* write = buffer;
-
-		while (*buffer)
-		{
-			char_t ch = *buffer++;
-			unsigned int index = static_cast<unsigned int>(ch);
-
-			if (index < 128)
-			{
-				unsigned char code = table[index];
-
-				// code=128 means "skip character" (table size is 128 so 128 can be a special value)
-				// this code skips these characters without extra branches
-				*write = static_cast<char_t>(code);
-				write += 1 - (code >> 7);
-			}
-			else
-			{
-				*write++ = ch;
-			}
-		}
-
-		// zero-terminate
-		*write = 0;
-
-		return write;
-	}
-
-	inline bool is_xpath_attribute(const char_t* name)
-	{
-		return !(starts_with(name, PUGIXML_TEXT("xmlns")) && (name[5] == 0 || name[5] == ':'));
-	}
-
-	struct xpath_variable_boolean: xpath_variable
-	{
-		xpath_variable_boolean(): xpath_variable(xpath_type_boolean), value(false)
-		{
-		}
-
-		bool value;
-		char_t name[1];
-	};
-
-	struct xpath_variable_number: xpath_variable
-	{
-		xpath_variable_number(): xpath_variable(xpath_type_number), value(0)
-		{
-		}
-
-		double value;
-		char_t name[1];
-	};
-
-	struct xpath_variable_string: xpath_variable
-	{
-		xpath_variable_string(): xpath_variable(xpath_type_string), value(0)
-		{
-		}
-
-		~xpath_variable_string()
-		{
-			if (value) xml_memory::deallocate(value);
-		}
-
-		char_t* value;
-		char_t name[1];
-	};
-
-	struct xpath_variable_node_set: xpath_variable
-	{
-		xpath_variable_node_set(): xpath_variable(xpath_type_node_set)
-		{
-		}
-
-		xpath_node_set value;
-		char_t name[1];
-	};
-
-	static const xpath_node_set dummy_node_set;
-
-	PUGI__FN PUGI__UNSIGNED_OVERFLOW unsigned int hash_string(const char_t* str)
-	{
-		// Jenkins one-at-a-time hash (http://en.wikipedia.org/wiki/Jenkins_hash_function#one-at-a-time)
-		unsigned int result = 0;
-
-		while (*str)
-		{
-			result += static_cast<unsigned int>(*str++);
-			result += result << 10;
-			result ^= result >> 6;
-		}
-
-		result += result << 3;
-		result ^= result >> 11;
-		result += result << 15;
-
-		return result;
-	}
-
-	template <typename T> PUGI__FN T* new_xpath_variable(const char_t* name)
-	{
-		size_t length = strlength(name);
-		if (length == 0) return 0; // empty variable names are invalid
-
-		// $$ we can't use offsetof(T, name) because T is non-POD, so we just allocate additional length characters
-		void* memory = xml_memory::allocate(sizeof(T) + length * sizeof(char_t));
-		if (!memory) return 0;
-
-		T* result = new (memory) T();
-
-		memcpy(result->name, name, (length + 1) * sizeof(char_t));
-
-		return result;
-	}
-
-	PUGI__FN xpath_variable* new_xpath_variable(xpath_value_type type, const char_t* name)
-	{
-		switch (type)
-		{
-		case xpath_type_node_set:
-			return new_xpath_variable<xpath_variable_node_set>(name);
-
-		case xpath_type_number:
-			return new_xpath_variable<xpath_variable_number>(name);
-
-		case xpath_type_string:
-			return new_xpath_variable<xpath_variable_string>(name);
-
-		case xpath_type_boolean:
-			return new_xpath_variable<xpath_variable_boolean>(name);
-
-		default:
-			return 0;
-		}
-	}
-
-	template <typename T> PUGI__FN void delete_xpath_variable(T* var)
-	{
-		var->~T();
-		xml_memory::deallocate(var);
-	}
-
-	PUGI__FN void delete_xpath_variable(xpath_value_type type, xpath_variable* var)
-	{
-		switch (type)
-		{
-		case xpath_type_node_set:
-			delete_xpath_variable(static_cast<xpath_variable_node_set*>(var));
-			break;
-
-		case xpath_type_number:
-			delete_xpath_variable(static_cast<xpath_variable_number*>(var));
-			break;
-
-		case xpath_type_string:
-			delete_xpath_variable(static_cast<xpath_variable_string*>(var));
-			break;
-
-		case xpath_type_boolean:
-			delete_xpath_variable(static_cast<xpath_variable_boolean*>(var));
-			break;
-
-		default:
-			assert(false && "Invalid variable type"); // unreachable
-		}
-	}
-
-	PUGI__FN bool copy_xpath_variable(xpath_variable* lhs, const xpath_variable* rhs)
-	{
-		switch (rhs->type())
-		{
-		case xpath_type_node_set:
-			return lhs->set(static_cast<const xpath_variable_node_set*>(rhs)->value);
-
-		case xpath_type_number:
-			return lhs->set(static_cast<const xpath_variable_number*>(rhs)->value);
-
-		case xpath_type_string:
-			return lhs->set(static_cast<const xpath_variable_string*>(rhs)->value);
-
-		case xpath_type_boolean:
-			return lhs->set(static_cast<const xpath_variable_boolean*>(rhs)->value);
-
-		default:
-			assert(false && "Invalid variable type"); // unreachable
-			return false;
-		}
-	}
-
-	PUGI__FN bool get_variable_scratch(char_t (&buffer)[32], xpath_variable_set* set, const char_t* begin, const char_t* end, xpath_variable** out_result)
-	{
-		size_t length = static_cast<size_t>(end - begin);
-		char_t* scratch = buffer;
-
-		if (length >= sizeof(buffer) / sizeof(buffer[0]))
-		{
-			// need to make dummy on-heap copy
-			scratch = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
-			if (!scratch) return false;
-		}
-
-		// copy string to zero-terminated buffer and perform lookup
-		memcpy(scratch, begin, length * sizeof(char_t));
-		scratch[length] = 0;
-
-		*out_result = set->get(scratch);
-
-		// free dummy buffer
-		if (scratch != buffer) xml_memory::deallocate(scratch);
-
-		return true;
-	}
-PUGI__NS_END
-
-// Internal node set class
-PUGI__NS_BEGIN
-	PUGI__FN xpath_node_set::type_t xpath_get_order(const xpath_node* begin, const xpath_node* end)
-	{
-		if (end - begin < 2)
-			return xpath_node_set::type_sorted;
-
-		document_order_comparator cmp;
-
-		bool first = cmp(begin[0], begin[1]);
-
-		for (const xpath_node* it = begin + 1; it + 1 < end; ++it)
-			if (cmp(it[0], it[1]) != first)
-				return xpath_node_set::type_unsorted;
-
-		return first ? xpath_node_set::type_sorted : xpath_node_set::type_sorted_reverse;
-	}
-
-	PUGI__FN xpath_node_set::type_t xpath_sort(xpath_node* begin, xpath_node* end, xpath_node_set::type_t type, bool rev)
-	{
-		xpath_node_set::type_t order = rev ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted;
-
-		if (type == xpath_node_set::type_unsorted)
-		{
-			xpath_node_set::type_t sorted = xpath_get_order(begin, end);
-
-			if (sorted == xpath_node_set::type_unsorted)
-			{
-				sort(begin, end, document_order_comparator());
-
-				type = xpath_node_set::type_sorted;
-			}
-			else
-				type = sorted;
-		}
-
-		if (type != order) reverse(begin, end);
-
-		return order;
-	}
-
-	PUGI__FN xpath_node xpath_first(const xpath_node* begin, const xpath_node* end, xpath_node_set::type_t type)
-	{
-		if (begin == end) return xpath_node();
-
-		switch (type)
-		{
-		case xpath_node_set::type_sorted:
-			return *begin;
-
-		case xpath_node_set::type_sorted_reverse:
-			return *(end - 1);
-
-		case xpath_node_set::type_unsorted:
-			return *min_element(begin, end, document_order_comparator());
-
-		default:
-			assert(false && "Invalid node set type"); // unreachable
-			return xpath_node();
-		}
-	}
-
-	class xpath_node_set_raw
-	{
-		xpath_node_set::type_t _type;
-
-		xpath_node* _begin;
-		xpath_node* _end;
-		xpath_node* _eos;
-
-	public:
-		xpath_node_set_raw(): _type(xpath_node_set::type_unsorted), _begin(0), _end(0), _eos(0)
-		{
-		}
-
-		xpath_node* begin() const
-		{
-			return _begin;
-		}
-
-		xpath_node* end() const
-		{
-			return _end;
-		}
-
-		bool empty() const
-		{
-			return _begin == _end;
-		}
-
-		size_t size() const
-		{
-			return static_cast<size_t>(_end - _begin);
-		}
-
-		xpath_node first() const
-		{
-			return xpath_first(_begin, _end, _type);
-		}
-
-		void push_back_grow(const xpath_node& node, xpath_allocator* alloc);
-
-		void push_back(const xpath_node& node, xpath_allocator* alloc)
-		{
-			if (_end != _eos)
-				*_end++ = node;
-			else
-				push_back_grow(node, alloc);
-		}
-
-		void append(const xpath_node* begin_, const xpath_node* end_, xpath_allocator* alloc)
-		{
-			if (begin_ == end_) return;
-
-			size_t size_ = static_cast<size_t>(_end - _begin);
-			size_t capacity = static_cast<size_t>(_eos - _begin);
-			size_t count = static_cast<size_t>(end_ - begin_);
-
-			if (size_ + count > capacity)
-			{
-				// reallocate the old array or allocate a new one
-				xpath_node* data = static_cast<xpath_node*>(alloc->reallocate(_begin, capacity * sizeof(xpath_node), (size_ + count) * sizeof(xpath_node)));
-				if (!data) return;
-
-				// finalize
-				_begin = data;
-				_end = data + size_;
-				_eos = data + size_ + count;
-			}
-
-			memcpy(_end, begin_, count * sizeof(xpath_node));
-			_end += count;
-		}
-
-		void sort_do()
-		{
-			_type = xpath_sort(_begin, _end, _type, false);
-		}
-
-		void truncate(xpath_node* pos)
-		{
-			assert(_begin <= pos && pos <= _end);
-
-			_end = pos;
-		}
-
-		void remove_duplicates(xpath_allocator* alloc)
-		{
-			if (_type == xpath_node_set::type_unsorted && _end - _begin > 2)
-			{
-				xpath_allocator_capture cr(alloc);
-
-				size_t size_ = static_cast<size_t>(_end - _begin);
-
-				size_t hash_size = 1;
-				while (hash_size < size_ + size_ / 2) hash_size *= 2;
-
-				const void** hash_data = static_cast<const void**>(alloc->allocate(hash_size * sizeof(void**)));
-				if (!hash_data) return;
-
-				memset(hash_data, 0, hash_size * sizeof(const void**));
-
-				xpath_node* write = _begin;
-
-				for (xpath_node* it = _begin; it != _end; ++it)
-				{
-					const void* attr = it->attribute().internal_object();
-					const void* node = it->node().internal_object();
-					const void* key = attr ? attr : node;
-
-					if (key && hash_insert(hash_data, hash_size, key))
-					{
-						*write++ = *it;
-					}
-				}
-
-				_end = write;
-			}
-			else
-			{
-				_end = unique(_begin, _end);
-			}
-		}
-
-		xpath_node_set::type_t type() const
-		{
-			return _type;
-		}
-
-		void set_type(xpath_node_set::type_t value)
-		{
-			_type = value;
-		}
-	};
-
-	PUGI__FN_NO_INLINE void xpath_node_set_raw::push_back_grow(const xpath_node& node, xpath_allocator* alloc)
-	{
-		size_t capacity = static_cast<size_t>(_eos - _begin);
-
-		// get new capacity (1.5x rule)
-		size_t new_capacity = capacity + capacity / 2 + 1;
-
-		// reallocate the old array or allocate a new one
-		xpath_node* data = static_cast<xpath_node*>(alloc->reallocate(_begin, capacity * sizeof(xpath_node), new_capacity * sizeof(xpath_node)));
-		if (!data) return;
-
-		// finalize
-		_begin = data;
-		_end = data + capacity;
-		_eos = data + new_capacity;
-
-		// push
-		*_end++ = node;
-	}
-PUGI__NS_END
-
-PUGI__NS_BEGIN
-	struct xpath_context
-	{
-		xpath_node n;
-		size_t position, size;
-
-		xpath_context(const xpath_node& n_, size_t position_, size_t size_): n(n_), position(position_), size(size_)
-		{
-		}
-	};
-
-	enum lexeme_t
-	{
-		lex_none = 0,
-		lex_equal,
-		lex_not_equal,
-		lex_less,
-		lex_greater,
-		lex_less_or_equal,
-		lex_greater_or_equal,
-		lex_plus,
-		lex_minus,
-		lex_multiply,
-		lex_union,
-		lex_var_ref,
-		lex_open_brace,
-		lex_close_brace,
-		lex_quoted_string,
-		lex_number,
-		lex_slash,
-		lex_double_slash,
-		lex_open_square_brace,
-		lex_close_square_brace,
-		lex_string,
-		lex_comma,
-		lex_axis_attribute,
-		lex_dot,
-		lex_double_dot,
-		lex_double_colon,
-		lex_eof
-	};
-
-	struct xpath_lexer_string
-	{
-		const char_t* begin;
-		const char_t* end;
-
-		xpath_lexer_string(): begin(0), end(0)
-		{
-		}
-
-		bool operator==(const char_t* other) const
-		{
-			size_t length = static_cast<size_t>(end - begin);
-
-			return strequalrange(other, begin, length);
-		}
-	};
-
-	class xpath_lexer
-	{
-		const char_t* _cur;
-		const char_t* _cur_lexeme_pos;
-		xpath_lexer_string _cur_lexeme_contents;
-
-		lexeme_t _cur_lexeme;
-
-	public:
-		explicit xpath_lexer(const char_t* query): _cur(query)
-		{
-			next();
-		}
-
-		const char_t* state() const
-		{
-			return _cur;
-		}
-
-		void next()
-		{
-			const char_t* cur = _cur;
-
-			while (PUGI__IS_CHARTYPE(*cur, ct_space)) ++cur;
-
-			// save lexeme position for error reporting
-			_cur_lexeme_pos = cur;
-
-			switch (*cur)
-			{
-			case 0:
-				_cur_lexeme = lex_eof;
-				break;
-
-			case '>':
-				if (*(cur+1) == '=')
-				{
-					cur += 2;
-					_cur_lexeme = lex_greater_or_equal;
-				}
-				else
-				{
-					cur += 1;
-					_cur_lexeme = lex_greater;
-				}
-				break;
-
-			case '<':
-				if (*(cur+1) == '=')
-				{
-					cur += 2;
-					_cur_lexeme = lex_less_or_equal;
-				}
-				else
-				{
-					cur += 1;
-					_cur_lexeme = lex_less;
-				}
-				break;
-
-			case '!':
-				if (*(cur+1) == '=')
-				{
-					cur += 2;
-					_cur_lexeme = lex_not_equal;
-				}
-				else
-				{
-					_cur_lexeme = lex_none;
-				}
-				break;
-
-			case '=':
-				cur += 1;
-				_cur_lexeme = lex_equal;
-
-				break;
-
-			case '+':
-				cur += 1;
-				_cur_lexeme = lex_plus;
-
-				break;
-
-			case '-':
-				cur += 1;
-				_cur_lexeme = lex_minus;
-
-				break;
-
-			case '*':
-				cur += 1;
-				_cur_lexeme = lex_multiply;
-
-				break;
-
-			case '|':
-				cur += 1;
-				_cur_lexeme = lex_union;
-
-				break;
-
-			case '$':
-				cur += 1;
-
-				if (PUGI__IS_CHARTYPEX(*cur, ctx_start_symbol))
-				{
-					_cur_lexeme_contents.begin = cur;
-
-					while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
-
-					if (cur[0] == ':' && PUGI__IS_CHARTYPEX(cur[1], ctx_symbol)) // qname
-					{
-						cur++; // :
-
-						while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
-					}
-
-					_cur_lexeme_contents.end = cur;
-
-					_cur_lexeme = lex_var_ref;
-				}
-				else
-				{
-					_cur_lexeme = lex_none;
-				}
-
-				break;
-
-			case '(':
-				cur += 1;
-				_cur_lexeme = lex_open_brace;
-
-				break;
-
-			case ')':
-				cur += 1;
-				_cur_lexeme = lex_close_brace;
-
-				break;
-
-			case '[':
-				cur += 1;
-				_cur_lexeme = lex_open_square_brace;
-
-				break;
-
-			case ']':
-				cur += 1;
-				_cur_lexeme = lex_close_square_brace;
-
-				break;
-
-			case ',':
-				cur += 1;
-				_cur_lexeme = lex_comma;
-
-				break;
-
-			case '/':
-				if (*(cur+1) == '/')
-				{
-					cur += 2;
-					_cur_lexeme = lex_double_slash;
-				}
-				else
-				{
-					cur += 1;
-					_cur_lexeme = lex_slash;
-				}
-				break;
-
-			case '.':
-				if (*(cur+1) == '.')
-				{
-					cur += 2;
-					_cur_lexeme = lex_double_dot;
-				}
-				else if (PUGI__IS_CHARTYPEX(*(cur+1), ctx_digit))
-				{
-					_cur_lexeme_contents.begin = cur; // .
-
-					++cur;
-
-					while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
-
-					_cur_lexeme_contents.end = cur;
-
-					_cur_lexeme = lex_number;
-				}
-				else
-				{
-					cur += 1;
-					_cur_lexeme = lex_dot;
-				}
-				break;
-
-			case '@':
-				cur += 1;
-				_cur_lexeme = lex_axis_attribute;
-
-				break;
-
-			case '"':
-			case '\'':
-			{
-				char_t terminator = *cur;
-
-				++cur;
-
-				_cur_lexeme_contents.begin = cur;
-				while (*cur && *cur != terminator) cur++;
-				_cur_lexeme_contents.end = cur;
-
-				if (!*cur)
-					_cur_lexeme = lex_none;
-				else
-				{
-					cur += 1;
-					_cur_lexeme = lex_quoted_string;
-				}
-
-				break;
-			}
-
-			case ':':
-				if (*(cur+1) == ':')
-				{
-					cur += 2;
-					_cur_lexeme = lex_double_colon;
-				}
-				else
-				{
-					_cur_lexeme = lex_none;
-				}
-				break;
-
-			default:
-				if (PUGI__IS_CHARTYPEX(*cur, ctx_digit))
-				{
-					_cur_lexeme_contents.begin = cur;
-
-					while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
-
-					if (*cur == '.')
-					{
-						cur++;
-
-						while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
-					}
-
-					_cur_lexeme_contents.end = cur;
-
-					_cur_lexeme = lex_number;
-				}
-				else if (PUGI__IS_CHARTYPEX(*cur, ctx_start_symbol))
-				{
-					_cur_lexeme_contents.begin = cur;
-
-					while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
-
-					if (cur[0] == ':')
-					{
-						if (cur[1] == '*') // namespace test ncname:*
-						{
-							cur += 2; // :*
-						}
-						else if (PUGI__IS_CHARTYPEX(cur[1], ctx_symbol)) // namespace test qname
-						{
-							cur++; // :
-
-							while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
-						}
-					}
-
-					_cur_lexeme_contents.end = cur;
-
-					_cur_lexeme = lex_string;
-				}
-				else
-				{
-					_cur_lexeme = lex_none;
-				}
-			}
-
-			_cur = cur;
-		}
-
-		lexeme_t current() const
-		{
-			return _cur_lexeme;
-		}
-
-		const char_t* current_pos() const
-		{
-			return _cur_lexeme_pos;
-		}
-
-		const xpath_lexer_string& contents() const
-		{
-			assert(_cur_lexeme == lex_var_ref || _cur_lexeme == lex_number || _cur_lexeme == lex_string || _cur_lexeme == lex_quoted_string);
-
-			return _cur_lexeme_contents;
-		}
-	};
-
-	enum ast_type_t
-	{
-		ast_unknown,
-		ast_op_or,						// left or right
-		ast_op_and,						// left and right
-		ast_op_equal,					// left = right
-		ast_op_not_equal,				// left != right
-		ast_op_less,					// left < right
-		ast_op_greater,					// left > right
-		ast_op_less_or_equal,			// left <= right
-		ast_op_greater_or_equal,		// left >= right
-		ast_op_add,						// left + right
-		ast_op_subtract,				// left - right
-		ast_op_multiply,				// left * right
-		ast_op_divide,					// left / right
-		ast_op_mod,						// left % right
-		ast_op_negate,					// left - right
-		ast_op_union,					// left | right
-		ast_predicate,					// apply predicate to set; next points to next predicate
-		ast_filter,						// select * from left where right
-		ast_string_constant,			// string constant
-		ast_number_constant,			// number constant
-		ast_variable,					// variable
-		ast_func_last,					// last()
-		ast_func_position,				// position()
-		ast_func_count,					// count(left)
-		ast_func_id,					// id(left)
-		ast_func_local_name_0,			// local-name()
-		ast_func_local_name_1,			// local-name(left)
-		ast_func_namespace_uri_0,		// namespace-uri()
-		ast_func_namespace_uri_1,		// namespace-uri(left)
-		ast_func_name_0,				// name()
-		ast_func_name_1,				// name(left)
-		ast_func_string_0,				// string()
-		ast_func_string_1,				// string(left)
-		ast_func_concat,				// concat(left, right, siblings)
-		ast_func_starts_with,			// starts_with(left, right)
-		ast_func_contains,				// contains(left, right)
-		ast_func_substring_before,		// substring-before(left, right)
-		ast_func_substring_after,		// substring-after(left, right)
-		ast_func_substring_2,			// substring(left, right)
-		ast_func_substring_3,			// substring(left, right, third)
-		ast_func_string_length_0,		// string-length()
-		ast_func_string_length_1,		// string-length(left)
-		ast_func_normalize_space_0,		// normalize-space()
-		ast_func_normalize_space_1,		// normalize-space(left)
-		ast_func_translate,				// translate(left, right, third)
-		ast_func_boolean,				// boolean(left)
-		ast_func_not,					// not(left)
-		ast_func_true,					// true()
-		ast_func_false,					// false()
-		ast_func_lang,					// lang(left)
-		ast_func_number_0,				// number()
-		ast_func_number_1,				// number(left)
-		ast_func_sum,					// sum(left)
-		ast_func_floor,					// floor(left)
-		ast_func_ceiling,				// ceiling(left)
-		ast_func_round,					// round(left)
-		ast_step,						// process set left with step
-		ast_step_root,					// select root node
-
-		ast_opt_translate_table,		// translate(left, right, third) where right/third are constants
-		ast_opt_compare_attribute		// @name = 'string'
-	};
-
-	enum axis_t
-	{
-		axis_ancestor,
-		axis_ancestor_or_self,
-		axis_attribute,
-		axis_child,
-		axis_descendant,
-		axis_descendant_or_self,
-		axis_following,
-		axis_following_sibling,
-		axis_namespace,
-		axis_parent,
-		axis_preceding,
-		axis_preceding_sibling,
-		axis_self
-	};
-
-	enum nodetest_t
-	{
-		nodetest_none,
-		nodetest_name,
-		nodetest_type_node,
-		nodetest_type_comment,
-		nodetest_type_pi,
-		nodetest_type_text,
-		nodetest_pi,
-		nodetest_all,
-		nodetest_all_in_namespace
-	};
-
-	enum predicate_t
-	{
-		predicate_default,
-		predicate_posinv,
-		predicate_constant,
-		predicate_constant_one
-	};
-
-	enum nodeset_eval_t
-	{
-		nodeset_eval_all,
-		nodeset_eval_any,
-		nodeset_eval_first
-	};
-
-	template <axis_t N> struct axis_to_type
-	{
-		static const axis_t axis;
-	};
-
-	template <axis_t N> const axis_t axis_to_type<N>::axis = N;
-
-	class xpath_ast_node
-	{
-	private:
-		// node type
-		char _type;
-		char _rettype;
-
-		// for ast_step
-		char _axis;
-
-		// for ast_step/ast_predicate/ast_filter
-		char _test;
-
-		// tree node structure
-		xpath_ast_node* _left;
-		xpath_ast_node* _right;
-		xpath_ast_node* _next;
-
-		union
-		{
-			// value for ast_string_constant
-			const char_t* string;
-			// value for ast_number_constant
-			double number;
-			// variable for ast_variable
-			xpath_variable* variable;
-			// node test for ast_step (node name/namespace/node type/pi target)
-			const char_t* nodetest;
-			// table for ast_opt_translate_table
-			const unsigned char* table;
-		} _data;
-
-		xpath_ast_node(const xpath_ast_node&);
-		xpath_ast_node& operator=(const xpath_ast_node&);
-
-		template <class Comp> static bool compare_eq(xpath_ast_node* lhs, xpath_ast_node* rhs, const xpath_context& c, const xpath_stack& stack, const Comp& comp)
-		{
-			xpath_value_type lt = lhs->rettype(), rt = rhs->rettype();
-
-			if (lt != xpath_type_node_set && rt != xpath_type_node_set)
-			{
-				if (lt == xpath_type_boolean || rt == xpath_type_boolean)
-					return comp(lhs->eval_boolean(c, stack), rhs->eval_boolean(c, stack));
-				else if (lt == xpath_type_number || rt == xpath_type_number)
-					return comp(lhs->eval_number(c, stack), rhs->eval_number(c, stack));
-				else if (lt == xpath_type_string || rt == xpath_type_string)
-				{
-					xpath_allocator_capture cr(stack.result);
-
-					xpath_string ls = lhs->eval_string(c, stack);
-					xpath_string rs = rhs->eval_string(c, stack);
-
-					return comp(ls, rs);
-				}
-			}
-			else if (lt == xpath_type_node_set && rt == xpath_type_node_set)
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
-				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
-
-				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
-					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
-					{
-						xpath_allocator_capture cri(stack.result);
-
-						if (comp(string_value(*li, stack.result), string_value(*ri, stack.result)))
-							return true;
-					}
-
-				return false;
-			}
-			else
-			{
-				if (lt == xpath_type_node_set)
-				{
-					swap(lhs, rhs);
-					swap(lt, rt);
-				}
-
-				if (lt == xpath_type_boolean)
-					return comp(lhs->eval_boolean(c, stack), rhs->eval_boolean(c, stack));
-				else if (lt == xpath_type_number)
-				{
-					xpath_allocator_capture cr(stack.result);
-
-					double l = lhs->eval_number(c, stack);
-					xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
-
-					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
-					{
-						xpath_allocator_capture cri(stack.result);
-
-						if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
-							return true;
-					}
-
-					return false;
-				}
-				else if (lt == xpath_type_string)
-				{
-					xpath_allocator_capture cr(stack.result);
-
-					xpath_string l = lhs->eval_string(c, stack);
-					xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
-
-					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
-					{
-						xpath_allocator_capture cri(stack.result);
-
-						if (comp(l, string_value(*ri, stack.result)))
-							return true;
-					}
-
-					return false;
-				}
-			}
-
-			assert(false && "Wrong types"); // unreachable
-			return false;
-		}
-
-		static bool eval_once(xpath_node_set::type_t type, nodeset_eval_t eval)
-		{
-			return type == xpath_node_set::type_sorted ? eval != nodeset_eval_all : eval == nodeset_eval_any;
-		}
-
-		template <class Comp> static bool compare_rel(xpath_ast_node* lhs, xpath_ast_node* rhs, const xpath_context& c, const xpath_stack& stack, const Comp& comp)
-		{
-			xpath_value_type lt = lhs->rettype(), rt = rhs->rettype();
-
-			if (lt != xpath_type_node_set && rt != xpath_type_node_set)
-				return comp(lhs->eval_number(c, stack), rhs->eval_number(c, stack));
-			else if (lt == xpath_type_node_set && rt == xpath_type_node_set)
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
-				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
-
-				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
-				{
-					xpath_allocator_capture cri(stack.result);
-
-					double l = convert_string_to_number(string_value(*li, stack.result).c_str());
-
-					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
-					{
-						xpath_allocator_capture crii(stack.result);
-
-						if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
-							return true;
-					}
-				}
-
-				return false;
-			}
-			else if (lt != xpath_type_node_set && rt == xpath_type_node_set)
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				double l = lhs->eval_number(c, stack);
-				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
-
-				for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
-				{
-					xpath_allocator_capture cri(stack.result);
-
-					if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
-						return true;
-				}
-
-				return false;
-			}
-			else if (lt == xpath_type_node_set && rt != xpath_type_node_set)
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
-				double r = rhs->eval_number(c, stack);
-
-				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
-				{
-					xpath_allocator_capture cri(stack.result);
-
-					if (comp(convert_string_to_number(string_value(*li, stack.result).c_str()), r))
-						return true;
-				}
-
-				return false;
-			}
-			else
-			{
-				assert(false && "Wrong types"); // unreachable
-				return false;
-			}
-		}
-
-		static void apply_predicate_boolean(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack, bool once)
-		{
-			assert(ns.size() >= first);
-			assert(expr->rettype() != xpath_type_number);
-
-			size_t i = 1;
-			size_t size = ns.size() - first;
-
-			xpath_node* last = ns.begin() + first;
-
-			// remove_if... or well, sort of
-			for (xpath_node* it = last; it != ns.end(); ++it, ++i)
-			{
-				xpath_context c(*it, i, size);
-
-				if (expr->eval_boolean(c, stack))
-				{
-					*last++ = *it;
-
-					if (once) break;
-				}
-			}
-
-			ns.truncate(last);
-		}
-
-		static void apply_predicate_number(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack, bool once)
-		{
-			assert(ns.size() >= first);
-			assert(expr->rettype() == xpath_type_number);
-
-			size_t i = 1;
-			size_t size = ns.size() - first;
-
-			xpath_node* last = ns.begin() + first;
-
-			// remove_if... or well, sort of
-			for (xpath_node* it = last; it != ns.end(); ++it, ++i)
-			{
-				xpath_context c(*it, i, size);
-
-				if (expr->eval_number(c, stack) == static_cast<double>(i))
-				{
-					*last++ = *it;
-
-					if (once) break;
-				}
-			}
-
-			ns.truncate(last);
-		}
-
-		static void apply_predicate_number_const(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack)
-		{
-			assert(ns.size() >= first);
-			assert(expr->rettype() == xpath_type_number);
-
-			size_t size = ns.size() - first;
-
-			xpath_node* last = ns.begin() + first;
-
-			xpath_context c(xpath_node(), 1, size);
-
-			double er = expr->eval_number(c, stack);
-
-			if (er >= 1.0 && er <= static_cast<double>(size))
-			{
-				size_t eri = static_cast<size_t>(er);
-
-				if (er == static_cast<double>(eri))
-				{
-					xpath_node r = last[eri - 1];
-
-					*last++ = r;
-				}
-			}
-
-			ns.truncate(last);
-		}
-
-		void apply_predicate(xpath_node_set_raw& ns, size_t first, const xpath_stack& stack, bool once)
-		{
-			if (ns.size() == first) return;
-
-			assert(_type == ast_filter || _type == ast_predicate);
-
-			if (_test == predicate_constant || _test == predicate_constant_one)
-				apply_predicate_number_const(ns, first, _right, stack);
-			else if (_right->rettype() == xpath_type_number)
-				apply_predicate_number(ns, first, _right, stack, once);
-			else
-				apply_predicate_boolean(ns, first, _right, stack, once);
-		}
-
-		void apply_predicates(xpath_node_set_raw& ns, size_t first, const xpath_stack& stack, nodeset_eval_t eval)
-		{
-			if (ns.size() == first) return;
-
-			bool last_once = eval_once(ns.type(), eval);
-
-			for (xpath_ast_node* pred = _right; pred; pred = pred->_next)
-				pred->apply_predicate(ns, first, stack, !pred->_next && last_once);
-		}
-
-		bool step_push(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* parent, xpath_allocator* alloc)
-		{
-			assert(a);
-
-			const char_t* name = a->name ? a->name + 0 : PUGIXML_TEXT("");
-
-			switch (_test)
-			{
-			case nodetest_name:
-				if (strequal(name, _data.nodetest) && is_xpath_attribute(name))
-				{
-					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_type_node:
-			case nodetest_all:
-				if (is_xpath_attribute(name))
-				{
-					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_all_in_namespace:
-				if (starts_with(name, _data.nodetest) && is_xpath_attribute(name))
-				{
-					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
-					return true;
-				}
-				break;
-
-			default:
-				;
-			}
-
-			return false;
-		}
-
-		bool step_push(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc)
-		{
-			assert(n);
-
-			xml_node_type type = PUGI__NODETYPE(n);
-
-			switch (_test)
-			{
-			case nodetest_name:
-				if (type == node_element && n->name && strequal(n->name, _data.nodetest))
-				{
-					ns.push_back(xml_node(n), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_type_node:
-				ns.push_back(xml_node(n), alloc);
-				return true;
-
-			case nodetest_type_comment:
-				if (type == node_comment)
-				{
-					ns.push_back(xml_node(n), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_type_text:
-				if (type == node_pcdata || type == node_cdata)
-				{
-					ns.push_back(xml_node(n), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_type_pi:
-				if (type == node_pi)
-				{
-					ns.push_back(xml_node(n), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_pi:
-				if (type == node_pi && n->name && strequal(n->name, _data.nodetest))
-				{
-					ns.push_back(xml_node(n), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_all:
-				if (type == node_element)
-				{
-					ns.push_back(xml_node(n), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_all_in_namespace:
-				if (type == node_element && n->name && starts_with(n->name, _data.nodetest))
-				{
-					ns.push_back(xml_node(n), alloc);
-					return true;
-				}
-				break;
-
-			default:
-				assert(false && "Unknown axis"); // unreachable
-			}
-
-			return false;
-		}
-
-		template <class T> void step_fill(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc, bool once, T)
-		{
-			const axis_t axis = T::axis;
-
-			switch (axis)
-			{
-			case axis_attribute:
-			{
-				for (xml_attribute_struct* a = n->first_attribute; a; a = a->next_attribute)
-					if (step_push(ns, a, n, alloc) & once)
-						return;
-
-				break;
-			}
-
-			case axis_child:
-			{
-				for (xml_node_struct* c = n->first_child; c; c = c->next_sibling)
-					if (step_push(ns, c, alloc) & once)
-						return;
-
-				break;
-			}
-
-			case axis_descendant:
-			case axis_descendant_or_self:
-			{
-				if (axis == axis_descendant_or_self)
-					if (step_push(ns, n, alloc) & once)
-						return;
-
-				xml_node_struct* cur = n->first_child;
-
-				while (cur)
-				{
-					if (step_push(ns, cur, alloc) & once)
-						return;
-
-					if (cur->first_child)
-						cur = cur->first_child;
-					else
-					{
-						while (!cur->next_sibling)
-						{
-							cur = cur->parent;
-
-							if (cur == n) return;
-						}
-
-						cur = cur->next_sibling;
-					}
-				}
-
-				break;
-			}
-
-			case axis_following_sibling:
-			{
-				for (xml_node_struct* c = n->next_sibling; c; c = c->next_sibling)
-					if (step_push(ns, c, alloc) & once)
-						return;
-
-				break;
-			}
-
-			case axis_preceding_sibling:
-			{
-				for (xml_node_struct* c = n->prev_sibling_c; c->next_sibling; c = c->prev_sibling_c)
-					if (step_push(ns, c, alloc) & once)
-						return;
-
-				break;
-			}
-
-			case axis_following:
-			{
-				xml_node_struct* cur = n;
-
-				// exit from this node so that we don't include descendants
-				while (!cur->next_sibling)
-				{
-					cur = cur->parent;
-
-					if (!cur) return;
-				}
-
-				cur = cur->next_sibling;
-
-				while (cur)
-				{
-					if (step_push(ns, cur, alloc) & once)
-						return;
-
-					if (cur->first_child)
-						cur = cur->first_child;
-					else
-					{
-						while (!cur->next_sibling)
-						{
-							cur = cur->parent;
-
-							if (!cur) return;
-						}
-
-						cur = cur->next_sibling;
-					}
-				}
-
-				break;
-			}
-
-			case axis_preceding:
-			{
-				xml_node_struct* cur = n;
-
-				// exit from this node so that we don't include descendants
-				while (!cur->prev_sibling_c->next_sibling)
-				{
-					cur = cur->parent;
-
-					if (!cur) return;
-				}
-
-				cur = cur->prev_sibling_c;
-
-				while (cur)
-				{
-					if (cur->first_child)
-						cur = cur->first_child->prev_sibling_c;
-					else
-					{
-						// leaf node, can't be ancestor
-						if (step_push(ns, cur, alloc) & once)
-							return;
-
-						while (!cur->prev_sibling_c->next_sibling)
-						{
-							cur = cur->parent;
-
-							if (!cur) return;
-
-							if (!node_is_ancestor(cur, n))
-								if (step_push(ns, cur, alloc) & once)
-									return;
-						}
-
-						cur = cur->prev_sibling_c;
-					}
-				}
-
-				break;
-			}
-
-			case axis_ancestor:
-			case axis_ancestor_or_self:
-			{
-				if (axis == axis_ancestor_or_self)
-					if (step_push(ns, n, alloc) & once)
-						return;
-
-				xml_node_struct* cur = n->parent;
-
-				while (cur)
-				{
-					if (step_push(ns, cur, alloc) & once)
-						return;
-
-					cur = cur->parent;
-				}
-
-				break;
-			}
-
-			case axis_self:
-			{
-				step_push(ns, n, alloc);
-
-				break;
-			}
-
-			case axis_parent:
-			{
-				if (n->parent)
-					step_push(ns, n->parent, alloc);
-
-				break;
-			}
-
-			default:
-				assert(false && "Unimplemented axis"); // unreachable
-			}
-		}
-
-		template <class T> void step_fill(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* p, xpath_allocator* alloc, bool once, T v)
-		{
-			const axis_t axis = T::axis;
-
-			switch (axis)
-			{
-			case axis_ancestor:
-			case axis_ancestor_or_self:
-			{
-				if (axis == axis_ancestor_or_self && _test == nodetest_type_node) // reject attributes based on principal node type test
-					if (step_push(ns, a, p, alloc) & once)
-						return;
-
-				xml_node_struct* cur = p;
-
-				while (cur)
-				{
-					if (step_push(ns, cur, alloc) & once)
-						return;
-
-					cur = cur->parent;
-				}
-
-				break;
-			}
-
-			case axis_descendant_or_self:
-			case axis_self:
-			{
-				if (_test == nodetest_type_node) // reject attributes based on principal node type test
-					step_push(ns, a, p, alloc);
-
-				break;
-			}
-
-			case axis_following:
-			{
-				xml_node_struct* cur = p;
-
-				while (cur)
-				{
-					if (cur->first_child)
-						cur = cur->first_child;
-					else
-					{
-						while (!cur->next_sibling)
-						{
-							cur = cur->parent;
-
-							if (!cur) return;
-						}
-
-						cur = cur->next_sibling;
-					}
-
-					if (step_push(ns, cur, alloc) & once)
-						return;
-				}
-
-				break;
-			}
-
-			case axis_parent:
-			{
-				step_push(ns, p, alloc);
-
-				break;
-			}
-
-			case axis_preceding:
-			{
-				// preceding:: axis does not include attribute nodes and attribute ancestors (they are the same as parent's ancestors), so we can reuse node preceding
-				step_fill(ns, p, alloc, once, v);
-				break;
-			}
-
-			default:
-				assert(false && "Unimplemented axis"); // unreachable
-			}
-		}
-
-		template <class T> void step_fill(xpath_node_set_raw& ns, const xpath_node& xn, xpath_allocator* alloc, bool once, T v)
-		{
-			const axis_t axis = T::axis;
-			const bool axis_has_attributes = (axis == axis_ancestor || axis == axis_ancestor_or_self || axis == axis_descendant_or_self || axis == axis_following || axis == axis_parent || axis == axis_preceding || axis == axis_self);
-
-			if (xn.node())
-				step_fill(ns, xn.node().internal_object(), alloc, once, v);
-			else if (axis_has_attributes && xn.attribute() && xn.parent())
-				step_fill(ns, xn.attribute().internal_object(), xn.parent().internal_object(), alloc, once, v);
-		}
-
-		template <class T> xpath_node_set_raw step_do(const xpath_context& c, const xpath_stack& stack, nodeset_eval_t eval, T v)
-		{
-			const axis_t axis = T::axis;
-			const bool axis_reverse = (axis == axis_ancestor || axis == axis_ancestor_or_self || axis == axis_preceding || axis == axis_preceding_sibling);
-			const xpath_node_set::type_t axis_type = axis_reverse ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted;
-
-			bool once =
-				(axis == axis_attribute && _test == nodetest_name) ||
-				(!_right && eval_once(axis_type, eval)) ||
-			    // coverity[mixed_enums]
-				(_right && !_right->_next && _right->_test == predicate_constant_one);
-
-			xpath_node_set_raw ns;
-			ns.set_type(axis_type);
-
-			if (_left)
-			{
-				xpath_node_set_raw s = _left->eval_node_set(c, stack, nodeset_eval_all);
-
-				// self axis preserves the original order
-				if (axis == axis_self) ns.set_type(s.type());
-
-				for (const xpath_node* it = s.begin(); it != s.end(); ++it)
-				{
-					size_t size = ns.size();
-
-					// in general, all axes generate elements in a particular order, but there is no order guarantee if axis is applied to two nodes
-					if (axis != axis_self && size != 0) ns.set_type(xpath_node_set::type_unsorted);
-
-					step_fill(ns, *it, stack.result, once, v);
-					if (_right) apply_predicates(ns, size, stack, eval);
-				}
-			}
-			else
-			{
-				step_fill(ns, c.n, stack.result, once, v);
-				if (_right) apply_predicates(ns, 0, stack, eval);
-			}
-
-			// child, attribute and self axes always generate unique set of nodes
-			// for other axis, if the set stayed sorted, it stayed unique because the traversal algorithms do not visit the same node twice
-			if (axis != axis_child && axis != axis_attribute && axis != axis_self && ns.type() == xpath_node_set::type_unsorted)
-				ns.remove_duplicates(stack.temp);
-
-			return ns;
-		}
-
-	public:
-		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, const char_t* value):
-			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
-		{
-			assert(type == ast_string_constant);
-			_data.string = value;
-		}
-
-		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, double value):
-			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
-		{
-			assert(type == ast_number_constant);
-			_data.number = value;
-		}
-
-		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_variable* value):
-			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
-		{
-			assert(type == ast_variable);
-			_data.variable = value;
-		}
-
-		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_ast_node* left = 0, xpath_ast_node* right = 0):
-			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(left), _right(right), _next(0)
-		{
-		}
-
-		xpath_ast_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents):
-			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(static_cast<char>(axis)), _test(static_cast<char>(test)), _left(left), _right(0), _next(0)
-		{
-			assert(type == ast_step);
-			_data.nodetest = contents;
-		}
-
-		xpath_ast_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test):
-			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(0), _test(static_cast<char>(test)), _left(left), _right(right), _next(0)
-		{
-			assert(type == ast_filter || type == ast_predicate);
-		}
-
-		void set_next(xpath_ast_node* value)
-		{
-			_next = value;
-		}
-
-		void set_right(xpath_ast_node* value)
-		{
-			_right = value;
-		}
-
-		bool eval_boolean(const xpath_context& c, const xpath_stack& stack)
-		{
-			switch (_type)
-			{
-			case ast_op_or:
-				return _left->eval_boolean(c, stack) || _right->eval_boolean(c, stack);
-
-			case ast_op_and:
-				return _left->eval_boolean(c, stack) && _right->eval_boolean(c, stack);
-
-			case ast_op_equal:
-				return compare_eq(_left, _right, c, stack, equal_to());
-
-			case ast_op_not_equal:
-				return compare_eq(_left, _right, c, stack, not_equal_to());
-
-			case ast_op_less:
-				return compare_rel(_left, _right, c, stack, less());
-
-			case ast_op_greater:
-				return compare_rel(_right, _left, c, stack, less());
-
-			case ast_op_less_or_equal:
-				return compare_rel(_left, _right, c, stack, less_equal());
-
-			case ast_op_greater_or_equal:
-				return compare_rel(_right, _left, c, stack, less_equal());
-
-			case ast_func_starts_with:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_string lr = _left->eval_string(c, stack);
-				xpath_string rr = _right->eval_string(c, stack);
-
-				return starts_with(lr.c_str(), rr.c_str());
-			}
-
-			case ast_func_contains:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_string lr = _left->eval_string(c, stack);
-				xpath_string rr = _right->eval_string(c, stack);
-
-				return find_substring(lr.c_str(), rr.c_str()) != 0;
-			}
-
-			case ast_func_boolean:
-				return _left->eval_boolean(c, stack);
-
-			case ast_func_not:
-				return !_left->eval_boolean(c, stack);
-
-			case ast_func_true:
-				return true;
-
-			case ast_func_false:
-				return false;
-
-			case ast_func_lang:
-			{
-				if (c.n.attribute()) return false;
-
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_string lang = _left->eval_string(c, stack);
-
-				for (xml_node n = c.n.node(); n; n = n.parent())
-				{
-					xml_attribute a = n.attribute(PUGIXML_TEXT("xml:lang"));
-
-					if (a)
-					{
-						const char_t* value = a.value();
-
-						// strnicmp / strncasecmp is not portable
-						for (const char_t* lit = lang.c_str(); *lit; ++lit)
-						{
-							if (tolower_ascii(*lit) != tolower_ascii(*value)) return false;
-							++value;
-						}
-
-						return *value == 0 || *value == '-';
-					}
-				}
-
-				return false;
-			}
-
-			case ast_opt_compare_attribute:
-			{
-				const char_t* value = (_right->_type == ast_string_constant) ? _right->_data.string : _right->_data.variable->get_string();
-
-				xml_attribute attr = c.n.node().attribute(_left->_data.nodetest);
-
-				return attr && strequal(attr.value(), value) && is_xpath_attribute(attr.name());
-			}
-
-			case ast_variable:
-			{
-				assert(_rettype == _data.variable->type());
-
-				if (_rettype == xpath_type_boolean)
-					return _data.variable->get_boolean();
-
-				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
-				break;
-			}
-
-			default:
-				;
-			}
-
-			// none of the ast types that return the value directly matched, we need to perform type conversion
-			switch (_rettype)
-			{
-			case xpath_type_number:
-				return convert_number_to_boolean(eval_number(c, stack));
-
-			case xpath_type_string:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return !eval_string(c, stack).empty();
-			}
-
-			case xpath_type_node_set:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return !eval_node_set(c, stack, nodeset_eval_any).empty();
-			}
-
-			default:
-				assert(false && "Wrong expression for return type boolean"); // unreachable
-				return false;
-			}
-		}
-
-		double eval_number(const xpath_context& c, const xpath_stack& stack)
-		{
-			switch (_type)
-			{
-			case ast_op_add:
-				return _left->eval_number(c, stack) + _right->eval_number(c, stack);
-
-			case ast_op_subtract:
-				return _left->eval_number(c, stack) - _right->eval_number(c, stack);
-
-			case ast_op_multiply:
-				return _left->eval_number(c, stack) * _right->eval_number(c, stack);
-
-			case ast_op_divide:
-				return _left->eval_number(c, stack) / _right->eval_number(c, stack);
-
-			case ast_op_mod:
-				return fmod(_left->eval_number(c, stack), _right->eval_number(c, stack));
-
-			case ast_op_negate:
-				return -_left->eval_number(c, stack);
-
-			case ast_number_constant:
-				return _data.number;
-
-			case ast_func_last:
-				return static_cast<double>(c.size);
-
-			case ast_func_position:
-				return static_cast<double>(c.position);
-
-			case ast_func_count:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return static_cast<double>(_left->eval_node_set(c, stack, nodeset_eval_all).size());
-			}
-
-			case ast_func_string_length_0:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return static_cast<double>(string_value(c.n, stack.result).length());
-			}
-
-			case ast_func_string_length_1:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return static_cast<double>(_left->eval_string(c, stack).length());
-			}
-
-			case ast_func_number_0:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return convert_string_to_number(string_value(c.n, stack.result).c_str());
-			}
-
-			case ast_func_number_1:
-				return _left->eval_number(c, stack);
-
-			case ast_func_sum:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				double r = 0;
-
-				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_all);
-
-				for (const xpath_node* it = ns.begin(); it != ns.end(); ++it)
-				{
-					xpath_allocator_capture cri(stack.result);
-
-					r += convert_string_to_number(string_value(*it, stack.result).c_str());
-				}
-
-				return r;
-			}
-
-			case ast_func_floor:
-			{
-				double r = _left->eval_number(c, stack);
-
-				return r == r ? floor(r) : r;
-			}
-
-			case ast_func_ceiling:
-			{
-				double r = _left->eval_number(c, stack);
-
-				return r == r ? ceil(r) : r;
-			}
-
-			case ast_func_round:
-				return round_nearest_nzero(_left->eval_number(c, stack));
-
-			case ast_variable:
-			{
-				assert(_rettype == _data.variable->type());
-
-				if (_rettype == xpath_type_number)
-					return _data.variable->get_number();
-
-				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
-				break;
-			}
-
-			default:
-				;
-			}
-
-			// none of the ast types that return the value directly matched, we need to perform type conversion
-			switch (_rettype)
-			{
-			case xpath_type_boolean:
-				return eval_boolean(c, stack) ? 1 : 0;
-
-			case xpath_type_string:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return convert_string_to_number(eval_string(c, stack).c_str());
-			}
-
-			case xpath_type_node_set:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return convert_string_to_number(eval_string(c, stack).c_str());
-			}
-
-			default:
-				assert(false && "Wrong expression for return type number"); // unreachable
-				return 0;
-			}
-		}
-
-		xpath_string eval_string_concat(const xpath_context& c, const xpath_stack& stack)
-		{
-			assert(_type == ast_func_concat);
-
-			xpath_allocator_capture ct(stack.temp);
-
-			// count the string number
-			size_t count = 1;
-			for (xpath_ast_node* nc = _right; nc; nc = nc->_next) count++;
-
-			// allocate a buffer for temporary string objects
-			xpath_string* buffer = static_cast<xpath_string*>(stack.temp->allocate(count * sizeof(xpath_string)));
-			if (!buffer) return xpath_string();
-
-			// evaluate all strings to temporary stack
-			xpath_stack swapped_stack = {stack.temp, stack.result};
-
-			buffer[0] = _left->eval_string(c, swapped_stack);
-
-			size_t pos = 1;
-			for (xpath_ast_node* n = _right; n; n = n->_next, ++pos) buffer[pos] = n->eval_string(c, swapped_stack);
-			assert(pos == count);
-
-			// get total length
-			size_t length = 0;
-			for (size_t i = 0; i < count; ++i) length += buffer[i].length();
-
-			// create final string
-			char_t* result = static_cast<char_t*>(stack.result->allocate((length + 1) * sizeof(char_t)));
-			if (!result) return xpath_string();
-
-			char_t* ri = result;
-
-			for (size_t j = 0; j < count; ++j)
-				for (const char_t* bi = buffer[j].c_str(); *bi; ++bi)
-					*ri++ = *bi;
-
-			*ri = 0;
-
-			return xpath_string::from_heap_preallocated(result, ri);
-		}
-
-		xpath_string eval_string(const xpath_context& c, const xpath_stack& stack)
-		{
-			switch (_type)
-			{
-			case ast_string_constant:
-				return xpath_string::from_const(_data.string);
-
-			case ast_func_local_name_0:
-			{
-				xpath_node na = c.n;
-
-				return xpath_string::from_const(local_name(na));
-			}
-
-			case ast_func_local_name_1:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
-				xpath_node na = ns.first();
-
-				return xpath_string::from_const(local_name(na));
-			}
-
-			case ast_func_name_0:
-			{
-				xpath_node na = c.n;
-
-				return xpath_string::from_const(qualified_name(na));
-			}
-
-			case ast_func_name_1:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
-				xpath_node na = ns.first();
-
-				return xpath_string::from_const(qualified_name(na));
-			}
-
-			case ast_func_namespace_uri_0:
-			{
-				xpath_node na = c.n;
-
-				return xpath_string::from_const(namespace_uri(na));
-			}
-
-			case ast_func_namespace_uri_1:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
-				xpath_node na = ns.first();
-
-				return xpath_string::from_const(namespace_uri(na));
-			}
-
-			case ast_func_string_0:
-				return string_value(c.n, stack.result);
-
-			case ast_func_string_1:
-				return _left->eval_string(c, stack);
-
-			case ast_func_concat:
-				return eval_string_concat(c, stack);
-
-			case ast_func_substring_before:
-			{
-				xpath_allocator_capture cr(stack.temp);
-
-				xpath_stack swapped_stack = {stack.temp, stack.result};
-
-				xpath_string s = _left->eval_string(c, swapped_stack);
-				xpath_string p = _right->eval_string(c, swapped_stack);
-
-				const char_t* pos = find_substring(s.c_str(), p.c_str());
-
-				return pos ? xpath_string::from_heap(s.c_str(), pos, stack.result) : xpath_string();
-			}
-
-			case ast_func_substring_after:
-			{
-				xpath_allocator_capture cr(stack.temp);
-
-				xpath_stack swapped_stack = {stack.temp, stack.result};
-
-				xpath_string s = _left->eval_string(c, swapped_stack);
-				xpath_string p = _right->eval_string(c, swapped_stack);
-
-				const char_t* pos = find_substring(s.c_str(), p.c_str());
-				if (!pos) return xpath_string();
-
-				const char_t* rbegin = pos + p.length();
-				const char_t* rend = s.c_str() + s.length();
-
-				return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin);
-			}
-
-			case ast_func_substring_2:
-			{
-				xpath_allocator_capture cr(stack.temp);
-
-				xpath_stack swapped_stack = {stack.temp, stack.result};
-
-				xpath_string s = _left->eval_string(c, swapped_stack);
-				size_t s_length = s.length();
-
-				double first = round_nearest(_right->eval_number(c, stack));
-
-				if (is_nan(first)) return xpath_string(); // NaN
-				else if (first >= static_cast<double>(s_length + 1)) return xpath_string();
-
-				size_t pos = first < 1 ? 1 : static_cast<size_t>(first);
-				assert(1 <= pos && pos <= s_length + 1);
-
-				const char_t* rbegin = s.c_str() + (pos - 1);
-				const char_t* rend = s.c_str() + s.length();
-
-				return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin);
-			}
-
-			case ast_func_substring_3:
-			{
-				xpath_allocator_capture cr(stack.temp);
-
-				xpath_stack swapped_stack = {stack.temp, stack.result};
-
-				xpath_string s = _left->eval_string(c, swapped_stack);
-				size_t s_length = s.length();
-
-				double first = round_nearest(_right->eval_number(c, stack));
-				double last = first + round_nearest(_right->_next->eval_number(c, stack));
-
-				if (is_nan(first) || is_nan(last)) return xpath_string();
-				else if (first >= static_cast<double>(s_length + 1)) return xpath_string();
-				else if (first >= last) return xpath_string();
-				else if (last < 1) return xpath_string();
-
-				size_t pos = first < 1 ? 1 : static_cast<size_t>(first);
-				size_t end = last >= static_cast<double>(s_length + 1) ? s_length + 1 : static_cast<size_t>(last);
-
-				assert(1 <= pos && pos <= end && end <= s_length + 1);
-				const char_t* rbegin = s.c_str() + (pos - 1);
-				const char_t* rend = s.c_str() + (end - 1);
-
-				return (end == s_length + 1 && !s.uses_heap()) ? xpath_string::from_const(rbegin) : xpath_string::from_heap(rbegin, rend, stack.result);
-			}
-
-			case ast_func_normalize_space_0:
-			{
-				xpath_string s = string_value(c.n, stack.result);
-
-				char_t* begin = s.data(stack.result);
-				if (!begin) return xpath_string();
-
-				char_t* end = normalize_space(begin);
-
-				return xpath_string::from_heap_preallocated(begin, end);
-			}
-
-			case ast_func_normalize_space_1:
-			{
-				xpath_string s = _left->eval_string(c, stack);
-
-				char_t* begin = s.data(stack.result);
-				if (!begin) return xpath_string();
-
-				char_t* end = normalize_space(begin);
-
-				return xpath_string::from_heap_preallocated(begin, end);
-			}
-
-			case ast_func_translate:
-			{
-				xpath_allocator_capture cr(stack.temp);
-
-				xpath_stack swapped_stack = {stack.temp, stack.result};
-
-				xpath_string s = _left->eval_string(c, stack);
-				xpath_string from = _right->eval_string(c, swapped_stack);
-				xpath_string to = _right->_next->eval_string(c, swapped_stack);
-
-				char_t* begin = s.data(stack.result);
-				if (!begin) return xpath_string();
-
-				char_t* end = translate(begin, from.c_str(), to.c_str(), to.length());
-
-				return xpath_string::from_heap_preallocated(begin, end);
-			}
-
-			case ast_opt_translate_table:
-			{
-				xpath_string s = _left->eval_string(c, stack);
-
-				char_t* begin = s.data(stack.result);
-				if (!begin) return xpath_string();
-
-				char_t* end = translate_table(begin, _data.table);
-
-				return xpath_string::from_heap_preallocated(begin, end);
-			}
-
-			case ast_variable:
-			{
-				assert(_rettype == _data.variable->type());
-
-				if (_rettype == xpath_type_string)
-					return xpath_string::from_const(_data.variable->get_string());
-
-				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
-				break;
-			}
-
-			default:
-				;
-			}
-
-			// none of the ast types that return the value directly matched, we need to perform type conversion
-			switch (_rettype)
-			{
-			case xpath_type_boolean:
-				return xpath_string::from_const(eval_boolean(c, stack) ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"));
-
-			case xpath_type_number:
-				return convert_number_to_string(eval_number(c, stack), stack.result);
-
-			case xpath_type_node_set:
-			{
-				xpath_allocator_capture cr(stack.temp);
-
-				xpath_stack swapped_stack = {stack.temp, stack.result};
-
-				xpath_node_set_raw ns = eval_node_set(c, swapped_stack, nodeset_eval_first);
-				return ns.empty() ? xpath_string() : string_value(ns.first(), stack.result);
-			}
-
-			default:
-				assert(false && "Wrong expression for return type string"); // unreachable
-				return xpath_string();
-			}
-		}
-
-		xpath_node_set_raw eval_node_set(const xpath_context& c, const xpath_stack& stack, nodeset_eval_t eval)
-		{
-			switch (_type)
-			{
-			case ast_op_union:
-			{
-				xpath_allocator_capture cr(stack.temp);
-
-				xpath_stack swapped_stack = {stack.temp, stack.result};
-
-				xpath_node_set_raw ls = _left->eval_node_set(c, stack, eval);
-				xpath_node_set_raw rs = _right->eval_node_set(c, swapped_stack, eval);
-
-				// we can optimize merging two sorted sets, but this is a very rare operation, so don't bother
-				ls.set_type(xpath_node_set::type_unsorted);
-
-				ls.append(rs.begin(), rs.end(), stack.result);
-				ls.remove_duplicates(stack.temp);
-
-				return ls;
-			}
-
-			case ast_filter:
-			{
-				xpath_node_set_raw set = _left->eval_node_set(c, stack, _test == predicate_constant_one ? nodeset_eval_first : nodeset_eval_all);
-
-				// either expression is a number or it contains position() call; sort by document order
-				if (_test != predicate_posinv) set.sort_do();
-
-				bool once = eval_once(set.type(), eval);
-
-				apply_predicate(set, 0, stack, once);
-
-				return set;
-			}
-
-			case ast_func_id:
-				return xpath_node_set_raw();
-
-			case ast_step:
-			{
-				switch (_axis)
-				{
-				case axis_ancestor:
-					return step_do(c, stack, eval, axis_to_type<axis_ancestor>());
-
-				case axis_ancestor_or_self:
-					return step_do(c, stack, eval, axis_to_type<axis_ancestor_or_self>());
-
-				case axis_attribute:
-					return step_do(c, stack, eval, axis_to_type<axis_attribute>());
-
-				case axis_child:
-					return step_do(c, stack, eval, axis_to_type<axis_child>());
-
-				case axis_descendant:
-					return step_do(c, stack, eval, axis_to_type<axis_descendant>());
-
-				case axis_descendant_or_self:
-					return step_do(c, stack, eval, axis_to_type<axis_descendant_or_self>());
-
-				case axis_following:
-					return step_do(c, stack, eval, axis_to_type<axis_following>());
-
-				case axis_following_sibling:
-					return step_do(c, stack, eval, axis_to_type<axis_following_sibling>());
-
-				case axis_namespace:
-					// namespaced axis is not supported
-					return xpath_node_set_raw();
-
-				case axis_parent:
-					return step_do(c, stack, eval, axis_to_type<axis_parent>());
-
-				case axis_preceding:
-					return step_do(c, stack, eval, axis_to_type<axis_preceding>());
-
-				case axis_preceding_sibling:
-					return step_do(c, stack, eval, axis_to_type<axis_preceding_sibling>());
-
-				case axis_self:
-					return step_do(c, stack, eval, axis_to_type<axis_self>());
-
-				default:
-					assert(false && "Unknown axis"); // unreachable
-					return xpath_node_set_raw();
-				}
-			}
-
-			case ast_step_root:
-			{
-				assert(!_right); // root step can't have any predicates
-
-				xpath_node_set_raw ns;
-
-				ns.set_type(xpath_node_set::type_sorted);
-
-				if (c.n.node()) ns.push_back(c.n.node().root(), stack.result);
-				else if (c.n.attribute()) ns.push_back(c.n.parent().root(), stack.result);
-
-				return ns;
-			}
-
-			case ast_variable:
-			{
-				assert(_rettype == _data.variable->type());
-
-				if (_rettype == xpath_type_node_set)
-				{
-					const xpath_node_set& s = _data.variable->get_node_set();
-
-					xpath_node_set_raw ns;
-
-					ns.set_type(s.type());
-					ns.append(s.begin(), s.end(), stack.result);
-
-					return ns;
-				}
-
-				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
-				break;
-			}
-
-			default:
-				;
-			}
-
-			// none of the ast types that return the value directly matched, but conversions to node set are invalid
-			assert(false && "Wrong expression for return type node set"); // unreachable
-			return xpath_node_set_raw();
-		}
-
-		void optimize(xpath_allocator* alloc)
-		{
-			if (_left)
-				_left->optimize(alloc);
-
-			if (_right)
-				_right->optimize(alloc);
-
-			if (_next)
-				_next->optimize(alloc);
-
-			// coverity[var_deref_model]
-			optimize_self(alloc);
-		}
-
-		void optimize_self(xpath_allocator* alloc)
-		{
-			// Rewrite [position()=expr] with [expr]
-			// Note that this step has to go before classification to recognize [position()=1]
-			if ((_type == ast_filter || _type == ast_predicate) &&
-				_right && // workaround for clang static analyzer (_right is never null for ast_filter/ast_predicate)
-				_right->_type == ast_op_equal && _right->_left->_type == ast_func_position && _right->_right->_rettype == xpath_type_number)
-			{
-				_right = _right->_right;
-			}
-
-			// Classify filter/predicate ops to perform various optimizations during evaluation
-			if ((_type == ast_filter || _type == ast_predicate) && _right) // workaround for clang static analyzer (_right is never null for ast_filter/ast_predicate)
-			{
-				assert(_test == predicate_default);
-
-				if (_right->_type == ast_number_constant && _right->_data.number == 1.0)
-					_test = predicate_constant_one;
-				else if (_right->_rettype == xpath_type_number && (_right->_type == ast_number_constant || _right->_type == ast_variable || _right->_type == ast_func_last))
-					_test = predicate_constant;
-				else if (_right->_rettype != xpath_type_number && _right->is_posinv_expr())
-					_test = predicate_posinv;
-			}
-
-			// Rewrite descendant-or-self::node()/child::foo with descendant::foo
-			// The former is a full form of //foo, the latter is much faster since it executes the node test immediately
-			// Do a similar kind of rewrite for self/descendant/descendant-or-self axes
-			// Note that we only rewrite positionally invariant steps (//foo[1] != /descendant::foo[1])
-			if (_type == ast_step && (_axis == axis_child || _axis == axis_self || _axis == axis_descendant || _axis == axis_descendant_or_self) &&
-				_left && _left->_type == ast_step && _left->_axis == axis_descendant_or_self && _left->_test == nodetest_type_node && !_left->_right &&
-				is_posinv_step())
-			{
-				if (_axis == axis_child || _axis == axis_descendant)
-					_axis = axis_descendant;
-				else
-					_axis = axis_descendant_or_self;
-
-				_left = _left->_left;
-			}
-
-			// Use optimized lookup table implementation for translate() with constant arguments
-			if (_type == ast_func_translate &&
-				_right && // workaround for clang static analyzer (_right is never null for ast_func_translate)
-				_right->_type == ast_string_constant && _right->_next->_type == ast_string_constant)
-			{
-				unsigned char* table = translate_table_generate(alloc, _right->_data.string, _right->_next->_data.string);
-
-				if (table)
-				{
-					_type = ast_opt_translate_table;
-					_data.table = table;
-				}
-			}
-
-			// Use optimized path for @attr = 'value' or @attr = $value
-			if (_type == ast_op_equal &&
-				_left && _right && // workaround for clang static analyzer and Coverity (_left and _right are never null for ast_op_equal)
-                // coverity[mixed_enums]
-				_left->_type == ast_step && _left->_axis == axis_attribute && _left->_test == nodetest_name && !_left->_left && !_left->_right &&
-				(_right->_type == ast_string_constant || (_right->_type == ast_variable && _right->_rettype == xpath_type_string)))
-			{
-				_type = ast_opt_compare_attribute;
-			}
-		}
-
-		bool is_posinv_expr() const
-		{
-			switch (_type)
-			{
-			case ast_func_position:
-			case ast_func_last:
-				return false;
-
-			case ast_string_constant:
-			case ast_number_constant:
-			case ast_variable:
-				return true;
-
-			case ast_step:
-			case ast_step_root:
-				return true;
-
-			case ast_predicate:
-			case ast_filter:
-				return true;
-
-			default:
-				if (_left && !_left->is_posinv_expr()) return false;
-
-				for (xpath_ast_node* n = _right; n; n = n->_next)
-					if (!n->is_posinv_expr()) return false;
-
-				return true;
-			}
-		}
-
-		bool is_posinv_step() const
-		{
-			assert(_type == ast_step);
-
-			for (xpath_ast_node* n = _right; n; n = n->_next)
-			{
-				assert(n->_type == ast_predicate);
-
-				if (n->_test != predicate_posinv)
-					return false;
-			}
-
-			return true;
-		}
-
-		xpath_value_type rettype() const
-		{
-			return static_cast<xpath_value_type>(_rettype);
-		}
-	};
-
-	static const size_t xpath_ast_depth_limit =
-	#ifdef PUGIXML_XPATH_DEPTH_LIMIT
-		PUGIXML_XPATH_DEPTH_LIMIT
-	#else
-		1024
-	#endif
-		;
-
-	struct xpath_parser
-	{
-		xpath_allocator* _alloc;
-		xpath_lexer _lexer;
-
-		const char_t* _query;
-		xpath_variable_set* _variables;
-
-		xpath_parse_result* _result;
-
-		char_t _scratch[32];
-
-		size_t _depth;
-
-		xpath_ast_node* error(const char* message)
-		{
-			_result->error = message;
-			_result->offset = _lexer.current_pos() - _query;
-
-			return 0;
-		}
-
-		xpath_ast_node* error_oom()
-		{
-			assert(_alloc->_error);
-			*_alloc->_error = true;
-
-			return 0;
-		}
-
-		xpath_ast_node* error_rec()
-		{
-			return error("Exceeded maximum allowed query depth");
-		}
-
-		void* alloc_node()
-		{
-			return _alloc->allocate(sizeof(xpath_ast_node));
-		}
-
-		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, const char_t* value)
-		{
-			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
-		}
-
-		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, double value)
-		{
-			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
-		}
-
-		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_variable* value)
-		{
-			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
-		}
-
-		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_ast_node* left = 0, xpath_ast_node* right = 0)
-		{
-			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, rettype, left, right) : 0;
-		}
-
-		xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents)
-		{
-			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, left, axis, test, contents) : 0;
-		}
-
-		xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test)
-		{
-			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, left, right, test) : 0;
-		}
-
-		const char_t* alloc_string(const xpath_lexer_string& value)
-		{
-			if (!value.begin)
-				return PUGIXML_TEXT("");
-
-			size_t length = static_cast<size_t>(value.end - value.begin);
-
-			char_t* c = static_cast<char_t*>(_alloc->allocate((length + 1) * sizeof(char_t)));
-			if (!c) return 0;
-
-			memcpy(c, value.begin, length * sizeof(char_t));
-			c[length] = 0;
-
-			return c;
-		}
-
-		xpath_ast_node* parse_function(const xpath_lexer_string& name, size_t argc, xpath_ast_node* args[2])
-		{
-			switch (name.begin[0])
-			{
-			case 'b':
-				if (name == PUGIXML_TEXT("boolean") && argc == 1)
-					return alloc_node(ast_func_boolean, xpath_type_boolean, args[0]);
-
-				break;
-
-			case 'c':
-				if (name == PUGIXML_TEXT("count") && argc == 1)
-				{
-					if (args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
-					return alloc_node(ast_func_count, xpath_type_number, args[0]);
-				}
-				else if (name == PUGIXML_TEXT("contains") && argc == 2)
-					return alloc_node(ast_func_contains, xpath_type_boolean, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("concat") && argc >= 2)
-					return alloc_node(ast_func_concat, xpath_type_string, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("ceiling") && argc == 1)
-					return alloc_node(ast_func_ceiling, xpath_type_number, args[0]);
-
-				break;
-
-			case 'f':
-				if (name == PUGIXML_TEXT("false") && argc == 0)
-					return alloc_node(ast_func_false, xpath_type_boolean);
-				else if (name == PUGIXML_TEXT("floor") && argc == 1)
-					return alloc_node(ast_func_floor, xpath_type_number, args[0]);
-
-				break;
-
-			case 'i':
-				if (name == PUGIXML_TEXT("id") && argc == 1)
-					return alloc_node(ast_func_id, xpath_type_node_set, args[0]);
-
-				break;
-
-			case 'l':
-				if (name == PUGIXML_TEXT("last") && argc == 0)
-					return alloc_node(ast_func_last, xpath_type_number);
-				else if (name == PUGIXML_TEXT("lang") && argc == 1)
-					return alloc_node(ast_func_lang, xpath_type_boolean, args[0]);
-				else if (name == PUGIXML_TEXT("local-name") && argc <= 1)
-				{
-					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
-					return alloc_node(argc == 0 ? ast_func_local_name_0 : ast_func_local_name_1, xpath_type_string, args[0]);
-				}
-
-				break;
-
-			case 'n':
-				if (name == PUGIXML_TEXT("name") && argc <= 1)
-				{
-					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
-					return alloc_node(argc == 0 ? ast_func_name_0 : ast_func_name_1, xpath_type_string, args[0]);
-				}
-				else if (name == PUGIXML_TEXT("namespace-uri") && argc <= 1)
-				{
-					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
-					return alloc_node(argc == 0 ? ast_func_namespace_uri_0 : ast_func_namespace_uri_1, xpath_type_string, args[0]);
-				}
-				else if (name == PUGIXML_TEXT("normalize-space") && argc <= 1)
-					return alloc_node(argc == 0 ? ast_func_normalize_space_0 : ast_func_normalize_space_1, xpath_type_string, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("not") && argc == 1)
-					return alloc_node(ast_func_not, xpath_type_boolean, args[0]);
-				else if (name == PUGIXML_TEXT("number") && argc <= 1)
-					return alloc_node(argc == 0 ? ast_func_number_0 : ast_func_number_1, xpath_type_number, args[0]);
-
-				break;
-
-			case 'p':
-				if (name == PUGIXML_TEXT("position") && argc == 0)
-					return alloc_node(ast_func_position, xpath_type_number);
-
-				break;
-
-			case 'r':
-				if (name == PUGIXML_TEXT("round") && argc == 1)
-					return alloc_node(ast_func_round, xpath_type_number, args[0]);
-
-				break;
-
-			case 's':
-				if (name == PUGIXML_TEXT("string") && argc <= 1)
-					return alloc_node(argc == 0 ? ast_func_string_0 : ast_func_string_1, xpath_type_string, args[0]);
-				else if (name == PUGIXML_TEXT("string-length") && argc <= 1)
-					return alloc_node(argc == 0 ? ast_func_string_length_0 : ast_func_string_length_1, xpath_type_number, args[0]);
-				else if (name == PUGIXML_TEXT("starts-with") && argc == 2)
-					return alloc_node(ast_func_starts_with, xpath_type_boolean, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("substring-before") && argc == 2)
-					return alloc_node(ast_func_substring_before, xpath_type_string, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("substring-after") && argc == 2)
-					return alloc_node(ast_func_substring_after, xpath_type_string, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("substring") && (argc == 2 || argc == 3))
-					return alloc_node(argc == 2 ? ast_func_substring_2 : ast_func_substring_3, xpath_type_string, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("sum") && argc == 1)
-				{
-					if (args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
-					return alloc_node(ast_func_sum, xpath_type_number, args[0]);
-				}
-
-				break;
-
-			case 't':
-				if (name == PUGIXML_TEXT("translate") && argc == 3)
-					return alloc_node(ast_func_translate, xpath_type_string, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("true") && argc == 0)
-					return alloc_node(ast_func_true, xpath_type_boolean);
-
-				break;
-
-			default:
-				break;
-			}
-
-			return error("Unrecognized function or wrong parameter count");
-		}
-
-		axis_t parse_axis_name(const xpath_lexer_string& name, bool& specified)
-		{
-			specified = true;
-
-			switch (name.begin[0])
-			{
-			case 'a':
-				if (name == PUGIXML_TEXT("ancestor"))
-					return axis_ancestor;
-				else if (name == PUGIXML_TEXT("ancestor-or-self"))
-					return axis_ancestor_or_self;
-				else if (name == PUGIXML_TEXT("attribute"))
-					return axis_attribute;
-
-				break;
-
-			case 'c':
-				if (name == PUGIXML_TEXT("child"))
-					return axis_child;
-
-				break;
-
-			case 'd':
-				if (name == PUGIXML_TEXT("descendant"))
-					return axis_descendant;
-				else if (name == PUGIXML_TEXT("descendant-or-self"))
-					return axis_descendant_or_self;
-
-				break;
-
-			case 'f':
-				if (name == PUGIXML_TEXT("following"))
-					return axis_following;
-				else if (name == PUGIXML_TEXT("following-sibling"))
-					return axis_following_sibling;
-
-				break;
-
-			case 'n':
-				if (name == PUGIXML_TEXT("namespace"))
-					return axis_namespace;
-
-				break;
-
-			case 'p':
-				if (name == PUGIXML_TEXT("parent"))
-					return axis_parent;
-				else if (name == PUGIXML_TEXT("preceding"))
-					return axis_preceding;
-				else if (name == PUGIXML_TEXT("preceding-sibling"))
-					return axis_preceding_sibling;
-
-				break;
-
-			case 's':
-				if (name == PUGIXML_TEXT("self"))
-					return axis_self;
-
-				break;
-
-			default:
-				break;
-			}
-
-			specified = false;
-			return axis_child;
-		}
-
-		nodetest_t parse_node_test_type(const xpath_lexer_string& name)
-		{
-			switch (name.begin[0])
-			{
-			case 'c':
-				if (name == PUGIXML_TEXT("comment"))
-					return nodetest_type_comment;
-
-				break;
-
-			case 'n':
-				if (name == PUGIXML_TEXT("node"))
-					return nodetest_type_node;
-
-				break;
-
-			case 'p':
-				if (name == PUGIXML_TEXT("processing-instruction"))
-					return nodetest_type_pi;
-
-				break;
-
-			case 't':
-				if (name == PUGIXML_TEXT("text"))
-					return nodetest_type_text;
-
-				break;
-
-			default:
-				break;
-			}
-
-			return nodetest_none;
-		}
-
-		// PrimaryExpr ::= VariableReference | '(' Expr ')' | Literal | Number | FunctionCall
-		xpath_ast_node* parse_primary_expression()
-		{
-			switch (_lexer.current())
-			{
-			case lex_var_ref:
-			{
-				xpath_lexer_string name = _lexer.contents();
-
-				if (!_variables)
-					return error("Unknown variable: variable set is not provided");
-
-				xpath_variable* var = 0;
-				if (!get_variable_scratch(_scratch, _variables, name.begin, name.end, &var))
-					return error_oom();
-
-				if (!var)
-					return error("Unknown variable: variable set does not contain the given name");
-
-				_lexer.next();
-
-				return alloc_node(ast_variable, var->type(), var);
-			}
-
-			case lex_open_brace:
-			{
-				_lexer.next();
-
-				xpath_ast_node* n = parse_expression();
-				if (!n) return 0;
-
-				if (_lexer.current() != lex_close_brace)
-					return error("Expected ')' to match an opening '('");
-
-				_lexer.next();
-
-				return n;
-			}
-
-			case lex_quoted_string:
-			{
-				const char_t* value = alloc_string(_lexer.contents());
-				if (!value) return 0;
-
-				_lexer.next();
-
-				return alloc_node(ast_string_constant, xpath_type_string, value);
-			}
-
-			case lex_number:
-			{
-				double value = 0;
-
-				if (!convert_string_to_number_scratch(_scratch, _lexer.contents().begin, _lexer.contents().end, &value))
-					return error_oom();
-
-				_lexer.next();
-
-				return alloc_node(ast_number_constant, xpath_type_number, value);
-			}
-
-			case lex_string:
-			{
-				xpath_ast_node* args[2] = {0};
-				size_t argc = 0;
-
-				xpath_lexer_string function = _lexer.contents();
-				_lexer.next();
-
-				xpath_ast_node* last_arg = 0;
-
-				if (_lexer.current() != lex_open_brace)
-					return error("Unrecognized function call");
-				_lexer.next();
-
-				size_t old_depth = _depth;
-
-				while (_lexer.current() != lex_close_brace)
-				{
-					if (argc > 0)
-					{
-						if (_lexer.current() != lex_comma)
-							return error("No comma between function arguments");
-						_lexer.next();
-					}
-
-					if (++_depth > xpath_ast_depth_limit)
-						return error_rec();
-
-					xpath_ast_node* n = parse_expression();
-					if (!n) return 0;
-
-					if (argc < 2) args[argc] = n;
-					else last_arg->set_next(n);
-
-					argc++;
-					last_arg = n;
-				}
-
-				_lexer.next();
-
-				_depth = old_depth;
-
-				return parse_function(function, argc, args);
-			}
-
-			default:
-				return error("Unrecognizable primary expression");
-			}
-		}
-
-		// FilterExpr ::= PrimaryExpr | FilterExpr Predicate
-		// Predicate ::= '[' PredicateExpr ']'
-		// PredicateExpr ::= Expr
-		xpath_ast_node* parse_filter_expression()
-		{
-			xpath_ast_node* n = parse_primary_expression();
-			if (!n) return 0;
-
-			size_t old_depth = _depth;
-
-			while (_lexer.current() == lex_open_square_brace)
-			{
-				_lexer.next();
-
-				if (++_depth > xpath_ast_depth_limit)
-					return error_rec();
-
-				if (n->rettype() != xpath_type_node_set)
-					return error("Predicate has to be applied to node set");
-
-				xpath_ast_node* expr = parse_expression();
-				if (!expr) return 0;
-
-				n = alloc_node(ast_filter, n, expr, predicate_default);
-				if (!n) return 0;
-
-				if (_lexer.current() != lex_close_square_brace)
-					return error("Expected ']' to match an opening '['");
-
-				_lexer.next();
-			}
-
-			_depth = old_depth;
-
-			return n;
-		}
-
-		// Step ::= AxisSpecifier NodeTest Predicate* | AbbreviatedStep
-		// AxisSpecifier ::= AxisName '::' | '@'?
-		// NodeTest ::= NameTest | NodeType '(' ')' | 'processing-instruction' '(' Literal ')'
-		// NameTest ::= '*' | NCName ':' '*' | QName
-		// AbbreviatedStep ::= '.' | '..'
-		xpath_ast_node* parse_step(xpath_ast_node* set)
-		{
-			if (set && set->rettype() != xpath_type_node_set)
-				return error("Step has to be applied to node set");
-
-			bool axis_specified = false;
-			axis_t axis = axis_child; // implied child axis
-
-			if (_lexer.current() == lex_axis_attribute)
-			{
-				axis = axis_attribute;
-				axis_specified = true;
-
-				_lexer.next();
-			}
-			else if (_lexer.current() == lex_dot)
-			{
-				_lexer.next();
-
-				if (_lexer.current() == lex_open_square_brace)
-					return error("Predicates are not allowed after an abbreviated step");
-
-				return alloc_node(ast_step, set, axis_self, nodetest_type_node, 0);
-			}
-			else if (_lexer.current() == lex_double_dot)
-			{
-				_lexer.next();
-
-				if (_lexer.current() == lex_open_square_brace)
-					return error("Predicates are not allowed after an abbreviated step");
-
-				return alloc_node(ast_step, set, axis_parent, nodetest_type_node, 0);
-			}
-
-			nodetest_t nt_type = nodetest_none;
-			xpath_lexer_string nt_name;
-
-			if (_lexer.current() == lex_string)
-			{
-				// node name test
-				nt_name = _lexer.contents();
-				_lexer.next();
-
-				// was it an axis name?
-				if (_lexer.current() == lex_double_colon)
-				{
-					// parse axis name
-					if (axis_specified)
-						return error("Two axis specifiers in one step");
-
-					axis = parse_axis_name(nt_name, axis_specified);
-
-					if (!axis_specified)
-						return error("Unknown axis");
-
-					// read actual node test
-					_lexer.next();
-
-					if (_lexer.current() == lex_multiply)
-					{
-						nt_type = nodetest_all;
-						nt_name = xpath_lexer_string();
-						_lexer.next();
-					}
-					else if (_lexer.current() == lex_string)
-					{
-						nt_name = _lexer.contents();
-						_lexer.next();
-					}
-					else
-					{
-						return error("Unrecognized node test");
-					}
-				}
-
-				if (nt_type == nodetest_none)
-				{
-					// node type test or processing-instruction
-					if (_lexer.current() == lex_open_brace)
-					{
-						_lexer.next();
-
-						if (_lexer.current() == lex_close_brace)
-						{
-							_lexer.next();
-
-							nt_type = parse_node_test_type(nt_name);
-
-							if (nt_type == nodetest_none)
-								return error("Unrecognized node type");
-
-							nt_name = xpath_lexer_string();
-						}
-						else if (nt_name == PUGIXML_TEXT("processing-instruction"))
-						{
-							if (_lexer.current() != lex_quoted_string)
-								return error("Only literals are allowed as arguments to processing-instruction()");
-
-							nt_type = nodetest_pi;
-							nt_name = _lexer.contents();
-							_lexer.next();
-
-							if (_lexer.current() != lex_close_brace)
-								return error("Unmatched brace near processing-instruction()");
-							_lexer.next();
-						}
-						else
-						{
-							return error("Unmatched brace near node type test");
-						}
-					}
-					// QName or NCName:*
-					else
-					{
-						if (nt_name.end - nt_name.begin > 2 && nt_name.end[-2] == ':' && nt_name.end[-1] == '*') // NCName:*
-						{
-							nt_name.end--; // erase *
-
-							nt_type = nodetest_all_in_namespace;
-						}
-						else
-						{
-							nt_type = nodetest_name;
-						}
-					}
-				}
-			}
-			else if (_lexer.current() == lex_multiply)
-			{
-				nt_type = nodetest_all;
-				_lexer.next();
-			}
-			else
-			{
-				return error("Unrecognized node test");
-			}
-
-			const char_t* nt_name_copy = alloc_string(nt_name);
-			if (!nt_name_copy) return 0;
-
-			xpath_ast_node* n = alloc_node(ast_step, set, axis, nt_type, nt_name_copy);
-			if (!n) return 0;
-
-			size_t old_depth = _depth;
-
-			xpath_ast_node* last = 0;
-
-			while (_lexer.current() == lex_open_square_brace)
-			{
-				_lexer.next();
-
-				if (++_depth > xpath_ast_depth_limit)
-					return error_rec();
-
-				xpath_ast_node* expr = parse_expression();
-				if (!expr) return 0;
-
-				xpath_ast_node* pred = alloc_node(ast_predicate, 0, expr, predicate_default);
-				if (!pred) return 0;
-
-				if (_lexer.current() != lex_close_square_brace)
-					return error("Expected ']' to match an opening '['");
-				_lexer.next();
-
-				if (last) last->set_next(pred);
-				else n->set_right(pred);
-
-				last = pred;
-			}
-
-			_depth = old_depth;
-
-			return n;
-		}
-
-		// RelativeLocationPath ::= Step | RelativeLocationPath '/' Step | RelativeLocationPath '//' Step
-		xpath_ast_node* parse_relative_location_path(xpath_ast_node* set)
-		{
-			xpath_ast_node* n = parse_step(set);
-			if (!n) return 0;
-
-			size_t old_depth = _depth;
-
-			while (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash)
-			{
-				lexeme_t l = _lexer.current();
-				_lexer.next();
-
-				if (l == lex_double_slash)
-				{
-					n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
-					if (!n) return 0;
-
-					++_depth;
-				}
-
-				if (++_depth > xpath_ast_depth_limit)
-					return error_rec();
-
-				n = parse_step(n);
-				if (!n) return 0;
-			}
-
-			_depth = old_depth;
-
-			return n;
-		}
-
-		// LocationPath ::= RelativeLocationPath | AbsoluteLocationPath
-		// AbsoluteLocationPath ::= '/' RelativeLocationPath? | '//' RelativeLocationPath
-		xpath_ast_node* parse_location_path()
-		{
-			if (_lexer.current() == lex_slash)
-			{
-				_lexer.next();
-
-				xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set);
-				if (!n) return 0;
-
-				// relative location path can start from axis_attribute, dot, double_dot, multiply and string lexemes; any other lexeme means standalone root path
-				lexeme_t l = _lexer.current();
-
-				if (l == lex_string || l == lex_axis_attribute || l == lex_dot || l == lex_double_dot || l == lex_multiply)
-					return parse_relative_location_path(n);
-				else
-					return n;
-			}
-			else if (_lexer.current() == lex_double_slash)
-			{
-				_lexer.next();
-
-				xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set);
-				if (!n) return 0;
-
-				n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
-				if (!n) return 0;
-
-				return parse_relative_location_path(n);
-			}
-
-			// else clause moved outside of if because of bogus warning 'control may reach end of non-void function being inlined' in gcc 4.0.1
-			return parse_relative_location_path(0);
-		}
-
-		// PathExpr ::= LocationPath
-		//				| FilterExpr
-		//				| FilterExpr '/' RelativeLocationPath
-		//				| FilterExpr '//' RelativeLocationPath
-		// UnionExpr ::= PathExpr | UnionExpr '|' PathExpr
-		// UnaryExpr ::= UnionExpr | '-' UnaryExpr
-		xpath_ast_node* parse_path_or_unary_expression()
-		{
-			// Clarification.
-			// PathExpr begins with either LocationPath or FilterExpr.
-			// FilterExpr begins with PrimaryExpr
-			// PrimaryExpr begins with '$' in case of it being a variable reference,
-			// '(' in case of it being an expression, string literal, number constant or
-			// function call.
-			if (_lexer.current() == lex_var_ref || _lexer.current() == lex_open_brace ||
-				_lexer.current() == lex_quoted_string || _lexer.current() == lex_number ||
-				_lexer.current() == lex_string)
-			{
-				if (_lexer.current() == lex_string)
-				{
-					// This is either a function call, or not - if not, we shall proceed with location path
-					const char_t* state = _lexer.state();
-
-					while (PUGI__IS_CHARTYPE(*state, ct_space)) ++state;
-
-					if (*state != '(')
-						return parse_location_path();
-
-					// This looks like a function call; however this still can be a node-test. Check it.
-					if (parse_node_test_type(_lexer.contents()) != nodetest_none)
-						return parse_location_path();
-				}
-
-				xpath_ast_node* n = parse_filter_expression();
-				if (!n) return 0;
-
-				if (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash)
-				{
-					lexeme_t l = _lexer.current();
-					_lexer.next();
-
-					if (l == lex_double_slash)
-					{
-						if (n->rettype() != xpath_type_node_set)
-							return error("Step has to be applied to node set");
-
-						n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
-						if (!n) return 0;
-					}
-
-					// select from location path
-					return parse_relative_location_path(n);
-				}
-
-				return n;
-			}
-			else if (_lexer.current() == lex_minus)
-			{
-				_lexer.next();
-
-				// precedence 7+ - only parses union expressions
-				xpath_ast_node* n = parse_expression(7);
-				if (!n) return 0;
-
-				return alloc_node(ast_op_negate, xpath_type_number, n);
-			}
-			else
-			{
-				return parse_location_path();
-			}
-		}
-
-		struct binary_op_t
-		{
-			ast_type_t asttype;
-			xpath_value_type rettype;
-			int precedence;
-
-			binary_op_t(): asttype(ast_unknown), rettype(xpath_type_none), precedence(0)
-			{
-			}
-
-			binary_op_t(ast_type_t asttype_, xpath_value_type rettype_, int precedence_): asttype(asttype_), rettype(rettype_), precedence(precedence_)
-			{
-			}
-
-			static binary_op_t parse(xpath_lexer& lexer)
-			{
-				switch (lexer.current())
-				{
-				case lex_string:
-					if (lexer.contents() == PUGIXML_TEXT("or"))
-						return binary_op_t(ast_op_or, xpath_type_boolean, 1);
-					else if (lexer.contents() == PUGIXML_TEXT("and"))
-						return binary_op_t(ast_op_and, xpath_type_boolean, 2);
-					else if (lexer.contents() == PUGIXML_TEXT("div"))
-						return binary_op_t(ast_op_divide, xpath_type_number, 6);
-					else if (lexer.contents() == PUGIXML_TEXT("mod"))
-						return binary_op_t(ast_op_mod, xpath_type_number, 6);
-					else
-						return binary_op_t();
-
-				case lex_equal:
-					return binary_op_t(ast_op_equal, xpath_type_boolean, 3);
-
-				case lex_not_equal:
-					return binary_op_t(ast_op_not_equal, xpath_type_boolean, 3);
-
-				case lex_less:
-					return binary_op_t(ast_op_less, xpath_type_boolean, 4);
-
-				case lex_greater:
-					return binary_op_t(ast_op_greater, xpath_type_boolean, 4);
-
-				case lex_less_or_equal:
-					return binary_op_t(ast_op_less_or_equal, xpath_type_boolean, 4);
-
-				case lex_greater_or_equal:
-					return binary_op_t(ast_op_greater_or_equal, xpath_type_boolean, 4);
-
-				case lex_plus:
-					return binary_op_t(ast_op_add, xpath_type_number, 5);
-
-				case lex_minus:
-					return binary_op_t(ast_op_subtract, xpath_type_number, 5);
-
-				case lex_multiply:
-					return binary_op_t(ast_op_multiply, xpath_type_number, 6);
-
-				case lex_union:
-					return binary_op_t(ast_op_union, xpath_type_node_set, 7);
-
-				default:
-					return binary_op_t();
-				}
-			}
-		};
-
-		xpath_ast_node* parse_expression_rec(xpath_ast_node* lhs, int limit)
-		{
-			binary_op_t op = binary_op_t::parse(_lexer);
-
-			while (op.asttype != ast_unknown && op.precedence >= limit)
-			{
-				_lexer.next();
-
-				if (++_depth > xpath_ast_depth_limit)
-					return error_rec();
-
-				xpath_ast_node* rhs = parse_path_or_unary_expression();
-				if (!rhs) return 0;
-
-				binary_op_t nextop = binary_op_t::parse(_lexer);
-
-				while (nextop.asttype != ast_unknown && nextop.precedence > op.precedence)
-				{
-					rhs = parse_expression_rec(rhs, nextop.precedence);
-					if (!rhs) return 0;
-
-					nextop = binary_op_t::parse(_lexer);
-				}
-
-				if (op.asttype == ast_op_union && (lhs->rettype() != xpath_type_node_set || rhs->rettype() != xpath_type_node_set))
-					return error("Union operator has to be applied to node sets");
-
-				lhs = alloc_node(op.asttype, op.rettype, lhs, rhs);
-				if (!lhs) return 0;
-
-				op = binary_op_t::parse(_lexer);
-			}
-
-			return lhs;
-		}
-
-		// Expr ::= OrExpr
-		// OrExpr ::= AndExpr | OrExpr 'or' AndExpr
-		// AndExpr ::= EqualityExpr | AndExpr 'and' EqualityExpr
-		// EqualityExpr ::= RelationalExpr
-		//					| EqualityExpr '=' RelationalExpr
-		//					| EqualityExpr '!=' RelationalExpr
-		// RelationalExpr ::= AdditiveExpr
-		//					  | RelationalExpr '<' AdditiveExpr
-		//					  | RelationalExpr '>' AdditiveExpr
-		//					  | RelationalExpr '<=' AdditiveExpr
-		//					  | RelationalExpr '>=' AdditiveExpr
-		// AdditiveExpr ::= MultiplicativeExpr
-		//					| AdditiveExpr '+' MultiplicativeExpr
-		//					| AdditiveExpr '-' MultiplicativeExpr
-		// MultiplicativeExpr ::= UnaryExpr
-		//						  | MultiplicativeExpr '*' UnaryExpr
-		//						  | MultiplicativeExpr 'div' UnaryExpr
-		//						  | MultiplicativeExpr 'mod' UnaryExpr
-		xpath_ast_node* parse_expression(int limit = 0)
-		{
-			size_t old_depth = _depth;
-
-			if (++_depth > xpath_ast_depth_limit)
-				return error_rec();
-
-			xpath_ast_node* n = parse_path_or_unary_expression();
-			if (!n) return 0;
-
-			n = parse_expression_rec(n, limit);
-
-			_depth = old_depth;
-
-			return n;
-		}
-
-		xpath_parser(const char_t* query, xpath_variable_set* variables, xpath_allocator* alloc, xpath_parse_result* result): _alloc(alloc), _lexer(query), _query(query), _variables(variables), _result(result), _depth(0)
-		{
-		}
-
-		xpath_ast_node* parse()
-		{
-			xpath_ast_node* n = parse_expression();
-			if (!n) return 0;
-
-			assert(_depth == 0);
-
-			// check if there are unparsed tokens left
-			if (_lexer.current() != lex_eof)
-				return error("Incorrect query");
-
-			return n;
-		}
-
-		static xpath_ast_node* parse(const char_t* query, xpath_variable_set* variables, xpath_allocator* alloc, xpath_parse_result* result)
-		{
-			xpath_parser parser(query, variables, alloc, result);
-
-			return parser.parse();
-		}
-	};
-
-	struct xpath_query_impl
-	{
-		static xpath_query_impl* create()
-		{
-			void* memory = xml_memory::allocate(sizeof(xpath_query_impl));
-			if (!memory) return 0;
-
-			return new (memory) xpath_query_impl();
-		}
-
-		static void destroy(xpath_query_impl* impl)
-		{
-			// free all allocated pages
-			impl->alloc.release();
-
-			// free allocator memory (with the first page)
-			xml_memory::deallocate(impl);
-		}
-
-		xpath_query_impl(): root(0), alloc(&block, &oom), oom(false)
-		{
-			block.next = 0;
-			block.capacity = sizeof(block.data);
-		}
-
-		xpath_ast_node* root;
-		xpath_allocator alloc;
-		xpath_memory_block block;
-		bool oom;
-	};
-
-	PUGI__FN impl::xpath_ast_node* evaluate_node_set_prepare(xpath_query_impl* impl)
-	{
-		if (!impl) return 0;
-
-		if (impl->root->rettype() != xpath_type_node_set)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			return 0;
-		#else
-			xpath_parse_result res;
-			res.error = "Expression does not evaluate to node set";
-
-			throw xpath_exception(res);
-		#endif
-		}
-
-		return impl->root;
-	}
-PUGI__NS_END
-
-namespace pugi
-{
-#ifndef PUGIXML_NO_EXCEPTIONS
-	PUGI__FN xpath_exception::xpath_exception(const xpath_parse_result& result_): _result(result_)
-	{
-		assert(_result.error);
-	}
-
-	PUGI__FN const char* xpath_exception::what() const throw()
-	{
-		return _result.error;
-	}
-
-	PUGI__FN const xpath_parse_result& xpath_exception::result() const
-	{
-		return _result;
-	}
-#endif
-
-	PUGI__FN xpath_node::xpath_node()
-	{
-	}
-
-	PUGI__FN xpath_node::xpath_node(const xml_node& node_): _node(node_)
-	{
-	}
-
-	PUGI__FN xpath_node::xpath_node(const xml_attribute& attribute_, const xml_node& parent_): _node(attribute_ ? parent_ : xml_node()), _attribute(attribute_)
-	{
-	}
-
-	PUGI__FN xml_node xpath_node::node() const
-	{
-		return _attribute ? xml_node() : _node;
-	}
-
-	PUGI__FN xml_attribute xpath_node::attribute() const
-	{
-		return _attribute;
-	}
-
-	PUGI__FN xml_node xpath_node::parent() const
-	{
-		return _attribute ? _node : _node.parent();
-	}
-
-	PUGI__FN static void unspecified_bool_xpath_node(xpath_node***)
-	{
-	}
-
-	PUGI__FN xpath_node::operator xpath_node::unspecified_bool_type() const
-	{
-		return (_node || _attribute) ? unspecified_bool_xpath_node : 0;
-	}
-
-	PUGI__FN bool xpath_node::operator!() const
-	{
-		return !(_node || _attribute);
-	}
-
-	PUGI__FN bool xpath_node::operator==(const xpath_node& n) const
-	{
-		return _node == n._node && _attribute == n._attribute;
-	}
-
-	PUGI__FN bool xpath_node::operator!=(const xpath_node& n) const
-	{
-		return _node != n._node || _attribute != n._attribute;
-	}
-
-#ifdef __BORLANDC__
-	PUGI__FN bool operator&&(const xpath_node& lhs, bool rhs)
-	{
-		return (bool)lhs && rhs;
-	}
-
-	PUGI__FN bool operator||(const xpath_node& lhs, bool rhs)
-	{
-		return (bool)lhs || rhs;
-	}
-#endif
-
-	PUGI__FN void xpath_node_set::_assign(const_iterator begin_, const_iterator end_, type_t type_)
-	{
-		assert(begin_ <= end_);
-
-		size_t size_ = static_cast<size_t>(end_ - begin_);
-
-		// use internal buffer for 0 or 1 elements, heap buffer otherwise
-		xpath_node* storage = (size_ <= 1) ? _storage : static_cast<xpath_node*>(impl::xml_memory::allocate(size_ * sizeof(xpath_node)));
-
-		if (!storage)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			return;
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-
-		// deallocate old buffer
-		if (_begin != _storage)
-			impl::xml_memory::deallocate(_begin);
-
-		// size check is necessary because for begin_ = end_ = nullptr, memcpy is UB
-		if (size_)
-			memcpy(storage, begin_, size_ * sizeof(xpath_node));
-
-		_begin = storage;
-		_end = storage + size_;
-		_type = type_;
-	}
-
-#ifdef PUGIXML_HAS_MOVE
-	PUGI__FN void xpath_node_set::_move(xpath_node_set& rhs) PUGIXML_NOEXCEPT
-	{
-		_type = rhs._type;
-		_storage[0] = rhs._storage[0];
-		_begin = (rhs._begin == rhs._storage) ? _storage : rhs._begin;
-		_end = _begin + (rhs._end - rhs._begin);
-
-		rhs._type = type_unsorted;
-		rhs._begin = rhs._storage;
-		rhs._end = rhs._storage;
-	}
-#endif
-
-	PUGI__FN xpath_node_set::xpath_node_set(): _type(type_unsorted), _begin(_storage), _end(_storage)
-	{
-	}
-
-	PUGI__FN xpath_node_set::xpath_node_set(const_iterator begin_, const_iterator end_, type_t type_): _type(type_unsorted), _begin(_storage), _end(_storage)
-	{
-		_assign(begin_, end_, type_);
-	}
-
-	PUGI__FN xpath_node_set::~xpath_node_set()
-	{
-		if (_begin != _storage)
-			impl::xml_memory::deallocate(_begin);
-	}
-
-	PUGI__FN xpath_node_set::xpath_node_set(const xpath_node_set& ns): _type(type_unsorted), _begin(_storage), _end(_storage)
-	{
-		_assign(ns._begin, ns._end, ns._type);
-	}
-
-	PUGI__FN xpath_node_set& xpath_node_set::operator=(const xpath_node_set& ns)
-	{
-		if (this == &ns) return *this;
-
-		_assign(ns._begin, ns._end, ns._type);
-
-		return *this;
-	}
-
-#ifdef PUGIXML_HAS_MOVE
-	PUGI__FN xpath_node_set::xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT: _type(type_unsorted), _begin(_storage), _end(_storage)
-	{
-		_move(rhs);
-	}
-
-	PUGI__FN xpath_node_set& xpath_node_set::operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT
-	{
-		if (this == &rhs) return *this;
-
-		if (_begin != _storage)
-			impl::xml_memory::deallocate(_begin);
-
-		_move(rhs);
-
-		return *this;
-	}
-#endif
-
-	PUGI__FN xpath_node_set::type_t xpath_node_set::type() const
-	{
-		return _type;
-	}
-
-	PUGI__FN size_t xpath_node_set::size() const
-	{
-		return _end - _begin;
-	}
-
-	PUGI__FN bool xpath_node_set::empty() const
-	{
-		return _begin == _end;
-	}
-
-	PUGI__FN const xpath_node& xpath_node_set::operator[](size_t index) const
-	{
-		assert(index < size());
-		return _begin[index];
-	}
-
-	PUGI__FN xpath_node_set::const_iterator xpath_node_set::begin() const
-	{
-		return _begin;
-	}
-
-	PUGI__FN xpath_node_set::const_iterator xpath_node_set::end() const
-	{
-		return _end;
-	}
-
-	PUGI__FN void xpath_node_set::sort(bool reverse)
-	{
-		_type = impl::xpath_sort(_begin, _end, _type, reverse);
-	}
-
-	PUGI__FN xpath_node xpath_node_set::first() const
-	{
-		return impl::xpath_first(_begin, _end, _type);
-	}
-
-	PUGI__FN xpath_parse_result::xpath_parse_result(): error("Internal error"), offset(0)
-	{
-	}
-
-	PUGI__FN xpath_parse_result::operator bool() const
-	{
-		return error == 0;
-	}
-
-	PUGI__FN const char* xpath_parse_result::description() const
-	{
-		return error ? error : "No error";
-	}
-
-	PUGI__FN xpath_variable::xpath_variable(xpath_value_type type_): _type(type_), _next(0)
-	{
-	}
-
-	PUGI__FN const char_t* xpath_variable::name() const
-	{
-		switch (_type)
-		{
-		case xpath_type_node_set:
-			return static_cast<const impl::xpath_variable_node_set*>(this)->name;
-
-		case xpath_type_number:
-			return static_cast<const impl::xpath_variable_number*>(this)->name;
-
-		case xpath_type_string:
-			return static_cast<const impl::xpath_variable_string*>(this)->name;
-
-		case xpath_type_boolean:
-			return static_cast<const impl::xpath_variable_boolean*>(this)->name;
-
-		default:
-			assert(false && "Invalid variable type"); // unreachable
-			return 0;
-		}
-	}
-
-	PUGI__FN xpath_value_type xpath_variable::type() const
-	{
-		return _type;
-	}
-
-	PUGI__FN bool xpath_variable::get_boolean() const
-	{
-		return (_type == xpath_type_boolean) ? static_cast<const impl::xpath_variable_boolean*>(this)->value : false;
-	}
-
-	PUGI__FN double xpath_variable::get_number() const
-	{
-		return (_type == xpath_type_number) ? static_cast<const impl::xpath_variable_number*>(this)->value : impl::gen_nan();
-	}
-
-	PUGI__FN const char_t* xpath_variable::get_string() const
-	{
-		const char_t* value = (_type == xpath_type_string) ? static_cast<const impl::xpath_variable_string*>(this)->value : 0;
-		return value ? value : PUGIXML_TEXT("");
-	}
-
-	PUGI__FN const xpath_node_set& xpath_variable::get_node_set() const
-	{
-		return (_type == xpath_type_node_set) ? static_cast<const impl::xpath_variable_node_set*>(this)->value : impl::dummy_node_set;
-	}
-
-	PUGI__FN bool xpath_variable::set(bool value)
-	{
-		if (_type != xpath_type_boolean) return false;
-
-		static_cast<impl::xpath_variable_boolean*>(this)->value = value;
-		return true;
-	}
-
-	PUGI__FN bool xpath_variable::set(double value)
-	{
-		if (_type != xpath_type_number) return false;
-
-		static_cast<impl::xpath_variable_number*>(this)->value = value;
-		return true;
-	}
-
-	PUGI__FN bool xpath_variable::set(const char_t* value)
-	{
-		if (_type != xpath_type_string) return false;
-
-		impl::xpath_variable_string* var = static_cast<impl::xpath_variable_string*>(this);
-
-		// duplicate string
-		size_t size = (impl::strlength(value) + 1) * sizeof(char_t);
-
-		char_t* copy = static_cast<char_t*>(impl::xml_memory::allocate(size));
-		if (!copy) return false;
-
-		memcpy(copy, value, size);
-
-		// replace old string
-		if (var->value) impl::xml_memory::deallocate(var->value);
-		var->value = copy;
-
-		return true;
-	}
-
-	PUGI__FN bool xpath_variable::set(const xpath_node_set& value)
-	{
-		if (_type != xpath_type_node_set) return false;
-
-		static_cast<impl::xpath_variable_node_set*>(this)->value = value;
-		return true;
-	}
-
-	PUGI__FN xpath_variable_set::xpath_variable_set()
-	{
-		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-			_data[i] = 0;
-	}
-
-	PUGI__FN xpath_variable_set::~xpath_variable_set()
-	{
-		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-			_destroy(_data[i]);
-	}
-
-	PUGI__FN xpath_variable_set::xpath_variable_set(const xpath_variable_set& rhs)
-	{
-		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-			_data[i] = 0;
-
-		_assign(rhs);
-	}
-
-	PUGI__FN xpath_variable_set& xpath_variable_set::operator=(const xpath_variable_set& rhs)
-	{
-		if (this == &rhs) return *this;
-
-		_assign(rhs);
-
-		return *this;
-	}
-
-#ifdef PUGIXML_HAS_MOVE
-	PUGI__FN xpath_variable_set::xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
-	{
-		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-		{
-			_data[i] = rhs._data[i];
-			rhs._data[i] = 0;
-		}
-	}
-
-	PUGI__FN xpath_variable_set& xpath_variable_set::operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
-	{
-		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-		{
-			_destroy(_data[i]);
-
-			_data[i] = rhs._data[i];
-			rhs._data[i] = 0;
-		}
-
-		return *this;
-	}
-#endif
-
-	PUGI__FN void xpath_variable_set::_assign(const xpath_variable_set& rhs)
-	{
-		xpath_variable_set temp;
-
-		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-			if (rhs._data[i] && !_clone(rhs._data[i], &temp._data[i]))
-				return;
-
-		_swap(temp);
-	}
-
-	PUGI__FN void xpath_variable_set::_swap(xpath_variable_set& rhs)
-	{
-		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-		{
-			xpath_variable* chain = _data[i];
-
-			_data[i] = rhs._data[i];
-			rhs._data[i] = chain;
-		}
-	}
-
-	PUGI__FN xpath_variable* xpath_variable_set::_find(const char_t* name) const
-	{
-		const size_t hash_size = sizeof(_data) / sizeof(_data[0]);
-		size_t hash = impl::hash_string(name) % hash_size;
-
-		// look for existing variable
-		for (xpath_variable* var = _data[hash]; var; var = var->_next)
-			if (impl::strequal(var->name(), name))
-				return var;
-
-		return 0;
-	}
-
-	PUGI__FN bool xpath_variable_set::_clone(xpath_variable* var, xpath_variable** out_result)
-	{
-		xpath_variable* last = 0;
-
-		while (var)
-		{
-			// allocate storage for new variable
-			xpath_variable* nvar = impl::new_xpath_variable(var->_type, var->name());
-			if (!nvar) return false;
-
-			// link the variable to the result immediately to handle failures gracefully
-			if (last)
-				last->_next = nvar;
-			else
-				*out_result = nvar;
-
-			last = nvar;
-
-			// copy the value; this can fail due to out-of-memory conditions
-			if (!impl::copy_xpath_variable(nvar, var)) return false;
-
-			var = var->_next;
-		}
-
-		return true;
-	}
-
-	PUGI__FN void xpath_variable_set::_destroy(xpath_variable* var)
-	{
-		while (var)
-		{
-			xpath_variable* next = var->_next;
-
-			impl::delete_xpath_variable(var->_type, var);
-
-			var = next;
-		}
-	}
-
-	PUGI__FN xpath_variable* xpath_variable_set::add(const char_t* name, xpath_value_type type)
-	{
-		const size_t hash_size = sizeof(_data) / sizeof(_data[0]);
-		size_t hash = impl::hash_string(name) % hash_size;
-
-		// look for existing variable
-		for (xpath_variable* var = _data[hash]; var; var = var->_next)
-			if (impl::strequal(var->name(), name))
-				return var->type() == type ? var : 0;
-
-		// add new variable
-		xpath_variable* result = impl::new_xpath_variable(type, name);
-
-		if (result)
-		{
-			result->_next = _data[hash];
-
-			_data[hash] = result;
-		}
-
-		return result;
-	}
-
-	PUGI__FN bool xpath_variable_set::set(const char_t* name, bool value)
-	{
-		xpath_variable* var = add(name, xpath_type_boolean);
-		return var ? var->set(value) : false;
-	}
-
-	PUGI__FN bool xpath_variable_set::set(const char_t* name, double value)
-	{
-		xpath_variable* var = add(name, xpath_type_number);
-		return var ? var->set(value) : false;
-	}
-
-	PUGI__FN bool xpath_variable_set::set(const char_t* name, const char_t* value)
-	{
-		xpath_variable* var = add(name, xpath_type_string);
-		return var ? var->set(value) : false;
-	}
-
-	PUGI__FN bool xpath_variable_set::set(const char_t* name, const xpath_node_set& value)
-	{
-		xpath_variable* var = add(name, xpath_type_node_set);
-		return var ? var->set(value) : false;
-	}
-
-	PUGI__FN xpath_variable* xpath_variable_set::get(const char_t* name)
-	{
-		return _find(name);
-	}
-
-	PUGI__FN const xpath_variable* xpath_variable_set::get(const char_t* name) const
-	{
-		return _find(name);
-	}
-
-	PUGI__FN xpath_query::xpath_query(const char_t* query, xpath_variable_set* variables): _impl(0)
-	{
-		impl::xpath_query_impl* qimpl = impl::xpath_query_impl::create();
-
-		if (!qimpl)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			_result.error = "Out of memory";
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-		else
-		{
-			using impl::auto_deleter; // MSVC7 workaround
-			auto_deleter<impl::xpath_query_impl> impl(qimpl, impl::xpath_query_impl::destroy);
-
-			qimpl->root = impl::xpath_parser::parse(query, variables, &qimpl->alloc, &_result);
-
-			if (qimpl->root)
-			{
-				qimpl->root->optimize(&qimpl->alloc);
-
-				_impl = impl.release();
-				_result.error = 0;
-			}
-			else
-			{
-			#ifdef PUGIXML_NO_EXCEPTIONS
-				if (qimpl->oom) _result.error = "Out of memory";
-			#else
-				if (qimpl->oom) throw std::bad_alloc();
-				throw xpath_exception(_result);
-			#endif
-			}
-		}
-	}
-
-	PUGI__FN xpath_query::xpath_query(): _impl(0)
-	{
-	}
-
-	PUGI__FN xpath_query::~xpath_query()
-	{
-		if (_impl)
-			impl::xpath_query_impl::destroy(static_cast<impl::xpath_query_impl*>(_impl));
-	}
-
-#ifdef PUGIXML_HAS_MOVE
-	PUGI__FN xpath_query::xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT
-	{
-		_impl = rhs._impl;
-		_result = rhs._result;
-		rhs._impl = 0;
-		rhs._result = xpath_parse_result();
-	}
-
-	PUGI__FN xpath_query& xpath_query::operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT
-	{
-		if (this == &rhs) return *this;
-
-		if (_impl)
-			impl::xpath_query_impl::destroy(static_cast<impl::xpath_query_impl*>(_impl));
-
-		_impl = rhs._impl;
-		_result = rhs._result;
-		rhs._impl = 0;
-		rhs._result = xpath_parse_result();
-
-		return *this;
-	}
-#endif
-
-	PUGI__FN xpath_value_type xpath_query::return_type() const
-	{
-		if (!_impl) return xpath_type_none;
-
-		return static_cast<impl::xpath_query_impl*>(_impl)->root->rettype();
-	}
-
-	PUGI__FN bool xpath_query::evaluate_boolean(const xpath_node& n) const
-	{
-		if (!_impl) return false;
-
-		impl::xpath_context c(n, 1, 1);
-		impl::xpath_stack_data sd;
-
-		bool r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_boolean(c, sd.stack);
-
-		if (sd.oom)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			return false;
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-
-		return r;
-	}
-
-	PUGI__FN double xpath_query::evaluate_number(const xpath_node& n) const
-	{
-		if (!_impl) return impl::gen_nan();
-
-		impl::xpath_context c(n, 1, 1);
-		impl::xpath_stack_data sd;
-
-		double r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_number(c, sd.stack);
-
-		if (sd.oom)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			return impl::gen_nan();
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-
-		return r;
-	}
-
-#ifndef PUGIXML_NO_STL
-	PUGI__FN string_t xpath_query::evaluate_string(const xpath_node& n) const
-	{
-		if (!_impl) return string_t();
-
-		impl::xpath_context c(n, 1, 1);
-		impl::xpath_stack_data sd;
-
-		impl::xpath_string r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_string(c, sd.stack);
-
-		if (sd.oom)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			return string_t();
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-
-		return string_t(r.c_str(), r.length());
-	}
-#endif
-
-	PUGI__FN size_t xpath_query::evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const
-	{
-		impl::xpath_context c(n, 1, 1);
-		impl::xpath_stack_data sd;
-
-		impl::xpath_string r = _impl ? static_cast<impl::xpath_query_impl*>(_impl)->root->eval_string(c, sd.stack) : impl::xpath_string();
-
-		if (sd.oom)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			r = impl::xpath_string();
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-
-		size_t full_size = r.length() + 1;
-
-		if (capacity > 0)
-		{
-			size_t size = (full_size < capacity) ? full_size : capacity;
-			assert(size > 0);
-
-			memcpy(buffer, r.c_str(), (size - 1) * sizeof(char_t));
-			buffer[size - 1] = 0;
-		}
-
-		return full_size;
-	}
-
-	PUGI__FN xpath_node_set xpath_query::evaluate_node_set(const xpath_node& n) const
-	{
-		impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast<impl::xpath_query_impl*>(_impl));
-		if (!root) return xpath_node_set();
-
-		impl::xpath_context c(n, 1, 1);
-		impl::xpath_stack_data sd;
-
-		impl::xpath_node_set_raw r = root->eval_node_set(c, sd.stack, impl::nodeset_eval_all);
-
-		if (sd.oom)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			return xpath_node_set();
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-
-		return xpath_node_set(r.begin(), r.end(), r.type());
-	}
-
-	PUGI__FN xpath_node xpath_query::evaluate_node(const xpath_node& n) const
-	{
-		impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast<impl::xpath_query_impl*>(_impl));
-		if (!root) return xpath_node();
-
-		impl::xpath_context c(n, 1, 1);
-		impl::xpath_stack_data sd;
-
-		impl::xpath_node_set_raw r = root->eval_node_set(c, sd.stack, impl::nodeset_eval_first);
-
-		if (sd.oom)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			return xpath_node();
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-
-		return r.first();
-	}
-
-	PUGI__FN const xpath_parse_result& xpath_query::result() const
-	{
-		return _result;
-	}
-
-	PUGI__FN static void unspecified_bool_xpath_query(xpath_query***)
-	{
-	}
-
-	PUGI__FN xpath_query::operator xpath_query::unspecified_bool_type() const
-	{
-		return _impl ? unspecified_bool_xpath_query : 0;
-	}
-
-	PUGI__FN bool xpath_query::operator!() const
-	{
-		return !_impl;
-	}
-
-	PUGI__FN xpath_node xml_node::select_node(const char_t* query, xpath_variable_set* variables) const
-	{
-		xpath_query q(query, variables);
-		return q.evaluate_node(*this);
-	}
-
-	PUGI__FN xpath_node xml_node::select_node(const xpath_query& query) const
-	{
-		return query.evaluate_node(*this);
-	}
-
-	PUGI__FN xpath_node_set xml_node::select_nodes(const char_t* query, xpath_variable_set* variables) const
-	{
-		xpath_query q(query, variables);
-		return q.evaluate_node_set(*this);
-	}
-
-	PUGI__FN xpath_node_set xml_node::select_nodes(const xpath_query& query) const
-	{
-		return query.evaluate_node_set(*this);
-	}
-
-	PUGI__FN xpath_node xml_node::select_single_node(const char_t* query, xpath_variable_set* variables) const
-	{
-		xpath_query q(query, variables);
-		return q.evaluate_node(*this);
-	}
-
-	PUGI__FN xpath_node xml_node::select_single_node(const xpath_query& query) const
-	{
-		return query.evaluate_node(*this);
-	}
-}
-
-#endif
-
-#ifdef __BORLANDC__
-#	pragma option pop
-#endif
-
-// Intel C++ does not properly keep warning state for function templates,
-// so popping warning state at the end of translation unit leads to warnings in the middle.
-#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-#	pragma warning(pop)
-#endif
-
-#if defined(_MSC_VER) && defined(__c2__)
-#	pragma clang diagnostic pop
-#endif
-
-// Undefine all local macros (makes sure we're not leaking macros in header-only mode)
-#undef PUGI__NO_INLINE
-#undef PUGI__UNLIKELY
-#undef PUGI__STATIC_ASSERT
-#undef PUGI__DMC_VOLATILE
-#undef PUGI__UNSIGNED_OVERFLOW
-#undef PUGI__MSVC_CRT_VERSION
-#undef PUGI__SNPRINTF
-#undef PUGI__NS_BEGIN
-#undef PUGI__NS_END
-#undef PUGI__FN
-#undef PUGI__FN_NO_INLINE
-#undef PUGI__GETHEADER_IMPL
-#undef PUGI__GETPAGE_IMPL
-#undef PUGI__GETPAGE
-#undef PUGI__NODETYPE
-#undef PUGI__IS_CHARTYPE_IMPL
-#undef PUGI__IS_CHARTYPE
-#undef PUGI__IS_CHARTYPEX
-#undef PUGI__ENDSWITH
-#undef PUGI__SKIPWS
-#undef PUGI__OPTSET
-#undef PUGI__PUSHNODE
-#undef PUGI__POPNODE
-#undef PUGI__SCANFOR
-#undef PUGI__SCANWHILE
-#undef PUGI__SCANWHILE_UNROLL
-#undef PUGI__ENDSEG
-#undef PUGI__THROW_ERROR
-#undef PUGI__CHECK_ERROR
-
-#endif
-
-/**
- * Copyright (c) 2006-2022 Arseny Kapoulkine
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
+/**
+ * pugixml parser - version 1.14
+ * --------------------------------------------------------
+ * Copyright (C) 2006-2023, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Report bugs and download new versions at https://pugixml.org/
+ *
+ * This library is distributed under the MIT License. See notice at the end
+ * of this file.
+ *
+ * This work is based on the pugxml parser, which is:
+ * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
+ */
+
+#ifndef SOURCE_PUGIXML_CPP
+#define SOURCE_PUGIXML_CPP
+
+#include "pugixml.hpp"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <limits.h>
+
+#ifdef PUGIXML_WCHAR_MODE
+#	include <wchar.h>
+#endif
+
+#ifndef PUGIXML_NO_XPATH
+#	include <math.h>
+#	include <float.h>
+#endif
+
+#ifndef PUGIXML_NO_STL
+#	include <istream>
+#	include <ostream>
+#	include <string>
+#endif
+
+// For placement new
+#include <new>
+
+// For load_file
+#if defined(__linux__) || defined(__APPLE__)
+#include <sys/stat.h>
+#endif
+
+#ifdef _MSC_VER
+#	pragma warning(push)
+#	pragma warning(disable: 4127) // conditional expression is constant
+#	pragma warning(disable: 4324) // structure was padded due to __declspec(align())
+#	pragma warning(disable: 4702) // unreachable code
+#	pragma warning(disable: 4996) // this function or variable may be unsafe
+#endif
+
+#if defined(_MSC_VER) && defined(__c2__)
+#	pragma clang diagnostic push
+#	pragma clang diagnostic ignored "-Wdeprecated" // this function or variable may be unsafe
+#endif
+
+#ifdef __INTEL_COMPILER
+#	pragma warning(disable: 177) // function was declared but never referenced
+#	pragma warning(disable: 279) // controlling expression is constant
+#	pragma warning(disable: 1478 1786) // function was declared "deprecated"
+#	pragma warning(disable: 1684) // conversion from pointer to same-sized integral type
+#endif
+
+#if defined(__BORLANDC__) && defined(PUGIXML_HEADER_ONLY)
+#	pragma warn -8080 // symbol is declared but never used; disabling this inside push/pop bracket does not make the warning go away
+#endif
+
+#ifdef __BORLANDC__
+#	pragma option push
+#	pragma warn -8008 // condition is always false
+#	pragma warn -8066 // unreachable code
+#endif
+
+#ifdef __SNC__
+// Using diag_push/diag_pop does not disable the warnings inside templates due to a compiler bug
+#	pragma diag_suppress=178 // function was declared but never referenced
+#	pragma diag_suppress=237 // controlling expression is constant
+#endif
+
+#ifdef __TI_COMPILER_VERSION__
+#	pragma diag_suppress 179 // function was declared but never referenced
+#endif
+
+// Inlining controls
+#if defined(_MSC_VER) && _MSC_VER >= 1300
+#	define PUGI_IMPL_NO_INLINE __declspec(noinline)
+#elif defined(__GNUC__)
+#	define PUGI_IMPL_NO_INLINE __attribute__((noinline))
+#else
+#	define PUGI_IMPL_NO_INLINE
+#endif
+
+// Branch weight controls
+#if defined(__GNUC__) && !defined(__c2__)
+#	define PUGI_IMPL_UNLIKELY(cond) __builtin_expect(cond, 0)
+#else
+#	define PUGI_IMPL_UNLIKELY(cond) (cond)
+#endif
+
+// Simple static assertion
+#define PUGI_IMPL_STATIC_ASSERT(cond) { static const char condition_failed[(cond) ? 1 : -1] = {0}; (void)condition_failed[0]; }
+
+// Digital Mars C++ bug workaround for passing char loaded from memory via stack
+#ifdef __DMC__
+#	define PUGI_IMPL_DMC_VOLATILE volatile
+#else
+#	define PUGI_IMPL_DMC_VOLATILE
+#endif
+
+// Integer sanitizer workaround; we only apply this for clang since gcc8 has no_sanitize but not unsigned-integer-overflow and produces "attribute directive ignored" warnings
+#if defined(__clang__) && defined(__has_attribute)
+#	if __has_attribute(no_sanitize)
+#		define PUGI_IMPL_UNSIGNED_OVERFLOW __attribute__((no_sanitize("unsigned-integer-overflow")))
+#	else
+#		define PUGI_IMPL_UNSIGNED_OVERFLOW
+#	endif
+#else
+#	define PUGI_IMPL_UNSIGNED_OVERFLOW
+#endif
+
+// Borland C++ bug workaround for not defining ::memcpy depending on header include order (can't always use std::memcpy because some compilers don't have it at all)
+#if defined(__BORLANDC__) && !defined(__MEM_H_USING_LIST)
+using std::memcpy;
+using std::memmove;
+using std::memset;
+#endif
+
+// Old versions of GCC do not define ::malloc and ::free depending on header include order
+#if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4))
+using std::malloc;
+using std::free;
+#endif
+
+// Some MinGW/GCC versions have headers that erroneously omit LLONG_MIN/LLONG_MAX/ULLONG_MAX definitions from limits.h in some configurations
+#if defined(PUGIXML_HAS_LONG_LONG) && defined(__GNUC__) && !defined(LLONG_MAX) && !defined(LLONG_MIN) && !defined(ULLONG_MAX)
+#	define LLONG_MIN (-LLONG_MAX - 1LL)
+#	define LLONG_MAX __LONG_LONG_MAX__
+#	define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+#endif
+
+// In some environments MSVC is a compiler but the CRT lacks certain MSVC-specific features
+#if defined(_MSC_VER) && !defined(__S3E__) && !defined(_WIN32_WCE)
+#	define PUGI_IMPL_MSVC_CRT_VERSION _MSC_VER
+#elif defined(_WIN32_WCE)
+#	define PUGI_IMPL_MSVC_CRT_VERSION 1310 // MSVC7.1
+#endif
+
+// Not all platforms have snprintf; we define a wrapper that uses snprintf if possible. This only works with buffers with a known size.
+#if __cplusplus >= 201103
+#	define PUGI_IMPL_SNPRINTF(buf, ...) snprintf(buf, sizeof(buf), __VA_ARGS__)
+#elif defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
+#	define PUGI_IMPL_SNPRINTF(buf, ...) _snprintf_s(buf, _countof(buf), _TRUNCATE, __VA_ARGS__)
+#elif defined(__APPLE__) && __clang_major__ >= 14 // Xcode 14 marks sprintf as deprecated while still using C++98 by default
+#	define PUGI_IMPL_SNPRINTF(buf, fmt, arg1, arg2) snprintf(buf, sizeof(buf), fmt, arg1, arg2)
+#else
+#	define PUGI_IMPL_SNPRINTF sprintf
+#endif
+
+// We put implementation details into an anonymous namespace in source mode, but have to keep it in non-anonymous namespace in header-only mode to prevent binary bloat.
+#ifdef PUGIXML_HEADER_ONLY
+#	define PUGI_IMPL_NS_BEGIN namespace pugi { namespace impl {
+#	define PUGI_IMPL_NS_END } }
+#	define PUGI_IMPL_FN inline
+#	define PUGI_IMPL_FN_NO_INLINE inline
+#else
+#	if defined(_MSC_VER) && _MSC_VER < 1300 // MSVC6 seems to have an amusing bug with anonymous namespaces inside namespaces
+#		define PUGI_IMPL_NS_BEGIN namespace pugi { namespace impl {
+#		define PUGI_IMPL_NS_END } }
+#	else
+#		define PUGI_IMPL_NS_BEGIN namespace pugi { namespace impl { namespace {
+#		define PUGI_IMPL_NS_END } } }
+#	endif
+#	define PUGI_IMPL_FN
+#	define PUGI_IMPL_FN_NO_INLINE PUGI_IMPL_NO_INLINE
+#endif
+
+// uintptr_t
+#if (defined(_MSC_VER) && _MSC_VER < 1600) || (defined(__BORLANDC__) && __BORLANDC__ < 0x561)
+namespace pugi
+{
+#	ifndef _UINTPTR_T_DEFINED
+	typedef size_t uintptr_t;
+#	endif
+
+	typedef unsigned __int8 uint8_t;
+	typedef unsigned __int16 uint16_t;
+	typedef unsigned __int32 uint32_t;
+}
+#else
+#	include <stdint.h>
+#endif
+
+// Memory allocation
+PUGI_IMPL_NS_BEGIN
+	PUGI_IMPL_FN void* default_allocate(size_t size)
+	{
+		return malloc(size);
+	}
+
+	PUGI_IMPL_FN void default_deallocate(void* ptr)
+	{
+		free(ptr);
+	}
+
+	template <typename T>
+	struct xml_memory_management_function_storage
+	{
+		static allocation_function allocate;
+		static deallocation_function deallocate;
+	};
+
+	// Global allocation functions are stored in class statics so that in header mode linker deduplicates them
+	// Without a template<> we'll get multiple definitions of the same static
+	template <typename T> allocation_function xml_memory_management_function_storage<T>::allocate = default_allocate;
+	template <typename T> deallocation_function xml_memory_management_function_storage<T>::deallocate = default_deallocate;
+
+	typedef xml_memory_management_function_storage<int> xml_memory;
+PUGI_IMPL_NS_END
+
+// String utilities
+PUGI_IMPL_NS_BEGIN
+	// Get string length
+	PUGI_IMPL_FN size_t strlength(const char_t* s)
+	{
+		assert(s);
+
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcslen(s);
+	#else
+		return strlen(s);
+	#endif
+	}
+
+	// Compare two strings
+	PUGI_IMPL_FN bool strequal(const char_t* src, const char_t* dst)
+	{
+		assert(src && dst);
+
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcscmp(src, dst) == 0;
+	#else
+		return strcmp(src, dst) == 0;
+	#endif
+	}
+
+	// Compare lhs with [rhs_begin, rhs_end)
+	PUGI_IMPL_FN bool strequalrange(const char_t* lhs, const char_t* rhs, size_t count)
+	{
+		for (size_t i = 0; i < count; ++i)
+			if (lhs[i] != rhs[i])
+				return false;
+
+		return lhs[count] == 0;
+	}
+
+	// Get length of wide string, even if CRT lacks wide character support
+	PUGI_IMPL_FN size_t strlength_wide(const wchar_t* s)
+	{
+		assert(s);
+
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcslen(s);
+	#else
+		const wchar_t* end = s;
+		while (*end) end++;
+		return static_cast<size_t>(end - s);
+	#endif
+	}
+PUGI_IMPL_NS_END
+
+// auto_ptr-like object for exception recovery
+PUGI_IMPL_NS_BEGIN
+	template <typename T> struct auto_deleter
+	{
+		typedef void (*D)(T*);
+
+		T* data;
+		D deleter;
+
+		auto_deleter(T* data_, D deleter_): data(data_), deleter(deleter_)
+		{
+		}
+
+		~auto_deleter()
+		{
+			if (data) deleter(data);
+		}
+
+		T* release()
+		{
+			T* result = data;
+			data = 0;
+			return result;
+		}
+	};
+PUGI_IMPL_NS_END
+
+#ifdef PUGIXML_COMPACT
+PUGI_IMPL_NS_BEGIN
+	class compact_hash_table
+	{
+	public:
+		compact_hash_table(): _items(0), _capacity(0), _count(0)
+		{
+		}
+
+		void clear()
+		{
+			if (_items)
+			{
+				xml_memory::deallocate(_items);
+				_items = 0;
+				_capacity = 0;
+				_count = 0;
+			}
+		}
+
+		void* find(const void* key)
+		{
+			if (_capacity == 0) return 0;
+
+			item_t* item = get_item(key);
+			assert(item);
+			assert(item->key == key || (item->key == 0 && item->value == 0));
+
+			return item->value;
+		}
+
+		void insert(const void* key, void* value)
+		{
+			assert(_capacity != 0 && _count < _capacity - _capacity / 4);
+
+			item_t* item = get_item(key);
+			assert(item);
+
+			if (item->key == 0)
+			{
+				_count++;
+				item->key = key;
+			}
+
+			item->value = value;
+		}
+
+		bool reserve(size_t extra = 16)
+		{
+			if (_count + extra >= _capacity - _capacity / 4)
+				return rehash(_count + extra);
+
+			return true;
+		}
+
+	private:
+		struct item_t
+		{
+			const void* key;
+			void* value;
+		};
+
+		item_t* _items;
+		size_t _capacity;
+
+		size_t _count;
+
+		bool rehash(size_t count);
+
+		item_t* get_item(const void* key)
+		{
+			assert(key);
+			assert(_capacity > 0);
+
+			size_t hashmod = _capacity - 1;
+			size_t bucket = hash(key) & hashmod;
+
+			for (size_t probe = 0; probe <= hashmod; ++probe)
+			{
+				item_t& probe_item = _items[bucket];
+
+				if (probe_item.key == key || probe_item.key == 0)
+					return &probe_item;
+
+				// hash collision, quadratic probing
+				bucket = (bucket + probe + 1) & hashmod;
+			}
+
+			assert(false && "Hash table is full"); // unreachable
+			return 0;
+		}
+
+		static PUGI_IMPL_UNSIGNED_OVERFLOW unsigned int hash(const void* key)
+		{
+			unsigned int h = static_cast<unsigned int>(reinterpret_cast<uintptr_t>(key) & 0xffffffff);
+
+			// MurmurHash3 32-bit finalizer
+			h ^= h >> 16;
+			h *= 0x85ebca6bu;
+			h ^= h >> 13;
+			h *= 0xc2b2ae35u;
+			h ^= h >> 16;
+
+			return h;
+		}
+	};
+
+	PUGI_IMPL_FN_NO_INLINE bool compact_hash_table::rehash(size_t count)
+	{
+		size_t capacity = 32;
+		while (count >= capacity - capacity / 4)
+			capacity *= 2;
+
+		compact_hash_table rt;
+		rt._capacity = capacity;
+		rt._items = static_cast<item_t*>(xml_memory::allocate(sizeof(item_t) * capacity));
+
+		if (!rt._items)
+			return false;
+
+		memset(rt._items, 0, sizeof(item_t) * capacity);
+
+		for (size_t i = 0; i < _capacity; ++i)
+			if (_items[i].key)
+				rt.insert(_items[i].key, _items[i].value);
+
+		if (_items)
+			xml_memory::deallocate(_items);
+
+		_capacity = capacity;
+		_items = rt._items;
+
+		assert(_count == rt._count);
+
+		return true;
+	}
+
+PUGI_IMPL_NS_END
+#endif
+
+PUGI_IMPL_NS_BEGIN
+#ifdef PUGIXML_COMPACT
+	static const uintptr_t xml_memory_block_alignment = 4;
+#else
+	static const uintptr_t xml_memory_block_alignment = sizeof(void*);
+#endif
+
+	// extra metadata bits
+	static const uintptr_t xml_memory_page_contents_shared_mask = 64;
+	static const uintptr_t xml_memory_page_name_allocated_mask = 32;
+	static const uintptr_t xml_memory_page_value_allocated_mask = 16;
+	static const uintptr_t xml_memory_page_type_mask = 15;
+
+	// combined masks for string uniqueness
+	static const uintptr_t xml_memory_page_name_allocated_or_shared_mask = xml_memory_page_name_allocated_mask | xml_memory_page_contents_shared_mask;
+	static const uintptr_t xml_memory_page_value_allocated_or_shared_mask = xml_memory_page_value_allocated_mask | xml_memory_page_contents_shared_mask;
+
+#ifdef PUGIXML_COMPACT
+	#define PUGI_IMPL_GETHEADER_IMPL(object, page, flags) // unused
+	#define PUGI_IMPL_GETPAGE_IMPL(header) (header).get_page()
+#else
+	#define PUGI_IMPL_GETHEADER_IMPL(object, page, flags) (((reinterpret_cast<char*>(object) - reinterpret_cast<char*>(page)) << 8) | (flags))
+	// this macro casts pointers through void* to avoid 'cast increases required alignment of target type' warnings
+	#define PUGI_IMPL_GETPAGE_IMPL(header) static_cast<impl::xml_memory_page*>(const_cast<void*>(static_cast<const void*>(reinterpret_cast<const char*>(&header) - (header >> 8))))
+#endif
+
+	#define PUGI_IMPL_GETPAGE(n) PUGI_IMPL_GETPAGE_IMPL((n)->header)
+	#define PUGI_IMPL_NODETYPE(n) static_cast<xml_node_type>((n)->header & impl::xml_memory_page_type_mask)
+
+	struct xml_allocator;
+
+	struct xml_memory_page
+	{
+		static xml_memory_page* construct(void* memory)
+		{
+			xml_memory_page* result = static_cast<xml_memory_page*>(memory);
+
+			result->allocator = 0;
+			result->prev = 0;
+			result->next = 0;
+			result->busy_size = 0;
+			result->freed_size = 0;
+
+		#ifdef PUGIXML_COMPACT
+			result->compact_string_base = 0;
+			result->compact_shared_parent = 0;
+			result->compact_page_marker = 0;
+		#endif
+
+			return result;
+		}
+
+		xml_allocator* allocator;
+
+		xml_memory_page* prev;
+		xml_memory_page* next;
+
+		size_t busy_size;
+		size_t freed_size;
+
+	#ifdef PUGIXML_COMPACT
+		char_t* compact_string_base;
+		void* compact_shared_parent;
+		uint32_t* compact_page_marker;
+	#endif
+	};
+
+	static const size_t xml_memory_page_size =
+	#ifdef PUGIXML_MEMORY_PAGE_SIZE
+		(PUGIXML_MEMORY_PAGE_SIZE)
+	#else
+		32768
+	#endif
+		- sizeof(xml_memory_page);
+
+	struct xml_memory_string_header
+	{
+		uint16_t page_offset; // offset from page->data
+		uint16_t full_size; // 0 if string occupies whole page
+	};
+
+	struct xml_allocator
+	{
+		xml_allocator(xml_memory_page* root): _root(root), _busy_size(root->busy_size)
+		{
+		#ifdef PUGIXML_COMPACT
+			_hash = 0;
+		#endif
+		}
+
+		xml_memory_page* allocate_page(size_t data_size)
+		{
+			size_t size = sizeof(xml_memory_page) + data_size;
+
+			// allocate block with some alignment, leaving memory for worst-case padding
+			void* memory = xml_memory::allocate(size);
+			if (!memory) return 0;
+
+			// prepare page structure
+			xml_memory_page* page = xml_memory_page::construct(memory);
+			assert(page);
+
+			assert(this == _root->allocator);
+			page->allocator = this;
+
+			return page;
+		}
+
+		static void deallocate_page(xml_memory_page* page)
+		{
+			xml_memory::deallocate(page);
+		}
+
+		void* allocate_memory_oob(size_t size, xml_memory_page*& out_page);
+
+		void* allocate_memory(size_t size, xml_memory_page*& out_page)
+		{
+			if (PUGI_IMPL_UNLIKELY(_busy_size + size > xml_memory_page_size))
+				return allocate_memory_oob(size, out_page);
+
+			void* buf = reinterpret_cast<char*>(_root) + sizeof(xml_memory_page) + _busy_size;
+
+			_busy_size += size;
+
+			out_page = _root;
+
+			return buf;
+		}
+
+	#ifdef PUGIXML_COMPACT
+		void* allocate_object(size_t size, xml_memory_page*& out_page)
+		{
+			void* result = allocate_memory(size + sizeof(uint32_t), out_page);
+			if (!result) return 0;
+
+			// adjust for marker
+			ptrdiff_t offset = static_cast<char*>(result) - reinterpret_cast<char*>(out_page->compact_page_marker);
+
+			if (PUGI_IMPL_UNLIKELY(static_cast<uintptr_t>(offset) >= 256 * xml_memory_block_alignment))
+			{
+				// insert new marker
+				uint32_t* marker = static_cast<uint32_t*>(result);
+
+				*marker = static_cast<uint32_t>(reinterpret_cast<char*>(marker) - reinterpret_cast<char*>(out_page));
+				out_page->compact_page_marker = marker;
+
+				// since we don't reuse the page space until we reallocate it, we can just pretend that we freed the marker block
+				// this will make sure deallocate_memory correctly tracks the size
+				out_page->freed_size += sizeof(uint32_t);
+
+				return marker + 1;
+			}
+			else
+			{
+				// roll back uint32_t part
+				_busy_size -= sizeof(uint32_t);
+
+				return result;
+			}
+		}
+	#else
+		void* allocate_object(size_t size, xml_memory_page*& out_page)
+		{
+			return allocate_memory(size, out_page);
+		}
+	#endif
+
+		void deallocate_memory(void* ptr, size_t size, xml_memory_page* page)
+		{
+			if (page == _root) page->busy_size = _busy_size;
+
+			assert(ptr >= reinterpret_cast<char*>(page) + sizeof(xml_memory_page) && ptr < reinterpret_cast<char*>(page) + sizeof(xml_memory_page) + page->busy_size);
+			(void)!ptr;
+
+			page->freed_size += size;
+			assert(page->freed_size <= page->busy_size);
+
+			if (page->freed_size == page->busy_size)
+			{
+				if (page->next == 0)
+				{
+					assert(_root == page);
+
+					// top page freed, just reset sizes
+					page->busy_size = 0;
+					page->freed_size = 0;
+
+				#ifdef PUGIXML_COMPACT
+					// reset compact state to maximize efficiency
+					page->compact_string_base = 0;
+					page->compact_shared_parent = 0;
+					page->compact_page_marker = 0;
+				#endif
+
+					_busy_size = 0;
+				}
+				else
+				{
+					assert(_root != page);
+					assert(page->prev);
+
+					// remove from the list
+					page->prev->next = page->next;
+					page->next->prev = page->prev;
+
+					// deallocate
+					deallocate_page(page);
+				}
+			}
+		}
+
+		char_t* allocate_string(size_t length)
+		{
+			static const size_t max_encoded_offset = (1 << 16) * xml_memory_block_alignment;
+
+			PUGI_IMPL_STATIC_ASSERT(xml_memory_page_size <= max_encoded_offset);
+
+			// allocate memory for string and header block
+			size_t size = sizeof(xml_memory_string_header) + length * sizeof(char_t);
+
+			// round size up to block alignment boundary
+			size_t full_size = (size + (xml_memory_block_alignment - 1)) & ~(xml_memory_block_alignment - 1);
+
+			xml_memory_page* page;
+			xml_memory_string_header* header = static_cast<xml_memory_string_header*>(allocate_memory(full_size, page));
+
+			if (!header) return 0;
+
+			// setup header
+			ptrdiff_t page_offset = reinterpret_cast<char*>(header) - reinterpret_cast<char*>(page) - sizeof(xml_memory_page);
+
+			assert(page_offset % xml_memory_block_alignment == 0);
+			assert(page_offset >= 0 && static_cast<size_t>(page_offset) < max_encoded_offset);
+			header->page_offset = static_cast<uint16_t>(static_cast<size_t>(page_offset) / xml_memory_block_alignment);
+
+			// full_size == 0 for large strings that occupy the whole page
+			assert(full_size % xml_memory_block_alignment == 0);
+			assert(full_size < max_encoded_offset || (page->busy_size == full_size && page_offset == 0));
+			header->full_size = static_cast<uint16_t>(full_size < max_encoded_offset ? full_size / xml_memory_block_alignment : 0);
+
+			// round-trip through void* to avoid 'cast increases required alignment of target type' warning
+			// header is guaranteed a pointer-sized alignment, which should be enough for char_t
+			return static_cast<char_t*>(static_cast<void*>(header + 1));
+		}
+
+		void deallocate_string(char_t* string)
+		{
+			// this function casts pointers through void* to avoid 'cast increases required alignment of target type' warnings
+			// we're guaranteed the proper (pointer-sized) alignment on the input string if it was allocated via allocate_string
+
+			// get header
+			xml_memory_string_header* header = static_cast<xml_memory_string_header*>(static_cast<void*>(string)) - 1;
+			assert(header);
+
+			// deallocate
+			size_t page_offset = sizeof(xml_memory_page) + header->page_offset * xml_memory_block_alignment;
+			xml_memory_page* page = reinterpret_cast<xml_memory_page*>(static_cast<void*>(reinterpret_cast<char*>(header) - page_offset));
+
+			// if full_size == 0 then this string occupies the whole page
+			size_t full_size = header->full_size == 0 ? page->busy_size : header->full_size * xml_memory_block_alignment;
+
+			deallocate_memory(header, full_size, page);
+		}
+
+		bool reserve()
+		{
+		#ifdef PUGIXML_COMPACT
+			return _hash->reserve();
+		#else
+			return true;
+		#endif
+		}
+
+		xml_memory_page* _root;
+		size_t _busy_size;
+
+	#ifdef PUGIXML_COMPACT
+		compact_hash_table* _hash;
+	#endif
+	};
+
+	PUGI_IMPL_FN_NO_INLINE void* xml_allocator::allocate_memory_oob(size_t size, xml_memory_page*& out_page)
+	{
+		const size_t large_allocation_threshold = xml_memory_page_size / 4;
+
+		xml_memory_page* page = allocate_page(size <= large_allocation_threshold ? xml_memory_page_size : size);
+		out_page = page;
+
+		if (!page) return 0;
+
+		if (size <= large_allocation_threshold)
+		{
+			_root->busy_size = _busy_size;
+
+			// insert page at the end of linked list
+			page->prev = _root;
+			_root->next = page;
+			_root = page;
+
+			_busy_size = size;
+		}
+		else
+		{
+			// insert page before the end of linked list, so that it is deleted as soon as possible
+			// the last page is not deleted even if it's empty (see deallocate_memory)
+			assert(_root->prev);
+
+			page->prev = _root->prev;
+			page->next = _root;
+
+			_root->prev->next = page;
+			_root->prev = page;
+
+			page->busy_size = size;
+		}
+
+		return reinterpret_cast<char*>(page) + sizeof(xml_memory_page);
+	}
+PUGI_IMPL_NS_END
+
+#ifdef PUGIXML_COMPACT
+PUGI_IMPL_NS_BEGIN
+	static const uintptr_t compact_alignment_log2 = 2;
+	static const uintptr_t compact_alignment = 1 << compact_alignment_log2;
+
+	class compact_header
+	{
+	public:
+		compact_header(xml_memory_page* page, unsigned int flags)
+		{
+			PUGI_IMPL_STATIC_ASSERT(xml_memory_block_alignment == compact_alignment);
+
+			ptrdiff_t offset = (reinterpret_cast<char*>(this) - reinterpret_cast<char*>(page->compact_page_marker));
+			assert(offset % compact_alignment == 0 && static_cast<uintptr_t>(offset) < 256 * compact_alignment);
+
+			_page = static_cast<unsigned char>(offset >> compact_alignment_log2);
+			_flags = static_cast<unsigned char>(flags);
+		}
+
+		void operator&=(uintptr_t mod)
+		{
+			_flags &= static_cast<unsigned char>(mod);
+		}
+
+		void operator|=(uintptr_t mod)
+		{
+			_flags |= static_cast<unsigned char>(mod);
+		}
+
+		uintptr_t operator&(uintptr_t mod) const
+		{
+			return _flags & mod;
+		}
+
+		xml_memory_page* get_page() const
+		{
+			// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+			const char* page_marker = reinterpret_cast<const char*>(this) - (_page << compact_alignment_log2);
+			const char* page = page_marker - *reinterpret_cast<const uint32_t*>(static_cast<const void*>(page_marker));
+
+			return const_cast<xml_memory_page*>(reinterpret_cast<const xml_memory_page*>(static_cast<const void*>(page)));
+		}
+
+	private:
+		unsigned char _page;
+		unsigned char _flags;
+	};
+
+	PUGI_IMPL_FN xml_memory_page* compact_get_page(const void* object, int header_offset)
+	{
+		const compact_header* header = reinterpret_cast<const compact_header*>(static_cast<const char*>(object) - header_offset);
+
+		return header->get_page();
+	}
+
+	template <int header_offset, typename T> PUGI_IMPL_FN_NO_INLINE T* compact_get_value(const void* object)
+	{
+		return static_cast<T*>(compact_get_page(object, header_offset)->allocator->_hash->find(object));
+	}
+
+	template <int header_offset, typename T> PUGI_IMPL_FN_NO_INLINE void compact_set_value(const void* object, T* value)
+	{
+		compact_get_page(object, header_offset)->allocator->_hash->insert(object, value);
+	}
+
+	template <typename T, int header_offset, int start = -126> class compact_pointer
+	{
+	public:
+		compact_pointer(): _data(0)
+		{
+		}
+
+		void operator=(const compact_pointer& rhs)
+		{
+			*this = rhs + 0;
+		}
+
+		void operator=(T* value)
+		{
+			if (value)
+			{
+				// value is guaranteed to be compact-aligned; 'this' is not
+				// our decoding is based on 'this' aligned to compact alignment downwards (see operator T*)
+				// so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to
+				// compensate for arithmetic shift rounding for negative values
+				ptrdiff_t diff = reinterpret_cast<char*>(value) - reinterpret_cast<char*>(this);
+				ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) - start;
+
+				if (static_cast<uintptr_t>(offset) <= 253)
+					_data = static_cast<unsigned char>(offset + 1);
+				else
+				{
+					compact_set_value<header_offset>(this, value);
+
+					_data = 255;
+				}
+			}
+			else
+				_data = 0;
+		}
+
+		operator T*() const
+		{
+			if (_data)
+			{
+				if (_data < 255)
+				{
+					uintptr_t base = reinterpret_cast<uintptr_t>(this) & ~(compact_alignment - 1);
+
+					return reinterpret_cast<T*>(base + (_data - 1 + start) * compact_alignment);
+				}
+				else
+					return compact_get_value<header_offset, T>(this);
+			}
+			else
+				return 0;
+		}
+
+		T* operator->() const
+		{
+			return *this;
+		}
+
+	private:
+		unsigned char _data;
+	};
+
+	template <typename T, int header_offset> class compact_pointer_parent
+	{
+	public:
+		compact_pointer_parent(): _data(0)
+		{
+		}
+
+		void operator=(const compact_pointer_parent& rhs)
+		{
+			*this = rhs + 0;
+		}
+
+		void operator=(T* value)
+		{
+			if (value)
+			{
+				// value is guaranteed to be compact-aligned; 'this' is not
+				// our decoding is based on 'this' aligned to compact alignment downwards (see operator T*)
+				// so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to
+				// compensate for arithmetic shift behavior for negative values
+				ptrdiff_t diff = reinterpret_cast<char*>(value) - reinterpret_cast<char*>(this);
+				ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) + 65533;
+
+				if (static_cast<uintptr_t>(offset) <= 65533)
+				{
+					_data = static_cast<unsigned short>(offset + 1);
+				}
+				else
+				{
+					xml_memory_page* page = compact_get_page(this, header_offset);
+
+					if (PUGI_IMPL_UNLIKELY(page->compact_shared_parent == 0))
+						page->compact_shared_parent = value;
+
+					if (page->compact_shared_parent == value)
+					{
+						_data = 65534;
+					}
+					else
+					{
+						compact_set_value<header_offset>(this, value);
+
+						_data = 65535;
+					}
+				}
+			}
+			else
+			{
+				_data = 0;
+			}
+		}
+
+		operator T*() const
+		{
+			if (_data)
+			{
+				if (_data < 65534)
+				{
+					uintptr_t base = reinterpret_cast<uintptr_t>(this) & ~(compact_alignment - 1);
+
+					return reinterpret_cast<T*>(base + (_data - 1 - 65533) * compact_alignment);
+				}
+				else if (_data == 65534)
+					return static_cast<T*>(compact_get_page(this, header_offset)->compact_shared_parent);
+				else
+					return compact_get_value<header_offset, T>(this);
+			}
+			else
+				return 0;
+		}
+
+		T* operator->() const
+		{
+			return *this;
+		}
+
+	private:
+		uint16_t _data;
+	};
+
+	template <int header_offset, int base_offset> class compact_string
+	{
+	public:
+		compact_string(): _data(0)
+		{
+		}
+
+		void operator=(const compact_string& rhs)
+		{
+			*this = rhs + 0;
+		}
+
+		void operator=(char_t* value)
+		{
+			if (value)
+			{
+				xml_memory_page* page = compact_get_page(this, header_offset);
+
+				if (PUGI_IMPL_UNLIKELY(page->compact_string_base == 0))
+					page->compact_string_base = value;
+
+				ptrdiff_t offset = value - page->compact_string_base;
+
+				if (static_cast<uintptr_t>(offset) < (65535 << 7))
+				{
+					// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+					uint16_t* base = reinterpret_cast<uint16_t*>(static_cast<void*>(reinterpret_cast<char*>(this) - base_offset));
+
+					if (*base == 0)
+					{
+						*base = static_cast<uint16_t>((offset >> 7) + 1);
+						_data = static_cast<unsigned char>((offset & 127) + 1);
+					}
+					else
+					{
+						ptrdiff_t remainder = offset - ((*base - 1) << 7);
+
+						if (static_cast<uintptr_t>(remainder) <= 253)
+						{
+							_data = static_cast<unsigned char>(remainder + 1);
+						}
+						else
+						{
+							compact_set_value<header_offset>(this, value);
+
+							_data = 255;
+						}
+					}
+				}
+				else
+				{
+					compact_set_value<header_offset>(this, value);
+
+					_data = 255;
+				}
+			}
+			else
+			{
+				_data = 0;
+			}
+		}
+
+		operator char_t*() const
+		{
+			if (_data)
+			{
+				if (_data < 255)
+				{
+					xml_memory_page* page = compact_get_page(this, header_offset);
+
+					// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+					const uint16_t* base = reinterpret_cast<const uint16_t*>(static_cast<const void*>(reinterpret_cast<const char*>(this) - base_offset));
+					assert(*base);
+
+					ptrdiff_t offset = ((*base - 1) << 7) + (_data - 1);
+
+					return page->compact_string_base + offset;
+				}
+				else
+				{
+					return compact_get_value<header_offset, char_t>(this);
+				}
+			}
+			else
+				return 0;
+		}
+
+	private:
+		unsigned char _data;
+	};
+PUGI_IMPL_NS_END
+#endif
+
+#ifdef PUGIXML_COMPACT
+namespace pugi
+{
+	struct xml_attribute_struct
+	{
+		xml_attribute_struct(impl::xml_memory_page* page): header(page, 0), namevalue_base(0)
+		{
+			PUGI_IMPL_STATIC_ASSERT(sizeof(xml_attribute_struct) == 8);
+		}
+
+		impl::compact_header header;
+
+		uint16_t namevalue_base;
+
+		impl::compact_string<4, 2> name;
+		impl::compact_string<5, 3> value;
+
+		impl::compact_pointer<xml_attribute_struct, 6> prev_attribute_c;
+		impl::compact_pointer<xml_attribute_struct, 7, 0> next_attribute;
+	};
+
+	struct xml_node_struct
+	{
+		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): header(page, type), namevalue_base(0)
+		{
+			PUGI_IMPL_STATIC_ASSERT(sizeof(xml_node_struct) == 12);
+		}
+
+		impl::compact_header header;
+
+		uint16_t namevalue_base;
+
+		impl::compact_string<4, 2> name;
+		impl::compact_string<5, 3> value;
+
+		impl::compact_pointer_parent<xml_node_struct, 6> parent;
+
+		impl::compact_pointer<xml_node_struct, 8, 0> first_child;
+
+		impl::compact_pointer<xml_node_struct,  9>    prev_sibling_c;
+		impl::compact_pointer<xml_node_struct, 10, 0> next_sibling;
+
+		impl::compact_pointer<xml_attribute_struct, 11, 0> first_attribute;
+	};
+}
+#else
+namespace pugi
+{
+	struct xml_attribute_struct
+	{
+		xml_attribute_struct(impl::xml_memory_page* page): name(0), value(0), prev_attribute_c(0), next_attribute(0)
+		{
+			header = PUGI_IMPL_GETHEADER_IMPL(this, page, 0);
+		}
+
+		uintptr_t header;
+
+		char_t*	name;
+		char_t*	value;
+
+		xml_attribute_struct* prev_attribute_c;
+		xml_attribute_struct* next_attribute;
+	};
+
+	struct xml_node_struct
+	{
+		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): name(0), value(0), parent(0), first_child(0), prev_sibling_c(0), next_sibling(0), first_attribute(0)
+		{
+			header = PUGI_IMPL_GETHEADER_IMPL(this, page, type);
+		}
+
+		uintptr_t header;
+
+		char_t* name;
+		char_t* value;
+
+		xml_node_struct* parent;
+
+		xml_node_struct* first_child;
+
+		xml_node_struct* prev_sibling_c;
+		xml_node_struct* next_sibling;
+
+		xml_attribute_struct* first_attribute;
+	};
+}
+#endif
+
+PUGI_IMPL_NS_BEGIN
+	struct xml_extra_buffer
+	{
+		char_t* buffer;
+		xml_extra_buffer* next;
+	};
+
+	struct xml_document_struct: public xml_node_struct, public xml_allocator
+	{
+		xml_document_struct(xml_memory_page* page): xml_node_struct(page, node_document), xml_allocator(page), buffer(0), extra_buffers(0)
+		{
+		}
+
+		const char_t* buffer;
+
+		xml_extra_buffer* extra_buffers;
+
+	#ifdef PUGIXML_COMPACT
+		compact_hash_table hash;
+	#endif
+	};
+
+	template <typename Object> inline xml_allocator& get_allocator(const Object* object)
+	{
+		assert(object);
+
+		return *PUGI_IMPL_GETPAGE(object)->allocator;
+	}
+
+	template <typename Object> inline xml_document_struct& get_document(const Object* object)
+	{
+		assert(object);
+
+		return *static_cast<xml_document_struct*>(PUGI_IMPL_GETPAGE(object)->allocator);
+	}
+PUGI_IMPL_NS_END
+
+// Low-level DOM operations
+PUGI_IMPL_NS_BEGIN
+	inline xml_attribute_struct* allocate_attribute(xml_allocator& alloc)
+	{
+		xml_memory_page* page;
+		void* memory = alloc.allocate_object(sizeof(xml_attribute_struct), page);
+		if (!memory) return 0;
+
+		return new (memory) xml_attribute_struct(page);
+	}
+
+	inline xml_node_struct* allocate_node(xml_allocator& alloc, xml_node_type type)
+	{
+		xml_memory_page* page;
+		void* memory = alloc.allocate_object(sizeof(xml_node_struct), page);
+		if (!memory) return 0;
+
+		return new (memory) xml_node_struct(page, type);
+	}
+
+	inline void destroy_attribute(xml_attribute_struct* a, xml_allocator& alloc)
+	{
+		if (a->header & impl::xml_memory_page_name_allocated_mask)
+			alloc.deallocate_string(a->name);
+
+		if (a->header & impl::xml_memory_page_value_allocated_mask)
+			alloc.deallocate_string(a->value);
+
+		alloc.deallocate_memory(a, sizeof(xml_attribute_struct), PUGI_IMPL_GETPAGE(a));
+	}
+
+	inline void destroy_node(xml_node_struct* n, xml_allocator& alloc)
+	{
+		if (n->header & impl::xml_memory_page_name_allocated_mask)
+			alloc.deallocate_string(n->name);
+
+		if (n->header & impl::xml_memory_page_value_allocated_mask)
+			alloc.deallocate_string(n->value);
+
+		for (xml_attribute_struct* attr = n->first_attribute; attr; )
+		{
+			xml_attribute_struct* next = attr->next_attribute;
+
+			destroy_attribute(attr, alloc);
+
+			attr = next;
+		}
+
+		for (xml_node_struct* child = n->first_child; child; )
+		{
+			xml_node_struct* next = child->next_sibling;
+
+			destroy_node(child, alloc);
+
+			child = next;
+		}
+
+		alloc.deallocate_memory(n, sizeof(xml_node_struct), PUGI_IMPL_GETPAGE(n));
+	}
+
+	inline void append_node(xml_node_struct* child, xml_node_struct* node)
+	{
+		child->parent = node;
+
+		xml_node_struct* head = node->first_child;
+
+		if (head)
+		{
+			xml_node_struct* tail = head->prev_sibling_c;
+
+			tail->next_sibling = child;
+			child->prev_sibling_c = tail;
+			head->prev_sibling_c = child;
+		}
+		else
+		{
+			node->first_child = child;
+			child->prev_sibling_c = child;
+		}
+	}
+
+	inline void prepend_node(xml_node_struct* child, xml_node_struct* node)
+	{
+		child->parent = node;
+
+		xml_node_struct* head = node->first_child;
+
+		if (head)
+		{
+			child->prev_sibling_c = head->prev_sibling_c;
+			head->prev_sibling_c = child;
+		}
+		else
+			child->prev_sibling_c = child;
+
+		child->next_sibling = head;
+		node->first_child = child;
+	}
+
+	inline void insert_node_after(xml_node_struct* child, xml_node_struct* node)
+	{
+		xml_node_struct* parent = node->parent;
+
+		child->parent = parent;
+
+		xml_node_struct* next = node->next_sibling;
+
+		if (next)
+			next->prev_sibling_c = child;
+		else
+			parent->first_child->prev_sibling_c = child;
+
+		child->next_sibling = next;
+		child->prev_sibling_c = node;
+
+		node->next_sibling = child;
+	}
+
+	inline void insert_node_before(xml_node_struct* child, xml_node_struct* node)
+	{
+		xml_node_struct* parent = node->parent;
+
+		child->parent = parent;
+
+		xml_node_struct* prev = node->prev_sibling_c;
+
+		if (prev->next_sibling)
+			prev->next_sibling = child;
+		else
+			parent->first_child = child;
+
+		child->prev_sibling_c = prev;
+		child->next_sibling = node;
+
+		node->prev_sibling_c = child;
+	}
+
+	inline void remove_node(xml_node_struct* node)
+	{
+		xml_node_struct* parent = node->parent;
+
+		xml_node_struct* next = node->next_sibling;
+		xml_node_struct* prev = node->prev_sibling_c;
+
+		if (next)
+			next->prev_sibling_c = prev;
+		else
+			parent->first_child->prev_sibling_c = prev;
+
+		if (prev->next_sibling)
+			prev->next_sibling = next;
+		else
+			parent->first_child = next;
+
+		node->parent = 0;
+		node->prev_sibling_c = 0;
+		node->next_sibling = 0;
+	}
+
+	inline void append_attribute(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		xml_attribute_struct* head = node->first_attribute;
+
+		if (head)
+		{
+			xml_attribute_struct* tail = head->prev_attribute_c;
+
+			tail->next_attribute = attr;
+			attr->prev_attribute_c = tail;
+			head->prev_attribute_c = attr;
+		}
+		else
+		{
+			node->first_attribute = attr;
+			attr->prev_attribute_c = attr;
+		}
+	}
+
+	inline void prepend_attribute(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		xml_attribute_struct* head = node->first_attribute;
+
+		if (head)
+		{
+			attr->prev_attribute_c = head->prev_attribute_c;
+			head->prev_attribute_c = attr;
+		}
+		else
+			attr->prev_attribute_c = attr;
+
+		attr->next_attribute = head;
+		node->first_attribute = attr;
+	}
+
+	inline void insert_attribute_after(xml_attribute_struct* attr, xml_attribute_struct* place, xml_node_struct* node)
+	{
+		xml_attribute_struct* next = place->next_attribute;
+
+		if (next)
+			next->prev_attribute_c = attr;
+		else
+			node->first_attribute->prev_attribute_c = attr;
+
+		attr->next_attribute = next;
+		attr->prev_attribute_c = place;
+		place->next_attribute = attr;
+	}
+
+	inline void insert_attribute_before(xml_attribute_struct* attr, xml_attribute_struct* place, xml_node_struct* node)
+	{
+		xml_attribute_struct* prev = place->prev_attribute_c;
+
+		if (prev->next_attribute)
+			prev->next_attribute = attr;
+		else
+			node->first_attribute = attr;
+
+		attr->prev_attribute_c = prev;
+		attr->next_attribute = place;
+		place->prev_attribute_c = attr;
+	}
+
+	inline void remove_attribute(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		xml_attribute_struct* next = attr->next_attribute;
+		xml_attribute_struct* prev = attr->prev_attribute_c;
+
+		if (next)
+			next->prev_attribute_c = prev;
+		else
+			node->first_attribute->prev_attribute_c = prev;
+
+		if (prev->next_attribute)
+			prev->next_attribute = next;
+		else
+			node->first_attribute = next;
+
+		attr->prev_attribute_c = 0;
+		attr->next_attribute = 0;
+	}
+
+	PUGI_IMPL_FN_NO_INLINE xml_node_struct* append_new_node(xml_node_struct* node, xml_allocator& alloc, xml_node_type type = node_element)
+	{
+		if (!alloc.reserve()) return 0;
+
+		xml_node_struct* child = allocate_node(alloc, type);
+		if (!child) return 0;
+
+		append_node(child, node);
+
+		return child;
+	}
+
+	PUGI_IMPL_FN_NO_INLINE xml_attribute_struct* append_new_attribute(xml_node_struct* node, xml_allocator& alloc)
+	{
+		if (!alloc.reserve()) return 0;
+
+		xml_attribute_struct* attr = allocate_attribute(alloc);
+		if (!attr) return 0;
+
+		append_attribute(attr, node);
+
+		return attr;
+	}
+PUGI_IMPL_NS_END
+
+// Helper classes for code generation
+PUGI_IMPL_NS_BEGIN
+	struct opt_false
+	{
+		enum { value = 0 };
+	};
+
+	struct opt_true
+	{
+		enum { value = 1 };
+	};
+PUGI_IMPL_NS_END
+
+// Unicode utilities
+PUGI_IMPL_NS_BEGIN
+	inline uint16_t endian_swap(uint16_t value)
+	{
+		return static_cast<uint16_t>(((value & 0xff) << 8) | (value >> 8));
+	}
+
+	inline uint32_t endian_swap(uint32_t value)
+	{
+		return ((value & 0xff) << 24) | ((value & 0xff00) << 8) | ((value & 0xff0000) >> 8) | (value >> 24);
+	}
+
+	struct utf8_counter
+	{
+		typedef size_t value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			// U+0000..U+007F
+			if (ch < 0x80) return result + 1;
+			// U+0080..U+07FF
+			else if (ch < 0x800) return result + 2;
+			// U+0800..U+FFFF
+			else return result + 3;
+		}
+
+		static value_type high(value_type result, uint32_t)
+		{
+			// U+10000..U+10FFFF
+			return result + 4;
+		}
+	};
+
+	struct utf8_writer
+	{
+		typedef uint8_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			// U+0000..U+007F
+			if (ch < 0x80)
+			{
+				*result = static_cast<uint8_t>(ch);
+				return result + 1;
+			}
+			// U+0080..U+07FF
+			else if (ch < 0x800)
+			{
+				result[0] = static_cast<uint8_t>(0xC0 | (ch >> 6));
+				result[1] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
+				return result + 2;
+			}
+			// U+0800..U+FFFF
+			else
+			{
+				result[0] = static_cast<uint8_t>(0xE0 | (ch >> 12));
+				result[1] = static_cast<uint8_t>(0x80 | ((ch >> 6) & 0x3F));
+				result[2] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
+				return result + 3;
+			}
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			// U+10000..U+10FFFF
+			result[0] = static_cast<uint8_t>(0xF0 | (ch >> 18));
+			result[1] = static_cast<uint8_t>(0x80 | ((ch >> 12) & 0x3F));
+			result[2] = static_cast<uint8_t>(0x80 | ((ch >> 6) & 0x3F));
+			result[3] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
+			return result + 4;
+		}
+
+		static value_type any(value_type result, uint32_t ch)
+		{
+			return (ch < 0x10000) ? low(result, ch) : high(result, ch);
+		}
+	};
+
+	struct utf16_counter
+	{
+		typedef size_t value_type;
+
+		static value_type low(value_type result, uint32_t)
+		{
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t)
+		{
+			return result + 2;
+		}
+	};
+
+	struct utf16_writer
+	{
+		typedef uint16_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			*result = static_cast<uint16_t>(ch);
+
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			uint32_t msh = static_cast<uint32_t>(ch - 0x10000) >> 10;
+			uint32_t lsh = static_cast<uint32_t>(ch - 0x10000) & 0x3ff;
+
+			result[0] = static_cast<uint16_t>(0xD800 + msh);
+			result[1] = static_cast<uint16_t>(0xDC00 + lsh);
+
+			return result + 2;
+		}
+
+		static value_type any(value_type result, uint32_t ch)
+		{
+			return (ch < 0x10000) ? low(result, ch) : high(result, ch);
+		}
+	};
+
+	struct utf32_counter
+	{
+		typedef size_t value_type;
+
+		static value_type low(value_type result, uint32_t)
+		{
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t)
+		{
+			return result + 1;
+		}
+	};
+
+	struct utf32_writer
+	{
+		typedef uint32_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			*result = ch;
+
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			*result = ch;
+
+			return result + 1;
+		}
+
+		static value_type any(value_type result, uint32_t ch)
+		{
+			*result = ch;
+
+			return result + 1;
+		}
+	};
+
+	struct latin1_writer
+	{
+		typedef uint8_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			*result = static_cast<uint8_t>(ch > 255 ? '?' : ch);
+
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			(void)ch;
+
+			*result = '?';
+
+			return result + 1;
+		}
+	};
+
+	struct utf8_decoder
+	{
+		typedef uint8_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			const uint8_t utf8_byte_mask = 0x3f;
+
+			while (size)
+			{
+				uint8_t lead = *data;
+
+				// 0xxxxxxx -> U+0000..U+007F
+				if (lead < 0x80)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+
+					// process aligned single-byte (ascii) blocks
+					if ((reinterpret_cast<uintptr_t>(data) & 3) == 0)
+					{
+						// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+						while (size >= 4 && (*static_cast<const uint32_t*>(static_cast<const void*>(data)) & 0x80808080) == 0)
+						{
+							result = Traits::low(result, data[0]);
+							result = Traits::low(result, data[1]);
+							result = Traits::low(result, data[2]);
+							result = Traits::low(result, data[3]);
+							data += 4;
+							size -= 4;
+						}
+					}
+				}
+				// 110xxxxx -> U+0080..U+07FF
+				else if (static_cast<unsigned int>(lead - 0xC0) < 0x20 && size >= 2 && (data[1] & 0xc0) == 0x80)
+				{
+					result = Traits::low(result, ((lead & ~0xC0) << 6) | (data[1] & utf8_byte_mask));
+					data += 2;
+					size -= 2;
+				}
+				// 1110xxxx -> U+0800-U+FFFF
+				else if (static_cast<unsigned int>(lead - 0xE0) < 0x10 && size >= 3 && (data[1] & 0xc0) == 0x80 && (data[2] & 0xc0) == 0x80)
+				{
+					result = Traits::low(result, ((lead & ~0xE0) << 12) | ((data[1] & utf8_byte_mask) << 6) | (data[2] & utf8_byte_mask));
+					data += 3;
+					size -= 3;
+				}
+				// 11110xxx -> U+10000..U+10FFFF
+				else if (static_cast<unsigned int>(lead - 0xF0) < 0x08 && size >= 4 && (data[1] & 0xc0) == 0x80 && (data[2] & 0xc0) == 0x80 && (data[3] & 0xc0) == 0x80)
+				{
+					result = Traits::high(result, ((lead & ~0xF0) << 18) | ((data[1] & utf8_byte_mask) << 12) | ((data[2] & utf8_byte_mask) << 6) | (data[3] & utf8_byte_mask));
+					data += 4;
+					size -= 4;
+				}
+				// 10xxxxxx or 11111xxx -> invalid
+				else
+				{
+					data += 1;
+					size -= 1;
+				}
+			}
+
+			return result;
+		}
+	};
+
+	template <typename opt_swap> struct utf16_decoder
+	{
+		typedef uint16_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint16_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			while (size)
+			{
+				uint16_t lead = opt_swap::value ? endian_swap(*data) : *data;
+
+				// U+0000..U+D7FF
+				if (lead < 0xD800)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+				}
+				// U+E000..U+FFFF
+				else if (static_cast<unsigned int>(lead - 0xE000) < 0x2000)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+				}
+				// surrogate pair lead
+				else if (static_cast<unsigned int>(lead - 0xD800) < 0x400 && size >= 2)
+				{
+					uint16_t next = opt_swap::value ? endian_swap(data[1]) : data[1];
+
+					if (static_cast<unsigned int>(next - 0xDC00) < 0x400)
+					{
+						result = Traits::high(result, 0x10000 + ((lead & 0x3ff) << 10) + (next & 0x3ff));
+						data += 2;
+						size -= 2;
+					}
+					else
+					{
+						data += 1;
+						size -= 1;
+					}
+				}
+				else
+				{
+					data += 1;
+					size -= 1;
+				}
+			}
+
+			return result;
+		}
+	};
+
+	template <typename opt_swap> struct utf32_decoder
+	{
+		typedef uint32_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint32_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			while (size)
+			{
+				uint32_t lead = opt_swap::value ? endian_swap(*data) : *data;
+
+				// U+0000..U+FFFF
+				if (lead < 0x10000)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+				}
+				// U+10000..U+10FFFF
+				else
+				{
+					result = Traits::high(result, lead);
+					data += 1;
+					size -= 1;
+				}
+			}
+
+			return result;
+		}
+	};
+
+	struct latin1_decoder
+	{
+		typedef uint8_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			while (size)
+			{
+				result = Traits::low(result, *data);
+				data += 1;
+				size -= 1;
+			}
+
+			return result;
+		}
+	};
+
+	template <size_t size> struct wchar_selector;
+
+	template <> struct wchar_selector<2>
+	{
+		typedef uint16_t type;
+		typedef utf16_counter counter;
+		typedef utf16_writer writer;
+		typedef utf16_decoder<opt_false> decoder;
+	};
+
+	template <> struct wchar_selector<4>
+	{
+		typedef uint32_t type;
+		typedef utf32_counter counter;
+		typedef utf32_writer writer;
+		typedef utf32_decoder<opt_false> decoder;
+	};
+
+	typedef wchar_selector<sizeof(wchar_t)>::counter wchar_counter;
+	typedef wchar_selector<sizeof(wchar_t)>::writer wchar_writer;
+
+	struct wchar_decoder
+	{
+		typedef wchar_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const wchar_t* data, size_t size, typename Traits::value_type result, Traits traits)
+		{
+			typedef wchar_selector<sizeof(wchar_t)>::decoder decoder;
+
+			return decoder::process(reinterpret_cast<const typename decoder::type*>(data), size, result, traits);
+		}
+	};
+
+#ifdef PUGIXML_WCHAR_MODE
+	PUGI_IMPL_FN void convert_wchar_endian_swap(wchar_t* result, const wchar_t* data, size_t length)
+	{
+		for (size_t i = 0; i < length; ++i)
+			result[i] = static_cast<wchar_t>(endian_swap(static_cast<wchar_selector<sizeof(wchar_t)>::type>(data[i])));
+	}
+#endif
+PUGI_IMPL_NS_END
+
+PUGI_IMPL_NS_BEGIN
+	enum chartype_t
+	{
+		ct_parse_pcdata = 1,	// \0, &, \r, <
+		ct_parse_attr = 2,		// \0, &, \r, ', "
+		ct_parse_attr_ws = 4,	// \0, &, \r, ', ", \n, tab
+		ct_space = 8,			// \r, \n, space, tab
+		ct_parse_cdata = 16,	// \0, ], >, \r
+		ct_parse_comment = 32,	// \0, -, >, \r
+		ct_symbol = 64,			// Any symbol > 127, a-z, A-Z, 0-9, _, :, -, .
+		ct_start_symbol = 128	// Any symbol > 127, a-z, A-Z, _, :
+	};
+
+	static const unsigned char chartype_table[256] =
+	{
+		55,  0,   0,   0,   0,   0,   0,   0,      0,   12,  12,  0,   0,   63,  0,   0,   // 0-15
+		0,   0,   0,   0,   0,   0,   0,   0,      0,   0,   0,   0,   0,   0,   0,   0,   // 16-31
+		8,   0,   6,   0,   0,   0,   7,   6,      0,   0,   0,   0,   0,   96,  64,  0,   // 32-47
+		64,  64,  64,  64,  64,  64,  64,  64,     64,  64,  192, 0,   1,   0,   48,  0,   // 48-63
+		0,   192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 64-79
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 0,   0,   16,  0,   192, // 80-95
+		0,   192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 96-111
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 0, 0, 0, 0, 0,           // 112-127
+
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 128+
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192
+	};
+
+	enum chartypex_t
+	{
+		ctx_special_pcdata = 1,   // Any symbol >= 0 and < 32 (except \t, \r, \n), &, <, >
+		ctx_special_attr = 2,     // Any symbol >= 0 and < 32, &, <, ", '
+		ctx_start_symbol = 4,	  // Any symbol > 127, a-z, A-Z, _
+		ctx_digit = 8,			  // 0-9
+		ctx_symbol = 16			  // Any symbol > 127, a-z, A-Z, 0-9, _, -, .
+	};
+
+	static const unsigned char chartypex_table[256] =
+	{
+		3,  3,  3,  3,  3,  3,  3,  3,     3,  2,  2,  3,  3,  2,  3,  3,     // 0-15
+		3,  3,  3,  3,  3,  3,  3,  3,     3,  3,  3,  3,  3,  3,  3,  3,     // 16-31
+		0,  0,  2,  0,  0,  0,  3,  2,     0,  0,  0,  0,  0, 16, 16,  0,     // 32-47
+		24, 24, 24, 24, 24, 24, 24, 24,    24, 24, 0,  0,  3,  0,  1,  0,     // 48-63
+
+		0,  20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 64-79
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 0,  0,  0,  0,  20,    // 80-95
+		0,  20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 96-111
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 0,  0,  0,  0,  0,     // 112-127
+
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 128+
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20
+	};
+
+#ifdef PUGIXML_WCHAR_MODE
+	#define PUGI_IMPL_IS_CHARTYPE_IMPL(c, ct, table) ((static_cast<unsigned int>(c) < 128 ? table[static_cast<unsigned int>(c)] : table[128]) & (ct))
+#else
+	#define PUGI_IMPL_IS_CHARTYPE_IMPL(c, ct, table) (table[static_cast<unsigned char>(c)] & (ct))
+#endif
+
+	#define PUGI_IMPL_IS_CHARTYPE(c, ct) PUGI_IMPL_IS_CHARTYPE_IMPL(c, ct, chartype_table)
+	#define PUGI_IMPL_IS_CHARTYPEX(c, ct) PUGI_IMPL_IS_CHARTYPE_IMPL(c, ct, chartypex_table)
+
+	PUGI_IMPL_FN bool is_little_endian()
+	{
+		unsigned int ui = 1;
+
+		return *reinterpret_cast<unsigned char*>(&ui) == 1;
+	}
+
+	PUGI_IMPL_FN xml_encoding get_wchar_encoding()
+	{
+		PUGI_IMPL_STATIC_ASSERT(sizeof(wchar_t) == 2 || sizeof(wchar_t) == 4);
+
+		if (sizeof(wchar_t) == 2)
+			return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+		else
+			return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+	}
+
+	PUGI_IMPL_FN bool parse_declaration_encoding(const uint8_t* data, size_t size, const uint8_t*& out_encoding, size_t& out_length)
+	{
+	#define PUGI_IMPL_SCANCHAR(ch) { if (offset >= size || data[offset] != ch) return false; offset++; }
+	#define PUGI_IMPL_SCANCHARTYPE(ct) { while (offset < size && PUGI_IMPL_IS_CHARTYPE(data[offset], ct)) offset++; }
+
+		// check if we have a non-empty XML declaration
+		if (size < 6 || !((data[0] == '<') & (data[1] == '?') & (data[2] == 'x') & (data[3] == 'm') & (data[4] == 'l') && PUGI_IMPL_IS_CHARTYPE(data[5], ct_space)))
+			return false;
+
+		// scan XML declaration until the encoding field
+		for (size_t i = 6; i + 1 < size; ++i)
+		{
+			// declaration can not contain ? in quoted values
+			if (data[i] == '?')
+				return false;
+
+			if (data[i] == 'e' && data[i + 1] == 'n')
+			{
+				size_t offset = i;
+
+				// encoding follows the version field which can't contain 'en' so this has to be the encoding if XML is well formed
+				PUGI_IMPL_SCANCHAR('e'); PUGI_IMPL_SCANCHAR('n'); PUGI_IMPL_SCANCHAR('c'); PUGI_IMPL_SCANCHAR('o');
+				PUGI_IMPL_SCANCHAR('d'); PUGI_IMPL_SCANCHAR('i'); PUGI_IMPL_SCANCHAR('n'); PUGI_IMPL_SCANCHAR('g');
+
+				// S? = S?
+				PUGI_IMPL_SCANCHARTYPE(ct_space);
+				PUGI_IMPL_SCANCHAR('=');
+				PUGI_IMPL_SCANCHARTYPE(ct_space);
+
+				// the only two valid delimiters are ' and "
+				uint8_t delimiter = (offset < size && data[offset] == '"') ? '"' : '\'';
+
+				PUGI_IMPL_SCANCHAR(delimiter);
+
+				size_t start = offset;
+
+				out_encoding = data + offset;
+
+				PUGI_IMPL_SCANCHARTYPE(ct_symbol);
+
+				out_length = offset - start;
+
+				PUGI_IMPL_SCANCHAR(delimiter);
+
+				return true;
+			}
+		}
+
+		return false;
+
+	#undef PUGI_IMPL_SCANCHAR
+	#undef PUGI_IMPL_SCANCHARTYPE
+	}
+
+	PUGI_IMPL_FN xml_encoding guess_buffer_encoding(const uint8_t* data, size_t size)
+	{
+		// skip encoding autodetection if input buffer is too small
+		if (size < 4) return encoding_utf8;
+
+		uint8_t d0 = data[0], d1 = data[1], d2 = data[2], d3 = data[3];
+
+		// look for BOM in first few bytes
+		if (d0 == 0 && d1 == 0 && d2 == 0xfe && d3 == 0xff) return encoding_utf32_be;
+		if (d0 == 0xff && d1 == 0xfe && d2 == 0 && d3 == 0) return encoding_utf32_le;
+		if (d0 == 0xfe && d1 == 0xff) return encoding_utf16_be;
+		if (d0 == 0xff && d1 == 0xfe) return encoding_utf16_le;
+		if (d0 == 0xef && d1 == 0xbb && d2 == 0xbf) return encoding_utf8;
+
+		// look for <, <? or <?xm in various encodings
+		if (d0 == 0 && d1 == 0 && d2 == 0 && d3 == 0x3c) return encoding_utf32_be;
+		if (d0 == 0x3c && d1 == 0 && d2 == 0 && d3 == 0) return encoding_utf32_le;
+		if (d0 == 0 && d1 == 0x3c && d2 == 0 && d3 == 0x3f) return encoding_utf16_be;
+		if (d0 == 0x3c && d1 == 0 && d2 == 0x3f && d3 == 0) return encoding_utf16_le;
+
+		// look for utf16 < followed by node name (this may fail, but is better than utf8 since it's zero terminated so early)
+		if (d0 == 0 && d1 == 0x3c) return encoding_utf16_be;
+		if (d0 == 0x3c && d1 == 0) return encoding_utf16_le;
+
+		// no known BOM detected; parse declaration
+		const uint8_t* enc = 0;
+		size_t enc_length = 0;
+
+		if (d0 == 0x3c && d1 == 0x3f && d2 == 0x78 && d3 == 0x6d && parse_declaration_encoding(data, size, enc, enc_length))
+		{
+			// iso-8859-1 (case-insensitive)
+			if (enc_length == 10
+				&& (enc[0] | ' ') == 'i' && (enc[1] | ' ') == 's' && (enc[2] | ' ') == 'o'
+				&& enc[3] == '-' && enc[4] == '8' && enc[5] == '8' && enc[6] == '5' && enc[7] == '9'
+				&& enc[8] == '-' && enc[9] == '1')
+				return encoding_latin1;
+
+			// latin1 (case-insensitive)
+			if (enc_length == 6
+				&& (enc[0] | ' ') == 'l' && (enc[1] | ' ') == 'a' && (enc[2] | ' ') == 't'
+				&& (enc[3] | ' ') == 'i' && (enc[4] | ' ') == 'n'
+				&& enc[5] == '1')
+				return encoding_latin1;
+		}
+
+		return encoding_utf8;
+	}
+
+	PUGI_IMPL_FN xml_encoding get_buffer_encoding(xml_encoding encoding, const void* contents, size_t size)
+	{
+		// replace wchar encoding with utf implementation
+		if (encoding == encoding_wchar) return get_wchar_encoding();
+
+		// replace utf16 encoding with utf16 with specific endianness
+		if (encoding == encoding_utf16) return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+		// replace utf32 encoding with utf32 with specific endianness
+		if (encoding == encoding_utf32) return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+		// only do autodetection if no explicit encoding is requested
+		if (encoding != encoding_auto) return encoding;
+
+		// try to guess encoding (based on XML specification, Appendix F.1)
+		const uint8_t* data = static_cast<const uint8_t*>(contents);
+
+		return guess_buffer_encoding(data, size);
+	}
+
+	PUGI_IMPL_FN bool get_mutable_buffer(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	{
+		size_t length = size / sizeof(char_t);
+
+		if (is_mutable)
+		{
+			out_buffer = static_cast<char_t*>(const_cast<void*>(contents));
+			out_length = length;
+		}
+		else
+		{
+			char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!buffer) return false;
+
+			if (contents)
+				memcpy(buffer, contents, length * sizeof(char_t));
+			else
+				assert(length == 0);
+
+			buffer[length] = 0;
+
+			out_buffer = buffer;
+			out_length = length + 1;
+		}
+
+		return true;
+	}
+
+#ifdef PUGIXML_WCHAR_MODE
+	PUGI_IMPL_FN bool need_endian_swap_utf(xml_encoding le, xml_encoding re)
+	{
+		return (le == encoding_utf16_be && re == encoding_utf16_le) || (le == encoding_utf16_le && re == encoding_utf16_be) ||
+			   (le == encoding_utf32_be && re == encoding_utf32_le) || (le == encoding_utf32_le && re == encoding_utf32_be);
+	}
+
+	PUGI_IMPL_FN bool convert_buffer_endian_swap(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	{
+		const char_t* data = static_cast<const char_t*>(contents);
+		size_t length = size / sizeof(char_t);
+
+		if (is_mutable)
+		{
+			char_t* buffer = const_cast<char_t*>(data);
+
+			convert_wchar_endian_swap(buffer, data, length);
+
+			out_buffer = buffer;
+			out_length = length;
+		}
+		else
+		{
+			char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!buffer) return false;
+
+			convert_wchar_endian_swap(buffer, data, length);
+			buffer[length] = 0;
+
+			out_buffer = buffer;
+			out_length = length + 1;
+		}
+
+		return true;
+	}
+
+	template <typename D> PUGI_IMPL_FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
+	{
+		const typename D::type* data = static_cast<const typename D::type*>(contents);
+		size_t data_length = size / sizeof(typename D::type);
+
+		// first pass: get length in wchar_t units
+		size_t length = D::process(data, data_length, 0, wchar_counter());
+
+		// allocate buffer of suitable length
+		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+		if (!buffer) return false;
+
+		// second pass: convert utf16 input to wchar_t
+		wchar_writer::value_type obegin = reinterpret_cast<wchar_writer::value_type>(buffer);
+		wchar_writer::value_type oend = D::process(data, data_length, obegin, wchar_writer());
+
+		assert(oend == obegin + length);
+		*oend = 0;
+
+		out_buffer = buffer;
+		out_length = length + 1;
+
+		return true;
+	}
+
+	PUGI_IMPL_FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
+	{
+		// get native encoding
+		xml_encoding wchar_encoding = get_wchar_encoding();
+
+		// fast path: no conversion required
+		if (encoding == wchar_encoding)
+			return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
+
+		// only endian-swapping is required
+		if (need_endian_swap_utf(encoding, wchar_encoding))
+			return convert_buffer_endian_swap(out_buffer, out_length, contents, size, is_mutable);
+
+		// source encoding is utf8
+		if (encoding == encoding_utf8)
+			return convert_buffer_generic(out_buffer, out_length, contents, size, utf8_decoder());
+
+		// source encoding is utf16
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_true>());
+		}
+
+		// source encoding is utf32
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_true>());
+		}
+
+		// source encoding is latin1
+		if (encoding == encoding_latin1)
+			return convert_buffer_generic(out_buffer, out_length, contents, size, latin1_decoder());
+
+		assert(false && "Invalid encoding"); // unreachable
+		return false;
+	}
+#else
+	template <typename D> PUGI_IMPL_FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
+	{
+		const typename D::type* data = static_cast<const typename D::type*>(contents);
+		size_t data_length = size / sizeof(typename D::type);
+
+		// first pass: get length in utf8 units
+		size_t length = D::process(data, data_length, 0, utf8_counter());
+
+		// allocate buffer of suitable length
+		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+		if (!buffer) return false;
+
+		// second pass: convert utf16 input to utf8
+		uint8_t* obegin = reinterpret_cast<uint8_t*>(buffer);
+		uint8_t* oend = D::process(data, data_length, obegin, utf8_writer());
+
+		assert(oend == obegin + length);
+		*oend = 0;
+
+		out_buffer = buffer;
+		out_length = length + 1;
+
+		return true;
+	}
+
+	PUGI_IMPL_FN size_t get_latin1_7bit_prefix_length(const uint8_t* data, size_t size)
+	{
+		for (size_t i = 0; i < size; ++i)
+			if (data[i] > 127)
+				return i;
+
+		return size;
+	}
+
+	PUGI_IMPL_FN bool convert_buffer_latin1(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	{
+		const uint8_t* data = static_cast<const uint8_t*>(contents);
+		size_t data_length = size;
+
+		// get size of prefix that does not need utf8 conversion
+		size_t prefix_length = get_latin1_7bit_prefix_length(data, data_length);
+		assert(prefix_length <= data_length);
+
+		const uint8_t* postfix = data + prefix_length;
+		size_t postfix_length = data_length - prefix_length;
+
+		// if no conversion is needed, just return the original buffer
+		if (postfix_length == 0) return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
+
+		// first pass: get length in utf8 units
+		size_t length = prefix_length + latin1_decoder::process(postfix, postfix_length, 0, utf8_counter());
+
+		// allocate buffer of suitable length
+		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+		if (!buffer) return false;
+
+		// second pass: convert latin1 input to utf8
+		memcpy(buffer, data, prefix_length);
+
+		uint8_t* obegin = reinterpret_cast<uint8_t*>(buffer);
+		uint8_t* oend = latin1_decoder::process(postfix, postfix_length, obegin + prefix_length, utf8_writer());
+
+		assert(oend == obegin + length);
+		*oend = 0;
+
+		out_buffer = buffer;
+		out_length = length + 1;
+
+		return true;
+	}
+
+	PUGI_IMPL_FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
+	{
+		// fast path: no conversion required
+		if (encoding == encoding_utf8)
+			return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
+
+		// source encoding is utf16
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_true>());
+		}
+
+		// source encoding is utf32
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_true>());
+		}
+
+		// source encoding is latin1
+		if (encoding == encoding_latin1)
+			return convert_buffer_latin1(out_buffer, out_length, contents, size, is_mutable);
+
+		assert(false && "Invalid encoding"); // unreachable
+		return false;
+	}
+#endif
+
+	PUGI_IMPL_FN size_t as_utf8_begin(const wchar_t* str, size_t length)
+	{
+		// get length in utf8 characters
+		return wchar_decoder::process(str, length, 0, utf8_counter());
+	}
+
+	PUGI_IMPL_FN void as_utf8_end(char* buffer, size_t size, const wchar_t* str, size_t length)
+	{
+		// convert to utf8
+		uint8_t* begin = reinterpret_cast<uint8_t*>(buffer);
+		uint8_t* end = wchar_decoder::process(str, length, begin, utf8_writer());
+
+		assert(begin + size == end);
+		(void)!end;
+		(void)!size;
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI_IMPL_FN std::string as_utf8_impl(const wchar_t* str, size_t length)
+	{
+		// first pass: get length in utf8 characters
+		size_t size = as_utf8_begin(str, length);
+
+		// allocate resulting string
+		std::string result;
+		result.resize(size);
+
+		// second pass: convert to utf8
+		if (size > 0) as_utf8_end(&result[0], size, str, length);
+
+		return result;
+	}
+
+	PUGI_IMPL_FN std::basic_string<wchar_t> as_wide_impl(const char* str, size_t size)
+	{
+		const uint8_t* data = reinterpret_cast<const uint8_t*>(str);
+
+		// first pass: get length in wchar_t units
+		size_t length = utf8_decoder::process(data, size, 0, wchar_counter());
+
+		// allocate resulting string
+		std::basic_string<wchar_t> result;
+		result.resize(length);
+
+		// second pass: convert to wchar_t
+		if (length > 0)
+		{
+			wchar_writer::value_type begin = reinterpret_cast<wchar_writer::value_type>(&result[0]);
+			wchar_writer::value_type end = utf8_decoder::process(data, size, begin, wchar_writer());
+
+			assert(begin + length == end);
+			(void)!end;
+		}
+
+		return result;
+	}
+#endif
+
+	template <typename Header>
+	inline bool strcpy_insitu_allow(size_t length, const Header& header, uintptr_t header_mask, char_t* target)
+	{
+		// never reuse shared memory
+		if (header & xml_memory_page_contents_shared_mask) return false;
+
+		size_t target_length = strlength(target);
+
+		// always reuse document buffer memory if possible
+		if ((header & header_mask) == 0) return target_length >= length;
+
+		// reuse heap memory if waste is not too great
+		const size_t reuse_threshold = 32;
+
+		return target_length >= length && (target_length < reuse_threshold || target_length - length < target_length / 2);
+	}
+
+	template <typename String, typename Header>
+	PUGI_IMPL_FN bool strcpy_insitu(String& dest, Header& header, uintptr_t header_mask, const char_t* source, size_t source_length)
+	{
+		assert((header & header_mask) == 0 || dest); // header bit indicates whether dest was previously allocated
+
+		if (source_length == 0)
+		{
+			// empty string and null pointer are equivalent, so just deallocate old memory
+			xml_allocator* alloc = PUGI_IMPL_GETPAGE_IMPL(header)->allocator;
+
+			if (header & header_mask) alloc->deallocate_string(dest);
+
+			// mark the string as not allocated
+			dest = 0;
+			header &= ~header_mask;
+
+			return true;
+		}
+		else if (dest && strcpy_insitu_allow(source_length, header, header_mask, dest))
+		{
+			// we can reuse old buffer, so just copy the new data (including zero terminator)
+			memcpy(dest, source, source_length * sizeof(char_t));
+			dest[source_length] = 0;
+
+			return true;
+		}
+		else
+		{
+			xml_allocator* alloc = PUGI_IMPL_GETPAGE_IMPL(header)->allocator;
+
+			if (!alloc->reserve()) return false;
+
+			// allocate new buffer
+			char_t* buf = alloc->allocate_string(source_length + 1);
+			if (!buf) return false;
+
+			// copy the string (including zero terminator)
+			memcpy(buf, source, source_length * sizeof(char_t));
+			buf[source_length] = 0;
+
+			// deallocate old buffer (*after* the above to protect against overlapping memory and/or allocation failures)
+			if (header & header_mask) alloc->deallocate_string(dest);
+
+			// the string is now allocated, so set the flag
+			dest = buf;
+			header |= header_mask;
+
+			return true;
+		}
+	}
+
+	struct gap
+	{
+		char_t* end;
+		size_t size;
+
+		gap(): end(0), size(0)
+		{
+		}
+
+		// Push new gap, move s count bytes further (skipping the gap).
+		// Collapse previous gap.
+		void push(char_t*& s, size_t count)
+		{
+			if (end) // there was a gap already; collapse it
+			{
+				// Move [old_gap_end, new_gap_start) to [old_gap_start, ...)
+				assert(s >= end);
+				memmove(end - size, end, reinterpret_cast<char*>(s) - reinterpret_cast<char*>(end));
+			}
+
+			s += count; // end of current gap
+
+			// "merge" two gaps
+			end = s;
+			size += count;
+		}
+
+		// Collapse all gaps, return past-the-end pointer
+		char_t* flush(char_t* s)
+		{
+			if (end)
+			{
+				// Move [old_gap_end, current_pos) to [old_gap_start, ...)
+				assert(s >= end);
+				memmove(end - size, end, reinterpret_cast<char*>(s) - reinterpret_cast<char*>(end));
+
+				return s - size;
+			}
+			else return s;
+		}
+	};
+
+	PUGI_IMPL_FN char_t* strconv_escape(char_t* s, gap& g)
+	{
+		char_t* stre = s + 1;
+
+		switch (*stre)
+		{
+			case '#':	// &#...
+			{
+				unsigned int ucsc = 0;
+
+				if (stre[1] == 'x') // &#x... (hex code)
+				{
+					stre += 2;
+
+					char_t ch = *stre;
+
+					if (ch == ';') return stre;
+
+					for (;;)
+					{
+						if (static_cast<unsigned int>(ch - '0') <= 9)
+							ucsc = 16 * ucsc + (ch - '0');
+						else if (static_cast<unsigned int>((ch | ' ') - 'a') <= 5)
+							ucsc = 16 * ucsc + ((ch | ' ') - 'a' + 10);
+						else if (ch == ';')
+							break;
+						else // cancel
+							return stre;
+
+						ch = *++stre;
+					}
+
+					++stre;
+				}
+				else	// &#... (dec code)
+				{
+					char_t ch = *++stre;
+
+					if (ch == ';') return stre;
+
+					for (;;)
+					{
+						if (static_cast<unsigned int>(ch - '0') <= 9)
+							ucsc = 10 * ucsc + (ch - '0');
+						else if (ch == ';')
+							break;
+						else // cancel
+							return stre;
+
+						ch = *++stre;
+					}
+
+					++stre;
+				}
+
+			#ifdef PUGIXML_WCHAR_MODE
+				s = reinterpret_cast<char_t*>(wchar_writer::any(reinterpret_cast<wchar_writer::value_type>(s), ucsc));
+			#else
+				s = reinterpret_cast<char_t*>(utf8_writer::any(reinterpret_cast<uint8_t*>(s), ucsc));
+			#endif
+
+				g.push(s, stre - s);
+				return stre;
+			}
+
+			case 'a':	// &a
+			{
+				++stre;
+
+				if (*stre == 'm') // &am
+				{
+					if (*++stre == 'p' && *++stre == ';') // &amp;
+					{
+						*s++ = '&';
+						++stre;
+
+						g.push(s, stre - s);
+						return stre;
+					}
+				}
+				else if (*stre == 'p') // &ap
+				{
+					if (*++stre == 'o' && *++stre == 's' && *++stre == ';') // &apos;
+					{
+						*s++ = '\'';
+						++stre;
+
+						g.push(s, stre - s);
+						return stre;
+					}
+				}
+				break;
+			}
+
+			case 'g': // &g
+			{
+				if (*++stre == 't' && *++stre == ';') // &gt;
+				{
+					*s++ = '>';
+					++stre;
+
+					g.push(s, stre - s);
+					return stre;
+				}
+				break;
+			}
+
+			case 'l': // &l
+			{
+				if (*++stre == 't' && *++stre == ';') // &lt;
+				{
+					*s++ = '<';
+					++stre;
+
+					g.push(s, stre - s);
+					return stre;
+				}
+				break;
+			}
+
+			case 'q': // &q
+			{
+				if (*++stre == 'u' && *++stre == 'o' && *++stre == 't' && *++stre == ';') // &quot;
+				{
+					*s++ = '"';
+					++stre;
+
+					g.push(s, stre - s);
+					return stre;
+				}
+				break;
+			}
+
+			default:
+				break;
+		}
+
+		return stre;
+	}
+
+	// Parser utilities
+	#define PUGI_IMPL_ENDSWITH(c, e)        ((c) == (e) || ((c) == 0 && endch == (e)))
+	#define PUGI_IMPL_SKIPWS()              { while (PUGI_IMPL_IS_CHARTYPE(*s, ct_space)) ++s; }
+	#define PUGI_IMPL_OPTSET(OPT)           ( optmsk & (OPT) )
+	#define PUGI_IMPL_PUSHNODE(TYPE)        { cursor = append_new_node(cursor, *alloc, TYPE); if (!cursor) PUGI_IMPL_THROW_ERROR(status_out_of_memory, s); }
+	#define PUGI_IMPL_POPNODE()             { cursor = cursor->parent; }
+	#define PUGI_IMPL_SCANFOR(X)            { while (*s != 0 && !(X)) ++s; }
+	#define PUGI_IMPL_SCANWHILE(X)          { while (X) ++s; }
+	#define PUGI_IMPL_SCANWHILE_UNROLL(X)   { for (;;) { char_t ss = s[0]; if (PUGI_IMPL_UNLIKELY(!(X))) { break; } ss = s[1]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 1; break; } ss = s[2]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 2; break; } ss = s[3]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 3; break; } s += 4; } }
+	#define PUGI_IMPL_ENDSEG()              { ch = *s; *s = 0; ++s; }
+	#define PUGI_IMPL_THROW_ERROR(err, m)   return error_offset = m, error_status = err, static_cast<char_t*>(0)
+	#define PUGI_IMPL_CHECK_ERROR(err, m)   { if (*s == 0) PUGI_IMPL_THROW_ERROR(err, m); }
+
+	PUGI_IMPL_FN char_t* strconv_comment(char_t* s, char_t endch)
+	{
+		gap g;
+
+		while (true)
+		{
+			PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_comment));
+
+			if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
+			{
+				*s++ = '\n'; // replace first one with 0x0a
+
+				if (*s == '\n') g.push(s, 1);
+			}
+			else if (s[0] == '-' && s[1] == '-' && PUGI_IMPL_ENDSWITH(s[2], '>')) // comment ends here
+			{
+				*g.flush(s) = 0;
+
+				return s + (s[2] == '>' ? 3 : 2);
+			}
+			else if (*s == 0)
+			{
+				return 0;
+			}
+			else ++s;
+		}
+	}
+
+	PUGI_IMPL_FN char_t* strconv_cdata(char_t* s, char_t endch)
+	{
+		gap g;
+
+		while (true)
+		{
+			PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_cdata));
+
+			if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
+			{
+				*s++ = '\n'; // replace first one with 0x0a
+
+				if (*s == '\n') g.push(s, 1);
+			}
+			else if (s[0] == ']' && s[1] == ']' && PUGI_IMPL_ENDSWITH(s[2], '>')) // CDATA ends here
+			{
+				*g.flush(s) = 0;
+
+				return s + 1;
+			}
+			else if (*s == 0)
+			{
+				return 0;
+			}
+			else ++s;
+		}
+	}
+
+	typedef char_t* (*strconv_pcdata_t)(char_t*);
+
+	template <typename opt_trim, typename opt_eol, typename opt_escape> struct strconv_pcdata_impl
+	{
+		static char_t* parse(char_t* s)
+		{
+			gap g;
+
+			char_t* begin = s;
+
+			while (true)
+			{
+				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_pcdata));
+
+				if (*s == '<') // PCDATA ends here
+				{
+					char_t* end = g.flush(s);
+
+					if (opt_trim::value)
+						while (end > begin && PUGI_IMPL_IS_CHARTYPE(end[-1], ct_space))
+							--end;
+
+					*end = 0;
+
+					return s + 1;
+				}
+				else if (opt_eol::value && *s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
+				{
+					*s++ = '\n'; // replace first one with 0x0a
+
+					if (*s == '\n') g.push(s, 1);
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (*s == 0)
+				{
+					char_t* end = g.flush(s);
+
+					if (opt_trim::value)
+						while (end > begin && PUGI_IMPL_IS_CHARTYPE(end[-1], ct_space))
+							--end;
+
+					*end = 0;
+
+					return s;
+				}
+				else ++s;
+			}
+		}
+	};
+
+	PUGI_IMPL_FN strconv_pcdata_t get_strconv_pcdata(unsigned int optmask)
+	{
+		PUGI_IMPL_STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_trim_pcdata == 0x0800);
+
+		switch (((optmask >> 4) & 3) | ((optmask >> 9) & 4)) // get bitmask for flags (trim eol escapes); this simultaneously checks 3 options from assertion above
+		{
+		case 0: return strconv_pcdata_impl<opt_false, opt_false, opt_false>::parse;
+		case 1: return strconv_pcdata_impl<opt_false, opt_false, opt_true>::parse;
+		case 2: return strconv_pcdata_impl<opt_false, opt_true, opt_false>::parse;
+		case 3: return strconv_pcdata_impl<opt_false, opt_true, opt_true>::parse;
+		case 4: return strconv_pcdata_impl<opt_true, opt_false, opt_false>::parse;
+		case 5: return strconv_pcdata_impl<opt_true, opt_false, opt_true>::parse;
+		case 6: return strconv_pcdata_impl<opt_true, opt_true, opt_false>::parse;
+		case 7: return strconv_pcdata_impl<opt_true, opt_true, opt_true>::parse;
+		default: assert(false); return 0; // unreachable
+		}
+	}
+
+	typedef char_t* (*strconv_attribute_t)(char_t*, char_t);
+
+	template <typename opt_escape> struct strconv_attribute_impl
+	{
+		static char_t* parse_wnorm(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			// trim leading whitespaces
+			if (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
+			{
+				char_t* str = s;
+
+				do ++str;
+				while (PUGI_IMPL_IS_CHARTYPE(*str, ct_space));
+
+				g.push(s, str - s);
+			}
+
+			while (true)
+			{
+				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_attr_ws | ct_space));
+
+				if (*s == end_quote)
+				{
+					char_t* str = g.flush(s);
+
+					do *str-- = 0;
+					while (PUGI_IMPL_IS_CHARTYPE(*str, ct_space));
+
+					return s + 1;
+				}
+				else if (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
+				{
+					*s++ = ' ';
+
+					if (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
+					{
+						char_t* str = s + 1;
+						while (PUGI_IMPL_IS_CHARTYPE(*str, ct_space)) ++str;
+
+						g.push(s, str - s);
+					}
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+
+		static char_t* parse_wconv(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			while (true)
+			{
+				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_attr_ws));
+
+				if (*s == end_quote)
+				{
+					*g.flush(s) = 0;
+
+					return s + 1;
+				}
+				else if (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
+				{
+					if (*s == '\r')
+					{
+						*s++ = ' ';
+
+						if (*s == '\n') g.push(s, 1);
+					}
+					else *s++ = ' ';
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+
+		static char_t* parse_eol(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			while (true)
+			{
+				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_attr));
+
+				if (*s == end_quote)
+				{
+					*g.flush(s) = 0;
+
+					return s + 1;
+				}
+				else if (*s == '\r')
+				{
+					*s++ = '\n';
+
+					if (*s == '\n') g.push(s, 1);
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+
+		static char_t* parse_simple(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			while (true)
+			{
+				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_attr));
+
+				if (*s == end_quote)
+				{
+					*g.flush(s) = 0;
+
+					return s + 1;
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+	};
+
+	PUGI_IMPL_FN strconv_attribute_t get_strconv_attribute(unsigned int optmask)
+	{
+		PUGI_IMPL_STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_wconv_attribute == 0x40 && parse_wnorm_attribute == 0x80);
+
+		switch ((optmask >> 4) & 15) // get bitmask for flags (wnorm wconv eol escapes); this simultaneously checks 4 options from assertion above
+		{
+		case 0:  return strconv_attribute_impl<opt_false>::parse_simple;
+		case 1:  return strconv_attribute_impl<opt_true>::parse_simple;
+		case 2:  return strconv_attribute_impl<opt_false>::parse_eol;
+		case 3:  return strconv_attribute_impl<opt_true>::parse_eol;
+		case 4:  return strconv_attribute_impl<opt_false>::parse_wconv;
+		case 5:  return strconv_attribute_impl<opt_true>::parse_wconv;
+		case 6:  return strconv_attribute_impl<opt_false>::parse_wconv;
+		case 7:  return strconv_attribute_impl<opt_true>::parse_wconv;
+		case 8:  return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 9:  return strconv_attribute_impl<opt_true>::parse_wnorm;
+		case 10: return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 11: return strconv_attribute_impl<opt_true>::parse_wnorm;
+		case 12: return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 13: return strconv_attribute_impl<opt_true>::parse_wnorm;
+		case 14: return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 15: return strconv_attribute_impl<opt_true>::parse_wnorm;
+		default: assert(false); return 0; // unreachable
+		}
+	}
+
+	inline xml_parse_result make_parse_result(xml_parse_status status, ptrdiff_t offset = 0)
+	{
+		xml_parse_result result;
+		result.status = status;
+		result.offset = offset;
+
+		return result;
+	}
+
+	struct xml_parser
+	{
+		xml_allocator* alloc;
+		char_t* error_offset;
+		xml_parse_status error_status;
+
+		xml_parser(xml_allocator* alloc_): alloc(alloc_), error_offset(0), error_status(status_ok)
+		{
+		}
+
+		// DOCTYPE consists of nested sections of the following possible types:
+		// <!-- ... -->, <? ... ?>, "...", '...'
+		// <![...]]>
+		// <!...>
+		// First group can not contain nested groups
+		// Second group can contain nested groups of the same type
+		// Third group can contain all other groups
+		char_t* parse_doctype_primitive(char_t* s)
+		{
+			if (*s == '"' || *s == '\'')
+			{
+				// quoted string
+				char_t ch = *s++;
+				PUGI_IMPL_SCANFOR(*s == ch);
+				if (!*s) PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
+
+				s++;
+			}
+			else if (s[0] == '<' && s[1] == '?')
+			{
+				// <? ... ?>
+				s += 2;
+				PUGI_IMPL_SCANFOR(s[0] == '?' && s[1] == '>'); // no need for ENDSWITH because ?> can't terminate proper doctype
+				if (!*s) PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
+
+				s += 2;
+			}
+			else if (s[0] == '<' && s[1] == '!' && s[2] == '-' && s[3] == '-')
+			{
+				s += 4;
+				PUGI_IMPL_SCANFOR(s[0] == '-' && s[1] == '-' && s[2] == '>'); // no need for ENDSWITH because --> can't terminate proper doctype
+				if (!*s) PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
+
+				s += 3;
+			}
+			else PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
+
+			return s;
+		}
+
+		char_t* parse_doctype_ignore(char_t* s)
+		{
+			size_t depth = 0;
+
+			assert(s[0] == '<' && s[1] == '!' && s[2] == '[');
+			s += 3;
+
+			while (*s)
+			{
+				if (s[0] == '<' && s[1] == '!' && s[2] == '[')
+				{
+					// nested ignore section
+					s += 3;
+					depth++;
+				}
+				else if (s[0] == ']' && s[1] == ']' && s[2] == '>')
+				{
+					// ignore section end
+					s += 3;
+
+					if (depth == 0)
+						return s;
+
+					depth--;
+				}
+				else s++;
+			}
+
+			PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
+		}
+
+		char_t* parse_doctype_group(char_t* s, char_t endch)
+		{
+			size_t depth = 0;
+
+			assert((s[0] == '<' || s[0] == 0) && s[1] == '!');
+			s += 2;
+
+			while (*s)
+			{
+				if (s[0] == '<' && s[1] == '!' && s[2] != '-')
+				{
+					if (s[2] == '[')
+					{
+						// ignore
+						s = parse_doctype_ignore(s);
+						if (!s) return s;
+					}
+					else
+					{
+						// some control group
+						s += 2;
+						depth++;
+					}
+				}
+				else if (s[0] == '<' || s[0] == '"' || s[0] == '\'')
+				{
+					// unknown tag (forbidden), or some primitive group
+					s = parse_doctype_primitive(s);
+					if (!s) return s;
+				}
+				else if (*s == '>')
+				{
+					if (depth == 0)
+						return s;
+
+					depth--;
+					s++;
+				}
+				else s++;
+			}
+
+			if (depth != 0 || endch != '>') PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
+
+			return s;
+		}
+
+		char_t* parse_exclamation(char_t* s, xml_node_struct* cursor, unsigned int optmsk, char_t endch)
+		{
+			// parse node contents, starting with exclamation mark
+			++s;
+
+			if (*s == '-') // '<!-...'
+			{
+				++s;
+
+				if (*s == '-') // '<!--...'
+				{
+					++s;
+
+					if (PUGI_IMPL_OPTSET(parse_comments))
+					{
+						PUGI_IMPL_PUSHNODE(node_comment); // Append a new node on the tree.
+						cursor->value = s; // Save the offset.
+					}
+
+					if (PUGI_IMPL_OPTSET(parse_eol) && PUGI_IMPL_OPTSET(parse_comments))
+					{
+						s = strconv_comment(s, endch);
+
+						if (!s) PUGI_IMPL_THROW_ERROR(status_bad_comment, cursor->value);
+					}
+					else
+					{
+						// Scan for terminating '-->'.
+						PUGI_IMPL_SCANFOR(s[0] == '-' && s[1] == '-' && PUGI_IMPL_ENDSWITH(s[2], '>'));
+						PUGI_IMPL_CHECK_ERROR(status_bad_comment, s);
+
+						if (PUGI_IMPL_OPTSET(parse_comments))
+							*s = 0; // Zero-terminate this segment at the first terminating '-'.
+
+						s += (s[2] == '>' ? 3 : 2); // Step over the '\0->'.
+					}
+				}
+				else PUGI_IMPL_THROW_ERROR(status_bad_comment, s);
+			}
+			else if (*s == '[')
+			{
+				// '<![CDATA[...'
+				if (*++s=='C' && *++s=='D' && *++s=='A' && *++s=='T' && *++s=='A' && *++s == '[')
+				{
+					++s;
+
+					if (PUGI_IMPL_OPTSET(parse_cdata))
+					{
+						PUGI_IMPL_PUSHNODE(node_cdata); // Append a new node on the tree.
+						cursor->value = s; // Save the offset.
+
+						if (PUGI_IMPL_OPTSET(parse_eol))
+						{
+							s = strconv_cdata(s, endch);
+
+							if (!s) PUGI_IMPL_THROW_ERROR(status_bad_cdata, cursor->value);
+						}
+						else
+						{
+							// Scan for terminating ']]>'.
+							PUGI_IMPL_SCANFOR(s[0] == ']' && s[1] == ']' && PUGI_IMPL_ENDSWITH(s[2], '>'));
+							PUGI_IMPL_CHECK_ERROR(status_bad_cdata, s);
+
+							*s++ = 0; // Zero-terminate this segment.
+						}
+					}
+					else // Flagged for discard, but we still have to scan for the terminator.
+					{
+						// Scan for terminating ']]>'.
+						PUGI_IMPL_SCANFOR(s[0] == ']' && s[1] == ']' && PUGI_IMPL_ENDSWITH(s[2], '>'));
+						PUGI_IMPL_CHECK_ERROR(status_bad_cdata, s);
+
+						++s;
+					}
+
+					s += (s[1] == '>' ? 2 : 1); // Step over the last ']>'.
+				}
+				else PUGI_IMPL_THROW_ERROR(status_bad_cdata, s);
+			}
+			else if (s[0] == 'D' && s[1] == 'O' && s[2] == 'C' && s[3] == 'T' && s[4] == 'Y' && s[5] == 'P' && PUGI_IMPL_ENDSWITH(s[6], 'E'))
+			{
+				s -= 2;
+
+				if (cursor->parent) PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
+
+				char_t* mark = s + 9;
+
+				s = parse_doctype_group(s, endch);
+				if (!s) return s;
+
+				assert((*s == 0 && endch == '>') || *s == '>');
+				if (*s) *s++ = 0;
+
+				if (PUGI_IMPL_OPTSET(parse_doctype))
+				{
+					while (PUGI_IMPL_IS_CHARTYPE(*mark, ct_space)) ++mark;
+
+					PUGI_IMPL_PUSHNODE(node_doctype);
+
+					cursor->value = mark;
+				}
+			}
+			else if (*s == 0 && endch == '-') PUGI_IMPL_THROW_ERROR(status_bad_comment, s);
+			else if (*s == 0 && endch == '[') PUGI_IMPL_THROW_ERROR(status_bad_cdata, s);
+			else PUGI_IMPL_THROW_ERROR(status_unrecognized_tag, s);
+
+			return s;
+		}
+
+		char_t* parse_question(char_t* s, xml_node_struct*& ref_cursor, unsigned int optmsk, char_t endch)
+		{
+			// load into registers
+			xml_node_struct* cursor = ref_cursor;
+			char_t ch = 0;
+
+			// parse node contents, starting with question mark
+			++s;
+
+			// read PI target
+			char_t* target = s;
+
+			if (!PUGI_IMPL_IS_CHARTYPE(*s, ct_start_symbol)) PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
+
+			PUGI_IMPL_SCANWHILE(PUGI_IMPL_IS_CHARTYPE(*s, ct_symbol));
+			PUGI_IMPL_CHECK_ERROR(status_bad_pi, s);
+
+			// determine node type; stricmp / strcasecmp is not portable
+			bool declaration = (target[0] | ' ') == 'x' && (target[1] | ' ') == 'm' && (target[2] | ' ') == 'l' && target + 3 == s;
+
+			if (declaration ? PUGI_IMPL_OPTSET(parse_declaration) : PUGI_IMPL_OPTSET(parse_pi))
+			{
+				if (declaration)
+				{
+					// disallow non top-level declarations
+					if (cursor->parent) PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
+
+					PUGI_IMPL_PUSHNODE(node_declaration);
+				}
+				else
+				{
+					PUGI_IMPL_PUSHNODE(node_pi);
+				}
+
+				cursor->name = target;
+
+				PUGI_IMPL_ENDSEG();
+
+				// parse value/attributes
+				if (ch == '?')
+				{
+					// empty node
+					if (!PUGI_IMPL_ENDSWITH(*s, '>')) PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
+					s += (*s == '>');
+
+					PUGI_IMPL_POPNODE();
+				}
+				else if (PUGI_IMPL_IS_CHARTYPE(ch, ct_space))
+				{
+					PUGI_IMPL_SKIPWS();
+
+					// scan for tag end
+					char_t* value = s;
+
+					PUGI_IMPL_SCANFOR(s[0] == '?' && PUGI_IMPL_ENDSWITH(s[1], '>'));
+					PUGI_IMPL_CHECK_ERROR(status_bad_pi, s);
+
+					if (declaration)
+					{
+						// replace ending ? with / so that 'element' terminates properly
+						*s = '/';
+
+						// we exit from this function with cursor at node_declaration, which is a signal to parse() to go to LOC_ATTRIBUTES
+						s = value;
+					}
+					else
+					{
+						// store value and step over >
+						cursor->value = value;
+
+						PUGI_IMPL_POPNODE();
+
+						PUGI_IMPL_ENDSEG();
+
+						s += (*s == '>');
+					}
+				}
+				else PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
+			}
+			else
+			{
+				// scan for tag end
+				PUGI_IMPL_SCANFOR(s[0] == '?' && PUGI_IMPL_ENDSWITH(s[1], '>'));
+				PUGI_IMPL_CHECK_ERROR(status_bad_pi, s);
+
+				s += (s[1] == '>' ? 2 : 1);
+			}
+
+			// store from registers
+			ref_cursor = cursor;
+
+			return s;
+		}
+
+		char_t* parse_tree(char_t* s, xml_node_struct* root, unsigned int optmsk, char_t endch)
+		{
+			strconv_attribute_t strconv_attribute = get_strconv_attribute(optmsk);
+			strconv_pcdata_t strconv_pcdata = get_strconv_pcdata(optmsk);
+
+			char_t ch = 0;
+			xml_node_struct* cursor = root;
+			char_t* mark = s;
+			char_t* merged_pcdata = s;
+
+			while (*s != 0)
+			{
+				if (*s == '<')
+				{
+					++s;
+
+				LOC_TAG:
+					if (PUGI_IMPL_IS_CHARTYPE(*s, ct_start_symbol)) // '<#...'
+					{
+						PUGI_IMPL_PUSHNODE(node_element); // Append a new node to the tree.
+
+						cursor->name = s;
+
+						PUGI_IMPL_SCANWHILE_UNROLL(PUGI_IMPL_IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
+						PUGI_IMPL_ENDSEG(); // Save char in 'ch', terminate & step over.
+
+						if (ch == '>')
+						{
+							// end of tag
+						}
+						else if (PUGI_IMPL_IS_CHARTYPE(ch, ct_space))
+						{
+						LOC_ATTRIBUTES:
+							while (true)
+							{
+								PUGI_IMPL_SKIPWS(); // Eat any whitespace.
+
+								if (PUGI_IMPL_IS_CHARTYPE(*s, ct_start_symbol)) // <... #...
+								{
+									xml_attribute_struct* a = append_new_attribute(cursor, *alloc); // Make space for this attribute.
+									if (!a) PUGI_IMPL_THROW_ERROR(status_out_of_memory, s);
+
+									a->name = s; // Save the offset.
+
+									PUGI_IMPL_SCANWHILE_UNROLL(PUGI_IMPL_IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
+									PUGI_IMPL_ENDSEG(); // Save char in 'ch', terminate & step over.
+
+									if (PUGI_IMPL_IS_CHARTYPE(ch, ct_space))
+									{
+										PUGI_IMPL_SKIPWS(); // Eat any whitespace.
+
+										ch = *s;
+										++s;
+									}
+
+									if (ch == '=') // '<... #=...'
+									{
+										PUGI_IMPL_SKIPWS(); // Eat any whitespace.
+
+										if (*s == '"' || *s == '\'') // '<... #="...'
+										{
+											ch = *s; // Save quote char to avoid breaking on "''" -or- '""'.
+											++s; // Step over the quote.
+											a->value = s; // Save the offset.
+
+											s = strconv_attribute(s, ch);
+
+											if (!s) PUGI_IMPL_THROW_ERROR(status_bad_attribute, a->value);
+
+											// After this line the loop continues from the start;
+											// Whitespaces, / and > are ok, symbols and EOF are wrong,
+											// everything else will be detected
+											if (PUGI_IMPL_IS_CHARTYPE(*s, ct_start_symbol)) PUGI_IMPL_THROW_ERROR(status_bad_attribute, s);
+										}
+										else PUGI_IMPL_THROW_ERROR(status_bad_attribute, s);
+									}
+									else PUGI_IMPL_THROW_ERROR(status_bad_attribute, s);
+								}
+								else if (*s == '/')
+								{
+									++s;
+
+									if (*s == '>')
+									{
+										PUGI_IMPL_POPNODE();
+										s++;
+										break;
+									}
+									else if (*s == 0 && endch == '>')
+									{
+										PUGI_IMPL_POPNODE();
+										break;
+									}
+									else PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
+								}
+								else if (*s == '>')
+								{
+									++s;
+
+									break;
+								}
+								else if (*s == 0 && endch == '>')
+								{
+									break;
+								}
+								else PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
+							}
+
+							// !!!
+						}
+						else if (ch == '/') // '<#.../'
+						{
+							if (!PUGI_IMPL_ENDSWITH(*s, '>')) PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
+
+							PUGI_IMPL_POPNODE(); // Pop.
+
+							s += (*s == '>');
+						}
+						else if (ch == 0)
+						{
+							// we stepped over null terminator, backtrack & handle closing tag
+							--s;
+
+							if (endch != '>') PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
+						}
+						else PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
+					}
+					else if (*s == '/')
+					{
+						++s;
+
+						mark = s;
+
+						char_t* name = cursor->name;
+						if (!name) PUGI_IMPL_THROW_ERROR(status_end_element_mismatch, mark);
+
+						while (PUGI_IMPL_IS_CHARTYPE(*s, ct_symbol))
+						{
+							if (*s++ != *name++) PUGI_IMPL_THROW_ERROR(status_end_element_mismatch, mark);
+						}
+
+						if (*name)
+						{
+							if (*s == 0 && name[0] == endch && name[1] == 0) PUGI_IMPL_THROW_ERROR(status_bad_end_element, s);
+							else PUGI_IMPL_THROW_ERROR(status_end_element_mismatch, mark);
+						}
+
+						PUGI_IMPL_POPNODE(); // Pop.
+
+						PUGI_IMPL_SKIPWS();
+
+						if (*s == 0)
+						{
+							if (endch != '>') PUGI_IMPL_THROW_ERROR(status_bad_end_element, s);
+						}
+						else
+						{
+							if (*s != '>') PUGI_IMPL_THROW_ERROR(status_bad_end_element, s);
+							++s;
+						}
+					}
+					else if (*s == '?') // '<?...'
+					{
+						s = parse_question(s, cursor, optmsk, endch);
+						if (!s) return s;
+
+						assert(cursor);
+						if (PUGI_IMPL_NODETYPE(cursor) == node_declaration) goto LOC_ATTRIBUTES;
+					}
+					else if (*s == '!') // '<!...'
+					{
+						s = parse_exclamation(s, cursor, optmsk, endch);
+						if (!s) return s;
+					}
+					else if (*s == 0 && endch == '?') PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
+					else PUGI_IMPL_THROW_ERROR(status_unrecognized_tag, s);
+				}
+				else
+				{
+					mark = s; // Save this offset while searching for a terminator.
+
+					PUGI_IMPL_SKIPWS(); // Eat whitespace if no genuine PCDATA here.
+
+					if (*s == '<' || !*s)
+					{
+						// We skipped some whitespace characters because otherwise we would take the tag branch instead of PCDATA one
+						assert(mark != s);
+
+						if (!PUGI_IMPL_OPTSET(parse_ws_pcdata | parse_ws_pcdata_single) || PUGI_IMPL_OPTSET(parse_trim_pcdata))
+						{
+							continue;
+						}
+						else if (PUGI_IMPL_OPTSET(parse_ws_pcdata_single))
+						{
+							if (s[0] != '<' || s[1] != '/' || cursor->first_child) continue;
+						}
+					}
+
+					if (!PUGI_IMPL_OPTSET(parse_trim_pcdata))
+						s = mark;
+
+					if (cursor->parent || PUGI_IMPL_OPTSET(parse_fragment))
+					{
+						char_t* parsed_pcdata = s;
+
+						s = strconv_pcdata(s);
+
+						if (PUGI_IMPL_OPTSET(parse_embed_pcdata) && cursor->parent && !cursor->first_child && !cursor->value)
+						{
+							cursor->value = parsed_pcdata; // Save the offset.
+						}
+						else if (PUGI_IMPL_OPTSET(parse_merge_pcdata) && cursor->first_child && PUGI_IMPL_NODETYPE(cursor->first_child->prev_sibling_c) == node_pcdata)
+						{
+							assert(merged_pcdata >= cursor->first_child->prev_sibling_c->value);
+
+							// Catch up to the end of last parsed value; only needed for the first fragment.
+							merged_pcdata += strlength(merged_pcdata);
+
+							size_t length = strlength(parsed_pcdata);
+
+							// Must use memmove instead of memcpy as this move may overlap
+							memmove(merged_pcdata, parsed_pcdata, (length + 1) * sizeof(char_t));
+							merged_pcdata += length;
+						}
+						else
+						{
+							xml_node_struct* prev_cursor = cursor;
+							PUGI_IMPL_PUSHNODE(node_pcdata); // Append a new node on the tree.
+
+							cursor->value = parsed_pcdata; // Save the offset.
+							merged_pcdata = parsed_pcdata; // Used for parse_merge_pcdata above, cheaper to save unconditionally
+
+							cursor = prev_cursor; // Pop since this is a standalone.
+						}
+
+						if (!*s) break;
+					}
+					else
+					{
+						PUGI_IMPL_SCANFOR(*s == '<'); // '...<'
+						if (!*s) break;
+
+						++s;
+					}
+
+					// We're after '<'
+					goto LOC_TAG;
+				}
+			}
+
+			// check that last tag is closed
+			if (cursor != root) PUGI_IMPL_THROW_ERROR(status_end_element_mismatch, s);
+
+			return s;
+		}
+
+	#ifdef PUGIXML_WCHAR_MODE
+		static char_t* parse_skip_bom(char_t* s)
+		{
+			unsigned int bom = 0xfeff;
+			return (s[0] == static_cast<wchar_t>(bom)) ? s + 1 : s;
+		}
+	#else
+		static char_t* parse_skip_bom(char_t* s)
+		{
+			return (s[0] == '\xef' && s[1] == '\xbb' && s[2] == '\xbf') ? s + 3 : s;
+		}
+	#endif
+
+		static bool has_element_node_siblings(xml_node_struct* node)
+		{
+			while (node)
+			{
+				if (PUGI_IMPL_NODETYPE(node) == node_element) return true;
+
+				node = node->next_sibling;
+			}
+
+			return false;
+		}
+
+		static xml_parse_result parse(char_t* buffer, size_t length, xml_document_struct* xmldoc, xml_node_struct* root, unsigned int optmsk)
+		{
+			// early-out for empty documents
+			if (length == 0)
+				return make_parse_result(PUGI_IMPL_OPTSET(parse_fragment) ? status_ok : status_no_document_element);
+
+			// get last child of the root before parsing
+			xml_node_struct* last_root_child = root->first_child ? root->first_child->prev_sibling_c + 0 : 0;
+
+			// create parser on stack
+			xml_parser parser(static_cast<xml_allocator*>(xmldoc));
+
+			// save last character and make buffer zero-terminated (speeds up parsing)
+			char_t endch = buffer[length - 1];
+			buffer[length - 1] = 0;
+
+			// skip BOM to make sure it does not end up as part of parse output
+			char_t* buffer_data = parse_skip_bom(buffer);
+
+			// perform actual parsing
+			parser.parse_tree(buffer_data, root, optmsk, endch);
+
+			xml_parse_result result = make_parse_result(parser.error_status, parser.error_offset ? parser.error_offset - buffer : 0);
+			assert(result.offset >= 0 && static_cast<size_t>(result.offset) <= length);
+
+			if (result)
+			{
+				// since we removed last character, we have to handle the only possible false positive (stray <)
+				if (endch == '<')
+					return make_parse_result(status_unrecognized_tag, length - 1);
+
+				// check if there are any element nodes parsed
+				xml_node_struct* first_root_child_parsed = last_root_child ? last_root_child->next_sibling + 0 : root->first_child + 0;
+
+				if (!PUGI_IMPL_OPTSET(parse_fragment) && !has_element_node_siblings(first_root_child_parsed))
+					return make_parse_result(status_no_document_element, length - 1);
+			}
+			else
+			{
+				// roll back offset if it occurs on a null terminator in the source buffer
+				if (result.offset > 0 && static_cast<size_t>(result.offset) == length - 1 && endch == 0)
+					result.offset--;
+			}
+
+			return result;
+		}
+	};
+
+	// Output facilities
+	PUGI_IMPL_FN xml_encoding get_write_native_encoding()
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return get_wchar_encoding();
+	#else
+		return encoding_utf8;
+	#endif
+	}
+
+	PUGI_IMPL_FN xml_encoding get_write_encoding(xml_encoding encoding)
+	{
+		// replace wchar encoding with utf implementation
+		if (encoding == encoding_wchar) return get_wchar_encoding();
+
+		// replace utf16 encoding with utf16 with specific endianness
+		if (encoding == encoding_utf16) return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+		// replace utf32 encoding with utf32 with specific endianness
+		if (encoding == encoding_utf32) return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+		// only do autodetection if no explicit encoding is requested
+		if (encoding != encoding_auto) return encoding;
+
+		// assume utf8 encoding
+		return encoding_utf8;
+	}
+
+	template <typename D, typename T> PUGI_IMPL_FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T)
+	{
+		PUGI_IMPL_STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
+
+		typename T::value_type end = D::process(reinterpret_cast<const typename D::type*>(data), length, dest, T());
+
+		return static_cast<size_t>(end - dest) * sizeof(*dest);
+	}
+
+	template <typename D, typename T> PUGI_IMPL_FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T, bool opt_swap)
+	{
+		PUGI_IMPL_STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
+
+		typename T::value_type end = D::process(reinterpret_cast<const typename D::type*>(data), length, dest, T());
+
+		if (opt_swap)
+		{
+			for (typename T::value_type i = dest; i != end; ++i)
+				*i = endian_swap(*i);
+		}
+
+		return static_cast<size_t>(end - dest) * sizeof(*dest);
+	}
+
+#ifdef PUGIXML_WCHAR_MODE
+	PUGI_IMPL_FN size_t get_valid_length(const char_t* data, size_t length)
+	{
+		if (length < 1) return 0;
+
+		// discard last character if it's the lead of a surrogate pair
+		return (sizeof(wchar_t) == 2 && static_cast<unsigned int>(static_cast<uint16_t>(data[length - 1]) - 0xD800) < 0x400) ? length - 1 : length;
+	}
+
+	PUGI_IMPL_FN size_t convert_buffer_output(char_t* r_char, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
+	{
+		// only endian-swapping is required
+		if (need_endian_swap_utf(encoding, get_wchar_encoding()))
+		{
+			convert_wchar_endian_swap(r_char, data, length);
+
+			return length * sizeof(char_t);
+		}
+
+		// convert to utf8
+		if (encoding == encoding_utf8)
+			return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), utf8_writer());
+
+		// convert to utf16
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return convert_buffer_output_generic(r_u16, data, length, wchar_decoder(), utf16_writer(), native_encoding != encoding);
+		}
+
+		// convert to utf32
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return convert_buffer_output_generic(r_u32, data, length, wchar_decoder(), utf32_writer(), native_encoding != encoding);
+		}
+
+		// convert to latin1
+		if (encoding == encoding_latin1)
+			return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), latin1_writer());
+
+		assert(false && "Invalid encoding"); // unreachable
+		return 0;
+	}
+#else
+	PUGI_IMPL_FN size_t get_valid_length(const char_t* data, size_t length)
+	{
+		if (length < 5) return 0;
+
+		for (size_t i = 1; i <= 4; ++i)
+		{
+			uint8_t ch = static_cast<uint8_t>(data[length - i]);
+
+			// either a standalone character or a leading one
+			if ((ch & 0xc0) != 0x80) return length - i;
+		}
+
+		// there are four non-leading characters at the end, sequence tail is broken so might as well process the whole chunk
+		return length;
+	}
+
+	PUGI_IMPL_FN size_t convert_buffer_output(char_t* /* r_char */, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
+	{
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return convert_buffer_output_generic(r_u16, data, length, utf8_decoder(), utf16_writer(), native_encoding != encoding);
+		}
+
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return convert_buffer_output_generic(r_u32, data, length, utf8_decoder(), utf32_writer(), native_encoding != encoding);
+		}
+
+		if (encoding == encoding_latin1)
+			return convert_buffer_output_generic(r_u8, data, length, utf8_decoder(), latin1_writer());
+
+		assert(false && "Invalid encoding"); // unreachable
+		return 0;
+	}
+#endif
+
+	class xml_buffered_writer
+	{
+		xml_buffered_writer(const xml_buffered_writer&);
+		xml_buffered_writer& operator=(const xml_buffered_writer&);
+
+	public:
+		xml_buffered_writer(xml_writer& writer_, xml_encoding user_encoding): writer(writer_), bufsize(0), encoding(get_write_encoding(user_encoding))
+		{
+			PUGI_IMPL_STATIC_ASSERT(bufcapacity >= 8);
+		}
+
+		size_t flush()
+		{
+			flush(buffer, bufsize);
+			bufsize = 0;
+			return 0;
+		}
+
+		void flush(const char_t* data, size_t size)
+		{
+			if (size == 0) return;
+
+			// fast path, just write data
+			if (encoding == get_write_native_encoding())
+				writer.write(data, size * sizeof(char_t));
+			else
+			{
+				// convert chunk
+				size_t result = convert_buffer_output(scratch.data_char, scratch.data_u8, scratch.data_u16, scratch.data_u32, data, size, encoding);
+				assert(result <= sizeof(scratch));
+
+				// write data
+				writer.write(scratch.data_u8, result);
+			}
+		}
+
+		void write_direct(const char_t* data, size_t length)
+		{
+			// flush the remaining buffer contents
+			flush();
+
+			// handle large chunks
+			if (length > bufcapacity)
+			{
+				if (encoding == get_write_native_encoding())
+				{
+					// fast path, can just write data chunk
+					writer.write(data, length * sizeof(char_t));
+					return;
+				}
+
+				// need to convert in suitable chunks
+				while (length > bufcapacity)
+				{
+					// get chunk size by selecting such number of characters that are guaranteed to fit into scratch buffer
+					// and form a complete codepoint sequence (i.e. discard start of last codepoint if necessary)
+					size_t chunk_size = get_valid_length(data, bufcapacity);
+					assert(chunk_size);
+
+					// convert chunk and write
+					flush(data, chunk_size);
+
+					// iterate
+					data += chunk_size;
+					length -= chunk_size;
+				}
+
+				// small tail is copied below
+				bufsize = 0;
+			}
+
+			memcpy(buffer + bufsize, data, length * sizeof(char_t));
+			bufsize += length;
+		}
+
+		void write_buffer(const char_t* data, size_t length)
+		{
+			size_t offset = bufsize;
+
+			if (offset + length <= bufcapacity)
+			{
+				memcpy(buffer + offset, data, length * sizeof(char_t));
+				bufsize = offset + length;
+			}
+			else
+			{
+				write_direct(data, length);
+			}
+		}
+
+		void write_string(const char_t* data)
+		{
+			// write the part of the string that fits in the buffer
+			size_t offset = bufsize;
+
+			while (*data && offset < bufcapacity)
+				buffer[offset++] = *data++;
+
+			// write the rest
+			if (offset < bufcapacity)
+			{
+				bufsize = offset;
+			}
+			else
+			{
+				// backtrack a bit if we have split the codepoint
+				size_t length = offset - bufsize;
+				size_t extra = length - get_valid_length(data - length, length);
+
+				bufsize = offset - extra;
+
+				write_direct(data - extra, strlength(data) + extra);
+			}
+		}
+
+		void write(char_t d0)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 1) offset = flush();
+
+			buffer[offset + 0] = d0;
+			bufsize = offset + 1;
+		}
+
+		void write(char_t d0, char_t d1)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 2) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			bufsize = offset + 2;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 3) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			bufsize = offset + 3;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2, char_t d3)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 4) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			buffer[offset + 3] = d3;
+			bufsize = offset + 4;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2, char_t d3, char_t d4)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 5) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			buffer[offset + 3] = d3;
+			buffer[offset + 4] = d4;
+			bufsize = offset + 5;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2, char_t d3, char_t d4, char_t d5)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 6) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			buffer[offset + 3] = d3;
+			buffer[offset + 4] = d4;
+			buffer[offset + 5] = d5;
+			bufsize = offset + 6;
+		}
+
+		// utf8 maximum expansion: x4 (-> utf32)
+		// utf16 maximum expansion: x2 (-> utf32)
+		// utf32 maximum expansion: x1
+		enum
+		{
+			bufcapacitybytes =
+			#ifdef PUGIXML_MEMORY_OUTPUT_STACK
+				PUGIXML_MEMORY_OUTPUT_STACK
+			#else
+				10240
+			#endif
+			,
+			bufcapacity = bufcapacitybytes / (sizeof(char_t) + 4)
+		};
+
+		char_t buffer[bufcapacity];
+
+		union
+		{
+			uint8_t data_u8[4 * bufcapacity];
+			uint16_t data_u16[2 * bufcapacity];
+			uint32_t data_u32[bufcapacity];
+			char_t data_char[bufcapacity];
+		} scratch;
+
+		xml_writer& writer;
+		size_t bufsize;
+		xml_encoding encoding;
+	};
+
+	PUGI_IMPL_FN void text_output_escaped(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags)
+	{
+		while (*s)
+		{
+			const char_t* prev = s;
+
+			// While *s is a usual symbol
+			PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPEX(ss, type));
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			switch (*s)
+			{
+				case 0: break;
+				case '&':
+					writer.write('&', 'a', 'm', 'p', ';');
+					++s;
+					break;
+				case '<':
+					writer.write('&', 'l', 't', ';');
+					++s;
+					break;
+				case '>':
+					writer.write('&', 'g', 't', ';');
+					++s;
+					break;
+				case '"':
+					if (flags & format_attribute_single_quote)
+						writer.write('"');
+					else
+						writer.write('&', 'q', 'u', 'o', 't', ';');
+					++s;
+					break;
+				case '\'':
+					if (flags & format_attribute_single_quote)
+						writer.write('&', 'a', 'p', 'o', 's', ';');
+					else
+						writer.write('\'');
+					++s;
+					break;
+				default: // s is not a usual symbol
+				{
+					unsigned int ch = static_cast<unsigned int>(*s++);
+					assert(ch < 32);
+
+					if (!(flags & format_skip_control_chars))
+						writer.write('&', '#', static_cast<char_t>((ch / 10) + '0'), static_cast<char_t>((ch % 10) + '0'), ';');
+				}
+			}
+		}
+	}
+
+	PUGI_IMPL_FN void text_output(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags)
+	{
+		if (flags & format_no_escapes)
+			writer.write_string(s);
+		else
+			text_output_escaped(writer, s, type, flags);
+	}
+
+	PUGI_IMPL_FN void text_output_cdata(xml_buffered_writer& writer, const char_t* s)
+	{
+		do
+		{
+			writer.write('<', '!', '[', 'C', 'D');
+			writer.write('A', 'T', 'A', '[');
+
+			const char_t* prev = s;
+
+			// look for ]]> sequence - we can't output it as is since it terminates CDATA
+			while (*s && !(s[0] == ']' && s[1] == ']' && s[2] == '>')) ++s;
+
+			// skip ]] if we stopped at ]]>, > will go to the next CDATA section
+			if (*s) s += 2;
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			writer.write(']', ']', '>');
+		}
+		while (*s);
+	}
+
+	PUGI_IMPL_FN void text_output_indent(xml_buffered_writer& writer, const char_t* indent, size_t indent_length, unsigned int depth)
+	{
+		switch (indent_length)
+		{
+		case 1:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0]);
+			break;
+		}
+
+		case 2:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0], indent[1]);
+			break;
+		}
+
+		case 3:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0], indent[1], indent[2]);
+			break;
+		}
+
+		case 4:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0], indent[1], indent[2], indent[3]);
+			break;
+		}
+
+		default:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write_buffer(indent, indent_length);
+		}
+		}
+	}
+
+	PUGI_IMPL_FN void node_output_comment(xml_buffered_writer& writer, const char_t* s)
+	{
+		writer.write('<', '!', '-', '-');
+
+		while (*s)
+		{
+			const char_t* prev = s;
+
+			// look for -\0 or -- sequence - we can't output it since -- is illegal in comment body
+			while (*s && !(s[0] == '-' && (s[1] == '-' || s[1] == 0))) ++s;
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			if (*s)
+			{
+				assert(*s == '-');
+
+				writer.write('-', ' ');
+				++s;
+			}
+		}
+
+		writer.write('-', '-', '>');
+	}
+
+	PUGI_IMPL_FN void node_output_pi_value(xml_buffered_writer& writer, const char_t* s)
+	{
+		while (*s)
+		{
+			const char_t* prev = s;
+
+			// look for ?> sequence - we can't output it since ?> terminates PI
+			while (*s && !(s[0] == '?' && s[1] == '>')) ++s;
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			if (*s)
+			{
+				assert(s[0] == '?' && s[1] == '>');
+
+				writer.write('?', ' ', '>');
+				s += 2;
+			}
+		}
+	}
+
+	PUGI_IMPL_FN void node_output_attributes(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+		const char_t enquotation_char = (flags & format_attribute_single_quote) ? '\'' : '"';
+
+		for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
+		{
+			if ((flags & (format_indent_attributes | format_raw)) == format_indent_attributes)
+			{
+				writer.write('\n');
+
+				text_output_indent(writer, indent, indent_length, depth + 1);
+			}
+			else
+			{
+				writer.write(' ');
+			}
+
+			writer.write_string(a->name ? a->name + 0 : default_name);
+			writer.write('=', enquotation_char);
+
+			if (a->value)
+				text_output(writer, a->value, ctx_special_attr, flags);
+
+			writer.write(enquotation_char);
+		}
+	}
+
+	PUGI_IMPL_FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+		const char_t* name = node->name ? node->name + 0 : default_name;
+
+		writer.write('<');
+		writer.write_string(name);
+
+		if (node->first_attribute)
+			node_output_attributes(writer, node, indent, indent_length, flags, depth);
+
+		// element nodes can have value if parse_embed_pcdata was used
+		if (!node->value)
+		{
+			if (!node->first_child)
+			{
+				if (flags & format_no_empty_element_tags)
+				{
+					writer.write('>', '<', '/');
+					writer.write_string(name);
+					writer.write('>');
+
+					return false;
+				}
+				else
+				{
+					if ((flags & format_raw) == 0)
+						writer.write(' ');
+
+					writer.write('/', '>');
+
+					return false;
+				}
+			}
+			else
+			{
+				writer.write('>');
+
+				return true;
+			}
+		}
+		else
+		{
+			writer.write('>');
+
+			text_output(writer, node->value, ctx_special_pcdata, flags);
+
+			if (!node->first_child)
+			{
+				writer.write('<', '/');
+				writer.write_string(name);
+				writer.write('>');
+
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+	}
+
+	PUGI_IMPL_FN void node_output_end(xml_buffered_writer& writer, xml_node_struct* node)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+		const char_t* name = node->name ? node->name + 0 : default_name;
+
+		writer.write('<', '/');
+		writer.write_string(name);
+		writer.write('>');
+	}
+
+	PUGI_IMPL_FN void node_output_simple(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+
+		switch (PUGI_IMPL_NODETYPE(node))
+		{
+			case node_pcdata:
+				text_output(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""), ctx_special_pcdata, flags);
+				break;
+
+			case node_cdata:
+				text_output_cdata(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""));
+				break;
+
+			case node_comment:
+				node_output_comment(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""));
+				break;
+
+			case node_pi:
+				writer.write('<', '?');
+				writer.write_string(node->name ? node->name + 0 : default_name);
+
+				if (node->value)
+				{
+					writer.write(' ');
+					node_output_pi_value(writer, node->value);
+				}
+
+				writer.write('?', '>');
+				break;
+
+			case node_declaration:
+				writer.write('<', '?');
+				writer.write_string(node->name ? node->name + 0 : default_name);
+				node_output_attributes(writer, node, PUGIXML_TEXT(""), 0, flags | format_raw, 0);
+				writer.write('?', '>');
+				break;
+
+			case node_doctype:
+				writer.write('<', '!', 'D', 'O', 'C');
+				writer.write('T', 'Y', 'P', 'E');
+
+				if (node->value)
+				{
+					writer.write(' ');
+					writer.write_string(node->value);
+				}
+
+				writer.write('>');
+				break;
+
+			default:
+				assert(false && "Invalid node type"); // unreachable
+		}
+	}
+
+	enum indent_flags_t
+	{
+		indent_newline = 1,
+		indent_indent = 2
+	};
+
+	PUGI_IMPL_FN void node_output(xml_buffered_writer& writer, xml_node_struct* root, const char_t* indent, unsigned int flags, unsigned int depth)
+	{
+		size_t indent_length = ((flags & (format_indent | format_indent_attributes)) && (flags & format_raw) == 0) ? strlength(indent) : 0;
+		unsigned int indent_flags = indent_indent;
+
+		xml_node_struct* node = root;
+
+		do
+		{
+			assert(node);
+
+			// begin writing current node
+			if (PUGI_IMPL_NODETYPE(node) == node_pcdata || PUGI_IMPL_NODETYPE(node) == node_cdata)
+			{
+				node_output_simple(writer, node, flags);
+
+				indent_flags = 0;
+			}
+			else
+			{
+				if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
+					writer.write('\n');
+
+				if ((indent_flags & indent_indent) && indent_length)
+					text_output_indent(writer, indent, indent_length, depth);
+
+				if (PUGI_IMPL_NODETYPE(node) == node_element)
+				{
+					indent_flags = indent_newline | indent_indent;
+
+					if (node_output_start(writer, node, indent, indent_length, flags, depth))
+					{
+						// element nodes can have value if parse_embed_pcdata was used
+						if (node->value)
+							indent_flags = 0;
+
+						node = node->first_child;
+						depth++;
+						continue;
+					}
+				}
+				else if (PUGI_IMPL_NODETYPE(node) == node_document)
+				{
+					indent_flags = indent_indent;
+
+					if (node->first_child)
+					{
+						node = node->first_child;
+						continue;
+					}
+				}
+				else
+				{
+					node_output_simple(writer, node, flags);
+
+					indent_flags = indent_newline | indent_indent;
+				}
+			}
+
+			// continue to the next node
+			while (node != root)
+			{
+				if (node->next_sibling)
+				{
+					node = node->next_sibling;
+					break;
+				}
+
+				node = node->parent;
+
+				// write closing node
+				if (PUGI_IMPL_NODETYPE(node) == node_element)
+				{
+					depth--;
+
+					if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
+						writer.write('\n');
+
+					if ((indent_flags & indent_indent) && indent_length)
+						text_output_indent(writer, indent, indent_length, depth);
+
+					node_output_end(writer, node);
+
+					indent_flags = indent_newline | indent_indent;
+				}
+			}
+		}
+		while (node != root);
+
+		if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
+			writer.write('\n');
+	}
+
+	PUGI_IMPL_FN bool has_declaration(xml_node_struct* node)
+	{
+		for (xml_node_struct* child = node->first_child; child; child = child->next_sibling)
+		{
+			xml_node_type type = PUGI_IMPL_NODETYPE(child);
+
+			if (type == node_declaration) return true;
+			if (type == node_element) return false;
+		}
+
+		return false;
+	}
+
+	PUGI_IMPL_FN bool is_attribute_of(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
+			if (a == attr)
+				return true;
+
+		return false;
+	}
+
+	PUGI_IMPL_FN bool allow_insert_attribute(xml_node_type parent)
+	{
+		return parent == node_element || parent == node_declaration;
+	}
+
+	PUGI_IMPL_FN bool allow_insert_child(xml_node_type parent, xml_node_type child)
+	{
+		if (parent != node_document && parent != node_element) return false;
+		if (child == node_document || child == node_null) return false;
+		if (parent != node_document && (child == node_declaration || child == node_doctype)) return false;
+
+		return true;
+	}
+
+	PUGI_IMPL_FN bool allow_move(xml_node parent, xml_node child)
+	{
+		// check that child can be a child of parent
+		if (!allow_insert_child(parent.type(), child.type()))
+			return false;
+
+		// check that node is not moved between documents
+		if (parent.root() != child.root())
+			return false;
+
+		// check that new parent is not in the child subtree
+		xml_node cur = parent;
+
+		while (cur)
+		{
+			if (cur == child)
+				return false;
+
+			cur = cur.parent();
+		}
+
+		return true;
+	}
+
+	template <typename String, typename Header>
+	PUGI_IMPL_FN void node_copy_string(String& dest, Header& header, uintptr_t header_mask, char_t* source, Header& source_header, xml_allocator* alloc)
+	{
+		assert(!dest && (header & header_mask) == 0); // copies are performed into fresh nodes
+
+		if (source)
+		{
+			if (alloc && (source_header & header_mask) == 0)
+			{
+				dest = source;
+
+				// since strcpy_insitu can reuse document buffer memory we need to mark both source and dest as shared
+				header |= xml_memory_page_contents_shared_mask;
+				source_header |= xml_memory_page_contents_shared_mask;
+			}
+			else
+				strcpy_insitu(dest, header, header_mask, source, strlength(source));
+		}
+	}
+
+	PUGI_IMPL_FN void node_copy_contents(xml_node_struct* dn, xml_node_struct* sn, xml_allocator* shared_alloc)
+	{
+		node_copy_string(dn->name, dn->header, xml_memory_page_name_allocated_mask, sn->name, sn->header, shared_alloc);
+		node_copy_string(dn->value, dn->header, xml_memory_page_value_allocated_mask, sn->value, sn->header, shared_alloc);
+
+		for (xml_attribute_struct* sa = sn->first_attribute; sa; sa = sa->next_attribute)
+		{
+			xml_attribute_struct* da = append_new_attribute(dn, get_allocator(dn));
+
+			if (da)
+			{
+				node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc);
+				node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc);
+			}
+		}
+	}
+
+	PUGI_IMPL_FN void node_copy_tree(xml_node_struct* dn, xml_node_struct* sn)
+	{
+		xml_allocator& alloc = get_allocator(dn);
+		xml_allocator* shared_alloc = (&alloc == &get_allocator(sn)) ? &alloc : 0;
+
+		node_copy_contents(dn, sn, shared_alloc);
+
+		xml_node_struct* dit = dn;
+		xml_node_struct* sit = sn->first_child;
+
+		while (sit && sit != sn)
+		{
+			// loop invariant: dit is inside the subtree rooted at dn
+			assert(dit);
+
+			// when a tree is copied into one of the descendants, we need to skip that subtree to avoid an infinite loop
+			if (sit != dn)
+			{
+				xml_node_struct* copy = append_new_node(dit, alloc, PUGI_IMPL_NODETYPE(sit));
+
+				if (copy)
+				{
+					node_copy_contents(copy, sit, shared_alloc);
+
+					if (sit->first_child)
+					{
+						dit = copy;
+						sit = sit->first_child;
+						continue;
+					}
+				}
+			}
+
+			// continue to the next node
+			do
+			{
+				if (sit->next_sibling)
+				{
+					sit = sit->next_sibling;
+					break;
+				}
+
+				sit = sit->parent;
+				dit = dit->parent;
+
+				// loop invariant: dit is inside the subtree rooted at dn while sit is inside sn
+				assert(sit == sn || dit);
+			}
+			while (sit != sn);
+		}
+
+		assert(!sit || dit == dn->parent);
+	}
+
+	PUGI_IMPL_FN void node_copy_attribute(xml_attribute_struct* da, xml_attribute_struct* sa)
+	{
+		xml_allocator& alloc = get_allocator(da);
+		xml_allocator* shared_alloc = (&alloc == &get_allocator(sa)) ? &alloc : 0;
+
+		node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc);
+		node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc);
+	}
+
+	inline bool is_text_node(xml_node_struct* node)
+	{
+		xml_node_type type = PUGI_IMPL_NODETYPE(node);
+
+		return type == node_pcdata || type == node_cdata;
+	}
+
+	// get value with conversion functions
+	template <typename U> PUGI_IMPL_FN PUGI_IMPL_UNSIGNED_OVERFLOW U string_to_integer(const char_t* value, U minv, U maxv)
+	{
+		U result = 0;
+		const char_t* s = value;
+
+		while (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
+			s++;
+
+		bool negative = (*s == '-');
+
+		s += (*s == '+' || *s == '-');
+
+		bool overflow = false;
+
+		if (s[0] == '0' && (s[1] | ' ') == 'x')
+		{
+			s += 2;
+
+			// since overflow detection relies on length of the sequence skip leading zeros
+			while (*s == '0')
+				s++;
+
+			const char_t* start = s;
+
+			for (;;)
+			{
+				if (static_cast<unsigned>(*s - '0') < 10)
+					result = result * 16 + (*s - '0');
+				else if (static_cast<unsigned>((*s | ' ') - 'a') < 6)
+					result = result * 16 + ((*s | ' ') - 'a' + 10);
+				else
+					break;
+
+				s++;
+			}
+
+			size_t digits = static_cast<size_t>(s - start);
+
+			overflow = digits > sizeof(U) * 2;
+		}
+		else
+		{
+			// since overflow detection relies on length of the sequence skip leading zeros
+			while (*s == '0')
+				s++;
+
+			const char_t* start = s;
+
+			for (;;)
+			{
+				if (static_cast<unsigned>(*s - '0') < 10)
+					result = result * 10 + (*s - '0');
+				else
+					break;
+
+				s++;
+			}
+
+			size_t digits = static_cast<size_t>(s - start);
+
+			PUGI_IMPL_STATIC_ASSERT(sizeof(U) == 8 || sizeof(U) == 4 || sizeof(U) == 2);
+
+			const size_t max_digits10 = sizeof(U) == 8 ? 20 : sizeof(U) == 4 ? 10 : 5;
+			const char_t max_lead = sizeof(U) == 8 ? '1' : sizeof(U) == 4 ? '4' : '6';
+			const size_t high_bit = sizeof(U) * 8 - 1;
+
+			overflow = digits >= max_digits10 && !(digits == max_digits10 && (*start < max_lead || (*start == max_lead && result >> high_bit)));
+		}
+
+		if (negative)
+		{
+			// Workaround for crayc++ CC-3059: Expected no overflow in routine.
+		#ifdef _CRAYC
+			return (overflow || result > ~minv + 1) ? minv : ~result + 1;
+		#else
+			return (overflow || result > 0 - minv) ? minv : 0 - result;
+		#endif
+		}
+		else
+			return (overflow || result > maxv) ? maxv : result;
+	}
+
+	PUGI_IMPL_FN int get_value_int(const char_t* value)
+	{
+		return string_to_integer<unsigned int>(value, static_cast<unsigned int>(INT_MIN), INT_MAX);
+	}
+
+	PUGI_IMPL_FN unsigned int get_value_uint(const char_t* value)
+	{
+		return string_to_integer<unsigned int>(value, 0, UINT_MAX);
+	}
+
+	PUGI_IMPL_FN double get_value_double(const char_t* value)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcstod(value, 0);
+	#else
+		return strtod(value, 0);
+	#endif
+	}
+
+	PUGI_IMPL_FN float get_value_float(const char_t* value)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return static_cast<float>(wcstod(value, 0));
+	#else
+		return static_cast<float>(strtod(value, 0));
+	#endif
+	}
+
+	PUGI_IMPL_FN bool get_value_bool(const char_t* value)
+	{
+		// only look at first char
+		char_t first = *value;
+
+		// 1*, t* (true), T* (True), y* (yes), Y* (YES)
+		return (first == '1' || first == 't' || first == 'T' || first == 'y' || first == 'Y');
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI_IMPL_FN long long get_value_llong(const char_t* value)
+	{
+		return string_to_integer<unsigned long long>(value, static_cast<unsigned long long>(LLONG_MIN), LLONG_MAX);
+	}
+
+	PUGI_IMPL_FN unsigned long long get_value_ullong(const char_t* value)
+	{
+		return string_to_integer<unsigned long long>(value, 0, ULLONG_MAX);
+	}
+#endif
+
+	template <typename U> PUGI_IMPL_FN PUGI_IMPL_UNSIGNED_OVERFLOW char_t* integer_to_string(char_t* begin, char_t* end, U value, bool negative)
+	{
+		char_t* result = end - 1;
+		U rest = negative ? 0 - value : value;
+
+		do
+		{
+			*result-- = static_cast<char_t>('0' + (rest % 10));
+			rest /= 10;
+		}
+		while (rest);
+
+		assert(result >= begin);
+		(void)begin;
+
+		*result = '-';
+
+		return result + !negative;
+	}
+
+	// set value with conversion functions
+	template <typename String, typename Header>
+	PUGI_IMPL_FN bool set_value_ascii(String& dest, Header& header, uintptr_t header_mask, char* buf)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		char_t wbuf[128];
+		assert(strlen(buf) < sizeof(wbuf) / sizeof(wbuf[0]));
+
+		size_t offset = 0;
+		for (; buf[offset]; ++offset) wbuf[offset] = buf[offset];
+
+		return strcpy_insitu(dest, header, header_mask, wbuf, offset);
+	#else
+		return strcpy_insitu(dest, header, header_mask, buf, strlen(buf));
+	#endif
+	}
+
+	template <typename U, typename String, typename Header>
+	PUGI_IMPL_FN bool set_value_integer(String& dest, Header& header, uintptr_t header_mask, U value, bool negative)
+	{
+		char_t buf[64];
+		char_t* end = buf + sizeof(buf) / sizeof(buf[0]);
+		char_t* begin = integer_to_string(buf, end, value, negative);
+
+		return strcpy_insitu(dest, header, header_mask, begin, end - begin);
+	}
+
+	template <typename String, typename Header>
+	PUGI_IMPL_FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, float value, int precision)
+	{
+		char buf[128];
+		PUGI_IMPL_SNPRINTF(buf, "%.*g", precision, double(value));
+
+		return set_value_ascii(dest, header, header_mask, buf);
+	}
+
+	template <typename String, typename Header>
+	PUGI_IMPL_FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, double value, int precision)
+	{
+		char buf[128];
+		PUGI_IMPL_SNPRINTF(buf, "%.*g", precision, value);
+
+		return set_value_ascii(dest, header, header_mask, buf);
+	}
+
+	template <typename String, typename Header>
+	PUGI_IMPL_FN bool set_value_bool(String& dest, Header& header, uintptr_t header_mask, bool value)
+	{
+		return strcpy_insitu(dest, header, header_mask, value ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"), value ? 4 : 5);
+	}
+
+	PUGI_IMPL_FN xml_parse_result load_buffer_impl(xml_document_struct* doc, xml_node_struct* root, void* contents, size_t size, unsigned int options, xml_encoding encoding, bool is_mutable, bool own, char_t** out_buffer)
+	{
+		// check input buffer
+		if (!contents && size) return make_parse_result(status_io_error);
+
+		// get actual encoding
+		xml_encoding buffer_encoding = impl::get_buffer_encoding(encoding, contents, size);
+
+		// if convert_buffer below throws bad_alloc, we still need to deallocate contents if we own it
+		auto_deleter<void> contents_guard(own ? contents : 0, xml_memory::deallocate);
+
+		// get private buffer
+		char_t* buffer = 0;
+		size_t length = 0;
+
+		// coverity[var_deref_model]
+		if (!impl::convert_buffer(buffer, length, buffer_encoding, contents, size, is_mutable)) return impl::make_parse_result(status_out_of_memory);
+
+		// after this we either deallocate contents (below) or hold on to it via doc->buffer, so we don't need to guard it
+		contents_guard.release();
+
+		// delete original buffer if we performed a conversion
+		if (own && buffer != contents && contents) impl::xml_memory::deallocate(contents);
+
+		// grab onto buffer if it's our buffer, user is responsible for deallocating contents himself
+		if (own || buffer != contents) *out_buffer = buffer;
+
+		// store buffer for offset_debug
+		doc->buffer = buffer;
+
+		// parse
+		xml_parse_result res = impl::xml_parser::parse(buffer, length, doc, root, options);
+
+		// remember encoding
+		res.encoding = buffer_encoding;
+
+		return res;
+	}
+
+	// we need to get length of entire file to load it in memory; the only (relatively) sane way to do it is via seek/tell trick
+	PUGI_IMPL_FN xml_parse_status get_file_size(FILE* file, size_t& out_result)
+	{
+	#if defined(__linux__) || defined(__APPLE__)
+		// this simultaneously retrieves the file size and file mode (to guard against loading non-files)
+		struct stat st;
+		if (fstat(fileno(file), &st) != 0) return status_io_error;
+
+		// anything that's not a regular file doesn't have a coherent length
+		if (!S_ISREG(st.st_mode)) return status_io_error;
+
+		typedef off_t length_type;
+		length_type length = st.st_size;
+	#elif defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
+		// there are 64-bit versions of fseek/ftell, let's use them
+		typedef __int64 length_type;
+
+		_fseeki64(file, 0, SEEK_END);
+		length_type length = _ftelli64(file);
+		_fseeki64(file, 0, SEEK_SET);
+	#elif defined(__MINGW32__) && !defined(__NO_MINGW_LFS) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR))
+		// there are 64-bit versions of fseek/ftell, let's use them
+		typedef off64_t length_type;
+
+		fseeko64(file, 0, SEEK_END);
+		length_type length = ftello64(file);
+		fseeko64(file, 0, SEEK_SET);
+	#else
+		// if this is a 32-bit OS, long is enough; if this is a unix system, long is 64-bit, which is enough; otherwise we can't do anything anyway.
+		typedef long length_type;
+
+		fseek(file, 0, SEEK_END);
+		length_type length = ftell(file);
+		fseek(file, 0, SEEK_SET);
+	#endif
+
+		// check for I/O errors
+		if (length < 0) return status_io_error;
+
+		// check for overflow
+		size_t result = static_cast<size_t>(length);
+
+		if (static_cast<length_type>(result) != length) return status_out_of_memory;
+
+		// finalize
+		out_result = result;
+
+		return status_ok;
+	}
+
+	// This function assumes that buffer has extra sizeof(char_t) writable bytes after size
+	PUGI_IMPL_FN size_t zero_terminate_buffer(void* buffer, size_t size, xml_encoding encoding)
+	{
+		// We only need to zero-terminate if encoding conversion does not do it for us
+	#ifdef PUGIXML_WCHAR_MODE
+		xml_encoding wchar_encoding = get_wchar_encoding();
+
+		if (encoding == wchar_encoding || need_endian_swap_utf(encoding, wchar_encoding))
+		{
+			size_t length = size / sizeof(char_t);
+
+			static_cast<char_t*>(buffer)[length] = 0;
+			return (length + 1) * sizeof(char_t);
+		}
+	#else
+		if (encoding == encoding_utf8)
+		{
+			static_cast<char*>(buffer)[size] = 0;
+			return size + 1;
+		}
+	#endif
+
+		return size;
+	}
+
+	PUGI_IMPL_FN xml_parse_result load_file_impl(xml_document_struct* doc, FILE* file, unsigned int options, xml_encoding encoding, char_t** out_buffer)
+	{
+		if (!file) return make_parse_result(status_file_not_found);
+
+		// get file size (can result in I/O errors)
+		size_t size = 0;
+		xml_parse_status size_status = get_file_size(file, size);
+		if (size_status != status_ok) return make_parse_result(size_status);
+
+		size_t max_suffix_size = sizeof(char_t);
+
+		// allocate buffer for the whole file
+		char* contents = static_cast<char*>(xml_memory::allocate(size + max_suffix_size));
+		if (!contents) return make_parse_result(status_out_of_memory);
+
+		// read file in memory
+		size_t read_size = fread(contents, 1, size, file);
+
+		if (read_size != size)
+		{
+			xml_memory::deallocate(contents);
+			return make_parse_result(status_io_error);
+		}
+
+		xml_encoding real_encoding = get_buffer_encoding(encoding, contents, size);
+
+		return load_buffer_impl(doc, doc, contents, zero_terminate_buffer(contents, size, real_encoding), options, real_encoding, true, true, out_buffer);
+	}
+
+	PUGI_IMPL_FN void close_file(FILE* file)
+	{
+		fclose(file);
+	}
+
+#ifndef PUGIXML_NO_STL
+	template <typename T> struct xml_stream_chunk
+	{
+		static xml_stream_chunk* create()
+		{
+			void* memory = xml_memory::allocate(sizeof(xml_stream_chunk));
+			if (!memory) return 0;
+
+			return new (memory) xml_stream_chunk();
+		}
+
+		static void destroy(xml_stream_chunk* chunk)
+		{
+			// free chunk chain
+			while (chunk)
+			{
+				xml_stream_chunk* next_ = chunk->next;
+
+				xml_memory::deallocate(chunk);
+
+				chunk = next_;
+			}
+		}
+
+		xml_stream_chunk(): next(0), size(0)
+		{
+		}
+
+		xml_stream_chunk* next;
+		size_t size;
+
+		T data[xml_memory_page_size / sizeof(T)];
+	};
+
+	template <typename T> PUGI_IMPL_FN xml_parse_status load_stream_data_noseek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
+	{
+		auto_deleter<xml_stream_chunk<T> > chunks(0, xml_stream_chunk<T>::destroy);
+
+		// read file to a chunk list
+		size_t total = 0;
+		xml_stream_chunk<T>* last = 0;
+
+		while (!stream.eof())
+		{
+			// allocate new chunk
+			xml_stream_chunk<T>* chunk = xml_stream_chunk<T>::create();
+			if (!chunk) return status_out_of_memory;
+
+			// append chunk to list
+			if (last) last = last->next = chunk;
+			else chunks.data = last = chunk;
+
+			// read data to chunk
+			stream.read(chunk->data, static_cast<std::streamsize>(sizeof(chunk->data) / sizeof(T)));
+			chunk->size = static_cast<size_t>(stream.gcount()) * sizeof(T);
+
+			// read may set failbit | eofbit in case gcount() is less than read length, so check for other I/O errors
+			if (stream.bad() || (!stream.eof() && stream.fail())) return status_io_error;
+
+			// guard against huge files (chunk size is small enough to make this overflow check work)
+			if (total + chunk->size < total) return status_out_of_memory;
+			total += chunk->size;
+		}
+
+		size_t max_suffix_size = sizeof(char_t);
+
+		// copy chunk list to a contiguous buffer
+		char* buffer = static_cast<char*>(xml_memory::allocate(total + max_suffix_size));
+		if (!buffer) return status_out_of_memory;
+
+		char* write = buffer;
+
+		for (xml_stream_chunk<T>* chunk = chunks.data; chunk; chunk = chunk->next)
+		{
+			assert(write + chunk->size <= buffer + total);
+			memcpy(write, chunk->data, chunk->size);
+			write += chunk->size;
+		}
+
+		assert(write == buffer + total);
+
+		// return buffer
+		*out_buffer = buffer;
+		*out_size = total;
+
+		return status_ok;
+	}
+
+	template <typename T> PUGI_IMPL_FN xml_parse_status load_stream_data_seek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
+	{
+		// get length of remaining data in stream
+		typename std::basic_istream<T>::pos_type pos = stream.tellg();
+		stream.seekg(0, std::ios::end);
+		std::streamoff length = stream.tellg() - pos;
+		stream.seekg(pos);
+
+		if (stream.fail() || pos < 0) return status_io_error;
+
+		// guard against huge files
+		size_t read_length = static_cast<size_t>(length);
+
+		if (static_cast<std::streamsize>(read_length) != length || length < 0) return status_out_of_memory;
+
+		size_t max_suffix_size = sizeof(char_t);
+
+		// read stream data into memory (guard against stream exceptions with buffer holder)
+		auto_deleter<void> buffer(xml_memory::allocate(read_length * sizeof(T) + max_suffix_size), xml_memory::deallocate);
+		if (!buffer.data) return status_out_of_memory;
+
+		stream.read(static_cast<T*>(buffer.data), static_cast<std::streamsize>(read_length));
+
+		// read may set failbit | eofbit in case gcount() is less than read_length (i.e. line ending conversion), so check for other I/O errors
+		if (stream.bad() || (!stream.eof() && stream.fail())) return status_io_error;
+
+		// return buffer
+		size_t actual_length = static_cast<size_t>(stream.gcount());
+		assert(actual_length <= read_length);
+
+		*out_buffer = buffer.release();
+		*out_size = actual_length * sizeof(T);
+
+		return status_ok;
+	}
+
+	template <typename T> PUGI_IMPL_FN xml_parse_result load_stream_impl(xml_document_struct* doc, std::basic_istream<T>& stream, unsigned int options, xml_encoding encoding, char_t** out_buffer)
+	{
+		void* buffer = 0;
+		size_t size = 0;
+		xml_parse_status status = status_ok;
+
+		// if stream has an error bit set, bail out (otherwise tellg() can fail and we'll clear error bits)
+		if (stream.fail()) return make_parse_result(status_io_error);
+
+		// load stream to memory (using seek-based implementation if possible, since it's faster and takes less memory)
+		if (stream.tellg() < 0)
+		{
+			stream.clear(); // clear error flags that could be set by a failing tellg
+			status = load_stream_data_noseek(stream, &buffer, &size);
+		}
+		else
+			status = load_stream_data_seek(stream, &buffer, &size);
+
+		if (status != status_ok) return make_parse_result(status);
+
+		xml_encoding real_encoding = get_buffer_encoding(encoding, buffer, size);
+
+		return load_buffer_impl(doc, doc, buffer, zero_terminate_buffer(buffer, size, real_encoding), options, real_encoding, true, true, out_buffer);
+	}
+#endif
+
+#if defined(PUGI_IMPL_MSVC_CRT_VERSION) || defined(__BORLANDC__) || (defined(__MINGW32__) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR)))
+	PUGI_IMPL_FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
+	{
+#if defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
+		FILE* file = 0;
+		return _wfopen_s(&file, path, mode) == 0 ? file : 0;
+#else
+		return _wfopen(path, mode);
+#endif
+	}
+#else
+	PUGI_IMPL_FN char* convert_path_heap(const wchar_t* str)
+	{
+		assert(str);
+
+		// first pass: get length in utf8 characters
+		size_t length = strlength_wide(str);
+		size_t size = as_utf8_begin(str, length);
+
+		// allocate resulting string
+		char* result = static_cast<char*>(xml_memory::allocate(size + 1));
+		if (!result) return 0;
+
+		// second pass: convert to utf8
+		as_utf8_end(result, size, str, length);
+
+		// zero-terminate
+		result[size] = 0;
+
+		return result;
+	}
+
+	PUGI_IMPL_FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
+	{
+		// there is no standard function to open wide paths, so our best bet is to try utf8 path
+		char* path_utf8 = convert_path_heap(path);
+		if (!path_utf8) return 0;
+
+		// convert mode to ASCII (we mirror _wfopen interface)
+		char mode_ascii[4] = {0};
+		for (size_t i = 0; mode[i]; ++i) mode_ascii[i] = static_cast<char>(mode[i]);
+
+		// try to open the utf8 path
+		FILE* result = fopen(path_utf8, mode_ascii);
+
+		// free dummy buffer
+		xml_memory::deallocate(path_utf8);
+
+		return result;
+	}
+#endif
+
+	PUGI_IMPL_FN FILE* open_file(const char* path, const char* mode)
+	{
+#if defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
+		FILE* file = 0;
+		return fopen_s(&file, path, mode) == 0 ? file : 0;
+#else
+		return fopen(path, mode);
+#endif
+	}
+
+	PUGI_IMPL_FN bool save_file_impl(const xml_document& doc, FILE* file, const char_t* indent, unsigned int flags, xml_encoding encoding)
+	{
+		if (!file) return false;
+
+		xml_writer_file writer(file);
+		doc.save(writer, indent, flags, encoding);
+
+		return fflush(file) == 0 && ferror(file) == 0;
+	}
+
+	struct name_null_sentry
+	{
+		xml_node_struct* node;
+		char_t* name;
+
+		name_null_sentry(xml_node_struct* node_): node(node_), name(node_->name)
+		{
+			node->name = 0;
+		}
+
+		~name_null_sentry()
+		{
+			node->name = name;
+		}
+	};
+PUGI_IMPL_NS_END
+
+namespace pugi
+{
+	PUGI_IMPL_FN xml_writer::~xml_writer()
+	{
+	}
+
+	PUGI_IMPL_FN xml_writer_file::xml_writer_file(void* file_): file(file_)
+	{
+	}
+
+	PUGI_IMPL_FN void xml_writer_file::write(const void* data, size_t size)
+	{
+		size_t result = fwrite(data, 1, size, static_cast<FILE*>(file));
+		(void)!result; // unfortunately we can't do proper error handling here
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI_IMPL_FN xml_writer_stream::xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream): narrow_stream(&stream), wide_stream(0)
+	{
+	}
+
+	PUGI_IMPL_FN xml_writer_stream::xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream): narrow_stream(0), wide_stream(&stream)
+	{
+	}
+
+	PUGI_IMPL_FN void xml_writer_stream::write(const void* data, size_t size)
+	{
+		if (narrow_stream)
+		{
+			assert(!wide_stream);
+			narrow_stream->write(reinterpret_cast<const char*>(data), static_cast<std::streamsize>(size));
+		}
+		else
+		{
+			assert(wide_stream);
+			assert(size % sizeof(wchar_t) == 0);
+
+			wide_stream->write(reinterpret_cast<const wchar_t*>(data), static_cast<std::streamsize>(size / sizeof(wchar_t)));
+		}
+	}
+#endif
+
+	PUGI_IMPL_FN xml_tree_walker::xml_tree_walker(): _depth(0)
+	{
+	}
+
+	PUGI_IMPL_FN xml_tree_walker::~xml_tree_walker()
+	{
+	}
+
+	PUGI_IMPL_FN int xml_tree_walker::depth() const
+	{
+		return _depth;
+	}
+
+	PUGI_IMPL_FN bool xml_tree_walker::begin(xml_node&)
+	{
+		return true;
+	}
+
+	PUGI_IMPL_FN bool xml_tree_walker::end(xml_node&)
+	{
+		return true;
+	}
+
+	PUGI_IMPL_FN xml_attribute::xml_attribute(): _attr(0)
+	{
+	}
+
+	PUGI_IMPL_FN xml_attribute::xml_attribute(xml_attribute_struct* attr): _attr(attr)
+	{
+	}
+
+	PUGI_IMPL_FN static void unspecified_bool_xml_attribute(xml_attribute***)
+	{
+	}
+
+	PUGI_IMPL_FN xml_attribute::operator xml_attribute::unspecified_bool_type() const
+	{
+		return _attr ? unspecified_bool_xml_attribute : 0;
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::operator!() const
+	{
+		return !_attr;
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::operator==(const xml_attribute& r) const
+	{
+		return (_attr == r._attr);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::operator!=(const xml_attribute& r) const
+	{
+		return (_attr != r._attr);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::operator<(const xml_attribute& r) const
+	{
+		return (_attr < r._attr);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::operator>(const xml_attribute& r) const
+	{
+		return (_attr > r._attr);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::operator<=(const xml_attribute& r) const
+	{
+		return (_attr <= r._attr);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::operator>=(const xml_attribute& r) const
+	{
+		return (_attr >= r._attr);
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_attribute::next_attribute() const
+	{
+		if (!_attr) return xml_attribute();
+		return xml_attribute(_attr->next_attribute);
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_attribute::previous_attribute() const
+	{
+		if (!_attr) return xml_attribute();
+		xml_attribute_struct* prev = _attr->prev_attribute_c;
+		return prev->next_attribute ? xml_attribute(prev) : xml_attribute();
+	}
+
+	PUGI_IMPL_FN const char_t* xml_attribute::as_string(const char_t* def) const
+	{
+		if (!_attr) return def;
+		const char_t* value = _attr->value;
+		return value ? value : def;
+	}
+
+	PUGI_IMPL_FN int xml_attribute::as_int(int def) const
+	{
+		if (!_attr) return def;
+		const char_t* value = _attr->value;
+		return value ? impl::get_value_int(value) : def;
+	}
+
+	PUGI_IMPL_FN unsigned int xml_attribute::as_uint(unsigned int def) const
+	{
+		if (!_attr) return def;
+		const char_t* value = _attr->value;
+		return value ? impl::get_value_uint(value) : def;
+	}
+
+	PUGI_IMPL_FN double xml_attribute::as_double(double def) const
+	{
+		if (!_attr) return def;
+		const char_t* value = _attr->value;
+		return value ? impl::get_value_double(value) : def;
+	}
+
+	PUGI_IMPL_FN float xml_attribute::as_float(float def) const
+	{
+		if (!_attr) return def;
+		const char_t* value = _attr->value;
+		return value ? impl::get_value_float(value) : def;
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::as_bool(bool def) const
+	{
+		if (!_attr) return def;
+		const char_t* value = _attr->value;
+		return value ? impl::get_value_bool(value) : def;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI_IMPL_FN long long xml_attribute::as_llong(long long def) const
+	{
+		if (!_attr) return def;
+		const char_t* value = _attr->value;
+		return value ? impl::get_value_llong(value) : def;
+	}
+
+	PUGI_IMPL_FN unsigned long long xml_attribute::as_ullong(unsigned long long def) const
+	{
+		if (!_attr) return def;
+		const char_t* value = _attr->value;
+		return value ? impl::get_value_ullong(value) : def;
+	}
+#endif
+
+	PUGI_IMPL_FN bool xml_attribute::empty() const
+	{
+		return !_attr;
+	}
+
+	PUGI_IMPL_FN const char_t* xml_attribute::name() const
+	{
+		if (!_attr) return PUGIXML_TEXT("");
+		const char_t* name = _attr->name;
+		return name ? name : PUGIXML_TEXT("");
+	}
+
+	PUGI_IMPL_FN const char_t* xml_attribute::value() const
+	{
+		if (!_attr) return PUGIXML_TEXT("");
+		const char_t* value = _attr->value;
+		return value ? value : PUGIXML_TEXT("");
+	}
+
+	PUGI_IMPL_FN size_t xml_attribute::hash_value() const
+	{
+		return static_cast<size_t>(reinterpret_cast<uintptr_t>(_attr) / sizeof(xml_attribute_struct));
+	}
+
+	PUGI_IMPL_FN xml_attribute_struct* xml_attribute::internal_object() const
+	{
+		return _attr;
+	}
+
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(const char_t* rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(int rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(unsigned int rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(unsigned long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(double rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(float rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(bool rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(long long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(unsigned long long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+#endif
+
+	PUGI_IMPL_FN bool xml_attribute::set_name(const char_t* rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::strcpy_insitu(_attr->name, _attr->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::set_name(const char_t* rhs, size_t size)
+	{
+		if (!_attr) return false;
+
+		return impl::strcpy_insitu(_attr->name, _attr->header, impl::xml_memory_page_name_allocated_mask, rhs, size);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::set_value(const char_t* rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::set_value(const char_t* rhs, size_t size)
+	{
+		if (!_attr) return false;
+
+		return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, size);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::set_value(int rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned int>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::set_value(unsigned int rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned int>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::set_value(long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::set_value(unsigned long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::set_value(double rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, default_double_precision);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::set_value(double rhs, int precision)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, precision);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::set_value(float rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, default_float_precision);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::set_value(float rhs, int precision)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, precision);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::set_value(bool rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_bool(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs);
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI_IMPL_FN bool xml_attribute::set_value(long long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
+	}
+
+	PUGI_IMPL_FN bool xml_attribute::set_value(unsigned long long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
+	}
+#endif
+
+#ifdef __BORLANDC__
+	PUGI_IMPL_FN bool operator&&(const xml_attribute& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI_IMPL_FN bool operator||(const xml_attribute& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI_IMPL_FN xml_node::xml_node(): _root(0)
+	{
+	}
+
+	PUGI_IMPL_FN xml_node::xml_node(xml_node_struct* p): _root(p)
+	{
+	}
+
+	PUGI_IMPL_FN static void unspecified_bool_xml_node(xml_node***)
+	{
+	}
+
+	PUGI_IMPL_FN xml_node::operator xml_node::unspecified_bool_type() const
+	{
+		return _root ? unspecified_bool_xml_node : 0;
+	}
+
+	PUGI_IMPL_FN bool xml_node::operator!() const
+	{
+		return !_root;
+	}
+
+	PUGI_IMPL_FN xml_node::iterator xml_node::begin() const
+	{
+		return iterator(_root ? _root->first_child + 0 : 0, _root);
+	}
+
+	PUGI_IMPL_FN xml_node::iterator xml_node::end() const
+	{
+		return iterator(0, _root);
+	}
+
+	PUGI_IMPL_FN xml_node::attribute_iterator xml_node::attributes_begin() const
+	{
+		return attribute_iterator(_root ? _root->first_attribute + 0 : 0, _root);
+	}
+
+	PUGI_IMPL_FN xml_node::attribute_iterator xml_node::attributes_end() const
+	{
+		return attribute_iterator(0, _root);
+	}
+
+	PUGI_IMPL_FN xml_object_range<xml_node_iterator> xml_node::children() const
+	{
+		return xml_object_range<xml_node_iterator>(begin(), end());
+	}
+
+	PUGI_IMPL_FN xml_object_range<xml_named_node_iterator> xml_node::children(const char_t* name_) const
+	{
+		return xml_object_range<xml_named_node_iterator>(xml_named_node_iterator(child(name_)._root, _root, name_), xml_named_node_iterator(0, _root, name_));
+	}
+
+	PUGI_IMPL_FN xml_object_range<xml_attribute_iterator> xml_node::attributes() const
+	{
+		return xml_object_range<xml_attribute_iterator>(attributes_begin(), attributes_end());
+	}
+
+	PUGI_IMPL_FN bool xml_node::operator==(const xml_node& r) const
+	{
+		return (_root == r._root);
+	}
+
+	PUGI_IMPL_FN bool xml_node::operator!=(const xml_node& r) const
+	{
+		return (_root != r._root);
+	}
+
+	PUGI_IMPL_FN bool xml_node::operator<(const xml_node& r) const
+	{
+		return (_root < r._root);
+	}
+
+	PUGI_IMPL_FN bool xml_node::operator>(const xml_node& r) const
+	{
+		return (_root > r._root);
+	}
+
+	PUGI_IMPL_FN bool xml_node::operator<=(const xml_node& r) const
+	{
+		return (_root <= r._root);
+	}
+
+	PUGI_IMPL_FN bool xml_node::operator>=(const xml_node& r) const
+	{
+		return (_root >= r._root);
+	}
+
+	PUGI_IMPL_FN bool xml_node::empty() const
+	{
+		return !_root;
+	}
+
+	PUGI_IMPL_FN const char_t* xml_node::name() const
+	{
+		if (!_root) return PUGIXML_TEXT("");
+		const char_t* name = _root->name;
+		return name ? name : PUGIXML_TEXT("");
+	}
+
+	PUGI_IMPL_FN xml_node_type xml_node::type() const
+	{
+		return _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
+	}
+
+	PUGI_IMPL_FN const char_t* xml_node::value() const
+	{
+		if (!_root) return PUGIXML_TEXT("");
+		const char_t* value = _root->value;
+		return value ? value : PUGIXML_TEXT("");
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::child(const char_t* name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+		{
+			const char_t* iname = i->name;
+			if (iname && impl::strequal(name_, iname))
+				return xml_node(i);
+		}
+
+		return xml_node();
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::attribute(const char_t* name_) const
+	{
+		if (!_root) return xml_attribute();
+
+		for (xml_attribute_struct* i = _root->first_attribute; i; i = i->next_attribute)
+		{
+			const char_t* iname = i->name;
+			if (iname && impl::strequal(name_, iname))
+				return xml_attribute(i);
+		}
+
+		return xml_attribute();
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::next_sibling(const char_t* name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->next_sibling; i; i = i->next_sibling)
+		{
+			const char_t* iname = i->name;
+			if (iname && impl::strequal(name_, iname))
+				return xml_node(i);
+		}
+
+		return xml_node();
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::next_sibling() const
+	{
+		return _root ? xml_node(_root->next_sibling) : xml_node();
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::previous_sibling(const char_t* name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->prev_sibling_c; i->next_sibling; i = i->prev_sibling_c)
+		{
+			const char_t* iname = i->name;
+			if (iname && impl::strequal(name_, iname))
+				return xml_node(i);
+		}
+
+		return xml_node();
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::attribute(const char_t* name_, xml_attribute& hint_) const
+	{
+		xml_attribute_struct* hint = hint_._attr;
+
+		// if hint is not an attribute of node, behavior is not defined
+		assert(!hint || (_root && impl::is_attribute_of(hint, _root)));
+
+		if (!_root) return xml_attribute();
+
+		// optimistically search from hint up until the end
+		for (xml_attribute_struct* i = hint; i; i = i->next_attribute)
+		{
+			const char_t* iname = i->name;
+			if (iname && impl::strequal(name_, iname))
+			{
+				// update hint to maximize efficiency of searching for consecutive attributes
+				hint_._attr = i->next_attribute;
+
+				return xml_attribute(i);
+			}
+		}
+
+		// wrap around and search from the first attribute until the hint
+		// 'j' null pointer check is technically redundant, but it prevents a crash in case the assertion above fails
+		for (xml_attribute_struct* j = _root->first_attribute; j && j != hint; j = j->next_attribute)
+		{
+			const char_t* jname = j->name;
+			if (jname && impl::strequal(name_, jname))
+			{
+				// update hint to maximize efficiency of searching for consecutive attributes
+				hint_._attr = j->next_attribute;
+
+				return xml_attribute(j);
+			}
+		}
+
+		return xml_attribute();
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::previous_sibling() const
+	{
+		if (!_root) return xml_node();
+		xml_node_struct* prev = _root->prev_sibling_c;
+		return prev->next_sibling ? xml_node(prev) : xml_node();
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::parent() const
+	{
+		return _root ? xml_node(_root->parent) : xml_node();
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::root() const
+	{
+		return _root ? xml_node(&impl::get_document(_root)) : xml_node();
+	}
+
+	PUGI_IMPL_FN xml_text xml_node::text() const
+	{
+		return xml_text(_root);
+	}
+
+	PUGI_IMPL_FN const char_t* xml_node::child_value() const
+	{
+		if (!_root) return PUGIXML_TEXT("");
+
+		// element nodes can have value if parse_embed_pcdata was used
+		if (PUGI_IMPL_NODETYPE(_root) == node_element && _root->value)
+			return _root->value;
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+		{
+			const char_t* ivalue = i->value;
+			if (impl::is_text_node(i) && ivalue)
+				return ivalue;
+		}
+
+		return PUGIXML_TEXT("");
+	}
+
+	PUGI_IMPL_FN const char_t* xml_node::child_value(const char_t* name_) const
+	{
+		return child(name_).child_value();
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::first_attribute() const
+	{
+		if (!_root) return xml_attribute();
+		return xml_attribute(_root->first_attribute);
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::last_attribute() const
+	{
+		if (!_root) return xml_attribute();
+		xml_attribute_struct* first = _root->first_attribute;
+		return first ? xml_attribute(first->prev_attribute_c) : xml_attribute();
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::first_child() const
+	{
+		if (!_root) return xml_node();
+		return xml_node(_root->first_child);
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::last_child() const
+	{
+		if (!_root) return xml_node();
+		xml_node_struct* first = _root->first_child;
+		return first ? xml_node(first->prev_sibling_c) : xml_node();
+	}
+
+	PUGI_IMPL_FN bool xml_node::set_name(const char_t* rhs)
+	{
+		xml_node_type type_ = _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
+
+		if (type_ != node_element && type_ != node_pi && type_ != node_declaration)
+			return false;
+
+		return impl::strcpy_insitu(_root->name, _root->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI_IMPL_FN bool xml_node::set_name(const char_t* rhs, size_t size)
+	{
+		xml_node_type type_ = _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
+
+		if (type_ != node_element && type_ != node_pi && type_ != node_declaration)
+			return false;
+
+		return impl::strcpy_insitu(_root->name, _root->header, impl::xml_memory_page_name_allocated_mask, rhs, size);
+	}
+
+	PUGI_IMPL_FN bool xml_node::set_value(const char_t* rhs)
+	{
+		xml_node_type type_ = _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
+
+		if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype)
+			return false;
+
+		return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI_IMPL_FN bool xml_node::set_value(const char_t* rhs, size_t size)
+	{
+		xml_node_type type_ = _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
+
+		if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype)
+			return false;
+
+		return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs, size);
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::append_attribute(const char_t* name_)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::append_attribute(a._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::prepend_attribute(const char_t* name_)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::prepend_attribute(a._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::insert_attribute_after(const char_t* name_, const xml_attribute& attr)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_after(a._attr, attr._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::insert_attribute_before(const char_t* name_, const xml_attribute& attr)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_before(a._attr, attr._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::append_copy(const xml_attribute& proto)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::append_attribute(a._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::prepend_copy(const xml_attribute& proto)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::prepend_attribute(a._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::insert_copy_after(const xml_attribute& proto, const xml_attribute& attr)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_after(a._attr, attr._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI_IMPL_FN xml_attribute xml_node::insert_copy_before(const xml_attribute& proto, const xml_attribute& attr)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_before(a._attr, attr._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::append_child(xml_node_type type_)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::append_node(n._root, _root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::prepend_child(xml_node_type type_)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::prepend_node(n._root, _root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::insert_child_before(xml_node_type type_, const xml_node& node)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_before(n._root, node._root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::insert_child_after(xml_node_type type_, const xml_node& node)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_after(n._root, node._root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::append_child(const char_t* name_)
+	{
+		xml_node result = append_child(node_element);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::prepend_child(const char_t* name_)
+	{
+		xml_node result = prepend_child(node_element);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::insert_child_after(const char_t* name_, const xml_node& node)
+	{
+		xml_node result = insert_child_after(node_element, node);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::insert_child_before(const char_t* name_, const xml_node& node)
+	{
+		xml_node result = insert_child_before(node_element, node);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::append_copy(const xml_node& proto)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::append_node(n._root, _root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::prepend_copy(const xml_node& proto)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::prepend_node(n._root, _root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::insert_copy_after(const xml_node& proto, const xml_node& node)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_after(n._root, node._root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::insert_copy_before(const xml_node& proto, const xml_node& node)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_before(n._root, node._root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::append_move(const xml_node& moved)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::append_node(moved._root, _root);
+
+		return moved;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::prepend_move(const xml_node& moved)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::prepend_node(moved._root, _root);
+
+		return moved;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::insert_move_after(const xml_node& moved, const xml_node& node)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+		if (moved._root == node._root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::insert_node_after(moved._root, node._root);
+
+		return moved;
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::insert_move_before(const xml_node& moved, const xml_node& node)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+		if (moved._root == node._root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::insert_node_before(moved._root, node._root);
+
+		return moved;
+	}
+
+	PUGI_IMPL_FN bool xml_node::remove_attribute(const char_t* name_)
+	{
+		return remove_attribute(attribute(name_));
+	}
+
+	PUGI_IMPL_FN bool xml_node::remove_attribute(const xml_attribute& a)
+	{
+		if (!_root || !a._attr) return false;
+		if (!impl::is_attribute_of(a._attr, _root)) return false;
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return false;
+
+		impl::remove_attribute(a._attr, _root);
+		impl::destroy_attribute(a._attr, alloc);
+
+		return true;
+	}
+
+	PUGI_IMPL_FN bool xml_node::remove_attributes()
+	{
+		if (!_root) return false;
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return false;
+
+		for (xml_attribute_struct* attr = _root->first_attribute; attr; )
+		{
+			xml_attribute_struct* next = attr->next_attribute;
+
+			impl::destroy_attribute(attr, alloc);
+
+			attr = next;
+		}
+
+		_root->first_attribute = 0;
+
+		return true;
+	}
+
+	PUGI_IMPL_FN bool xml_node::remove_child(const char_t* name_)
+	{
+		return remove_child(child(name_));
+	}
+
+	PUGI_IMPL_FN bool xml_node::remove_child(const xml_node& n)
+	{
+		if (!_root || !n._root || n._root->parent != _root) return false;
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return false;
+
+		impl::remove_node(n._root);
+		impl::destroy_node(n._root, alloc);
+
+		return true;
+	}
+
+	PUGI_IMPL_FN bool xml_node::remove_children()
+	{
+		if (!_root) return false;
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return false;
+
+		for (xml_node_struct* cur = _root->first_child; cur; )
+		{
+			xml_node_struct* next = cur->next_sibling;
+
+			impl::destroy_node(cur, alloc);
+
+			cur = next;
+		}
+
+		_root->first_child = 0;
+
+		return true;
+	}
+
+	PUGI_IMPL_FN xml_parse_result xml_node::append_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		// append_buffer is only valid for elements/documents
+		if (!impl::allow_insert_child(type(), node_element)) return impl::make_parse_result(status_append_invalid_root);
+
+		// append buffer can not merge PCDATA into existing PCDATA nodes
+		if ((options & parse_merge_pcdata) != 0 && last_child().type() == node_pcdata) return impl::make_parse_result(status_append_invalid_root);
+
+		// get document node
+		impl::xml_document_struct* doc = &impl::get_document(_root);
+
+		// disable document_buffer_order optimization since in a document with multiple buffers comparing buffer pointers does not make sense
+		doc->header |= impl::xml_memory_page_contents_shared_mask;
+
+		// get extra buffer element (we'll store the document fragment buffer there so that we can deallocate it later)
+		impl::xml_memory_page* page = 0;
+		impl::xml_extra_buffer* extra = static_cast<impl::xml_extra_buffer*>(doc->allocate_memory(sizeof(impl::xml_extra_buffer) + sizeof(void*), page));
+		(void)page;
+
+		if (!extra) return impl::make_parse_result(status_out_of_memory);
+
+	#ifdef PUGIXML_COMPACT
+		// align the memory block to a pointer boundary; this is required for compact mode where memory allocations are only 4b aligned
+		// note that this requires up to sizeof(void*)-1 additional memory, which the allocation above takes into account
+		extra = reinterpret_cast<impl::xml_extra_buffer*>((reinterpret_cast<uintptr_t>(extra) + (sizeof(void*) - 1)) & ~(sizeof(void*) - 1));
+	#endif
+
+		// add extra buffer to the list
+		extra->buffer = 0;
+		extra->next = doc->extra_buffers;
+		doc->extra_buffers = extra;
+
+		// name of the root has to be NULL before parsing - otherwise closing node mismatches will not be detected at the top level
+		impl::name_null_sentry sentry(_root);
+
+		return impl::load_buffer_impl(doc, _root, const_cast<void*>(contents), size, options, encoding, false, false, &extra->buffer);
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::find_child_by_attribute(const char_t* name_, const char_t* attr_name, const char_t* attr_value) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+		{
+			const char_t* iname = i->name;
+			if (iname && impl::strequal(name_, iname))
+			{
+				for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute)
+				{
+					const char_t* aname = a->name;
+					if (aname && impl::strequal(attr_name, aname))
+					{
+						const char_t* avalue = a->value;
+						if (impl::strequal(attr_value, avalue ? avalue : PUGIXML_TEXT("")))
+							return xml_node(i);
+					}
+				}
+			}
+		}
+
+		return xml_node();
+	}
+
+	PUGI_IMPL_FN xml_node xml_node::find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute)
+			{
+				const char_t* aname = a->name;
+				if (aname && impl::strequal(attr_name, aname))
+				{
+					const char_t* avalue = a->value;
+					if (impl::strequal(attr_value, avalue ? avalue : PUGIXML_TEXT("")))
+						return xml_node(i);
+				}
+			}
+
+		return xml_node();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI_IMPL_FN string_t xml_node::path(char_t delimiter) const
+	{
+		if (!_root) return string_t();
+
+		size_t offset = 0;
+
+		for (xml_node_struct* i = _root; i; i = i->parent)
+		{
+			const char_t* iname = i->name;
+			offset += (i != _root);
+			offset += iname ? impl::strlength(iname) : 0;
+		}
+
+		string_t result;
+		result.resize(offset);
+
+		for (xml_node_struct* j = _root; j; j = j->parent)
+		{
+			if (j != _root)
+				result[--offset] = delimiter;
+
+			const char_t* jname = j->name;
+			if (jname)
+			{
+				size_t length = impl::strlength(jname);
+
+				offset -= length;
+				memcpy(&result[offset], jname, length * sizeof(char_t));
+			}
+		}
+
+		assert(offset == 0);
+
+		return result;
+	}
+#endif
+
+	PUGI_IMPL_FN xml_node xml_node::first_element_by_path(const char_t* path_, char_t delimiter) const
+	{
+		xml_node context = path_[0] == delimiter ? root() : *this;
+
+		if (!context._root) return xml_node();
+
+		const char_t* path_segment = path_;
+
+		while (*path_segment == delimiter) ++path_segment;
+
+		const char_t* path_segment_end = path_segment;
+
+		while (*path_segment_end && *path_segment_end != delimiter) ++path_segment_end;
+
+		if (path_segment == path_segment_end) return context;
+
+		const char_t* next_segment = path_segment_end;
+
+		while (*next_segment == delimiter) ++next_segment;
+
+		if (*path_segment == '.' && path_segment + 1 == path_segment_end)
+			return context.first_element_by_path(next_segment, delimiter);
+		else if (*path_segment == '.' && *(path_segment+1) == '.' && path_segment + 2 == path_segment_end)
+			return context.parent().first_element_by_path(next_segment, delimiter);
+		else
+		{
+			for (xml_node_struct* j = context._root->first_child; j; j = j->next_sibling)
+			{
+				const char_t* jname = j->name;
+				if (jname && impl::strequalrange(jname, path_segment, static_cast<size_t>(path_segment_end - path_segment)))
+				{
+					xml_node subsearch = xml_node(j).first_element_by_path(next_segment, delimiter);
+
+					if (subsearch) return subsearch;
+				}
+			}
+
+			return xml_node();
+		}
+	}
+
+	PUGI_IMPL_FN bool xml_node::traverse(xml_tree_walker& walker)
+	{
+		walker._depth = -1;
+
+		xml_node arg_begin(_root);
+		if (!walker.begin(arg_begin)) return false;
+
+		xml_node_struct* cur = _root ? _root->first_child + 0 : 0;
+
+		if (cur)
+		{
+			++walker._depth;
+
+			do
+			{
+				xml_node arg_for_each(cur);
+				if (!walker.for_each(arg_for_each))
+					return false;
+
+				if (cur->first_child)
+				{
+					++walker._depth;
+					cur = cur->first_child;
+				}
+				else if (cur->next_sibling)
+					cur = cur->next_sibling;
+				else
+				{
+					while (!cur->next_sibling && cur != _root && cur->parent)
+					{
+						--walker._depth;
+						cur = cur->parent;
+					}
+
+					if (cur != _root)
+						cur = cur->next_sibling;
+				}
+			}
+			while (cur && cur != _root);
+		}
+
+		assert(walker._depth == -1);
+
+		xml_node arg_end(_root);
+		return walker.end(arg_end);
+	}
+
+	PUGI_IMPL_FN size_t xml_node::hash_value() const
+	{
+		return static_cast<size_t>(reinterpret_cast<uintptr_t>(_root) / sizeof(xml_node_struct));
+	}
+
+	PUGI_IMPL_FN xml_node_struct* xml_node::internal_object() const
+	{
+		return _root;
+	}
+
+	PUGI_IMPL_FN void xml_node::print(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
+	{
+		if (!_root) return;
+
+		impl::xml_buffered_writer buffered_writer(writer, encoding);
+
+		impl::node_output(buffered_writer, _root, indent, flags, depth);
+
+		buffered_writer.flush();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI_IMPL_FN void xml_node::print(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
+	{
+		xml_writer_stream writer(stream);
+
+		print(writer, indent, flags, encoding, depth);
+	}
+
+	PUGI_IMPL_FN void xml_node::print(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent, unsigned int flags, unsigned int depth) const
+	{
+		xml_writer_stream writer(stream);
+
+		print(writer, indent, flags, encoding_wchar, depth);
+	}
+#endif
+
+	PUGI_IMPL_FN ptrdiff_t xml_node::offset_debug() const
+	{
+		if (!_root) return -1;
+
+		impl::xml_document_struct& doc = impl::get_document(_root);
+
+		// we can determine the offset reliably only if there is exactly once parse buffer
+		if (!doc.buffer || doc.extra_buffers) return -1;
+
+		switch (type())
+		{
+		case node_document:
+			return 0;
+
+		case node_element:
+		case node_declaration:
+		case node_pi:
+			return _root->name && (_root->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0 ? _root->name - doc.buffer : -1;
+
+		case node_pcdata:
+		case node_cdata:
+		case node_comment:
+		case node_doctype:
+			return _root->value && (_root->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0 ? _root->value - doc.buffer : -1;
+
+		default:
+			assert(false && "Invalid node type"); // unreachable
+			return -1;
+		}
+	}
+
+#ifdef __BORLANDC__
+	PUGI_IMPL_FN bool operator&&(const xml_node& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI_IMPL_FN bool operator||(const xml_node& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI_IMPL_FN xml_text::xml_text(xml_node_struct* root): _root(root)
+	{
+	}
+
+	PUGI_IMPL_FN xml_node_struct* xml_text::_data() const
+	{
+		if (!_root || impl::is_text_node(_root)) return _root;
+
+		// element nodes can have value if parse_embed_pcdata was used
+		if (PUGI_IMPL_NODETYPE(_root) == node_element && _root->value)
+			return _root;
+
+		for (xml_node_struct* node = _root->first_child; node; node = node->next_sibling)
+			if (impl::is_text_node(node))
+				return node;
+
+		return 0;
+	}
+
+	PUGI_IMPL_FN xml_node_struct* xml_text::_data_new()
+	{
+		xml_node_struct* d = _data();
+		if (d) return d;
+
+		return xml_node(_root).append_child(node_pcdata).internal_object();
+	}
+
+	PUGI_IMPL_FN xml_text::xml_text(): _root(0)
+	{
+	}
+
+	PUGI_IMPL_FN static void unspecified_bool_xml_text(xml_text***)
+	{
+	}
+
+	PUGI_IMPL_FN xml_text::operator xml_text::unspecified_bool_type() const
+	{
+		return _data() ? unspecified_bool_xml_text : 0;
+	}
+
+	PUGI_IMPL_FN bool xml_text::operator!() const
+	{
+		return !_data();
+	}
+
+	PUGI_IMPL_FN bool xml_text::empty() const
+	{
+		return _data() == 0;
+	}
+
+	PUGI_IMPL_FN const char_t* xml_text::get() const
+	{
+		xml_node_struct* d = _data();
+		if (!d) return PUGIXML_TEXT("");
+		const char_t* value = d->value;
+		return value ? value : PUGIXML_TEXT("");
+	}
+
+	PUGI_IMPL_FN const char_t* xml_text::as_string(const char_t* def) const
+	{
+		xml_node_struct* d = _data();
+		if (!d) return def;
+		const char_t* value = d->value;
+		return value ? value : def;
+	}
+
+	PUGI_IMPL_FN int xml_text::as_int(int def) const
+	{
+		xml_node_struct* d = _data();
+		if (!d) return def;
+		const char_t* value = d->value;
+		return value ? impl::get_value_int(value) : def;
+	}
+
+	PUGI_IMPL_FN unsigned int xml_text::as_uint(unsigned int def) const
+	{
+		xml_node_struct* d = _data();
+		if (!d) return def;
+		const char_t* value = d->value;
+		return value ? impl::get_value_uint(value) : def;
+	}
+
+	PUGI_IMPL_FN double xml_text::as_double(double def) const
+	{
+		xml_node_struct* d = _data();
+		if (!d) return def;
+		const char_t* value = d->value;
+		return value ? impl::get_value_double(value) : def;
+	}
+
+	PUGI_IMPL_FN float xml_text::as_float(float def) const
+	{
+		xml_node_struct* d = _data();
+		if (!d) return def;
+		const char_t* value = d->value;
+		return value ? impl::get_value_float(value) : def;
+	}
+
+	PUGI_IMPL_FN bool xml_text::as_bool(bool def) const
+	{
+		xml_node_struct* d = _data();
+		if (!d) return def;
+		const char_t* value = d->value;
+		return value ? impl::get_value_bool(value) : def;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI_IMPL_FN long long xml_text::as_llong(long long def) const
+	{
+		xml_node_struct* d = _data();
+		if (!d) return def;
+		const char_t* value = d->value;
+		return value ? impl::get_value_llong(value) : def;
+	}
+
+	PUGI_IMPL_FN unsigned long long xml_text::as_ullong(unsigned long long def) const
+	{
+		xml_node_struct* d = _data();
+		if (!d) return def;
+		const char_t* value = d->value;
+		return value ? impl::get_value_ullong(value) : def;
+	}
+#endif
+
+	PUGI_IMPL_FN bool xml_text::set(const char_t* rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs)) : false;
+	}
+
+	PUGI_IMPL_FN bool xml_text::set(const char_t* rhs, size_t size)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, size) : false;
+	}
+
+	PUGI_IMPL_FN bool xml_text::set(int rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned int>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
+	}
+
+	PUGI_IMPL_FN bool xml_text::set(unsigned int rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned int>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
+	}
+
+	PUGI_IMPL_FN bool xml_text::set(long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
+	}
+
+	PUGI_IMPL_FN bool xml_text::set(unsigned long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
+	}
+
+	PUGI_IMPL_FN bool xml_text::set(float rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, default_float_precision) : false;
+	}
+
+	PUGI_IMPL_FN bool xml_text::set(float rhs, int precision)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, precision) : false;
+	}
+
+	PUGI_IMPL_FN bool xml_text::set(double rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, default_double_precision) : false;
+	}
+
+	PUGI_IMPL_FN bool xml_text::set(double rhs, int precision)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, precision) : false;
+	}
+
+	PUGI_IMPL_FN bool xml_text::set(bool rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_bool(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI_IMPL_FN bool xml_text::set(long long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
+	}
+
+	PUGI_IMPL_FN bool xml_text::set(unsigned long long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
+	}
+#endif
+
+	PUGI_IMPL_FN xml_text& xml_text::operator=(const char_t* rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_text& xml_text::operator=(int rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_text& xml_text::operator=(unsigned int rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_text& xml_text::operator=(long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_text& xml_text::operator=(unsigned long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_text& xml_text::operator=(double rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_text& xml_text::operator=(float rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_text& xml_text::operator=(bool rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI_IMPL_FN xml_text& xml_text::operator=(long long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_text& xml_text::operator=(unsigned long long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+#endif
+
+	PUGI_IMPL_FN xml_node xml_text::data() const
+	{
+		return xml_node(_data());
+	}
+
+#ifdef __BORLANDC__
+	PUGI_IMPL_FN bool operator&&(const xml_text& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI_IMPL_FN bool operator||(const xml_text& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI_IMPL_FN xml_node_iterator::xml_node_iterator()
+	{
+	}
+
+	PUGI_IMPL_FN xml_node_iterator::xml_node_iterator(const xml_node& node): _wrap(node), _parent(node.parent())
+	{
+	}
+
+	PUGI_IMPL_FN xml_node_iterator::xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
+	{
+	}
+
+	PUGI_IMPL_FN bool xml_node_iterator::operator==(const xml_node_iterator& rhs) const
+	{
+		return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root;
+	}
+
+	PUGI_IMPL_FN bool xml_node_iterator::operator!=(const xml_node_iterator& rhs) const
+	{
+		return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root;
+	}
+
+	PUGI_IMPL_FN xml_node& xml_node_iterator::operator*() const
+	{
+		assert(_wrap._root);
+		return _wrap;
+	}
+
+	PUGI_IMPL_FN xml_node* xml_node_iterator::operator->() const
+	{
+		assert(_wrap._root);
+		return const_cast<xml_node*>(&_wrap); // BCC5 workaround
+	}
+
+	PUGI_IMPL_FN xml_node_iterator& xml_node_iterator::operator++()
+	{
+		assert(_wrap._root);
+		_wrap._root = _wrap._root->next_sibling;
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_node_iterator xml_node_iterator::operator++(int)
+	{
+		xml_node_iterator temp = *this;
+		++*this;
+		return temp;
+	}
+
+	PUGI_IMPL_FN xml_node_iterator& xml_node_iterator::operator--()
+	{
+		_wrap = _wrap._root ? _wrap.previous_sibling() : _parent.last_child();
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_node_iterator xml_node_iterator::operator--(int)
+	{
+		xml_node_iterator temp = *this;
+		--*this;
+		return temp;
+	}
+
+	PUGI_IMPL_FN xml_attribute_iterator::xml_attribute_iterator()
+	{
+	}
+
+	PUGI_IMPL_FN xml_attribute_iterator::xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent): _wrap(attr), _parent(parent)
+	{
+	}
+
+	PUGI_IMPL_FN xml_attribute_iterator::xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
+	{
+	}
+
+	PUGI_IMPL_FN bool xml_attribute_iterator::operator==(const xml_attribute_iterator& rhs) const
+	{
+		return _wrap._attr == rhs._wrap._attr && _parent._root == rhs._parent._root;
+	}
+
+	PUGI_IMPL_FN bool xml_attribute_iterator::operator!=(const xml_attribute_iterator& rhs) const
+	{
+		return _wrap._attr != rhs._wrap._attr || _parent._root != rhs._parent._root;
+	}
+
+	PUGI_IMPL_FN xml_attribute& xml_attribute_iterator::operator*() const
+	{
+		assert(_wrap._attr);
+		return _wrap;
+	}
+
+	PUGI_IMPL_FN xml_attribute* xml_attribute_iterator::operator->() const
+	{
+		assert(_wrap._attr);
+		return const_cast<xml_attribute*>(&_wrap); // BCC5 workaround
+	}
+
+	PUGI_IMPL_FN xml_attribute_iterator& xml_attribute_iterator::operator++()
+	{
+		assert(_wrap._attr);
+		_wrap._attr = _wrap._attr->next_attribute;
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_attribute_iterator xml_attribute_iterator::operator++(int)
+	{
+		xml_attribute_iterator temp = *this;
+		++*this;
+		return temp;
+	}
+
+	PUGI_IMPL_FN xml_attribute_iterator& xml_attribute_iterator::operator--()
+	{
+		_wrap = _wrap._attr ? _wrap.previous_attribute() : _parent.last_attribute();
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_attribute_iterator xml_attribute_iterator::operator--(int)
+	{
+		xml_attribute_iterator temp = *this;
+		--*this;
+		return temp;
+	}
+
+	PUGI_IMPL_FN xml_named_node_iterator::xml_named_node_iterator(): _name(0)
+	{
+	}
+
+	PUGI_IMPL_FN xml_named_node_iterator::xml_named_node_iterator(const xml_node& node, const char_t* name): _wrap(node), _parent(node.parent()), _name(name)
+	{
+	}
+
+	PUGI_IMPL_FN xml_named_node_iterator::xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name): _wrap(ref), _parent(parent), _name(name)
+	{
+	}
+
+	PUGI_IMPL_FN bool xml_named_node_iterator::operator==(const xml_named_node_iterator& rhs) const
+	{
+		return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root;
+	}
+
+	PUGI_IMPL_FN bool xml_named_node_iterator::operator!=(const xml_named_node_iterator& rhs) const
+	{
+		return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root;
+	}
+
+	PUGI_IMPL_FN xml_node& xml_named_node_iterator::operator*() const
+	{
+		assert(_wrap._root);
+		return _wrap;
+	}
+
+	PUGI_IMPL_FN xml_node* xml_named_node_iterator::operator->() const
+	{
+		assert(_wrap._root);
+		return const_cast<xml_node*>(&_wrap); // BCC5 workaround
+	}
+
+	PUGI_IMPL_FN xml_named_node_iterator& xml_named_node_iterator::operator++()
+	{
+		assert(_wrap._root);
+		_wrap = _wrap.next_sibling(_name);
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_named_node_iterator xml_named_node_iterator::operator++(int)
+	{
+		xml_named_node_iterator temp = *this;
+		++*this;
+		return temp;
+	}
+
+	PUGI_IMPL_FN xml_named_node_iterator& xml_named_node_iterator::operator--()
+	{
+		if (_wrap._root)
+			_wrap = _wrap.previous_sibling(_name);
+		else
+		{
+			_wrap = _parent.last_child();
+
+			if (!impl::strequal(_wrap.name(), _name))
+				_wrap = _wrap.previous_sibling(_name);
+		}
+
+		return *this;
+	}
+
+	PUGI_IMPL_FN xml_named_node_iterator xml_named_node_iterator::operator--(int)
+	{
+		xml_named_node_iterator temp = *this;
+		--*this;
+		return temp;
+	}
+
+	PUGI_IMPL_FN xml_parse_result::xml_parse_result(): status(status_internal_error), offset(0), encoding(encoding_auto)
+	{
+	}
+
+	PUGI_IMPL_FN xml_parse_result::operator bool() const
+	{
+		return status == status_ok;
+	}
+
+	PUGI_IMPL_FN const char* xml_parse_result::description() const
+	{
+		switch (status)
+		{
+		case status_ok: return "No error";
+
+		case status_file_not_found: return "File was not found";
+		case status_io_error: return "Error reading from file/stream";
+		case status_out_of_memory: return "Could not allocate memory";
+		case status_internal_error: return "Internal error occurred";
+
+		case status_unrecognized_tag: return "Could not determine tag type";
+
+		case status_bad_pi: return "Error parsing document declaration/processing instruction";
+		case status_bad_comment: return "Error parsing comment";
+		case status_bad_cdata: return "Error parsing CDATA section";
+		case status_bad_doctype: return "Error parsing document type declaration";
+		case status_bad_pcdata: return "Error parsing PCDATA section";
+		case status_bad_start_element: return "Error parsing start element tag";
+		case status_bad_attribute: return "Error parsing element attribute";
+		case status_bad_end_element: return "Error parsing end element tag";
+		case status_end_element_mismatch: return "Start-end tags mismatch";
+
+		case status_append_invalid_root: return "Unable to append nodes: root is not an element or document";
+
+		case status_no_document_element: return "No document element found";
+
+		default: return "Unknown error";
+		}
+	}
+
+	PUGI_IMPL_FN xml_document::xml_document(): _buffer(0)
+	{
+		_create();
+	}
+
+	PUGI_IMPL_FN xml_document::~xml_document()
+	{
+		_destroy();
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI_IMPL_FN xml_document::xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT: _buffer(0)
+	{
+		_create();
+		_move(rhs);
+	}
+
+	PUGI_IMPL_FN xml_document& xml_document::operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
+	{
+		if (this == &rhs) return *this;
+
+		_destroy();
+		_create();
+		_move(rhs);
+
+		return *this;
+	}
+#endif
+
+	PUGI_IMPL_FN void xml_document::reset()
+	{
+		_destroy();
+		_create();
+	}
+
+	PUGI_IMPL_FN void xml_document::reset(const xml_document& proto)
+	{
+		reset();
+
+		impl::node_copy_tree(_root, proto._root);
+	}
+
+	PUGI_IMPL_FN void xml_document::_create()
+	{
+		assert(!_root);
+
+	#ifdef PUGIXML_COMPACT
+		// space for page marker for the first page (uint32_t), rounded up to pointer size; assumes pointers are at least 32-bit
+		const size_t page_offset = sizeof(void*);
+	#else
+		const size_t page_offset = 0;
+	#endif
+
+		// initialize sentinel page
+		PUGI_IMPL_STATIC_ASSERT(sizeof(impl::xml_memory_page) + sizeof(impl::xml_document_struct) + page_offset <= sizeof(_memory));
+
+		// prepare page structure
+		impl::xml_memory_page* page = impl::xml_memory_page::construct(_memory);
+		assert(page);
+
+		page->busy_size = impl::xml_memory_page_size;
+
+		// setup first page marker
+	#ifdef PUGIXML_COMPACT
+		// round-trip through void* to avoid 'cast increases required alignment of target type' warning
+		page->compact_page_marker = reinterpret_cast<uint32_t*>(static_cast<void*>(reinterpret_cast<char*>(page) + sizeof(impl::xml_memory_page)));
+		*page->compact_page_marker = sizeof(impl::xml_memory_page);
+	#endif
+
+		// allocate new root
+		_root = new (reinterpret_cast<char*>(page) + sizeof(impl::xml_memory_page) + page_offset) impl::xml_document_struct(page);
+		_root->prev_sibling_c = _root;
+
+		// setup sentinel page
+		page->allocator = static_cast<impl::xml_document_struct*>(_root);
+
+		// setup hash table pointer in allocator
+	#ifdef PUGIXML_COMPACT
+		page->allocator->_hash = &static_cast<impl::xml_document_struct*>(_root)->hash;
+	#endif
+
+		// verify the document allocation
+		assert(reinterpret_cast<char*>(_root) + sizeof(impl::xml_document_struct) <= _memory + sizeof(_memory));
+	}
+
+	PUGI_IMPL_FN void xml_document::_destroy()
+	{
+		assert(_root);
+
+		// destroy static storage
+		if (_buffer)
+		{
+			impl::xml_memory::deallocate(_buffer);
+			_buffer = 0;
+		}
+
+		// destroy extra buffers (note: no need to destroy linked list nodes, they're allocated using document allocator)
+		for (impl::xml_extra_buffer* extra = static_cast<impl::xml_document_struct*>(_root)->extra_buffers; extra; extra = extra->next)
+		{
+			if (extra->buffer) impl::xml_memory::deallocate(extra->buffer);
+		}
+
+		// destroy dynamic storage, leave sentinel page (it's in static memory)
+		impl::xml_memory_page* root_page = PUGI_IMPL_GETPAGE(_root);
+		assert(root_page && !root_page->prev);
+		assert(reinterpret_cast<char*>(root_page) >= _memory && reinterpret_cast<char*>(root_page) < _memory + sizeof(_memory));
+
+		for (impl::xml_memory_page* page = root_page->next; page; )
+		{
+			impl::xml_memory_page* next = page->next;
+
+			impl::xml_allocator::deallocate_page(page);
+
+			page = next;
+		}
+
+	#ifdef PUGIXML_COMPACT
+		// destroy hash table
+		static_cast<impl::xml_document_struct*>(_root)->hash.clear();
+	#endif
+
+		_root = 0;
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI_IMPL_FN void xml_document::_move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
+	{
+		impl::xml_document_struct* doc = static_cast<impl::xml_document_struct*>(_root);
+		impl::xml_document_struct* other = static_cast<impl::xml_document_struct*>(rhs._root);
+
+		// save first child pointer for later; this needs hash access
+		xml_node_struct* other_first_child = other->first_child;
+
+	#ifdef PUGIXML_COMPACT
+		// reserve space for the hash table up front; this is the only operation that can fail
+		// if it does, we have no choice but to throw (if we have exceptions)
+		if (other_first_child)
+		{
+			size_t other_children = 0;
+			for (xml_node_struct* node = other_first_child; node; node = node->next_sibling)
+				other_children++;
+
+			// in compact mode, each pointer assignment could result in a hash table request
+			// during move, we have to relocate document first_child and parents of all children
+			// normally there's just one child and its parent has a pointerless encoding but
+			// we assume the worst here
+			if (!other->_hash->reserve(other_children + 1))
+			{
+			#ifdef PUGIXML_NO_EXCEPTIONS
+				return;
+			#else
+				throw std::bad_alloc();
+			#endif
+			}
+		}
+	#endif
+
+		// move allocation state
+		// note that other->_root may point to the embedded document page, in which case we should keep original (empty) state
+		if (other->_root != PUGI_IMPL_GETPAGE(other))
+		{
+			doc->_root = other->_root;
+			doc->_busy_size = other->_busy_size;
+		}
+
+		// move buffer state
+		doc->buffer = other->buffer;
+		doc->extra_buffers = other->extra_buffers;
+		_buffer = rhs._buffer;
+
+	#ifdef PUGIXML_COMPACT
+		// move compact hash; note that the hash table can have pointers to other but they will be "inactive", similarly to nodes removed with remove_child
+		doc->hash = other->hash;
+		doc->_hash = &doc->hash;
+
+		// make sure we don't access other hash up until the end when we reinitialize other document
+		other->_hash = 0;
+	#endif
+
+		// move page structure
+		impl::xml_memory_page* doc_page = PUGI_IMPL_GETPAGE(doc);
+		assert(doc_page && !doc_page->prev && !doc_page->next);
+
+		impl::xml_memory_page* other_page = PUGI_IMPL_GETPAGE(other);
+		assert(other_page && !other_page->prev);
+
+		// relink pages since root page is embedded into xml_document
+		if (impl::xml_memory_page* page = other_page->next)
+		{
+			assert(page->prev == other_page);
+
+			page->prev = doc_page;
+
+			doc_page->next = page;
+			other_page->next = 0;
+		}
+
+		// make sure pages point to the correct document state
+		for (impl::xml_memory_page* page = doc_page->next; page; page = page->next)
+		{
+			assert(page->allocator == other);
+
+			page->allocator = doc;
+
+		#ifdef PUGIXML_COMPACT
+			// this automatically migrates most children between documents and prevents ->parent assignment from allocating
+			if (page->compact_shared_parent == other)
+				page->compact_shared_parent = doc;
+		#endif
+		}
+
+		// move tree structure
+		assert(!doc->first_child);
+
+		doc->first_child = other_first_child;
+
+		for (xml_node_struct* node = other_first_child; node; node = node->next_sibling)
+		{
+		#ifdef PUGIXML_COMPACT
+			// most children will have migrated when we reassigned compact_shared_parent
+			assert(node->parent == other || node->parent == doc);
+
+			node->parent = doc;
+		#else
+			assert(node->parent == other);
+			node->parent = doc;
+		#endif
+		}
+
+		// reset other document
+		new (other) impl::xml_document_struct(PUGI_IMPL_GETPAGE(other));
+		rhs._buffer = 0;
+	}
+#endif
+
+#ifndef PUGIXML_NO_STL
+	PUGI_IMPL_FN xml_parse_result xml_document::load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_stream_impl(static_cast<impl::xml_document_struct*>(_root), stream, options, encoding, &_buffer);
+	}
+
+	PUGI_IMPL_FN xml_parse_result xml_document::load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options)
+	{
+		reset();
+
+		return impl::load_stream_impl(static_cast<impl::xml_document_struct*>(_root), stream, options, encoding_wchar, &_buffer);
+	}
+#endif
+
+	PUGI_IMPL_FN xml_parse_result xml_document::load_string(const char_t* contents, unsigned int options)
+	{
+		// Force native encoding (skip autodetection)
+	#ifdef PUGIXML_WCHAR_MODE
+		xml_encoding encoding = encoding_wchar;
+	#else
+		xml_encoding encoding = encoding_utf8;
+	#endif
+
+		return load_buffer(contents, impl::strlength(contents) * sizeof(char_t), options, encoding);
+	}
+
+	PUGI_IMPL_FN xml_parse_result xml_document::load(const char_t* contents, unsigned int options)
+	{
+		return load_string(contents, options);
+	}
+
+	PUGI_IMPL_FN xml_parse_result xml_document::load_file(const char* path_, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(impl::open_file(path_, "rb"), impl::close_file);
+
+		return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
+	}
+
+	PUGI_IMPL_FN xml_parse_result xml_document::load_file(const wchar_t* path_, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(impl::open_file_wide(path_, L"rb"), impl::close_file);
+
+		return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
+	}
+
+	PUGI_IMPL_FN xml_parse_result xml_document::load_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, const_cast<void*>(contents), size, options, encoding, false, false, &_buffer);
+	}
+
+	PUGI_IMPL_FN xml_parse_result xml_document::load_buffer_inplace(void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, false, &_buffer);
+	}
+
+	PUGI_IMPL_FN xml_parse_result xml_document::load_buffer_inplace_own(void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, true, &_buffer);
+	}
+
+	PUGI_IMPL_FN void xml_document::save(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		impl::xml_buffered_writer buffered_writer(writer, encoding);
+
+		if ((flags & format_write_bom) && encoding != encoding_latin1)
+		{
+			// BOM always represents the codepoint U+FEFF, so just write it in native encoding
+		#ifdef PUGIXML_WCHAR_MODE
+			unsigned int bom = 0xfeff;
+			buffered_writer.write(static_cast<wchar_t>(bom));
+		#else
+			buffered_writer.write('\xef', '\xbb', '\xbf');
+		#endif
+		}
+
+		if (!(flags & format_no_declaration) && !impl::has_declaration(_root))
+		{
+			buffered_writer.write_string(PUGIXML_TEXT("<?xml version=\"1.0\""));
+			if (encoding == encoding_latin1) buffered_writer.write_string(PUGIXML_TEXT(" encoding=\"ISO-8859-1\""));
+			buffered_writer.write('?', '>');
+			if (!(flags & format_raw)) buffered_writer.write('\n');
+		}
+
+		impl::node_output(buffered_writer, _root, indent, flags, 0);
+
+		buffered_writer.flush();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI_IMPL_FN void xml_document::save(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		xml_writer_stream writer(stream);
+
+		save(writer, indent, flags, encoding);
+	}
+
+	PUGI_IMPL_FN void xml_document::save(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent, unsigned int flags) const
+	{
+		xml_writer_stream writer(stream);
+
+		save(writer, indent, flags, encoding_wchar);
+	}
+#endif
+
+	PUGI_IMPL_FN bool xml_document::save_file(const char* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(impl::open_file(path_, (flags & format_save_file_text) ? "w" : "wb"), impl::close_file);
+
+		return impl::save_file_impl(*this, file.data, indent, flags, encoding) && fclose(file.release()) == 0;
+	}
+
+	PUGI_IMPL_FN bool xml_document::save_file(const wchar_t* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(impl::open_file_wide(path_, (flags & format_save_file_text) ? L"w" : L"wb"), impl::close_file);
+
+		return impl::save_file_impl(*this, file.data, indent, flags, encoding) && fclose(file.release()) == 0;
+	}
+
+	PUGI_IMPL_FN xml_node xml_document::document_element() const
+	{
+		assert(_root);
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			if (PUGI_IMPL_NODETYPE(i) == node_element)
+				return xml_node(i);
+
+		return xml_node();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI_IMPL_FN std::string PUGIXML_FUNCTION as_utf8(const wchar_t* str)
+	{
+		assert(str);
+
+		return impl::as_utf8_impl(str, impl::strlength_wide(str));
+	}
+
+	PUGI_IMPL_FN std::string PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t>& str)
+	{
+		return impl::as_utf8_impl(str.c_str(), str.size());
+	}
+
+	PUGI_IMPL_FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const char* str)
+	{
+		assert(str);
+
+		return impl::as_wide_impl(str, strlen(str));
+	}
+
+	PUGI_IMPL_FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const std::string& str)
+	{
+		return impl::as_wide_impl(str.c_str(), str.size());
+	}
+#endif
+
+	PUGI_IMPL_FN void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate)
+	{
+		impl::xml_memory::allocate = allocate;
+		impl::xml_memory::deallocate = deallocate;
+	}
+
+	PUGI_IMPL_FN allocation_function PUGIXML_FUNCTION get_memory_allocation_function()
+	{
+		return impl::xml_memory::allocate;
+	}
+
+	PUGI_IMPL_FN deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function()
+	{
+		return impl::xml_memory::deallocate;
+	}
+}
+
+#if !defined(PUGIXML_NO_STL) && (defined(_MSC_VER) || defined(__ICC))
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier)
+	PUGI_IMPL_FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI_IMPL_FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_attribute_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI_IMPL_FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_named_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+}
+#endif
+
+#if !defined(PUGIXML_NO_STL) && defined(__SUNPRO_CC)
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection
+	PUGI_IMPL_FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI_IMPL_FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_attribute_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI_IMPL_FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_named_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+}
+#endif
+
+#ifndef PUGIXML_NO_XPATH
+// STL replacements
+PUGI_IMPL_NS_BEGIN
+	struct equal_to
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs == rhs;
+		}
+	};
+
+	struct not_equal_to
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs != rhs;
+		}
+	};
+
+	struct less
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs < rhs;
+		}
+	};
+
+	struct less_equal
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs <= rhs;
+		}
+	};
+
+	template <typename T> inline void swap(T& lhs, T& rhs)
+	{
+		T temp = lhs;
+		lhs = rhs;
+		rhs = temp;
+	}
+
+	template <typename I, typename Pred> PUGI_IMPL_FN I min_element(I begin, I end, const Pred& pred)
+	{
+		I result = begin;
+
+		for (I it = begin + 1; it != end; ++it)
+			if (pred(*it, *result))
+				result = it;
+
+		return result;
+	}
+
+	template <typename I> PUGI_IMPL_FN void reverse(I begin, I end)
+	{
+		while (end - begin > 1)
+			swap(*begin++, *--end);
+	}
+
+	template <typename I> PUGI_IMPL_FN I unique(I begin, I end)
+	{
+		// fast skip head
+		while (end - begin > 1 && *begin != *(begin + 1))
+			begin++;
+
+		if (begin == end)
+			return begin;
+
+		// last written element
+		I write = begin++;
+
+		// merge unique elements
+		while (begin != end)
+		{
+			if (*begin != *write)
+				*++write = *begin++;
+			else
+				begin++;
+		}
+
+		// past-the-end (write points to live element)
+		return write + 1;
+	}
+
+	template <typename T, typename Pred> PUGI_IMPL_FN void insertion_sort(T* begin, T* end, const Pred& pred)
+	{
+		if (begin == end)
+			return;
+
+		for (T* it = begin + 1; it != end; ++it)
+		{
+			T val = *it;
+			T* hole = it;
+
+			// move hole backwards
+			while (hole > begin && pred(val, *(hole - 1)))
+			{
+				*hole = *(hole - 1);
+				hole--;
+			}
+
+			// fill hole with element
+			*hole = val;
+		}
+	}
+
+	template <typename I, typename Pred> inline I median3(I first, I middle, I last, const Pred& pred)
+	{
+		if (pred(*middle, *first))
+			swap(middle, first);
+		if (pred(*last, *middle))
+			swap(last, middle);
+		if (pred(*middle, *first))
+			swap(middle, first);
+
+		return middle;
+	}
+
+	template <typename T, typename Pred> PUGI_IMPL_FN void partition3(T* begin, T* end, T pivot, const Pred& pred, T** out_eqbeg, T** out_eqend)
+	{
+		// invariant: array is split into 4 groups: = < ? > (each variable denotes the boundary between the groups)
+		T* eq = begin;
+		T* lt = begin;
+		T* gt = end;
+
+		while (lt < gt)
+		{
+			if (pred(*lt, pivot))
+				lt++;
+			else if (*lt == pivot)
+				swap(*eq++, *lt++);
+			else
+				swap(*lt, *--gt);
+		}
+
+		// we now have just 4 groups: = < >; move equal elements to the middle
+		T* eqbeg = gt;
+
+		for (T* it = begin; it != eq; ++it)
+			swap(*it, *--eqbeg);
+
+		*out_eqbeg = eqbeg;
+		*out_eqend = gt;
+	}
+
+	template <typename I, typename Pred> PUGI_IMPL_FN void sort(I begin, I end, const Pred& pred)
+	{
+		// sort large chunks
+		while (end - begin > 16)
+		{
+			// find median element
+			I middle = begin + (end - begin) / 2;
+			I median = median3(begin, middle, end - 1, pred);
+
+			// partition in three chunks (< = >)
+			I eqbeg, eqend;
+			partition3(begin, end, *median, pred, &eqbeg, &eqend);
+
+			// loop on larger half
+			if (eqbeg - begin > end - eqend)
+			{
+				sort(eqend, end, pred);
+				end = eqbeg;
+			}
+			else
+			{
+				sort(begin, eqbeg, pred);
+				begin = eqend;
+			}
+		}
+
+		// insertion sort small chunk
+		insertion_sort(begin, end, pred);
+	}
+
+	PUGI_IMPL_FN bool hash_insert(const void** table, size_t size, const void* key)
+	{
+		assert(key);
+
+		unsigned int h = static_cast<unsigned int>(reinterpret_cast<uintptr_t>(key));
+
+		// MurmurHash3 32-bit finalizer
+		h ^= h >> 16;
+		h *= 0x85ebca6bu;
+		h ^= h >> 13;
+		h *= 0xc2b2ae35u;
+		h ^= h >> 16;
+
+		size_t hashmod = size - 1;
+		size_t bucket = h & hashmod;
+
+		for (size_t probe = 0; probe <= hashmod; ++probe)
+		{
+			if (table[bucket] == 0)
+			{
+				table[bucket] = key;
+				return true;
+			}
+
+			if (table[bucket] == key)
+				return false;
+
+			// hash collision, quadratic probing
+			bucket = (bucket + probe + 1) & hashmod;
+		}
+
+		assert(false && "Hash table is full"); // unreachable
+		return false;
+	}
+PUGI_IMPL_NS_END
+
+// Allocator used for AST and evaluation stacks
+PUGI_IMPL_NS_BEGIN
+	static const size_t xpath_memory_page_size =
+	#ifdef PUGIXML_MEMORY_XPATH_PAGE_SIZE
+		PUGIXML_MEMORY_XPATH_PAGE_SIZE
+	#else
+		4096
+	#endif
+		;
+
+	static const uintptr_t xpath_memory_block_alignment = sizeof(double) > sizeof(void*) ? sizeof(double) : sizeof(void*);
+
+	struct xpath_memory_block
+	{
+		xpath_memory_block* next;
+		size_t capacity;
+
+		union
+		{
+			char data[xpath_memory_page_size];
+			double alignment;
+		};
+	};
+
+	struct xpath_allocator
+	{
+		xpath_memory_block* _root;
+		size_t _root_size;
+		bool* _error;
+
+		xpath_allocator(xpath_memory_block* root, bool* error = 0): _root(root), _root_size(0), _error(error)
+		{
+		}
+
+		void* allocate(size_t size)
+		{
+			// round size up to block alignment boundary
+			size = (size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
+
+			if (_root_size + size <= _root->capacity)
+			{
+				void* buf = &_root->data[0] + _root_size;
+				_root_size += size;
+				return buf;
+			}
+			else
+			{
+				// make sure we have at least 1/4th of the page free after allocation to satisfy subsequent allocation requests
+				size_t block_capacity_base = sizeof(_root->data);
+				size_t block_capacity_req = size + block_capacity_base / 4;
+				size_t block_capacity = (block_capacity_base > block_capacity_req) ? block_capacity_base : block_capacity_req;
+
+				size_t block_size = block_capacity + offsetof(xpath_memory_block, data);
+
+				xpath_memory_block* block = static_cast<xpath_memory_block*>(xml_memory::allocate(block_size));
+				if (!block)
+				{
+					if (_error) *_error = true;
+					return 0;
+				}
+
+				block->next = _root;
+				block->capacity = block_capacity;
+
+				_root = block;
+				_root_size = size;
+
+				return block->data;
+			}
+		}
+
+		void* reallocate(void* ptr, size_t old_size, size_t new_size)
+		{
+			// round size up to block alignment boundary
+			old_size = (old_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
+			new_size = (new_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
+
+			// we can only reallocate the last object
+			assert(ptr == 0 || static_cast<char*>(ptr) + old_size == &_root->data[0] + _root_size);
+
+			// try to reallocate the object inplace
+			if (ptr && _root_size - old_size + new_size <= _root->capacity)
+			{
+				_root_size = _root_size - old_size + new_size;
+				return ptr;
+			}
+
+			// allocate a new block
+			void* result = allocate(new_size);
+			if (!result) return 0;
+
+			// we have a new block
+			if (ptr)
+			{
+				// copy old data (we only support growing)
+				assert(new_size >= old_size);
+				memcpy(result, ptr, old_size);
+
+				// free the previous page if it had no other objects
+				assert(_root->data == result);
+				assert(_root->next);
+
+				if (_root->next->data == ptr)
+				{
+					// deallocate the whole page, unless it was the first one
+					xpath_memory_block* next = _root->next->next;
+
+					if (next)
+					{
+						xml_memory::deallocate(_root->next);
+						_root->next = next;
+					}
+				}
+			}
+
+			return result;
+		}
+
+		void revert(const xpath_allocator& state)
+		{
+			// free all new pages
+			xpath_memory_block* cur = _root;
+
+			while (cur != state._root)
+			{
+				xpath_memory_block* next = cur->next;
+
+				xml_memory::deallocate(cur);
+
+				cur = next;
+			}
+
+			// restore state
+			_root = state._root;
+			_root_size = state._root_size;
+		}
+
+		void release()
+		{
+			xpath_memory_block* cur = _root;
+			assert(cur);
+
+			while (cur->next)
+			{
+				xpath_memory_block* next = cur->next;
+
+				xml_memory::deallocate(cur);
+
+				cur = next;
+			}
+		}
+	};
+
+	struct xpath_allocator_capture
+	{
+		xpath_allocator_capture(xpath_allocator* alloc): _target(alloc), _state(*alloc)
+		{
+		}
+
+		~xpath_allocator_capture()
+		{
+			_target->revert(_state);
+		}
+
+		xpath_allocator* _target;
+		xpath_allocator _state;
+	};
+
+	struct xpath_stack
+	{
+		xpath_allocator* result;
+		xpath_allocator* temp;
+	};
+
+	struct xpath_stack_data
+	{
+		xpath_memory_block blocks[2];
+		xpath_allocator result;
+		xpath_allocator temp;
+		xpath_stack stack;
+		bool oom;
+
+		xpath_stack_data(): result(blocks + 0, &oom), temp(blocks + 1, &oom), oom(false)
+		{
+			blocks[0].next = blocks[1].next = 0;
+			blocks[0].capacity = blocks[1].capacity = sizeof(blocks[0].data);
+
+			stack.result = &result;
+			stack.temp = &temp;
+		}
+
+		~xpath_stack_data()
+		{
+			result.release();
+			temp.release();
+		}
+	};
+PUGI_IMPL_NS_END
+
+// String class
+PUGI_IMPL_NS_BEGIN
+	class xpath_string
+	{
+		const char_t* _buffer;
+		bool _uses_heap;
+		size_t _length_heap;
+
+		static char_t* duplicate_string(const char_t* string, size_t length, xpath_allocator* alloc)
+		{
+			char_t* result = static_cast<char_t*>(alloc->allocate((length + 1) * sizeof(char_t)));
+			if (!result) return 0;
+
+			memcpy(result, string, length * sizeof(char_t));
+			result[length] = 0;
+
+			return result;
+		}
+
+		xpath_string(const char_t* buffer, bool uses_heap_, size_t length_heap): _buffer(buffer), _uses_heap(uses_heap_), _length_heap(length_heap)
+		{
+		}
+
+	public:
+		static xpath_string from_const(const char_t* str)
+		{
+			return xpath_string(str, false, 0);
+		}
+
+		static xpath_string from_heap_preallocated(const char_t* begin, const char_t* end)
+		{
+			assert(begin <= end && *end == 0);
+
+			return xpath_string(begin, true, static_cast<size_t>(end - begin));
+		}
+
+		static xpath_string from_heap(const char_t* begin, const char_t* end, xpath_allocator* alloc)
+		{
+			assert(begin <= end);
+
+			if (begin == end)
+				return xpath_string();
+
+			size_t length = static_cast<size_t>(end - begin);
+			const char_t* data = duplicate_string(begin, length, alloc);
+
+			return data ? xpath_string(data, true, length) : xpath_string();
+		}
+
+		xpath_string(): _buffer(PUGIXML_TEXT("")), _uses_heap(false), _length_heap(0)
+		{
+		}
+
+		void append(const xpath_string& o, xpath_allocator* alloc)
+		{
+			// skip empty sources
+			if (!*o._buffer) return;
+
+			// fast append for constant empty target and constant source
+			if (!*_buffer && !_uses_heap && !o._uses_heap)
+			{
+				_buffer = o._buffer;
+			}
+			else
+			{
+				// need to make heap copy
+				size_t target_length = length();
+				size_t source_length = o.length();
+				size_t result_length = target_length + source_length;
+
+				// allocate new buffer
+				char_t* result = static_cast<char_t*>(alloc->reallocate(_uses_heap ? const_cast<char_t*>(_buffer) : 0, (target_length + 1) * sizeof(char_t), (result_length + 1) * sizeof(char_t)));
+				if (!result) return;
+
+				// append first string to the new buffer in case there was no reallocation
+				if (!_uses_heap) memcpy(result, _buffer, target_length * sizeof(char_t));
+
+				// append second string to the new buffer
+				memcpy(result + target_length, o._buffer, source_length * sizeof(char_t));
+				result[result_length] = 0;
+
+				// finalize
+				_buffer = result;
+				_uses_heap = true;
+				_length_heap = result_length;
+			}
+		}
+
+		const char_t* c_str() const
+		{
+			return _buffer;
+		}
+
+		size_t length() const
+		{
+			return _uses_heap ? _length_heap : strlength(_buffer);
+		}
+
+		char_t* data(xpath_allocator* alloc)
+		{
+			// make private heap copy
+			if (!_uses_heap)
+			{
+				size_t length_ = strlength(_buffer);
+				const char_t* data_ = duplicate_string(_buffer, length_, alloc);
+
+				if (!data_) return 0;
+
+				_buffer = data_;
+				_uses_heap = true;
+				_length_heap = length_;
+			}
+
+			return const_cast<char_t*>(_buffer);
+		}
+
+		bool empty() const
+		{
+			return *_buffer == 0;
+		}
+
+		bool operator==(const xpath_string& o) const
+		{
+			return strequal(_buffer, o._buffer);
+		}
+
+		bool operator!=(const xpath_string& o) const
+		{
+			return !strequal(_buffer, o._buffer);
+		}
+
+		bool uses_heap() const
+		{
+			return _uses_heap;
+		}
+	};
+PUGI_IMPL_NS_END
+
+PUGI_IMPL_NS_BEGIN
+	PUGI_IMPL_FN bool starts_with(const char_t* string, const char_t* pattern)
+	{
+		while (*pattern && *string == *pattern)
+		{
+			string++;
+			pattern++;
+		}
+
+		return *pattern == 0;
+	}
+
+	PUGI_IMPL_FN const char_t* find_char(const char_t* s, char_t c)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcschr(s, c);
+	#else
+		return strchr(s, c);
+	#endif
+	}
+
+	PUGI_IMPL_FN const char_t* find_substring(const char_t* s, const char_t* p)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		// MSVC6 wcsstr bug workaround (if s is empty it always returns 0)
+		return (*p == 0) ? s : wcsstr(s, p);
+	#else
+		return strstr(s, p);
+	#endif
+	}
+
+	// Converts symbol to lower case, if it is an ASCII one
+	PUGI_IMPL_FN char_t tolower_ascii(char_t ch)
+	{
+		return static_cast<unsigned int>(ch - 'A') < 26 ? static_cast<char_t>(ch | ' ') : ch;
+	}
+
+	PUGI_IMPL_FN xpath_string string_value(const xpath_node& na, xpath_allocator* alloc)
+	{
+		if (na.attribute())
+			return xpath_string::from_const(na.attribute().value());
+		else
+		{
+			xml_node n = na.node();
+
+			switch (n.type())
+			{
+			case node_pcdata:
+			case node_cdata:
+			case node_comment:
+			case node_pi:
+				return xpath_string::from_const(n.value());
+
+			case node_document:
+			case node_element:
+			{
+				xpath_string result;
+
+				// element nodes can have value if parse_embed_pcdata was used
+				if (n.value()[0])
+					result.append(xpath_string::from_const(n.value()), alloc);
+
+				xml_node cur = n.first_child();
+
+				while (cur && cur != n)
+				{
+					if (cur.type() == node_pcdata || cur.type() == node_cdata)
+						result.append(xpath_string::from_const(cur.value()), alloc);
+
+					if (cur.first_child())
+						cur = cur.first_child();
+					else if (cur.next_sibling())
+						cur = cur.next_sibling();
+					else
+					{
+						while (!cur.next_sibling() && cur != n)
+							cur = cur.parent();
+
+						if (cur != n) cur = cur.next_sibling();
+					}
+				}
+
+				return result;
+			}
+
+			default:
+				return xpath_string();
+			}
+		}
+	}
+
+	PUGI_IMPL_FN bool node_is_before_sibling(xml_node_struct* ln, xml_node_struct* rn)
+	{
+		assert(ln->parent == rn->parent);
+
+		// there is no common ancestor (the shared parent is null), nodes are from different documents
+		if (!ln->parent) return ln < rn;
+
+		// determine sibling order
+		xml_node_struct* ls = ln;
+		xml_node_struct* rs = rn;
+
+		while (ls && rs)
+		{
+			if (ls == rn) return true;
+			if (rs == ln) return false;
+
+			ls = ls->next_sibling;
+			rs = rs->next_sibling;
+		}
+
+		// if rn sibling chain ended ln must be before rn
+		return !rs;
+	}
+
+	PUGI_IMPL_FN bool node_is_before(xml_node_struct* ln, xml_node_struct* rn)
+	{
+		// find common ancestor at the same depth, if any
+		xml_node_struct* lp = ln;
+		xml_node_struct* rp = rn;
+
+		while (lp && rp && lp->parent != rp->parent)
+		{
+			lp = lp->parent;
+			rp = rp->parent;
+		}
+
+		// parents are the same!
+		if (lp && rp) return node_is_before_sibling(lp, rp);
+
+		// nodes are at different depths, need to normalize heights
+		bool left_higher = !lp;
+
+		while (lp)
+		{
+			lp = lp->parent;
+			ln = ln->parent;
+		}
+
+		while (rp)
+		{
+			rp = rp->parent;
+			rn = rn->parent;
+		}
+
+		// one node is the ancestor of the other
+		if (ln == rn) return left_higher;
+
+		// find common ancestor... again
+		while (ln->parent != rn->parent)
+		{
+			ln = ln->parent;
+			rn = rn->parent;
+		}
+
+		return node_is_before_sibling(ln, rn);
+	}
+
+	PUGI_IMPL_FN bool node_is_ancestor(xml_node_struct* parent, xml_node_struct* node)
+	{
+		while (node && node != parent) node = node->parent;
+
+		return parent && node == parent;
+	}
+
+	PUGI_IMPL_FN const void* document_buffer_order(const xpath_node& xnode)
+	{
+		xml_node_struct* node = xnode.node().internal_object();
+
+		if (node)
+		{
+			if ((get_document(node).header & xml_memory_page_contents_shared_mask) == 0)
+			{
+				if (node->name && (node->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0) return node->name;
+				if (node->value && (node->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return node->value;
+			}
+
+			return 0;
+		}
+
+		xml_attribute_struct* attr = xnode.attribute().internal_object();
+
+		if (attr)
+		{
+			if ((get_document(attr).header & xml_memory_page_contents_shared_mask) == 0)
+			{
+				if ((attr->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0) return attr->name;
+				if ((attr->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return attr->value;
+			}
+
+			return 0;
+		}
+
+		return 0;
+	}
+
+	struct document_order_comparator
+	{
+		bool operator()(const xpath_node& lhs, const xpath_node& rhs) const
+		{
+			// optimized document order based check
+			const void* lo = document_buffer_order(lhs);
+			const void* ro = document_buffer_order(rhs);
+
+			if (lo && ro) return lo < ro;
+
+			// slow comparison
+			xml_node ln = lhs.node(), rn = rhs.node();
+
+			// compare attributes
+			if (lhs.attribute() && rhs.attribute())
+			{
+				// shared parent
+				if (lhs.parent() == rhs.parent())
+				{
+					// determine sibling order
+					for (xml_attribute a = lhs.attribute(); a; a = a.next_attribute())
+						if (a == rhs.attribute())
+							return true;
+
+					return false;
+				}
+
+				// compare attribute parents
+				ln = lhs.parent();
+				rn = rhs.parent();
+			}
+			else if (lhs.attribute())
+			{
+				// attributes go after the parent element
+				if (lhs.parent() == rhs.node()) return false;
+
+				ln = lhs.parent();
+			}
+			else if (rhs.attribute())
+			{
+				// attributes go after the parent element
+				if (rhs.parent() == lhs.node()) return true;
+
+				rn = rhs.parent();
+			}
+
+			if (ln == rn) return false;
+
+			if (!ln || !rn) return ln < rn;
+
+			return node_is_before(ln.internal_object(), rn.internal_object());
+		}
+	};
+
+	PUGI_IMPL_FN double gen_nan()
+	{
+	#if defined(__STDC_IEC_559__) || ((FLT_RADIX - 0 == 2) && (FLT_MAX_EXP - 0 == 128) && (FLT_MANT_DIG - 0 == 24))
+		PUGI_IMPL_STATIC_ASSERT(sizeof(float) == sizeof(uint32_t));
+		typedef uint32_t UI; // BCC5 workaround
+		union { float f; UI i; } u;
+		u.i = 0x7fc00000;
+		return double(u.f);
+	#else
+		// fallback
+		const volatile double zero = 0.0;
+		return zero / zero;
+	#endif
+	}
+
+	PUGI_IMPL_FN bool is_nan(double value)
+	{
+	#if defined(PUGI_IMPL_MSVC_CRT_VERSION) || defined(__BORLANDC__)
+		return !!_isnan(value);
+	#elif defined(fpclassify) && defined(FP_NAN)
+		return fpclassify(value) == FP_NAN;
+	#else
+		// fallback
+		const volatile double v = value;
+		return v != v;
+	#endif
+	}
+
+	PUGI_IMPL_FN const char_t* convert_number_to_string_special(double value)
+	{
+	#if defined(PUGI_IMPL_MSVC_CRT_VERSION) || defined(__BORLANDC__)
+		if (_finite(value)) return (value == 0) ? PUGIXML_TEXT("0") : 0;
+		if (_isnan(value)) return PUGIXML_TEXT("NaN");
+		return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
+	#elif defined(fpclassify) && defined(FP_NAN) && defined(FP_INFINITE) && defined(FP_ZERO)
+		switch (fpclassify(value))
+		{
+		case FP_NAN:
+			return PUGIXML_TEXT("NaN");
+
+		case FP_INFINITE:
+			return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
+
+		case FP_ZERO:
+			return PUGIXML_TEXT("0");
+
+		default:
+			return 0;
+		}
+	#else
+		// fallback
+		const volatile double v = value;
+
+		if (v == 0) return PUGIXML_TEXT("0");
+		if (v != v) return PUGIXML_TEXT("NaN");
+		if (v * 2 == v) return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
+		return 0;
+	#endif
+	}
+
+	PUGI_IMPL_FN bool convert_number_to_boolean(double value)
+	{
+		return (value != 0 && !is_nan(value));
+	}
+
+	PUGI_IMPL_FN void truncate_zeros(char* begin, char* end)
+	{
+		while (begin != end && end[-1] == '0') end--;
+
+		*end = 0;
+	}
+
+	// gets mantissa digits in the form of 0.xxxxx with 0. implied and the exponent
+#if defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
+	PUGI_IMPL_FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
+	{
+		// get base values
+		int sign, exponent;
+		_ecvt_s(buffer, sizeof(buffer), value, DBL_DIG + 1, &exponent, &sign);
+
+		// truncate redundant zeros
+		truncate_zeros(buffer, buffer + strlen(buffer));
+
+		// fill results
+		*out_mantissa = buffer;
+		*out_exponent = exponent;
+	}
+#else
+	PUGI_IMPL_FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
+	{
+		// get a scientific notation value with IEEE DBL_DIG decimals
+		PUGI_IMPL_SNPRINTF(buffer, "%.*e", DBL_DIG, value);
+
+		// get the exponent (possibly negative)
+		char* exponent_string = strchr(buffer, 'e');
+		assert(exponent_string);
+
+		int exponent = atoi(exponent_string + 1);
+
+		// extract mantissa string: skip sign
+		char* mantissa = buffer[0] == '-' ? buffer + 1 : buffer;
+		assert(mantissa[0] != '0' && (mantissa[1] == '.' || mantissa[1] == ','));
+
+		// divide mantissa by 10 to eliminate integer part
+		mantissa[1] = mantissa[0];
+		mantissa++;
+		exponent++;
+
+		// remove extra mantissa digits and zero-terminate mantissa
+		truncate_zeros(mantissa, exponent_string);
+
+		// fill results
+		*out_mantissa = mantissa;
+		*out_exponent = exponent;
+	}
+#endif
+
+	PUGI_IMPL_FN xpath_string convert_number_to_string(double value, xpath_allocator* alloc)
+	{
+		// try special number conversion
+		const char_t* special = convert_number_to_string_special(value);
+		if (special) return xpath_string::from_const(special);
+
+		// get mantissa + exponent form
+		char mantissa_buffer[32];
+
+		char* mantissa;
+		int exponent;
+		convert_number_to_mantissa_exponent(value, mantissa_buffer, &mantissa, &exponent);
+
+		// allocate a buffer of suitable length for the number
+		size_t result_size = strlen(mantissa_buffer) + (exponent > 0 ? exponent : -exponent) + 4;
+		char_t* result = static_cast<char_t*>(alloc->allocate(sizeof(char_t) * result_size));
+		if (!result) return xpath_string();
+
+		// make the number!
+		char_t* s = result;
+
+		// sign
+		if (value < 0) *s++ = '-';
+
+		// integer part
+		if (exponent <= 0)
+		{
+			*s++ = '0';
+		}
+		else
+		{
+			while (exponent > 0)
+			{
+				assert(*mantissa == 0 || static_cast<unsigned int>(*mantissa - '0') <= 9);
+				*s++ = *mantissa ? *mantissa++ : '0';
+				exponent--;
+			}
+		}
+
+		// fractional part
+		if (*mantissa)
+		{
+			// decimal point
+			*s++ = '.';
+
+			// extra zeroes from negative exponent
+			while (exponent < 0)
+			{
+				*s++ = '0';
+				exponent++;
+			}
+
+			// extra mantissa digits
+			while (*mantissa)
+			{
+				assert(static_cast<unsigned int>(*mantissa - '0') <= 9);
+				*s++ = *mantissa++;
+			}
+		}
+
+		// zero-terminate
+		assert(s < result + result_size);
+		*s = 0;
+
+		return xpath_string::from_heap_preallocated(result, s);
+	}
+
+	PUGI_IMPL_FN bool check_string_to_number_format(const char_t* string)
+	{
+		// parse leading whitespace
+		while (PUGI_IMPL_IS_CHARTYPE(*string, ct_space)) ++string;
+
+		// parse sign
+		if (*string == '-') ++string;
+
+		if (!*string) return false;
+
+		// if there is no integer part, there should be a decimal part with at least one digit
+		if (!PUGI_IMPL_IS_CHARTYPEX(string[0], ctx_digit) && (string[0] != '.' || !PUGI_IMPL_IS_CHARTYPEX(string[1], ctx_digit))) return false;
+
+		// parse integer part
+		while (PUGI_IMPL_IS_CHARTYPEX(*string, ctx_digit)) ++string;
+
+		// parse decimal part
+		if (*string == '.')
+		{
+			++string;
+
+			while (PUGI_IMPL_IS_CHARTYPEX(*string, ctx_digit)) ++string;
+		}
+
+		// parse trailing whitespace
+		while (PUGI_IMPL_IS_CHARTYPE(*string, ct_space)) ++string;
+
+		return *string == 0;
+	}
+
+	PUGI_IMPL_FN double convert_string_to_number(const char_t* string)
+	{
+		// check string format
+		if (!check_string_to_number_format(string)) return gen_nan();
+
+		// parse string
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcstod(string, 0);
+	#else
+		return strtod(string, 0);
+	#endif
+	}
+
+	PUGI_IMPL_FN bool convert_string_to_number_scratch(char_t (&buffer)[32], const char_t* begin, const char_t* end, double* out_result)
+	{
+		size_t length = static_cast<size_t>(end - begin);
+		char_t* scratch = buffer;
+
+		if (length >= sizeof(buffer) / sizeof(buffer[0]))
+		{
+			// need to make dummy on-heap copy
+			scratch = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!scratch) return false;
+		}
+
+		// copy string to zero-terminated buffer and perform conversion
+		memcpy(scratch, begin, length * sizeof(char_t));
+		scratch[length] = 0;
+
+		*out_result = convert_string_to_number(scratch);
+
+		// free dummy buffer
+		if (scratch != buffer) xml_memory::deallocate(scratch);
+
+		return true;
+	}
+
+	PUGI_IMPL_FN double round_nearest(double value)
+	{
+		return floor(value + 0.5);
+	}
+
+	PUGI_IMPL_FN double round_nearest_nzero(double value)
+	{
+		// same as round_nearest, but returns -0 for [-0.5, -0]
+		// ceil is used to differentiate between +0 and -0 (we return -0 for [-0.5, -0] and +0 for +0)
+		return (value >= -0.5 && value <= 0) ? ceil(value) : floor(value + 0.5);
+	}
+
+	PUGI_IMPL_FN const char_t* qualified_name(const xpath_node& node)
+	{
+		return node.attribute() ? node.attribute().name() : node.node().name();
+	}
+
+	PUGI_IMPL_FN const char_t* local_name(const xpath_node& node)
+	{
+		const char_t* name = qualified_name(node);
+		const char_t* p = find_char(name, ':');
+
+		return p ? p + 1 : name;
+	}
+
+	struct namespace_uri_predicate
+	{
+		const char_t* prefix;
+		size_t prefix_length;
+
+		namespace_uri_predicate(const char_t* name)
+		{
+			const char_t* pos = find_char(name, ':');
+
+			prefix = pos ? name : 0;
+			prefix_length = pos ? static_cast<size_t>(pos - name) : 0;
+		}
+
+		bool operator()(xml_attribute a) const
+		{
+			const char_t* name = a.name();
+
+			if (!starts_with(name, PUGIXML_TEXT("xmlns"))) return false;
+
+			return prefix ? name[5] == ':' && strequalrange(name + 6, prefix, prefix_length) : name[5] == 0;
+		}
+	};
+
+	PUGI_IMPL_FN const char_t* namespace_uri(xml_node node)
+	{
+		namespace_uri_predicate pred = node.name();
+
+		xml_node p = node;
+
+		while (p)
+		{
+			xml_attribute a = p.find_attribute(pred);
+
+			if (a) return a.value();
+
+			p = p.parent();
+		}
+
+		return PUGIXML_TEXT("");
+	}
+
+	PUGI_IMPL_FN const char_t* namespace_uri(xml_attribute attr, xml_node parent)
+	{
+		namespace_uri_predicate pred = attr.name();
+
+		// Default namespace does not apply to attributes
+		if (!pred.prefix) return PUGIXML_TEXT("");
+
+		xml_node p = parent;
+
+		while (p)
+		{
+			xml_attribute a = p.find_attribute(pred);
+
+			if (a) return a.value();
+
+			p = p.parent();
+		}
+
+		return PUGIXML_TEXT("");
+	}
+
+	PUGI_IMPL_FN const char_t* namespace_uri(const xpath_node& node)
+	{
+		return node.attribute() ? namespace_uri(node.attribute(), node.parent()) : namespace_uri(node.node());
+	}
+
+	PUGI_IMPL_FN char_t* normalize_space(char_t* buffer)
+	{
+		char_t* write = buffer;
+
+		for (char_t* it = buffer; *it; )
+		{
+			char_t ch = *it++;
+
+			if (PUGI_IMPL_IS_CHARTYPE(ch, ct_space))
+			{
+				// replace whitespace sequence with single space
+				while (PUGI_IMPL_IS_CHARTYPE(*it, ct_space)) it++;
+
+				// avoid leading spaces
+				if (write != buffer) *write++ = ' ';
+			}
+			else *write++ = ch;
+		}
+
+		// remove trailing space
+		if (write != buffer && PUGI_IMPL_IS_CHARTYPE(write[-1], ct_space)) write--;
+
+		// zero-terminate
+		*write = 0;
+
+		return write;
+	}
+
+	PUGI_IMPL_FN char_t* translate(char_t* buffer, const char_t* from, const char_t* to, size_t to_length)
+	{
+		char_t* write = buffer;
+
+		while (*buffer)
+		{
+			PUGI_IMPL_DMC_VOLATILE char_t ch = *buffer++;
+
+			const char_t* pos = find_char(from, ch);
+
+			if (!pos)
+				*write++ = ch; // do not process
+			else if (static_cast<size_t>(pos - from) < to_length)
+				*write++ = to[pos - from]; // replace
+		}
+
+		// zero-terminate
+		*write = 0;
+
+		return write;
+	}
+
+	PUGI_IMPL_FN unsigned char* translate_table_generate(xpath_allocator* alloc, const char_t* from, const char_t* to)
+	{
+		unsigned char table[128] = {0};
+
+		while (*from)
+		{
+			unsigned int fc = static_cast<unsigned int>(*from);
+			unsigned int tc = static_cast<unsigned int>(*to);
+
+			if (fc >= 128 || tc >= 128)
+				return 0;
+
+			// code=128 means "skip character"
+			if (!table[fc])
+				table[fc] = static_cast<unsigned char>(tc ? tc : 128);
+
+			from++;
+			if (tc) to++;
+		}
+
+		for (int i = 0; i < 128; ++i)
+			if (!table[i])
+				table[i] = static_cast<unsigned char>(i);
+
+		void* result = alloc->allocate(sizeof(table));
+		if (!result) return 0;
+
+		memcpy(result, table, sizeof(table));
+
+		return static_cast<unsigned char*>(result);
+	}
+
+	PUGI_IMPL_FN char_t* translate_table(char_t* buffer, const unsigned char* table)
+	{
+		char_t* write = buffer;
+
+		while (*buffer)
+		{
+			char_t ch = *buffer++;
+			unsigned int index = static_cast<unsigned int>(ch);
+
+			if (index < 128)
+			{
+				unsigned char code = table[index];
+
+				// code=128 means "skip character" (table size is 128 so 128 can be a special value)
+				// this code skips these characters without extra branches
+				*write = static_cast<char_t>(code);
+				write += 1 - (code >> 7);
+			}
+			else
+			{
+				*write++ = ch;
+			}
+		}
+
+		// zero-terminate
+		*write = 0;
+
+		return write;
+	}
+
+	inline bool is_xpath_attribute(const char_t* name)
+	{
+		return !(starts_with(name, PUGIXML_TEXT("xmlns")) && (name[5] == 0 || name[5] == ':'));
+	}
+
+	struct xpath_variable_boolean: xpath_variable
+	{
+		xpath_variable_boolean(): xpath_variable(xpath_type_boolean), value(false)
+		{
+		}
+
+		bool value;
+		char_t name[1];
+	};
+
+	struct xpath_variable_number: xpath_variable
+	{
+		xpath_variable_number(): xpath_variable(xpath_type_number), value(0)
+		{
+		}
+
+		double value;
+		char_t name[1];
+	};
+
+	struct xpath_variable_string: xpath_variable
+	{
+		xpath_variable_string(): xpath_variable(xpath_type_string), value(0)
+		{
+		}
+
+		~xpath_variable_string()
+		{
+			if (value) xml_memory::deallocate(value);
+		}
+
+		char_t* value;
+		char_t name[1];
+	};
+
+	struct xpath_variable_node_set: xpath_variable
+	{
+		xpath_variable_node_set(): xpath_variable(xpath_type_node_set)
+		{
+		}
+
+		xpath_node_set value;
+		char_t name[1];
+	};
+
+	static const xpath_node_set dummy_node_set;
+
+	PUGI_IMPL_FN PUGI_IMPL_UNSIGNED_OVERFLOW unsigned int hash_string(const char_t* str)
+	{
+		// Jenkins one-at-a-time hash (http://en.wikipedia.org/wiki/Jenkins_hash_function#one-at-a-time)
+		unsigned int result = 0;
+
+		while (*str)
+		{
+			result += static_cast<unsigned int>(*str++);
+			result += result << 10;
+			result ^= result >> 6;
+		}
+
+		result += result << 3;
+		result ^= result >> 11;
+		result += result << 15;
+
+		return result;
+	}
+
+	template <typename T> PUGI_IMPL_FN T* new_xpath_variable(const char_t* name)
+	{
+		size_t length = strlength(name);
+		if (length == 0) return 0; // empty variable names are invalid
+
+		// $$ we can't use offsetof(T, name) because T is non-POD, so we just allocate additional length characters
+		void* memory = xml_memory::allocate(sizeof(T) + length * sizeof(char_t));
+		if (!memory) return 0;
+
+		T* result = new (memory) T();
+
+		memcpy(result->name, name, (length + 1) * sizeof(char_t));
+
+		return result;
+	}
+
+	PUGI_IMPL_FN xpath_variable* new_xpath_variable(xpath_value_type type, const char_t* name)
+	{
+		switch (type)
+		{
+		case xpath_type_node_set:
+			return new_xpath_variable<xpath_variable_node_set>(name);
+
+		case xpath_type_number:
+			return new_xpath_variable<xpath_variable_number>(name);
+
+		case xpath_type_string:
+			return new_xpath_variable<xpath_variable_string>(name);
+
+		case xpath_type_boolean:
+			return new_xpath_variable<xpath_variable_boolean>(name);
+
+		default:
+			return 0;
+		}
+	}
+
+	template <typename T> PUGI_IMPL_FN void delete_xpath_variable(T* var)
+	{
+		var->~T();
+		xml_memory::deallocate(var);
+	}
+
+	PUGI_IMPL_FN void delete_xpath_variable(xpath_value_type type, xpath_variable* var)
+	{
+		switch (type)
+		{
+		case xpath_type_node_set:
+			delete_xpath_variable(static_cast<xpath_variable_node_set*>(var));
+			break;
+
+		case xpath_type_number:
+			delete_xpath_variable(static_cast<xpath_variable_number*>(var));
+			break;
+
+		case xpath_type_string:
+			delete_xpath_variable(static_cast<xpath_variable_string*>(var));
+			break;
+
+		case xpath_type_boolean:
+			delete_xpath_variable(static_cast<xpath_variable_boolean*>(var));
+			break;
+
+		default:
+			assert(false && "Invalid variable type"); // unreachable
+		}
+	}
+
+	PUGI_IMPL_FN bool copy_xpath_variable(xpath_variable* lhs, const xpath_variable* rhs)
+	{
+		switch (rhs->type())
+		{
+		case xpath_type_node_set:
+			return lhs->set(static_cast<const xpath_variable_node_set*>(rhs)->value);
+
+		case xpath_type_number:
+			return lhs->set(static_cast<const xpath_variable_number*>(rhs)->value);
+
+		case xpath_type_string:
+			return lhs->set(static_cast<const xpath_variable_string*>(rhs)->value);
+
+		case xpath_type_boolean:
+			return lhs->set(static_cast<const xpath_variable_boolean*>(rhs)->value);
+
+		default:
+			assert(false && "Invalid variable type"); // unreachable
+			return false;
+		}
+	}
+
+	PUGI_IMPL_FN bool get_variable_scratch(char_t (&buffer)[32], xpath_variable_set* set, const char_t* begin, const char_t* end, xpath_variable** out_result)
+	{
+		size_t length = static_cast<size_t>(end - begin);
+		char_t* scratch = buffer;
+
+		if (length >= sizeof(buffer) / sizeof(buffer[0]))
+		{
+			// need to make dummy on-heap copy
+			scratch = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!scratch) return false;
+		}
+
+		// copy string to zero-terminated buffer and perform lookup
+		memcpy(scratch, begin, length * sizeof(char_t));
+		scratch[length] = 0;
+
+		*out_result = set->get(scratch);
+
+		// free dummy buffer
+		if (scratch != buffer) xml_memory::deallocate(scratch);
+
+		return true;
+	}
+PUGI_IMPL_NS_END
+
+// Internal node set class
+PUGI_IMPL_NS_BEGIN
+	PUGI_IMPL_FN xpath_node_set::type_t xpath_get_order(const xpath_node* begin, const xpath_node* end)
+	{
+		if (end - begin < 2)
+			return xpath_node_set::type_sorted;
+
+		document_order_comparator cmp;
+
+		bool first = cmp(begin[0], begin[1]);
+
+		for (const xpath_node* it = begin + 1; it + 1 < end; ++it)
+			if (cmp(it[0], it[1]) != first)
+				return xpath_node_set::type_unsorted;
+
+		return first ? xpath_node_set::type_sorted : xpath_node_set::type_sorted_reverse;
+	}
+
+	PUGI_IMPL_FN xpath_node_set::type_t xpath_sort(xpath_node* begin, xpath_node* end, xpath_node_set::type_t type, bool rev)
+	{
+		xpath_node_set::type_t order = rev ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted;
+
+		if (type == xpath_node_set::type_unsorted)
+		{
+			xpath_node_set::type_t sorted = xpath_get_order(begin, end);
+
+			if (sorted == xpath_node_set::type_unsorted)
+			{
+				sort(begin, end, document_order_comparator());
+
+				type = xpath_node_set::type_sorted;
+			}
+			else
+				type = sorted;
+		}
+
+		if (type != order) reverse(begin, end);
+
+		return order;
+	}
+
+	PUGI_IMPL_FN xpath_node xpath_first(const xpath_node* begin, const xpath_node* end, xpath_node_set::type_t type)
+	{
+		if (begin == end) return xpath_node();
+
+		switch (type)
+		{
+		case xpath_node_set::type_sorted:
+			return *begin;
+
+		case xpath_node_set::type_sorted_reverse:
+			return *(end - 1);
+
+		case xpath_node_set::type_unsorted:
+			return *min_element(begin, end, document_order_comparator());
+
+		default:
+			assert(false && "Invalid node set type"); // unreachable
+			return xpath_node();
+		}
+	}
+
+	class xpath_node_set_raw
+	{
+		xpath_node_set::type_t _type;
+
+		xpath_node* _begin;
+		xpath_node* _end;
+		xpath_node* _eos;
+
+	public:
+		xpath_node_set_raw(): _type(xpath_node_set::type_unsorted), _begin(0), _end(0), _eos(0)
+		{
+		}
+
+		xpath_node* begin() const
+		{
+			return _begin;
+		}
+
+		xpath_node* end() const
+		{
+			return _end;
+		}
+
+		bool empty() const
+		{
+			return _begin == _end;
+		}
+
+		size_t size() const
+		{
+			return static_cast<size_t>(_end - _begin);
+		}
+
+		xpath_node first() const
+		{
+			return xpath_first(_begin, _end, _type);
+		}
+
+		void push_back_grow(const xpath_node& node, xpath_allocator* alloc);
+
+		void push_back(const xpath_node& node, xpath_allocator* alloc)
+		{
+			if (_end != _eos)
+				*_end++ = node;
+			else
+				push_back_grow(node, alloc);
+		}
+
+		void append(const xpath_node* begin_, const xpath_node* end_, xpath_allocator* alloc)
+		{
+			if (begin_ == end_) return;
+
+			size_t size_ = static_cast<size_t>(_end - _begin);
+			size_t capacity = static_cast<size_t>(_eos - _begin);
+			size_t count = static_cast<size_t>(end_ - begin_);
+
+			if (size_ + count > capacity)
+			{
+				// reallocate the old array or allocate a new one
+				xpath_node* data = static_cast<xpath_node*>(alloc->reallocate(_begin, capacity * sizeof(xpath_node), (size_ + count) * sizeof(xpath_node)));
+				if (!data) return;
+
+				// finalize
+				_begin = data;
+				_end = data + size_;
+				_eos = data + size_ + count;
+			}
+
+			memcpy(_end, begin_, count * sizeof(xpath_node));
+			_end += count;
+		}
+
+		void sort_do()
+		{
+			_type = xpath_sort(_begin, _end, _type, false);
+		}
+
+		void truncate(xpath_node* pos)
+		{
+			assert(_begin <= pos && pos <= _end);
+
+			_end = pos;
+		}
+
+		void remove_duplicates(xpath_allocator* alloc)
+		{
+			if (_type == xpath_node_set::type_unsorted && _end - _begin > 2)
+			{
+				xpath_allocator_capture cr(alloc);
+
+				size_t size_ = static_cast<size_t>(_end - _begin);
+
+				size_t hash_size = 1;
+				while (hash_size < size_ + size_ / 2) hash_size *= 2;
+
+				const void** hash_data = static_cast<const void**>(alloc->allocate(hash_size * sizeof(void**)));
+				if (!hash_data) return;
+
+				memset(hash_data, 0, hash_size * sizeof(const void**));
+
+				xpath_node* write = _begin;
+
+				for (xpath_node* it = _begin; it != _end; ++it)
+				{
+					const void* attr = it->attribute().internal_object();
+					const void* node = it->node().internal_object();
+					const void* key = attr ? attr : node;
+
+					if (key && hash_insert(hash_data, hash_size, key))
+					{
+						*write++ = *it;
+					}
+				}
+
+				_end = write;
+			}
+			else
+			{
+				_end = unique(_begin, _end);
+			}
+		}
+
+		xpath_node_set::type_t type() const
+		{
+			return _type;
+		}
+
+		void set_type(xpath_node_set::type_t value)
+		{
+			_type = value;
+		}
+	};
+
+	PUGI_IMPL_FN_NO_INLINE void xpath_node_set_raw::push_back_grow(const xpath_node& node, xpath_allocator* alloc)
+	{
+		size_t capacity = static_cast<size_t>(_eos - _begin);
+
+		// get new capacity (1.5x rule)
+		size_t new_capacity = capacity + capacity / 2 + 1;
+
+		// reallocate the old array or allocate a new one
+		xpath_node* data = static_cast<xpath_node*>(alloc->reallocate(_begin, capacity * sizeof(xpath_node), new_capacity * sizeof(xpath_node)));
+		if (!data) return;
+
+		// finalize
+		_begin = data;
+		_end = data + capacity;
+		_eos = data + new_capacity;
+
+		// push
+		*_end++ = node;
+	}
+PUGI_IMPL_NS_END
+
+PUGI_IMPL_NS_BEGIN
+	struct xpath_context
+	{
+		xpath_node n;
+		size_t position, size;
+
+		xpath_context(const xpath_node& n_, size_t position_, size_t size_): n(n_), position(position_), size(size_)
+		{
+		}
+	};
+
+	enum lexeme_t
+	{
+		lex_none = 0,
+		lex_equal,
+		lex_not_equal,
+		lex_less,
+		lex_greater,
+		lex_less_or_equal,
+		lex_greater_or_equal,
+		lex_plus,
+		lex_minus,
+		lex_multiply,
+		lex_union,
+		lex_var_ref,
+		lex_open_brace,
+		lex_close_brace,
+		lex_quoted_string,
+		lex_number,
+		lex_slash,
+		lex_double_slash,
+		lex_open_square_brace,
+		lex_close_square_brace,
+		lex_string,
+		lex_comma,
+		lex_axis_attribute,
+		lex_dot,
+		lex_double_dot,
+		lex_double_colon,
+		lex_eof
+	};
+
+	struct xpath_lexer_string
+	{
+		const char_t* begin;
+		const char_t* end;
+
+		xpath_lexer_string(): begin(0), end(0)
+		{
+		}
+
+		bool operator==(const char_t* other) const
+		{
+			size_t length = static_cast<size_t>(end - begin);
+
+			return strequalrange(other, begin, length);
+		}
+	};
+
+	class xpath_lexer
+	{
+		const char_t* _cur;
+		const char_t* _cur_lexeme_pos;
+		xpath_lexer_string _cur_lexeme_contents;
+
+		lexeme_t _cur_lexeme;
+
+	public:
+		explicit xpath_lexer(const char_t* query): _cur(query)
+		{
+			next();
+		}
+
+		const char_t* state() const
+		{
+			return _cur;
+		}
+
+		void next()
+		{
+			const char_t* cur = _cur;
+
+			while (PUGI_IMPL_IS_CHARTYPE(*cur, ct_space)) ++cur;
+
+			// save lexeme position for error reporting
+			_cur_lexeme_pos = cur;
+
+			switch (*cur)
+			{
+			case 0:
+				_cur_lexeme = lex_eof;
+				break;
+
+			case '>':
+				if (*(cur+1) == '=')
+				{
+					cur += 2;
+					_cur_lexeme = lex_greater_or_equal;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_greater;
+				}
+				break;
+
+			case '<':
+				if (*(cur+1) == '=')
+				{
+					cur += 2;
+					_cur_lexeme = lex_less_or_equal;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_less;
+				}
+				break;
+
+			case '!':
+				if (*(cur+1) == '=')
+				{
+					cur += 2;
+					_cur_lexeme = lex_not_equal;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+				break;
+
+			case '=':
+				cur += 1;
+				_cur_lexeme = lex_equal;
+
+				break;
+
+			case '+':
+				cur += 1;
+				_cur_lexeme = lex_plus;
+
+				break;
+
+			case '-':
+				cur += 1;
+				_cur_lexeme = lex_minus;
+
+				break;
+
+			case '*':
+				cur += 1;
+				_cur_lexeme = lex_multiply;
+
+				break;
+
+			case '|':
+				cur += 1;
+				_cur_lexeme = lex_union;
+
+				break;
+
+			case '$':
+				cur += 1;
+
+				if (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_start_symbol))
+				{
+					_cur_lexeme_contents.begin = cur;
+
+					while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+
+					if (cur[0] == ':' && PUGI_IMPL_IS_CHARTYPEX(cur[1], ctx_symbol)) // qname
+					{
+						cur++; // :
+
+						while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+					}
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_var_ref;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+
+				break;
+
+			case '(':
+				cur += 1;
+				_cur_lexeme = lex_open_brace;
+
+				break;
+
+			case ')':
+				cur += 1;
+				_cur_lexeme = lex_close_brace;
+
+				break;
+
+			case '[':
+				cur += 1;
+				_cur_lexeme = lex_open_square_brace;
+
+				break;
+
+			case ']':
+				cur += 1;
+				_cur_lexeme = lex_close_square_brace;
+
+				break;
+
+			case ',':
+				cur += 1;
+				_cur_lexeme = lex_comma;
+
+				break;
+
+			case '/':
+				if (*(cur+1) == '/')
+				{
+					cur += 2;
+					_cur_lexeme = lex_double_slash;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_slash;
+				}
+				break;
+
+			case '.':
+				if (*(cur+1) == '.')
+				{
+					cur += 2;
+					_cur_lexeme = lex_double_dot;
+				}
+				else if (PUGI_IMPL_IS_CHARTYPEX(*(cur+1), ctx_digit))
+				{
+					_cur_lexeme_contents.begin = cur; // .
+
+					++cur;
+
+					while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_number;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_dot;
+				}
+				break;
+
+			case '@':
+				cur += 1;
+				_cur_lexeme = lex_axis_attribute;
+
+				break;
+
+			case '"':
+			case '\'':
+			{
+				char_t terminator = *cur;
+
+				++cur;
+
+				_cur_lexeme_contents.begin = cur;
+				while (*cur && *cur != terminator) cur++;
+				_cur_lexeme_contents.end = cur;
+
+				if (!*cur)
+					_cur_lexeme = lex_none;
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_quoted_string;
+				}
+
+				break;
+			}
+
+			case ':':
+				if (*(cur+1) == ':')
+				{
+					cur += 2;
+					_cur_lexeme = lex_double_colon;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+				break;
+
+			default:
+				if (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_digit))
+				{
+					_cur_lexeme_contents.begin = cur;
+
+					while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+
+					if (*cur == '.')
+					{
+						cur++;
+
+						while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+					}
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_number;
+				}
+				else if (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_start_symbol))
+				{
+					_cur_lexeme_contents.begin = cur;
+
+					while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+
+					if (cur[0] == ':')
+					{
+						if (cur[1] == '*') // namespace test ncname:*
+						{
+							cur += 2; // :*
+						}
+						else if (PUGI_IMPL_IS_CHARTYPEX(cur[1], ctx_symbol)) // namespace test qname
+						{
+							cur++; // :
+
+							while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+						}
+					}
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_string;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+			}
+
+			_cur = cur;
+		}
+
+		lexeme_t current() const
+		{
+			return _cur_lexeme;
+		}
+
+		const char_t* current_pos() const
+		{
+			return _cur_lexeme_pos;
+		}
+
+		const xpath_lexer_string& contents() const
+		{
+			assert(_cur_lexeme == lex_var_ref || _cur_lexeme == lex_number || _cur_lexeme == lex_string || _cur_lexeme == lex_quoted_string);
+
+			return _cur_lexeme_contents;
+		}
+	};
+
+	enum ast_type_t
+	{
+		ast_unknown,
+		ast_op_or,						// left or right
+		ast_op_and,						// left and right
+		ast_op_equal,					// left = right
+		ast_op_not_equal,				// left != right
+		ast_op_less,					// left < right
+		ast_op_greater,					// left > right
+		ast_op_less_or_equal,			// left <= right
+		ast_op_greater_or_equal,		// left >= right
+		ast_op_add,						// left + right
+		ast_op_subtract,				// left - right
+		ast_op_multiply,				// left * right
+		ast_op_divide,					// left / right
+		ast_op_mod,						// left % right
+		ast_op_negate,					// left - right
+		ast_op_union,					// left | right
+		ast_predicate,					// apply predicate to set; next points to next predicate
+		ast_filter,						// select * from left where right
+		ast_string_constant,			// string constant
+		ast_number_constant,			// number constant
+		ast_variable,					// variable
+		ast_func_last,					// last()
+		ast_func_position,				// position()
+		ast_func_count,					// count(left)
+		ast_func_id,					// id(left)
+		ast_func_local_name_0,			// local-name()
+		ast_func_local_name_1,			// local-name(left)
+		ast_func_namespace_uri_0,		// namespace-uri()
+		ast_func_namespace_uri_1,		// namespace-uri(left)
+		ast_func_name_0,				// name()
+		ast_func_name_1,				// name(left)
+		ast_func_string_0,				// string()
+		ast_func_string_1,				// string(left)
+		ast_func_concat,				// concat(left, right, siblings)
+		ast_func_starts_with,			// starts_with(left, right)
+		ast_func_contains,				// contains(left, right)
+		ast_func_substring_before,		// substring-before(left, right)
+		ast_func_substring_after,		// substring-after(left, right)
+		ast_func_substring_2,			// substring(left, right)
+		ast_func_substring_3,			// substring(left, right, third)
+		ast_func_string_length_0,		// string-length()
+		ast_func_string_length_1,		// string-length(left)
+		ast_func_normalize_space_0,		// normalize-space()
+		ast_func_normalize_space_1,		// normalize-space(left)
+		ast_func_translate,				// translate(left, right, third)
+		ast_func_boolean,				// boolean(left)
+		ast_func_not,					// not(left)
+		ast_func_true,					// true()
+		ast_func_false,					// false()
+		ast_func_lang,					// lang(left)
+		ast_func_number_0,				// number()
+		ast_func_number_1,				// number(left)
+		ast_func_sum,					// sum(left)
+		ast_func_floor,					// floor(left)
+		ast_func_ceiling,				// ceiling(left)
+		ast_func_round,					// round(left)
+		ast_step,						// process set left with step
+		ast_step_root,					// select root node
+
+		ast_opt_translate_table,		// translate(left, right, third) where right/third are constants
+		ast_opt_compare_attribute		// @name = 'string'
+	};
+
+	enum axis_t
+	{
+		axis_ancestor,
+		axis_ancestor_or_self,
+		axis_attribute,
+		axis_child,
+		axis_descendant,
+		axis_descendant_or_self,
+		axis_following,
+		axis_following_sibling,
+		axis_namespace,
+		axis_parent,
+		axis_preceding,
+		axis_preceding_sibling,
+		axis_self
+	};
+
+	enum nodetest_t
+	{
+		nodetest_none,
+		nodetest_name,
+		nodetest_type_node,
+		nodetest_type_comment,
+		nodetest_type_pi,
+		nodetest_type_text,
+		nodetest_pi,
+		nodetest_all,
+		nodetest_all_in_namespace
+	};
+
+	enum predicate_t
+	{
+		predicate_default,
+		predicate_posinv,
+		predicate_constant,
+		predicate_constant_one
+	};
+
+	enum nodeset_eval_t
+	{
+		nodeset_eval_all,
+		nodeset_eval_any,
+		nodeset_eval_first
+	};
+
+	template <axis_t N> struct axis_to_type
+	{
+		static const axis_t axis;
+	};
+
+	template <axis_t N> const axis_t axis_to_type<N>::axis = N;
+
+	class xpath_ast_node
+	{
+	private:
+		// node type
+		char _type;
+		char _rettype;
+
+		// for ast_step
+		char _axis;
+
+		// for ast_step/ast_predicate/ast_filter
+		char _test;
+
+		// tree node structure
+		xpath_ast_node* _left;
+		xpath_ast_node* _right;
+		xpath_ast_node* _next;
+
+		union
+		{
+			// value for ast_string_constant
+			const char_t* string;
+			// value for ast_number_constant
+			double number;
+			// variable for ast_variable
+			xpath_variable* variable;
+			// node test for ast_step (node name/namespace/node type/pi target)
+			const char_t* nodetest;
+			// table for ast_opt_translate_table
+			const unsigned char* table;
+		} _data;
+
+		xpath_ast_node(const xpath_ast_node&);
+		xpath_ast_node& operator=(const xpath_ast_node&);
+
+		template <class Comp> static bool compare_eq(xpath_ast_node* lhs, xpath_ast_node* rhs, const xpath_context& c, const xpath_stack& stack, const Comp& comp)
+		{
+			xpath_value_type lt = lhs->rettype(), rt = rhs->rettype();
+
+			if (lt != xpath_type_node_set && rt != xpath_type_node_set)
+			{
+				if (lt == xpath_type_boolean || rt == xpath_type_boolean)
+					return comp(lhs->eval_boolean(c, stack), rhs->eval_boolean(c, stack));
+				else if (lt == xpath_type_number || rt == xpath_type_number)
+					return comp(lhs->eval_number(c, stack), rhs->eval_number(c, stack));
+				else if (lt == xpath_type_string || rt == xpath_type_string)
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					xpath_string ls = lhs->eval_string(c, stack);
+					xpath_string rs = rhs->eval_string(c, stack);
+
+					return comp(ls, rs);
+				}
+			}
+			else if (lt == xpath_type_node_set && rt == xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
+				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture cri(stack.result);
+
+						if (comp(string_value(*li, stack.result), string_value(*ri, stack.result)))
+							return true;
+					}
+
+				return false;
+			}
+			else
+			{
+				if (lt == xpath_type_node_set)
+				{
+					swap(lhs, rhs);
+					swap(lt, rt);
+				}
+
+				if (lt == xpath_type_boolean)
+					return comp(lhs->eval_boolean(c, stack), rhs->eval_boolean(c, stack));
+				else if (lt == xpath_type_number)
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					double l = lhs->eval_number(c, stack);
+					xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture cri(stack.result);
+
+						if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
+							return true;
+					}
+
+					return false;
+				}
+				else if (lt == xpath_type_string)
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					xpath_string l = lhs->eval_string(c, stack);
+					xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture cri(stack.result);
+
+						if (comp(l, string_value(*ri, stack.result)))
+							return true;
+					}
+
+					return false;
+				}
+			}
+
+			assert(false && "Wrong types"); // unreachable
+			return false;
+		}
+
+		static bool eval_once(xpath_node_set::type_t type, nodeset_eval_t eval)
+		{
+			return type == xpath_node_set::type_sorted ? eval != nodeset_eval_all : eval == nodeset_eval_any;
+		}
+
+		template <class Comp> static bool compare_rel(xpath_ast_node* lhs, xpath_ast_node* rhs, const xpath_context& c, const xpath_stack& stack, const Comp& comp)
+		{
+			xpath_value_type lt = lhs->rettype(), rt = rhs->rettype();
+
+			if (lt != xpath_type_node_set && rt != xpath_type_node_set)
+				return comp(lhs->eval_number(c, stack), rhs->eval_number(c, stack));
+			else if (lt == xpath_type_node_set && rt == xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
+				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					double l = convert_string_to_number(string_value(*li, stack.result).c_str());
+
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture crii(stack.result);
+
+						if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
+							return true;
+					}
+				}
+
+				return false;
+			}
+			else if (lt != xpath_type_node_set && rt == xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				double l = lhs->eval_number(c, stack);
+				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
+						return true;
+				}
+
+				return false;
+			}
+			else if (lt == xpath_type_node_set && rt != xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
+				double r = rhs->eval_number(c, stack);
+
+				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					if (comp(convert_string_to_number(string_value(*li, stack.result).c_str()), r))
+						return true;
+				}
+
+				return false;
+			}
+			else
+			{
+				assert(false && "Wrong types"); // unreachable
+				return false;
+			}
+		}
+
+		static void apply_predicate_boolean(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack, bool once)
+		{
+			assert(ns.size() >= first);
+			assert(expr->rettype() != xpath_type_number);
+
+			size_t i = 1;
+			size_t size = ns.size() - first;
+
+			xpath_node* last = ns.begin() + first;
+
+			// remove_if... or well, sort of
+			for (xpath_node* it = last; it != ns.end(); ++it, ++i)
+			{
+				xpath_context c(*it, i, size);
+
+				if (expr->eval_boolean(c, stack))
+				{
+					*last++ = *it;
+
+					if (once) break;
+				}
+			}
+
+			ns.truncate(last);
+		}
+
+		static void apply_predicate_number(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack, bool once)
+		{
+			assert(ns.size() >= first);
+			assert(expr->rettype() == xpath_type_number);
+
+			size_t i = 1;
+			size_t size = ns.size() - first;
+
+			xpath_node* last = ns.begin() + first;
+
+			// remove_if... or well, sort of
+			for (xpath_node* it = last; it != ns.end(); ++it, ++i)
+			{
+				xpath_context c(*it, i, size);
+
+				if (expr->eval_number(c, stack) == static_cast<double>(i))
+				{
+					*last++ = *it;
+
+					if (once) break;
+				}
+			}
+
+			ns.truncate(last);
+		}
+
+		static void apply_predicate_number_const(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack)
+		{
+			assert(ns.size() >= first);
+			assert(expr->rettype() == xpath_type_number);
+
+			size_t size = ns.size() - first;
+
+			xpath_node* last = ns.begin() + first;
+
+			xpath_node cn;
+			xpath_context c(cn, 1, size);
+
+			double er = expr->eval_number(c, stack);
+
+			if (er >= 1.0 && er <= static_cast<double>(size))
+			{
+				size_t eri = static_cast<size_t>(er);
+
+				if (er == static_cast<double>(eri))
+				{
+					xpath_node r = last[eri - 1];
+
+					*last++ = r;
+				}
+			}
+
+			ns.truncate(last);
+		}
+
+		void apply_predicate(xpath_node_set_raw& ns, size_t first, const xpath_stack& stack, bool once)
+		{
+			if (ns.size() == first) return;
+
+			assert(_type == ast_filter || _type == ast_predicate);
+
+			if (_test == predicate_constant || _test == predicate_constant_one)
+				apply_predicate_number_const(ns, first, _right, stack);
+			else if (_right->rettype() == xpath_type_number)
+				apply_predicate_number(ns, first, _right, stack, once);
+			else
+				apply_predicate_boolean(ns, first, _right, stack, once);
+		}
+
+		void apply_predicates(xpath_node_set_raw& ns, size_t first, const xpath_stack& stack, nodeset_eval_t eval)
+		{
+			if (ns.size() == first) return;
+
+			bool last_once = eval_once(ns.type(), eval);
+
+			for (xpath_ast_node* pred = _right; pred; pred = pred->_next)
+				pred->apply_predicate(ns, first, stack, !pred->_next && last_once);
+		}
+
+		bool step_push(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* parent, xpath_allocator* alloc)
+		{
+			assert(a);
+
+			const char_t* name = a->name ? a->name + 0 : PUGIXML_TEXT("");
+
+			switch (_test)
+			{
+			case nodetest_name:
+				if (strequal(name, _data.nodetest) && is_xpath_attribute(name))
+				{
+					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_node:
+			case nodetest_all:
+				if (is_xpath_attribute(name))
+				{
+					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_all_in_namespace:
+				if (starts_with(name, _data.nodetest) && is_xpath_attribute(name))
+				{
+					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
+					return true;
+				}
+				break;
+
+			default:
+				;
+			}
+
+			return false;
+		}
+
+		bool step_push(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc)
+		{
+			assert(n);
+
+			xml_node_type type = PUGI_IMPL_NODETYPE(n);
+
+			switch (_test)
+			{
+			case nodetest_name:
+				if (type == node_element && n->name && strequal(n->name, _data.nodetest))
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_node:
+				ns.push_back(xml_node(n), alloc);
+				return true;
+
+			case nodetest_type_comment:
+				if (type == node_comment)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_text:
+				if (type == node_pcdata || type == node_cdata)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_pi:
+				if (type == node_pi)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_pi:
+				if (type == node_pi && n->name && strequal(n->name, _data.nodetest))
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_all:
+				if (type == node_element)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_all_in_namespace:
+				if (type == node_element && n->name && starts_with(n->name, _data.nodetest))
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			default:
+				assert(false && "Unknown axis"); // unreachable
+			}
+
+			return false;
+		}
+
+		template <class T> void step_fill(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc, bool once, T)
+		{
+			const axis_t axis = T::axis;
+
+			switch (axis)
+			{
+			case axis_attribute:
+			{
+				for (xml_attribute_struct* a = n->first_attribute; a; a = a->next_attribute)
+					if (step_push(ns, a, n, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_child:
+			{
+				for (xml_node_struct* c = n->first_child; c; c = c->next_sibling)
+					if (step_push(ns, c, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_descendant:
+			case axis_descendant_or_self:
+			{
+				if (axis == axis_descendant_or_self)
+					if (step_push(ns, n, alloc) & once)
+						return;
+
+				xml_node_struct* cur = n->first_child;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					if (cur->first_child)
+						cur = cur->first_child;
+					else
+					{
+						while (!cur->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (cur == n) return;
+						}
+
+						cur = cur->next_sibling;
+					}
+				}
+
+				break;
+			}
+
+			case axis_following_sibling:
+			{
+				for (xml_node_struct* c = n->next_sibling; c; c = c->next_sibling)
+					if (step_push(ns, c, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_preceding_sibling:
+			{
+				for (xml_node_struct* c = n->prev_sibling_c; c->next_sibling; c = c->prev_sibling_c)
+					if (step_push(ns, c, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_following:
+			{
+				xml_node_struct* cur = n;
+
+				// exit from this node so that we don't include descendants
+				while (!cur->next_sibling)
+				{
+					cur = cur->parent;
+
+					if (!cur) return;
+				}
+
+				cur = cur->next_sibling;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					if (cur->first_child)
+						cur = cur->first_child;
+					else
+					{
+						while (!cur->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (!cur) return;
+						}
+
+						cur = cur->next_sibling;
+					}
+				}
+
+				break;
+			}
+
+			case axis_preceding:
+			{
+				xml_node_struct* cur = n;
+
+				// exit from this node so that we don't include descendants
+				while (!cur->prev_sibling_c->next_sibling)
+				{
+					cur = cur->parent;
+
+					if (!cur) return;
+				}
+
+				cur = cur->prev_sibling_c;
+
+				while (cur)
+				{
+					if (cur->first_child)
+						cur = cur->first_child->prev_sibling_c;
+					else
+					{
+						// leaf node, can't be ancestor
+						if (step_push(ns, cur, alloc) & once)
+							return;
+
+						while (!cur->prev_sibling_c->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (!cur) return;
+
+							if (!node_is_ancestor(cur, n))
+								if (step_push(ns, cur, alloc) & once)
+									return;
+						}
+
+						cur = cur->prev_sibling_c;
+					}
+				}
+
+				break;
+			}
+
+			case axis_ancestor:
+			case axis_ancestor_or_self:
+			{
+				if (axis == axis_ancestor_or_self)
+					if (step_push(ns, n, alloc) & once)
+						return;
+
+				xml_node_struct* cur = n->parent;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					cur = cur->parent;
+				}
+
+				break;
+			}
+
+			case axis_self:
+			{
+				step_push(ns, n, alloc);
+
+				break;
+			}
+
+			case axis_parent:
+			{
+				if (n->parent)
+					step_push(ns, n->parent, alloc);
+
+				break;
+			}
+
+			default:
+				assert(false && "Unimplemented axis"); // unreachable
+			}
+		}
+
+		template <class T> void step_fill(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* p, xpath_allocator* alloc, bool once, T v)
+		{
+			const axis_t axis = T::axis;
+
+			switch (axis)
+			{
+			case axis_ancestor:
+			case axis_ancestor_or_self:
+			{
+				if (axis == axis_ancestor_or_self && _test == nodetest_type_node) // reject attributes based on principal node type test
+					if (step_push(ns, a, p, alloc) & once)
+						return;
+
+				xml_node_struct* cur = p;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					cur = cur->parent;
+				}
+
+				break;
+			}
+
+			case axis_descendant_or_self:
+			case axis_self:
+			{
+				if (_test == nodetest_type_node) // reject attributes based on principal node type test
+					step_push(ns, a, p, alloc);
+
+				break;
+			}
+
+			case axis_following:
+			{
+				xml_node_struct* cur = p;
+
+				while (cur)
+				{
+					if (cur->first_child)
+						cur = cur->first_child;
+					else
+					{
+						while (!cur->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (!cur) return;
+						}
+
+						cur = cur->next_sibling;
+					}
+
+					if (step_push(ns, cur, alloc) & once)
+						return;
+				}
+
+				break;
+			}
+
+			case axis_parent:
+			{
+				step_push(ns, p, alloc);
+
+				break;
+			}
+
+			case axis_preceding:
+			{
+				// preceding:: axis does not include attribute nodes and attribute ancestors (they are the same as parent's ancestors), so we can reuse node preceding
+				step_fill(ns, p, alloc, once, v);
+				break;
+			}
+
+			default:
+				assert(false && "Unimplemented axis"); // unreachable
+			}
+		}
+
+		template <class T> void step_fill(xpath_node_set_raw& ns, const xpath_node& xn, xpath_allocator* alloc, bool once, T v)
+		{
+			const axis_t axis = T::axis;
+			const bool axis_has_attributes = (axis == axis_ancestor || axis == axis_ancestor_or_self || axis == axis_descendant_or_self || axis == axis_following || axis == axis_parent || axis == axis_preceding || axis == axis_self);
+
+			if (xn.node())
+				step_fill(ns, xn.node().internal_object(), alloc, once, v);
+			else if (axis_has_attributes && xn.attribute() && xn.parent())
+				step_fill(ns, xn.attribute().internal_object(), xn.parent().internal_object(), alloc, once, v);
+		}
+
+		template <class T> xpath_node_set_raw step_do(const xpath_context& c, const xpath_stack& stack, nodeset_eval_t eval, T v)
+		{
+			const axis_t axis = T::axis;
+			const bool axis_reverse = (axis == axis_ancestor || axis == axis_ancestor_or_self || axis == axis_preceding || axis == axis_preceding_sibling);
+			const xpath_node_set::type_t axis_type = axis_reverse ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted;
+
+			bool once =
+				(axis == axis_attribute && _test == nodetest_name) ||
+				(!_right && eval_once(axis_type, eval)) ||
+			    // coverity[mixed_enums]
+				(_right && !_right->_next && _right->_test == predicate_constant_one);
+
+			xpath_node_set_raw ns;
+			ns.set_type(axis_type);
+
+			if (_left)
+			{
+				xpath_node_set_raw s = _left->eval_node_set(c, stack, nodeset_eval_all);
+
+				// self axis preserves the original order
+				if (axis == axis_self) ns.set_type(s.type());
+
+				for (const xpath_node* it = s.begin(); it != s.end(); ++it)
+				{
+					size_t size = ns.size();
+
+					// in general, all axes generate elements in a particular order, but there is no order guarantee if axis is applied to two nodes
+					if (axis != axis_self && size != 0) ns.set_type(xpath_node_set::type_unsorted);
+
+					step_fill(ns, *it, stack.result, once, v);
+					if (_right) apply_predicates(ns, size, stack, eval);
+				}
+			}
+			else
+			{
+				step_fill(ns, c.n, stack.result, once, v);
+				if (_right) apply_predicates(ns, 0, stack, eval);
+			}
+
+			// child, attribute and self axes always generate unique set of nodes
+			// for other axis, if the set stayed sorted, it stayed unique because the traversal algorithms do not visit the same node twice
+			if (axis != axis_child && axis != axis_attribute && axis != axis_self && ns.type() == xpath_node_set::type_unsorted)
+				ns.remove_duplicates(stack.temp);
+
+			return ns;
+		}
+
+	public:
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, const char_t* value):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+		{
+			assert(type == ast_string_constant);
+			_data.string = value;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, double value):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+		{
+			assert(type == ast_number_constant);
+			_data.number = value;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_variable* value):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+		{
+			assert(type == ast_variable);
+			_data.variable = value;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_ast_node* left = 0, xpath_ast_node* right = 0):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(left), _right(right), _next(0)
+		{
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents):
+			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(static_cast<char>(axis)), _test(static_cast<char>(test)), _left(left), _right(0), _next(0)
+		{
+			assert(type == ast_step);
+			_data.nodetest = contents;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test):
+			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(0), _test(static_cast<char>(test)), _left(left), _right(right), _next(0)
+		{
+			assert(type == ast_filter || type == ast_predicate);
+		}
+
+		void set_next(xpath_ast_node* value)
+		{
+			_next = value;
+		}
+
+		void set_right(xpath_ast_node* value)
+		{
+			_right = value;
+		}
+
+		bool eval_boolean(const xpath_context& c, const xpath_stack& stack)
+		{
+			switch (_type)
+			{
+			case ast_op_or:
+				return _left->eval_boolean(c, stack) || _right->eval_boolean(c, stack);
+
+			case ast_op_and:
+				return _left->eval_boolean(c, stack) && _right->eval_boolean(c, stack);
+
+			case ast_op_equal:
+				return compare_eq(_left, _right, c, stack, equal_to());
+
+			case ast_op_not_equal:
+				return compare_eq(_left, _right, c, stack, not_equal_to());
+
+			case ast_op_less:
+				return compare_rel(_left, _right, c, stack, less());
+
+			case ast_op_greater:
+				return compare_rel(_right, _left, c, stack, less());
+
+			case ast_op_less_or_equal:
+				return compare_rel(_left, _right, c, stack, less_equal());
+
+			case ast_op_greater_or_equal:
+				return compare_rel(_right, _left, c, stack, less_equal());
+
+			case ast_func_starts_with:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_string lr = _left->eval_string(c, stack);
+				xpath_string rr = _right->eval_string(c, stack);
+
+				return starts_with(lr.c_str(), rr.c_str());
+			}
+
+			case ast_func_contains:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_string lr = _left->eval_string(c, stack);
+				xpath_string rr = _right->eval_string(c, stack);
+
+				return find_substring(lr.c_str(), rr.c_str()) != 0;
+			}
+
+			case ast_func_boolean:
+				return _left->eval_boolean(c, stack);
+
+			case ast_func_not:
+				return !_left->eval_boolean(c, stack);
+
+			case ast_func_true:
+				return true;
+
+			case ast_func_false:
+				return false;
+
+			case ast_func_lang:
+			{
+				if (c.n.attribute()) return false;
+
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_string lang = _left->eval_string(c, stack);
+
+				for (xml_node n = c.n.node(); n; n = n.parent())
+				{
+					xml_attribute a = n.attribute(PUGIXML_TEXT("xml:lang"));
+
+					if (a)
+					{
+						const char_t* value = a.value();
+
+						// strnicmp / strncasecmp is not portable
+						for (const char_t* lit = lang.c_str(); *lit; ++lit)
+						{
+							if (tolower_ascii(*lit) != tolower_ascii(*value)) return false;
+							++value;
+						}
+
+						return *value == 0 || *value == '-';
+					}
+				}
+
+				return false;
+			}
+
+			case ast_opt_compare_attribute:
+			{
+				const char_t* value = (_right->_type == ast_string_constant) ? _right->_data.string : _right->_data.variable->get_string();
+
+				xml_attribute attr = c.n.node().attribute(_left->_data.nodetest);
+
+				return attr && strequal(attr.value(), value) && is_xpath_attribute(attr.name());
+			}
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_boolean)
+					return _data.variable->get_boolean();
+
+				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
+				break;
+			}
+
+			default:
+				;
+			}
+
+			// none of the ast types that return the value directly matched, we need to perform type conversion
+			switch (_rettype)
+			{
+			case xpath_type_number:
+				return convert_number_to_boolean(eval_number(c, stack));
+
+			case xpath_type_string:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return !eval_string(c, stack).empty();
+			}
+
+			case xpath_type_node_set:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return !eval_node_set(c, stack, nodeset_eval_any).empty();
+			}
+
+			default:
+				assert(false && "Wrong expression for return type boolean"); // unreachable
+				return false;
+			}
+		}
+
+		double eval_number(const xpath_context& c, const xpath_stack& stack)
+		{
+			switch (_type)
+			{
+			case ast_op_add:
+				return _left->eval_number(c, stack) + _right->eval_number(c, stack);
+
+			case ast_op_subtract:
+				return _left->eval_number(c, stack) - _right->eval_number(c, stack);
+
+			case ast_op_multiply:
+				return _left->eval_number(c, stack) * _right->eval_number(c, stack);
+
+			case ast_op_divide:
+				return _left->eval_number(c, stack) / _right->eval_number(c, stack);
+
+			case ast_op_mod:
+				return fmod(_left->eval_number(c, stack), _right->eval_number(c, stack));
+
+			case ast_op_negate:
+				return -_left->eval_number(c, stack);
+
+			case ast_number_constant:
+				return _data.number;
+
+			case ast_func_last:
+				return static_cast<double>(c.size);
+
+			case ast_func_position:
+				return static_cast<double>(c.position);
+
+			case ast_func_count:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return static_cast<double>(_left->eval_node_set(c, stack, nodeset_eval_all).size());
+			}
+
+			case ast_func_string_length_0:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return static_cast<double>(string_value(c.n, stack.result).length());
+			}
+
+			case ast_func_string_length_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return static_cast<double>(_left->eval_string(c, stack).length());
+			}
+
+			case ast_func_number_0:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return convert_string_to_number(string_value(c.n, stack.result).c_str());
+			}
+
+			case ast_func_number_1:
+				return _left->eval_number(c, stack);
+
+			case ast_func_sum:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				double r = 0;
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* it = ns.begin(); it != ns.end(); ++it)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					r += convert_string_to_number(string_value(*it, stack.result).c_str());
+				}
+
+				return r;
+			}
+
+			case ast_func_floor:
+			{
+				double r = _left->eval_number(c, stack);
+
+				return r == r ? floor(r) : r;
+			}
+
+			case ast_func_ceiling:
+			{
+				double r = _left->eval_number(c, stack);
+
+				return r == r ? ceil(r) : r;
+			}
+
+			case ast_func_round:
+				return round_nearest_nzero(_left->eval_number(c, stack));
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_number)
+					return _data.variable->get_number();
+
+				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
+				break;
+			}
+
+			default:
+				;
+			}
+
+			// none of the ast types that return the value directly matched, we need to perform type conversion
+			switch (_rettype)
+			{
+			case xpath_type_boolean:
+				return eval_boolean(c, stack) ? 1 : 0;
+
+			case xpath_type_string:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return convert_string_to_number(eval_string(c, stack).c_str());
+			}
+
+			case xpath_type_node_set:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return convert_string_to_number(eval_string(c, stack).c_str());
+			}
+
+			default:
+				assert(false && "Wrong expression for return type number"); // unreachable
+				return 0;
+			}
+		}
+
+		xpath_string eval_string_concat(const xpath_context& c, const xpath_stack& stack)
+		{
+			assert(_type == ast_func_concat);
+
+			xpath_allocator_capture ct(stack.temp);
+
+			// count the string number
+			size_t count = 1;
+			for (xpath_ast_node* nc = _right; nc; nc = nc->_next) count++;
+
+			// allocate a buffer for temporary string objects
+			xpath_string* buffer = static_cast<xpath_string*>(stack.temp->allocate(count * sizeof(xpath_string)));
+			if (!buffer) return xpath_string();
+
+			// evaluate all strings to temporary stack
+			xpath_stack swapped_stack = {stack.temp, stack.result};
+
+			buffer[0] = _left->eval_string(c, swapped_stack);
+
+			size_t pos = 1;
+			for (xpath_ast_node* n = _right; n; n = n->_next, ++pos) buffer[pos] = n->eval_string(c, swapped_stack);
+			assert(pos == count);
+
+			// get total length
+			size_t length = 0;
+			for (size_t i = 0; i < count; ++i) length += buffer[i].length();
+
+			// create final string
+			char_t* result = static_cast<char_t*>(stack.result->allocate((length + 1) * sizeof(char_t)));
+			if (!result) return xpath_string();
+
+			char_t* ri = result;
+
+			for (size_t j = 0; j < count; ++j)
+				for (const char_t* bi = buffer[j].c_str(); *bi; ++bi)
+					*ri++ = *bi;
+
+			*ri = 0;
+
+			return xpath_string::from_heap_preallocated(result, ri);
+		}
+
+		xpath_string eval_string(const xpath_context& c, const xpath_stack& stack)
+		{
+			switch (_type)
+			{
+			case ast_string_constant:
+				return xpath_string::from_const(_data.string);
+
+			case ast_func_local_name_0:
+			{
+				xpath_node na = c.n;
+
+				return xpath_string::from_const(local_name(na));
+			}
+
+			case ast_func_local_name_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
+				xpath_node na = ns.first();
+
+				return xpath_string::from_const(local_name(na));
+			}
+
+			case ast_func_name_0:
+			{
+				xpath_node na = c.n;
+
+				return xpath_string::from_const(qualified_name(na));
+			}
+
+			case ast_func_name_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
+				xpath_node na = ns.first();
+
+				return xpath_string::from_const(qualified_name(na));
+			}
+
+			case ast_func_namespace_uri_0:
+			{
+				xpath_node na = c.n;
+
+				return xpath_string::from_const(namespace_uri(na));
+			}
+
+			case ast_func_namespace_uri_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
+				xpath_node na = ns.first();
+
+				return xpath_string::from_const(namespace_uri(na));
+			}
+
+			case ast_func_string_0:
+				return string_value(c.n, stack.result);
+
+			case ast_func_string_1:
+				return _left->eval_string(c, stack);
+
+			case ast_func_concat:
+				return eval_string_concat(c, stack);
+
+			case ast_func_substring_before:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				xpath_string p = _right->eval_string(c, swapped_stack);
+
+				const char_t* pos = find_substring(s.c_str(), p.c_str());
+
+				return pos ? xpath_string::from_heap(s.c_str(), pos, stack.result) : xpath_string();
+			}
+
+			case ast_func_substring_after:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				xpath_string p = _right->eval_string(c, swapped_stack);
+
+				const char_t* pos = find_substring(s.c_str(), p.c_str());
+				if (!pos) return xpath_string();
+
+				const char_t* rbegin = pos + p.length();
+				const char_t* rend = s.c_str() + s.length();
+
+				return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin);
+			}
+
+			case ast_func_substring_2:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				size_t s_length = s.length();
+
+				double first = round_nearest(_right->eval_number(c, stack));
+
+				if (is_nan(first)) return xpath_string(); // NaN
+				else if (first >= static_cast<double>(s_length + 1)) return xpath_string();
+
+				size_t pos = first < 1 ? 1 : static_cast<size_t>(first);
+				assert(1 <= pos && pos <= s_length + 1);
+
+				const char_t* rbegin = s.c_str() + (pos - 1);
+				const char_t* rend = s.c_str() + s.length();
+
+				return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin);
+			}
+
+			case ast_func_substring_3:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				size_t s_length = s.length();
+
+				double first = round_nearest(_right->eval_number(c, stack));
+				double last = first + round_nearest(_right->_next->eval_number(c, stack));
+
+				if (is_nan(first) || is_nan(last)) return xpath_string();
+				else if (first >= static_cast<double>(s_length + 1)) return xpath_string();
+				else if (first >= last) return xpath_string();
+				else if (last < 1) return xpath_string();
+
+				size_t pos = first < 1 ? 1 : static_cast<size_t>(first);
+				size_t end = last >= static_cast<double>(s_length + 1) ? s_length + 1 : static_cast<size_t>(last);
+
+				assert(1 <= pos && pos <= end && end <= s_length + 1);
+				const char_t* rbegin = s.c_str() + (pos - 1);
+				const char_t* rend = s.c_str() + (end - 1);
+
+				return (end == s_length + 1 && !s.uses_heap()) ? xpath_string::from_const(rbegin) : xpath_string::from_heap(rbegin, rend, stack.result);
+			}
+
+			case ast_func_normalize_space_0:
+			{
+				xpath_string s = string_value(c.n, stack.result);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = normalize_space(begin);
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_func_normalize_space_1:
+			{
+				xpath_string s = _left->eval_string(c, stack);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = normalize_space(begin);
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_func_translate:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, stack);
+				xpath_string from = _right->eval_string(c, swapped_stack);
+				xpath_string to = _right->_next->eval_string(c, swapped_stack);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = translate(begin, from.c_str(), to.c_str(), to.length());
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_opt_translate_table:
+			{
+				xpath_string s = _left->eval_string(c, stack);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = translate_table(begin, _data.table);
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_string)
+					return xpath_string::from_const(_data.variable->get_string());
+
+				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
+				break;
+			}
+
+			default:
+				;
+			}
+
+			// none of the ast types that return the value directly matched, we need to perform type conversion
+			switch (_rettype)
+			{
+			case xpath_type_boolean:
+				return xpath_string::from_const(eval_boolean(c, stack) ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"));
+
+			case xpath_type_number:
+				return convert_number_to_string(eval_number(c, stack), stack.result);
+
+			case xpath_type_node_set:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_node_set_raw ns = eval_node_set(c, swapped_stack, nodeset_eval_first);
+				return ns.empty() ? xpath_string() : string_value(ns.first(), stack.result);
+			}
+
+			default:
+				assert(false && "Wrong expression for return type string"); // unreachable
+				return xpath_string();
+			}
+		}
+
+		xpath_node_set_raw eval_node_set(const xpath_context& c, const xpath_stack& stack, nodeset_eval_t eval)
+		{
+			switch (_type)
+			{
+			case ast_op_union:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_node_set_raw ls = _left->eval_node_set(c, stack, eval);
+				xpath_node_set_raw rs = _right->eval_node_set(c, swapped_stack, eval);
+
+				// we can optimize merging two sorted sets, but this is a very rare operation, so don't bother
+				ls.set_type(xpath_node_set::type_unsorted);
+
+				ls.append(rs.begin(), rs.end(), stack.result);
+				ls.remove_duplicates(stack.temp);
+
+				return ls;
+			}
+
+			case ast_filter:
+			{
+				xpath_node_set_raw set = _left->eval_node_set(c, stack, _test == predicate_constant_one ? nodeset_eval_first : nodeset_eval_all);
+
+				// either expression is a number or it contains position() call; sort by document order
+				if (_test != predicate_posinv) set.sort_do();
+
+				bool once = eval_once(set.type(), eval);
+
+				apply_predicate(set, 0, stack, once);
+
+				return set;
+			}
+
+			case ast_func_id:
+				return xpath_node_set_raw();
+
+			case ast_step:
+			{
+				switch (_axis)
+				{
+				case axis_ancestor:
+					return step_do(c, stack, eval, axis_to_type<axis_ancestor>());
+
+				case axis_ancestor_or_self:
+					return step_do(c, stack, eval, axis_to_type<axis_ancestor_or_self>());
+
+				case axis_attribute:
+					return step_do(c, stack, eval, axis_to_type<axis_attribute>());
+
+				case axis_child:
+					return step_do(c, stack, eval, axis_to_type<axis_child>());
+
+				case axis_descendant:
+					return step_do(c, stack, eval, axis_to_type<axis_descendant>());
+
+				case axis_descendant_or_self:
+					return step_do(c, stack, eval, axis_to_type<axis_descendant_or_self>());
+
+				case axis_following:
+					return step_do(c, stack, eval, axis_to_type<axis_following>());
+
+				case axis_following_sibling:
+					return step_do(c, stack, eval, axis_to_type<axis_following_sibling>());
+
+				case axis_namespace:
+					// namespaced axis is not supported
+					return xpath_node_set_raw();
+
+				case axis_parent:
+					return step_do(c, stack, eval, axis_to_type<axis_parent>());
+
+				case axis_preceding:
+					return step_do(c, stack, eval, axis_to_type<axis_preceding>());
+
+				case axis_preceding_sibling:
+					return step_do(c, stack, eval, axis_to_type<axis_preceding_sibling>());
+
+				case axis_self:
+					return step_do(c, stack, eval, axis_to_type<axis_self>());
+
+				default:
+					assert(false && "Unknown axis"); // unreachable
+					return xpath_node_set_raw();
+				}
+			}
+
+			case ast_step_root:
+			{
+				assert(!_right); // root step can't have any predicates
+
+				xpath_node_set_raw ns;
+
+				ns.set_type(xpath_node_set::type_sorted);
+
+				if (c.n.node()) ns.push_back(c.n.node().root(), stack.result);
+				else if (c.n.attribute()) ns.push_back(c.n.parent().root(), stack.result);
+
+				return ns;
+			}
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_node_set)
+				{
+					const xpath_node_set& s = _data.variable->get_node_set();
+
+					xpath_node_set_raw ns;
+
+					ns.set_type(s.type());
+					ns.append(s.begin(), s.end(), stack.result);
+
+					return ns;
+				}
+
+				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
+				break;
+			}
+
+			default:
+				;
+			}
+
+			// none of the ast types that return the value directly matched, but conversions to node set are invalid
+			assert(false && "Wrong expression for return type node set"); // unreachable
+			return xpath_node_set_raw();
+		}
+
+		void optimize(xpath_allocator* alloc)
+		{
+			if (_left)
+				_left->optimize(alloc);
+
+			if (_right)
+				_right->optimize(alloc);
+
+			if (_next)
+				_next->optimize(alloc);
+
+			// coverity[var_deref_model]
+			optimize_self(alloc);
+		}
+
+		void optimize_self(xpath_allocator* alloc)
+		{
+			// Rewrite [position()=expr] with [expr]
+			// Note that this step has to go before classification to recognize [position()=1]
+			if ((_type == ast_filter || _type == ast_predicate) &&
+				_right && // workaround for clang static analyzer (_right is never null for ast_filter/ast_predicate)
+				_right->_type == ast_op_equal && _right->_left->_type == ast_func_position && _right->_right->_rettype == xpath_type_number)
+			{
+				_right = _right->_right;
+			}
+
+			// Classify filter/predicate ops to perform various optimizations during evaluation
+			if ((_type == ast_filter || _type == ast_predicate) && _right) // workaround for clang static analyzer (_right is never null for ast_filter/ast_predicate)
+			{
+				assert(_test == predicate_default);
+
+				if (_right->_type == ast_number_constant && _right->_data.number == 1.0)
+					_test = predicate_constant_one;
+				else if (_right->_rettype == xpath_type_number && (_right->_type == ast_number_constant || _right->_type == ast_variable || _right->_type == ast_func_last))
+					_test = predicate_constant;
+				else if (_right->_rettype != xpath_type_number && _right->is_posinv_expr())
+					_test = predicate_posinv;
+			}
+
+			// Rewrite descendant-or-self::node()/child::foo with descendant::foo
+			// The former is a full form of //foo, the latter is much faster since it executes the node test immediately
+			// Do a similar kind of rewrite for self/descendant/descendant-or-self axes
+			// Note that we only rewrite positionally invariant steps (//foo[1] != /descendant::foo[1])
+			if (_type == ast_step && (_axis == axis_child || _axis == axis_self || _axis == axis_descendant || _axis == axis_descendant_or_self) &&
+				_left && _left->_type == ast_step && _left->_axis == axis_descendant_or_self && _left->_test == nodetest_type_node && !_left->_right &&
+				is_posinv_step())
+			{
+				if (_axis == axis_child || _axis == axis_descendant)
+					_axis = axis_descendant;
+				else
+					_axis = axis_descendant_or_self;
+
+				_left = _left->_left;
+			}
+
+			// Use optimized lookup table implementation for translate() with constant arguments
+			if (_type == ast_func_translate &&
+				_right && // workaround for clang static analyzer (_right is never null for ast_func_translate)
+				_right->_type == ast_string_constant && _right->_next->_type == ast_string_constant)
+			{
+				unsigned char* table = translate_table_generate(alloc, _right->_data.string, _right->_next->_data.string);
+
+				if (table)
+				{
+					_type = ast_opt_translate_table;
+					_data.table = table;
+				}
+			}
+
+			// Use optimized path for @attr = 'value' or @attr = $value
+			if (_type == ast_op_equal &&
+				_left && _right && // workaround for clang static analyzer and Coverity (_left and _right are never null for ast_op_equal)
+                // coverity[mixed_enums]
+				_left->_type == ast_step && _left->_axis == axis_attribute && _left->_test == nodetest_name && !_left->_left && !_left->_right &&
+				(_right->_type == ast_string_constant || (_right->_type == ast_variable && _right->_rettype == xpath_type_string)))
+			{
+				_type = ast_opt_compare_attribute;
+			}
+		}
+
+		bool is_posinv_expr() const
+		{
+			switch (_type)
+			{
+			case ast_func_position:
+			case ast_func_last:
+				return false;
+
+			case ast_string_constant:
+			case ast_number_constant:
+			case ast_variable:
+				return true;
+
+			case ast_step:
+			case ast_step_root:
+				return true;
+
+			case ast_predicate:
+			case ast_filter:
+				return true;
+
+			default:
+				if (_left && !_left->is_posinv_expr()) return false;
+
+				for (xpath_ast_node* n = _right; n; n = n->_next)
+					if (!n->is_posinv_expr()) return false;
+
+				return true;
+			}
+		}
+
+		bool is_posinv_step() const
+		{
+			assert(_type == ast_step);
+
+			for (xpath_ast_node* n = _right; n; n = n->_next)
+			{
+				assert(n->_type == ast_predicate);
+
+				if (n->_test != predicate_posinv)
+					return false;
+			}
+
+			return true;
+		}
+
+		xpath_value_type rettype() const
+		{
+			return static_cast<xpath_value_type>(_rettype);
+		}
+	};
+
+	static const size_t xpath_ast_depth_limit =
+	#ifdef PUGIXML_XPATH_DEPTH_LIMIT
+		PUGIXML_XPATH_DEPTH_LIMIT
+	#else
+		1024
+	#endif
+		;
+
+	struct xpath_parser
+	{
+		xpath_allocator* _alloc;
+		xpath_lexer _lexer;
+
+		const char_t* _query;
+		xpath_variable_set* _variables;
+
+		xpath_parse_result* _result;
+
+		char_t _scratch[32];
+
+		size_t _depth;
+
+		xpath_ast_node* error(const char* message)
+		{
+			_result->error = message;
+			_result->offset = _lexer.current_pos() - _query;
+
+			return 0;
+		}
+
+		xpath_ast_node* error_oom()
+		{
+			assert(_alloc->_error);
+			*_alloc->_error = true;
+
+			return 0;
+		}
+
+		xpath_ast_node* error_rec()
+		{
+			return error("Exceeded maximum allowed query depth");
+		}
+
+		void* alloc_node()
+		{
+			return _alloc->allocate(sizeof(xpath_ast_node));
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, const char_t* value)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, double value)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_variable* value)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_ast_node* left = 0, xpath_ast_node* right = 0)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, left, right) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, left, axis, test, contents) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, left, right, test) : 0;
+		}
+
+		const char_t* alloc_string(const xpath_lexer_string& value)
+		{
+			if (!value.begin)
+				return PUGIXML_TEXT("");
+
+			size_t length = static_cast<size_t>(value.end - value.begin);
+
+			char_t* c = static_cast<char_t*>(_alloc->allocate((length + 1) * sizeof(char_t)));
+			if (!c) return 0;
+
+			memcpy(c, value.begin, length * sizeof(char_t));
+			c[length] = 0;
+
+			return c;
+		}
+
+		xpath_ast_node* parse_function(const xpath_lexer_string& name, size_t argc, xpath_ast_node* args[2])
+		{
+			switch (name.begin[0])
+			{
+			case 'b':
+				if (name == PUGIXML_TEXT("boolean") && argc == 1)
+					return alloc_node(ast_func_boolean, xpath_type_boolean, args[0]);
+
+				break;
+
+			case 'c':
+				if (name == PUGIXML_TEXT("count") && argc == 1)
+				{
+					if (args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(ast_func_count, xpath_type_number, args[0]);
+				}
+				else if (name == PUGIXML_TEXT("contains") && argc == 2)
+					return alloc_node(ast_func_contains, xpath_type_boolean, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("concat") && argc >= 2)
+					return alloc_node(ast_func_concat, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("ceiling") && argc == 1)
+					return alloc_node(ast_func_ceiling, xpath_type_number, args[0]);
+
+				break;
+
+			case 'f':
+				if (name == PUGIXML_TEXT("false") && argc == 0)
+					return alloc_node(ast_func_false, xpath_type_boolean);
+				else if (name == PUGIXML_TEXT("floor") && argc == 1)
+					return alloc_node(ast_func_floor, xpath_type_number, args[0]);
+
+				break;
+
+			case 'i':
+				if (name == PUGIXML_TEXT("id") && argc == 1)
+					return alloc_node(ast_func_id, xpath_type_node_set, args[0]);
+
+				break;
+
+			case 'l':
+				if (name == PUGIXML_TEXT("last") && argc == 0)
+					return alloc_node(ast_func_last, xpath_type_number);
+				else if (name == PUGIXML_TEXT("lang") && argc == 1)
+					return alloc_node(ast_func_lang, xpath_type_boolean, args[0]);
+				else if (name == PUGIXML_TEXT("local-name") && argc <= 1)
+				{
+					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(argc == 0 ? ast_func_local_name_0 : ast_func_local_name_1, xpath_type_string, args[0]);
+				}
+
+				break;
+
+			case 'n':
+				if (name == PUGIXML_TEXT("name") && argc <= 1)
+				{
+					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(argc == 0 ? ast_func_name_0 : ast_func_name_1, xpath_type_string, args[0]);
+				}
+				else if (name == PUGIXML_TEXT("namespace-uri") && argc <= 1)
+				{
+					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(argc == 0 ? ast_func_namespace_uri_0 : ast_func_namespace_uri_1, xpath_type_string, args[0]);
+				}
+				else if (name == PUGIXML_TEXT("normalize-space") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_normalize_space_0 : ast_func_normalize_space_1, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("not") && argc == 1)
+					return alloc_node(ast_func_not, xpath_type_boolean, args[0]);
+				else if (name == PUGIXML_TEXT("number") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_number_0 : ast_func_number_1, xpath_type_number, args[0]);
+
+				break;
+
+			case 'p':
+				if (name == PUGIXML_TEXT("position") && argc == 0)
+					return alloc_node(ast_func_position, xpath_type_number);
+
+				break;
+
+			case 'r':
+				if (name == PUGIXML_TEXT("round") && argc == 1)
+					return alloc_node(ast_func_round, xpath_type_number, args[0]);
+
+				break;
+
+			case 's':
+				if (name == PUGIXML_TEXT("string") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_string_0 : ast_func_string_1, xpath_type_string, args[0]);
+				else if (name == PUGIXML_TEXT("string-length") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_string_length_0 : ast_func_string_length_1, xpath_type_number, args[0]);
+				else if (name == PUGIXML_TEXT("starts-with") && argc == 2)
+					return alloc_node(ast_func_starts_with, xpath_type_boolean, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("substring-before") && argc == 2)
+					return alloc_node(ast_func_substring_before, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("substring-after") && argc == 2)
+					return alloc_node(ast_func_substring_after, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("substring") && (argc == 2 || argc == 3))
+					return alloc_node(argc == 2 ? ast_func_substring_2 : ast_func_substring_3, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("sum") && argc == 1)
+				{
+					if (args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(ast_func_sum, xpath_type_number, args[0]);
+				}
+
+				break;
+
+			case 't':
+				if (name == PUGIXML_TEXT("translate") && argc == 3)
+					return alloc_node(ast_func_translate, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("true") && argc == 0)
+					return alloc_node(ast_func_true, xpath_type_boolean);
+
+				break;
+
+			default:
+				break;
+			}
+
+			return error("Unrecognized function or wrong parameter count");
+		}
+
+		axis_t parse_axis_name(const xpath_lexer_string& name, bool& specified)
+		{
+			specified = true;
+
+			switch (name.begin[0])
+			{
+			case 'a':
+				if (name == PUGIXML_TEXT("ancestor"))
+					return axis_ancestor;
+				else if (name == PUGIXML_TEXT("ancestor-or-self"))
+					return axis_ancestor_or_self;
+				else if (name == PUGIXML_TEXT("attribute"))
+					return axis_attribute;
+
+				break;
+
+			case 'c':
+				if (name == PUGIXML_TEXT("child"))
+					return axis_child;
+
+				break;
+
+			case 'd':
+				if (name == PUGIXML_TEXT("descendant"))
+					return axis_descendant;
+				else if (name == PUGIXML_TEXT("descendant-or-self"))
+					return axis_descendant_or_self;
+
+				break;
+
+			case 'f':
+				if (name == PUGIXML_TEXT("following"))
+					return axis_following;
+				else if (name == PUGIXML_TEXT("following-sibling"))
+					return axis_following_sibling;
+
+				break;
+
+			case 'n':
+				if (name == PUGIXML_TEXT("namespace"))
+					return axis_namespace;
+
+				break;
+
+			case 'p':
+				if (name == PUGIXML_TEXT("parent"))
+					return axis_parent;
+				else if (name == PUGIXML_TEXT("preceding"))
+					return axis_preceding;
+				else if (name == PUGIXML_TEXT("preceding-sibling"))
+					return axis_preceding_sibling;
+
+				break;
+
+			case 's':
+				if (name == PUGIXML_TEXT("self"))
+					return axis_self;
+
+				break;
+
+			default:
+				break;
+			}
+
+			specified = false;
+			return axis_child;
+		}
+
+		nodetest_t parse_node_test_type(const xpath_lexer_string& name)
+		{
+			switch (name.begin[0])
+			{
+			case 'c':
+				if (name == PUGIXML_TEXT("comment"))
+					return nodetest_type_comment;
+
+				break;
+
+			case 'n':
+				if (name == PUGIXML_TEXT("node"))
+					return nodetest_type_node;
+
+				break;
+
+			case 'p':
+				if (name == PUGIXML_TEXT("processing-instruction"))
+					return nodetest_type_pi;
+
+				break;
+
+			case 't':
+				if (name == PUGIXML_TEXT("text"))
+					return nodetest_type_text;
+
+				break;
+
+			default:
+				break;
+			}
+
+			return nodetest_none;
+		}
+
+		// PrimaryExpr ::= VariableReference | '(' Expr ')' | Literal | Number | FunctionCall
+		xpath_ast_node* parse_primary_expression()
+		{
+			switch (_lexer.current())
+			{
+			case lex_var_ref:
+			{
+				xpath_lexer_string name = _lexer.contents();
+
+				if (!_variables)
+					return error("Unknown variable: variable set is not provided");
+
+				xpath_variable* var = 0;
+				if (!get_variable_scratch(_scratch, _variables, name.begin, name.end, &var))
+					return error_oom();
+
+				if (!var)
+					return error("Unknown variable: variable set does not contain the given name");
+
+				_lexer.next();
+
+				return alloc_node(ast_variable, var->type(), var);
+			}
+
+			case lex_open_brace:
+			{
+				_lexer.next();
+
+				xpath_ast_node* n = parse_expression();
+				if (!n) return 0;
+
+				if (_lexer.current() != lex_close_brace)
+					return error("Expected ')' to match an opening '('");
+
+				_lexer.next();
+
+				return n;
+			}
+
+			case lex_quoted_string:
+			{
+				const char_t* value = alloc_string(_lexer.contents());
+				if (!value) return 0;
+
+				_lexer.next();
+
+				return alloc_node(ast_string_constant, xpath_type_string, value);
+			}
+
+			case lex_number:
+			{
+				double value = 0;
+
+				if (!convert_string_to_number_scratch(_scratch, _lexer.contents().begin, _lexer.contents().end, &value))
+					return error_oom();
+
+				_lexer.next();
+
+				return alloc_node(ast_number_constant, xpath_type_number, value);
+			}
+
+			case lex_string:
+			{
+				xpath_ast_node* args[2] = {0};
+				size_t argc = 0;
+
+				xpath_lexer_string function = _lexer.contents();
+				_lexer.next();
+
+				xpath_ast_node* last_arg = 0;
+
+				if (_lexer.current() != lex_open_brace)
+					return error("Unrecognized function call");
+				_lexer.next();
+
+				size_t old_depth = _depth;
+
+				while (_lexer.current() != lex_close_brace)
+				{
+					if (argc > 0)
+					{
+						if (_lexer.current() != lex_comma)
+							return error("No comma between function arguments");
+						_lexer.next();
+					}
+
+					if (++_depth > xpath_ast_depth_limit)
+						return error_rec();
+
+					xpath_ast_node* n = parse_expression();
+					if (!n) return 0;
+
+					if (argc < 2) args[argc] = n;
+					else last_arg->set_next(n);
+
+					argc++;
+					last_arg = n;
+				}
+
+				_lexer.next();
+
+				_depth = old_depth;
+
+				return parse_function(function, argc, args);
+			}
+
+			default:
+				return error("Unrecognizable primary expression");
+			}
+		}
+
+		// FilterExpr ::= PrimaryExpr | FilterExpr Predicate
+		// Predicate ::= '[' PredicateExpr ']'
+		// PredicateExpr ::= Expr
+		xpath_ast_node* parse_filter_expression()
+		{
+			xpath_ast_node* n = parse_primary_expression();
+			if (!n) return 0;
+
+			size_t old_depth = _depth;
+
+			while (_lexer.current() == lex_open_square_brace)
+			{
+				_lexer.next();
+
+				if (++_depth > xpath_ast_depth_limit)
+					return error_rec();
+
+				if (n->rettype() != xpath_type_node_set)
+					return error("Predicate has to be applied to node set");
+
+				xpath_ast_node* expr = parse_expression();
+				if (!expr) return 0;
+
+				n = alloc_node(ast_filter, n, expr, predicate_default);
+				if (!n) return 0;
+
+				if (_lexer.current() != lex_close_square_brace)
+					return error("Expected ']' to match an opening '['");
+
+				_lexer.next();
+			}
+
+			_depth = old_depth;
+
+			return n;
+		}
+
+		// Step ::= AxisSpecifier NodeTest Predicate* | AbbreviatedStep
+		// AxisSpecifier ::= AxisName '::' | '@'?
+		// NodeTest ::= NameTest | NodeType '(' ')' | 'processing-instruction' '(' Literal ')'
+		// NameTest ::= '*' | NCName ':' '*' | QName
+		// AbbreviatedStep ::= '.' | '..'
+		xpath_ast_node* parse_step(xpath_ast_node* set)
+		{
+			if (set && set->rettype() != xpath_type_node_set)
+				return error("Step has to be applied to node set");
+
+			bool axis_specified = false;
+			axis_t axis = axis_child; // implied child axis
+
+			if (_lexer.current() == lex_axis_attribute)
+			{
+				axis = axis_attribute;
+				axis_specified = true;
+
+				_lexer.next();
+			}
+			else if (_lexer.current() == lex_dot)
+			{
+				_lexer.next();
+
+				if (_lexer.current() == lex_open_square_brace)
+					return error("Predicates are not allowed after an abbreviated step");
+
+				return alloc_node(ast_step, set, axis_self, nodetest_type_node, 0);
+			}
+			else if (_lexer.current() == lex_double_dot)
+			{
+				_lexer.next();
+
+				if (_lexer.current() == lex_open_square_brace)
+					return error("Predicates are not allowed after an abbreviated step");
+
+				return alloc_node(ast_step, set, axis_parent, nodetest_type_node, 0);
+			}
+
+			nodetest_t nt_type = nodetest_none;
+			xpath_lexer_string nt_name;
+
+			if (_lexer.current() == lex_string)
+			{
+				// node name test
+				nt_name = _lexer.contents();
+				_lexer.next();
+
+				// was it an axis name?
+				if (_lexer.current() == lex_double_colon)
+				{
+					// parse axis name
+					if (axis_specified)
+						return error("Two axis specifiers in one step");
+
+					axis = parse_axis_name(nt_name, axis_specified);
+
+					if (!axis_specified)
+						return error("Unknown axis");
+
+					// read actual node test
+					_lexer.next();
+
+					if (_lexer.current() == lex_multiply)
+					{
+						nt_type = nodetest_all;
+						nt_name = xpath_lexer_string();
+						_lexer.next();
+					}
+					else if (_lexer.current() == lex_string)
+					{
+						nt_name = _lexer.contents();
+						_lexer.next();
+					}
+					else
+					{
+						return error("Unrecognized node test");
+					}
+				}
+
+				if (nt_type == nodetest_none)
+				{
+					// node type test or processing-instruction
+					if (_lexer.current() == lex_open_brace)
+					{
+						_lexer.next();
+
+						if (_lexer.current() == lex_close_brace)
+						{
+							_lexer.next();
+
+							nt_type = parse_node_test_type(nt_name);
+
+							if (nt_type == nodetest_none)
+								return error("Unrecognized node type");
+
+							nt_name = xpath_lexer_string();
+						}
+						else if (nt_name == PUGIXML_TEXT("processing-instruction"))
+						{
+							if (_lexer.current() != lex_quoted_string)
+								return error("Only literals are allowed as arguments to processing-instruction()");
+
+							nt_type = nodetest_pi;
+							nt_name = _lexer.contents();
+							_lexer.next();
+
+							if (_lexer.current() != lex_close_brace)
+								return error("Unmatched brace near processing-instruction()");
+							_lexer.next();
+						}
+						else
+						{
+							return error("Unmatched brace near node type test");
+						}
+					}
+					// QName or NCName:*
+					else
+					{
+						if (nt_name.end - nt_name.begin > 2 && nt_name.end[-2] == ':' && nt_name.end[-1] == '*') // NCName:*
+						{
+							nt_name.end--; // erase *
+
+							nt_type = nodetest_all_in_namespace;
+						}
+						else
+						{
+							nt_type = nodetest_name;
+						}
+					}
+				}
+			}
+			else if (_lexer.current() == lex_multiply)
+			{
+				nt_type = nodetest_all;
+				_lexer.next();
+			}
+			else
+			{
+				return error("Unrecognized node test");
+			}
+
+			const char_t* nt_name_copy = alloc_string(nt_name);
+			if (!nt_name_copy) return 0;
+
+			xpath_ast_node* n = alloc_node(ast_step, set, axis, nt_type, nt_name_copy);
+			if (!n) return 0;
+
+			size_t old_depth = _depth;
+
+			xpath_ast_node* last = 0;
+
+			while (_lexer.current() == lex_open_square_brace)
+			{
+				_lexer.next();
+
+				if (++_depth > xpath_ast_depth_limit)
+					return error_rec();
+
+				xpath_ast_node* expr = parse_expression();
+				if (!expr) return 0;
+
+				xpath_ast_node* pred = alloc_node(ast_predicate, 0, expr, predicate_default);
+				if (!pred) return 0;
+
+				if (_lexer.current() != lex_close_square_brace)
+					return error("Expected ']' to match an opening '['");
+				_lexer.next();
+
+				if (last) last->set_next(pred);
+				else n->set_right(pred);
+
+				last = pred;
+			}
+
+			_depth = old_depth;
+
+			return n;
+		}
+
+		// RelativeLocationPath ::= Step | RelativeLocationPath '/' Step | RelativeLocationPath '//' Step
+		xpath_ast_node* parse_relative_location_path(xpath_ast_node* set)
+		{
+			xpath_ast_node* n = parse_step(set);
+			if (!n) return 0;
+
+			size_t old_depth = _depth;
+
+			while (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash)
+			{
+				lexeme_t l = _lexer.current();
+				_lexer.next();
+
+				if (l == lex_double_slash)
+				{
+					n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
+					if (!n) return 0;
+
+					++_depth;
+				}
+
+				if (++_depth > xpath_ast_depth_limit)
+					return error_rec();
+
+				n = parse_step(n);
+				if (!n) return 0;
+			}
+
+			_depth = old_depth;
+
+			return n;
+		}
+
+		// LocationPath ::= RelativeLocationPath | AbsoluteLocationPath
+		// AbsoluteLocationPath ::= '/' RelativeLocationPath? | '//' RelativeLocationPath
+		xpath_ast_node* parse_location_path()
+		{
+			if (_lexer.current() == lex_slash)
+			{
+				_lexer.next();
+
+				xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set);
+				if (!n) return 0;
+
+				// relative location path can start from axis_attribute, dot, double_dot, multiply and string lexemes; any other lexeme means standalone root path
+				lexeme_t l = _lexer.current();
+
+				if (l == lex_string || l == lex_axis_attribute || l == lex_dot || l == lex_double_dot || l == lex_multiply)
+					return parse_relative_location_path(n);
+				else
+					return n;
+			}
+			else if (_lexer.current() == lex_double_slash)
+			{
+				_lexer.next();
+
+				xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set);
+				if (!n) return 0;
+
+				n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
+				if (!n) return 0;
+
+				return parse_relative_location_path(n);
+			}
+
+			// else clause moved outside of if because of bogus warning 'control may reach end of non-void function being inlined' in gcc 4.0.1
+			return parse_relative_location_path(0);
+		}
+
+		// PathExpr ::= LocationPath
+		//				| FilterExpr
+		//				| FilterExpr '/' RelativeLocationPath
+		//				| FilterExpr '//' RelativeLocationPath
+		// UnionExpr ::= PathExpr | UnionExpr '|' PathExpr
+		// UnaryExpr ::= UnionExpr | '-' UnaryExpr
+		xpath_ast_node* parse_path_or_unary_expression()
+		{
+			// Clarification.
+			// PathExpr begins with either LocationPath or FilterExpr.
+			// FilterExpr begins with PrimaryExpr
+			// PrimaryExpr begins with '$' in case of it being a variable reference,
+			// '(' in case of it being an expression, string literal, number constant or
+			// function call.
+			if (_lexer.current() == lex_var_ref || _lexer.current() == lex_open_brace ||
+				_lexer.current() == lex_quoted_string || _lexer.current() == lex_number ||
+				_lexer.current() == lex_string)
+			{
+				if (_lexer.current() == lex_string)
+				{
+					// This is either a function call, or not - if not, we shall proceed with location path
+					const char_t* state = _lexer.state();
+
+					while (PUGI_IMPL_IS_CHARTYPE(*state, ct_space)) ++state;
+
+					if (*state != '(')
+						return parse_location_path();
+
+					// This looks like a function call; however this still can be a node-test. Check it.
+					if (parse_node_test_type(_lexer.contents()) != nodetest_none)
+						return parse_location_path();
+				}
+
+				xpath_ast_node* n = parse_filter_expression();
+				if (!n) return 0;
+
+				if (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash)
+				{
+					lexeme_t l = _lexer.current();
+					_lexer.next();
+
+					if (l == lex_double_slash)
+					{
+						if (n->rettype() != xpath_type_node_set)
+							return error("Step has to be applied to node set");
+
+						n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
+						if (!n) return 0;
+					}
+
+					// select from location path
+					return parse_relative_location_path(n);
+				}
+
+				return n;
+			}
+			else if (_lexer.current() == lex_minus)
+			{
+				_lexer.next();
+
+				// precedence 7+ - only parses union expressions
+				xpath_ast_node* n = parse_expression(7);
+				if (!n) return 0;
+
+				return alloc_node(ast_op_negate, xpath_type_number, n);
+			}
+			else
+			{
+				return parse_location_path();
+			}
+		}
+
+		struct binary_op_t
+		{
+			ast_type_t asttype;
+			xpath_value_type rettype;
+			int precedence;
+
+			binary_op_t(): asttype(ast_unknown), rettype(xpath_type_none), precedence(0)
+			{
+			}
+
+			binary_op_t(ast_type_t asttype_, xpath_value_type rettype_, int precedence_): asttype(asttype_), rettype(rettype_), precedence(precedence_)
+			{
+			}
+
+			static binary_op_t parse(xpath_lexer& lexer)
+			{
+				switch (lexer.current())
+				{
+				case lex_string:
+					if (lexer.contents() == PUGIXML_TEXT("or"))
+						return binary_op_t(ast_op_or, xpath_type_boolean, 1);
+					else if (lexer.contents() == PUGIXML_TEXT("and"))
+						return binary_op_t(ast_op_and, xpath_type_boolean, 2);
+					else if (lexer.contents() == PUGIXML_TEXT("div"))
+						return binary_op_t(ast_op_divide, xpath_type_number, 6);
+					else if (lexer.contents() == PUGIXML_TEXT("mod"))
+						return binary_op_t(ast_op_mod, xpath_type_number, 6);
+					else
+						return binary_op_t();
+
+				case lex_equal:
+					return binary_op_t(ast_op_equal, xpath_type_boolean, 3);
+
+				case lex_not_equal:
+					return binary_op_t(ast_op_not_equal, xpath_type_boolean, 3);
+
+				case lex_less:
+					return binary_op_t(ast_op_less, xpath_type_boolean, 4);
+
+				case lex_greater:
+					return binary_op_t(ast_op_greater, xpath_type_boolean, 4);
+
+				case lex_less_or_equal:
+					return binary_op_t(ast_op_less_or_equal, xpath_type_boolean, 4);
+
+				case lex_greater_or_equal:
+					return binary_op_t(ast_op_greater_or_equal, xpath_type_boolean, 4);
+
+				case lex_plus:
+					return binary_op_t(ast_op_add, xpath_type_number, 5);
+
+				case lex_minus:
+					return binary_op_t(ast_op_subtract, xpath_type_number, 5);
+
+				case lex_multiply:
+					return binary_op_t(ast_op_multiply, xpath_type_number, 6);
+
+				case lex_union:
+					return binary_op_t(ast_op_union, xpath_type_node_set, 7);
+
+				default:
+					return binary_op_t();
+				}
+			}
+		};
+
+		xpath_ast_node* parse_expression_rec(xpath_ast_node* lhs, int limit)
+		{
+			binary_op_t op = binary_op_t::parse(_lexer);
+
+			while (op.asttype != ast_unknown && op.precedence >= limit)
+			{
+				_lexer.next();
+
+				if (++_depth > xpath_ast_depth_limit)
+					return error_rec();
+
+				xpath_ast_node* rhs = parse_path_or_unary_expression();
+				if (!rhs) return 0;
+
+				binary_op_t nextop = binary_op_t::parse(_lexer);
+
+				while (nextop.asttype != ast_unknown && nextop.precedence > op.precedence)
+				{
+					rhs = parse_expression_rec(rhs, nextop.precedence);
+					if (!rhs) return 0;
+
+					nextop = binary_op_t::parse(_lexer);
+				}
+
+				if (op.asttype == ast_op_union && (lhs->rettype() != xpath_type_node_set || rhs->rettype() != xpath_type_node_set))
+					return error("Union operator has to be applied to node sets");
+
+				lhs = alloc_node(op.asttype, op.rettype, lhs, rhs);
+				if (!lhs) return 0;
+
+				op = binary_op_t::parse(_lexer);
+			}
+
+			return lhs;
+		}
+
+		// Expr ::= OrExpr
+		// OrExpr ::= AndExpr | OrExpr 'or' AndExpr
+		// AndExpr ::= EqualityExpr | AndExpr 'and' EqualityExpr
+		// EqualityExpr ::= RelationalExpr
+		//					| EqualityExpr '=' RelationalExpr
+		//					| EqualityExpr '!=' RelationalExpr
+		// RelationalExpr ::= AdditiveExpr
+		//					  | RelationalExpr '<' AdditiveExpr
+		//					  | RelationalExpr '>' AdditiveExpr
+		//					  | RelationalExpr '<=' AdditiveExpr
+		//					  | RelationalExpr '>=' AdditiveExpr
+		// AdditiveExpr ::= MultiplicativeExpr
+		//					| AdditiveExpr '+' MultiplicativeExpr
+		//					| AdditiveExpr '-' MultiplicativeExpr
+		// MultiplicativeExpr ::= UnaryExpr
+		//						  | MultiplicativeExpr '*' UnaryExpr
+		//						  | MultiplicativeExpr 'div' UnaryExpr
+		//						  | MultiplicativeExpr 'mod' UnaryExpr
+		xpath_ast_node* parse_expression(int limit = 0)
+		{
+			size_t old_depth = _depth;
+
+			if (++_depth > xpath_ast_depth_limit)
+				return error_rec();
+
+			xpath_ast_node* n = parse_path_or_unary_expression();
+			if (!n) return 0;
+
+			n = parse_expression_rec(n, limit);
+
+			_depth = old_depth;
+
+			return n;
+		}
+
+		xpath_parser(const char_t* query, xpath_variable_set* variables, xpath_allocator* alloc, xpath_parse_result* result): _alloc(alloc), _lexer(query), _query(query), _variables(variables), _result(result), _depth(0)
+		{
+		}
+
+		xpath_ast_node* parse()
+		{
+			xpath_ast_node* n = parse_expression();
+			if (!n) return 0;
+
+			assert(_depth == 0);
+
+			// check if there are unparsed tokens left
+			if (_lexer.current() != lex_eof)
+				return error("Incorrect query");
+
+			return n;
+		}
+
+		static xpath_ast_node* parse(const char_t* query, xpath_variable_set* variables, xpath_allocator* alloc, xpath_parse_result* result)
+		{
+			xpath_parser parser(query, variables, alloc, result);
+
+			return parser.parse();
+		}
+	};
+
+	struct xpath_query_impl
+	{
+		static xpath_query_impl* create()
+		{
+			void* memory = xml_memory::allocate(sizeof(xpath_query_impl));
+			if (!memory) return 0;
+
+			return new (memory) xpath_query_impl();
+		}
+
+		static void destroy(xpath_query_impl* impl)
+		{
+			// free all allocated pages
+			impl->alloc.release();
+
+			// free allocator memory (with the first page)
+			xml_memory::deallocate(impl);
+		}
+
+		xpath_query_impl(): root(0), alloc(&block, &oom), oom(false)
+		{
+			block.next = 0;
+			block.capacity = sizeof(block.data);
+		}
+
+		xpath_ast_node* root;
+		xpath_allocator alloc;
+		xpath_memory_block block;
+		bool oom;
+	};
+
+	PUGI_IMPL_FN impl::xpath_ast_node* evaluate_node_set_prepare(xpath_query_impl* impl)
+	{
+		if (!impl) return 0;
+
+		if (impl->root->rettype() != xpath_type_node_set)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return 0;
+		#else
+			xpath_parse_result res;
+			res.error = "Expression does not evaluate to node set";
+
+			throw xpath_exception(res);
+		#endif
+		}
+
+		return impl->root;
+	}
+PUGI_IMPL_NS_END
+
+namespace pugi
+{
+#ifndef PUGIXML_NO_EXCEPTIONS
+	PUGI_IMPL_FN xpath_exception::xpath_exception(const xpath_parse_result& result_): _result(result_)
+	{
+		assert(_result.error);
+	}
+
+	PUGI_IMPL_FN const char* xpath_exception::what() const throw()
+	{
+		return _result.error;
+	}
+
+	PUGI_IMPL_FN const xpath_parse_result& xpath_exception::result() const
+	{
+		return _result;
+	}
+#endif
+
+	PUGI_IMPL_FN xpath_node::xpath_node()
+	{
+	}
+
+	PUGI_IMPL_FN xpath_node::xpath_node(const xml_node& node_): _node(node_)
+	{
+	}
+
+	PUGI_IMPL_FN xpath_node::xpath_node(const xml_attribute& attribute_, const xml_node& parent_): _node(attribute_ ? parent_ : xml_node()), _attribute(attribute_)
+	{
+	}
+
+	PUGI_IMPL_FN xml_node xpath_node::node() const
+	{
+		return _attribute ? xml_node() : _node;
+	}
+
+	PUGI_IMPL_FN xml_attribute xpath_node::attribute() const
+	{
+		return _attribute;
+	}
+
+	PUGI_IMPL_FN xml_node xpath_node::parent() const
+	{
+		return _attribute ? _node : _node.parent();
+	}
+
+	PUGI_IMPL_FN static void unspecified_bool_xpath_node(xpath_node***)
+	{
+	}
+
+	PUGI_IMPL_FN xpath_node::operator xpath_node::unspecified_bool_type() const
+	{
+		return (_node || _attribute) ? unspecified_bool_xpath_node : 0;
+	}
+
+	PUGI_IMPL_FN bool xpath_node::operator!() const
+	{
+		return !(_node || _attribute);
+	}
+
+	PUGI_IMPL_FN bool xpath_node::operator==(const xpath_node& n) const
+	{
+		return _node == n._node && _attribute == n._attribute;
+	}
+
+	PUGI_IMPL_FN bool xpath_node::operator!=(const xpath_node& n) const
+	{
+		return _node != n._node || _attribute != n._attribute;
+	}
+
+#ifdef __BORLANDC__
+	PUGI_IMPL_FN bool operator&&(const xpath_node& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI_IMPL_FN bool operator||(const xpath_node& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI_IMPL_FN void xpath_node_set::_assign(const_iterator begin_, const_iterator end_, type_t type_)
+	{
+		assert(begin_ <= end_);
+
+		size_t size_ = static_cast<size_t>(end_ - begin_);
+
+		// use internal buffer for 0 or 1 elements, heap buffer otherwise
+		xpath_node* storage = (size_ <= 1) ? _storage : static_cast<xpath_node*>(impl::xml_memory::allocate(size_ * sizeof(xpath_node)));
+
+		if (!storage)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return;
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		// deallocate old buffer
+		if (_begin != _storage)
+			impl::xml_memory::deallocate(_begin);
+
+		// size check is necessary because for begin_ = end_ = nullptr, memcpy is UB
+		if (size_)
+			memcpy(storage, begin_, size_ * sizeof(xpath_node));
+
+		_begin = storage;
+		_end = storage + size_;
+		_type = type_;
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI_IMPL_FN void xpath_node_set::_move(xpath_node_set& rhs) PUGIXML_NOEXCEPT
+	{
+		_type = rhs._type;
+		_storage[0] = rhs._storage[0];
+		_begin = (rhs._begin == rhs._storage) ? _storage : rhs._begin;
+		_end = _begin + (rhs._end - rhs._begin);
+
+		rhs._type = type_unsorted;
+		rhs._begin = rhs._storage;
+		rhs._end = rhs._storage;
+	}
+#endif
+
+	PUGI_IMPL_FN xpath_node_set::xpath_node_set(): _type(type_unsorted), _begin(_storage), _end(_storage)
+	{
+	}
+
+	PUGI_IMPL_FN xpath_node_set::xpath_node_set(const_iterator begin_, const_iterator end_, type_t type_): _type(type_unsorted), _begin(_storage), _end(_storage)
+	{
+		_assign(begin_, end_, type_);
+	}
+
+	PUGI_IMPL_FN xpath_node_set::~xpath_node_set()
+	{
+		if (_begin != _storage)
+			impl::xml_memory::deallocate(_begin);
+	}
+
+	PUGI_IMPL_FN xpath_node_set::xpath_node_set(const xpath_node_set& ns): _type(type_unsorted), _begin(_storage), _end(_storage)
+	{
+		_assign(ns._begin, ns._end, ns._type);
+	}
+
+	PUGI_IMPL_FN xpath_node_set& xpath_node_set::operator=(const xpath_node_set& ns)
+	{
+		if (this == &ns) return *this;
+
+		_assign(ns._begin, ns._end, ns._type);
+
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI_IMPL_FN xpath_node_set::xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT: _type(type_unsorted), _begin(_storage), _end(_storage)
+	{
+		_move(rhs);
+	}
+
+	PUGI_IMPL_FN xpath_node_set& xpath_node_set::operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT
+	{
+		if (this == &rhs) return *this;
+
+		if (_begin != _storage)
+			impl::xml_memory::deallocate(_begin);
+
+		_move(rhs);
+
+		return *this;
+	}
+#endif
+
+	PUGI_IMPL_FN xpath_node_set::type_t xpath_node_set::type() const
+	{
+		return _type;
+	}
+
+	PUGI_IMPL_FN size_t xpath_node_set::size() const
+	{
+		return _end - _begin;
+	}
+
+	PUGI_IMPL_FN bool xpath_node_set::empty() const
+	{
+		return _begin == _end;
+	}
+
+	PUGI_IMPL_FN const xpath_node& xpath_node_set::operator[](size_t index) const
+	{
+		assert(index < size());
+		return _begin[index];
+	}
+
+	PUGI_IMPL_FN xpath_node_set::const_iterator xpath_node_set::begin() const
+	{
+		return _begin;
+	}
+
+	PUGI_IMPL_FN xpath_node_set::const_iterator xpath_node_set::end() const
+	{
+		return _end;
+	}
+
+	PUGI_IMPL_FN void xpath_node_set::sort(bool reverse)
+	{
+		_type = impl::xpath_sort(_begin, _end, _type, reverse);
+	}
+
+	PUGI_IMPL_FN xpath_node xpath_node_set::first() const
+	{
+		return impl::xpath_first(_begin, _end, _type);
+	}
+
+	PUGI_IMPL_FN xpath_parse_result::xpath_parse_result(): error("Internal error"), offset(0)
+	{
+	}
+
+	PUGI_IMPL_FN xpath_parse_result::operator bool() const
+	{
+		return error == 0;
+	}
+
+	PUGI_IMPL_FN const char* xpath_parse_result::description() const
+	{
+		return error ? error : "No error";
+	}
+
+	PUGI_IMPL_FN xpath_variable::xpath_variable(xpath_value_type type_): _type(type_), _next(0)
+	{
+	}
+
+	PUGI_IMPL_FN const char_t* xpath_variable::name() const
+	{
+		switch (_type)
+		{
+		case xpath_type_node_set:
+			return static_cast<const impl::xpath_variable_node_set*>(this)->name;
+
+		case xpath_type_number:
+			return static_cast<const impl::xpath_variable_number*>(this)->name;
+
+		case xpath_type_string:
+			return static_cast<const impl::xpath_variable_string*>(this)->name;
+
+		case xpath_type_boolean:
+			return static_cast<const impl::xpath_variable_boolean*>(this)->name;
+
+		default:
+			assert(false && "Invalid variable type"); // unreachable
+			return 0;
+		}
+	}
+
+	PUGI_IMPL_FN xpath_value_type xpath_variable::type() const
+	{
+		return _type;
+	}
+
+	PUGI_IMPL_FN bool xpath_variable::get_boolean() const
+	{
+		return (_type == xpath_type_boolean) ? static_cast<const impl::xpath_variable_boolean*>(this)->value : false;
+	}
+
+	PUGI_IMPL_FN double xpath_variable::get_number() const
+	{
+		return (_type == xpath_type_number) ? static_cast<const impl::xpath_variable_number*>(this)->value : impl::gen_nan();
+	}
+
+	PUGI_IMPL_FN const char_t* xpath_variable::get_string() const
+	{
+		const char_t* value = (_type == xpath_type_string) ? static_cast<const impl::xpath_variable_string*>(this)->value : 0;
+		return value ? value : PUGIXML_TEXT("");
+	}
+
+	PUGI_IMPL_FN const xpath_node_set& xpath_variable::get_node_set() const
+	{
+		return (_type == xpath_type_node_set) ? static_cast<const impl::xpath_variable_node_set*>(this)->value : impl::dummy_node_set;
+	}
+
+	PUGI_IMPL_FN bool xpath_variable::set(bool value)
+	{
+		if (_type != xpath_type_boolean) return false;
+
+		static_cast<impl::xpath_variable_boolean*>(this)->value = value;
+		return true;
+	}
+
+	PUGI_IMPL_FN bool xpath_variable::set(double value)
+	{
+		if (_type != xpath_type_number) return false;
+
+		static_cast<impl::xpath_variable_number*>(this)->value = value;
+		return true;
+	}
+
+	PUGI_IMPL_FN bool xpath_variable::set(const char_t* value)
+	{
+		if (_type != xpath_type_string) return false;
+
+		impl::xpath_variable_string* var = static_cast<impl::xpath_variable_string*>(this);
+
+		// duplicate string
+		size_t size = (impl::strlength(value) + 1) * sizeof(char_t);
+
+		char_t* copy = static_cast<char_t*>(impl::xml_memory::allocate(size));
+		if (!copy) return false;
+
+		memcpy(copy, value, size);
+
+		// replace old string
+		if (var->value) impl::xml_memory::deallocate(var->value);
+		var->value = copy;
+
+		return true;
+	}
+
+	PUGI_IMPL_FN bool xpath_variable::set(const xpath_node_set& value)
+	{
+		if (_type != xpath_type_node_set) return false;
+
+		static_cast<impl::xpath_variable_node_set*>(this)->value = value;
+		return true;
+	}
+
+	PUGI_IMPL_FN xpath_variable_set::xpath_variable_set()
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			_data[i] = 0;
+	}
+
+	PUGI_IMPL_FN xpath_variable_set::~xpath_variable_set()
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			_destroy(_data[i]);
+	}
+
+	PUGI_IMPL_FN xpath_variable_set::xpath_variable_set(const xpath_variable_set& rhs)
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			_data[i] = 0;
+
+		_assign(rhs);
+	}
+
+	PUGI_IMPL_FN xpath_variable_set& xpath_variable_set::operator=(const xpath_variable_set& rhs)
+	{
+		if (this == &rhs) return *this;
+
+		_assign(rhs);
+
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI_IMPL_FN xpath_variable_set::xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+		{
+			_data[i] = rhs._data[i];
+			rhs._data[i] = 0;
+		}
+	}
+
+	PUGI_IMPL_FN xpath_variable_set& xpath_variable_set::operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+		{
+			_destroy(_data[i]);
+
+			_data[i] = rhs._data[i];
+			rhs._data[i] = 0;
+		}
+
+		return *this;
+	}
+#endif
+
+	PUGI_IMPL_FN void xpath_variable_set::_assign(const xpath_variable_set& rhs)
+	{
+		xpath_variable_set temp;
+
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			if (rhs._data[i] && !_clone(rhs._data[i], &temp._data[i]))
+				return;
+
+		_swap(temp);
+	}
+
+	PUGI_IMPL_FN void xpath_variable_set::_swap(xpath_variable_set& rhs)
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+		{
+			xpath_variable* chain = _data[i];
+
+			_data[i] = rhs._data[i];
+			rhs._data[i] = chain;
+		}
+	}
+
+	PUGI_IMPL_FN xpath_variable* xpath_variable_set::_find(const char_t* name) const
+	{
+		const size_t hash_size = sizeof(_data) / sizeof(_data[0]);
+		size_t hash = impl::hash_string(name) % hash_size;
+
+		// look for existing variable
+		for (xpath_variable* var = _data[hash]; var; var = var->_next)
+			if (impl::strequal(var->name(), name))
+				return var;
+
+		return 0;
+	}
+
+	PUGI_IMPL_FN bool xpath_variable_set::_clone(xpath_variable* var, xpath_variable** out_result)
+	{
+		xpath_variable* last = 0;
+
+		while (var)
+		{
+			// allocate storage for new variable
+			xpath_variable* nvar = impl::new_xpath_variable(var->_type, var->name());
+			if (!nvar) return false;
+
+			// link the variable to the result immediately to handle failures gracefully
+			if (last)
+				last->_next = nvar;
+			else
+				*out_result = nvar;
+
+			last = nvar;
+
+			// copy the value; this can fail due to out-of-memory conditions
+			if (!impl::copy_xpath_variable(nvar, var)) return false;
+
+			var = var->_next;
+		}
+
+		return true;
+	}
+
+	PUGI_IMPL_FN void xpath_variable_set::_destroy(xpath_variable* var)
+	{
+		while (var)
+		{
+			xpath_variable* next = var->_next;
+
+			impl::delete_xpath_variable(var->_type, var);
+
+			var = next;
+		}
+	}
+
+	PUGI_IMPL_FN xpath_variable* xpath_variable_set::add(const char_t* name, xpath_value_type type)
+	{
+		const size_t hash_size = sizeof(_data) / sizeof(_data[0]);
+		size_t hash = impl::hash_string(name) % hash_size;
+
+		// look for existing variable
+		for (xpath_variable* var = _data[hash]; var; var = var->_next)
+			if (impl::strequal(var->name(), name))
+				return var->type() == type ? var : 0;
+
+		// add new variable
+		xpath_variable* result = impl::new_xpath_variable(type, name);
+
+		if (result)
+		{
+			result->_next = _data[hash];
+
+			_data[hash] = result;
+		}
+
+		return result;
+	}
+
+	PUGI_IMPL_FN bool xpath_variable_set::set(const char_t* name, bool value)
+	{
+		xpath_variable* var = add(name, xpath_type_boolean);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI_IMPL_FN bool xpath_variable_set::set(const char_t* name, double value)
+	{
+		xpath_variable* var = add(name, xpath_type_number);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI_IMPL_FN bool xpath_variable_set::set(const char_t* name, const char_t* value)
+	{
+		xpath_variable* var = add(name, xpath_type_string);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI_IMPL_FN bool xpath_variable_set::set(const char_t* name, const xpath_node_set& value)
+	{
+		xpath_variable* var = add(name, xpath_type_node_set);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI_IMPL_FN xpath_variable* xpath_variable_set::get(const char_t* name)
+	{
+		return _find(name);
+	}
+
+	PUGI_IMPL_FN const xpath_variable* xpath_variable_set::get(const char_t* name) const
+	{
+		return _find(name);
+	}
+
+	PUGI_IMPL_FN xpath_query::xpath_query(const char_t* query, xpath_variable_set* variables): _impl(0)
+	{
+		impl::xpath_query_impl* qimpl = impl::xpath_query_impl::create();
+
+		if (!qimpl)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			_result.error = "Out of memory";
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+		else
+		{
+			using impl::auto_deleter; // MSVC7 workaround
+			auto_deleter<impl::xpath_query_impl> impl(qimpl, impl::xpath_query_impl::destroy);
+
+			qimpl->root = impl::xpath_parser::parse(query, variables, &qimpl->alloc, &_result);
+
+			if (qimpl->root)
+			{
+				qimpl->root->optimize(&qimpl->alloc);
+
+				_impl = impl.release();
+				_result.error = 0;
+			}
+			else
+			{
+			#ifdef PUGIXML_NO_EXCEPTIONS
+				if (qimpl->oom) _result.error = "Out of memory";
+			#else
+				if (qimpl->oom) throw std::bad_alloc();
+				throw xpath_exception(_result);
+			#endif
+			}
+		}
+	}
+
+	PUGI_IMPL_FN xpath_query::xpath_query(): _impl(0)
+	{
+	}
+
+	PUGI_IMPL_FN xpath_query::~xpath_query()
+	{
+		if (_impl)
+			impl::xpath_query_impl::destroy(static_cast<impl::xpath_query_impl*>(_impl));
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI_IMPL_FN xpath_query::xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT
+	{
+		_impl = rhs._impl;
+		_result = rhs._result;
+		rhs._impl = 0;
+		rhs._result = xpath_parse_result();
+	}
+
+	PUGI_IMPL_FN xpath_query& xpath_query::operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT
+	{
+		if (this == &rhs) return *this;
+
+		if (_impl)
+			impl::xpath_query_impl::destroy(static_cast<impl::xpath_query_impl*>(_impl));
+
+		_impl = rhs._impl;
+		_result = rhs._result;
+		rhs._impl = 0;
+		rhs._result = xpath_parse_result();
+
+		return *this;
+	}
+#endif
+
+	PUGI_IMPL_FN xpath_value_type xpath_query::return_type() const
+	{
+		if (!_impl) return xpath_type_none;
+
+		return static_cast<impl::xpath_query_impl*>(_impl)->root->rettype();
+	}
+
+	PUGI_IMPL_FN bool xpath_query::evaluate_boolean(const xpath_node& n) const
+	{
+		if (!_impl) return false;
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		bool r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_boolean(c, sd.stack);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return false;
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return r;
+	}
+
+	PUGI_IMPL_FN double xpath_query::evaluate_number(const xpath_node& n) const
+	{
+		if (!_impl) return impl::gen_nan();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		double r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_number(c, sd.stack);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return impl::gen_nan();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return r;
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI_IMPL_FN string_t xpath_query::evaluate_string(const xpath_node& n) const
+	{
+		if (!_impl) return string_t();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_string r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_string(c, sd.stack);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return string_t();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return string_t(r.c_str(), r.length());
+	}
+#endif
+
+	PUGI_IMPL_FN size_t xpath_query::evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const
+	{
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_string r = _impl ? static_cast<impl::xpath_query_impl*>(_impl)->root->eval_string(c, sd.stack) : impl::xpath_string();
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			r = impl::xpath_string();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		size_t full_size = r.length() + 1;
+
+		if (capacity > 0)
+		{
+			size_t size = (full_size < capacity) ? full_size : capacity;
+			assert(size > 0);
+
+			memcpy(buffer, r.c_str(), (size - 1) * sizeof(char_t));
+			buffer[size - 1] = 0;
+		}
+
+		return full_size;
+	}
+
+	PUGI_IMPL_FN xpath_node_set xpath_query::evaluate_node_set(const xpath_node& n) const
+	{
+		impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast<impl::xpath_query_impl*>(_impl));
+		if (!root) return xpath_node_set();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_node_set_raw r = root->eval_node_set(c, sd.stack, impl::nodeset_eval_all);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return xpath_node_set();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return xpath_node_set(r.begin(), r.end(), r.type());
+	}
+
+	PUGI_IMPL_FN xpath_node xpath_query::evaluate_node(const xpath_node& n) const
+	{
+		impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast<impl::xpath_query_impl*>(_impl));
+		if (!root) return xpath_node();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_node_set_raw r = root->eval_node_set(c, sd.stack, impl::nodeset_eval_first);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return xpath_node();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return r.first();
+	}
+
+	PUGI_IMPL_FN const xpath_parse_result& xpath_query::result() const
+	{
+		return _result;
+	}
+
+	PUGI_IMPL_FN static void unspecified_bool_xpath_query(xpath_query***)
+	{
+	}
+
+	PUGI_IMPL_FN xpath_query::operator xpath_query::unspecified_bool_type() const
+	{
+		return _impl ? unspecified_bool_xpath_query : 0;
+	}
+
+	PUGI_IMPL_FN bool xpath_query::operator!() const
+	{
+		return !_impl;
+	}
+
+	PUGI_IMPL_FN xpath_node xml_node::select_node(const char_t* query, xpath_variable_set* variables) const
+	{
+		xpath_query q(query, variables);
+		return q.evaluate_node(*this);
+	}
+
+	PUGI_IMPL_FN xpath_node xml_node::select_node(const xpath_query& query) const
+	{
+		return query.evaluate_node(*this);
+	}
+
+	PUGI_IMPL_FN xpath_node_set xml_node::select_nodes(const char_t* query, xpath_variable_set* variables) const
+	{
+		xpath_query q(query, variables);
+		return q.evaluate_node_set(*this);
+	}
+
+	PUGI_IMPL_FN xpath_node_set xml_node::select_nodes(const xpath_query& query) const
+	{
+		return query.evaluate_node_set(*this);
+	}
+
+	PUGI_IMPL_FN xpath_node xml_node::select_single_node(const char_t* query, xpath_variable_set* variables) const
+	{
+		xpath_query q(query, variables);
+		return q.evaluate_node(*this);
+	}
+
+	PUGI_IMPL_FN xpath_node xml_node::select_single_node(const xpath_query& query) const
+	{
+		return query.evaluate_node(*this);
+	}
+}
+
+#endif
+
+#ifdef __BORLANDC__
+#	pragma option pop
+#endif
+
+// Intel C++ does not properly keep warning state for function templates,
+// so popping warning state at the end of translation unit leads to warnings in the middle.
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+#	pragma warning(pop)
+#endif
+
+#if defined(_MSC_VER) && defined(__c2__)
+#	pragma clang diagnostic pop
+#endif
+
+// Undefine all local macros (makes sure we're not leaking macros in header-only mode)
+#undef PUGI_IMPL_NO_INLINE
+#undef PUGI_IMPL_UNLIKELY
+#undef PUGI_IMPL_STATIC_ASSERT
+#undef PUGI_IMPL_DMC_VOLATILE
+#undef PUGI_IMPL_UNSIGNED_OVERFLOW
+#undef PUGI_IMPL_MSVC_CRT_VERSION
+#undef PUGI_IMPL_SNPRINTF
+#undef PUGI_IMPL_NS_BEGIN
+#undef PUGI_IMPL_NS_END
+#undef PUGI_IMPL_FN
+#undef PUGI_IMPL_FN_NO_INLINE
+#undef PUGI_IMPL_GETHEADER_IMPL
+#undef PUGI_IMPL_GETPAGE_IMPL
+#undef PUGI_IMPL_GETPAGE
+#undef PUGI_IMPL_NODETYPE
+#undef PUGI_IMPL_IS_CHARTYPE_IMPL
+#undef PUGI_IMPL_IS_CHARTYPE
+#undef PUGI_IMPL_IS_CHARTYPEX
+#undef PUGI_IMPL_ENDSWITH
+#undef PUGI_IMPL_SKIPWS
+#undef PUGI_IMPL_OPTSET
+#undef PUGI_IMPL_PUSHNODE
+#undef PUGI_IMPL_POPNODE
+#undef PUGI_IMPL_SCANFOR
+#undef PUGI_IMPL_SCANWHILE
+#undef PUGI_IMPL_SCANWHILE_UNROLL
+#undef PUGI_IMPL_ENDSEG
+#undef PUGI_IMPL_THROW_ERROR
+#undef PUGI_IMPL_CHECK_ERROR
+
+#endif
+
+/**
+ * Copyright (c) 2006-2023 Arseny Kapoulkine
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
diff --git a/src/rest.cpp b/src/rest.cpp
index faf74538a64..ec76a9ed396 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -402,7 +402,7 @@ int Rest::GetLocationRelativeToCurrentLayer(const Staff *currentStaff, const Lay
     // Get previous and next elements from the current layer
     if (currentLayer->GetFirstChildNot(REST)) {
         GetRelativeLayerElementFunctor getRelativeLayerElementBackwards(this->GetIdx(), false);
-        getRelativeLayerElementBackwards.PushDirection(BACKWARD);
+        getRelativeLayerElementBackwards.SetDirection(BACKWARD);
         currentLayer->Process(getRelativeLayerElementBackwards);
         previousElement = getRelativeLayerElementBackwards.GetRelativeElement();
 
@@ -474,7 +474,7 @@ int Rest::GetFirstRelativeElementLocation(
 
     // Get last element if it's previous layer, get first one otherwise
     GetRelativeLayerElementFunctor getRelativeLayerElement(this->GetIdx(), true);
-    getRelativeLayerElement.PushDirection(!isPrevious);
+    getRelativeLayerElement.SetDirection(!isPrevious);
     (*layerIter)->Process(getRelativeLayerElement);
 
     const Object *lastLayerElement = getRelativeLayerElement.GetRelativeElement();
diff --git a/src/runningelement.cpp b/src/runningelement.cpp
index 3fcc0a36082..91d724c7bac 100644
--- a/src/runningelement.cpp
+++ b/src/runningelement.cpp
@@ -108,8 +108,7 @@ int RunningElement::GetTotalWidth(const Doc *doc) const
 
 void RunningElement::SetDrawingPage(Page *page)
 {
-
-    this->ResetList(this);
+    this->ResetList();
 
     this->ResetCachedDrawingX();
     m_drawingPage = page;
diff --git a/src/score.cpp b/src/score.cpp
index fb10abcd573..3e6886578c8 100644
--- a/src/score.cpp
+++ b/src/score.cpp
@@ -86,16 +86,6 @@ bool Score::IsSupportedChild(Object *child)
     return true;
 }
 
-void Score::SetAsCurrent()
-{
-    Doc *doc = vrv_cast<Doc *>(this->GetFirstAncestor(DOC));
-    // The doc can be NULL when doing the castoff and the pages are no attached to the doc
-    // If such cases, it will not matter not to have the current scoreDef in the doc
-    if (doc) {
-        doc->SetCurrentScore(this);
-    }
-}
-
 void Score::CalcRunningElementHeight(Doc *doc)
 {
     assert(doc);
diff --git a/src/scoredef.cpp b/src/scoredef.cpp
index 2cc929116dc..172f1d5a021 100644
--- a/src/scoredef.cpp
+++ b/src/scoredef.cpp
@@ -475,7 +475,7 @@ void ScoreDef::FilterList(ListOfConstObjects &childList) const
 
 void ScoreDef::ResetFromDrawingValues()
 {
-    const ListOfObjects &childList = this->GetList(this);
+    const ListOfObjects &childList = this->GetList();
 
     StaffDef *staffDef = NULL;
     for (Object *object : childList) {
@@ -510,13 +510,12 @@ StaffDef *ScoreDef::GetStaffDef(int n)
 
 const StaffDef *ScoreDef::GetStaffDef(int n) const
 {
-    const ListOfConstObjects &childList = this->GetList(this);
-    ListOfConstObjects::const_iterator iter;
+    const ListOfConstObjects &childList = this->GetList();
 
     const StaffDef *staffDef = NULL;
-    for (iter = childList.begin(); iter != childList.end(); ++iter) {
-        if (!(*iter)->Is(STAFFDEF)) continue;
-        staffDef = vrv_cast<const StaffDef *>(*iter);
+    for (const Object *child : childList) {
+        if (!child->Is(STAFFDEF)) continue;
+        staffDef = vrv_cast<const StaffDef *>(child);
         assert(staffDef);
         if (staffDef->GetN() == n) {
             return staffDef;
@@ -547,15 +546,14 @@ const StaffGrp *ScoreDef::GetStaffGrp(const std::string &n) const
 
 std::vector<int> ScoreDef::GetStaffNs() const
 {
-    const ListOfConstObjects &childList = this->GetList(this);
-    ListOfConstObjects::const_iterator iter;
+    const ListOfConstObjects &childList = this->GetList();
 
     std::vector<int> ns;
     const StaffDef *staffDef = NULL;
-    for (iter = childList.begin(); iter != childList.end(); ++iter) {
+    for (const Object *child : childList) {
         // It should be staffDef only, but double check.
-        if (!(*iter)->Is(STAFFDEF)) continue;
-        staffDef = vrv_cast<const StaffDef *>(*iter);
+        if (!child->Is(STAFFDEF)) continue;
+        staffDef = vrv_cast<const StaffDef *>(child);
         assert(staffDef);
         ns.push_back(staffDef->GetN());
     }
diff --git a/src/scoredefinterface.cpp b/src/scoredefinterface.cpp
index f052082528c..2fcd0c8fd47 100644
--- a/src/scoredefinterface.cpp
+++ b/src/scoredefinterface.cpp
@@ -32,6 +32,7 @@ ScoreDefInterface::ScoreDefInterface()
     , AttMidiTempo()
     , AttMmTempo()
     , AttMultinumMeasures()
+    , AttOctaveDefault()
     , AttPianoPedals()
     , AttSpacing()
     , AttSystems()
@@ -45,6 +46,7 @@ ScoreDefInterface::ScoreDefInterface()
     this->RegisterInterfaceAttClass(ATT_MIDITEMPO);
     this->RegisterInterfaceAttClass(ATT_MMTEMPO);
     this->RegisterInterfaceAttClass(ATT_MULTINUMMEASURES);
+    this->RegisterInterfaceAttClass(ATT_OCTAVEDEFAULT);
     this->RegisterInterfaceAttClass(ATT_PIANOPEDALS);
     this->RegisterInterfaceAttClass(ATT_SPACING);
     this->RegisterInterfaceAttClass(ATT_SYSTEMS);
@@ -63,6 +65,7 @@ void ScoreDefInterface::Reset()
     this->ResetMidiTempo();
     this->ResetMmTempo();
     this->ResetMultinumMeasures();
+    this->ResetOctaveDefault();
     this->ResetPianoPedals();
     this->ResetSpacing();
     this->ResetSystems();
diff --git a/src/setscoredeffunctor.cpp b/src/setscoredeffunctor.cpp
index d78d59db534..144bc4d3248 100644
--- a/src/setscoredeffunctor.cpp
+++ b/src/setscoredeffunctor.cpp
@@ -66,12 +66,13 @@ ScoreDefSetCurrentPageFunctor::ScoreDefSetCurrentPageFunctor(Doc *doc) : DocFunc
 
 FunctorCode ScoreDefSetCurrentPageFunctor::VisitPageEnd(Page *page)
 {
-    if (!page->m_score) {
-        page->m_score = m_doc->GetCurrentScore();
-    }
-    else {
-        page->m_scoreEnd = m_doc->GetCurrentScore();
-    }
+    const Object *firstSystem = page->GetFirst(SYSTEM);
+    const Object *reference = firstSystem ? firstSystem : page;
+    page->m_score = m_doc->GetCorrespondingScore(reference);
+
+    const Object *lastSystem = page->GetLast(SYSTEM);
+    reference = lastSystem ? lastSystem : page;
+    page->m_scoreEnd = m_doc->GetCorrespondingScore(reference);
 
     return FUNCTOR_CONTINUE;
 }
diff --git a/src/slur.cpp b/src/slur.cpp
index ca875c4669f..5719bdfbe09 100644
--- a/src/slur.cpp
+++ b/src/slur.cpp
@@ -45,14 +45,14 @@ Slur::Slur()
     , TimeSpanningInterface()
     , AttColor()
     , AttCurvature()
-    , AttCurveRend()
     , AttLayerIdent()
+    , AttLineRendBase()
 {
     this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     this->RegisterAttClass(ATT_COLOR);
     this->RegisterAttClass(ATT_CURVATURE);
-    this->RegisterAttClass(ATT_CURVEREND);
     this->RegisterAttClass(ATT_LAYERIDENT);
+    this->RegisterAttClass(ATT_LINERENDBASE);
 
     this->Reset();
 }
@@ -62,14 +62,14 @@ Slur::Slur(ClassId classId)
     , TimeSpanningInterface()
     , AttColor()
     , AttCurvature()
-    , AttCurveRend()
     , AttLayerIdent()
+    , AttLineRendBase()
 {
     this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     this->RegisterAttClass(ATT_COLOR);
     this->RegisterAttClass(ATT_CURVATURE);
-    this->RegisterAttClass(ATT_CURVEREND);
     this->RegisterAttClass(ATT_LAYERIDENT);
+    this->RegisterAttClass(ATT_LINERENDBASE);
 
     this->Reset();
 }
@@ -79,14 +79,14 @@ Slur::Slur(ClassId classId, const std::string &classIdStr)
     , TimeSpanningInterface()
     , AttColor()
     , AttCurvature()
-    , AttCurveRend()
     , AttLayerIdent()
+    , AttLineRendBase()
 {
     this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     this->RegisterAttClass(ATT_COLOR);
     this->RegisterAttClass(ATT_CURVATURE);
-    this->RegisterAttClass(ATT_CURVEREND);
     this->RegisterAttClass(ATT_LAYERIDENT);
+    this->RegisterAttClass(ATT_LINERENDBASE);
 
     this->Reset();
 }
@@ -99,8 +99,8 @@ void Slur::Reset()
     TimeSpanningInterface::Reset();
     this->ResetColor();
     this->ResetCurvature();
-    this->ResetCurveRend();
     this->ResetLayerIdent();
+    this->ResetLineRendBase();
 
     m_drawingCurveDir = SlurCurveDirection::None;
 }
@@ -562,839 +562,6 @@ void Slur::InitBezierControlSides(BezierCurve &bezier, curvature_CURVEDIR curveD
     }
 }
 
-void Slur::AdjustSlur(const Doc *doc, FloatingCurvePositioner *curve, int unit)
-{
-    assert(doc);
-    assert(curve);
-
-    Point points[4];
-    curve->GetPoints(points);
-    BezierCurve bezier(points[0], points[1], points[2], points[3]);
-    this->InitBezierControlSides(bezier, curve->GetDir());
-    bezier.UpdateControlPointParams();
-
-    const int margin = doc->GetOptions()->m_slurMargin.GetValue() * unit;
-    const double flexibility = doc->GetOptions()->m_slurEndpointFlexibility.GetValue();
-    const double symmetry = doc->GetOptions()->m_slurSymmetry.GetValue();
-
-    // STEP 1: Filter spanned elements and discard certain bounding boxes even though they collide
-    this->FilterSpannedElements(curve, bezier, margin);
-
-    // STEP 2: Detect collisions near the endpoints and switch to secondary endpoints if necessary
-    NearEndCollision nearEndCollision = this->DetectCollisionsNearEnd(curve, bezier, margin);
-    this->CalcInitialCurve(doc, curve, &nearEndCollision);
-    if (nearEndCollision.endPointsAdjusted) {
-        curve->GetPoints(points);
-        bezier.p1 = points[0];
-        bezier.c1 = points[1];
-        bezier.c2 = points[2];
-        bezier.p2 = points[3];
-        bezier.UpdateControlPointParams();
-        this->CalcSpannedElements(curve);
-        this->FilterSpannedElements(curve, bezier, margin);
-    }
-    else {
-        curve->UpdatePoints(bezier);
-    }
-
-    // STEP 3: Calculate the vertical adjustment of endpoints. This shifts the slur vertically.
-    // Only collisions near the endpoints are taken into account.
-    int endPointShiftLeft = 0;
-    int endPointShiftRight = 0;
-    std::tie(endPointShiftLeft, endPointShiftRight) = this->CalcEndPointShift(curve, bezier, flexibility, margin);
-    this->ApplyEndPointShift(curve, bezier, endPointShiftLeft, endPointShiftRight);
-
-    // Special handling if bulge is prescribed from here on
-    if (this->HasBulge()) {
-        this->AdjustSlurFromBulge(curve, bezier, unit);
-        return;
-    }
-
-    // STEP 4: Calculate the horizontal offset of the control points.
-    // The idea is to shift control points to the outside if there is an obstacle in the vicinity of the corresponding
-    // endpoint. For C1 we consider the largest angle <)BP1P2 where B is a colliding left bounding box corner and choose
-    // C1 in this direction. Similar for C2.
-    if (this->AllowControlOffsetAdjustment(bezier, symmetry, unit)) {
-        bool ok = false;
-        int controlPointOffsetLeft = 0;
-        int controlPointOffsetRight = 0;
-        std::tie(ok, controlPointOffsetLeft, controlPointOffsetRight)
-            = this->CalcControlPointOffset(curve, bezier, margin);
-        if (ok) {
-            bezier.SetLeftControlOffset(controlPointOffsetLeft);
-            bezier.SetRightControlOffset(controlPointOffsetRight);
-            bezier.UpdateControlPoints();
-            curve->UpdatePoints(bezier);
-        }
-    }
-
-    // STEP 5: Calculate the vertical shift of the control points.
-    // For each colliding bounding box we formulate a constraint ax + by >= c
-    // where x, y denote the vertical adjustments of the control points and c is the size of the collision.
-    // The coefficients a, b are calculated from the Bezier curve equation.
-    // After collecting all constraints we calculate a solution.
-    const ControlPointAdjustment adjustment = this->CalcControlPointVerticalShift(curve, bezier, symmetry, margin);
-    const int leftSign = (bezier.IsLeftControlAbove() == adjustment.moveUpwards) ? 1 : -1;
-    bezier.SetLeftControlHeight(bezier.GetLeftControlHeight() + leftSign * adjustment.leftShift);
-    const int rightSign = (bezier.IsRightControlAbove() == adjustment.moveUpwards) ? 1 : -1;
-    bezier.SetRightControlHeight(bezier.GetRightControlHeight() + rightSign * adjustment.rightShift);
-    bezier.UpdateControlPoints();
-    curve->UpdatePoints(bezier);
-    curve->SetRequestedStaffSpace(adjustment.requestedStaffSpace);
-
-    // STEP 6: Adjust the slur shape
-    // Through the control point adjustments in step 3 and 4 it can happen that the slur looses its desired shape.
-    // We correct the shape if the slur is too flat or not convex.
-    if (curve->GetDir() != curvature_CURVEDIR_mixed) {
-        this->AdjustSlurShape(bezier, curve->GetDir(), unit);
-        curve->UpdatePoints(bezier);
-    }
-
-    // Since we are going to redraw it, reset its bounding box
-    curve->BoundingBox::ResetBoundingBox();
-}
-
-void Slur::FilterSpannedElements(FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, int margin)
-{
-    if (bezierCurve.p1.x >= bezierCurve.p2.x) return;
-
-    const int dist = bezierCurve.p2.x - bezierCurve.p1.x;
-
-    const ArrayOfCurveSpannedElements *spannedElements = curve->GetSpannedElements();
-
-    for (CurveSpannedElement *spannedElement : *spannedElements) {
-
-        if (spannedElement->m_discarded) {
-            continue;
-        }
-
-        bool discard = false;
-        const int intersection = curve->CalcDirectionalAdjustment(
-            spannedElement->m_boundingBox, spannedElement->m_isBelow, discard, margin);
-        const int xMiddle
-            = (spannedElement->m_boundingBox->GetSelfLeft() + spannedElement->m_boundingBox->GetSelfRight()) / 2.0;
-        const float distanceRatio = float(xMiddle - bezierCurve.p1.x) / float(dist);
-
-        // Check if obstacles completely lie on the other side of the slur
-        const int elementHeight
-            = std::abs(spannedElement->m_boundingBox->GetSelfTop() - spannedElement->m_boundingBox->GetSelfBottom());
-        if (intersection > elementHeight + 4 * margin) {
-            // Ignore elements in a different layer near the endpoints
-            const LayerElement *layerElement = dynamic_cast<const LayerElement *>(spannedElement->m_boundingBox);
-            if (distanceRatio < 0.05) {
-                spannedElement->m_discarded = layerElement
-                    ? (layerElement->GetOriginalLayerN() != this->GetStart()->GetOriginalLayerN())
-                    : true;
-            }
-            else if (distanceRatio > 0.95) {
-                spannedElement->m_discarded
-                    = layerElement ? (layerElement->GetOriginalLayerN() != this->GetEnd()->GetOriginalLayerN()) : true;
-            }
-            // Ignore tuplet numbers
-            if (layerElement && layerElement->Is(TUPLET_NUM)) {
-                spannedElement->m_discarded = true;
-            }
-        }
-    }
-}
-
-NearEndCollision Slur::DetectCollisionsNearEnd(
-    FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, int margin)
-{
-    NearEndCollision nearEndCollision({ 0.0, 0.0, false });
-    if (bezierCurve.p1.x >= bezierCurve.p2.x) return nearEndCollision;
-
-    const ArrayOfCurveSpannedElements *spannedElements = curve->GetSpannedElements();
-    for (CurveSpannedElement *spannedElement : *spannedElements) {
-        if (spannedElement->m_discarded) {
-            continue;
-        }
-
-        bool discard = false;
-        int intersectionLeft, intersectionRight;
-        std::tie(intersectionLeft, intersectionRight) = curve->CalcDirectionalLeftRightAdjustment(
-            spannedElement->m_boundingBox, spannedElement->m_isBelow, discard, margin);
-
-        if ((intersectionLeft > 0) || (intersectionRight > 0)) {
-            Point points[4];
-            points[0] = bezierCurve.p1;
-            points[1] = bezierCurve.c1;
-            points[2] = bezierCurve.c2;
-            points[3] = bezierCurve.p2;
-
-            // Adjust the collision metrics
-            const int xLeft = std::max(bezierCurve.p1.x, spannedElement->m_boundingBox->GetSelfLeft());
-            Point pLeft(xLeft, BoundingBox::CalcBezierAtPosition(points, xLeft));
-            double distStart = std::max(BoundingBox::CalcDistance(bezierCurve.p1, pLeft), 1.0);
-            double distEnd = std::max(BoundingBox::CalcDistance(bezierCurve.p2, pLeft), 1.0);
-            nearEndCollision.metricAtStart = std::max(intersectionLeft / distStart, nearEndCollision.metricAtStart);
-            nearEndCollision.metricAtEnd = std::max(intersectionLeft / distEnd, nearEndCollision.metricAtEnd);
-
-            const int xRight = std::min(bezierCurve.p2.x, spannedElement->m_boundingBox->GetSelfRight());
-            Point pRight(xRight, BoundingBox::CalcBezierAtPosition(points, xRight));
-            distStart = std::max(BoundingBox::CalcDistance(bezierCurve.p1, pRight), 1.0);
-            distEnd = std::max(BoundingBox::CalcDistance(bezierCurve.p2, pRight), 1.0);
-            nearEndCollision.metricAtStart = std::max(intersectionRight / distStart, nearEndCollision.metricAtStart);
-            nearEndCollision.metricAtEnd = std::max(intersectionRight / distEnd, nearEndCollision.metricAtEnd);
-        }
-    }
-
-    return nearEndCollision;
-}
-
-std::pair<int, int> Slur::CalcEndPointShift(
-    FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, const double flexibility, const int margin)
-{
-    if (bezierCurve.p1.x >= bezierCurve.p2.x) return { 0, 0 };
-
-    int shiftLeft = 0;
-    int shiftRight = 0;
-
-    const int dist = bezierCurve.p2.x - bezierCurve.p1.x;
-
-    const ArrayOfCurveSpannedElements *spannedElements = curve->GetSpannedElements();
-    for (CurveSpannedElement *spannedElement : *spannedElements) {
-
-        if (spannedElement->m_discarded) {
-            continue;
-        }
-
-        bool discard = false;
-        int intersectionLeft, intersectionRight;
-        std::tie(intersectionLeft, intersectionRight) = curve->CalcDirectionalLeftRightAdjustment(
-            spannedElement->m_boundingBox, spannedElement->m_isBelow, discard, margin);
-
-        if (discard) {
-            spannedElement->m_discarded = true;
-            continue;
-        }
-
-        if ((intersectionLeft > 0) || (intersectionRight > 0)) {
-            // Now apply the intersections on the left and right hand side of the bounding box
-            const int xLeft = std::max(bezierCurve.p1.x, spannedElement->m_boundingBox->GetSelfLeft());
-            const float distanceRatioLeft = float(xLeft - bezierCurve.p1.x) / float(dist);
-            this->ShiftEndPoints(shiftLeft, shiftRight, distanceRatioLeft, intersectionLeft, flexibility,
-                spannedElement->m_isBelow, curve->m_spanningType);
-
-            const int xRight = std::min(bezierCurve.p2.x, spannedElement->m_boundingBox->GetSelfRight());
-            const float distanceRatioRight = float(xRight - bezierCurve.p1.x) / float(dist);
-            this->ShiftEndPoints(shiftLeft, shiftRight, distanceRatioRight, intersectionRight, flexibility,
-                spannedElement->m_isBelow, curve->m_spanningType);
-        }
-    }
-
-    return { shiftLeft, shiftRight };
-}
-
-void Slur::ApplyEndPointShift(
-    FloatingCurvePositioner *curve, BezierCurve &bezierCurve, int endPointShiftLeft, int endPointShiftRight)
-{
-    if ((endPointShiftLeft != 0) || (endPointShiftRight != 0)) {
-        const int signLeft = bezierCurve.IsLeftControlAbove() ? 1 : -1;
-        const int signRight = bezierCurve.IsRightControlAbove() ? 1 : -1;
-        bezierCurve.p1.y += signLeft * endPointShiftLeft;
-        bezierCurve.p2.y += signRight * endPointShiftRight;
-        if (bezierCurve.p1.x != bezierCurve.p2.x) {
-            double lambda1, lambda2;
-            std::tie(lambda1, lambda2) = bezierCurve.EstimateCurveParamForControlPoints();
-            bezierCurve.c1.y
-                += signLeft * (1.0 - lambda1) * endPointShiftLeft + signRight * lambda1 * endPointShiftRight;
-            bezierCurve.c2.y
-                += signLeft * (1.0 - lambda2) * endPointShiftLeft + signRight * lambda2 * endPointShiftRight;
-        }
-        bezierCurve.UpdateControlPointParams();
-        curve->UpdatePoints(bezierCurve);
-    }
-}
-
-void Slur::ShiftEndPoints(int &shiftLeft, int &shiftRight, double ratio, int intersection, double flexibility,
-    bool isBelow, char spanningType) const
-{
-    // Filter collisions near the endpoints
-    // Collisions with ratio beyond the partialShiftRadius do not contribute to shifts
-    // They are compensated later by shifting the control points
-    double fullShiftRadius = 0.0;
-    double partialShiftRadius = 0.0;
-    std::tie(fullShiftRadius, partialShiftRadius) = this->CalcShiftRadii(true, flexibility, spanningType);
-
-    if ((ratio < partialShiftRadius) && (this->HasEndpointAboveStart() == isBelow)) {
-        if (ratio > fullShiftRadius) {
-            // Collisions here only partially contribute to shifts
-            // We multiply with a function that interpolates between 1 and 0
-            intersection *= this->CalcQuadraticInterpolation(partialShiftRadius, fullShiftRadius, ratio);
-        }
-        shiftLeft = std::max(shiftLeft, intersection);
-    }
-
-    std::tie(fullShiftRadius, partialShiftRadius) = this->CalcShiftRadii(false, flexibility, spanningType);
-
-    if ((ratio > 1.0 - partialShiftRadius) && (this->HasEndpointAboveEnd() == isBelow)) {
-        if (ratio < 1.0 - fullShiftRadius) {
-            // Collisions here only partially contribute to shifts
-            // We multiply with a function that interpolates between 0 and 1
-            intersection *= this->CalcQuadraticInterpolation(1.0 - partialShiftRadius, 1.0 - fullShiftRadius, ratio);
-        }
-        shiftRight = std::max(shiftRight, intersection);
-    }
-}
-
-std::pair<double, double> Slur::CalcShiftRadii(bool forShiftLeft, double flexibility, char spanningType) const
-{
-    // Use full flexibility for broken slur endpoints
-    if (forShiftLeft) {
-        if ((spanningType == SPANNING_MIDDLE) || (spanningType == SPANNING_END)) {
-            flexibility = 1.0;
-        }
-    }
-    else {
-        if ((spanningType == SPANNING_START) || (spanningType == SPANNING_MIDDLE)) {
-            flexibility = 1.0;
-        }
-    }
-
-    const double fullShiftRadius = 0.05 + flexibility * 0.15;
-    const double partialShiftRadius = fullShiftRadius * 3.0;
-
-    return { fullShiftRadius, partialShiftRadius };
-}
-
-double Slur::CalcQuadraticInterpolation(double zeroAt, double oneAt, double arg) const
-{
-    assert(zeroAt != oneAt);
-    const double a = 1.0 / (oneAt - zeroAt);
-    const double b = zeroAt / (zeroAt - oneAt);
-    return pow(a * arg + b, 2.0);
-}
-
-void Slur::AdjustSlurFromBulge(FloatingCurvePositioner *curve, BezierCurve &bezierCurve, const int unit)
-{
-    if (bezierCurve.p1.x >= bezierCurve.p2.x) return;
-
-    data_BULGE bulge = this->GetBulge();
-
-    // Filter admissible values
-    bulge.erase(std::remove_if(bulge.begin(), bulge.end(),
-                    [](const data_BULGE::value_type &entry) {
-                        return ((entry.first <= 0.0) || (entry.second <= 0.0) || (entry.second >= 100.0));
-                    }),
-        bulge.end());
-
-    // Get the minimal and maximal lambda
-    double lambdaMin = 0.66;
-    double lambdaMax = 0.33;
-    for (const data_BULGE::value_type &bulgeEntry : bulge) {
-        const double lambda = bulgeEntry.second / 100.0;
-        lambdaMin = std::min(lambda, lambdaMin);
-        lambdaMax = std::max(lambda, lambdaMax);
-    }
-
-    // Horizontal control point adjustment
-    lambdaMin /= 2.0;
-    lambdaMax = 1.0 - (1.0 - lambdaMax) / 2.0;
-    const double xMin = (1.0 - lambdaMin) * bezierCurve.p1.x + lambdaMin * bezierCurve.p2.x;
-    const double xMax = (1.0 - lambdaMax) * bezierCurve.p1.x + lambdaMax * bezierCurve.p2.x;
-    bezierCurve.SetLeftControlOffset(xMin - bezierCurve.p1.x);
-    bezierCurve.SetRightControlOffset(bezierCurve.p2.x - xMax);
-    bezierCurve.UpdateControlPoints();
-    curve->UpdatePoints(bezierCurve);
-
-    // Generate a control point constraint for each bulge entry
-    std::list<ControlPointConstraint> constraints;
-    Point points[4];
-    points[0] = bezierCurve.p1;
-    points[1] = bezierCurve.c1;
-    points[2] = bezierCurve.c2;
-    points[3] = bezierCurve.p2;
-
-    for (const data_BULGE::value_type &bulgeEntry : bulge) {
-        const double lambda = bulgeEntry.second / 100.0;
-        const double x = (1.0 - lambda) * bezierCurve.p1.x + lambda * bezierCurve.p2.x;
-        const double t = BoundingBox::CalcBezierParamAtPosition(points, x);
-        constraints.push_back({ 3.0 * pow(1.0 - t, 2.0) * t, 3.0 * (1.0 - t) * pow(t, 2.0), bulgeEntry.first * unit });
-    }
-
-    // Solve these constraints and calculate the vertical control point adjustment
-    int leftShift = 0;
-    int rightShift = 0;
-    std::tie(leftShift, rightShift) = this->SolveControlPointConstraints(constraints);
-    bezierCurve.SetLeftControlHeight(bezierCurve.GetLeftControlHeight() + leftShift);
-    bezierCurve.SetRightControlHeight(bezierCurve.GetRightControlHeight() + rightShift);
-    bezierCurve.UpdateControlPoints();
-    curve->UpdatePoints(bezierCurve);
-
-    // Prevent awkward slur shapes
-    this->AdjustSlurShape(bezierCurve, curve->GetDir(), unit);
-    curve->UpdatePoints(bezierCurve);
-
-    // Since we are going to redraw it, reset its bounding box
-    curve->BoundingBox::ResetBoundingBox();
-}
-
-bool Slur::AllowControlOffsetAdjustment(const BezierCurve &bezierCurve, double symmetry, int unit) const
-{
-    const double distance = BoundingBox::CalcDistance(bezierCurve.p1, bezierCurve.p2);
-
-    return (distance > symmetry * 40 * unit);
-}
-
-std::tuple<bool, int, int> Slur::CalcControlPointOffset(
-    FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, int margin)
-{
-    if (bezierCurve.p1.x >= bezierCurve.p2.x) return { false, 0, 0 };
-
-    // Initially we start with the slopes of the lines P1-C1 and P2-C2
-    double leftSlopeMax = std::abs(BoundingBox::CalcSlope(bezierCurve.p1, bezierCurve.c1));
-    double rightSlopeMax = std::abs(BoundingBox::CalcSlope(bezierCurve.p2, bezierCurve.c2));
-    const ArrayOfCurveSpannedElements *spannedElements = curve->GetSpannedElements();
-    for (CurveSpannedElement *spannedElement : *spannedElements) {
-
-        if (spannedElement->m_discarded) {
-            continue;
-        }
-
-        const int bbY = spannedElement->m_isBelow ? spannedElement->m_boundingBox->GetSelfTop()
-                                                  : spannedElement->m_boundingBox->GetSelfBottom();
-        const Point pLeft = { spannedElement->m_boundingBox->GetSelfLeft(), bbY };
-        const Point pRight = { spannedElement->m_boundingBox->GetSelfRight(), bbY };
-
-        // Prefer the (increased) slope of P1-B1, if larger
-        // B1 is the upper left bounding box corner of a colliding obstacle
-        if ((pLeft.x > bezierCurve.p1.x + margin) && (bezierCurve.IsLeftControlAbove() == spannedElement->m_isBelow)) {
-            const double slope = BoundingBox::CalcSlope(bezierCurve.p1, pLeft);
-            if ((slope > 0.0) && bezierCurve.IsLeftControlAbove()) {
-                const double adjustedSlope = this->RotateSlope(slope, 10.0, 2.5, true);
-                leftSlopeMax = std::max(leftSlopeMax, adjustedSlope);
-            }
-            if ((slope < 0.0) && !bezierCurve.IsLeftControlAbove()) {
-                const double adjustedSlope = this->RotateSlope(-slope, 10.0, 2.5, true);
-                leftSlopeMax = std::max(leftSlopeMax, adjustedSlope);
-            }
-        }
-
-        // Prefer the (increased) slope of P2-B2, if larger
-        // B2 is the upper right bounding box corner of a colliding obstacle
-        if ((pRight.x < bezierCurve.p2.x - margin)
-            && (bezierCurve.IsRightControlAbove() == spannedElement->m_isBelow)) {
-            const double slope = BoundingBox::CalcSlope(bezierCurve.p2, pRight);
-            if ((slope < 0.0) && bezierCurve.IsRightControlAbove()) {
-                const double adjustedSlope = this->RotateSlope(-slope, 10.0, 2.5, true);
-                rightSlopeMax = std::max(rightSlopeMax, adjustedSlope);
-            }
-            if ((slope > 0.0) && !bezierCurve.IsRightControlAbove()) {
-                const double adjustedSlope = this->RotateSlope(slope, 10.0, 2.5, true);
-                rightSlopeMax = std::max(rightSlopeMax, adjustedSlope);
-            }
-        }
-    }
-
-    if ((leftSlopeMax == 0.0) || (rightSlopeMax == 0.0)) return { false, 0, 0 };
-
-    // Calculate offset from extremal slope, but use 1/20 of horizontal distance as minimum
-    const int minOffset = (bezierCurve.p2.x - bezierCurve.p1.x) / 20;
-    int leftOffset = minOffset;
-    if (bezierCurve.GetLeftControlOffset() > 0) {
-        leftOffset = std::max<int>(leftOffset, std::abs(bezierCurve.GetLeftControlHeight()) / leftSlopeMax);
-    }
-    int rightOffset = minOffset;
-    if (bezierCurve.GetRightControlOffset() > 0) {
-        rightOffset = std::max<int>(rightOffset, std::abs(bezierCurve.GetRightControlHeight()) / rightSlopeMax);
-    }
-
-    return { true, leftOffset, rightOffset };
-}
-
-ControlPointAdjustment Slur::CalcControlPointVerticalShift(
-    FloatingCurvePositioner *curve, const BezierCurve &bezierCurve, double symmetry, int margin)
-{
-    ControlPointAdjustment adjustment{ 0, 0, false, 0 };
-    if (bezierCurve.p1.x >= bezierCurve.p2.x) return adjustment;
-
-    std::list<ControlPointConstraint> aboveConstraints;
-    std::list<ControlPointConstraint> belowConstraints;
-    int maxIntersectionAbove = 0;
-    int maxIntersectionBelow = 0;
-
-    const int dist = bezierCurve.p2.x - bezierCurve.p1.x;
-
-    const ArrayOfCurveSpannedElements *spannedElements = curve->GetSpannedElements();
-
-    for (CurveSpannedElement *spannedElement : *spannedElements) {
-
-        if (spannedElement->m_discarded) {
-            continue;
-        }
-
-        bool discard = false;
-        int intersectionLeft, intersectionRight;
-        std::tie(intersectionLeft, intersectionRight) = curve->CalcDirectionalLeftRightAdjustment(
-            spannedElement->m_boundingBox, spannedElement->m_isBelow, discard, margin);
-
-        if (discard) {
-            spannedElement->m_discarded = true;
-            continue;
-        }
-
-        std::list<ControlPointConstraint> &constraints
-            = spannedElement->m_isBelow ? belowConstraints : aboveConstraints;
-        int &maxIntersection = spannedElement->m_isBelow ? maxIntersectionBelow : maxIntersectionAbove;
-
-        if ((intersectionLeft > 0) || (intersectionRight > 0)) {
-            Point points[4];
-            points[0] = bezierCurve.p1;
-            points[1] = bezierCurve.c1;
-            points[2] = bezierCurve.c2;
-            points[3] = bezierCurve.p2;
-
-            // Add constraint for the left boundary of the colliding bounding box
-            const int xLeft = std::max(bezierCurve.p1.x, spannedElement->m_boundingBox->GetSelfLeft());
-            float distanceRatio = float(xLeft - bezierCurve.p1.x) / float(dist);
-            // Ignore obstacles close to the endpoints, because this would result in very large shifts
-            if ((std::abs(0.5 - distanceRatio) < 0.45) && (intersectionLeft > 0)) {
-                const double t = BoundingBox::CalcBezierParamAtPosition(points, xLeft);
-                constraints.push_back(
-                    { 3.0 * pow(1.0 - t, 2.0) * t, 3.0 * (1.0 - t) * pow(t, 2.0), double(intersectionLeft) });
-                maxIntersection = std::max(maxIntersection, intersectionLeft);
-            }
-
-            // Add constraint for the right boundary of the colliding bounding box
-            const int xRight = std::min(bezierCurve.p2.x, spannedElement->m_boundingBox->GetSelfRight());
-            distanceRatio = float(xRight - bezierCurve.p1.x) / float(dist);
-            // Ignore obstacles close to the endpoints, because this would result in very large shifts
-            if ((std::abs(0.5 - distanceRatio) < 0.45) && (intersectionRight > 0)) {
-                const double t = BoundingBox::CalcBezierParamAtPosition(points, xRight);
-                constraints.push_back(
-                    { 3.0 * pow(1.0 - t, 2.0) * t, 3.0 * (1.0 - t) * pow(t, 2.0), double(intersectionRight) });
-                maxIntersection = std::max(maxIntersection, intersectionRight);
-            }
-        }
-    }
-
-    // Solve the constraints and calculate the adjustment
-    if (maxIntersectionAbove > maxIntersectionBelow) {
-        std::tie(adjustment.leftShift, adjustment.rightShift)
-            = this->SolveControlPointConstraints(aboveConstraints, symmetry);
-        adjustment.moveUpwards = false;
-    }
-    else {
-        std::tie(adjustment.leftShift, adjustment.rightShift)
-            = this->SolveControlPointConstraints(belowConstraints, symmetry);
-        adjustment.moveUpwards = true;
-    }
-
-    // Determine the requested staff space
-    if (bezierCurve.IsLeftControlAbove() && !bezierCurve.IsRightControlAbove()) {
-        adjustment.requestedStaffSpace = std::max(bezierCurve.p1.y - bezierCurve.p2.y + 6 * margin, 0);
-    }
-    else if (!bezierCurve.IsLeftControlAbove() && bezierCurve.IsRightControlAbove()) {
-        adjustment.requestedStaffSpace = std::max(bezierCurve.p2.y - bezierCurve.p1.y + 6 * margin, 0);
-    }
-    if ((maxIntersectionAbove > 0) && (maxIntersectionBelow > 0)) {
-        adjustment.requestedStaffSpace
-            = std::max(adjustment.requestedStaffSpace, maxIntersectionAbove + maxIntersectionBelow);
-    }
-
-    return adjustment;
-}
-
-std::pair<int, int> Slur::SolveControlPointConstraints(
-    const std::list<ControlPointConstraint> &constraints, double symmetry) const
-{
-    if (constraints.empty()) return { 0, 0 };
-
-    // Each constraint corresponds to a halfplane in the upper right quadrant.
-    // We consider the line through the origin orthogonal to the halfplane's boundary
-    // and average the slopes of these orthogonal lines.
-    double weightSum = 0.0;
-    double weightedAngleSum = 0.0;
-    for (const ControlPointConstraint &constraint : constraints) {
-        // Use the distance of the halfplane's boundary to the origin as weight
-        const double weight = constraint.c / std::hypot(constraint.a, constraint.b);
-        weightedAngleSum += weight * atan(constraint.b / constraint.a);
-        weightSum += weight;
-    }
-    // Depending on symmetry we want the angle to be near PI/4
-    double angle = weightedAngleSum / weightSum;
-    angle = std::max(symmetry * M_PI / 4.0, angle);
-    angle = std::min((2.0 - symmetry) * M_PI / 4.0, angle);
-    const double slope = tan(angle);
-
-    // Now follow the line with the averaged slope until we have hit all halfplanes.
-    // For each constraint we must solve: slope * x = c/b - a/b * x
-    double xMax = 0.0;
-    for (const ControlPointConstraint &constraint : constraints) {
-        const double x = constraint.c / (constraint.a + slope * constraint.b);
-        xMax = std::max(xMax, x);
-    }
-
-    // The point which hits the last halfplane is the desired solution.
-    return { xMax, slope * xMax };
-}
-
-void Slur::AdjustSlurShape(BezierCurve &bezierCurve, curvature_CURVEDIR dir, int unit)
-{
-    if (bezierCurve.p1.x >= bezierCurve.p2.x) return;
-
-    // Normalize the slur via rotation (such that p1-p2 is horizontal)
-    const float angle = atan2(bezierCurve.p2.y - bezierCurve.p1.y, bezierCurve.p2.x - bezierCurve.p1.x);
-    bezierCurve.Rotate(-angle, bezierCurve.p1);
-    bezierCurve.UpdateControlPointParams();
-
-    // *** STEP 1: Ensure MINIMAL HEIGHT ***
-    // <)C1P1P2 should be at least 30 degrees, but allow smaller angles if the midpoint would be lifted more than 6 MEI
-    // units
-    // Similar for <)P1P2C2
-    const int sign = (dir == curvature_CURVEDIR_above) ? 1 : -1;
-    const Point shiftedMidpoint(
-        (bezierCurve.p1.x + bezierCurve.p2.x) / 2, (bezierCurve.p1.y + bezierCurve.p2.y) / 2 + sign * 6 * unit);
-    const float minAngle = this->GetMinControlPointAngle(bezierCurve, angle / M_PI * 180.0, unit);
-    const bool ignoreLeft = (bezierCurve.c1.x <= bezierCurve.p1.x);
-    const bool ignoreRight = (bezierCurve.c2.x >= bezierCurve.p2.x);
-    double slopeLeft = BoundingBox::CalcSlope(bezierCurve.p1, bezierCurve.c1);
-    double slopeRight = BoundingBox::CalcSlope(bezierCurve.p2, bezierCurve.c2);
-    const double slopeBase = BoundingBox::CalcSlope(bezierCurve.p1, bezierCurve.p2);
-
-    if (dir == curvature_CURVEDIR_above) {
-        double minSlopeLeft = this->RotateSlope(slopeBase, minAngle, 1.0, true);
-        minSlopeLeft = std::min(minSlopeLeft, BoundingBox::CalcSlope(bezierCurve.p1, shiftedMidpoint));
-        slopeLeft = std::max(slopeLeft, minSlopeLeft);
-        double minSlopeRight = this->RotateSlope(slopeBase, minAngle, 1.0, false);
-        minSlopeRight = std::max(minSlopeRight, BoundingBox::CalcSlope(bezierCurve.p2, shiftedMidpoint));
-        slopeRight = std::min(slopeRight, minSlopeRight);
-    }
-    else if (dir == curvature_CURVEDIR_below) {
-        double minSlopeLeft = this->RotateSlope(slopeBase, minAngle, 1.0, false);
-        minSlopeLeft = std::max(minSlopeLeft, BoundingBox::CalcSlope(bezierCurve.p1, shiftedMidpoint));
-        if (!ignoreLeft) slopeLeft = std::min(slopeLeft, minSlopeLeft);
-        double minSlopeRight = this->RotateSlope(slopeBase, minAngle, 1.0, true);
-        minSlopeRight = std::min(minSlopeRight, BoundingBox::CalcSlope(bezierCurve.p2, shiftedMidpoint));
-        if (!ignoreRight) slopeRight = std::max(slopeRight, minSlopeRight);
-    }
-
-    // Update control points
-    if (!ignoreLeft) bezierCurve.SetLeftControlHeight(slopeLeft * sign * bezierCurve.GetLeftControlOffset());
-    if (!ignoreRight) bezierCurve.SetRightControlHeight(slopeRight * -sign * bezierCurve.GetRightControlOffset());
-    bezierCurve.UpdateControlPoints();
-
-    // *** STEP 2: Ensure CONVEXITY ***
-    // <)C1P1C2 and <)C1P2C2 should be at least 3 degree
-    if (dir == curvature_CURVEDIR_above) {
-        const double minSlopeLeft
-            = this->RotateSlope(BoundingBox::CalcSlope(bezierCurve.p1, bezierCurve.c2), 3.0, 10.0, true);
-        slopeLeft = std::max(slopeLeft, minSlopeLeft);
-        const double minSlopeRight
-            = this->RotateSlope(BoundingBox::CalcSlope(bezierCurve.p2, bezierCurve.c1), 3.0, 10.0, false);
-        slopeRight = std::min(slopeRight, minSlopeRight);
-    }
-    else if (dir == curvature_CURVEDIR_below) {
-        const double minSlopeLeft
-            = this->RotateSlope(BoundingBox::CalcSlope(bezierCurve.p1, bezierCurve.c2), 3.0, 10.0, false);
-        slopeLeft = std::min(slopeLeft, minSlopeLeft);
-        const double minSlopeRight
-            = this->RotateSlope(BoundingBox::CalcSlope(bezierCurve.p2, bezierCurve.c1), 3.0, 10.0, true);
-        slopeRight = std::max(slopeRight, minSlopeRight);
-    }
-
-    // Update control points
-    if (!ignoreLeft) bezierCurve.SetLeftControlHeight(slopeLeft * sign * bezierCurve.GetLeftControlOffset());
-    if (!ignoreRight) bezierCurve.SetRightControlHeight(slopeRight * -sign * bezierCurve.GetRightControlOffset());
-    bezierCurve.UpdateControlPoints();
-
-    // Rotate back
-    bezierCurve.Rotate(angle, bezierCurve.p1);
-
-    // Enforce p1.x <= c1.x <= c2.x <= p2.x
-    bezierCurve.c1.x = std::max(bezierCurve.p1.x, bezierCurve.c1.x);
-    bezierCurve.c2.x = std::max(bezierCurve.c1.x, bezierCurve.c2.x);
-    bezierCurve.c2.x = std::min(bezierCurve.p2.x, bezierCurve.c2.x);
-    bezierCurve.c1.x = std::min(bezierCurve.c2.x, bezierCurve.c1.x);
-
-    bezierCurve.UpdateControlPointParams();
-}
-
-double Slur::RotateSlope(double slope, double degrees, double doublingBound, bool upwards) const
-{
-    assert(degrees >= 0.0);
-    assert(doublingBound >= 0.0);
-
-    if (upwards && (slope >= doublingBound)) return slope * 2.0;
-    if (!upwards && (slope <= -doublingBound)) return slope * 2.0;
-    const int sign = upwards ? 1 : -1;
-    return tan(atan(slope) + sign * M_PI * degrees / 180.0);
-}
-
-float Slur::GetMinControlPointAngle(const BezierCurve &bezierCurve, float angle, int unit) const
-{
-    angle = abs(angle);
-    const double distance = double(bezierCurve.p2.x - bezierCurve.p1.x) / unit;
-
-    // Increase min angle for short and angled slurs
-    double angleIncrement = std::min(angle / 4.0, 15.0); // values in [0.0, 15.0]
-    double factor = 1.0 - (distance - 8.0) / 8.0;
-    factor = std::min(factor, 1.0);
-    factor = std::max(factor, 0.0); // values in [0.0, 1.0]
-
-    // not if control points are horizontally in a degenerated position
-    if ((bezierCurve.c1.x < bezierCurve.p1.x) || (2.0 * bezierCurve.c1.x > bezierCurve.p1.x + bezierCurve.p2.x)) {
-        angleIncrement = 0.0;
-    }
-    if ((bezierCurve.c2.x > bezierCurve.p2.x) || (2.0 * bezierCurve.c2.x < bezierCurve.p1.x + bezierCurve.p2.x)) {
-        angleIncrement = 0.0;
-    }
-
-    return 30.0 + angleIncrement * factor;
-}
-
-void Slur::AdjustOuterSlur(
-    const Doc *doc, FloatingCurvePositioner *curve, const ArrayOfFloatingCurvePositioners &innerCurves, int unit)
-{
-    assert(doc);
-    assert(curve);
-
-    Point points[4];
-    curve->GetPoints(points);
-    BezierCurve bezier(points[0], points[1], points[2], points[3]);
-    this->InitBezierControlSides(bezier, curve->GetDir());
-    bezier.UpdateControlPointParams();
-
-    const int margin = doc->GetOptions()->m_slurMargin.GetValue() * unit;
-    const double flexibility = doc->GetOptions()->m_slurEndpointFlexibility.GetValue();
-    const double symmetry = doc->GetOptions()->m_slurSymmetry.GetValue();
-
-    // STEP 1: Calculate the vertical adjustment of endpoints. This shifts the slur vertically.
-    // Only collisions near the endpoints are taken into account.
-    int endPointShiftLeft = 0;
-    int endPointShiftRight = 0;
-    std::tie(endPointShiftLeft, endPointShiftRight)
-        = this->CalcEndPointShift(curve, bezier, innerCurves, flexibility, margin);
-    this->ApplyEndPointShift(curve, bezier, endPointShiftLeft, endPointShiftRight);
-
-    // STEP 2: Calculate the vertical shift of the control points.
-    // For each inner slur we formulate some constraints ax + by >= c
-    // where x, y denote the vertical adjustments of the control points and c is the size of the collision.
-    // The coefficients a, b are calculated from the Bezier curve equation.
-    // After collecting all constraints we calculate a solution.
-    const ControlPointAdjustment adjustment = this->CalcControlPointShift(curve, bezier, innerCurves, symmetry, margin);
-    bezier.SetLeftControlHeight(bezier.GetLeftControlHeight() + adjustment.leftShift);
-    bezier.SetRightControlHeight(bezier.GetRightControlHeight() + adjustment.rightShift);
-    bezier.UpdateControlPoints();
-    curve->UpdatePoints(bezier);
-
-    // STEP 3: Adjust the slur shape
-    // We correct the shape if the slur is too flat or not convex.
-    if (curve->GetDir() != curvature_CURVEDIR_mixed) {
-        this->AdjustSlurShape(bezier, curve->GetDir(), unit);
-        curve->UpdatePoints(bezier);
-    }
-
-    // Since we are going to redraw it, reset its bounding box
-    curve->BoundingBox::ResetBoundingBox();
-}
-
-ControlPointAdjustment Slur::CalcControlPointShift(FloatingCurvePositioner *curve, const BezierCurve &bezierCurve,
-    const ArrayOfFloatingCurvePositioners &innerCurves, double symmetry, int margin)
-{
-    ControlPointAdjustment adjustment{ 0, 0, false, 0 };
-    if (bezierCurve.p1.x >= bezierCurve.p2.x) return adjustment;
-
-    const int dist = bezierCurve.p2.x - bezierCurve.p1.x;
-    const bool isBelow = (curve->GetDir() == curvature_CURVEDIR_above);
-    const int sign = isBelow ? 1 : -1;
-    Point points[4];
-    points[0] = bezierCurve.p1;
-    points[1] = bezierCurve.c1;
-    points[2] = bezierCurve.c2;
-    points[3] = bezierCurve.p2;
-
-    std::list<ControlPointConstraint> constraints;
-    for (FloatingCurvePositioner *innerCurve : innerCurves) {
-        Point innerPoints[4];
-        innerCurve->GetPoints(innerPoints);
-
-        // Create five constraints for each inner slur
-        for (int step = 0; step <= 4; ++step) {
-            const Point innerPoint = BoundingBox::CalcPointAtBezier(innerPoints, 0.25 * step);
-            if ((bezierCurve.p1.x <= innerPoint.x) && (innerPoint.x <= bezierCurve.p2.x)) {
-                const int y = CalcBezierAtPosition(points, innerPoint.x);
-                const int intersection = (innerPoint.y - y) * sign + margin;
-                const float distanceRatio = float(innerPoint.x - bezierCurve.p1.x) / float(dist);
-
-                // Ignore obstacles close to the endpoints, because this would result in very large shifts
-                if ((std::abs(0.5 - distanceRatio) < 0.45) && (intersection > 0)) {
-                    const double t = BoundingBox::CalcBezierParamAtPosition(points, innerPoint.x);
-                    constraints.push_back(
-                        { 3.0 * pow(1.0 - t, 2.0) * t, 3.0 * (1.0 - t) * pow(t, 2.0), double(intersection) });
-                }
-            }
-        }
-    }
-
-    // Solve the constraints and calculate the adjustment
-    std::tie(adjustment.leftShift, adjustment.rightShift) = this->SolveControlPointConstraints(constraints, symmetry);
-
-    return adjustment;
-}
-
-std::pair<int, int> Slur::CalcEndPointShift(FloatingCurvePositioner *curve, const BezierCurve &bezierCurve,
-    const ArrayOfFloatingCurvePositioners &innerCurves, double flexibility, int margin)
-{
-    if (bezierCurve.p1.x >= bezierCurve.p2.x) return { 0, 0 };
-
-    int shiftLeft = 0;
-    int shiftRight = 0;
-
-    const int dist = bezierCurve.p2.x - bezierCurve.p1.x;
-    const bool isBelow = (curve->GetDir() == curvature_CURVEDIR_above);
-    const int sign = isBelow ? 1 : -1;
-    Point points[4];
-    points[0] = bezierCurve.p1;
-    points[1] = bezierCurve.c1;
-    points[2] = bezierCurve.c2;
-    points[3] = bezierCurve.p2;
-
-    for (FloatingCurvePositioner *innerCurve : innerCurves) {
-        Point innerPoints[4];
-        innerCurve->GetPoints(innerPoints);
-
-        // Adjustment for start point of inner slur
-        const int xInnerStart = innerPoints[0].x;
-        if ((bezierCurve.p1.x <= xInnerStart) && (xInnerStart <= bezierCurve.p2.x)) {
-            const int yStart = CalcBezierAtPosition(points, xInnerStart);
-            const int intersectionStart = (innerPoints[0].y - yStart) * sign + 1.5 * margin;
-            if (intersectionStart > 0) {
-                const float distanceRatioStart = float(xInnerStart - bezierCurve.p1.x) / float(dist);
-                this->ShiftEndPoints(shiftLeft, shiftRight, distanceRatioStart, intersectionStart, flexibility, isBelow,
-                    curve->m_spanningType);
-            }
-        }
-
-        // Adjustment for midpoint of inner slur
-        const Point innerMidPoint = BoundingBox::CalcPointAtBezier(innerPoints, 0.5);
-        if ((bezierCurve.p1.x <= innerMidPoint.x) && (innerMidPoint.x <= bezierCurve.p2.x)) {
-            const int yMid = CalcBezierAtPosition(points, innerMidPoint.x);
-            const int intersectionMid = (innerMidPoint.y - yMid) * sign + 1.5 * margin;
-            if (intersectionMid > 0) {
-                const float distanceRatioMid = float(innerMidPoint.x - bezierCurve.p1.x) / float(dist);
-                this->ShiftEndPoints(shiftLeft, shiftRight, distanceRatioMid, intersectionMid, flexibility, isBelow,
-                    curve->m_spanningType);
-            }
-        }
-
-        // Adjustment for end point of inner slur
-        const int xInnerEnd = innerPoints[3].x;
-        if ((bezierCurve.p1.x <= xInnerEnd) && (xInnerEnd <= bezierCurve.p2.x)) {
-            const int yEnd = CalcBezierAtPosition(points, xInnerEnd);
-            const int intersectionEnd = (innerPoints[3].y - yEnd) * sign + 1.5 * margin;
-            if (intersectionEnd > 0) {
-                const float distanceRatioEnd = float(xInnerEnd - bezierCurve.p1.x) / float(dist);
-                this->ShiftEndPoints(shiftLeft, shiftRight, distanceRatioEnd, intersectionEnd, flexibility, isBelow,
-                    curve->m_spanningType);
-            }
-        }
-    }
-
-    return { shiftLeft, shiftRight };
-}
-
 float Slur::GetAdjustedSlurAngle(const Doc *doc, Point &p1, Point &p2, curvature_CURVEDIR curveDir) const
 {
     float slurAngle = (p1 == p2) ? 0 : atan2(p2.y - p1.y, p2.x - p1.x);
@@ -1922,13 +1089,13 @@ bool Slur::HasBoundaryOnBeam(bool isStart) const
     const LayerElement *boundary = isStart ? this->GetStart() : this->GetEnd();
     // Check for Beam
     if (const Beam *parentBeam = boundary->GetAncestorBeam(); parentBeam) {
-        if (isStart && !parentBeam->IsLastIn(parentBeam, boundary)) return true;
-        if (!isStart && !parentBeam->IsFirstIn(parentBeam, boundary)) return true;
+        if (isStart && !parentBeam->IsLastIn(boundary)) return true;
+        if (!isStart && !parentBeam->IsFirstIn(boundary)) return true;
     }
     // Check for FTrem
     if (const FTrem *parentFTrem = boundary->GetAncestorFTrem(); parentFTrem) {
-        if (isStart && !parentFTrem->IsLastIn(parentFTrem, boundary)) return true;
-        if (!isStart && !parentFTrem->IsFirstIn(parentFTrem, boundary)) return true;
+        if (isStart && !parentFTrem->IsLastIn(boundary)) return true;
+        if (!isStart && !parentFTrem->IsFirstIn(boundary)) return true;
     }
     // Check for BeamSpan
     if (boundary->GetIsInBeamSpan()) {
diff --git a/src/staffgrp.cpp b/src/staffgrp.cpp
index 1c9598b57a0..d7aa3469fd2 100644
--- a/src/staffgrp.cpp
+++ b/src/staffgrp.cpp
@@ -121,7 +121,7 @@ void StaffGrp::FilterList(ListOfConstObjects &childList) const
 
 int StaffGrp::GetMaxStaffSize() const
 {
-    const ListOfConstObjects &childList = this->GetList(this);
+    const ListOfConstObjects &childList = this->GetList();
 
     if (childList.empty()) return 100;
 
@@ -150,7 +150,7 @@ std::pair<StaffDef *, StaffDef *> StaffGrp::GetFirstLastStaffDef()
 
 std::pair<const StaffDef *, const StaffDef *> StaffGrp::GetFirstLastStaffDef() const
 {
-    const ListOfConstObjects &staffDefs = this->GetList(this);
+    const ListOfConstObjects &staffDefs = this->GetList();
     if (staffDefs.empty()) {
         return { NULL, NULL };
     }
diff --git a/src/surface.cpp b/src/surface.cpp
index 8cd36a58c45..3c0b01d1b43 100644
--- a/src/surface.cpp
+++ b/src/surface.cpp
@@ -31,6 +31,7 @@ Surface::Surface() : Object(SURFACE, "surface-"), AttTyped(), AttCoordinated()
 {
     this->RegisterAttClass(ATT_TYPED);
     this->RegisterAttClass(ATT_COORDINATED);
+    this->RegisterAttClass(ATT_COORDINATEDUL);
     this->Reset();
 }
 
@@ -40,6 +41,7 @@ void Surface::Reset()
 {
     this->ResetTyped();
     this->ResetCoordinated();
+    this->ResetCoordinatedUl();
 }
 
 bool Surface::IsSupportedChild(Object *object)
diff --git a/src/svgdevicecontext.cpp b/src/svgdevicecontext.cpp
index 2444ff72852..4451b067d8c 100644
--- a/src/svgdevicecontext.cpp
+++ b/src/svgdevicecontext.cpp
@@ -211,13 +211,15 @@ void SvgDeviceContext::Commit(bool xml_declaration)
 }
 
 void SvgDeviceContext::StartGraphic(
-    Object *object, std::string gClass, std::string gId, GraphicID graphicID, bool prepend)
+    Object *object, const std::string &gClass, const std::string &gId, GraphicID graphicID, bool prepend)
 {
+    std::string gClassFull = gClass;
+
     if (object->HasAttClass(ATT_TYPED)) {
         AttTyped *att = dynamic_cast<AttTyped *>(object);
         assert(att);
         if (att->HasType()) {
-            gClass.append((gClass.empty() ? "" : " ") + att->GetType());
+            gClassFull.append((gClassFull.empty() ? "" : " ") + att->GetType());
         }
     }
 
@@ -228,7 +230,7 @@ void SvgDeviceContext::StartGraphic(
         m_currentNode = m_currentNode.append_child("g");
     }
     m_svgNodeStack.push_back(m_currentNode);
-    AppendIdAndClass(gId, object->GetClassName(), gClass, graphicID);
+    AppendIdAndClass(gId, object->GetClassName(), gClassFull, graphicID);
     AppendAdditionalAttributes(object);
 
     // this sets staffDef styles for lyrics
@@ -323,14 +325,14 @@ void SvgDeviceContext::StartGraphic(
     // this->GetColor(currentBrush.GetColor()).c_str(), currentBrush.GetOpacity()).c_str();
 }
 
-void SvgDeviceContext::StartCustomGraphic(std::string name, std::string gClass, std::string gId)
+void SvgDeviceContext::StartCustomGraphic(const std::string &name, std::string gClass, std::string gId)
 {
     m_currentNode = m_currentNode.append_child("g");
     m_svgNodeStack.push_back(m_currentNode);
     AppendIdAndClass(gId, name, gClass);
 }
 
-void SvgDeviceContext::StartTextGraphic(Object *object, std::string gClass, std::string gId)
+void SvgDeviceContext::StartTextGraphic(Object *object, const std::string &gClass, const std::string &gId)
 {
     m_currentNode = AddChild("tspan");
     m_svgNodeStack.push_back(m_currentNode);
@@ -405,6 +407,12 @@ void SvgDeviceContext::EndCustomGraphic()
     m_currentNode = m_svgNodeStack.back();
 }
 
+void SvgDeviceContext::SetCustomGraphicColor(const std::string &color)
+{
+    m_currentNode.append_attribute("color") = color.c_str();
+    m_currentNode.append_attribute("fill") = color.c_str();
+}
+
 void SvgDeviceContext::EndResumedGraphic(Object *object, View *view)
 {
     m_svgNodeStack.pop_back();
@@ -961,6 +969,10 @@ void SvgDeviceContext::DrawText(
     if (m_fontStack.top()->GetPointSize() != 0) {
         textChild.append_attribute("font-size") = StringFormat("%dpx", m_fontStack.top()->GetPointSize()).c_str();
     }
+    if (m_fontStack.top()->GetLetterSpacing() != 0.0) {
+        textChild.append_attribute("letter-spacing")
+            = StringFormat("%dpx", m_fontStack.top()->GetLetterSpacing()).c_str();
+    }
     textChild.text().set(svgText.c_str());
 
     if ((x != 0) && (y != 0) && (x != VRV_UNSET) && (y != VRV_UNSET) && (width != 0) && (height != 0)
@@ -1069,9 +1081,10 @@ void SvgDeviceContext::AddDescription(const std::string &text)
 }
 
 void SvgDeviceContext::AppendIdAndClass(
-    std::string gId, std::string baseClass, std::string addedClasses, GraphicID graphicID)
+    const std::string &gId, const std::string &baseClass, const std::string &addedClasses, GraphicID graphicID)
 {
-    std::transform(baseClass.begin(), baseClass.begin() + 1, baseClass.begin(), ::tolower);
+    std::string baseClassFull = baseClass;
+    std::transform(baseClassFull.begin(), baseClassFull.begin() + 1, baseClassFull.begin(), ::tolower);
 
     if (gId.length() > 0) {
         if (m_html5) {
@@ -1085,17 +1098,17 @@ void SvgDeviceContext::AppendIdAndClass(
     }
 
     if (m_html5) {
-        m_currentNode.append_attribute("data-class") = baseClass.c_str();
+        m_currentNode.append_attribute("data-class") = baseClassFull.c_str();
     }
 
     if (graphicID != PRIMARY) {
         std::string addClass = (graphicID == SPANNING) ? " spanning" : " symbol-ref";
-        baseClass.append(" id-" + gId + addClass);
+        baseClassFull.append(" id-" + gId + addClass);
     }
     if (!addedClasses.empty()) {
-        baseClass.append(" " + addedClasses);
+        baseClassFull.append(" " + addedClasses);
     }
-    m_currentNode.append_attribute("class") = baseClass.c_str();
+    m_currentNode.append_attribute("class") = baseClassFull.c_str();
 }
 
 void SvgDeviceContext::AppendAdditionalAttributes(Object *object)
diff --git a/src/syllable.cpp b/src/syllable.cpp
index 63fbe5346ec..f94e7ecb641 100644
--- a/src/syllable.cpp
+++ b/src/syllable.cpp
@@ -16,6 +16,7 @@
 
 //----------------------------------------------------------------------------
 
+#include "divline.h"
 #include "functor.h"
 #include "neume.h"
 #include "syl.h"
@@ -51,6 +52,15 @@ bool Syllable::IsSupportedChild(Object *child)
     else if (child->Is(NEUME)) {
         assert(dynamic_cast<Neume *>(child));
     }
+    else if (child->Is(DIVLINE)) {
+        assert(dynamic_cast<DivLine *>(child));
+    }
+    else if (child->Is(ACCID)) {
+        assert(dynamic_cast<Accid *>(child));
+    }
+    else if (child->Is(CLEF)) {
+        assert(dynamic_cast<Clef *>(child));
+    }
     else {
         return false;
     }
diff --git a/src/system.cpp b/src/system.cpp
index 270c85b3671..f7deae78600 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -462,7 +462,7 @@ void System::ConvertToUnCastOffMensuralSystem()
 
     Filters filters;
     ConvertToUnCastOffMensuralFunctor convertToUnCastOffMensural;
-    convertToUnCastOffMensural.PushFilters(&filters);
+    convertToUnCastOffMensural.SetFilters(&filters);
 
     // Now we can process by layer and move their content to (measure) segments
     for (const auto &staves : layerTree.child) {
diff --git a/src/tabgrp.cpp b/src/tabgrp.cpp
index 52a3a7183ab..72436718d33 100644
--- a/src/tabgrp.cpp
+++ b/src/tabgrp.cpp
@@ -78,13 +78,13 @@ void TabGrp::FilterList(ListOfConstObjects &childList) const
 int TabGrp::GetYTop() const
 {
     // The last note is the top
-    return this->GetListBack(this)->GetDrawingY();
+    return this->GetListBack()->GetDrawingY();
 }
 
 int TabGrp::GetYBottom() const
 {
     // The first note is the bottom
-    return this->GetListFront(this)->GetDrawingY();
+    return this->GetListFront()->GetDrawingY();
 }
 
 Note *TabGrp::GetTopNote()
@@ -94,7 +94,7 @@ Note *TabGrp::GetTopNote()
 
 const Note *TabGrp::GetTopNote() const
 {
-    const Note *topNote = vrv_cast<const Note *>(this->GetListBack(this));
+    const Note *topNote = vrv_cast<const Note *>(this->GetListBack());
     assert(topNote);
     return topNote;
 }
@@ -107,7 +107,7 @@ Note *TabGrp::GetBottomNote()
 const Note *TabGrp::GetBottomNote() const
 {
     // The first note is the bottom
-    const Note *bottomNote = vrv_cast<const Note *>(this->GetListFront(this));
+    const Note *bottomNote = vrv_cast<const Note *>(this->GetListFront());
     assert(bottomNote);
     return bottomNote;
 }
diff --git a/src/tie.cpp b/src/tie.cpp
index 693fd9597af..d66e942061d 100644
--- a/src/tie.cpp
+++ b/src/tie.cpp
@@ -34,34 +34,34 @@ namespace vrv {
 
 static const ClassRegistrar<Tie> s_factory("tie", TIE);
 
-Tie::Tie() : ControlElement(TIE, "tie-"), TimeSpanningInterface(), AttColor(), AttCurvature(), AttCurveRend()
+Tie::Tie() : ControlElement(TIE, "tie-"), TimeSpanningInterface(), AttColor(), AttCurvature(), AttLineRendBase()
 {
     this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     this->RegisterAttClass(ATT_COLOR);
     this->RegisterAttClass(ATT_CURVATURE);
-    this->RegisterAttClass(ATT_CURVEREND);
+    this->RegisterAttClass(ATT_LINERENDBASE);
 
     this->Reset();
 }
 
 Tie::Tie(ClassId classId)
-    : ControlElement(classId, "tie-"), TimeSpanningInterface(), AttColor(), AttCurvature(), AttCurveRend()
+    : ControlElement(classId, "tie-"), TimeSpanningInterface(), AttColor(), AttCurvature(), AttLineRendBase()
 {
     this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     this->RegisterAttClass(ATT_COLOR);
     this->RegisterAttClass(ATT_CURVATURE);
-    this->RegisterAttClass(ATT_CURVEREND);
+    this->RegisterAttClass(ATT_LINERENDBASE);
 
     this->Reset();
 }
 
 Tie::Tie(ClassId classId, const std::string &classIdStr)
-    : ControlElement(classId, classIdStr), TimeSpanningInterface(), AttColor(), AttCurvature(), AttCurveRend()
+    : ControlElement(classId, classIdStr), TimeSpanningInterface(), AttColor(), AttCurvature(), AttLineRendBase()
 {
     this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     this->RegisterAttClass(ATT_COLOR);
     this->RegisterAttClass(ATT_CURVATURE);
-    this->RegisterAttClass(ATT_CURVEREND);
+    this->RegisterAttClass(ATT_LINERENDBASE);
 
     this->Reset();
 }
@@ -74,7 +74,7 @@ void Tie::Reset()
     TimeSpanningInterface::Reset();
     this->ResetColor();
     this->ResetCurvature();
-    this->ResetCurveRend();
+    this->ResetLineRendBase();
 }
 
 bool Tie::AdjustEnharmonicTies(const Doc *doc, const FloatingCurvePositioner *curve, Point bezier[4],
diff --git a/src/toolkit.cpp b/src/toolkit.cpp
index d320b89fa2f..cb8fe6e8ada 100644
--- a/src/toolkit.cpp
+++ b/src/toolkit.cpp
@@ -1189,10 +1189,11 @@ void Toolkit::PrintOptionUsageOutput(const vrv::Option *option, std::ostream &ou
 void Toolkit::PrintOptionUsage(const std::string &category, std::ostream &output) const
 {
     // map of all categories and expected string arguments for them
-    const std::map<vrv::OptionsCategory, std::string> categories = { { vrv::OptionsCategory::Base, "base" },
-        { vrv::OptionsCategory::General, "general" }, { vrv::OptionsCategory::Layout, "layout" },
-        { vrv::OptionsCategory::Margins, "margins" }, { vrv::OptionsCategory::Midi, "midi" },
-        { vrv::OptionsCategory::Selectors, "selectors" }, { vrv::OptionsCategory::Full, "full" } };
+    const std::map<vrv::OptionsCategory, std::string> categories
+        = { { vrv::OptionsCategory::Base, "base" }, { vrv::OptionsCategory::General, "general" },
+              { vrv::OptionsCategory::Layout, "layout" }, { vrv::OptionsCategory::Margins, "margins" },
+              { vrv::OptionsCategory::Mensural, "mensural" }, { vrv::OptionsCategory::Midi, "midi" },
+              { vrv::OptionsCategory::Selectors, "selectors" }, { vrv::OptionsCategory::Full, "full" } };
 
     output.precision(2);
     // display_version();
diff --git a/src/tuplet.cpp b/src/tuplet.cpp
index 13964ad033f..68d0493b488 100644
--- a/src/tuplet.cpp
+++ b/src/tuplet.cpp
@@ -259,7 +259,7 @@ void Tuplet::CalcDrawingBracketAndNumPos(bool tupletNumHead)
         return;
     }
 
-    const ListOfObjects &tupletChildren = this->GetList(this);
+    const ListOfObjects &tupletChildren = this->GetList();
 
     // There are unbeamed notes of two different beams
     // treat all the notes as unbeamed
diff --git a/src/verticalaligner.cpp b/src/verticalaligner.cpp
index 5765ebc5f83..0bf5b3ed82e 100644
--- a/src/verticalaligner.cpp
+++ b/src/verticalaligner.cpp
@@ -47,19 +47,28 @@ void SystemAligner::Reset()
     Object::Reset();
     m_spacingTypes.clear();
     m_system = NULL;
-    m_bottomAlignment = NULL;
-    m_bottomAlignment = this->GetStaffAlignment(0, NULL, NULL);
+
+    ArrayOfObjects &children = this->GetChildrenForModification();
+    m_bottomAlignment = new StaffAlignment();
+    m_bottomAlignment->SetStaff(NULL, NULL, this->GetAboveSpacingType(NULL));
+    m_bottomAlignment->SetParentSystem(this->GetSystem());
+    this->AddChild(m_bottomAlignment);
+}
+
+bool SystemAligner::IsSupportedChild(Object *child)
+{
+    assert(dynamic_cast<StaffAlignment *>(child));
+    return true;
 }
 
 StaffAlignment *SystemAligner::GetStaffAlignment(int idx, Staff *staff, const Doc *doc)
 {
     ArrayOfObjects &children = this->GetChildrenForModification();
 
-    // The last one is always the bottomAlignment (unless if not created)
-    if (m_bottomAlignment) {
-        // remove it temporarily
-        children.pop_back();
-    }
+    // The last one is always the bottomAlignment
+    assert(m_bottomAlignment);
+    // remove it temporarily
+    children.pop_back();
 
     if (idx < this->GetChildCount()) {
         children.push_back(m_bottomAlignment);
@@ -73,17 +82,46 @@ StaffAlignment *SystemAligner::GetStaffAlignment(int idx, Staff *staff, const Do
     // We create the StaffAlignment
     StaffAlignment *alignment = new StaffAlignment();
     alignment->SetStaff(staff, doc, this->GetAboveSpacingType(staff));
-    alignment->SetParent(this);
     alignment->SetParentSystem(this->GetSystem());
-    children.push_back(alignment);
+    this->AddChild(alignment);
 
-    if (m_bottomAlignment) {
-        children.push_back(m_bottomAlignment);
-    }
+    // put back the bottomAlignment
+    children.push_back(m_bottomAlignment);
 
     return alignment;
 }
 
+void SystemAligner::ReorderBy(const std::vector<int> &staffNs)
+{
+    std::vector<int> order = staffNs;
+    // First check that staffNs are unique
+    std::sort(order.begin(), order.end());
+    order.erase(std::unique(order.begin(), order.end()), order.end());
+    // If not, we should return because the re-ordering below will corrupt the data
+    // Returning will keep the order as it is
+    if (order.size() != staffNs.size()) return;
+
+    ArrayOfObjects &children = this->GetChildrenForModification();
+
+    // Since we have a bottom alignment, the number is +1
+    if (children.size() != staffNs.size() + 1) return;
+
+    ListOfObjects orderedAlignments;
+    for (auto staffN : staffNs) {
+        StaffAlignment *alignment = this->GetStaffAlignmentForStaffN(staffN);
+        // Something is wrong in the data, we keep the order as it is
+        if (!alignment) return;
+        orderedAlignments.push_back(alignment);
+    }
+    int i = 0;
+    // Since the number of staffAlignment is the same and they are unique, we can
+    // blindly replace them in the StaffAligner children
+    for (auto alignment : orderedAlignments) {
+        children.at(i) = alignment;
+        ++i;
+    }
+}
+
 StaffAlignment *SystemAligner::GetStaffAlignmentForStaffN(int staffN)
 {
     return const_cast<StaffAlignment *>(std::as_const(*this).GetStaffAlignmentForStaffN(staffN));
@@ -176,7 +214,7 @@ void SystemAligner::SetSpacing(const ScoreDef *scoreDef)
 
     m_spacingTypes.clear();
 
-    const ListOfConstObjects &childList = scoreDef->GetList(scoreDef);
+    const ListOfConstObjects &childList = scoreDef->GetList();
     for (const Object *object : childList) {
         // It should be staffDef only, but double check.
         if (!object->Is(STAFFDEF)) continue;
diff --git a/src/view_beam.cpp b/src/view_beam.cpp
index 51a8213f198..1be6bdbe31c 100644
--- a/src/view_beam.cpp
+++ b/src/view_beam.cpp
@@ -45,7 +45,7 @@ void View::DrawBeam(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     // initialization
 
     // Should we assert this at the beginning?
-    if (beam->HasEmptyList(beam)) {
+    if (beam->HasEmptyList()) {
         return;
     }
 
@@ -95,7 +95,7 @@ void View::DrawFTrem(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     // initialization
 
     // Should we assert this at the beginning?
-    if (fTrem->HasEmptyList(fTrem)) {
+    if (fTrem->HasEmptyList()) {
         return;
     }
     const ArrayOfBeamElementCoords *beamElementCoords = fTrem->GetElementCoords();
diff --git a/src/view_control.cpp b/src/view_control.cpp
index ee0c1f8d562..e491dda4abb 100644
--- a/src/view_control.cpp
+++ b/src/view_control.cpp
@@ -989,7 +989,7 @@ void View::DrawPedalLine(
     if (spanningType == SPANNING_START_END || spanningType == SPANNING_START) {
         x1 -= startRadius;
         // With pedline we need to take into account the initial symbol
-        if (pedal->GetForm() == PEDALSTYLE_pedline) {
+        if ((pedal->GetForm() == PEDALSTYLE_pedline) || (pedal->GetForm() == PEDALSTYLE_pedstar)) {
             x1 += m_doc->GetGlyphWidth(SMUFL_E650_keyboardPedalPed, staff->m_drawingStaffSize, false);
         }
     }
@@ -1010,15 +1010,26 @@ void View::DrawPedalLine(
 
     // Opening bracket - but only if not a pedline value
     if ((spanningType == SPANNING_START_END) || (spanningType == SPANNING_START)) {
-        if (pedal->GetForm() != PEDALSTYLE_pedline) {
+        if ((pedal->GetForm() != PEDALSTYLE_pedline && pedal->GetForm() != PEDALSTYLE_pedstar)) {
             this->DrawFilledRectangle(dc, x1, y, x1 + bracketSize / 2, y + lineWidth);
             this->DrawFilledRectangle(dc, x1, y, x1 + lineWidth, y + bracketSize);
         }
     }
     // Closing bracket
     if ((spanningType == SPANNING_START_END) || (spanningType == SPANNING_END)) {
-        this->DrawFilledRectangle(dc, x2 - bracketSize / 2, y, x2, y + lineWidth);
-        this->DrawFilledRectangle(dc, x2 - lineWidth, y, x2, y + bracketSize);
+        if (pedal->GetForm() != PEDALSTYLE_pedstar) {
+            this->DrawFilledRectangle(dc, x2 - bracketSize / 2, y, x2, y + lineWidth);
+            this->DrawFilledRectangle(dc, x2 - lineWidth, y, x2, y + bracketSize);
+        }
+        else {
+            std::u32string str;
+            str.push_back(SMUFL_E655_keyboardPedalUp);
+            const int staffSize = staff->m_drawingStaffSize;
+            data_HORIZONTALALIGNMENT alignment = HORIZONTALALIGNMENT_left;
+            dc->SetFont(m_doc->GetDrawingSmuflFont(staffSize, false));
+            this->DrawSmuflString(dc, x2, y, str, alignment, staffSize);
+            dc->ResetFont();
+        }
     }
     this->DrawFilledRectangle(dc, x1 + bracketSize / 2, y, x2 - bracketSize / 2, y + lineWidth);
 
@@ -1849,7 +1860,7 @@ void View::DrawFermata(DeviceContext *dc, Fermata *fermata, Measure *measure, Sy
             continue;
         }
 
-        const int staffSize = staff->m_drawingStaffSize;
+        const int staffSize = staff->GetDrawingStaffNotationSize();
         const int y = fermata->GetDrawingY();
 
         const int width = (symbolDef) ? symbolDef->GetSymbolWidth(m_doc, staffSize, drawingCueSize)
diff --git a/src/view_element.cpp b/src/view_element.cpp
index 79788e90cbe..c970d76b031 100644
--- a/src/view_element.cpp
+++ b/src/view_element.cpp
@@ -12,6 +12,8 @@
 #include <cassert>
 #include <math.h>
 
+#include <string>
+
 //----------------------------------------------------------------------------
 
 #include "accid.h"
@@ -23,6 +25,7 @@
 #include "clef.h"
 #include "custos.h"
 #include "devicecontext.h"
+#include "divline.h"
 #include "doc.h"
 #include "dot.h"
 #include "dynam.h"
@@ -109,6 +112,9 @@ void View::DrawLayerElement(DeviceContext *dc, LayerElement *element, Layer *lay
     else if (element->Is(CUSTOS)) {
         this->DrawCustos(dc, element, layer, staff, measure);
     }
+    else if (element->Is(DIVLINE)) {
+        DrawDivLine(dc, element, layer, staff, measure);
+    }
     else if (element->Is(DOT)) {
         this->DrawDot(dc, element, layer, staff, measure);
     }
@@ -293,6 +299,19 @@ void View::DrawAccid(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
         y = (accid->GetPlace() == STAFFREL_below) ? y - extend.m_ascent - unit : y + extend.m_descent + unit;
     }
 
+    if (notationType == NOTATIONTYPE_neume) {
+        int rotateOffset = 0;
+        if ((m_doc->GetType() == Facs) && (staff->GetDrawingRotate() != 0)) {
+            double deg = staff->GetDrawingRotate();
+            int xDiff = x - staff->GetDrawingX();
+            rotateOffset = int(xDiff * tan(deg * M_PI / 180.0));
+        }
+        if (accid->HasFacs() && (m_doc->GetType() == Facs)) {
+            y = ToLogicalY(y);
+        }
+        y -= rotateOffset;
+    }
+
     this->DrawSmuflString(
         dc, x, y, accidStr, HORIZONTALALIGNMENT_center, staff->m_drawingStaffSize, accid->GetDrawingCueSize(), true);
 
@@ -671,8 +690,10 @@ void View::DrawClef(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     this->DrawSmuflCode(dc, x, y, sym, staff->m_drawingStaffSize, false);
 
     if ((m_doc->GetType() == Facs) && element->HasFacs()) {
-        const int noteHeight = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 2);
-        const int noteWidth = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 1.4);
+        const int noteHeight
+            = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_HEIGHT_TO_STAFF_SIZE_RATIO);
+        const int noteWidth
+            = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_WIDTH_TO_STAFF_SIZE_RATIO);
 
         FacsimileInterface *fi = element->GetFacsimileInterface();
         fi->GetZone()->SetUlx(x);
@@ -807,15 +828,21 @@ void View::DrawDot(DeviceContext *dc, LayerElement *element, Layer *layer, Staff
             if (dot->m_drawingPreviousElement && !dot->m_drawingNextElement) {
                 x += m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * 7 / 2;
                 y = dot->m_drawingPreviousElement->GetDrawingY();
+                this->DrawDotsPart(dc, x, y, 1, staff);
             }
             if (dot->m_drawingPreviousElement && dot->m_drawingNextElement) {
+                // Do not take into account the spacing since it is place in-between
+                dc->DeactivateGraphicX();
                 x += ((dot->m_drawingNextElement->GetDrawingX() - dot->m_drawingPreviousElement->GetDrawingX()) / 2);
                 x += dot->m_drawingPreviousElement->GetDrawingRadius(m_doc);
                 y = dot->m_drawingPreviousElement->GetDrawingY();
+                this->DrawDotsPart(dc, x, y, 1, staff);
+                dc->ReactivateGraphic();
             }
         }
-
-        this->DrawDotsPart(dc, x, y, 1, staff);
+        else {
+            this->DrawDotsPart(dc, x, y, 1, staff);
+        }
     }
 
     dc->EndGraphic(element, this);
@@ -1010,7 +1037,7 @@ void View::DrawKeySig(DeviceContext *dc, LayerElement *element, Layer *layer, St
 
     dc->SetFont(m_doc->GetDrawingSmuflFont(staff->m_drawingStaffSize, false));
 
-    ListOfObjects childList = keySig->GetList(keySig);
+    ListOfObjects childList = keySig->GetList();
     for (Object *child : childList) {
         KeyAccid *keyAccid = vrv_cast<KeyAccid *>(child);
         assert(keyAccid);
@@ -1136,6 +1163,8 @@ void View::DrawMRest(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     MRest *mRest = vrv_cast<MRest *>(element);
     assert(mRest);
 
+    const int staffSize = staff->GetDrawingStaffNotationSize();
+
     dc->StartGraphic(element, "", element->GetID());
 
     mRest->CenterDrawingX();
@@ -1143,25 +1172,24 @@ void View::DrawMRest(DeviceContext *dc, LayerElement *element, Layer *layer, Sta
     const bool drawingCueSize = mRest->GetDrawingCueSize();
     int x = mRest->GetDrawingX();
     int y = (measure->m_measureAligner.GetMaxTime() >= (DUR_MAX * 2))
-        ? element->GetDrawingY() - m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize)
+        ? element->GetDrawingY() - m_doc->GetDrawingDoubleUnit(staffSize)
         : element->GetDrawingY();
     char32_t rest
         = (measure->m_measureAligner.GetMaxTime() >= (DUR_MAX * 2)) ? SMUFL_E4E2_restDoubleWhole : SMUFL_E4E3_restWhole;
 
-    x -= m_doc->GetGlyphWidth(rest, staff->m_drawingStaffSize, drawingCueSize) / 2;
+    x -= m_doc->GetGlyphWidth(rest, staffSize, drawingCueSize) / 2;
 
-    this->DrawSmuflCode(dc, x, y, rest, staff->m_drawingStaffSize, drawingCueSize);
+    this->DrawSmuflCode(dc, x, y, rest, staffSize, drawingCueSize);
 
     // single legder line for whole rest glyphs
     if ((measure->m_measureAligner.GetMaxTime() < (DUR_MAX * 2))
         && (y > staff->GetDrawingY()
-            || y < staff->GetDrawingY()
-                    - (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize))) {
-        const int width = m_doc->GetGlyphWidth(rest, staff->m_drawingStaffSize, drawingCueSize);
+            || y < staff->GetDrawingY() - (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staffSize))) {
+        const int width = m_doc->GetGlyphWidth(rest, staffSize, drawingCueSize);
         int ledgerLineThickness
-            = m_doc->GetOptions()->m_ledgerLineThickness.GetValue() * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            = m_doc->GetOptions()->m_ledgerLineThickness.GetValue() * m_doc->GetDrawingUnit(staffSize);
         int ledgerLineExtension
-            = m_doc->GetOptions()->m_ledgerLineExtension.GetValue() * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            = m_doc->GetOptions()->m_ledgerLineExtension.GetValue() * m_doc->GetDrawingUnit(staffSize);
         if (drawingCueSize) {
             ledgerLineThickness *= m_doc->GetOptions()->m_graceFactor.GetValue();
             ledgerLineExtension *= m_doc->GetOptions()->m_graceFactor.GetValue();
@@ -1188,6 +1216,8 @@ void View::DrawMRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
 
     mRpt->CenterDrawingX();
 
+    const int staffSize = staff->GetDrawingStaffNotationSize();
+
     dc->StartGraphic(element, "", element->GetID());
 
     this->DrawMRptPart(dc, element->GetDrawingX(), SMUFL_E500_repeat1Bar, 0, false, staff);
@@ -1195,12 +1225,11 @@ void View::DrawMRpt(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     // draw the measure count
     const int mRptNum = mRpt->HasNum() ? mRpt->GetNum() : mRpt->m_drawingMeasureCount;
     if ((mRptNum > 0) && (mRpt->GetNumVisible() != BOOLEAN_false)) {
-        dc->SetFont(m_doc->GetDrawingSmuflFont(staff->m_drawingStaffSize, false));
+        dc->SetFont(m_doc->GetDrawingSmuflFont(staffSize, false));
         // calculate the extend of the number
         TextExtend extend;
         const std::u32string figures = this->IntToTupletFigures(mRptNum);
         dc->GetSmuflTextExtent(figures, &extend);
-        const int staffSize = staff->m_drawingStaffSize;
         const int staffHeight = (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staffSize);
         const int offset = std::max(m_doc->GetGlyphHeight(SMUFL_E500_repeat1Bar, staffSize, false) - staffHeight, 0);
         int yNum = staff->GetDrawingY() + m_doc->GetDrawingUnit(staffSize) + offset / 2;
@@ -1264,6 +1293,9 @@ void View::DrawMultiRest(DeviceContext *dc, LayerElement *element, Layer *layer,
 
     multiRest->CenterDrawingX();
 
+    const int staffNotationSize = staff->GetDrawingStaffNotationSize();
+    const int staffSize = staff->m_drawingStaffSize;
+
     dc->StartGraphic(element, "", element->GetID());
 
     int measureWidth = measure->GetInnerWidth();
@@ -1284,24 +1316,23 @@ void View::DrawMultiRest(DeviceContext *dc, LayerElement *element, Layer *layer,
     const int num = multiRest->HasNum() ? std::min(multiRest->GetNum(), 999) : 1;
 
     const int multiRestThickness
-        = m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * m_doc->GetOptions()->m_multiRestThickness.GetValue();
+        = m_doc->GetDrawingUnit(staffNotationSize) * m_doc->GetOptions()->m_multiRestThickness.GetValue();
     // Position centered in staff
-    int y2 = staff->GetDrawingY() - m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * (staff->m_drawingLines - 1)
+    int y2 = staff->GetDrawingY() - m_doc->GetDrawingUnit(staffSize) * (staff->m_drawingLines - 1)
         - multiRestThickness / 2;
     if (multiRest->HasLoc()) {
-        y2 -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize) * (staff->m_drawingLines - 1 - multiRest->GetLoc());
+        y2 -= m_doc->GetDrawingUnit(staffSize) * (staff->m_drawingLines - 1 - multiRest->GetLoc());
     }
     int y1 = y2 + multiRestThickness;
 
     if (multiRest->UseBlockStyle(m_doc)) {
         // This is 1/2 the length of the black rectangle
-        int width = measureWidth - 2 * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+        int width = measureWidth - 2 * m_doc->GetDrawingDoubleUnit(staffNotationSize);
         if (multiRest->HasWidth() && multiRest->AttWidth::GetWidth().GetType() == MEASUREMENTTYPE_vu) {
-            const int fixedWidth
-                = multiRest->AttWidth::GetWidth().GetVu() * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            const int fixedWidth = multiRest->AttWidth::GetWidth().GetVu() * m_doc->GetDrawingUnit(staffNotationSize);
             width = (width > fixedWidth) ? fixedWidth : width;
         }
-        if (width > m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) * 4) {
+        if (width > m_doc->GetDrawingStemWidth(staffNotationSize) * 4) {
             // xCentered is the central point, calculate x1 and x2
             const int x1 = xCentered - width / 2;
             const int x2 = xCentered + width / 2;
@@ -1313,58 +1344,57 @@ void View::DrawMultiRest(DeviceContext *dc, LayerElement *element, Layer *layer,
             this->DrawFilledRectangle(dc, x1, y1, x2, y2);
 
             // Draw two lines at beginning and end
-            int border = m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-            this->DrawFilledRectangle(
-                dc, x1, y1 + border, x1 + m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) * 2, y2 - border);
+            int border = m_doc->GetDrawingUnit(staffNotationSize);
             this->DrawFilledRectangle(
-                dc, x2 - m_doc->GetDrawingStemWidth(staff->m_drawingStaffSize) * 2, y1 + border, x2, y2 - border);
+                dc, x1, y1 + border, x1 + m_doc->GetDrawingStemWidth(staffNotationSize) * 2, y2 - border);
+            this->DrawFilledRectangle(dc, x2 - m_doc->GetDrawingStemWidth(staffSize) * 2, y1 + border, x2, y2 - border);
 
             dc->ReactivateGraphic();
         }
     }
     else {
         if (staff->m_drawingLines % 2 != 0) {
-            y2 += m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
-            y1 += m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            y2 += m_doc->GetDrawingUnit(staffSize);
+            y1 += m_doc->GetDrawingUnit(staffSize);
         }
 
-        const int lgWidth = m_doc->GetGlyphWidth(SMUFL_E4E1_restLonga, staff->m_drawingStaffSize, false);
-        const int brWidth = m_doc->GetGlyphWidth(SMUFL_E4E2_restDoubleWhole, staff->m_drawingStaffSize, false);
-        const int sbWidth = m_doc->GetGlyphWidth(SMUFL_E4E3_restWhole, staff->m_drawingStaffSize, false);
+        const int lgWidth = m_doc->GetGlyphWidth(SMUFL_E4E1_restLonga, staffSize, false);
+        const int brWidth = m_doc->GetGlyphWidth(SMUFL_E4E2_restDoubleWhole, staffSize, false);
+        const int sbWidth = m_doc->GetGlyphWidth(SMUFL_E4E3_restWhole, staffSize, false);
 
-        int width = (num / 4) * (lgWidth + m_doc->GetDrawingUnit(staff->m_drawingStaffSize));
-        width += ((num % 4) / 2) * (brWidth + m_doc->GetDrawingUnit(staff->m_drawingStaffSize));
-        width = (num % 2) ? width + sbWidth : width - m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+        int width = (num / 4) * (lgWidth + m_doc->GetDrawingUnit(staffSize));
+        width += ((num % 4) / 2) * (brWidth + m_doc->GetDrawingUnit(staffSize));
+        width = (num % 2) ? width + sbWidth : width - m_doc->GetDrawingUnit(staffSize);
 
         int x1 = xCentered - width / 2;
 
         int count = num;
         while ((count / 4)) {
-            this->DrawSmuflCode(dc, x1, y2, SMUFL_E4E1_restLonga, staff->m_drawingStaffSize, false);
-            x1 += lgWidth + m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            this->DrawSmuflCode(dc, x1, y2, SMUFL_E4E1_restLonga, staffSize, false);
+            x1 += lgWidth + m_doc->GetDrawingUnit(staffSize);
             count -= 4;
         }
         while ((count / 2)) {
-            this->DrawSmuflCode(dc, x1, y2, SMUFL_E4E2_restDoubleWhole, staff->m_drawingStaffSize, false);
-            x1 += brWidth + m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            this->DrawSmuflCode(dc, x1, y2, SMUFL_E4E2_restDoubleWhole, staffSize, false);
+            x1 += brWidth + m_doc->GetDrawingUnit(staffSize);
             count -= 2;
         }
-        if (count) this->DrawSmuflCode(dc, x1, y1, SMUFL_E4E3_restWhole, staff->m_drawingStaffSize, false);
+        if (count) this->DrawSmuflCode(dc, x1, y1, SMUFL_E4E3_restWhole, staffSize, false);
     }
 
     // Draw the number
     if (multiRest->GetNumVisible() != BOOLEAN_false) {
-        dc->SetFont(m_doc->GetDrawingSmuflFont(staff->m_drawingStaffSize, false));
+        dc->SetFont(m_doc->GetDrawingSmuflFont(staffNotationSize, false));
 
-        const int staffHeight = (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
-        const int offset = 3 * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+        const int staffHeight = (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staffSize);
+        const int offset = 3 * m_doc->GetDrawingUnit(staffNotationSize);
 
         const int y = (multiRest->GetNumPlace() == STAFFREL_basic_below)
             ? std::min(staff->GetDrawingY() - staffHeight, y2) - offset
             : std::max(staff->GetDrawingY(), y1) + offset;
 
         this->DrawSmuflString(
-            dc, xCentered, y, this->IntToTimeSigFigures(num), HORIZONTALALIGNMENT_center, staff->m_drawingStaffSize);
+            dc, xCentered, y, this->IntToTimeSigFigures(num), HORIZONTALALIGNMENT_center, staffNotationSize);
         dc->ResetFont();
     }
 
@@ -1451,6 +1481,10 @@ void View::DrawNote(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
 
             dc->StartCustomGraphic("notehead");
 
+            if (note->HasHeadColor()) {
+                dc->SetCustomGraphicColor(note->GetHeadColor());
+            }
+
             this->DrawSmuflCode(dc, noteX, noteY, fontNo, staff->m_drawingStaffSize, drawingCueSize, true);
 
             // handle notehead enclosure
@@ -1501,6 +1535,7 @@ void View::DrawRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     if (rest->m_crossStaff) staff = rest->m_crossStaff;
 
     const bool drawingCueSize = rest->GetDrawingCueSize();
+    const int staffSize = staff->GetDrawingStaffNotationSize();
     int drawingDur = rest->GetActualDur();
     if (drawingDur == DUR_NONE) {
         if (!dc->Is(BBOX_DEVICE_CONTEXT)) {
@@ -1513,21 +1548,21 @@ void View::DrawRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
     const int x = element->GetDrawingX();
     const int y = element->GetDrawingY();
 
-    this->DrawSmuflCode(dc, x, y, drawingGlyph, staff->m_drawingStaffSize, drawingCueSize);
+    this->DrawSmuflCode(dc, x, y, drawingGlyph, staffSize, drawingCueSize);
 
     if ((drawingDur == DUR_1 || drawingDur == DUR_2 || drawingDur == DUR_BR)) {
-        const int width = m_doc->GetGlyphWidth(drawingGlyph, staff->m_drawingStaffSize, drawingCueSize);
+        const int width = m_doc->GetGlyphWidth(drawingGlyph, staffSize, drawingCueSize);
         int ledgerLineThickness
-            = m_doc->GetOptions()->m_ledgerLineThickness.GetValue() * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            = m_doc->GetOptions()->m_ledgerLineThickness.GetValue() * m_doc->GetDrawingUnit(staffSize);
         int ledgerLineExtension
-            = m_doc->GetOptions()->m_ledgerLineExtension.GetValue() * m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+            = m_doc->GetOptions()->m_ledgerLineExtension.GetValue() * m_doc->GetDrawingUnit(staffSize);
         if (drawingCueSize) {
             ledgerLineThickness *= m_doc->GetOptions()->m_graceFactor.GetValue();
             ledgerLineExtension *= m_doc->GetOptions()->m_graceFactor.GetValue();
         }
         const int topMargin = staff->GetDrawingY();
-        const int bottomMargin = staff->GetDrawingY()
-            - (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize);
+        const int bottomMargin
+            = staff->GetDrawingY() - (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staffSize);
 
         dc->StartCustomGraphic("ledgerLines");
         // single legder line for half and whole rests
@@ -1539,7 +1574,7 @@ void View::DrawRest(DeviceContext *dc, LayerElement *element, Layer *layer, Staf
         }
         // double ledger line for breve rests
         else if (drawingDur == DUR_BR && (y >= topMargin || y <= bottomMargin)) {
-            const int height = m_doc->GetGlyphHeight(drawingGlyph, staff->m_drawingStaffSize, drawingCueSize);
+            const int height = m_doc->GetGlyphHeight(drawingGlyph, staffSize, drawingCueSize);
             dc->DeactivateGraphicX();
             if (y != topMargin) {
                 this->DrawHorizontalLine(
@@ -1727,6 +1762,9 @@ void View::DrawSyl(DeviceContext *dc, LayerElement *element, Layer *layer, Staff
     if (syl->GetStart() && syl->GetStart()->GetDrawingCueSize()) {
         currentFont.SetPointSize(m_doc->GetCueSize(currentFont.GetPointSize()));
     }
+    if (syl->HasLetterspacing()) {
+        currentFont.SetLetterSpacing(syl->GetLetterspacing() * m_doc->GetDrawingUnit(staff->m_drawingStaffSize));
+    }
     dc->SetFont(&currentFont);
 
     TextDrawingParams params;
@@ -1986,29 +2024,31 @@ int View::DrawMeterSigFigures(DeviceContext *dc, int x, int y, MeterSig *meterSi
 
 void View::DrawMRptPart(DeviceContext *dc, int xCentered, char32_t rptGlyph, int num, bool line, Staff *staff)
 {
+    const int staffNotationSize = staff->GetDrawingStaffNotationSize();
     const int staffSize = staff->m_drawingStaffSize;
     const int y = staff->GetDrawingY();
-    const int xSymbol = xCentered - m_doc->GetGlyphWidth(rptGlyph, staffSize, false) / 2;
+    const int xSymbol = xCentered - m_doc->GetGlyphWidth(rptGlyph, staffNotationSize, false) / 2;
     const int ySymbol = y - (staff->m_drawingLines - 1) * m_doc->GetDrawingUnit(staffSize);
 
-    this->DrawSmuflCode(dc, xSymbol, ySymbol, rptGlyph, staffSize, false);
+    this->DrawSmuflCode(dc, xSymbol, ySymbol, rptGlyph, staffNotationSize, false);
 
     if (line) {
         const int yBottom = y - (staff->m_drawingLines - 1) * m_doc->GetDrawingDoubleUnit(staffSize);
         const int offset = (y == ySymbol) ? m_doc->GetDrawingDoubleUnit(staffSize) : 0;
-        this->DrawVerticalLine(dc, y + offset, yBottom - offset, xCentered, m_doc->GetDrawingBarLineWidth(staffSize));
+        this->DrawVerticalLine(
+            dc, y + offset, yBottom - offset, xCentered, m_doc->GetDrawingBarLineWidth(staffNotationSize));
     }
 
     if (num > 0) {
-        dc->SetFont(m_doc->GetDrawingSmuflFont(staffSize, false));
+        dc->SetFont(m_doc->GetDrawingSmuflFont(staffNotationSize, false));
         // calculate the width of the figures
         TextExtend extend;
         const std::u32string figures = this->IntToTimeSigFigures(num);
         dc->GetSmuflTextExtent(figures, &extend);
-        const int symHeight = m_doc->GetGlyphHeight(rptGlyph, staffSize, false);
+        const int symHeight = m_doc->GetGlyphHeight(rptGlyph, staffNotationSize, false);
         const int yNum = (y > ySymbol + symHeight / 2)
-            ? staff->GetDrawingY() + m_doc->GetDrawingUnit(staffSize) + extend.m_height / 2
-            : ySymbol + 3 * m_doc->GetDrawingUnit(staffSize) + extend.m_height / 2;
+            ? staff->GetDrawingY() + m_doc->GetDrawingUnit(staffNotationSize) + extend.m_height / 2
+            : ySymbol + 3 * m_doc->GetDrawingUnit(staffNotationSize) + extend.m_height / 2;
         dc->DrawMusicText(figures, ToDeviceContextX(xCentered - extend.m_width / 2), ToDeviceContextY(yNum));
         dc->ResetFont();
     }
diff --git a/src/view_mensural.cpp b/src/view_mensural.cpp
index a5ab7613e66..3bce2133234 100644
--- a/src/view_mensural.cpp
+++ b/src/view_mensural.cpp
@@ -280,7 +280,7 @@ void View::DrawLigature(DeviceContext *dc, LayerElement *element, Layer *layer,
 
     // Render a bracket for the ligature
     if (m_options->m_ligatureAsBracket.GetValue()) {
-        const ListOfObjects &notes = ligature->GetList(ligature);
+        const ListOfObjects &notes = ligature->GetList();
 
         if (notes.size() > 0) {
             int y = staff->GetDrawingY();
diff --git a/src/view_neume.cpp b/src/view_neume.cpp
index 9506b59e1a0..cbdf0b8c624 100644
--- a/src/view_neume.cpp
+++ b/src/view_neume.cpp
@@ -16,9 +16,11 @@
 //----------------------------------------------------------------------------
 
 #include "devicecontext.h"
+#include "divline.h"
 #include "doc.h"
 #include "layer.h"
 #include "layerelement.h"
+#include "liquescent.h"
 #include "mrpt.h"
 #include "nc.h"
 #include "neume.h"
@@ -70,12 +72,16 @@ void View::DrawNc(DeviceContext *dc, LayerElement *element, Layer *layer, Staff
     }
 
     struct drawingParams {
-        char32_t fontNo = SMUFL_E990_chantPunctum;
+        wchar_t fontNo = SMUFL_E990_chantPunctum;
+        wchar_t fontNoLiq[5] = {};
         float xOffset = 0;
         float yOffset = 0;
+        float xOffsetLiq[5] = { 0, 0, 0, 0, 0 };
+        float yOffsetLiq[5] = { 0, 0, 0, 0, 0 };
     };
     std::vector<drawingParams> params;
     params.push_back(drawingParams());
+
     dc->StartGraphic(element, "", element->GetID());
 
     /******************************************************************/
@@ -98,30 +104,50 @@ void View::DrawNc(DeviceContext *dc, LayerElement *element, Layer *layer, Staff
         int pitchDifference = 0;
         bool isFirst;
         // Check if this is the first or second part of a ligature
-        Object *nextSibling = neume->GetChild(position + 1);
-        if (nextSibling != NULL) {
-            Nc *nextNc = dynamic_cast<Nc *>(nextSibling);
-            assert(nextNc);
-            if (nextNc->GetLigated() == BOOLEAN_true) { // first part of the ligature
-                isFirst = true;
+        // Object *nextSibling = neume->GetChild(position + 1);
+        // if (nextSibling != NULL) {
+        //     Nc *nextNc = dynamic_cast<Nc *>(nextSibling);
+        //     assert(nextNc);
+        //     if (nextNc->GetLigated() == BOOLEAN_true) { // first part of the ligature
+        //         isFirst = true;
+        //         pitchDifference = nextNc->PitchDifferenceTo(nc);
+        //         params.at(0).yOffset = pitchDifference;
+        //     }
+        //     else {
+        //         isFirst = false;
+        //     }
+        // }
+        // else {
+        //     isFirst = false;
+        // }
+        int ligCount = neume->GetLigatureCount(position);
+
+        if (ligCount % 2 == 0) {
+            isFirst = false;
+            Nc *lastNc = dynamic_cast<Nc *>(neume->GetChild(position > 0 ? position - 1 : 0));
+            assert(lastNc);
+            pitchDifference = nc->PitchDifferenceTo(lastNc);
+            params.at(0).xOffset = -1;
+            params.at(0).yOffset = -pitchDifference;
+        }
+        else {
+            isFirst = true;
+            Object *nextSibling = neume->GetChild(position + 1);
+            if (nextSibling != NULL) {
+                Nc *nextNc = dynamic_cast<Nc *>(nextSibling);
+                assert(nextNc);
                 pitchDifference = nextNc->PitchDifferenceTo(nc);
                 params.at(0).yOffset = pitchDifference;
             }
-            else {
-                isFirst = false;
-            }
-        }
-        else {
-            isFirst = false;
         }
 
-        if (!isFirst) { // still need to get pitchDifference
-            Nc *lastnc = dynamic_cast<Nc *>(neume->GetChild(position > 0 ? position - 1 : 0));
-            assert(lastnc);
-            pitchDifference = nc->PitchDifferenceTo(lastnc);
-            params.at(0).xOffset = -1;
-            params.at(0).yOffset = -pitchDifference;
-        }
+        // if (!isFirst) { // still need to get pitchDifference
+        //     Nc *lastnc = dynamic_cast<Nc *>(neume->GetChild(position > 0 ? position - 1 : 0));
+        //     assert(lastnc);
+        //     pitchDifference = nc->PitchDifferenceTo(lastnc);
+        //     params.at(0).xOffset = -1;
+        //     params.at(0).yOffset = -pitchDifference;
+        // }
 
         // set the glyph
         switch (pitchDifference) {
@@ -143,12 +169,39 @@ void View::DrawNc(DeviceContext *dc, LayerElement *element, Layer *layer, Staff
 
     // If the nc is supposed to be a virga and currently is being rendered as a punctum
     // change it to a virga
-    if (nc->GetTilt() == COMPASSDIRECTION_n && params.at(0).fontNo == SMUFL_E990_chantPunctum) {
+    if (nc->GetTilt() == COMPASSDIRECTION_s && params.at(0).fontNo == SMUFL_E990_chantPunctum) {
         params.at(0).fontNo = SMUFL_E996_chantPunctumVirga;
     }
 
-    const int noteHeight = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 2);
-    const int noteWidth = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / 1.4);
+    else if (nc->GetTilt() == COMPASSDIRECTION_n && params.at(0).fontNo == SMUFL_E990_chantPunctum) {
+        params.at(0).fontNo = SMUFL_E997_chantPunctumVirgaReversed;
+    }
+
+    else if (nc->GetCurve() == curvatureDirection_CURVE_c) {
+        params.at(0).fontNoLiq[0] = SMUFL_E9BE_chantConnectingLineAsc3rd;
+        params.at(0).fontNoLiq[1] = SMUFL_EB92_staffPosRaise3;
+        params.at(0).fontNoLiq[2] = SMUFL_E995_chantAuctumDesc;
+        params.at(0).fontNoLiq[3] = SMUFL_EB91_staffPosRaise2;
+        params.at(0).fontNoLiq[4] = SMUFL_E9BE_chantConnectingLineAsc3rd;
+        params.at(0).xOffsetLiq[4] = 0.8;
+        params.at(0).yOffsetLiq[0] = -1.5;
+        params.at(0).yOffsetLiq[4] = -1.75;
+    }
+    else if (nc->GetCurve() == curvatureDirection_CURVE_a) {
+        params.at(0).fontNoLiq[0] = SMUFL_E9BE_chantConnectingLineAsc3rd;
+        params.at(0).fontNoLiq[1] = SMUFL_EB98_staffPosLower1;
+        params.at(0).fontNoLiq[2] = SMUFL_E994_chantAuctumAsc;
+        params.at(0).fontNoLiq[3] = SMUFL_EB99_staffPosLower2;
+        params.at(0).fontNoLiq[4] = SMUFL_E9BE_chantConnectingLineAsc3rd;
+        params.at(0).xOffsetLiq[4] = 0.8;
+        params.at(0).yOffsetLiq[0] = 0.5;
+        params.at(0).yOffsetLiq[4] = 0.75;
+    }
+
+    const int noteHeight
+        = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_HEIGHT_TO_STAFF_SIZE_RATIO);
+    const int noteWidth
+        = (int)(m_doc->GetDrawingDoubleUnit(staff->m_drawingStaffSize) / NOTE_WIDTH_TO_STAFF_SIZE_RATIO);
     int noteY, noteX;
     int yValue;
     if (nc->HasFacs() && (m_doc->GetType() == Facs)) {
@@ -167,7 +220,14 @@ void View::DrawNc(DeviceContext *dc, LayerElement *element, Layer *layer, Staff
     // Calculating proper y offset based on pname, clef, staff, and staff rotate
     int clefYPosition = noteY - (staffSize * (staffLineNumber - clefLine));
     int pitchOffset = 0;
-    int octaveOffset = (nc->GetOct() - 3) * ((staffSize / 2) * 7);
+
+    // The default octave = 3, but the actual octave is calculated by
+    // taking into account the displacement of the clef
+    int clefOctave = 3;
+    if (clef->GetDis() && clef->GetDisPlace()) {
+        clefOctave += (clef->GetDisPlace() == STAFFREL_basic_above ? 1 : -1) * (clef->GetDis() / 7);
+    }
+    int octaveOffset = (nc->GetOct() - clefOctave) * ((staffSize / 2) * 7);
     int rotateOffset;
     if ((m_doc->GetType() == Facs) && (staff->GetDrawingRotate() != 0)) {
         double deg = staff->GetDrawingRotate();
@@ -178,18 +238,30 @@ void View::DrawNc(DeviceContext *dc, LayerElement *element, Layer *layer, Staff
         rotateOffset = 0;
     }
 
-    if (clef->GetShape() == CLEFSHAPE_C) {
-        pitchOffset = (nc->GetPname() - 1) * (staffSize / 2);
+    if (nc->HasLoc()) {
+        yValue = noteY + (nc->GetLoc() - 2 * (staffLineNumber - 1)) * (staffSize / 2);
     }
-    else if (clef->GetShape() == CLEFSHAPE_F) {
-        pitchOffset = (nc->GetPname() - 4) * (staffSize / 2);
+    else {
+        if (clef->GetShape() == CLEFSHAPE_C) {
+            pitchOffset = (nc->GetPname() - 1) * (staffSize / 2);
+        }
+        else if (clef->GetShape() == CLEFSHAPE_F) {
+            pitchOffset = (nc->GetPname() - 4) * (staffSize / 2);
+        }
+        yValue = clefYPosition + pitchOffset + octaveOffset - rotateOffset;
     }
 
-    yValue = clefYPosition + pitchOffset + octaveOffset - rotateOffset;
-
-    for (drawingParams &param : params) {
-        this->DrawSmuflCode(dc, noteX + param.xOffset * noteWidth, yValue + param.yOffset * noteHeight, param.fontNo,
-            staff->m_drawingStaffSize, false, true);
+    for (auto it = params.begin(); it != params.end(); it++) {
+        if (nc->GetCurve() == curvatureDirection_CURVE_a || nc->GetCurve() == curvatureDirection_CURVE_c) {
+            for (int i = 0; i < static_cast<int>(sizeof(params.at(0).fontNoLiq)); i++) {
+                DrawSmuflCode(dc, noteX + it->xOffsetLiq[i] * noteWidth, yValue + it->yOffsetLiq[i] * noteHeight,
+                    it->fontNoLiq[i], staff->m_drawingStaffSize, false, true);
+            }
+        }
+        else {
+            DrawSmuflCode(dc, noteX + it->xOffset * noteWidth, yValue + it->yOffset * noteHeight, it->fontNo,
+                staff->m_drawingStaffSize, false, true);
+        }
     }
 
     // adjust facsimile values of element based on where it is rendered if necessary
@@ -279,4 +351,61 @@ void View::DrawNcAsNotehead(DeviceContext *dc, Nc *nc, Layer *layer, Staff *staf
     dc->EndGraphic(nc, this);
 }
 
+void View::DrawDivLine(DeviceContext *dc, LayerElement *element, Layer *layer, Staff *staff, Measure *measure)
+{
+    assert(dc);
+    assert(element);
+    assert(layer);
+    assert(staff);
+    assert(measure);
+
+    DivLine *divLine = dynamic_cast<DivLine *>(element);
+    assert(divLine);
+
+    // int x = divLine->GetDrawingX();
+    // int y = divLine->GetDrawingY();
+
+    dc->StartGraphic(element, "", element->GetID());
+
+    int sym = 0;
+
+    switch (divLine->GetForm()) {
+        case divLineLog_FORM_minima: sym = SMUFL_E8F3_chantDivisioMinima; break;
+        case divLineLog_FORM_maior: sym = SMUFL_E8F4_chantDivisioMaior; break;
+        case divLineLog_FORM_maxima: sym = SMUFL_E8F5_chantDivisioMaxima; break;
+        case divLineLog_FORM_finalis: sym = SMUFL_E8F6_chantDivisioFinalis; break;
+        case divLineLog_FORM_caesura: sym = SMUFL_E8F8_chantCaesura; break;
+        case divLineLog_FORM_virgula: sym = SMUFL_E8F7_chantVirgula; break;
+        default: break;
+    }
+
+    int x, y;
+    if ((m_doc->GetType() == Facs) && (divLine->HasFacs())) {
+        x = divLine->GetDrawingX();
+        y = ToLogicalY(staff->GetDrawingY());
+    }
+    else {
+        x = element->GetDrawingX();
+        y = element->GetDrawingY();
+        y -= m_doc->GetDrawingUnit(staff->m_drawingStaffSize);
+    }
+
+    y -= (m_doc->GetDrawingUnit(staff->m_drawingStaffSize)) * 3;
+
+    int rotateOffset;
+    if ((m_doc->GetType() == Facs) && (staff->GetDrawingRotate() != 0)) {
+        double deg = staff->GetDrawingRotate();
+        int xDiff = x - staff->GetDrawingX();
+        rotateOffset = int(xDiff * tan(deg * M_PI / 180.0));
+    }
+    else {
+        rotateOffset = 0;
+    }
+
+    y -= rotateOffset;
+
+    DrawSmuflCode(dc, x, y, sym, staff->m_drawingStaffSize, false, true);
+
+    dc->EndGraphic(element, this);
+}
 } // namespace vrv
diff --git a/src/view_page.cpp b/src/view_page.cpp
index a56e34501b7..7a49126257c 100644
--- a/src/view_page.cpp
+++ b/src/view_page.cpp
@@ -135,9 +135,9 @@ void View::SetScoreDefDrawingWidth(DeviceContext *dc, ScoreDef *scoreDef)
     }
 
     // longest key signature of the staffDefs
-    const ListOfObjects &scoreDefList = scoreDef->GetList(scoreDef); // make sure it's initialized
-    for (ListOfObjects::const_iterator it = scoreDefList.begin(); it != scoreDefList.end(); ++it) {
-        StaffDef *staffDef = vrv_cast<StaffDef *>(*it);
+    const ListOfObjects &childList = scoreDef->GetList(); // make sure it's initialized
+    for (Object *child : childList) {
+        StaffDef *staffDef = vrv_cast<StaffDef *>(child);
         assert(staffDef);
         if (!staffDef->HasKeySigInfo()) continue;
         KeySig *keySig = staffDef->GetKeySig();
@@ -541,8 +541,8 @@ void View::DrawLabels(
     LabelAbbr *labelAbbr = vrv_cast<LabelAbbr *>(object->FindDescendantByType(LABELABBR, 1));
     Object *graphic = label;
 
-    std::u32string labelStr = (label) ? label->GetText(label) : U"";
-    std::u32string labelAbbrStr = (labelAbbr) ? labelAbbr->GetText(labelAbbr) : U"";
+    std::u32string labelStr = label ? label->GetText() : U"";
+    std::u32string labelAbbrStr = labelAbbr ? labelAbbr->GetText() : U"";
 
     if (abbreviations) {
         labelStr = labelAbbrStr;
@@ -586,7 +586,7 @@ void View::DrawLabels(
     if (labelAbbr && !abbreviations && (labelAbbrStr.length() > 0)) {
         TextExtend extend;
         std::vector<std::u32string> lines;
-        labelAbbr->GetTextLines(labelAbbr, lines);
+        labelAbbr->GetTextLines(lines);
         int maxLength = 0;
         for (std::u32string &line : lines) {
             dc->GetTextExtent(line, &extend, true);
@@ -1116,7 +1116,7 @@ void View::DrawMeterSigGrp(DeviceContext *dc, Layer *layer, Staff *staff)
     assert(staff);
 
     MeterSigGrp *meterSigGrp = layer->GetStaffDefMeterSigGrp();
-    ListOfObjects childList = meterSigGrp->GetList(meterSigGrp);
+    ListOfObjects childList = meterSigGrp->GetList();
 
     // Ignore invisible meter signatures and those without count
     childList.erase(std::remove_if(childList.begin(), childList.end(),
@@ -1246,7 +1246,9 @@ void View::DrawStaff(DeviceContext *dc, Staff *staff, Measure *measure, System *
         this->DrawStaffLines(dc, staff, measure, system);
     }
 
-    this->DrawStaffDef(dc, staff, measure);
+    if (staffDef && (m_doc->GetType() != Facs)) {
+        this->DrawStaffDef(dc, staff, measure);
+    }
 
     if (!staff->GetLedgerLinesAbove().empty()) {
         this->DrawLedgerLines(dc, staff, staff->GetLedgerLinesAbove(), false, false);
@@ -1973,7 +1975,7 @@ void View::DrawAnnot(DeviceContext *dc, EditorialElement *element, bool isTextEl
 
     Annot *annot = vrv_cast<Annot *>(element);
     assert(annot);
-    dc->AddDescription(UTF32to8(annot->GetText(annot)));
+    dc->AddDescription(UTF32to8(annot->GetText()));
 
     if (isTextElement) {
         dc->EndTextGraphic(element, this);
diff --git a/src/view_text.cpp b/src/view_text.cpp
index 7466cf5694b..2d2839dd935 100644
--- a/src/view_text.cpp
+++ b/src/view_text.cpp
@@ -127,6 +127,7 @@ void View::DrawDynamString(DeviceContext *dc, const std::u32string &str, TextDra
                 bool isFallbackNeeded = (m_doc->GetResources()).IsSmuflFallbackNeeded(smuflStr);
                 vrvTxt.SetSmuflWithFallback(isFallbackNeeded);
                 vrvTxt.SetStyle(FONTSTYLE_normal);
+                vrvTxt.SetLetterSpacing(90);
                 dc->SetFont(&vrvTxt);
                 this->DrawTextString(dc, smuflStr, params);
                 dc->ResetFont();
@@ -419,6 +420,10 @@ void View::DrawRend(DeviceContext *dc, Rend *rend, TextDrawingParams &params)
         rendFont.SetWeight(rend->GetFontweight());
         customFont = true;
     }
+    if (rend->HasLetterspacing()) {
+        rendFont.SetLetterSpacing(rend->GetLetterspacing() * m_doc->GetDrawingUnit(100));
+        customFont = true;
+    }
 
     if (customFont) dc->SetFont(&rendFont);
 
diff --git a/src/zone.cpp b/src/zone.cpp
index e404f82733b..b5838cd7672 100644
--- a/src/zone.cpp
+++ b/src/zone.cpp
@@ -28,6 +28,7 @@ Zone::Zone() : Object(ZONE, "zone-"), AttTyped(), AttCoordinated()
 {
     this->RegisterAttClass(ATT_TYPED);
     this->RegisterAttClass(ATT_COORDINATED);
+    this->RegisterAttClass(ATT_COORDINATEDUL);
     this->Reset();
 }
 
@@ -37,6 +38,7 @@ void Zone::Reset()
 {
     this->ResetTyped();
     this->ResetCoordinated();
+    this->ResetCoordinatedUl();
 }
 
 void Zone::ShiftByXY(int xDiff, int yDiff)