increased word spacing in WL XML

diff --git a/librarian/epub/style.css b/librarian/epub/style.css
index d217cce..78ed5bc 100644 (file)
--- a/librarian/epub/style.css
+++ b/librarian/epub/style.css
@@ -330,6 +330,12 @@ em.author-emphasis
     letter-spacing: 0.1em;
 }
 
+em.wieksze-odstepy
+{
+    font-style: normal;
+    word-spacing: 1em;
+}
+
 .person-list em.person
 {
     font-style: normal;

diff --git a/librarian/epub/xsltScheme.xsl b/librarian/epub/xsltScheme.xsl
index 29966e4..3b7036c 100644 (file)
--- a/librarian/epub/xsltScheme.xsl
+++ b/librarian/epub/xsltScheme.xsl
@@ -270,6 +270,12 @@
     </em>
   </xsl:template>
 
+  <xsl:template match="wieksze_odstepy" >
+    <em class="wieksze-odstepy" xmlns="http://www.w3.org/1999/xhtml">
+      <xsl:apply-templates />
+    </em>
+  </xsl:template>
+
   <xsl:template match="indeks_dolny" >
     <sub xmlns="http://www.w3.org/1999/xhtml">
       <xsl:apply-templates />

diff --git a/librarian/fb2/inline.xslt b/librarian/fb2/inline.xslt
index 3429e29..351d13c 100644 (file)
--- a/librarian/fb2/inline.xslt
+++ b/librarian/fb2/inline.xslt
@@ -39,6 +39,9 @@
                        <xsl:apply-templates mode="inline"/>
                </sub>
        </xsl:template>
+       <xsl:template match="wieksze_odstepy" mode="inline">
+               <xsl:apply-templates mode="inline"/>
+       </xsl:template>
 
        <!-- text -->
        <xsl:template match="text()" mode="inline">

diff --git a/librarian/pdf/wl.cls b/librarian/pdf/wl.cls
index 824ac19..4d010a9 100644 (file)
--- a/librarian/pdf/wl.cls
+++ b/librarian/pdf/wl.cls
@@ -533,6 +533,11 @@ Letters={Uppercase}
 \newcommand{\indeksdolny}[1]{%
 \textsubscript{#1}%
 }
+\newcommand{\wiekszeodstepy}[1]{%
+\spaceskip 3\fontdimen2\font plus 3\fontdimen3\font minus 3\fontdimen4\font \relax%
+#1%
+\spaceskip \fontdimen2\font plus \fontdimen3\font minus \fontdimen4\font \relax%
+}
 
 \newcommand{\osoba}[1]{%
 #1%

diff --git a/librarian/pdf/wl2tex.xslt b/librarian/pdf/wl2tex.xslt
index f26f62a..4c8be32 100644 (file)
--- a/librarian/pdf/wl2tex.xslt
+++ b/librarian/pdf/wl2tex.xslt
@@ -362,7 +362,7 @@
 <!-- ================================================ -->
 
 <xsl:template mode="inline"
-    match="pa|pe|pr|pt|mat|didask_tekst|slowo_obce|wyroznienie|osoba|indeks_dolny">
+    match="pa|pe|pr|pt|mat|didask_tekst|slowo_obce|wyroznienie|osoba|indeks_dolny|wieksze_odstepy">
     <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 d62071e..c4757e1 100644 (file)
--- a/librarian/xslt/book2html.xslt
+++ b/librarian/xslt/book2html.xslt
@@ -303,6 +303,10 @@
     <em class="author-emphasis"><xsl:apply-templates mode="inline" /></em>
 </xsl:template>
 
+<xsl:template match="wieksze_odstepy" mode="inline">
+    <em class="wieksze-odstepy"><xsl:apply-templates mode="inline" /></em>
+</xsl:template>
+
 <xsl:template match="indeks_dolny" mode="inline">
     <sub><xsl:apply-templates mode="inline" /></sub>
 </xsl:template>

diff --git a/librarian/xslt/book2txt.xslt b/librarian/xslt/book2txt.xslt
index 514d624..36032cf 100644 (file)
--- a/librarian/xslt/book2txt.xslt
+++ b/librarian/xslt/book2txt.xslt
@@ -282,6 +282,10 @@
 <xsl:apply-templates mode="inline" />
 </xsl:template>
 
+<xsl:template match="wieksze_odstepy" mode="inline">
+<xsl:apply-templates mode="inline" />
+</xsl:template>
+
 <xsl:template match="osoba" mode="inline">
 <xsl:apply-templates mode="inline" />
 </xsl:template>

diff --git a/librarian/xslt/config.xml b/librarian/xslt/config.xml
index 113c464..29905da 100644 (file)
--- a/librarian/xslt/config.xml
+++ b/librarian/xslt/config.xml
@@ -37,6 +37,7 @@
         <osoba />
         <tytul_dziela />
         <indeks_dolny />
+        <wieksze_odstepy />
     </inline-elements>
 
     <paragraph-elements element="p" mixed="true">

diff --git a/librarian/xslt/normalize.xslt b/librarian/xslt/normalize.xslt
deleted file mode 100644 (file)
index 435c30a..0000000
--- a/librarian/xslt/normalize.xslt
+++ /dev/null
@@ -1,405 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-   This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
-   Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
-
--->
-<xsl:stylesheet version="1.0"
-    xmlns="http://nowoczesnapolska.org.pl/ML/Lektury/1.1"
-
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:wlf="http://wolnelektury.pl/functions"
-
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-
-    exclude-result-prefixes="wlf xsl"
->
-
-    <!-- Normalization Stylsheet for Wolne Lektury XML -->
-    <xsl:output method="xml" encoding="utf-8" indent="yes" />
-
-    <xsl:strip-space elements="rdf:RDF rdf:Description meta doc main-text strofa stanza drama-line wlml:*" />
-
-    <xsl:param name="normalize-text" select="boolean(1)" />
-
-    <!-- Main entry point -->
-    <xsl:template match="/">
-        <doc>
-            <meta>
-                <xsl:apply-templates select="//rdf:RDF" mode="meta"/>
-            </meta>
-
-            <xsl:variable name="body" select="/utwor/*[local-name() = name()]" />
-
-            <main-text class="{name($body)}">
-                <xsl:apply-templates select="$body/node()" />
-            </main-text>
-
-            <annotations>
-                <xsl:apply-templates select="//pr|pt|pe|pa" mode="annotations" />
-            </annotations>
-        </doc>
-    </xsl:template>
-
-    <xsl:template match="strofa">
-        <xsl:element name="stanza" namespace="http://nowoczesnapolska.org.pl/ML/Lektury/1.1">
-            <!-- normalize verses -->
-            <xsl:choose>
-                <xsl:when test="count(br) > 0">
-                    <!-- First, collect all the tags up to first BR -->
-                    <xsl:call-template name="verse">
-                        <xsl:with-param name="verse-content" select="br[1]/preceding-sibling::node()" />
-                        <xsl:with-param name="verse-type" select="br[1]/preceding-sibling::*[name() = 'wers_wciety' or name() = 'wers_akap' or name() = 'wers_cd' or name() = 'wers_do_prawej'][1]" />
-                    </xsl:call-template>
-
-                    <!-- Collect the rest of verses -->
-                    <xsl:for-each select="br">
-                               <!-- Each BR tag "consumes" text after it -->
-                        <xsl:variable name="lnum" select="count(preceding-sibling::br)" />
-                        <xsl:call-template name="verse">
-                            <xsl:with-param name="verse-content"
-                                select="following-sibling::node()[count(preceding-sibling::br) = $lnum+1 and name() != 'br']" />
-                            <xsl:with-param name="verse-type" select="following-sibling::*[count(preceding-sibling::br) = $lnum+1 and (name() = 'wers_wciety' or name() = 'wers_akap' or name() = 'wers_cd' or name() = 'wers_do_prawej')][1]" />
-                        </xsl:call-template>
-                    </xsl:for-each>
-                </xsl:when>
-
-                <!-- No BR's - collect the whole content -->
-                <xsl:otherwise>
-                    <xsl:call-template name="verse">
-                        <xsl:with-param name="verse-content" select="child::node()" />
-                        <xsl:with-param name="verse-type" select="wers_wciety|wers_akap|wers_cd|wers_do_prawej[1]" />
-                    </xsl:call-template>
-                </xsl:otherwise>
-
-            </xsl:choose>
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template name="verse">
-        <xsl:param name="verse-content" />
-        <xsl:param name="verse-type" />
-
-        <xsl:choose>
-            <xsl:when test="not($verse-type)">
-                <xsl:element name="v" namespace="http://nowoczesnapolska.org.pl/ML/Lektury/1.1">
-                    <xsl:apply-templates select="$verse-content" />
-                </xsl:element>
-            </xsl:when>
-
-            <xsl:otherwise>
-                <xsl:apply-templates select="$verse-content" />
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-
-    <!-- akapity -->
-    <xsl:template match="akap">
-        <xsl:element name="p">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="akap_cd">
-        <xsl:element name="pc">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="akap_dialog">
-        <xsl:element name="pd">
-            <xsl:variable name="prolog" select="./text()[1]" />
-            <xsl:value-of select="wlf:fix-dialog-line($prolog)" />
-            <xsl:apply-templates select="@*|*|text()[. != $prolog]" />
-        </xsl:element>
-    </xsl:template>
-
-    <!-- wersy -->
-    <xsl:template match="wers_cd">
-        <xsl:element name="vc">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="wers_akap">
-        <xsl:element name="vi">
-            <xsl:attribute name="size">p</xsl:attribute>
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="wers_wciety">
-        <xsl:element name="vi">
-            <xsl:if test="@typ">
-            <xsl:attribute name="size"><xsl:value-of select="@typ" /></xsl:attribute>
-            </xsl:if>
-            <xsl:apply-templates select="@*[name() != 'typ']|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="zastepnik_wersu">
-        <xsl:element name="verse-skip">
-            <xsl:choose>
-                <xsl:when test="starts-with(., '.')">
-                    <xsl:attribute name="type">dot</xsl:attribute>
-                </xsl:when>
-            </xsl:choose>
-        </xsl:element>
-    </xsl:template>
-
-    <!-- Przypisy i motywy -->
-    <xsl:template match="begin">
-        <xsl:element name="mark">
-            <xsl:attribute name="starts">
-                <xsl:value-of select="substring(@id, 2)" />
-            </xsl:attribute>
-            <xsl:attribute name="themes">
-                <xsl:value-of select="following-sibling::motyw[1]/text()" />
-            </xsl:attribute>
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="motyw" />
-
-    <xsl:template match="end">
-        <xsl:element name="mark">
-            <xsl:attribute name="ends">
-                <xsl:value-of select="substring(@id, 2)" />
-            </xsl:attribute>
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="pa|pe|pr|pt">
-        <mark id="{generate-id(.)}" />
-    </xsl:template>
-
-
-    <xsl:template match="pa|pe|pr|pt" mode="annotations">
-        <annotation refs="{generate-id(.)}" type="{name(.)}">
-            <xsl:apply-templates select="@*|node()" />
-        </annotation>
-    </xsl:template>
-
-
-    <!-- Tytuły -->
-    <xsl:template match="autor_utworu">
-        <xsl:element name="author">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="nazwa_utworu">
-        <xsl:element name="title">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="naglowek_czesc">
-        <chapter>
-            <xsl:apply-templates select="@*|node()" />
-        </chapter>
-    </xsl:template>
-
-    <xsl:template match="naglowek_akt">
-        <act>
-            <xsl:apply-templates select="@*|node()" />
-        </act>
-    </xsl:template>
-
-    <xsl:template match="naglowek_scena">
-        <scene>
-            <xsl:apply-templates select="@*|node()" />
-        </scene>
-    </xsl:template>
-
-    <xsl:template match="podtytul">
-        <second-title>
-            <xsl:apply-templates select="@*|node()" />
-        </second-title>
-    </xsl:template>
-
-    <xsl:template match="srodtytul">
-        <part-title>
-            <xsl:apply-templates select="@*|node()" />
-        </part-title>
-    </xsl:template>
-
-    <!-- elementy dramatu -->
-    <xsl:template match="miejsce_czas">
-        <xsl:element name="time-and-date">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-
-    <xsl:template match="didaskalia|didask_tekst">
-        <xsl:element name="stage-directions">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="motto">
-        <xsl:element name="motto">
-            <xsl:apply-templates select="@*|node()" />
-
-        <xsl:variable name="sign" select="following-sibling::*[1][name() = 'motto_podpis']" />
-        <signature>
-            <xsl:apply-templates select="$sign/node()" />
-        </signature>
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="motto_podpis[preceding-sibling::*[1][name() = 'motto']]" />
-
-    <xsl:template match="lista_osob">
-        <person-list>
-            <xsl:apply-templates select="@*|node()" />
-        </person-list>
-    </xsl:template>
-
-    <xsl:template match="naglowek_listy">
-        <caption>
-            <xsl:apply-templates select="@*|node()" />
-        </caption>
-    </xsl:template>
-
-    <xsl:template match="lista_osoba">
-        <person>
-            <xsl:apply-templates select="@*|node()" />
-        </person>
-    </xsl:template>
-
-    <!-- Odstępy i prześwity -->
-    <xsl:template match="sekcja_swiatlo">
-        <vertical-space />
-    </xsl:template>
-
-    <xsl:template match="sekcja_asterysk">
-        <vertical-space type="asterisk" />
-    </xsl:template>
-
-    <xsl:template match="sekcja_asterysk">
-        <vertical-space type="line" />
-    </xsl:template>
-
-    <!-- pozostałe elementy blokowe -->
-    <xsl:template match="dlugi_cytat">
-        <block-quote>
-            <xsl:apply-templates select="@*|node()" />
-        </block-quote>`
-    </xsl:template>
-
-    <xsl:template match="poezja_cyt">
-        <block-quote>
-            <xsl:apply-templates select="@*|node()" />
-        </block-quote>`
-    </xsl:template>
-
-    <xsl:template match="kwestia">
-        <xsl:variable name="person" select="preceding-sibling::*[1][name() = 'naglowek_osoba']" />
-        <drama-line>
-            <person>
-                <xsl:apply-templates select="$person/node()" />
-            </person>
-            <xsl:apply-templates select="node()[. != $person]" />
-        </drama-line>
-    </xsl:template>
-
-    <xsl:template match="naglowek_osoba[following-sibling::*[1][name() = 'kwestia']]" />
-
-    <!-- Inne -->
-    <xsl:template match="osoba">
-        <xsl:element name="person-ref">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="slowo_obce">
-        <xsl:element name="df">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="wyroznienie">
-        <xsl:element name="em">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="indeks_dolny">
-        <xsl:element name="sub">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="mat">
-        <xsl:element name="math">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <!-- oznaczenie tytulu innego utworu, wymienionego w tym -->
-    <xsl:template match="tytul_dziela">
-        <xsl:element name="book-ref">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="extra">
-        <xsl:element name="comment">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="uwaga">
-        <xsl:element name="edit-comment">
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:element>
-    </xsl:template>
-
-    <!-- Copy attributes -->
-    <xsl:template match="@*|comment()">
-        <xsl:copy />
-    </xsl:template>
-
-    <!-- Inside RDF meta-data, leave the text unchanged -->
-    <xsl:template match="rdf:RDF//text()">
-        <xsl:value-of select="." />
-    </xsl:template>
-
-    <!-- Normalize text in other nodes -->
-    <xsl:template match="text()">
-        <xsl:choose>
-            <xsl:when test="$normalize-text">
-                <xsl:value-of select="wlf:normalize-text(.)" />
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="." />
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <!-- Ignoruj RDF poza meta -->
-    <xsl:template match="rdf:*|dc:*" />
-
-    <xsl:template match="@*|node()" mode="meta">
-        <xsl:copy>
-            <xsl:apply-templates match="@*|node()" mode="meta" />
-        </xsl:copy>
-    </xsl:template>
-
-    <!-- Warn about non-matched elements -->
-    <xsl:template match="node()">
-        <xsl:message>
-            <xsl:text>Nieprzetworzony węzeł:</xsl:text>
-            <xsl:value-of select="." />
-        </xsl:message>
-        <unparsed-node>
-            <xsl:copy-of select="." />
-        </unparsed-node>
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file

diff --git a/scripts/master.css b/scripts/master.css
index 44fe927..b2ea786 100644 (file)
--- a/scripts/master.css
+++ b/scripts/master.css
@@ -210,3 +210,8 @@ em.person {
     font-variant: small-caps;
 }
 
+em.wieksze-odstepy
+{
+    font-style: normal;
+    word-spacing: 1em;
+}

diff --git a/scripts/normalize.py b/scripts/normalize.py
deleted file mode 100644 (file)
index 6f6013f..0000000
--- a/scripts/normalize.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
-# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
-#
-from __future__ import with_statement
-
-import re
-import sys
-import os.path
-
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-
-from StringIO import StringIO
-from lxml import etree
-import librarian
-
-REPLACEMENTS = (
-    (u'---', u'\u2014'), # mdash
-    (u'--', u'\u2013'),  # ndash
-    (u'...', u'\u2026'), # ldots
-    (u',,', u'\u201E'),  # lower double back-quote
-    (u'"', u'\u201D'),   # upper double quote
-)
-
-DIALOG_EXPR = re.compile(r"\s*---\s(.*)")
-
-def wl_normalize_text(context, text):
-    """XPath extension function converting all entites in passed text."""
-    if isinstance(text, list):
-        text = u''.join(text)
-
-    for code, ucode in REPLACEMENTS:
-        text = text.replace(code, ucode)
-
-    return text
-
-def wl_fix_dialog(context, data):
-
-    if isinstance(data, list):
-        text = u''.join(data)
-    else:
-        text = data
-
-    m = DIALOG_EXPR.match(text)
-
-    if m is not None:
-        return m.group(1)
-    else:
-        return text
-
-
-def filter_verse_ends(data):
-    return data.replace('/\n', '<br />')
-
-ns = etree.FunctionNamespace('http://wolnelektury.pl/functions')
-ns['normalize-text'] = wl_normalize_text
-ns['fix-dialog-line'] = wl_fix_dialog
-
-def normalize_stylesheet():
-    return etree.XSLT(etree.parse(os.path.join(os.path.dirname(librarian.__file__), 'xslt', 'normalize.xslt')))
-
-if __name__ == '__main__':
-    tran = normalize_stylesheet()
-    input = StringIO( f )
-    doc = trans( etree.parse(input) )
-    print etree.tostring(doc, pretty_print=True, encoding=unicode).encode('utf-8')
-
-    for err in trans.error_log:
-        sys.stderr.write( (u"%s\n" % err).encode('utf-8') )
-

diff --git a/tests/files/example-wl.xml b/tests/files/example-wl.xml
index 945eee5..3c4b29b 100644 (file)
--- a/tests/files/example-wl.xml
+++ b/tests/files/example-wl.xml
@@ -129,6 +129,7 @@ rzu.</strofa>
 <wyroznienie>wyroznienie</wyroznienie>,
 <slowo_obce>slowo_obce</slowo_obce>
 indeks_dolny: H<indeks_dolny>2</indeks_dolny>O
+<wieksze_odstepy>większe odstępy między słowami</wieksze_odstepy>
 </akap>
 
 <akap>[Przypisy: pa, pt, pr, pe]</akap>