Add address back into affiliation

diff --git a/slides/slides-custom.dtd b/slides/slides-custom.dtd
index 9287c26958707bbeb06f21823d6a8d2f10723791..fd376d3c273b9e2a94ae1f43daa173112cb7ecb1 100644 (file)
--- a/slides/slides-custom.dtd
+++ b/slides/slides-custom.dtd
@@ -32,6 +32,7 @@
 <!ENTITY % simple.bibliography.element "IGNORE">
 <!ENTITY % simple.bibliomixed.element "IGNORE">
 <!ENTITY % simple.bibliodiv.element "IGNORE">
+<!ENTITY % simple.affiliation.element "IGNORE">
 <!ENTITY % sidebar.module "INCLUDE">
 
 <!ENTITY % confgroup.content.module "INCLUDE">
@@ -81,6 +82,19 @@
                %local.screen.attrib;
 >
 
+<!-- Add address back into the affiliation... -->
+<!ELEMENT affiliation (jobtitle?, orgname?, address*)>
+
+<!-- And add address back into the DTD -->
+<!ELEMENT address (#PCDATA)>
+<!ENTITY % address.role.attrib "%role.attrib;">
+<!ENTITY % local.address.attrib "">
+<!ATTLIST address
+               %linespecific.attrib;
+               %common.attrib;
+               %address.role.attrib;
+>
+
 <!-- ====================================================================== -->
 
 <!ELEMENT slides (slidesinfo, speakernotes?, (foil+|section+))>