capitalize > textcase

plotly · archmoj · May 16, 2024 · Apr 24, 2024 · Apr 24, 2024 · Apr 24, 2024
commit 042b2ad7b0e0d7d6212faea0d500251014b27f1d
diff --git a/src/components/annotations/draw.js b/src/components/annotations/draw.js
@@ -201,7 +201,7 @@ function drawRaw(gd, options, index, subplotId, xa, ya) {
                 fontVariant: hoverFont.variant,
                 fontShadow: hoverFont.fontShadow,
                 fontDecorline: hoverFont.fontDecorline,
-                fontCapitalize: hoverFont.fontCapitalize,
+                fontTextcase: hoverFont.fontTextcase,
             }, {
                 container: fullLayout._hoverlayer.node(),
                 outerContainer: fullLayout._paper.node(),

diff --git a/src/components/drawing/index.js b/src/components/drawing/index.js
@@ -36,7 +36,7 @@ drawing.font = function(s, font) {
     var family = font.family;
     var shadow = font.shadow;
     var decorline = font.decorline;
-    var capitalize = font.capitalize;
+    var textcase = font.textcase;
 
     if(family) s.style('font-family', family);
     if(size + 1) s.style('font-size', size + 'px');
@@ -46,22 +46,22 @@ drawing.font = function(s, font) {
     if(style) s.style('font-style', style);
     if(variant) s.style('font-variant', variant);
 
-    if(capitalize) s.style('text-transform', capitalize2transform(capitalize));
+    if(textcase) s.style('text-transform', textcase2transform(textcase));
     if(shadow) s.style('text-shadow', shadow === 'auto' ? svgTextUtils.makeTextShadow(Color.contrast(color)) : shadow);
     if(decorline) s.style('text-decoration-line', decorline2decorationLine(decorline));
 };
 
-var capitalize2transformOptions = {
+var textcase2transformOptions = {
     normal: 'none',
     word: 'capitalize',
     lower: 'lowercase',
     upper: 'uppercase'
 };
 
-function capitalize2transform(capitalize) {
-    return capitalize2transformOptions[capitalize];
+function textcase2transform(textcase) {
+    return textcase2transformOptions[textcase];
 }
-drawing.capitalize2transform = capitalize2transform;
+drawing.textcase2transform = textcase2transform;
 
 function decorline2decorationLine(decorline) {
     return (
@@ -1167,7 +1167,7 @@ drawing.textPointStyle = function(s, trace, gd) {
             weight: d.tw || trace.textfont.weight,
             style: d.ty || trace.textfont.style,
             variant: d.tv || trace.textfont.variant,
-            capitalize: d.tC || trace.textfont.capitalize,
+            textcase: d.tC || trace.textfont.textcase,
             decorline: d.tE || trace.textfont.decorline,
             shadow: d.tS || trace.textfont.shadow,
             size: fontSize,

diff --git a/src/components/fx/hover.js b/src/components/fx/hover.js
@@ -961,7 +961,7 @@ function createHoverText(hoverData, opts) {
     var fontWeight = opts.fontWeight || fullLayout.font.weight;
     var fontStyle = opts.fontStyle || fullLayout.font.style;
     var fontVariant = opts.fontVariant || fullLayout.font.variant;
-    var fontCapitalize = opts.fontCapitalize || fullLayout.font.capitalize;
+    var fontTextcase = opts.fontTextcase || fullLayout.font.textcase;
     var fontDecorline = opts.fontDecorline || fullLayout.font.decorline;
     var fontShadow = opts.fontShadow || fullLayout.font.shadow;
 
@@ -1049,7 +1049,7 @@ function createHoverText(hoverData, opts) {
             weight: commonLabelOptsFont.weight || fontWeight,
             style: commonLabelOptsFont.style || fontStyle,
             variant: commonLabelOptsFont.variant || fontVariant,
-            capitalize: commonLabelOptsFont.capitalize || fontCapitalize,
+            textcase: commonLabelOptsFont.textcase || fontTextcase,
             decorline: commonLabelOptsFont.decorline || fontDecorline,
             shadow: commonLabelOptsFont.shadow || fontShadow,
             family: commonLabelOptsFont.family || fontFamily,
@@ -1377,7 +1377,7 @@ function createHoverText(hoverData, opts) {
                     weight: fontWeight,
                     style: fontStyle,
                     variant: fontVariant,
-                    capitalize: fontCapitalize,
+                    textcase: fontTextcase,
                     decorline: fontDecorline,
                     shadow: fontShadow,
                     family: fontFamily,
@@ -1424,7 +1424,7 @@ function createHoverText(hoverData, opts) {
                 weight: d.fontWeight || fontWeight,
                 style: d.fontStyle || fontStyle,
                 variant: d.fontVariant || fontVariant,
-                capitalize: d.fontCapitalize || fontCapitalize,
+                textcase: d.fontTextcase || fontTextcase,
                 decorline: d.fontDecorline || fontDecorline,
                 shadow: d.fontShadow || fontShadow,
             })
@@ -1446,7 +1446,7 @@ function createHoverText(hoverData, opts) {
                 weight: d.fontWeight || fontWeight,
                 style: d.fontStyle || fontStyle,
                 variant: d.fontVariant || fontVariant,
-                capitalize: d.fontCapitalize || fontCapitalize,
+                textcase: d.fontTextcase || fontTextcase,
                 decorline: d.fontDecorline || fontDecorline,
                 shadow: d.fontShadow || fontShadow,
             }).text(name)

diff --git a/src/components/legend/style.js b/src/components/legend/style.js
@@ -247,7 +247,7 @@ module.exports = function style(s, gd, legend) {
                 dEdit.tw = boundVal('textfont.weight', pickFirst);
                 dEdit.ty = boundVal('textfont.style', pickFirst);
                 dEdit.tv = boundVal('textfont.variant', pickFirst);
-                dEdit.tC = boundVal('textfont.capitalize', pickFirst);
+                dEdit.tC = boundVal('textfont.textcase', pickFirst);
                 dEdit.tE = boundVal('textfont.decorline', pickFirst);
                 dEdit.tS = boundVal('textfont.shadow', pickFirst);
             }

diff --git a/src/components/titles/index.js b/src/components/titles/index.js
@@ -71,7 +71,7 @@ function draw(gd, titleClass, options) {
     var fontWeight = font.weight;
     var fontStyle = font.style;
     var fontVariant = font.variant;
-    var fontCapitalize = font.capitalize;
+    var fontTextcase = font.textcase;
     var fontDecorline = font.decorline;
     var fontShadow = font.shadow;
 
@@ -155,7 +155,7 @@ function draw(gd, titleClass, options) {
             'font-weight': fontWeight,
             'font-style': fontStyle,
             'font-variant': fontVariant,
-            'text-transform': Drawing.capitalize2transform(fontCapitalize),
+            'text-transform': Drawing.textcase2transform(fontTextcase),
             'text-shadow': fontShadow === 'auto' ? svgTextUtils.makeTextShadow(Color.contrast(fontColor)) : fontShadow,
             'text-decoration-line': Drawing.decorline2decorationLine(fontDecorline),
         })

diff --git a/src/lib/coerce.js b/src/lib/coerce.js
@@ -485,7 +485,7 @@ exports.coerceFont = function(coerce, attr, dfltObj, opts) {
 
     if(!opts.noFontVariant) out.variant = coerce(attr + '.variant', dfltObj.variant);
     if(!opts.noFontDecorline) out.decorline = coerce(attr + '.decorline', dfltObj.decorline);
-    if(!opts.noFontCapitalize) out.capitalize = coerce(attr + '.capitalize', dfltObj.capitalize);
+    if(!opts.noFontTextcase) out.textcase = coerce(attr + '.textcase', dfltObj.textcase);
     if(!opts.noFontShadow) {
         var dfltShadow = dfltObj.shadow;
         if(dfltShadow === 'none' && opts.autoShadowDflt) {

diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -1740,7 +1740,7 @@ function tickTextObj(ax, x, text) {
         fontWeight: tf.weight,
         fontStyle: tf.style,
         fontVariant: tf.variant,
-        fontCapitalize: tf.capitalize,
+        fontTextcase: tf.textcase,
         fontDecorline: tf.decorline,
         fontShadow: tf.shadow,
         fontColor: tf.color
@@ -3511,7 +3511,7 @@ axes.drawLabels = function(gd, ax, opts) {
                         weight: d.fontWeight,
                         style: d.fontStyle,
                         variant: d.fontVariant,
-                        capitalize: d.fontCapitalize,
+                        textcase: d.fontTextcase,
                         decorline: d.fontDecorline,
                         shadow: d.fontShadow,
                     })

diff --git a/src/plots/font_attributes.js b/src/plots/font_attributes.js
@@ -99,7 +99,7 @@ module.exports = function(opts) {
             ].join(' ')
         },
 
-        capitalize: opts.noFontCapitalize ? undefined : {
+        textcase: opts.noFontTextcase ? undefined : {
             editType: editType,
             valType: 'enumerated',
             values: ['normal', 'word', 'upper', 'lower'],
@@ -151,8 +151,8 @@ module.exports = function(opts) {
         if(!opts.noFontVariant) {
             attrs.variant.arrayOk = true;
         }
-        if(!opts.noFontCapitalize) {
-            attrs.capitalize.arrayOk = true;
+        if(!opts.noFontTextcase) {
+            attrs.textcase.arrayOk = true;
         }
         if(!opts.noFontDecorline) {
             attrs.decorline.arrayOk = true;

diff --git a/src/plots/mapbox/layout_attributes.js b/src/plots/mapbox/layout_attributes.js
@@ -14,7 +14,7 @@ var fontAttr = fontAttrs({
     noFontVariant: true,
     noFontShadow: true,
     noFontDecorline: true,
-    noFontCapitalize: true,
+    noFontTextcase: true,
     description: [
         'Sets the icon text font (color=mapbox.layer.paint.text-color, size=mapbox.layer.layout.text-size).',
         'Has an effect only when `type` is set to *symbol*.'

diff --git a/src/plots/mapbox/layout_defaults.js b/src/plots/mapbox/layout_defaults.js
@@ -107,7 +107,7 @@ function handleLayerDefaults(layerIn, layerOut) {
                 noFontVariant: true,
                 noFontShadow: true,
                 noFontDecorline: true,
-                noFontCapitalize: true,
+                noFontTextcase: true,
             });
             coerce('symbol.textposition');
             coerce('symbol.placement');

diff --git a/src/plots/polar/layout_defaults.js b/src/plots/polar/layout_defaults.js
@@ -157,7 +157,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
             var dfltFontWeight;
             var dfltFontStyle;
             var dfltFontVariant;
-            var dfltFontCapitalize;
+            var dfltFontTextcase;
             var dfltFontDecorline;
             var dfltFontShadow;
             var font = opts.font || {};
@@ -169,7 +169,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
             dfltFontWeight = font.weight;
             dfltFontStyle = font.style;
             dfltFontVariant = font.variant;
-            dfltFontCapitalize = font.capitalize;
+            dfltFontTextcase = font.textcase;
             dfltFontDecorline = font.decorline;
             dfltFontShadow = font.shadow;
 
@@ -179,7 +179,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
                     weight: dfltFontWeight,
                     style: dfltFontStyle,
                     variant: dfltFontVariant,
-                    capitalize: dfltFontCapitalize,
+                    textcase: dfltFontTextcase,
                     decorline: dfltFontDecorline,
                     shadow: dfltFontShadow,
                     color: dfltFontColor,
@@ -214,7 +214,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
                     weight: dfltFontWeight,
                     style: dfltFontStyle,
                     variant: dfltFontVariant,
-                    capitalize: dfltFontCapitalize,
+                    textcase: dfltFontTextcase,
                     decorline: dfltFontDecorline,
                     shadow: dfltFontShadow,
                     color: dfltFontColor,

diff --git a/src/traces/bar/style.js b/src/traces/bar/style.js
@@ -127,7 +127,7 @@ function getInsideTextFont(trace, index, layoutFont, barColor) {
             weight: defaultFont.weight,
             style: defaultFont.style,
             variant: defaultFont.variant,
-            capitalize: defaultFont.capitalize,
+            textcase: defaultFont.textcase,
             decorline: defaultFont.decorline,
             shadow: defaultFont.shadow,
         };
@@ -152,7 +152,7 @@ function getFontValue(attributeDefinition, attributeValue, index, defaultValue)
     var weightValue = helpers.getValue(attributeValue.weight, index);
     var styleValue = helpers.getValue(attributeValue.style, index);
     var variantValue = helpers.getValue(attributeValue.variant, index);
-    var capitalizeValue = helpers.getValue(attributeValue.capitalize, index);
+    var textcaseValue = helpers.getValue(attributeValue.textcase, index);
     var decorlineValue = helpers.getValue(attributeValue.decorline, index);
     var shadowValue = helpers.getValue(attributeValue.shadow, index);
 
@@ -169,8 +169,8 @@ function getFontValue(attributeDefinition, attributeValue, index, defaultValue)
             attributeDefinition.style, styleValue, defaultValue.style),
         variant: helpers.coerceString(
             attributeDefinition.variant, variantValue, defaultValue.variant),
-        capitalize: helpers.coerceString(
-            attributeDefinition.variant, capitalizeValue, defaultValue.capitalize),
+        textcase: helpers.coerceString(
+            attributeDefinition.variant, textcaseValue, defaultValue.textcase),
         decorline: helpers.coerceString(
             attributeDefinition.variant, decorlineValue, defaultValue.decorline),
         shadow: helpers.coerceString(

diff --git a/src/traces/contour/style.js b/src/traces/contour/style.js
@@ -44,7 +44,7 @@ module.exports = function style(gd) {
                 weight: labelFont.weight,
                 style: labelFont.style,
                 variant: labelFont.variant,
-                capitalize: labelFont.capitalize,
+                textcase: labelFont.textcase,
                 decorline: labelFont.decorline,
                 shadow: labelFont.shadow,
                 family: labelFont.family,

diff --git a/src/traces/heatmap/plot.js b/src/traces/heatmap/plot.js
@@ -551,7 +551,7 @@ module.exports = function(gd, plotinfo, cdheatmaps, heatmapLayer) {
                             weight: font.weight,
                             style: font.style,
                             variant: font.variant,
-                            capitalize: font.capitalize,
+                            textcase: font.textcase,
                             decorline: font.decorline,
                             shadow: font.shadow,
                         })

diff --git a/src/traces/pie/plot.js b/src/traces/pie/plot.js
@@ -515,10 +515,10 @@ function determineOutsideTextFont(trace, pt, layoutFont) {
         helpers.castOption(trace.textfont.variant, pt.pts) ||
         layoutFont.variant;
 
-    var capitalize =
-        helpers.castOption(trace.outsidetextfont.capitalize, pt.pts) ||
-        helpers.castOption(trace.textfont.capitalize, pt.pts) ||
-        layoutFont.capitalize;
+    var textcase =
+        helpers.castOption(trace.outsidetextfont.textcase, pt.pts) ||
+        helpers.castOption(trace.textfont.textcase, pt.pts) ||
+        layoutFont.textcase;
 
     var decorline =
         helpers.castOption(trace.outsidetextfont.decorline, pt.pts) ||
@@ -537,7 +537,7 @@ function determineOutsideTextFont(trace, pt, layoutFont) {
         weight: weight,
         style: style,
         variant: variant,
-        capitalize: capitalize,
+        textcase: textcase,
         decorline: decorline,
         shadow: shadow,
     };
@@ -578,10 +578,10 @@ function determineInsideTextFont(trace, pt, layoutFont) {
         helpers.castOption(trace.textfont.variant, pt.pts) ||
         layoutFont.variant;
 
-    var capitalize =
-        helpers.castOption(trace.insidetextfont.capitalize, pt.pts) ||
-        helpers.castOption(trace.textfont.capitalize, pt.pts) ||
-        layoutFont.capitalize;
+    var textcase =
+        helpers.castOption(trace.insidetextfont.textcase, pt.pts) ||
+        helpers.castOption(trace.textfont.textcase, pt.pts) ||
+        layoutFont.textcase;
 
     var decorline =
         helpers.castOption(trace.insidetextfont.decorline, pt.pts) ||
@@ -600,7 +600,7 @@ function determineInsideTextFont(trace, pt, layoutFont) {
         weight: weight,
         style: style,
         variant: variant,
-        capitalize: capitalize,
+        textcase: textcase,
         decorline: decorline,
         shadow: shadow,
     };

diff --git a/src/traces/sankey/plot.js b/src/traces/sankey/plot.js
@@ -229,7 +229,7 @@ module.exports = function plot(gd, calcData) {
                 fontWeight: castHoverOption(obj, 'font.weight'),
                 fontStyle: castHoverOption(obj, 'font.style'),
                 fontVariant: castHoverOption(obj, 'font.variant'),
-                fontCapitalize: castHoverOption(obj, 'font.capitalize'),
+                fontTextcase: castHoverOption(obj, 'font.textcase'),
                 fontDecorline: castHoverOption(obj, 'font.decorline'),
                 fontShadow: castHoverOption(obj, 'font.shadow'),
                 nameLength: castHoverOption(obj, 'namelength'),
@@ -329,7 +329,7 @@ module.exports = function plot(gd, calcData) {
             fontWeight: castHoverOption(obj, 'font.weight'),
             fontStyle: castHoverOption(obj, 'font.style'),
             fontVariant: castHoverOption(obj, 'font.variant'),
-            fontCapitalize: castHoverOption(obj, 'font.capitalize'),
+            fontTextcase: castHoverOption(obj, 'font.textcase'),
             fontDecorline: castHoverOption(obj, 'font.decorline'),
             fontShadow: castHoverOption(obj, 'font.shadow'),
             nameLength: castHoverOption(obj, 'namelength'),

diff --git a/src/traces/scatter/arrays_to_calcdata.js b/src/traces/scatter/arrays_to_calcdata.js
@@ -20,7 +20,7 @@ module.exports = function arraysToCalcdata(cd, trace) {
         Lib.mergeArray(trace.textfont.weight, cd, 'tw');
         Lib.mergeArray(trace.textfont.style, cd, 'ty');
         Lib.mergeArray(trace.textfont.variant, cd, 'tv');
-        Lib.mergeArray(trace.textfont.capitalize, cd, 'tC');
+        Lib.mergeArray(trace.textfont.textcase, cd, 'tC');
         Lib.mergeArray(trace.textfont.decorline, cd, 'tE');
         Lib.mergeArray(trace.textfont.shadow, cd, 'tS');
     }

diff --git a/src/traces/scatter3d/attributes.js b/src/traces/scatter3d/attributes.js
@@ -159,7 +159,7 @@ var attrs = module.exports = overrideAll({
     textfont: fontAttrs({
         noFontShadow: true,
         noFontDecorline: true,
-        noFontCapitalize: true,
+        noFontTextcase: true,
         editType: 'calc',
         colorEditType: 'style',
         arrayOk: true,

diff --git a/src/traces/scatter3d/defaults.js b/src/traces/scatter3d/defaults.js
@@ -45,7 +45,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
             noSelect: true,
             noFontShadow: true,
             noFontDecorline: true,
-            noFontCapitalize: true,
+            noFontTextcase: true,
         });
     }
 

diff --git a/src/traces/scattergl/attributes.js b/src/traces/scattergl/attributes.js
@@ -40,7 +40,7 @@ var attrs = module.exports = overrideAll({
     textfont: fontAttrs({
         noFontShadow: true,
         noFontDecorline: true,
-        noFontCapitalize: true,
+        noFontTextcase: true,
         editType: 'calc',
         colorEditType: 'style',
         arrayOk: true,

diff --git a/src/traces/scattergl/defaults.js b/src/traces/scattergl/defaults.js
@@ -55,7 +55,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         handleTextDefaults(traceIn, traceOut, layout, coerce, {
             noFontShadow: true,
             noFontDecorline: true,
-            noFontCapitalize: true,
+            noFontTextcase: true,
         });
     }
 

diff --git a/src/traces/scattermapbox/defaults.js b/src/traces/scattermapbox/defaults.js
@@ -75,7 +75,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
                 noFontVariant: true,
                 noFontShadow: true,
                 noFontDecorline: true,
-                noFontCapitalize: true,
+                noFontTextcase: true,
                 font: {
                     family: isSupportedFont(layoutFontFamily) ? layoutFontFamily : 'Open Sans Regular',
                     weight: layout.font.weight,