Update paper size names

Update list of standardized paper size names from
PWG Media Standardized Names 2.0 (MSN2) and from
CUPS' cups/pwg-media.c.

https://bugzilla.gnome.org/show_bug.cgi?id=725441

1 files changed, 40 insertions, 21 deletions

diff --git a/gtk/paper_names.c b/gtk/paper_names.c
index 2ae9334dbe..938704e8ff 100644
--- a/gtk/paper_names.c
+++ b/gtk/paper_names.c
@@ -2,8 +2,10 @@
 
 /* The paper size names are from:
  * PWG 5101.1-2002 PWG: Standard for Media Standardized Names
+ * PWG 5101.1-2013 PWG: PWG Media Standardized Names 2.0 (MSN2)
  *
- * The PPD names come from the PPD specification.
+ * The PPD names come from the PPD specification and from
+ * CUPS' cups/pwg-media.c.
  */
 
 typedef struct {
@@ -36,7 +38,7 @@ static const PaperInfo standard_names[] = {
   {"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_a4-tab", "225x297mm", N_("A4 Tab"), "A4Tab"},
   {"iso_a4x3", "297x630mm", N_("A4×3")},
   {"iso_a4x4", "297x841mm", N_("A4×4")},
   {"iso_a4x5", "297x1051mm", N_("A4×5")},
@@ -80,9 +82,13 @@ static const PaperInfo standard_names[] = {
   {"iso_ra0", "860x1220mm", N_("RA0")},
   {"iso_ra1", "610x860mm", N_("RA1")},
   {"iso_ra2", "430x610mm", N_("RA2")},
+  {"iso_ra3", "305x430mm", N_("RA3")},
+  {"iso_ra4", "215x305mm", N_("RA4")},
   {"iso_sra0", "900x1280mm", N_("SRA0")},
   {"iso_sra1", "640x900mm", N_("SRA1")},
   {"iso_sra2", "450x640mm", N_("SRA2")},
+  {"iso_sra3", "320x450mm", N_("SRA3")},
+  {"iso_sra4", "225x320mm", N_("SRA4")},
   {"jis_b0", "1030x1456mm", N_("JB0"), "B0"},
   {"jis_b1", "728x1030mm", N_("JB1"), "B1"},
   {"jis_b10", "32x45mm", N_("JB10"), "B10"},
@@ -98,47 +104,55 @@ static const PaperInfo standard_names[] = {
   {"jpn_chou2", "111.1x146mm", N_("Choukei 2 Envelope")},
   {"jpn_chou3", "120x235mm", N_("Choukei 3 Envelope"), "EnvChou3"},
   {"jpn_chou4", "90x205mm", N_("Choukei 4 Envelope"), "EnvChou4"},
+  {"jpn_chou40", "90x225mm", N_("Choukei 40 Envelope"), "EnvChou40"},
   {"jpn_hagaki", "100x148mm", N_("hagaki (postcard)"), "Postcard"},
   {"jpn_kahu", "240x322.1mm", N_("kahu Envelope")},
   {"jpn_kaku2", "240x332mm", N_("kaku2 Envelope"), "EnvKaku2"},
+  {"jpn_kaku3", "216x277mm", N_("kaku3 Envelope"), "EnvKaku3"},
+  {"jpn_kaku4", "197x267mm", N_("kaku4 Envelope"), "EnvKaku4"},
+  {"jpn_kaku5", "190x240mm", N_("kaku5 Envelope"), "EnvKaku5"},
+  {"jpn_kaku7", "142x205mm", N_("kaku7 Envelope"), "EnvKaku7"},
+  {"jpn_kaku8", "119x197mm", N_("kaku8 Envelope"), "EnvKaku8"},
   {"jpn_oufuku", "148x200mm", N_("oufuku (reply postcard)"), "DoublePostcard"},
-  {"jpn_you4", "105x235mm", N_("you4 Envelope")},
+  {"jpn_you4", "105x235mm", N_("you4 Envelope"), "EnvYou4"},
+  {"jpn_you6", "98x190mm", N_("you6 Envelope"), "EnvYou6"},
   {"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_10x15", "10x15in", N_("10×15"), "10x15"},
   {"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_12x19", "12x19in", N_("12×19"), "12x19"},
+  {"na_5x7", "5x7in", N_("5×7"), "5x7"},
+  {"na_6x9", "6x9in", N_("6×9 Envelope"), "6x9"},
   {"na_7x9", "7x9in", N_("7×9 Envelope"), "7x9"},
+  {"na_8x10", "8x10in", N_("8×10 Envelope"), "8x10"},
   {"na_9x11", "9x11in", N_("9×11 Envelope"), "9x11"},
-  {"na_a2", "4.375x5.75in", N_("a2 Envelope")},
+  {"na_9x12", "9x12in", N_("9×12 Envelope"), "9x12"},
+  {"na_a2", "4.375x5.75in", N_("a2 Envelope"), "EnvA2"},
   {"na_arch-a", "9x12in", N_("Arch A"), "ARCHA"},
   {"na_arch-b", "12x18in", N_("Arch B"), "ARCHB"},
   {"na_arch-c", "18x24in", N_("Arch C"), "ARCHC"},
   {"na_arch-d", "24x36in", N_("Arch D"), "ARCHD"},
   {"na_arch-e", "36x48in", N_("Arch E"), "ARCHE"},
-  {"na_b-plus", "12x19.17in", N_("b-plus")},
+  {"na_b-plus", "12x19.17in", N_("b-plus"), "SuperB"},
   {"na_c", "17x22in", N_("c"), "AnsiC"},
-  {"na_c5", "6.5x9.5in", N_("c5 Envelope")},
+  {"na_c5", "6.5x9.5in", N_("c5 Envelope"), "6.5x9.5"},
   {"na_d", "22x34in", N_("d"), "AnsiD"},
   {"na_e", "34x44in", N_("e"), "AnsiE"},
-  {"na_edp", "11x14in", N_("edp")},
+  {"na_edp", "11x14in", N_("edp"), "11x14"},
   {"na_eur-edp", "12x14in", N_("European edp")},
   {"na_executive", "7.25x10.5in", N_("Executive"), "Executive"},
-  {"na_f", "44x68in", N_("f")},
+  {"na_f", "44x68in", N_("f"), "AnsiF"},
   {"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-legal", "8x13in", N_("Government Legal"), "8x13"},
   {"na_govt-letter", "8x10in", N_("Government Letter"), "8x10"},
-  {"na_index-3x5", "3x5in", N_("Index 3×5")},
-  {"na_index-4x6", "4x6in", N_("Index 4×6 (postcard)")},
+  {"na_index-3x5", "3x5in", N_("Index 3×5"), "3x5"},
+  {"na_index-4x6", "4x6in", N_("Index 4×6 (postcard)"), "4x6"},
   {"na_index-4x6-ext", "6x8in", N_("Index 4×6 ext")},
-  {"na_index-5x8", "5x8in", N_("Index 5×8")},
+  {"na_index-5x8", "5x8in", N_("Index 5×8"), "5x8"},
   {"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"},
@@ -152,20 +166,25 @@ static const PaperInfo standard_names[] = {
   {"na_number-12", "4.75x11in", N_("#12 Envelope"), "Env12"}, /* number-12 Envelope */
   {"na_number-14", "5x11.5in", N_("#14 Envelope"), "Env14"}, /* number-14 Envelope */
   {"na_number-9", "3.875x8.875in", N_("#9 Envelope"), "Env9"},
+  {"na_oficio", "8.5x13.4in", N_("Oficio"), "Oficio"},
   {"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_wide-format", "30x42in", N_("Wide Format")},
+  {"oe_photo-l", "3.5x5in", N_("Photo L"), "3.5x5"},
   {"om_dai-pa-kai", "275x395mm", N_("Dai-pa-kai")},
   {"om_folio", "210x330mm", N_("Folio"), "Folio"},
-  {"om_folio-sp", "215x315mm", N_("Folio sp")},
+  {"om_folio-sp", "215x315mm", N_("Folio sp"), "FolioSP"},
   {"om_invite", "220x220mm", N_("Invite Envelope"), "EnvInvite"},
   {"om_italian", "110x230mm", N_("Italian Envelope"), "EnvItalian"},
   {"om_juuro-ku-kai", "198x275mm", N_("juuro-ku-kai")},
+  {"om_large-photo", "200x300mm", N_("Large Photo"), "om_large-photo"},
+  {"om_medium-photo", "130x180mm", N_("Medium Photo")},
   {"om_pa-kai", "267x389mm", N_("pa-kai")},
   {"om_postfix", "114x229mm", N_("Postfix Envelope")},
-  {"om_small-photo", "100x150mm", N_("Small Photo")},
+  {"om_small-photo", "100x150mm", N_("Small Photo"), "om_small-photo"},
+  {"om_wide-photo", "100x200mm", N_("Wide Photo"), "om_wide-photo"},
   {"prc_1", "102x165mm", N_("prc1 Envelope"), "EnvPRC1"},
   {"prc_10", "324x458mm", N_("prc10 Envelope"), "EnvPRC10"},
   {"prc_16k", "146x215mm", N_("prc 16k"), "PRC16K"},
@@ -178,8 +197,8 @@ static const PaperInfo standard_names[] = {
   {"prc_7", "160x230mm", N_("prc7 Envelope"), "EnvPRC7"},
   {"prc_8", "120x309mm", N_("prc8 Envelope"), "EnvPRC8"},
   {"prc_9", "229x324mm", N_("prc9 Envelope"), "EnvPRC9"},
-  {"roc_16k", "7.75x10.75in", N_("ROC 16k")},
-  {"roc_8k", "10.75x15.5in", N_("ROC 8k")},
+  {"roc_16k", "7.75x10.75in", N_("ROC 16k"), "roc16k"},
+  {"roc_8k", "10.75x15.5in", N_("ROC 8k"), "roc8k"},
 };
 
 /* Some page sizes have multiple PPD names in use.