[fontpipeline] Flesh out

3 files changed, 39 insertions, 15 deletions

diff --git a/fontpipeline/fontpipeline_slides.py b/fontpipeline/fontpipeline_slides.py
index ccde2c7..2526c3a 100755
--- a/fontpipeline/fontpipeline_slides.py
+++ b/fontpipeline/fontpipeline_slides.py
@@ -24,8 +24,9 @@
 # set_allocation.  See their pydocs.
 
 title_font="Impact"
-head_font="sans Bold" # "Oswald Bold"
-body_font="sans" # "PT Sans"
+head_font="noto sans" # "Oswald Bold"
+body_font="noto sans light 50" # "PT Sans"
+xbody_font="noto sans thin 200" # "PT Sans"
 mono_font="Consolas, monospace"
 
 slides = []
@@ -46,7 +47,7 @@ def slide(f, data=None, scale=None):
 		data = dict (data)
 	else:
 		data = {}
-	if not scale: scale = 1.4
+	if not scale: scale = 1.
 	def slider(r):
 		r.move_to (50, 30)
 		r.scale(scale, scale)
@@ -56,6 +57,21 @@ def slide(f, data=None, scale=None):
 		return slide_add (slider, data)
 	return slide_add (f, data)
 
+def slide_big(f, data=None, scale=None):
+	if data:
+		data = dict (data)
+	else:
+		data = {}
+	if not scale: scale = 1
+	def slider(r):
+		r.move_to (960, 512)
+		r.scale(scale, scale)
+		r.put_text (f, valign=0, halign=0, desc=xbody_font)
+		#r.set_allocation (x, y, width, height)
+	if isinstance(f, basestring):
+		return slide_add (slider, data)
+	return slide_add (f, data)
+
 def slide_title (title, text, scale=None):
 	ts = '' if not title else "<span font_desc='"+head_font+"'>"+title+"</span>\n\n"
 	ts = ts + text.strip()
@@ -98,6 +114,13 @@ def title_slide (r):
 	r.scale(1.4, 1.4)
 	r.put_text ("Marek Jeziorek\nBehdad Esfahbod\nGoogle", halign=-1, valign=-1)
 
+slide_big("FontTools")
+slide_big("UFO")
+slide_big("ATypI 2014")
+slide_big("FontTools")
+slide_big("AFDKO")
+slide_big("Noto")
+
 bullet_list_slide("Noto pipeline", [
 	"glyphs2ufo",
 	"robofab vs extractor",
@@ -178,7 +201,7 @@ bullet_list_slide("Noto pipeline: compreffor", [
 	"compreffor",
 	])
 
-bullet_list_slide("Noto pipeline: fontmake", [
+bullet_list_slide("Noto pipeline: ttfautohint", [
 	"glyphs2ufo",
 	"ufoLib",
 	"defcon",
@@ -188,10 +211,10 @@ bullet_list_slide("Noto pipeline: fontmake", [
 	"booleanOperations",
 	"cu2qu",
 	"compreffor",
-	"fontmake",
+	"ttfautohint",
 	])
 
-bullet_list_slide("Noto pipeline: noto-source", [
+bullet_list_slide("Noto pipeline: fontmake", [
 	"glyphs2ufo",
 	"ufoLib",
 	"defcon",
@@ -201,17 +224,11 @@ bullet_list_slide("Noto pipeline: noto-source", [
 	"booleanOperations",
 	"cu2qu",
 	"compreffor",
+	"ttfautohint",
 	"fontmake",
-	"noto-source",
 	])
 
-bullet_list_slide("Noto pipeline: TODO", [
-	"fontTools.varLib",
-	"CFF operator specializer",
-	"FDK hinter",
-])
-
-#image_slide("jenga1.jpg")
+image_slide("pipeline.png", imgwidth=1900, imgheight=1000)
 image_slide("jenga2.jpg")
 
 bullet_list_slide("Noto pipeline: challenges", [
@@ -221,6 +238,12 @@ bullet_list_slide("Noto pipeline: challenges", [
 	"Flexibility",
 ])
 
+bullet_list_slide("Noto pipeline: TODO", [
+	"fontTools.varLib",
+	"CFF operator specializer",
+	"FDK hinter",
+])
+
 slide_title("", """
 github.com/googlei18n/fontmake
 github.com/googlei18n/glyphsLib
@@ -233,10 +256,11 @@ github.com/typemytype/booleanOperations
 github.com/googlei18n/cu2qu
 github.com/googlei18n/compreffor
 github.com/behdad/fonttools
+github.com/googlei18n/noto-source
 www.freetype.org/ttfautohint/
 """)
 
-slide_title("Q&amp;A", '')
+slide_big("Q&amp;A")
 
 if __name__ == "__main__":
 	import slippy
diff --git a/fontpipeline/jenga1.jpg b/fontpipeline/jenga1.jpg
deleted file mode 100644
index cb36422..0000000
--- a/fontpipeline/jenga1.jpg
+++ /dev/null
diff --git a/fontpipeline/pipeline.png b/fontpipeline/pipeline.png
new file mode 100644
index 0000000..0b6fdde
--- /dev/null
+++ b/fontpipeline/pipeline.png