Correctly handle default encoding.

joniles · Feb 8, 2017 · de42a30 · de42a30
1 parent 823ca9a
commit de42a30
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/RTF Parser Kit/src/com/rtfparserkit/parser/standard/ParserState.java b/RTF Parser Kit/src/com/rtfparserkit/parser/standard/ParserState.java
@@ -35,7 +35,7 @@ public ParserState(ParserState state)
  }
 
  public int currentFont;
- public String currentEncoding;
+ public String currentEncoding = Encoding.ANSI_ENCODING;
  public String currentFontEncoding;
  public int unicodeAlternateSkipCount = 1;
 }
diff --git a/RTF Parser Kit/test/com/rtfparserkit/parser/standard/StandardRtfParserTest.java b/RTF Parser Kit/test/com/rtfparserkit/parser/standard/StandardRtfParserTest.java
@@ -29,6 +29,12 @@ public void testEncodingParse() throws Exception
  TestUtilities.assertRtfParserDumpMatches(this, new StandardRtfParser(), "testEncodingParse");
  }
 
+ @Test
+ public void testDefaultEncodingParse() throws Exception
+ {
+ TestUtilities.assertRtfParserDumpMatches(this, new StandardRtfParser(), "testDefaultEncodingParse");
+ }
+
  @Test
  public void testStylesParse() throws Exception
  {

diff --git a/RTF Parser Kit/test/com/rtfparserkit/parser/standard/data/testDefaultEncodingParse.rtf b/RTF Parser Kit/test/com/rtfparserkit/parser/standard/data/testDefaultEncodingParse.rtf
diff --git a/RTF Parser Kit/test/com/rtfparserkit/parser/standard/data/testDefaultEncodingParse.xml b/RTF Parser Kit/test/com/rtfparserkit/parser/standard/data/testDefaultEncodingParse.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rtf>
+ <group>
+ <command name="rtf" parameter="1"/>
+ <chars>Test1</chars>
+ <command name="par"/>
+ </group>
+</rtf>