merge conflicting on stripping spaces

[librarian.git] / librarian / pdf / wl2tex.xslt

diff --git a/librarian/pdf/wl2tex.xslt b/librarian/pdf/wl2tex.xslt
index 9e2d77e..fd14d5c 100644 (file)
--- a/librarian/pdf/wl2tex.xslt
+++ b/librarian/pdf/wl2tex.xslt
@@ -257,7 +257,7 @@
 </xsl:template>
 
 <xsl:template
 </xsl:template>
 
 <xsl:template

-    match="naglowek_akt|naglowek_czesc|srodtytul|naglowek_osoba|naglowek_podrozdzial|naglowek_scena|naglowek_rozdzial|miejsce_czas|didaskalia|lista_osoba|akap|akap_dialog|akap_cd|motto_podpis|naglowek_listy|lista">
+    match="naglowek_akt|naglowek_czesc|srodtytul|naglowek_osoba|naglowek_podrozdzial|naglowek_scena|naglowek_rozdzial|miejsce_czas|didaskalia|lista_osoba|akap|akap_dialog|akap_cd|motto_podpis|naglowek_listy|lista|nota_red">

   <xsl:if test="name(following-sibling::*[1])='autor_rozdzialu'">
     <cmd name="autorrozdzialu"><parm><xsl:value-of select="following-sibling::*[1]/text()"/></parm></cmd>
   </xsl:if>
   <xsl:if test="name(following-sibling::*[1])='autor_rozdzialu'">
     <cmd name="autorrozdzialu"><parm><xsl:value-of select="following-sibling::*[1]/text()"/></parm></cmd>
   </xsl:if>


@@ -332,8 +332,10 @@
 <!-- = (contain other inline tags and special tags) = -->
 <!-- ================================================ -->
 
 <!-- = (contain other inline tags and special tags) = -->
 <!-- ================================================ -->
 

+<xsl:strip-space elements="nota|akap|wyroznienie"/>
+

 <xsl:template mode="inline"
 <xsl:template mode="inline"

-    match="pa|pe|pr|pt|mat|didask_tekst|slowo_obce|wyroznienie|osoba|punkt|www">
+    match="pa|pe|pr|pt|mat|didask_tekst|slowo_obce|wyroznienie|osoba|punkt|www|nota_red">

     <cmd>
         <xsl:attribute name="name">
             <xsl:value-of select="wl:texcommand(name())" />
     <cmd>
         <xsl:attribute name="name">
             <xsl:value-of select="wl:texcommand(name())" />


@@ -554,7 +556,8 @@
 <xsl:template match="extra|uwaga" />
 <xsl:template match="extra|uwaga" mode="inline" />
 
 <xsl:template match="extra|uwaga" />
 <xsl:template match="extra|uwaga" mode="inline" />
 

-<xsl:template match="nota_red" />
+<!-- make it a command: <xsl:template match="nota_red" />-->
+

 
 <!-- ======== -->
 <!-- = TEXT = -->
 
 <!-- ======== -->
 <!-- = TEXT = -->