From 0699a4a0b15f11c40b20d0cf279c4194abcceabb Mon Sep 17 00:00:00 2001
From: be5invis <belleve@typeof.net>
Date: Mon, 8 Feb 2016 04:36:16 +0800
Subject: [PATCH] Corrected /lesseq and /greatereq with /lesseqslant and
 /greatereqslant added. Close #60.

---
 glyphs/symbol-math.ptl | 32 ++++++++++------
 onegroup.mk            |  5 +--
 testdrive/fonts.css    | 84 +++++++++++++++++++++---------------------
 testdrive/index.html   |  7 ++--
 4 files changed, 67 insertions(+), 61 deletions(-)

diff --git a/glyphs/symbol-math.ptl b/glyphs/symbol-math.ptl
index 007c14c..ce0d0ed 100644
--- a/glyphs/symbol-math.ptl
+++ b/glyphs/symbol-math.ptl
@@ -197,12 +197,16 @@ symbol-block 'Mathematical Operators'
 			widths.center OPERATORSTROKE
 			flat SB ([mix top bot 0.5] + fine) [heading  RIGHTWARD]
 			curl RIGHTSB (bot + fine)
-		include : dispiro
-			widths.center OPERATORSTROKE
-			flat SB ([mix top bot 0.5] - fine) [heading  RIGHTWARD]
-			curl RIGHTSB (bot - fine)
-	
-		save 'lesseq' 0x2264
+		
+		branch
+			include : HBar SB RIGHTSB (bot - fine) OPERATORSTROKE
+			save 'lesseq' 0x2264
+		branch
+			include : dispiro
+				widths.center OPERATORSTROKE
+				flat SB ([mix top bot 0.5] - fine) [heading  RIGHTWARD]
+				curl RIGHTSB (bot - fine)
+			save 'lesseqslant' 0x2A7D
 	
 	sketch # greatereq
 		local fine : Math.max [adviceBlackness 4] (XH * 0.1)
@@ -217,12 +221,16 @@ symbol-block 'Mathematical Operators'
 			widths.center OPERATORSTROKE
 			flat RIGHTSB ([mix top bot 0.5] + fine) [heading  LEFTWARD]
 			curl SB (bot + fine)
-		include : dispiro
-			widths.center OPERATORSTROKE
-			flat RIGHTSB ([mix top bot 0.5] - fine) [heading  LEFTWARD]
-			curl SB (bot - fine)
-	
-		save 'greatereq' 0x2265
+		
+		branch
+			include : HBar SB RIGHTSB (bot - fine) OPERATORSTROKE
+			save 'greatereq' 0x2265
+		branch
+			include : dispiro
+				widths.center OPERATORSTROKE
+				flat RIGHTSB ([mix top bot 0.5] - fine) [heading  LEFTWARD]
+				curl SB (bot - fine)
+			save 'greatereqslant' 0x2A7E
 	
 	sketch # subst
 		local top : mix parenMid parenTop 0.5
diff --git a/onegroup.mk b/onegroup.mk
index 8173fb4..b207e1d 100644
--- a/onegroup.mk
+++ b/onegroup.mk
@@ -173,11 +173,8 @@ TESTDIR = testdrive/assets
 TESTTTF = $(subst $(DISTDIR)/,$(TESTDIR)/,$(DISTTARGETS))
 $(TESTTTF) : $(TESTDIR)/%.ttf : $(DISTDIR)/%.ttf
 	cp $< $@
-TESTWOFF = $(subst .ttf,.woff,$(TESTTTF))
-$(TESTWOFF) : $(TESTDIR)/%.woff : $(TESTDIR)/%.ttf
-	sfnt2woff $<
 TESTMAPS = $(subst $(OBJDIR)/,$(TESTDIR)/,$(MAPS))
 $(TESTMAPS) : $(TESTDIR)/%.charmap : $(OBJDIR)/%.charmap
 	cp $< $@
 
-test : $(TESTTTF) $(TESTWOFF) $(TESTMAPS)
\ No newline at end of file
+test : $(TESTTTF) $(TESTMAPS)
\ No newline at end of file
diff --git a/testdrive/fonts.css b/testdrive/fonts.css
index d0e7d6a..80dbf84 100644
--- a/testdrive/fonts.css
+++ b/testdrive/fonts.css
@@ -1,234 +1,234 @@
 @font-face {
 	font-family: IosevkaWEB;
 	font-weight: 100;
-	src: url('assets/iosevka-thin.woff') format('woff'), url('assets/iosevka-thin.ttf') format('truetype');
+	src: url('assets/iosevka-thin.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-weight: 100;
 	font-style: italic;
-	src: url('assets/iosevka-thinitalic.woff') format('woff'), url('assets/iosevka-thinitalic.ttf') format('truetype');
+	src: url('assets/iosevka-thinitalic.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-weight: 100;
 	font-style: oblique;
-	src: url('assets/iosevka-thinoblique.woff') format('woff'), url('assets/iosevka-thinoblique.ttf') format('truetype');
+	src: url('assets/iosevka-thinoblique.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-weight: 200;
-	src: url('assets/iosevka-extralight.woff') format('woff'), url('assets/iosevka-extralight.ttf') format('truetype');
+	src: url('assets/iosevka-extralight.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-weight: 200;
 	font-style: italic;
-	src: url('assets/iosevka-extralightitalic.woff') format('woff'), url('assets/iosevka-extralightitalic.ttf') format('truetype');
+	src: url('assets/iosevka-extralightitalic.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-weight: 200;
 	font-style: oblique;
-	src: url('assets/iosevka-extralightoblique.woff') format('woff'), url('assets/iosevka-extralightoblique.ttf') format('truetype');
+	src: url('assets/iosevka-extralightoblique.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-weight: 300;
-	src: url('assets/iosevka-light.woff') format('woff'), url('assets/iosevka-light.ttf') format('truetype');
+	src: url('assets/iosevka-light.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-weight: 300;
 	font-style: italic;
-	src: url('assets/iosevka-lightitalic.woff') format('woff'), url('assets/iosevka-lightitalic.ttf') format('truetype');
+	src: url('assets/iosevka-lightitalic.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-weight: 300;
 	font-style: oblique;
-	src: url('assets/iosevka-lightoblique.woff') format('woff'), url('assets/iosevka-lightoblique.ttf') format('truetype');
+	src: url('assets/iosevka-lightoblique.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
-	src: url('assets/iosevka-regular.woff') format('woff'), url('assets/iosevka-regular.ttf') format('truetype');
+	src: url('assets/iosevka-regular.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-style: italic;
-	src: url('assets/iosevka-italic.woff') format('woff'), url('assets/iosevka-italic.ttf') format('truetype');
+	src: url('assets/iosevka-italic.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-style: oblique;
-	src: url('assets/iosevka-oblique.woff') format('woff'), url('assets/iosevka-oblique.ttf') format('truetype');
+	src: url('assets/iosevka-oblique.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-weight: 500;
-	src: url('assets/iosevka-medium.woff') format('woff'), url('assets/iosevka-medium.ttf') format('truetype');
+	src: url('assets/iosevka-medium.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-style: italic;
 	font-weight: 500;
-	src: url('assets/iosevka-mediumitalic.woff') format('woff'), url('assets/iosevka-mediumitalic.ttf') format('truetype');
+	src: url('assets/iosevka-mediumitalic.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-style: oblique;
 	font-weight: 500;
-	src: url('assets/iosevka-mediumoblique.woff') format('woff'), url('assets/iosevka-mediumoblique.ttf') format('truetype');
+	src: url('assets/iosevka-mediumoblique.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-weight: 700;
-	src: url('assets/iosevka-bold.woff') format('woff'), url('assets/iosevka-bold.ttf') format('truetype');
+	src: url('assets/iosevka-bold.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-style: italic;
 	font-weight: 700;
-	src: url('assets/iosevka-bolditalic.woff') format('woff'), url('assets/iosevka-bolditalic.ttf') format('truetype');
+	src: url('assets/iosevka-bolditalic.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-style: oblique;
 	font-weight: 700;
-	src: url('assets/iosevka-boldoblique.woff') format('woff'), url('assets/iosevka-boldoblique.ttf') format('truetype');
+	src: url('assets/iosevka-boldoblique.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-weight: 900;
-	src: url('assets/iosevka-heavy.woff') format('woff'), url('assets/iosevka-heavy.ttf') format('truetype');
+	src: url('assets/iosevka-heavy.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-style: italic;
 	font-weight: 900;
-	src: url('assets/iosevka-heavyitalic.woff') format('woff'), url('assets/iosevka-heavyitalic.ttf') format('truetype');
+	src: url('assets/iosevka-heavyitalic.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaWEB;
 	font-style: oblique;
 	font-weight: 900;
-	src: url('assets/iosevka-heavyoblique.woff') format('woff'), url('assets/iosevka-heavyoblique.ttf') format('truetype');
+	src: url('assets/iosevka-heavyoblique.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-weight: 100;
-	src: url('assets/iosevka-slab-thin.woff') format('woff'), url('assets/iosevka-slab-thin.ttf') format('truetype');
+	src: url('assets/iosevka-slab-thin.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-weight: 100;
 	font-style: italic;
-	src: url('assets/iosevka-slab-thinitalic.woff') format('woff'), url('assets/iosevka-slab-thinitalic.ttf') format('truetype');
+	src: url('assets/iosevka-slab-thinitalic.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-weight: 100;
 	font-style: oblique;
-	src: url('assets/iosevka-slab-thinoblique.woff') format('woff'), url('assets/iosevka-slab-thinoblique.ttf') format('truetype');
+	src: url('assets/iosevka-slab-thinoblique.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-weight: 200;
-	src: url('assets/iosevka-slab-extralight.woff') format('woff'), url('assets/iosevka-slab-extralight.ttf') format('truetype');
+	src: url('assets/iosevka-slab-extralight.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-weight: 200;
 	font-style: italic;
-	src: url('assets/iosevka-slab-extralightitalic.woff') format('woff'), url('assets/iosevka-slab-extralightitalic.ttf') format('truetype');
+	src: url('assets/iosevka-slab-extralightitalic.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-weight: 200;
 	font-style: oblique;
-	src: url('assets/iosevka-slab-extralightoblique.woff') format('woff'), url('assets/iosevka-slab-extralightoblique.ttf') format('truetype');
+	src: url('assets/iosevka-slab-extralightoblique.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-weight: 300;
-	src: url('assets/iosevka-slab-light.woff') format('woff'), url('assets/iosevka-slab-light.ttf') format('truetype');
+	src: url('assets/iosevka-slab-light.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-weight: 300;
 	font-style: italic;
-	src: url('assets/iosevka-slab-lightitalic.woff') format('woff'), url('assets/iosevka-slab-lightitalic.ttf') format('truetype');
+	src: url('assets/iosevka-slab-lightitalic.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-weight: 300;
 	font-style: oblique;
-	src: url('assets/iosevka-slab-lightoblique.woff') format('woff'), url('assets/iosevka-slab-lightoblique.ttf') format('truetype');
+	src: url('assets/iosevka-slab-lightoblique.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
-	src: url('assets/iosevka-slab-regular.woff') format('woff'), url('assets/iosevka-slab-regular.ttf') format('truetype');
+	src: url('assets/iosevka-slab-regular.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-style: italic;
-	src: url('assets/iosevka-slab-italic.woff') format('woff'), url('assets/iosevka-slab-italic.ttf') format('truetype');
+	src: url('assets/iosevka-slab-italic.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-style: oblique;
-	src: url('assets/iosevka-slab-oblique.woff') format('woff'), url('assets/iosevka-slab-oblique.ttf') format('truetype');
+	src: url('assets/iosevka-slab-oblique.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-weight: 500;
-	src: url('assets/iosevka-slab-medium.woff') format('woff'), url('assets/iosevka-slab-medium.ttf') format('truetype');
+	src: url('assets/iosevka-slab-medium.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-style: italic;
 	font-weight: 500;
-	src: url('assets/iosevka-slab-mediumitalic.woff') format('woff'), url('assets/iosevka-slab-mediumitalic.ttf') format('truetype');
+	src: url('assets/iosevka-slab-mediumitalic.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-style: oblique;
 	font-weight: 500;
-	src: url('assets/iosevka-slab-mediumoblique.woff') format('woff'), url('assets/iosevka-slab-mediumoblique.ttf') format('truetype');
+	src: url('assets/iosevka-slab-mediumoblique.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-weight: 700;
-	src: url('assets/iosevka-slab-bold.woff') format('woff'), url('assets/iosevka-slab-bold.ttf') format('truetype');
+	src: url('assets/iosevka-slab-bold.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-style: italic;
 	font-weight: 700;
-	src: url('assets/iosevka-slab-bolditalic.woff') format('woff'), url('assets/iosevka-slab-bolditalic.ttf') format('truetype');
+	src: url('assets/iosevka-slab-bolditalic.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-style: oblique;
 	font-weight: 700;
-	src: url('assets/iosevka-slab-boldoblique.woff') format('woff'), url('assets/iosevka-slab-boldoblique.ttf') format('truetype');
+	src: url('assets/iosevka-slab-boldoblique.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-weight: 900;
-	src: url('assets/iosevka-slab-heavy.woff') format('woff'), url('assets/iosevka-slab-heavy.ttf') format('truetype');
+	src: url('assets/iosevka-slab-heavy.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-style: italic;
 	font-weight: 900;
-	src: url('assets/iosevka-slab-heavyitalic.woff') format('woff'), url('assets/iosevka-slab-heavyitalic.ttf') format('truetype');
+	src: url('assets/iosevka-slab-heavyitalic.ttf') format('truetype');
 }
 @font-face {
 	font-family: IosevkaSlabWEB;
 	font-style: oblique;
 	font-weight: 900;
-	src: url('assets/iosevka-slab-heavyoblique.woff') format('woff'), url('assets/iosevka-slab-heavyoblique.ttf') format('truetype');
+	src: url('assets/iosevka-slab-heavyoblique.ttf') format('truetype');
 }
 
 .thin       { font-weight: 100 }
diff --git a/testdrive/index.html b/testdrive/index.html
index 9dd8981..213b68e 100644
--- a/testdrive/index.html
+++ b/testdrive/index.html
@@ -24,10 +24,11 @@
 			margin: 0 auto;
 			padding: 4rem 0;
 		}
-		.show, .show samp, .pp {
+		body, .show, .show samp, .pp {
 			font-family: "IosevkaWEB", monospace;
 			line-height: 1.5;
-			
+		}
+		.langs {
 			-moz-font-feature-settings: "locl";
 			-ms-font-feature-settings: "locl";
 			-webkit-font-feature-settings: "locl";
@@ -202,7 +203,7 @@
 	<div id="display" class="show {{currentFont.cls}}">
 		<p class="waterfall" v-for="size in waterfall" style="font-size:{{size / 14}}rem">float Fox.quick(h){isBrown &amp;&amp; jumpOver(doges.lazy)}</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">
+		<pre class="langs"><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>
 		<table class="block">
 			<tr class="row" v-for="row in sampleRows">