From dcf222167e512abb39c83f6e885ed35ea8b1e802 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 8 Oct 2014 20:36:22 +0200
Subject: Add proper 'viewBox', set 'inkscape:document-units', increased
 maximum emsize to 2048 (typical of TrueType).

(bzr r13341.1.261)
---
 share/extensions/setup_typography_canvas.inx | 10 +++++-----
 share/extensions/setup_typography_canvas.py  |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/share/extensions/setup_typography_canvas.inx b/share/extensions/setup_typography_canvas.inx
index 332a14ade..8e7739b5c 100644
--- a/share/extensions/setup_typography_canvas.inx
+++ b/share/extensions/setup_typography_canvas.inx
@@ -4,11 +4,11 @@
   <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="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>
-  <param name="descender" type="int" _gui-text="Descender:" min="0" max="1000">250</param>
+  <param name="emsize" type="int" _gui-text="Em-size:" min="10" max="2048">1000</param>
+  <param name="ascender" type="int" _gui-text="Ascender:" min="0" max="2048">750</param>
+  <param name="caps" type="int" _gui-text="Caps Height:" min="0" max="2048">700</param>
+  <param name="xheight" type="int" _gui-text="X-Height:" min="0" max="2048">500</param>
+  <param name="descender" type="int" _gui-text="Descender:" min="0" max="1024">250</param>
   <effect>
     <object-type>all</object-type>
     <effects-menu>
diff --git a/share/extensions/setup_typography_canvas.py b/share/extensions/setup_typography_canvas.py
index 197aeb77e..a1000f2d1 100755
--- a/share/extensions/setup_typography_canvas.py
+++ b/share/extensions/setup_typography_canvas.py
@@ -69,6 +69,7 @@ class SetupTypographyCanvas(inkex.Effect):
 		self.svg = self.document.getroot()
 		self.svg.set("width", str(emsize))
 		self.svg.set("height", str(emsize))
+                self.svg.set("viewBox", "0 0 " + str(emsize) + " " + str(emsize) )
 
 		baseline = descender
 		# Create guidelines
@@ -78,6 +79,12 @@ class SetupTypographyCanvas(inkex.Effect):
 		self.create_horizontal_guideline("xheight", baseline+xheight)
 		self.create_horizontal_guideline("descender", baseline-descender)
 
+                namedview = self.svg.find(inkex.addNS('namedview', 'sodipodi'))
+                namedview.set(inkex.addNS('document-units', 'inkscape'), 'px')
+                namedview.set(inkex.addNS('cx', 'inkscape'), str(emsize/2.0 ))
+                namedview.set(inkex.addNS('cy', 'inkscape'), str(emsize/2.0 ))
+
+
 if __name__ == '__main__':
 	e = SetupTypographyCanvas()
 	e.affect()
-- 
cgit v1.2.3