[sword-svn] r2923 - in trunk: . examples/cmdline include tests/testsuite
scribe at crosswire.org
scribe at crosswire.org
Sun Jul 28 13:05:37 MST 2013
Author: scribe
Date: 2013-07-28 13:05:37 -0700 (Sun, 28 Jul 2013)
New Revision: 2923
Modified:
trunk/configure.ac
trunk/examples/cmdline/threaded_search.cpp
trunk/include/swmodule.h
trunk/tests/testsuite/osis.good
trunk/usrinst.sh
Log:
Updated examples to remove deprecated methods.
updated tests to pass on osis test
fixed qt compile options
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2013-07-28 17:52:06 UTC (rev 2922)
+++ trunk/configure.ac 2013-07-28 20:05:37 UTC (rev 2923)
@@ -125,6 +125,7 @@
AM_CXXFLAGS="$AM_CXXFLAGS -DEXCLUDEZLIB"
fi
+
AS_IF([test "x$with_internalregex" = "xyes"],
[have_systemregex="no"],
[AC_SEARCH_LIBS(regexec, regex, [have_systemregex="yes"], [have_systemregex="no"])])
@@ -297,8 +298,10 @@
else
with_qt="no"
fi
-if test x$with_qt = xyes; then
-ACX_QT4
+
+if test x$with_qt = xyes; then
+ AM_CXXFLAGS="$AM_CXXFLAGS $QT4_CFLAGS"
+ LIBS="$LIBS $QT4_LIBS"
fi
Modified: trunk/examples/cmdline/threaded_search.cpp
===================================================================
--- trunk/examples/cmdline/threaded_search.cpp 2013-07-28 17:52:06 UTC (rev 2922)
+++ trunk/examples/cmdline/threaded_search.cpp 2013-07-28 20:05:37 UTC (rev 2923)
@@ -101,8 +101,8 @@
}
ListKey scopeList = VerseKey().parseVerseList("Luke;John;Revelation","", true);
- for (int i=0; i < scopeList.Count(); ++i) {
- std::cout << (const char*)*scopeList.GetElement(i) << std::endl;
+ for (int i=0; i < scopeList.getCount(); ++i) {
+ std::cout << (const char*)*scopeList.getElement(i) << std::endl;
}
SWKey* scope = &scopeList;
@@ -146,7 +146,7 @@
std::cout.flush();
};
- std::cout << std::endl << "Number of found items: " << searchThread->searchResult.Count() << std::endl;
+ std::cout << std::endl << "Number of found items: " << searchThread->searchResult.getCount() << std::endl;
std::cout << "Finished program" << std::endl;
std::cout.flush();
Modified: trunk/include/swmodule.h
===================================================================
--- trunk/include/swmodule.h 2013-07-28 17:52:06 UTC (rev 2922)
+++ trunk/include/swmodule.h 2013-07-28 20:05:37 UTC (rev 2923)
@@ -214,7 +214,6 @@
* @return Error status
*/
char setKey(const SWKey &ikey) { return setKey(&ikey); }
- char setKey(const char *keyText) { return setKey(keyText); }
/**
* @deprecated Use setKey() instead.
*/
Modified: trunk/tests/testsuite/osis.good
===================================================================
--- trunk/tests/testsuite/osis.good 2013-07-28 17:52:06 UTC (rev 2922)
+++ trunk/tests/testsuite/osis.good 2013-07-28 20:05:37 UTC (rev 2923)
@@ -7,13 +7,28 @@
<div sID="gen12" type="section"/> <title canonical="true" type="psalm">A Psalm of David, when he fled from Absalom his son.</title> <div sID="gen13" type="paragraph"/> <lg sID="gen14"/>
-------
Rendered Header:
-<div sID="gen12" type="section"/> <h3>A Psalm of David, when he fled from Absalom his son.</h3> <br /> <br />
+ <h3>A Psalm of David, when he fled from Absalom his son.</h3>
+
+<br />
+
-------
CSS:
- .divineName { font-variant: small-caps; } .wordsOfJesus { color: red; } .transChangeSupplied { font-style: italic; }
+ .divineName { font-variant: small-caps; }
+ .wordsOfJesus { color: red; }
+ .transChangeSupplied { font-style: italic; }
+ .small, .sub, .sup { font-size: .83em }
+ .sub { vertical-align: sub }
+ .sup { vertical-align: super }
+ .indent1 { margin-left: 10px }
+ .indent2 { margin-left: 20px }
+ .indent3 { margin-left: 30px }
+ .indent4 { margin-left: 40px }
+
-------
RenderText:
- <span class="divineName">Lord</span>, how are they increased that trouble me!<br /> many <span class="transChangeSupplied">are</span> they that rise up against me.<br />
+ <span class="line indent0"><span class="divineName">Lord</span>, how are they increased that trouble me!</span><br />
+<span class="line indent0">many <span class="transChangeSupplied">are</span> they that rise up against me.</span><br />
+
-------
-------
@@ -25,13 +40,67 @@
<div sID="gen22" 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="gen23" type="paragraph"/>
-------
Rendered Header:
-<div sID="gen22" type="section"/> <h3>The Beginning of the Ministry of Jesus</h3> <h3>(<a href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3> <br />
+ <h3>The Beginning of the Ministry of Jesus</h3>
+
+<h3>(<a href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a 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; } .transChangeSupplied { font-style: italic; }
+ .divineName { font-variant: small-caps; }
+ .wordsOfJesus { color: red; }
+ .transChangeSupplied { font-style: italic; }
+ .small, .sub, .sup { font-size: .83em }
+ .sub { vertical-align: sub }
+ .sup { vertical-align: super }
+ .indent1 { margin-left: 10px }
+ .indent2 { margin-left: 20px }
+ .indent3 { margin-left: 30px }
+ .indent4 { margin-left: 40px }
+
-------
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">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><span class="sup">1</span>Creation of Heaven and Earth, 1:1-2:4a</li>
+ <li><span class="sup">2</span>Creation of Man and Woman, 2:4b-25</li>
+ <li><span class="sub">3</span>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>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.
Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh 2013-07-28 17:52:06 UTC (rev 2922)
+++ trunk/usrinst.sh 2013-07-28 20:05:37 UTC (rev 2923)
@@ -38,6 +38,7 @@
#OPTIONS="--with-icusword $OPTIONS"
#OPTIONS="--without-clucene $OPTIONS"
#OPTIONS="--without-curl $OPTIONS"
+OPTIONS="--without-qt $OPTIONS"
#OPTIONS="--disable-tests $OPTIONS"
#OPTIONS="--disable-utilities $OPTIONS"
More information about the sword-cvs
mailing list