#1030: fixes for separators and empty verses in html, epub, pdf

diff --git a/librarian/epub/xsltScheme.xsl b/librarian/epub/xsltScheme.xsl
index ff0ceb5..bb96350 100644 (file)
--- a/librarian/epub/xsltScheme.xsl
+++ b/librarian/epub/xsltScheme.xsl
@@ -173,19 +173,19 @@
   <xsl:template match="wers_normalny">\r
     <div class="verse" xmlns="http://www.w3.org/1999/xhtml">\r
       <xsl:apply-templates />\r
   <xsl:template match="wers_normalny">\r
     <div class="verse" xmlns="http://www.w3.org/1999/xhtml">\r
       <xsl:apply-templates />\r

-    </div>\r
+    &#160;</div>\r

   </xsl:template>\r
 \r
   <xsl:template match="wers_akap">\r
     <div class="verse" style="margin-left: 1em;" xmlns="http://www.w3.org/1999/xhtml">\r
       <xsl:apply-templates />\r
   </xsl:template>\r
 \r
   <xsl:template match="wers_akap">\r
     <div class="verse" style="margin-left: 1em;" xmlns="http://www.w3.org/1999/xhtml">\r
       <xsl:apply-templates />\r

-    </div>\r
+    &#160;</div>\r

   </xsl:template>\r
 \r
   <xsl:template match="wers_wciety">\r
     <div class="verse" style='margin-left:1em;' xmlns="http://www.w3.org/1999/xhtml">\r
       <xsl:apply-templates />\r
   </xsl:template>\r
 \r
   <xsl:template match="wers_wciety">\r
     <div class="verse" style='margin-left:1em;' xmlns="http://www.w3.org/1999/xhtml">\r
       <xsl:apply-templates />\r

-    </div>\r
+    &#160;</div>\r

   </xsl:template>\r
 \r
   <xsl:template match="wers_wciety[@typ!='']">\r
   </xsl:template>\r
 \r
   <xsl:template match="wers_wciety[@typ!='']">\r


@@ -194,13 +194,13 @@
           margin-left: <xsl:value-of select="@typ" />em;\r
       </xsl:attribute>\r
       <xsl:apply-templates />\r
           margin-left: <xsl:value-of select="@typ" />em;\r
       </xsl:attribute>\r
       <xsl:apply-templates />\r

-    </div>\r
+    &#160;</div>\r

   </xsl:template>\r
 \r
   <xsl:template match="wers_cd">\r
     <div class="verse" style="margin-left: 12em;" xmlns="http://www.w3.org/1999/xhtml">\r
       <xsl:apply-templates />\r
   </xsl:template>\r
 \r
   <xsl:template match="wers_cd">\r
     <div class="verse" style="margin-left: 12em;" xmlns="http://www.w3.org/1999/xhtml">\r
       <xsl:apply-templates />\r

-    </div>\r
+    &#160;</div>\r

   </xsl:template>\r
 \r
   <xsl:template match="motto_podpis">\r
   </xsl:template>\r
 \r
   <xsl:template match="motto_podpis">\r


@@ -266,7 +266,7 @@
   <!--===========================================================-->\r
 \r
   <xsl:template match="sekcja_swiatlo">\r
   <!--===========================================================-->\r
 \r
   <xsl:template match="sekcja_swiatlo">\r

-    <hr class="spacer" xmlns="http://www.w3.org/1999/xhtml"></hr>\r
+    <p class="spacer" xmlns="http://www.w3.org/1999/xhtml">&#160;</p>\r

   </xsl:template>\r
 \r
   <xsl:template match="sekcja_asterysk">\r
   </xsl:template>\r
 \r
   <xsl:template match="sekcja_asterysk">\r

diff --git a/librarian/pdf/wl.sty b/librarian/pdf/wl.sty
index 687efde..a7a97ba 100644 (file)
--- a/librarian/pdf/wl.sty
+++ b/librarian/pdf/wl.sty
@@ -326,15 +326,20 @@ Letters={Uppercase}
 }
 
 \newcommand{\sekcjaswiatlo}{%
 }
 
 \newcommand{\sekcjaswiatlo}{%

-\hspace{30pt}%
+\vspace{30pt}%

 }
 
 \newcommand{\sekcjaasterysk}{%
 }
 
 \newcommand{\sekcjaasterysk}{%

+\vspace{10pt}%
+\begin{center}%

 \par{*}%
 \par{*}%

+\end{center}%

 }
 
 \newcommand{\separatorlinia}{%
 }
 
 \newcommand{\separatorlinia}{%

+\vspace{10pt}%

 \hrule{}%
 \hrule{}%

+\vspace{10pt}%

 }
 
 \newcommand{\motyw}[2][0]{%
 }
 
 \newcommand{\motyw}[2][0]{%

diff --git a/librarian/xslt/book2html.xslt b/librarian/xslt/book2html.xslt
index 3c52b0b..752eade 100755 (executable)
--- a/librarian/xslt/book2html.xslt
+++ b/librarian/xslt/book2html.xslt
@@ -54,6 +54,7 @@
                 background: #333;
                 color: #FFF;
                 opacity: 0.9;
                 background: #333;
                 color: #FFF;
                 opacity: 0.9;

+                z-index: 99;

             }
 
             #menu ul {
             }
 
             #menu ul {


@@ -74,15 +75,30 @@
 
             #menu li a:hover, #menu li a:active {
                 color: #000;
 
             #menu li a:hover, #menu li a:active {
                 color: #000;

-                background: #FFF url(/media/img/arrow-down.png) no-repeat center right;
+                background: #FFF url(/static/img/arrow-down.png) no-repeat center right;

             }
 
             #menu li a.selected {
                 color: #000;
             }
 
             #menu li a.selected {
                 color: #000;

-                background: #FFF url(/media/img/arrow-up.png) no-repeat center right;
+                background: #FFF url(/static/img/arrow-up.png) no-repeat center right;

             }
             }

+            #menu a.menu-link {
+                display: block;
+                float: left;
+                height: 1.5em;
+                margin-left: 0.5em;
+                text-align: center;
+                color: #FFF;
+            }
+            #menu span {
+                color: #888;
+                font-style: italic;
+                font-size: .75em;
+                margin-right: 0.5em;
+            }
+

 
 

-            #toc, #themes {
+            #toc, #themes, #nota_red {

                 position: fixed;
                 left: 0em;
                 top: 1.5em;
                 position: fixed;
                 left: 0em;
                 top: 1.5em;


@@ -96,6 +112,7 @@
                 overflow-x: hidden;
                 overflow-y: auto;
                 opacity: 0.9;
                 overflow-x: hidden;
                 overflow-y: auto;
                 opacity: 0.9;

+                z-index: 99;

             }
 
             #toc ol, #themes ol {
             }
 
             #toc ol, #themes ol {


@@ -172,11 +189,18 @@
                 color: #777;
                 padding: 0 0.5em;
                 width: 7.5em;
                 color: #777;
                 padding: 0 0.5em;
                 width: 7.5em;

+

                 font-style: normal;
                 font-weight: normal;
                 font-style: normal;
                 font-weight: normal;

+                font-variant: normal;
+                letter-spacing: 0;
+                text-transform: none;
+                text-decoration: none;
+

                 font-size: 16px;
                 float: right;
                 margin-right: -9.5em;
                 font-size: 16px;
                 float: right;
                 margin-right: -9.5em;

+                margin-bottom: 0.5em;

                 clear: both;
                 left: 40em;
                 line-height: 1.5em;
                 clear: both;
                 left: 40em;
                 line-height: 1.5em;


@@ -187,6 +211,9 @@
                 font-style: normal;
                 font-weight: normal;
                 font-size: 12px;
                 font-style: normal;
                 font-weight: normal;
                 font-size: 12px;

+                padding-left: 2px;
+                position: relative;
+                top: -4px;

             }
 
             #footnotes .annotation {
             }
 
             #footnotes .annotation {


@@ -212,10 +239,13 @@
             /* ============= */
             /* = Numbering = */
             /* ============= */
             /* ============= */
             /* = Numbering = */
             /* ============= */

+            .verse, .paragraph {
+                position:relative;
+            }

             .anchor {
                 position: absolute;
                 margin: -0.25em -0.5em;
             .anchor {
                 position: absolute;
                 margin: -0.25em -0.5em;

-                left: 1em;
+                left: -3em;

                 color: #777;
                 font-size: 12px;
                 width: 2em;
                 color: #777;
                 font-size: 12px;
                 width: 2em;


@@ -334,6 +364,19 @@
                 font-style: normal;
                 font-variant: small-caps;
             }
                 font-style: normal;
                 font-variant: small-caps;
             }

+
+            .verse:after {
+                content: "\feff";
+            }
+
+
+            /* =================================== */
+            /* = Hide some elements for printing = */
+            /* =================================== */
+
+            @media print {
+                #menu {display: none;}
+            }

         </style>
         <body> -->
         <div id="book-text">
         </style>
         <body> -->
         <div id="book-text">