From 86ecfe41110852173fce02bd085364fa0089cf05 Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Sat, 2 Apr 2005 05:52:57 +0000
Subject: [PATCH] regenerated based on Simplified 1.1

---
 website/schema/dtd/website.dtd | 785 +++++++++++++++++++++------------
 1 file changed, 500 insertions(+), 285 deletions(-)

diff --git a/website/schema/dtd/website.dtd b/website/schema/dtd/website.dtd
index 0600d8112..e64022186 100644
--- a/website/schema/dtd/website.dtd
+++ b/website/schema/dtd/website.dtd
@@ -1,10 +1,10 @@
 <!-- *********************************************************************
      *** THIS IS THE FLATTENED DTD. DO NOT EDIT THIS DTD BY HAND, EDIT ***
-     *** THE CUSTOMIZATION LAYER AND REGNERATE THE FLATTENED DTD! ********
+     *** THE CUSTOMIZATION LAYER AND REGENERATE THE FLATTENED DTD! ********
      ********************************************************************* -->
 
 <!-- ====================================================================== -->
-<!-- Website DTD V2.5.0
+<!-- Website DTD V2.5.1
      Copyright (C) 1997-2003 Norman Walsh
      http://sourceforge.net/projects/docbook/
 
@@ -17,8 +17,8 @@
 
      <?xml version="1.0"?>
      <!DOCTYPE webpage
-       PUBLIC "-//Norman Walsh//DTD Website V2.5.0//EN"
-       "http://docbook.sourceforge.net/release/website/2.5.0/schema/dtd/website.dtd">
+       PUBLIC "-//Norman Walsh//DTD Website V2.5.1//EN"
+       "http://docbook.sourceforge.net/release/website/2.5.1/schema/dtd/website.dtd">
                                                                             -->
 <!-- ====================================================================== -->
 
@@ -90,6 +90,8 @@
 		"example|figure|table %local.formal.class;">
 <!ENTITY % compound.class
 		"sidebar %local.compound.class;">
+<!ENTITY % local.genobj.class "">
+<!ENTITY % genobj.class "anchor %local.genobj.class;">
 <!ENTITY % local.descobj.class "">
 <!ENTITY % descobj.class
 		"abstract|authorblurb|epigraph
@@ -110,18 +112,28 @@
 		|replaceable
 		|systemitem|userinput
 		%local.tech.char.class;">
+<!ENTITY % local.base.char.class "">
+<!ENTITY % base.char.class "anchor %local.base.char.class;">
 <!ENTITY % local.docinfo.char.class "">
 <!ENTITY % docinfo.char.class
 		"author|corpauthor|othercredit
 		|revhistory
 		%local.docinfo.char.class;">
+<!ENTITY % local.other.char.class "">
+<!ENTITY % other.char.class
+		"subscript|superscript %local.other.char.class;">
 <!ENTITY % local.inlineobj.char.class "">
 <!ENTITY % inlineobj.char.class
 		"inlinemediaobject %local.inlineobj.char.class;">
+<!ENTITY % local.effectivity.attrib "">
+<!ENTITY % effectivity.attrib 
+	"%local.effectivity.attrib;"
+>
 <!ENTITY % local.common.attrib "">
 <!ENTITY % common.attrib
 	"id		ID		#IMPLIED
 	lang		CDATA		#IMPLIED
+        remap           CDATA           #IMPLIED
 	revisionflag	(changed
 			|added
 			|deleted
@@ -156,7 +168,7 @@
 		|%linespecific.class;
 		|%para.class;		|%informal.class;
 		|%formal.class;		|%compound.class;
-					|%descobj.class;
+		|%genobj.class;		|%descobj.class;
 		%local.component.mix;">
 <!ENTITY % local.sidebar.mix "">
 <!ENTITY % sidebar.mix
@@ -164,6 +176,7 @@
 		|%linespecific.class;
 		|%para.class;		|%informal.class;
 		|%formal.class;
+		|%genobj.class;
 		%local.sidebar.mix;">
 <!ENTITY % local.qandaset.mix "">
 <!ENTITY % qandaset.mix
@@ -171,6 +184,7 @@
 		|%linespecific.class;
 		|%para.class;		|%informal.class;
 		|%formal.class;
+		|%genobj.class;
 		%local.qandaset.mix;">
 <!ENTITY % local.revdescription.mix "">
 <!ENTITY % revdescription.mix
@@ -178,6 +192,7 @@
 		|%linespecific.class;
 		|%para.class;		|%informal.class;
 		|%formal.class;
+		|%genobj.class;
 		%local.revdescription.mix;">
 <!ENTITY % local.footnote.mix "">
 <!ENTITY % footnote.mix
@@ -226,27 +241,30 @@
 		"                  	 %admon.class;
 		|%linespecific.class;
 		|%para.class;		|%informal.class;
-		 		        |%descobj.class;
+		|%genobj.class;		|%descobj.class;
 		%local.listpreamble.mix;">
 <!ENTITY % para.char.mix
 		"#PCDATA
 		|%xref.char.class;	|%gen.char.class;
 		|%link.char.class;	|%tech.char.class;
-					|%inlineobj.char.class;
+                |%base.char.class;
+		|%other.char.class;	|%inlineobj.char.class;
 		%local.para.char.mix;">
 <!ENTITY % local.title.char.mix "">
 <!ENTITY % title.char.mix
 		"#PCDATA
 		|%xref.char.class;	|%gen.char.class;
 		|%link.char.class;	|%tech.char.class;
+                |%base.char.class;
 					|%docinfo.char.class;
-					|%inlineobj.char.class;
+		|%other.char.class;	|%inlineobj.char.class;
 		%local.title.char.mix;">
 <!ENTITY % local.cptr.char.mix "">
 <!ENTITY % cptr.char.mix
 		"#PCDATA
 		|%link.char.class;	|%tech.char.class;
-					|inlinemediaobject
+                |%base.char.class;
+		|%other.char.class;	|inlinemediaobject
 		%local.cptr.char.mix;">
 <!ENTITY % local.smallcptr.char.mix "">
 <!ENTITY % smallcptr.char.mix
@@ -259,7 +277,8 @@
 		"#PCDATA
 					|acronym|emphasis|trademark
 		|%link.char.class;
-					|inlinemediaobject
+                |%base.char.class;
+		|%other.char.class;	|inlinemediaobject
 		%local.word.char.mix;">
 <!ENTITY % local.docinfo.char.mix "">
 <!ENTITY % docinfo.char.mix
@@ -267,10 +286,11 @@
 		|%link.char.class;
 					|emphasis|trademark
 					|replaceable
-					|inlinemediaobject
+		|%other.char.class;	|inlinemediaobject
 		%local.docinfo.char.mix;">
 <!ENTITY % tbl.table.mdl
-	"(title, (mediaobject+|tgroup+))">
+	"((title, (mediaobject+|tgroup+))
+          |(caption, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+)))">
 <!ENTITY % divcomponent.mix
 		"%list.class;		|%admon.class;
 		|%linespecific.class;
@@ -281,230 +301,230 @@
 <!ENTITY % bookcomponent.content
 	"((%divcomponent.mix;)+, section*)
 	| section+">
-<!ENTITY aacute	"&#x00E1;">
-<!ENTITY Aacute	"&#x00C1;">
-<!ENTITY acirc	"&#x00E2;">
-<!ENTITY Acirc	"&#x00C2;">
-<!ENTITY agrave	"&#x00E0;">
-<!ENTITY Agrave	"&#x00C0;">
-<!ENTITY aring	"&#x00E5;">
-<!ENTITY Aring	"&#x00C5;">
-<!ENTITY atilde	"&#x00E3;">
-<!ENTITY Atilde	"&#x00C3;">
-<!ENTITY auml	"&#x00E4;">
-<!ENTITY Auml	"&#x00C4;">
-<!ENTITY aelig	"&#x00E6;">
-<!ENTITY AElig	"&#x00C6;">
-<!ENTITY ccedil	"&#x00E7;">
-<!ENTITY Ccedil	"&#x00C7;">
-<!ENTITY eth	"&#x00F0;">
-<!ENTITY ETH	"&#x00D0;">
-<!ENTITY eacute	"&#x00E9;">
-<!ENTITY Eacute	"&#x00C9;">
-<!ENTITY ecirc	"&#x00EA;">
-<!ENTITY Ecirc	"&#x00CA;">
-<!ENTITY egrave	"&#x00E8;">
-<!ENTITY Egrave	"&#x00C8;">
-<!ENTITY euml	"&#x00EB;">
-<!ENTITY Euml	"&#x00CB;">
-<!ENTITY iacute	"&#x00ED;">
-<!ENTITY Iacute	"&#x00CD;">
-<!ENTITY icirc	"&#x00EE;">
-<!ENTITY Icirc	"&#x00CE;">
-<!ENTITY igrave	"&#x00EC;">
-<!ENTITY Igrave	"&#x00CC;">
-<!ENTITY iuml	"&#x00EF;">
-<!ENTITY Iuml	"&#x00CF;">
-<!ENTITY ntilde	"&#x00F1;">
-<!ENTITY Ntilde	"&#x00D1;">
-<!ENTITY oacute	"&#x00F3;">
-<!ENTITY Oacute	"&#x00D3;">
-<!ENTITY ocirc	"&#x00F4;">
-<!ENTITY Ocirc	"&#x00D4;">
-<!ENTITY ograve	"&#x00F2;">
-<!ENTITY Ograve	"&#x00D2;">
-<!ENTITY oslash	"&#x00F8;">
-<!ENTITY Oslash	"&#x00D8;">
-<!ENTITY otilde	"&#x00F5;">
-<!ENTITY Otilde	"&#x00D5;">
-<!ENTITY ouml	"&#x00F6;">
-<!ENTITY Ouml	"&#x00D6;">
-<!ENTITY szlig	"&#x00DF;">
-<!ENTITY thorn	"&#x00FE;">
-<!ENTITY THORN	"&#x00DE;">
-<!ENTITY uacute	"&#x00FA;">
-<!ENTITY Uacute	"&#x00DA;">
-<!ENTITY ucirc	"&#x00FB;">
-<!ENTITY Ucirc	"&#x00DB;">
-<!ENTITY ugrave	"&#x00F9;">
-<!ENTITY Ugrave	"&#x00D9;">
-<!ENTITY uuml	"&#x00FC;">
-<!ENTITY Uuml	"&#x00DC;">
-<!ENTITY yacute	"&#x00FD;">
-<!ENTITY Yacute	"&#x00DD;">
-<!ENTITY yuml	"&#x00FF;">
-<!ENTITY half	"&#x00BD;">
-<!ENTITY frac12	"&#x00BD;">
-<!ENTITY frac14	"&#x00BC;">
-<!ENTITY frac34	"&#x00BE;">
-<!ENTITY frac18	"&#x215B;">
-<!ENTITY frac38	"&#x215C;">
-<!ENTITY frac58	"&#x215D;">
-<!ENTITY frac78	"&#x215E;">
-<!ENTITY sup1	"&#x00B9;">
-<!ENTITY sup2	"&#x00B2;">
-<!ENTITY sup3	"&#x00B3;">
-<!ENTITY plus	"&#x002B;">
-<!ENTITY plusmn	"&#x00B1;">
-<!ENTITY lt	"&#38;#60;">
-<!ENTITY equals	"&#x003D;">
-<!ENTITY gt	"&#x003E;">
-<!ENTITY divide	"&#x00F7;">
-<!ENTITY times	"&#x00D7;">
-<!ENTITY curren	"&#x00A4;">
-<!ENTITY pound	"&#x00A3;">
-<!ENTITY dollar	"&#x0024;">
-<!ENTITY cent	"&#x00A2;">
-<!ENTITY yen	"&#x00A5;">
-<!ENTITY num	"&#x0023;">
-<!ENTITY percnt	"&#x0025;">
-<!ENTITY amp	"&#38;#38;">
-<!ENTITY ast	"&#x002A;">
-<!ENTITY commat	"&#x0040;">
-<!ENTITY lsqb	"&#x005B;">
-<!ENTITY bsol	"&#x005C;">
-<!ENTITY rsqb	"&#x005D;">
-<!ENTITY lcub	"&#x007B;">
-<!ENTITY horbar	"&#x2015;">
-<!ENTITY verbar	"&#x007C;">
-<!ENTITY rcub	"&#x007D;">
-<!ENTITY micro	"&#x00B5;">
-<!ENTITY ohm	"&#x2126;">
-<!ENTITY deg	"&#x00B0;">
-<!ENTITY ordm	"&#x00BA;">
-<!ENTITY ordf	"&#x00AA;">
-<!ENTITY sect	"&#x00A7;">
-<!ENTITY para	"&#x00B6;">
-<!ENTITY middot	"&#x00B7;">
-<!ENTITY larr	"&#x2190;">
-<!ENTITY rarr	"&#x2192;">
-<!ENTITY uarr	"&#x2191;">
-<!ENTITY darr	"&#x2193;">
-<!ENTITY copy	"&#x00A9;">
-<!ENTITY reg	"&#x00AE;">
-<!ENTITY trade	"&#x2122;">
-<!ENTITY brvbar	"&#x00A6;">
-<!ENTITY not	"&#x00AC;">
-<!ENTITY sung	"&#x2669;">
-<!ENTITY excl	"&#x0021;">
-<!ENTITY iexcl	"&#x00A1;">
-<!ENTITY quot	"&#x0022;">
-<!ENTITY apos	"&#x0027;">
-<!ENTITY lpar	"&#x0028;">
-<!ENTITY rpar	"&#x0029;">
-<!ENTITY comma	"&#x002C;">
-<!ENTITY lowbar	"&#x005F;">
-<!ENTITY hyphen	"&#x002D;">
-<!ENTITY period	"&#x002E;">
-<!ENTITY sol	"&#x002F;">
-<!ENTITY colon	"&#x003A;">
-<!ENTITY semi	"&#x003B;">
-<!ENTITY quest	"&#x003F;">
-<!ENTITY iquest	"&#x00BF;">
-<!ENTITY laquo	"&#x00AB;">
-<!ENTITY raquo	"&#x00BB;">
-<!ENTITY lsquo	"&#x2018;">
-<!ENTITY rsquo	"&#x2019;">
-<!ENTITY ldquo	"&#x201C;">
-<!ENTITY rdquo	"&#x201D;">
-<!ENTITY nbsp	"&#x00A0;">
-<!ENTITY shy	"&#x00AD;">
-<!ENTITY emsp	"&#x2003;">
-<!ENTITY ensp	"&#x2002;">
-<!ENTITY emsp13	"&#x2004;">
-<!ENTITY emsp14	"&#x2005;">
-<!ENTITY numsp	"&#x2007;">
-<!ENTITY puncsp	"&#x2008;">
-<!ENTITY thinsp	"&#x2009;">
-<!ENTITY hairsp	"&#x200A;">
-<!ENTITY mdash	"&#x2014;">
-<!ENTITY ndash	"&#x2013;">
-<!ENTITY dash	"&#x2010;">
-<!ENTITY blank	"&#x2423;">
-<!ENTITY hellip	"&#x2026;">
-<!ENTITY nldr	"&#x2025;">
-<!ENTITY frac13	"&#x2153;">
-<!ENTITY frac23	"&#x2154;">
-<!ENTITY frac15	"&#x2155;">
-<!ENTITY frac25	"&#x2156;">
-<!ENTITY frac35	"&#x2157;">
-<!ENTITY frac45	"&#x2158;">
-<!ENTITY frac16	"&#x2159;">
-<!ENTITY frac56	"&#x215A;">
-<!ENTITY incare	"&#x2105;">
-<!ENTITY block	"&#x2588;">
-<!ENTITY uhblk	"&#x2580;">
-<!ENTITY lhblk	"&#x2584;">
-<!ENTITY blk14	"&#x2591;">
-<!ENTITY blk12	"&#x2592;">
-<!ENTITY blk34	"&#x2593;">
-<!ENTITY marker	"&#x25AE;">
-<!ENTITY cir	"&#x25CB;">
-<!ENTITY squ	"&#x25A1;">
-<!ENTITY rect	"&#x25AD;">
-<!ENTITY utri	"&#x25B5;">
-<!ENTITY dtri	"&#x25BF;">
-<!ENTITY star	"&#x22C6;">
-<!ENTITY bull	"&#x2022;">
-<!ENTITY squf	"&#x25AA;">
-<!ENTITY utrif	"&#x25B4;">
-<!ENTITY dtrif	"&#x25BE;">
-<!ENTITY ltrif	"&#x25C2;">
-<!ENTITY rtrif	"&#x25B8;">
-<!ENTITY clubs	"&#x2663;">
-<!ENTITY diams	"&#x2666;">
-<!ENTITY hearts	"&#x2665;">
-<!ENTITY spades	"&#x2660;">
-<!ENTITY malt	"&#x2720;">
-<!ENTITY dagger	"&#x2020;">
-<!ENTITY Dagger	"&#x2021;">
-<!ENTITY check	"&#x2713;">
-<!ENTITY cross	"&#x2717;">
-<!ENTITY sharp	"&#x266F;">
-<!ENTITY flat	"&#x266D;">
-<!ENTITY male	"&#x2642;">
-<!ENTITY female	"&#x2640;">
-<!ENTITY phone	"&#x260E;">
-<!ENTITY telrec	"&#x2315;">
-<!ENTITY copysr	"&#x2117;">
-<!ENTITY caret	"&#x2041;">
-<!ENTITY lsquor	"&#x201A;">
-<!ENTITY ldquor	"&#x201E;">
-<!ENTITY fflig	"&#xFB00;">
-<!ENTITY filig	"&#xFB01;">
-<!ENTITY ffilig	"&#xFB03;">
-<!ENTITY ffllig	"&#xFB04;">
-<!ENTITY fllig	"&#xFB02;">
-<!ENTITY mldr	"&#x2026;">
-<!ENTITY rdquor	"&#x201C;">
-<!ENTITY rsquor	"&#x2018;">
-<!ENTITY vellip	"&#x22EE;">
-<!ENTITY hybull	"&#x2043;">
-<!ENTITY loz	"&#x25CA;">
-<!ENTITY lozf	"&#x2726;">
-<!ENTITY ltri	"&#x25C3;">
-<!ENTITY rtri	"&#x25B9;">
-<!ENTITY starf	"&#x2605;">
-<!ENTITY natur	"&#x266E;">
-<!ENTITY rx	"&#x211E;">
-<!ENTITY sext	"&#x2736;">
-<!ENTITY target	"&#x2316;">
-<!ENTITY dlcrop	"&#x230D;">
-<!ENTITY drcrop	"&#x230C;">
-<!ENTITY ulcrop	"&#x230F;">
-<!ENTITY urcrop	"&#x230E;">
+<!ENTITY Aacute           "&#x000C1;" >
+<!ENTITY aacute           "&#x000E1;" >
+<!ENTITY Acirc            "&#x000C2;" >
+<!ENTITY acirc            "&#x000E2;" >
+<!ENTITY AElig            "&#x000C6;" >
+<!ENTITY aelig            "&#x000E6;" >
+<!ENTITY Agrave           "&#x000C0;" >
+<!ENTITY agrave           "&#x000E0;" >
+<!ENTITY Aring            "&#x000C5;" >
+<!ENTITY aring            "&#x000E5;" >
+<!ENTITY Atilde           "&#x000C3;" >
+<!ENTITY atilde           "&#x000E3;" >
+<!ENTITY Auml             "&#x000C4;" >
+<!ENTITY auml             "&#x000E4;" >
+<!ENTITY Ccedil           "&#x000C7;" >
+<!ENTITY ccedil           "&#x000E7;" >
+<!ENTITY Eacute           "&#x000C9;" >
+<!ENTITY eacute           "&#x000E9;" >
+<!ENTITY Ecirc            "&#x000CA;" >
+<!ENTITY ecirc            "&#x000EA;" >
+<!ENTITY Egrave           "&#x000C8;" >
+<!ENTITY egrave           "&#x000E8;" >
+<!ENTITY ETH              "&#x000D0;" >
+<!ENTITY eth              "&#x000F0;" >
+<!ENTITY Euml             "&#x000CB;" >
+<!ENTITY euml             "&#x000EB;" >
+<!ENTITY Iacute           "&#x000CD;" >
+<!ENTITY iacute           "&#x000ED;" >
+<!ENTITY Icirc            "&#x000CE;" >
+<!ENTITY icirc            "&#x000EE;" >
+<!ENTITY Igrave           "&#x000CC;" >
+<!ENTITY igrave           "&#x000EC;" >
+<!ENTITY Iuml             "&#x000CF;" >
+<!ENTITY iuml             "&#x000EF;" >
+<!ENTITY Ntilde           "&#x000D1;" >
+<!ENTITY ntilde           "&#x000F1;" >
+<!ENTITY Oacute           "&#x000D3;" >
+<!ENTITY oacute           "&#x000F3;" >
+<!ENTITY Ocirc            "&#x000D4;" >
+<!ENTITY ocirc            "&#x000F4;" >
+<!ENTITY Ograve           "&#x000D2;" >
+<!ENTITY ograve           "&#x000F2;" >
+<!ENTITY Oslash           "&#x000D8;" >
+<!ENTITY oslash           "&#x000F8;" >
+<!ENTITY Otilde           "&#x000D5;" >
+<!ENTITY otilde           "&#x000F5;" >
+<!ENTITY Ouml             "&#x000D6;" >
+<!ENTITY ouml             "&#x000F6;" >
+<!ENTITY szlig            "&#x000DF;" >
+<!ENTITY THORN            "&#x000DE;" >
+<!ENTITY thorn            "&#x000FE;" >
+<!ENTITY Uacute           "&#x000DA;" >
+<!ENTITY uacute           "&#x000FA;" >
+<!ENTITY Ucirc            "&#x000DB;" >
+<!ENTITY ucirc            "&#x000FB;" >
+<!ENTITY Ugrave           "&#x000D9;" >
+<!ENTITY ugrave           "&#x000F9;" >
+<!ENTITY Uuml             "&#x000DC;" >
+<!ENTITY uuml             "&#x000FC;" >
+<!ENTITY Yacute           "&#x000DD;" >
+<!ENTITY yacute           "&#x000FD;" >
+<!ENTITY yuml             "&#x000FF;" >
+<!ENTITY amp              "&#38;#38;" >
+<!ENTITY apos             "&#x00027;" >
+<!ENTITY ast              "&#x0002A;" >
+<!ENTITY brvbar           "&#x000A6;" >
+<!ENTITY bsol             "&#x0005C;" >
+<!ENTITY cent             "&#x000A2;" >
+<!ENTITY colon            "&#x0003A;" >
+<!ENTITY comma            "&#x0002C;" >
+<!ENTITY commat           "&#x00040;" >
+<!ENTITY copy             "&#x000A9;" >
+<!ENTITY curren           "&#x000A4;" >
+<!ENTITY darr             "&#x02193;" >
+<!ENTITY deg              "&#x000B0;" >
+<!ENTITY divide           "&#x000F7;" >
+<!ENTITY dollar           "&#x00024;" >
+<!ENTITY equals           "&#x0003D;" >
+<!ENTITY excl             "&#x00021;" >
+<!ENTITY frac12           "&#x000BD;" >
+<!ENTITY frac14           "&#x000BC;" >
+<!ENTITY frac18           "&#x0215B;" >
+<!ENTITY frac34           "&#x000BE;" >
+<!ENTITY frac38           "&#x0215C;" >
+<!ENTITY frac58           "&#x0215D;" >
+<!ENTITY frac78           "&#x0215E;" >
+<!ENTITY gt               "&#x0003E;" >
+<!ENTITY half             "&#x000BD;" >
+<!ENTITY horbar           "&#x02015;" >
+<!ENTITY hyphen           "&#x02010;" >
+<!ENTITY iexcl            "&#x000A1;" >
+<!ENTITY iquest           "&#x000BF;" >
+<!ENTITY laquo            "&#x000AB;" >
+<!ENTITY larr             "&#x02190;" >
+<!ENTITY lcub             "&#x0007B;" >
+<!ENTITY ldquo            "&#x0201C;" >
+<!ENTITY lowbar           "&#x0005F;" >
+<!ENTITY lpar             "&#x00028;" >
+<!ENTITY lsqb             "&#x0005B;" >
+<!ENTITY lsquo            "&#x02018;" >
+<!ENTITY lt               "&#38;#60;" >
+<!ENTITY micro            "&#x000B5;" >
+<!ENTITY middot           "&#x000B7;" >
+<!ENTITY nbsp             "&#x000A0;" >
+<!ENTITY not              "&#x000AC;" >
+<!ENTITY num              "&#x00023;" >
+<!ENTITY ohm              "&#x02126;" >
+<!ENTITY ordf             "&#x000AA;" >
+<!ENTITY ordm             "&#x000BA;" >
+<!ENTITY para             "&#x000B6;" >
+<!ENTITY percnt           "&#x00025;" >
+<!ENTITY period           "&#x0002E;" >
+<!ENTITY plus             "&#x0002B;" >
+<!ENTITY plusmn           "&#x000B1;" >
+<!ENTITY pound            "&#x000A3;" >
+<!ENTITY quest            "&#x0003F;" >
+<!ENTITY quot             "&#x00022;" >
+<!ENTITY raquo            "&#x000BB;" >
+<!ENTITY rarr             "&#x02192;" >
+<!ENTITY rcub             "&#x0007D;" >
+<!ENTITY rdquo            "&#x0201D;" >
+<!ENTITY reg              "&#x000AE;" >
+<!ENTITY rpar             "&#x00029;" >
+<!ENTITY rsqb             "&#x0005D;" >
+<!ENTITY rsquo            "&#x02019;" >
+<!ENTITY sect             "&#x000A7;" >
+<!ENTITY semi             "&#x0003B;" >
+<!ENTITY shy              "&#x000AD;" >
+<!ENTITY sol              "&#x0002F;" >
+<!ENTITY sung             "&#x0266A;" >
+<!ENTITY sup1             "&#x000B9;" >
+<!ENTITY sup2             "&#x000B2;" >
+<!ENTITY sup3             "&#x000B3;" >
+<!ENTITY times            "&#x000D7;" >
+<!ENTITY trade            "&#x02122;" >
+<!ENTITY uarr             "&#x02191;" >
+<!ENTITY verbar           "&#x0007C;" >
+<!ENTITY yen              "&#x000A5;" >
+<!ENTITY blank            "&#x02423;" >
+<!ENTITY blk12            "&#x02592;" >
+<!ENTITY blk14            "&#x02591;" >
+<!ENTITY blk34            "&#x02593;" >
+<!ENTITY block            "&#x02588;" >
+<!ENTITY bull             "&#x02022;" >
+<!ENTITY caret            "&#x02041;" >
+<!ENTITY check            "&#x02713;" >
+<!ENTITY cir              "&#x025CB;" >
+<!ENTITY clubs            "&#x02663;" >
+<!ENTITY copysr           "&#x02117;" >
+<!ENTITY cross            "&#x02717;" >
+<!ENTITY Dagger           "&#x02021;" >
+<!ENTITY dagger           "&#x02020;" >
+<!ENTITY dash             "&#x02010;" >
+<!ENTITY diams            "&#x02666;" >
+<!ENTITY dlcrop           "&#x0230D;" >
+<!ENTITY drcrop           "&#x0230C;" >
+<!ENTITY dtri             "&#x025BF;" >
+<!ENTITY dtrif            "&#x025BE;" >
+<!ENTITY emsp             "&#x02003;" >
+<!ENTITY emsp13           "&#x02004;" >
+<!ENTITY emsp14           "&#x02005;" >
+<!ENTITY ensp             "&#x02002;" >
+<!ENTITY female           "&#x02640;" >
+<!ENTITY ffilig           "&#x0FB03;" >
+<!ENTITY fflig            "&#x0FB00;" >
+<!ENTITY ffllig           "&#x0FB04;" >
+<!ENTITY filig            "&#x0FB01;" >
+<!ENTITY flat             "&#x0266D;" >
+<!ENTITY fllig            "&#x0FB02;" >
+<!ENTITY frac13           "&#x02153;" >
+<!ENTITY frac15           "&#x02155;" >
+<!ENTITY frac16           "&#x02159;" >
+<!ENTITY frac23           "&#x02154;" >
+<!ENTITY frac25           "&#x02156;" >
+<!ENTITY frac35           "&#x02157;" >
+<!ENTITY frac45           "&#x02158;" >
+<!ENTITY frac56           "&#x0215A;" >
+<!ENTITY hairsp           "&#x0200A;" >
+<!ENTITY hearts           "&#x02665;" >
+<!ENTITY hellip           "&#x02026;" >
+<!ENTITY hybull           "&#x02043;" >
+<!ENTITY incare           "&#x02105;" >
+<!ENTITY ldquor           "&#x0201E;" >
+<!ENTITY lhblk            "&#x02584;" >
+<!ENTITY loz              "&#x025CA;" >
+<!ENTITY lozf             "&#x029EB;" >
+<!ENTITY lsquor           "&#x0201A;" >
+<!ENTITY ltri             "&#x025C3;" >
+<!ENTITY ltrif            "&#x025C2;" >
+<!ENTITY male             "&#x02642;" >
+<!ENTITY malt             "&#x02720;" >
+<!ENTITY marker           "&#x025AE;" >
+<!ENTITY mdash            "&#x02014;" >
+<!ENTITY mldr             "&#x02026;" >
+<!ENTITY natur            "&#x0266E;" >
+<!ENTITY ndash            "&#x02013;" >
+<!ENTITY nldr             "&#x02025;" >
+<!ENTITY numsp            "&#x02007;" >
+<!ENTITY phone            "&#x0260E;" >
+<!ENTITY puncsp           "&#x02008;" >
+<!ENTITY rdquor           "&#x0201D;" >
+<!ENTITY rect             "&#x025AD;" >
+<!ENTITY rsquor           "&#x02019;" >
+<!ENTITY rtri             "&#x025B9;" >
+<!ENTITY rtrif            "&#x025B8;" >
+<!ENTITY rx               "&#x0211E;" >
+<!ENTITY sext             "&#x02736;" >
+<!ENTITY sharp            "&#x0266F;" >
+<!ENTITY spades           "&#x02660;" >
+<!ENTITY squ              "&#x025A1;" >
+<!ENTITY squf             "&#x025AA;" >
+<!ENTITY star             "&#x02606;" >
+<!ENTITY starf            "&#x02605;" >
+<!ENTITY target           "&#x02316;" >
+<!ENTITY telrec           "&#x02315;" >
+<!ENTITY thinsp           "&#x02009;" >
+<!ENTITY uhblk            "&#x02580;" >
+<!ENTITY ulcrop           "&#x0230F;" >
+<!ENTITY urcrop           "&#x0230E;" >
+<!ENTITY utri             "&#x025B5;" >
+<!ENTITY utrif            "&#x025B4;" >
+<!ENTITY vellip           "&#x022EE;" >
 <!NOTATION BMP		PUBLIC
-"+//ISBN 0-7923-9432-1::Graphic Notation//NOTATION Microsoft Windows bitmap//EN">
+"+//ISBN 0-7923-94.2-1::Graphic Notation//NOTATION Microsoft Windows bitmap//EN">
 <!NOTATION CGM-CHAR	PUBLIC "ISO 8632/2//NOTATION Character encoding//EN">
 <!NOTATION CGM-BINARY	PUBLIC "ISO 8632/3//NOTATION Binary encoding//EN">
 <!NOTATION CGM-CLEAR	PUBLIC "ISO 8632/4//NOTATION Clear text encoding//EN">
@@ -525,7 +545,7 @@
 <!NOTATION IGES		PUBLIC
 "-//USA-DOD//NOTATION (ASME/ANSI Y14.26M-1987) Initial Graphics Exchange Specification//EN">
 <!NOTATION PCX		PUBLIC
-"+//ISBN 0-7923-9432-1::Graphic Notation//NOTATION ZSoft PCX bitmap//EN">
+"+//ISBN 0-7923-94.2-1::Graphic Notation//NOTATION ZSoft PCX bitmap//EN">
 <!NOTATION PIC		SYSTEM "PIC">
 <!NOTATION PNG          SYSTEM "http://www.w3.org/TR/REC-png">
 <!NOTATION PS		SYSTEM "PS">
@@ -536,9 +556,11 @@
 "+//ISBN 0-201-13448-9::Knuth//NOTATION The TeXbook//EN">
 <!NOTATION TIFF		SYSTEM "TIFF">
 <!NOTATION WMF		PUBLIC
-"+//ISBN 0-7923-9432-1::Graphic Notation//NOTATION Microsoft Windows Metafile//EN">
+"+//ISBN 0-7923-94.2-1::Graphic Notation//NOTATION Microsoft Windows Metafile//EN">
 <!NOTATION WPG		SYSTEM "WPG">
 <!NOTATION SVG		SYSTEM "http://www.w3.org/TR/SVG/">
+<!NOTATION PDF		SYSTEM "http://www.adobe.com/products/acrobat/adobepdf.html">
+<!NOTATION SWF          SYSTEM "http://www.macromedia.com/software/flash">
 <!NOTATION linespecific	SYSTEM "linespecific">
 <!ENTITY euro "&#x20AC;">
 <!ENTITY % yesorno.attvals	"CDATA">
@@ -546,14 +568,37 @@
 <!ENTITY % local.mediaobject.mix "">
 <!ENTITY % mediaobject.mix
 		"videoobject|audioobject|imageobject|textobject %local.mediaobject.mix;">
+<!ENTITY % idreq.attrib
+	"id		ID		#REQUIRED">
+<!ENTITY % lang.attrib
+	"lang		CDATA		#IMPLIED">
+<!ENTITY % remap.attrib
+	"remap		CDATA		#IMPLIED">
 <!ENTITY % role.attrib
 	"role		CDATA		#IMPLIED">
+<!ENTITY % xreflabel.attrib
+	"xreflabel	CDATA		#IMPLIED">
+<!ENTITY % revisionflag.attrib
+	"revisionflag	(changed
+			|added
+			|deleted
+			|off)		#IMPLIED">
+<!ENTITY % dir.attrib
+	"dir		(ltr
+			|rtl
+			|lro
+			|rlo)		#IMPLIED">
+<!ENTITY % xml-base.attrib
+	"xml:base	CDATA		#IMPLIED">
 <!ENTITY % label.attrib
 	"label		CDATA		#IMPLIED">
 <!ENTITY % linespecific.attrib
 	"format		NOTATION
 			(linespecific)	'linespecific'
-         linenumbering	(numbered|unnumbered) 	#IMPLIED">
+         linenumbering	(numbered|unnumbered) 	#IMPLIED
+         continuation	(continues|restarts)	#IMPLIED
+         startinglinenumber	CDATA		#IMPLIED
+         language	CDATA			#IMPLIED">
 <!ENTITY % linkendreq.attrib
 	"linkend	IDREF		#REQUIRED">
 <!ENTITY % local.mark.attrib "">
@@ -755,8 +800,6 @@
 >
 <!ENTITY % local.blockquote.attrib "">
 <!ENTITY % blockquote.role.attrib "%role.attrib;">
-<!ELEMENT blockquote  (title?, attribution?, (%component.mix;)+)
-                      >
 <!ATTLIST blockquote
 		%common.attrib;
 		%blockquote.role.attrib;
@@ -887,6 +930,7 @@
 <!ENTITY % local.example.attrib "">
 <!ENTITY % example.role.attrib "%role.attrib;">
 <!ATTLIST example
+		floatstyle	CDATA			#IMPLIED
 		%label.attrib;
 		%width.attrib;
 		%common.attrib;
@@ -916,6 +960,7 @@
 <!ENTITY % figure.role.attrib "%role.attrib;">
 <!ATTLIST figure
 		float		%yesorno.attvals;	'0'
+		floatstyle	CDATA			#IMPLIED
 		pgwide      	%yesorno.attvals;       #IMPLIED
 		%label.attrib;
 		%common.attrib;
@@ -1053,39 +1098,136 @@
 		%textdata.role.attrib;
 		%local.textdata.attrib;
 >
-<!ENTITY % local.caption.attrib "">
-<!ENTITY % caption.role.attrib "%role.attrib;">
-<!ELEMENT caption  (%textobject.mix;)*>
-<!ATTLIST caption
-		%common.attrib;
-		%caption.role.attrib;
-		%local.caption.attrib;
->
+<!ENTITY % html.coreattrs
+ "id          ID             #IMPLIED
+  class       CDATA          #IMPLIED
+  style       CDATA          #IMPLIED
+  title       CDATA         #IMPLIED"
+  >
+<!ENTITY % i18n
+ "xml:lang    NMTOKEN        #IMPLIED"
+  >
+<!ENTITY % events
+ "onclick     CDATA       #IMPLIED
+  ondblclick  CDATA       #IMPLIED
+  onmousedown CDATA       #IMPLIED
+  onmouseup   CDATA       #IMPLIED
+  onmouseover CDATA       #IMPLIED
+  onmousemove CDATA       #IMPLIED
+  onmouseout  CDATA       #IMPLIED
+  onkeypress  CDATA       #IMPLIED
+  onkeydown   CDATA       #IMPLIED
+  onkeyup     CDATA       #IMPLIED"
+  >
+<!ENTITY % attrs "%html.coreattrs; %i18n; %events;">
+<!ENTITY % cellhalign
+  "align      (left|center|right|justify|char) #IMPLIED
+   char       CDATA    #IMPLIED
+   charoff    CDATA       #IMPLIED"
+  >
+<!ENTITY % cellvalign
+  "valign     (top|middle|bottom|baseline) #IMPLIED"
+  >
+<!ELEMENT colgroup (col)*>
+<!ELEMENT col      EMPTY>
+<!ELEMENT tr       (th|td)+>
+<!ELEMENT th       (%para.char.mix; | %tabentry.mix;)*>
+<!ELEMENT td       (%para.char.mix; | %tabentry.mix;)*>
+<!ATTLIST colgroup
+  %attrs;
+  span        CDATA       "1"
+  width       CDATA  #IMPLIED
+  %cellhalign;
+  %cellvalign;
+  >
+<!ATTLIST col
+  %attrs;
+  span        CDATA       "1"
+  width       CDATA  #IMPLIED
+  %cellhalign;
+  %cellvalign;
+  >
+<!ATTLIST tr
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  bgcolor     CDATA        #IMPLIED
+  >
+<!ATTLIST th
+  %attrs;
+  abbr        CDATA         #IMPLIED
+  axis        CDATA          #IMPLIED
+  headers     IDREFS         #IMPLIED
+  scope       (row|col|rowgroup|colgroup)   #IMPLIED
+  rowspan     CDATA       "1"
+  colspan     CDATA       "1"
+  %cellhalign;
+  %cellvalign;
+  nowrap      (nowrap)       #IMPLIED
+  bgcolor     CDATA         #IMPLIED
+  width       CDATA       #IMPLIED
+  height      CDATA       #IMPLIED
+  >
+<!ATTLIST td
+  %attrs;
+  abbr        CDATA         #IMPLIED
+  axis        CDATA          #IMPLIED
+  headers     IDREFS         #IMPLIED
+  scope       (row|col|rowgroup|colgroup)   #IMPLIED
+  rowspan     CDATA       "1"
+  colspan     CDATA       "1"
+  %cellhalign;
+  %cellvalign;
+  nowrap      (nowrap)       #IMPLIED
+  bgcolor     CDATA         #IMPLIED
+  width       CDATA       #IMPLIED
+  height      CDATA       #IMPLIED
+  >
 <!ENTITY % tables.role.attrib "%role.attrib;">
-<!ENTITY % bodyatt "%label.attrib;">
-<!ENTITY % secur
-	"%common.attrib;
+<!ENTITY % bodyatt "
+		floatstyle	CDATA			#IMPLIED
+                %label.attrib;"
+>
+<!ENTITY % secur "
+	%common.attrib;
+	class       CDATA          #IMPLIED
+	style       CDATA          #IMPLIED
+	title       CDATA         #IMPLIED
+	%i18n;
+	%events;
 	%tables.role.attrib;">
 <!ENTITY % common.table.attribs
 	"%bodyatt;
 	%secur;">
-<!ENTITY % tbl.entry.mdl "%para.char.mix; | %tabentry.mix;">
-<!ENTITY % yesorno 'CDATA'>
 <!ENTITY % tbl.table.att        '
     tabstyle    CDATA           #IMPLIED
-    tocentry    %yesorno;       #IMPLIED
-    shortentry  %yesorno;       #IMPLIED
+    tocentry    %yesorno.attvals;       #IMPLIED
+    shortentry  %yesorno.attvals;       #IMPLIED
     orient      (port|land)     #IMPLIED
-    pgwide      %yesorno;       #IMPLIED '>
+    pgwide      %yesorno.attvals;       #IMPLIED 
+    summary     CDATA          #IMPLIED
+    width       CDATA        #IMPLIED
+    border      CDATA        #IMPLIED
+    rules       (none | groups | rows | cols | all)      #IMPLIED
+    cellspacing CDATA        #IMPLIED
+    cellpadding CDATA        #IMPLIED
+    align       (left|center|right)   #IMPLIED
+    bgcolor     CDATA         #IMPLIED
+'>
+<!ENTITY % tbl.frame.attval "void|above|below|hsides|lhs|rhs|vsides|box|border|
+top|bottom|topbot|all|sides|none">
+<!ENTITY % tbl.entry.mdl "%para.char.mix; | %tabentry.mix;">
+<!ENTITY % tbl.hdft.mdl        "(tr+|(colspec*,row+))">
+<!ENTITY % tbl.tbody.mdl       "(tr+|row+)">
+<!ENTITY % yesorno 'CDATA'>
 <!ENTITY % tbl.tgroup.mdl       "colspec*,spanspec*,thead?,tfoot?,tbody">
 <!ENTITY % tbl.tgroup.att       '
     tgroupstyle CDATA           #IMPLIED '>
-<!ENTITY % tbl.hdft.mdl         "colspec*,row+">
 <!ENTITY % tbl.row.mdl          "(entry|entrytbl)+">
 <!ENTITY % tbl.entrytbl.mdl     "colspec*,spanspec*,thead?,tbody">
 <!ELEMENT table  (%tbl.table.mdl;)>
 <!ATTLIST table
-        frame           (top|bottom|topbot|all|sides|none)      #IMPLIED
+        frame           (%tbl.frame.attval;)                    #IMPLIED
         colsep          %yesorno;                               #IMPLIED
         rowsep          %yesorno;                               #IMPLIED
         %tbl.table.att;
@@ -1135,7 +1277,7 @@
         valign          (top|middle|bottom)                     #IMPLIED
         %secur;
 >
-<!ELEMENT tbody  (row+)>
+<!ELEMENT tbody  (%tbl.tbody.mdl;)>
 <!ATTLIST tbody
         valign          (top|middle|bottom)                     #IMPLIED
         %secur;
@@ -1179,18 +1321,31 @@
 >
 <!ENTITY % local.informaltable.attrib "">
 <!ATTLIST informaltable
-		frame		(top
-				|bottom
-				|topbot
-				|all
-				|sides
-				|none)			#IMPLIED
+		frame		(%tbl.frame.attval;)	#IMPLIED
 		colsep		%yesorno.attvals;	#IMPLIED
 		rowsep		%yesorno.attvals;	#IMPLIED
 		%common.table.attribs;
 		%tbl.table.att;
 		%local.informaltable.attrib;
 >
+<!ENTITY % local.caption.attrib "">
+<!ENTITY % caption.role.attrib "%role.attrib;">
+<!ELEMENT caption  (#PCDATA | %textobject.mix;)*>
+<!ENTITY % caption.attlist.content "
+	%lang.attrib;
+	%remap.attrib;
+	%xreflabel.attrib;
+	%revisionflag.attrib;
+	%effectivity.attrib;
+	%dir.attrib;
+	%xml-base.attrib;
+	%local.common.attrib;
+		%caption.role.attrib;
+		%attrs;
+		align	(top|bottom|left|right)	#IMPLIED
+		%local.caption.attrib;
+">
+<!ATTLIST caption %caption.attlist.content;>
 <!ENTITY % local.affiliation.attrib "">
 <!ENTITY % affiliation.role.attrib "%role.attrib;">
 <!ATTLIST affiliation
@@ -1311,6 +1466,12 @@
 <!ENTITY % local.othercredit.attrib "">
 <!ENTITY % othercredit.role.attrib "%role.attrib;">
 <!ATTLIST othercredit
+		class	(graphicdesigner
+			|productioneditor
+			|copyeditor
+			|technicaleditor
+			|translator
+			|other)			#IMPLIED
 		%common.attrib;
 		%othercredit.role.attrib;
 		%local.othercredit.attrib;
@@ -1389,7 +1550,7 @@
 >
 <!ENTITY % local.revision.attrib "">
 <!ENTITY % revision.role.attrib "%role.attrib;">
-<!ELEMENT revision  (revnumber, date, authorinitials*,
+<!ELEMENT revision  (revnumber, date, (author|authorinitials)*,
                     (revremark|revdescription)?)>
 <!ATTLIST revision
 		%common.attrib;
@@ -1521,7 +1682,11 @@
 				|pi
                                 |xmlpi
 				|starttag
-				|sgmlcomment)	#IMPLIED
+				|sgmlcomment
+                                |prefix
+                                |namespace
+                                |localname)	#IMPLIED
+		namespace	CDATA		#IMPLIED
 		%common.attrib;
 		%sgmltag.role.attrib;
 		%local.sgmltag.attrib;
@@ -1545,7 +1710,11 @@
 			|resource
 			|systemname
 			|username
-			|newsgroup)	#IMPLIED
+			|newsgroup
+                        |process
+                        |service
+                        |server
+                        |daemon)	#IMPLIED
 		%moreinfo.attrib;
 		%common.attrib;
 		%systemitem.role.attrib;
@@ -1589,7 +1758,15 @@
 				|journal
 				|series
 				|set
-				|manuscript)	#IMPLIED
+				|manuscript
+				|cdrom
+				|dvd
+				|wiki
+				|gopher
+				|bbs
+                                |emailmessage
+                                |webpage
+                                |newsposting)	#IMPLIED
 		%common.attrib;
 		%citetitle.role.attrib;
 		%local.citetitle.attrib;
@@ -1618,6 +1795,18 @@
 		%quote.role.attrib;
 		%local.quote.attrib;
 >
+<!ENTITY % local.ssscript.attrib "">
+<!ENTITY % ssscript.role.attrib "%role.attrib;">
+<!ATTLIST subscript
+		%common.attrib;
+		%ssscript.role.attrib;
+		%local.ssscript.attrib;
+>
+<!ATTLIST superscript
+		%common.attrib;
+		%ssscript.role.attrib;
+		%local.ssscript.attrib;
+>
 <!ENTITY % local.trademark.attrib "">
 <!ENTITY % trademark.role.attrib "%role.attrib;">
 <!ATTLIST trademark
@@ -1635,7 +1824,9 @@
 		>
 <!ATTLIST link
 		endterm		IDREF		#IMPLIED
-		%linkendreq.attrib;		type		CDATA		#IMPLIED
+		xrefstyle	CDATA		#IMPLIED
+		type		CDATA		#IMPLIED
+		%linkendreq.attrib;
 		%common.attrib;
 		%link.role.attrib;
 		%local.link.attrib;
@@ -1651,6 +1842,7 @@
 		type		CDATA		#IMPLIED
 		targetdoc	CDATA		#IMPLIED
 		targetptr	CDATA		#IMPLIED
+		xrefstyle	CDATA		#IMPLIED
 		%common.attrib;
 		%olink.role.attrib;
 		%local.olink.attrib;
@@ -1662,6 +1854,7 @@
 <!ATTLIST ulink
 		url		CDATA		#REQUIRED
 		type		CDATA		#IMPLIED
+		xrefstyle	CDATA		#IMPLIED
 		%common.attrib;
 		%ulink.role.attrib;
 		%local.ulink.attrib;
@@ -1680,10 +1873,23 @@
 <!ELEMENT xref  EMPTY>
 <!ATTLIST xref
 		endterm		IDREF		#IMPLIED
-		%linkendreq.attrib;		%common.attrib;
+		xrefstyle	CDATA		#IMPLIED
+		%common.attrib;
+		%linkendreq.attrib;
 		%xref.role.attrib;
 		%local.xref.attrib;
 >
+<!ENTITY % local.anchor.attrib "">
+<!ENTITY % anchor.role.attrib "%role.attrib;">
+<!ELEMENT anchor  EMPTY>
+<!ATTLIST anchor
+		%idreq.attrib;		%pagenum.attrib;		%remap.attrib;
+		%xreflabel.attrib;
+		%revisionflag.attrib;
+		%effectivity.attrib;
+		%anchor.role.attrib;
+		%local.anchor.attrib;
+>
 <!ENTITY % local.appendix.class "">
 <!ENTITY % appendix.class	"appendix %local.appendix.class;">
 <!ENTITY % div.title.content
@@ -1754,9 +1960,13 @@
 <!ELEMENT othercredit ((%person.ident.mix;)+)>
 <!ELEMENT affiliation (jobtitle?, orgname?)>
 <!ELEMENT para (%para.char.mix;)*>
-<!ELEMENT informaltable (mediaobject+|tgroup+) >
+<!ENTITY % informaltable.table.mdl
+	"((mediaobject+|tgroup+)
+          |(caption, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+)))">
+<!ELEMENT informaltable (%informaltable.table.mdl;) >
 <!ELEMENT replaceable (#PCDATA 
-		| %link.char.class; 
+		| %link.char.class;
+                | %base.char.class;
 		| inlinemediaobject)*>
 <!ELEMENT trademark (#PCDATA 
 		| %link.char.class; 
@@ -1795,6 +2005,23 @@
 <!ELEMENT systemitem (%cptr.char.mix; | acronym)*>
 <!ELEMENT computeroutput  (%cptr.char.mix;)*>
 <!ELEMENT userinput  (%cptr.char.mix;)*>
+<!ELEMENT blockquote  (title?, attribution?, (%component.mix;)+)>
+<!ELEMENT subscript  (#PCDATA
+		| %link.char.class;
+		| emphasis
+		| replaceable
+                | inlinemediaobject
+		| %base.char.class;
+		| %other.char.class;)*
+		>
+<!ELEMENT superscript  (#PCDATA
+		| %link.char.class;
+		| emphasis
+		| replaceable
+                | inlinemediaobject
+		| %base.char.class;
+		| %other.char.class;)*
+		>
 <!ENTITY % webpage.mix "(config*, head, (%bookcomponent.content;),
                         appendix*, bibliography*)">
 <!ELEMENT head (title, titleabbrev?, subtitle?, summary?, base?, keywords?,
@@ -1880,18 +2107,6 @@
 	%xlink-href;	CDATA	#IMPLIED
 	%xlink-title;	CDATA	#IMPLIED
 >
-<!ENTITY % events
- "onclick		CDATA		#IMPLIED
-  ondblclick		CDATA		#IMPLIED
-  onmousedown		CDATA		#IMPLIED
-  onmouseup		CDATA		#IMPLIED
-  onmouseover		CDATA		#IMPLIED
-  onmousemove		CDATA		#IMPLIED
-  onmouseout		CDATA		#IMPLIED
-  onkeypress		CDATA		#IMPLIED
-  onkeydown		CDATA		#IMPLIED
-  onkeyup		CDATA		#IMPLIED"
->
 <!ELEMENT %html-form.element; ((%component.mix;)|%html-input.element;|%html-button.element;
 			|%html-label.element;|%html-select.element;|%html-textarea.element;)+>
 <!ATTLIST %html-form.element;
-- 
2.40.0