[sword-svn] r3545 - in trunk: src/modules/filters tests/testsuite
scribe at crosswire.org
scribe at crosswire.org
Sat Dec 9 16:28:35 MST 2017
Author: scribe
Date: 2017-12-09 16:28:34 -0700 (Sat, 09 Dec 2017)
New Revision: 3545
Modified:
trunk/src/modules/filters/osisxhtml.cpp
trunk/tests/testsuite/osis_basic.good
trunk/tests/testsuite/osis_mod2zmod.good
trunk/tests/testsuite/osis_osis2modcipher.good
Log:
Fixed CSS header bugs and inconsistencies in osisxhtml render filter
Modified: trunk/src/modules/filters/osisxhtml.cpp
===================================================================
--- trunk/src/modules/filters/osisxhtml.cpp 2017-12-06 03:36:42 UTC (rev 3544)
+++ trunk/src/modules/filters/osisxhtml.cpp 2017-12-09 23:28:34 UTC (rev 3545)
@@ -37,24 +37,25 @@
const static char *header = "\
.divineName { font-variant: small-caps; }\n\
.wordsOfJesus { color: red; }\n\
- .transChange { font-style: italic;}\n\
- .transChange.transChange-supplied { font-style: italic;}\n\
- .transChange.transChange-added { font-style: italic;}\n\
- .transChange.transChange-tenseChange::before { content: '*';}\n\
- .transChange:lang(zh) { font-style: normal; text-decoration : dotted underline;}\n\
- .overline { text-decoration: overline; }\n\
- .indent1 { margin-left: 10px }\n\
- .indent2 { margin-left: 20px }\n\
- .indent3 { margin-left: 30px }\n\
- .indent4 { margin-left: 40px }\n\
- abbr { &:hover{ &:before{ content: attr(title) } } }\n\
+ .transChange { font-style: italic; }\n\
+ .transChange.transChange-supplied { font-style: italic; }\n\
+ .transChange.transChange-added { font-style: italic; }\n\
+ .transChange.transChange-tenseChange::before { content: '*'; }\n\
+ .transChange.transChange-tenseChange { font-style: normal; }\n\
+ .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; }\n\
+ .overline { text-decoration: overline; }\n\
+ .indent1 { margin-left: 1em; }\n\
+ .indent2 { margin-left: 2em; }\n\
+ .indent3 { margin-left: 3em; }\n\
+ .indent4 { margin-left: 4em; }\n\
+ abbr { &:hover{ &:before{ content: attr(title); } } }\n\
.small-caps { font-variant: small-caps; }\n\
.selah { text-align: right; width: 50%; margin: 0; padding: 0; }\n\
.acrostic { text-align: center; }\n\
- .colophon {font-style: italic; font-size=small; display:block;}\n\
- .rdg { font-style: italic;}\n\
- .catchWord {font-style: bold;}\n\
- .x-p-indent {text-indent: 10px;}\n\
+ .colophon {font-style: italic; font-size: small; display: block; }\n\
+ .rdg { font-style: italic; }\n\
+ .catchWord {font-style: bold; }\n\
+ .x-p-indent {text-indent: 1em; }\n\
";
// Acrostic for things like the titles in Psalm 119
return header;
Modified: trunk/tests/testsuite/osis_basic.good
===================================================================
--- trunk/tests/testsuite/osis_basic.good 2017-12-06 03:36:42 UTC (rev 3544)
+++ trunk/tests/testsuite/osis_basic.good 2017-12-09 23:28:34 UTC (rev 3545)
@@ -15,24 +15,25 @@
CSS:
.divineName { font-variant: small-caps; }
.wordsOfJesus { color: red; }
- .transChange { font-style: italic;}
- .transChange.transChange-supplied { font-style: italic;}
- .transChange.transChange-added { font-style: italic;}
- .transChange.transChange-tenseChange::before { content: '*';}
- .transChange:lang(zh) { font-style: normal; text-decoration : dotted underline;}
- .overline { text-decoration: overline; }
- .indent1 { margin-left: 10px }
- .indent2 { margin-left: 20px }
- .indent3 { margin-left: 30px }
- .indent4 { margin-left: 40px }
- abbr { &:hover{ &:before{ content: attr(title) } } }
+ .transChange { font-style: italic; }
+ .transChange.transChange-supplied { font-style: italic; }
+ .transChange.transChange-added { font-style: italic; }
+ .transChange.transChange-tenseChange::before { content: '*'; }
+ .transChange.transChange-tenseChange { font-style: normal; }
+ .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; }
+ .overline { text-decoration: overline; }
+ .indent1 { margin-left: 1em; }
+ .indent2 { margin-left: 2em; }
+ .indent3 { margin-left: 3em; }
+ .indent4 { margin-left: 4em; }
+ abbr { &:hover{ &:before{ content: attr(title); } } }
.small-caps { font-variant: small-caps; }
.selah { text-align: right; width: 50%; margin: 0; padding: 0; }
.acrostic { text-align: center; }
- .colophon {font-style: italic; font-size=small; display:block;}
- .rdg { font-style: italic;}
- .catchWord {font-style: bold;}
- .x-p-indent {text-indent: 10px;}
+ .colophon {font-style: italic; font-size: small; display: block; }
+ .rdg { font-style: italic; }
+ .catchWord {font-style: bold; }
+ .x-p-indent {text-indent: 1em; }
-------
RenderText:
@@ -60,24 +61,25 @@
CSS:
.divineName { font-variant: small-caps; }
.wordsOfJesus { color: red; }
- .transChange { font-style: italic;}
- .transChange.transChange-supplied { font-style: italic;}
- .transChange.transChange-added { font-style: italic;}
- .transChange.transChange-tenseChange::before { content: '*';}
- .transChange:lang(zh) { font-style: normal; text-decoration : dotted underline;}
- .overline { text-decoration: overline; }
- .indent1 { margin-left: 10px }
- .indent2 { margin-left: 20px }
- .indent3 { margin-left: 30px }
- .indent4 { margin-left: 40px }
- abbr { &:hover{ &:before{ content: attr(title) } } }
+ .transChange { font-style: italic; }
+ .transChange.transChange-supplied { font-style: italic; }
+ .transChange.transChange-added { font-style: italic; }
+ .transChange.transChange-tenseChange::before { content: '*'; }
+ .transChange.transChange-tenseChange { font-style: normal; }
+ .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; }
+ .overline { text-decoration: overline; }
+ .indent1 { margin-left: 1em; }
+ .indent2 { margin-left: 2em; }
+ .indent3 { margin-left: 3em; }
+ .indent4 { margin-left: 4em; }
+ abbr { &:hover{ &:before{ content: attr(title); } } }
.small-caps { font-variant: small-caps; }
.selah { text-align: right; width: 50%; margin: 0; padding: 0; }
.acrostic { text-align: center; }
- .colophon {font-style: italic; font-size=small; display:block;}
- .rdg { font-style: italic;}
- .catchWord {font-style: bold;}
- .x-p-indent {text-indent: 10px;}
+ .colophon {font-style: italic; font-size: small; display: block; }
+ .rdg { font-style: italic; }
+ .catchWord {font-style: bold; }
+ .x-p-indent {text-indent: 1em; }
-------
RenderText:
Modified: trunk/tests/testsuite/osis_mod2zmod.good
===================================================================
--- trunk/tests/testsuite/osis_mod2zmod.good 2017-12-06 03:36:42 UTC (rev 3544)
+++ trunk/tests/testsuite/osis_mod2zmod.good 2017-12-09 23:28:34 UTC (rev 3545)
@@ -15,24 +15,25 @@
CSS:
.divineName { font-variant: small-caps; }
.wordsOfJesus { color: red; }
- .transChange { font-style: italic;}
- .transChange.transChange-supplied { font-style: italic;}
- .transChange.transChange-added { font-style: italic;}
- .transChange.transChange-tenseChange::before { content: '*';}
- .transChange:lang(zh) { font-style: normal; text-decoration : dotted underline;}
- .overline { text-decoration: overline; }
- .indent1 { margin-left: 10px }
- .indent2 { margin-left: 20px }
- .indent3 { margin-left: 30px }
- .indent4 { margin-left: 40px }
- abbr { &:hover{ &:before{ content: attr(title) } } }
+ .transChange { font-style: italic; }
+ .transChange.transChange-supplied { font-style: italic; }
+ .transChange.transChange-added { font-style: italic; }
+ .transChange.transChange-tenseChange::before { content: '*'; }
+ .transChange.transChange-tenseChange { font-style: normal; }
+ .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; }
+ .overline { text-decoration: overline; }
+ .indent1 { margin-left: 1em; }
+ .indent2 { margin-left: 2em; }
+ .indent3 { margin-left: 3em; }
+ .indent4 { margin-left: 4em; }
+ abbr { &:hover{ &:before{ content: attr(title); } } }
.small-caps { font-variant: small-caps; }
.selah { text-align: right; width: 50%; margin: 0; padding: 0; }
.acrostic { text-align: center; }
- .colophon {font-style: italic; font-size=small; display:block;}
- .rdg { font-style: italic;}
- .catchWord {font-style: bold;}
- .x-p-indent {text-indent: 10px;}
+ .colophon {font-style: italic; font-size: small; display: block; }
+ .rdg { font-style: italic; }
+ .catchWord {font-style: bold; }
+ .x-p-indent {text-indent: 1em; }
-------
RenderText:
@@ -60,24 +61,25 @@
CSS:
.divineName { font-variant: small-caps; }
.wordsOfJesus { color: red; }
- .transChange { font-style: italic;}
- .transChange.transChange-supplied { font-style: italic;}
- .transChange.transChange-added { font-style: italic;}
- .transChange.transChange-tenseChange::before { content: '*';}
- .transChange:lang(zh) { font-style: normal; text-decoration : dotted underline;}
- .overline { text-decoration: overline; }
- .indent1 { margin-left: 10px }
- .indent2 { margin-left: 20px }
- .indent3 { margin-left: 30px }
- .indent4 { margin-left: 40px }
- abbr { &:hover{ &:before{ content: attr(title) } } }
+ .transChange { font-style: italic; }
+ .transChange.transChange-supplied { font-style: italic; }
+ .transChange.transChange-added { font-style: italic; }
+ .transChange.transChange-tenseChange::before { content: '*'; }
+ .transChange.transChange-tenseChange { font-style: normal; }
+ .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; }
+ .overline { text-decoration: overline; }
+ .indent1 { margin-left: 1em; }
+ .indent2 { margin-left: 2em; }
+ .indent3 { margin-left: 3em; }
+ .indent4 { margin-left: 4em; }
+ abbr { &:hover{ &:before{ content: attr(title); } } }
.small-caps { font-variant: small-caps; }
.selah { text-align: right; width: 50%; margin: 0; padding: 0; }
.acrostic { text-align: center; }
- .colophon {font-style: italic; font-size=small; display:block;}
- .rdg { font-style: italic;}
- .catchWord {font-style: bold;}
- .x-p-indent {text-indent: 10px;}
+ .colophon {font-style: italic; font-size: small; display: block; }
+ .rdg { font-style: italic; }
+ .catchWord {font-style: bold; }
+ .x-p-indent {text-indent: 1em; }
-------
RenderText:
Modified: trunk/tests/testsuite/osis_osis2modcipher.good
===================================================================
--- trunk/tests/testsuite/osis_osis2modcipher.good 2017-12-06 03:36:42 UTC (rev 3544)
+++ trunk/tests/testsuite/osis_osis2modcipher.good 2017-12-09 23:28:34 UTC (rev 3545)
@@ -15,24 +15,25 @@
CSS:
.divineName { font-variant: small-caps; }
.wordsOfJesus { color: red; }
- .transChange { font-style: italic;}
- .transChange.transChange-supplied { font-style: italic;}
- .transChange.transChange-added { font-style: italic;}
- .transChange.transChange-tenseChange::before { content: '*';}
- .transChange:lang(zh) { font-style: normal; text-decoration : dotted underline;}
- .overline { text-decoration: overline; }
- .indent1 { margin-left: 10px }
- .indent2 { margin-left: 20px }
- .indent3 { margin-left: 30px }
- .indent4 { margin-left: 40px }
- abbr { &:hover{ &:before{ content: attr(title) } } }
+ .transChange { font-style: italic; }
+ .transChange.transChange-supplied { font-style: italic; }
+ .transChange.transChange-added { font-style: italic; }
+ .transChange.transChange-tenseChange::before { content: '*'; }
+ .transChange.transChange-tenseChange { font-style: normal; }
+ .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; }
+ .overline { text-decoration: overline; }
+ .indent1 { margin-left: 1em; }
+ .indent2 { margin-left: 2em; }
+ .indent3 { margin-left: 3em; }
+ .indent4 { margin-left: 4em; }
+ abbr { &:hover{ &:before{ content: attr(title); } } }
.small-caps { font-variant: small-caps; }
.selah { text-align: right; width: 50%; margin: 0; padding: 0; }
.acrostic { text-align: center; }
- .colophon {font-style: italic; font-size=small; display:block;}
- .rdg { font-style: italic;}
- .catchWord {font-style: bold;}
- .x-p-indent {text-indent: 10px;}
+ .colophon {font-style: italic; font-size: small; display: block; }
+ .rdg { font-style: italic; }
+ .catchWord {font-style: bold; }
+ .x-p-indent {text-indent: 1em; }
-------
RenderText:
@@ -60,24 +61,25 @@
CSS:
.divineName { font-variant: small-caps; }
.wordsOfJesus { color: red; }
- .transChange { font-style: italic;}
- .transChange.transChange-supplied { font-style: italic;}
- .transChange.transChange-added { font-style: italic;}
- .transChange.transChange-tenseChange::before { content: '*';}
- .transChange:lang(zh) { font-style: normal; text-decoration : dotted underline;}
- .overline { text-decoration: overline; }
- .indent1 { margin-left: 10px }
- .indent2 { margin-left: 20px }
- .indent3 { margin-left: 30px }
- .indent4 { margin-left: 40px }
- abbr { &:hover{ &:before{ content: attr(title) } } }
+ .transChange { font-style: italic; }
+ .transChange.transChange-supplied { font-style: italic; }
+ .transChange.transChange-added { font-style: italic; }
+ .transChange.transChange-tenseChange::before { content: '*'; }
+ .transChange.transChange-tenseChange { font-style: normal; }
+ .transChange:lang(zh) { font-style: normal; text-decoration: dotted underline; }
+ .overline { text-decoration: overline; }
+ .indent1 { margin-left: 1em; }
+ .indent2 { margin-left: 2em; }
+ .indent3 { margin-left: 3em; }
+ .indent4 { margin-left: 4em; }
+ abbr { &:hover{ &:before{ content: attr(title); } } }
.small-caps { font-variant: small-caps; }
.selah { text-align: right; width: 50%; margin: 0; padding: 0; }
.acrostic { text-align: center; }
- .colophon {font-style: italic; font-size=small; display:block;}
- .rdg { font-style: italic;}
- .catchWord {font-style: bold;}
- .x-p-indent {text-indent: 10px;}
+ .colophon {font-style: italic; font-size: small; display: block; }
+ .rdg { font-style: italic; }
+ .catchWord {font-style: bold; }
+ .x-p-indent {text-indent: 1em; }
-------
RenderText:
More information about the sword-cvs
mailing list