beta 2013.10.20 07:09

1 files changed, 57 insertions, 17 deletions

diff --git a/tex/context/base/font-pre.mkiv b/tex/context/base/font-pre.mkiv
index b03abed7d..75f42f8f5 100644
--- a/tex/context/base/font-pre.mkiv
+++ b/tex/context/base/font-pre.mkiv
@@ -17,11 +17,15 @@
 
 %D A basic set of features is defined here.
 
+% beware, base mode + dynamics can give weird effects
+
+% rlig ccmp
+
 \definefontfeature
   [always]
-  [mode=auto,
-   script=auto,
-   kern=yes,
+  [mode=node,    % we had 'auto', but let's try 'node' for a while and see what the impact is
+   script=auto,  % on speed; 'base' just doesn't play well with dynamics; some day we can even
+   kern=yes,     % consider skipping the base passes when no base mode is used
    mark=yes,
    mkmk=yes,
    curs=yes]
@@ -59,6 +63,15 @@
    tlig=yes,
    trep=yes]
 
+\definefontfeature
+  [letterspacing]
+  [liga=no,
+   rlig=no,
+   clig=no,
+   dlig=no,
+   ccmp=yes,
+   keepligatures=auto]
+
 \definefontfeature % can be used for type1 fonts
   [complete]
   [always]
@@ -72,28 +85,38 @@
   [mode=none,
    features=no]
 
-\definefontfeature % might move
-  [arabic]
-  [mode=node,language=dflt,script=arab,ccmp=yes,
+\definefontfeature
+  [semetic-complete]
+  [mode=node,analyze=yes,language=dflt,ccmp=yes,
    init=yes,medi=yes,fina=yes,isol=yes,
-   liga=yes,dlig=yes,rlig=yes,clig=yes,calt=yes,
-   mark=yes,mkmk=yes,kern=yes,curs=yes]
+   mark=yes,mkmk=yes,kern=yes,curs=yes,
+   liga=yes,dlig=yes,rlig=yes,clig=yes,calt=yes]
+
+\definefontfeature
+  [semetic-simple]
+  [mode=node,analyze=yes,language=dflt,ccmp=yes,
+   init=yes,medi=yes,fina=yes,isol=yes,
+   mark=yes,mkmk=yes,kern=yes,curs=yes,
+   rlig=yes,calt=yes]
 
 \definefontfeature
-  [hebrew]
   [arabic]
+  [semetic-complete]
+  [script=arab]
+
+\definefontfeature
+  [hebrew]
+  [semetic-complete]
   [script=hebr]
 
-\definefontfeature % might move
+\definefontfeature
   [simplearabic]
-  [mode=node,language=dflt,script=arab,
-   init=yes,medi=yes,fina=yes,
-   rlig=yes,calt=yes,
-   mark=yes,mkmk=yes,curs=yes]
+  [semetic-simple]
+  [script=arab]
 
 \definefontfeature
   [simplehebrew]
-  [simplearabic]
+  [semetic-simple]
   [script=hebr]
 
 % \definefont [DevaOne] [file:chandas.ttf*devanagari-one at 12pt]
@@ -151,6 +174,7 @@
    trep=yes,
    mathalternates=yes,
    mathitalics=yes,
+ % mathgaps=yes,
  % nomathitalics=yes, % don't pass to tex, might become default
    language=dflt,
    script=math]
@@ -195,6 +219,21 @@
   [missing]
   [missing=yes]
 
+%D Nice to have too:
+
+\definefontfeature
+  [quality]
+  [expansion=quality,
+   protrusion=quality]
+
+\definefontfeature
+  [slanted]
+  [slant=.2]
+
+\definefontfeature
+  [boldened]
+  [extend=1.2]
+
 %D We define some colors that are used in tracing (for instance \OPENTYPE\
 %D features). We cannot yet inherit because no colors are predefined.
 
@@ -497,6 +536,7 @@
 \definealternativestyle [\v!Words]   [{\setcharactercasing[\v!Words  ]}] [{\setcharactercasing[\v!Words  ]}]
 \definealternativestyle [\v!capital] [{\setcharactercasing[\v!capital]}] [{\setcharactercasing[\v!capital]}]
 \definealternativestyle [\v!Capital] [{\setcharactercasing[\v!Capital]}] [{\setcharactercasing[\v!Capital]}]
+\definealternativestyle [\v!mixed]   [{\setcharactercasing[\v!mixed  ]}] [{\setcharactercasing[\v!mixed  ]}]
 
 \definealternativestyle [\v!cap]     [{\setcharactercasing[\v!cap    ]}] [{\setcharactercasing[\v!cap    ]}]
 \definealternativestyle [\v!Cap]     [{\setcharactercasing[\v!Cap    ]}] [{\setcharactercasing[\v!Cap    ]}]
@@ -523,7 +563,7 @@
 %D
 %D For tracing purposes we define:
 
-\definefont[tinyfont][Mono at 1ex]
+\definefont[tinyfont][dejavusansmono at 1ex]
 
 %D \macros
 %D   {infofont}
@@ -535,7 +575,7 @@
 
 \let\infofont\relax % satisfy dep checker
 
-\definefont [infofont] [Mono at 6pt] % todo \the\everybodyfont
+\definefont[infofont][dejavusansmono at 6pt] % todo \the\everybodyfont
 
 \protect \endinput