[gtk+] Use better typography for paper names

From: Matthias Clasen <matthiasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk+] Use better typography for paper names
Date: Tue, 30 Sep 2014 03:06:41 +0000 (UTC)
commit 60c7f223101456f2e750f91461054fa1ac2b847d
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Aug 21 17:03:00 2014 -0400

    Use better typography for paper names
    
    Use U+00D7 MULTIPLICATION SIGN instead of a plain old x in
    paper names, following https://wiki.gnome.org/Design/OS/Typography.
    
    This is a string change.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=735192

 gtk/paper_names.c         |   86 ++++----
 gtk/paper_names_offsets.c |  480 +++++++++++++++++++++++----------------------
 2 files changed, 287 insertions(+), 279 deletions(-)
---
diff --git a/gtk/paper_names.c b/gtk/paper_names.c
index 65e2e9e..2ae9334 100644
--- a/gtk/paper_names.c
+++ b/gtk/paper_names.c
@@ -16,34 +16,34 @@ typedef struct {
 static const PaperInfo standard_names[] = {
   /* sorted by name, remember to sort when changing */
   {"asme_f", "28x40in", N_("asme_f")}, /* f           5    e1 */
-  {"iso_2a0", "1189x1682mm", N_("A0x2")},
+  {"iso_2a0", "1189x1682mm", N_("A0×2")},
   {"iso_a0", "841x1189mm", N_("A0"), "A0"},
-  {"iso_a0x3", "1189x2523mm", N_("A0x3")},
+  {"iso_a0x3", "1189x2523mm", N_("A0×3")},
   {"iso_a1", "594x841mm", N_("A1"), "A1"},
   {"iso_a10", "26x37mm", N_("A10"), "A10"},
-  {"iso_a1x3", "841x1783mm", N_("A1x3")},
-  {"iso_a1x4", "841x2378mm", N_("A1x4")}, 
+  {"iso_a1x3", "841x1783mm", N_("A1×3")},
+  {"iso_a1x4", "841x2378mm", N_("A1×4")},
   {"iso_a2", "420x594mm", N_("A2"), "A2"},
-  {"iso_a2x3", "594x1261mm", N_("A2x3")},
-  {"iso_a2x4", "594x1682mm", N_("A2x4")},
-  {"iso_a2x5", "594x2102mm", N_("A2x5")},
+  {"iso_a2x3", "594x1261mm", N_("A2×3")},
+  {"iso_a2x4", "594x1682mm", N_("A2×4")},
+  {"iso_a2x5", "594x2102mm", N_("A2×5")},
   {"iso_a3", "297x420mm", N_("A3"), "A3"},
   {"iso_a3-extra", "322x445mm", N_("A3 Extra"), "A3Extra"},
-  {"iso_a3x3", "420x891mm", N_("A3x3")},
-  {"iso_a3x4", "420x1189mm", N_("A3x4")},
-  {"iso_a3x5", "420x1486mm", N_("A3x5")},
-  {"iso_a3x6", "420x1783mm", N_("A3x6")},
-  {"iso_a3x7", "420x2080mm", N_("A3x7")},
+  {"iso_a3x3", "420x891mm", N_("A3×3")},
+  {"iso_a3x4", "420x1189mm", N_("A3×4")},
+  {"iso_a3x5", "420x1486mm", N_("A3×5")},
+  {"iso_a3x6", "420x1783mm", N_("A3×6")},
+  {"iso_a3x7", "420x2080mm", N_("A3×7")},
   {"iso_a4", "210x297mm", N_("A4"), "A4"},
   {"iso_a4-extra", "235.5x322.3mm", N_("A4 Extra"), "A4Extra"},
   {"iso_a4-tab", "225x297mm", N_("A4 Tab")},
-  {"iso_a4x3", "297x630mm", N_("A4x3")},
-  {"iso_a4x4", "297x841mm", N_("A4x4")},
-  {"iso_a4x5", "297x1051mm", N_("A4x5")},
-  {"iso_a4x6", "297x1261mm", N_("A4x6")},
-  {"iso_a4x7", "297x1471mm", N_("A4x7")},
-  {"iso_a4x8", "297x1682mm", N_("A4x8")},
-  {"iso_a4x9", "297x1892mm", N_("A4x9")},
+  {"iso_a4x3", "297x630mm", N_("A4×3")},
+  {"iso_a4x4", "297x841mm", N_("A4×4")},
+  {"iso_a4x5", "297x1051mm", N_("A4×5")},
+  {"iso_a4x6", "297x1261mm", N_("A4×6")},
+  {"iso_a4x7", "297x1471mm", N_("A4×7")},
+  {"iso_a4x8", "297x1682mm", N_("A4×8")},
+  {"iso_a4x9", "297x1892mm", N_("A4×9")},
   {"iso_a5", "148x210mm", N_("A5"), "A5"},
   {"iso_a5-extra", "174x235mm", N_("A5 Extra"), "A5Extra"},
   {"iso_a6", "105x148mm", N_("A6"), "A6"},
@@ -58,7 +58,7 @@ static const PaperInfo standard_names[] = {
   {"iso_b4", "250x353mm", N_("B4"), "ISOB4"},
   {"iso_b5", "176x250mm", N_("B5"), "ISOB5"},
   {"iso_b5-extra", "201x276mm", N_("B5 Extra"), "ISOB5Extra"},
-  {"iso_b6", "125x176mm", N_("B6"), "ISOB6"}, 
+  {"iso_b6", "125x176mm", N_("B6"), "ISOB6"},
   {"iso_b6c4", "125x324mm", N_("B6/C4")}, /* b6/c4 Envelope */
   {"iso_b7", "88x125mm", N_("B7"), "ISOB7"},
   {"iso_b8", "62x88mm", N_("B8"), "ISOB8"},
@@ -103,18 +103,18 @@ static const PaperInfo standard_names[] = {
   {"jpn_kaku2", "240x332mm", N_("kaku2 Envelope"), "EnvKaku2"},
   {"jpn_oufuku", "148x200mm", N_("oufuku (reply postcard)"), "DoublePostcard"},
   {"jpn_you4", "105x235mm", N_("you4 Envelope")},
-  {"na_10x11", "10x11in", N_("10x11"), "10x11"},
-  {"na_10x13", "10x13in", N_("10x13"), "10x13"},
-  {"na_10x14", "10x14in", N_("10x14"), "10x14"},
-  {"na_10x15", "10x15in", N_("10x15")},
-  {"na_10x15", "10x15in", N_("10x15")},
-  {"na_11x12", "11x12in", N_("11x12"), "12x11"}, 
-  {"na_11x15", "11x15in", N_("11x15"), "15x11"}, 
-  {"na_12x19", "12x19in", N_("12x19")},
-  {"na_5x7", "5x7in", N_("5x7")},
-  {"na_6x9", "6x9in", N_("6x9 Envelope")},
-  {"na_7x9", "7x9in", N_("7x9 Envelope"), "7x9"},
-  {"na_9x11", "9x11in", N_("9x11 Envelope"), "9x11"},
+  {"na_10x11", "10x11in", N_("10×11"), "10x11"},
+  {"na_10x13", "10x13in", N_("10×13"), "10x13"},
+  {"na_10x14", "10x14in", N_("10×14"), "10x14"},
+  {"na_10x15", "10x15in", N_("10×15")},
+  {"na_10x15", "10x15in", N_("10×15")},
+  {"na_11x12", "11x12in", N_("11×12"), "12x11"},
+  {"na_11x15", "11x15in", N_("11×15"), "15x11"},
+  {"na_12x19", "12x19in", N_("12×19")},
+  {"na_5x7", "5x7in", N_("5×7")},
+  {"na_6x9", "6x9in", N_("6×9 Envelope")},
+  {"na_7x9", "7x9in", N_("7×9 Envelope"), "7x9"},
+  {"na_9x11", "9x11in", N_("9×11 Envelope"), "9x11"},
   {"na_a2", "4.375x5.75in", N_("a2 Envelope")},
   {"na_arch-a", "9x12in", N_("Arch A"), "ARCHA"},
   {"na_arch-b", "12x18in", N_("Arch B"), "ARCHB"},
@@ -130,15 +130,15 @@ static const PaperInfo standard_names[] = {
   {"na_eur-edp", "12x14in", N_("European edp")},
   {"na_executive", "7.25x10.5in", N_("Executive"), "Executive"},
   {"na_f", "44x68in", N_("f")},
-  {"na_fanfold-eur", "8.5x12in", N_("FanFold European"), "FanFoldGerman"},
-  {"na_fanfold-us", "11x14.875in", N_("FanFold US"), "FanFoldUS"},
-  {"na_foolscap", "8.5x13in", N_("FanFold German Legal"), "FanFoldGermanLegal"}, /* foolscap, 
german-legal-fanfold */
+  {"na_fanfold-eur", "8.5x12in", N_("Fan-Fold European"), "FanFoldGerman"},
+  {"na_fanfold-us", "11x14.875in", N_("Fan-Fold US"), "FanFoldUS"},
+  {"na_foolscap", "8.5x13in", N_("Fan-Fold German Legal"), "FanFoldGermanLegal"}, /* foolscap, 
german-legal-fanfold */
   {"na_govt-legal", "8x13in", N_("Government Legal")},
   {"na_govt-letter", "8x10in", N_("Government Letter"), "8x10"},
-  {"na_index-3x5", "3x5in", N_("Index 3x5")},
-  {"na_index-4x6", "4x6in", N_("Index 4x6 (postcard)")},
-  {"na_index-4x6-ext", "6x8in", N_("Index 4x6 ext")},
-  {"na_index-5x8", "5x8in", N_("Index 5x8")},
+  {"na_index-3x5", "3x5in", N_("Index 3×5")},
+  {"na_index-4x6", "4x6in", N_("Index 4×6 (postcard)")},
+  {"na_index-4x6-ext", "6x8in", N_("Index 4×6 ext")},
+  {"na_index-5x8", "5x8in", N_("Index 5×8")},
   {"na_invoice", "5.5x8.5in", N_("Invoice"), "Statement"}, /* invoice,  statement, mini, half-letter */
   {"na_ledger", "11x17in", N_("Tabloid"), "Ledger"}, /* tabloid, engineering-b */
   {"na_legal", "8.5x14in", N_("US Legal"), "Legal"},
@@ -153,12 +153,12 @@ static const PaperInfo standard_names[] = {
   {"na_number-14", "5x11.5in", N_("#14 Envelope"), "Env14"}, /* number-14 Envelope */
   {"na_number-9", "3.875x8.875in", N_("#9 Envelope"), "Env9"},
   {"na_personal", "3.625x6.5in", N_("Personal Envelope"), "EnvPersonal"},
-  {"na_quarto", "8.5x10.83in", N_("Quarto"), "Quarto"}, 
-  {"na_super-a", "8.94x14in", N_("Super A"), "SuperA"}, 
-  {"na_super-b", "13x19in", N_("Super B"), "SuperB"}, 
+  {"na_quarto", "8.5x10.83in", N_("Quarto"), "Quarto"},
+  {"na_super-a", "8.94x14in", N_("Super A"), "SuperA"},
+  {"na_super-b", "13x19in", N_("Super B"), "SuperB"},
   {"na_wide-format", "30x42in", N_("Wide Format")},
   {"om_dai-pa-kai", "275x395mm", N_("Dai-pa-kai")},
-  {"om_folio", "210x330mm", N_("Folio"), "Folio"}, 
+  {"om_folio", "210x330mm", N_("Folio"), "Folio"},
   {"om_folio-sp", "215x315mm", N_("Folio sp")},
   {"om_invite", "220x220mm", N_("Invite Envelope"), "EnvInvite"},
   {"om_italian", "110x230mm", N_("Italian Envelope"), "EnvItalian"},
diff --git a/gtk/paper_names_offsets.c b/gtk/paper_names_offsets.c
index dfb9788..103bca4 100644
--- a/gtk/paper_names_offsets.c
+++ b/gtk/paper_names_offsets.c
@@ -2,34 +2,34 @@
 
 #if 0
 NC_("paper size", "asme_f")
-NC_("paper size", "A0x2")
+NC_("paper size", "A0×2")
 NC_("paper size", "A0")
-NC_("paper size", "A0x3")
+NC_("paper size", "A0×3")
 NC_("paper size", "A1")
 NC_("paper size", "A10")
-NC_("paper size", "A1x3")
-NC_("paper size", "A1x4")
+NC_("paper size", "A1×3")
+NC_("paper size", "A1×4")
 NC_("paper size", "A2")
-NC_("paper size", "A2x3")
-NC_("paper size", "A2x4")
-NC_("paper size", "A2x5")
+NC_("paper size", "A2×3")
+NC_("paper size", "A2×4")
+NC_("paper size", "A2×5")
 NC_("paper size", "A3")
 NC_("paper size", "A3 Extra")
-NC_("paper size", "A3x3")
-NC_("paper size", "A3x4")
-NC_("paper size", "A3x5")
-NC_("paper size", "A3x6")
-NC_("paper size", "A3x7")
+NC_("paper size", "A3×3")
+NC_("paper size", "A3×4")
+NC_("paper size", "A3×5")
+NC_("paper size", "A3×6")
+NC_("paper size", "A3×7")
 NC_("paper size", "A4")
 NC_("paper size", "A4 Extra")
 NC_("paper size", "A4 Tab")
-NC_("paper size", "A4x3")
-NC_("paper size", "A4x4")
-NC_("paper size", "A4x5")
-NC_("paper size", "A4x6")
-NC_("paper size", "A4x7")
-NC_("paper size", "A4x8")
-NC_("paper size", "A4x9")
+NC_("paper size", "A4×3")
+NC_("paper size", "A4×4")
+NC_("paper size", "A4×5")
+NC_("paper size", "A4×6")
+NC_("paper size", "A4×7")
+NC_("paper size", "A4×8")
+NC_("paper size", "A4×9")
 NC_("paper size", "A5")
 NC_("paper size", "A5 Extra")
 NC_("paper size", "A6")
@@ -89,18 +89,18 @@ NC_("paper size", "kahu Envelope")
 NC_("paper size", "kaku2 Envelope")
 NC_("paper size", "oufuku (reply postcard)")
 NC_("paper size", "you4 Envelope")
-NC_("paper size", "10x11")
-NC_("paper size", "10x13")
-NC_("paper size", "10x14")
-NC_("paper size", "10x15")
-NC_("paper size", "10x15")
-NC_("paper size", "11x12")
-NC_("paper size", "11x15")
-NC_("paper size", "12x19")
-NC_("paper size", "5x7")
-NC_("paper size", "6x9 Envelope")
-NC_("paper size", "7x9 Envelope")
-NC_("paper size", "9x11 Envelope")
+NC_("paper size", "10×11")
+NC_("paper size", "10×13")
+NC_("paper size", "10×14")
+NC_("paper size", "10×15")
+NC_("paper size", "10×15")
+NC_("paper size", "11×12")
+NC_("paper size", "11×15")
+NC_("paper size", "12×19")
+NC_("paper size", "5×7")
+NC_("paper size", "6×9 Envelope")
+NC_("paper size", "7×9 Envelope")
+NC_("paper size", "9×11 Envelope")
 NC_("paper size", "a2 Envelope")
 NC_("paper size", "Arch A")
 NC_("paper size", "Arch B")
@@ -116,15 +116,15 @@ NC_("paper size", "edp")
 NC_("paper size", "European edp")
 NC_("paper size", "Executive")
 NC_("paper size", "f")
-NC_("paper size", "FanFold European")
-NC_("paper size", "FanFold US")
-NC_("paper size", "FanFold German Legal")
+NC_("paper size", "Fan-Fold European")
+NC_("paper size", "Fan-Fold US")
+NC_("paper size", "Fan-Fold German Legal")
 NC_("paper size", "Government Legal")
 NC_("paper size", "Government Letter")
-NC_("paper size", "Index 3x5")
-NC_("paper size", "Index 4x6 (postcard)")
-NC_("paper size", "Index 4x6 ext")
-NC_("paper size", "Index 5x8")
+NC_("paper size", "Index 3×5")
+NC_("paper size", "Index 4×6 (postcard)")
+NC_("paper size", "Index 4×6 ext")
+NC_("paper size", "Index 5×8")
 NC_("paper size", "Invoice")
 NC_("paper size", "Tabloid")
 NC_("paper size", "US Legal")
@@ -171,39 +171,39 @@ NC_("paper size", "ROC 8k")
 static const char paper_names[] =
   "asme_f\0"
   "iso_2a0\0"
-  "A0x2\0"
+  "A0×2\0"
   "iso_a0\0"
   "iso_a0x3\0"
-  "A0x3\0"
+  "A0×3\0"
   "iso_a1\0"
   "iso_a10\0"
   "A10\0"
   "iso_a1x3\0"
-  "A1x3\0"
+  "A1×3\0"
   "iso_a1x4\0"
-  "A1x4\0"
+  "A1×4\0"
   "iso_a2\0"
   "iso_a2x3\0"
-  "A2x3\0"
+  "A2×3\0"
   "iso_a2x4\0"
-  "A2x4\0"
+  "A2×4\0"
   "iso_a2x5\0"
-  "A2x5\0"
+  "A2×5\0"
   "iso_a3\0"
   "A3\0"
   "iso_a3-extra\0"
   "A3 Extra\0"
   "A3Extra\0"
   "iso_a3x3\0"
-  "A3x3\0"
+  "A3×3\0"
   "iso_a3x4\0"
-  "A3x4\0"
+  "A3×4\0"
   "iso_a3x5\0"
-  "A3x5\0"
+  "A3×5\0"
   "iso_a3x6\0"
-  "A3x6\0"
+  "A3×6\0"
   "iso_a3x7\0"
-  "A3x7\0"
+  "A3×7\0"
   "iso_a4\0"
   "A4\0"
   "iso_a4-extra\0"
@@ -212,19 +212,19 @@ static const char paper_names[] =
   "iso_a4-tab\0"
   "A4 Tab\0"
   "iso_a4x3\0"
-  "A4x3\0"
+  "A4×3\0"
   "iso_a4x4\0"
-  "A4x4\0"
+  "A4×4\0"
   "iso_a4x5\0"
-  "A4x5\0"
+  "A4×5\0"
   "iso_a4x6\0"
-  "A4x6\0"
+  "A4×6\0"
   "iso_a4x7\0"
-  "A4x7\0"
+  "A4×7\0"
   "iso_a4x8\0"
-  "A4x8\0"
+  "A4×8\0"
   "iso_a4x9\0"
-  "A4x9\0"
+  "A4×9\0"
   "iso_a5\0"
   "A5\0"
   "iso_a5-extra\0"
@@ -349,21 +349,29 @@ static const char paper_names[] =
   "jpn_you4\0"
   "you4 Envelope\0"
   "na_10x11\0"
+  "10×11\0"
   "na_10x13\0"
+  "10×13\0"
   "na_10x14\0"
+  "10×14\0"
   "na_10x15\0"
+  "10×15\0"
   "na_11x12\0"
+  "11×12\0"
   "12x11\0"
   "na_11x15\0"
+  "11×15\0"
   "15x11\0"
   "na_12x19\0"
+  "12×19\0"
   "na_5x7\0"
+  "5×7\0"
   "na_6x9\0"
-  "6x9 Envelope\0"
+  "6×9 Envelope\0"
   "na_7x9\0"
-  "7x9 Envelope\0"
+  "7×9 Envelope\0"
   "na_9x11\0"
-  "9x11 Envelope\0"
+  "9×11 Envelope\0"
   "na_a2\0"
   "a2 Envelope\0"
   "na_arch-a\0"
@@ -396,13 +404,13 @@ static const char paper_names[] =
   "Executive\0"
   "na_f\0"
   "na_fanfold-eur\0"
-  "FanFold European\0"
+  "Fan-Fold European\0"
   "FanFoldGerman\0"
   "na_fanfold-us\0"
-  "FanFold US\0"
+  "Fan-Fold US\0"
   "FanFoldUS\0"
   "na_foolscap\0"
-  "FanFold German Legal\0"
+  "Fan-Fold German Legal\0"
   "FanFoldGermanLegal\0"
   "na_govt-legal\0"
   "Government Legal\0"
@@ -410,13 +418,13 @@ static const char paper_names[] =
   "Government Letter\0"
   "8x10\0"
   "na_index-3x5\0"
-  "Index 3x5\0"
+  "Index 3×5\0"
   "na_index-4x6\0"
-  "Index 4x6 (postcard)\0"
+  "Index 4×6 (postcard)\0"
   "na_index-4x6-ext\0"
-  "Index 4x6 ext\0"
+  "Index 4×6 ext\0"
   "na_index-5x8\0"
-  "Index 5x8\0"
+  "Index 5×8\0"
   "na_invoice\0"
   "Invoice\0"
   "Statement\0"
@@ -538,180 +546,180 @@ typedef struct {
 static const PaperInfo standard_names_offsets[] = {
   {    0, 711.2, 1016,    0,   -1 },
   {    7, 1189, 1682,   15,   -1 },
-  {   20, 841, 1189,  918,  918 },
-  {   27, 1189, 2523,   36,   -1 },
-  {   41, 594, 841,  932,  932 },
-  {   48, 26, 37,   56,   56 },
-  {   60, 841, 1783,   69,   -1 },
-  {   74, 841, 2378,   83,   -1 },
-  {   88, 420, 594,  946,  946 },
-  {   95, 594, 1261,  104,   -1 },
-  {  109, 594, 1682,  118,   -1 },
-  {  123, 594, 2102,  132,   -1 },
-  {  137, 297, 420,  144,  144 },
-  {  147, 322, 445,  160,  169 },
-  {  177, 420, 891,  186,   -1 },
-  {  191, 420, 1189,  200,   -1 },
-  {  205, 420, 1486,  214,   -1 },
-  {  219, 420, 1783,  228,   -1 },
-  {  233, 420, 2080,  242,   -1 },
-  {  247, 210, 297,  254,  254 },
-  {  257, 235.5, 322.3,  270,  279 },
-  {  287, 225, 297,  298,   -1 },
-  {  305, 297, 630,  314,   -1 },
-  {  319, 297, 841,  328,   -1 },
-  {  333, 297, 1051,  342,   -1 },
-  {  347, 297, 1261,  356,   -1 },
-  {  361, 297, 1471,  370,   -1 },
-  {  375, 297, 1682,  384,   -1 },
-  {  389, 297, 1892,  398,   -1 },
-  {  403, 148, 210,  410,  410 },
-  {  413, 174, 235,  426,  435 },
-  {  443, 105, 148,  450,  450 },
-  {  453, 74, 105,  460,  460 },
-  {  463, 52, 74,  470,  470 },
-  {  473, 37, 52,  480,  480 },
-  {  483, 1000, 1414,  493,  490 },
-  {  496, 707, 1000,  506,  503 },
-  {  509, 31, 44,  520,  517 },
-  {  524, 500, 707,  534,  531 },
-  {  537, 353, 500,  547,  544 },
-  {  550, 250, 353,  560,  557 },
-  {  563, 176, 250,  573,  570 },
-  {  576, 201, 276,  589,  598 },
-  {  609, 125, 176,  619,  616 },
-  {  622, 125, 324,  631,   -1 },
-  {  637, 88, 125,  647,  644 },
-  {  650, 62, 88,  660,  657 },
-  {  663, 44, 62,  673,  670 },
-  {  676, 917, 1297,  686,  683 },
-  {  689, 648, 917,  699,  696 },
-  {  702, 28, 40,  713,  710 },
-  {  717, 458, 648,  727,  724 },
-  {  730, 324, 458,  740,  737 },
-  {  743, 229, 324,  634,  750 },
-  {  756, 162, 229,  766,  763 },
-  {  769, 114, 162,  779,  776 },
-  {  782, 114, 229,  791,  797 },
-  {  804, 81, 114,  814,  811 },
-  {  817, 81, 162,  826,   -1 },
-  {  832, 57, 81,  842,  839 },
-  {  845, 40, 57,  855,  852 },
-  {  858, 110, 220,  865,  877 },
-  {  883, 860, 1220,  917,   -1 },
-  {  891, 610, 860,  931,   -1 },
-  {  899, 430, 610,  945,   -1 },
-  {  907, 900, 1280,  916,   -1 },
-  {  921, 640, 900,  930,   -1 },
-  {  935, 450, 640,  944,   -1 },
-  {  949, 1030, 1456,  956,  493 },
-  {  960, 728, 1030,  967,  506 },
-  {  971, 32, 45,  979,  520 },
-  {  984, 515, 728,  991,  534 },
-  {  995, 364, 515, 1002,  547 },
-  { 1006, 257, 364, 1013,  560 },
-  { 1017, 182, 257, 1024,  573 },
-  { 1028, 128, 182, 1035,  619 },
-  { 1039, 91, 128, 1046,  647 },
-  { 1050, 64, 91, 1057,  660 },
-  { 1061, 45, 64, 1068,  673 },
-  { 1072, 216, 330, 1081,   -1 },
-  { 1090, 111.1, 146, 1100,   -1 },
-  { 1119, 120, 235, 1129, 1148 },
-  { 1157, 90, 205, 1167, 1186 },
-  { 1195, 100, 148, 1206, 1322 },
-  { 1224, 240, 322.1, 1233,   -1 },
-  { 1247, 240, 332, 1257, 1272 },
-  { 1281, 148, 200, 1292, 1316 },
-  { 1331, 105, 235, 1340,   -1 },
-  { 1354, 254, 279.4, 1357, 1357 },
-  { 1363, 254, 330.2, 1366, 1366 },
-  { 1372, 254, 355.6, 1375, 1375 },
-  { 1381, 254, 381, 1384,   -1 },
-  { 1381, 254, 381, 1384,   -1 },
-  { 1390, 279.4, 304.8, 1393, 1399 },
-  { 1405, 279.4, 381, 1408, 1414 },
-  { 1420, 304.8, 482.6, 1423,   -1 },
-  { 1429, 127, 177.8, 1432,   -1 },
-  { 1436, 152.4, 228.6, 1443,   -1 },
-  { 1456, 177.8, 228.6, 1463, 1459 },
-  { 1476, 228.6, 279.4, 1484, 1479 },
-  { 1498, 111.125, 146.05, 1504,   -1 },
-  { 1516, 228.6, 304.8, 1526, 1533 },
-  { 1539, 304.8, 457.2, 1549, 1556 },
-  { 1562, 457.2, 609.6, 1572, 1579 },
-  { 1585, 609.6, 914.4, 1595, 1602 },
-  { 1608, 914.4, 1219.2, 1618, 1625 },
-  { 1631, 304.8, 486.918, 1634,   -1 },
-  { 1641, 431.8, 558.8, 1079, 1646 },
-  { 1652, 165.1, 241.3, 3018,   -1 },
-  { 1658, 558.8, 863.6, 1329, 1663 },
-  { 1669, 863.6, 1117.6,  875, 1674 },
-  { 1680, 279.4, 355.6, 1683,   -1 },
-  { 1687, 304.8, 355.6, 1698,   -1 },
-  { 1711, 184.15, 266.7, 1724, 1724 },
-  { 1734, 1117.6, 1727.2,    5,   -1 },
-  { 1739, 215.9, 304.8, 1754, 1771 },
-  { 1785, 279.4, 377.825, 1799, 1810 },
-  { 1820, 215.9, 330.2, 1832, 1853 },
-  { 1872, 203.2, 330.2, 1886,   -1 },
-  { 1903, 203.2, 254, 1918, 1936 },
-  { 1941, 76.2, 127, 1954,   -1 },
-  { 1964, 101.6, 152.4, 1977,   -1 },
-  { 1998, 152.4, 203.2, 2015,   -1 },
-  { 2029, 127, 203.2, 2042,   -1 },
-  { 2052, 139.7, 215.9, 2063, 2071 },
-  { 2081, 279.4, 431.8, 2091, 2099 },
-  { 2106, 215.9, 355.6, 2115, 1847 },
-  { 2124, 241.3, 381, 2139, 2154 },
-  { 2165, 215.9, 279.4, 2175, 1929 },
-  { 2185, 241.3, 304.8, 2201, 2217 },
-  { 2229, 215.9, 322.326, 2244, 2259 },
-  { 2270, 98.425, 190.5, 2281, 2298 },
-  { 2309, 104.775, 241.3, 2322, 2335 },
-  { 2341, 114.3, 263.525, 2354, 2367 },
-  { 2373, 120.65, 279.4, 2386, 2399 },
-  { 2405, 127, 292.1, 2418, 2431 },
-  { 2437, 98.425, 225.425, 2449, 2461 },
-  { 2466, 92.075, 165.1, 2478, 2496 },
-  { 2508, 215.9, 275.082, 2518, 2518 },
-  { 2525, 227.076, 355.6, 2536, 2544 },
-  { 2551, 330.2, 482.6, 2562, 2570 },
-  { 2577, 762, 1066.8, 2592,   -1 },
-  { 2604, 275, 395, 2618,   -1 },
-  { 2629, 210, 330, 2638, 2638 },
-  { 2644, 215, 315, 2656,   -1 },
-  { 2665, 220, 220, 2675, 2691 },
-  { 2701, 110, 230, 2712, 2729 },
-  { 2740, 198, 275, 2743,   -1 },
-  { 2756, 267, 389, 2611,   -1 },
-  { 2766, 114, 229, 2777,   -1 },
-  { 2794, 100, 150, 2809,   -1 },
-  { 2821, 102, 165, 2827, 2841 },
-  { 2849, 324, 458, 2856, 2871 },
-  { 2880, 146, 215, 2888, 2896 },
-  { 2903, 102, 176, 2909, 2923 },
-  { 2931, 125, 176, 2937, 2951 },
-  { 2959, 97, 151, 2967, 2975 },
-  { 2982, 110, 208, 2988, 3002 },
-  { 3010, 110, 220, 3016, 3030 },
-  { 3038, 120, 230, 3044, 3058 },
-  { 3066, 160, 230, 3072, 3086 },
-  { 3094, 120, 309, 3100, 3114 },
-  { 3122, 229, 324, 3128, 3142 },
-  { 3150, 196.85, 273.05, 3158,   -1 },
-  { 3166, 273.05, 393.7, 3173,   -1 },
+  {   21, 841, 1189,  937,  937 },
+  {   28, 1189, 2523,   37,   -1 },
+  {   43, 594, 841,  951,  951 },
+  {   50, 26, 37,   58,   58 },
+  {   62, 841, 1783,   71,   -1 },
+  {   77, 841, 2378,   86,   -1 },
+  {   92, 420, 594,  965,  965 },
+  {   99, 594, 1261,  108,   -1 },
+  {  114, 594, 1682,  123,   -1 },
+  {  129, 594, 2102,  138,   -1 },
+  {  144, 297, 420,  151,  151 },
+  {  154, 322, 445,  167,  176 },
+  {  184, 420, 891,  193,   -1 },
+  {  199, 420, 1189,  208,   -1 },
+  {  214, 420, 1486,  223,   -1 },
+  {  229, 420, 1783,  238,   -1 },
+  {  244, 420, 2080,  253,   -1 },
+  {  259, 210, 297,  266,  266 },
+  {  269, 235.5, 322.3,  282,  291 },
+  {  299, 225, 297,  310,   -1 },
+  {  317, 297, 630,  326,   -1 },
+  {  332, 297, 841,  341,   -1 },
+  {  347, 297, 1051,  356,   -1 },
+  {  362, 297, 1261,  371,   -1 },
+  {  377, 297, 1471,  386,   -1 },
+  {  392, 297, 1682,  401,   -1 },
+  {  407, 297, 1892,  416,   -1 },
+  {  422, 148, 210,  429,  429 },
+  {  432, 174, 235,  445,  454 },
+  {  462, 105, 148,  469,  469 },
+  {  472, 74, 105,  479,  479 },
+  {  482, 52, 74,  489,  489 },
+  {  492, 37, 52,  499,  499 },
+  {  502, 1000, 1414,  512,  509 },
+  {  515, 707, 1000,  525,  522 },
+  {  528, 31, 44,  539,  536 },
+  {  543, 500, 707,  553,  550 },
+  {  556, 353, 500,  566,  563 },
+  {  569, 250, 353,  579,  576 },
+  {  582, 176, 250,  592,  589 },
+  {  595, 201, 276,  608,  617 },
+  {  628, 125, 176,  638,  635 },
+  {  641, 125, 324,  650,   -1 },
+  {  656, 88, 125,  666,  663 },
+  {  669, 62, 88,  679,  676 },
+  {  682, 44, 62,  692,  689 },
+  {  695, 917, 1297,  705,  702 },
+  {  708, 648, 917,  718,  715 },
+  {  721, 28, 40,  732,  729 },
+  {  736, 458, 648,  746,  743 },
+  {  749, 324, 458,  759,  756 },
+  {  762, 229, 324,  653,  769 },
+  {  775, 162, 229,  785,  782 },
+  {  788, 114, 162,  798,  795 },
+  {  801, 114, 229,  810,  816 },
+  {  823, 81, 114,  833,  830 },
+  {  836, 81, 162,  845,   -1 },
+  {  851, 57, 81,  861,  858 },
+  {  864, 40, 57,  874,  871 },
+  {  877, 110, 220,  884,  896 },
+  {  902, 860, 1220,  936,   -1 },
+  {  910, 610, 860,  950,   -1 },
+  {  918, 430, 610,  964,   -1 },
+  {  926, 900, 1280,  935,   -1 },
+  {  940, 640, 900,  949,   -1 },
+  {  954, 450, 640,  963,   -1 },
+  {  968, 1030, 1456,  975,  512 },
+  {  979, 728, 1030,  986,  525 },
+  {  990, 32, 45,  998,  539 },
+  { 1003, 515, 728, 1010,  553 },
+  { 1014, 364, 515, 1021,  566 },
+  { 1025, 257, 364, 1032,  579 },
+  { 1036, 182, 257, 1043,  592 },
+  { 1047, 128, 182, 1054,  638 },
+  { 1058, 91, 128, 1065,  666 },
+  { 1069, 64, 91, 1076,  679 },
+  { 1080, 45, 64, 1087,  692 },
+  { 1091, 216, 330, 1100,   -1 },
+  { 1109, 111.1, 146, 1119,   -1 },
+  { 1138, 120, 235, 1148, 1167 },
+  { 1176, 90, 205, 1186, 1205 },
+  { 1214, 100, 148, 1225, 1341 },
+  { 1243, 240, 322.1, 1252,   -1 },
+  { 1266, 240, 332, 1276, 1291 },
+  { 1300, 148, 200, 1311, 1335 },
+  { 1350, 105, 235, 1359,   -1 },
+  { 1373, 254, 279.4, 1382, 1376 },
+  { 1389, 254, 330.2, 1398, 1392 },
+  { 1405, 254, 355.6, 1414, 1408 },
+  { 1421, 254, 381, 1430,   -1 },
+  { 1421, 254, 381, 1430,   -1 },
+  { 1437, 279.4, 304.8, 1446, 1453 },
+  { 1459, 279.4, 381, 1468, 1475 },
+  { 1481, 304.8, 482.6, 1490,   -1 },
+  { 1497, 127, 177.8, 1504,   -1 },
+  { 1509, 152.4, 228.6, 1516,   -1 },
+  { 1530, 177.8, 228.6, 1537, 1533 },
+  { 1551, 228.6, 279.4, 1559, 1554 },
+  { 1574, 111.125, 146.05, 1580,   -1 },
+  { 1592, 228.6, 304.8, 1602, 1609 },
+  { 1615, 304.8, 457.2, 1625, 1632 },
+  { 1638, 457.2, 609.6, 1648, 1655 },
+  { 1661, 609.6, 914.4, 1671, 1678 },
+  { 1684, 914.4, 1219.2, 1694, 1701 },
+  { 1707, 304.8, 486.918, 1710,   -1 },
+  { 1717, 431.8, 558.8, 1098, 1722 },
+  { 1728, 165.1, 241.3, 3101,   -1 },
+  { 1734, 558.8, 863.6, 1348, 1739 },
+  { 1745, 863.6, 1117.6,  894, 1750 },
+  { 1756, 279.4, 355.6, 1759,   -1 },
+  { 1763, 304.8, 355.6, 1774,   -1 },
+  { 1787, 184.15, 266.7, 1800, 1800 },
+  { 1810, 1117.6, 1727.2,    5,   -1 },
+  { 1815, 215.9, 304.8, 1830, 1848 },
+  { 1862, 279.4, 377.825, 1876, 1888 },
+  { 1898, 215.9, 330.2, 1910, 1932 },
+  { 1951, 203.2, 330.2, 1965,   -1 },
+  { 1982, 203.2, 254, 1997, 2015 },
+  { 2020, 76.2, 127, 2033,   -1 },
+  { 2044, 101.6, 152.4, 2057,   -1 },
+  { 2079, 152.4, 203.2, 2096,   -1 },
+  { 2111, 127, 203.2, 2124,   -1 },
+  { 2135, 139.7, 215.9, 2146, 2154 },
+  { 2164, 279.4, 431.8, 2174, 2182 },
+  { 2189, 215.9, 355.6, 2198, 1926 },
+  { 2207, 241.3, 381, 2222, 2237 },
+  { 2248, 215.9, 279.4, 2258, 2008 },
+  { 2268, 241.3, 304.8, 2284, 2300 },
+  { 2312, 215.9, 322.326, 2327, 2342 },
+  { 2353, 98.425, 190.5, 2364, 2381 },
+  { 2392, 104.775, 241.3, 2405, 2418 },
+  { 2424, 114.3, 263.525, 2437, 2450 },
+  { 2456, 120.65, 279.4, 2469, 2482 },
+  { 2488, 127, 292.1, 2501, 2514 },
+  { 2520, 98.425, 225.425, 2532, 2544 },
+  { 2549, 92.075, 165.1, 2561, 2579 },
+  { 2591, 215.9, 275.082, 2601, 2601 },
+  { 2608, 227.076, 355.6, 2619, 2627 },
+  { 2634, 330.2, 482.6, 2645, 2653 },
+  { 2660, 762, 1066.8, 2675,   -1 },
+  { 2687, 275, 395, 2701,   -1 },
+  { 2712, 210, 330, 2721, 2721 },
+  { 2727, 215, 315, 2739,   -1 },
+  { 2748, 220, 220, 2758, 2774 },
+  { 2784, 110, 230, 2795, 2812 },
+  { 2823, 198, 275, 2826,   -1 },
+  { 2839, 267, 389, 2694,   -1 },
+  { 2849, 114, 229, 2860,   -1 },
+  { 2877, 100, 150, 2892,   -1 },
+  { 2904, 102, 165, 2910, 2924 },
+  { 2932, 324, 458, 2939, 2954 },
+  { 2963, 146, 215, 2971, 2979 },
+  { 2986, 102, 176, 2992, 3006 },
+  { 3014, 125, 176, 3020, 3034 },
+  { 3042, 97, 151, 3050, 3058 },
+  { 3065, 110, 208, 3071, 3085 },
+  { 3093, 110, 220, 3099, 3113 },
+  { 3121, 120, 230, 3127, 3141 },
+  { 3149, 160, 230, 3155, 3169 },
+  { 3177, 120, 309, 3183, 3197 },
+  { 3205, 229, 324, 3211, 3225 },
+  { 3233, 196.85, 273.05, 3241,   -1 },
+  { 3249, 273.05, 393.7, 3256,   -1 },
 };
 
 static const struct {
   int ppd_name;
   int standard_name;
 } extra_ppd_names_offsets[] = {
-  {  634,  743 },
-  {  766,  756 },
-  {  779,  769 },
-  { 3180, 2309 },
-  {  880,  858 },
-  { 2301, 2270 },
+  {  653,  762 },
+  {  785,  775 },
+  {  798,  788 },
+  { 3263, 2392 },
+  {  899,  877 },
+  { 2384, 2353 },
 };
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]