Merge branch 'dev'

This commit is contained in:
Belleve Invis 2020-04-05 07:21:25 -07:00
commit f13da6edcb
12 changed files with 50 additions and 43 deletions

View file

@ -24,7 +24,7 @@ The typeface contains 9 weights (Thin to Heavy) alongside with both italic and o
![Weights sample](https://raw.githubusercontent.com/be5invis/Iosevka/master/images/weights.png) ![Weights sample](https://raw.githubusercontent.com/be5invis/Iosevka/master/images/weights.png)
All versions include the same ranges of characters: Latin letters, Greek letters (including Polytonic), some Cyrillic letters, IPA symbols and common punctuations and some symbols. You can check out the full list [here](http://be5invis.github.io/Iosevka/specimen.html). All versions include the same ranges of characters: Latin letters, Greek letters (including Polytonic), some Cyrillic letters, IPA symbols and common punctuations and some symbols. You can check out the full list [here](http://be5invis.github.io/Iosevka/specimen).
![Languages Sample](https://raw.githubusercontent.com/be5invis/Iosevka/master/images/languages.png) ![Languages Sample](https://raw.githubusercontent.com/be5invis/Iosevka/master/images/languages.png)

View file

@ -916,7 +916,7 @@ glyph-block Symbol-Punctuation : begin
do 'Interpuncts' do 'Interpuncts'
sketch # interpunct sketch # interpunct
include : DotAt MIDDLE symbolMid (PERIODRADIUS - O) include : DotAt MIDDLE symbolMid (PERIODRADIUS - O)
save 'period.center' save 'period.mid'
save 'interpunct' 0xB7 save 'interpunct' 0xB7
save 'greekbullet' 0x387 save 'greekbullet' 0x387
save 'bullet' 0x2022 save 'bullet' 0x2022
@ -1379,9 +1379,10 @@ glyph-block Symbol-Punctuation : begin
do "Ligation Variants" do "Ligation Variants"
define dotLikePunctuations : list define dotLikePunctuations : list
* "colon" * "colon"
* "colon.mid"
* "semicolon" * "semicolon"
* "period" * "period"
* "period.center" * "period.mid"
* "comma" * "comma"
* "question" * "question"
* "exclam" * "exclam"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 KiB

After

Width:  |  Height:  |  Size: 184 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 399 KiB

After

Width:  |  Height:  |  Size: 399 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 337 KiB

After

Width:  |  Height:  |  Size: 340 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 KiB

After

Width:  |  Height:  |  Size: 174 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 337 KiB

After

Width:  |  Height:  |  Size: 337 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 957 KiB

After

Width:  |  Height:  |  Size: 957 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 KiB

After

Width:  |  Height:  |  Size: 318 KiB

Before After
Before After

View file

@ -56,9 +56,10 @@ export : define [buildLigations sink para plm glyphs] : foreach [ {featureName m
} }
define dottyPunctuations : list define dottyPunctuations : list
* "colon" * "colon"
* "colon.mid"
* "semicolon" * "semicolon"
* "period" * "period"
* "period.center" * "period.mid"
* "comma" * "comma"
* "question" * "question"
* "exclam" * "exclam"
@ -85,8 +86,8 @@ export : define [buildLigations sink para plm glyphs] : foreach [ {featureName m
define [colon_center] ({'colon' 'colon.mid'} ~> {'colon.mid' 'colon.mid'}) define [colon_center] ({'colon' 'colon.mid'} ~> {'colon.mid' 'colon.mid'})
define [caret_center] ({'asciicaret'} ~> {'asciicaret.low'}) define [caret_center] ({'asciicaret'} ~> {'asciicaret.low'})
define [tilde_center] ({'asciitilde'} ~> {'asciitilde.low'}) define [tilde_center] ({'asciitilde'} ~> {'asciitilde.low'})
define [period_center] ({'period'} ~> {'period.center'}) define [period_center] ({'period'} ~> {'period.mid'})
define [no_period_center] ({'period.center'} ~> {'period'}) define [no_period_center] ({'period.mid'} ~> {'period'})
local ligationLookupName : 'lig_' + featureName + '-' + mappedFeature local ligationLookupName : 'lig_' + featureName + '-' + mappedFeature
@ -220,13 +221,13 @@ export : define [buildLigations sink para plm glyphs] : foreach [ {featureName m
# Colon chains # Colon chains
chain-rule chain-rule
[dRight.concat dMid] ~> preserved [dRight.concat dMid] ~> preserved
dottyPunctuations ~> [only 'colons' dMid] dottyPunctuations ~> [only 'kern-dotty' dMid]
dottyPunctuations ~> preserved dottyPunctuations ~> preserved
chain-rule chain-rule
[dRight.concat dMid] ~> preserved [dRight.concat dMid] ~> preserved
dottyPunctuations ~> [only 'colons' dLeft] dottyPunctuations ~> [only 'kern-dotty' dLeft]
chain-rule chain-rule
dottyPunctuations ~> [only 'colons' dRight] dottyPunctuations ~> [only 'kern-dotty' dRight]
dottyPunctuations ~> preserved dottyPunctuations ~> preserved
includeLookup includeLookup
.type 'gsub_chaining' .type 'gsub_chaining'
@ -234,19 +235,24 @@ export : define [buildLigations sink para plm glyphs] : foreach [ {featureName m
# Colon chains # Colon chains
chain-rule chain-rule
boundary ~> preserved boundary ~> preserved
dRight ~> [only 'colons' dMid] dRight ~> [only 'kern-dotty' dMid]
[dMid.concat dLeft] ~> preserved [dMid.concat dLeft] ~> preserved
chain-rule
boundary ~> preserved
dRight ~> advance
dLeft ~> advance
boundary ~> preserved
chain-rule chain-rule
[dMid.concat dRight] ~> preserved [dMid.concat dRight] ~> preserved
dLeft ~> [only 'colons' dMid] dLeft ~> [only 'kern-dotty' dMid]
boundary ~> preserved boundary ~> preserved
includeLookup includeLookup
.type 'gsub_chaining' .type 'gsub_chaining'
.subtables : list .subtables : list
# Colon chains # Colon chains
chain-rule chain-rule
dRight ~> [only 'colons' dRightHalf] dRight ~> [only 'kern-dotty' dRightHalf]
dLeft ~> [only 'colons' dLeftHalf] dLeft ~> [only 'kern-dotty' dLeftHalf]
do "Plus chains" : begin do "Plus chains" : begin
includeLookup includeLookup

View file

@ -739,7 +739,7 @@
<td colspan="2" style="font-feature-settings:'calt' on"> <td colspan="2" style="font-feature-settings:'calt' on">
<pre><s>-&lt;&lt;</s> <s>-&lt;</s> <s>-&lt;-</s> <em class="rank-1">&lt;--</em> <em class="rank-1">&lt;---</em> <em class="rank-1">&lt;&lt;-</em> <em class="rank-1">&lt;-</em> <em class="rank-1">-&gt;</em> <em class="rank-1">-&gt;&gt;</em> <em class="rank-1">--&gt;</em> <em class="rank-1">---&gt;</em> <s>-&gt;-</s> <s>&gt;-</s> <s>&gt;&gt;-</s> <em class="rank-1">&lt;-&gt;</em> <em class="rank-1">&lt;--&gt;</em> <em class="rank-1">&lt;---&gt;</em> <em class="rank-1">&lt;----&gt;</em> <em class="rank-1">&lt;!--</em></pre> <pre><s>-&lt;&lt;</s> <s>-&lt;</s> <s>-&lt;-</s> <em class="rank-1">&lt;--</em> <em class="rank-1">&lt;---</em> <em class="rank-1">&lt;&lt;-</em> <em class="rank-1">&lt;-</em> <em class="rank-1">-&gt;</em> <em class="rank-1">-&gt;&gt;</em> <em class="rank-1">--&gt;</em> <em class="rank-1">---&gt;</em> <s>-&gt;-</s> <s>&gt;-</s> <s>&gt;&gt;-</s> <em class="rank-1">&lt;-&gt;</em> <em class="rank-1">&lt;--&gt;</em> <em class="rank-1">&lt;---&gt;</em> <em class="rank-1">&lt;----&gt;</em> <em class="rank-1">&lt;!--</em></pre>
<pre><s>=&lt;&lt;</s> <s>=&lt;</s> <s>=&lt;=</s> <em class="rank-1">&lt;==</em> <em class="rank-1">&lt;===</em> <em class="rank-1">&lt;&lt;=</em> <em class="rank-1">&lt;=</em> <em class="rank-1">=&gt;</em> <em class="rank-1">=&gt;&gt;</em> <em class="rank-1">==&gt;</em> <em class="rank-1">===&gt;</em> <s>=&gt;=</s> <em class="rank-1">&gt;=</em> <s>&gt;&gt;=</s> <em class="rank-1">&lt;=&gt;</em> <em class="rank-1">&lt;==&gt;</em> <em class="rank-1">&lt;===&gt;</em> <em class="rank-1">&lt;====&gt;</em> <em class="rank-1">&lt;!---</em></pre> <pre><s>=&lt;&lt;</s> <s>=&lt;</s> <s>=&lt;=</s> <em class="rank-1">&lt;==</em> <em class="rank-1">&lt;===</em> <em class="rank-1">&lt;&lt;=</em> <em class="rank-1">&lt;=</em> <em class="rank-1">=&gt;</em> <em class="rank-1">=&gt;&gt;</em> <em class="rank-1">==&gt;</em> <em class="rank-1">===&gt;</em> <s>=&gt;=</s> <em class="rank-1">&gt;=</em> <s>&gt;&gt;=</s> <em class="rank-1">&lt;=&gt;</em> <em class="rank-1">&lt;==&gt;</em> <em class="rank-1">&lt;===&gt;</em> <em class="rank-1">&lt;====&gt;</em> <em class="rank-1">&lt;!---</em></pre>
<pre><em class="rank-1">&lt;------</em> <em class="rank-1">------&gt;</em> <em class="rank-1">&lt;=====&gt;</em> <em class="rank-1">&lt;~~</em> <em class="rank-1">&lt;~</em> <em class="rank-1">~&gt;</em> <em class="rank-1">~~&gt;</em> <s>::</s> <s>:::</s> <s>\/</s> <s>/\</s> <em class="rank-1">==</em> <em class="rank-1">!=</em> <s>/=</s> <s>~=</s> <s>&lt;&gt;</s> <em class="rank-1">===</em> <em class="rank-1">!==</em> <s>=/=</s> <s>=!=</s></pre> <pre><em class="rank-1">&lt;------</em> <em class="rank-1">------&gt;</em> <em class="rank-1">&lt;=====&gt;</em> <em class="rank-1">&lt;~~</em> <em class="rank-1">&lt;~</em> <em class="rank-1">~&gt;</em> <em class="rank-1">~~&gt;</em> <em class="rank-1">::</em> <em class="rank-1">:::</em> <s>\/</s> <s>/\</s> <em class="rank-1">==</em> <em class="rank-1">!=</em> <s>/=</s> <s>~=</s> <s>&lt;&gt;</s> <em class="rank-1">===</em> <em class="rank-1">!==</em> <s>=/=</s> <s>=!=</s></pre>
<pre><em class="rank-1">:=</em> <em class="rank-1">:-</em> <em class="rank-1">:+</em> <em class="rank-1">&lt;*</em> <em class="rank-1">&lt;*&gt;</em> <em class="rank-1">*&gt;</em> <em class="rank-1">&lt;|</em> <em class="rank-1">&lt;|&gt;</em> <em class="rank-1">|&gt;</em> <s>&lt;.</s> <s>&lt;.&gt;</s> <s>.&gt;</s> <em class="rank-1">+:</em> <em class="rank-1">-:</em> <em class="rank-1">=:</em> <em class="rank-1">&lt;******&gt;</em> <s>(* comm *)</s> <em class="rank-1">++</em> <em class="rank-1">+++</em> <s>|-</s> <s>-|</s></pre> <pre><em class="rank-1">:=</em> <em class="rank-1">:-</em> <em class="rank-1">:+</em> <em class="rank-1">&lt;*</em> <em class="rank-1">&lt;*&gt;</em> <em class="rank-1">*&gt;</em> <em class="rank-1">&lt;|</em> <em class="rank-1">&lt;|&gt;</em> <em class="rank-1">|&gt;</em> <s>&lt;.</s> <s>&lt;.&gt;</s> <s>.&gt;</s> <em class="rank-1">+:</em> <em class="rank-1">-:</em> <em class="rank-1">=:</em> <em class="rank-1">&lt;******&gt;</em> <s>(* comm *)</s> <em class="rank-1">++</em> <em class="rank-1">+++</em> <s>|-</s> <s>-|</s></pre>
</td> </td>
</tr> </tr>
@ -751,7 +751,7 @@
<td colspan="2" style="font-feature-settings: 'calt' off, 'dlig' on"> <td colspan="2" style="font-feature-settings: 'calt' off, 'dlig' on">
<pre><em class="rank-1">-&lt;&lt;</em> <em class="rank-1">-&lt;</em> <em class="rank-1">-&lt;-</em> <em class="rank-1">&lt;--</em> <em class="rank-1">&lt;---</em> <em class="rank-1">&lt;&lt;-</em> <em class="rank-1">&lt;-</em> <em class="rank-1">-&gt;</em> <em class="rank-1">-&gt;&gt;</em> <em class="rank-1">--&gt;</em> <em class="rank-1">---&gt;</em> <em class="rank-1">-&gt;-</em> <em class="rank-1">&gt;-</em> <em class="rank-1">&gt;&gt;-</em> <em class="rank-1">&lt;-&gt;</em> <em class="rank-1">&lt;--&gt;</em> <em class="rank-1">&lt;---&gt;</em> <em class="rank-1">&lt;----&gt;</em> <em class="rank-1">&lt;!--</em></pre> <pre><em class="rank-1">-&lt;&lt;</em> <em class="rank-1">-&lt;</em> <em class="rank-1">-&lt;-</em> <em class="rank-1">&lt;--</em> <em class="rank-1">&lt;---</em> <em class="rank-1">&lt;&lt;-</em> <em class="rank-1">&lt;-</em> <em class="rank-1">-&gt;</em> <em class="rank-1">-&gt;&gt;</em> <em class="rank-1">--&gt;</em> <em class="rank-1">---&gt;</em> <em class="rank-1">-&gt;-</em> <em class="rank-1">&gt;-</em> <em class="rank-1">&gt;&gt;-</em> <em class="rank-1">&lt;-&gt;</em> <em class="rank-1">&lt;--&gt;</em> <em class="rank-1">&lt;---&gt;</em> <em class="rank-1">&lt;----&gt;</em> <em class="rank-1">&lt;!--</em></pre>
<pre><em class="rank-1">=&lt;&lt;</em> <em class="rank-1">=&lt;</em> <em class="rank-1">=&lt;=</em> <em class="rank-1">&lt;==</em> <em class="rank-1">&lt;===</em> <em class="rank-1">&lt;&lt;=</em> <em class="rank-1">&lt;=</em> <em class="rank-1">=&gt;</em> <em class="rank-1">=&gt;&gt;</em> <em class="rank-1">==&gt;</em> <em class="rank-1">===&gt;</em> <em class="rank-1">=&gt;=</em> <em class="rank-1">&gt;=</em> <em class="rank-1">&gt;&gt;=</em> <em class="rank-1">&lt;=&gt;</em> <em class="rank-1">&lt;==&gt;</em> <em class="rank-1">&lt;===&gt;</em> <em class="rank-1">&lt;====&gt;</em> <em class="rank-1">&lt;!---</em></pre> <pre><em class="rank-1">=&lt;&lt;</em> <em class="rank-1">=&lt;</em> <em class="rank-1">=&lt;=</em> <em class="rank-1">&lt;==</em> <em class="rank-1">&lt;===</em> <em class="rank-1">&lt;&lt;=</em> <em class="rank-1">&lt;=</em> <em class="rank-1">=&gt;</em> <em class="rank-1">=&gt;&gt;</em> <em class="rank-1">==&gt;</em> <em class="rank-1">===&gt;</em> <em class="rank-1">=&gt;=</em> <em class="rank-1">&gt;=</em> <em class="rank-1">&gt;&gt;=</em> <em class="rank-1">&lt;=&gt;</em> <em class="rank-1">&lt;==&gt;</em> <em class="rank-1">&lt;===&gt;</em> <em class="rank-1">&lt;====&gt;</em> <em class="rank-1">&lt;!---</em></pre>
<pre><em class="rank-1">&lt;------</em> <em class="rank-1">------&gt;</em> <em class="rank-1">&lt;=====&gt;</em> <em class="rank-1">&lt;~~</em> <em class="rank-1">&lt;~</em> <em class="rank-1">~&gt;</em> <em class="rank-1">~~&gt;</em> <s>::</s> <s>:::</s> <em class="rank-1">\/</em> <em class="rank-1">/\</em> <em class="rank-1">==</em> <em class="rank-1">!=</em> <s>/=</s> <s>~=</s> <em class="rank-1">&lt;&gt;</em> <em class="rank-1">===</em> <em class="rank-1">!==</em> <s>=/=</s> <s>=!=</s></pre> <pre><em class="rank-1">&lt;------</em> <em class="rank-1">------&gt;</em> <em class="rank-1">&lt;=====&gt;</em> <em class="rank-1">&lt;~~</em> <em class="rank-1">&lt;~</em> <em class="rank-1">~&gt;</em> <em class="rank-1">~~&gt;</em> <em class="rank-1">::</em> <em class="rank-1">:::</em> <em class="rank-1">\/</em> <em class="rank-1">/\</em> <em class="rank-1">==</em> <em class="rank-1">!=</em> <s>/=</s> <s>~=</s> <em class="rank-1">&lt;&gt;</em> <em class="rank-1">===</em> <em class="rank-1">!==</em> <s>=/=</s> <s>=!=</s></pre>
<pre><em class="rank-1">:=</em> <em class="rank-1">:-</em> <em class="rank-1">:+</em> <em class="rank-1">&lt;*</em> <em class="rank-1">&lt;*&gt;</em> <em class="rank-1">*&gt;</em> <em class="rank-1">&lt;|</em> <em class="rank-1">&lt;|&gt;</em> <em class="rank-1">|&gt;</em> <em class="rank-1">&lt;.</em> <em class="rank-1">&lt;.&gt;</em> <em class="rank-1">.&gt;</em> <em class="rank-1">+:</em> <em class="rank-1">-:</em> <em class="rank-1">=:</em> <em class="rank-1">&lt;******&gt;</em> <em class="rank-1">(* comm *)</em> <em class="rank-1">++</em> <em class="rank-1">+++</em> <em class="rank-1">|-</em> <em class="rank-1">-|</em></pre> <pre><em class="rank-1">:=</em> <em class="rank-1">:-</em> <em class="rank-1">:+</em> <em class="rank-1">&lt;*</em> <em class="rank-1">&lt;*&gt;</em> <em class="rank-1">*&gt;</em> <em class="rank-1">&lt;|</em> <em class="rank-1">&lt;|&gt;</em> <em class="rank-1">|&gt;</em> <em class="rank-1">&lt;.</em> <em class="rank-1">&lt;.&gt;</em> <em class="rank-1">.&gt;</em> <em class="rank-1">+:</em> <em class="rank-1">-:</em> <em class="rank-1">=:</em> <em class="rank-1">&lt;******&gt;</em> <em class="rank-1">(* comm *)</em> <em class="rank-1">++</em> <em class="rank-1">+++</em> <em class="rank-1">|-</em> <em class="rank-1">-|</em></pre>
</td> </td>
</tr> </tr>
@ -763,7 +763,7 @@
<td colspan="2" style="font-feature-settings: 'calt' off, 'JSPT' on"> <td colspan="2" style="font-feature-settings: 'calt' off, 'JSPT' on">
<pre><s>-&lt;&lt;</s> <s>-&lt;</s> <s>-&lt;-</s> <em class="rank-1">&lt;--</em> <em class="rank-1">&lt;---</em> <em class="rank-1">&lt;&lt;-</em> <em class="rank-1">&lt;-</em> <em class="rank-1">-&gt;</em> <em class="rank-1">-&gt;&gt;</em> <em class="rank-1">--&gt;</em> <em class="rank-1">---&gt;</em> <s>-&gt;-</s> <s>&gt;-</s> <s>&gt;&gt;-</s> <em class="rank-1">&lt;-&gt;</em> <em class="rank-1">&lt;--&gt;</em> <em class="rank-1">&lt;---&gt;</em> <em class="rank-1">&lt;----&gt;</em> <em class="rank-1">&lt;!--</em></pre> <pre><s>-&lt;&lt;</s> <s>-&lt;</s> <s>-&lt;-</s> <em class="rank-1">&lt;--</em> <em class="rank-1">&lt;---</em> <em class="rank-1">&lt;&lt;-</em> <em class="rank-1">&lt;-</em> <em class="rank-1">-&gt;</em> <em class="rank-1">-&gt;&gt;</em> <em class="rank-1">--&gt;</em> <em class="rank-1">---&gt;</em> <s>-&gt;-</s> <s>&gt;-</s> <s>&gt;&gt;-</s> <em class="rank-1">&lt;-&gt;</em> <em class="rank-1">&lt;--&gt;</em> <em class="rank-1">&lt;---&gt;</em> <em class="rank-1">&lt;----&gt;</em> <em class="rank-1">&lt;!--</em></pre>
<pre><s>=&lt;&lt;</s> <s>=&lt;</s> <s>=&lt;=</s> <em class="rank-1">&lt;==</em> <em class="rank-1">&lt;===</em> <em class="rank-1">&lt;&lt;=</em> <em class="rank-1">&lt;=</em> <em class="rank-1">=&gt;</em> <em class="rank-1">=&gt;&gt;</em> <em class="rank-1">==&gt;</em> <em class="rank-1">===&gt;</em> <s>=&gt;=</s> <em class="rank-1">&gt;=</em> <s>&gt;&gt;=</s> <em class="rank-1">&lt;=&gt;</em> <em class="rank-1">&lt;==&gt;</em> <em class="rank-1">&lt;===&gt;</em> <em class="rank-1">&lt;====&gt;</em> <em class="rank-1">&lt;!---</em></pre> <pre><s>=&lt;&lt;</s> <s>=&lt;</s> <s>=&lt;=</s> <em class="rank-1">&lt;==</em> <em class="rank-1">&lt;===</em> <em class="rank-1">&lt;&lt;=</em> <em class="rank-1">&lt;=</em> <em class="rank-1">=&gt;</em> <em class="rank-1">=&gt;&gt;</em> <em class="rank-1">==&gt;</em> <em class="rank-1">===&gt;</em> <s>=&gt;=</s> <em class="rank-1">&gt;=</em> <s>&gt;&gt;=</s> <em class="rank-1">&lt;=&gt;</em> <em class="rank-1">&lt;==&gt;</em> <em class="rank-1">&lt;===&gt;</em> <em class="rank-1">&lt;====&gt;</em> <em class="rank-1">&lt;!---</em></pre>
<pre><em class="rank-1">&lt;------</em> <em class="rank-1">------&gt;</em> <em class="rank-1">&lt;=====&gt;</em> <em class="rank-1">&lt;~~</em> <em class="rank-1">&lt;~</em> <em class="rank-1">~&gt;</em> <em class="rank-1">~~&gt;</em> <s>::</s> <s>:::</s> <s>\/</s> <s>/\</s> <em class="rank-1">==</em> <em class="rank-1">!=</em> <s>/=</s> <s>~=</s> <s>&lt;&gt;</s> <em class="rank-2">===</em> <em class="rank-2">!==</em> <s>=/=</s> <s>=!=</s></pre> <pre><em class="rank-1">&lt;------</em> <em class="rank-1">------&gt;</em> <em class="rank-1">&lt;=====&gt;</em> <em class="rank-1">&lt;~~</em> <em class="rank-1">&lt;~</em> <em class="rank-1">~&gt;</em> <em class="rank-1">~~&gt;</em> <em class="rank-1">::</em> <em class="rank-1">:::</em> <s>\/</s> <s>/\</s> <em class="rank-1">==</em> <em class="rank-1">!=</em> <s>/=</s> <s>~=</s> <s>&lt;&gt;</s> <em class="rank-2">===</em> <em class="rank-2">!==</em> <s>=/=</s> <s>=!=</s></pre>
<pre><em class="rank-1">:=</em> <em class="rank-1">:-</em> <em class="rank-1">:+</em> <em class="rank-1">&lt;*</em> <em class="rank-1">&lt;*&gt;</em> <em class="rank-1">*&gt;</em> <em class="rank-1">&lt;|</em> <em class="rank-1">&lt;|&gt;</em> <em class="rank-1">|&gt;</em> <s>&lt;.</s> <s>&lt;.&gt;</s> <s>.&gt;</s> <em class="rank-1">+:</em> <em class="rank-1">-:</em> <em class="rank-1">=:</em> <em class="rank-1">&lt;******&gt;</em> <s>(* comm *)</s> <em class="rank-1">++</em> <em class="rank-1">+++</em> <s>|-</s> <s>-|</s></pre> <pre><em class="rank-1">:=</em> <em class="rank-1">:-</em> <em class="rank-1">:+</em> <em class="rank-1">&lt;*</em> <em class="rank-1">&lt;*&gt;</em> <em class="rank-1">*&gt;</em> <em class="rank-1">&lt;|</em> <em class="rank-1">&lt;|&gt;</em> <em class="rank-1">|&gt;</em> <s>&lt;.</s> <s>&lt;.&gt;</s> <s>.&gt;</s> <em class="rank-1">+:</em> <em class="rank-1">-:</em> <em class="rank-1">=:</em> <em class="rank-1">&lt;******&gt;</em> <s>(* comm *)</s> <em class="rank-1">++</em> <em class="rank-1">+++</em> <s>|-</s> <s>-|</s></pre>
</td> </td>
</tr> </tr>
@ -799,7 +799,7 @@
<td colspan="2" style="font-feature-settings: 'calt' off, 'HSKL' on"> <td colspan="2" style="font-feature-settings: 'calt' off, 'HSKL' on">
<pre><em class="rank-1">-&lt;&lt;</em> <em class="rank-1">-&lt;</em> <em class="rank-1">-&lt;-</em> <em class="rank-1">&lt;--</em> <em class="rank-1">&lt;---</em> <em class="rank-1">&lt;&lt;-</em> <em class="rank-1">&lt;-</em> <em class="rank-1">-&gt;</em> <em class="rank-1">-&gt;&gt;</em> <em class="rank-1">--&gt;</em> <em class="rank-1">---&gt;</em> <em class="rank-1">-&gt;-</em> <em class="rank-1">&gt;-</em> <em class="rank-1">&gt;&gt;-</em> <em class="rank-1">&lt;-&gt;</em> <em class="rank-1">&lt;--&gt;</em> <em class="rank-1">&lt;---&gt;</em> <em class="rank-1">&lt;----&gt;</em> <s>&lt;!--</s></pre> <pre><em class="rank-1">-&lt;&lt;</em> <em class="rank-1">-&lt;</em> <em class="rank-1">-&lt;-</em> <em class="rank-1">&lt;--</em> <em class="rank-1">&lt;---</em> <em class="rank-1">&lt;&lt;-</em> <em class="rank-1">&lt;-</em> <em class="rank-1">-&gt;</em> <em class="rank-1">-&gt;&gt;</em> <em class="rank-1">--&gt;</em> <em class="rank-1">---&gt;</em> <em class="rank-1">-&gt;-</em> <em class="rank-1">&gt;-</em> <em class="rank-1">&gt;&gt;-</em> <em class="rank-1">&lt;-&gt;</em> <em class="rank-1">&lt;--&gt;</em> <em class="rank-1">&lt;---&gt;</em> <em class="rank-1">&lt;----&gt;</em> <s>&lt;!--</s></pre>
<pre><em class="rank-1">=&lt;&lt;</em> <em class="rank-1">=&lt;</em> <em class="rank-1">=&lt;=</em> <em class="rank-1">&lt;==</em> <em class="rank-1">&lt;===</em> <em class="rank-1">&lt;&lt;=</em> <em class="rank-1">&lt;=</em> <em class="rank-1">=&gt;</em> <em class="rank-1">=&gt;&gt;</em> <em class="rank-1">==&gt;</em> <em class="rank-1">===&gt;</em> <em class="rank-1">=&gt;=</em> <em class="rank-1">&gt;=</em> <em class="rank-1">&gt;&gt;=</em> <em class="rank-1">&lt;=&gt;</em> <em class="rank-1">&lt;==&gt;</em> <em class="rank-1">&lt;===&gt;</em> <em class="rank-1">&lt;====&gt;</em> <s>&lt;!---</s></pre> <pre><em class="rank-1">=&lt;&lt;</em> <em class="rank-1">=&lt;</em> <em class="rank-1">=&lt;=</em> <em class="rank-1">&lt;==</em> <em class="rank-1">&lt;===</em> <em class="rank-1">&lt;&lt;=</em> <em class="rank-1">&lt;=</em> <em class="rank-1">=&gt;</em> <em class="rank-1">=&gt;&gt;</em> <em class="rank-1">==&gt;</em> <em class="rank-1">===&gt;</em> <em class="rank-1">=&gt;=</em> <em class="rank-1">&gt;=</em> <em class="rank-1">&gt;&gt;=</em> <em class="rank-1">&lt;=&gt;</em> <em class="rank-1">&lt;==&gt;</em> <em class="rank-1">&lt;===&gt;</em> <em class="rank-1">&lt;====&gt;</em> <s>&lt;!---</s></pre>
<pre><em class="rank-1">&lt;------</em> <em class="rank-1">------&gt;</em> <em class="rank-1">&lt;=====&gt;</em> <em class="rank-1">&lt;~~</em> <em class="rank-1">&lt;~</em> <em class="rank-1">~&gt;</em> <em class="rank-1">~~&gt;</em> <s>::</s> <s>:::</s> <em class="rank-1">\/</em> <em class="rank-1">/\</em> <em class="rank-1">==</em> <s>!=</s> <em class="rank-1">/=</em> <s>~=</s> <em class="rank-1">&lt;&gt;</em> <em class="rank-1">===</em> <s>!==</s> <em class="rank-1">=/=</em> <s>=!=</s></pre> <pre><em class="rank-1">&lt;------</em> <em class="rank-1">------&gt;</em> <em class="rank-1">&lt;=====&gt;</em> <em class="rank-1">&lt;~~</em> <em class="rank-1">&lt;~</em> <em class="rank-1">~&gt;</em> <em class="rank-1">~~&gt;</em> <em class="rank-1">::</em> <em class="rank-1">:::</em> <em class="rank-1">\/</em> <em class="rank-1">/\</em> <em class="rank-1">==</em> <s>!=</s> <em class="rank-1">/=</em> <s>~=</s> <em class="rank-1">&lt;&gt;</em> <em class="rank-1">===</em> <s>!==</s> <em class="rank-1">=/=</em> <s>=!=</s></pre>
<pre><em class="rank-1">:=</em> <em class="rank-1">:-</em> <em class="rank-1">:+</em> <em class="rank-1">&lt;*</em> <em class="rank-1">&lt;*&gt;</em> <em class="rank-1">*&gt;</em> <em class="rank-1">&lt;|</em> <em class="rank-1">&lt;|&gt;</em> <em class="rank-1">|&gt;</em> <em class="rank-1">&lt;.</em> <em class="rank-1">&lt;.&gt;</em> <em class="rank-1">.&gt;</em> <em class="rank-1">+:</em> <em class="rank-1">-:</em> <em class="rank-1">=:</em> <em class="rank-1">&lt;******&gt;</em> <s>(* comm *)</s> <em class="rank-1">++</em> <em class="rank-1">+++</em> <em class="rank-1">|-</em> <em class="rank-1">-|</em></pre> <pre><em class="rank-1">:=</em> <em class="rank-1">:-</em> <em class="rank-1">:+</em> <em class="rank-1">&lt;*</em> <em class="rank-1">&lt;*&gt;</em> <em class="rank-1">*&gt;</em> <em class="rank-1">&lt;|</em> <em class="rank-1">&lt;|&gt;</em> <em class="rank-1">|&gt;</em> <em class="rank-1">&lt;.</em> <em class="rank-1">&lt;.&gt;</em> <em class="rank-1">.&gt;</em> <em class="rank-1">+:</em> <em class="rank-1">-:</em> <em class="rank-1">=:</em> <em class="rank-1">&lt;******&gt;</em> <s>(* comm *)</s> <em class="rank-1">++</em> <em class="rank-1">+++</em> <em class="rank-1">|-</em> <em class="rank-1">-|</em></pre>
</td> </td>
</tr> </tr>
@ -835,7 +835,7 @@
<td colspan="2" style="font-feature-settings: 'calt' off, 'MTLB' on"> <td colspan="2" style="font-feature-settings: 'calt' off, 'MTLB' on">
<pre><s>-&lt;&lt;</s> <s>-&lt;</s> <s>-&lt;-</s> <em class="rank-1">&lt;--</em> <em class="rank-1">&lt;---</em> <em class="rank-1">&lt;&lt;-</em> <em class="rank-1">&lt;-</em> <em class="rank-1">-&gt;</em> <em class="rank-1">-&gt;&gt;</em> <em class="rank-1">--&gt;</em> <em class="rank-1">---&gt;</em> <s>-&gt;-</s> <s>&gt;-</s> <s>&gt;&gt;-</s> <em class="rank-1">&lt;-&gt;</em> <em class="rank-1">&lt;--&gt;</em> <em class="rank-1">&lt;---&gt;</em> <em class="rank-1">&lt;----&gt;</em> <em class="rank-1">&lt;!--</em></pre> <pre><s>-&lt;&lt;</s> <s>-&lt;</s> <s>-&lt;-</s> <em class="rank-1">&lt;--</em> <em class="rank-1">&lt;---</em> <em class="rank-1">&lt;&lt;-</em> <em class="rank-1">&lt;-</em> <em class="rank-1">-&gt;</em> <em class="rank-1">-&gt;&gt;</em> <em class="rank-1">--&gt;</em> <em class="rank-1">---&gt;</em> <s>-&gt;-</s> <s>&gt;-</s> <s>&gt;&gt;-</s> <em class="rank-1">&lt;-&gt;</em> <em class="rank-1">&lt;--&gt;</em> <em class="rank-1">&lt;---&gt;</em> <em class="rank-1">&lt;----&gt;</em> <em class="rank-1">&lt;!--</em></pre>
<pre><s>=&lt;&lt;</s> <s>=&lt;</s> <s>=&lt;=</s> <em class="rank-1">&lt;==</em> <em class="rank-1">&lt;===</em> <em class="rank-1">&lt;&lt;=</em> <em class="rank-1">&lt;=</em> <em class="rank-1">=&gt;</em> <em class="rank-1">=&gt;&gt;</em> <em class="rank-1">==&gt;</em> <em class="rank-1">===&gt;</em> <s>=&gt;=</s> <em class="rank-1">&gt;=</em> <s>&gt;&gt;=</s> <em class="rank-1">&lt;=&gt;</em> <em class="rank-1">&lt;==&gt;</em> <em class="rank-1">&lt;===&gt;</em> <em class="rank-1">&lt;====&gt;</em> <em class="rank-1">&lt;!---</em></pre> <pre><s>=&lt;&lt;</s> <s>=&lt;</s> <s>=&lt;=</s> <em class="rank-1">&lt;==</em> <em class="rank-1">&lt;===</em> <em class="rank-1">&lt;&lt;=</em> <em class="rank-1">&lt;=</em> <em class="rank-1">=&gt;</em> <em class="rank-1">=&gt;&gt;</em> <em class="rank-1">==&gt;</em> <em class="rank-1">===&gt;</em> <s>=&gt;=</s> <em class="rank-1">&gt;=</em> <s>&gt;&gt;=</s> <em class="rank-1">&lt;=&gt;</em> <em class="rank-1">&lt;==&gt;</em> <em class="rank-1">&lt;===&gt;</em> <em class="rank-1">&lt;====&gt;</em> <em class="rank-1">&lt;!---</em></pre>
<pre><em class="rank-1">&lt;------</em> <em class="rank-1">------&gt;</em> <em class="rank-1">&lt;=====&gt;</em> <em class="rank-1">&lt;~~</em> <em class="rank-1">&lt;~</em> <em class="rank-1">~&gt;</em> <em class="rank-1">~~&gt;</em> <s>::</s> <s>:::</s> <s>\/</s> <s>/\</s> <em class="rank-1">==</em> <s>!=</s> <s>/=</s> <em class="rank-1">~=</em> <s>&lt;&gt;</s> <em class="rank-1">===</em> <s>!==</s> <s>=/=</s> <s>=!=</s></pre> <pre><em class="rank-1">&lt;------</em> <em class="rank-1">------&gt;</em> <em class="rank-1">&lt;=====&gt;</em> <em class="rank-1">&lt;~~</em> <em class="rank-1">&lt;~</em> <em class="rank-1">~&gt;</em> <em class="rank-1">~~&gt;</em> <em class="rank-1">::</em> <em class="rank-1">:::</em> <s>\/</s> <s>/\</s> <em class="rank-1">==</em> <s>!=</s> <s>/=</s> <em class="rank-1">~=</em> <s>&lt;&gt;</s> <em class="rank-1">===</em> <s>!==</s> <s>=/=</s> <s>=!=</s></pre>
<pre><em class="rank-1">:=</em> <em class="rank-1">:-</em> <em class="rank-1">:+</em> <em class="rank-1">&lt;*</em> <em class="rank-1">&lt;*&gt;</em> <em class="rank-1">*&gt;</em> <em class="rank-1">&lt;|</em> <em class="rank-1">&lt;|&gt;</em> <em class="rank-1">|&gt;</em> <s>&lt;.</s> <s>&lt;.&gt;</s> <s>.&gt;</s> <em class="rank-1">+:</em> <em class="rank-1">-:</em> <em class="rank-1">=:</em> <em class="rank-1">&lt;******&gt;</em> <s>(* comm *)</s> <em class="rank-1">++</em> <em class="rank-1">+++</em> <s>|-</s> <s>-|</s></pre> <pre><em class="rank-1">:=</em> <em class="rank-1">:-</em> <em class="rank-1">:+</em> <em class="rank-1">&lt;*</em> <em class="rank-1">&lt;*&gt;</em> <em class="rank-1">*&gt;</em> <em class="rank-1">&lt;|</em> <em class="rank-1">&lt;|&gt;</em> <em class="rank-1">|&gt;</em> <s>&lt;.</s> <s>&lt;.&gt;</s> <s>.&gt;</s> <em class="rank-1">+:</em> <em class="rank-1">-:</em> <em class="rank-1">=:</em> <em class="rank-1">&lt;******&gt;</em> <s>(* comm *)</s> <em class="rank-1">++</em> <em class="rank-1">+++</em> <s>|-</s> <s>-|</s></pre>
</td> </td>
</tr> </tr>

View file

@ -3,7 +3,7 @@ const path = require("path");
const toml = require("toml"); const toml = require("toml");
function TAG(...ltag) { function TAG(...ltag) {
return function(s) { return function (s) {
return { tags: ltag, s: s }; return { tags: ltag, s: s };
}; };
} }
@ -24,7 +24,7 @@ const brst = TAG("brst");
const trig = TAG("trig"); const trig = TAG("trig");
const ltgt = TAG("ltgt-diamond", "ltgt-ne"); const ltgt = TAG("ltgt-diamond", "ltgt-ne");
const dotOper = TAG("dotoper"); const dotOper = TAG("dotoper");
const colons = TAG("colons"); const kernDotty = TAG("kern-dotty");
const htmlComment = TAG("html-comment"); const htmlComment = TAG("html-comment");
const plusplus = TAG("plusplus"); const plusplus = TAG("plusplus");
@ -48,7 +48,7 @@ const ligationSamples = [
arrow("<-->"), arrow("<-->"),
arrow("<--->"), arrow("<--->"),
arrow("<---->"), arrow("<---->"),
htmlComment("<!--") htmlComment("<!--"),
], ],
[ [
arrow2("=<<"), arrow2("=<<"),
@ -69,7 +69,7 @@ const ligationSamples = [
arrow("<==>"), arrow("<==>"),
arrow("<===>"), arrow("<===>"),
arrow("<====>"), arrow("<====>"),
htmlComment("<!---") htmlComment("<!---"),
], ],
[ [
arrow("<------"), arrow("<------"),
@ -79,8 +79,8 @@ const ligationSamples = [
arrow("<~"), arrow("<~"),
arrow("~>"), arrow("~>"),
arrow("~~>"), arrow("~~>"),
colons("::"), kernDotty("::"),
colons(":::"), kernDotty(":::"),
logc("\\/"), logc("\\/"),
logc("/\\"), logc("/\\"),
eqeq("=="), eqeq("=="),
@ -91,7 +91,7 @@ const ligationSamples = [
eqeqeq("==="), eqeqeq("==="),
exeqeq("!=="), exeqeq("!=="),
eqslasheq("=/="), eqslasheq("=/="),
eqexeq("=!=") eqexeq("=!="),
], ],
[ [
centerOps(":="), centerOps(":="),
@ -114,8 +114,8 @@ const ligationSamples = [
plusplus("++"), plusplus("++"),
plusplus("+++"), plusplus("+++"),
logc("|-"), logc("|-"),
logc("-|") logc("-|"),
] ],
]; ];
const ligationSamplesNarrow = [ const ligationSamplesNarrow = [
@ -129,7 +129,7 @@ const ligationSamplesNarrow = [
arrow("->>"), arrow("->>"),
arrow("-->"), arrow("-->"),
arrow("--->"), arrow("--->"),
htmlComment("<!--") htmlComment("<!--"),
], ],
[ [
arrow2("-<<"), arrow2("-<<"),
@ -140,7 +140,7 @@ const ligationSamplesNarrow = [
arrow2(">>-"), arrow2(">>-"),
arrow("<-->"), arrow("<-->"),
arrow("<--->"), arrow("<--->"),
arrow("<---->") arrow("<---->"),
], ],
[ [
arrow("<=="), arrow("<=="),
@ -152,7 +152,7 @@ const ligationSamplesNarrow = [
arrow("=>>"), arrow("=>>"),
arrow("==>"), arrow("==>"),
arrow("===>"), arrow("===>"),
htmlComment("<!---") htmlComment("<!---"),
], ],
[ [
arrow2("=<<"), arrow2("=<<"),
@ -163,7 +163,7 @@ const ligationSamplesNarrow = [
arrow2(">>="), arrow2(">>="),
arrow("<==>"), arrow("<==>"),
arrow("<===>"), arrow("<===>"),
arrow("<====>") arrow("<====>"),
], ],
[ [
arrow("<-------"), arrow("<-------"),
@ -172,7 +172,7 @@ const ligationSamplesNarrow = [
arrow("<~~"), arrow("<~~"),
arrow("<~"), arrow("<~"),
arrow("~>"), arrow("~>"),
arrow("~~>") arrow("~~>"),
], ],
[ [
logc("\\/"), logc("\\/"),
@ -185,7 +185,7 @@ const ligationSamplesNarrow = [
eqeqeq("==="), eqeqeq("==="),
exeqeq("!=="), exeqeq("!=="),
eqslasheq("=/="), eqslasheq("=/="),
eqexeq("=!=") eqexeq("=!="),
], ],
[ [
centerOps(":="), centerOps(":="),
@ -199,11 +199,11 @@ const ligationSamplesNarrow = [
trig("|>"), trig("|>"),
centerOps("+:"), centerOps("+:"),
centerOps("-:"), centerOps("-:"),
centerOps("=:") centerOps("=:"),
], ],
[ [
colons("::"), kernDotty("::"),
colons(":::"), kernDotty(":::"),
dotOper("<."), dotOper("<."),
dotOper("<.>"), dotOper("<.>"),
dotOper(".>"), dotOper(".>"),
@ -211,18 +211,18 @@ const ligationSamplesNarrow = [
plusplus("++"), plusplus("++"),
plusplus("+++"), plusplus("+++"),
logc("|-"), logc("|-"),
logc("-|") logc("-|"),
] ],
]; ];
module.exports = async function getLigationData() { module.exports = async function getLigationData() {
const ligToml = await fs.readFile(path.join(__dirname, "../../ligation-set.toml"), "utf8"); const ligToml = await fs.readFile(path.join(__dirname, "../../ligation-set.toml"), "utf8");
const ligData = toml.parse(ligToml); const ligData = toml.parse(ligToml);
const ligationSets = buildLigationSet(ligData, comp => comp.buildup.join(",")); const ligationSets = buildLigationSet(ligData, (comp) => comp.buildup.join(","));
const nonMergeLigationSets = buildLigationSet( const nonMergeLigationSets = buildLigationSet(
ligData, ligData,
comp => comp.tag + comp.buildup.join(",") (comp) => comp.tag + comp.buildup.join(",")
); );
return { return {
@ -231,13 +231,13 @@ module.exports = async function getLigationData() {
cherry: ligData.simple, cherry: ligData.simple,
rawSets: ligData.composite, rawSets: ligData.composite,
sets: [...ligationSets.values()], sets: [...ligationSets.values()],
nonMergeSets: [...nonMergeLigationSets.values()] nonMergeSets: [...nonMergeLigationSets.values()],
}; };
}; };
function buildLigationSet(ligData, getKey) { function buildLigationSet(ligData, getKey) {
const ligationSets = new Map([ const ligationSets = new Map([
["*off", { tag: "calt", switch: "off", desc: "Ligation Off", brief: "Off", buildup: [] }] ["*off", { tag: "calt", switch: "off", desc: "Ligation Off", brief: "Off", buildup: [] }],
]); ]);
for (const sel in ligData.composite) { for (const sel in ligData.composite) {
const comp = ligData.composite[sel]; const comp = ligData.composite[sel];
@ -250,7 +250,7 @@ function buildLigationSet(ligData, getKey) {
buildup: comp.buildup, buildup: comp.buildup,
tagName: comp.tag, tagName: comp.tag,
desc: comp.desc, desc: comp.desc,
brief: comp.brief || comp.desc brief: comp.brief || comp.desc,
}; };
ligationSets.set(key, item); ligationSets.set(key, item);
} else { } else {