more fixes

public-law · Jul 22, 2023 · fcb9b7d · fcb9b7d
1 parent 7f64de0
commit fcb9b7d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/public_law/parsers/usa/colorado/crs.dtd b/public_law/parsers/usa/colorado/crs.dtd
@@ -6,9 +6,9 @@
 <!ELEMENT ANNO-TEXT    - O (#PCDATA | B | T | M | N | NL | P)* >
 <!ELEMENT ANNO-TOC     - O (#PCDATA | I | M | T)* >
 <!ELEMENT ART-ANAL     - - (AL | I | ART-PART | NL)+ >
-<!ELEMENT ART-PART     - - (#PCDATA | NL)* >
+<!ELEMENT ART-PART     - - (#PCDATA | NL | P)* >
 <!ELEMENT ARTICLE-NUM  - - (#PCDATA) >
-<!ELEMENT ARTICLE-PART - - (#PCDATA | NL)* >
+<!ELEMENT ARTICLE-PART - - (#PCDATA | NL | P)* >
 <!ELEMENT ARTICLE-TEXT - - (RHRTC) >
 <!ELEMENT B            - - (#PCDATA | IT | M | N | NL | P | T | U)* >
 <!ELEMENT BL           - O EMPTY >
@@ -27,7 +27,7 @@
 <!ELEMENT CDEF         - O EMPTY >
 <!ELEMENT CATCH-LINE   - - ANY >
 <!ELEMENT COL15        - O EMPTY >
-<!ELEMENT COMMENT-HEAD - - (#PCDATA | B | NL)* >
+<!ELEMENT COMMENT-HEAD - - (#PCDATA | B | NL | P)* >
 <!ELEMENT COMMENT-TEXT - - (#PCDATA | B | IP-5-5-5 | IT | M | P | S1 | T)* >
 <!ELEMENT CPOINT07     - O EMPTY >
 <!ELEMENT CPOINT09     - O EMPTY >

diff --git a/script/crs-txt-to-sgml.py b/script/crs-txt-to-sgml.py
@@ -54,6 +54,7 @@ def fix_unencoded_text(line: str) -> str:
         line.replace("&RE", "&amp;RE")
         .replace("M&S", "M&amp;S")
         .replace("&A ", "&amp;A ")
+        .replace("&ampl ", "&amp; ")
         .replace(chr(21), "")
         .replace(chr(12), "")
     )