From 915c41c9d945ce845c77eeba2889f833464f4f69 Mon Sep 17 00:00:00 2001
From: Florian Oswald <florian.oswald@gmail.com>
Date: Wed, 17 May 2017 17:48:03 +0200
Subject: [PATCH] addressed changes requested

---
 src/args.jl       | 27 ++++-----------------------
 src/components.jl |  4 ++--
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/src/args.jl b/src/args.jl
index f93aeae6..af791198 100644
--- a/src/args.jl
+++ b/src/args.jl
@@ -336,10 +336,10 @@ const _all_defaults = KW[
 ]
 
 # to be able to reset font sizes to initial values
-const _initial_fontsizes = Dict(:titlefont  => deepcopy(_subplot_defaults[:titlefont]),
-                                :legendfont => deepcopy(_subplot_defaults[:legendfont]),
-                                :tickfont   => deepcopy(_axis_defaults[:tickfont]),
-                                :guidefont  => deepcopy(_axis_defaults[:guidefont]))
+const _initial_fontsizes = Dict(:titlefont  => _subplot_defaults[:titlefont].pointsize,
+                                :legendfont => _subplot_defaults[:legendfont].pointsize,
+                                :tickfont   => _axis_defaults[:tickfont].pointsize,
+                                :guidefont  => _axis_defaults[:guidefont].pointsize)
 
 const _all_args = sort(collect(union(map(keys, _all_defaults)...)))
 
@@ -525,25 +525,6 @@ function default(d::KW, k::Symbol)
     get(d, k, default(k))
 end
 
-# reset the defaults globally to values at startup
-
-"""
-`initial(key)` returns the intial value for that key
-"""
-
-function initial(k::Symbol)
-    k = get(_keyAliases, k, k)
-    for defaults in _all_initial_defaults
-        if haskey(defaults, k)
-            return defaults[k]
-        end
-    end
-    if haskey(_axis_initial_defaults, k)
-        return _axis_initial_defaults[k]
-    end
-    k in _suppress_warnings || error("Unknown key: ", k)
-end
-
 
 # -----------------------------------------------------------------------------
 
diff --git a/src/components.jl b/src/components.jl
index 1f53f2d1..de3b1197 100644
--- a/src/components.jl
+++ b/src/components.jl
@@ -307,8 +307,8 @@ end
 function scalefontsizes()
   for k in (:titlefont, :guidefont, :tickfont, :legendfont)
       f = default(k)
-      if haskey(_initial_fontsizes,k)
-        factor = f.pointsize / _initial_fontsizes[k].pointsize
+      for k in keys(_initial_fontsizes)
+        factor = f.pointsize / _initial_fontsizes[k]
         scalefontsize(k, 1.0/factor)
       end
   end