diff --git a/.github/pr-labeler_config.yml b/.github/pr-labeler_config.yml index 42ad004b9..cb71102d8 100644 --- a/.github/pr-labeler_config.yml +++ b/.github/pr-labeler_config.yml @@ -1,29 +1,35 @@ -"Component: Build": -- build.xml +'Component: Build': + - changed-files: + - any-glob-to-any-file: ['build.xml'] -"Component: Core Schema": -- source/modules/**/* -- source/mei-source.xml +'Component: Core Schema': + - changed-files: + - any-glob-to-any-file: ['source/modules/**/*', 'source/mei-source.xml'] -"Component: Customizations": -- customizations/**/* +'Component: Customizations': + - changed-files: + - any-glob-to-any-file: ['customizations/**/*'] -"Component: Guidelines & Documentation": -- source/docs/**/* -- source/examples/**/* -- source/web/**/* +'Component: Guidelines & Documentation': + - changed-files: + - any-glob-to-any-file: ['source/docs/**/*', 'source/examples/**/*'] -"Component: Images": -- source/images/**/* +'Component: Images': + - changed-files: + - any-glob-to-any-file: ['source/assets/images/**/*'] -"Component: Style": -- source/assets/css/**/* +'Component: Style': + - changed-files: + - any-glob-to-any-file: ['source/assets/css/**/*'] -"Component: Utils": -- utils/**/* +'Component: Utils': + - changed-files: + - any-glob-to-any-file: ['utils/**/*'] -"Component: Validation": -- source/validation/**/* +'Component: Validation': + - changed-files: + - any-glob-to-any-file: ['source/validation/**/*'] -"Component: Workflows": -- .github/workflows/**/* +'Component: Workflows': + - changed-files: + - any-glob-to-any-file: ['.github/**/*'] diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 23665631a..6fe768725 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -56,7 +56,7 @@ jobs: ### BUIDLING THE SCHEMA AND THE GUIDELINES ### - name: Checkout main repo - uses: actions/checkout@v3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: # Whether to checkout submodules: `true` to checkout submodules or `recursive` to # recursively checkout submodules. @@ -72,13 +72,13 @@ jobs: ### UPLOADING THE ARTIFACTS ### - name: Upload PDF - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: pdf path: ${{ github.workspace }}/dist/guidelines/pdf/MEI_Guidelines_*.pdf - name: Upload Prince XML log - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: prince_log path: ${{ github.workspace }}/build/prince.log @@ -112,7 +112,7 @@ jobs: ### PUBLISHING THE SCHEMA ### - name: Checkout SCHEMA_REPO into SCHEMA_DIR if: github.repository_owner == env.REPO_OWNER && env.IS_DEV_OR_TAG == 'true' - uses: actions/checkout@v3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: # repository to check out repository: ${{ env.SCHEMA_REPO }} @@ -140,7 +140,10 @@ jobs: rm -rf $SCHEMA_DIR/$TARGET_DIR cp -r dist/schemata/ $SCHEMA_DIR/ mv $SCHEMA_DIR/schemata $SCHEMA_DIR/$TARGET_DIR - cp -r build/mei-source_canonicalized.xml $SCHEMA_DIR/$TARGET_DIR + + - name: Copy mei-source_canonicalized to SCHEMA_DIR + if: github.repository_owner == env.REPO_OWNER && env.IS_DEV_OR_TAG == 'true' + run: find ${{ github.workspace }}/build -name 'mei-source_canonicalized_*.xml' -exec cp {} $SCHEMA_DIR/$TARGET_DIR/ \; - name: Check git status before commit if: github.repository_owner == env.REPO_OWNER && env.IS_DEV_OR_TAG == 'true' @@ -173,7 +176,7 @@ jobs: ### PUBLISHING THE GUIDELINES ### - name: Checkout GUIDELINES_REPO into GUIDELINES_DIR if: github.repository_owner == env.REPO_OWNER && env.IS_DEV_OR_TAG == 'true' - uses: actions/checkout@v3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: # repository to check out repository: ${{ env.GUIDELINES_REPO }} @@ -239,7 +242,7 @@ jobs: # but then the version would have to be determined programatically - name: Create release if: startsWith(github.ref, 'refs/tags/v') - uses: ncipollo/release-action@6c75be85e571768fa31b40abf38de58ba0397db5 # ratchet:ncipollo/release-action@v1.13.0 + uses: ncipollo/release-action@cdcc88a9acf3ca41c16c37bb7d21b9ad48560d87 # v1.15.0 with: allowUpdates: false artifacts: "${{ github.workspace }}/dist/guidelines/pdf/MEI_Guidelines_${{ github.ref_name }}.pdf" diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml index 44860d23f..4c34f760d 100644 --- a/.github/workflows/pr-labeler.yml +++ b/.github/workflows/pr-labeler.yml @@ -16,10 +16,13 @@ on: jobs: label: + permissions: + contents: read + pull-requests: write runs-on: ubuntu-latest if: github.repository_owner == 'music-encoding' steps: - - uses: actions/labeler@v4 + - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 with: repo-token: "${{ secrets.GITHUB_TOKEN }}" sync-labels: true diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3a7380f27..000000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "Stylesheets"] - path = submodules/Stylesheets - url = https://github.com/TEIC/Stylesheets.git - branch = released diff --git a/BUILD_COMMANDLINE.md b/BUILD_COMMANDLINE.md index e128b3f71..12f68adb7 100644 --- a/BUILD_COMMANDLINE.md +++ b/BUILD_COMMANDLINE.md @@ -7,11 +7,12 @@ | Prerequisite | Recommended version | |----|----------------| |Java| Java Development Kit (JDK) 17 recommended (at least Java 8 at runtime to support Apache Ant™)| - |Apache Ant|1.10.13| - |Verovio Toolkit|3.15| - |Prince XML|15.1| - |Saxon HE*| 11.5 | - |Xerces*|Synchrosoft patched version 25.1.0.1| + |Apache Ant|1.10.14| + |Verovio Toolkit|4.2.1| + |Prince XML|15.3| + |Saxon HE*|12.5| + |TEI Stylesheets*|7.57.1| + |Xerces*|Synchrosoft patched version 26.1.0.1| \* automatically pulled during build execution @@ -49,7 +50,7 @@ This should return something similar to: ```shell - Apache Ant™ version 1.10.13 compiled on September 27 2020 + Apache Ant(TM) version 1.10.14 compiled on August 16 2023 ``` We recommend using the latest stable release of Apache Ant™. If your system has an older version of Apache Ant™ installed you might still give it a try though. If the prompt returns an empty string, please refer to the [Apache Ant™ Installation Instructions](https://ant.apache.org/manual/install.html) or any other applicable installation instruction. @@ -143,15 +144,17 @@ The following targets can be called using `ant `: | target | description | |-----------------------|-----------------| | `dist` (or no target) | Default main target; equivalent to calling ant without any target. Builds all artifacts, i.e., RNG and compiled ODDs of all customizations, guidelines html and PDF. | -| `canonicalize-source` | Creates a canonicalized version of the mei-source.xml, i.e., resolves xincludes and puts result in `build/mei-source_canonicalized`. This target will be triggered before all `build-...` targets. | +| `canonicalize-source` | Creates a canonicalized version of the mei-source.xml, i.e., resolves xincludes and puts result in `build/mei-source_canonicalized_v{mei-version}`. | +| `validate-source` | Validates the canonicalized source. This target will be triggered before all `build-...` targets. | | `build-compiled-odds` | Builds the compiled ODD files for all MEI customizations. | | `build-compiled-odd -Dcustomization.path="[ABSOLUTE/PATH/TO/YOUR/CUSTOMIZATION]"` | Builds the compiled ODD of a specific customization submitted as as absolute path with `-Dcustomization.path` input param. | | `build-customizations` | Builds the RNG schemata for all MEI customizations. | | `build-rng -Dcustomization.path="[ABSOLUTE/PATH/TO/YOUR/CUSTOMIZATION]"` | Builds the RNG schema of a specific customization submitted as absolute path with `-Dcustomization.path` input param. | | `build-guidelines-html` | Builds the HTML version of the MEI guidelines. | | `build-guidelines-pdf` | Builds the PDF version of the MEI guidelines. (Calls `build-guidelines-html` before execution.) | -| `init` | Initializes the build environment, i.e., checks if saxon and xerces are available, and if not, downloads jar files for Saxon, Xerces and adds them to the `lib` folder. Checks if prince is available. | +| `info`| Displays the versions of Ant and Java (JDK). | +| `init` | Initializes the build environment, i.e., checks if TEI Stylesheets, Saxon, Xerces and Schematron are available, and if not, it downloads everything into the `lib` folder. Checks if Prince is available. | | `init-mei-classpath` | Initializes the mei.classpath, which is essential for the schema generation, by prepending the jar files contained in the lib directory to the java classpath. Will be called automatically if needed. | | `compare-versions` | Compares the canonicalized sources of the MEI dev version with the previous stable version and creates an HTML output; custom versions and output folder can be set via `-Dsource`, `-Dold` and `-Doutput` input params. | | `clean` | Deletes the following directories: `build`, `dist` and `temp`. | -| `reset` | Resets the build environment. Same as `clean`, but additionaly deletes the `lib` directory with the Saxon and Xerces jar files. | +| `reset` | Resets the build environment. Same as `clean`, but additionally deletes the `lib` directory with the TEI Stylesheets and the jar files. | diff --git a/BUILD_OXYGEN.md b/BUILD_OXYGEN.md index e493753dd..47bc6ac94 100644 --- a/BUILD_OXYGEN.md +++ b/BUILD_OXYGEN.md @@ -8,7 +8,7 @@ To build the RNG schema of a specific customization, follow these steps: 1. Open the customization file in oXygen. - To make sure that step 2 works out of the box, make sure that it has the extension `.odd` and not `.xml`. This is necessary for oXygen to recognize the file as TEI ODD customization and offer you the preconfigured transformation scenario for generating RNG schema files from an ODD. + To make sure that step 2 works out of the box, make sure that it has the extension `.odd` and not `.xml`. This is necessary for oXygen to recognize the file as TEI ODD customization and offer you the pre-configured transformation scenario for generating RNG schema files from an ODD. 2. Click on the _Configure Transformation Scenario(s)_ button (the red play button with the wrench). This will open a window of the same name. diff --git a/LICENSE b/LICENSE index 005a58461..9d9f3070c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,16 +1,179 @@ -NOTICE: Copyright (c) 2017-2023 by the Music Encoding Initiative (MEI) Board (formerly known as "MEI Council"). +Educational Community License -Licensed under the Educational Community License, Version 2.0 (the "License"); you may -not use this file except in compliance with the License. You may obtain a copy of the License -at https://opensource.org/licenses/ECL-2.0. +Version 2.0, April 2007 -Unless required by applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS -OF ANY KIND, either express or implied. See the License for the specific language -governing permissions and limitations under the License. +http://opensource.org/licenses/ECL-2.0 -This is a derivative work based on earlier versions of the schema © 2001-2006 Perry Roland -and the Rector and Visitors of the University of Virginia; licensed under the Educational -Community License version 1.0. +The Educational Community License version 2.0 ("ECL") consists of the Apache +2.0 license, modified to change the scope of the patent grant in section 3 to +be specific to the needs of the education communities using this license. The +original Apache 2.0 license can be found at: +http://www.apache.org/licenses/LICENSE-2.0 -CONTACT: info@music-encoding.org +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the +copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other +entities that control, are controlled by, or are under common control with +that entity. For the purposes of this definition, "control" means (i) the +power, direct or indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (ii) ownership of fifty percent +(50%) or more of the outstanding shares, or (iii) beneficial ownership of such +entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation source, and +configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object +code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, +made available under the License, as indicated by a copyright notice that is +included in or attached to the work (an example is provided in the Appendix +below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative +Works shall not include works that remain separable from, or merely link (or +bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original +version of the Work and any modifications or additions to that Work or +Derivative Works thereof, that is intentionally submitted to Licensor for +inclusion in the Work by the copyright owner or by an individual or Legal +Entity authorized to submit on behalf of the copyright owner. For the purposes +of this definition, "submitted" means any form of electronic, verbal, or +written communication sent to the Licensor or its representatives, including +but not limited to communication on electronic mailing lists, source code +control systems, and issue tracking systems that are managed by, or on behalf +of, the Licensor for the purpose of discussing and improving the Work, but +excluding communication that is conspicuously marked or otherwise designated +in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and +such Derivative Works in Source or Object form. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such +Contributor that are necessarily infringed by their Contribution(s) alone or +by combination of their Contribution(s) with the Work to which such +Contribution(s) was submitted. If You institute patent litigation against any +entity (including a cross-claim or counterclaim in a lawsuit) alleging that +the Work or a Contribution incorporated within the Work constitutes direct or +contributory patent infringement, then any patent licenses granted to You +under this License for that Work shall terminate as of the date such +litigation is filed. Any patent license granted hereby with respect to +contributions by an individual employed by an institution or organization is +limited to patent claims where the individual that is the author of the Work +is also the inventor of the patent claims licensed, and where the organization +or institution has the right to grant such license under applicable grant and +research funding agreements. No other express or implied licenses are granted. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works +thereof in any medium, with or without modifications, and in Source or Object +form, provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of +this License; and You must cause any modified files to carry prominent notices +stating that You changed the files; and You must retain, in the Source form of +any Derivative Works that You distribute, all copyright, patent, trademark, +and attribution notices from the Source form of the Work, excluding those +notices that do not pertain to any part of the Derivative Works; and If the +Work includes a "NOTICE" text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of +the following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents +of the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. You may add Your own copyright statement to Your +modifications and may provide additional or different license terms and +conditions for use, reproduction, or distribution of Your modifications, or +for any such Derivative Works as a whole, provided Your use, reproduction, and +distribution of the Work otherwise complies with the conditions stated in this +License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally +submitted for inclusion in the Work by You to the Licensor shall be under the +terms and conditions of this License, without any additional terms or +conditions. Notwithstanding the above, nothing herein shall supersede or +modify the terms of any separate license agreement you may have executed with +Licensor regarding such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides +the Work (and each Contributor provides its Contributions) on an "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied, including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You +are solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a result of +this License or out of the use or inability to use the Work (including but not +limited to damages for loss of goodwill, work stoppage, computer failure or +malfunction, or any and all other commercial damages or losses), even if such +Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. +However, in accepting such obligations, You may act only on Your own behalf +and on Your sole responsibility, not on behalf of any other Contributor, and +only if You agree to indemnify, defend, and hold each Contributor harmless for +any liability incurred by, or claims asserted against, such Contributor by +reason of your accepting any such warranty or additional liability. diff --git a/README.md b/README.md index 7118b98b7..c503b13d2 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ # The Music Encoding Initiative -| Branch | Continuous Integration Status | -| ------------- |:------------------------------:| -| Develop |![Deploy Schema and Guidelines](https://github.com/music-encoding/music-encoding/workflows/Deploy%20Schema%20and%20Guidelines/badge.svg?branch=develop) +[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.8319922.svg)](https://zenodo.org/doi/10.5281/zenodo.8319922) +[![GitHub release (with filter)](https://img.shields.io/github/v/release/music-encoding/music-encoding?label=latest%20release) +](https://github.com/music-encoding/music-encoding/releases/latest) +[![GitHub](https://img.shields.io/github/license/music-encoding/music-encoding)](LICENSE) +![Deploy Schema and Guidelines](https://github.com/music-encoding/music-encoding/workflows/Deploy%20Schema%20and%20Guidelines/badge.svg?branch=develop) The Music Encoding Initiative (MEI) is an open-source effort to define a system for encoding musical documents in a machine-readable structure. MEI brings together specialists from various music research communities, including technologists, librarians, historians, and theorists in a common effort to define best practices for representing a broad range of musical documents and structures. The results of these discussions are formalized in the MEI Source and customizations, a core set of rules for recording physical and intellectual characteristics of music notation documents expressed in TEI’s ODD language (One Document Does-it-all, cf. amongst others: Viglianti, 2019). As such, the MEI Source contains both, the specifications that can be compiled to [schema](https://music-encoding.org/schema/) formats for [validating](#validating-mei-files-against-an-mei-schema) XML files, and documentation in prose, the [MEI Guidelines](https://music-encoding.org/guidelines), which provide detailed explanations of the components of the MEI model and best practices suggestions. @@ -14,18 +16,17 @@ In this document, you will learn how to contribute to the development of MEI by This repository contains all the source code of the MEI Schema and Guidelines: - * [.github](.github): Configuration files for GitHub Actions workflows. - * [customizations](customizations): TEI ODD files that allow you to build customized MEI schemata. - * [source](source): Contains the source code, as expressed in TEI ODD. This includes the source code for the MEI Guidelines and the MEI schema modules. - * [submodules](submodules): A container for Git Submodules: third-party developments that are needed, e.g., for building this repository's contents, but which are not part of our codebase. - * [tests](tests): Unit tests for the MEI Schemata. - * [utils](utils): Helper scripts e.g. for compiling schemata and guidelines from this repository. +* [.github](.github): Configuration files for GitHub Actions workflows. +* [customizations](customizations): TEI ODD files that allow you to build customized MEI schemata. +* [source](source): Contains the source code, as expressed in TEI ODD. This includes the source code for the MEI Guidelines and the MEI schema modules. +* [submodules](submodules): A container for Git Submodules: third-party developments that are needed, e.g., for building this repository's contents, but which are not part of our codebase. +* [tests](tests): Unit tests for the MEI Schemata. +* [utils](utils): Helper scripts e.g. for compiling schemata and guidelines from this repository. -**!ATTENTION!** - -For the sake of the continuous integration (CI) workflow, the build artifacts of the schemata and guidelines are no longer included in this repository, but are generated on every commit to the develop branch and automatically pushed to their dedicated repositories. For more information please see the section [Additional Resources](#additional-resources) below. - -Nevertheless, it is possible to (build)[#building-mei] any customization locally in your working copy of this repository. +> [!IMPORTANT] +> For the sake of the continuous integration (CI) workflow, the build artifacts of the schemata and guidelines are no longer included in this repository, but are generated on every commit to the develop branch and automatically pushed to their dedicated repositories. For more information please see the section [Additional Resources](#additional-resources) below. +> +> Nevertheless, it is possible to [build](#building-mei) any customization locally in your working copy of this repository. ## Validating MEI files against an MEI Schema @@ -79,7 +80,7 @@ While it is possible to build the artifacts with other tools, the above are test * **command line:** If your build system meets the prerequisites as described in [Building MEI on the command line](BUILD_COMMANDLINE.md), you can build the artifacts natively. * **Docker:** MEI maintains a Docker image that meets all the prerequisites and can be used for building the artifacts via the command line. How to use the Docker image is described in the [README](https://github.com/music-encoding/docker-mei#readme) of the [docker-mei repository](https://github.com/music-encoding/docker-mei). -* **oXygen XML Editor:** When the command line is not your preferred tool and you do not want to build the Guidelines PDF, you might consider using alternative environments, such as Synchrosoft’s oXygen XML software family. A description of how to set up corresponding transformation scenarios can be found in [Building MEI with oXygen XML Editor](BUILD_OXYYGEN.md). +* **oXygen XML Editor:** When the command line is not your preferred tool and you do not want to build the Guidelines PDF, you might consider using alternative environments, such as Synchrosoft’s oXygen XML software family. A description of how to set up corresponding transformation scenarios can be found in [Building MEI with oXygen XML Editor](BUILD_OXYGEN.md). ## Additional Resources @@ -103,3 +104,24 @@ And moreover ## Referenced Material * Viglianti, R. (2019). One Document Does-it-all (ODD): A language for documentation, schema generation, and customization from the Text Encoding Initiative. Symposium on Markup Vocabulary Customization, Washington, DC. [https://doi.org/10.4242/BalisageVol24.Viglianti01](https://doi.org/10.4242/BalisageVol24.Viglianti01) + +## License + +Copyright 2017–2024 by the Music Encoding Initiative (MEI) Board (formerly known as "MEI Council") + +Licensed under the Educational Community License, Version 2.0 (the "License"); you may not use this file +except in compliance with the License. You may obtain a copy of the License at + +http://opensource.org/licenses/ECL-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations under +the License. + +This is a derivative work based on earlier versions of the schema © 2001–2006 Perry Roland +and the Rector and Visitors of the University of Virginia; licensed under the Educational +Community License version 1.0. + +CONTACT: info@music-encoding.org diff --git a/build.properties b/build.properties new file mode 100644 index 000000000..28074a7e3 --- /dev/null +++ b/build.properties @@ -0,0 +1,7 @@ +meiversion.latest=5.0 +meiversion.next=5.1 +saxon.edition.version=SaxonHE12-5 +saxon.version=12.5 +schematron.version=8.0.0 +stylesheets.version=7.57.1 +xerces.version=26.1.0.1 diff --git a/build.xml b/build.xml index d1ab03872..9e4841214 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,6 @@ + + + @@ -61,22 +64,32 @@ + + + + - + + - + + - - - - + + + + + + + - - - + + + + @@ -99,7 +112,7 @@ - + @@ -110,7 +123,7 @@ - + @@ -129,7 +142,7 @@ Local github.sha: ${github.sha.local} - + @@ -137,13 +150,18 @@ Local github.branch: ${github.branch.local} - - + + + + + + Ant version: ${ant.version} + Java version (JDK): ${ant.java.version} - - + + @@ -152,7 +170,7 @@ - + @@ -161,33 +179,48 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + initialized - - - - - - - - mei.classpath set - - - - + @@ -197,32 +230,85 @@ + downloaded saxon jar + + + + + + downloaded schematron jar + + + + + + + + + + + + + + + + + + + + + + downloaded tei stylesheets + downloaded xerces jars - + + + + + + + + + + mei.classpath set + + + canonicalizing source... - + canonicalized source available: ${canonicalize-source.done} - - - ${odd.basename} - + + validating source... + + + + + + + + canonicalized source validated: ${validate-source.done} + + + + + - + @@ -231,29 +317,28 @@ - - - ${odd.basename} + + - - - + + + true - - - building rng ${odd.basename} from ${customization.path} + + + building rng ${selectedSchema} from ${customization.path} source: ${canonicalized.source.path.cross_platform} - output: ${dir.dist.schemata}/${odd.basename}.rng - + output: ${dir.dist.schemata}/${selectedSchema}.rng + - + true @@ -261,12 +346,12 @@ - - + + - - + + github.sha: ${github.sha} github.sha.local: ${github.sha.local} @@ -281,7 +366,7 @@ - + @@ -314,7 +399,7 @@ - + @@ -354,7 +439,7 @@ - + @@ -375,7 +460,7 @@ - + @@ -396,9 +481,9 @@ - + - + source.default: ${source.default} source user input: ${source} @@ -408,11 +493,11 @@ Using source.file: ${source.file} - + - + old.default: ${old.default} old user input: ${old} @@ -452,7 +537,7 @@ Comparison done. See ${output.folder}/comparison.html for results. - + diff --git a/customizations/mei-CMN.xml b/customizations/mei-CMN.xml index 8ec5101f7..17cfdfefe 100644 --- a/customizations/mei-CMN.xml +++ b/customizations/mei-CMN.xml @@ -1,6 +1,6 @@ - @@ -105,12 +105,13 @@ - 5.0+CMN - - - - + + + + + + diff --git a/customizations/mei-Mensural.xml b/customizations/mei-Mensural.xml index 4d2636eb9..74029b7e2 100644 --- a/customizations/mei-Mensural.xml +++ b/customizations/mei-Mensural.xml @@ -1,6 +1,6 @@ - @@ -105,12 +105,13 @@ - 5.0+Mensural - - - - + + + + + + @@ -123,15 +124,15 @@ + + - - - +

This element provides an alternative to the dots attribute on + + - - diff --git a/customizations/mei-Neumes.xml b/customizations/mei-Neumes.xml index 08e4607f9..bde5ce730 100644 --- a/customizations/mei-Neumes.xml +++ b/customizations/mei-Neumes.xml @@ -1,6 +1,6 @@ - @@ -106,12 +106,13 @@ - 5.0+Neumes - - - - + + + + + + diff --git a/customizations/mei-all.xml b/customizations/mei-all.xml index f4da4db40..fc7542b14 100644 --- a/customizations/mei-all.xml +++ b/customizations/mei-all.xml @@ -1,6 +1,6 @@ - @@ -108,13 +108,13 @@ - 5.0 - - - - - + + + + + + diff --git a/customizations/mei-all_anyStart.xml b/customizations/mei-all_anyStart.xml index d1e4a4286..53d989c4f 100644 --- a/customizations/mei-all_anyStart.xml +++ b/customizations/mei-all_anyStart.xml @@ -1,6 +1,6 @@ - Require meiversion attribute on the root element. - - The root element must have the @meiversion attribute in order to indicate the MEI version of the snippet. + + The document root element must have the @meiversion attribute in order to indicate the MEI version in use. - If the root element is any other than mei, meiHead, meiCorpus, or music the value of @meiversion must be '5.0+anyStart'. + If the root element is any other than mei, meiHead, meiCorpus, or music the value of @meiversion must be '5.1+anyStart'. - 5.0+anyStart - - - - + + + + + + @@ -211,6 +221,19 @@ + + + + + + Only analog, class, label, mm, mm.dots, mm.unit, n, translit, type, xml:base, xml:id, + and xml:lang attributes are allowed when tempo is not the document root element or a descendant of a score or part. + + + + diff --git a/customizations/mei-basic.xml b/customizations/mei-basic.xml index fbe0203cb..b0d96f00b 100644 --- a/customizations/mei-basic.xml +++ b/customizations/mei-basic.xml @@ -1,6 +1,6 @@ @@ -319,7 +319,7 @@ - + @@ -347,7 +347,7 @@ - + @@ -396,7 +396,7 @@ - + - + @@ -695,7 +695,7 @@ - + @@ -857,16 +857,66 @@ Visual domain attributes. + - + + + Visual domain attributes for staffDef. + + + + + + + + + Captures the colors of the staff lines. + + + + +

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.

+

All values from data.COLOR are allowed.

+ + + + Records whether all staff lines are visible. + + + + + + + + Visual domain attributes. @@ -894,10 +944,9 @@ - - + @@ -928,12 +977,12 @@ - - + + - + @@ -992,10 +1041,12 @@ - - - - + + + + + + diff --git a/source/assets/images/modules/tablature/tab-anchorline-2.png b/source/assets/images/modules/tablature/tab-anchorline-2.png new file mode 100644 index 000000000..1ddfab299 Binary files /dev/null and b/source/assets/images/modules/tablature/tab-anchorline-2.png differ diff --git a/source/assets/images/modules/tablature/tab-anchorline.png b/source/assets/images/modules/tablature/tab-anchorline.png new file mode 100644 index 000000000..a769d3d94 Binary files /dev/null and b/source/assets/images/modules/tablature/tab-anchorline.png differ diff --git a/source/assets/images/modules/tablature/tab-bottom-aligned.png b/source/assets/images/modules/tablature/tab-bottom-aligned.png new file mode 100644 index 000000000..77da88580 Binary files /dev/null and b/source/assets/images/modules/tablature/tab-bottom-aligned.png differ diff --git a/source/assets/images/modules/tablature/tab-irregularly-aligned.png b/source/assets/images/modules/tablature/tab-irregularly-aligned.png new file mode 100644 index 000000000..f5581d381 Binary files /dev/null and b/source/assets/images/modules/tablature/tab-irregularly-aligned.png differ diff --git a/source/assets/images/modules/tablature/tab-top-aligned.png b/source/assets/images/modules/tablature/tab-top-aligned.png new file mode 100644 index 000000000..dc1a43bfd Binary files /dev/null and b/source/assets/images/modules/tablature/tab-top-aligned.png differ diff --git a/source/contributors/README.md b/source/contributors/README.md index 4a54bf428..aa160d82b 100644 --- a/source/contributors/README.md +++ b/source/contributors/README.md @@ -1,9 +1,9 @@ # Curated List of Contributors -The file _curated.contributors.json_ is used to provide additional information about contributors to the MEI Guidelines and Specification. When generating the PDF version of the Guidelines, a list of all contributors to the /music-encoding/music-encoding and /music-encoding/guidelines repositories is loaded from GitHub and compiled to a format similar to the one found in this document. It is then compared to and enriched with the information found here. The purpose of this file is to +The file _curated.contributors.json_ is used to provide additional information about contributors to the MEI Guidelines and Specification. When generating the PDF version of the Guidelines, a list of all contributors to the `/music-encoding/music-encoding` and `/music-encoding/guidelines` repositories is loaded from GitHub and compiled to a format similar to the one found in this document. It is then compared to and enriched with the information found here. The purpose of this file is to * give clear names of contributors where they're not available from GitHub -* provide additional information like ORCID IDs +* provide additional information like [ORCID IDs](https://orcid.org/) * suppress bot users -The supposed workflow is to make contributions to MEI as usual. If you're new to MEI and your information isn't contained in this file yet, you are invited to open a Pull Request with the details necessary for this file. If you would like some assistance with this, just reach out to the MEI Technical Co-Chairs. It is their responsibility to update this list before an upcoming MEI release. \ No newline at end of file +The supposed workflow is to make contributions to MEI as usual. If you're new to MEI and your information isn't contained in this file yet, you are invited to open a Pull Request with the details necessary for this file. If you would like some assistance with this, just reach out to the MEI Technical Co-Chairs. It is their responsibility to update this list before an upcoming MEI release. diff --git a/source/contributors/curated.contributors.json b/source/contributors/curated.contributors.json index 7126e1340..37e8f8ea4 100644 --- a/source/contributors/curated.contributors.json +++ b/source/contributors/curated.contributors.json @@ -13,7 +13,7 @@ "name": "Alastair Porter", "github": "https://github.com/alastair", "viaf": "", - "orcid": "", + "orcid": "https://orcid.org/0000-0001-8259-6028", "avatar": "https://avatars.githubusercontent.com/u/19217?v=4", "suppress":false }, @@ -170,6 +170,15 @@ "avatar": "https://avatars.githubusercontent.com/u/10829937?v=4", "suppress":false }, + { + "login": "janjusolja", + "name": "Olja Janjuš", + "github": "https://github.com/janjusolja", + "viaf": "http://viaf.org/viaf/24149233454276511312", + "orcid": "https://orcid.org/0009-0004-1498-495X", + "avatar": "https://avatars.githubusercontent.com/u/129741493?v=4", + "suppress":false + }, { "login": "jcdevaney", "name": "Johanna Devaney", @@ -206,6 +215,15 @@ "avatar": "https://avatars.githubusercontent.com/u/2078563?v=4", "suppress":false }, + { + "login": "krHERO", + "name": "Kristin Herold", + "github": "https://github.com/krHERO", + "viaf": "http://viaf.org/viaf/6170923988090150195", + "orcid": "https://orcid.org/0000-0003-2915-353X", + "avatar": "https://avatars.githubusercontent.com/u/5928917?v=4", + "suppress":false + }, { "login": "KristinaRichts", "name": "Kristina Richts-Matthaei", @@ -251,6 +269,15 @@ "avatar": "https://avatars.githubusercontent.com/u/13948831?v=4", "suppress":false }, + { + "login": "maxrothman ", + "name": "Max Rothman", + "github": "https://github.com/maxrothman", + "viaf": "", + "orcid": "", + "avatar": "https://avatars.githubusercontent.com/u/2607086?v=4", + "suppress":false + }, { "login": "mss2221", "name": "Mark Saccomano", diff --git a/source/docs/01-introduction.xml b/source/docs/01-introduction.xml index de41c1063..a5121c01b 100644 --- a/source/docs/01-introduction.xml +++ b/source/docs/01-introduction.xml @@ -1,6 +1,6 @@ +f \ No newline at end of file diff --git a/source/examples/harmony/harmony-sample261.txt b/source/examples/harmony/harmony-sample261.txt index 04df2eafc..8a3dd292d 100644 --- a/source/examples/harmony/harmony-sample261.txt +++ b/source/examples/harmony/harmony-sample261.txt @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/source/examples/harmony/harmony-sample262.txt b/source/examples/harmony/harmony-sample262.txt index 3ca836183..a9e8ef0e6 100644 --- a/source/examples/harmony/harmony-sample262.txt +++ b/source/examples/harmony/harmony-sample262.txt @@ -1,5 +1,5 @@ - - - + + + diff --git a/source/examples/header/header-sample088.txt b/source/examples/header/header-sample088.txt index 4dd8b43e4..36f0cc890 100644 --- a/source/examples/header/header-sample088.txt +++ b/source/examples/header/header-sample088.txt @@ -9,7 +9,7 @@
Unter den Linden 8 - 10117 + 10117 Berlin
diff --git a/source/examples/analysis/analysis-sample172.txt b/source/examples/linkalign/linkalign-example017.txt similarity index 100% rename from source/examples/analysis/analysis-sample172.txt rename to source/examples/linkalign/linkalign-example017.txt diff --git a/source/examples/analysis/analysis-sample173.txt b/source/examples/linkalign/linkalign-example018.txt similarity index 100% rename from source/examples/analysis/analysis-sample173.txt rename to source/examples/linkalign/linkalign-example018.txt diff --git a/source/examples/analysis/analysis-sample174.txt b/source/examples/linkalign/linkalign-example019.txt similarity index 100% rename from source/examples/analysis/analysis-sample174.txt rename to source/examples/linkalign/linkalign-example019.txt diff --git a/source/examples/analysis/analysis-sample176.txt b/source/examples/linkalign/linkalign-example020.txt similarity index 100% rename from source/examples/analysis/analysis-sample176.txt rename to source/examples/linkalign/linkalign-example020.txt diff --git a/source/examples/analysis/analysis-sample177.txt b/source/examples/linkalign/linkalign-example021.txt similarity index 100% rename from source/examples/analysis/analysis-sample177.txt rename to source/examples/linkalign/linkalign-example021.txt diff --git a/source/examples/analysis/analysis-sample178.txt b/source/examples/linkalign/linkalign-example022.txt similarity index 100% rename from source/examples/analysis/analysis-sample178.txt rename to source/examples/linkalign/linkalign-example022.txt diff --git a/source/examples/lyricsDesc/lyricsDesc-sample284.txt b/source/examples/lyricsDesc/lyricsDesc-sample284.txt new file mode 100644 index 000000000..9f3697768 --- /dev/null +++ b/source/examples/lyricsDesc/lyricsDesc-sample284.txt @@ -0,0 +1,66 @@ + + + + + + Es + + + + + + + + + + + war + + + + + ein + + + + + Kö + + + + + nig + + + + + in + + + + + + + + + + + + Thu + + + + + le, + + + + + + +
+ + Es ging ihm nichts dar ü ber, + + +
diff --git a/source/examples/lyricsDesc/vagabond.txt b/source/examples/lyricsDesc/vagabond.txt deleted file mode 100644 index f0af164c5..000000000 --- a/source/examples/lyricsDesc/vagabond.txt +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - -
- - Or let Autumn fall on me - Where afield I linger - -
diff --git a/source/examples/namesDates/namesDates-corpName1.txt b/source/examples/namesDates/namesDates-corpName1.txt new file mode 100644 index 000000000..407995f31 --- /dev/null +++ b/source/examples/namesDates/namesDates-corpName1.txt @@ -0,0 +1,3 @@ + + Library of Congress + \ No newline at end of file diff --git a/source/examples/namesDates/namesDates-corpName2.txt b/source/examples/namesDates/namesDates-corpName2.txt new file mode 100644 index 000000000..8f3f4b91e --- /dev/null +++ b/source/examples/namesDates/namesDates-corpName2.txt @@ -0,0 +1,7 @@ + + + +

First performance by The Boston Symphony Orchestra, October 22, 1881.

+ + + \ No newline at end of file diff --git a/source/examples/namesDates/namesDates-corpName3.txt b/source/examples/namesDates/namesDates-corpName3.txt new file mode 100644 index 000000000..733033635 --- /dev/null +++ b/source/examples/namesDates/namesDates-corpName3.txt @@ -0,0 +1,3 @@ +Federal Research Division, + Library of Congress + diff --git a/source/examples/namesDates/namesDates-geogName1.txt b/source/examples/namesDates/namesDates-geogName1.txt new file mode 100644 index 000000000..10b996f0d --- /dev/null +++ b/source/examples/namesDates/namesDates-geogName1.txt @@ -0,0 +1,3 @@ + + <geogName>Bohemia</geogName>: Folk Songs + diff --git a/source/examples/namesDates/namesDates-geogName2.txt b/source/examples/namesDates/namesDates-geogName2.txt new file mode 100644 index 000000000..98348924b --- /dev/null +++ b/source/examples/namesDates/namesDates-geogName2.txt @@ -0,0 +1,3 @@ +Music in the + <geogName>German Democratic Republic</geogName> + diff --git a/source/examples/namesDates/namesDates-geogName3.txt b/source/examples/namesDates/namesDates-geogName3.txt new file mode 100644 index 000000000..650d816ab --- /dev/null +++ b/source/examples/namesDates/namesDates-geogName3.txt @@ -0,0 +1,11 @@ +

+ + Baltimore, + Maryland + + + French Quarter, + New Orleans, + Louisiana + +

diff --git a/source/examples/namesDates/namesDates-geogName4.txt b/source/examples/namesDates/namesDates-geogName4.txt new file mode 100644 index 000000000..779e58656 --- /dev/null +++ b/source/examples/namesDates/namesDates-geogName4.txt @@ -0,0 +1,8 @@ +
+ 21 Jump Street + My Town + My Prefecture + My Province + My Country + A123B456C +
diff --git a/source/examples/namesDates/namesDates-geogName5.txt b/source/examples/namesDates/namesDates-geogName5.txt new file mode 100644 index 000000000..b13ea6de8 --- /dev/null +++ b/source/examples/namesDates/namesDates-geogName5.txt @@ -0,0 +1,7 @@ +Holmes and Watson live at + + 221Baker St. + in + London, + England. + diff --git a/source/examples/namesDates/namesDates-geogName6.txt b/source/examples/namesDates/namesDates-geogName6.txt new file mode 100644 index 000000000..49536f71c --- /dev/null +++ b/source/examples/namesDates/namesDates-geogName6.txt @@ -0,0 +1,14 @@ + + + Oh, the places I want to go + +
  • + London +
    • +
  • + France +
    • +
  • + Napa Valley +
    • +     diff --git a/source/examples/namesDates/namesDates-geogName7.txt b/source/examples/namesDates/namesDates-geogName7.txt new file mode 100644 index 000000000..3b6bb0334 --- /dev/null +++ b/source/examples/namesDates/namesDates-geogName7.txt @@ -0,0 +1,5 @@ + +Frankfurt + + +Frankfurt diff --git a/source/examples/namesDates/namesDates-geogName8.txt b/source/examples/namesDates/namesDates-geogName8.txt new file mode 100644 index 000000000..d5ba5cc16 --- /dev/null +++ b/source/examples/namesDates/namesDates-geogName8.txt @@ -0,0 +1,12 @@ +

    + German Research Foundation +

    + Kennedyallee 40 + 53175 + Bonn + + + Germany + +
    +

    diff --git a/source/examples/namesDates/namesDates-name_type.txt b/source/examples/namesDates/namesDates-name_type.txt new file mode 100644 index 000000000..dfe93a879 --- /dev/null +++ b/source/examples/namesDates/namesDates-name_type.txt @@ -0,0 +1,6 @@ +

    + Henry VIII, King of England + The Beatles + Orbach + OMR software +

    \ No newline at end of file diff --git a/source/examples/namesDates/namesDates-periodName1.txt b/source/examples/namesDates/namesDates-periodName1.txt new file mode 100644 index 000000000..53766952f --- /dev/null +++ b/source/examples/namesDates/namesDates-periodName1.txt @@ -0,0 +1 @@ +Baroque diff --git a/source/examples/namesDates/namesDates-periodName2.txt b/source/examples/namesDates/namesDates-periodName2.txt new file mode 100644 index 000000000..70ad33abe --- /dev/null +++ b/source/examples/namesDates/namesDates-periodName2.txt @@ -0,0 +1,4 @@ +Baroque ( + 1600- + 1750) + diff --git a/source/examples/namesDates/namesDates-periodName3.txt b/source/examples/namesDates/namesDates-periodName3.txt new file mode 100644 index 000000000..d0f9b5521 --- /dev/null +++ b/source/examples/namesDates/namesDates-periodName3.txt @@ -0,0 +1 @@ +Baroque diff --git a/source/examples/namesDates/namesDates-persName1.txt b/source/examples/namesDates/namesDates-persName1.txt new file mode 100644 index 000000000..6f93e5af0 --- /dev/null +++ b/source/examples/namesDates/namesDates-persName1.txt @@ -0,0 +1,10 @@ + + + + Im wunderschönen Monat Mai + + Robert Schumann + + + + diff --git a/source/examples/namesDates/namesDates-persName2.txt b/source/examples/namesDates/namesDates-persName2.txt new file mode 100644 index 000000000..7386bac8c --- /dev/null +++ b/source/examples/namesDates/namesDates-persName2.txt @@ -0,0 +1 @@ +Wolfgang Amadeus Mozart diff --git a/source/examples/namesDates/namesDates-persName3.txt b/source/examples/namesDates/namesDates-persName3.txt new file mode 100644 index 000000000..3f6d7e436 --- /dev/null +++ b/source/examples/namesDates/namesDates-persName3.txt @@ -0,0 +1 @@ +Heinrich Heine diff --git a/source/examples/namesDates/namesDates-persName4.txt b/source/examples/namesDates/namesDates-persName4.txt new file mode 100644 index 000000000..c7e865cd0 --- /dev/null +++ b/source/examples/namesDates/namesDates-persName4.txt @@ -0,0 +1,9 @@ + + Rob + The Bold + Stark + I + of + Winterfell + King in the North + diff --git a/source/examples/namesDates/namesDates-persName5.txt b/source/examples/namesDates/namesDates-persName5.txt new file mode 100644 index 000000000..236d5d820 --- /dev/null +++ b/source/examples/namesDates/namesDates-persName5.txt @@ -0,0 +1,4 @@ + + Mozart, + Johannes Chrysostomus Wolfgangus Theophilus + diff --git a/source/examples/namesDates/namesDates-persName6.txt b/source/examples/namesDates/namesDates-persName6.txt new file mode 100644 index 000000000..059c6ea02 --- /dev/null +++ b/source/examples/namesDates/namesDates-persName6.txt @@ -0,0 +1,7 @@ + + Mozart, + Johannes + Chrysostomus + Wolfgangus + Theophilus + diff --git a/source/examples/namesDates/namesDates-persName7.txt b/source/examples/namesDates/namesDates-persName7.txt new file mode 100644 index 000000000..a823f05c1 --- /dev/null +++ b/source/examples/namesDates/namesDates-persName7.txt @@ -0,0 +1 @@ +Wolfgang Amadeus Mozart diff --git a/source/examples/namesDates/namesDates-styleName1.txt b/source/examples/namesDates/namesDates-styleName1.txt new file mode 100644 index 000000000..3b9a5bc13 --- /dev/null +++ b/source/examples/namesDates/namesDates-styleName1.txt @@ -0,0 +1 @@ +bebop diff --git a/source/examples/namesDates/namesDates-styleName2.txt b/source/examples/namesDates/namesDates-styleName2.txt new file mode 100644 index 000000000..b65b27d4d --- /dev/null +++ b/source/examples/namesDates/namesDates-styleName2.txt @@ -0,0 +1,3 @@ +La voix du + <styleName>bebop</styleName> + diff --git a/source/examples/namesDates/namesDates-styleName3.txt b/source/examples/namesDates/namesDates-styleName3.txt new file mode 100644 index 000000000..1b300a3b0 --- /dev/null +++ b/source/examples/namesDates/namesDates-styleName3.txt @@ -0,0 +1,3 @@ +Modern + Jazz + diff --git a/source/examples/neumes/neumes-sample-6-04-04.txt b/source/examples/neumes/neumes-sample-6-04-04.txt index 23344a677..4fa508378 100644 --- a/source/examples/neumes/neumes-sample-6-04-04.txt +++ b/source/examples/neumes/neumes-sample-6-04-04.txt @@ -1,5 +1,5 @@ - + diff --git a/source/examples/neumes/neumes-sample169.txt b/source/examples/neumes/neumes-sample169.txt index 12e8fa613..96d92f5dd 100644 --- a/source/examples/neumes/neumes-sample169.txt +++ b/source/examples/neumes/neumes-sample169.txt @@ -1,4 +1,4 @@ - + diff --git a/source/examples/shared/shared-sample0000.txt b/source/examples/shared/shared-sample0000.txt index ff172f492..83bee9e2a 100644 --- a/source/examples/shared/shared-sample0000.txt +++ b/source/examples/shared/shared-sample0000.txt @@ -1,4 +1,4 @@ - + diff --git a/source/examples/shared/shared-sample0001.txt b/source/examples/shared/shared-sample0001.txt index 94814681a..2d2b64ec2 100644 --- a/source/examples/shared/shared-sample0001.txt +++ b/source/examples/shared/shared-sample0001.txt @@ -1,4 +1,4 @@ - + diff --git a/source/examples/shared/shared-sample0002.txt b/source/examples/shared/shared-sample0002.txt index 01ae36f74..86c79045e 100644 --- a/source/examples/shared/shared-sample0002.txt +++ b/source/examples/shared/shared-sample0002.txt @@ -1,3 +1,3 @@ - + diff --git a/source/examples/shared/shared-sample0003.txt b/source/examples/shared/shared-sample0003.txt index 432c7cdc6..eeabefb56 100644 --- a/source/examples/shared/shared-sample0003.txt +++ b/source/examples/shared/shared-sample0003.txt @@ -1,3 +1,3 @@ - + diff --git a/source/examples/svg/svg-example.xml b/source/examples/svg/svg-example.xml index 69bc580c6..9e33010d4 100644 --- a/source/examples/svg/svg-example.xml +++ b/source/examples/svg/svg-example.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/tablature/tablature-sample001.txt b/source/examples/tablature/tablature-sample001.txt new file mode 100644 index 000000000..1224b9b51 --- /dev/null +++ b/source/examples/tablature/tablature-sample001.txt @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample002.txt b/source/examples/tablature/tablature-sample002.txt new file mode 100644 index 000000000..e3e534550 --- /dev/null +++ b/source/examples/tablature/tablature-sample002.txt @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample003.txt b/source/examples/tablature/tablature-sample003.txt new file mode 100644 index 000000000..d7ef29308 --- /dev/null +++ b/source/examples/tablature/tablature-sample003.txt @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample004.txt b/source/examples/tablature/tablature-sample004.txt new file mode 100644 index 000000000..64d113ebc --- /dev/null +++ b/source/examples/tablature/tablature-sample004.txt @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/source/examples/tablature/tablature-sample005.txt b/source/examples/tablature/tablature-sample005.txt new file mode 100644 index 000000000..080de27ec --- /dev/null +++ b/source/examples/tablature/tablature-sample005.txt @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample006.txt b/source/examples/tablature/tablature-sample006.txt new file mode 100644 index 000000000..3dc2a178c --- /dev/null +++ b/source/examples/tablature/tablature-sample006.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample007.txt b/source/examples/tablature/tablature-sample007.txt new file mode 100644 index 000000000..1a854760a --- /dev/null +++ b/source/examples/tablature/tablature-sample007.txt @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample008.txt b/source/examples/tablature/tablature-sample008.txt new file mode 100644 index 000000000..8d5b3459b --- /dev/null +++ b/source/examples/tablature/tablature-sample008.txt @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/source/examples/tablature/tablature-sample009.txt b/source/examples/tablature/tablature-sample009.txt new file mode 100644 index 000000000..fc0b7ee92 --- /dev/null +++ b/source/examples/tablature/tablature-sample009.txt @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample010.txt b/source/examples/tablature/tablature-sample010.txt new file mode 100644 index 000000000..ed9cae088 --- /dev/null +++ b/source/examples/tablature/tablature-sample010.txt @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample011.txt b/source/examples/tablature/tablature-sample011.txt new file mode 100644 index 000000000..688d00da1 --- /dev/null +++ b/source/examples/tablature/tablature-sample011.txt @@ -0,0 +1,3 @@ + + ... + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample012.txt b/source/examples/tablature/tablature-sample012.txt new file mode 100644 index 000000000..7f8a30be2 --- /dev/null +++ b/source/examples/tablature/tablature-sample012.txt @@ -0,0 +1,40 @@ + + ... + +... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample013.txt b/source/examples/tablature/tablature-sample013.txt new file mode 100644 index 000000000..f865d37a0 --- /dev/null +++ b/source/examples/tablature/tablature-sample013.txt @@ -0,0 +1,44 @@ + + ... + +... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample014.txt b/source/examples/tablature/tablature-sample014.txt new file mode 100644 index 000000000..43bdf097d --- /dev/null +++ b/source/examples/tablature/tablature-sample014.txt @@ -0,0 +1,58 @@ + + ... + +... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample015.txt b/source/examples/tablature/tablature-sample015.txt new file mode 100644 index 000000000..716a90452 --- /dev/null +++ b/source/examples/tablature/tablature-sample015.txt @@ -0,0 +1,27 @@ + + ... + +... + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample016.txt b/source/examples/tablature/tablature-sample016.txt new file mode 100644 index 000000000..02f3d4e10 --- /dev/null +++ b/source/examples/tablature/tablature-sample016.txt @@ -0,0 +1,117 @@ + + ... + +... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample017.txt b/source/examples/tablature/tablature-sample017.txt new file mode 100644 index 000000000..0932e7e8f --- /dev/null +++ b/source/examples/tablature/tablature-sample017.txt @@ -0,0 +1,64 @@ + + + + + + ... + +... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/examples/tablature/tablature-sample353.txt b/source/examples/tablature/tablature-sample353.txt deleted file mode 100644 index 58fdf2db7..000000000 --- a/source/examples/tablature/tablature-sample353.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/source/examples/tablature/tablature-sample354.txt b/source/examples/tablature/tablature-sample354.txt deleted file mode 100644 index 760616167..000000000 --- a/source/examples/tablature/tablature-sample354.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/source/examples/tablature/tablature-sample355.txt b/source/examples/tablature/tablature-sample355.txt deleted file mode 100644 index f984d9e60..000000000 --- a/source/examples/tablature/tablature-sample355.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/source/examples/tablature/tablature-sample356.txt b/source/examples/tablature/tablature-sample356.txt deleted file mode 100644 index 0e1581406..000000000 --- a/source/examples/tablature/tablature-sample356.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/source/examples/tablature/tablature-sample357.txt b/source/examples/tablature/tablature-sample357.txt deleted file mode 100644 index e09e1b7bd..000000000 --- a/source/examples/tablature/tablature-sample357.txt +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/source/examples/verovio/04-score-redefinition.mei b/source/examples/verovio/04-score-redefinition.mei index 13e1bfb55..66b571bc6 100644 --- a/source/examples/verovio/04-score-redefinition.mei +++ b/source/examples/verovio/04-score-redefinition.mei @@ -1,6 +1,6 @@ - - - + + + @@ -12,7 +12,9 @@ Music Encoding Initiative (MEI) Board - +

    Educational Community License v2.0

         @@ -28,27 +30,27 @@ + -
    - + - + - + @@ -60,7 +62,7 @@ - + @@ -71,27 +73,30 @@ - + - - + + - + - + - + @@ -103,8 +108,8 @@
    -     +     diff --git a/source/examples/verovio/accid-03.mei b/source/examples/verovio/accid-03.mei index 0ec3308d2..d13ee1784 100644 --- a/source/examples/verovio/accid-03.mei +++ b/source/examples/verovio/accid-03.mei @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/verovio/alteration.mei b/source/examples/verovio/alteration.mei index 6fc35eafc..b88789a60 100644 --- a/source/examples/verovio/alteration.mei +++ b/source/examples/verovio/alteration.mei @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/verovio/ars_antiqua.mei b/source/examples/verovio/ars_antiqua.mei index fbdef68cc..79d590383 100644 --- a/source/examples/verovio/ars_antiqua.mei +++ b/source/examples/verovio/ars_antiqua.mei @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/verovio/att-corresp.mei b/source/examples/verovio/att-corresp.mei new file mode 100644 index 000000000..b540bcd37 --- /dev/null +++ b/source/examples/verovio/att-corresp.mei @@ -0,0 +1,65 @@ + + + + + + + Example of attribute corresp + + + 2024 + + Music Encoding Initiative (MEI) + + + +

    Educational Community License v2.0

    +     +     +     + + MEI guidelines examples + + + Usage of attribute corresp with editorial markup. + +     +     + + + + + + + + + + + +
    + + + + + + + + + + + + + + + sf + + + sf + + +
    +     +     + +     +     \ No newline at end of file diff --git a/source/examples/verovio/augmentation.mei b/source/examples/verovio/augmentation.mei index 1095a1b0b..16fa14e26 100644 --- a/source/examples/verovio/augmentation.mei +++ b/source/examples/verovio/augmentation.mei @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/verovio/editorial_example.mei b/source/examples/verovio/editorial_example.mei index 8e86cae45..7b60b1ac7 100644 --- a/source/examples/verovio/editorial_example.mei +++ b/source/examples/verovio/editorial_example.mei @@ -1,7 +1,7 @@ - - - + + + diff --git a/source/examples/verovio/imperfection.mei b/source/examples/verovio/imperfection.mei index 088ab0d32..a97d3f4cc 100644 --- a/source/examples/verovio/imperfection.mei +++ b/source/examples/verovio/imperfection.mei @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/verovio/implicit-mensuration.mei b/source/examples/verovio/implicit-mensuration.mei index 307f31f02..178d72662 100644 --- a/source/examples/verovio/implicit-mensuration.mei +++ b/source/examples/verovio/implicit-mensuration.mei @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/verovio/mensuration_changes.mei b/source/examples/verovio/mensuration_changes.mei index d35ffcf27..205af9c0c 100644 --- a/source/examples/verovio/mensuration_changes.mei +++ b/source/examples/verovio/mensuration_changes.mei @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/verovio/motet_fauvel_fol22r_triplum.mei b/source/examples/verovio/motet_fauvel_fol22r_triplum.mei index 0eac65881..0b4ca8a37 100644 --- a/source/examples/verovio/motet_fauvel_fol22r_triplum.mei +++ b/source/examples/verovio/motet_fauvel_fol22r_triplum.mei @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/verovio/notes_rests.mei b/source/examples/verovio/notes_rests.mei index 12f322782..0a09da439 100644 --- a/source/examples/verovio/notes_rests.mei +++ b/source/examples/verovio/notes_rests.mei @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/verovio/octave-shift-01.mei b/source/examples/verovio/octave-shift-01.mei index 40d9f4286..f7238d9a1 100644 --- a/source/examples/verovio/octave-shift-01.mei +++ b/source/examples/verovio/octave-shift-01.mei @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/verovio/partial-imp-01-propinquam.mei b/source/examples/verovio/partial-imp-01-propinquam.mei index e817f4db5..75d6a06e5 100644 --- a/source/examples/verovio/partial-imp-01-propinquam.mei +++ b/source/examples/verovio/partial-imp-01-propinquam.mei @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/verovio/partial-imp-02-bilateral.mei b/source/examples/verovio/partial-imp-02-bilateral.mei index 4c2f96c62..29fd52c45 100644 --- a/source/examples/verovio/partial-imp-02-bilateral.mei +++ b/source/examples/verovio/partial-imp-02-bilateral.mei @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/verovio/partial-imp-03-remotam.mei b/source/examples/verovio/partial-imp-03-remotam.mei index bd0c4a8b0..6996fa865 100644 --- a/source/examples/verovio/partial-imp-03-remotam.mei +++ b/source/examples/verovio/partial-imp-03-remotam.mei @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/verovio/partial-imp-04-remotam.mei b/source/examples/verovio/partial-imp-04-remotam.mei index a625dab75..b7e9a396e 100644 --- a/source/examples/verovio/partial-imp-04-remotam.mei +++ b/source/examples/verovio/partial-imp-04-remotam.mei @@ -1,6 +1,6 @@ - - - + + + diff --git a/source/examples/verovio/tchaikovsky_scherzo.mei b/source/examples/verovio/tchaikovsky_scherzo.mei new file mode 100644 index 000000000..084f4dc41 --- /dev/null +++ b/source/examples/verovio/tchaikovsky_scherzo.mei @@ -0,0 +1,274 @@ + + + + + + + Scherzo from Tchaikovsky's String Quartet No. 2 (excerpt) + + + 2024 + + Music Encoding Initiative (MEI) Board + + + +

    Educational Community License v2.0

    +     +     +     + + MEI guidelines examples + +     +     + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Allegro giusto + p + + + + p + p + p + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +     +     + +     +     \ No newline at end of file diff --git a/source/examples/verovio/tempo-01.mei b/source/examples/verovio/tempo-01.mei index ee43cef89..1bc0119fc 100644 --- a/source/examples/verovio/tempo-01.mei +++ b/source/examples/verovio/tempo-01.mei @@ -1,6 +1,6 @@ - - - + + + @@ -21,18 +21,9 @@ MEI guidelines examples - Verovio supports "tempo" elements. Horizontal positioning can be specified. - By default, tempi indications are placed above the staff. The "rend" element can - be used within the text, for example for specifying metronome values. + Example taken from the Verovio Test Suite - - - - Verovio - - - @@ -45,7 +36,7 @@
    - + @@ -54,10 +45,10 @@ - Andante con moto = 70 + Andante con moto = 70 - + diff --git a/source/mei-source.xml b/source/mei-source.xml index bb5b3397c..e371eedd4 100644 --- a/source/mei-source.xml +++ b/source/mei-source.xml @@ -1,6 +1,6 @@ - Analytical component declarations. @@ -100,6 +99,9 @@ Analytical domain attributes. + + Analytical domain attributes. + Analytical domain attributes. @@ -183,7 +185,7 @@ Attributes describing the harmonic function of a single pitch. - degree + degree Captures scale degree information using Humdrum **deg syntax -- 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 @@ -208,7 +210,7 @@ Attributes that describe harmonic intervals. - interval harmonic + interval harmonic Encodes the harmonic interval between pitches occurring at the same time. @@ -220,7 +222,7 @@ Attributes that provide for description of intervallic content. - interval melodic + interval melodic 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. @@ -430,7 +432,7 @@ Attributes that describe pitch class. - pitch class + pitch class Holds pitch class information. @@ -493,7 +495,7 @@ Attributes that specify pitch using sol-fa. - pitch sol-fa + pitch sol-fa Contains sol-fa designation, e.g., do, re, mi, etc., in either a fixed or movable Do system. @@ -541,6 +543,15 @@ Analytical domain attributes. + + Analytical domain attributes. + + + Analytical domain attributes. + + + + Analytical domain attributes. @@ -550,6 +561,9 @@ Analytical domain attributes. + + Analytical domain attributes. + Analytical domain attributes. diff --git a/source/modules/MEI.cmn.xml b/source/modules/MEI.cmn.xml index 277402903..047eedec6 100644 --- a/source/modules/MEI.cmn.xml +++ b/source/modules/MEI.cmn.xml @@ -1,6 +1,6 @@ - Common Music Notation (CMN) repertoire component declarations. @@ -74,6 +73,22 @@ + + Indicates the pedal setting for a harp strings. + + + + Flat. + + + Natural. + + + Sharp. + + + + Items in the CMN repertoire that may be printed near a staff. @@ -238,21 +253,21 @@ Captures whether a beam is "feathered" and in which direction. - accelerando + accelerando means that the secondary beams become progressively more distant toward the end of the beam. - mixed acc and rit + mixed acc and rit for beams that are "feathered" in both directions. - ritardando + ritardando indicates that the secondary beams get progressively closer together toward the end of the beam. - normal + normal indicates that the secondary beams are equidistant along the course of the beam. @@ -267,18 +282,15 @@ - Stem direction must be specified for all notes and chords under the + Stem directions should be specified for all notes and chords under the beam. - Opposing stem directions are required for a beam with @place="mixed". - + Opposing stem directions are required for a beam with @place="mixed". @@ -357,7 +369,7 @@ - function + function Describes the function of the bracketed event sequence. @@ -372,6 +384,9 @@ Represents a ligature in the mensural notation source material. + + Unspecified bracket. + @@ -478,7 +493,7 @@ Attributes that indicate whether an event participates in a glissando. - glissando + glissando Indicates that this element participates in a glissando. If visual information about the glissando needs to be recorded, then a gliss element should be employed instead. @@ -574,7 +589,7 @@ Logical domain attributes. - + @@ -587,108 +602,52 @@ Indicates the pedal setting for the harp’s C strings. + + + n - - - Flat. - - - Natural. - - - Sharp. - - Indicates the pedal setting for the harp’s D strings. + + + n - - - Flat. - - - Natural. - - - Sharp. - - Indicates the pedal setting for the harp’s E strings. + + + n - - - Flat. - - - Natural. - - - Sharp. - - Indicates the pedal setting for the harp’s F strings. + + + n - - - Flat. - - - Natural. - - - Sharp. - - Indicates the pedal setting for the harp’s G strings. + + + n - - - Flat. - - - Natural. - - - Sharp. - - Indicates the pedal setting for the harp’s A strings. + + + n - - - Flat. - - - Natural. - - - Sharp. - - Indicates the pedal setting for the harp’s B strings. + + + n - - - Flat. - - - Natural. - - - Sharp. - - @@ -753,7 +712,7 @@ Logical domain attributes. - function + function Function of the meter signature group. @@ -844,7 +803,7 @@ Attributes that record numbers to be displayed with a feature. - number + number Records a number or count accompanying a notational feature. @@ -857,7 +816,7 @@ tremolo or tuplet. - number placement + number placement States where the tuplet number will be placed in relation to the note heads. @@ -906,7 +865,7 @@ - direction + direction Records the position of the piano damper pedal. @@ -924,9 +883,9 @@ - function + function Indicates the function of the depressed pedal, but not necessarily the text associated - with its use. Use the dir element for such text. + with its use. Use the dir element for such text. @@ -1128,7 +1087,7 @@ - Attributes describing the form of a tremolo. + Attributes describing the form of a tremolo. Describes the style of the tremolo. @@ -1224,7 +1183,7 @@ - arpeggiation + arpeggiation Indicates that the notes of a chord are to be performed successively rather than simultaneously, usually from lowest to highest. Sometimes called a "roll". @@ -1237,7 +1196,7 @@ - +

    The modern arpeggiation symbol is a vertical wavy line preceding the chord. When the notes @@ -1259,10 +1218,10 @@ + + - - @@ -1337,7 +1296,7 @@ - beam span + beam span Alternative element for explicitly encoding beams, particularly those which extend across bar lines. @@ -1350,7 +1309,7 @@ - + @@ -1371,7 +1330,7 @@ - beat repeat + beat repeat An indication that material on a preceding beat should be repeated. @@ -1385,7 +1344,7 @@ - +

    beatRpt may also be used in guitar or rhythm parts to indicate where @@ -1407,7 +1366,7 @@ - + @@ -1459,7 +1418,7 @@ - breath mark + breath mark An indication of a point at which the performer on an instrument requiring breath (including the voice) may breathe. @@ -1472,7 +1431,7 @@ - + @@ -1496,7 +1455,7 @@ - bowed tremolo + bowed tremolo A rapid alternation on a single pitch or chord. @@ -1528,7 +1487,7 @@ - + @@ -1549,7 +1508,7 @@ - fingered tremolo + fingered tremolo A rapid alternation between a pair of notes (or chords or perhaps between a note and a chord) that are (usually) farther apart than a major second. @@ -1587,7 +1546,7 @@ - glissando + glissando A continuous or sliding movement from one pitch to another, usually indicated by a straight or wavy line. @@ -1630,7 +1589,7 @@ - grace group + grace group A container for a sequence of grace notes. @@ -1684,7 +1643,7 @@ - + @@ -1710,7 +1669,7 @@ - half-measure repeat + half-measure repeat A half-measure repeat in any meter. @@ -1722,11 +1681,11 @@ - + - harp pedal + harp pedal Harp pedal diagram. @@ -1738,7 +1697,7 @@ - + @@ -1755,7 +1714,7 @@ - laissez vibrer + laissez vibrer A "tie-like" indication that a note should ring beyond its written duration. @@ -1839,7 +1798,7 @@ - meter signature + meter signature Written meter signature. @@ -1851,11 +1810,11 @@ - + - meter signature group + meter signature group Used to capture alternating, interchanging, mixed or other non-standard meter signatures. @@ -1867,21 +1826,14 @@ - - - + + + + - - - - meterSigGrp must have at least 2 child - meterSig elements. - - - - measure number + measure number Designation, name, or label for a measure, often but not always consisting of digits. Use this element when the n attribute on measure does not adequately capture the appearance or placement of the measure @@ -1909,7 +1861,7 @@ - measure rest + measure rest Complete measure rest in any meter. @@ -1921,7 +1873,7 @@ - +

    Automatically-generated numbering of consecutive measures of rest may be controlled via the @@ -1930,7 +1882,7 @@ - measure repeat + measure repeat An indication that the previous measure should be repeated. @@ -1942,7 +1894,7 @@ - +

    The automated numbering of consecutive measures of rest may be controlled via the @@ -1951,7 +1903,7 @@ - 2-measure repeat + 2-measure repeat An indication that the previous two measures should be repeated. @@ -1964,11 +1916,11 @@ - + - measure space + measure space A measure containing only empty space in any meter. @@ -1980,7 +1932,7 @@ - +

    The automated numbering of consecutive measures of space may be controlled via the @@ -1989,9 +1941,9 @@ - multiple rest - Multiple measures of rest compressed into a single symbol, frequently - found in performer parts. + multimeasure rest + Multiple full measure rests compressed into a single bar, + frequently found in performer parts. @@ -2002,13 +1954,13 @@ - + - multiple repeat + multiple repeat Multiple repeated measures. @@ -2020,7 +1972,7 @@ - +

    In modern publishing practice, repeats of more than two measures should be written out @@ -2072,7 +2024,7 @@ - ossia layer + ossia layer A layer that contains an alternative to material in another layer. @@ -2158,7 +2110,7 @@ - ossia staff + ossia staff A staff that holds an alternative passage which may be played instead of the original material. @@ -2203,7 +2155,7 @@ - + @@ -2220,7 +2172,7 @@ - rehearsal mark + rehearsal mark In an orchestral score and its corresponding parts, a mark indicating a convenient point from which to resume rehearsal after a break. @@ -2249,7 +2201,7 @@ - repetition mark + repetition mark An instruction expressed as a combination of text and symbols – segno and coda – typically above, below, or between staves, but not on the staff. @@ -2438,7 +2390,7 @@ - tuplet span + tuplet span Alternative element for encoding tuplets, especially useful for tuplets that extend across bar lines. @@ -2451,7 +2403,7 @@ - + diff --git a/source/modules/MEI.cmnOrnaments.xml b/source/modules/MEI.cmnOrnaments.xml index ce1599a71..e2250a54e 100644 --- a/source/modules/MEI.cmnOrnaments.xml +++ b/source/modules/MEI.cmnOrnaments.xml @@ -1,6 +1,6 @@ - CMN ornament component declarations. @@ -97,7 +96,7 @@ Attributes for marking the presence of an ornament. - ornament + ornament 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. @@ -159,14 +158,14 @@ + + - - - + @@ -188,14 +187,14 @@ + + - - - + @@ -222,14 +221,14 @@ + + - - - + diff --git a/source/modules/MEI.corpus.xml b/source/modules/MEI.corpus.xml index b7f4d2db7..58becb71a 100644 --- a/source/modules/MEI.corpus.xml +++ b/source/modules/MEI.corpus.xml @@ -1,6 +1,6 @@ - Corpus component declarations. @@ -29,7 +28,7 @@ Groups elements that may be document elements when the corpus module is invoked. - MEI corpus + MEI corpus A group of related MEI documents, consisting of a header for the group, and one or more mei elements, each with its own complete header. diff --git a/source/modules/MEI.critapp.xml b/source/modules/MEI.critapp.xml index 739a04d33..e6e322e82 100644 --- a/source/modules/MEI.critapp.xml +++ b/source/modules/MEI.critapp.xml @@ -1,6 +1,6 @@ - Critical apparatus component declarations. @@ -64,7 +63,7 @@ - apparatus + apparatus Contains one or more alternative encodings. @@ -86,13 +85,11 @@ note, phrase, measure, etc.), its text-critical significance (e.g., significant, accidental, unclear), or the nature of the variation or the principles required to understand it (e.g., lectio difficilior, usus auctoris, etc.).

    -     -

    The model of this element is based on the app element of the Text Encoding Initiative (TEI).

         - lemma + lemma Contains the lemma, or base text, of a textual variation. @@ -138,13 +135,11 @@ permitted to occur within the parent of its own app ancestor. For example, when used as a descendent of verse, lem should only contain those elements allowed within verse.

    - -

    The model of this element is based on the lem element of the Text Encoding Initiative (TEI).

         - reading + reading Contains a single reading within a textual variation. @@ -183,14 +178,10 @@ is allowed so that a reading may have its own meta-data without incurring the overhead of child section elements. The app sub-element is permitted in order to allow nested sub-variants.

    - -

    In no case should rdg contain elements that would not otherwise be permitted to occur within the parent of its own app ancestor. For example, when used as a descendent of verse, rdg should only contain those elements allowed within verse.

    -     -

    The model of this element is based on the rdg element of the Text Encoding Initiative (TEI).

         diff --git a/source/modules/MEI.drama.xml b/source/modules/MEI.drama.xml index 603551235..fdc75954d 100644 --- a/source/modules/MEI.drama.xml +++ b/source/modules/MEI.drama.xml @@ -1,6 +1,6 @@ - Dramatic text component declarations. @@ -49,7 +48,7 @@ - speech + speech Contains an individual speech in a performance text. @@ -125,13 +124,11 @@

    In a musical context sp must have a start-type attribute when it's not a descendant of sp. In a textual content sp must NOT have any musical attributes.

    - -

    The model of this element is based on the sp element of the Text Encoding Initiative (TEI).

         - stage direction + stage direction Contains any kind of stage direction within a dramatic text or fragment. @@ -179,8 +176,6 @@

    In a musical context stageDir must have a start-type attribute when it’s not a descendant of sp. In a textual content stageDir must NOT have any musical attributes.

    - -

    The model of this element is based on the stage element of the Text Encoding Initiative (TEI).

         diff --git a/source/modules/MEI.edittrans.xml b/source/modules/MEI.edittrans.xml index 0616d008f..4055c48f9 100644 --- a/source/modules/MEI.edittrans.xml +++ b/source/modules/MEI.edittrans.xml @@ -1,6 +1,6 @@ - Editorial and transcriptional component declarations. @@ -125,7 +124,7 @@ - abbreviation + abbreviation A generic element for 1) a shortened form of a word, including an acronym or 2) a shorthand notation. @@ -170,14 +169,12 @@ example, when used as a descendent of verse, abbr should only contain those elements allowed within verse.

    - -

    The model of this element is based on the abbr element of the Text Encoding Initiative (TEI) and the abbr element of the Encoded Archival Description (EAD).

         - addition + addition Marks an addition to the text. @@ -207,7 +204,7 @@ - + Location of the addition. @@ -227,8 +224,6 @@ permitted to occur within the parent of its own app ancestor. For example, when used as a descendent of verse, add should only contain those elements allowed within verse.

    - -

    The model of this element is based on the add element of the Text Encoding Initiative (TEI).

         @@ -251,13 +246,11 @@ However, there may be cases where a full representation of a text requires the alternative encodings to be considered as parallel. Note also that choice elements may be recursively nested.

    - -

    The model of this element is based on the choice element of the Text Encoding Initiative (TEI).

     - correction + correction Contains the correct form of an apparent erroneous passage. @@ -301,13 +294,11 @@ example, when used as a descendent of verse, corr should only contain those elements allowed within verse.

    - -

    The model of this element is based on the corr element of the Text Encoding Initiative (TEI).

         - copy/colla parte mark + copy/colla parte mark A verbal or graphical indication to copy musical material written elsewhere. @@ -420,13 +411,11 @@ example, when used as a descendent of verse, damage should only contain those elements allowed within verse.

    - -

    The model of this element is based on the damage element of the Text Encoding Initiative (TEI).

         - deletion + deletion Contains information deleted, marked as deleted, or otherwise indicated as superfluous or spurious in the copy text by an author, scribe, annotator, or corrector. @@ -471,13 +460,11 @@ permitted to occur within the parent of its own app ancestor. For example, when used as a descendent of verse, del should only contain those elements allowed within verse.

    - -

    The model of this element is based on the del element of the Text Encoding Initiative (TEI).

         - expansion + expansion Contains the expansion of an abbreviation. @@ -510,7 +497,7 @@ - abbreviation + abbreviation Captures the abbreviated form of the text. @@ -523,8 +510,6 @@ example, when used as a descendent of verse, expan should only contain those elements allowed within verse.

    - -

    The model of this element is based on the expan element of the Text Encoding Initiative (TEI) and the expan element of the Encoded Archival Description (EAD).

     @@ -541,7 +526,7 @@     - +

    When material is omitted because it is illegible or inaudible, cert attribute signifies the degree of certainty ascribed to the identification of the extent of the missing material.

    -     -

    The model of this element is based on the gap element of the Text Encoding Initiative (TEI).

         @@ -575,7 +558,7 @@ - + @@ -633,8 +616,6 @@ editor or transcriber responsible for identifying the change of hand. The cert attribute signifies the degree of certainty ascribed to the identification of the new hand.

    - -

    The model of this element is based on the handShift element of the Text Encoding Initiative (TEI).

     @@ -673,7 +654,7 @@ - + Describes the purpose of the metaMark. @@ -720,7 +701,7 @@ - original + original Contains material which is marked as following the original, rather than being normalized or corrected. @@ -764,13 +745,11 @@ example, when used as a descendent of verse, orig should only contain those elements allowed within verse.

    - -

    The model of this element is based on the orig element of the Text Encoding Initiative (TEI).

         - regularization + regularization Contains material which has been regularized or normalized in some sense. @@ -814,8 +793,6 @@ permitted to occur within the parent of its own app ancestor. For example, when used as a descendent of verse, reg should only contain those elements allowed within verse.

    - -

    The model of this element is based on the reg element of the Text Encoding Initiative (TEI).

         @@ -854,7 +831,7 @@ - description + description Provides a description of the means of restoration, stet or strike-down, for example. @@ -868,8 +845,6 @@ example, when used as a descendent of verse, restore should only contain those elements allowed within verse.

    - -

    The model of this element is based on the restore element of the Text Encoding Initiative (TEI).

     @@ -912,13 +887,11 @@ permitted to occur within the parent of its own app ancestor. For example, when used as a descendent of verse, sic should only contain those elements allowed within verse.

    - -

    The model of this element is based on the sic element of the Text Encoding Initiative (TEI).

     - substitution + substitution Groups transcriptional elements when the combination is to be regarded as a single intervention in the text. @@ -987,8 +960,6 @@ example, when used as a descendent of verse, supplied should only contain those elements allowed within verse.

    - -

    The model of this element is based on the supplied element of the Text Encoding Initiative (TEI).

         @@ -1044,8 +1015,6 @@ example, when used as a descendent of verse, unclear should only contain those elements allowed within verse.

    - -

    The model of this element is based on the unclear element of the Text Encoding Initiative (TEI).

     diff --git a/source/modules/MEI.externalsymbols.xml b/source/modules/MEI.externalsymbols.xml index 6dcd7c75b..b2183f907 100644 --- a/source/modules/MEI.externalsymbols.xml +++ b/source/modules/MEI.externalsymbols.xml @@ -1,6 +1,6 @@ - External symbols component declarations. diff --git a/source/modules/MEI.facsimile.xml b/source/modules/MEI.facsimile.xml index abecee027..eb8728e3a 100644 --- a/source/modules/MEI.facsimile.xml +++ b/source/modules/MEI.facsimile.xml @@ -1,6 +1,6 @@ - Facsimile component declarations. @@ -29,8 +28,8 @@ Attributes that associate a feature corresponding with all or part of an image. - facsimile - Points to one or more images, portions of an image, or surfaces which correspond to the current element. + facsimile + Points to one or more images, portions of an image, or surfaces which correspond to the current element. @@ -73,8 +72,6 @@ element for each page.

    The decls attribute may be used to link the collection of images with a particular source described in the header.

    - -

    The model of this element is based on the facsimile element of the Text Encoding Initiative (TEI).

     @@ -105,8 +102,6 @@ model.

    The startid attribute may be used to hold a reference to the first feature occurring on this surface.

    - -

    The model of this element is based on the surface element of the Text Encoding Initiative (TEI).

     diff --git a/source/modules/MEI.figtable.xml b/source/modules/MEI.figtable.xml index 513b02025..487d2069b 100644 --- a/source/modules/MEI.figtable.xml +++ b/source/modules/MEI.figtable.xml @@ -1,6 +1,6 @@ - Figures and tables component declarations. @@ -65,7 +64,7 @@ - figure + figure Groups elements representing or containing graphic information such as an illustration or figure. @@ -91,7 +90,7 @@ - figure description + figure description Contains a brief prose description of the appearance or content of a graphic figure, for use when documenting an image without displaying it. @@ -118,8 +117,6 @@

    Best practice suggests the use of controlled vocabulary for figure descriptions. Don't 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.

    - -

    The model of this element is based on the figDesc element of the Text Encoding Initiative (TEI).

         @@ -190,7 +187,7 @@ - table data + table data Designates a table cell that contains data as opposed to a cell that contains column or row heading information. @@ -214,13 +211,11 @@

    The colspan and rowspan attributes record tabular display rendering information.

    -     -

    The model of this element is based on the td element of HTML.

         - table header + table header Designates a table cell containing column or row heading information as opposed to one containing data. @@ -244,13 +239,11 @@

    The colspan and rowspan attributes record tabular display rendering information.

    -     -

    The model of this element is based on the th element of HTML.

         - table row + table row A formatting element that contains one or more cells (intersection of a row and a column) in a table. @@ -269,8 +262,6 @@

    More precise rendition of the table and its cells can be specified in a style sheet.

    -     -

    The model of this element is based on the tr element of HTML.

         diff --git a/source/modules/MEI.fingering.xml b/source/modules/MEI.fingering.xml index c6244889d..8bb68b128 100644 --- a/source/modules/MEI.fingering.xml +++ b/source/modules/MEI.fingering.xml @@ -1,6 +1,6 @@ - Fingering component declarations. @@ -66,7 +65,7 @@ - finger + finger An individual finger in a fingering indication. @@ -106,7 +105,7 @@ - finger group + finger group A group of individual fingers in a fingering indication. diff --git a/source/modules/MEI.frbr.xml b/source/modules/MEI.frbr.xml index 076c8c5b3..e4d4e2564 100644 --- a/source/modules/MEI.frbr.xml +++ b/source/modules/MEI.frbr.xml @@ -1,6 +1,6 @@ - FRBR (Functional Requirements for Bibliographic Records) declarations. @@ -400,7 +399,7 @@ - + Indicates the manifestation is a unique physical object. diff --git a/source/modules/MEI.genetic.xml b/source/modules/MEI.genetic.xml index 052a79976..7270d0c69 100644 --- a/source/modules/MEI.genetic.xml +++ b/source/modules/MEI.genetic.xml @@ -1,6 +1,6 @@ - Genetic encoding component declarations. @@ -40,7 +39,7 @@ - + The @instant attribute is syntactic sugar for classifying a scribal intervention as an ad-hoc modification; that is, one which does not interrupt the writing process. @@ -50,7 +49,7 @@ - + Points to the genetic state that results from this modification. @@ -59,7 +58,7 @@ - genetic description + genetic description Bundles information about the textual development of a work. @@ -76,7 +75,7 @@ - + When set to "true" the child elements are known to be in chronological order. When set to "false" or when not provided, the order of child elements is unknown. diff --git a/source/modules/MEI.gestural.xml b/source/modules/MEI.gestural.xml index 74e89a533..0fdb8fc84 100644 --- a/source/modules/MEI.gestural.xml +++ b/source/modules/MEI.gestural.xml @@ -1,6 +1,6 @@ - Gestural component declarations. @@ -96,7 +95,7 @@ Attributes whether an element is performed "attacca". - + Indicates that the performance of the next musical division should begin immediately following this one. @@ -186,6 +185,9 @@ Gestural domain attributes. + + Gestural domain attributes. + Gestural domain attributes. @@ -609,7 +611,7 @@ - pitch number + pitch number Holds a pitch-to-number mapping, a base-40 or MIDI note number, for example. @@ -763,6 +765,16 @@ Gestural domain attributes. + + Gestural domain attributes. + + + Gestural domain attributes. + + + + + Gestural domain attributes. @@ -819,6 +831,9 @@ + + Gestural domain attributes. + Gestural domain attributes. diff --git a/source/modules/MEI.harmony.xml b/source/modules/MEI.harmony.xml index 1b7f5834b..f1310d5ab 100644 --- a/source/modules/MEI.harmony.xml +++ b/source/modules/MEI.harmony.xml @@ -1,6 +1,6 @@ - Harmony component declarations. @@ -58,7 +57,7 @@ - chord reference + chord reference Contains a reference to a chordDef element elsewhere in the document. @@ -102,7 +101,7 @@ - chord definition + chord definition Chord tablature definition. @@ -138,14 +137,14 @@ - +

    The string, fret, and fing attributes are provided in order to create displayable chord tablature grids. The inth (harmonic interval) attribute may be used to facilitate automated performance of a chord. It gives the number of - 1/2 steps above the bass. Of course, for the bass note itself, inth should be set - to 0.

    + diatonic steps above the bass. Of course, for the bass note itself, inth should be set + to P1.

         @@ -165,7 +164,7 @@ - figure + figure Single element of a figured bass indication. @@ -188,7 +187,7 @@ - figured bass + figured bass Symbols added to a bass line that indicate harmony. Used to improvise a chordal accompaniment. Sometimes called Generalbass, thoroughbass, or basso continuo. @@ -207,16 +206,16 @@ - harmony + harmony An indication of harmony, e.g., chord names, tablature grids, harmonic analysis, figured bass. + + - - diff --git a/source/modules/MEI.header.xml b/source/modules/MEI.header.xml index b4b550ed7..61c657266 100644 --- a/source/modules/MEI.header.xml +++ b/source/modules/MEI.header.xml @@ -1,6 +1,6 @@ - + Metadata header component declarations. @@ -189,7 +188,7 @@ Attributes that define the characteristics and components of the bibliographic description. - + Language material. @@ -365,7 +364,7 @@ Collects work-like elements. - access restriction + access restriction Describes the conditions that affect the accessibility of material. @@ -383,8 +382,6 @@ element with useRestrict (usage restrictions), which captures information about limitations on the use of material, such as those afforded by copyright.

    - -

    The model of this element is based on the accessrestrict element of the Encoded Archival Description (EAD).

         @@ -423,7 +420,7 @@     - alternative identifier + alternative identifier 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. @@ -446,7 +443,7 @@ - application information + application information Groups information about applications which have acted upon the MEI file. @@ -562,8 +559,6 @@

    When used within the fileDesc element, availability indicates access to the MEI-encoded document itself.

    -     -

    The model of this element is based on the availability element of the Text Encoding Initiative (TEI).

         @@ -612,7 +607,7 @@     - capture mode + capture mode The means used to record notation, sound, or images in the production of a source/manifestation (e.g., analogue, acoustic, electric, digital, optical etc.). @@ -627,7 +622,7 @@ - carrier form + carrier form The specific class of material to which the physical carrier of the source/manifestation belongs (e.g., sound cassette, videodisc, microfilm cartridge, transparency, etc.). The carrier for a manifestation comprising multiple physical components @@ -680,8 +675,9 @@ - category relationship - Contains the name of a related category. + category relationship + Contains the name, i.e., label, of a related + category. @@ -758,13 +754,11 @@ person/entity responsible for change. The edition element can be used to designate an MEI encoding that has been so substantively changed that it constitutes a new version that supersedes earlier versions.

    - -

    The model of this element is based on the respective element of the Encoded Archival Description (EAD).

         - change description + change description Description of a revision of the MEI file. @@ -1107,8 +1101,6 @@ remaining upper half. If, in contrast, only the lower right quarter of the page has been cut, these attributes still indicate the size of the full page (assuming that the removed section was a regular rectangle).

    - -

    The dimensions (@width, @height) on cutout itself are only to be used when there is a "gap" in the manuscript that allows to specify the dimensions of that missing part. In this case, the bounding box dimensions are given, together with @x and @y @@ -1152,7 +1144,7 @@ - domains declaration + domains declaration Indicates which domains are included in the encoding. @@ -1177,7 +1169,7 @@ - edition statement + edition statement Container for meta-data pertaining to a particular edition of the material being described. @@ -1205,7 +1197,7 @@ - editorial declaration + editorial declaration Used to provide details of editorial principles and practices applied during the encoding of musical text. @@ -1238,7 +1230,7 @@ - encoding description + encoding description 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. @@ -1278,7 +1270,7 @@ - exhibition history + exhibition history A record of public exhibitions, including dates, venues, etc. @@ -1313,7 +1305,7 @@ - extended metadata + extended metadata Provides a container element for non-MEI metadata formats. @@ -1332,7 +1324,7 @@ - file characteristics + file characteristics Standards or schemes used to encode the file (e.g., ASCII, SGML, etc.), physical characteristics of the file (e.g., recording density, parity, blocking, etc.), and other characteristics that have a bearing on how the file can be processed. @@ -1347,7 +1339,7 @@ - file description + file description Contains a full bibliographic description of the MEI file. @@ -1374,8 +1366,6 @@

    Extent in this context represents file size.

    -     -

    The model of this element is based on the fileDesc element of the Text Encoding Initiative (TEI) and the filedesc element of the Encoded Archival Description (EAD).

     @@ -1454,7 +1444,7 @@     -

    The initial attribute indicates whether this is the first or main hand of the +

    The initial attribute indicates whether this is the first hand of the document. The medium attribute describes the writing medium, e.g., pencil, or the tint or type of ink, e.g., brown. The resp attribute contains an ID reference to an element containing the name of @@ -1462,8 +1452,6 @@ hand, particularly those related to the quality of the writing, such as shaky, thick, etc. may be described within the content of the hand element.

    -     -

    The model of this element is based on the handNote element of the Text Encoding Initiative (TEI).

         @@ -1672,14 +1660,12 @@ ISO639-2b, to the same value as this element’s codedval attribute. The name and web location of the authorizing list may be encoded in the auth attribute and the auth.uri attribute, respectively.

    - -

    The model of this element is based on the language element of the Text Encoding Initiative (TEI) and the language element of the Encoded Archival Description (EAD).

     - language usage + language usage Groups elements describing the languages, sub-languages, dialects, etc., represented within the encoded resource. @@ -1700,7 +1686,7 @@ - MEI header + MEI header Supplies the descriptive and declarative metadata prefixed to every MEI-conformant text. @@ -1876,7 +1862,7 @@ - notes statement + notes statement Collects any notes providing information about a text additional to that recorded in other parts of the bibliographic description. @@ -1896,7 +1882,7 @@ - other distinguishing characteristic + other distinguishing characteristic Any characteristic that serves to differentiate a work or expression from another. @@ -1998,7 +1984,7 @@ --> - performance duration + performance duration Used to express the duration of performance of printed or manuscript music or the playing time for a sound recording, videorecording, etc. @@ -2026,7 +2012,7 @@ - performance medium + performance medium Indicates the number and character of the performing forces used in a musical composition. @@ -2055,7 +2041,7 @@ - performance resource + performance resource Name of an instrument on which a performer plays, a performer's voice range, or a standard performing ensemble designation. @@ -2077,13 +2063,11 @@

    In the context of a performance resource the attribute adlib marks a resource as optional.

    -     -

    To indicate the tuning of an instrument, the attribute trans.diat can be used.

         - performance resources list + performance resources list Several instrumental or vocal resources treated as a group. @@ -2112,7 +2096,7 @@ - physical description + physical description Container for information about the appearance, construction, or handling of physical materials, such as their dimension, quantity, color, style, and technique of creation. @@ -2135,13 +2119,11 @@

    Dedicatory text and title page features may also be encoded here when they are not transcribed as part of the front or back matter; i.e., when they are considered to be meta-data rather than a transcription.

    - -

    The model of this element is based on the physdesc element of the Encoded Archival Description (EAD).

         - physical medium + physical medium Records the physical materials used in the source, such as ink and paper. @@ -2157,14 +2139,12 @@

    All materials may be described in a single physMedium element or multiple elements may be used, one for each medium.

    -     -

    The model of this element is based on respective elements of the Encoded Archival Description (EAD). It has the same function as the material element of the Text Encoding Initiative (TEI).

         - plate number + plate number 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. @@ -2239,7 +2219,7 @@ - project description + project description Project-level meta-data describing the aim or purpose for which the electronic file was encoded, funding agencies, etc. together with any other relevant information concerning the process by which it was assembled or collected. @@ -2297,7 +2277,7 @@ - publication statement + publication statement 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. @@ -2320,13 +2300,11 @@

    When an item is unpublished, use only the unpub sub-element.

    -     -

    The model of this element is based on the publicationStmt element of the Text Encoding Initiative (TEI).

         - revision description + revision description Container for information about alterations that have been made to an MEI file. @@ -2344,13 +2322,11 @@

    It is recommended that changes be recorded in reverse chronological order, with the most recent alteration first.

    -     -

    The model of this element is based on the revisionDesc element of the Text Encoding Initiative (TEI).

         - sampling declaration + sampling declaration Contains a prose description of the rationale and methods used in sampling texts in the creation of a corpus or collection. @@ -2409,7 +2385,7 @@ - series statement + series statement Groups information about the series, if any, to which a publication belongs. @@ -2445,13 +2421,11 @@ >contents element should be used when it is necessary to enumerate the content of the series, but not describe each component. The seriesStmt element is provided within seriesStmt for the description of a sub-series.

    - -

    The model of this element is based on the seriesStmt element of the Text Encoding Initiative (TEI).

         - sound channels + sound channels Reflects the number of apparent sound channels in the playback of a recording (monaural, stereophonic, quadraphonic, etc.). @@ -2534,14 +2508,12 @@ element.

    The data attribute may be used to reference one or more musical features found in the content of this particular source.

    - -

    The model of this element is based on the source element of the Text Encoding Initiative (TEI) and the source element of the Encoded Archival Description (EAD).

         - source description + source description A container for the descriptions of the source(s) used in the creation of the electronic file. @@ -2561,7 +2533,7 @@ - special reproduction characteristic + special reproduction characteristic The equalization system, noise reduction system, etc. used in making the recording (e.g., NAB, DBX, Dolby, etc.). @@ -2576,7 +2548,7 @@ - standard values + standard values Specifies the format used when standardized date or number values are supplied. @@ -2599,7 +2571,7 @@ - system requirements + system requirements System requirements for using the electronic item. @@ -2612,7 +2584,7 @@ - tagging declaration + tagging declaration Provides detailed information about the tagging applied to a document. @@ -2744,7 +2716,7 @@ - title statement + title statement Container for title and responsibility meta-data. @@ -2768,7 +2740,7 @@ - track configuration + track configuration Number of physical/input tracks on a sound medium (e.g., eight track, twelve track). @@ -2799,7 +2771,7 @@ - treatment history + treatment history A record of the treatment the item has undergone (e.g., de-acidification, restoration, etc.). @@ -2832,13 +2804,11 @@

    Treatment history may also comprise details of the treatment process (e.g., chemical solutions used, techniques applied, etc.), the date the treatment was applied, etc.

    -     -

    The model of this element is based on the respective element of the Encoded Archival Description (EAD).

         - treatment scheduled + treatment scheduled Scheduled treatment, e.g., de-acidification, restoration, etc., for an item. @@ -2873,7 +2843,7 @@ - unpublished + unpublished Used to explicitly indicate that a bibliographic resource is unpublished. @@ -2891,7 +2861,7 @@ - usage restrictions + usage restrictions Container for information about the conditions that affect use of a bibliographic item after access has been granted. @@ -2911,8 +2881,6 @@ such as when rights have been ceded to the public domain. Do not confuse this element with the accessRestrict element, which holds information about conditions affecting the availability of the material.

    - -

    The model of this element is based on the userestrict element of the Encoded Archival Description (EAD).

         @@ -2932,8 +2900,6 @@

    The facs attribute may be used to record the location of the watermark in a facsimile image.

    -     -

    The model of this element is based on the watermark element of the Text Encoding Initiative (TEI).

     @@ -3021,7 +2987,7 @@ - work list + work list Grouping mechanism for information describing non-bibliographic aspects of a text. diff --git a/source/modules/MEI.lyrics.xml b/source/modules/MEI.lyrics.xml index 3112b3865..24b2268a2 100644 --- a/source/modules/MEI.lyrics.xml +++ b/source/modules/MEI.lyrics.xml @@ -1,6 +1,6 @@ - Lyrics component declarations. @@ -88,9 +87,7 @@ -

    The lb element is allowed here in order to facilitate karaoke - applications. The func attribute on lb may be used to - distinguish true line endings from those of line groups for these applications.

    +

    The lb element is allowed here in order to facilitate karaoke applications.

         diff --git a/source/modules/MEI.mensural.xml b/source/modules/MEI.mensural.xml index a8e0b552f..bdb7a5272 100644 --- a/source/modules/MEI.mensural.xml +++ b/source/modules/MEI.mensural.xml @@ -1,6 +1,6 @@ - Mensural repertoire component declarations. @@ -441,7 +440,7 @@ - mensuration + mensuration Collects information about the metrical relationship between a note value and the next smaller value; that is, either triple or duple. @@ -455,7 +454,7 @@ - +

    The mensur element is provided for the encoding of mensural notation. @@ -482,7 +481,7 @@ - proportion + proportion Description of note duration as arithmetic ratio. @@ -495,7 +494,7 @@ - +

    The proport element is provided for the encoding of mensural notation. It allows the @@ -515,7 +514,7 @@ - + diff --git a/source/modules/MEI.midi.xml b/source/modules/MEI.midi.xml index eb29eddf6..c9d520ec6 100644 --- a/source/modules/MEI.midi.xml +++ b/source/modules/MEI.midi.xml @@ -1,6 +1,6 @@ - MIDI component declarations. @@ -119,8 +118,7 @@ - Captures the General MIDI instrument number. Use an integer for a 0-based value. An - integer preceded by "in" indicates a 1-based value. + Captures the General MIDI instrument number. Use an integer for a 0-based value. @@ -163,7 +161,7 @@ Attributes that record MIDI numbers. - number + number MIDI number in the range set by data.MIDIVALUE. @@ -248,7 +246,7 @@ - control change + control change MIDI parameter/control change. @@ -257,7 +255,7 @@ - +

    The num attribute specifies a MIDI parameter number, while val @@ -265,14 +263,14 @@ - channel + channel MIDI channel assignment. - + @@ -284,7 +282,7 @@ - channel pressure + channel pressure MIDI channel pressure/after touch. @@ -292,7 +290,7 @@ - +

    The value of the num attribute must be in the range 0-127.

    @@ -323,7 +321,7 @@     - instrument definition + instrument definition MIDI instrument declaration. @@ -340,7 +338,7 @@ - +

    This element provides a starting or default instrument declaration for a staff, a group of @@ -349,7 +347,7 @@ - instrument group + instrument group Collects MIDI instrument definitions. @@ -424,7 +422,7 @@ - + @@ -435,7 +433,7 @@ - + @@ -446,11 +444,11 @@ - + - program + program MIDI program change. @@ -458,18 +456,18 @@ - + - sequence number + sequence number MIDI sequence number. - + @@ -483,7 +481,7 @@ - track name + track name MIDI track/sequence name. @@ -495,7 +493,7 @@ - velocity + velocity MIDI Note-on/off velocity. @@ -503,7 +501,7 @@ - + diff --git a/source/modules/MEI.msDesc.xml b/source/modules/MEI.msDesc.xml index 768db9d49..1b06eb8d5 100644 --- a/source/modules/MEI.msDesc.xml +++ b/source/modules/MEI.msDesc.xml @@ -1,6 +1,6 @@ - Manuscript description component declarations. @@ -90,7 +89,7 @@ - addition description + addition description Provides a description of significant additions found within an item, such as marginalia or other annotations. @@ -107,7 +106,7 @@ - binding + binding Contains a description of one binding, i.e., type of covering, boards, etc. applied to an item. @@ -135,7 +134,7 @@ - binding description + binding description Describes the present and former bindings of an item. @@ -231,7 +230,7 @@ - decoration description + decoration description Contains a description of the decoration of an item. @@ -266,7 +265,7 @@ - decoration note + decoration note Contains a description of one or more decorative features of an item. @@ -422,7 +421,7 @@ - layout description + layout description Collects layout descriptions. @@ -494,7 +493,7 @@ - locus group + locus group Groups locations which together form a distinct but discontinuous item within a manuscript or manuscript part, according to a specific foliation. @@ -542,7 +541,7 @@ - + Signals beginning of a text division. @@ -558,7 +557,7 @@ - script description + script description Contains a description of the letters or characters used in an autographic item. @@ -593,7 +592,7 @@ - script note + script note Describes a particular script distinguished within the description of an autographic item. @@ -644,7 +643,7 @@ - seal description + seal description Describes the seals or similar external attachments applied to an item. @@ -685,7 +684,7 @@ - second folio + second folio 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. @@ -781,7 +780,7 @@ - support description + support description Groups elements describing the physical support material of an item. @@ -849,7 +848,7 @@ - type description + type description Contains a description of the typefaces or other aspects of the printing of a printed source. @@ -884,7 +883,7 @@ - type note + type note Describes a particular font or other significant typographic feature of a printed resource. diff --git a/source/modules/MEI.namesdates.xml b/source/modules/MEI.namesdates.xml index feff65390..08eabf9b3 100644 --- a/source/modules/MEI.namesdates.xml +++ b/source/modules/MEI.namesdates.xml @@ -1,6 +1,6 @@ - Names and dates component declarations. @@ -67,7 +66,7 @@ Groups elements which form part of a personal name. - additional name + additional name Contains an additional name component, such as a nickname, epithet, or alias, or any other descriptive phrase used within a personal name. @@ -120,7 +119,7 @@ - corporate name + corporate name Identifies an organization or group of people that acts as a single entity. @@ -149,8 +148,6 @@ ships. Usually, secondary name parts are encoded in corpName sub-elements. The name of the list from which a controlled value is taken may be recorded using the auth attribute.

    -     -

    The model of this element is based on the corpname element of the Encoded Archival Description (EAD).

         @@ -208,7 +205,7 @@ - family name + family name Contains a family (inherited) name, as opposed to a given, baptismal, or nick name. @@ -258,7 +255,7 @@ - generational name component + generational name component Contains a name component used to distinguish otherwise similar names on the basis of the relative ages or generations of the persons named. @@ -285,7 +282,7 @@ - geographical feature name + geographical feature name Contains a common noun identifying a geographical feature. @@ -312,7 +309,7 @@ - geographic name + geographic name The proper noun designation for a place, natural feature, or political jurisdiction. @@ -342,13 +339,11 @@ sub-elements. The name of the list from which a controlled value is taken, such as the Thesaurus of Geographic Names (TGN), may be recorded using the auth attribute.

    - -

    The model of this element is based on the geogname element of the Encoded Archival Description (EAD).

         - name link + name link 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. @@ -375,7 +370,7 @@ - period name + period name A label that describes a period of time, such as 'Baroque' or '3rd Style period'. @@ -403,7 +398,7 @@ - personal name + personal name Designation for an individual, including any or all of that individual's forenames, surnames, honorific titles, and added names. @@ -431,13 +426,11 @@ For greater specificity, however, use foreName, famName, genName, addName, genName, nameLink, and roleName elements. The name of the list from which a controlled value for persName is taken may be recorded using the auth attribute.

    - -

    The model of this element is based on the persname element of the Encoded Archival Description (EAD).

         - postal box or post office box + postal box or post office box Contains a number or other identifier for some postal delivery point other than a street address. @@ -460,7 +453,7 @@ - postal code + postal code Contains a numerical or alphanumeric code used as part of a postal address to simplify sorting or delivery of mail. @@ -509,7 +502,7 @@ - role name + role name Contains a name component which indicates that the referent has a particular role or position in society, such as an official title or rank. @@ -585,7 +578,7 @@ - style name + style name A label for a characteristic style of writing or performance, such as 'bebop' or 'rock-n-roll'. diff --git a/source/modules/MEI.neumes.xml b/source/modules/MEI.neumes.xml index 570b03fb2..4eec8c987 100644 --- a/source/modules/MEI.neumes.xml +++ b/source/modules/MEI.neumes.xml @@ -1,6 +1,6 @@ - Neume repertoire component declarations. @@ -98,7 +97,7 @@     - pitch name + pitch name Contains a written pitch name. @@ -326,7 +325,7 @@ - + @@ -371,7 +370,7 @@ - neume component group + neume component group Collection of one or more neume components. @@ -422,6 +421,9 @@ + +

    The MEI Neumes customization restricts the use of this element. This customization disallows neume as a direct child of layer.

    +     Oriscus. diff --git a/source/modules/MEI.performance.xml b/source/modules/MEI.performance.xml index 14421deba..c13ea1ba4 100644 --- a/source/modules/MEI.performance.xml +++ b/source/modules/MEI.performance.xml @@ -1,6 +1,6 @@ - Performance component declarations. @@ -50,7 +49,7 @@     - audio/video file + audio/video file References an external digital audio or video file. diff --git a/source/modules/MEI.ptrref.xml b/source/modules/MEI.ptrref.xml index a8a2dd3ac..eae163d80 100644 --- a/source/modules/MEI.ptrref.xml +++ b/source/modules/MEI.ptrref.xml @@ -1,6 +1,6 @@ - Pointer and reference component declarations. @@ -32,7 +31,7 @@ - pointer + pointer Defines a traversible pointer to another location, using only attributes to describe the destination. @@ -44,19 +43,17 @@ - +

    Unlike the ref element, ptr cannot contain text or sub-elements to describe the referenced object.

    -     -

    The model of this element is based on the ptr element of the Encoded Archival Description (EAD) and the ptr element of the Text Encoding Initiative (TEI).

         - reference + reference Defines a traversible reference to another location. May contain text and sub-elements that describe the destination. @@ -79,8 +76,6 @@

    Unlike the ptr element, ref may contain text and sub-elements to describe the destination.

    -     -

    The model of this element is based on the ref element of the Encoded Archival Description (EAD) and the ref element of the Text Encoding Initiative (TEI).

     diff --git a/source/modules/MEI.shared.xml b/source/modules/MEI.shared.xml index 637fa7694..dc1abf227 100644 --- a/source/modules/MEI.shared.xml +++ b/source/modules/MEI.shared.xml @@ -1,6 +1,6 @@ - Component declarations that are shared between two or more modules. @@ -678,12 +677,12 @@     - Indicates the lower-left corner x coordinate. + Indicates the lower-right corner y coordinate. - + Indicates the amount by which the contents of this element have been rotated clockwise or, if applicable, how the orientation of the element self should be interpreted, with respect to the normal orientation of the parent surface. @@ -861,6 +860,17 @@     + + Attributes for selecting data. + + + XPath used to select data to which an element or a property applies. + + + + + + Logical domain attributes. @@ -972,7 +982,7 @@ Attributes that permit total duration to be represented by multiple values. - duration + duration 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. @@ -1011,7 +1021,7 @@ Attributes that express duration in musical terms. - duration + duration Records the duration of a feature using the relative durational values provided by the data.DURATION datatype. @@ -1024,7 +1034,7 @@ Attributes that describe duration as a ratio. - number + number Along with numbase, describes duration as a ratio. num is the first value in the ratio, while numbase is the second. @@ -1494,7 +1504,7 @@ - line end symbol + line end symbol Symbol rendered at end of line. @@ -1507,7 +1517,7 @@ - line start symbol + line start symbol Symbol rendered at start of line. @@ -1888,28 +1898,35 @@ Attributes that record the version of MEI in use. + + Prohibit meiversion attribute on non root elements. + + + The @meiversion attribute is not allowed on elements that are not the document root element. + + + Specifies a generic MEI version label. - 5.0 - - MEI 5.0 + + Version of MEI - - MEI 5.0+anyStart + + Version of MEI all_anyStart customization - - MEI 5.0+basic + + Version of MEI basic customization - - MEI 5.0+CMN + + Version of MEI cmn customization - - MEI 5.0+Mensural + + Version of MEI mensural customization - - MEI 5.0+Neumes + + Version of MEI neumes customization @@ -1923,7 +1940,7 @@ - Level of duration at which the proportion given by the @num and @numbase ratio applies. + Level of duration at which the proportion given by the @num and @numbase ratio applies. @@ -1935,7 +1952,7 @@ meter. - meter conformance + meter conformance Indicates the relationship between the content of a staff or layer and the prevailing meter. @@ -1957,7 +1974,7 @@ meter. - meter conformance + meter conformance Indicates the relationship between the content of a measure and the prevailing meter. @@ -1990,7 +2007,7 @@ - symbol + symbol 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. @@ -2279,7 +2296,7 @@ Attributes that record written octave. - octave + octave Captures written octave information. @@ -2320,8 +2337,8 @@ Attributes that record placement of notes on a single-line staff. - Determines the placement of notes on a 1-line staff. A value of 'true' places all - notes on the line, while a value of 'false' places stems-up notes above the line and + Determines the placement of notes on a 1-line staff. A value of true places all + notes on the line, while a value of false places stems-up notes above the line and stems-down notes below the line. @@ -2334,7 +2351,7 @@ Indicates whether staves without notes, rests, etc. should be displayed. When the - value is 'true', empty staves are displayed. + value is 'true', empty staves are not displayed. @@ -2453,28 +2470,28 @@ - page top margin + page top margin Indicates the amount of whitespace at the top of a page. - page bottom margin + page bottom margin Indicates the amount of whitespace at the bottom of a page. - page left margin + page left margin Indicates the amount of whitespace at the left side of a page. - page right margin + page right margin Indicates the amount of whitespace at the right side of a page. @@ -2560,7 +2577,7 @@ Attributes that record written pitch name. - pitch name + pitch name Contains a written pitch name. @@ -2579,13 +2596,13 @@ Attributes capturing placement on a staff. - Indicates the placement of the item within the staff. A value of 'true' means on the staff, and 'false' off the staff. + Indicates the placement of the item within the staff. A value of true means on the staff, and false off the staff. - + Attributes capturing placement information with respect to an event. @@ -3079,7 +3096,7 @@ Attributes for identifying the staff associated with the current feature. - + Signifies the staff on which a notated event occurs or to which a control event applies. Mandatory when applicable. @@ -3091,21 +3108,21 @@ Attributes that describe items printed near (above, below, or between) staves - + Describes vertical order of items printed above a staff, from closest to farthest away from the staff. - + Describes vertical order of items printed below a staff, from closest to farthest away from the staff. - + Describes vertical order of items printed between staves, from top to bottom. @@ -3411,7 +3428,7 @@ - + Records the function of a tempo indication. @@ -3446,7 +3463,7 @@ - rendition + rendition Captures the appearance of the element’s contents using MEI-defined descriptors. @@ -3512,7 +3529,7 @@ part]. - time stamp + time stamp Encodes the onset time in terms of musical time, i.e., beats[.fractional beat part], as expressed in the written time signature. @@ -3538,7 +3555,7 @@ Attributes that describe transposition. - transposition (diatonic) + transposition (diatonic) Records the amount of diatonic pitch shift, e.g., C to C♯ = 0, C to D♭ = 1, necessary to calculate the sounded pitch from the written one. @@ -3546,7 +3563,7 @@ - transposition (semitones) + transposition (semitones) Records the amount of pitch shift in semitones, e.g., C to C♯ = 1, C to D♭ = 1, necessary to calculate the sounded pitch from the written one. @@ -3560,6 +3577,17 @@ C to C♯ and one from C to D♭.

     + + Logical domain attributes for tuning. + + + Describes the tuning standard used. + + + + + + Attributes that describe tuning. @@ -4286,21 +4314,24 @@ Groups elements that may appear as part of a title page transcription. + + Groups elements that may appear inside the tuning element. + - accidental + accidental Records a temporary alteration to the pitch of a note. + + - - - +

    An accidental may raise a pitch by one or two semitones or it may cancel a previous @@ -4358,7 +4389,7 @@ - address line + address line Single line of a postal address. @@ -4405,17 +4436,17 @@ + + - - - + - analytic level + analytic level Contains bibliographic elements describing an item (e.g., an article or poem) published within a monograph or journal and not as an independent publication. @@ -4444,15 +4475,11 @@ - annotation + annotation Provides a statement explaining the text or indicating the basis for an assertion. - - - - @@ -4461,6 +4488,10 @@ + + + + @@ -4527,20 +4558,20 @@ - articulation + articulation An indication of how to play a note or chord. + + - - - +

    Articulations typically affect duration, such as staccato marks, or the force of attack, @@ -4582,14 +4613,14 @@ + + - - - +

    This element is provided for repertoires, such as mensural notation, that lack measures. @@ -4600,7 +4631,7 @@ - bibliographic reference + bibliographic reference Provides a loosely-structured bibliographic citation in which the sub-components may or may not be explicitly marked. @@ -4686,7 +4717,7 @@ - scope of citation + scope of citation Defines the scope of a bibliographic reference, for example as a list of page numbers, or a named subdivision of a larger work. @@ -4724,7 +4755,7 @@ - structured bibliographic citation + structured bibliographic citation Contains a bibliographic citation in which bibliographic sub-elements must appear in a specified order. @@ -4797,7 +4828,7 @@ - + @@ -4843,7 +4874,7 @@ - cast group + cast group Groups one or more individual castItem elements within a cast list. @@ -4912,7 +4943,7 @@ - column beginning + column beginning An empty formatting element that forces text to begin in a new column. @@ -4927,7 +4958,7 @@ - + @@ -4959,10 +4990,10 @@ + + - - @@ -4994,7 +5025,7 @@ - + @@ -5027,16 +5058,16 @@ - clef group + clef group A set of simultaneously-occurring clefs. + + - - @@ -5047,7 +5078,7 @@ - column layout + column layout An empty formatting element that signals the start of columnar layout. @@ -5057,7 +5088,7 @@ - + @@ -5169,10 +5200,10 @@ + + - - @@ -5256,7 +5287,7 @@ - description + description Container for text that briefly describes the feature to which it is attached, including its intended usage, purpose, or application as appropriate. @@ -5282,7 +5313,7 @@ - dimension + dimension Any single dimensional specification. @@ -5393,7 +5424,7 @@ - directive + directive 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 tempo, dynam or repeatMark. @@ -5401,10 +5432,10 @@ + + - - @@ -5460,7 +5491,7 @@ - division + division Major structural division of text, such as a preface, chapter or section. @@ -5562,15 +5593,15 @@ + + - - - +

    This element provides an alternative to the dots attribute on - dynamic + dynamic Indication of the volume of a note, phrase, or section of music. - - - - + + + + @@ -5631,7 +5662,7 @@ - edition designation + edition designation A word or text phrase that indicates a difference in either content or form between the item being described and a related item previously issued by the same publisher/distributor (e.g., 2nd edition, version 2.0, etc.), or simultaneously issued by @@ -5687,13 +5718,13 @@ etc. + + + - - - @@ -5824,7 +5855,7 @@ - +

    The plist attribute contains an ordered list of identifiers of descendant - extended data + extended data Provides a container element for non-MEI data formats. @@ -5963,16 +5994,16 @@ - group symbol + group symbol A brace or bracket used to group two or more staves of a score or part. + + - - @@ -6002,7 +6033,7 @@ - heading + heading Contains any heading, for example, the title of a section of text, or the heading of a list. @@ -6100,7 +6131,7 @@ - incipit + incipit The opening music and/or words of a musical or textual work. @@ -6160,7 +6191,7 @@ - key accidental + key accidental Accidental in a key signature. @@ -6172,7 +6203,7 @@ - + @@ -6203,7 +6234,7 @@ - key signature + key signature Written key signature. @@ -6300,10 +6331,10 @@ + + - - @@ -6332,7 +6363,7 @@ - layer definition + layer definition Container for layer meta-information. @@ -6342,10 +6373,10 @@ + + - - @@ -6364,7 +6395,7 @@ - line beginning + line beginning An empty formatting element that forces text to begin on a new line. @@ -6374,12 +6405,12 @@ - +

    The n attribute should be used to record a number associated with this textual - line. See comment on verse element for description of func - attribute. Do not confuse this element with the sb element, which + line.

    +

    Do not confuse this element with the sb element, which performs a similar function for musical notation.

     @@ -6387,7 +6418,7 @@     - line group + line group 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, e.g., a stanza, refrain, verse paragraph, etc. @@ -6395,12 +6426,12 @@ + + - - @@ -6461,7 +6492,7 @@ - musical division + musical division Contains a subdivision of the body of a musical text. @@ -6532,7 +6563,7 @@ - monograph level + monograph level Contains bibliographic elements describing an item, for example, a published book or journal, score, recording, or an unpublished manuscript. @@ -6720,10 +6751,10 @@ + + - - @@ -6755,7 +6786,7 @@ - number + number Numeric information in any form. @@ -6794,10 +6825,10 @@ + + - - @@ -6828,7 +6859,7 @@ - paragraph + paragraph One or more text phrases that form a logical prose passage. @@ -6856,18 +6887,18 @@ - padding + padding An indication of extra visual space between notational elements. + + - - - + @@ -6876,10 +6907,10 @@ + + - - @@ -6915,10 +6946,10 @@ + + - - @@ -6928,7 +6959,7 @@ - page beginning + page beginning An empty formatting element that forces text to begin on a new page. @@ -6956,7 +6987,7 @@ - page description + page description Contains a brief prose description of the appearance or description of the content of a physical page. @@ -6982,7 +7013,7 @@ - page footer + page footer A running footer. @@ -7015,7 +7046,7 @@ - page header + page header A running header. @@ -7052,10 +7083,10 @@ + + - - @@ -7106,7 +7137,7 @@ - physical location + physical location Groups information about the current physical location of a bibliographic item, such as the repository in which it is located and its shelf mark(s), and its previous locations. @@ -7159,7 +7190,7 @@ - publication place + publication place Name of the place where a bibliographic item was published. @@ -7201,7 +7232,7 @@ - related item + related item Contains or references another bibliographic item which is related to the present one. @@ -7247,7 +7278,7 @@ - + @@ -7343,7 +7374,7 @@ - render + render A formatting element indicating special visual rendering, e.g., bold or italicized, of a text word or phrase. @@ -7412,7 +7443,7 @@ - responsibility + responsibility A phrase describing the nature of intellectual responsibility. @@ -7439,7 +7470,7 @@ - responsibility statement + responsibility statement 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. @@ -7483,10 +7514,10 @@ + + - - @@ -7535,7 +7566,7 @@ - role description + role description Describes a character’s role in a drama. @@ -7555,7 +7586,7 @@ - system beginning + system beginning An empty formatting element that forces musical notation to begin on a new line. @@ -7569,7 +7600,7 @@ - +

    Do not confuse this element with the lb element, which performs a @@ -7581,10 +7612,10 @@ + + - - @@ -7605,30 +7636,29 @@ -

    Since the measure element is optional, a score may consist entirely - of page beginnings, each of which points to a page image. div elements - are allowed preceding and following sections of music data in order to accommodate blocks of - explanatory text.

    +

    A score may consist entirely of page beginnings, each of which points to a page + image. div elements are allowed preceding and following sections + of music data in order to accommodate blocks of explanatory text.

         - score definition + score definition Container for score meta-information. + + - - - + - + @@ -7664,11 +7694,11 @@ + - @@ -7748,7 +7778,7 @@ - + @@ -7799,7 +7829,7 @@ - stacked text + stacked text An inline table with a single column. @@ -7909,7 +7939,7 @@ - staff definition + staff definition Container for staff meta-information. @@ -7919,10 +7949,10 @@ + + - - @@ -8058,16 +8088,16 @@ - staff group + staff group A group of bracketed or braced staves. + + - - @@ -8108,16 +8138,16 @@ - syllable + syllable Individual lyric syllable. + + - - @@ -8148,7 +8178,7 @@ - + @@ -8179,10 +8209,10 @@ + + - - @@ -8258,7 +8288,7 @@ - text language + text language Identifies the languages and writing systems within the work described by a bibliographic description, not the language of the description. @@ -8526,6 +8556,25 @@

    The model of this element is based on the titlePart element of the Text Encoding Initiative (TEI).

     + + Describes the tuning of an instrument. + + + + + + + + + + + + + + +

    At this point, the tuning element has been worked out for string instruments only. However, as it seems applicable for other instruments, it's been made available in the MEI.shared module.

    +     +     Description of the horizontal size of an object. diff --git a/source/modules/MEI.stringtab.xml b/source/modules/MEI.stringtab.xml index 5458f0d58..0d8d0fef1 100644 --- a/source/modules/MEI.stringtab.xml +++ b/source/modules/MEI.stringtab.xml @@ -1,38 +1,99 @@ - + Tablature component declarations. + + In string tablature, the number of the course to be played. + + + + + + Standard course tunings. + + + + Standard tuning for current guitars. The courses are tuned to E2 A2 D3 G3 B3 E4. + + + Drop D tuning for guitars. The lowest course is tuned down to D, while all other courses are kept to their regular pitches. D2 A2 D3 G3 B3 E4. + + + Open D tuning for guitars. D2 A2 D3 F3s A3 D4. + + + Open G tuning for guitars. D2 G2 D3 G3 B3 D4. + + + Open A tuning for guitars. E2 A2 E3 A3 C4s E4. + + + Renaissance tuning for lutes with 6 courses. G2 C3 F3 A3 D4 G4. + + + Baroque tuning for lutes with 6 stable courses, and additional bass courses tuned to the key of D Major. A2 D3 F3s A3 D4 F4s for the main six courses, and bass courses descending in pitch from G2, F2s, etc., depending on the size of the instrument. + + + Baroque tuning for lutes with 6 stable courses, and additional bass courses tuned to the key of D minor. A2 D3 F3 A3 D4 F4 for the main six courses, and bass courses descending in pitch from G2, F2, etc., depending on the size of the instrument. + + + + + + Logical domain attributes. + + + + + + + Visual domain attributes for scoreDef in the tablature repertoire. + + + Visual domain attributes for staffDef in the tablature repertoire. + + + Attribute that describes the vertical alignment of tablature symbols. Only applicable in cases where the symbols' vertical position does not communicate other information, such as courses (i.e., only in German lute tablature). Typical values are top and bottom. + + + + + + Used in German lute tablature where the vertical alignment of tab notes is consistent but cannot be identified using a typical value of tab.align (i.e., top or bottom). Specifies the horizontal strand corresponding to the lines attribute on staffDef that anchors the vertical position of tab notes. This anchorline is used as the vertical starting position when stacking tab notes into chords. Single tab notes simply occupy this position. Chords grow upwards from this position. If the chord extends further than the number of available horizontal strands (lines) above the anchorline, the entire chord is shifted downward until its top tab note is positioned on the top-most line. (Note that in German lute tablature, the lines are conceptual rather than visible). + + + + + + + String tablature string and fret information. - Indicates which finger, if any, should be used to play an individual string. The - index, middle, ring, and little fingers are represented by the values 1-4, while t is - for the thumb. The values x and o indicate muffled and open strings, - respectively. + This attribute is deprecated and will be removed in a future version. Indicates which finger, if any, should be used to play an individual string. The index, middle, ring, and little fingers are represented by the values 1-4, while t is for the thumb. The values x and o indicate muffled and open strings, respectively. @@ -43,12 +104,24 @@     + + Used in German lute tablature in cases where vertical positioning deviates from the norm which can be specified by tab.align. Indicates the position of the tab note on one of the horizontal strands corresponding to the lines attribute on staffDef. (Note that in this case, the lines are conceptual rather than visible). + + + + - Records which string is to be played. + This attribute is deprecated in favor of tab.course and will be removed in a future version. Records which string is to be played. + + Records which course is to be played. + + + +     @@ -63,17 +136,30 @@     - String tablature tuning information. + This collection of attributes is deprecated in favor of the new tuning element and will be removed in a future version. String tablature tuning information. - Provides a *written* pitch and octave for each open string or course of + This attribute is deprecated in favor of the new tuning element and will be removed in a future version. Provides a *written* pitch and octave for each open string or course of strings. - [a-g][0-9](s|f|ss|x|ff|xs|sx|ts|tf|n|nf|ns|su|sd|fu|fd|nu|nd|1qf|3qf|1qs|3qs)?([a-g][0-9](s|f|ss|x|ff|xs|sx|ts|tf|n|nf|ns|su|sd|fu|fd|nu|nd|1qf|3qf|1qs|3qs)?)* + + [a-g][0-9](s|f|ss|x|ff|xs|sx|ts|tf|n|nf|ns|su|sd|fu|fd|nu|nd|1qf|3qf|1qs|3qs)?([a-g][0-9](s|f|ss|x|ff|xs|sx|ts|tf|n|nf|ns|su|sd|fu|fd|nu|nd|1qf|3qf|1qs|3qs)?)* + + + + + + + This attribute is deprecated in favor of the new tuning element and will be removed in a future version. Provides a *written* pitch and octave for each open string or course of strings. + + + + + + [a-g][0-9](s|f|ss|x|ff|xs|sx|ts|tf|n|nf|ns|su|sd|fu|fd|nu|nd|1qf|3qf|1qs|3qs)?([a-g][0-9](s|f|ss|x|ff|xs|sx|ts|tf|n|nf|ns|su|sd|fu|fd|nu|nd|1qf|3qf|1qs|3qs)?)* @@ -81,6 +167,22 @@ + + Logical domain attributes. + + + + + + + Logical domain attributes. + + + + + + + A barre in a chord tablature grid. @@ -88,13 +190,11 @@ - + - Records the location at which the strings should be stopped against a fret in a - fretboard diagram. This may or may not be the same as the actual location on the fretboard - of the instrument in performance. + This attribute is deprecated in favor of tab.fret, and will be removed in a future version. Records the location at which the strings should be stopped against a fret in a fretboard diagram. This may or may not be the same as the actual location on the fretboard of the instrument in performance. 1 @@ -105,9 +205,88 @@

    The startid and endid attributes are used to indicate the chordMember elements on which the barre starts and finishes respectively. - The fret at which the barre should be created is recorded by the fret + scheme="MEI">chordMember elements on which the barre starts and finishes + respectively. The fret at which the barre should be created is recorded by the fret attribute.

         -     + + individual course tuning information + Describes the tuning of a course on a stringed instrument (e.g., guitar, lute). + + + + + + + + + + + + + + + + individual string tuning information + Used to modify tuning information given by the course element. Describes the tuning of an individual string within a course on a stringed instrument (e.g., guitar, lute). + + + + + + + + + + + + + + + A visual indication of the duration of a tabGrp. + + + + + + + + + + + + + + +

    The presence of a tabDurSym indicates that there is a symbol rendered for the parent tabGrp. If no additional attributes like altsymare given, a default symbol conforming to the current notation style or font is to be used. The absence of this elements indicates that the last provided duration symbol equally applies to the current tab group.

    +     +     + + A group of simultaneous tab notes, comparable to a chord in CMN. Rarely, may also contain rests, as in some "German" lute tablatures. + + + + + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/source/modules/MEI.text.xml b/source/modules/MEI.text.xml index 7b07f74d5..fe764cb0b 100644 --- a/source/modules/MEI.text.xml +++ b/source/modules/MEI.text.xml @@ -1,6 +1,6 @@ - Text component declarations. @@ -102,7 +101,7 @@ - back matter + back matter Contains any appendixes, advertisements, indexes, etc. following the main body of a musical text. @@ -149,7 +148,7 @@ - front matter + front matter Bundles prefatory text found before the start of the musical text. @@ -175,8 +174,6 @@ scheme="MEI">head sub-element describing the nature of the division. The pb element is allowed here in order to accommodate page images, e.g., cover, endpapers, etc. before and after the actual textual matter.

    - -

    The model of this element is based on the front element of the Text Encoding Initiative (TEI).

         @@ -203,7 +200,7 @@ - line of text + line of text Contains a single line of text within a line group. @@ -236,13 +233,11 @@

    Do not confuse this element with the line element, which is used for graphical lines that occur in music notation.

    -     -

    The model of this element is based on the l element of the Text Encoding Initiative (TEI).

         - list item + list item Single item in a list. @@ -358,7 +353,7 @@ - quoted + quoted Contains material which is distinguished from the surrounding phrase-level text using quotation marks or a similar method. Use quote for block-level quotations. @@ -370,6 +365,7 @@ + @@ -422,13 +418,11 @@ and passages that are mentioned but not used.

    Do not confuse this element, used to capture phrase-level quotations, and quote, intended for block quotations.

    - -

    The model of this element is based on the q element of HTML and the q element of the Text Encoding Initiative (TEI).

         - quoted material + quoted material 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. @@ -436,6 +430,7 @@ + @@ -453,13 +448,11 @@

    The source for the quote may be included in a bibl sub-element.

    Do not confuse this element, used to capture block-level quotations, and q, intended for inline quotations.

    - -

    The model of this element is based on the quote element of the Text Encoding Initiative (TEI) and the quote element of the Encoded Archival Description (EAD).

         - arbitrary segment + arbitrary segment represents any segmentation of text below the "text component" level. diff --git a/source/modules/MEI.usersymbols.xml b/source/modules/MEI.usersymbols.xml index e7eea989f..8d9af5519 100644 --- a/source/modules/MEI.usersymbols.xml +++ b/source/modules/MEI.usersymbols.xml @@ -1,6 +1,6 @@ - User-defined symbols component declarations. @@ -173,7 +172,7 @@ - + @@ -267,7 +266,7 @@ - property name + property name Name of a property of the symbol. @@ -294,7 +293,7 @@     - property value + property value A single property value. @@ -304,11 +303,12 @@ - symbol definition + symbol definition Declaration of an individual symbol in a symbolTable. + @@ -343,7 +343,7 @@ - symbol name + symbol name Contains the name of a symbol, expressed following Unicode conventions. @@ -354,7 +354,7 @@ - symbol property + symbol property Provides a name and value for some property of the parent symbol. diff --git a/source/modules/MEI.visual.xml b/source/modules/MEI.visual.xml index ec54ff67f..8ad973820 100644 --- a/source/modules/MEI.visual.xml +++ b/source/modules/MEI.visual.xml @@ -1,6 +1,6 @@ - Visual component declarations. @@ -138,6 +137,7 @@ Visual domain attributes. + @@ -158,7 +158,7 @@ - length + length 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); e.g., a value of 8 for a 5-line staff. @@ -274,6 +274,7 @@ + @@ -304,6 +305,7 @@ + @@ -324,6 +326,7 @@ + @@ -396,6 +399,9 @@ Visual domain attributes. + + Visual domain attributes. + Visual domain attributes. @@ -405,6 +411,7 @@ + @@ -454,6 +461,7 @@ Visual domain attributes. + @@ -480,6 +488,7 @@ Visual domain attributes. + @@ -533,6 +542,7 @@ Visual domain attributes. + @@ -552,6 +562,7 @@ + @@ -589,8 +600,10 @@ Visual domain attributes. + + @@ -603,14 +616,16 @@ Visual domain attributes. + + - orientation + orientation Combination expressed horizontally, as for brass instruments. @@ -759,8 +774,10 @@ Visual domain attributes. + + @@ -791,6 +808,7 @@ + @@ -1133,7 +1151,9 @@ Visual domain attributes. + + @@ -1182,6 +1202,10 @@ Visual domain attributes. + + + + Visual domain attributes. @@ -1202,6 +1226,7 @@ + @@ -1344,6 +1369,7 @@ + @@ -1371,6 +1397,7 @@ + @@ -1446,14 +1473,14 @@ Visual domain attributes that describe the properties of a plica stem in the mensural repertoire. - direction + direction Describes the direction of a stem. - length + length Encodes the stem length. @@ -1524,6 +1551,7 @@ Visual domain attributes. + @@ -1594,6 +1622,7 @@ + @@ -1706,6 +1735,7 @@ + @@ -1752,7 +1782,7 @@ - bar lines through + bar lines through Indicates whether bar lines go across the space between staves (true) or are only drawn across the lines of each staff (false). @@ -1785,14 +1815,14 @@ - position + position Records the position of the stem in relation to the note head(s). - length + length Encodes the stem length. @@ -1805,7 +1835,7 @@ - direction + direction Describes the direction of a stem. @@ -1875,9 +1905,34 @@ + + Visual domain attributes. + + + + + + + + + + + + + Visual domain attributes. + + + + + + + + + Visual domain attributes. + @@ -1911,15 +1966,19 @@ - + + + + Visual domain attributes. + Visual domain attributes. @@ -1974,6 +2033,7 @@ + diff --git a/source/modules/MEI.xml b/source/modules/MEI.xml index 8f0909bec..210449b26 100644 --- a/source/modules/MEI.xml +++ b/source/modules/MEI.xml @@ -1,6 +1,6 @@ - Data type definitions. @@ -437,16 +436,16 @@ Heavy double bar line (SMuFL E035). - + Segno serpent with vertical lines (SMuFL E04B). - + End bar line (SMuFL E032 and Unicode 1D102). Heavy bar line (SMuFL E034). - + Bar line not rendered. @@ -493,15 +492,18 @@ - A beat location, i.e., [0-9]+(\.?[0-9]*)? The value must fall between 0 and the numerator - of the time signature + 1, where 0 represents the left bar line and the upper boundary - represents the right bar line. For example, in 12/8 the value must be in the range from 0 to - 13. + A beat location, i.e., a decimal number. 0 + +

    The value must fall between 0 and the numerator of the time signature + 1, + where 0 represents the left bar line and the upper boundary represents the right bar line. + For example, in 12/8 the value must be in the range from 0 to 13. +

    +     Visual and performance information for a repeated beat symbol. @@ -1666,14 +1668,26 @@ --> - A token indicating diatonic interval quality and size. + A token indicating diatonic interval quality and size in shorthand notation. - [AdMmP][0-9]+ + [AdMmP][1-9][0-9]* + +

    + + Interval qualities: + A = augmented, + d = diminished, + M = major, + m = minor, + P = perfect + +

    +     A token indicating direction of the interval but not its precise value, a diatonic @@ -3025,6 +3039,18 @@ Tablature notation. + + Tablature notation for guitars (includes "spanish" lute tablature). Frets are indicated using numbers. Courses closest to the player's feet are at the top of the staff. + + + "French" tablature notation for lutes. Frets are indicated using letters. Courses closest to the player's feet are at the top of the staff. + + + "Italian" tablature notation for lutes. Frets are indicated using numbers. Courses closest to the player's feet are at the bottom of the staff. + + + "German" tablature notation for lutes. Fret and course information is conveyed solely by choice of symbol (vertical position is not used for this). + @@ -3573,7 +3599,7 @@ - In string tablature, the number of the string to be played, i.e., [1-9]+. + This datatype is deprecated in favor of data.COURSENUMBER and will be removed in a future version. In string tablature, the number of the string to be played. diff --git a/source/unusedImages.txt b/source/unusedImages.txt deleted file mode 100644 index 30383fe7d..000000000 --- a/source/unusedImages.txt +++ /dev/null @@ -1,111 +0,0 @@ -DataDictionary/DataDictAttClass.png -DataDictionary/DataDictElement.png -DataDictionary/DataDictElement_1.png -DataDictionary/DataDictElement_2.png -DataDictionary/DataDictMacro.png -DataDictionary/DataDictModelClass.png -ExampleImages/AEU-overview.png -ExampleImages/Oberthuer_Album-Blatt.png -ExampleImages/accid-20100510.png -ExampleImages/arpeg-20100510.png -ExampleImages/artic-20100510.png -ExampleImages/barline-20100510.png -ExampleImages/beam-b-20100510.png -ExampleImages/beam-d-20100510.png -ExampleImages/beam-e-20100510.png -ExampleImages/beamspan.2.png -ExampleImages/bend-300-20100514.png -ExampleImages/breath-20100510.png -ExampleImages/chord-20100510.png -ExampleImages/clef-20100510.png -ExampleImages/cpMark_1.png -ExampleImages/cross-staff.2.png -ExampleImages/custos-20100510.png -ExampleImages/dir-20100510.png -ExampleImages/dot-a-20100510.png -ExampleImages/dot-b-20100510.png -ExampleImages/dynam-20100510.png -ExampleImages/dynamics.2.png -ExampleImages/ending-300-20100514.png -ExampleImages/fermata-a-300-20100514.png -ExampleImages/fermata-b-300-20100514.png -ExampleImages/ftrem-a-300-20100514.png -ExampleImages/gliss-300-20100514.png -ExampleImages/grpsym-20100510.png -ExampleImages/hairpin-20100510.png -ExampleImages/harm-a-300-20100514.png -ExampleImages/harm-b-300-20100514.png -ExampleImages/keysig-20100510.png -ExampleImages/layer-20100510.png -ExampleImages/measure-20100510.png -ExampleImages/mrest-20100510.png -ExampleImages/octave-b-20100510.png -ExampleImages/octave_shifts.1.png -ExampleImages/octave_shifts.2.png -ExampleImages/phrase-300-20100514.png -ExampleImages/reh-20100510.png -ExampleImages/tempo-20100510.png -ExampleImages/tremolos.1.png -ExampleImages/trill-20100510.png -ExampleImages/tuplet-300-20100514.png -dfg_logo_schwarz.png -hzonlineart.png -meilogo.png -modules/analysis/erl-koenig.bmp -modules/cmnOrnaments/ex_multi_orn.png -modules/edittrans/schuetz_sopranoclef.png -modules/harmony/figuredBass08.png -modules/mensural/E-VAu-835-long-rests-47r.png -modules/mensural/ex_alteration.png -modules/mensural/ex_augmentation.png -modules/mensural/ex_imperfection.png -modules/neumes/Aquitanian_liquescent.png -modules/neumes/Example1.png -modules/neumes/Example2.png -modules/neumes/LIQUESCENT–ExampleA.png -modules/neumes/Mneume.png -modules/neumes/NC-rhombus.png -modules/neumes/NC-rhombusNEW.png -modules/neumes/NC-squareNEW.png -modules/neumes/NC-squaretailNEW.png -modules/neumes/NEUME-con.png -modules/neumes/NEUME-non-con.png -modules/neumes/angled.png -modules/neumes/curve.png -modules/neumes/custos-and-lozenged-punctum.png -modules/neumes/custos.EX1.png -modules/neumes/custos.EX2.png -modules/neumes/custos.EX3.png -modules/neumes/custos.EX4.png -modules/neumes/custos.EX5.png -modules/neumes/episemaB.png -modules/neumes/episemaC.png -modules/neumes/episemaD.png -modules/neumes/extended.png -modules/neumes/four-pitchesSN.png -modules/neumes/gapped.png -modules/neumes/hooked.png -modules/neumes/liquescent1NEW.png -modules/neumes/looped.png -modules/neumes/nc-example-1.png -modules/neumes/nc-example-2.png -modules/neumes/nc-example-3.png -modules/neumes/non-extended.png -modules/neumes/one-pitch-ex-a.png -modules/neumes/one-pitch-ex-aNEW.png -modules/neumes/one-pitch-ex-b.png -modules/neumes/one-pitch-ex-bNEW.png -modules/neumes/oriscus.png -modules/neumes/oriscus2.png -modules/neumes/parrish_neumes.png -modules/neumes/quilismaOH.png -modules/neumes/rellenA.png -modules/neumes/rellenL.png -modules/neumes/rellenS.png -modules/neumes/s-shape.png -modules/neumes/s-shapeA.png -modules/neumes/s-shapeB.png -modules/neumes/strophicus.png -modules/neumes/strophicusNEW.png -modules/neumes/tilt.png -modules/neumes/two-pitchesSN.png diff --git a/source/usedImages.txt b/source/usedImages.txt deleted file mode 100644 index 847180c75..000000000 --- a/source/usedImages.txt +++ /dev/null @@ -1,86 +0,0 @@ -ExampleImages/Beethoven.png -ExampleImages/CPEB_Dorinde.png -ExampleImages/ExplicationBach.png -ExampleImages/Hanon.21.png -ExampleImages/LisztMazeppa.png -ExampleImages/MozartK428.4.png -ExampleImages/RachmaninoffPrelude.png -ExampleImages/SchubertD887.png -ExampleImages/TarregaAlborada.png -ExampleImages/beam-a-20100510.png -ExampleImages/beamspan.1.png -ExampleImages/beatrpt-20100510.png -ExampleImages/cpMark_2.png -ExampleImages/cpMark_3.png -ExampleImages/cross-staff.1.png -ExampleImages/dynamics.1.png -ExampleImages/foliadesc-01.png -ExampleImages/foliadesc-02.png -ExampleImages/foliadesc-04.png -ExampleImages/harppedal.1.png -ExampleImages/mrpt-20100510.png -ExampleImages/mrpt2-20100510.png -ExampleImages/mspace.1.png -ExampleImages/multirest.png -ExampleImages/multirpt-20100510.png -ExampleImages/slur-300-20100514.png -ExampleImages/tremolos.2.png -ExampleImages/tremolos.3.png -ExampleImages/tuplets.1.png -ExampleImages/tuplets.2.png -modules/analysis/chor003_m6-7.png -modules/analysis/schubert_erlkonig_op1_m1.png -modules/cmn/K543_m1-3_exc.png -modules/cmn/beamAcc-Rit.png -modules/cmn/finger-300.png -modules/cmn/grace-300.png -modules/cmn/halfmRpt_beethoven.png -modules/cmn/reh_berlioz.png -modules/cmn/xchord-300.png -modules/cmnOrnaments/JSBtableofornaments.jpg -modules/cmnOrnaments/ex_mordent.png -modules/cmnOrnaments/ex_mordent_l.png -modules/cmnOrnaments/ex_tr.png -modules/cmnOrnaments/ex_tr_accid.png -modules/cmnOrnaments/ex_tr_grace.png -modules/cmnOrnaments/ex_tr_multi.png -modules/cmnOrnaments/ex_trill_wavy.png -modules/cmnOrnaments/ex_turn.png -modules/cmnOrnaments/ex_turn_d.png -modules/edittrans/metamarks-Beethoven-op59.3.png -modules/edittrans/schuetz_sopranoclef.png -modules/harmony/A7_1st.gif -modules/harmony/A7_5th.gif -modules/harmony/figuredBass01.png -modules/harmony/figuredBass02.png -modules/harmony/figuredBass03.png -modules/harmony/figuredBass04.png -modules/harmony/figuredBass05.png -modules/harmony/figuredBass06.png -modules/harmony/figuredBass07.png -modules/harmony/figuredBass09.png -modules/harmony/figuredBass10.png -modules/lyrics/ex_lyric.png -modules/lyrics/ex_syl_att.png -modules/lyrics/ex_verse_m.png -modules/mensural/Motet_Fauvel_Fol22r_Triplum_Staves4-5.png -modules/mensural/ex_ligatures01.png -modules/mensural/ex_ligatures02.png -modules/neumes/LIQUESCENT-ExampleB.png -modules/neumes/MneumeOH.png -modules/neumes/NLneumeOH.png -modules/neumes/O-splendidissima.png -modules/neumes/division.png -modules/neumes/episema.png -modules/neumes/hispanTick.png -modules/neumes/liquescent2NEW.png -modules/neumes/quilisma.png -modules/neumes/salicus.png -modules/neumes/signifLet.png -modules/neumes/syllable.png -modules/usersymbols/bulge.png -modules/usersymbols/charpentier.png -modules/usersymbols/mignon.png -modules/usersymbols/percussion.png -modules/usersymbols/triangle.png -modules/usersymbols/triangleWithStick.png diff --git a/source/validation/mei-customizations.sch b/source/validation/mei-customizations.sch index 0dfacd3f6..0bcf12e80 100644 --- a/source/validation/mei-customizations.sch +++ b/source/validation/mei-customizations.sch @@ -3,60 +3,115 @@ - - - + + + + + + + + + + + + + + Validating () + applicable source path: + The applicable source doc is not available at: + + + - - The MEI Source file is not available at the expected location of + + + The applicable MEI Source file is not available at the expected location of - - - + + There is no attribute class with name "". - Attribute class "" is not in module "", but in module "". + Attribute class "" is not in module "", but in module "". - - - + + There is no model class with name "". - Model class "" is not in module "", but in module "". + Model class "" is not in module "", but in module "". + - There is no module "" in MEI. + + There is no module "". + - + - The following elements are not available in : . - The following elements are not available in : . + The following elements are not available in : . + The following elements are not available in : . + + + + + + + + + The referenced class "" does neither exist in the applicable source nor in mei source or in your customization. + The referenced class "" has been deleted from your customization. When converting the ODD to a schema the class will probably be zapped but you should remove the reference here or make sure it is not deleted from your customization. + + diff --git a/source/validation/mei-source.sch b/source/validation/mei-source.sch index 5b31d22eb..9fbdf5d28 100644 --- a/source/validation/mei-source.sch +++ b/source/validation/mei-source.sch @@ -2,30 +2,34 @@ + A <gi> element needs to specify the @scheme which is used. Usually this will have a value of "MEI". + + + - A <gi scheme="MEI"></gi> references an element unknown to - MEI. It has to match an //elementSpec/@ident. + + A <gi scheme="MEI"></gi> references an element unknown to MEI. It has to match an //elementSpec/@ident. A <gi> in the MEI scheme must reference a value from <elementSpec>/@ident. - + + An <ident> element needs to specify its @type. This is usually "class". + + + - + A <ptr> element needs to specify a @target. + + + - The - <> points to a <div>/xml:id which wasn't declared. + + The <> points to which wasn't declared in a <div>/xml:id. diff --git a/source/validation/mei_odds.rng b/source/validation/mei_odds.rng index 0faa4ffc9..be796d49d 100644 --- a/source/validation/mei_odds.rng +++ b/source/validation/mei_odds.rng @@ -5154,7 +5154,7 @@ Sample values include: 1] main; 2] sub(subordinate) ; 3] alt(alternate) ; 4] sho - + @@ -6156,7 +6156,7 @@ On , either the @marks attribute should be used, or a paragraph of descri (tagging declaration) provides detailed information about the tagging applied to a document. [2.3.4. The Tagging Declaration 2.3. The Encoding Description] - + @@ -9303,8 +9303,8 @@ Child elements of are only allowed when an external module is being load - - + + @@ -10398,7 +10398,7 @@ Suggested values include: 1] schematron(ISO Schematron) ; 2] schematron(ISO Sche - + @@ -11929,7 +11929,7 @@ You must supply at least two values for @target on - + diff --git a/submodules/Stylesheets b/submodules/Stylesheets deleted file mode 160000 index 2b130e0b1..000000000 --- a/submodules/Stylesheets +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2b130e0b1faa400ad648c5bc7c0b9a6a32b391ae diff --git a/utils/canonicalization/copy.xsl b/utils/canonicalization/copy.xsl index 0ef77f84f..50caa2d4f 100644 --- a/utils/canonicalization/copy.xsl +++ b/utils/canonicalization/copy.xsl @@ -32,7 +32,7 @@ - + diff --git a/utils/compare_versions/comparison.xsl b/utils/compare_versions/comparison.xsl index ac573275c..b0fb23610 100644 --- a/utils/compare_versions/comparison.xsl +++ b/utils/compare_versions/comparison.xsl @@ -1,15 +1,5 @@ - + Created on: Oct 29, 2018 @@ -17,15 +7,15 @@ - - - - - + + + + + - + - + @@ -38,10 +28,10 @@ - + - + @@ -49,8 +39,8 @@ - - + + --- @@ -58,22 +48,33 @@ title: "Comparison of MEI v and v" ---
    - +

    MEI Comparison
    - Version vs + Version + vs Version -

    +
    -
    -
    -
    -
    -
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    added content changed content @@ -87,14 +88,14 @@ - - - + + + - - + +
    - + - + - + - + @@ -155,44 +156,60 @@ - + - + - + - + - - + + + + + + - - + + + + + + - - + + + + + + - - + + + + + + - + - + @@ -201,7 +218,7 @@ - + @@ -236,11 +253,11 @@ - + - + - - + + + + + + - - + + + + + + @@ -270,18 +295,32 @@ -
    • +
  • + + + +
    • -
    • +
  • + + + +
    • -
    • +
  • + +
    • -
    • +
  • + + + +
    • @@ -291,18 +330,32 @@ -
    • +
  • + + + +
    • -
    • +
  • + + + +
    • -
    • +
  • + +
    • -
    • +
  • + + + +
    • @@ -312,30 +365,50 @@ -
    • - +
  • + + + + + +
    • +     -
    • +
  • + + + + + +
    • -
    • +
  • + + + +
    • -
    • +
  • + + + + + +
    • - -     - +

    Element Comparison

    new elements:

    @@ -343,10 +416,20 @@ - - - - + + + +
    visit guidelines + + + + + + + + + visit guidelines +
    @@ -356,10 +439,18 @@ - - - - visit guidelines + + + + + + + + + + + visit guidelines + @@ -373,21 +464,27 @@ - - - + + + + + + + + +     - + - + - + @@ -396,42 +493,50 @@ - + - + - + - + - + - + - - + + + + + + - - + + + + + + @@ -444,18 +549,30 @@ -
    • +
  • + + + +
    • -
    • +
  • + +
    • -
    • +
  • + +
    • -
    • +
  • + + + +
    • @@ -465,26 +582,42 @@ -
    • +
  • + + + + + +
    • -
    • +
  • + + + +
    • -
    • +
  • + + + + + +
    • - - + +     - +

    Attribute Class Comparison

    new attribute classes:

    @@ -492,9 +625,15 @@ - - - + + +
    + + + + + +
    @@ -504,9 +643,15 @@ - - - + + + + + + + + + @@ -520,21 +665,27 @@ - - - + + + + + + + + +     - + - + - + @@ -543,30 +694,38 @@ - + - + - + - + - - + + + + + + - - + + + + + + @@ -579,29 +738,37 @@ -
    • +
  • + +
    • -
    • +
  • + +
    • -
    • +
  • + +
    • -
    • +
  • + +
    • - - + +     - +

    Model Class Comparison

    new model classes:

    @@ -609,9 +776,15 @@ - - - + + +
    + + + + + +
    @@ -621,9 +794,15 @@ - - - + + + + + + + + + @@ -637,36 +816,42 @@ - - - + + + + + + + + +     - - + + - - - - + + + + - - - + + + - + @@ -675,31 +860,39 @@ - + - + - + - + - - + + + + + + - - + + + + + + @@ -712,100 +905,135 @@ -
    • +
  • + +
    • -
    • +
  • + +
    • -
    • +
  • + +
    • -
    • +
  • + +
    • - - + +     - +

    MacroSpec Comparison (Parameter Entities)

    -

    new macroSpec classes:

    +

    new macroSpec classes:

    - + + + + + + + + + + - - - + + +
    + + + + + +
    -

    removed macroSpec classes:

    +

    removed macroSpec classes:

    - + - - - + + +
    + + + + + +
    -

    modified macroSpec classes:

    +

    modified macroSpec classes:

    -

    unchanged macroSpec classes:

    +

    unchanged macroSpec classes:

    - + - - - + + +
    + + + + + +
    - - + + - - - - + + + + - - - + + + - + - + - + @@ -814,23 +1042,31 @@ - + - + - - + + + + + + - - + + + + + + @@ -843,18 +1079,26 @@ -
    • +
  • + +
    • -
    • +
  • + +
    • -
    • +
  • + +
    • -
    • +
  • + +
    • @@ -864,64 +1108,88 @@ -
    • +
  • + +
    • -
    • +
  • + +
    • -
    • +
  • + +
    • - - + +     - -

    MacroSpec Comparison (datatypes)

    -

    new macroSpecs:

    + +

    DataSpec Comparison (datatypes)

    +

    new dataSpecs:

    - + - - - + + +
    + + + + + +
    -

    removed macroSpecs:

    +

    removed dataSpecs:

    - + - - - + + +
    + + + + + +
    -

    modified macroSpecs:

    +

    modified dataSpecs:

    -

    unchanged macroSpecs:

    +

    unchanged dataSpecs:

    - + - - - + + +
    + + + + + +
    @@ -939,7 +1207,7 @@ - + @@ -1004,7 +1272,7 @@     - + @@ -1012,37 +1280,37 @@ - + - + - + - + - + - + ['’] - + This is a generic copy template which will copy all content in all modes @@ -1053,6 +1321,6 @@ - - + + \ No newline at end of file diff --git a/utils/compare_versions/resources/js/main.js b/utils/compare_versions/resources/js/main.js index 60cc29176..021a1d30e 100644 --- a/utils/compare_versions/resources/js/main.js +++ b/utils/compare_versions/resources/js/main.js @@ -23,14 +23,14 @@ const svg3 = d3.select("#modelClassesChart") .append("g") .attr("transform", `translate(${width / 2}, ${height / 2})`); -const svg4 = d3.select("#macroPeChart") +const svg4 = d3.select("#macroChart") .append("svg") .attr("width", width) .attr("height", height) .append("g") .attr("transform", `translate(${width / 2}, ${height / 2})`); -const svg5 = d3.select("#macroDtChart") +const svg5 = d3.select("#dataChart") .append("svg") .attr("width", width) .attr("height", height) @@ -97,7 +97,7 @@ function getCharts() { // Join new data const path4 = svg4.selectAll("path") - .data(pie(macroPe)); + .data(pie(macro)); // Enter new arcs path4.enter().append("path") @@ -111,7 +111,7 @@ function getCharts() { // Join new data const path5 = svg5.selectAll("path") - .data(pie(macroDt)); + .data(pie(data)); // Enter new arcs path5.enter().append("path") diff --git a/utils/examples/generate-examples.py b/utils/examples/generate-examples.py index d44ad6bc6..2b97ca2ca 100644 --- a/utils/examples/generate-examples.py +++ b/utils/examples/generate-examples.py @@ -1,12 +1,12 @@ import argparse -import os import sys import pprint import logging +from pathlib import Path import verovio -IMAGES_PATH = "../../build/assets/images/GeneratedImages" +IMAGES_PATH = Path("../../build/assets/images/GeneratedImages") VRV_OPTIONS: dict = { 'scale': 10, @@ -62,39 +62,31 @@ log.debug("Running Verovio with the following options: %s", pprint.pformat(VRV_OPTIONS)) tk.setOptions(VRV_OPTIONS) - for file in os.listdir(IMAGES_PATH): - # Skip everything that is not an .mei or .xml file - if not file.endswith(".mei"): - continue - - mei_file = os.path.join(IMAGES_PATH, file) - svg_file = os.path.join(IMAGES_PATH, f"{file}.svg") + for mei_file in IMAGES_PATH.glob("*.mei"): + svg_file = mei_file.with_suffix(".svg") - if os.path.exists(svg_file) and os.path.exists(mei_file) and not args.clean: - log.info("This example already exists, and we're not running in cleaning mode. Skipping.") + if svg_file.exists() and mei_file.exists() and not args.clean: + log.info("%s already exists, and we're not running in cleaning mode. Skipping.", svg_file.name) continue # Download the MEI file from the given url - mei_example: str = "" - with open(mei_file) as f: - mei_example = f.read() + mei_example: str = mei_file.read_text() if not tk.loadData(mei_example): - log.error("Failed to load %s", mei_file) + log.error("Failed to load %s", mei_file.name) success = False continue svg: str = tk.renderToSVG(1) if svg: - with open(svg_file, 'w') as f: - f.write(svg) - log.info("Successfully rendered %s", svg_file) + svg_file.write_text(svg) + log.info("Successfully rendered %s", svg_file.name) else: - log.error("Failed to render %s", mei_file) + log.error("Failed to render %s", mei_file.name) success = False - log.debug("Finished processing %s", mei_file) + log.debug("Finished processing %s", mei_file.name) if not success: sys.exit(1) diff --git a/utils/guidelines_xslt/odd2html.xsl b/utils/guidelines_xslt/odd2html.xsl index 72f1b8dfb..69b099880 100644 --- a/utils/guidelines_xslt/odd2html.xsl +++ b/utils/guidelines_xslt/odd2html.xsl @@ -107,7 +107,7 @@ The version of the Guidelines - + @@ -201,8 +201,8 @@ - +
    diff --git a/utils/guidelines_xslt/odd2html/functions.xsl b/utils/guidelines_xslt/odd2html/functions.xsl index 8bd9885ce..a49227cdc 100644 --- a/utils/guidelines_xslt/odd2html/functions.xsl +++ b/utils/guidelines_xslt/odd2html/functions.xsl @@ -101,7 +101,7 @@ - + @@ -180,6 +180,7 @@ +
    - +
    diff --git a/utils/guidelines_xslt/odd2html/guidelines.xsl b/utils/guidelines_xslt/odd2html/guidelines.xsl index c8a803dff..e9823cc67 100644 --- a/utils/guidelines_xslt/odd2html/guidelines.xsl +++ b/utils/guidelines_xslt/odd2html/guidelines.xsl @@ -199,7 +199,9 @@ - + + + @@ -265,7 +267,7 @@ - + @@ -361,7 +363,6 @@ - soCalled @@ -400,11 +401,56 @@ - term + Names + + + + + + + + + + + + + + + + + + Terms - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -416,6 +462,15 @@ + + + Quoted content + + + + + + Emphasized content diff --git a/utils/guidelines_xslt/odd2html/prepareLiveExamples.xsl b/utils/guidelines_xslt/odd2html/prepareLiveExamples.xsl index d9bbe6495..7daa93e3c 100644 --- a/utils/guidelines_xslt/odd2html/prepareLiveExamples.xsl +++ b/utils/guidelines_xslt/odd2html/prepareLiveExamples.xsl @@ -43,6 +43,7 @@ + diff --git a/utils/guidelines_xslt/odd2html/specs/attClassSpecs.xsl b/utils/guidelines_xslt/odd2html/specs/attClassSpecs.xsl index 85bc4de96..2f8d3a5a8 100644 --- a/utils/guidelines_xslt/odd2html/specs/attClassSpecs.xsl +++ b/utils/guidelines_xslt/odd2html/specs/attClassSpecs.xsl @@ -40,6 +40,7 @@ the section element +

    Attribute Class Specifications

    diff --git a/utils/guidelines_xslt/odd2html/specs/dataTypeSpecs.xsl b/utils/guidelines_xslt/odd2html/specs/dataTypeSpecs.xsl index 4acb9f156..f7b3047c2 100644 --- a/utils/guidelines_xslt/odd2html/specs/dataTypeSpecs.xsl +++ b/utils/guidelines_xslt/odd2html/specs/dataTypeSpecs.xsl @@ -24,7 +24,7 @@ Module Used By - Allowed values + Tolerated values Remarks (optional) Constraints (optional) Declaration @@ -40,6 +40,7 @@ the section element +

    Data Type Specifications

    @@ -61,7 +62,7 @@ - + @@ -74,7 +75,7 @@ - + diff --git a/utils/guidelines_xslt/odd2html/specs/elementSpecs.xsl b/utils/guidelines_xslt/odd2html/specs/elementSpecs.xsl index 1e638c5e5..7cd9c1d3c 100644 --- a/utils/guidelines_xslt/odd2html/specs/elementSpecs.xsl +++ b/utils/guidelines_xslt/odd2html/specs/elementSpecs.xsl @@ -42,6 +42,7 @@ the section element +

    Element Specifications

    diff --git a/utils/guidelines_xslt/odd2html/specs/genericSpecFunctions.xsl b/utils/guidelines_xslt/odd2html/specs/genericSpecFunctions.xsl index 0900ced5b..0e93e445a 100644 --- a/utils/guidelines_xslt/odd2html/specs/genericSpecFunctions.xsl +++ b/utils/guidelines_xslt/odd2html/specs/genericSpecFunctions.xsl @@ -463,19 +463,21 @@ - Retreives the allowed values of an attribute + Retrieves the tolerated values of an attribute - + -
    -
    Allowed Values
    + + +
    +
    @@ -607,7 +609,7 @@ - Resolves the defition of an attribute + Resolves the definition of an attribute The current attribute @@ -631,7 +633,8 @@ - Allowed values are: + + , "" () @@ -1148,12 +1151,7 @@ - - - - - - + @@ -1162,16 +1160,30 @@ - - - - - - - + + + + + Processes ancestor models for a given object + + + + + + + + + + + + + + + + diff --git a/utils/guidelines_xslt/odd2html/specs/macroGroupSpecs.xsl b/utils/guidelines_xslt/odd2html/specs/macroGroupSpecs.xsl index 9afffcf46..190c801da 100644 --- a/utils/guidelines_xslt/odd2html/specs/macroGroupSpecs.xsl +++ b/utils/guidelines_xslt/odd2html/specs/macroGroupSpecs.xsl @@ -42,6 +42,7 @@ the section element +

    Macro Group Specifications

    diff --git a/utils/guidelines_xslt/odd2html/specs/modelClassSpecs.xsl b/utils/guidelines_xslt/odd2html/specs/modelClassSpecs.xsl index 232a1f2d0..bef496400 100644 --- a/utils/guidelines_xslt/odd2html/specs/modelClassSpecs.xsl +++ b/utils/guidelines_xslt/odd2html/specs/modelClassSpecs.xsl @@ -41,6 +41,7 @@ the section element +

    Model Class Specifications