contours.font -> contours.labelfont

Author: alexcjohnson

src/traces/contour/attributes.js

@@ -118,11 +118,10 @@ module.exports = extendFlat({}, {
                 'Determines whether to label the contour lines with their values.'
             ].join(' ')
         },
-        font: extendFlat({}, fontAttrs, {
+        labelfont: extendFlat({}, fontAttrs, {
             description: [
                 'Sets the font used for labeling the contour levels.',
                 'The default color comes from the lines, if shown.',
-                // TODO: same size as layout.font, or smaller? 80%?
                 'The default family and size come from `layout.font`.'
             ].join(' ')
         }),

src/traces/contour/plot.js

@@ -370,7 +370,7 @@ function makeLinesAndLabels(plotgroup, pathinfo, gd, cd0, contours, perimeter) {
 
         var dummyText = Drawing.tester.append('text')
             .attr('data-notex', 1)
-            .call(Drawing.font, contours.font);
+            .call(Drawing.font, contours.labelfont);
 
         var xLen = pathinfo[0].xaxis._length;
         var yLen = pathinfo[0].yaxis._length;
@@ -491,7 +491,7 @@ function makeLinesAndLabels(plotgroup, pathinfo, gd, cd0, contours, perimeter) {
                         transform: 'rotate(' + (180 * d.theta / Math.PI) + ' ' + x + ' ' + y + ')'
                     })
                     .call(svgTextUtils.convertToTspans, gd)
-                    .call(Drawing.font, contours.font.family, contours.font.size);
+                    .call(Drawing.font, contours.labelfont.family, contours.labelfont.size);
             });
 
         if(clipLinesForLabels) {

src/traces/contour/style.js

@@ -43,7 +43,7 @@ module.exports = function style(gd) {
                     line.dash);
         });
 
-        var labelFontColor = (contours.font || {}).color;
+        var labelFontColor = (contours.labelfont || {}).color;
         c.selectAll('g.contourlabels text').each(function(d) {
             Drawing.font(d3.select(this), {
                 color: labelFontColor || (colorLines ? colorMap(d.level) : line.color)

src/traces/contour/style_defaults.js

@@ -37,7 +37,7 @@ module.exports = function handleStyleDefaults(traceIn, traceOut, coerce, layout,
     var showLabels = coerce('contours.showlabels');
     if(showLabels) {
         var globalFont = layout.font;
-        Lib.coerceFont(coerce, 'contours.font', {
+        Lib.coerceFont(coerce, 'contours.labelfont', {
             family: globalFont.family,
             size: globalFont.size,
             color: lineColor

src/traces/contourcarpet/attributes.js

@@ -94,7 +94,7 @@ module.exports = extendFlat({}, {
         },
         showlines: contourContourAttrs.showlines,
         showlabels: contourContourAttrs.showlabels,
-        font: contourContourAttrs.font,
+        labelfont: contourContourAttrs.font,
         labelformat: contourContourAttrs.labelformat,
         operation: {
             valType: 'enumerated',