From e22edd86a196ae58a92c83cd82246a6fe922425c Mon Sep 17 00:00:00 2001
From: Jany Belluz <jany.belluz@hotmail.fr>
Date: Sun, 9 Mar 2014 21:48:13 +0100
Subject: [PATCH] Generate better CSS (fix #26) + drop TeX fonts

---
 Makefile             |  4 ++--
 validate-generate.sh | 52 +++++++++++++++++++++++++++++---------------
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 68718ef..ff5ab08 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ INSTALLED_TTF_FILES=$(patsubst %,~/.fonts/%.ttf,$(BASENAMES))
 all: $(TTF_FILES)
 
 OTF/%.otf %.ttf Webfonts/%.svg Webfonts/%.eot Webfonts/%.woff Webfonts/%-decl.css: Sources/%.sfd
-	mkdir -p OTF TeX Webfonts
+	mkdir -p OTF Webfonts
 	./validate-generate.sh "$*"
 	# TODO determine perfect parameters
 	ttfautohint "$*.ttf" "$*.hinted.ttf"
@@ -42,7 +42,7 @@ zip-prop: $(TTF_FILES) $(OTF_FILES) $(SVG_FILES) $(EOT_FILES) $(WOFF_FILES) $(SO
 	zip FantasqueSans.zip OFL.txt README.md Webfonts/README.md $(foreach v,$^,$(if $(findstring Mono,$v),,$v))
 
 clean:
-	rm -f *.ttf *.zip OTF/* TeX/* Webfonts/*.eot Webfonts/*.woff Webfonts/*.svg Webfonts/*.css
+	rm -f *.ttf *.zip OTF/* Webfonts/*.eot Webfonts/*.woff Webfonts/*.svg Webfonts/*.css
 
 test: $(INSTALLED_TTF_FILES)
 	gvim -f ~/Developpement/Système/kernel-base/shared/printf.c
diff --git a/validate-generate.sh b/validate-generate.sh
index 3aecd2f..6507fbb 100755
--- a/validate-generate.sh
+++ b/validate-generate.sh
@@ -5,20 +5,21 @@
 basename=$1
 ttf="${basename}.ttf"
 otf="OTF/${basename}.otf"
-texFamily="cm" # arbitrary two letters out of the font's name
-
-texCut="r" # Regular
-if [[ "${basename,,}" == *bold* ]]; then
-  texCut="b" # Bold
-fi
 
 echo -e "\e[1;37mGenerating ${basename}... \e[0m"
 
-fontforge -lang=py -script - <<EOF
+output=$(fontforge -lang=py -script - <<EOF
 import fontforge;
 
 font = fontforge.open("Sources/${basename}.sfd");
 
+# Extract interesting informations
+print font.fontname
+print font.familyname
+print font.fullname
+print font.os2_weight
+print font.italicangle
+
 bitmask = font.validate();
 if bitmask != 0:
   exit(42);
@@ -27,23 +28,38 @@ font.generate("${basename}.ttf", flags=("opentype", "dummy-dsig"));
 font.generate("OTF/${basename}.otf", flags=("opentype", "dummy-dsig"));
 font.generate("Webfonts/${basename}.svg");
 
-# TeX stuff
-font.encoding = "AdobeStandard";
-font.generate("TeX/f${texFamily}${texCut}8a.pfb",
-  flags=("afm", "tfm", "pfm"));
 EOF
+)
 error=$?
 
+old_IFS="$IFS"
+IFS='
+'
+output=($output)
+IFS="$old_IFS"
+
+fontname=${output[0]}
+familyname=${output[1]}
+fullname=${output[2]}
+fontweight=${output[3]}
+slope=${output[4]}
+if [ x"$slope" = "x0.0" ]; then
+  fontstyle=normal
+else
+  fontstyle=italic
+fi
+
 cat > Webfonts/${basename}-decl.css <<EOF
 @font-face {
-    font-family: '${basename}';
-    src: url('${basename}.eot'); /* IE 9 Compatibility Mode */
-    src: url('${basename}.eot?#iefix') format('embedded-opentype'), /* IE < 9 */
-         url('${basename}.woff') format('woff'), /* Firefox >= 3.6, any other modern browser */
-         url('${basename}.ttf') format('truetype'), /* Safari, Android, iOS */
-         url('${basename}.svg#${basename}') format('svg'); /* Chrome < 4, Legacy iOS */
+  font-family: '${familyname}';
+  src: url('${basename}.eot'); /* IE 9 Compatibility Mode */
+  src: url('${basename}.eot?#iefix') format('embedded-opentype'), /* IE < 9 */
+       url('${basename}.woff') format('woff'), /* Firefox >= 3.6, any other modern browser */
+       url('${basename}.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('${basename}.svg#${fontname}') format('svg'); /* Chrome < 4, Legacy iOS */
+  font-weight: ${fontweight};
+  font-style: ${fontstyle};
 }
-
 EOF
 
 if [ "x$error" != "x0" ]; then