Correct PRC6 and PRC9 envelope sizes

See bug 603144 for the full story.
This commit is contained in:
Matthias Clasen 2010-01-12 01:10:13 -05:00
parent 1024b44df9
commit b6ff1abc93
2 changed files with 176 additions and 5 deletions

View File

@ -174,9 +174,10 @@ static const PaperInfo standard_names[] = {
{"prc_32k", "97x151mm", N_("prc 32k"), "PRC32K"},
{"prc_4", "110x208mm", N_("prc4 Envelope"), "EnvPRC4"},
{"prc_5", "110x220mm", N_("prc5 Envelope"), "EnvPRC5"},
{"prc_6", "120x320mm", N_("prc6 Envelope"), "EnvPRC6"},
{"prc_6", "120x230mm", N_("prc6 Envelope"), "EnvPRC6"},
{"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")},
};

View File

@ -1,169 +1,335 @@
/* Generated by gen-paper-names */
#if 0
/* translators, strip everything up to the first | */
NC_("paper size", "asme_f")
/* translators, strip everything up to the first | */
NC_("paper size", "A0x2")
/* translators, strip everything up to the first | */
NC_("paper size", "A0")
/* translators, strip everything up to the first | */
NC_("paper size", "A0x3")
/* translators, strip everything up to the first | */
NC_("paper size", "A1")
/* translators, strip everything up to the first | */
NC_("paper size", "A10")
/* translators, strip everything up to the first | */
NC_("paper size", "A1x3")
/* translators, strip everything up to the first | */
NC_("paper size", "A1x4")
/* translators, strip everything up to the first | */
NC_("paper size", "A2")
/* translators, strip everything up to the first | */
NC_("paper size", "A2x3")
/* translators, strip everything up to the first | */
NC_("paper size", "A2x4")
/* translators, strip everything up to the first | */
NC_("paper size", "A2x5")
/* translators, strip everything up to the first | */
NC_("paper size", "A3")
/* translators, strip everything up to the first | */
NC_("paper size", "A3 Extra")
/* translators, strip everything up to the first | */
NC_("paper size", "A3x3")
/* translators, strip everything up to the first | */
NC_("paper size", "A3x4")
/* translators, strip everything up to the first | */
NC_("paper size", "A3x5")
/* translators, strip everything up to the first | */
NC_("paper size", "A3x6")
/* translators, strip everything up to the first | */
NC_("paper size", "A3x7")
/* translators, strip everything up to the first | */
NC_("paper size", "A4")
/* translators, strip everything up to the first | */
NC_("paper size", "A4 Extra")
/* translators, strip everything up to the first | */
NC_("paper size", "A4 Tab")
/* translators, strip everything up to the first | */
NC_("paper size", "A4x3")
/* translators, strip everything up to the first | */
NC_("paper size", "A4x4")
/* translators, strip everything up to the first | */
NC_("paper size", "A4x5")
/* translators, strip everything up to the first | */
NC_("paper size", "A4x6")
/* translators, strip everything up to the first | */
NC_("paper size", "A4x7")
/* translators, strip everything up to the first | */
NC_("paper size", "A4x8")
/* translators, strip everything up to the first | */
NC_("paper size", "A4x9")
/* translators, strip everything up to the first | */
NC_("paper size", "A5")
/* translators, strip everything up to the first | */
NC_("paper size", "A5 Extra")
/* translators, strip everything up to the first | */
NC_("paper size", "A6")
/* translators, strip everything up to the first | */
NC_("paper size", "A7")
/* translators, strip everything up to the first | */
NC_("paper size", "A8")
/* translators, strip everything up to the first | */
NC_("paper size", "A9")
/* translators, strip everything up to the first | */
NC_("paper size", "B0")
/* translators, strip everything up to the first | */
NC_("paper size", "B1")
/* translators, strip everything up to the first | */
NC_("paper size", "B10")
/* translators, strip everything up to the first | */
NC_("paper size", "B2")
/* translators, strip everything up to the first | */
NC_("paper size", "B3")
/* translators, strip everything up to the first | */
NC_("paper size", "B4")
/* translators, strip everything up to the first | */
NC_("paper size", "B5")
/* translators, strip everything up to the first | */
NC_("paper size", "B5 Extra")
/* translators, strip everything up to the first | */
NC_("paper size", "B6")
/* translators, strip everything up to the first | */
NC_("paper size", "B6/C4")
/* translators, strip everything up to the first | */
NC_("paper size", "B7")
/* translators, strip everything up to the first | */
NC_("paper size", "B8")
/* translators, strip everything up to the first | */
NC_("paper size", "B9")
/* translators, strip everything up to the first | */
NC_("paper size", "C0")
/* translators, strip everything up to the first | */
NC_("paper size", "C1")
/* translators, strip everything up to the first | */
NC_("paper size", "C10")
/* translators, strip everything up to the first | */
NC_("paper size", "C2")
/* translators, strip everything up to the first | */
NC_("paper size", "C3")
/* translators, strip everything up to the first | */
NC_("paper size", "C4")
/* translators, strip everything up to the first | */
NC_("paper size", "C5")
/* translators, strip everything up to the first | */
NC_("paper size", "C6")
/* translators, strip everything up to the first | */
NC_("paper size", "C6/C5")
/* translators, strip everything up to the first | */
NC_("paper size", "C7")
/* translators, strip everything up to the first | */
NC_("paper size", "C7/C6")
/* translators, strip everything up to the first | */
NC_("paper size", "C8")
/* translators, strip everything up to the first | */
NC_("paper size", "C9")
/* translators, strip everything up to the first | */
NC_("paper size", "DL Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "RA0")
/* translators, strip everything up to the first | */
NC_("paper size", "RA1")
/* translators, strip everything up to the first | */
NC_("paper size", "RA2")
/* translators, strip everything up to the first | */
NC_("paper size", "SRA0")
/* translators, strip everything up to the first | */
NC_("paper size", "SRA1")
/* translators, strip everything up to the first | */
NC_("paper size", "SRA2")
/* translators, strip everything up to the first | */
NC_("paper size", "JB0")
/* translators, strip everything up to the first | */
NC_("paper size", "JB1")
/* translators, strip everything up to the first | */
NC_("paper size", "JB10")
/* translators, strip everything up to the first | */
NC_("paper size", "JB2")
/* translators, strip everything up to the first | */
NC_("paper size", "JB3")
/* translators, strip everything up to the first | */
NC_("paper size", "JB4")
/* translators, strip everything up to the first | */
NC_("paper size", "JB5")
/* translators, strip everything up to the first | */
NC_("paper size", "JB6")
/* translators, strip everything up to the first | */
NC_("paper size", "JB7")
/* translators, strip everything up to the first | */
NC_("paper size", "JB8")
/* translators, strip everything up to the first | */
NC_("paper size", "JB9")
/* translators, strip everything up to the first | */
NC_("paper size", "jis exec")
/* translators, strip everything up to the first | */
NC_("paper size", "Choukei 2 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "Choukei 3 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "Choukei 4 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "hagaki (postcard)")
/* translators, strip everything up to the first | */
NC_("paper size", "kahu Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "kaku2 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "oufuku (reply postcard)")
/* translators, strip everything up to the first | */
NC_("paper size", "you4 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "10x11")
/* translators, strip everything up to the first | */
NC_("paper size", "10x13")
/* translators, strip everything up to the first | */
NC_("paper size", "10x14")
/* translators, strip everything up to the first | */
NC_("paper size", "10x15")
/* translators, strip everything up to the first | */
NC_("paper size", "10x15")
/* translators, strip everything up to the first | */
NC_("paper size", "11x12")
/* translators, strip everything up to the first | */
NC_("paper size", "11x15")
/* translators, strip everything up to the first | */
NC_("paper size", "12x19")
/* translators, strip everything up to the first | */
NC_("paper size", "5x7")
/* translators, strip everything up to the first | */
NC_("paper size", "6x9 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "7x9 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "9x11 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "a2 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "Arch A")
/* translators, strip everything up to the first | */
NC_("paper size", "Arch B")
/* translators, strip everything up to the first | */
NC_("paper size", "Arch C")
/* translators, strip everything up to the first | */
NC_("paper size", "Arch D")
/* translators, strip everything up to the first | */
NC_("paper size", "Arch E")
/* translators, strip everything up to the first | */
NC_("paper size", "b-plus")
/* translators, strip everything up to the first | */
NC_("paper size", "c")
/* translators, strip everything up to the first | */
NC_("paper size", "c5 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "d")
/* translators, strip everything up to the first | */
NC_("paper size", "e")
/* translators, strip everything up to the first | */
NC_("paper size", "edp")
/* translators, strip everything up to the first | */
NC_("paper size", "European edp")
/* translators, strip everything up to the first | */
NC_("paper size", "Executive")
/* translators, strip everything up to the first | */
NC_("paper size", "f")
/* translators, strip everything up to the first | */
NC_("paper size", "FanFold European")
/* translators, strip everything up to the first | */
NC_("paper size", "FanFold US")
/* translators, strip everything up to the first | */
NC_("paper size", "FanFold German Legal")
/* translators, strip everything up to the first | */
NC_("paper size", "Government Legal")
/* translators, strip everything up to the first | */
NC_("paper size", "Government Letter")
/* translators, strip everything up to the first | */
NC_("paper size", "Index 3x5")
/* translators, strip everything up to the first | */
NC_("paper size", "Index 4x6 (postcard)")
/* translators, strip everything up to the first | */
NC_("paper size", "Index 4x6 ext")
/* translators, strip everything up to the first | */
NC_("paper size", "Index 5x8")
/* translators, strip everything up to the first | */
NC_("paper size", "Invoice")
/* translators, strip everything up to the first | */
NC_("paper size", "Tabloid")
/* translators, strip everything up to the first | */
NC_("paper size", "US Legal")
/* translators, strip everything up to the first | */
NC_("paper size", "US Legal Extra")
/* translators, strip everything up to the first | */
NC_("paper size", "US Letter")
/* translators, strip everything up to the first | */
NC_("paper size", "US Letter Extra")
/* translators, strip everything up to the first | */
NC_("paper size", "US Letter Plus")
/* translators, strip everything up to the first | */
NC_("paper size", "Monarch Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "#10 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "#11 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "#12 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "#14 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "#9 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "Personal Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "Quarto")
/* translators, strip everything up to the first | */
NC_("paper size", "Super A")
/* translators, strip everything up to the first | */
NC_("paper size", "Super B")
/* translators, strip everything up to the first | */
NC_("paper size", "Wide Format")
/* translators, strip everything up to the first | */
NC_("paper size", "Dai-pa-kai")
/* translators, strip everything up to the first | */
NC_("paper size", "Folio")
/* translators, strip everything up to the first | */
NC_("paper size", "Folio sp")
/* translators, strip everything up to the first | */
NC_("paper size", "Invite Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "Italian Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "juuro-ku-kai")
/* translators, strip everything up to the first | */
NC_("paper size", "pa-kai")
/* translators, strip everything up to the first | */
NC_("paper size", "Postfix Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "Small Photo")
/* translators, strip everything up to the first | */
NC_("paper size", "prc1 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "prc10 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "prc 16k")
/* translators, strip everything up to the first | */
NC_("paper size", "prc2 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "prc3 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "prc 32k")
/* translators, strip everything up to the first | */
NC_("paper size", "prc4 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "prc5 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "prc6 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "prc7 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "prc8 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "prc9 Envelope")
/* translators, strip everything up to the first | */
NC_("paper size", "ROC 16k")
/* translators, strip everything up to the first | */
NC_("paper size", "ROC 8k")
#endif
@ -517,6 +683,9 @@ static const char paper_names[] =
"prc_8\0"
"prc8 Envelope\0"
"EnvPRC8\0"
"prc_9\0"
"prc9 Envelope\0"
"EnvPRC9\0"
"roc_16k\0"
"ROC 16k\0"
"roc_8k\0"
@ -691,11 +860,12 @@ static const PaperInfo standard_names_offsets[] = {
{ 2959, 97, 151, 2967, 2975 },
{ 2982, 110, 208, 2988, 3002 },
{ 3010, 110, 220, 3016, 3030 },
{ 3038, 120, 320, 3044, 3058 },
{ 3038, 120, 230, 3044, 3058 },
{ 3066, 160, 230, 3072, 3086 },
{ 3094, 120, 309, 3100, 3114 },
{ 3122, 196.85, 273.05, 3130, -1 },
{ 3138, 273.05, 393.7, 3145, -1 },
{ 3122, 229, 324, 3128, 3142 },
{ 3150, 196.85, 273.05, 3158, -1 },
{ 3166, 273.05, 393.7, 3173, -1 },
};
static const struct {
@ -705,7 +875,7 @@ static const struct {
{ 634, 743 },
{ 766, 756 },
{ 779, 769 },
{ 3152, 2309 },
{ 3180, 2309 },
{ 880, 858 },
{ 2301, 2270 },
};