epub/mobi fixes

diff --git a/librarian/epub.py b/librarian/epub.py
index c5942a2..58d4bc0 100644 (file)
--- a/librarian/epub.py
+++ b/librarian/epub.py
@@ -167,7 +167,7 @@ class TOC(object):
     def add(self, name, part_href, level=0, is_part=True, index=None):
         assert level == 0 or index is None
         if level > 0 and self.children:
-            return self.children[-1].add(name, "part%d.html" % part_href, level-1, is_part)
+            return self.children[-1].add(name, part_href, level-1, is_part)
         else:
             t = TOC(name)
             t.part_href = part_href

diff --git a/librarian/epub/xsltScheme.xsl b/librarian/epub/xsltScheme.xsl
index 25296d3..3ddcf97 100644 (file)
--- a/librarian/epub/xsltScheme.xsl
+++ b/librarian/epub/xsltScheme.xsl
@@ -168,7 +168,7 @@
   <xsl:template match="strofa">
     <div class="stanza" xmlns="http://www.w3.org/1999/xhtml">
       <xsl:apply-templates />
-    </div><div xmlns="http://www.w3.org/1999/xhtml">&#160;</div>
+    </div><div class='stanza-spacer' xmlns="http://www.w3.org/1999/xhtml">&#160;</div>
   </xsl:template>
 
   <xsl:template match="wers_normalny">

diff --git a/librarian/mobi/style.css b/librarian/mobi/style.css
index 3fa7021..99792e5 100755 (executable)
--- a/librarian/mobi/style.css
+++ b/librarian/mobi/style.css
@@ -25,13 +25,13 @@
 {
        font-size: 1em;
     margin: 0;
-    margin-top: 1.5em;
+    margin-top: 1em;
        line-height: 1.5em;
 }
 
-p
+.paragraph
 {
-       margin: 0;
+    margin-top: 0;
 }
 
 /* ======================== */
@@ -166,10 +166,14 @@ div.kwestia
        margin-top: 0.5em;
 }
 
-.paragraph
+.stanza
 {
-       text-align: justify;
-       margin-top: 1.5em;
+    margin-bottom: 1em;
+}
+
+.stanza-spacer
+{
+    display: none;
 }
 
 .motto
@@ -274,8 +278,7 @@ em.author-emphasis
 .person-list em.person
 {
        font-style: normal;
-       font-variant: small-caps;
-       /*text-transform: uppercase;*/
+       text-transform: uppercase;
 }
 
 .info