Adde superscript/subscript

diff --git a/docbook/simple/sdbpool.mod b/docbook/simple/sdbpool.mod
index f01850c77de957bd05e5db4b538deec6a3b6a8bf..6aa4d057283b48bfd10255964d011185300eef90 100644 (file)
--- a/docbook/simple/sdbpool.mod
+++ b/docbook/simple/sdbpool.mod
@@ -154,7 +154,7 @@
                |%xref.char.class;      |%gen.char.class;
                |%link.char.class;      |%tech.char.class;
                 |%base.char.class;
-                                       |%inlineobj.char.class;
+               |%other.char.class;     |%inlineobj.char.class;
                %local.para.char.mix;">
 
 <!ENTITY % local.title.char.mix "">
@@ -164,7 +164,7 @@
                |%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 "">
@@ -172,7 +172,7 @@
                "#PCDATA
                |%link.char.class;      |%tech.char.class;
                 |%base.char.class;
-                                       |inlinemediaobject
+               |%other.char.class;     |inlinemediaobject
                %local.cptr.char.mix;">
 
 <!ENTITY % local.smallcptr.char.mix "">
@@ -188,7 +188,7 @@
                                        |acronym|emphasis|trademark
                |%link.char.class;
                 |%base.char.class;
-                                       |inlinemediaobject
+               |%other.char.class;     |inlinemediaobject
                %local.word.char.mix;">
 
 <!ENTITY % local.docinfo.char.mix "">
@@ -197,7 +197,7 @@
                |%link.char.class;
                                        |emphasis|trademark
                                        |replaceable
-                                       |inlinemediaobject
+               |%other.char.class;     |inlinemediaobject
                %local.docinfo.char.mix;">
 
 <!ENTITY % tbl.table.excep "">

diff --git a/docbook/simple/sdocbook-custom.dtd b/docbook/simple/sdocbook-custom.dtd
index 587fa972a4bdd162bd19b3ad2f081b8af497fd75..d69f18be2befaa61e76aef33d3f8b11df5c9a2a9 100644 (file)
--- a/docbook/simple/sdocbook-custom.dtd
+++ b/docbook/simple/sdocbook-custom.dtd
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- Simplified DocBook DTD V1.1b3 .......................................... -->
+<!-- Simplified DocBook DTD V1.1CR1 .......................................... -->
 <!-- File sdocbook-custom.dtd ............................................. -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -30,16 +30,16 @@
 
 <!-- ...................................................................... -->
 
-<!-- This is the driver file for V1.1b3 of the Simplified DocBook XML DTD.
+<!-- This is the driver file for V1.1CR1 of the Simplified DocBook XML DTD.
      Please use the following formal public identifier to identify it:
 
-     "-//OASIS//DTD Simplified DocBook XML V1.1b3//EN"
+     "-//OASIS//DTD Simplified DocBook XML V1.1CR1//EN"
 
      For example:
 
      <!DOCTYPE article
-               PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1b3//EN"
-      "http://www.oasis-open.org/docbook/xml/simple/1.1b3/sdocbook.dtd"
+               PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1CR1//EN"
+      "http://www.oasis-open.org/docbook/xml/simple/1.1CR1/sdocbook.dtd"
      [...]>
 -->
 
@@ -131,6 +131,10 @@
                |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;">
@@ -423,5 +427,5 @@
 <!ELEMENT blockquote %ho; (title?, attribution?, (%component.mix;)+)>
 ]]>
 
-<!-- End of Simplified DocBook DTD V1.1b3 ................................... -->
+<!-- End of Simplified DocBook DTD V1.1CR1 ................................... -->
 <!-- ...................................................................... -->

diff --git a/docbook/simple/sinclist.mod b/docbook/simple/sinclist.mod
index a9f53170ad4f421c6365cd7eff3a766d5aab7f88..7b458385a6dbebce6a86b126159bd425bf686c44 100644 (file)
--- a/docbook/simple/sinclist.mod
+++ b/docbook/simple/sinclist.mod
@@ -44,7 +44,6 @@
 <!ENTITY % biblioentry.module "IGNORE">
 <!ENTITY % glossary.content.module "IGNORE">
 <!ENTITY % glossentry.content.module "IGNORE">
-<!ENTITY % ssscript.module "IGNORE">
 <!ENTITY % caution.element "IGNORE">
 <!ENTITY % caution.attlist "IGNORE">
 <!ENTITY % important.element "IGNORE">