rel

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d19c282..e953fb4 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@
 This document records all notable changes to Librarian.
 
 
 This document records all notable changes to Librarian.
 
 

+## 2.3.5 (2022-04-07)
+
+### Fixed
+- Support for www tag.
+- Support for mat with inline text.
+
+

 ## 2.3.4 (2022-02-28)
 
 ### Fixed:
 ## 2.3.4 (2022-02-28)
 
 ### Fixed:

diff --git a/setup.py b/setup.py
index c89f5a1..957652f 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ def whole_tree(prefix, path):
 
 setup(
     name='librarian',
 
 setup(
     name='librarian',

-    version='2.3.4',
+    version='2.3.5',

     description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats',
     author="Marek Stępniowski",
     author_email='marek@stepniowski.com',
     description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats',
     author="Marek Stępniowski",
     author_email='marek@stepniowski.com',

diff --git a/src/librarian/elements/styles/www.py b/src/librarian/elements/styles/www.py
index e15f712..d8268a1 100644 (file)
--- a/src/librarian/elements/styles/www.py
+++ b/src/librarian/elements/styles/www.py
@@ -2,4 +2,10 @@ from ..base import WLElement
 
 
 class WWW(WLElement):
 
 
 class WWW(WLElement):

-    pass
+    EPUB_TAG = 'a'
+
+    def get_epub_attr(self, builder):
+        attr = super().get_epub_attr(builder)
+        attr['href'] = self.text
+        return attr
+

diff --git a/src/librarian/xslt/book2html.xslt b/src/librarian/xslt/book2html.xslt
index ba9dbb4..f540b49 100644 (file)
--- a/src/librarian/xslt/book2html.xslt
+++ b/src/librarian/xslt/book2html.xslt
@@ -430,7 +430,7 @@
 
 <!-- Other inline tags -->
 <xsl:template match="mat" mode="inline">
 
 <!-- Other inline tags -->
 <xsl:template match="mat" mode="inline">

-    <math xmlns="http://www.w3.org/1998/Math/MathML"><xsl:copy-of select="*" /></math>
+    <math xmlns="http://www.w3.org/1998/Math/MathML"><xsl:copy-of select="*|text()" /></math>

 </xsl:template>
 
 <xsl:template match="didask_tekst" mode="inline">
 </xsl:template>
 
 <xsl:template match="didask_tekst" mode="inline">


@@ -463,6 +463,14 @@
     <em class="person"><xsl:apply-templates mode="inline" /></em>
 </xsl:template>
 
     <em class="person"><xsl:apply-templates mode="inline" /></em>
 </xsl:template>
 

+<xsl:template match="www" mode="inline">
+    <a target="_blank">
+        <xsl:attribute name="href">
+            <xsl:value-of select="text()"/>
+        </xsl:attribute>
+        <xsl:apply-templates mode="inline" />
+    </a>
+</xsl:template>

 
 <!-- ============================================== -->
 <!-- = STANDALONE TAGS                            = -->
 
 <!-- ============================================== -->
 <!-- = STANDALONE TAGS                            = -->