Merge pull request #368 from JunoLab/avi/config

config powerup

src/config.jl

@@ -1,64 +1,60 @@
-# Default options
-const defaultParams = Dict{Symbol,Any}(
-    :storeresults => false,
-    :chunk_defaults => Dict{Symbol,Any}(
-        :echo => true,
-        :results => "markup",
-        :hold => false,
-        :fig => true,
-        :include => true,
-        :eval => true,
-        :tangle => true,
-        :cache => false,
-        :fig_cap => nothing,
-        # Size in inches
-        :fig_width => 6,
-        :fig_height => 4,
-        :fig_path => DEFAULT_FIG_PATH,
-        :dpi => 96,
-        :term => false,
-        :display => false,
-        :prompt => "\njulia> ",
-        :label => nothing,
-        :wrap => true,
-        :line_width => 75,
-        :engine => "julia",
-        # :option_AbstractString=> "",
-        # Defined in formats
-        :fig_ext => nothing,
-        :fig_pos => nothing,
-        :fig_env => nothing,
-        :out_width => nothing,
-        :out_height => nothing,
-        :skip => false,
-    ),
+const _DEFAULT_PARAMS = Dict{Symbol,Any}(
+    :echo => true,
+    :results => "markup",
+    :hold => false,
+    :fig => true,
+    :include => true,
+    :eval => true,
+    :tangle => true,
+    :cache => false,
+    :fig_cap => nothing,
+    # NOTE: size in inches
+    :fig_width => 6,
+    :fig_height => 4,
+    :fig_path => DEFAULT_FIG_PATH,
+    :dpi => 96,
+    :term => false,
+    :display => false,
+    :prompt => "\njulia> ",
+    :label => nothing,
+    :wrap => true,
+    :line_width => 75,
+    :engine => "julia",
+    :fig_ext => nothing,
+    :fig_pos => nothing,
+    :fig_env => nothing,
+    :out_width => nothing,
+    :out_height => nothing,
+    :skip => false,
 )
-# This one can be changed at runtime, initially a copy of defaults
-const rcParams = deepcopy(defaultParams)
+const DEFAULT_PARAMS = deepcopy(_DEFAULT_PARAMS) # might be changed at runtime
 
 """
-    set_chunk_defaults!(opts::Dict{Symbol, Any})
+    set_chunk_defaults!(k::Symbol, v::Any) = DEFAULT_PARAMS[k]= v
+    set_chunk_defaults!(kv::Pair{Symbol,Any}...) = for (k,v) in kv; set_chunk_defaults!(k, v); end
+    set_chunk_defaults!(opts::AbstractDict{Symbol,Any}) = merge!(DEFAULT_PARAMS, opts)
 
 Set default options for code chunks, use [`get_chunk_defaults`](@ref) to see the current values.
 
-E.g.: set default `dpi` to `200` and `fig_width` to `8`
-
-```julia
-julia> set_chunk_defaults!(Dict(:dpi => 200, :fig_width => 8))
-```
+E.g.: all the three examples below will set default `dpi` to `200` and `fig_width` to `8`:
+- `set_chunk_defaults!(:dpi, 200); set_chunk_defaults!(:fig_width, 8)`
+- `set_chunk_defaults!(:dpi => 200, :fig_width => 8)`
+- `set_chunk_defaults!(Dict(:dpi => 200, :fig_width => 8))`
 """
-set_chunk_defaults!(opts::Dict{Symbol,Any}) = merge!(rcParams[:chunk_defaults], opts)
+set_chunk_defaults!(k::Symbol, v::Any) = DEFAULT_PARAMS[k]= v
+set_chunk_defaults!(kv::Pair{Symbol,Any}...) = for (k,v) in kv; set_chunk_defaults!(k, v); end
+set_chunk_defaults!(opts::AbstractDict{Symbol,Any}) = merge!(DEFAULT_PARAMS, opts)
 
 """
     get_chunk_defaults()
 
 Get default options used for code chunks.
 """
-get_chunk_defaults() = rcParams[:chunk_defaults]
+get_chunk_defaults() = DEFAULT_PARAMS
 
 """
     restore_chunk_defaults!()
 
 Restore Weave.jl default chunk options.
 """
-restore_chunk_defaults!() = rcParams[:chunk_defaults] = defaultParams[:chunk_defaults]
+restore_chunk_defaults!() = for (k,v) in _DEFAULT_PARAMS; DEFAULT_PARAMS[k] = v; end