--- a/common.dtd	Thu Jan 26 16:51:34 2006 -0500
+++ b/common.dtd	Fri Feb 03 16:28:04 2006 -0500
@@ -1,18 +1,27 @@
 <!-- Common DTD Elements -->
 
+<!-- Notations -->
+<!NOTATION SGML	PUBLIC "ISO 8879:1986//NOTATION Standard Generalized Markup Language//EN">
+
 <!-- Entities declarations -->
+<!ENTITY % local.common.attrib "">
 <!ENTITY % common.attrib 
-'id       ID                            #IMPLIED
+"id       ID                            #IMPLIED
 lang      CDATA                         #IMPLIED
 role      CDATA                         #IMPLIED
-xreflabel CDATA                         #IMPLIED'>
+xreflabel CDATA                         #IMPLIED
+%local.common.attrib;">
 <!ENTITY % xref.attrib 
-'linkend  IDREF                         #REQUIRED
-endterm   IDREF                         #IMPLIED'>
+"linkend  IDREF                         #REQUIRED
+endterm   IDREF                         #IMPLIED">
+<!ENTITY % oref.attrib
+"objent   ENTITY                        #REQUIRED
+linkend  CDATA                          #REQUIRED
+endterm  CDATA                          #REQUIRED">
 <!ENTITY % title.class "title,subtitle?,titleabbrev?">
 <!ENTITY % info.class "docinfo?,%title.class;">
 <!ENTITY % author.class "author">
-<!ENTITY % xref.class "anchor|xref|link|ulink">
+<!ENTITY % xref.class "anchor|xref|link|ulink|oref|olink">
 <!ENTITY % special.location.class "">
 <!ENTITY % location.class "web|email|address|phone
         %special.location.class;">
@@ -23,10 +32,11 @@
         "#PCDATA|emphasis|term|subscript|superscript|foreign|replaceable|literal|acronym
         |%xref.class;
         %special.text.class;">
+<!ENTITY % local.block.class "">
 <!ENTITY % special.block.class "">
 <!ENTITY % commonblock.class 
         "para|formalpara|list|shortlist|deflist|example|citation
-        %special.block.class;">
+        %special.block.class;%local.block.class;">
 <!ENTITY % listitem.class "listitem|item">
 
 <!-- Top elements -->
@@ -59,9 +69,10 @@
 <!-- structure elements -->
 <!ELEMENT preambule ((%title.class;)?,(%commonblock.class;)*)>
 <!ATTLIST preambule %common.attrib;>
+<!ENTITY % local.section.alt "">
 <!ENTITY % special.section.alt "">
 <!ELEMENT section ((%title.class;)?,(%commonblock.class;)+,
-        (section %special.section.alt;)*)>
+        (section %special.section.alt;%local.section.alt;)*)>
 <!ATTLIST section %common.attrib;>
 <!ELEMENT addendum ((%title.class;)?,(%commonblock.class;)*)>
 <!ATTLIST addendum %common.attrib;>
@@ -182,3 +193,9 @@
 <!ELEMENT ulink (%commontext.class;)*>
 <!ATTLIST ulink %common.attrib;
                 url CDATA #REQUIRED>
+<!ELEMENT oref EMPTY>
+<!ATTLIST oref %common.attrib;
+               %oref.attrib;>
+<!ELEMENT olink (%commontext.class;)*>
+<!ATTLIST olink %common.attrib;
+                %oref.attrib;>