Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor the Odt writer code

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-04-05 17:12:01 +02:00
parent d0d6da3436
commit 53e5756745
2 changed files with 243 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/core/toodt.py
+242 -312
View File
@@ -60,8 +60,7 @@ for ns, uri in XML_NS.items():
def _mkTag(ns: str, tag: str) -> str: def _mkTag(ns: str, tag: str) -> str:
"""Assemble namespace and tag name.""" """Assemble namespace and tag name."""
uri = XML_NS.get(ns, "") if uri := XML_NS.get(ns, ""):
if uri:
return f"{{{uri}}}{tag}" return f"{{{uri}}}{tag}"
logger.warning("Missing xml namespace '%s'", ns) logger.warning("Missing xml namespace '%s'", ns)
return tag return tag
@@ -204,10 +203,9 @@ class ToOdt(Tokenizer):
def setLanguage(self, language: str | None) -> None: def setLanguage(self, language: str | None) -> None:
"""Set language for the document.""" """Set language for the document."""
if language: if language:
langBits = language.split("_") lang, _, country = language.partition("_")
self._dLanguage = langBits[0] self._dLanguage = lang or self._dLanguage
if len(langBits) > 1: self._dCountry = country or self._dCountry
self._dCountry = langBits[1]
return return
def setColourHeaders(self, state: bool) -> None: def setColourHeaders(self, state: bool) -> None:
@@ -574,10 +572,7 @@ class ToOdt(Tokenizer):
def _formatSynopsis(self, text: str, synopsis: bool) -> tuple[str, list[tuple[int, int]]]: def _formatSynopsis(self, text: str, synopsis: bool) -> tuple[str, list[tuple[int, int]]]:
"""Apply formatting to synopsis lines.""" """Apply formatting to synopsis lines."""
if synopsis: name = self._localLookup("Synopsis" if synopsis else "Short Description")
name = self._localLookup("Synopsis")
else:
name = self._localLookup("Short Description")
rTxt = f"{name}: {text}" rTxt = f"{name}: {text}"
rFmt = [(0, self.FMT_B_B), (len(name) + 1, self.FMT_B_E)] rFmt = [(0, self.FMT_B_B), (len(name) + 1, self.FMT_B_E)]
return rTxt, rFmt return rTxt, rFmt
@@ -610,8 +605,7 @@ class ToOdt(Tokenizer):
tFmt: Sequence[tuple[int, int]] = [], isHead: bool = False, oLevel: str | None = None tFmt: Sequence[tuple[int, int]] = [], isHead: bool = False, oLevel: str | None = None
) -> None: ) -> None:
"""Add a text paragraph to the text XML element.""" """Add a text paragraph to the text XML element."""
tAttr = {} tAttr = {_mkTag("text", "style-name"): self._paraStyle(styleName, oStyle)}
tAttr[_mkTag("text", "style-name")] = self._paraStyle(styleName, oStyle)
if oLevel is not None: if oLevel is not None:
tAttr[_mkTag("text", "outline-level")] = oLevel tAttr[_mkTag("text", "outline-level")] = oLevel
@@ -718,29 +712,29 @@ class ToOdt(Tokenizer):
if hFmt in self._autoText: if hFmt in self._autoText:
return self._autoText[hFmt][0] return self._autoText[hFmt][0]
newName = "T%d" % (len(self._autoText) + 1) name = "T%d" % (len(self._autoText) + 1)
newStyle = ODTTextStyle() style = ODTTextStyle()
if hFmt & X_BLD: if hFmt & X_BLD:
newStyle.setFontWeight("bold") style.setFontWeight("bold")
if hFmt & X_ITA: if hFmt & X_ITA:
newStyle.setFontStyle("italic") style.setFontStyle("italic")
if hFmt & X_DEL: if hFmt & X_DEL:
newStyle.setStrikeStyle("solid") style.setStrikeStyle("solid")
newStyle.setStrikeType("single") style.setStrikeType("single")
if hFmt & X_UND: if hFmt & X_UND:
newStyle.setUnderlineStyle("solid") style.setUnderlineStyle("solid")
newStyle.setUnderlineWidth("auto") style.setUnderlineWidth("auto")
newStyle.setUnderlineColour("font-color") style.setUnderlineColour("font-color")
if hFmt & X_MRK: if hFmt & X_MRK:
newStyle.setBackgroundColor(self._markText) style.setBackgroundColor(self._markText)
if hFmt & X_SUP: if hFmt & X_SUP:
newStyle.setTextPosition("super") style.setTextPosition("super")
if hFmt & X_SUB: if hFmt & X_SUB:
newStyle.setTextPosition("sub") style.setTextPosition("sub")
self._autoText[hFmt] = (newName, newStyle) self._autoText[hFmt] = (name, style)
return newName return name
def _emToCm(self, value: float) -> str: def _emToCm(self, value: float) -> str:
"""Converts an em value to centimetres.""" """Converts an em value to centimetres."""
@@ -752,298 +746,254 @@ class ToOdt(Tokenizer):
def _pageStyles(self) -> None: def _pageStyles(self) -> None:
"""Set the default page style.""" """Set the default page style."""
tAttr = {} xPage = ET.SubElement(
tAttr[_mkTag("style", "name")] = "PM1" self._xAuto if self._isFlat else self._xAut2,
if self._isFlat: _mkTag("style", "page-layout"),
xPage = ET.SubElement(self._xAuto, _mkTag("style", "page-layout"), attrib=tAttr) attrib={_mkTag("style", "name"): "PM1"}
else: )
xPage = ET.SubElement(self._xAut2, _mkTag("style", "page-layout"), attrib=tAttr) ET.SubElement(xPage, _mkTag("style", "page-layout-properties"), attrib={
_mkTag("fo", "page-width"): self._mDocWidth,
tAttr = {} _mkTag("fo", "page-height"): self._mDocHeight,
tAttr[_mkTag("fo", "page-width")] = self._mDocWidth _mkTag("fo", "margin-top"): self._mDocTop,
tAttr[_mkTag("fo", "page-height")] = self._mDocHeight _mkTag("fo", "margin-bottom"): self._mDocBtm,
tAttr[_mkTag("fo", "margin-top")] = self._mDocTop _mkTag("fo", "margin-left"): self._mDocLeft,
tAttr[_mkTag("fo", "margin-bottom")] = self._mDocBtm _mkTag("fo", "margin-right"): self._mDocRight,
tAttr[_mkTag("fo", "margin-left")] = self._mDocLeft _mkTag("fo", "print-orientation"): "portrait",
tAttr[_mkTag("fo", "margin-right")] = self._mDocRight })
tAttr[_mkTag("fo", "print-orientation")] = "portrait"
ET.SubElement(xPage, _mkTag("style", "page-layout-properties"), attrib=tAttr)
xHead = ET.SubElement(xPage, _mkTag("style", "header-style")) xHead = ET.SubElement(xPage, _mkTag("style", "header-style"))
ET.SubElement(xHead, _mkTag("style", "header-footer-properties"), attrib={
tAttr = {} _mkTag("fo", "min-height"): "0.600cm",
tAttr[_mkTag("fo", "min-height")] = "0.600cm" _mkTag("fo", "margin-left"): "0.000cm",
tAttr[_mkTag("fo", "margin-left")] = "0.000cm" _mkTag("fo", "margin-right"): "0.000cm",
tAttr[_mkTag("fo", "margin-right")] = "0.000cm" _mkTag("fo", "margin-bottom"): "0.500cm",
tAttr[_mkTag("fo", "margin-bottom")] = "0.500cm" })
ET.SubElement(xHead, _mkTag("style", "header-footer-properties"), attrib=tAttr)
return return
def _defaultStyles(self) -> None: def _defaultStyles(self) -> None:
"""Set the default styles.""" """Set the default styles."""
# Add Paragraph Family Style # Add Paragraph Family Style
# ========================== xStyl = ET.SubElement(self._xStyl, _mkTag("style", "default-style"), attrib={
_mkTag("style", "family"): "paragraph",
tAttr = {} })
tAttr[_mkTag("style", "family")] = "paragraph" ET.SubElement(xStyl, _mkTag("style", "paragraph-properties"), attrib={
xStyl = ET.SubElement(self._xStyl, _mkTag("style", "default-style"), attrib=tAttr) _mkTag("style", "line-break"): "strict",
_mkTag("style", "tab-stop-distance"): "1.251cm",
tAttr = {} _mkTag("style", "writing-mode"): "page",
tAttr[_mkTag("style", "line-break")] = "strict" })
tAttr[_mkTag("style", "tab-stop-distance")] = "1.251cm" ET.SubElement(xStyl, _mkTag("style", "text-properties"), attrib={
tAttr[_mkTag("style", "writing-mode")] = "page" _mkTag("style", "font-name"): self._textFont,
ET.SubElement(xStyl, _mkTag("style", "paragraph-properties"), attrib=tAttr) _mkTag("fo", "font-family"): self._fontFamily,
_mkTag("fo", "font-size"): self._fSizeText,
tAttr = {} _mkTag("fo", "language"): self._dLanguage,
tAttr[_mkTag("style", "font-name")] = self._textFont _mkTag("fo", "country"): self._dCountry,
tAttr[_mkTag("fo", "font-family")] = self._fontFamily })
tAttr[_mkTag("fo", "font-size")] = self._fSizeText
tAttr[_mkTag("fo", "language")] = self._dLanguage
tAttr[_mkTag("fo", "country")] = self._dCountry
ET.SubElement(xStyl, _mkTag("style", "text-properties"), attrib=tAttr)
# Add Standard Paragraph Style # Add Standard Paragraph Style
# ============================ xStyl = ET.SubElement(self._xStyl, _mkTag("style", "style"), attrib={
_mkTag("style", "name"): "Standard",
tAttr = {} _mkTag("style", "family"): "paragraph",
tAttr[_mkTag("style", "name")] = "Standard" _mkTag("style", "class"): "text",
tAttr[_mkTag("style", "family")] = "paragraph" })
tAttr[_mkTag("style", "class")] = "text" ET.SubElement(xStyl, _mkTag("style", "text-properties"), attrib={
xStyl = ET.SubElement(self._xStyl, _mkTag("style", "style"), attrib=tAttr) _mkTag("style", "font-name"): self._textFont,
_mkTag("fo", "font-family"): self._fontFamily,
tAttr = {} _mkTag("fo", "font-size"): self._fSizeText,
tAttr[_mkTag("style", "font-name")] = self._textFont })
tAttr[_mkTag("fo", "font-family")] = self._fontFamily
tAttr[_mkTag("fo", "font-size")] = self._fSizeText
ET.SubElement(xStyl, _mkTag("style", "text-properties"), attrib=tAttr)
# Add Default Heading Style # Add Default Heading Style
# ========================= xStyl = ET.SubElement(self._xStyl, _mkTag("style", "style"), attrib={
_mkTag("style", "name"): "Heading",
tAttr = {} _mkTag("style", "family"): "paragraph",
tAttr[_mkTag("style", "name")] = "Heading" _mkTag("style", "parent-style-name"): "Standard",
tAttr[_mkTag("style", "family")] = "paragraph" _mkTag("style", "next-style-name"): "Text_20_body",
tAttr[_mkTag("style", "parent-style-name")] = "Standard" _mkTag("style", "class"): "text",
tAttr[_mkTag("style", "next-style-name")] = "Text_20_body" })
tAttr[_mkTag("style", "class")] = "text" ET.SubElement(xStyl, _mkTag("style", "paragraph-properties"), attrib={
xStyl = ET.SubElement(self._xStyl, _mkTag("style", "style"), attrib=tAttr) _mkTag("fo", "margin-top"): self._mTopHead,
_mkTag("fo", "margin-bottom"): self._mBotHead,
tAttr = {} _mkTag("fo", "keep-with-next"): "always",
tAttr[_mkTag("fo", "margin-top")] = self._mTopHead })
tAttr[_mkTag("fo", "margin-bottom")] = self._mBotHead ET.SubElement(xStyl, _mkTag("style", "text-properties"), attrib={
tAttr[_mkTag("fo", "keep-with-next")] = "always" _mkTag("style", "font-name"): self._textFont,
ET.SubElement(xStyl, _mkTag("style", "paragraph-properties"), attrib=tAttr) _mkTag("fo", "font-family"): self._fontFamily,
_mkTag("fo", "font-size"): self._fSizeHead,
tAttr = {} })
tAttr[_mkTag("style", "font-name")] = self._textFont
tAttr[_mkTag("fo", "font-family")] = self._fontFamily
tAttr[_mkTag("fo", "font-size")] = self._fSizeHead
ET.SubElement(xStyl, _mkTag("style", "text-properties"), attrib=tAttr)
# Add Header and Footer Styles # Add Header and Footer Styles
# ============================ ET.SubElement(self._xStyl, _mkTag("style", "style"), attrib={
tAttr = {} _mkTag("style", "name"): "Header_20_and_20_Footer",
tAttr[_mkTag("style", "name")] = "Header_20_and_20_Footer" _mkTag("style", "display-name"): "Header and Footer",
tAttr[_mkTag("style", "display-name")] = "Header and Footer" _mkTag("style", "family"): "paragraph",
tAttr[_mkTag("style", "family")] = "paragraph" _mkTag("style", "parent-style-name"): "Standard",
tAttr[_mkTag("style", "parent-style-name")] = "Standard" _mkTag("style", "class"): "extra",
tAttr[_mkTag("style", "class")] = "extra" })
ET.SubElement(self._xStyl, _mkTag("style", "style"), attrib=tAttr)
return return
def _useableStyles(self) -> None: def _useableStyles(self) -> None:
"""Set the usable styles.""" """Set the usable styles."""
# Add Text Body Style # Add Text Body Style
# =================== style = ODTParagraphStyle()
style.setClass("text")
oStyle = ODTParagraphStyle() style.setDisplayName("Text body")
oStyle.setDisplayName("Text body") style.setFontFamily(self._fontFamily)
oStyle.setParentStyleName("Standard") style.setFontName(self._textFont)
oStyle.setClass("text") style.setFontSize(self._fSizeText)
oStyle.setMarginTop(self._mTopText) style.setLineHeight(self._fLineHeight)
oStyle.setMarginBottom(self._mBotText) style.setMarginBottom(self._mBotText)
oStyle.setLineHeight(self._fLineHeight) style.setMarginTop(self._mTopText)
oStyle.setFontName(self._textFont) style.setParentStyleName("Standard")
oStyle.setFontFamily(self._fontFamily) style.setTextAlign(self._textAlign)
oStyle.setFontSize(self._fSizeText) style.packXML(self._xStyl, "Text_20_body")
oStyle.setTextAlign(self._textAlign) self._mainPara["Text_20_body"] = style
oStyle.packXML(self._xStyl, "Text_20_body")
self._mainPara["Text_20_body"] = oStyle
# Add First Line Indent Style # Add First Line Indent Style
# =========================== style = ODTParagraphStyle()
style.setClass("text")
oStyle = ODTParagraphStyle() style.setDisplayName("First line indent")
oStyle.setDisplayName("First line indent") style.setParentStyleName("Text_20_body")
oStyle.setParentStyleName("Text_20_body") style.setTextIndent(self._fTextIndent)
oStyle.setClass("text") style.packXML(self._xStyl, "First_20_line_20_indent")
oStyle.setTextIndent(self._fTextIndent) self._mainPara["First_20_line_20_indent"] = style
oStyle.packXML(self._xStyl, "First_20_line_20_indent")
self._mainPara["First_20_line_20_indent"] = oStyle
# Add Text Meta Style # Add Text Meta Style
# =================== style = ODTParagraphStyle()
style.setClass("text")
oStyle = ODTParagraphStyle() style.setColor(self._colMetaTx)
oStyle.setDisplayName("Text Meta") style.setDisplayName("Text Meta")
oStyle.setParentStyleName("Standard") style.setFontFamily(self._fontFamily)
oStyle.setClass("text") style.setFontName(self._textFont)
oStyle.setMarginTop(self._mTopMeta) style.setFontSize(self._fSizeText)
oStyle.setMarginBottom(self._mBotMeta) style.setLineHeight(self._fLineHeight)
oStyle.setLineHeight(self._fLineHeight) style.setMarginBottom(self._mBotMeta)
oStyle.setFontName(self._textFont) style.setMarginTop(self._mTopMeta)
oStyle.setFontFamily(self._fontFamily) style.setOpacity(self._opaMetaTx)
oStyle.setFontSize(self._fSizeText) style.setParentStyleName("Standard")
oStyle.setColor(self._colMetaTx) style.packXML(self._xStyl, "Text_20_Meta")
oStyle.setOpacity(self._opaMetaTx) self._mainPara["Text_20_Meta"] = style
oStyle.packXML(self._xStyl, "Text_20_Meta")
self._mainPara["Text_20_Meta"] = oStyle
# Add Title Style # Add Title Style
# =============== style = ODTParagraphStyle()
style.setClass("chapter")
oStyle = ODTParagraphStyle() style.setDisplayName("Title")
oStyle.setDisplayName("Title") style.setFontFamily(self._fontFamily)
oStyle.setParentStyleName("Heading") style.setFontName(self._textFont)
oStyle.setNextStyleName("Text_20_body") style.setFontSize(self._fSizeTitle)
oStyle.setClass("chapter") style.setFontWeight("bold")
oStyle.setTextAlign("center") style.setMarginBottom(self._mBotTitle)
oStyle.setMarginTop(self._mTopTitle) style.setMarginTop(self._mTopTitle)
oStyle.setMarginBottom(self._mBotTitle) style.setNextStyleName("Text_20_body")
oStyle.setFontName(self._textFont) style.setParentStyleName("Heading")
oStyle.setFontFamily(self._fontFamily) style.setTextAlign("center")
oStyle.setFontSize(self._fSizeTitle) style.packXML(self._xStyl, "Title")
oStyle.setFontWeight("bold") self._mainPara["Title"] = style
oStyle.packXML(self._xStyl, "Title")
self._mainPara["Title"] = oStyle
# Add Separator Style # Add Separator Style
# =================== style = ODTParagraphStyle()
style.setClass("text")
oStyle = ODTParagraphStyle() style.setDisplayName("Separator")
oStyle.setDisplayName("Separator") style.setFontFamily(self._fontFamily)
oStyle.setParentStyleName("Standard") style.setFontName(self._textFont)
oStyle.setNextStyleName("Text_20_body") style.setFontSize(self._fSizeText)
oStyle.setClass("text") style.setLineHeight(self._fLineHeight)
oStyle.setTextAlign("center") style.setMarginBottom(self._mBotText)
oStyle.setMarginTop(self._mTopText) style.setMarginTop(self._mTopText)
oStyle.setMarginBottom(self._mBotText) style.setNextStyleName("Text_20_body")
oStyle.setLineHeight(self._fLineHeight) style.setParentStyleName("Standard")
oStyle.setFontName(self._textFont) style.setTextAlign("center")
oStyle.setFontFamily(self._fontFamily) style.packXML(self._xStyl, "Separator")
oStyle.setFontSize(self._fSizeText) self._mainPara["Separator"] = style
oStyle.packXML(self._xStyl, "Separator")
self._mainPara["Separator"] = oStyle
# Add Heading 1 Style # Add Heading 1 Style
# =================== style = ODTParagraphStyle()
style.setClass("text")
oStyle = ODTParagraphStyle() style.setColor(self._colHead12)
oStyle.setDisplayName("Heading 1") style.setDisplayName("Heading 1")
oStyle.setParentStyleName("Heading") style.setFontFamily(self._fontFamily)
oStyle.setNextStyleName("Text_20_body") style.setFontName(self._textFont)
oStyle.setOutlineLevel("1") style.setFontSize(self._fSizeHead1)
oStyle.setClass("text") style.setFontWeight("bold")
oStyle.setMarginTop(self._mTopHead1) style.setMarginBottom(self._mBotHead1)
oStyle.setMarginBottom(self._mBotHead1) style.setMarginTop(self._mTopHead1)
oStyle.setFontName(self._textFont) style.setNextStyleName("Text_20_body")
oStyle.setFontFamily(self._fontFamily) style.setOpacity(self._opaHead12)
oStyle.setFontSize(self._fSizeHead1) style.setOutlineLevel("1")
oStyle.setColor(self._colHead12) style.setParentStyleName("Heading")
oStyle.setOpacity(self._opaHead12) style.packXML(self._xStyl, "Heading_20_1")
oStyle.setFontWeight("bold") self._mainPara["Heading_20_1"] = style
oStyle.packXML(self._xStyl, "Heading_20_1")
self._mainPara["Heading_20_1"] = oStyle
# Add Heading 2 Style # Add Heading 2 Style
# =================== style = ODTParagraphStyle()
style.setClass("text")
oStyle = ODTParagraphStyle() style.setColor(self._colHead12)
oStyle.setDisplayName("Heading 2") style.setDisplayName("Heading 2")
oStyle.setParentStyleName("Heading") style.setFontFamily(self._fontFamily)
oStyle.setNextStyleName("Text_20_body") style.setFontName(self._textFont)
oStyle.setOutlineLevel("2") style.setFontSize(self._fSizeHead2)
oStyle.setClass("text") style.setFontWeight("bold")
oStyle.setMarginTop(self._mTopHead2) style.setMarginBottom(self._mBotHead2)
oStyle.setMarginBottom(self._mBotHead2) style.setMarginTop(self._mTopHead2)
oStyle.setFontName(self._textFont) style.setNextStyleName("Text_20_body")
oStyle.setFontFamily(self._fontFamily) style.setOpacity(self._opaHead12)
oStyle.setFontSize(self._fSizeHead2) style.setOutlineLevel("2")
oStyle.setColor(self._colHead12) style.setParentStyleName("Heading")
oStyle.setOpacity(self._opaHead12) style.packXML(self._xStyl, "Heading_20_2")
oStyle.setFontWeight("bold") self._mainPara["Heading_20_2"] = style
oStyle.packXML(self._xStyl, "Heading_20_2")
self._mainPara["Heading_20_2"] = oStyle
# Add Heading 3 Style # Add Heading 3 Style
# =================== style = ODTParagraphStyle()
style.setClass("text")
oStyle = ODTParagraphStyle() style.setColor(self._colHead34)
oStyle.setDisplayName("Heading 3") style.setDisplayName("Heading 3")
oStyle.setParentStyleName("Heading") style.setFontFamily(self._fontFamily)
oStyle.setNextStyleName("Text_20_body") style.setFontName(self._textFont)
oStyle.setOutlineLevel("3") style.setFontSize(self._fSizeHead3)
oStyle.setClass("text") style.setFontWeight("bold")
oStyle.setMarginTop(self._mTopHead3) style.setMarginBottom(self._mBotHead3)
oStyle.setMarginBottom(self._mBotHead3) style.setMarginTop(self._mTopHead3)
oStyle.setFontName(self._textFont) style.setNextStyleName("Text_20_body")
oStyle.setFontFamily(self._fontFamily) style.setOpacity(self._opaHead34)
oStyle.setFontSize(self._fSizeHead3) style.setOutlineLevel("3")
oStyle.setColor(self._colHead34) style.setParentStyleName("Heading")
oStyle.setOpacity(self._opaHead34) style.packXML(self._xStyl, "Heading_20_3")
oStyle.setFontWeight("bold") self._mainPara["Heading_20_3"] = style
oStyle.packXML(self._xStyl, "Heading_20_3")
self._mainPara["Heading_20_3"] = oStyle
# Add Heading 4 Style # Add Heading 4 Style
# =================== style = ODTParagraphStyle()
style.setClass("text")
oStyle = ODTParagraphStyle() style.setColor(self._colHead34)
oStyle.setDisplayName("Heading 4") style.setDisplayName("Heading 4")
oStyle.setParentStyleName("Heading") style.setFontFamily(self._fontFamily)
oStyle.setNextStyleName("Text_20_body") style.setFontName(self._textFont)
oStyle.setOutlineLevel("4") style.setFontSize(self._fSizeHead4)
oStyle.setClass("text") style.setFontWeight("bold")
oStyle.setMarginTop(self._mTopHead4) style.setMarginBottom(self._mBotHead4)
oStyle.setMarginBottom(self._mBotHead4) style.setMarginTop(self._mTopHead4)
oStyle.setFontName(self._textFont) style.setNextStyleName("Text_20_body")
oStyle.setFontFamily(self._fontFamily) style.setOpacity(self._opaHead34)
oStyle.setFontSize(self._fSizeHead4) style.setOutlineLevel("4")
oStyle.setColor(self._colHead34) style.setParentStyleName("Heading")
oStyle.setOpacity(self._opaHead34) style.packXML(self._xStyl, "Heading_20_4")
oStyle.setFontWeight("bold") self._mainPara["Heading_20_4"] = style
oStyle.packXML(self._xStyl, "Heading_20_4")
self._mainPara["Heading_20_4"] = oStyle
# Add Header Style # Add Header Style
# ================ style = ODTParagraphStyle()
oStyle = ODTParagraphStyle() style.setDisplayName("Header")
oStyle.setDisplayName("Header") style.setParentStyleName("Header_20_and_20_Footer")
oStyle.setParentStyleName("Header_20_and_20_Footer") style.setTextAlign("right")
oStyle.setTextAlign("right") style.packXML(self._xStyl, "Header")
oStyle.packXML(self._xStyl, "Header") self._mainPara["Header"] = style
self._mainPara["Header"] = oStyle
return return
def _writeHeader(self) -> None: def _writeHeader(self) -> None:
"""Write the header elements.""" """Write the header elements."""
tAttr = {} xPage = ET.SubElement(self._xMast, _mkTag("style", "master-page"), attrib={
tAttr[_mkTag("style", "name")] = "Standard" _mkTag("style", "name"): "Standard",
tAttr[_mkTag("style", "page-layout-name")] = "PM1" _mkTag("style", "page-layout-name"): "PM1",
xPage = ET.SubElement(self._xMast, _mkTag("style", "master-page"), attrib=tAttr) })
# Standard Page Header # Standard Page Header
if self._headerFormat: if self._headerFormat:
@@ -1060,10 +1010,10 @@ class ToOdt(Tokenizer):
}) })
xPar.text = pre xPar.text = pre
if page: if page:
attrib = {_mkTag("text", "select-page"): "current"} attr = {_mkTag("text", "select-page"): "current"}
if self._pageOffset > 0: if self._pageOffset > 0:
attrib = {_mkTag("text", "page-adjust"): str(0 - self._pageOffset)} attr = {_mkTag("text", "page-adjust"): str(0 - self._pageOffset)}
xTail = ET.SubElement(xPar, _mkTag("text", "page-number"), attrib=attrib) xTail = ET.SubElement(xPar, _mkTag("text", "page-number"), attrib=attr)
xTail.text = "2" xTail.text = "2"
xTail.tail = post xTail.tail = post
else: else:
@@ -1272,38 +1222,25 @@ class ODTParagraphStyle:
def getID(self) -> str: def getID(self) -> str:
"""Generate a unique ID from the settings.""" """Generate a unique ID from the settings."""
string = ( return sha256((
f"Paragraph:Main:{str(self._mAttr)}:" f"Paragraph:Main:{str(self._mAttr)}:"
f"Paragraph:Para:{str(self._pAttr)}:" f"Paragraph:Para:{str(self._pAttr)}:"
f"Paragraph:Text:{str(self._tAttr)}:" f"Paragraph:Text:{str(self._tAttr)}:"
) ).encode()).hexdigest()
return sha256(string.encode()).hexdigest()
def packXML(self, xParent: ET.Element, name: str) -> None: def packXML(self, xParent: ET.Element, name: str) -> None:
"""Pack the content into an xml element.""" """Pack the content into an xml element."""
attr = {} attr = {
attr[_mkTag("style", "name")] = name _mkTag("style", "name"): name,
attr[_mkTag("style", "family")] = "paragraph" _mkTag("style", "family"): "paragraph",
for aName, (aNm, aVal) in self._mAttr.items(): }
if aVal is not None: attr.update({_mkTag(n, m): v for m, (n, v) in self._mAttr.items() if v is not None})
attr[_mkTag(aNm, aName)] = aVal
xEntry = ET.SubElement(xParent, _mkTag("style", "style"), attrib=attr) xEntry = ET.SubElement(xParent, _mkTag("style", "style"), attrib=attr)
attr = {} if attr := {_mkTag(n, m): v for m, (n, v) in self._pAttr.items() if v is not None}:
for aName, (aNm, aVal) in self._pAttr.items():
if aVal is not None:
attr[_mkTag(aNm, aName)] = aVal
if attr:
ET.SubElement(xEntry, _mkTag("style", "paragraph-properties"), attrib=attr) ET.SubElement(xEntry, _mkTag("style", "paragraph-properties"), attrib=attr)
attr = {} if attr := {_mkTag(n, m): v for m, (n, v) in self._tAttr.items() if v is not None}:
for aName, (aNm, aVal) in self._tAttr.items():
if aVal is not None:
attr[_mkTag(aNm, aName)] = aVal
if attr:
ET.SubElement(xEntry, _mkTag("style", "text-properties"), attrib=attr) ET.SubElement(xEntry, _mkTag("style", "text-properties"), attrib=attr)
return return
@@ -1412,19 +1349,12 @@ class ODTTextStyle:
def packXML(self, xParent: ET.Element, name: str) -> None: def packXML(self, xParent: ET.Element, name: str) -> None:
"""Pack the content into an xml element.""" """Pack the content into an xml element."""
attr = {} xEntry = ET.SubElement(xParent, _mkTag("style", "style"), attrib={
attr[_mkTag("style", "name")] = name _mkTag("style", "name"): name,
attr[_mkTag("style", "family")] = "text" _mkTag("style", "family"): "text",
xEntry = ET.SubElement(xParent, _mkTag("style", "style"), attrib=attr) })
if attr := {_mkTag(n, m): v for m, (n, v) in self._tAttr.items() if v is not None}:
attr = {}
for aName, (aNm, aVal) in self._tAttr.items():
if aVal is not None:
attr[_mkTag(aNm, aName)] = aVal
if attr:
ET.SubElement(xEntry, _mkTag("style", "text-properties"), attrib=attr) ET.SubElement(xEntry, _mkTag("style", "text-properties"), attrib=attr)
return return
# END Class ODTTextStyle # END Class ODTTextStyle
tests/test_core/test_core_toodt.py
+1
View File
@@ -136,6 +136,7 @@ def testCoreToOdt_TextFormatting(mockGUI):
] ]
key = "55db6c1d22ff5aba93f0f67c8d4a857a26e2d3813dfbcba1ef7c0d424f501be5" key = "55db6c1d22ff5aba93f0f67c8d4a857a26e2d3813dfbcba1ef7c0d424f501be5"
assert key in odt._autoPara
assert odt._autoPara[key][0] == "P1" assert odt._autoPara[key][0] == "P1"
assert isinstance(odt._autoPara[key][1], ODTParagraphStyle) assert isinstance(odt._autoPara[key][1], ODTParagraphStyle)