Skip to content

Commit 239e2b7

Browse files
committed
Added WrapXHTMLTextWithCDATA() to all preprocessing of ONIX files.
1 parent 078b237 commit 239e2b7

4 files changed

Lines changed: 12 additions & 0 deletions

File tree

OnixData.Standard/Extensions/OnixParserExtensions.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,8 @@ public static void ReplaceIsoLatinEncodings(this FileInfo ParserFileInfo, bool P
559559

560560
AllFileText.ReplaceIsoLatinEncodings(ShouldReplaceTechEncodings);
561561

562+
AllFileText.WrapXHTMLTextWithCDATA();
563+
562564
var sAllFileText = AllFileText.ToString();
563565

564566
if (FilterBadEncodings)
@@ -794,6 +796,8 @@ public static void FilterTextThread(StringBuilder poParserFileBlock)
794796

795797
poParserFileBlock.ReplaceIsoLatinEncodings(true);
796798

799+
poParserFileBlock.WrapXHTMLTextWithCDATA();
800+
797801
string sCurrentBlock = poParserFileBlock.ToString();
798802

799803
//

OnixData.Standard/Extensions/OnixReplaceExtensions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ public static void ReplaceIsoLatinEncodings(this StringBuilder ParserFileContent
2323

2424
ReplaceIsoLatinEncodings(ParserFileContent);
2525

26+
ParserFileContent.WrapXHTMLTextWithCDATA();
27+
2628
// From the "iso-tech.ent" file
2729
if (ShouldReplaceTechEncodings)
2830
ReplaceTechEncodings(ParserFileContent);

OnixData/Extensions/OnixParserExtensions.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,8 @@ public static void ReplaceIsoLatinEncodings(this FileInfo ParserFileInfo, bool P
566566
{
567567
TempLineBuilder.ReplaceIsoLatinEncodings(ShouldReplaceTechEncodings);
568568

569+
TempLineBuilder.WrapXHTMLTextWithCDATA();
570+
569571
// NOTE: This section will remove any problematic control characters which are not allowed within XML
570572
string sFilteredContents =
571573
System.Text.RegularExpressions.Regex.Replace(TempLineBuilder.ToString(),
@@ -762,6 +764,8 @@ public static void FilterTextThread(StringBuilder poParserFileBlock)
762764

763765
poParserFileBlock.ReplaceIsoLatinEncodings(true);
764766

767+
poParserFileBlock.WrapXHTMLTextWithCDATA();
768+
765769
string sCurrentBlock = poParserFileBlock.ToString();
766770

767771
//

OnixData/Extensions/OnixReplaceExtensions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public static void ReplaceIsoLatinEncodings(this StringBuilder ParserFileContent
3636

3737
ReplaceIsoLatinEncodings(ParserFileContent);
3838

39+
ParserFileContent.WrapXHTMLTextWithCDATA();
40+
3941
// From the "iso-tech.ent" file
4042
if (ShouldReplaceTechEncodings)
4143
ReplaceTechEncodings(ParserFileContent);

0 commit comments

Comments
 (0)