[xiph-commits] r9540 - trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags

davidb at svn.xiph.org davidb at svn.xiph.org
Wed Jun 29 16:12:12 PDT 2005


Author: davidb
Date: 2005-06-29 16:12:08 -0700 (Wed, 29 Jun 2005)
New Revision: 9540

Modified:
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp
Log:
Change line endings from \n to \r\n for CMML docs.

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp	2005-06-29 22:57:49 UTC (rev 9539)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp	2005-06-29 23:12:08 UTC (rev 9540)
@@ -87,7 +87,7 @@
 
 	retStr += L">";
 	retStr += escapeEntities(mText);
-	retStr += L"</a>\n";
+	retStr += L"</a>\r\n";
 	
 	return retStr;
 }

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.cpp	2005-06-29 22:57:49 UTC (rev 9539)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLPreamble.cpp	2005-06-29 23:12:08 UTC (rev 9540)
@@ -85,10 +85,10 @@
 	retStr += mXmlEncoding;
 	retStr += L"\" standalone=\"";
 	retStr += mXmlStandAlone;
-	retStr += L"\"?>\n";
+	retStr += L"\"?>\r\n";
 	
 	//TO DO::: Make this more generalised properly
-	retStr += L"<!DOCTYPE cmml SYSTEM \"cmml.dtd\">\n";
+	retStr += L"<!DOCTYPE cmml SYSTEM \"cmml.dtd\">\r\n";
 
 	return retStr;
 

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp	2005-06-29 22:57:49 UTC (rev 9539)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp	2005-06-29 23:12:08 UTC (rev 9540)
@@ -109,13 +109,13 @@
 	retStr += makeAttribute(L"xmlns", L"http://www.annodex.net/cmml");
 
 	
-	retStr += L">\n";
+	retStr += L">\r\n";
 	if (mStream != NULL) {
 		retStr += mStream->toString();
 	}
 
 	retStr += mHead->toString();
 	retStr += mClipList->toString();
-	retStr += L"</cmml>\n";
+	retStr += L"</cmml>\r\n";
 	return retStr;
 }

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp	2005-06-29 22:57:49 UTC (rev 9539)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp	2005-06-29 23:12:08 UTC (rev 9540)
@@ -169,7 +169,7 @@
 		retStr += makeAttribute(L"end", mEnd);
 	}
 
-	retStr += L">\n";
+	retStr += L">\r\n";
 
 	if (mAnchor != NULL) {
 		retStr += mAnchor->toString();
@@ -182,6 +182,6 @@
 	}
 
 	retStr += mMetaList->toString();
-	retStr += L"</clip>\n\n";
+	retStr += L"</clip>\r\n\r\n";
 	return retStr;
 }

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp	2005-06-29 22:57:49 UTC (rev 9539)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp	2005-06-29 23:12:08 UTC (rev 9540)
@@ -56,7 +56,7 @@
 
 	retStr += L">";
 	retStr += escapeEntities(mText);
-	retStr += L"</desc>\n";
+	retStr += L"</desc>\r\n";
 	return retStr;
 }
 

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.cpp	2005-06-29 22:57:49 UTC (rev 9539)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HeadTag.cpp	2005-06-29 23:12:08 UTC (rev 9540)
@@ -121,7 +121,7 @@
 		retStr += escapeEntities(mProfile);
 		retStr += L"\"";
 	}
-	retStr+= L">\n";
+	retStr+= L">\r\n";
 	
 	if (mBase != NULL)  {
 		retStr += mBase->toString();
@@ -129,6 +129,6 @@
 
 	retStr += mTitle->toString();
 	retStr += mMetaList->toString();
-	retStr += L"</head>\n\n";
+	retStr += L"</head>\r\n\r\n";
 	return retStr;
 }

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp	2005-06-29 22:57:49 UTC (rev 9539)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp	2005-06-29 23:12:08 UTC (rev 9540)
@@ -91,7 +91,7 @@
 		retStr += makeAttribute(L"alt", mAlt);
 	}
 	
-	retStr += L"/>\n";
+	retStr += L"/>\r\n";
 
 	return retStr;
 

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp	2005-06-29 22:57:49 UTC (rev 9539)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp	2005-06-29 23:12:08 UTC (rev 9540)
@@ -151,11 +151,11 @@
 		retStr += makeAttribute(L"title", mTitle);
 	}
 
-	retStr += L">\n";
+	retStr += L">\r\n";
 
 	retStr += mParamList->toString();
 
-	retStr += L"</import>\n";
+	retStr += L"</import>\r\n";
 	return retStr;
 
 }

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp	2005-06-29 22:57:49 UTC (rev 9539)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp	2005-06-29 23:12:08 UTC (rev 9540)
@@ -87,7 +87,7 @@
 		retStr += makeAttribute(L"scheme", mScheme);
 	}
 
-	retStr += L"/>\n";
+	retStr += L"/>\r\n";
 
 
 	return retStr;

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp	2005-06-29 22:57:49 UTC (rev 9539)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp	2005-06-29 23:12:08 UTC (rev 9540)
@@ -52,7 +52,7 @@
 	retStr += makeLangElements();
 	retStr += makeAttribute(L"name", mName);
 	retStr += makeAttribute(L"value", mContent);
-	retStr += L"/>\n";
+	retStr += L"/>\r\n";
 	return retStr;
 
 }

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp	2005-06-29 22:57:49 UTC (rev 9539)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp	2005-06-29 23:12:08 UTC (rev 9540)
@@ -102,9 +102,9 @@
 	if (mUtc.size() != 0) {
 		retStr += makeAttribute(L"utc", mUtc);
 	}
-	retStr += L">\n";
+	retStr += L">\r\n";
 	retStr += mImportList->toString();
-	retStr += L"</stream>\n\n";
+	retStr += L"</stream>\r\n\r\n";
 
 	return retStr;
 }

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp	2005-06-29 22:57:49 UTC (rev 9539)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp	2005-06-29 23:12:08 UTC (rev 9540)
@@ -54,7 +54,7 @@
 	retStr += makeLangElements();
 	retStr += L">";
 	retStr += escapeEntities(mText);
-	retStr+= L"</title>\n";
+	retStr+= L"</title>\r\n";
 	return retStr;
 }
 void C_TitleTag::privateClone(C_CMMLTag* outTag) {



More information about the commits mailing list