From cceb006ae2dd0164bc7f9fd0bac675e188419d5d Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Tue, 28 Oct 2003 13:13:35 +0000
Subject: [PATCH] Make firstterm isomorphic to glossterm

---
 docbook/xml/dbpoolx.mod | 54 +++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/docbook/xml/dbpoolx.mod b/docbook/xml/dbpoolx.mod
index e7a86b80c..85751436b 100644
--- a/docbook/xml/dbpoolx.mod
+++ b/docbook/xml/dbpoolx.mod
@@ -6886,7 +6886,6 @@ OtherCredit. -->
 <![%code.attlist;[
 <!ATTLIST code
 		language	CDATA	#IMPLIED
-		%moreinfo.attrib;
 		%common.attrib;
 		%code.role.attrib;
 		%local.code.attrib;
@@ -7650,29 +7649,6 @@ OtherCredit. -->
 <!--end of emphasis.attlist-->]]>
 <!--end of emphasis.module-->]]>
 
-<!ENTITY % firstterm.module "INCLUDE">
-<![%firstterm.module;[
-<!ENTITY % local.firstterm.attrib "">
-<!ENTITY % firstterm.role.attrib "%role.attrib;">
-
-<!ENTITY % firstterm.element "INCLUDE">
-<![%firstterm.element;[
-<!ELEMENT firstterm %ho; (%word.char.mix;)*>
-<!--end of firstterm.element-->]]>
-
-<!-- to GlossEntry or other explanation -->
-
-
-<!ENTITY % firstterm.attlist "INCLUDE">
-<![%firstterm.attlist;[
-<!ATTLIST firstterm
-		%linkend.attrib;		%common.attrib;
-		%firstterm.role.attrib;
-		%local.firstterm.attrib;
->
-<!--end of firstterm.attlist-->]]>
-<!--end of firstterm.module-->]]>
-
 <!ENTITY % foreignphrase.module "INCLUDE">
 <![%foreignphrase.module;[
 <!ENTITY % local.foreignphrase.attrib "">
@@ -7708,11 +7684,11 @@ OtherCredit. -->
 <!-- BaseForm: Provides the form of GlossTerm to be used
 		for indexing -->
 
-
 <!ENTITY % glossterm.attlist "INCLUDE">
 <![%glossterm.attlist;[
 <!ATTLIST glossterm
-		%linkend.attrib;		baseform	CDATA		#IMPLIED
+		baseform	CDATA		#IMPLIED
+		%linkend.attrib;
 		%common.attrib;
 		%glossterm.role.attrib;
 		%local.glossterm.attrib;
@@ -7720,6 +7696,32 @@ OtherCredit. -->
 <!--end of glossterm.attlist-->]]>
 <!--end of glossterm.module-->]]>
 
+<!ENTITY % firstterm.module "INCLUDE">
+<![%firstterm.module;[
+<!ENTITY % local.firstterm.attrib "">
+<!ENTITY % firstterm.role.attrib "%role.attrib;">
+
+<!ENTITY % firstterm.element "INCLUDE">
+<![%firstterm.element;[
+<!ELEMENT firstterm %ho; (%para.char.mix;)*
+		%glossterm.exclusion;>
+<!--end of firstterm.element-->]]>
+
+<!-- to GlossEntry or other explanation -->
+
+
+<!ENTITY % firstterm.attlist "INCLUDE">
+<![%firstterm.attlist;[
+<!ATTLIST firstterm
+		baseform	CDATA		#IMPLIED
+		%linkend.attrib;
+		%common.attrib;
+		%firstterm.role.attrib;
+		%local.firstterm.attrib;
+>
+<!--end of firstterm.attlist-->]]>
+<!--end of firstterm.module-->]]>
+
 <!ENTITY % phrase.module "INCLUDE">
 <![%phrase.module;[
 <!ENTITY % local.phrase.attrib "">
-- 
2.40.0