------------------------------------------------------------ revno: 57 committer: Jonathan Marsden <[email protected]> branch nick: main timestamp: Fri 2010-11-12 17:27:03 -0800 message: New upstream version 2.8_rc2 modified: CMakeLists.txt ChangeLog debian/changelog src/backend/keys/cswordkey.cpp src/backend/rendering/chtmlexportrendering.cpp
-- lp:~pkgcrosswire/bibletime/main https://code.launchpad.net/~pkgcrosswire/bibletime/main Your team Crosswire Packaging Team is subscribed to branch lp:~pkgcrosswire/bibletime/main. To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/bibletime/main/+edit-subscription
=== modified file 'CMakeLists.txt' --- CMakeLists.txt 2010-11-09 06:29:29 +0000 +++ CMakeLists.txt 2010-11-13 01:27:03 +0000 @@ -5,7 +5,7 @@ # BibleTime version SET(BT_VERSION_MAJOR "2") SET(BT_VERSION_MINOR "8") -SET(BT_VERSION_PATCH "0_RC1") +SET(BT_VERSION_PATCH "0_RC2") #SET(BT_VERSION_BUILD "") # Temporarily uncomment this line for release procedures # Determine build, if needed: === modified file 'ChangeLog' --- ChangeLog 2010-11-09 06:29:29 +0000 +++ ChangeLog 2010-11-13 01:27:03 +0000 @@ -1,3 +1,10 @@ +2011-11-12 Jaak Ristioja <[email protected]> + * Temporary workaround for bug 2954856 causing wrong HTML code for headings. + * Released 2.8 RC 2 + +2010-10-31 Gary Holmlund <[email protected]> + * Fix bug in display of footnotes in mag window + 2010-10-29 Jaak Ristioja <[email protected]> * Made the "Remove modules" confirmation dialog a bit prettier. * Released 2.8 RC 1 === modified file 'debian/changelog' --- debian/changelog 2010-11-10 06:34:14 +0000 +++ debian/changelog 2010-11-13 01:27:03 +0000 @@ -1,3 +1,9 @@ +bibletime (2.8~rc2-1) UNRELEASED; urgency=low + + * New upstream version 2.8_rc2 + + -- Jonathan Marsden <[email protected]> Fri, 12 Nov 2010 17:22:36 -0800 + bibletime (2.8~rc1-4) UNRELEASED; urgency=low * debian/control: Replace Build-Depends: libqt4-dev with libqtwebkit-dev | libqt3-dev . === modified file 'src/backend/keys/cswordkey.cpp' --- src/backend/keys/cswordkey.cpp 2010-11-09 06:29:29 +0000 +++ src/backend/keys/cswordkey.cpp 2010-11-13 01:27:03 +0000 @@ -83,8 +83,10 @@ //Q_ASSERT(!key().isNull()); if (!key().isNull()) { //we have valid text - if (mode == ProcessEntryAttributesOnly) return QString::null; - QString text = QString::fromUtf8( m_module->module()->RenderText(0, -1) ); + bool DoRender = mode != ProcessEntryAttributesOnly; + QString text = QString::fromUtf8( m_module->module()->RenderText(0,-1, DoRender)); + if (!DoRender) + return QString::null; // This is yucky, but if we want strong lexicon refs we have to do it here. if (m_module->type() == CSwordModuleInfo::Lexicon) { === modified file 'src/backend/rendering/chtmlexportrendering.cpp' --- src/backend/rendering/chtmlexportrendering.cpp 2010-11-09 06:29:29 +0000 +++ src/backend/rendering/chtmlexportrendering.cpp 2010-11-13 01:27:03 +0000 @@ -142,7 +142,16 @@ (*mod_Itr)->module()->getEntryAttributes()["Heading"]["Preverse"].end(); for (; it != end; ++it) { - preverseHeading = QString::fromUtf8(it->second.c_str()); + QString unfiltered = it->second.c_str(); + + /// \todo This is only a preliminary workaround to strip the tags: + QRegExp filter("<title>(.*)</title>"); + if (unfiltered.indexOf(filter) >= 0) { + preverseHeading = filter.cap(1); + } else { + preverseHeading = unfiltered; + } + /// \todo Take care of the heading type! if (!preverseHeading.isEmpty()) { entry.append("<div ")
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-crosswire-devel
