Merge pull request #13 from gl-vis/font-styles

Font styles

Author: archmoj

lib/text.js

@@ -211,14 +211,21 @@ proto.update = function(options) {
       var x     = tick.x
       var text  = tick.text
       var font  = tick.font || 'sans-serif'
+      var fontStyle = tick.fontStyle || 'normal'
+      var fontWeight = tick.fontWeight || 'normal'
+      var fontVariant = tick.fontVariant || 'normal'
       scale = (tick.fontSize || 12)
 
       var coordScale = 1.0 / (bounds[dimension+2] - bounds[dimension])
       var coordShift = bounds[dimension]
 
       var rows = text.split('\n')
       for(var r = 0; r < rows.length; r++) {
-        data = getText(font, rows[r]).data
+        data = getText(font, rows[r], {
+          fontStyle: fontStyle,
+          fontWeight: fontWeight,
+          fontVariant: fontVariant
+        }).data
         for (j = 0; j < data.length; j += 2) {
           vertices.push(
               data[j] * scale,
@@ -239,7 +246,13 @@ proto.update = function(options) {
   for(dimension=0; dimension<2; ++dimension) {
     this.labelOffset[dimension] = Math.floor(vertices.length/3)
 
-    data  = getText(options.labelFont[dimension], options.labels[dimension], { textAlign: 'center' }).data
+    data  = getText(options.labelFont[dimension], options.labels[dimension], {
+      fontStyle: options.labelFontStyle[dimension],
+      fontWeight: options.labelFontWeight[dimension],
+      fontVariant: options.labelFontVariant[dimension],
+      textAlign: 'center'
+    }).data
+
     scale = options.labelSize[dimension]
     for(i=0; i<data.length; i+=2) {
       vertices.push(data[i]*scale, -data[i+1]*scale, 0)
@@ -251,7 +264,11 @@ proto.update = function(options) {
 
   //Add title
   this.titleOffset = Math.floor(vertices.length/3)
-  data = getText(options.titleFont, options.title).data
+  data = getText(options.titleFont, options.title, {
+    fontStyle: options.titleFontStyle,
+    fontWeight: options.titleFontWeight,
+    fontVariant: options.titleFontVariant,
+  }).data
   scale = options.titleSize
   for(i=0; i<data.length; i+=2) {
     vertices.push(data[i]*scale, -data[i+1]*scale, 0)

package.json

@@ -18,7 +18,7 @@
     "gl-shader": "^4.2.1",
     "glsl-inverse": "^1.0.0",
     "glslify": "^7.0.0",
-    "text-cache": "^4.2.2"
+    "text-cache": "github:gl-vis/text-cache#5369cdcfa5b94077f6be76b1dfa74d6ac87e76f3"
   },
   "devDependencies": {
     "camera-2d": "^1.0.1",

plot.js

@@ -504,9 +504,16 @@ proto.update = function(options) {
     labels:     options.labels    || ['x', 'y'],
     labelSize:  options.labelSize || [12,12],
     labelFont:  options.labelFont || ['sans-serif', 'sans-serif'],
+    labelFontStyle: options.labelFontStyle || ['normal', 'normal'],
+    labelFontWeight: options.labelFontWeight || ['normal', 'normal'],
+    labelFontVariant: options.labelFontVariant || ['normal', 'normal'],
+
     title:      options.title     || '',
     titleSize:  options.titleSize || 18,
-    titleFont:  options.titleFont || 'sans-serif'
+    titleFont:  options.titleFont || 'sans-serif',
+    titleFontStyle: options.titleFontStyle || 'normal',
+    titleFontWeight: options.titleFontWeight || 'normal',
+    titleFontVariant: options.titleFontVariant || 'normal'
   })
 
   this.static = !!options.static;