From 5b7afab3ebde59e8dd58c8eb9a93f8cd6bd85398 Mon Sep 17 00:00:00 2001 From: Dave Rice Date: Wed, 25 Jul 2018 10:02:51 -0400 Subject: [PATCH 1/3] remove unused ebml schema transform --- Makefile | 5 +- transforms/ebml_schema2markdown.xsl | 164 ---------------------------- 2 files changed, 1 insertion(+), 168 deletions(-) delete mode 100644 transforms/ebml_schema2markdown.xsl diff --git a/Makefile b/Makefile index 0c7b3a29..dffb8919 100644 --- a/Makefile +++ b/Makefile @@ -33,9 +33,6 @@ $(OUTPUT_TAGS).md: index_tags.md tagging.md matroska_tagging_registry.md tagging %.txt: %.xml xml2rfc $< -o $@ -ebml_matroska_elements.md: ebml_matroska.xml transforms/ebml_schema2markdown.xsl - xsltproc transforms/ebml_schema2markdown.xsl $< > $@ - matroska_tagging_registry.md: matroska_tags.xml transforms/matroska_tags2markdown4rfc.xsl xsltproc transforms/matroska_tags2markdown4rfc.xsl $< > $@ @@ -43,7 +40,7 @@ website: jekyll b clean: - $(RM) -f $(OUTPUT_MATROSKA).txt $(OUTPUT_MATROSKA).html $(OUTPUT_MATROSKA).md $(OUTPUT_MATROSKA).xml ebml_matroska_elements.md ebml_matroska_elements4rfc.md matroska_tagging_registry.md + $(RM) -f $(OUTPUT_MATROSKA).txt $(OUTPUT_MATROSKA).html $(OUTPUT_MATROSKA).md $(OUTPUT_MATROSKA).xml ebml_matroska_elements4rfc.md matroska_tagging_registry.md $(RM) -f $(OUTPUT_CODEC).txt $(OUTPUT_CODEC).html $(OUTPUT_CODEC).md $(OUTPUT_CODEC).xml $(RM) -f $(OUTPUT_TAGS).txt $(OUTPUT_TAGS).html $(OUTPUT_TAGS).md $(OUTPUT_TAGS).xml $(RM) -rf _site diff --git a/transforms/ebml_schema2markdown.xsl b/transforms/ebml_schema2markdown.xsl deleted file mode 100644 index 5d7de937..00000000 --- a/transforms/ebml_schema2markdown.xsl +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - # - - - - - Element Name - - - - Element ID - - - - Element Type - - - - Version - - - - - - 1 - - - - - - - - - - - - - DEPRECATED - - - - - Parent Element - - - - [ - - ](# - - ) - - None - - - - - Child Elements - - - - - [ - - ](# - - ) - - - None - - - - - Element Context - - - - - /[ - - ](# - - ) - - / - - - None - - - - - Mandatory - - - Not Mandatory - Not Mandatory - Mandatory - - A minimum of - - must occur. - - - - - - Repeatability - - - Not Repeatable - Repeatable - Repeatable, but must only repeat as identical copies (for redundancy) - Not Repeatable - - A maximum of - - may occur. - - - - - - Recursive - - - Recursive - Not Recursive - - - - - Documentation - - - - - - - - - | - - - :---|:---- - - - - - - - | - - - - \ No newline at end of file From e0b6a68f9af696e645cd99f5ef34e7209df9c4a2 Mon Sep 17 00:00:00 2001 From: Dave Rice Date: Wed, 25 Jul 2018 11:37:24 -0400 Subject: [PATCH 2/3] add section nesting to mkv elements --- Makefile | 2 +- transforms/ebml_schema2markdown4rfc.xsl | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index dffb8919..c3c8f383 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ $(OUTPUT_TAGS).md: index_tags.md tagging.md matroska_tagging_registry.md tagging cat $^ > $@ %.xml: %.md - mmark -xml2 -page $< > $@ + mmark -xml2 -page $< | awk '/\n"); modif=1 } {print}' > $@ %.html: %.xml xml2rfc --html $< -o $@ diff --git a/transforms/ebml_schema2markdown4rfc.xsl b/transforms/ebml_schema2markdown4rfc.xsl index 8b5e105b..f590a679 100644 --- a/transforms/ebml_schema2markdown4rfc.xsl +++ b/transforms/ebml_schema2markdown4rfc.xsl @@ -1,13 +1,21 @@ - - + + - ### + + + ### + + + + + + Element From 59554fcd9331d2e0ee5e82020daae728c9044eb9 Mon Sep 17 00:00:00 2001 From: Dave Rice Date: Wed, 25 Jul 2018 14:10:24 -0400 Subject: [PATCH 3/3] adjust text to move element descriptions up a level and limit sectional depth to 6 --- Makefile | 2 +- matroska_schema_section_header.md | 11 ++++------- transforms/ebml_schema2markdown4rfc.xsl | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index c3c8f383..6116bbed 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ $(OUTPUT_TAGS).md: index_tags.md tagging.md matroska_tagging_registry.md tagging cat $^ > $@ %.xml: %.md - mmark -xml2 -page $< | awk '/\n"); modif=1 } {print}' > $@ + mmark -xml2 -page $< | awk '/\n"); modif=1 } {print}' > $@ %.html: %.xml xml2rfc --html $< -o $@ diff --git a/matroska_schema_section_header.md b/matroska_schema_section_header.md index 749949f8..3e820f3a 100644 --- a/matroska_schema_section_header.md +++ b/matroska_schema_section_header.md @@ -1,9 +1,5 @@ -# Matroska Schema - -This specification includes an `EBML Schema` which defines the Elements and structure of Matroska as an EBML Document Type. The EBML Schema defines every valid Matroska element in a manner defined by the EBML specification. - -## Matroska Additions to Schema Element Attributes +# Matroska Additions to Schema Element Attributes In addition to the EBML Schema definition provided by the EBML Specification, Matroska adds the following additional attributes: @@ -11,8 +7,9 @@ In addition to the EBML Schema definition provided by the EBML Specification, Ma |:---------------|:---------|:-----------| | webm | No | A boolean to express if the Matroska Element is also supported within version 2 of the `webm` specification. Please consider the [webm specification](http://www.webmproject.org/docs/container/) as the authoritative on `webm`. | -## Matroska Schema Element Definitions +# Matroska Schema + +This specification includes an `EBML Schema` which defines the Elements and structure of Matroska as an EBML Document Type. The EBML Schema defines every valid Matroska element in a manner defined by the EBML specification. Here the definition of each Matroska Element is provided. -% concatenate with Matroska EBML Schema converted to markdown % diff --git a/transforms/ebml_schema2markdown4rfc.xsl b/transforms/ebml_schema2markdown4rfc.xsl index f590a679..51b2aa52 100644 --- a/transforms/ebml_schema2markdown4rfc.xsl +++ b/transforms/ebml_schema2markdown4rfc.xsl @@ -9,10 +9,10 @@ - ### + ## - +