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

Add ODT meta namespace, add font format to HTML, and merge page break settings

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2021-01-27 13:36:09 +01:00
parent 8ccd6a8ed3
commit cbbe1b4f47
12 changed files with 62 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/core/tohtml.py
+20 -23
View File
@@ -173,16 +173,12 @@ class ToHtml(Tokenizer):
aStyle.append("text-align: justify;") aStyle.append("text-align: justify;")
if tStyle & self.A_PBB: if tStyle & self.A_PBB:
aStyle.append("page-break-before: always;") aStyle.append("page-break-before: always;")
if tStyle & self.A_PBB_AV: if tStyle & self.A_PBB_AUT:
aStyle.append("page-break-before: avoid;") aStyle.append("page-break-before: auto;")
if tStyle & self.A_PBB_NO:
aStyle.append("page-break-before: never;")
if tStyle & self.A_PBA: if tStyle & self.A_PBA:
aStyle.append("page-break-after: always;") aStyle.append("page-break-after: always;")
if tStyle & self.A_PBA_AV: if tStyle & self.A_PBA_AUT:
aStyle.append("page-break-after: avoid;") aStyle.append("page-break-after: auto;")
if tStyle & self.A_PBA_NO:
aStyle.append("page-break-after: never;")
if len(aStyle) > 0: if len(aStyle) > 0:
hStyle = " style='%s'" % (" ".join(aStyle)) hStyle = " style='%s'" % (" ".join(aStyle))
@@ -268,22 +264,23 @@ class ToHtml(Tokenizer):
if not self.cssStyles: if not self.cssStyles:
return theStyles return theStyles
if self.doJustify: textAlign = "justify" if self.doJustify else "left"
theStyles.append(r"p {text-align: justify;}")
else:
theStyles.append(r"p {text-align: left;}")
theStyles.append(r"h1, h2 {color: rgb(66, 113, 174);}") theStyles.append("body {font-family: '%s'; font-size: %dpt}" % (
theStyles.append(r"h3, h4 {color: rgb(50, 50, 50);}") self.textFont, self.textSize)
theStyles.append(r"h1, h2, h3, h4 {page-break-after: avoid;}") )
theStyles.append(r"a {color: rgb(66, 113, 174);}") theStyles.append("p {text-align: %s;}" % textAlign)
theStyles.append(r".title {font-size: 2.5em;}") theStyles.append("h1, h2 {color: rgb(66, 113, 174);}")
theStyles.append(r".tags {color: rgb(245, 135, 31); font-weight: bold;}") theStyles.append("h3, h4 {color: rgb(50, 50, 50);}")
theStyles.append(r".break {text-align: left;}") theStyles.append("h1, h2, h3, h4 {page-break-after: avoid;}")
theStyles.append(r".sep {text-align: center; margin-top: 1em; margin-bottom: 1em;}") theStyles.append("a {color: rgb(66, 113, 174);}")
theStyles.append(r".skip {margin-top: 1em; margin-bottom: 1em;}") theStyles.append(".title {font-size: 2.5em;}")
theStyles.append(r".synopsis {font-style: italic;}") theStyles.append(".tags {color: rgb(245, 135, 31); font-weight: bold;}")
theStyles.append(r".comment {font-style: italic; color: rgb(100, 100, 100);}") theStyles.append(".break {text-align: left;}")
theStyles.append(".sep {text-align: center; margin-top: 1em; margin-bottom: 1em;}")
theStyles.append(".skip {margin-top: 1em; margin-bottom: 1em;}")
theStyles.append(".synopsis {font-style: italic;}")
theStyles.append(".comment {font-style: italic; color: rgb(100, 100, 100);}")
return theStyles return theStyles
nw/core/tokenizer.py
+4 -6
View File
@@ -67,11 +67,9 @@ class Tokenizer():
A_CENTRE = 0x0004 # Centred A_CENTRE = 0x0004 # Centred
A_JUSTIFY = 0x0008 # Justified A_JUSTIFY = 0x0008 # Justified
A_PBB = 0x0010 # Page break before always A_PBB = 0x0010 # Page break before always
A_PBB_AV = 0x0020 # Page break before avoid A_PBB_AUT = 0x0020 # Page break before auto
A_PBB_NO = 0x0040 # Page break before never A_PBA = 0x0040 # Page break after always
A_PBA = 0x0080 # Page break after always A_PBA_AUT = 0x0080 # Page break after auto
A_PBA_AV = 0x0100 # Page break after avoid
A_PBA_NO = 0x0200 # Page break after avoid
def __init__(self, theProject, theParent): def __init__(self, theProject, theParent):
@@ -628,7 +626,7 @@ class Tokenizer():
tToken[1], tToken[1],
tToken[2], tToken[2],
tToken[3], tToken[3],
self.A_PBB_NO | self.A_CENTRE self.A_PBB_AUT | self.A_CENTRE
) )
else: else:
self.theTokens[n] = ( self.theTokens[n] = (
nw/core/toodt.py
+19 -2
View File
@@ -30,6 +30,7 @@ import os
from lxml import etree from lxml import etree
from hashlib import sha256 from hashlib import sha256
from datetime import datetime
from nw.core.tokenizer import Tokenizer from nw.core.tokenizer import Tokenizer
@@ -39,6 +40,7 @@ XML_NS = {
"office" : "urn:oasis:names:tc:opendocument:xmlns:office:1.0", "office" : "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
"style" : "urn:oasis:names:tc:opendocument:xmlns:style:1.0", "style" : "urn:oasis:names:tc:opendocument:xmlns:style:1.0",
"text" : "urn:oasis:names:tc:opendocument:xmlns:text:1.0", "text" : "urn:oasis:names:tc:opendocument:xmlns:text:1.0",
"meta" : "urn:oasis:names:tc:opendocument:xmlns:meta:1.0",
"fo" : "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0", "fo" : "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
} }
@@ -113,12 +115,19 @@ class ToOdt(Tokenizer):
_mkTag("office", "mimetype") : "application/vnd.oasis.opendocument.text", _mkTag("office", "mimetype") : "application/vnd.oasis.opendocument.text",
} }
self._xRoot = etree.Element(_mkTag("office", "document"), attrib=rAttr, nsmap=XML_NS) self._xRoot = etree.Element(_mkTag("office", "document"), attrib=rAttr, nsmap=XML_NS)
self._xMeta = etree.SubElement(self._xRoot, _mkTag("office", "meta"))
self._xFont = etree.SubElement(self._xRoot, _mkTag("office", "font-face-decls")) self._xFont = etree.SubElement(self._xRoot, _mkTag("office", "font-face-decls"))
self._xStyl = etree.SubElement(self._xRoot, _mkTag("office", "styles")) self._xStyl = etree.SubElement(self._xRoot, _mkTag("office", "styles"))
self._xAuto = etree.SubElement(self._xRoot, _mkTag("office", "automatic-styles")) self._xAuto = etree.SubElement(self._xRoot, _mkTag("office", "automatic-styles"))
self._xBody = etree.SubElement(self._xRoot, _mkTag("office", "body")) self._xBody = etree.SubElement(self._xRoot, _mkTag("office", "body"))
self._xText = etree.SubElement(self._xBody, _mkTag("office", "text")) self._xText = etree.SubElement(self._xBody, _mkTag("office", "text"))
# Meta Data
xMeta = etree.SubElement(self._xMeta, _mkTag("meta", "creation-date"))
xMeta.text = datetime.now().isoformat()
xMeta = etree.SubElement(self._xMeta, _mkTag("meta", "generator"))
xMeta.text = f"novelWriter/{nw.__version__}"
# Re-Init Variables # Re-Init Variables
self._fontFamily = self.textFont self._fontFamily = self.textFont
if len(self.textFont.split()) > 1: if len(self.textFont.split()) > 1:
@@ -166,8 +175,12 @@ class ToOdt(Tokenizer):
oStyle.setTextAlign("justify") oStyle.setTextAlign("justify")
if tStyle & self.A_PBB: if tStyle & self.A_PBB:
oStyle.setBreakBefore("page") oStyle.setBreakBefore("page")
if tStyle & self.A_PBB_AUT:
oStyle.setBreakBefore("auto")
if tStyle & self.A_PBA: if tStyle & self.A_PBA:
oStyle.setBreakAfter("page") oStyle.setBreakAfter("page")
if tStyle & self.A_PBA_AUT:
oStyle.setBreakAfter("auto")
# Process Text Type # Process Text Type
if tType == self.T_EMPTY: if tType == self.T_EMPTY:
@@ -212,7 +225,7 @@ class ToOdt(Tokenizer):
if parStyle is None: if parStyle is None:
parStyle = oStyle parStyle = oStyle
# for xPos, xLen, xFmt in reversed(tFormat): # for xPos, xLen, xFmt in reversed(tFormat):
# tTemp = tTemp[:xPos]+htmlTags[xFmt]+tTemp[xPos+xLen:] # tTemp = tTemp[:xPos] + htmlTags[xFmt] + tTemp[xPos+xLen:]
if tText.endswith(" "): if tText.endswith(" "):
thisPar.append(tTemp.rstrip()+"\n") thisPar.append(tTemp.rstrip()+"\n")
hasHardBreak = True hasHardBreak = True
@@ -511,6 +524,10 @@ class ToOdt(Tokenizer):
# =============================================================================================== # # =============================================================================================== #
class ODTParagraphStyle(): class ODTParagraphStyle():
"""Wrapper class for the paragraph style setting used by the
exporter. Only the used settings are exposed here to keep the class
minimal and fast.
"""
VALID_ALIGN = ["start", "center", "end", "justify", "inside", "outside", "left", "right"] VALID_ALIGN = ["start", "center", "end", "justify", "inside", "outside", "left", "right"]
VALID_BREAK = ["auto", "column", "page", "even-page", "odd-page", "inherit"] VALID_BREAK = ["auto", "column", "page", "even-page", "odd-page", "inherit"]
@@ -539,7 +556,7 @@ class ODTParagraphStyle():
"break-after": ["fo", None], "break-after": ["fo", None],
} }
# text Attributes # Text Attributes
self._tAttr = { self._tAttr = {
"font-name": ["style", None], "font-name": ["style", None],
"font-family": ["fo", None], "font-family": ["fo", None],
nw/gui/build.py
+1 -1
View File
@@ -573,7 +573,7 @@ class GuiBuildNovel(QDialog):
self.nwdText = nwdText self.nwdText = nwdText
tEnd = int(time()) tEnd = int(time())
logger.debug("Built project in %.3f ms" % (1000*(tEnd-tStart))) logger.debug("Built project in %.3f ms" % (1000*(tEnd - tStart)))
self.htmlStyle = makeHtml.getStyleSheet() self.htmlStyle = makeHtml.getStyleSheet()
self.buildTime = tEnd self.buildTime = tEnd
tests/reference/guiBuild_Tool_Step1_Lorem_Ipsum.htm
+2 -1
View File
@@ -5,6 +5,7 @@
<title>Lorem Ipsum</title> <title>Lorem Ipsum</title>
</head> </head>
<style> <style>
body {font-family: 'Sans'; font-size: 12pt}
p {text-align: left;} p {text-align: left;}
h1, h2 {color: rgb(66, 113, 174);} h1, h2 {color: rgb(66, 113, 174);}
h3, h4 {color: rgb(50, 50, 50);} h3, h4 {color: rgb(50, 50, 50);}
@@ -21,7 +22,7 @@ article {width: 800px; margin: 40px auto;}
</style> </style>
<body> <body>
<article> <article>
<h1 class='title' style='text-align: center; page-break-before: never;'>Lorem Ipsum</h1> <h1 class='title' style='text-align: center; page-break-before: auto;'>Lorem Ipsum</h1>
<p style='text-align: center;'><strong>By lipsum.com</strong></p> <p style='text-align: center;'><strong>By lipsum.com</strong></p>
<p style='text-align: center;'>“Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit&hellip;”</p> <p style='text-align: center;'>“Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit&hellip;”</p>
<p style='text-align: center;'>“There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain&hellip;”</p> <p style='text-align: center;'>“There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain&hellip;”</p>
tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.htm
+2 -1
View File
@@ -5,6 +5,7 @@
<title>Lorem Ipsum</title> <title>Lorem Ipsum</title>
</head> </head>
<style> <style>
body {font-family: 'Sans'; font-size: 12pt}
p {text-align: justify;} p {text-align: justify;}
h1, h2 {color: rgb(66, 113, 174);} h1, h2 {color: rgb(66, 113, 174);}
h3, h4 {color: rgb(50, 50, 50);} h3, h4 {color: rgb(50, 50, 50);}
@@ -21,7 +22,7 @@ article {width: 800px; margin: 40px auto;}
</style> </style>
<body> <body>
<article> <article>
<h1 class='title' style='text-align: center; page-break-before: never;'>Lorem Ipsum</h1> <h1 class='title' style='text-align: center; page-break-before: auto;'>Lorem Ipsum</h1>
<p style='text-align: center;'><strong>By lipsum.com</strong></p> <p style='text-align: center;'><strong>By lipsum.com</strong></p>
<p style='text-align: center;'>“Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit&hellip;”</p> <p style='text-align: center;'>“Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit&hellip;”</p>
<p style='text-align: center;'>“There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain&hellip;”</p> <p style='text-align: center;'>“There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain&hellip;”</p>
tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.htm
+2 -1
View File
@@ -5,6 +5,7 @@
<title>Lorem Ipsum</title> <title>Lorem Ipsum</title>
</head> </head>
<style> <style>
body {font-family: 'Sans'; font-size: 12pt}
p {text-align: justify;} p {text-align: justify;}
h1, h2 {color: rgb(66, 113, 174);} h1, h2 {color: rgb(66, 113, 174);}
h3, h4 {color: rgb(50, 50, 50);} h3, h4 {color: rgb(50, 50, 50);}
@@ -21,7 +22,7 @@ article {width: 800px; margin: 40px auto;}
</style> </style>
<body> <body>
<article> <article>
<h1 class='title' style='text-align: center; page-break-before: never;'>Lorem Ipsum</h1> <h1 class='title' style='text-align: center; page-break-before: auto;'>Lorem Ipsum</h1>
<p style='text-align: center;'><strong>By lipsum.com</strong></p> <p style='text-align: center;'><strong>By lipsum.com</strong></p>
<p style='text-align: center;'>“Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit&hellip;”</p> <p style='text-align: center;'>“Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit&hellip;”</p>
<p style='text-align: center;'>“There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain&hellip;”</p> <p style='text-align: center;'>“There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain&hellip;”</p>
tests/reference/guiBuild_Tool_Step4H_Lorem_Ipsum.json
+3 -2
View File
@@ -5,10 +5,11 @@
"authors": [ "authors": [
"lipsum.com" "lipsum.com"
], ],
"buildTime": 1611662802 "buildTime": 1611750760
}, },
"text": { "text": {
"css": [ "css": [
"body {font-family: 'Sans'; font-size: 12pt}",
"p {text-align: justify;}", "p {text-align: justify;}",
"h1, h2 {color: rgb(66, 113, 174);}", "h1, h2 {color: rgb(66, 113, 174);}",
"h3, h4 {color: rgb(50, 50, 50);}", "h3, h4 {color: rgb(50, 50, 50);}",
@@ -24,7 +25,7 @@
], ],
"html": [ "html": [
[ [
"<h1 class='title' style='text-align: center; page-break-before: never;'>Lorem Ipsum</h1>" "<h1 class='title' style='text-align: center; page-break-before: auto;'>Lorem Ipsum</h1>"
], ],
[ [
"" ""
tests/reference/guiBuild_Tool_Step4_Lorem_Ipsum.htm
+2 -1
View File
@@ -5,6 +5,7 @@
<title>Lorem Ipsum</title> <title>Lorem Ipsum</title>
</head> </head>
<style> <style>
body {font-family: 'Sans'; font-size: 12pt}
p {text-align: justify;} p {text-align: justify;}
h1, h2 {color: rgb(66, 113, 174);} h1, h2 {color: rgb(66, 113, 174);}
h3, h4 {color: rgb(50, 50, 50);} h3, h4 {color: rgb(50, 50, 50);}
@@ -21,7 +22,7 @@ article {width: 800px; margin: 40px auto;}
</style> </style>
<body> <body>
<article> <article>
<h1 class='title' style='text-align: center; page-break-before: never;'>Lorem Ipsum</h1> <h1 class='title' style='text-align: center; page-break-before: auto;'>Lorem Ipsum</h1>
<h1 style='page-break-before: always;'>Prologue</h1> <h1 style='page-break-before: always;'>Prologue</h1>
<p class='synopsis'><strong>Synopsis:</strong> Explanation from the lipsum.com website.</p> <p class='synopsis'><strong>Synopsis:</strong> Explanation from the lipsum.com website.</p>
<h1 style='text-align: center; page-break-before: always;'>Act One</h1> <h1 style='text-align: center; page-break-before: always;'>Act One</h1>
tests/test_core/test_core_tohtml.py
+5 -15
View File
@@ -211,12 +211,12 @@ def testCoreToHtml_Convert(dummyGUI):
# Title # Title
theHtml.theTokens = [ theHtml.theTokens = [
(theHtml.T_TITLE, 1, "A Title", None, theHtml.A_PBB_NO | theHtml.A_CENTRE), (theHtml.T_TITLE, 1, "A Title", None, theHtml.A_PBB_AUT | theHtml.A_CENTRE),
(theHtml.T_EMPTY, 1, "", None, theHtml.A_NONE), (theHtml.T_EMPTY, 1, "", None, theHtml.A_NONE),
] ]
theHtml.doConvert() theHtml.doConvert()
assert theHtml.theResult == ( assert theHtml.theResult == (
"<h1 class='title' style='text-align: center; page-break-before: never;'>" "<h1 class='title' style='text-align: center; page-break-before: auto;'>"
"<a name='T000001'></a>A Title</h1>\n" "<a name='T000001'></a>A Title</h1>\n"
) )
@@ -299,24 +299,14 @@ def testCoreToHtml_Convert(dummyGUI):
"style='page-break-before: always; page-break-after: always;'>A Title</h1>\n" "style='page-break-before: always; page-break-after: always;'>A Title</h1>\n"
) )
# Page Break Avoid # Page Break Auto
theHtml.theTokens = [ theHtml.theTokens = [
(theHtml.T_HEAD1, 1, "A Title", None, theHtml.A_PBB_AV | theHtml.A_PBA_AV), (theHtml.T_HEAD1, 1, "A Title", None, theHtml.A_PBB_AUT | theHtml.A_PBA_AUT),
] ]
theHtml.doConvert() theHtml.doConvert()
assert theHtml.theResult == ( assert theHtml.theResult == (
"<h1 class='title' " "<h1 class='title' "
"style='page-break-before: avoid; page-break-after: avoid;'>A Title</h1>\n" "style='page-break-before: auto; page-break-after: auto;'>A Title</h1>\n"
)
# Page Break ANever
theHtml.theTokens = [
(theHtml.T_HEAD1, 1, "A Title", None, theHtml.A_PBB_NO | theHtml.A_PBA_NO),
]
theHtml.doConvert()
assert theHtml.theResult == (
"<h1 class='title' "
"style='page-break-before: never; page-break-after: never;'>A Title</h1>\n"
) )
# Preview Mode # Preview Mode
tests/test_core/test_core_tokenizer.py
+1 -1
View File
@@ -623,7 +623,7 @@ def testCoreToken_Headers(dummyGUI):
theToken.isPart = False theToken.isPart = False
theToken.doHeaders() theToken.doHeaders()
assert theToken.theTokens == [ assert theToken.theTokens == [
(Tokenizer.T_TITLE, 1, "Novel Title", None, Tokenizer.A_PBB_NO | Tokenizer.A_CENTRE), (Tokenizer.T_TITLE, 1, "Novel Title", None, Tokenizer.A_PBB_AUT | Tokenizer.A_CENTRE),
(Tokenizer.T_EMPTY, 1, "", None, Tokenizer.A_PBA | Tokenizer.A_CENTRE), (Tokenizer.T_EMPTY, 1, "", None, Tokenizer.A_PBA | Tokenizer.A_CENTRE),
] ]
tests/test_core/test_core_toodt.py
+1
View File
@@ -31,6 +31,7 @@ XML_NS = [
' xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"', ' xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"',
' xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"', ' xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"',
' xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"', ' xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"',
' xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"',
' xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"', ' xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"',
] ]