diff --git a/data.py b/data.py index b10ca7fa6156dae14ce3e65c904ab8a2c852d8ea..2f023928b66743a829afeb70fb0726fc8b4da28a 100644 --- a/data.py +++ b/data.py @@ -32,33 +32,38 @@ class Image: img.attrib["height"] = self._height return img - def to_element(self, tag_name="element"): + def to_element(self, tag_name="element", is_in_table=False): el = etree.Element(tag_name) layout = etree.Element("layout") layout.attrib["secondary_alignment"] = "CENTER" layout.attrib["gap"] = "0" layout.attrib["fit_content_height"] = "true" - el.append(layout) + if not is_in_table: + el.append(layout) top_mg = etree.Element("top_margin") top_mg.text = "20" layout.append(top_mg) - size = etree.Element("size") - size.attrib["relative_width"] = "1" - layout.append(size) + if not is_in_table: + size = etree.Element("size") + size.attrib["relative_width"] = "1" + layout.append(size) - inner_el = etree.Element("element") + inner_el = etree.Element("element") - el.append(inner_el) + el.append(inner_el) - inner_layout = etree.Element("layout") - inner_layout.attrib["secondary_alignment"] = "CENTER" - inner_layout.attrib["gap"] = "0" - inner_layout.attrib["fit_content_height"] = "true" + inner_layout = etree.Element("layout") + inner_layout.attrib["secondary_alignment"] = "CENTER" + inner_layout.attrib["gap"] = "0" + inner_layout.attrib["fit_content_height"] = "true" - inner_el.append(inner_layout) - - inner_el.append(self.to_xml()) + inner_el.append(inner_layout) + + inner_el.append(self.to_xml()) + else: + el.append(layout) + el.append(self.to_xml()) return el @@ -195,7 +200,7 @@ class Table: if isinstance(cell, Image): cell_xml = etree.Element("cell") table.append(cell_xml) - cell_xml.append(cell.to_element("element")) + cell_xml.append(cell.to_element("element", True)) else: table.append(cell.to_element("cell"))