actually fontforge flipping of y-axis for svgfont glyphs is compliant with the svg spec. So we need to do it also.

(bzr r10218)

3 files changed, 26 insertions, 9 deletions

diff --git a/share/extensions/layers2svgfont.py b/share/extensions/layers2svgfont.py
index b53cf241c..7921ec233 100644
--- a/share/extensions/layers2svgfont.py
+++ b/share/extensions/layers2svgfont.py
@@ -23,6 +23,12 @@ logfile = open("/tmp/inkscape-ext-logfile", "wa")
 def LOG(s):
 	logfile.write(s+"\n")
 
+def flip_cordinate_system(d, units_per_em, baseline):
+	#todo
+	return d
+
+bugged_fontforge_compatibility_mode = True
+
 class Layers2SVGFont(inkex.Effect):
 	def __init__(self):
 		inkex.Effect.__init__(self)
@@ -55,11 +61,12 @@ class Layers2SVGFont(inkex.Effect):
 		self.defs = self.get_or_create(self.svg, inkex.addNS('defs', 'svg'))
 
 		setwidth = int(self.svg.get("width"))
+		units_per_em = setwidth #TODO: ask the user for this value?
 		baseline = self.guideline_value("baseline", 1)
 		ascender = self.guideline_value("ascender", 1) - baseline
 		caps = self.guideline_value("caps", 1) - baseline
 		xheight = self.guideline_value("xheight", 1) - baseline
-		descender = self.guideline_value("descender", 1) - baseline
+		descender = baseline - self.guideline_value("descender", 1)
 		lbearing = self.guideline_value("lbearing", 0)
 		rbearing = setwidth - self.guideline_value("rbearing", 0)
 
@@ -74,8 +81,9 @@ class Layers2SVGFont(inkex.Effect):
 
 		font = self.get_or_create(self.defs, inkex.addNS('font', 'svg'))
 		font.set("horiz-adv-x", str(setwidth))
+		font.set("horiz-origin-y", str(baseline))
 
-		fontface = self.get_or_create(font, inkex.addNS('fontface', 'svg'))
+		fontface = self.get_or_create(font, inkex.addNS('font-face', 'svg'))
 		fontface.set("units-per-em", str(setwidth))
 		fontface.set("cap-height", str(caps))
 		fontface.set("x-height", str(xheight))
@@ -90,9 +98,18 @@ class Layers2SVGFont(inkex.Effect):
 				unicode_char = label.split("GlyphLayer-")[1]
 				glyph = self.get_or_create_glyph(font, unicode_char)
 				glyph.set("unicode", unicode_char)
-				use = self.get_or_create(glyph, inkex.addNS('use', 'svg'))
-				use.set(inkex.addNS('href', 'xlink'), "#"+group.get("id"))
-				#TODO: This code creates nodes but they do not render on svg fonts dialog. why? 
+
+				#use = self.get_or_create(glyph, inkex.addNS('use', 'svg'))
+				#use.set(inkex.addNS('href', 'xlink'), "#"+group.get("id"))
+				#TODO: This code creates <use> nodes but they do not render on svg fonts dialog. why? 
+
+				paths = group.findall(inkex.addNS('path', 'svg'))				
+				for p in paths:
+					path = inkex.etree.SubElement(glyph, inkex.addNS('path', 'svg'))
+					d = p.get("d")
+					if not bugged_fontforge_compatibility_mode:
+						d = flip_cordinate_system(d, units_per_em, baseline)
+					path.set("d", d)
 
 if __name__ == '__main__':
 	LOG("\n\n"+"*"*80+"\n\n")
diff --git a/share/extensions/setup_typography_canvas.inx b/share/extensions/setup_typography_canvas.inx
index ed89b71fc..4c8c6499b 100644
--- a/share/extensions/setup_typography_canvas.inx
+++ b/share/extensions/setup_typography_canvas.inx
@@ -8,7 +8,7 @@
   <param name="ascender" type="int" _gui-text="Ascender:" min="0" max="2000">750</param>
   <param name="caps" type="int" _gui-text="Caps Height:" min="0" max="2000">700</param>
   <param name="xheight" type="int" _gui-text="X-Height:" min="0" max="2000">500</param>
-  <param name="descender" type="int" _gui-text="Descender:" min="-1000" max="0">-250</param>
+  <param name="descender" type="int" _gui-text="Descender:" min="0" max="1000">250</param>
   <param name="lbearing" type="int" _gui-text="Left Side Bearing:" min="0" max="2000">100</param>
   <param name="rbearing" type="int" _gui-text="Right Side Bearing:" min="0" max="2000">100</param>
   <effect>
diff --git a/share/extensions/setup_typography_canvas.py b/share/extensions/setup_typography_canvas.py
index 4d9dd3d5f..7e4b32603 100755
--- a/share/extensions/setup_typography_canvas.py
+++ b/share/extensions/setup_typography_canvas.py
@@ -40,7 +40,7 @@ class SetupTypographyCanvas(inkex.Effect):
 						help="x-height")
 		self.OptionParser.add_option("-d", "--descender",
 						action="store", type="int",
-						dest="descender", default='-250',
+						dest="descender", default='250',
 						help="Descender")
 		self.OptionParser.add_option("-l", "--lbearing",
 						action="store", type="int",
@@ -79,13 +79,13 @@ class SetupTypographyCanvas(inkex.Effect):
 		self.svg.set("width", str(setwidth))
 		self.svg.set("height", str(setwidth))
 
-		baseline = -descender
+		baseline = descender
 		# Create guidelines
 		self.create_horizontal_guideline("baseline", baseline)
 		self.create_horizontal_guideline("ascender", baseline+ascender)
 		self.create_horizontal_guideline("caps", baseline+caps)
 		self.create_horizontal_guideline("xheight", baseline+xheight)
-		self.create_horizontal_guideline("descender", baseline+descender)
+		self.create_horizontal_guideline("descender", baseline-descender)
 		self.create_vertical_guideline("lbearing", lbearing)
 		self.create_vertical_guideline("rbearing", setwidth-rbearing)