pdf: use custom TeX commands and a style

diff --git a/librarian/functions.py b/librarian/functions.py
index 5ad723d..e5023b3 100644 (file)
--- a/librarian/functions.py
+++ b/librarian/functions.py
@@ -96,3 +96,12 @@ def reg_person_name():
     _register_function(person_name)
 
 
     _register_function(person_name)
 
 

+def reg_texcommand():
+    def texcommand(context, text):
+        """Remove non-letters"""
+        if isinstance(text, list):
+            text = ''.join(text)
+        return re.sub(r'[^a-zA-Z]', '', text).strip()
+    _register_function(texcommand)
+
+

diff --git a/librarian/pdf.py b/librarian/pdf.py
index bb1ba64..32fa571 100644 (file)
--- a/librarian/pdf.py
+++ b/librarian/pdf.py
@@ -29,6 +29,7 @@ functions.reg_substitute_entities()
 functions.reg_strip()
 functions.reg_starts_white()
 functions.reg_ends_white()
 functions.reg_strip()
 functions.reg_starts_white()
 functions.reg_ends_white()

+functions.reg_texcommand()

 
 STYLESHEETS = {
     'wl2tex': 'xslt/wl2tex.xslt',
 
 STYLESHEETS = {
     'wl2tex': 'xslt/wl2tex.xslt',

diff --git a/librarian/pdf/wl.sty b/librarian/pdf/wl.sty
index bfe2881..1299aec 100644 (file)
--- a/librarian/pdf/wl.sty
+++ b/librarian/pdf/wl.sty
@@ -78,3 +78,187 @@
 %    \end{figure}
     }
 }
 %    \end{figure}
     }
 }

+
+
+
+
+\newcommand{\nazwapodutworu}[1]{%
+\section*{#1}%
+}
+
+\newcommand{\autorutworu}[1]{%
+\subsection*{#1}%
+}
+
+\newcommand{\nazwautworu}[1]{%
+\section*{#1}%
+}
+
+\newcommand{\powiesc}[1]{#1}
+\newcommand{\opowiadanie}[1]{#1}
+\newcommand{\lirykal}[1]{#1}
+\newcommand{\lirykalp}[1]{#1}
+\newcommand{\dramatwierszowanyl}[1]{#1}
+\newcommand{\dramatwierszowanylp}[1]{#1}
+\newcommand{\dramatwspolczesny}[1]{#1}
+
+\newcommand{\nota}[1]{%
+\par{#1}%
+}
+
+\newcommand{\dedykacja}[1]{%
+\begin{em}%
+\begin{flushright}%
+#1%
+\end{flushright}%
+\end{em}%
+}
+
+\newcommand{\dlugicytat}[1]{%
+\begin{quotation}%
+#1%
+\end{quotation}%
+}
+
+\newcommand{\poezjacyt}[1]{%
+\begin{verse}%
+#1%
+\end{verse}%
+}
+\newcommand{\motto}[1]{%
+\begin{em}%
+#1%
+\end{em}%
+}
+\newcommand{\listaosob}[2]{%
+\par{#1}%
+\begin{itemize}%
+#2%
+\end{itemize}%
+}
+
+\newcommand{\nagloweklisty}[1]{%
+\textbf{#1}%
+}
+
+\newcommand{\listaosoba}[1]{%
+\item{#1}%
+}
+
+\newcommand{\kwestia}[1]{%
+\par{#1}%
+}
+
+\newcommand{\naglowekakt}[1]{%
+\subsection*{#1}%
+}
+\newcommand{\naglowekczesc}[1]{%
+\subsection*{#1}%
+}
+\newcommand{\srodtytul}[1]{%
+\subsection*{#1}%
+}
+
+\newcommand{\naglowekscena}[1]{%
+\subsubsection*{#1}%
+}
+\newcommand{\naglowekrozdzia}[1]{%
+\subsubsection*{#1}%
+}
+
+\newcommand{\naglowekosoba}[1]{%
+\par{#1}\nopagebreak%
+}
+\newcommand{\naglowekpodrozdzial}[1]{%
+\par{#1}\nopagebreak%
+}
+
+\newcommand{\miejsceczas}[1]{%
+\par{\emph{#1}}%
+}
+\newcommand{\didaskalia}[1]{%
+\par{\emph{#1}}%
+}
+
+\newcommand{\akap}[1]{%
+\par{#1}%
+}
+\newcommand{\akapdialog}[1]{%
+\par{#1}%
+}
+\newcommand{\akapcd}[1]{%
+\par{#1}%
+}
+
+\newcommand{\mottopodpis}[1]{%
+\begin{em}%
+\begin{flushright}%
+#1%
+\end{flushright}%
+\end{em}%
+}
+
+\newcommand{\strofa}[1]{%
+\par{\noindent{\ignorespaces#1\vspace{1em}}}%
+}
+
+\newcommand{\wers}[1]{#1}
+
+\newcommand{\wersakap}[1]{%
+\hspace*{1em}#1%
+}
+\newcommand{\werscd}[1]{%
+\hspace*{8em}#1%
+}
+\newcommand{\werswciety}[2][1em]{%
+\hspace*{#1}#2%
+}
+
+
+\newcommand{\pa}[1]{\footnote{#1}}
+\newcommand{\pe}[1]{\footnote{#1}}
+\newcommand{\pr}[1]{\footnote{#1}}
+\newcommand{\pt}[1]{\footnote{#1}}
+
+\newcommand{\mat}[1]{$#1$}
+
+\newcommand{\didasktekst}[1]{%
+\emph{#1}%
+}
+\newcommand{\slowoobce}[1]{%
+\emph{#1}%
+}
+\newcommand{\tytuldziela}[1]{%
+\emph{#1}%
+}
+\newcommand{\wyroznienie}[1]{%
+\emph{#1}%
+}
+
+\newcommand{\osoba}[1]{%
+\textsc{#1}%
+}
+
+\newcommand{\sekcjaswiatlo}{%
+\hspace{30pt}%
+}
+
+\newcommand{\sekcjaasterysk}{%
+\par{*}%
+}
+
+\newcommand{\separatorlinia}{%
+\hrule{}%
+}
+
+\newcommand{\motyw}[2][0]{%
+\mbox{}%
+\marginpar{%
+\vspace{-8pt}%
+\vspace{-#1\baselineskip}%
+\raggedright{\hspace{0pt}%
+\footnotesize{\color{theme}{#2}}}%
+\vspace{\baselineskip}%
+}%
+}
+

diff --git a/librarian/xslt/wl2tex.xslt b/librarian/xslt/wl2tex.xslt
index a6a9b56..0e2dbfe 100644 (file)
--- a/librarian/xslt/wl2tex.xslt
+++ b/librarian/xslt/wl2tex.xslt
@@ -106,21 +106,20 @@
 </xsl:template>
 
 <xsl:template match="rdf:RDF" mode="dctitle">
 </xsl:template>
 
 <xsl:template match="rdf:RDF" mode="dctitle">

-    <cmd name="section*"><parm>
+    <cmd name="nazwapodutworu"><parm>

         <xsl:apply-templates select=".//dc:title/node()" mode="inline" />
     </parm></cmd>
 </xsl:template>
 
         <xsl:apply-templates select=".//dc:title/node()" mode="inline" />
     </parm></cmd>
 </xsl:template>
 

-

 <xsl:template match="powiesc|opowiadanie|liryka_l|liryka_lp|dramat_wierszowany_l|dramat_wierszowany_lp|dramat_wspolczesny" mode="firstdctitle">
     <xsl:apply-templates select="rdf:RDF" mode="firstdctitle" />
 </xsl:template>
 
 <xsl:template match="rdf:RDF" mode="firstdctitle">
 <xsl:template match="powiesc|opowiadanie|liryka_l|liryka_lp|dramat_wierszowany_l|dramat_wierszowany_lp|dramat_wspolczesny" mode="firstdctitle">
     <xsl:apply-templates select="rdf:RDF" mode="firstdctitle" />
 </xsl:template>
 
 <xsl:template match="rdf:RDF" mode="firstdctitle">

-    <cmd name="subsection*"><parm>
+    <cmd name="autorutworu"><parm>

         <xsl:apply-templates select=".//dc:creator_parsed/node()" mode="inline" />
     </parm></cmd>
         <xsl:apply-templates select=".//dc:creator_parsed/node()" mode="inline" />
     </parm></cmd>

-    <cmd name="section*"><parm>
+    <cmd name="nazwautworu"><parm>

         <xsl:apply-templates select=".//dc:title/node()" mode="inline" />
     </parm></cmd>
 </xsl:template>
         <xsl:apply-templates select=".//dc:title/node()" mode="inline" />
     </parm></cmd>
 </xsl:template>


@@ -130,66 +129,34 @@
 <!-- = MASTER TAG                                                                 = -->
 <!-- = (can contain block tags, paragraph tags, standalone tags and special tags) = -->
 <!-- ============================================================================== -->
 <!-- = MASTER TAG                                                                 = -->
 <!-- = (can contain block tags, paragraph tags, standalone tags and special tags) = -->
 <!-- ============================================================================== -->

-
-<xsl:template match="powiesc|opowiadanie|liryka_l|liryka_lp|dramat_wierszowany_l|dramat_wierszowany_lp|dramat_wspolczesny">
-    <xsl:apply-templates />
-</xsl:template>
-
-
-

 <!-- ==================================================================================== -->
 <!-- = BLOCK TAGS                                                                       = -->
 <!-- = (can contain other block tags, paragraph tags, standalone tags and special tags) = -->
 <!-- ==================================================================================== -->
 <!-- ==================================================================================== -->
 <!-- = BLOCK TAGS                                                                       = -->
 <!-- = (can contain other block tags, paragraph tags, standalone tags and special tags) = -->
 <!-- ==================================================================================== -->

-<xsl:template match="nota">
-    <cmd name="par">
-        <parm><xsl:apply-templates /></parm>
+
+<xsl:template 
+    match="powiesc|opowiadanie|liryka_l|liryka_lp|dramat_wierszowany_l|dramat_wierszowany_lp|dramat_wspolczesny|nota|dedykacja|dlugi_cytat|poezja_cyt|motto">
+    <cmd>
+        <xsl:attribute name="name">
+            <xsl:value-of select="wl:texcommand(name())" />
+        </xsl:attribute>
+        <parm><xsl:apply-templates/></parm>

     </cmd>
 </xsl:template>
 
 <xsl:template match="lista_osob">
     </cmd>
 </xsl:template>
 
 <xsl:template match="lista_osob">

-    <cmd name="par"><parm>
-        <cmd name="textbf">
-            <parm><xsl:apply-templates select="naglowek_listy" mode="inline" /></parm>
-        </cmd>
-        <env name="itemize">
-            <xsl:apply-templates select="lista_osoba" />
-        </env>
-    </parm></cmd>
-</xsl:template>
-
-<xsl:template match="dedykacja">
-    <env name="em">
-        <env name="flushright">
-            <xsl:apply-templates/>
-        </env>
-    </env>
+    <cmd name="listaosob">
+        <parm><xsl:apply-templates select="naglowek_listy" /></parm>
+        <parm><xsl:apply-templates select="lista_osoba" /></parm>
+    </cmd>

 </xsl:template>
 
 <xsl:template match="kwestia">
 </xsl:template>
 
 <xsl:template match="kwestia">

-    <cmd name="par">
+    <cmd name="kwestia">

         <parm><xsl:apply-templates select="strofa|akap|didaskalia" /></parm>
     </cmd>
 </xsl:template>
 
         <parm><xsl:apply-templates select="strofa|akap|didaskalia" /></parm>
     </cmd>
 </xsl:template>
 

-<xsl:template match="dlugi_cytat">
-    <env name="quotation">
-        <xsl:apply-templates />
-    </env>
-</xsl:template>
-
-<xsl:template match="poezja_cyt">
-    <env name="verse">
-        <xsl:apply-templates />
-    </env>
-</xsl:template>
-
-<xsl:template match="motto">
-    <env name="em">
-        <xsl:apply-templates mode="inline" />
-    </env>
-</xsl:template>
-

 
 <!-- ========================================== -->
 <!-- = PARAGRAPH TAGS                         = -->
 
 <!-- ========================================== -->
 <!-- = PARAGRAPH TAGS                         = -->


@@ -198,67 +165,24 @@
 
 <!-- only in root -->
 <xsl:template match="autor_utworu" mode="title">
 
 <!-- only in root -->
 <xsl:template match="autor_utworu" mode="title">

-    <cmd name="subsection*"><parm>
+    <cmd name="autorutworu"><parm>

         <xsl:apply-templates mode="inline" />
     </parm></cmd>
 </xsl:template>
 
         <xsl:apply-templates mode="inline" />
     </parm></cmd>
 </xsl:template>
 

-<xsl:template match="nazwa_utworu">
-    <cmd name="section*"><parm>
-        <xsl:apply-templates mode="inline" />
-    </parm></cmd>
-</xsl:template>

 
 

-<!-- Section headers (included in index)-->
-<xsl:template match="naglowek_akt|naglowek_czesc|srodtytul">
-    <cmd name="subsection*">
-        <parm><xsl:apply-templates mode="inline" /></parm>
+<xsl:template 
+    match="nazwa_utworu|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">
+    <cmd>
+        <xsl:attribute name="name">
+            <xsl:value-of select="wl:texcommand(name())" />
+        </xsl:attribute>
+        <parm><xsl:apply-templates mode="inline"/></parm>

     </cmd>
 </xsl:template>
 
     </cmd>
 </xsl:template>
 

-<xsl:template match="naglowek_scena|naglowek_rozdzial">
-    <cmd name="subsubsection*">
-        <parm><xsl:apply-templates mode="inline" /></parm>
-    </cmd>
-</xsl:template>
-
-<xsl:template match="naglowek_osoba|naglowek_podrozdzial">
-    <cmd name="par">
-        <parm><xsl:apply-templates mode="inline" /></parm>
-    </cmd><cmd name="nopagebreak" />
-</xsl:template>
-
-<!-- Other paragraph tags -->
-<xsl:template match="miejsce_czas">
-    <cmd name="par"><parm>
-        <cmd name="emph">
-            <parm><xsl:apply-templates mode="inline" /></parm>
-        </cmd>
-    </parm></cmd>
-</xsl:template>
-
-<xsl:template match="didaskalia">
-    <cmd name="par"><parm>
-        <cmd name="emph">
-            <parm><xsl:apply-templates mode="inline" /></parm>
-        </cmd>
-    </parm></cmd>
-</xsl:template>
-
-<xsl:template match="lista_osoba">
-    <cmd name="item"><parm>
-        <xsl:apply-templates mode="inline" />
-    </parm></cmd>
-</xsl:template>
-
-<xsl:template match="akap|akap_dialog|akap_cd">
-    <cmd name="par"><parm>
-        <xsl:apply-templates mode="inline" />
-    </parm></cmd>
-</xsl:template>
-

 <xsl:template match="strofa">
 <xsl:template match="strofa">

-<cmd name="par"><parm><cmd name="noindent"><parm>
+  <cmd name="strofa"><parm>

     <xsl:choose>
         <xsl:when test="count(br) > 0">
             <xsl:call-template name="verse">
     <xsl:choose>
         <xsl:when test="count(br) > 0">
             <xsl:call-template name="verse">


@@ -283,38 +207,28 @@
             </xsl:call-template>
         </xsl:otherwise>
     </xsl:choose>
             </xsl:call-template>
         </xsl:otherwise>
     </xsl:choose>

-    <cmd name="vspace"><parm>1em</parm></cmd>
-</parm></cmd></parm></cmd>
+  </parm></cmd>

 </xsl:template>
 
 
 <xsl:template name="verse">
     <xsl:param name="verse-content" />
     <xsl:param name="verse-type" />
 </xsl:template>
 
 
 <xsl:template name="verse">
     <xsl:param name="verse-content" />
     <xsl:param name="verse-type" />

-        <xsl:choose><xsl:when test="name($verse-type) = 'wers_akap'"><cmd name="hspace" ><parm>1em</parm></cmd></xsl:when>
-            <xsl:when test="name($verse-type) = 'wers_wciety'">
-                <xsl:choose>
-                    <xsl:when test="string($verse-content/@typ)">
-                        <cmd name="hspace" ><parm><xsl:value-of select="$verse-content/@typ" />em</parm></cmd>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <cmd name="hspace" ><parm>1em</parm></cmd>
-                    </xsl:otherwise>
-                </xsl:choose>
-            </xsl:when>
-            <xsl:when test="name($verse-type) = 'wers_cd'">
-                <cmd name="hspace" ><parm>8em</parm></cmd>
-            </xsl:when>
-        </xsl:choose>
-        <xsl:apply-templates select="$verse-content" mode="inline" />
-</xsl:template>

 
 

-<xsl:template match="motto_podpis">
-    <env name="em">
-        <env name="flushright">
-            <xsl:apply-templates mode="inline"/>
-        </env>
-    </env>
+    <cmd>
+        <xsl:attribute name="name">
+            <xsl:choose>
+                <xsl:when test="$verse-type != ''">
+                    <xsl:value-of select='wl:texcommand(name($verse-type))' />
+                </xsl:when>
+                <xsl:otherwise>wers</xsl:otherwise>
+            </xsl:choose>
+        </xsl:attribute>
+        <xsl:if test="string($verse-content/@typ)">
+            <opt><xsl:value-of select="$verse-content/@typ" />em</opt>
+        </xsl:if>
+        <parm><xsl:apply-templates select="$verse-content" mode="inline"/></parm>
+    </cmd>

 </xsl:template>
 
 <!-- ================================================ -->
 </xsl:template>
 
 <!-- ================================================ -->


@@ -322,58 +236,40 @@
 <!-- = (contain other inline tags and special tags) = -->
 <!-- ================================================ -->
 
 <!-- = (contain other inline tags and special tags) = -->
 <!-- ================================================ -->
 

-<!-- Annotations -->
-<xsl:template match="pa|pe|pr|pt" mode="inline">
-    <cmd name="footnote"><parm><xsl:apply-templates mode="inline" /></parm></cmd>
+<xsl:template mode="inline"
+    match="pa|pe|pr|pt|mat|didask_tekst|slowo_obce|wyroznienie|osoba">
+    <cmd>
+        <xsl:attribute name="name">
+            <xsl:value-of select="wl:texcommand(name())" />
+        </xsl:attribute>
+        <parm><xsl:apply-templates mode="inline"/></parm>
+    </cmd>

 </xsl:template>
 
 </xsl:template>
 

-<!-- Other inline tags -->
-<xsl:template match="mat" mode="inline">
-    <math><xsl:apply-templates mode="inline" /></math>
-</xsl:template>

 
 

-<xsl:template match="didask_tekst" mode="inline">
-    <cmd name="emph"><parm><xsl:apply-templates mode="inline" /></parm></cmd>
-</xsl:template>
-
-<xsl:template match="slowo_obce" mode="inline">
-    <cmd name="emph"><parm><xsl:apply-templates mode="inline" /></parm></cmd>
-</xsl:template>

 
 <xsl:template match="tytul_dziela" mode="inline">
 
 <xsl:template match="tytul_dziela" mode="inline">

-    <cmd name="emph"><parm>
+    <cmd name="tytuldziela"><parm>

         <xsl:if test="@typ = '1'">„</xsl:if><xsl:apply-templates mode="inline" /><xsl:if test="@typ = '1'">”</xsl:if>
     </parm></cmd>
 </xsl:template>
 
         <xsl:if test="@typ = '1'">„</xsl:if><xsl:apply-templates mode="inline" /><xsl:if test="@typ = '1'">”</xsl:if>
     </parm></cmd>
 </xsl:template>
 

-<xsl:template match="wyroznienie" mode="inline">
-    <cmd name="emph"><parm><xsl:apply-templates mode="inline" /></parm></cmd>
-</xsl:template>
-
-<xsl:template match="osoba" mode="inline">
-    <cmd name="textsc"><parm><xsl:apply-templates mode="inline" /></parm></cmd>
-</xsl:template>

 
 
 <!-- ============================================== -->
 <!-- = STANDALONE TAGS                            = -->
 <!-- = (cannot contain any other tags)            = -->
 <!-- ============================================== -->
 
 
 <!-- ============================================== -->
 <!-- = STANDALONE TAGS                            = -->
 <!-- = (cannot contain any other tags)            = -->
 <!-- ============================================== -->

-<xsl:template match="sekcja_swiatlo">
-    <cmd name="hspace"><parm>30pt</parm></cmd>
-</xsl:template>
-
-<xsl:template match="sekcja_asterysk">
-    <!-- TODO: padding? -->
-    <cmd name="par"><parm>*</parm></cmd>
-</xsl:template>
-
-<xsl:template match="separator_linia">
-    <cmd name="hrule" />
+<xsl:template
+    match="sekcja_swiatlo|sekcja_asterysk|separator_linia">
+    <cmd>
+        <xsl:attribute name="name">
+            <xsl:value-of select="wl:texcommand(name())" />
+        </xsl:attribute>
+    </cmd>

 </xsl:template>
 
 
 </xsl:template>
 
 

-

 <!-- ================ -->
 <!-- = SPECIAL TAGS = -->
 <!-- ================ -->
 <!-- ================ -->
 <!-- = SPECIAL TAGS = -->
 <!-- ================ -->


@@ -388,23 +284,11 @@
 <xsl:template match="end" mode="inline" />
 
 <xsl:template match="motyw" mode="inline">
 <xsl:template match="end" mode="inline" />
 
 <xsl:template match="motyw" mode="inline">

-    <cmd name="mbox" />
-    <cmd name="marginpar">
-        <parm>
-            <cmd name="vspace"><parm>-8pt</parm></cmd>
-            <xsl:if test="@moved">
-                <cmd name="vspace"><parm>-<xsl:value-of select="@moved" /><cmd name="baselineskip" /></parm></cmd>
-            </xsl:if>
-            <cmd name="raggedright"><parm>
-                <cmd name="hspace"><parm>0pt</parm></cmd>
-                <cmd name="footnotesize"><parm>
-                    <cmd name="color"><parm>theme</parm><parm>
-                        <xsl:apply-templates mode="inline" />
-                    </parm></cmd>
-                </parm></cmd>
-            </parm></cmd>
-            <cmd name="vspace"><parm><cmd name="baselineskip" /></parm></cmd>
-        </parm>
+    <cmd name="motyw">
+        <xsl:if test="@moved">
+            <opt name="moved"><xsl:value-of select="@moved" /></opt>
+        </xsl:if>
+        <parm><xsl:apply-templates mode="inline" /></parm>

     </cmd>
 </xsl:template>
 
     </cmd>
 </xsl:template>