Added anchors to themes in book text.

diff --git a/lib/librarian/book2html.xslt b/lib/librarian/book2html.xslt
index d6c9db1..827c696 100644 (file)
--- a/lib/librarian/book2html.xslt
+++ b/lib/librarian/book2html.xslt
@@ -1,7 +1,7 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:wl="http://wolnelektury.pl/functions" >
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:wl="http://wolnelektury.pl/functions" >
 

-<xsl:output method="xml" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.1//EN" doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" indent="yes" />
+<xsl:output encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.1//EN" doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" indent="yes" />

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


@@ -248,10 +248,9 @@
 <!-- Themes -->
 <xsl:template match="begin" mode="inline">
     <xsl:variable name="mnum" select="concat('m', substring(@id, 2))" />
 <!-- Themes -->
 <xsl:template match="begin" mode="inline">
     <xsl:variable name="mnum" select="concat('m', substring(@id, 2))" />

-    <span class="theme-begin" fid="{substring(@id, 2)}">
-        <a name="m{substring(@id, 2)}" />
+    <a name="m{substring(@id, 2)}" class="theme-begin" fid="{substring(@id, 2)}">

         <xsl:value-of select="string(following::motyw[@id=$mnum]/text())" />
         <xsl:value-of select="string(following::motyw[@id=$mnum]/text())" />

-    </span>
+    </a>

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

diff --git a/lib/librarian/html.py b/lib/librarian/html.py
index bb5a637..3dd70f5 100644 (file)
--- a/lib/librarian/html.py
+++ b/lib/librarian/html.py
@@ -109,7 +109,7 @@ def extract_fragments(input_filename):
 
     for event, element in etree.iterparse(input_filename, events=('start', 'end')):
         # Process begin and end elements
 
     for event, element in etree.iterparse(input_filename, events=('start', 'end')):
         # Process begin and end elements

-        if element.tag == 'span' and element.get('class', '') in ('theme-begin', 'theme-end'):
+        if element.get('class', '') in ('theme-begin', 'theme-end'):

             if not event == 'end': continue # Process elements only once, on end event
 
             # Open new fragment
             if not event == 'end': continue # Process elements only once, on end event
 
             # Open new fragment