Merge pull request #693 from korsbo/nk/latexify_recipes

Fix latexification of `Function`s.

Author: ChrisRackauckas

src/latexify_recipes.jl

@@ -1,5 +1,5 @@
 prettify_expr(expr) = expr
-prettify_expr(f::Function) = Base.isoperator(nameof(f)) ? nameof(f) : f
+prettify_expr(f::Function) = nameof(f)
 prettify_expr(expr::Expr) = Expr(expr.head, prettify_expr.(expr.args)...)
 
 @latexrecipe function f(eqs::Vector{ModelingToolkit.Equation})

test/latexify.jl

@@ -26,38 +26,52 @@ eqs = [D(x) ~ σ*(y-x)*D(x-y)/D(z),
        0 ~ σ*x*(ρ-z)/10-y,
        D(z) ~ x*y^(2//3) - β*z]
 
-@test latexify(eqs) == raw"""\begin{align}
+
+# Latexify.@generate_test latexify(eqs)
+@test latexify(eqs) == replace(
+raw"\begin{align}
 \frac{dx(t)}{dt} =& \frac{\sigma \left( y\left( t \right) - x\left( t \right) \right) \frac{d\left(x\left( t \right) - y\left( t \right)\right)}{dt}}{\frac{dz(t)}{dt}} \\
 0 =& \frac{\sigma x\left( t \right) \left( \rho - z\left( t \right) \right)}{10} - y\left( t \right) \\
 \frac{dz(t)}{dt} =& x\left( t \right) \left( y\left( t \right) \right)^{\frac{2}{3}} - \beta z\left( t \right)
 \end{align}
-"""
-@parameters t p[1:3]
-@variables u[1:3](t)
-@derivatives D'~t
+", "\r\n"=>"\n")
 
+@variables u[1:3](t)
+@parameters p[1:3]
 eqs = [D(u[1]) ~ p[3]*(u[2]-u[1]),
        0 ~ p[2]*p[3]*u[1]*(p[1]-u[1])/10-u[2],
        D(u[3]) ~ u[1]*u[2]^(2//3) - p[3]*u[3]]
 
-@test latexify(eqs) ==
+@test latexify(eqs) == replace(
 raw"\begin{align}
 \frac{du{_1}(t)}{dt} =& p{_3} \left( \mathrm{u{_2}}\left( t \right) - \mathrm{u{_1}}\left( t \right) \right) \\
 0 =& \frac{p{_2} p{_3} \mathrm{u{_1}}\left( t \right) \left( p{_1} - \mathrm{u{_1}}\left( t \right) \right)}{10} - \mathrm{u{_2}}\left( t \right) \\
 \frac{du{_3}(t)}{dt} =& \mathrm{u{_1}}\left( t \right) \left( \mathrm{u{_2}}\left( t \right) \right)^{\frac{2}{3}} - p{_3} \mathrm{u{_3}}\left( t \right)
 \end{align}
-"
+", "\r\n"=>"\n")
 
 eqs = [D(u[1]) ~ p[3]*(u[2]-u[1]),
        D(u[2]) ~ p[2]*p[3]*u[1]*(p[1]-u[1])/10-u[2],
        D(u[3]) ~ u[1]*u[2]^(2//3) - p[3]*u[3]]
 
 sys = ODESystem(eqs)
 
-@test latexify(eqs) ==
+@test latexify(eqs) == replace(
 raw"\begin{align}
 \frac{du{_1}(t)}{dt} =& p{_3} \left( \mathrm{u{_2}}\left( t \right) - \mathrm{u{_1}}\left( t \right) \right) \\
 \frac{du{_2}(t)}{dt} =& \frac{p{_2} p{_3} \mathrm{u{_1}}\left( t \right) \left( p{_1} - \mathrm{u{_1}}\left( t \right) \right)}{10} - \mathrm{u{_2}}\left( t \right) \\
 \frac{du{_3}(t)}{dt} =& \mathrm{u{_1}}\left( t \right) \left( \mathrm{u{_2}}\left( t \right) \right)^{\frac{2}{3}} - p{_3} \mathrm{u{_3}}\left( t \right)
 \end{align}
-"
+", "\r\n"=>"\n")
+
+
+@parameters t
+@variables x(t)
+@derivatives D'~t
+eqs = [D(x) ~ (1+cos(t))/(1+2*x)]
+
+@test latexify(eqs) == replace(
+raw"\begin{align}
+\frac{dx(t)}{dt} =& \frac{1 + \cos\left( t \right)}{1 + 2 x\left( t \right)}
+\end{align}
+", "\r\n"=>"\n")