@@ -470,7 +470,7 @@ function withfaces(f, keyvals_itr)
470
470
if face isa Face
471
471
newfaces[name] = face
472
472
elseif face isa Symbol
473
- newfaces[name] = get (FACES. current[], face, Face () )
473
+ newfaces[name] = get (Face, FACES. current[], face)
474
474
elseif face isa Vector{Symbol}
475
475
newfaces[name] = Face (inherit= face)
476
476
elseif haskey (newfaces, name)
@@ -517,7 +517,7 @@ function Base.merge(a::Face, b::Face)
517
517
b_noinherit = Face (
518
518
b. font, b. height, b. weight, b. slant, b. foreground, b. background,
519
519
b. underline, b. strikethrough, b. inverse, Symbol[])
520
- b_inheritance = map (fname -> get (FACES. current[], fname, Face () ), Iterators. reverse (b. inherit))
520
+ b_inheritance = map (fname -> get (Face, FACES. current[], fname), Iterators. reverse (b. inherit))
521
521
b_resolved = merge (foldl (merge, b_inheritance), b_noinherit)
522
522
merge (a, b_resolved)
523
523
end
@@ -529,7 +529,7 @@ Base.merge(a::Face, b::Face, others::Face...) = merge(merge(a, b), others...)
529
529
530
530
# Putting these inside `getface` causes the julia compiler to box it
531
531
_mergedface (face:: Face ) = face
532
- _mergedface (face:: Symbol ) = get (FACES. current[], face, Face () )
532
+ _mergedface (face:: Symbol ) = get (Face, FACES. current[], face)
533
533
_mergedface (faces:: Vector ) = mapfoldl (_mergedface, merge, Iterators. reverse (faces))
534
534
535
535
"""
@@ -558,7 +558,7 @@ function getface(annotations::Vector{Pair{Symbol, Any}})
558
558
end
559
559
560
560
getface (face:: Face ) = merge (FACES. current[][:default ], merge (Face (), face))
561
- getface (face:: Symbol ) = getface (get (FACES. current[], face, Face () ))
561
+ getface (face:: Symbol ) = getface (get (Face, FACES. current[], face))
562
562
563
563
"""
564
564
getface()
0 commit comments