X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/773612b400fb85103153032b193b1434d136a7ef..f3e3374103ee892540927b65acc2231a10e493b7:/librarian/pypdf.py?ds=sidebyside
diff --git a/librarian/pypdf.py b/librarian/pypdf.py
index 4cc4d1d..b261eb6 100644
--- a/librarian/pypdf.py
+++ b/librarian/pypdf.py
@@ -9,27 +9,20 @@ Creates one big XML from the book and its children, converts it to LaTeX
with TeXML, then runs it by XeLaTeX.
"""
-from __future__ import with_statement
-import os
+from copy import deepcopy
import os.path
import shutil
-from StringIO import StringIO
-from tempfile import mkdtemp, NamedTemporaryFile
import re
-from copy import deepcopy
-from subprocess import call, PIPE
+import random
+from urllib2 import urlopen
-from Texml.processor import process
from lxml import etree
-from lxml.etree import XMLSyntaxError, XSLTApplyError
-from xmlutils import Xmill, tag, tagged, ifoption
+from xmlutils import Xmill, tag, tagged, ifoption, tag_open_close
from librarian.dcparser import Person
-from librarian.parser import WLDocument
-from librarian import ParseError, DCNS, get_resource, IOFile, Format
+from librarian import DCNS, get_resource, IOFile
from librarian import functions
-from pdf import PDFFormat
-
+from pdf import PDFFormat, substitute_hyphens, fix_hanging
def escape(really):
@@ -49,15 +42,21 @@ def escape(really):
return deco
-def cmd(name, pass_text=False):
- def wrap(self, element):
- pre = u'' % name
+def cmd(name, parms=None):
+ def wrap(self, element=None):
+ pre, post = tag_open_close('cmd', name=name)
- if pass_text:
- pre += "%s" % element.text
- return pre + ''
+ if parms:
+ for parm in parms:
+ e = etree.Element("parm")
+ e.text = parm
+ pre += etree.tostring(e)
+ if element is not None:
+ pre += ""
+ post = "" + post
+ return pre, post
else:
- return pre, ''
+ return pre + post
return wrap
@@ -74,11 +73,11 @@ class EduModule(Xmill):
def swap_endlines(txt):
if self.options['strofa']:
- txt = txt.replace("/\n", '')
+ txt = txt.replace("/\n", '')
return txt
+ self.register_text_filter(swap_endlines)
self.register_text_filter(functions.substitute_entities)
self.register_text_filter(mark_alien_characters)
- self.register_text_filter(swap_endlines)
def get_dc(self, element, dc_field, single=False):
values = map(lambda t: t.text, element.xpath("//dc:%s" % dc_field, namespaces={'dc': DCNS.uri}))
@@ -99,11 +98,15 @@ class EduModule(Xmill):
u''
@escape(True)
- def get_authors(self, element):
- authors = self.get_dc(element, 'creator.expert') + \
- self.get_dc(element, 'creator.scenario') + \
- self.get_dc(element, 'creator.textbook')
- return u', '.join(authors)
+ def get_authors(self, element, which=None):
+ dc = self.options['wldoc'].book_info
+ if which is None:
+ authors = dc.authors_textbook + \
+ dc.authors_scenario + \
+ dc.authors_expert
+ else:
+ authors = getattr(dc, "authors_%s" % which)
+ return u', '.join(author.readable() for author in authors)
@escape(1)
def get_title(self, element):
@@ -124,9 +127,13 @@ class EduModule(Xmill):
\\usepackage{morefloats}
}{}'''),
u'''\\def\\authors{%s}''' % self.get_authors(element),
+ u'''\\def\\authorsexpert{%s}''' % self.get_authors(element, 'expert'),
+ u'''\\def\\authorsscenario{%s}''' % self.get_authors(element, 'scenario'),
+ u'''\\def\\authorstextbook{%s}''' % self.get_authors(element, 'textbook'),
+
u'''\\author{\\authors}''',
u'''\\title{%s}''' % self.get_title(element),
- u'''\\def\\bookurl{%s}''' % self.get_dc(element, 'identifier.url', True),
+ u'''\\def\\bookurl{%s}''' % self.options['wldoc'].book_info.url.canonical(),
u'''\\def\\rightsinfo{%s}''' % self.get_rightsinfo(element),
u'']
@@ -138,7 +145,7 @@ class EduModule(Xmill):
return u"""
- """, """"""
+ """, """"""
@escape(1)
def handle_texcommand(self, element):
@@ -187,9 +194,18 @@ class EduModule(Xmill):
handle_srodtytul = \
handle_tytul_dziela = \
handle_wyroznienie = \
+ handle_dywiz = \
handle_texcommand
- _handle_strofa = cmd("strofa", True)
+ def handle_uwaga(self, _e):
+ return None
+ def handle_extra(self, _e):
+ return None
+
+ def handle_nbsp(self, _e):
+ return ''
+
+ _handle_strofa = cmd("strofa")
def handle_strofa(self, element):
self.options = {'strofa': True}
@@ -204,7 +220,10 @@ class EduModule(Xmill):
}
submill = EduModule(self.options)
- opis = submill.generate(element.xpath('opis')[0])
+ if element.xpath('opis'):
+ opis = submill.generate(element.xpath('opis')[0])
+ else:
+ opis = ''
n = element.xpath('wskazowki')
if n: wskazowki = submill.generate(n[0])
@@ -222,7 +241,7 @@ class EduModule(Xmill):
counter = self.activity_counter
return u"""
-
+
%(counter)d.
%(czas)s
@@ -251,11 +270,19 @@ class EduModule(Xmill):
def handle_lista(self, element, attrs={}):
ltype = element.attrib.get('typ', 'punkt')
+ if not element.findall("punkt"):
+ if ltype == 'czytelnia':
+ return 'W przygotowaniu.'
+ else:
+ return None
if ltype == 'slowniczek':
- surl = element.attrib.get('href', None)
+ surl = element.attrib.get('src', None)
+ if surl is None:
+ # print '** missing src on , setting default'
+ surl = 'http://edukacjamedialna.edu.pl/lekcje/slowniczek/'
sxml = None
if surl:
- sxml = etree.fromstring(self.options['provider'].by_uri(surl).get_string())
+ sxml = etree.fromstring(self.options['wldoc'].provider.by_uri(surl).get_string())
self.options = {'slowniczek': True, 'slowniczek_xml': sxml }
listcmd = {'num': 'enumerate',
@@ -271,16 +298,19 @@ class EduModule(Xmill):
def handle_cwiczenie(self, element):
exercise_handlers = {
- 'wybor': Wybor}
- # 'uporzadkuj': Uporzadkuj,
- # 'luki': Luki,
- # 'zastap': Zastap,
- # 'przyporzadkuj': Przyporzadkuj,
- # 'prawdafalsz': PrawdaFalsz
+ 'wybor': Wybor,
+ 'uporzadkuj': Uporzadkuj,
+ 'luki': Luki,
+ 'zastap': Zastap,
+ 'przyporzadkuj': Przyporzadkuj,
+ 'prawdafalsz': PrawdaFalsz
+ }
typ = element.attrib['typ']
+ self.exercise_counter += 1
if not typ in exercise_handlers:
return '(no handler)'
+ self.options = {'exercise_counter': self.exercise_counter}
handler = exercise_handlers[typ](self.options)
return handler.generate(element)
@@ -291,7 +321,7 @@ class EduModule(Xmill):
definiens_s = ''
# let's pull definiens from another document
- if self.options['slowniczek_xml'] and (not nxt or nxt.tag != 'definiens'):
+ if self.options['slowniczek_xml'] is not None and (nxt is None or nxt.tag != 'definiens'):
sxml = self.options['slowniczek_xml']
assert element.text != ''
defloc = sxml.xpath("//definiendum[text()='%s']" % element.text)
@@ -322,7 +352,7 @@ class EduModule(Xmill):
# else: frames_c = ""
# return u""""
return u'''
-tabular%s
+tabular%s
''' % ('l' * max_col), \
u'''tabular'''
@@ -333,10 +363,43 @@ class EduModule(Xmill):
@escape(1)
def handle_kol(self, element):
if element.getnext() is not None:
- return u"", u''
+ return u"", u''
return u"", u""
- handle_link = cmd('em', True)
+ def handle_link(self, element):
+ if element.attrib.get('url'):
+ 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('emph')(self, element)
+
+ def handle_obraz(self, element):
+ frmt = self.options['format']
+ name = element.attrib.get('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 '!!