From: Norman Walsh <ndw@nwalsh.com>
Date: Sun, 6 Jan 2002 19:18:39 +0000 (+0000)
Subject: Add address back into affiliation
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8993c8851db1da21d97fdc23af2962bb3604301;p=docbook-dsssl

Add address back into affiliation
---

diff --git a/slides/slides-custom.dtd b/slides/slides-custom.dtd
index 9287c2695..fd376d3c2 100644
--- 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+))>