right-aligned poem line in WL XML

[librarian.git] / librarian / cover.py

diff --git a/librarian/cover.py b/librarian/cover.py
index 21eedc3..5093de3 100644 (file)
--- a/librarian/cover.py
+++ b/librarian/cover.py
@@ -4,7 +4,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import re
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import re

-from PIL import Image, ImageFont, ImageDraw, ImageFilter, ImageEnhance
+from PIL import Image, ImageFont, ImageDraw, ImageFilter

 from StringIO import StringIO
 from librarian import get_resource, OutputFile, URLOpener
 
 from StringIO import StringIO
 from librarian import get_resource, OutputFile, URLOpener
 


@@ -18,8 +18,9 @@ class Metric(object):
     def __getattr__(self, name):
         src = getattr(self._obj, name)
         if src and self._scale:
     def __getattr__(self, name):
         src = getattr(self._obj, name)
         if src and self._scale:

-            src = type(src)(self._scale * src)
-        return src
+            return type(src)(self._scale * src)
+        else:
+            return src

 
 
 class TextBox(object):
 
 
 class TextBox(object):


@@ -142,6 +143,8 @@ class Cover(object):
         self.title = book_info.title
         if format is not None:
             self.format = format
         self.title = book_info.title
         if format is not None:
             self.format = format

+        if width and height:
+            self.height = height * self.width / width

         scale = max(float(width or 0) / self.width, float(height or 0) / self.height)
         if scale >= 1:
             self.scale = scale
         scale = max(float(width or 0) / self.width, float(height or 0) / self.height)
         if scale >= 1:
             self.scale = scale


@@ -179,8 +182,7 @@ class Cover(object):
             
         author_font = ImageFont.truetype(
             self.author_font_ttf, metr.author_font_size)
             
         author_font = ImageFont.truetype(
             self.author_font_ttf, metr.author_font_size)

-        tbox.text(self.pretty_author(), self.author_color, author_font,
-            metr.author_lineskip, self.author_shadow)
+        tbox.text(self.pretty_author(), self.author_color, author_font, metr.author_lineskip, self.author_shadow)

         text_img = tbox.image()
         img.paste(text_img, (metr.author_margin_left, top), text_img)
 
         text_img = tbox.image()
         img.paste(text_img, (metr.author_margin_left, top), text_img)
 


@@ -191,8 +193,7 @@ class Cover(object):
             )
         title_font = ImageFont.truetype(
             self.title_font_ttf, metr.title_font_size)
             )
         title_font = ImageFont.truetype(
             self.title_font_ttf, metr.title_font_size)

-        tbox.text(self.pretty_title(), self.title_color, title_font,
-            metr.title_lineskip, self.title_shadow)
+        tbox.text(self.pretty_title(), self.title_color, title_font, metr.title_lineskip, self.title_shadow)

         text_img = tbox.image()
         img.paste(text_img, (metr.title_margin_left, top), text_img)
 
         text_img = tbox.image()
         img.paste(text_img, (metr.title_margin_left, top), text_img)
 


@@ -239,7 +240,7 @@ class WLCover(Cover):
     title_font_size = 30
     title_lineskip = 40
     title_box_width = 350
     title_font_size = 30
     title_lineskip = 40
     title_box_width = 350

-    
+

     box_top_margin = 100
     box_bottom_margin = 100
     box_padding_y = 20
     box_top_margin = 100
     box_bottom_margin = 100
     box_padding_y = 20


@@ -278,7 +279,7 @@ class WLCover(Cover):
         u'Epika': 'bottom',
     }
 
         u'Epika': 'bottom',
     }
 

-    def __init__(self, book_info, format=None, width=None, height=None):
+    def __init__(self, book_info, format=None, width=None, height=None, bleed=0):

         super(WLCover, self).__init__(book_info, format=format, width=width, height=height)
         # Set box position.
         self.box_position = book_info.cover_box_position or \
         super(WLCover, self).__init__(book_info, format=format, width=width, height=height)
         # Set box position.
         self.box_position = book_info.cover_box_position or \


@@ -292,6 +293,11 @@ class WLCover(Cover):
         # Set title color.
         self.title_color = self.epoch_colors.get(book_info.epoch, self.title_color)
 
         # Set title color.
         self.title_color = self.epoch_colors.get(book_info.epoch, self.title_color)
 

+        self.bleed = bleed
+        self.box_top_margin += bleed
+        self.box_bottom_margin += bleed
+        self.bar_width += bleed
+

         if book_info.cover_url:
             url = book_info.cover_url
             bg_src = None
         if book_info.cover_url:
             url = book_info.cover_url
             bg_src = None


@@ -317,12 +323,11 @@ class WLCover(Cover):
                  font=author_font,
                  line_height=metr.author_lineskip,
                  color=self.author_color,
                  font=author_font,
                  line_height=metr.author_lineskip,
                  color=self.author_color,

-                 shadow_color=self.author_shadow,
-                )
+                 shadow_color=self.author_shadow)

 
         box.skip(metr.box_above_line)
         box.draw.line((metr.box_line_left, box.height, metr.box_line_right, box.height),
 
         box.skip(metr.box_above_line)
         box.draw.line((metr.box_line_left, box.height, metr.box_line_right, box.height),

-                fill=self.author_color, width=metr.box_line_width)
+                      fill=self.author_color, width=metr.box_line_width)

         box.skip(metr.box_below_line)
 
         # Write title.
         box.skip(metr.box_below_line)
 
         # Write title.


@@ -332,8 +337,7 @@ class WLCover(Cover):
                  line_height=metr.title_lineskip,
                  font=title_font,
                  color=self.title_color,
                  line_height=metr.title_lineskip,
                  font=title_font,
                  color=self.title_color,

-                 shadow_color=self.title_shadow,
-                )
+                 shadow_color=self.title_shadow)

 
         box_img = box.image()
 
 
         box_img = box.image()
 


@@ -345,17 +349,33 @@ class WLCover(Cover):
         else:   # Middle.
             box_top = (metr.height - box_img.size[1]) / 2
 
         else:   # Middle.
             box_top = (metr.height - box_img.size[1]) / 2
 

-        box_left = metr.bar_width + (metr.width - metr.bar_width -
-                        box_img.size[0]) / 2
+        box_left = metr.bar_width + (metr.width - metr.bar_width - box_img.size[0]) / 2

 
         # Draw the white box.
 
         # Draw the white box.

-        ImageDraw.Draw(img).rectangle((box_left, box_top,
-            box_left + box_img.size[0], box_top + box_img.size[1]),
-            fill='#fff')
+        ImageDraw.Draw(img).rectangle(
+            (box_left, box_top, box_left + box_img.size[0], box_top + box_img.size[1]), fill='#fff')

         # Paste the contents into the white box.
         img.paste(box_img, (box_left, box_top), box_img)
         return img
 
         # Paste the contents into the white box.
         img.paste(box_img, (box_left, box_top), box_img)
         return img
 

+    def add_cut_lines(self, img):
+        line_ratio = 0.5
+        if self.bleed == 0:
+            return img
+        metr = Metric(self, self.scale)
+        draw = ImageDraw.Draw(img)
+        for corner_x, corner_y in ((0, 0), (metr.width, 0), (0, metr.height), (metr.width, metr.height)):
+            dir_x = 1 if corner_x == 0 else -1
+            dir_y = 1 if corner_y == 0 else -1
+            for offset in (-1, 0, 1):
+                draw.line((corner_x, corner_y + dir_y * metr.bleed + offset,
+                           corner_x + dir_x * metr.bleed * line_ratio, corner_y + dir_y * metr.bleed +  offset),
+                          fill='black' if offset == 0 else 'white', width=1)
+                draw.line((corner_x + dir_x * metr.bleed + offset, corner_y,
+                           corner_x + dir_x * metr.bleed + offset, corner_y + dir_y * metr.bleed * line_ratio),
+                          fill='black' if offset == 0 else 'white', width=1)
+        return img
+

     def image(self):
         metr = Metric(self, self.scale)
         img = Image.new('RGB', (metr.width, metr.height), self.background_color)
     def image(self):
         metr = Metric(self, self.scale)
         img = Image.new('RGB', (metr.width, metr.height), self.background_color)


@@ -388,6 +408,8 @@ class WLCover(Cover):
 
         img = self.add_box(img)
 
 
         img = self.add_box(img)
 

+        # img = self.add_cut_lines(img)
+

         return img
 
 
         return img
 
 


@@ -403,6 +425,11 @@ class LogoWLCover(WLCover):
         'res/fnp-logo-white.png',
     ]
 
         'res/fnp-logo-white.png',
     ]
 

+    def __init__(self, *args, **kwargs):
+        super(LogoWLCover, self).__init__(*args, **kwargs)
+        self.gradient_height += self.bleed
+        self.gradient_logo_margin_right += self.bleed
+

     def image(self):
         img = super(LogoWLCover, self).image()
         metr = Metric(self, self.scale)
     def image(self):
         img = super(LogoWLCover, self).image()
         metr = Metric(self, self.scale)


@@ -410,12 +437,13 @@ class LogoWLCover(WLCover):
         gradient_mask = Image.new('L', (metr.width - metr.bar_width, metr.gradient_height))
         draw = ImageDraw.Draw(gradient_mask)
         for line in range(0, metr.gradient_height):
         gradient_mask = Image.new('L', (metr.width - metr.bar_width, metr.gradient_height))
         draw = ImageDraw.Draw(gradient_mask)
         for line in range(0, metr.gradient_height):

-            draw.line((0, line, metr.width - metr.bar_width, line), fill=int(255 * self.gradient_opacity * line / metr.gradient_height))
-        img.paste(gradient, 
-            (metr.bar_width, metr.height - metr.gradient_height), mask=gradient_mask)
+            draw.line(
+                (0, line, metr.width - metr.bar_width, line),
+                fill=int(255 * self.gradient_opacity * line / metr.gradient_height))
+        img.paste(gradient, (metr.bar_width, metr.height - metr.gradient_height), mask=gradient_mask)

 
         cursor = metr.width - metr.gradient_logo_margin_right
 
         cursor = metr.width - metr.gradient_logo_margin_right

-        logo_top = metr.height - metr.gradient_height / 2  - metr.gradient_logo_height / 2
+        logo_top = metr.height - metr.gradient_height / 2 - metr.gradient_logo_height / 2 - metr.bleed / 2

         for logo_path in self.gradient_logos[::-1]:
             logo = Image.open(get_resource(logo_path))
             logo = logo.resize(
         for logo_path in self.gradient_logos[::-1]:
             logo = Image.open(get_resource(logo_path))
             logo = logo.resize(


@@ -512,4 +540,3 @@ class GandalfCover(Cover):
 
 
 DefaultEbookCover = LogoWLCover
 
 
 DefaultEbookCover = LogoWLCover

-