Merge branch 'master' into master

Gruntfile.js

@@ -368,6 +368,25 @@ module.exports = function(grunt) {
 				dest: 'test/tmp/timestamp_different',
 				options: {
 					fontFilename: 'different_2'
+        }
+      },
+			enabled_template_variables: {
+				src: 'test/src/*.svg',
+				dest: 'test/tmp/enabled_template_variables',
+				options: {
+					relativeFontPath: '../iamrelative',
+					fontPathVariables: true,
+					stylesheets: ['css', 'scss', 'less']
+				}
+			},
+			filename_length: {
+				src: 'test/src_filename_length/*.svg',
+				dest: 'test/tmp/filename_length',
+				options: {
+					autoHint: false,
+					engine: 'node',
+					hashes: false,
+					types: 'woff'
 				}
 			},
 		},

Pull_Request_Template.md

@@ -0,0 +1,12 @@
+**PROJECT IS NOT ACTIVELY MAINTAINED**
+
+Which means I will not receive a notification about this pull request.
+
+If you want your pull request to be merged:
+
+1. Explain the use case or bug you’re solving.
+2. Add tests.
+3. Add docs.
+4. Mention sapegin.
+
+If you want to maintain the project, please contact me: http://sapegin.me/

Readme.md

@@ -271,6 +271,16 @@ Type: `string` Default: `null`
 
 Custom font path. Will be used instead of `destCss` *in* CSS file. Useful with CSS preprocessors.
 
+#### fontPathVariables
+
+Type: `boolean` Default: `false`
+
+Create font-path variables for `less`, `scss` and `sass` files. Can be used to override the `relativeFontPath`
+in custom preprocessor tasks or configs. 
+
+The variable name is a combination of the `font` name appended with `-font-path`.
+
+
 #### version
 
 Type: `string` Default: `false`
@@ -614,7 +624,7 @@ And finally, the third, for `icon-web-home.html`, a file that has access to the
         <h1><%= homeHeading %></h1>
         <p><%= homeMessage %></p>
         <ul>
-        	<% for (var i = 0; i < glpyhs.length; i++) { %>
+        	<% for (var i = 0; i < glyphs.length; i++) { %>
         	<li><a href="#"><%= glyphs[i] %></a></li>
         	<% } %>
         </ul>
@@ -626,6 +636,23 @@ And finally, the third, for `icon-web-home.html`, a file that has access to the
 
 You can change CSS file syntax using `stylesheet` option (see above). It change file extension (so you can specify any) with some tweaks. Replace all comments with single line comments (which will be removed after compilation).
 
+### Dynamic font-path
+You can enable the `fontPathVariables` in combination with `relativeFontPath` to create a overridable font-path. 
+
+For example scss:
+```scss
+$icons-font-path : "/relativeFontPath/" !default;
+@font-face {
+	font-family:"icons";
+	src:url($icons-font-path + "icons.eot");
+	src:url($icons-font-path + "icons.eot?#iefix") format("embedded-opentype"),
+		url($icons-font-path + "icons.woff") format("woff"),
+		url($icons-font-path + "icons.ttf") format("truetype");
+	font-weight:normal;
+	font-style:normal;
+}
+```
+
 ### Sass
 
 If `stylesheet` option is `sass` or `scss`, `_` will prefix the file (so it can be a used as a partial).

tasks/bin/eotlitetool.py

@@ -373,7 +373,7 @@ def make_eot_name_headers(fontdata, nameTableDir):
         else:
             nameheaders.append(struct.pack('4x'))  # len = 0, padding = 0
 
-    return b''.join(nameheaders)
+    return ''.join(nameheaders)
 
 # just return a null-string (len = 0)
 def make_root_string():
@@ -445,11 +445,11 @@ def make_eot_header(fontdata):
                         *([eotSize, fontDataSize, version, flags] + panose + [charset, italic] +
                           [weight, fsType, magicNumber] + urange + codepage + [checkSumAdjustment]))
 
-    return b''.join((fixed, nameheaders, rootstring))
+    return ''.join((fixed, nameheaders, rootstring))
 
 
 def write_eot_font(eot, header, data):
-    open(eot,'wb').write(b''.join((header, data)))
+    open(eot,'wb').write(''.join((header, data)))
     return
 
 def main():

tasks/templates/bem.css

@@ -1,6 +1,9 @@
 /* Generated by grunt-webfont */
 
 <% if (fontfaceStyles) { %>
+<% if (fontPathVariables && stylesheet !== 'css') { %>
+<%= fontPathVariable %>
+<% } %>
 <% if (fontSrc1 && embed.length) { %>
 @font-face {
 	font-family:"<%= fontFamilyName %>";
@@ -22,7 +25,6 @@
 		font-family:"<%= fontFamilyName %>";
 	<% if (stylesheet === 'less') { %>}<% } %>
 	display:inline-block;
-	vertical-align:middle;
 	line-height:1;
 	font-weight:normal;
 	font-style:normal;

tasks/templates/bootstrap.css

@@ -2,6 +2,9 @@
 /* Based on https://github.com/endtwist/fontcustom/blob/master/lib/fontcustom/templates/fontcustom.css */
 
 <% if (fontfaceStyles) { %>
+<% if (fontPathVariables && stylesheet !== 'css') { %>
+<%= fontPathVariable %>
+<% } %>
 <% if (fontSrc1 && embed.length) { %>
 @font-face {
     font-family:"<%= fontFamilyName %>";
@@ -26,7 +29,6 @@
 .ligature-icons<% } %> {
 	font-family:"<%= fontFamilyName %>";
 	display:inline-block;
-	vertical-align:middle;
 	line-height:1;
 	font-weight:normal;
 	font-style:normal;

tasks/webfont.js

@@ -87,6 +87,7 @@ module.exports = function(grunt) {
 			destStyl: options.destStyl || params.destStyl || params.destCss || params.dest,
 			dest: options.dest || params.dest,
 			relativeFontPath: options.relativeFontPath,
+			fontPathVariables: options.fontPathVariables || false,
 			addHashes: options.hashes !== false,
 			addLigatures: options.ligatures === true,
 			template: options.template,
@@ -356,7 +357,7 @@ module.exports = function(grunt) {
 				if (!has(o.types, type)) return;
 				wf.fontsSrcsMap[type].forEach(function(font, idx) {
 					if (font) {
-						fontSrcs[idx].push(generateFontSrc(type, font));
+						fontSrcs[idx].push(generateFontSrc(type, font, stylesheet));
 					}
 				});
 			});
@@ -622,7 +623,7 @@ module.exports = function(grunt) {
 		 * @return {Integer}
 		 */
 		function getNextCodepoint() {
-			while (_.includes(o.codepoints, currentCodepoint)) {
+			while (_.invert(o.codepoints).hasOwnProperty(currentCodepoint)) {
 				currentCodepoint++;
 			}
 			return currentCodepoint;
@@ -681,17 +682,32 @@ module.exports = function(grunt) {
 		 *
 		 * @param {String} type Type of font
 		 * @param {Object} font URL or Base64 string
+		 * @param {String} stylesheet type: css, scss, ...
 		 * @return {String}
 		 */
-		function generateFontSrc(type, font) {
+		function generateFontSrc(type, font, stylesheet) {
 			var filename = template(o.fontFilename + font.ext, o);
+			var fontPathVariableName = o.fontFamilyName + '-font-path';
 
 			var url;
 			if (font.embeddable && has(o.embed, type)) {
 				url = embedFont(path.join(o.dest, filename));
 			}
 			else {
-				url = o.relativeFontPath + filename;
+				if (o.fontPathVariables &&  stylesheet !== 'css') {
+					if (stylesheet === 'less') {
+						fontPathVariableName = '@' + fontPathVariableName;
+						o.fontPathVariable = fontPathVariableName + ' : "' + o.relativeFontPath + '";';
+					}
+					else {
+						fontPathVariableName = '$' + fontPathVariableName;
+						o.fontPathVariable = fontPathVariableName + ' : "' + o.relativeFontPath + '" !default;';
+					}
+					url = filename;
+				}
+				else {
+					url = o.relativeFontPath + filename;
+				}
 				if (o.addHashes) {
 					if (url.indexOf('#iefix') === -1) {  // Do not add hashes for OldIE
 						// Put hash at the end of an URL or before #hash
@@ -701,6 +717,10 @@ module.exports = function(grunt) {
 			}
 
 			var src = 'url("' + url + '")';
+			if (o.fontPathVariables && stylesheet !== 'css') {
+				src = 'url(' + fontPathVariableName + ' + "' + url + '")';
+			}
+
 			if (font.format) src += ' format("' + font.format + '")';
 
 			return src;

test/webfont_test.js

@@ -309,6 +309,26 @@ exports.webfont = {
 		test.done();
 	},
 
+	enabled_template_variables: function(test) {
+		var cssFilename = 'test/tmp/enabled_template_variables/_icons.scss';
+
+		var css = grunt.file.read(cssFilename);
+
+		// There should be a variable declaration for scss preprocessor
+		test.ok(
+			find(css, '$icons-font-path : "../iamrelative/" !default;'),
+			'SCSS enable template variables: variable exists.'
+		);
+
+		// The variable declaration should be used
+		test.ok(
+			find(css, 'url($icons-font-path + "'),
+			'SCSS enable template variables: variable used.'
+		);
+
+		test.done();
+	},
+
 	html_template: function(test) {
 		var demo = grunt.file.read('test/tmp/html_template/icons.html');
 
@@ -899,7 +919,6 @@ exports.webfont = {
 
 		test.done();
 	},
-
 	// If font created multiple times with same value as timestamp option
 	// then md5 of created files must be the same too
 	timestamp_same: function (test) {
@@ -945,5 +964,17 @@ exports.webfont = {
 				test.done();
 			});
 	},
+	filename_length: function(test) {
+
+		// File should have been created.
+		test.ok(fs.existsSync('test/tmp/filename_length/icons.css'));
 
+		// File should have been created.
+		test.ok(fs.existsSync('test/tmp/filename_length/icons.woff'));
+
+		// File should have been created.
+		test.ok(fs.existsSync('test/tmp/filename_length/icons.html'));
+
+		test.done();
+	}
 };