Index: gbfhtml.cpp
===================================================================
--- gbfhtml.cpp	(revision 2746)
+++ gbfhtml.cpp	(working copy)
@@ -54,7 +54,7 @@
 	addTokenSubstitute("Pp", "</cite>");
 	addTokenSubstitute("Fn", "</font>"); //  font  end
 	addTokenSubstitute("CL", "<br />"); //  new line
-	addTokenSubstitute("CM", "<!P><br />"); //  paragraph <!P> is a non showing comment that can be changed in the front end to <P> if desired
+	addTokenSubstitute("CM", "<!--p--><br />"); //  paragraph <!--p--> is a non showing comment that can be changed in the front end to <p> if desired
 	addTokenSubstitute("CG", ""); //  ???
 	addTokenSubstitute("CT", ""); // ???
 	addTokenSubstitute("JR", "<div align=\"right\">"); // right align begin
Index: gbfhtmlhref.cpp
===================================================================
--- gbfhtmlhref.cpp	(revision 2746)
+++ gbfhtmlhref.cpp	(working copy)
@@ -67,7 +67,7 @@
 	addTokenSubstitute("Pp", "</cite>");
 	addTokenSubstitute("Fn", "</font>"); //  font  end
 	addTokenSubstitute("CL", "<br />"); //  new line
-	addTokenSubstitute("CM", "<!P><br />"); //  paragraph <!P> is a non showing comment that can be changed in the front end to <P> if desired
+	addTokenSubstitute("CM", "<!--p--><br />"); //  paragraph <!--p--> is a non showing comment that can be changed in the front end to <p> if desired
 	addTokenSubstitute("CG", ""); //  ???
 	addTokenSubstitute("CT", ""); // ???
 	addTokenSubstitute("JR", "<div align=\"right\">"); // right align begin
Index: gbfxhtml.cpp
===================================================================
--- gbfxhtml.cpp	(revision 2746)
+++ gbfxhtml.cpp	(working copy)
@@ -73,7 +73,7 @@
 	addTokenSubstitute("Pp", "</cite>");
 	addTokenSubstitute("Fn", "</font>"); //  font  end
 	addTokenSubstitute("CL", "<br />"); //  new line
-	addTokenSubstitute("CM", "<!P><br />"); //  paragraph <!P> is a non showing comment that can be changed in the front end to <P> if desired
+	addTokenSubstitute("CM", "<!--p--><br />"); //  paragraph <!--p--> is a non showing comment that can be changed in the front end to <p> if desired
 	addTokenSubstitute("CG", ""); //  ???
 	addTokenSubstitute("CT", ""); // ???
 	addTokenSubstitute("JR", "<div align=\"right\">"); // right align begin
Index: osishtmlhref.cpp
===================================================================
--- osishtmlhref.cpp	(revision 2746)
+++ osishtmlhref.cpp	(working copy)
@@ -275,14 +275,14 @@
 		// <p> paragraph and <lg> linegroup tags
 		else if (!strcmp(tag.getName(), "p") || !strcmp(tag.getName(), "lg")) {
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
-				outText("<!P><br />", buf, u);
+				outText("<!--p--><br />", buf, u);
 			}
 			else if (tag.isEndTag()) {	// end tag
-				outText("<!/P><br />", buf, u);
+				outText("<!--/p--><br />", buf, u);
 				userData->supressAdjacentWhitespace = true;
 			}
 			else {					// empty paragraph break marker
-				outText("<!P><br />", buf, u);
+				outText("<!--p--><br />", buf, u);
 				userData->supressAdjacentWhitespace = true;
 			}
 		}
@@ -293,11 +293,11 @@
 		else if (tag.isEmpty() && !strcmp(tag.getName(), "div") && tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "paragraph")) {
 			// <div type="paragraph"  sID... />
 			if (tag.getAttribute("sID")) {	// non-empty start tag
-				outText("<!P><br />", buf, u);
+				outText("<!--p--><br />", buf, u);
 			}
 			// <div type="paragraph"  eID... />
 			else if (tag.getAttribute("eID")) {
-				outText("<!/P><br />", buf, u);
+				outText("<!--/p--><br />", buf, u);
 				userData->supressAdjacentWhitespace = true;
 			}
 		}
Index: osisxhtml.cpp
===================================================================
--- osisxhtml.cpp	(revision 2746)
+++ osisxhtml.cpp	(working copy)
@@ -300,14 +300,14 @@
 		// <p> paragraph and <lg> linegroup tags
 		else if (!strcmp(tag.getName(), "p") || !strcmp(tag.getName(), "lg")) {
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
-				outText("<!P><br />", buf, u);
+				outText("<!--p--><br />", buf, u);
 			}
 			else if (tag.isEndTag()) {	// end tag
-				outText("<!/P><br />", buf, u);
+				outText("<!--/p--><br />", buf, u);
 				userData->supressAdjacentWhitespace = true;
 			}
 			else {					// empty paragraph break marker
-				outText("<!P><br />", buf, u);
+				outText("<!--p--><br />", buf, u);
 				userData->supressAdjacentWhitespace = true;
 			}
 		}
@@ -318,11 +318,11 @@
 		else if (tag.isEmpty() && !strcmp(tag.getName(), "div") && tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "paragraph")) {
 			// <div type="paragraph"  sID... />
 			if (tag.getAttribute("sID")) {	// non-empty start tag
-				outText("<!P><br />", buf, u);
+				outText("<!--p--><br />", buf, u);
 			}
 			// <div type="paragraph"  eID... />
 			else if (tag.getAttribute("eID")) {
-				outText("<!/P><br />", buf, u);
+				outText("<!--/p--><br />", buf, u);
 				userData->supressAdjacentWhitespace = true;
 			}
 		}
Index: teihtmlhref.cpp
===================================================================
--- teihtmlhref.cpp	(revision 2746)
+++ teihtmlhref.cpp	(working copy)
@@ -69,14 +69,14 @@
 
 		if (!strcmp(tag.getName(), "p")) {
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
-				buf += "<!P><br />";
+				buf += "<!--p--><br />";
 			}
 			else if (tag.isEndTag()) {	// end tag
-				buf += "<!/P><br />";
+				buf += "<!--/p--><br />";
 				//userData->supressAdjacentWhitespace = true;
 			}
 			else {					// empty paragraph break marker
-				buf += "<!P><br />";
+				buf += "<!--p--><br />";
 				//userData->supressAdjacentWhitespace = true;
 			}
 		}
@@ -138,7 +138,7 @@
 		else if (!strcmp(tag.getName(), "div")) {
 
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				buf += "<!P>";
+				buf += "<!--p-->";
 			}
 			else if (tag.isEndTag()) {
 			}
Index: teixhtml.cpp
===================================================================
--- teixhtml.cpp	(revision 2746)
+++ teixhtml.cpp	(working copy)
@@ -69,14 +69,14 @@
 
 		if (!strcmp(tag.getName(), "p")) {
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
-				buf += "<!P><br />";
+				buf += "<!--p--><br />";
 			}
 			else if (tag.isEndTag()) {	// end tag
-				buf += "<!/P><br />";
+				buf += "<!--/p--><br />";
 				//userData->supressAdjacentWhitespace = true;
 			}
 			else {					// empty paragraph break marker
-				buf += "<!P><br />";
+				buf += "<!--p--><br />";
 				//userData->supressAdjacentWhitespace = true;
 			}
 		}
@@ -138,7 +138,7 @@
 		else if (!strcmp(tag.getName(), "div")) {
 
 			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				buf += "<!P>";
+				buf += "<!--p-->";
 			}
 			else if (tag.isEndTag()) {
 			}