Added angular brackets and floor/ceiling brackets.

This commit is contained in:
be5invis 2015-12-09 23:08:15 +08:00
parent 05e5a24279
commit a96b8df9a9
4 changed files with 101 additions and 58 deletions

View File

@ -231,6 +231,8 @@ symbol-block 'L'
include capitalMarks
include : LShape CAP
turned 'turnL' 0xA780 'L' MIDDLE (CAP / 2)
create-glyph 'Lcaron' : glyph-construction
assign-unicode 0x13D
include glyphs.commaAbove
@ -305,6 +307,7 @@ symbol-block 'l'
select-variant 'l' 'l' [if para.italicangle 'italic' 'serifed']
alias 'palochka' 0x4CF 'l'
turned 'turnl' 0xA781 'l' MIDDLE (XH / 2) pMarks
create-glyph 'lcaron' : glyph-construction
assign-unicode 0x13E
@ -2280,6 +2283,7 @@ define {FShape} : symbol-block 'F'
### long s, and f
define {LongSShape} : symbol-block 'f'
define fovershoot : fallback para.fovershoot (O * 6)
define fbar : XH * 0.925
create-glyph 'longs.straight' : glyph-construction
set-width WIDTH
include bMarks
@ -2299,7 +2303,7 @@ define {LongSShape} : symbol-block 'f'
include : dispiro
widths.lhs
g4 r (CAP - HOOK)
hookstart (CAP - O) true
hookstart (CAP - O)
flat m (CAP - SMOOTHA)
curl m 0
if SLAB : begin
@ -2356,30 +2360,7 @@ define {LongSShape} : symbol-block 'f'
flat m1 XH [heading DOWNWARD]
curl m1 (DESCENDER + fine * 3)
CurlyTail fine rinner m1 DESCENDER (m1 - LONGJUT) x2 y2
create-glyph 'f.upright' : glyph-construction
include bMarks
local barleft : [mix SB RIGHTSB 0.35] - STROKE * 0.25 * CORRECTION_HX
include : dispiro
widths.lhs
g4 (RIGHTSB - OX * 2) (CAP - HOOK * 0.7)
hookstart (CAP - O) true
flat barleft [CAP - SMOOTHA * 0.85]
curl barleft 0
include : HBarTop [mix SB RIGHTSB 0] [mix SB RIGHTSB 0.95] (XH * 0.95)
if SLAB : include : HBarBottom [mix SB RIGHTSB 0.02] [mix SB RIGHTSB 0.875] 0
create-glyph 'f.italic' : glyph-construction
include glyphs.'longs.italic' AS_BASE
include : HBarTop (MIDDLE - LONGJUT) (MIDDLE + LONGJUT) XH
italic-variant 'f' 'f'
create-glyph 'fltail' : glyph-construction
assign-unicode 0x192
include glyphs.'longs.italic' AS_BASE
include : HBarTop (MIDDLE - LONGJUT) (MIDDLE + LONGJUT) XH
create-glyph 'ifishhook' : glyph-construction
assign-unicode 0x27F
include pMarks
@ -2396,8 +2377,69 @@ define {LongSShape} : symbol-block 'f'
include : VerticalHook MIDDLE (XH - HOOK - HALFSTROKE) (-LONGJUT) (-HOOK)
include : VerticalHook MIDDLE 0 LONGJUT HOOK
create-glyph 'f.upright' : glyph-construction
include bMarks
local barleft : [mix SB RIGHTSB 0.35] - STROKE * 0.25 * CORRECTION_HX
include : dispiro
widths.lhs
g4 (RIGHTSB - OX * 2) (CAP - HOOK * 0.7)
hookstart (CAP - O) true
flat barleft [CAP - SMOOTHA * 0.85]
curl barleft 0
include : HBarTop [mix SB RIGHTSB 0] [mix SB RIGHTSB 0.95] fbar
if SLAB : include : HBarBottom [mix SB RIGHTSB 0.02] [mix SB RIGHTSB 0.875] 0
create-glyph 'f.italic' : glyph-construction
include glyphs.'longs.italic' AS_BASE
include : HBarTop (MIDDLE - LONGJUT) (MIDDLE + LONGJUT) fbar
alias 'fltail' 0x192 'f.italic'
italic-variant 'f' 'f'
turned 'turnf' 0x25F 'f' MIDDLE (XH / 2) pMarks
symbol-block 'compatibility ligatures'
local shift (-(MIDDLE - STROKE * [if para.isItalic 0.25 0.75] - SB * 2))
local barr (RIGHTSB - SB * 0.5)
local hbarleft (SB + shift + STROKE * [if para.isItalic 0.5 0.25])
create-glyph 'f_i' : glyph-construction
assign-unicode 0xFB01
include bMarks
include : create-glyph : glyph-construction
include glyphs.longs
apply-transform : Translate shift 0
include : VBarRight barr 0 fbar
include : HBarTop hbarleft barr fbar
if SLAB : begin
if para.isItalic
: then : include : tagged 'serifRB' : RightwardBottomSerif barr 0 SIDEJUT
: else : include : tagged 'serifRB' : CenterBottomSerif (barr - HALFSTROKE * CORRECTION_HX) 0 JUT
create-glyph 'f_l.upright' : glyph-construction
local m : MIDDLE - JBALANCE - HALFSTROKE * CORRECTION_HX + shift
include : dispiro
widths.rhs
flat m 0
curl m (CAP - SMOOTHA)
hookend (CAP - O)
g4 (barr + OXHOOK) (CAP - HOOK)
include : VBarRight barr 0 (CAP - HOOK)
include : HBarTop hbarleft [mix SB barr 0.6] fbar
if SLAB : begin
include : tagged 'serifLB' : CenterBottomSerif (m + HALFSTROKE * CORRECTION_HX + RBALANCE * 0.35) 0 (JUT + RBALANCE * 0.65)
include : tagged 'serifRB' : CenterBottomSerif (barr - HALFSTROKE * CORRECTION_HX) 0 JUT
create-glyph 'f_l.italic' : glyph-construction
include : create-glyph : glyph-construction
include glyphs.'longs.italic' AS_BASE
apply-transform : Translate shift 0
include : VBarRight barr 0 CAP
include : HBarTop hbarleft [mix SB barr 0.65] fbar
if SLAB : include : tagged 'serifRB' : RightwardBottomSerif barr 0 SIDEJUT
italic-variant 'f_l' 0xFB02
* {LongSShape}
### E
@ -2510,9 +2552,11 @@ symbol-block 'T'
include capitalMarks
set-anchor 'bottomright' BASE (MIDDLE + HALFSTROKE * CORRECTION_HX) 0
include : TShape CAP
alias 'Tau' 0x3A4 'T'
alias 'cyrTe' 0x422 'T'
composite nothing 0x4AC { glyphs.cyrTe [CyrDescender (MIDDLE + HALFSTROKE * CORRECTION_HX)] ifMarks}
turned 'turnT' 0xA7B1 'T' MIDDLE (CAP / 2)
create-glyph 'cyrte.upright' : glyph-construction
include eMarks

View File

@ -118,34 +118,4 @@ symbol-block 'Letterlike Symbols'
assign-unicode 0x212E
include : SmallEShape CAP [adviceBlackness 4] (0.5 - [adviceBlackness 4] / CAP / 2)
turned 'turniota' 0x2129 'iota' MIDDLE (XH / 2)
symbol-block 'compatibility ligatures'
create-glyph 'f_i' : glyph-construction
assign-unicode 0xFB01
include bMarks
include : create-glyph : glyph-construction
include glyphs.longs
apply-transform : Translate (-(MIDDLE - HALFSTROKE - SB * 2)) 0
include : VBarRight (RIGHTSB - SB * 0.5) 0 XH
include : HBarTop SB (RIGHTSB - SB * 0.5) XH
if SLAB : begin
if (para.italicangle > 0)
: then : include : tagged 'serifRB' : RightwardBottomSerif (RIGHTSB - SB * 0.5) 0 SIDEJUT
: else : include : tagged 'serifRB' : CenterBottomSerif ((RIGHTSB - SB * 0.5) - HALFSTROKE * CORRECTION_HX) 0 JUT
create-glyph 'f_l' : glyph-construction
assign-unicode 0xFB02
include bMarks
include : create-glyph : glyph-construction
include glyphs.longs
apply-transform : Translate (-(MIDDLE - HALFSTROKE - SB * 2)) 0
include : VBarRight (RIGHTSB - SB * 0.5) 0 CAP
include : HBarTop SB (STROKE + SB * 4) XH
if SLAB : begin
if (para.italicangle > 0)
: then : include : tagged 'serifRB' : RightwardBottomSerif (RIGHTSB - SB * 0.5) 0 SIDEJUT
: else : include : tagged 'serifRB' : CenterBottomSerif ((RIGHTSB - SB * 0.5) - HALFSTROKE * CORRECTION_HX) 0 JUT
turned 'turniota' 0x2129 'iota' MIDDLE (XH / 2)

View File

@ -37,7 +37,6 @@ symbol-block 'Brackets'
quadcontrols 0 p
g4 [mix SB RIGHTSB parenInside] parenBot
create-glyph 'parenRight' : glyph-construction
set-width WIDTH
assign-unicode ')'
@ -95,6 +94,36 @@ symbol-block 'Brackets'
include glyphs.braceLeft
include : FlipAround MIDDLE parenMid
create-glyph 'angleLeft' : glyph-construction
assign-unicode 0x2329
local fatten : Math.hypot 1 (([mix SB RIGHTSB : parenInside - parenOutside] - O) / (parenTop - parenMid))
include : dispiro
widths.lhs
flat [mix SB RIGHTSB parenInside] parenTop
curl ([mix SB RIGHTSB parenOutside] + O) parenMid [widths.heading (STROKE * fatten) 0 DOWNWARD]
include : dispiro
widths.rhs
flat [mix SB RIGHTSB parenInside] parenBot
curl ([mix SB RIGHTSB parenOutside] + O) parenMid [widths.heading 0 (STROKE * fatten) UPWARD]
alias 'mangleLeft' 0x27E8 'angleLeft'
turned 'angleRight' 0x232A 'angleLeft' MIDDLE parenMid
alias 'mangleRight' 0x27E9 'angleRight'
dual 'dblangleLeft' 0x27EA 'angleLeft' (WIDTH * 0.35)
dual 'dblangleRight' 0x27EB 'angleRight' (WIDTH * 0.35)
create-glyph 'ceilingLeft' : glyph-construction
assign-unicode 0x2308
include : HBarTop [mix SB RIGHTSB bracketOutside] [mix SB RIGHTSB bracketInside] parenTop
include : VBarLeft [mix SB RIGHTSB bracketOutside] parenBot parenTop
create-glyph 'floorLeft' : glyph-construction
assign-unicode 0x230A
include : HBarBottom [mix SB RIGHTSB bracketOutside] [mix SB RIGHTSB bracketInside] parenBot
include : VBarLeft [mix SB RIGHTSB bracketOutside] parenBot parenTop
turned 'floorRight' 0x230B 'ceilingLeft' MIDDLE parenMid
turned 'ceilingRight' 0x2309 'floorLeft' MIDDLE parenMid
symbol-block 'Small Punctuations'
create-glyph 'period' : glyph-construction

View File

@ -229,7 +229,7 @@
</div>
</div>
<div id="display" class="show {{currentFont.cls}}">
<p class="waterfall" v-for="size in waterfall" style="font-size:{{size / 14}}rem">The quick brown fox jumps over the lazy dog. xjx</p>
<p class="waterfall" v-for="size in waterfall" style="font-size:{{size / 14}}rem">The quick brown fox jumps over the lazy dog. 〈x〉</p>
<p class="lipsum" v-for="item in lipsums">{{item}}</p>
<pre><code class=patel><span class=keyword>define</span> samples : <span class=keyword>object</span><template v-for="sample in samples">
{<span class=qualifier>.lang</span> <span class=string>'{{sample.lang}}'</span>{{sample.spaces}}<span class=qualifier>.sample</span> <span class=string lang="{{sample.code}}">'{{{sample.sample}}}'</span>}<span class=comment>{{sample.comment}}</span></template></code></pre>