Version 2.2

[librarian.git] / src / librarian / html.py

diff --git a/src/librarian/html.py b/src/librarian/html.py
index 363286c..d4b9795 100644 (file)
--- a/src/librarian/html.py
+++ b/src/librarian/html.py
@@ -58,9 +58,8 @@ def add_image_sizes(tree, gallery_path, gallery_url, base_url):
         rel_path = ilustr.attrib['src']
         img_url = six.moves.urllib.parse.urljoin(base_url, rel_path)
 
         rel_path = ilustr.attrib['src']
         img_url = six.moves.urllib.parse.urljoin(base_url, rel_path)
 

-        with six.moves.urllib.request.urlopen(img_url) as f:
-            img = Image.open(f)
-
+        f = six.moves.urllib.request.urlopen(img_url)
+        img = Image.open(f)

         ext = {'GIF': 'gif', 'PNG': 'png'}.get(img.format, 'jpg')
 
         srcset = []
         ext = {'GIF': 'gif', 'PNG': 'png'}.get(img.format, 'jpg')
 
         srcset = []


@@ -75,10 +74,12 @@ def add_image_sizes(tree, gallery_path, gallery_url, base_url):
         ]
         largest = None
         for w in widths:
         ]
         largest = None
         for w in widths:

-            height = round(img.size[1] * w / img.size[0])
-            th = img.resize((w, height))

             fname = '%d.W%d.%s' % (i, w, ext)
             fname = '%d.W%d.%s' % (i, w, ext)

-            th.save(gallery_path + fname)
+            fpath = gallery_path + fname
+            if not os.path.exists(fpath):
+                height = round(img.size[1] * w / img.size[0])
+                th = img.resize((w, height))
+                th.save(fpath)

             th_url = gallery_url + fname
             srcset.append(" ".join((
                 th_url,
             th_url = gallery_url + fname
             srcset.append(" ".join((
                 th_url,


@@ -88,6 +89,8 @@ def add_image_sizes(tree, gallery_path, gallery_url, base_url):
         ilustr.attrib['srcset'] = ", ".join(srcset)
         ilustr.attrib['src'] = largest_url
 
         ilustr.attrib['srcset'] = ", ".join(srcset)
         ilustr.attrib['src'] = largest_url
 

+        f.close()
+

 
 def transform(wldoc, stylesheet='legacy', options=None, flags=None, css=None, gallery_path='img/', gallery_url='img/', base_url='file://./'):
     """Transforms the WL document to XHTML.
 
 def transform(wldoc, stylesheet='legacy', options=None, flags=None, css=None, gallery_path='img/', gallery_url='img/', base_url='file://./'):
     """Transforms the WL document to XHTML.


@@ -111,7 +114,8 @@ def transform(wldoc, stylesheet='legacy', options=None, flags=None, css=None, ga
 
         document.clean_ed_note()
         document.clean_ed_note('abstrakt')
 
         document.clean_ed_note()
         document.clean_ed_note('abstrakt')

-
+        document.fix_pa_akap()
+        

         if not options:
             options = {}
 
         if not options:
             options = {}
 


@@ -316,6 +320,7 @@ def add_anchors(root):
                 )
                 or e.get('id') == 'nota_red'
                 or e.tag == 'blockquote'
                 )
                 or e.get('id') == 'nota_red'
                 or e.tag == 'blockquote'

+                or e.get('id') == 'footnotes'

             )
         if any_ancestor(element, f):
             continue
             )
         if any_ancestor(element, f):
             continue