From ff775a45ea9cf593312c7feb21c5eba9f5dc7b99 Mon Sep 17 00:00:00 2001
From: Jonathan Blake <jonathan.blake@projectaon.org>
Date: Wed, 14 Nov 2012 18:14:09 +0000
Subject: [PATCH] correcting use of newlines in target document

git-svn-id: https://projectaon.org/data/trunk@2173 f6f3e2d7-ff33-0410-aaf5-b4bee2cdac11
---
 common/xsl/epub-xhtml.xsl        | 5 ++---
 common/xsl/xhtml-less-simple.xsl | 6 ++++--
 common/xsl/xhtml-simple.xsl      | 6 ++++--
 common/xsl/xhtml.xsl             | 6 ++++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/common/xsl/epub-xhtml.xsl b/common/xsl/epub-xhtml.xsl
index 794fbc4..bac7c86 100644
--- a/common/xsl/epub-xhtml.xsl
+++ b/common/xsl/epub-xhtml.xsl
@@ -526,13 +526,13 @@ Todo:
 
  <xsl:template match="puzzle">
   <p class="puzzle">
-   <xsl:apply-templates /><xsl:value-of select="$newline" />
+   <xsl:apply-templates />
   </p>
  </xsl:template>
  
  <xsl:template match="deadend">
   <p class="deadend">
-   <xsl:apply-templates /><xsl:value-of select="$newline" />
+   <xsl:apply-templates />
   </p>
  </xsl:template>
 
@@ -540,7 +540,6 @@ Todo:
   <div class="signpost">
    <xsl:apply-templates />
   </div>
-
  </xsl:template>
 
  <xsl:template match="signpost">
diff --git a/common/xsl/xhtml-less-simple.xsl b/common/xsl/xhtml-less-simple.xsl
index c01c0ac..fba6ef9 100644
--- a/common/xsl/xhtml-less-simple.xsl
+++ b/common/xsl/xhtml-less-simple.xsl
@@ -751,14 +751,16 @@ Todo:
 
 <xsl:template match="puzzle">
  <p class="puzzle">
-  <xsl:apply-templates /><xsl:value-of select="$newline" />
+  <xsl:apply-templates />
  </p>
+ <xsl:value-of select="$newline" />
 </xsl:template>
 
 <xsl:template match="deadend">
  <p class="deadend">
-  <xsl:apply-templates /><xsl:value-of select="$newline" />
+  <xsl:apply-templates />
  </p>
+ <xsl:value-of select="$newline" />
 </xsl:template>
 
 <xsl:template match="data/signpost">
diff --git a/common/xsl/xhtml-simple.xsl b/common/xsl/xhtml-simple.xsl
index 5f88b55..5f290a8 100644
--- a/common/xsl/xhtml-simple.xsl
+++ b/common/xsl/xhtml-simple.xsl
@@ -846,14 +846,16 @@ Todo:
 
 <xsl:template match="puzzle">
  <p class="puzzle">
-  <xsl:apply-templates /><xsl:value-of select="$newline" />
+  <xsl:apply-templates />
  </p>
+ <xsl:value-of select="$newline" />
 </xsl:template>
 
 <xsl:template match="deadend">
  <p class="deadend">
-  <xsl:apply-templates /><xsl:value-of select="$newline" />
+  <xsl:apply-templates />
  </p>
+ <xsl:value-of select="$newline" />
 </xsl:template>
 
 <xsl:template match="data/signpost">
diff --git a/common/xsl/xhtml.xsl b/common/xsl/xhtml.xsl
index 1449e52..fab55c7 100644
--- a/common/xsl/xhtml.xsl
+++ b/common/xsl/xhtml.xsl
@@ -573,14 +573,16 @@ Todo:
 
 <xsl:template match="puzzle">
  <p class="puzzle">
-  <xsl:apply-templates /><xsl:value-of select="$newline" />
+  <xsl:apply-templates />
  </p>
+ <xsl:value-of select="$newline" />
 </xsl:template>
 
 <xsl:template match="deadend">
  <p class="deadend">
-  <xsl:apply-templates /><xsl:value-of select="$newline" />
+  <xsl:apply-templates />
  </p>
+ <xsl:value-of select="$newline" />
 </xsl:template>
 
 <xsl:template match="data/signpost">
-- 
2.34.1