[dia] Bug 724846 - fix ISO A*,B*,JIS B* paper size

[Hans Breuer <hans src gnome org>]

commit 68f688fec49f8cccf291d5a08e9d8c77d5b24e78
Author: yusuke mihara <mihara netlab jp>
Date:   Fri Feb 21 10:49:45 2014 +0900

    Bug 724846 - fix ISO A*,B*,JIS B* paper size
    
    ISO paper size unit is mm. But dia`s paper size have under mm number.
    So the pdf have abnormal size which exported by dia, on adobereader or
    some viewers.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=724846
    
    Signed-off-by: Hans Breuer <hans breuer org>

 lib/paper.c |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/lib/paper.c b/lib/paper.c
index 7b30fd6..15ca957 100644
--- a/lib/paper.c
+++ b/lib/paper.c
@@ -32,15 +32,30 @@ static const struct _dia_paper_metrics {
   gdouble pswidth, psheight;
   gdouble lmargin, tmargin, rmargin, bmargin;
 } paper_metrics[] = {
+  { "A0", 84.1, 118.9, 2.8222, 2.8222, 2.8222, 2.8222 },
+  { "A1", 59.4, 84.1, 2.8222, 2.8222, 2.8222, 2.8222 },
+  { "A2", 42.0, 59.4, 2.8222, 2.8222, 2.8222, 2.8222 },
   { "A3", 29.7, 42.0, 2.8222, 2.8222, 2.8222, 2.8222 },
   { "A4", 21.0, 29.7, 2.8222, 2.8222, 2.8222, 2.8222 },
-  { "A5", 14.85, 21.0, 2.8222, 2.8222, 2.8222, 2.8222 },
-  { "B4", 25.7528, 36.4772, 2.1167, 2.1167, 2.1167, 2.1167 },
-  { "B5", 17.6389, 25.0472, 2.8222, 2.8222, 2.8222, 2.8222 },
-  { "B5-Japan", 18.2386, 25.7528, 2.8222, 2.8222, 2.8222, 2.8222 },
+  { "A5", 14.8, 21.0, 2.8222, 2.8222, 2.8222, 2.8222 },
+  { "A6", 10.5, 14.8, 2.8222, 2.8222, 2.8222, 2.8222 },
+  { "B0-Japan", 103.0, 145.6, 2.1167, 2.1167, 2.1167, 2.1167 },
+  { "B1-Japan", 72.8, 103.0, 2.1167, 2.1167, 2.1167, 2.1167 },
+  { "B2-Japan", 51.5, 72.8, 2.1167, 2.1167, 2.1167, 2.1167 },
+  { "B3-Japan", 36.4, 51.5, 2.1167, 2.1167, 2.1167, 2.1167 },
+  { "B4-Japan", 25.7, 36.4, 2.1167, 2.1167, 2.1167, 2.1167 },
+  { "B5-Japan", 18.2, 25.7, 2.8222, 2.8222, 2.8222, 2.8222 },
+  { "B6-Japan", 12.8, 18.2, 2.8222, 2.8222, 2.8222, 2.8222 },
+  { "B0", 100.0, 141.4, 2.1167, 2.1167, 2.1167, 2.1167 },
+  { "B1", 70.7, 100.0, 2.1167, 2.1167, 2.1167, 2.1167 },
+  { "B2", 50.0, 70.7, 2.1167, 2.1167, 2.1167, 2.1167 },
+  { "B3", 35.3, 50.0, 2.1167, 2.1167, 2.1167, 2.1167 },
+  { "B4", 25.0, 35.3, 2.1167, 2.1167, 2.1167, 2.1167 },
+  { "B5", 17.6, 25.0, 2.8222, 2.8222, 2.8222, 2.8222 },
+  { "B6", 12.5, 17.6, 2.8222, 2.8222, 2.8222, 2.8222 },
   { "Letter", 21.59, 27.94, 2.54, 2.54, 2.54, 2.54 },
   { "Legal", 21.59, 35.56, 2.54, 2.54, 2.54, 2.54 },
-  { "Ledger", 27.94, 43.18, 2.54, 2.54, 2.54, 2.54 },
+  { "Ledger", 27.9, 43.2, 2.54, 2.54, 2.54, 2.54 },
   { "Half-Letter", 21.59, 14.0, 2.54, 2.54, 2.54, 2.54 },
   { "Executive", 18.45, 26.74, 2.54, 2.54, 2.54, 2.54 },
   { "Tabloid", 28.01, 43.2858, 2.54, 2.54, 2.54, 2.54 },
@@ -51,9 +66,6 @@ static const struct _dia_paper_metrics {
   { "Envelope-DL", 11.0, 22.0, 0.1764, 0.1764, 0.1764, 0.1764 },
   { "Envelope-C5", 16.2278, 22.9306, 0.1764, 0.1764, 0.1764, 0.1764 },
   { "EuroPostcard", 10.5128, 14.8167, 0.1764, 0.1764, 0.1764, 0.1764 },
-  { "A0", 84.1, 118.9, 2.8222, 2.8222, 2.8222, 2.8222 },
-  { "A1", 59.4, 84.1, 2.8222, 2.8222, 2.8222, 2.8222 },
-  { "A2", 42.0, 59.4, 2.8222, 2.8222, 2.8222, 2.8222 },
   { NULL, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }
 };