DS Guide: Repaired schedule

git-svn-id: svn://svn.c3d2.de/c3d2-web/trunk@282 31f61c52-7bfb-0310-b897-fc00f8a278f0

xslfo/datenspuren/guide/Makefile

@@ -7,6 +7,6 @@ C3D2WEB_XSL=c3d2web.xsl
 DEPS=$(GUIDE_XML) $(GUIDE_XSL) $(SCHEDULE_XSL) $(SCHEDULE_XML) $(C3D2WEB_XSL)
 
 guide.pdf: $(DEPS)
-	/home/stephan/programs/fop/fop -xml $(GUIDE_XML) -xsl $(GUIDE_XSL) -pdf $@
+	~/programs/fop/fop -d -xml $(GUIDE_XML) -xsl $(GUIDE_XSL) -pdf $@
 guide-xep.pdf: $(DEPS)
 	~/Java/XEP/xep -xml $(GUIDE_XML) -xsl $(GUIDE_XSL) -pdf $@

xslfo/datenspuren/guide/guide.xml

@@ -41,7 +41,7 @@
       <pull-c3d2web file='../../../content/datenspuren/veranstaltungsort.xml'/>
     </section>
     <section title='Vorträge'>
-      <pull-c3d2web file='../../public_html/c3d2-web/trunk/content/datenspuren/vortraege.xml'/>
+      <pull-c3d2web file='../../../content/datenspuren/vortraege.xml'/>
     </section>
 
     <section title='Conglomerate: XML For Everyone'>
@@ -69,10 +69,11 @@
   We are working towards our first stable release. You can download the current version and used it for simple editing as it is, although there are some known bugs.
       </p>
     </section>
+  </page-sequence>
 
+  <page-sequence>
     <section title='Programm'>
       <pull-schedule file='../../../www/datenspuren/fahrplan/schedule.de.xml'/>
     </section>
-
   </page-sequence>
 </guide>

xslfo/datenspuren/guide/guide.xsl

@@ -3,6 +3,7 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
+  <xsl:include href='schedule.xsl'/>
   <xsl:include href='schedule.xsl'/>
 
   <xsl:template match="/guide">
@@ -136,18 +137,13 @@
   </xsl:template>
 
   <!-- For schedule.xsl -->
-
   <xsl:template match='pull-schedule'>
-    <xsl:for-each select='document(@file)'>
-      <xsl:apply-templates/>
-    </xsl:for-each>
+    <xsl:apply-templates select='document(@file)'/>
   </xsl:template>
 
   <!-- For c3d2web.xsl -->
   <xsl:template match='pull-c3d2web'>
-    <xsl:for-each select='document(@file)'>
-      <xsl:apply-templates/>
-    </xsl:for-each>
+    <xsl:apply-templates select='document(@file)'/>
   </xsl:template>
 </xsl:stylesheet>
 

xslfo/datenspuren/guide/schedule.xsl

@@ -3,14 +3,10 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-  <xsl:template match="pull-schedule/schedule">
-    <xsl:apply-templates/>
+  <xsl:template match="/schedule/conference">
   </xsl:template>
 
-  <xsl:template match="pull-schedule/schedule/conference">
-  </xsl:template>
-
-  <xsl:template match='pull-schedule/schedule/day/room'>
+  <xsl:template match='/schedule/day/room'>
     <fo:block padding='10mm 2mm' font-size='14pt' font-family='serif' text-align='center'
               keep-together.within-column="always" keep-with-next.within-column="always">
       Tag <xsl:value-of select='../@index'/>, <xsl:value-of select='@name'/>
@@ -19,7 +15,7 @@
     <xsl:apply-templates/>
   </xsl:template>
 
-  <xsl:template match='pull-schedule/schedule/day/room/event'>
+  <xsl:template match='/schedule/day/room/event'>
     <fo:block font-size='14pt' padding='1mm'
               border-top-style='solid' border-bottom-style='solid'
               border-top-color='black' border-bottom-color='black'