Use CharAtoms to render all text (#104)

ForNeVeR · Feb 3, 2018 · cefd15d · cefd15d
1 parent 83e4bea
commit cefd15d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/WpfMath.Tests/ParserTests.fs b/src/WpfMath.Tests/ParserTests.fs
@@ -185,6 +185,11 @@ let ``Delimiter with scripts should be parsed properly`` () =
     <| @"\left(2+2\right)_a^b"
     <| (formula <| scripts (fenced (openBrace "lbrack") ``2+2`` (closeBrace "rbrack")) (char 'a') (char 'b'))
 
+let ``\text doesn't create any SymbolAtoms``() =
+    assertParseResult
+    <| @"\text{2+2}"
+    <| (formula <| row [char '2'; char '+'; char '2'])
+
 [<Fact>]
 let ``\sqrt{} should throw a TexParseException``() =
     assertParseThrows<TexParseException> @"\sqrt{}"

diff --git a/src/WpfMath/TexFormulaParser.cs b/src/WpfMath/TexFormulaParser.cs
@@ -140,7 +140,7 @@ private static bool IsWhiteSpace(char ch)
             return ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r';
         }
 
-        private static bool ShouldSkipWhiteSpace(string style) => style != "text";
+        private static bool ShouldSkipWhiteSpace(string style) => style != TexUtilities.TextStyleName;
 
         public TexFormula Parse(string value, string textStyle = null)
         {
@@ -232,7 +232,7 @@ private TexFormula Parse(string value, ref int position, bool allowClosingDelimi
                         formula,
                         value,
                         ref position,
-                        ConvertCharacter(formula, value, ref position, ch),
+                        ConvertCharacter(formula, ref position, ch),
                         skipWhiteSpace);
                     formula.Add(scriptsAtom);
                 }
@@ -604,15 +604,15 @@ private Atom AttachScripts(TexFormula formula, string value, ref int position, A
             }
         }
 
-        private Atom ConvertCharacter(TexFormula formula, string value, ref int position, char character)
+        private Atom ConvertCharacter(TexFormula formula, ref int position, char character)
         {
             position++;
-            if (IsSymbol(character))
+            if (IsSymbol(character) && formula.TextStyle != TexUtilities.TextStyleName)
             {
                 // Character is symbol.
                 var symbolName = symbols.ElementAtOrDefault(character);
                 if (string.IsNullOrEmpty(symbolName))
-                    throw new TexParseException("Unknown character : '" + character.ToString() + "'");
+                    throw new TexParseException($"Unknown character : '{character}'");
 
                 try
                 {
@@ -626,9 +626,8 @@ private Atom ConvertCharacter(TexFormula formula, string value, ref int position
                             + (string)symbolName + "'!", e);
                 }
             }
-            else
+            else // Character is alpha-numeric or should be rendered as text.
             {
-                // Character is alpha-numeric.
                 return new CharAtom(character, formula.TextStyle);
             }
         }