From 42a23b47ade7e86ec77aaf291510a7addd831934 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Thu, 25 Mar 2010 12:25:01 +0000
Subject: [PATCH] - Fixed missing units in driver margins (bug #576370).

---
 foomatic-db-bad-margins.patch | 3656 +++++++++++++++++++++++++++++++++
 foomatic-db.spec              |    9 +-
 2 files changed, 3664 insertions(+), 1 deletion(-)
 create mode 100644 foomatic-db-bad-margins.patch

diff --git a/foomatic-db-bad-margins.patch b/foomatic-db-bad-margins.patch
new file mode 100644
index 0000000..4c3339a
--- /dev/null
+++ b/foomatic-db-bad-margins.patch
@@ -0,0 +1,3656 @@
+diff -U0 foomatic-db-20100204/ChangeLog.bad-margins foomatic-db-20100204/ChangeLog
+diff -up foomatic-db-20100204/db/source/driver/chp2200.xml.bad-margins foomatic-db-20100204/db/source/driver/chp2200.xml
+--- foomatic-db-20100204/db/source/driver/chp2200.xml.bad-margins	2010-02-04 08:21:49.000000000 +0000
++++ foomatic-db-20100204/db/source/driver/chp2200.xml	2010-03-25 10:52:12.462096392 +0000
+@@ -7,6 +7,7 @@
+     <prototype>gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPAUSE -sDEVICE=chp2200%A%Z -sOutputFile=- -</prototype>
+     <margins>
+       <general>
++        <unit>in</unit>
+         <relative />
+         <top>0.08</top>
+         <left>0.25</left>
+diff -up foomatic-db-20100204/db/source/driver/hpijs-pcl3.xml.bad-margins foomatic-db-20100204/db/source/driver/hpijs-pcl3.xml
+--- foomatic-db-20100204/db/source/driver/hpijs-pcl3.xml.bad-margins	2010-02-04 08:21:49.000000000 +0000
++++ foomatic-db-20100204/db/source/driver/hpijs-pcl3.xml	2010-03-25 10:52:12.465096538 +0000
+@@ -28,6 +28,7 @@
+     <prototype>gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPAUSE -sDEVICE=ijs -sIjsServer=hpijs%A%B%C -dIjsUseOutputFD%Z -sOutputFile=- -</prototype>
+     <margins>
+       <general>
++        <unit>in</unit>
+         <relative />
+         <top>0.125</top>
+         <left>0.25</left>
+diff -up foomatic-db-20100204/db/source/driver/hpijs-pcl5c.xml.bad-margins foomatic-db-20100204/db/source/driver/hpijs-pcl5c.xml
+--- foomatic-db-20100204/db/source/driver/hpijs-pcl5c.xml.bad-margins	2010-02-04 08:21:49.000000000 +0000
++++ foomatic-db-20100204/db/source/driver/hpijs-pcl5c.xml	2010-03-25 10:52:12.467225245 +0000
+@@ -28,6 +28,7 @@
+     <prototype>gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPAUSE -sDEVICE=ijs -sIjsServer=hpijs -sDeviceManufacturer=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;hp color LaserJet&quot;%A%B%C -dIjsUseOutputFD%Z -sOutputFile=- -</prototype>
+     <margins>
+       <general>
++        <unit>in</unit>
+         <relative />
+         <top>0.2</top>
+         <left>0.25</left>
+diff -up foomatic-db-20100204/db/source/driver/hpijs-pcl5e.xml.bad-margins foomatic-db-20100204/db/source/driver/hpijs-pcl5e.xml
+--- foomatic-db-20100204/db/source/driver/hpijs-pcl5e.xml.bad-margins	2010-02-04 08:21:49.000000000 +0000
++++ foomatic-db-20100204/db/source/driver/hpijs-pcl5e.xml	2010-03-25 10:52:12.471222624 +0000
+@@ -28,6 +28,7 @@
+     <prototype>gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPAUSE -sDEVICE=ijs -sIjsServer=hpijs -sDeviceManufacturer=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;HP LaserJet&quot;%A%B%C -dIjsUseOutputFD%Z -sOutputFile=- -</prototype>
+     <margins>
+       <general>
++        <unit>in</unit>
+         <relative />
+         <top>0.2</top>
+         <left>0.25</left>
+diff -up foomatic-db-20100204/db/source/driver/hplip.xml.bad-margins foomatic-db-20100204/db/source/driver/hplip.xml
+--- foomatic-db-20100204/db/source/driver/hplip.xml.bad-margins	2010-02-04 08:21:49.000000000 +0000
++++ foomatic-db-20100204/db/source/driver/hplip.xml	2010-03-25 10:52:12.546221280 +0000
+@@ -71,6 +71,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -146,6 +147,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -237,6 +239,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -328,6 +331,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -403,6 +407,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -474,6 +479,7 @@
+       <id>printer/HP-Business_Inkjet_1000</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -545,6 +551,7 @@
+       <id>printer/HP-Business_Inkjet_1100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -616,6 +623,7 @@
+       <id>printer/HP-Business_Inkjet_1200</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -691,6 +699,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -766,6 +775,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -841,6 +851,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -916,6 +927,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -991,6 +1003,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -1066,6 +1079,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1085,6 +1099,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1104,6 +1119,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1123,6 +1139,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1138,6 +1155,7 @@
+       <id>printer/HP-Color_Inkjet_Printer_CP1160</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -1209,6 +1227,7 @@
+       <id>printer/HP-Color_Inkjet_Printer_CP1700</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -1300,6 +1319,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1319,6 +1339,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1342,6 +1363,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1365,6 +1387,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1388,6 +1411,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1407,6 +1431,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1426,6 +1451,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1445,6 +1471,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1464,6 +1491,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1483,6 +1511,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1502,6 +1531,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1521,6 +1551,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1540,6 +1571,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1559,6 +1591,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1578,6 +1611,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1597,6 +1631,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1616,6 +1651,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1635,6 +1671,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1654,6 +1691,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1673,6 +1711,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1692,6 +1731,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1711,6 +1751,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1730,6 +1771,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1749,6 +1791,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1768,6 +1811,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1787,6 +1831,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -1806,6 +1851,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -1897,6 +1943,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -1988,6 +2035,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -2079,6 +2127,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -2170,6 +2219,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -2185,6 +2235,7 @@
+       <id>printer/HP-DeskJet_1220C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -2272,6 +2323,7 @@
+       <id>printer/HP-DeskJet_1280</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -2363,6 +2415,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -2382,6 +2435,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -2457,6 +2511,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -2532,6 +2587,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -2607,6 +2663,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -2682,6 +2739,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -2706,6 +2764,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -2781,6 +2840,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -2856,6 +2916,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -2931,6 +2992,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3006,6 +3068,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3081,6 +3144,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3156,6 +3220,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3231,6 +3296,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3306,6 +3372,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3377,6 +3444,7 @@
+       <id>printer/HP-DeskJet_3810</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3448,6 +3516,7 @@
+       <id>printer/HP-DeskJet_3816</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3519,6 +3588,7 @@
+       <id>printer/HP-DeskJet_3820</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3590,6 +3660,7 @@
+       <id>printer/HP-DeskJet_3822</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3665,6 +3736,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3740,6 +3812,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3815,6 +3888,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3890,6 +3964,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3965,6 +4040,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -3989,6 +4065,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4009,6 +4086,7 @@
+       <id>printer/HP-DeskJet_450</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4112,6 +4190,7 @@
+       <id>printer/HP-DeskJet_460</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4234,6 +4313,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4258,6 +4338,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4283,6 +4364,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4308,6 +4390,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4328,6 +4411,7 @@
+       <id>printer/HP-DeskJet_5150</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4445,6 +4529,7 @@
+       <id>printer/HP-DeskJet_5158</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4562,6 +4647,7 @@
+       <id>printer/HP-DeskJet_5160</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4684,6 +4770,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4708,6 +4795,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4732,6 +4820,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4752,6 +4841,7 @@
+       <id>printer/HP-DeskJet_5440</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4873,6 +4963,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -4893,6 +4984,7 @@
+       <id>printer/HP-DeskJet_5550</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -5010,6 +5102,7 @@
+       <id>printer/HP-DeskJet_5551</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -5131,6 +5224,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -5151,6 +5245,7 @@
+       <id>printer/HP-DeskJet_5650</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -5268,6 +5363,7 @@
+       <id>printer/HP-DeskJet_5652</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -5385,6 +5481,7 @@
+       <id>printer/HP-DeskJet_5670</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -5502,6 +5599,7 @@
+       <id>printer/HP-DeskJet_5740</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -5619,6 +5717,7 @@
+       <id>printer/HP-DeskJet_5850</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -5736,6 +5835,7 @@
+       <id>printer/HP-DeskJet_5940</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -5857,6 +5957,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -5881,6 +5982,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -5905,6 +6007,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -5925,6 +6028,7 @@
+       <id>printer/HP-DeskJet_6122</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -5996,6 +6100,7 @@
+       <id>printer/HP-DeskJet_6127</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6071,6 +6176,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6095,6 +6201,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6119,6 +6226,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6143,6 +6251,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6167,6 +6276,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6187,6 +6297,7 @@
+       <id>printer/HP-DeskJet_6520</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6304,6 +6415,7 @@
+       <id>printer/HP-DeskJet_6540</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6425,6 +6537,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6445,6 +6558,7 @@
+       <id>printer/HP-DeskJet_6600</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6566,6 +6680,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6590,6 +6705,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6614,6 +6730,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6638,6 +6755,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6658,6 +6776,7 @@
+       <id>printer/HP-DeskJet_6800</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6779,6 +6898,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6803,6 +6923,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6823,6 +6944,7 @@
+       <id>printer/HP-DeskJet_6840</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6944,6 +7066,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6968,6 +7091,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -6992,6 +7116,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7012,6 +7137,7 @@
+       <id>printer/HP-DeskJet_6940</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7133,6 +7259,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7157,6 +7284,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7181,6 +7309,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7201,6 +7330,7 @@
+       <id>printer/HP-DeskJet_6980</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7322,6 +7452,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7397,6 +7528,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7472,6 +7604,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7547,6 +7680,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7622,6 +7756,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7697,6 +7832,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7772,6 +7908,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7847,6 +7984,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7922,6 +8060,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -7997,6 +8136,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -8072,6 +8212,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -8147,6 +8288,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -8222,6 +8364,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -8297,6 +8440,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -8372,6 +8516,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -8447,6 +8592,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -8522,6 +8668,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -8597,6 +8744,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -8672,6 +8820,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -8743,6 +8892,7 @@
+       <id>printer/HP-DeskJet_916C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -8814,6 +8964,7 @@
+       <id>printer/HP-DeskJet_920C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -8885,6 +9036,7 @@
+       <id>printer/HP-DeskJet_9300</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -8972,6 +9124,7 @@
+       <id>printer/HP-DeskJet_930C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -9043,6 +9196,7 @@
+       <id>printer/HP-DeskJet_932C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -9114,6 +9268,7 @@
+       <id>printer/HP-DeskJet_933C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -9185,6 +9340,7 @@
+       <id>printer/HP-DeskJet_934C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -9256,6 +9412,7 @@
+       <id>printer/HP-DeskJet_935C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -9327,6 +9484,7 @@
+       <id>printer/HP-DeskJet_940C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -9398,6 +9556,7 @@
+       <id>printer/HP-DeskJet_948C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -9469,6 +9628,7 @@
+       <id>printer/HP-DeskJet_950C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -9540,6 +9700,7 @@
+       <id>printer/HP-DeskJet_952C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -9611,6 +9772,7 @@
+       <id>printer/HP-DeskJet_955C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -9682,6 +9844,7 @@
+       <id>printer/HP-DeskJet_957C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -9753,6 +9916,7 @@
+       <id>printer/HP-DeskJet_959C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -9824,6 +9988,7 @@
+       <id>printer/HP-DeskJet_9600</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -9957,6 +10122,7 @@
+       <id>printer/HP-DeskJet_960C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -10028,6 +10194,7 @@
+       <id>printer/HP-DeskJet_970C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -10099,6 +10266,7 @@
+       <id>printer/HP-DeskJet_975C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -10170,6 +10338,7 @@
+       <id>printer/HP-DeskJet_9800</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -10303,6 +10472,7 @@
+       <id>printer/HP-DeskJet_980C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -10374,6 +10544,7 @@
+       <id>printer/HP-DeskJet_990C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -10445,6 +10616,7 @@
+       <id>printer/HP-DeskJet_995C</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -10520,6 +10692,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -10595,6 +10768,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -10670,6 +10844,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -10745,6 +10920,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -10820,6 +10996,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -10895,6 +11072,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -10970,6 +11148,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -11045,6 +11224,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -11120,6 +11300,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -11195,6 +11376,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -11215,6 +11397,7 @@
+       <id>printer/HP-LaserJet_1010</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11230,6 +11413,7 @@
+       <id>printer/HP-LaserJet_1012</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11250,6 +11434,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11270,6 +11455,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11290,6 +11476,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11310,6 +11497,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11330,6 +11518,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11350,6 +11539,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11370,6 +11560,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11390,6 +11581,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11410,6 +11602,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11430,6 +11623,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11450,6 +11644,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11470,6 +11665,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11490,6 +11686,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11510,6 +11707,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11530,6 +11728,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11550,6 +11749,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11570,6 +11770,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11590,6 +11791,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11610,6 +11812,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11630,6 +11833,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11650,6 +11854,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11670,6 +11875,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11690,6 +11896,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11710,6 +11917,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11730,6 +11938,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11750,6 +11959,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11770,6 +11980,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11790,6 +12001,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11810,6 +12022,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11830,6 +12043,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11850,6 +12064,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11870,6 +12085,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11890,6 +12106,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11910,6 +12127,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11930,6 +12148,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11950,6 +12169,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11970,6 +12190,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -11990,6 +12211,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12010,6 +12232,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12030,6 +12253,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12050,6 +12274,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12070,6 +12295,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12090,6 +12316,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12110,6 +12337,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12134,6 +12362,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12154,6 +12383,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12178,6 +12408,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12198,6 +12429,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12218,6 +12450,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12238,6 +12471,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12262,6 +12496,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12282,6 +12517,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12302,6 +12538,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12322,6 +12559,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12342,6 +12580,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12362,6 +12601,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12382,6 +12622,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12402,6 +12643,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12422,6 +12664,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12442,6 +12685,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12462,6 +12706,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12482,6 +12727,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12502,6 +12748,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12522,6 +12769,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12542,6 +12790,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12562,6 +12811,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12582,6 +12832,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12602,6 +12853,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12622,6 +12874,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12642,6 +12895,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12662,6 +12916,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12682,6 +12937,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12702,6 +12958,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12722,6 +12979,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12742,6 +13000,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12762,6 +13021,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12782,6 +13042,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12802,6 +13063,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12822,6 +13084,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12842,6 +13105,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12862,6 +13126,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12882,6 +13147,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12902,6 +13168,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12922,6 +13189,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12942,6 +13210,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12962,6 +13231,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -12982,6 +13252,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -13002,6 +13273,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -13022,6 +13294,9 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
++          <unit>in</unit>
++          <unit>in</unit>
+           <relative />
+           <top>0.2</top>
+           <left>0.25</left>
+@@ -13042,6 +13317,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13067,6 +13343,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13092,6 +13369,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13117,6 +13395,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13141,6 +13420,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13216,6 +13496,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13291,6 +13572,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13366,6 +13648,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13441,6 +13724,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13516,6 +13800,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13591,6 +13876,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13611,6 +13897,7 @@
+       <id>printer/HP-OfficeJet_5105</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13682,6 +13969,7 @@
+       <id>printer/HP-OfficeJet_5110</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13753,6 +14041,7 @@
+       <id>printer/HP-OfficeJet_5110xi</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13828,6 +14117,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13852,6 +14142,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -13927,6 +14218,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14002,6 +14294,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14026,6 +14319,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14050,6 +14344,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14074,6 +14369,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14098,6 +14394,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14118,6 +14415,7 @@
+       <id>printer/HP-OfficeJet_6100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14235,6 +14533,7 @@
+       <id>printer/HP-OfficeJet_6105</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14352,6 +14651,7 @@
+       <id>printer/HP-OfficeJet_6110</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14469,6 +14769,7 @@
+       <id>printer/HP-OfficeJet_6150</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14586,6 +14887,7 @@
+       <id>printer/HP-OfficeJet_6200</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14707,6 +15009,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14731,6 +15034,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14751,6 +15055,7 @@
+       <id>printer/HP-OfficeJet_6300</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14872,6 +15177,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14896,6 +15202,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14920,6 +15227,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -14940,6 +15248,7 @@
+       <id>printer/HP-OfficeJet_7100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -15011,6 +15320,7 @@
+       <id>printer/HP-OfficeJet_7110</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -15082,6 +15392,7 @@
+       <id>printer/HP-OfficeJet_7130</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -15153,6 +15464,7 @@
+       <id>printer/HP-OfficeJet_7140</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -15228,6 +15540,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -15248,6 +15561,7 @@
+       <id>printer/HP-OfficeJet_7200</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -15369,6 +15683,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -15389,6 +15704,7 @@
+       <id>printer/HP-OfficeJet_7300</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -15506,6 +15822,7 @@
+       <id>printer/HP-OfficeJet_7400</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -15623,6 +15940,7 @@
+       <id>printer/HP-OfficeJet_D125</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -15694,6 +16012,7 @@
+       <id>printer/HP-OfficeJet_D135</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -15765,6 +16084,7 @@
+       <id>printer/HP-OfficeJet_D145</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -15836,6 +16156,7 @@
+       <id>printer/HP-OfficeJet_D155</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -15907,6 +16228,7 @@
+       <id>printer/HP-OfficeJet_G55</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -15978,6 +16300,7 @@
+       <id>printer/HP-OfficeJet_G85</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -16049,6 +16372,7 @@
+       <id>printer/HP-OfficeJet_G95</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -16124,6 +16448,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -16199,6 +16524,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -16270,6 +16596,7 @@
+       <id>printer/HP-OfficeJet_J5700</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -16387,6 +16714,7 @@
+       <id>printer/HP-OfficeJet_K60</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -16458,6 +16786,7 @@
+       <id>printer/HP-OfficeJet_K60xi</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -16529,6 +16858,7 @@
+       <id>printer/HP-OfficeJet_K7100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -16662,6 +16992,7 @@
+       <id>printer/HP-OfficeJet_K80</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -16733,6 +17064,7 @@
+       <id>printer/HP-OfficeJet_K80xi</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -16809,6 +17141,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -16833,6 +17166,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -16908,6 +17242,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -16983,6 +17318,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -17054,6 +17390,7 @@
+       <id>printer/HP-OfficeJet_Pro_K5300</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -17125,6 +17462,7 @@
+       <id>printer/HP-OfficeJet_Pro_K5400</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -17196,6 +17534,7 @@
+       <id>printer/HP-OfficeJet_Pro_K550</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -17267,6 +17606,7 @@
+       <id>printer/HP-OfficeJet_Pro_K850</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -17354,6 +17694,7 @@
+       <id>printer/HP-OfficeJet_Pro_K8600</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -17441,6 +17782,7 @@
+       <id>printer/HP-OfficeJet_Pro_L7300</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -17512,6 +17854,7 @@
+       <id>printer/HP-OfficeJet_Pro_L7500</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -17583,6 +17926,7 @@
+       <id>printer/HP-OfficeJet_Pro_L7600</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -17654,6 +17998,7 @@
+       <id>printer/HP-OfficeJet_Pro_L7700</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -17729,6 +18074,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -17804,6 +18150,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -17879,6 +18226,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -17954,6 +18302,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -18029,6 +18378,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -18104,6 +18454,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -18179,6 +18530,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -18250,6 +18602,7 @@
+       <id>printer/HP-OfficeJet_V40</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -18321,6 +18674,7 @@
+       <id>printer/HP-OfficeJet_V40xi</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -18392,6 +18746,7 @@
+       <id>printer/HP-PhotoSmart_140</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -18415,6 +18770,7 @@
+       <id>printer/HP-PhotoSmart_240</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -18438,6 +18794,7 @@
+       <id>printer/HP-PhotoSmart_2570</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -18555,6 +18912,7 @@
+       <id>printer/HP-PhotoSmart_2600</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -18672,6 +19030,7 @@
+       <id>printer/HP-PhotoSmart_2700</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -18789,6 +19148,7 @@
+       <id>printer/HP-PhotoSmart_3100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -18906,6 +19266,7 @@
+       <id>printer/HP-PhotoSmart_320</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -18929,6 +19290,7 @@
+       <id>printer/HP-PhotoSmart_3200</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -19046,6 +19408,7 @@
+       <id>printer/HP-PhotoSmart_330</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -19069,6 +19432,7 @@
+       <id>printer/HP-PhotoSmart_3300</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -19186,6 +19550,7 @@
+       <id>printer/HP-PhotoSmart_370</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -19209,6 +19574,7 @@
+       <id>printer/HP-PhotoSmart_380</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -19232,6 +19598,7 @@
+       <id>printer/HP-PhotoSmart_420</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -19255,6 +19622,7 @@
+       <id>printer/HP-PhotoSmart_470</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -19278,6 +19646,7 @@
+       <id>printer/HP-PhotoSmart_7150</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -19395,6 +19764,7 @@
+       <id>printer/HP-PhotoSmart_7260</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -19512,6 +19882,7 @@
+       <id>printer/HP-PhotoSmart_7268</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -19629,6 +20000,7 @@
+       <id>printer/HP-PhotoSmart_7345</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -19746,6 +20118,7 @@
+       <id>printer/HP-PhotoSmart_7350</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -19863,6 +20236,7 @@
+       <id>printer/HP-PhotoSmart_7400</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -19980,6 +20354,7 @@
+       <id>printer/HP-PhotoSmart_7550</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -20097,6 +20472,7 @@
+       <id>printer/HP-PhotoSmart_7660</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -20214,6 +20590,7 @@
+       <id>printer/HP-PhotoSmart_7760</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -20331,6 +20708,7 @@
+       <id>printer/HP-PhotoSmart_7800</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -20448,6 +20826,7 @@
+       <id>printer/HP-PhotoSmart_7960</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -20565,6 +20944,7 @@
+       <id>printer/HP-PhotoSmart_8000</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -20682,6 +21062,7 @@
+       <id>printer/HP-PhotoSmart_8100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -20799,6 +21180,7 @@
+       <id>printer/HP-PhotoSmart_8200</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -20916,6 +21298,7 @@
+       <id>printer/HP-PhotoSmart_8400</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -21033,6 +21416,7 @@
+       <id>printer/HP-PhotoSmart_8700</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -21166,6 +21550,7 @@
+       <id>printer/HP-PhotoSmart_A310</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -21189,6 +21574,7 @@
+       <id>printer/HP-PhotoSmart_A320</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -21212,6 +21598,7 @@
+       <id>printer/HP-PhotoSmart_A430</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -21235,6 +21622,7 @@
+       <id>printer/HP-PhotoSmart_A440</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -21258,6 +21646,7 @@
+       <id>printer/HP-PhotoSmart_A510</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -21281,6 +21670,7 @@
+       <id>printer/HP-PhotoSmart_A520</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -21304,6 +21694,7 @@
+       <id>printer/HP-PhotoSmart_A610</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -21327,6 +21718,7 @@
+       <id>printer/HP-PhotoSmart_A620</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -21350,6 +21742,7 @@
+       <id>printer/HP-PhotoSmart_A710</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -21373,6 +21766,7 @@
+       <id>printer/HP-PhotoSmart_A820</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -21396,6 +21790,7 @@
+       <id>printer/HP-PhotoSmart_C3100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -21513,6 +21908,7 @@
+       <id>printer/HP-PhotoSmart_C4100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -21630,6 +22026,7 @@
+       <id>printer/HP-PhotoSmart_C4200</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -21747,6 +22144,7 @@
+       <id>printer/HP-PhotoSmart_C4380</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -21864,6 +22262,7 @@
+       <id>printer/HP-PhotoSmart_C5100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -21981,6 +22380,7 @@
+       <id>printer/HP-PhotoSmart_C5200</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -22098,6 +22498,7 @@
+       <id>printer/HP-PhotoSmart_C6100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -22215,6 +22616,7 @@
+       <id>printer/HP-PhotoSmart_C6200</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -22332,6 +22734,7 @@
+       <id>printer/HP-PhotoSmart_C7100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -22449,6 +22852,7 @@
+       <id>printer/HP-PhotoSmart_C7200</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -22566,6 +22970,7 @@
+       <id>printer/HP-PhotoSmart_C8100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -22683,6 +23088,7 @@
+       <id>printer/HP-PhotoSmart_D5060</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -22800,6 +23206,7 @@
+       <id>printer/HP-PhotoSmart_D5100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -22917,6 +23324,7 @@
+       <id>printer/HP-PhotoSmart_D5300</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -23034,6 +23442,7 @@
+       <id>printer/HP-PhotoSmart_D6100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -23151,6 +23560,7 @@
+       <id>printer/HP-PhotoSmart_D7100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -23268,6 +23678,7 @@
+       <id>printer/HP-PhotoSmart_D7200</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -23385,6 +23796,7 @@
+       <id>printer/HP-PhotoSmart_D7300</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -23502,6 +23914,7 @@
+       <id>printer/HP-PhotoSmart_D7400</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -23619,6 +24032,7 @@
+       <id>printer/HP-PhotoSmart_P100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -23642,6 +24056,7 @@
+       <id>printer/HP-PhotoSmart_P1000</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -23713,6 +24128,7 @@
+       <id>printer/HP-PhotoSmart_P1100</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -23784,6 +24200,7 @@
+       <id>printer/HP-PhotoSmart_P1115</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -23855,6 +24272,7 @@
+       <id>printer/HP-PhotoSmart_P1215</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -23926,6 +24344,7 @@
+       <id>printer/HP-PhotoSmart_P1218</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -23997,6 +24416,7 @@
+       <id>printer/HP-PhotoSmart_P130</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -24020,6 +24440,7 @@
+       <id>printer/HP-PhotoSmart_P1315</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -24091,6 +24512,7 @@
+       <id>printer/HP-PhotoSmart_P230</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0</top>
+           <left>0</left>
+@@ -24114,6 +24536,7 @@
+       <id>printer/HP-PhotoSmart_Pro_B8300</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -24251,6 +24674,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -24326,6 +24750,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -24401,6 +24826,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -24476,6 +24902,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -24551,6 +24978,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -24626,6 +25054,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -24701,6 +25130,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -24776,6 +25206,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -24847,6 +25278,7 @@
+       <id>printer/HP-PSC_1500</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -24964,6 +25396,7 @@
+       <id>printer/HP-PSC_1510</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -25081,6 +25514,7 @@
+       <id>printer/HP-PSC_1600</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -25198,6 +25632,7 @@
+       <id>printer/HP-PSC_2110</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -25315,6 +25750,7 @@
+       <id>printer/HP-PSC_2150</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -25432,6 +25868,7 @@
+       <id>printer/HP-PSC_2170</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -25549,6 +25986,7 @@
+       <id>printer/HP-PSC_2175</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -25666,6 +26104,7 @@
+       <id>printer/HP-PSC_2210</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -25783,6 +26222,7 @@
+       <id>printer/HP-PSC_2300</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -25900,6 +26340,7 @@
+       <id>printer/HP-PSC_2350</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -26017,6 +26458,7 @@
+       <id>printer/HP-PSC_2400</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -26134,6 +26576,7 @@
+       <id>printer/HP-PSC_2500</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -26255,6 +26698,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -26279,6 +26723,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -26303,6 +26748,7 @@
+       </functionality>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -26374,6 +26820,7 @@
+       <id>printer/HP-PSC_750</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -26445,6 +26892,7 @@
+       <id>printer/HP-PSC_750xi</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -26516,6 +26964,7 @@
+       <id>printer/HP-PSC_950</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+@@ -26587,6 +27036,7 @@
+       <id>printer/HP-PSC_950xi</id>
+       <margins>
+         <general>
++          <unit>in</unit>
+           <relative />
+           <top>0.125</top>
+           <left>0.25</left>
+diff -up foomatic-db-20100204/db/source/driver/min12xxw.xml.bad-margins foomatic-db-20100204/db/source/driver/min12xxw.xml
+--- foomatic-db-20100204/db/source/driver/min12xxw.xml.bad-margins	2010-02-04 08:21:50.000000000 +0000
++++ foomatic-db-20100204/db/source/driver/min12xxw.xml	2010-03-25 10:52:12.549223642 +0000
+@@ -10,6 +10,7 @@
+     <prototype>gs -q -dNOPAUSE -dPARANOIDSAFER -dBATCH -sDEVICE=pbmraw%A%Z -sOutputFile=- - | min12xxw%B</prototype>
+     <margins>
+       <general>
++        <unit>in</unit>
+         <relative />
+         <top>0.17</top>
+         <left>0.17</left>
+diff -up foomatic-db-20100204/db/source/driver/oki4w.xml.bad-margins foomatic-db-20100204/db/source/driver/oki4w.xml
+--- foomatic-db-20100204/db/source/driver/oki4w.xml.bad-margins	2010-02-04 08:21:50.000000000 +0000
++++ foomatic-db-20100204/db/source/driver/oki4w.xml	2010-03-25 10:52:12.554224798 +0000
+@@ -7,6 +7,7 @@
+     <prototype>gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPAUSE -sDEVICE=oki4w%A%Z -sOutputFile=-%C -f -</prototype>
+     <margins>
+       <general>
++        <unit>in</unit>
+         <relative />
+         <top>0.07</top>
+         <left>0.125</left>
diff --git a/foomatic-db.spec b/foomatic-db.spec
index ec9fd90..79a09d1 100644
--- a/foomatic-db.spec
+++ b/foomatic-db.spec
@@ -5,7 +5,7 @@
 Summary: Database of printers and printer drivers
 Name: foomatic-db
 Version: %{dbver_rel}
-Release: 11.%{dbver_snap}%{?dist}
+Release: 12.%{dbver_snap}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Requires: %{name}-filesystem = %{version}-%{release}
@@ -15,6 +15,7 @@ Source0: http://www.openprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-
 Source1: http://www.openprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
 Patch1: foomatic-db-device-id-kyocera-mita-fs-1020d.patch
+Patch2: foomatic-db-bad-margins.patch
 
 Url: http://www.openprinting.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -98,6 +99,9 @@ popd
 # Device ID for Kyocera Mita FS-1020D (bug #575063).
 %patch1 -p1
 
+# Fixed missing units in driver margins (bug #576370).
+%patch2 -p1 -b .bad-margins
+
 popd
 
 %build
@@ -164,6 +168,9 @@ rm -rf %{buildroot}
 %{_datadir}/cups/model/foomatic-db-ppds
 
 %changelog
+* Thu Mar 25 2010 Tim Waugh <twaugh@redhat.com> 4.0-12.20100402
+- Fixed missing units in driver margins (bug #576370).
+
 * Fri Mar 19 2010 Tim Waugh <twaugh@redhat.com> 4.0-11.20100402
 - Device ID for Kyocera Mita FS-1020D (bug #575063).