[sword-svn] r3766 - trunk/tests/testsuite
scribe at crosswire.org
scribe at crosswire.org
Sun Jul 26 09:10:57 EDT 2020
Author: scribe
Date: 2020-07-26 09:10:56 -0400 (Sun, 26 Jul 2020)
New Revision: 3766
Removed:
trunk/tests/testsuite/osis_mod2zmod.good
trunk/tests/testsuite/osis_osis2modcipher.good
Modified:
trunk/tests/testsuite/osisReference.xml
trunk/tests/testsuite/osis_basic.good
trunk/tests/testsuite/osis_basic.sh
trunk/tests/testsuite/osis_mod2zmod.sh
trunk/tests/testsuite/osis_osis2modcipher.sh
Log:
Added link test to osisReference.xml
Removed redundant osis_mod2zmod.good and osis_osis2modcipher.good, as they are identical to and copied from osis_basic.good
Modified: trunk/tests/testsuite/osisReference.xml
===================================================================
--- trunk/tests/testsuite/osisReference.xml 2020-07-26 10:31:09 UTC (rev 3765)
+++ trunk/tests/testsuite/osisReference.xml 2020-07-26 13:10:56 UTC (rev 3766)
@@ -192,6 +192,9 @@
<chapter sID="Acts.2" osisID="Acts.2"/>
<verse sID="Acts.2.19" osisID="Acts.2.19"/><l level="1">‘<hi type="small-caps"><w lemma="strong:G1325">And I will grant</w> <w lemma="strong:G5059">wonders</w> <w lemma="strong:G3772">in the sky</w> <w lemma="strong:G0507">above</w></hi></l><l level="1"> <hi type="small-caps"><w lemma="strong:G4592">And signs</w> <w lemma="strong:G1093">on the earth</w> <w lemma="strong:G2736">below</w></hi>,</l><l level="1"> <hi type="small-caps"><w lemma="strong:G0129">Blood</w>, <w lemma="strong:G4442">and fire</w>, <w lemma="strong:G0822">and vapor</w> <w lemma="strong:G2586">of smoke</w></hi>.</l><verse eID="Acts.2.19"/>
<verse sID="Acts.2.20" osisID="Acts.2.20"/><l level="1">‘<hi type="small-caps"><w lemma="strong:G2246">The sun</w> <w lemma="strong:G3344">will be turned</w> <w lemma="strong:G4655">into darkness</w></hi></l><l level="1"> <hi type="small-caps"><w lemma="strong:G4582">And the moon</w> <w lemma="strong:G0129">into blood</w></hi>,</l><l level="1"> <hi type="small-caps"><w lemma="strong:G4250">Before</w> <w lemma="strong:G3173">the great</w> <w lemma="strong:G2016">and glorious</w> <w lemma="strong:G2250">day</w> <w lemma="strong:G2962">of the Lord</w> <w lemma="strong:G2064">shall come</w></hi>.</l><verse eID="Acts.2.20"/>
+ <verse osisID="Acts.2.21 Acts.2.22"><w lemma="strong:G2532 lemma.TR:και" morph="robinson:CONJ" src="1">And</w> <w lemma="strong:G2071 lemma.TR:εσται" morph="robinson:V-FXI-3S" src="2">it shall come to pass</w>, <transChange type="added">that</transChange> <w lemma="strong:G3739 lemma.TR:ος" morph="robinson:R-NSM" src="4"/><w lemma="strong:G3956 lemma.TR:πας" morph="robinson:A-NSM" src="3"/><w lemma="strong:G302 lemma.TR:αν" morph="robinson:PRT" src="5">whosoever</w> <w lemma="strong:G1941 lemma.TR:επικαλεσηται" morph="robinson:V-AMS-3S" src="6">shall call on</w> <w lemma="strong:G3588 strong:G3686 lemma.TR:το lemma.TR:ονομα" morph="robinson:T-ASN robinson:N-ASN" src="7 8">the name</w> <w lemma="strong:G2962 lemma.TR:κυριου" morph="robinson:N-GSM" src="9">of the Lord</w> <w lemma="strong:G4982 lemma.TR:σωθησεται" morph="robinson:V-FPI-3S" src="10">shall be saved</w>.
+ (22) <w lemma="strong:G435 lemma.TR:ανδρες" morph="robinson:N-VPM" src="1">Ye men</w> <w lemma="strong:G2475 lemma.TR:ισραηλιται" morph="robinson:N-VPM" src="2">of Israel</w>, <w lemma="strong:G191 lemma.TR:ακουσατε" morph="robinson:V-AAM-2P" src="3">hear</w> <w lemma="strong:G5128 lemma.TR:τουτους" morph="robinson:D-APM" src="6">these</w> <w lemma="strong:G3588 strong:G3056 lemma.TR:τους lemma.TR:λογους" morph="robinson:T-APM robinson:N-APM" src="4 5">words</w>; <w lemma="strong:G2424 lemma.TR:ιησουν" morph="robinson:N-ASM" src="7">Jesus</w> <w lemma="strong:G3588 strong:G3480 lemma.TR:τον lemma.TR:ναζωραιον" morph="robinson:T-ASM robinson:N-ASM" src="8 9">of Nazareth</w>, <w lemma="strong:G435 lemma.TR:ανδρα" morph="robinson:N-ASM" src="10">a man</w> <w lemma="strong:G584 lemma.TR:αποδεδειγμενον" morph="robinson:V-RPP-ASM" src="14" type="x-split-2102">approved</w> <w lemma="strong:G575 lemma.TR:απο" morph="robinson:PREP" src="11">of</w> <w lemma="strong:G3588 strong:G2316 lemma.TR:του lemma.TR:θεου" morph="robinson:T-GSM robinson:N-GSM" src="12 13">God</w> <w lemma="strong:G1519 lemma.TR:εις" morph="robinson:PREP" src="15">among</w> <w lemma="strong:G5209 lemma.TR:υμας" morph="robinson:P-2AP" src="16">you</w> <w lemma="strong:G584 lemma.TR:αποδεδειγμενον" morph="robinson:V-RPP-ASM" src="14" type="x-split-2102">by</w> <w lemma="strong:G1411 lemma.TR:δυναμεσιν" morph="robinson:N-DPF" src="17">miracles</w> <w lemma="strong:G2532 lemma.TR:και" morph="robinson:CONJ" src="18">and</w> <w lemma="strong:G5059 lemma.TR:τερασιν" morph="robinson:N-DPN" src="19">wonders</w> <w lemma="strong:G2532 lemma.TR:και" morph="robinson:CONJ" src="20">and</w> <w lemma="strong:G4592 lemma.TR:σημειοις" morph="robinson:N-DPN" src="21">signs</w>, <w lemma="strong:G3739 lemma.TR:οις" morph="robinson:R-DPN" src="22">which</w> <w lemma="strong:G3588 strong:G2316 lemma.TR:ο lemma.TR:θεος" morph="robinson:T-NSM robinson:N-NSM" src="26 27">God</w> <w lemma="strong:G4160 lemma.TR:εποιησεν" morph="robinson:V-AAI-3S" src="23">did</w> <w lemma="strong:G1223 lemma.TR:δι" morph="robinson:PREP" src="24">by</w> <w lemma="strong:G846 lemma.TR:αυτου" morph="robinson:P-GSM" src="25">him</w> <w lemma="strong:G1722 lemma.TR:εν" morph="robinson:PREP" src="28">in</w> <w lemma="strong:G3319 lemma.TR:μεσω" morph="robinson:A-DSN" src="29">the midst</w> <w lemma="strong:G5216 lemma.TR:υμων" morph="robinson:P-2GP" src="30">of you</w>, <w lemma="strong:G2531 lemma.TR:καθως" morph="robinson:ADV" src="31">as</w> <w lemma="strong:G846 lemma.TR:αυτοι" morph="robinson:P-NPM" src="33">ye yourselves</w> <w lemma="strong:G2532 lemma.TR:και" morph="robinson:CONJ" src="32">also</w> <w lemma="strong:G1492 lemma.TR:οιδατε" morph="robinson:V-RAI-2P" src="34">know</w>:
+ </verse>
<chapter eID="Acts.2"/>
</div>
</osisText>
Modified: trunk/tests/testsuite/osis_basic.good
===================================================================
--- trunk/tests/testsuite/osis_basic.good 2020-07-26 10:31:09 UTC (rev 3765)
+++ trunk/tests/testsuite/osis_basic.good 2020-07-26 13:10:56 UTC (rev 3766)
@@ -1,4 +1,6 @@
+DEBUG(LINK): Acts.2.21
SUCCESS: ../../utilities/osis2mod: has finished its work and will now rest
+INFO(LINK): Linking Acts.2.22 to Acts.2.21
Key:
Psalms 3:1
-------
@@ -184,9 +186,13 @@
Acts 2:20: ‘* The sun will be turned into darkness *
* And the moon into blood *,
* Before the great and glorious day of the Lord shall come *.
-
+Acts 2:21: And it shall come to pass, that whosoever shall call on the name of the Lord shall be saved. (22) Ye men of Israel, hear these words; Jesus of Nazareth, a man approved of God among you by miracles and wonders and signs, which God did by him in the midst of you, as ye yourselves also know:
+Acts 2:22: And it shall come to pass, that whosoever shall call on the name of the Lord shall be saved. (22) Ye men of Israel, hear these words; Jesus of Nazareth, a man approved of God among you by miracles and wonders and signs, which God did by him in the midst of you, as ye yourselves also know:
+
-- RTF output
{\rtf1\ansi{\fonttbl{\f0\froman\fcharset0\fprq2 Times New Roman;}{\f1\fdecor\fprq2 Gentium;}{\f7\froman\fcharset2\fprq2 Symbol;}}Acts 2:19: {\f1 ‘{\i1 {And I will grant} {wonders} {in the sky} {above}}{\par} {\i1 {And signs} {on the earth} {below}},{\par} {\i1 {Blood}, {and fire}, {and vapor} {of smoke}}.{\par}}\par
-Acts 2:20: {\f1 ‘{\i1 {The sun} {will be turned} {into darkness}}{\par} {\i1 {And the moon} {into blood}},{\par} {\i1 {Before} {the great} {and glorious} {day} {of the Lord} {shall come}}.{\par} }\par
+Acts 2:20: {\f1 ‘{\i1 {The sun} {will be turned} {into darkness}}{\par} {\i1 {And the moon} {into blood}},{\par} {\i1 {Before} {the great} {and glorious} {day} {of the Lord} {shall come}}.{\par}}\par
+Acts 2:21: {\f1 {And} {it shall come to pass}, {\i1 that} {whosoever} {shall call on} {the name} {of the Lord} {shall be saved}. (22) {Ye men} {of Israel}, {hear} {these} {words}; {Jesus} {of Nazareth}, {a man} {approved} {of} {God} {among} {you} {by} {miracles} {and} {wonders} {and} {signs}, {which} {God} {did} {by} {him} {in} {the midst} {of you}, {as} {ye yourselves} {also} {know}: }\par
+Acts 2:22: {\f1 {And} {it shall come to pass}, {\i1 that} {whosoever} {shall call on} {the name} {of the Lord} {shall be saved}. (22) {Ye men} {of Israel}, {hear} {these} {words}; {Jesus} {of Nazareth}, {a man} {approved} {of} {God} {among} {you} {by} {miracles} {and} {wonders} {and} {signs}, {which} {God} {did} {by} {him} {in} {the midst} {of you}, {as} {ye yourselves} {also} {know}: }\par
}
Modified: trunk/tests/testsuite/osis_basic.sh
===================================================================
--- trunk/tests/testsuite/osis_basic.sh 2020-07-26 10:31:09 UTC (rev 3765)
+++ trunk/tests/testsuite/osis_basic.sh 2020-07-26 13:10:56 UTC (rev 3766)
@@ -29,7 +29,7 @@
echo
echo "-- Plain output"
-../../../../utilities/diatheke/diatheke -b OSISReference -f plain -k Acts 2:19-20 | grep -v OSISReference
+../../../../utilities/diatheke/diatheke -b OSISReference -f plain -k Acts 2:19-22 | grep -v OSISReference
echo
echo "-- RTF output"
-../../../../utilities/diatheke/diatheke -b OSISReference -f RTF -k Acts 2:19-20 | grep -v OSISReference
+../../../../utilities/diatheke/diatheke -b OSISReference -f RTF -k Acts 2:19-22 | grep -v OSISReference
Deleted: trunk/tests/testsuite/osis_mod2zmod.good
===================================================================
--- trunk/tests/testsuite/osis_mod2zmod.good 2020-07-26 10:31:09 UTC (rev 3765)
+++ trunk/tests/testsuite/osis_mod2zmod.good 2020-07-26 13:10:56 UTC (rev 3766)
@@ -1,192 +0,0 @@
-SUCCESS: ../../utilities/osis2mod: has finished its work and will now rest
-Key:
-Psalms 3:1
--------
-Preverse Header 0:
-Raw:
-<div sID="gen12" type="section"/> <title canonical="true" type="psalm">A Psalm of David<note n="A" osisID="Ps.3.xref.A" swordFootnote="1" type="crossReference"></note>, when he fled from Absalom his son.</title> <div sID="gen13" type="x-p"/> <lg sID="gen14"/>
--------
-Rendered Header:
- <h3 class="title psalm canonical">A Psalm of David<a class="noteMarker crossReference" href="passagestudy.jsp?action=showNote&type=x&value=1&module=zOSISReference&passage=Psalms+3%3A1"><small><sup class="x">*x</sup></small></a>, when he fled from Absalom his son.</h3>
-
-<br />
-
--------
-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.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; }
- .otPassage { 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; }
- .inscription {font-variant: small-caps; }
- .catchWord {font-style: bold; }
- .x-p-indent {text-indent: 1em; }
-
--------
-RenderText:
- <span class="line indent0"><span class=""><span class="divineName">Lord</span></span>, how are they increased that trouble me!</span><br />
-<span class="line indent0">many <span class="transChange transChange-added">are</span> they that rise up against me.</span><br />
-
--------
--------
-
-Key:
-Matthew 2:6
--------
-Preverse Header 0:
-Raw:
-<div></div>
--------
-Rendered Header:
-<div class=""></div>
--------
-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.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; }
- .otPassage { 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; }
- .inscription {font-variant: small-caps; }
- .catchWord {font-style: bold; }
- .x-p-indent {text-indent: 1em; }
-
--------
-RenderText:
-<span class="line indent0">‘<a class="noteMarker crossReference" href="passagestudy.jsp?action=showNote&type=x&value=1&module=zOSISReference&passage=Matthew+2%3A6"><small><sup class="x">*x</sup></small></a><span class="small-caps">And you, Bethlehem, land of Judah</span>, </span><br />
-<span class="line indent0"><span class="small-caps">Are by no means least among the leaders of Judah</span>; </span><br />
-<span class="line indent0"><span class="small-caps">For out of you shall come forth a Ruler</span> </span><br />
-<span class="line indent0"><span class="small-caps">Who will</span> <a class="noteMarker crossReference" href="passagestudy.jsp?action=showNote&type=x&value=2&module=zOSISReference&passage=Matthew+2%3A6"><small><sup class="x">*x</sup></small></a><span class="small-caps">shepherd My people Israel</span>.’” <br />
-
--------
--------
-
-Key:
-Mark 1:14
--------
-Preverse Header 0:
-Raw:
-<div sID="gen25" type="section"/> <title>The Beginning of the Ministry of Jesus</title> <title type="parallel">(<reference osisRef="Matt.4.12-Matt.4.22">Matt 4:12–22</reference>; <reference osisRef="Luke.4.14">Luke 4:14</reference>, <reference osisRef="Luke.4.15">15</reference>; <reference osisRef="Luke.5.1-Luke.5.11">5:1-11</reference>) </title> <div sID="gen26" type="x-p"/>
--------
-Rendered Header:
- <h3 class="title">The Beginning of the Ministry of Jesus</h3>
-
-<h3 class="title parallel">(<a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3>
-
-<br />
-
--------
-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.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; }
- .otPassage { 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; }
- .inscription {font-variant: small-caps; }
- .catchWord {font-style: bold; }
- .x-p-indent {text-indent: 1em; }
-
--------
-RenderText:
- Now after that John was put in prison, Jesus came into Galilee, preaching the gospel of the kingdom of God,
--------
--------
-
-
-Whitespace tests around headings:
-
-
- <h1 class="bookHeader">Old Testament</h1>
-
- <h1 class="bookHeader main">THE FIRST BOOK OF MOSES CALLED GENESIS</h1>
-
- <h1 class="bookHeader">Introduction and Outline</h1>
-
-<br />
-This is the <b>Book of Genesis</b>, the <i>first</i> book in the Bible. It may be outlined as follows: <br />
-<br />
-<ul>
- <li><sup>1</sup>Creation of Heaven and Earth, 1:1-2:4a</li>
- <li><sup>2</sup>Creation of Man and Woman, 2:4b-25</li>
- <li><sub>3</sub>Fall, 3:1-24</li>
- <li>...</li>
-</ul>
- <br />
-Tables work like this: <table><tbody>
- <tr> <td><b>Column 1 Label</b></td> <td><b>Column 2 Label</b></td> </tr>
- <tr> <td>Column 1, Row 1</td> <td>Column 2, Row 1</td> </tr>
- <tr> <td>Column 1, Row 2</td> <td>Column 2, Row 2</td> </tr>
- </tbody></table>
-<br />
-
- <h2 class="chapterHeader">From Creation to Abraham (1:1–11:9)</h2>
-
-
- <h3 class="title">Creation of the Heavens and the Earth</h3>
-
-<br />
-
-[ Genesis 1:1 ] In the beginning God created the heaven and the earth. <br />
-
-<br />
-
-[ Genesis 1:2 ] Text of verse 2.
-
--- Plain output
-Acts 2:19: ‘* And I will grant wonders in the sky above *
-* And signs on the earth below *,
-* Blood, and fire, and vapor of smoke *.
-
-Acts 2:20: ‘* The sun will be turned into darkness *
-* And the moon into blood *,
-* Before the great and glorious day of the Lord shall come *.
-
-
--- RTF output
-{\rtf1\ansi{\fonttbl{\f0\froman\fcharset0\fprq2 Times New Roman;}{\f1\fdecor\fprq2 Gentium;}{\f7\froman\fcharset2\fprq2 Symbol;}}Acts 2:19: {\f1 ‘{\i1 {And I will grant} {wonders} {in the sky} {above}}{\par} {\i1 {And signs} {on the earth} {below}},{\par} {\i1 {Blood}, {and fire}, {and vapor} {of smoke}}.{\par}}\par
-Acts 2:20: {\f1 ‘{\i1 {The sun} {will be turned} {into darkness}}{\par} {\i1 {And the moon} {into blood}},{\par} {\i1 {Before} {the great} {and glorious} {day} {of the Lord} {shall come}}.{\par} }\par
-}
Modified: trunk/tests/testsuite/osis_mod2zmod.sh
===================================================================
--- trunk/tests/testsuite/osis_mod2zmod.sh 2020-07-26 10:31:09 UTC (rev 3765)
+++ trunk/tests/testsuite/osis_mod2zmod.sh 2020-07-26 13:10:56 UTC (rev 3766)
@@ -54,7 +54,7 @@
echo
echo "-- Plain output"
-../../../../utilities/diatheke/diatheke -b zOSISReference -f plain -k Acts 2:19-20 | grep -v zOSISReference
+../../../../utilities/diatheke/diatheke -b zOSISReference -f plain -k Acts 2:19-22 | grep -v zOSISReference
echo
echo "-- RTF output"
-../../../../utilities/diatheke/diatheke -b zOSISReference -f RTF -k Acts 2:19-20 | grep -v zOSISReference
+../../../../utilities/diatheke/diatheke -b zOSISReference -f RTF -k Acts 2:19-22 | grep -v zOSISReference
Deleted: trunk/tests/testsuite/osis_osis2modcipher.good
===================================================================
--- trunk/tests/testsuite/osis_osis2modcipher.good 2020-07-26 10:31:09 UTC (rev 3765)
+++ trunk/tests/testsuite/osis_osis2modcipher.good 2020-07-26 13:10:56 UTC (rev 3766)
@@ -1,192 +0,0 @@
-SUCCESS: ../../utilities/osis2mod: has finished its work and will now rest
-Key:
-Psalms 3:1
--------
-Preverse Header 0:
-Raw:
-<div sID="gen12" type="section"/> <title canonical="true" type="psalm">A Psalm of David<note n="A" osisID="Ps.3.xref.A" swordFootnote="1" type="crossReference"></note>, when he fled from Absalom his son.</title> <div sID="gen13" type="x-p"/> <lg sID="gen14"/>
--------
-Rendered Header:
- <h3 class="title psalm canonical">A Psalm of David<a class="noteMarker crossReference" href="passagestudy.jsp?action=showNote&type=x&value=1&module=OSISReference&passage=Psalms+3%3A1"><small><sup class="x">*x</sup></small></a>, when he fled from Absalom his son.</h3>
-
-<br />
-
--------
-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.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; }
- .otPassage { 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; }
- .inscription {font-variant: small-caps; }
- .catchWord {font-style: bold; }
- .x-p-indent {text-indent: 1em; }
-
--------
-RenderText:
- <span class="line indent0"><span class=""><span class="divineName">Lord</span></span>, how are they increased that trouble me!</span><br />
-<span class="line indent0">many <span class="transChange transChange-added">are</span> they that rise up against me.</span><br />
-
--------
--------
-
-Key:
-Matthew 2:6
--------
-Preverse Header 0:
-Raw:
-<div></div>
--------
-Rendered Header:
-<div class=""></div>
--------
-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.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; }
- .otPassage { 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; }
- .inscription {font-variant: small-caps; }
- .catchWord {font-style: bold; }
- .x-p-indent {text-indent: 1em; }
-
--------
-RenderText:
-<span class="line indent0">‘<a class="noteMarker crossReference" href="passagestudy.jsp?action=showNote&type=x&value=1&module=OSISReference&passage=Matthew+2%3A6"><small><sup class="x">*x</sup></small></a><span class="small-caps">And you, Bethlehem, land of Judah</span>, </span><br />
-<span class="line indent0"><span class="small-caps">Are by no means least among the leaders of Judah</span>; </span><br />
-<span class="line indent0"><span class="small-caps">For out of you shall come forth a Ruler</span> </span><br />
-<span class="line indent0"><span class="small-caps">Who will</span> <a class="noteMarker crossReference" href="passagestudy.jsp?action=showNote&type=x&value=2&module=OSISReference&passage=Matthew+2%3A6"><small><sup class="x">*x</sup></small></a><span class="small-caps">shepherd My people Israel</span>.’” <br />
-
--------
--------
-
-Key:
-Mark 1:14
--------
-Preverse Header 0:
-Raw:
-<div sID="gen25" type="section"/> <title>The Beginning of the Ministry of Jesus</title> <title type="parallel">(<reference osisRef="Matt.4.12-Matt.4.22">Matt 4:12–22</reference>; <reference osisRef="Luke.4.14">Luke 4:14</reference>, <reference osisRef="Luke.4.15">15</reference>; <reference osisRef="Luke.5.1-Luke.5.11">5:1-11</reference>) </title> <div sID="gen26" type="x-p"/>
--------
-Rendered Header:
- <h3 class="title">The Beginning of the Ministry of Jesus</h3>
-
-<h3 class="title parallel">(<a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3>
-
-<br />
-
--------
-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.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; }
- .otPassage { 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; }
- .inscription {font-variant: small-caps; }
- .catchWord {font-style: bold; }
- .x-p-indent {text-indent: 1em; }
-
--------
-RenderText:
- Now after that John was put in prison, Jesus came into Galilee, preaching the gospel of the kingdom of God,
--------
--------
-
-
-Whitespace tests around headings:
-
-
- <h1 class="bookHeader">Old Testament</h1>
-
- <h1 class="bookHeader main">THE FIRST BOOK OF MOSES CALLED GENESIS</h1>
-
- <h1 class="bookHeader">Introduction and Outline</h1>
-
-<br />
-This is the <b>Book of Genesis</b>, the <i>first</i> book in the Bible. It may be outlined as follows: <br />
-<br />
-<ul>
- <li><sup>1</sup>Creation of Heaven and Earth, 1:1-2:4a</li>
- <li><sup>2</sup>Creation of Man and Woman, 2:4b-25</li>
- <li><sub>3</sub>Fall, 3:1-24</li>
- <li>...</li>
-</ul>
- <br />
-Tables work like this: <table><tbody>
- <tr> <td><b>Column 1 Label</b></td> <td><b>Column 2 Label</b></td> </tr>
- <tr> <td>Column 1, Row 1</td> <td>Column 2, Row 1</td> </tr>
- <tr> <td>Column 1, Row 2</td> <td>Column 2, Row 2</td> </tr>
- </tbody></table>
-<br />
-
- <h2 class="chapterHeader">From Creation to Abraham (1:1–11:9)</h2>
-
-
- <h3 class="title">Creation of the Heavens and the Earth</h3>
-
-<br />
-
-[ Genesis 1:1 ] In the beginning God created the heaven and the earth. <br />
-
-<br />
-
-[ Genesis 1:2 ] Text of verse 2.
-
--- Plain output
-Acts 2:19: ‘* And I will grant wonders in the sky above *
-* And signs on the earth below *,
-* Blood, and fire, and vapor of smoke *.
-
-Acts 2:20: ‘* The sun will be turned into darkness *
-* And the moon into blood *,
-* Before the great and glorious day of the Lord shall come *.
-
-
--- RTF output
-{\rtf1\ansi{\fonttbl{\f0\froman\fcharset0\fprq2 Times New Roman;}{\f1\fdecor\fprq2 Gentium;}{\f7\froman\fcharset2\fprq2 Symbol;}}Acts 2:19: {\f1 ‘{\i1 {And I will grant} {wonders} {in the sky} {above}}{\par} {\i1 {And signs} {on the earth} {below}},{\par} {\i1 {Blood}, {and fire}, {and vapor} {of smoke}}.{\par}}\par
-Acts 2:20: {\f1 ‘{\i1 {The sun} {will be turned} {into darkness}}{\par} {\i1 {And the moon} {into blood}},{\par} {\i1 {Before} {the great} {and glorious} {day} {of the Lord} {shall come}}.{\par} }\par
-}
Modified: trunk/tests/testsuite/osis_osis2modcipher.sh
===================================================================
--- trunk/tests/testsuite/osis_osis2modcipher.sh 2020-07-26 10:31:09 UTC (rev 3765)
+++ trunk/tests/testsuite/osis_osis2modcipher.sh 2020-07-26 13:10:56 UTC (rev 3766)
@@ -31,7 +31,7 @@
echo
echo "-- Plain output"
-../../../../utilities/diatheke/diatheke -b OSISReference -f plain -k Acts 2:19-20 | grep -v OSISReference
+../../../../utilities/diatheke/diatheke -b OSISReference -f plain -k Acts 2:19-22 | grep -v OSISReference
echo
echo "-- RTF output"
-../../../../utilities/diatheke/diatheke -b OSISReference -f RTF -k Acts 2:19-20 | grep -v OSISReference
+../../../../utilities/diatheke/diatheke -b OSISReference -f RTF -k Acts 2:19-22 | grep -v OSISReference
More information about the sword-cvs
mailing list