[sword-svn] r3364 - trunk/utilities/diatheke

Sun Mar 22 19:10:22 MST 2015

Author: refdoc
Date: 2015-03-22 19:10:22 -0700 (Sun, 22 Mar 2015)
New Revision: 3364

Modified:
   trunk/utilities/diatheke/corediatheke.cpp
Log:
added CSS engine output to xhtml header


Modified: trunk/utilities/diatheke/corediatheke.cpp
===================================================================

--- trunk/utilities/diatheke/corediatheke.cpp	2015-03-23 01:35:30 UTC (rev 3363)
+++ trunk/utilities/diatheke/corediatheke.cpp	2015-03-23 02:10:22 UTC (rev 3364)
@@ -254,10 +254,8 @@
 	manager.setGlobalOption("Transliterated Forms", (optionfilters & OP_XLIT) ? "On": "Off");
 	manager.setGlobalOption("Enumerations", (optionfilters & OP_ENUM) ? "On": "Off");
 	manager.setGlobalOption("Morpheme Segmentation", (optionfilters & OP_MORPHSEG) ? "On": "Off");
-	manager.setGlobalOption("Introductions", (optionfilters & OP_INTROS) ? "On": "Off");
 
-	manager.setGlobalOption("Transliteration", (optionfilters & OP_TRANSLITERATOR && script) ? script : "Off");
-	
+	manager.setGlobalOption("Transliteration", (optionfilters & OP_TRANSLITERATOR && script) ? script : "Off");	
 
 	if ((optionfilters & OP_VARIANTS) && variants) {
 		if (variants == -1)
@@ -269,6 +267,8 @@
 		manager.setGlobalOption("Textual Variants", "Primary Reading");
 
 
+
+
 	if (querytype == QT_SEARCH) {
 
 	        //this test is just to determine if we've got SWKeys or VerseKeys
@@ -354,9 +354,10 @@
 		}
 		else if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML) {
 			*output << "<html><head><meta http-equiv=\"content-type\" content=\"text/html\" charset=\"UTF-8\""
-				   " lang=\"" << locale << "\" xml:lang=\"" << locale << "\"/>"
-				   "<link href=\"style.css\" rel=\"stylesheet\" type=\"text/css\"></head><body>";
-				   
+				   " lang=\"" << locale << "\" xml:lang=\"" << locale << "\"/>";
+			*output << "<style type=\"text/css\">";
+			*output << target->getRenderHeader();
+			*output << "</style></head><body>";				   
 		}
 		else if (outputformat == FMT_LATEX) {
 			*output << "\\documentclass{bibletext}\n"
@@ -504,14 +505,15 @@
 
 		else if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML) {
 			*output << "<html><head><meta http-equiv=\"content-type\" content=\"text/html\" charset=\"UTF-8\""
-				   " lang=\"" <<  locale << "\" xml:lang=\"" <<   locale << "\"/>\n"
-				   "<link href=\"style.css\" rel=\"stylesheet\" type=\"text/css\"></head><body>";
-				   
+				   " lang=\"" <<  locale << "\" xml:lang=\"" <<   locale << "\"/>\n";
+			*output << "<style type=\"text/css\">";
+			*output << target->getRenderHeader();
+			*output << "</style></head><body>";				   
+						   
 		}
 
 		for (i = 0; i < listkey.getCount() && maxverses; i++) {
 			VerseKey *element = SWDYNAMIC_CAST(VerseKey, listkey.getElement(i));
-			element->setIntros(true);			
 			
 			if (element && element->isBoundSet()) {
 			  target->setKey(element->getLowerBound());


