Change semantics of termdef so that a firstterm is required; move the addition of...

diff --git a/docbook/relaxng/docbook/src/glossary.rnc b/docbook/relaxng/docbook/src/glossary.rnc
index 9db04ed555db128c79220fde27c0142bd55ef363..9fa54b56c63a48238c0b36ba4c549b51b51c2a7e 100644 (file)
--- a/docbook/relaxng/docbook/src/glossary.rnc
+++ b/docbook/relaxng/docbook/src/glossary.rnc
@@ -349,6 +349,8 @@ div {
 
 # ======================================================================
 
+db.technical.inlines |= db.termdef
+
 [
    db:refname [ "termdef" ]
    db:refpurpose [ "An inline definition of a term" ]
@@ -369,7 +371,7 @@ div {
             s:rule [
                context = "db:termdef"
                s:assert [
-                  test = "count(db:glossterm) = 1"
+                  test = "count(db:firstterm) = 1"
                   "A termdef must contain exactly one glossterm"
                ]
             ]

diff --git a/docbook/relaxng/docbook/src/pool.rnc b/docbook/relaxng/docbook/src/pool.rnc
index beab9ee57d86859f7dd4c574f280e7a5221f4c4c..fdd2cae82f15414a2f0bc7129bfceeede3379c2c 100644 (file)
--- a/docbook/relaxng/docbook/src/pool.rnc
+++ b/docbook/relaxng/docbook/src/pool.rnc
@@ -657,7 +657,6 @@ db.technical.inlines =
  | db.package
  | db.parameter
  | db.property
- | db.termdef
 
 db.error.inlines =
    db.errorcode