diff --git a/RelaxNG/document-pdf-ua1.rnc b/RelaxNG/document-pdf-ua1.rnc
index 5852458..66c38d4 100644
--- a/RelaxNG/document-pdf-ua1.rnc
+++ b/RelaxNG/document-pdf-ua1.rnc
@@ -11,6 +11,12 @@ namespace Table = "http://iso.org/pdf/ssn/Table"
namespace List = "http://iso.org/pdf/ssn/List"
namespace Artifact = "http://iso.org/pdf/ssn/Artifact"
+# XMP
+namespace x = "adobe:ns:meta/"
+namespace rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+namespace dc = "http://purl.org/dc/elements/1.1/"
+namespace pdfuaid = "http://www.aiim.org/pdfua/ns/id/"
+
# XHTML Namespace, not currently used
namespace h = "http://www.w3.org/1999/xhtml"
@@ -40,15 +46,47 @@ pdf1rolemap-Note = attribute rolemaps-to {"Note"}
# UA-1 does not force a single document element.
start = PDF
-PDF = element NoNS:PDF {StructTreeRoot}
+PDF = element NoNS:PDF {StructTreeRoot,XMP?}
+
StructTreeRoot = element NoNS:StructTreeRoot {( Document|DocumentFragment|Part|Art|Div|Sect|TOC|Aside|BlockQuote|NonStruct|Private|P|Note|Code|Hn|H|Title|Link|Annot|Form|FENote|Index|L|Table|Figure|Formula|Artifact)*}
+
AssociatedFile = element NoNS:AssociatedFile {
attribute name {text},
(text|math)
}
+AssociatedFilemath = element NoNS:AssociatedFile {
+attribute name {text},
+(math)
+}
+AssociatedFiletext = element NoNS:AssociatedFile {
+attribute name {text},
+(text)
+}
+
+formula-requirements = (
+ attribute actualtext {text}|
+ attribute alt {text}
+)
+
+## PDF/UA-1
+pdfuaid_part = element pdfuaid:part {"1"}
+
## share with pdf1.7 version from here to end
+# XMP data
+anyelem = element * {(attribute * {text}* | text | anyelem) *}
+
+XMP = element NoNS:XMP {x_xmpmeta & anyelem*}
+
+x_xmpmeta = element x:xmpmeta {attribute * {text}*,(rdf_RDF & anyelem*)}
+
+rdf_RDF= element rdf:RDF {attribute * {text}*, (rdf_Description & anyelem*)}
+
+rdf_Description= element rdf:Description {attribute * {text}*, (pdfuaid_part & anyelem*)}
+
+# end of XMP
+
textorHTML &= (Link|Reference|Strong|Code|Em|Lbl|Span|mathse|Quote|RB|Annot|Figure|Form)*
MathMLPGlobalAttributes &= showtags-attributes
@@ -493,13 +531,29 @@ Figure = element pdf2:Figure {
}
### Formula
-
+# expanded pdf2-attributes to avoid so much backtracking
Formula = element pdf2:Formula {
- pdf2-attributes,
+ AssociatedFiletext*,
+ formula-requirements ,
+ AssociatedFiletext*,
+ (
+ attribute lang {text}?, # Lang
+ attribute expansion {text}?, # E
+ attribute title {text}?, # T
+ attribute id {text}?, # ID
+ attribute phoneme {text}?, # Phoneme
+ attribute phonetic-alphabet {text}?, # PhoneticAlphabet
+ attribute revision {text}?, # R
+ layout-attributes,
+ otherns-attributes,
+ attribute af {text}?,
+ attribute rolemapped-from {text}?,
+ attribute referenced-as {text}?,
attribute Layout:Width {text}?,
attribute Layout:Height {text}?,
(H? & Caption? & (text|Part|Div|Aside|BlockQuote|NonStruct|Private|P|Note|Code|Hn|Sub|Lbl|Em|Strong|Span|Quote|Link|Reference|Annot|Form|Ruby|Warichu|FENote|Index|L|BibEntry|Table|Figure|Formula|Artifact|
mathse)*)
+)
}
### Artifact
@@ -571,3 +625,4 @@ pdf2-attributes,
(text|NonStruct|Private|Note|Code|Sub|Lbl|Em|Strong|Span|Quote|Link|Reference|Annot|Form|Ruby|Warichu|FENote|BibEntry|Figure|Formula|Artifact)*
}
+
diff --git a/RelaxNG/document-pdf-ua1.rng b/RelaxNG/document-pdf-ua1.rng
index a78275b..4e0f56f 100644
--- a/RelaxNG/document-pdf-ua1.rng
+++ b/RelaxNG/document-pdf-ua1.rng
@@ -1,2717 +1,2869 @@
-
-
-
-
-
-
-
-
-
-
-
-
- MathML Namespace (temp actualtext moved to content element in new code)
-
-
-
-
-
-
- \s*(([\-+]?[0-9]*([0-9]\.?|\.[0-9])[0-9]*(r?em|ex|in|cm|mm|p[xtc]|Q|v[hw]|vmin|vmax|%))|0)\s*
-
-
-
-
-
-
-
-
-
-
-
-
- P
-
-
-
-
- Span
-
-
-
-
- Note
-
-
-
-
-
-
-
-
-
-
-
- axis
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- false
-
-
-
-
-
-
- true
- false
-
-
-
-
-
-
-
-
-
-
-
- top
- bottom
- center
- baseline
- axis
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ axis
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ false
+
+
+
+
+
+
+ true
+ false
+
+
+
+
+
+
+
+
+
+
+
+ top
+ bottom
+ center
+ baseline
+ axis
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+