obraz + video in pdf

diff --git a/librarian/pdf/wl.cls b/librarian/pdf/wl.cls
index 4023934..fa89dc3 100755 (executable)
--- a/librarian/pdf/wl.cls
+++ b/librarian/pdf/wl.cls
@@ -75,6 +75,7 @@
 \usepackage[overload]{textcase}
 \usepackage{scalefnt}
 % TODO: link color is a style thing
+\usepackage[hyphens]{url}
 \usepackage[colorlinks=true,linkcolor=black,setpagesize=false,urlcolor=blue,xetex]{hyperref}
 
 \ifenablewlfont
@@ -426,3 +427,12 @@ Letters={Uppercase}
 \renewcommand{\naglowekpodrozdzial}[1]{%
 \subsubsection*{\typosubsubsection{#1}}%
 }
+
+\newcommand{\obraz}[1]{
+\includegraphics[width=8cm]{#1}
+}
+
+\newcommand{\video}[2]{
+\includegraphics[width=8cm]{#1}\\
+\href{#2}{(Otwórz wideo w serwisie YouTube)}
+}

diff --git a/librarian/pypdf.py b/librarian/pypdf.py
index 387f647..adc414c 100644 (file)
--- a/librarian/pypdf.py
+++ b/librarian/pypdf.py
@@ -20,6 +20,7 @@ import re
 import random
 from copy import deepcopy
 from subprocess import call, PIPE
+from urllib2 import urlopen
 
 from Texml.processor import process
 from lxml import etree
@@ -52,7 +53,7 @@ def escape(really):
 
 
 def cmd(name, parms=None):
-    def wrap(self, element):
+    def wrap(self, element=None):
         pre, post = tag_open_close('cmd', name=name)
 
         if parms:
@@ -60,9 +61,12 @@ def cmd(name, parms=None):
                 e = etree.Element("parm")
                 e.text = parm
                 pre += etree.tostring(e)
-        pre += "<parm>"
-        post = "</parm>" + post
-        return pre, post
+        if element is not None:
+            pre += "<parm>"
+            post = "</parm>" + post
+            return pre, post
+        else:
+            return pre + post
     return wrap
 
 
@@ -348,10 +352,39 @@ class EduModule(Xmill):
 
     def handle_link(self, element):
         if element.attrib.get('url'):
-            return cmd('href', parms=[element.attrib['url']])(self, element)
+            url = element.attrib.get('url')
+            if url == element.text:
+                return cmd('url')(self, element)
+            else:
+                return cmd('href', parms=[element.attrib['url']])(self, element)
         else:
             return cmd('em')(self, element)
 
+    def handle_obraz(self, element):
+        frmt = self.options['format']
+        name = element.attrib['nazwa'].strip()
+        image = frmt.get_image(name.strip())
+        img_path = "obraz/%s" % name.replace("_", "")
+        frmt.attachments[img_path] = image
+        return cmd("obraz", parms=[img_path])(self)
+
+    def handle_video(self, element):
+        url = element.attrib.get('url')
+        if not url:
+            print '!! <video> missing url'
+            return
+        m = re.match(r'(?:https?://)?(?:www.)?youtube.com/watch\?(?:.*&)?v=([^&]+)(?:$|&)', url)
+        if not m:
+            print '!! unknown <video> url scheme:', url
+            return
+        name = m.group(1)
+        thumb = IOFile.from_string(urlopen
+            ("http://img.youtube.com/vi/%s/0.jpg" % name).read())
+        img_path = "video/%s.jpg" % name.replace("_", "")
+        self.options['format'].attachments[img_path] = thumb
+        canon_url = "https://www.youtube.com/watch?v=%s" % name
+        return cmd("video", parms=[img_path, canon_url])(self)
+
 
 class Exercise(EduModule):
     def __init__(self, *args, **kw):
@@ -548,8 +581,22 @@ def fix_lists(tree):
 
 class EduModulePDFFormat(PDFFormat):
     def get_texml(self):
-        edumod = EduModule({"teacher": self.customization.get('teacher')})
+        self.attachments = {}
+        edumod = EduModule({
+            "format": self,
+            "teacher": self.customization.get('teacher'),
+        })
         texml = edumod.generate(fix_lists(self.wldoc.edoc.getroot())).encode('utf-8')
 
         open("/tmp/texml.xml", "w").write(texml)
         return texml
+
+    def get_tex_dir(self):
+        temp = super(EduModulePDFFormat, self).get_tex_dir()
+        for name, iofile in self.attachments.items():
+            iofile.save_as(os.path.join(temp, name))
+        return temp
+
+    def get_image(self, name):
+        return self.wldoc.source.attachments[name]
+

diff --git a/librarian/xmlutils.py b/librarian/xmlutils.py
index 340ee83..9e921a2 100644 (file)
--- a/librarian/xmlutils.py
+++ b/librarian/xmlutils.py
@@ -26,7 +26,10 @@ class Xmill(object):
             if text is None:
                 return None
             text = flt(text)
-        return text
+        # TODO: just work on the tree and let lxml handle escaping.
+        e = etree.Element("x")
+        e.text = text
+        return etree.tostring(e, encoding=unicode)[3:-4]
 
     def generate(self, document):
         """Generate text from node using handlers defined in class."""