Merge branch 'main' into dev

2024-03-17 11:56:34 +01:00
parent 227c30cce3 cfcf05fdad
commit c3aa8fec56
16 changed files with 1973 additions and 2076 deletions
@@ -1048,6 +1048,12 @@ class ToOdt(Tokenizer):
        # Standard Page Header
        if self._headerFormat:
            pre, page, post = self._headerFormat.partition(nwHeadFmt.ODT_PAGE)
+
+            pre = pre.replace(nwHeadFmt.ODT_PROJECT, self._project.data.name)
+            pre = pre.replace(nwHeadFmt.ODT_AUTHOR, self._project.data.author)
+            post = post.replace(nwHeadFmt.ODT_PROJECT, self._project.data.name)
+            post = post.replace(nwHeadFmt.ODT_AUTHOR, self._project.data.author)
+
            xHead = ET.SubElement(xPage, _mkTag("style", "header"))
            xPar = ET.SubElement(xHead, _mkTag("text", "p"), attrib={
                _mkTag("text", "style-name"): "Header"