Skip to content

Commit 065da23

Browse files
complete legend aliases
1 parent 9aa3830 commit 065da23

File tree

3 files changed

+14
-24
lines changed

3 files changed

+14
-24
lines changed

src/args.jl

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,16 @@ function make_non_underscore(s::Symbol)
66
end
77

88
const _keyAliases = Dict{Symbol,Symbol}()
9+
const _generalAliases = ("background" => "bg", "foreground" => "fg", "pointsize" => "size", "yfill" => "fill")
910

1011
function add_aliases(sym::Symbol, aliases::Symbol...)
1112
for alias in aliases
13+
str = string(alias)
14+
for ga in _generalAliases
15+
contains(str, ga.first) || continue
16+
str2 = replace(str, ga)
17+
_keyAliases[Symbol(str2)] = sym
18+
end
1219
(haskey(_keyAliases, alias) || alias === sym) && return
1320
_keyAliases[alias] = sym
1421
end
@@ -552,29 +559,6 @@ aliases(aliasMap::Dict{Symbol,Symbol}, val) =
552559
filter((x) -> x.second == val, aliasMap) |> keys |> collect |> sort
553560

554561
# -----------------------------------------------------------------------------
555-
# legend
556-
add_aliases(
557-
:legend_foreground_color,
558-
:fg_legend,
559-
:fglegend,
560-
:fgcolor_legend,
561-
:fg_color_legend,
562-
:foreground_legend,
563-
:foreground_colour_legend,
564-
:fgcolour_legend,
565-
:fg_colour_legend,
566-
:foreground_color_legend,
567-
)
568-
add_aliases(:legend_font_pointsize, :legendfontsize)
569-
add_aliases(
570-
:legend_title,
571-
:key_title,
572-
:keytitle,
573-
:label_title,
574-
:labeltitle,
575-
:leg_title,
576-
:legtitle,
577-
)
578562
add_aliases(:legend_title_font_pointsize, :legendtitlefontsize)
579563
# margin
580564
add_aliases(:left_margin, :leftmargin)

src/components.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -832,6 +832,10 @@ end :match = (
832832
:legend_font_color,
833833
:legend_title_font_family,
834834
:legend_title_font_color,
835+
) :aliases = Dict(
836+
:legend_position => (:legend, :leg, :key),
837+
:legend_background_color => (:background_legend, :background_colour_legend, :background_color_legend),
838+
:legend_foreground_color => (:foreground_legend, :foreground_colour_legend, :foreground_colour_legend)
835839
)
836840

837841
### Line

test/test_args.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,16 @@ end
5252
:legend_title_font_color,
5353
) :aliases = Dict(
5454
:legend_position => (:legend, :leg, :key),
55-
:legend_background_color => (:bg_legend, :bg_color_legend, :background_legend, :background_colour_legend, :bg_colour_legend, :background_color_legend)
55+
:legend_background_color => (:background_legend, :background_colour_legend, :background_color_legend),
56+
:legend_title = (:key_title, :label_title, :leg_title),
5657
)
5758
@test Plots._subplot_defaults[:legend_font_family] == :match
5859
@test Plots._subplot_defaults[:legend_column] == 1
5960
@test Plots._keyAliases[:legend] == :legend_position
6061
@test Plots._keyAliases[:legends] == :legend_position
6162
@test Plots._keyAliases[:bgcolourlegend] == :legend_background_color
6263
@test Plots._keyAliases[:bgcolour_legend] == :legend_background_color
64+
@test Plots._keyAliases[:legendfontsize] == :legend_font_pointsize
6365
end
6466

6567
@testset "aspect_ratio" begin

0 commit comments

Comments
 (0)