rename "set width" and "units per em" to "Em-size"

(bzr r10233)

3 files changed, 16 insertions, 17 deletions

diff --git a/share/extensions/layers2svgfont.py b/share/extensions/layers2svgfont.py
index de3617fa2..ef291fc4c 100644
--- a/share/extensions/layers2svgfont.py
+++ b/share/extensions/layers2svgfont.py
@@ -46,25 +46,24 @@ class Layers2SVGFont(inkex.Effect):
 				return glyph
 		return inkex.etree.SubElement(font, inkex.addNS('glyph', 'svg'))	
 
-	def flip_cordinate_system(self, d, units_per_em, baseline):
+	def flip_cordinate_system(self, d, emsize, baseline):
 		pathdata = PathData(d)
 
-		def flip_cordinates(coordinates, units_per_em, baseline, relative):
+		def flip_cordinates(coordinates, emsize, baseline, relative):
 			x, y = coordinates
 			if relative:
 				return (x, -y)
 			else:
-				return (x, units_per_em - baseline - y)	
+				return (x, emsize - baseline - y)	
 
-		return pathdata.transform_coordinate_values(flip_cordinates, units_per_em, baseline)
+		return pathdata.transform_coordinate_values(flip_cordinates, emsize, baseline)
 
 	def effect(self):
 		# Get access to main SVG document element
 		self.svg = self.document.getroot()
 		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?
+		emsize = int(self.svg.get("width"))
 		baseline = self.guideline_value("baseline", 1)
 		ascender = self.guideline_value("ascender", 1) - baseline
 		caps = self.guideline_value("caps", 1) - baseline
@@ -72,12 +71,12 @@ class Layers2SVGFont(inkex.Effect):
 		descender = baseline - self.guideline_value("descender", 1)
 
 		font = self.get_or_create(self.defs, inkex.addNS('font', 'svg'))
-		font.set("horiz-adv-x", str(setwidth))
+		font.set("horiz-adv-x", str(emsize))
 		font.set("horiz-origin-y", str(baseline))
 
 		fontface = self.get_or_create(font, inkex.addNS('font-face', 'svg'))
 		fontface.set("font-family", "SVGFont")
-		fontface.set("units-per-em", str(setwidth))
+		fontface.set("units-per-em", str(emsize))
 		fontface.set("cap-height", str(caps))
 		fontface.set("x-height", str(xheight))
 		fontface.set("ascent", str(ascender))
@@ -106,7 +105,7 @@ class Layers2SVGFont(inkex.Effect):
 				#paths = group.findall(inkex.addNS('path', 'svg'))
 				#for p in paths:
 				#	d = p.get("d")
-				#	d = self.flip_cordinate_system(d, units_per_em, baseline)
+				#	d = self.flip_cordinate_system(d, emsize, baseline)
 				#	path = inkex.etree.SubElement(glyph, inkex.addNS('path', 'svg'))
 				#	path.set("d", d)
 
@@ -117,7 +116,7 @@ class Layers2SVGFont(inkex.Effect):
 				paths = group.findall(inkex.addNS('path', 'svg'))
 				d = ""
 				for p in paths:
-					d += " " + self.flip_cordinate_system(p.get("d"), units_per_em, baseline)
+					d += " " + self.flip_cordinate_system(p.get("d"), emsize, baseline)
 				glyph.set("d", d)
 
 if __name__ == '__main__':
diff --git a/share/extensions/setup_typography_canvas.inx b/share/extensions/setup_typography_canvas.inx
index 9f731b51e..332a14ade 100644
--- a/share/extensions/setup_typography_canvas.inx
+++ b/share/extensions/setup_typography_canvas.inx
@@ -4,7 +4,7 @@
   <id>org.inkscape.typography.setuptypographycanvas</id>
   <dependency type="executable" location="extensions">inkex.py</dependency>
   <dependency type="executable" location="extensions">setup_typography_canvas.py</dependency>
-  <param name="setwidth" type="int" _gui-text="Set Width:" min="10" max="2000">1000</param>
+  <param name="emsize" type="int" _gui-text="Em-size:" min="10" max="2000">1000</param>
   <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>
diff --git a/share/extensions/setup_typography_canvas.py b/share/extensions/setup_typography_canvas.py
index 1342f60fd..31798ca3a 100755
--- a/share/extensions/setup_typography_canvas.py
+++ b/share/extensions/setup_typography_canvas.py
@@ -22,10 +22,10 @@ import sys
 class SetupTypographyCanvas(inkex.Effect):
 	def __init__(self):
 		inkex.Effect.__init__(self)
-		self.OptionParser.add_option("-w", "--setwidth",
+		self.OptionParser.add_option("-e", "--emsize",
 						action="store", type="int",
-						dest="setwidth", default=1000,
-						help="Set Width")
+						dest="emsize", default=1000,
+						help="Em-size")
 		self.OptionParser.add_option("-a", "--ascender",
 						action="store", type="int",
 						dest="ascender", default='750',
@@ -58,7 +58,7 @@ class SetupTypographyCanvas(inkex.Effect):
 
 	def effect(self):
 		# Get all the options
-		setwidth = self.options.setwidth
+		emsize = self.options.emsize
 		ascender = self.options.ascender
 		caps = self.options.caps
 		xheight = self.options.xheight
@@ -66,8 +66,8 @@ class SetupTypographyCanvas(inkex.Effect):
 
 		# Get access to main SVG document element
 		self.svg = self.document.getroot()
-		self.svg.set("width", str(setwidth))
-		self.svg.set("height", str(setwidth))
+		self.svg.set("width", str(emsize))
+		self.svg.set("height", str(emsize))
 
 		baseline = descender
 		# Create guidelines