Basic form of TeXForm.

corywalker · Oct 14, 2018 · ecd591b · ecd591b
1 parent f4e7c37
commit ecd591b
Show file tree

Hide file tree

Showing 7 changed files with 126 additions and 97 deletions.
diff --git a/expreduce/builtin_string.go b/expreduce/builtin_string.go
@@ -15,7 +15,7 @@ func GetStringDefinitions() (defs []Definition) {
 			}
 
 			// Do not implement FullForm here. It is not officially supported
-			if formAsSymbol.Name != "System`InputForm" && formAsSymbol.Name != "System`OutputForm" && formAsSymbol.Name != "System`FullForm" {
+			if formAsSymbol.Name != "System`InputForm" && formAsSymbol.Name != "System`OutputForm" && formAsSymbol.Name != "System`FullForm" && formAsSymbol.Name != "System`TeXForm" {
 				return this
 			}
 

diff --git a/expreduce/builtin_trig.go b/expreduce/builtin_trig.go
@@ -24,22 +24,27 @@ func GetTrigDefinitions() (defs []Definition) {
 	defs = append(defs, Definition{
 		Name:         "Sin",
 		legacyEvalFn: mathFnOneParam(math.Sin),
+		toString: simpleTeXToString("sin"),
 	})
 	defs = append(defs, Definition{
 		Name:         "Cos",
 		legacyEvalFn: mathFnOneParam(math.Cos),
+		toString: simpleTeXToString("cos"),
 	})
 	defs = append(defs, Definition{
 		Name:         "Tan",
 		legacyEvalFn: mathFnOneParam(math.Tan),
+		toString: simpleTeXToString("tan"),
 	})
 	defs = append(defs, Definition{
 		Name:         "ArcTan",
 		legacyEvalFn: mathFnOneParam(math.Atan),
+		toString: simpleTeXToString("tan^{-1}"),
 	})
 	defs = append(defs, Definition{
 		Name:         "Cot",
 		legacyEvalFn: mathFnOneParam(func(x float64) float64 {return 1/math.Tan(x)}),
+		toString: simpleTeXToString("cot"),
 	})
 	defs = append(defs, Definition{
 		Name:         "TrigExpand",

diff --git a/expreduce/evalstate.go b/expreduce/evalstate.go
@@ -89,6 +89,7 @@ func (es *EvalState) Init(loadAllDefs bool) {
 		es.MarkSeen("System`False")
 
 		es.MarkSeen("System`InputForm")
+		es.MarkSeen("System`TeXForm")
 		es.MarkSeen("System`OutputForm")
 		es.MarkSeen("System`FullForm")
 		es.MarkSeen("System`TraditionalForm")

diff --git a/expreduce/ex_expression.go b/expreduce/ex_expression.go
@@ -439,6 +439,7 @@ func (this *Expression) StringForm(params ToStringParams) string {
 		headAsSym.Name == "System`InputForm" ||
 		headAsSym.Name == "System`FullForm" ||
 		headAsSym.Name == "System`TraditionalForm" ||
+		headAsSym.Name == "System`TeXForm" ||
 		headAsSym.Name == "System`StandardForm" ||
 		headAsSym.Name == "System`OutputForm") {
 		mutatedParams := params

diff --git a/expreduce/resources.go b/expreduce/resources.go
diff --git a/expreduce/resources/string.m b/expreduce/resources/string.m
@@ -4,7 +4,11 @@
 Tests`ToString = {
     ESimpleExamples[
         ESameTest["a^2", ToString[Global`a^2, InputForm]],
+        ESameTest["\sin (1)", ToString[Sin[1], TeXForm]],
         ESameTest["Hello World", "Hello World" // ToString]
+    ], ETests[
+        ESameTest["\sin ()", ToString[Sin[], TeXForm]],
+        ESameTest["\sin (1,2)", ToString[Sin[1, 2], TeXForm]],
     ]
 };
 

diff --git a/expreduce/string.go b/expreduce/string.go
@@ -138,3 +138,21 @@ func ActualStringFormArgsFull(form string, es *EvalState) ToStringParams {
 	}
 
 }
+
+func simpleTeXToString(fnName string) func(*Expression, ToStringParams) (bool, string) {
+	return (func(this *Expression, params ToStringParams) (bool, string) {
+		if params.form != "TeXForm" {
+			return false, ""
+		}
+		var buffer bytes.Buffer
+		buffer.WriteString("\\sin (")
+		for i := 1; i < len(this.Parts); i++ {
+			buffer.WriteString(this.Parts[i].StringForm(params))
+			if i != len(this.Parts)-1 {
+				buffer.WriteString(",")
+			}
+		}
+		buffer.WriteString(")")
+		return true, buffer.String()
+	})
+}