Skip to content

Commit

Permalink
3.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ethantw committed Dec 8, 2014
1 parent 6081a6b commit c27ced8
Show file tree
Hide file tree
Showing 69 changed files with 11,208 additions and 43 deletions.
2 changes: 1 addition & 1 deletion latest/counter-han.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion latest/em-han.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion latest/generics-han.css

Large diffs are not rendered by default.

60 changes: 31 additions & 29 deletions latest/han.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@charset "UTF-8";
/*! 漢字標準格式 v3.0.1 | MIT License | css.hanzi.co */
/*! 漢字標準格式 v3.0.2 | MIT License | css.hanzi.co */
/*! Han: CSS typography framework optimised for Hanzi */
/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
/**
Expand Down Expand Up @@ -581,10 +581,10 @@ ruby *:before,
ruby *:after {
line-height: normal;
}
ruby > rt:before {
ruby > rt:not(:empty):before {
content: "(";
}
ruby > rt:after {
ruby > rt:not(:empty):after {
content: ")";
}
ruby > rb + rtc:before {
Expand All @@ -602,6 +602,8 @@ ruby > rt:before, ruby > rt:after {
vertical-align: middle;
height: 0;
width: 0;
}
ruby > rt:not(:empty):before, ruby > rt:not(:empty):after {
height: -moz-calc( 1.3em );
width: -moz-calc( 1em );
}
Expand Down Expand Up @@ -1152,103 +1154,103 @@ jinze {
/* Em dash (——) */
@font-face {
font-family: 'Biaodian Sans';
src: url(./font/han.woff?v3.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("MS Mincho"), local("Microsoft Yahei");
src: url(./font/han.woff?v3.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.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);
src: url(./font/han.woff?v3.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) format("opentype"), local("Hiragino Kaku Gothic ProN"), local("Hiragino Kaku Gothic Pro"), local(Meiryo), local("MS Gothic");
src: url(./font/han.woff?v3.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("MS Mincho");
src: url(./font/han.woff?v3.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(SimSun), local(PMingLiU);
src: url(./font/han.woff?v3.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) 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.0.2) format("woff"), url(./font/han.otf?v3.0.2) format("opentype"), local("Hiragino Mincho ProN"), local("Hiragino Mincho Pro"), local("Songti SC"), local(STSongti), local(SimSun), local(PMingLiU);
unicode-range: U+2026;
}
/* Curve quotes (“‘’”, GB-only) */
Expand Down Expand Up @@ -1391,7 +1393,7 @@ jinze {
*/
@font-face {
font-family: 'Biaodian Basic';
src: url(./font/han.woff?v3.0.1) format("woff"), url(./font/han.otf?v3.0.1) format("opentype");
src: url(./font/han.woff?v3.0.2) format("woff"), url(./font/han.otf?v3.0.2) format("opentype");
unicode-range: U+2014, U+2026, U+00B7;
}
@font-face {
Expand Down Expand Up @@ -1565,7 +1567,7 @@ jinze {
* Zhuyin Kaiti
*/
@font-face {
src: url(./font/han.woff?v3.0.1) format("woff"), url(./font/han.otf?v3.0.1) format("opentype");
src: url(./font/han.woff?v3.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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';
}
Expand All @@ -1575,23 +1577,23 @@ 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.0.1) format("woff"), url(./font/han.otf?v3.0.1) format("opentype");
src: local("Hiragino Sans GB"), local("Heiti TC"), local("Microsoft Jhenghei"), url(./font/han.woff?v3.0.2) format("woff"), url(./font/han.otf?v3.0.2) format("opentype");
}
@font-face {
font-family: 'Zhuyin Heiti';
src: local("Heiti TC"), local("Microsoft Jhenghei"), url(./font/han.woff?v3.0.1) format("woff"), url(./font/han.otf?v3.0.1) format("opentype");
src: local("Heiti TC"), local("Microsoft Jhenghei"), url(./font/han.woff?v3.0.2) format("woff"), url(./font/han.otf?v3.0.2) format("opentype");
unicode-range: U+3127;
}
@font-face {
src: url(./font/han.woff?v3.0.1) format("woff"), url(./font/han.otf?v3.0.1) format("opentype");
src: url(./font/han.woff?v3.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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;
}
/**
* Romanisation (checked tone ligature [陽入韻連字])
*/
@font-face {
src: url(./font/han.woff?v3.0.1) format("woff"), url(./font/han.otf?v3.0.1) format("opentype");
src: url(./font/han.woff?v3.0.2) format("woff"), url(./font/han.otf?v3.0.2) 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;
}
Expand Down
6 changes: 4 additions & 2 deletions latest/han.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 漢字標準格式 v3.0.1 | MIT License | css.hanzi.co
* 漢字標準格式 v3.0.2 | MIT License | css.hanzi.co
* Han: CSS typography framework optimised for Hanzi
*/

Expand All @@ -24,7 +24,7 @@ var body = document.body



var VERSION = '3.0.1',
var VERSION = '3.0.2',

ROUTINE = [
// Initialise the condition with feature-detecting
Expand Down Expand Up @@ -62,6 +62,8 @@ var VERSION = '3.0.1',
return this
}

Han.version = VERSION

Han.fn = Han.prototype = {
version: VERSION,

Expand Down
6 changes: 2 additions & 4 deletions latest/han.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions latest/han.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion latest/ruby(ff)-han.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions latest/test-commonjs.js

Large diffs are not rendered by default.

48 changes: 48 additions & 0 deletions v3.0.2/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
測試頁索引
========

- [測試頁(標準)](test.html)
- [測試頁(AMD模組)](test-amd.html)
- [測試頁(CommonJS模組,browserify)](test-commonjs.html)
- [測試頁(無JavaScript)](test-nojs.html)

## Normalisation(樣式標準化)

- [文字裝飾線元素](./deco-line.html)
- [強調元素(着重號)](./em.html)
- [行間注元素](./ruby.html)

## 字體
### 漢字

- [標點符號](./biaodian.html)
- [四大字體集](./four.html)
- [字體基型(typeface generics)與@extend](./generics.html)

### 其他

- [西文意大利體](./italic.html)
- [數字](./numeral.html)
- [標音(注音符號、羅馬拼音)](./ruby\(ff\).html)

## 排版
### 章節的組成

- [文章、章節與內容的邊界調整](./well-knit.html)
- [章節與目錄的計數](./counter.html)

### 行的組成

- [漢字西文混排間隙](./hws.html)
- [標點擠壓](./jiya.html)
- [字元的替換](./subst.html)

<!--
## 接口
- [強制標點禁則](./api/jinzify.html)
- [字元級選擇器](./api/charify.html)
- [相鄰文字裝飾線](./api/deco-line.html)
- [着重號](./api/em.html)
- [行間注元素](./api/ruby.html)
-->
Loading

0 comments on commit c27ced8

Please sign in to comment.