From d72d44905d807b71643471ea992ad15faa53b191 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 1 Dec 2017 11:23:57 +0100 Subject: [PATCH] m.images: simplify code. --- pelican-plugins/m/images.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pelican-plugins/m/images.py b/pelican-plugins/m/images.py index 19dc945b..3eaaaf1b 100644 --- a/pelican-plugins/m/images.py +++ b/pelican-plugins/m/images.py @@ -192,22 +192,22 @@ class ImageGrid(rst.Directive): caption = "F{}, {}/{} s, ISO {}".format(float(exif['FNumber'][0])/float(exif['FNumber'][1]), exif['ExposureTime'][0], exif['ExposureTime'][1], exif['ISOSpeedRatings']) rel_width = float(im.width)/im.height total_widths[-1] += rel_width - rows[-1].append((uri, rel_width, len(total_widths) - 1, caption)) + rows[-1].append((uri, rel_width, caption)) - for row in rows: + for i, row in enumerate(rows): row_node = nodes.container() - for image in row: - image_reference = rst.directives.uri(image[0]) + for uri, rel_width, caption in row: + image_reference = rst.directives.uri(uri) image_node = nodes.image('', uri=image_reference) - text_nodes, _ = self.state.inline_text(image[3], self.lineno) + text_nodes, _ = self.state.inline_text(caption, self.lineno) text_node = nodes.paragraph('', '', *text_nodes) overlay_node = nodes.caption() overlay_node.append(text_node) link_node = nodes.reference('', refuri=image_reference) link_node.append(image_node) link_node.append(overlay_node) - wrapper_node = nodes.figure(width="{:.3f}%".format(image[1]*100.0/total_widths[image[2]])) + wrapper_node = nodes.figure(width="{:.3f}%".format(rel_width*100.0/total_widths[i])) wrapper_node.append(link_node) row_node.append(wrapper_node) -- 2.30.2