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
This commit is contained in:
Marek Kasik 2014-10-02 15:41:45 +02:00
parent 42280f6c4e
commit ccbb51dff1
2 changed files with 246 additions and 144 deletions

View File

@ -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.

View File

@ -66,9 +66,13 @@ NC_("paper size", "DL Envelope")
NC_("paper size", "RA0")
NC_("paper size", "RA1")
NC_("paper size", "RA2")
NC_("paper size", "RA3")
NC_("paper size", "RA4")
NC_("paper size", "SRA0")
NC_("paper size", "SRA1")
NC_("paper size", "SRA2")
NC_("paper size", "SRA3")
NC_("paper size", "SRA4")
NC_("paper size", "JB0")
NC_("paper size", "JB1")
NC_("paper size", "JB10")
@ -84,23 +88,31 @@ NC_("paper size", "jis exec")
NC_("paper size", "Choukei 2 Envelope")
NC_("paper size", "Choukei 3 Envelope")
NC_("paper size", "Choukei 4 Envelope")
NC_("paper size", "Choukei 40 Envelope")
NC_("paper size", "hagaki (postcard)")
NC_("paper size", "kahu Envelope")
NC_("paper size", "kaku2 Envelope")
NC_("paper size", "kaku3 Envelope")
NC_("paper size", "kaku4 Envelope")
NC_("paper size", "kaku5 Envelope")
NC_("paper size", "kaku7 Envelope")
NC_("paper size", "kaku8 Envelope")
NC_("paper size", "oufuku (reply postcard)")
NC_("paper size", "you4 Envelope")
NC_("paper size", "you6 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", "8×10 Envelope")
NC_("paper size", "9×11 Envelope")
NC_("paper size", "9×12 Envelope")
NC_("paper size", "a2 Envelope")
NC_("paper size", "Arch A")
NC_("paper size", "Arch B")
@ -138,20 +150,25 @@ NC_("paper size", "#11 Envelope")
NC_("paper size", "#12 Envelope")
NC_("paper size", "#14 Envelope")
NC_("paper size", "#9 Envelope")
NC_("paper size", "Oficio")
NC_("paper size", "Personal Envelope")
NC_("paper size", "Quarto")
NC_("paper size", "Super A")
NC_("paper size", "Super B")
NC_("paper size", "Wide Format")
NC_("paper size", "Photo L")
NC_("paper size", "Dai-pa-kai")
NC_("paper size", "Folio")
NC_("paper size", "Folio sp")
NC_("paper size", "Invite Envelope")
NC_("paper size", "Italian Envelope")
NC_("paper size", "juuro-ku-kai")
NC_("paper size", "Large Photo")
NC_("paper size", "Medium Photo")
NC_("paper size", "pa-kai")
NC_("paper size", "Postfix Envelope")
NC_("paper size", "Small Photo")
NC_("paper size", "Wide Photo")
NC_("paper size", "prc1 Envelope")
NC_("paper size", "prc10 Envelope")
NC_("paper size", "prc 16k")
@ -190,7 +207,6 @@ static const char paper_names[] =
"iso_a2x5\0"
"A2×5\0"
"iso_a3\0"
"A3\0"
"iso_a3-extra\0"
"A3 Extra\0"
"A3Extra\0"
@ -205,12 +221,12 @@ static const char paper_names[] =
"iso_a3x7\0"
"A3×7\0"
"iso_a4\0"
"A4\0"
"iso_a4-extra\0"
"A4 Extra\0"
"A4Extra\0"
"iso_a4-tab\0"
"A4 Tab\0"
"A4Tab\0"
"iso_a4x3\0"
"A4×3\0"
"iso_a4x4\0"
@ -298,12 +314,18 @@ static const char paper_names[] =
"iso_ra0\0"
"iso_ra1\0"
"iso_ra2\0"
"iso_ra3\0"
"iso_ra4\0"
"iso_sra0\0"
"SRA0\0"
"iso_sra1\0"
"SRA1\0"
"iso_sra2\0"
"SRA2\0"
"iso_sra3\0"
"SRA3\0"
"iso_sra4\0"
"SRA4\0"
"jis_b0\0"
"JB0\0"
"jis_b1\0"
@ -336,6 +358,9 @@ static const char paper_names[] =
"jpn_chou4\0"
"Choukei 4 Envelope\0"
"EnvChou4\0"
"jpn_chou40\0"
"Choukei 40 Envelope\0"
"EnvChou40\0"
"jpn_hagaki\0"
"hagaki (postcard)\0"
"jpn_kahu\0"
@ -343,11 +368,30 @@ static const char paper_names[] =
"jpn_kaku2\0"
"kaku2 Envelope\0"
"EnvKaku2\0"
"jpn_kaku3\0"
"kaku3 Envelope\0"
"EnvKaku3\0"
"jpn_kaku4\0"
"kaku4 Envelope\0"
"EnvKaku4\0"
"jpn_kaku5\0"
"kaku5 Envelope\0"
"EnvKaku5\0"
"jpn_kaku7\0"
"kaku7 Envelope\0"
"EnvKaku7\0"
"jpn_kaku8\0"
"kaku8 Envelope\0"
"EnvKaku8\0"
"jpn_oufuku\0"
"oufuku (reply postcard)\0"
"DoublePostcard\0"
"jpn_you4\0"
"you4 Envelope\0"
"EnvYou4\0"
"jpn_you6\0"
"you6 Envelope\0"
"EnvYou6\0"
"na_10x11\0"
"10×11\0"
"na_10x13\0"
@ -370,10 +414,15 @@ static const char paper_names[] =
"6×9 Envelope\0"
"na_7x9\0"
"7×9 Envelope\0"
"na_8x10\0"
"8×10 Envelope\0"
"na_9x11\0"
"9×11 Envelope\0"
"na_9x12\0"
"9×12 Envelope\0"
"na_a2\0"
"a2 Envelope\0"
"EnvA2\0"
"na_arch-a\0"
"Arch A\0"
"ARCHA\0"
@ -390,19 +439,23 @@ static const char paper_names[] =
"Arch E\0"
"ARCHE\0"
"na_b-plus\0"
"SuperB\0"
"na_c\0"
"AnsiC\0"
"na_c5\0"
"6.5x9.5\0"
"na_d\0"
"AnsiD\0"
"na_e\0"
"AnsiE\0"
"na_edp\0"
"11x14\0"
"na_eur-edp\0"
"European edp\0"
"na_executive\0"
"Executive\0"
"na_f\0"
"AnsiF\0"
"na_fanfold-eur\0"
"Fan-Fold European\0"
"FanFoldGerman\0"
@ -414,9 +467,9 @@ static const char paper_names[] =
"FanFoldGermanLegal\0"
"na_govt-legal\0"
"Government Legal\0"
"8x13\0"
"na_govt-letter\0"
"Government Letter\0"
"8x10\0"
"na_index-3x5\0"
"Index 3×5\0"
"na_index-4x6\0"
@ -462,6 +515,8 @@ static const char paper_names[] =
"na_number-9\0"
"#9 Envelope\0"
"Env9\0"
"na_oficio\0"
"Oficio\0"
"na_personal\0"
"Personal Envelope\0"
"EnvPersonal\0"
@ -472,15 +527,18 @@ static const char paper_names[] =
"SuperA\0"
"na_super-b\0"
"Super B\0"
"SuperB\0"
"na_wide-format\0"
"Wide Format\0"
"oe_photo-l\0"
"Photo L\0"
"3.5x5\0"
"om_dai-pa-kai\0"
"Dai-pa-kai\0"
"om_folio\0"
"Folio\0"
"om_folio-sp\0"
"Folio sp\0"
"FolioSP\0"
"om_invite\0"
"Invite Envelope\0"
"EnvInvite\0"
@ -488,11 +546,17 @@ static const char paper_names[] =
"Italian Envelope\0"
"EnvItalian\0"
"om_juuro-ku-kai\0"
"om_large-photo\0"
"Large Photo\0"
"om_medium-photo\0"
"Medium Photo\0"
"om_pa-kai\0"
"om_postfix\0"
"Postfix Envelope\0"
"om_small-photo\0"
"Small Photo\0"
"om_wide-photo\0"
"Wide Photo\0"
"prc_1\0"
"prc1 Envelope\0"
"EnvPRC1\0"
@ -531,8 +595,10 @@ static const char paper_names[] =
"EnvPRC9\0"
"roc_16k\0"
"ROC 16k\0"
"roc16k\0"
"roc_8k\0"
"ROC 8k\0"
"roc8k\0"
"Comm10\0";
typedef struct {
@ -546,26 +612,26 @@ typedef struct {
static const PaperInfo standard_names_offsets[] = {
{ 0, 711.2, 1016, 0, -1 },
{ 7, 1189, 1682, 15, -1 },
{ 21, 841, 1189, 937, 937 },
{ 21, 841, 1189, 953, 953 },
{ 28, 1189, 2523, 37, -1 },
{ 43, 594, 841, 951, 951 },
{ 43, 594, 841, 967, 967 },
{ 50, 26, 37, 58, 58 },
{ 62, 841, 1783, 71, -1 },
{ 77, 841, 2378, 86, -1 },
{ 92, 420, 594, 965, 965 },
{ 92, 420, 594, 981, 981 },
{ 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 },
{ 144, 297, 420, 995, 995 },
{ 151, 322, 445, 164, 173 },
{ 181, 420, 891, 190, -1 },
{ 196, 420, 1189, 205, -1 },
{ 211, 420, 1486, 220, -1 },
{ 226, 420, 1783, 235, -1 },
{ 241, 420, 2080, 250, -1 },
{ 256, 210, 297, 1009, 1009 },
{ 263, 235.5, 322.3, 276, 285 },
{ 293, 225, 297, 304, 311 },
{ 317, 297, 630, 326, -1 },
{ 332, 297, 841, 341, -1 },
{ 347, 297, 1051, 356, -1 },
@ -606,109 +672,126 @@ static const PaperInfo standard_names_offsets[] = {
{ 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 },
{ 902, 860, 1220, 952, -1 },
{ 910, 610, 860, 966, -1 },
{ 918, 430, 610, 980, -1 },
{ 926, 305, 430, 994, -1 },
{ 934, 215, 305, 1008, -1 },
{ 942, 900, 1280, 951, -1 },
{ 956, 640, 900, 965, -1 },
{ 970, 450, 640, 979, -1 },
{ 984, 320, 450, 993, -1 },
{ 998, 225, 320, 1007, -1 },
{ 1012, 1030, 1456, 1019, 512 },
{ 1023, 728, 1030, 1030, 525 },
{ 1034, 32, 45, 1042, 539 },
{ 1047, 515, 728, 1054, 553 },
{ 1058, 364, 515, 1065, 566 },
{ 1069, 257, 364, 1076, 579 },
{ 1080, 182, 257, 1087, 592 },
{ 1091, 128, 182, 1098, 638 },
{ 1102, 91, 128, 1109, 666 },
{ 1113, 64, 91, 1120, 679 },
{ 1124, 45, 64, 1131, 692 },
{ 1135, 216, 330, 1144, -1 },
{ 1153, 111.1, 146, 1163, -1 },
{ 1182, 120, 235, 1192, 1211 },
{ 1220, 90, 205, 1230, 1249 },
{ 1258, 90, 225, 1269, 1289 },
{ 1299, 100, 148, 1310, 1596 },
{ 1328, 240, 322.1, 1337, -1 },
{ 1351, 240, 332, 1361, 1376 },
{ 1385, 216, 277, 1395, 1410 },
{ 1419, 197, 267, 1429, 1444 },
{ 1453, 190, 240, 1463, 1478 },
{ 1487, 142, 205, 1497, 1512 },
{ 1521, 119, 197, 1531, 1546 },
{ 1555, 148, 200, 1566, 1590 },
{ 1605, 105, 235, 1614, 1628 },
{ 1636, 98, 190, 1645, 1659 },
{ 1667, 254, 279.4, 1676, 1670 },
{ 1683, 254, 330.2, 1692, 1686 },
{ 1699, 254, 355.6, 1708, 1702 },
{ 1715, 254, 381, 1724, 1718 },
{ 1731, 279.4, 304.8, 1740, 1747 },
{ 1753, 279.4, 381, 1762, 1769 },
{ 1775, 304.8, 482.6, 1784, 1778 },
{ 1791, 127, 177.8, 1798, 1794 },
{ 1803, 152.4, 228.6, 1810, 1806 },
{ 1824, 177.8, 228.6, 1831, 1827 },
{ 1845, 203.2, 254, 1853, 1848 },
{ 1868, 228.6, 279.4, 1876, 1871 },
{ 1891, 228.6, 304.8, 1899, 1894 },
{ 1914, 111.125, 146.05, 1920, 1932 },
{ 1938, 228.6, 304.8, 1948, 1955 },
{ 1961, 304.8, 457.2, 1971, 1978 },
{ 1984, 457.2, 609.6, 1994, 2001 },
{ 2007, 609.6, 914.4, 2017, 2024 },
{ 2030, 914.4, 1219.2, 2040, 2047 },
{ 2053, 304.8, 486.918, 2056, 2063 },
{ 2070, 431.8, 558.8, 1142, 2075 },
{ 2081, 165.1, 241.3, 3598, 2087 },
{ 2095, 558.8, 863.6, 1603, 2100 },
{ 2106, 863.6, 1117.6, 894, 2111 },
{ 2117, 279.4, 355.6, 2120, 2124 },
{ 2130, 304.8, 355.6, 2141, -1 },
{ 2154, 184.15, 266.7, 2167, 2167 },
{ 2177, 1117.6, 1727.2, 5, 2182 },
{ 2188, 215.9, 304.8, 2203, 2221 },
{ 2235, 279.4, 377.825, 2249, 2261 },
{ 2271, 215.9, 330.2, 2283, 2305 },
{ 2324, 203.2, 330.2, 2338, 2355 },
{ 2360, 203.2, 254, 2375, 1848 },
{ 2393, 76.2, 127, 2406, 216 },
{ 2417, 101.6, 152.4, 2430, 367 },
{ 2452, 152.4, 203.2, 2469, -1 },
{ 2484, 127, 203.2, 2497, 2493 },
{ 2508, 139.7, 215.9, 2519, 2527 },
{ 2537, 279.4, 431.8, 2547, 2555 },
{ 2562, 215.9, 355.6, 2571, 2299 },
{ 2580, 241.3, 381, 2595, 2610 },
{ 2621, 215.9, 279.4, 2631, 2386 },
{ 2641, 241.3, 304.8, 2657, 2673 },
{ 2685, 215.9, 322.326, 2700, 2715 },
{ 2726, 98.425, 190.5, 2737, 2754 },
{ 2765, 104.775, 241.3, 2778, 2791 },
{ 2797, 114.3, 263.525, 2810, 2823 },
{ 2829, 120.65, 279.4, 2842, 2855 },
{ 2861, 127, 292.1, 2874, 2887 },
{ 2893, 98.425, 225.425, 2905, 2917 },
{ 2922, 215.9, 340.36, 2932, 2932 },
{ 2939, 92.075, 165.1, 2951, 2969 },
{ 2981, 215.9, 275.082, 2991, 2991 },
{ 2998, 227.076, 355.6, 3009, 3017 },
{ 3024, 330.2, 482.6, 3035, 2063 },
{ 3043, 762, 1066.8, 3058, -1 },
{ 3070, 88.9, 127, 3081, 3089 },
{ 3095, 275, 395, 3109, -1 },
{ 3120, 210, 330, 3129, 3129 },
{ 3135, 215, 315, 3147, 3156 },
{ 3164, 220, 220, 3174, 3190 },
{ 3200, 110, 230, 3211, 3228 },
{ 3239, 198, 275, 3242, -1 },
{ 3255, 200, 300, 3270, 3255 },
{ 3282, 130, 180, 3298, -1 },
{ 3311, 267, 389, 3102, -1 },
{ 3321, 114, 229, 3332, -1 },
{ 3349, 100, 150, 3364, 3349 },
{ 3376, 100, 200, 3390, 3376 },
{ 3401, 102, 165, 3407, 3421 },
{ 3429, 324, 458, 3436, 3451 },
{ 3460, 146, 215, 3468, 3476 },
{ 3483, 102, 176, 3489, 3503 },
{ 3511, 125, 176, 3517, 3531 },
{ 3539, 97, 151, 3547, 3555 },
{ 3562, 110, 208, 3568, 3582 },
{ 3590, 110, 220, 3596, 3610 },
{ 3618, 120, 230, 3624, 3638 },
{ 3646, 160, 230, 3652, 3666 },
{ 3674, 120, 309, 3680, 3694 },
{ 3702, 229, 324, 3708, 3722 },
{ 3730, 196.85, 273.05, 3738, 3746 },
{ 3753, 273.05, 393.7, 3760, 3767 },
};
static const struct {
@ -718,8 +801,8 @@ static const struct {
{ 653, 762 },
{ 785, 775 },
{ 798, 788 },
{ 3263, 2392 },
{ 3773, 2765 },
{ 899, 877 },
{ 2384, 2353 },
{ 2757, 2726 },
};