Add ligation group "CLIK"

This commit is contained in:
Belleve Invis 2020-04-15 18:30:33 -07:00
parent 7987462935
commit 24325f0188
12 changed files with 50 additions and 44 deletions

View file

@ -161,6 +161,7 @@ The current available styles for `design`/`upright`/`italic`/`oblique` options a
* Styles for ligation sets, include:
* `ligset-dlig`: Default ligation set would be assigned to Discretionary ligatures.
* `ligset-clike`: Default ligation set would be assigned to C-Like.
* `ligset-javascript`: Default ligation set would be assigned to JavaScript.
* `ligset-php`: Default ligation set would be assigned to PHP.
* `ligset-ml`: Default ligation set would be assigned to ML.
@ -170,7 +171,6 @@ The current available styles for `design`/`upright`/`italic`/`oblique` options a
* `ligset-idris`: Default ligation set would be assigned to Idris.
* `ligset-elm`: Default ligation set would be assigned to Elm.
* `ligset-purescript`: Default ligation set would be assigned to PureScript.
* `ligset-patel`: Default ligation set would be assigned to PatEL.
* `ligset-swift`: Default ligation set would be assigned to Swift.
* `ligset-coq`: Default ligation set would be assigned to Coq.
* `ligset-matlab`: Default ligation set would be assigned to Matlab.
@ -201,6 +201,7 @@ The current available styles for `design`/`upright`/`italic`/`oblique` options a
* `calt-kern-dotty`: Move connecting dotty punctuations closer, like for `::`, `:::` and `...`..
* `calt-logic`: Enable ligation for `/\` and `\/`.
* `calt-llgg`: Enable ligation for `<<`, `>>` and other angle-bracket chaining.
* `calt-llggeq`: Enable ligation for `<<=`, `>>=` as shift operator.
* `calt-dotoper`: Treat dot (`.`) as operator and perform chained centering.
* `calt-arrowZALE`: Treat `<=` as arrow.
* `calt-arrowZAGE`: Treat `>=` as co-arrow.

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: 345 KiB

After

Width:  |  Height:  |  Size: 345 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: 955 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

@ -98,12 +98,24 @@ desc = 'Treat `>=` as co-arrow'
ligGroup = "html-comment"
desc = 'Enable ligation for `<!--` and `<!---`'
[composite.ligset-calt]
isOptOut = true # This feature is on by default by many software
tag = 'calt'
buildup = ['center-ops', 'arrow', 'html-comment', 'trig', 'llgg', 'llggeq', 'eqeq', 'ineq', 'exeq', 'plusplus', 'kern-dotty']
brief = 'Default'
desc = 'Default setting in text editors'
[composite.ligset-dlig]
tag = 'dlig'
buildup = ['center-ops', 'arrow', 'html-comment', 'trig', 'arrow2', 'llgg', 'eqeq', 'ineq', 'exeq', 'ltgt-diamond', 'plusplus', 'kern-dotty', 'dotoper', 'logic', 'brst']
brief = 'Discretionary'
desc = 'Discretionary ligatures'
[composite.ligset-clike]
tag = 'CLIK'
buildup = ['center-ops', 'arrow', 'html-comment', 'trig', 'llgg', 'llggeq', 'eqeqeq', 'eqeq', 'ineq', 'exeqeq', 'exeq', 'plusplus', 'kern-dotty']
desc = 'C-Like'
[composite.ligset-javascript]
tag = 'JSPT'
buildup = ['center-ops', 'arrow', 'html-comment', 'trig', 'llgg', 'llggeq', 'eqeqeq', 'eqeq', 'ineq', 'exeqeq', 'exeq', 'plusplus', 'kern-dotty']
@ -149,11 +161,6 @@ tag = 'PURS'
buildup = ['center-ops', 'arrow', 'arrow2', 'trig', 'llgg', 'eqeq', 'ineq', 'slasheq', 'ltgt-diamond', 'plusplus', 'dotoper', 'kern-dotty', 'logic']
desc = 'PureScript'
[composite.ligset-patel]
tag = 'PTLX'
buildup = ['center-ops', 'arrow', 'arrow2', 'trig', 'llgg', 'eqeq', 'ineq', 'exeq', 'ltgt-diamond', 'plusplus']
desc = 'PatEL'
[composite.ligset-swift]
tag = 'SWFT'
buildup = ['center-ops', 'arrow', 'arrow2', 'trig', 'llgg', 'eqeq', 'ineq', 'exeq', 'ltgt-diamond', 'plusplus']
@ -168,10 +175,3 @@ desc = 'Coq'
tag = 'MTLB'
buildup = ['center-ops', 'arrow', 'html-comment', 'trig', 'llgg', 'eqeq', 'ineq', 'tildeeq', 'plusplus', 'kern-dotty']
desc = 'Matlab'
[composite.ligset-calt]
disableHives = true
tag = 'calt'
buildup = ['center-ops', 'arrow', 'html-comment', 'trig', 'llgg', 'llggeq', 'eqeq', 'ineq', 'exeq', 'plusplus', 'kern-dotty']
brief = 'Default'
desc = 'Default setting in text editors'

View file

@ -731,6 +731,18 @@
<pre><s>:=</s> <s>:-</s> <s>:+</s> <s>&lt;*</s> <s>&lt;*&gt;</s> <s>*&gt;</s> <s>&lt;|</s> <s>&lt;|&gt;</s> <s>|&gt;</s> <s>&lt;.</s> <s>&lt;.&gt;</s> <s>.&gt;</s> <s>+:</s> <s>-:</s> <s>=:</s> <s>&lt;******&gt;</s> <s>(* comm *)</s> <s>++</s> <s>+++</s> <s>|-</s> <s>-|</s></pre>
</td>
</tr>
<tr class="note">
<td>calt</td>
<td>Default setting in text editors</td>
</tr>
<tr>
<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> <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> <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>
</td>
</tr>
<tr class="note">
<td>dlig</td>
<td>Discretionary ligatures</td>
@ -738,19 +750,19 @@
<tr>
<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> <s>&lt;&lt;=</s> <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> <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> <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>
</td>
</tr>
<tr class="note">
<td>JSPT, PHPX</td>
<td>JavaScript, PHP</td>
<td>CLIK, JSPT, PHPX</td>
<td>C-Like, JavaScript, PHP</td>
</tr>
<tr>
<td colspan="2" style="font-feature-settings: 'calt' off, 'JSPT' on">
<td colspan="2" style="font-feature-settings: 'calt' off, 'CLIK' 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> <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> <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> <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>
</td>
@ -762,7 +774,7 @@
<tr>
<td colspan="2" style="font-feature-settings: 'calt' off, 'MLXX' 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> <s>&lt;!--</s></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> <s>&lt;!---</s></pre>
<pre><s>=&lt;&lt;</s> <s>=&lt;</s> <s>=&lt;=</s> <em class="rank-1">&lt;==</em> <em class="rank-1">&lt;===</em> <s>&lt;&lt;=</s> <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> <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> <s>/=</s> <s>~=</s> <em class="rank-2">&lt;&gt;</em> <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> <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>
@ -774,7 +786,7 @@
<tr>
<td colspan="2" style="font-feature-settings: 'calt' off, 'FSTA' 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> <s>&lt;!--</s></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> <s>&lt;!---</s></pre>
<pre><s>=&lt;&lt;</s> <s>=&lt;</s> <s>=&lt;=</s> <em class="rank-1">&lt;==</em> <em class="rank-1">&lt;===</em> <s>&lt;&lt;=</s> <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> <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> <s>==</s> <s>!=</s> <s>/=</s> <s>~=</s> <s>&lt;&gt;</s> <em class="rank-2">===</em> <s>!==</s> <s>=/=</s> <em class="rank-2">=!=</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> <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> <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>
@ -786,19 +798,19 @@
<tr>
<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> <s>&lt;&lt;=</s> <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> <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> <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> <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>
</td>
</tr>
<tr class="note">
<td>PTLX, SWFT</td>
<td>PatEL, Swift</td>
<td>SWFT</td>
<td>Swift</td>
</tr>
<tr>
<td colspan="2" style="font-feature-settings: 'calt' off, 'PTLX' on">
<td colspan="2" style="font-feature-settings: 'calt' off, 'SWFT' 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> <s>&lt;&lt;=</s> <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> <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> <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> <s>\/</s> <s>/\</s> <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> <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>
@ -810,7 +822,7 @@
<tr>
<td colspan="2" style="font-feature-settings: 'calt' off, 'COQX' 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> <s>&lt;&lt;=</s> <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> <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> <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> <s>/=</s> <s>~=</s> <em class="rank-2">&lt;&gt;</em> <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> <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>
@ -822,23 +834,11 @@
<tr>
<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> <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> <s>&lt;&lt;=</s> <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> <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>
</td>
</tr>
<tr class="note">
<td>calt</td>
<td>Default setting in text editors</td>
</tr>
<tr>
<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> <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> <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>
</td>
</tr>
</tbody>
</table>
</section><section id="matrix">

View file

@ -1,7 +1,8 @@
"use strict";
module.exports = function formVariantData(data, para) {
const defaultBuildup = {};
const optInBuildup = {};
const optOutBuildup = {};
const hives = {};
hives["default"] = { caltBuildup: [] };
@ -11,11 +12,15 @@ module.exports = function formVariantData(data, para) {
for (const gr in data.composite) {
const comp = data.composite[gr];
if (!comp.tag) continue;
defaultBuildup[comp.tag] = comp.buildup;
if (!comp.disableHives) {
if (comp.isOptOut) {
optOutBuildup[comp.tag] = comp.buildup;
} else {
optInBuildup[comp.tag] = comp.buildup;
}
if (!comp.isOptOut) {
hives[gr] = { caltBuildup: [...comp.buildup] };
}
}
return { defaultBuildup, hives };
return { defaultBuildup: { ...optInBuildup, ...optOutBuildup }, hives };
};

View file

@ -152,7 +152,7 @@ async function processLigSetPreDef() {
const md = new MdCol("Section-Cherry-Picking-Predefined");
md.log(`* Styles for ligation sets, include:\n`);
for (const gr in ligData.rawSets) {
if (ligData.rawSets[gr].disableHives) continue;
if (ligData.rawSets[gr].isOptOut) continue;
const longDesc =
ligData.rawSets[gr].longDesc ||
`Default ligation set would be assigned to ${ligData.rawSets[gr].desc}`;