3.1.1

ethantw · Mar 13, 2015 · 916eb85 · 916eb85
1 parent da79295
commit 916eb85
Show file tree

Hide file tree

Showing 18 changed files with 79 additions and 80 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Han",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "homepage": "http://css.hanzi.co/",
   "authors": [
     "Chen Yijun (@ethantw)"

diff --git a/component.json b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "Han",
   "repo": "ethantw/Han",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "The CSS typography framework optimised for Hanzi.",
   "author": "Chen Yijun",
   "keywords": [

diff --git a/dist/han.css b/dist/han.css
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 
-/*! 漢字標準格式 v3.1.0 | MIT License | css.hanzi.co */
+/*! 漢字標準格式 v3.1.1 | MIT License | css.hanzi.co */
 /*! Han.css: the CSS typography framework optimised for Hanzi */
 
 /*! normalize.css v3.0.2 | MIT License | git.io/normalize */
@@ -852,15 +852,13 @@ hruby[rightangle] ru[annotation]:before {
     transform: scale(.8);
     display: inline-block;
   }
-
   hruby ru[zhuyin][diao="˪"] diao,
   hruby ru[zhuyin][diao="˫"] diao {
     -moz-transform: scale(1);
     -ms-transform: scale(1);
     -webkit-transform: scale(1);
     transform: scale(1);
   }
-
   hruby ru[zhuyin][diao="˙"] diao {
     -moz-transform: scale(.8);
     -ms-transform: scale(.8);
@@ -1249,122 +1247,122 @@ jinze {
 /* Em dash (——) */
 @font-face {
   font-family: "Biaodian Sans";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local("Microsoft Yahei"), local(SimSun);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local("Microsoft Yahei"), local(SimSun);
   unicode-range: U+2014;
 }
 
 @font-face {
   font-family: "Biaodian Serif";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(STSong), local("Microsoft Yahei"), local(SimSun);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(STSong), local("Microsoft Yahei"), local(SimSun);
   unicode-range: U+2014;
 }
 
 @font-face {
   font-family: "Yakumono Sans";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local("Arial Unicode MS"), local("MS Gothic");
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local("Arial Unicode MS"), local("MS Gothic");
   unicode-range: U+2014;
 }
 
 @font-face {
   font-family: "Yakumono Serif";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("MS Mincho"), local("Microsoft Yahei");
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("MS Mincho"), local("Microsoft Yahei");
   unicode-range: U+2014;
 }
 
 @font-face {
   font-family: "Biaodian Pro Sans";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local("Microsoft Yahei"), local(SimSun);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local("Microsoft Yahei"), local(SimSun);
   unicode-range: U+2014;
 }
 
 @font-face {
   font-family: "Biaodian Pro Serif";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(STSong), local("Microsoft Yahei"), local(SimSun);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(STSong), local("Microsoft Yahei"), local(SimSun);
   unicode-range: U+2014;
 }
 
 @font-face {
   font-family: "Biaodian Pro Sans CNS";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local("Microsoft Yahei"), local(SimSun);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local("Microsoft Yahei"), local(SimSun);
   unicode-range: U+2014;
 }
 
 @font-face {
   font-family: "Biaodian Pro Serif CNS";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(STSong), local("Microsoft Yahei"), local(SimSun);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(STSong), local("Microsoft Yahei"), local(SimSun);
   unicode-range: U+2014;
 }
 
 @font-face {
   font-family: "Biaodian Pro Sans GB";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local("Microsoft Yahei"), local(SimSun);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local("Microsoft Yahei"), local(SimSun);
   unicode-range: U+2014;
 }
 
 @font-face {
   font-family: "Biaodian Pro Serif GB";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(STSong), local("Microsoft Yahei"), local(SimSun);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(STSong), local("Microsoft Yahei"), local(SimSun);
   unicode-range: U+2014;
 }
 
 /* Ellipsis (……) */
 @font-face {
   font-family: "Biaodian Sans";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local(Meiryo), local("MS Gothic"), local(SimSun), local(PMingLiU);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local(Meiryo), local("MS Gothic"), local(SimSun), local(PMingLiU);
   unicode-range: U+2026;
 }
 
 @font-face {
   font-family: "Biaodian Serif";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local("MS Mincho"), local(SimSun), local(PMingLiU);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local("MS Mincho"), local(SimSun), local(PMingLiU);
   unicode-range: U+2026;
 }
 
 @font-face {
   font-family: "Yakumono Sans";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local(Meiryo), local("MS Gothic");
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local(Meiryo), local("MS Gothic");
   unicode-range: U+2026;
 }
 
 @font-face {
   font-family: "Yakumono Serif";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("MS Mincho");
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("MS Mincho");
   unicode-range: U+2026;
 }
 
 @font-face {
   font-family: "Biaodian Pro Sans";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local(SimSun), local(PMingLiU);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local(SimSun), local(PMingLiU);
   unicode-range: U+2026;
 }
 
 @font-face {
   font-family: "Biaodian Pro Serif";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(SimSun), local(PMingLiU);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(SimSun), local(PMingLiU);
   unicode-range: U+2026;
 }
 
 @font-face {
   font-family: "Biaodian Pro Sans CNS";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local(SimSun), local(PMingLiU);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local(SimSun), local(PMingLiU);
   unicode-range: U+2026;
 }
 
 @font-face {
   font-family: "Biaodian Pro Serif CNS";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(STSongti), local(SimSun), local(PMingLiU);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(STSongti), local(SimSun), local(PMingLiU);
   unicode-range: U+2026;
 }
 
 @font-face {
   font-family: "Biaodian Pro Sans GB";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local(SimSun), local(PMingLiU);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Sans GB"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local(SimSun), local(PMingLiU);
   unicode-range: U+2026;
 }
 
 @font-face {
   font-family: "Biaodian Pro Serif GB";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(STSongti), local(SimSun), local(PMingLiU);
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(STSongti), local(SimSun), local(PMingLiU);
   unicode-range: U+2026;
 }
 
@@ -1534,7 +1532,7 @@ jinze {
  */
 @font-face {
   font-family: "Biaodian Basic";
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype");
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype");
   unicode-range: U+2014, U+2026, U+00B7;
 }
 
@@ -1739,7 +1737,7 @@ jinze {
  * Zhuyin Kaiti
  */
 @font-face {
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype");
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype");
   unicode-range: U+3105-312D, U+31A0-31BA, U+02D9, U+02CA, U+02C5, U+02C7, U+02CB, U+02EA-02EB, U+030D, U+0358, U+F31B4-F31B7, U+F0061, U+F0065, U+F0069, U+F006F, U+F0075;
   font-family: "Zhuyin Kaiti";
 }
@@ -1750,17 +1748,17 @@ jinze {
 @font-face {
   unicode-range: U+3105-312D, U+31A0-31BA, U+02D9, U+02CA, U+02C5, U+02C7, U+02CB, U+02EA-02EB, U+030D, U+0358, U+F31B4-F31B7, U+F0061, U+F0065, U+F0069, U+F006F, U+F0075;
   font-family: "Zhuyin Heiti";
-  src: local("Hiragino Sans GB"), local("Heiti TC"), local("Microsoft Jhenghei"), url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype");
+  src: local("Hiragino Sans GB"), local("Heiti TC"), local("Microsoft Jhenghei"), url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype");
 }
 
 @font-face {
   font-family: "Zhuyin Heiti";
-  src: local("Heiti TC"), local("Microsoft Jhenghei"), url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype");
+  src: local("Heiti TC"), local("Microsoft Jhenghei"), url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype");
   unicode-range: U+3127;
 }
 
 @font-face {
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype");
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype");
   font-family: "Zhuyin Heiti";
   unicode-range: U+02D9, U+02CA, U+02C5, U+02C7, U+02CB, U+02EA-02EB, U+31B4, U+31B5, U+31B6, U+31B7, U+030D, U+0358, U+F31B4-F31B7, U+F0061, U+F0065, U+F0069, U+F006F, U+F0075;
 }
@@ -1769,7 +1767,7 @@ jinze {
  * Romanisation (checked tone ligature [陽入韻連字])
  */
 @font-face {
-  src: url(./font/han.woff?v3.1.0) format("woff"), url(./font/han.otf?v3.1.0) format("opentype");
+  src: url(./font/han.woff?v3.1.1) format("woff"), url(./font/han.otf?v3.1.1) format("opentype");
   font-family: "Romanization Sans";
   unicode-range: U+030D, U+0358, U+F31B4-F31B7, U+F0061, U+F0065, U+F0069, U+F006F, U+F0075;
 }

diff --git a/dist/han.js b/dist/han.js
@@ -1,5 +1,5 @@
 /*!
- * 漢字標準格式 v3.1.0 | MIT License | css.hanzi.co
+ * 漢字標準格式 v3.1.1 | MIT License | css.hanzi.co
  * Han.css: the CSS typography framework optimised for Hanzi
  */
 
@@ -22,7 +22,7 @@ var root = document.documentElement
 
 var body = document.body
 
-var VERSION = '3.1.0'
+var VERSION = '3.1.1'
 
 var ROUTINE = [
   // Initialise the condition with feature-detecting

diff --git a/dist/han.min.css b/dist/han.min.css
diff --git a/dist/han.min.js b/dist/han.min.js
diff --git a/gulpfile.ls b/gulpfile.ls
@@ -81,7 +81,10 @@ gulp.task \dist:font ->
 gulp.task \dist:sass ->
   gulp.src \./src/sass/han.scss
     .pipe sass!
-    .pipe concat \han.css
+    .pipe concat \han.css, {
+      process: ( src ) ->
+        src.replace /@charset\s(['"])UTF-8\1;\n/g, ''
+    }
     .pipe concat.header CSS-BANNER
     .pipe gulp-csscomb!
     .pipe gulp.dest \./dist

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "han-css",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "The CSS typography framework optimised for Hanzi",
   "repository": {
     "type": "git",

diff --git a/src/sass/var/_internal.sass b/src/sass/var/_internal.sass
@@ -5,7 +5,7 @@
 // * be modified!
 // *
 
-$han-version:           'v3.1.0'
+$han-version:           'v3.1.1'
 
 $han-webfont: url(#{$han-font-woff}?#{$han-version}) format('woff'), url(#{$han-font-otf}?#{$han-version}) format('opentype') !default
 
diff --git a/test/counter-han.css b/test/counter-han.css
diff --git a/test/em-han.css b/test/em-han.css
diff --git a/test/generics-han.css b/test/generics-han.css