For 'other' attributes, allow the other value to imply a primary value of 'other'

diff --git a/docbook/relaxng/src/callouts.rnc b/docbook/relaxng/src/callouts.rnc
index b9855bd97317190cc74f59a0c377968a7b49bb72..357ea2162fa3be906e5fe2ef7f6187bb5a3364a5 100644 (file)
--- a/docbook/relaxng/src/callouts.rnc
+++ b/docbook/relaxng/src/callouts.rnc
@@ -46,7 +46,7 @@ area.units-enum.attribute =
    }?
 
 area.units-other.attributes =
-   attribute units { "other" },
+   attribute units { "other" }?,
    attribute otherunits { xsd:NMTOKEN }
 
 area.units.attrib =

diff --git a/docbook/relaxng/src/pool.rnc b/docbook/relaxng/src/pool.rnc
index b744ec8e9d585ff097fdf5bac17c7e3258654f30..e2d47fa5128c034bb5cba189fbfb2bc5694f12b3 100644 (file)
--- a/docbook/relaxng/src/pool.rnc
+++ b/docbook/relaxng/src/pool.rnc
@@ -169,7 +169,7 @@ biblio.class-enum.attribute =
     | "uri" }?
 
 biblio.class-other.attributes =
-   attribute class { "other" },
+   attribute class { "other" }?,
    attribute otherclass { xsd:NMTOKEN }
 
 biblio.class.attrib = (biblio.class-enum.attribute | biblio.class-other.attributes)
@@ -754,7 +754,7 @@ div {
       step.role.attribute?
     & common.attributes
     & common.linking.attributes
-    & performance.attribute
+    & performance.attribute?
 
    step.info = docbook.info.titleonly
 
@@ -781,7 +781,7 @@ div {
       stepalternatives.role.attribute?
     & common.attributes
     & common.linking.attributes
-    & performance.attribute
+    & performance.attribute?
 
    stepalternatives.info = docbook.info.titleforbidden
 
@@ -807,7 +807,7 @@ div {
       substeps.role.attribute?
     & common.attributes
     & common.linking.attributes
-    & performance.attribute
+    & performance.attribute?
 
    db.substeps =
       element substeps {
@@ -3216,7 +3216,7 @@ div {
        | "nonprofit" }?
 
    orgname.class-other.attributes =
-      attribute class { "other" },
+      attribute class { "other" }?,
       attribute otherclass { text }
 
    orgname.class.attrib = (orgname.class-enum.attribute | orgname.class-other.attributes)
@@ -3806,7 +3806,7 @@ div {
       }?
 
    bibliorelation.type-other.attributes =
-      attribute type { "othertype" },
+      attribute type { "othertype" }?,
       attribute othertype { xsd:NMTOKEN }
 
    bibliorelation.type.attrib =
@@ -3846,7 +3846,7 @@ div {
       }
 
    bibliocoverage.spatial-other.attributes =
-      attribute spatial { "otherspatial" },
+      attribute spatial { "otherspatial" }?,
       attribute otherspatial { xsd:NMTOKEN }
 
    bibliocoverage.spatial.attrs =
@@ -3862,7 +3862,7 @@ div {
       }
 
    bibliocoverage.temporal-other.attributes =
-      attribute temporal { "othertemporal" },
+      attribute temporal { "othertemporal" }?,
       attribute othertemporal { xsd:NMTOKEN }
 
    bibliocoverage.temporal.attrs =
@@ -4984,7 +4984,7 @@ div {
       }?
 
    keycap.function-other.attributes =
-      attribute function { "other" },
+      attribute function { "other" }?,
       attribute otherfunction { text }
 
    keycap.function.attrib =
@@ -5045,7 +5045,7 @@ div {
       }?
 
    keycombo.action-other.attributes =
-      attribute action { "other" },
+      attribute action { "other" }?,
       attribute otheraction { text }
 
    keycombo.action.attrib =