clean up TeX and MathML converter

axkr · Nov 7, 2017 · f132506 · f132506
1 parent 9eadc83
commit f132506
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 32 deletions.
diff --git a/...eclipse-core/src/main/java/org/matheclipse/core/form/mathml/MathMLContentFormFactory.java b/...eclipse-core/src/main/java/org/matheclipse/core/form/mathml/MathMLContentFormFactory.java
@@ -3,7 +3,7 @@
 import java.text.NumberFormat;
 import java.util.HashMap;
 
-import org.hipparchus.fraction.BigFraction;
+//import org.hipparchus.fraction.BigFraction;
 import org.matheclipse.core.basic.Config;
 import org.matheclipse.core.convert.AST2Expr;
 import org.matheclipse.core.eval.EvalAttributes;
@@ -106,13 +106,13 @@ public void convertFraction(final StringBuilder buf, final IRational f, final in
 		tagEnd(buf, "cn");
 	}
 
-	public void convertFraction(final StringBuilder buf, final BigFraction f, final int precedence) {
-		tagStart(buf, "cn", "type=\"rational\"");
-		buf.append(String.valueOf(f.getNumerator().toString()));
-		tagStartEnd(buf, "sep");
-		buf.append(String.valueOf(f.getDenominator().toString()));
-		tagEnd(buf, "cn");
-	}
+//	public void convertFraction(final StringBuilder buf, final BigFraction f, final int precedence) {
+//		tagStart(buf, "cn", "type=\"rational\"");
+//		buf.append(String.valueOf(f.getNumerator().toString()));
+//		tagStartEnd(buf, "sep");
+//		buf.append(String.valueOf(f.getDenominator().toString()));
+//		tagEnd(buf, "cn");
+//	}
 
 	@Override
 	public void convertComplex(final StringBuilder buf, final IComplex c, final int precedence) {

diff --git a/..._library/matheclipse-core/src/main/java/org/matheclipse/core/form/tex/TeXFormFactory.java b/..._library/matheclipse-core/src/main/java/org/matheclipse/core/form/tex/TeXFormFactory.java
@@ -1,10 +1,9 @@
 package org.matheclipse.core.form.tex;
 
-import java.math.BigInteger;
 import java.text.NumberFormat;
 import java.util.HashMap;
 
-import org.hipparchus.fraction.BigFraction;
+//import org.hipparchus.fraction.BigFraction;
 import org.matheclipse.core.basic.Config;
 import org.matheclipse.core.convert.AST2Expr;
 import org.matheclipse.core.expression.F;
@@ -140,24 +139,24 @@ public void convertFraction(final StringBuilder buf, final IFraction f, final in
 		}
 	}
 
-	public void convertFraction(final StringBuilder buf, final BigFraction f, final int precedence) {
-		boolean negative = f.compareTo(BigFraction.ZERO) < 0;
-		if (negative && (precedence > plusPrec)) {
-			buf.append("\\left( ");
-		}
-		if (f.getDenominator().equals(BigInteger.ONE)) {
-			buf.append(f.getNumerator().toString());
-		} else {
-			buf.append("\\frac{");
-			buf.append(f.getNumerator().toString());
-			buf.append("}{");
-			buf.append(f.getDenominator().toString());
-			buf.append('}');
-		}
-		if (negative && (precedence > plusPrec)) {
-			buf.append("\\right) ");
-		}
-	}
+	// public void convertFraction(final StringBuilder buf, final BigFraction f, final int precedence) {
+	// boolean negative = f.compareTo(BigFraction.ZERO) < 0;
+	// if (negative && (precedence > plusPrec)) {
+	// buf.append("\\left( ");
+	// }
+	// if (f.getDenominator().equals(BigInteger.ONE)) {
+	// buf.append(f.getNumerator().toString());
+	// } else {
+	// buf.append("\\frac{");
+	// buf.append(f.getNumerator().toString());
+	// buf.append("}{");
+	// buf.append(f.getDenominator().toString());
+	// buf.append('}');
+	// }
+	// if (negative && (precedence > plusPrec)) {
+	// buf.append("\\right) ");
+	// }
+	// }
 
 	@Override
 	public void convertComplex(final StringBuilder buf, final IComplex c, final int precedence) {
@@ -304,10 +303,10 @@ public void convert(final StringBuilder buf, final Object o, final int precedenc
 			convertSymbol(buf, (ISymbol) o);
 			return;
 		}
-		if (o instanceof BigFraction) {
-			convertFraction(buf, (BigFraction) o, precedence);
-			return;
-		}
+		// if (o instanceof BigFraction) {
+		// convertFraction(buf, (BigFraction) o, precedence);
+		// return;
+		// }
 		convertString(buf, o.toString());
 	}