@@ -150,7 +150,7 @@ function wordcloud(words::AbstractVector{<:AbstractString}, weights::AbstractVec
150
150
end
151
151
function processscheme (words, weights; colors= :auto , angles= :auto , fonts= :auto , language= :auto ,
152
152
mask= :auto , svgmask= nothing , editmask= true , transparent= :auto ,
153
- masksize= :auto , maskcolor= :default , keepmaskarea = :auto , avgfontsize= 12 ,
153
+ masksize= :auto , maskcolor= :default , preservevolume = :auto , avgfontsize= 12 ,
154
154
backgroundcolor= :default , padding= :default , outline= :default , linecolor= :auto ,
155
155
params= Dict {Symbol,Any} (), kargs... )
156
156
merge! (params, kargs)
@@ -178,8 +178,8 @@ function processscheme(words, weights; colors=:auto, angles=:auto, fonts=:auto,
178
178
maskcolor = backgroundcolor
179
179
end
180
180
end
181
- if keepmaskarea in DEFAULTSYMBOLS
182
- keepmaskarea = masksize in DEFAULTSYMBOLS
181
+ if preservevolume in DEFAULTSYMBOLS
182
+ preservevolume = masksize in DEFAULTSYMBOLS
183
183
end
184
184
masksize in DEFAULTSYMBOLS && (masksize = volumeproposal (words, weights, avgfontsize))
185
185
if backgroundcolor in DEFAULTSYMBOLS
@@ -203,7 +203,7 @@ function processscheme(words, weights; colors=:auto, angles=:auto, fonts=:auto,
203
203
end
204
204
padding in DEFAULTSYMBOLS && (padding = round (Int, maximum (masksize) ÷ 10 ))
205
205
mask, maskkw = randommask (masksize; maskshape= mask, color= maskcolor, padding= padding,
206
- preservevolume= keepmaskarea , returnkwargs= true , kg... , kargs... )
206
+ preservevolume= preservevolume , returnkwargs= true , kg... , kargs... )
207
207
merge! (params, maskkw)
208
208
transparent = c -> c != torgba (maskcolor)
209
209
elseif editmask
@@ -214,8 +214,8 @@ function processscheme(words, weights; colors=:auto, angles=:auto, fonts=:auto,
214
214
else
215
215
ms = masksize
216
216
end
217
- if keepmaskarea in DEFAULTSYMBOLS
218
- keepmaskarea = masksize == :auto
217
+ if preservevolume in DEFAULTSYMBOLS
218
+ preservevolume = masksize == :auto
219
219
end
220
220
if backgroundcolor == :auto
221
221
if maskcolor == :default
@@ -249,10 +249,10 @@ function processscheme(words, weights; colors=:auto, angles=:auto, fonts=:auto,
249
249
padding in DEFAULTSYMBOLS && (padding = outline)
250
250
if svgmask != = nothing
251
251
svgmask = loadmask (svgmask, ms... ; color= maskcolor, transparent= transparent, backgroundcolor= bc,
252
- outline= outline, linecolor= linecolor, padding= padding, preservevolume= keepmaskarea , kargs... )
252
+ outline= outline, linecolor= linecolor, padding= padding, preservevolume= preservevolume , kargs... )
253
253
end
254
254
mask, binarymask = loadmask (mask, ms... ; color= maskcolor, transparent= transparent, backgroundcolor= bc,
255
- outline= outline, linecolor= linecolor, padding= padding, return_bitmask= true , preservevolume= keepmaskarea , kargs... )
255
+ outline= outline, linecolor= linecolor, padding= padding, return_bitmask= true , preservevolume= preservevolume , kargs... )
256
256
binarymask === nothing || (transparent = .! binarymask)
257
257
else
258
258
mask = loadmask (mask)
0 commit comments