aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-12-28 11:40:53 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2015-12-28 11:40:53 -0800
commit32cba5183cae23eb5a48dfed610251fada605a81 (patch)
treecbb039f1c7d1f19825834f328e914ff7dd9830c7
parent4da283454624a25509b3ca843660b37fd2929422 (diff)
DTD - Rename html -> html_block, inline_html -> html_inline.
For consistency.
-rw-r--r--CommonMark.dtd20
1 files changed, 10 insertions, 10 deletions
diff --git a/CommonMark.dtd b/CommonMark.dtd
index 2f6f74b..fad0728 100644
--- a/CommonMark.dtd
+++ b/CommonMark.dtd
@@ -1,9 +1,9 @@
<!-- DTD for CommonMark xml export format -->
<!ENTITY % block
- 'block_quote|list|code_block|html|paragraph|heading|thematic_break|custom_block'>
+ 'block_quote|list|code_block|paragraph|heading|thematic_break|html_block|custom_block'>
<!ENTITY % inline
- 'text|softbreak|linebreak|code|inline_html|emph|strong|link|image|custom_inline'>
+ 'text|softbreak|linebreak|code|emph|strong|link|image|html_inline|custom_inline'>
<!ELEMENT document (%block;)*>
<!ATTLIST document
@@ -27,10 +27,6 @@
xml:space CDATA #FIXED "preserve"
info CDATA #IMPLIED>
-<!ELEMENT html (#PCDATA)>
-<!ATTLIST html
- xml:space CDATA #FIXED "preserve">
-
<!ELEMENT paragraph (%inline;)*>
<!ELEMENT heading (%inline;)*>
@@ -39,6 +35,10 @@
<!ELEMENT thematic_break EMPTY>
+<!ELEMENT html_block (#PCDATA)>
+<!ATTLIST html_block
+ xml:space CDATA #FIXED "preserve">
+
<!ELEMENT custom_block (%inline;|%block;)*>
<!ATTLIST custom_block
on_enter CDATA #IMPLIED
@@ -56,10 +56,6 @@
<!ATTLIST code
xml:space CDATA #FIXED "preserve">
-<!ELEMENT inline_html (#PCDATA)>
-<!ATTLIST inline_html
- xml:space CDATA #FIXED "preserve">
-
<!ELEMENT emph (%inline;)*>
<!ELEMENT strong (%inline;)*>
@@ -74,6 +70,10 @@
url CDATA #REQUIRED
title CDATA #IMPLIED>
+<!ELEMENT html_inline (#PCDATA)>
+<!ATTLIST html_inline
+ xml:space CDATA #FIXED "preserve">
+
<!ELEMENT custom_inline (%inline;)*>
<!ATTLIST custom_inline
on_enter CDATA #IMPLIED