epub margin for indents

diff --git a/librarian/epub.py b/librarian/epub.py
index 3bdd1cd..a5607f7 100644 (file)
--- a/librarian/epub.py
+++ b/librarian/epub.py
@@ -276,6 +276,8 @@ def transform(provider, slug=None, file_path=None, output_file=None, output_dir=
     def transform_file(input_xml, chunk_counter=1, first=True):
         """ processes one input file and proceeds to its children """
 
+        replace_characters(input_xml.getroot())
+
         children = [child.text for child in input_xml.findall('.//'+DCNS('relation.hasPart'))]
 
         # every input file will have a TOC entry,
@@ -308,8 +310,6 @@ def transform(provider, slug=None, file_path=None, output_file=None, output_dir=
                 main_text = None
 
         if main_text is not None:
-            replace_characters(main_text)
-
             for chunk_xml in chop(main_text):
                 chunk_html, chunk_toc, chunk_chars = transform_chunk(chunk_xml, chunk_counter, annotations)
                 toc.extend(chunk_toc)

diff --git a/librarian/epub/xsltScheme.xsl b/librarian/epub/xsltScheme.xsl
index 6557a5c..ff0ceb5 100644 (file)
--- a/librarian/epub/xsltScheme.xsl
+++ b/librarian/epub/xsltScheme.xsl
@@ -177,55 +177,28 @@
   </xsl:template>\r
 \r
   <xsl:template match="wers_akap">\r
-    <div class="verse" style="padding-left: 1em;" xmlns="http://www.w3.org/1999/xhtml">\r
+    <div class="verse" style="margin-left: 1em;" xmlns="http://www.w3.org/1999/xhtml">\r
       <xsl:apply-templates />\r
     </div>\r
   </xsl:template>\r
 \r
   <xsl:template match="wers_wciety">\r
-    <div class="verse" style="padding-left: 1em;" xmlns="http://www.w3.org/1999/xhtml">\r
+    <div class="verse" style='margin-left:1em;' xmlns="http://www.w3.org/1999/xhtml">\r
       <xsl:apply-templates />\r
     </div>\r
   </xsl:template>\r
 \r
-  <xsl:template match="wers_wciety[@typ='1']">\r
-    <div class="verse" style="padding-left: 1em;" xmlns="http://www.w3.org/1999/xhtml">\r
-      <xsl:apply-templates />\r
-    </div>\r
-  </xsl:template>\r
-\r
-  <xsl:template match="wers_wciety[@typ='2']">\r
-    <div class="verse" style="padding-left: 2em;" xmlns="http://www.w3.org/1999/xhtml">\r
-      <xsl:apply-templates />\r
-    </div>\r
-  </xsl:template>\r
-\r
-  <xsl:template match="wers_wciety[@typ='3']">\r
-    <div class="verse" style="padding-left: 3em;" xmlns="http://www.w3.org/1999/xhtml">\r
-      <xsl:apply-templates />\r
-    </div>\r
-  </xsl:template>\r
-\r
-  <xsl:template match="wers_wciety[@typ='4']">\r
-    <div class="verse" style="padding-left: 4em;" xmlns="http://www.w3.org/1999/xhtml">\r
-      <xsl:apply-templates />\r
-    </div>\r
-  </xsl:template>\r
-\r
-  <xsl:template match="wers_wciety[@typ='5']">\r
-    <div class="verse" style="padding-left: 5em;" xmlns="http://www.w3.org/1999/xhtml">\r
-      <xsl:apply-templates />\r
-    </div>\r
-  </xsl:template>\r
-\r
-  <xsl:template match="wers_wciety[@typ='6']">\r
-    <div class="verse" style="padding-left: 6em;" xmlns="http://www.w3.org/1999/xhtml">\r
+  <xsl:template match="wers_wciety[@typ!='']">\r
+    <div class="verse" xmlns="http://www.w3.org/1999/xhtml">\r
+      <xsl:attribute name="style">\r
+          margin-left: <xsl:value-of select="@typ" />em;\r
+      </xsl:attribute>\r
       <xsl:apply-templates />\r
     </div>\r
   </xsl:template>\r
 \r
   <xsl:template match="wers_cd">\r
-    <div class="verse" style="padding-left: 12em;" xmlns="http://www.w3.org/1999/xhtml">\r
+    <div class="verse" style="margin-left: 12em;" xmlns="http://www.w3.org/1999/xhtml">\r
       <xsl:apply-templates />\r
     </div>\r
   </xsl:template>\r