Refactor Latexify.jl

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '0.7' 
+          - '0.7'
           - '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
           - 'nightly'
         os:

Project.toml

@@ -11,13 +11,11 @@ LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 
 [compat]
 Formatting = "0.4"
 LaTeXStrings = "0.3, 1"
 MacroTools = "0.4, 0.5"
-Requires = "0.5, 1"
 julia = "1"
 
 [extras]

src/Latexify.jl

@@ -1,5 +1,6 @@
 module Latexify
-using Requires
+# Base.Experimental.@compiler_options optimize=0 compile=min infer=no
+# using Requires
 using LaTeXStrings
 using InteractiveUtils
 using Markdown
@@ -8,63 +9,44 @@ import MacroTools
 using Printf
 using Formatting
 
-export latexify, md, copy_to_clipboard, auto_display, set_default, get_default,
+export latexify, copy_to_clipboard, auto_display, set_default, get_default,
     reset_default, @latexrecipe, render, @latexify, @latexrun
 
-## Allow some backwards compatibility until its time to deprecate.
-export latexequation, latexarray, latexalign, latexraw, latexinline, latextabular, mdtable
 
 export StyledNumberFormatter, FancyNumberFormatter
 
-COPY_TO_CLIPBOARD = false
+const COPY_TO_CLIPBOARD = false
 function copy_to_clipboard(x::Bool)
     global COPY_TO_CLIPBOARD = x
 end
 
-AUTO_DISPLAY = false
+const AUTO_DISPLAY = false
 function auto_display(x::Bool)
     global AUTO_DISPLAY = x
 end
 
 include("unicode2latex.jl")
 include("function2latex.jl")
 include("latexraw.jl")
-include("latexoperation.jl")
-include("latexarray.jl")
-include("latexalign.jl")
-include("latexbracket.jl")
-include("latexinline.jl")
-include("latexequation.jl")
-include("latextabular.jl")
 include("default_kwargs.jl")
 include("recipes.jl")
 include("macros.jl")
+include("instructions.jl")
 
-include("mdtable.jl")
-include("mdtext.jl")
-include("md.jl")
+# include("mdtable.jl")
+# include("mdtext.jl")
+# include("md.jl")
 
 include("utils.jl")
+include("TracedIO.jl")
+include("config.jl")
 
 include("numberformatters.jl")
 
 include("latexify_function.jl")
+# include("refactor_prototype_2.jl")
+export descend, unpack, head, operation, arguments, nested 
 
-### Add support for additional packages without adding them as dependencies.
-function __init__()
-    @require DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" begin
-        include("plugins/ParameterizedFunctions.jl")
-    end
-    @require DiffEqBiological = "eb300fae-53e8-50a0-950c-e21f52c2b7e0" begin
-        include("plugins/DiffEqBiological.jl")
-    end
-    @require SymEngine = "123dc426-2d89-5057-bbad-38513e3affd8" begin
-        include("plugins/SymEngine.jl")
-    end
-    @require DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" begin
-        include("plugins/DataFrames.jl")
-    end
-end
 
 macro generate_test(expr)
     return :(clipboard("@test $($(string(expr))) == replace(\nraw\"$($(esc(expr)))\", \"\\r\\n\"=>\"\\n\")\n"))
@@ -125,4 +107,44 @@ macro append_test!(fname, str)
     )
 end
 
+# const _ex = :(a+w*c/d-b+1+1. + [1,x/y^2] * [1 2. 2im] .* x ± x = l_Huge(y))
+# latexify(:(a+w*c/d-b+1+1. + [1,x/y^2] * [1 2. 2im] .* x ± x = l_Huge(y)))
+# Latexify._latextree(:(a+w*c/d-b+1+1. + [1,x/y^2] * [1 2. 2im] .* x ± x = l_Huge(y)))
+# latexify(:(a+w*c/d-b+1+1. + [1,x/y^2] * [1 2. 2im] .* x ± x = l_Huge(y)))
+# latexify(:(a+w*c/d-b+1+1. + [1,x/y^2] * [1 2. 2im] .* x ± x = l_Huge(y)))
+# latexify(_ex)
+# latexify(_ex)
+# @assert precompile(latexify, (Expr,))
+
+latexify(:(z/y*s+1.2+1//2))
+for f in DEFAULT_INSTRUCTIONS
+    for op in [Expr, Symbol, Float64, Int, Rational, ComplexF64]
+        for config in [Dict, NamedTuple]
+            for prevop in [Symbol, Nothing]
+                precompile(f, (IOBuffer, config, op, prevop ))
+            end
+        end
+    end
 end
+
+
+# ### Add support for additional packages without adding them as dependencies.
+# function __init__()
+#     @require DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" begin
+#         include("plugins/ParameterizedFunctions.jl")
+#     end
+#     @require DiffEqBiological = "eb300fae-53e8-50a0-950c-e21f52c2b7e0" begin
+#         include("plugins/DiffEqBiological.jl")
+#     end
+#     @require SymEngine = "123dc426-2d89-5057-bbad-38513e3affd8" begin
+#         include("plugins/SymEngine.jl")
+#     end
+#     @require DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" begin
+#         include("plugins/DataFrames.jl")
+#     end
+#     # Latexify._latextree(:(a+w*c/d-b+1+1. + [1,x/y^2] * [1 2. 2im] .* x ± x = l_Huge(y)))
+#     # Latexify.latexify(:(a+w*c/d-b+1+1. + [1,x/y^2] * [1 2. 2im] .* x ± x = l_Huge(y)))
+# end
+
+end
+

src/TracedIO.jl

@@ -0,0 +1,19 @@
+
+struct TracedIO{T} <: IO
+  trace::Vector{Function}
+  io::T
+end
+Base.write(x::TracedIO, s::String; kwargs...) = Base.write(x.io, s; kwargs...)
+
+struct TracedResult{T}
+  trace::Vector{Function}
+  str::T
+end
+
+function Base.show(io::IO, tio::TracedResult)
+  write(io, "Latexify TracedResult\n")
+  write(io, "\nwith call trace:\n")
+  write(io, join(string.(typeof.(tio.trace)), "\n"))
+  write(io, "\n\nand result\n")
+  show(io, tio.str)
+end

src/config.jl

@@ -0,0 +1,35 @@
+const DEFAULT_CONFIG = (;
+  :mulsym => " \\cdot ",
+  :convert_unicode => true,
+  :strip_broadcast => true,
+  :fmt => identity,
+  :index => :bracket,
+  :ifstr => "\\text{if }",
+  :elseifstr => "\\text{elseif }",
+  :elsestr => "\\text{otherwise}",
+  :adjustment => "c",
+  :transpose => false,
+  :double_linebreak => false,
+  :starred => false,
+)
+
+## MODULE_CONFIG can store defaults specified in other modules. E.g. from recipes.
+const MODULE_CONFIG = Dict{Symbol, Any}()
+
+## USE_CONFIG can store user-specified defaults
+const USER_CONFIG = Dict{Symbol, Any}()
+
+const comparison_operators = (;
+        :< => "<",
+        :.< => "<",
+        :> => ">",
+        :.> => ">",
+        Symbol("==") => "=",
+        Symbol(".==") => "=",
+        :<= => "\\leq",
+        :.<= => "\\leq",
+        :>= => "\\geq",
+        :.>= => "\\geq",
+        :!= => "\\neq",
+        :.!= => "\\neq",
+        )