Merge bugfix for #2080 from 2.5 release branch
This commit is contained in:
@@ -305,10 +305,10 @@ class ToHtml(Tokenizer):
|
|||||||
"<head>\n"
|
"<head>\n"
|
||||||
"<meta charset='utf-8'>\n"
|
"<meta charset='utf-8'>\n"
|
||||||
"<title>{title:s}</title>\n"
|
"<title>{title:s}</title>\n"
|
||||||
"</head>\n"
|
|
||||||
"<style>\n"
|
"<style>\n"
|
||||||
"{style:s}\n"
|
"{style:s}\n"
|
||||||
"</style>\n"
|
"</style>\n"
|
||||||
|
"</head>\n"
|
||||||
"<body>\n"
|
"<body>\n"
|
||||||
"<article>\n"
|
"<article>\n"
|
||||||
"{body:s}\n"
|
"{body:s}\n"
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset='utf-8'>
|
<meta charset='utf-8'>
|
||||||
<title>Lorem Ipsum</title>
|
<title>Lorem Ipsum</title>
|
||||||
</head>
|
|
||||||
<style>
|
<style>
|
||||||
body {color: #000000; font-family: 'Arial'; font-size: 12pt; font-weight: 400; font-style: normal;}
|
body {color: #000000; font-family: 'Arial'; font-size: 12pt; font-weight: 400; font-style: normal;}
|
||||||
p {text-align: left; line-height: 150%; margin-top: 0.00em; margin-bottom: 0.76em;}
|
p {text-align: left; line-height: 150%; margin-top: 0.00em; margin-bottom: 0.76em;}
|
||||||
@@ -17,6 +16,7 @@ h4 {margin-top: 1.53em; margin-bottom: 0.65em;}
|
|||||||
.title {font-size: 2.5em; margin-top: 1.85em; margin-bottom: 0.65em;}
|
.title {font-size: 2.5em; margin-top: 1.85em; margin-bottom: 0.65em;}
|
||||||
.sep {text-align: center; margin-top: 1.53em; margin-bottom: 1.53em;}
|
.sep {text-align: center; margin-top: 1.53em; margin-bottom: 1.53em;}
|
||||||
</style>
|
</style>
|
||||||
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<article>
|
<article>
|
||||||
<h1 class='title' style='text-align: center;'>Lorem Ipsum</h1>
|
<h1 class='title' style='text-align: center;'>Lorem Ipsum</h1>
|
||||||
|
|||||||
@@ -672,10 +672,10 @@ def testFmtToHtml_Save(mockGUI, fncPath):
|
|||||||
"<head>\n"
|
"<head>\n"
|
||||||
"<meta charset='utf-8'>\n"
|
"<meta charset='utf-8'>\n"
|
||||||
"<title></title>\n"
|
"<title></title>\n"
|
||||||
"</head>\n"
|
|
||||||
"<style>\n"
|
"<style>\n"
|
||||||
"{htmlStyle:s}\n"
|
"{htmlStyle:s}\n"
|
||||||
"</style>\n"
|
"</style>\n"
|
||||||
|
"</head>\n"
|
||||||
"<body>\n"
|
"<body>\n"
|
||||||
"<article>\n"
|
"<article>\n"
|
||||||
"{bodyText:s}\n"
|
"{bodyText:s}\n"
|
||||||
|
|||||||
Reference in New Issue
Block a user