Add podtytul_* tags; refs #4005.

diff --git a/librarian/epub/xsltScheme.xsl b/librarian/epub/xsltScheme.xsl
index e67cda7..724d983 100644 (file)
--- a/librarian/epub/xsltScheme.xsl
+++ b/librarian/epub/xsltScheme.xsl
@@ -161,6 +161,25 @@
     </h2>
   </xsl:template>
 
     </h2>
   </xsl:template>
 

+  <xsl:template match="podtytul_czesc|podtytul_akt">
+    <h2 class="h2"><small>
+      <xsl:apply-templates />
+    </small></h2>
+  </xsl:template>
+
+  <xsl:template match="podtytul_rozdzial|podtytul_scena">
+    <h2 class="h3"><small>
+      <xsl:apply-templates />
+    </small></h2>
+  </xsl:template>
+
+  <xsl:template match="podtytul_podrozdzial">
+    <h2 class="h4"><small>
+      <xsl:apply-templates />
+    </small></h2>
+  </xsl:template>
+
+

   <xsl:template match="naglowek_osoba">
     <h2 class="h4" xmlns="http://www.w3.org/1999/xhtml">
       <xsl:apply-templates />
   <xsl:template match="naglowek_osoba">
     <h2 class="h4" xmlns="http://www.w3.org/1999/xhtml">
       <xsl:apply-templates />

diff --git a/librarian/fb2/paragraphs.xslt b/librarian/fb2/paragraphs.xslt
index ed90d2a..e2dc26b 100644 (file)
--- a/librarian/fb2/paragraphs.xslt
+++ b/librarian/fb2/paragraphs.xslt
@@ -23,7 +23,7 @@
                <cite><xsl:apply-templates mode="para"/></cite>
        </xsl:template>
 
                <cite><xsl:apply-templates mode="para"/></cite>
        </xsl:template>
 

-       <xsl:template mode="para" match="srodtytul">
+       <xsl:template mode="para" match="srodtytul|podtytul_czesc|podtytul_rozdzial|podtytul_podrozdzial|podtytul_akt|podtytul_scena">

                <p><strong><xsl:apply-templates mode="inline"/></strong></p>
        </xsl:template>
 
                <p><strong><xsl:apply-templates mode="inline"/></strong></p>
        </xsl:template>
 

diff --git a/librarian/pdf/wl.cls b/librarian/pdf/wl.cls
index fb1c4e5..f8b7731 100644 (file)
--- a/librarian/pdf/wl.cls
+++ b/librarian/pdf/wl.cls
@@ -632,12 +632,24 @@ Letters={Uppercase}
 \addcontentsline{toc}{subsection}{#2}%
 \vspace{5ex}%
 }
 \addcontentsline{toc}{subsection}{#2}%
 \vspace{5ex}%
 }

+
+\newcommand{\podtytulakt}[1]{%
+\par{\typosubsubsection{\LARGE #1}}%
+\vspace{5ex}%
+}
+

 \newcommand{\naglowekczesc}[2]{%
 \pagebreak
 \subsection*{\typosubsection{\huge #1}}%
 \addcontentsline{toc}{subsection}{#2}%
 \vspace{5ex}%
 }
 \newcommand{\naglowekczesc}[2]{%
 \pagebreak
 \subsection*{\typosubsection{\huge #1}}%
 \addcontentsline{toc}{subsection}{#2}%
 \vspace{5ex}%
 }

+
+\newcommand{\podtytulczesc}[1]{%
+\par{\typosubsubsection{\LARGE #1}}%
+\vspace{5ex}%
+}
+

 \newcommand{\srodtytul}[1]{%
 \subsection*{\typosubsection{#1}}%
 }
 \newcommand{\srodtytul}[1]{%
 \subsection*{\typosubsection{#1}}%
 }


@@ -647,12 +659,23 @@ Letters={Uppercase}
 \addcontentsline{toc}{subsubsection}{#2}%
 \vspace{5ex}%
 }
 \addcontentsline{toc}{subsubsection}{#2}%
 \vspace{5ex}%
 }

+
+\newcommand{\podtytulscena}[1]{%
+\par{\large #1}%
+\vspace{5ex}%
+}
+

 \newcommand{\naglowekrozdzial}[2]{%
 \subsubsection*{\typosubsubsection{\LARGE #1}}%
 \addcontentsline{toc}{subsubsection}{#2}%
 \vspace{5ex}%
 }
 
 \newcommand{\naglowekrozdzial}[2]{%
 \subsubsection*{\typosubsubsection{\LARGE #1}}%
 \addcontentsline{toc}{subsubsection}{#2}%
 \vspace{5ex}%
 }
 

+\newcommand{\podtytulrozdzial}[1]{%
+\par{\large #1}%
+\vspace{5ex}%
+}
+

 \newcommand{\naglowekosoba}[1]{%
 \medskip%
 \par{\textsc{\MakeLowercase{#1}}}\nopagebreak%
 \newcommand{\naglowekosoba}[1]{%
 \medskip%
 \par{\textsc{\MakeLowercase{#1}}}\nopagebreak%


@@ -661,6 +684,10 @@ Letters={Uppercase}
 \vspace{5ex}\par{#1}\nopagebreak%
 }
 
 \vspace{5ex}\par{#1}\nopagebreak%
 }
 

+\newcommand{\podtytulpodrozdzial}[1]{%
+\par{#1}\nopagebreak%
+}
+

 \newcommand{\miejsceczas}[1]{%
 \par{\emph{#1}}%
 }
 \newcommand{\miejsceczas}[1]{%
 \par{\emph{#1}}%
 }

diff --git a/librarian/pdf/wl2tex.xslt b/librarian/pdf/wl2tex.xslt
index 8a1eb08..43a3274 100644 (file)
--- a/librarian/pdf/wl2tex.xslt
+++ b/librarian/pdf/wl2tex.xslt
@@ -327,7 +327,7 @@
 
 
 <xsl:template
 
 
 <xsl:template

-    match="naglowek_osoba|naglowek_podrozdzial|miejsce_czas|didaskalia|lista_osoba|akap|akap_dialog|akap_cd|motto_podpis|naglowek_listy|srodtytul">
+       match="naglowek_osoba|naglowek_podrozdzial|podtytul_podrozdzial|miejsce_czas|didaskalia|lista_osoba|akap|akap_dialog|akap_cd|motto_podpis|naglowek_listy|srodtytul|podtytul_czesc|podtytul_rozdzial|podtytul_akt|podtytul_scena">

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

diff --git a/librarian/xslt/book2html.xslt b/librarian/xslt/book2html.xslt
index 3b094ac..7d2d6b5 100644 (file)
--- a/librarian/xslt/book2html.xslt
+++ b/librarian/xslt/book2html.xslt
@@ -180,16 +180,34 @@
     <h2><xsl:apply-templates mode="inline" /></h2>
 </xsl:template>
 
     <h2><xsl:apply-templates mode="inline" /></h2>
 </xsl:template>
 

+<xsl:template match="podtytul_akt|podtytul_czesc">
+  <div class="subtitle2">
+    <xsl:apply-templates mode="inline" />
+  </div>
+</xsl:template>
+

 <xsl:template match="naglowek_scena|naglowek_rozdzial">
     <xsl:call-template name="section-anchor"/>
     <h3><xsl:apply-templates mode="inline" /></h3>
 </xsl:template>
 
 <xsl:template match="naglowek_scena|naglowek_rozdzial">
     <xsl:call-template name="section-anchor"/>
     <h3><xsl:apply-templates mode="inline" /></h3>
 </xsl:template>
 

+<xsl:template match="podtytul_scena|podtytul_rozdzial">
+  <div class="subtitle3">
+    <xsl:apply-templates mode="inline" />
+  </div>
+</xsl:template>
+

 <xsl:template match="naglowek_osoba|naglowek_podrozdzial">
       <xsl:call-template name="section-anchor"/>
     <h4><xsl:apply-templates mode="inline" /></h4>
 </xsl:template>
 
 <xsl:template match="naglowek_osoba|naglowek_podrozdzial">
       <xsl:call-template name="section-anchor"/>
     <h4><xsl:apply-templates mode="inline" /></h4>
 </xsl:template>
 

+<xsl:template match="podtytul_podrozdzial">
+  <div class="subtitle4">
+    <xsl:apply-templates mode="inline" />
+  </div>
+</xsl:template>
+

 <!-- Other paragraph tags -->
 <xsl:template match="miejsce_czas">
       <xsl:call-template name="section-anchor"/>
 <!-- Other paragraph tags -->
 <xsl:template match="miejsce_czas">
       <xsl:call-template name="section-anchor"/>

diff --git a/librarian/xslt/book2txt.xslt b/librarian/xslt/book2txt.xslt
index 8589121..4175e96 100644 (file)
--- a/librarian/xslt/book2txt.xslt
+++ b/librarian/xslt/book2txt.xslt
@@ -142,6 +142,16 @@
 <xsl:apply-templates mode="inline" />
 </xsl:template>
 
 <xsl:apply-templates mode="inline" />
 </xsl:template>
 

+
+<xsl:template match="podtytul_czesc|podtytul_rozdzial|podtytul_podrozdzial|podtytul_akt|podtytul_scena">
+<xsl:text>
+
+</xsl:text>
+<xsl:apply-templates mode="inline" />
+</xsl:template>
+
+
+

 <!-- Other paragraph tags -->
 <xsl:template match="miejsce_czas">
 <xsl:text>
 <!-- Other paragraph tags -->
 <xsl:template match="miejsce_czas">
 <xsl:text>