From 1241b36d06a2016db9fcdc5dfd4d7478a67e426c Mon Sep 17 00:00:00 2001 From: Norman Walsh Date: Fri, 9 Jan 2004 14:15:49 +0000 Subject: [PATCH] Fix Schematron rules; make attributes on example and equation the same as figure; make content model of foreignphrase smaller --- docbook/relaxng/src/pool.rnc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docbook/relaxng/src/pool.rnc b/docbook/relaxng/src/pool.rnc index 361e3e781..634065e0d 100644 --- a/docbook/relaxng/src/pool.rnc +++ b/docbook/relaxng/src/pool.rnc @@ -1222,6 +1222,7 @@ div { footnote.role.attribute? & common.attributes & common.linking.attributes + & attribute label { text }? & local.footnote.attributes db.footnote = @@ -1840,6 +1841,7 @@ div { & common.linking.attributes & attribute label { text }? & floatstyle.attribute? + & float.attribute? & attribute width { text }? & local.example.attributes @@ -2394,6 +2396,10 @@ div { equation.role.attribute? & common.attributes & common.linking.attributes + & attribute label { text }? + & pgwide.attribute? + & floatstyle.attribute? + & float.attribute? & local.equation.attributes equation.info = docbook.info.titleonlyreq @@ -2663,7 +2669,7 @@ div { s:rule [ context = "db:synopfragmentref" s:assert [ - test = "local-name(//*[@id=current()/@linkend]) = 'synopfragment' and namespace-uri(//*[@id=current()/@linkend]) = 'http://docbook.org/docbook-ng/absinthe'" + test = "local-name(//*[@id=current()/@linkend]) = 'synopfragment' and namespace-uri(//*[@id=current()/@linkend]) = 'http://docbook.org/docbook-ng'" "@linkend on synopfragmentref must point to a synopfragment." ] ] @@ -6635,7 +6641,7 @@ div { db.foreignphrase = element foreignphrase { foreignphrase.attlist, - inlines* + (text | general.inlines)* } } @@ -6817,7 +6823,7 @@ div { s:rule [ context = "db:footnoteref" s:assert [ - test = "local-name(//*[@id=current()/@linkend]) = 'footnote' and namespace-uri(//*[@id=current()/@linkend]) = 'http://docbook.org/docbook-ng/absinthe'" + test = "local-name(//*[@id=current()/@linkend]) = 'footnote' and namespace-uri(//*[@id=current()/@linkend]) = 'http://docbook.org/docbook-ng'" "@linkend on footnoteref must point to a footnote." ] ] -- 2.40.0