[sword-svn] r3463 - in trunk: src/modules/filters tests/testsuite

[refdoc at crosswire.org]

Author: refdoc
Date: 2017-05-17 14:21:16 -0700 (Wed, 17 May 2017)
New Revision: 3463

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:
This closes [API153] - request for support for x-p-indent milestones. We are
now filtering all types of milestones through as span with CSS class for
OSIS type attributes unless specific handling is required. This allows
frontends to handle such tags as they wish. 



Modified: trunk/src/modules/filters/osisxhtml.cpp
===================================================================
--- trunk/src/modules/filters/osisxhtml.cpp	2017-05-17 19:07:42 UTC (rev 3462)
+++ trunk/src/modules/filters/osisxhtml.cpp	2017-05-17 21:21:16 UTC (rev 3463)
@@ -54,6 +54,7 @@
 		.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\
 	";
 	// Acrostic for things like the titles in Psalm 119
 	return header;
@@ -507,6 +508,15 @@
 				else if (u->osisQToTick)
 					outText((level % 2) ? '\"' : '\'', buf, u);
 			}
+			else if (!strcmp(type, "x-importer")) {
+				//drop tag as not relevant
+			} 
+			
+			
+			else {
+				SWBuf type = tag.getAttribute("type");
+				outText(SWBuf("<span class=\"") + type + "\"/>", buf,u);
+			}
 		}
 
 		// <title>

Modified: trunk/tests/testsuite/osis_basic.good
===================================================================
--- trunk/tests/testsuite/osis_basic.good	2017-05-17 19:07:42 UTC (rev 3462)
+++ trunk/tests/testsuite/osis_basic.good	2017-05-17 21:21:16 UTC (rev 3463)
@@ -32,6 +32,7 @@
 		.colophon {font-style: italic; font-size=small; display:block;}
 		.rdg { font-style: italic;}
 		.catchWord {font-style: bold;}
+		.x-p-indent {text-indent: 10px;}
 	
 -------
 RenderText:
@@ -76,6 +77,7 @@
 		.colophon {font-style: italic; font-size=small; display:block;}
 		.rdg { font-style: italic;}
 		.catchWord {font-style: bold;}
+		.x-p-indent {text-indent: 10px;}
 	
 -------
 RenderText:

Modified: trunk/tests/testsuite/osis_mod2zmod.good
===================================================================
--- trunk/tests/testsuite/osis_mod2zmod.good	2017-05-17 19:07:42 UTC (rev 3462)
+++ trunk/tests/testsuite/osis_mod2zmod.good	2017-05-17 21:21:16 UTC (rev 3463)
@@ -32,6 +32,7 @@
 		.colophon {font-style: italic; font-size=small; display:block;}
 		.rdg { font-style: italic;}
 		.catchWord {font-style: bold;}
+		.x-p-indent {text-indent: 10px;}
 	
 -------
 RenderText:
@@ -76,6 +77,7 @@
 		.colophon {font-style: italic; font-size=small; display:block;}
 		.rdg { font-style: italic;}
 		.catchWord {font-style: bold;}
+		.x-p-indent {text-indent: 10px;}
 	
 -------
 RenderText:

Modified: trunk/tests/testsuite/osis_osis2modcipher.good
===================================================================
--- trunk/tests/testsuite/osis_osis2modcipher.good	2017-05-17 19:07:42 UTC (rev 3462)
+++ trunk/tests/testsuite/osis_osis2modcipher.good	2017-05-17 21:21:16 UTC (rev 3463)
@@ -32,6 +32,7 @@
 		.colophon {font-style: italic; font-size=small; display:block;}
 		.rdg { font-style: italic;}
 		.catchWord {font-style: bold;}
+		.x-p-indent {text-indent: 10px;}
 	
 -------
 RenderText:
@@ -76,6 +77,7 @@
 		.colophon {font-style: italic; font-size=small; display:block;}
 		.rdg { font-style: italic;}
 		.catchWord {font-style: bold;}
+		.x-p-indent {text-indent: 10px;}
 	
 -------
 RenderText: