images in html, pdf

diff --git a/librarian/pdf.py b/librarian/pdf.py
index 077a1e1..ace83af 100644 (file)
--- a/librarian/pdf.py
+++ b/librarian/pdf.py
@@ -235,6 +235,9 @@ def transform(wldoc, verbose=False, save_tex=None, morefloats=None,
             with open(os.path.join(temp, 'cover.png'), 'w') as f:
                 c.save(f)
 
             with open(os.path.join(temp, 'cover.png'), 'w') as f:
                 c.save(f)
 

+        for img in document.edoc.findall('//ilustr'):
+            shutil.copy(img.get('src'), temp)
+

         del document # no longer needed large object :)
 
         tex_path = os.path.join(temp, 'doc.tex')
         del document # no longer needed large object :)
 
         tex_path = os.path.join(temp, 'doc.tex')

diff --git a/librarian/pdf/wl.cls b/librarian/pdf/wl.cls
index 08737f7..80a6bb5 100644 (file)
--- a/librarian/pdf/wl.cls
+++ b/librarian/pdf/wl.cls
@@ -512,3 +512,11 @@ Letters={Uppercase}
 \fi
 }
 
 \fi
 }
 

+\newcommand{\ilustr}[2]{
+
+\vspace{1em}%
+\begin{center}%
+\par{\includegraphics{#1}\\#2}%
+\end{center}%
+\vspace{1em}%
+}

diff --git a/librarian/pdf/wl2tex.xslt b/librarian/pdf/wl2tex.xslt
index a2c592e..c23a045 100644 (file)
--- a/librarian/pdf/wl2tex.xslt
+++ b/librarian/pdf/wl2tex.xslt
@@ -348,6 +348,16 @@
     </cmd>
 </xsl:template>
 
     </cmd>
 </xsl:template>
 

+<xsl:template match="ilustr">
+    <cmd>
+        <xsl:attribute name="name">
+            <xsl:value-of select="wl:texcommand(name())" />
+        </xsl:attribute>
+               <parm><xsl:value-of select="@src" /></parm>
+        <parm><xsl:apply-templates mode="inline" /></parm>
+    </cmd>
+</xsl:template>
+

 
 <!-- ================ -->
 <!-- = SPECIAL TAGS = -->
 
 <!-- ================ -->
 <!-- = SPECIAL TAGS = -->

diff --git a/librarian/xslt/book2html.xslt b/librarian/xslt/book2html.xslt
index 10da3ec..b018405 100755 (executable)
--- a/librarian/xslt/book2html.xslt
+++ b/librarian/xslt/book2html.xslt
@@ -648,6 +648,22 @@
     <hr class="spacer-line" />
 </xsl:template>
 
     <hr class="spacer-line" />
 </xsl:template>
 

+<xsl:template match="ilustr">
+    <div xmlns="http://www.w3.org/1999/xhtml" class="ilustr">
+      <img xmlns="http://www.w3.org/1999/xhtml" alt="ilustracja">
+        <xsl:attribute name="src">
+          <xsl:value-of select="@src" />
+        </xsl:attribute>
+        <xsl:attribute name="alt">
+          <xsl:apply-templates mode="inline" />
+        </xsl:attribute>
+        <xsl:attribute name="title">
+          <xsl:apply-templates mode="inline" />
+        </xsl:attribute>
+      </img>
+    </div>
+</xsl:template>
+

 
 <!-- ================ -->
 <!-- = SPECIAL TAGS = -->
 
 <!-- ================ -->
 <!-- = SPECIAL TAGS = -->