Fix a thinko in the suffix calculation. (#382369, Christian Persch)

[~andy/gtk] / gtk / paper_names_offsets.c

diff --git a/gtk/paper_names_offsets.c b/gtk/paper_names_offsets.c
index 98e26223a0ca6cbac1011e319ad6d6ee6df0d9da..2d213ddff6af7d2f16fc831519793793d963debc 100644 (file)
--- a/gtk/paper_names_offsets.c
+++ b/gtk/paper_names_offsets.c
@@ -331,7 +331,7 @@ N_("paper size|ROC 16k")
 N_("paper size|ROC 8k")
 #endif
 
-static const char paper_names[] =
+const char paper_names[] =
   "asme_f\0"
   "iso_2a0\0"
   "A0x2\0"
@@ -606,7 +606,7 @@ static const char paper_names[] =
   "#10 Envelope\0"
   "Env10\0"
   "na_number-11\0"
-  "#11 Eenvelope\0"
+  "#11 Envelope\0"
   "Env11\0"
   "na_number-12\0"
   "#12 Envelope\0"
@@ -695,16 +695,16 @@ typedef struct {
   int ppd_name;
 } PaperInfo;
 
-static const PaperInfo standard_names_offsets[] = {
+const PaperInfo standard_names_offsets[] = {
   {    0, 711.2, 1016,    0,   -1 },
   {    7, 1189, 1682,   15,   -1 },
-  {   20, 841, 1189,    1,    1 },
+  {   20, 841, 1189,  918,  918 },
   {   27, 1189, 2523,   36,   -1 },
-  {   41, 594, 841,    1,    1 },
+  {   41, 594, 841,  932,  932 },
   {   48, 26, 37,   56,   56 },
   {   60, 841, 1783,   69,   -1 },
   {   74, 841, 2378,   83,   -1 },
-  {   88, 420, 594,    1,    1 },
+  {   88, 420, 594,  946,  946 },
   {   95, 594, 1261,  104,   -1 },
   {  109, 594, 1682,  118,   -1 },
   {  123, 594, 2102,  132,   -1 },
@@ -804,7 +804,7 @@ static const PaperInfo standard_names_offsets[] = {
   { 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, 3019,   -1 },
+  { 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 },
@@ -829,47 +829,47 @@ static const PaperInfo standard_names_offsets[] = {
   { 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, 2368 },
-  { 2374, 120.65, 279.4, 2387, 2400 },
-  { 2406, 127, 292.1, 2419, 2432 },
-  { 2438, 98.425, 225.425, 2450, 2462 },
-  { 2467, 92.075, 165.1, 2479, 2497 },
-  { 2509, 215.9, 275.082, 2519, 2519 },
-  { 2526, 227.076, 355.6, 2537, 2545 },
-  { 2552, 330.2, 482.6, 2563, 2571 },
-  { 2578, 762, 1066.8, 2593,   -1 },
-  { 2605, 275, 395, 2619,   -1 },
-  { 2630, 210, 330, 2639, 2639 },
-  { 2645, 215, 315, 2657,   -1 },
-  { 2666, 220, 220, 2676, 2692 },
-  { 2702, 110, 230, 2713, 2730 },
-  { 2741, 198, 275, 2744,   -1 },
-  { 2757, 267, 389, 2612,   -1 },
-  { 2767, 114, 229, 2778,   -1 },
-  { 2795, 100, 150, 2810,   -1 },
-  { 2822, 102, 165, 2828, 2842 },
-  { 2850, 324, 458, 2857, 2872 },
-  { 2881, 146, 215, 2889, 2897 },
-  { 2904, 102, 176, 2910, 2924 },
-  { 2932, 125, 176, 2938, 2952 },
-  { 2960, 97, 151, 2968, 2976 },
-  { 2983, 110, 208, 2989, 3003 },
-  { 3011, 110, 220, 3017, 3031 },
-  { 3039, 120, 320, 3045, 3059 },
-  { 3067, 160, 230, 3073, 3087 },
-  { 3095, 120, 309, 3101, 3115 },
-  { 3123, 196.85, 273.05, 3131,   -1 },
-  { 3139, 273.05, 393.7, 3146,   -1 },
+  { 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, 320, 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 },
 };
 
-static const struct {
+const struct {
   int ppd_name;
   int standard_name;
 } extra_ppd_names_offsets[] = {
   {  634,  743 },
   {  766,  756 },
   {  779,  769 },
-  { 3153, 2309 },
+  { 3152, 2309 },
   {  880,  858 },
   { 2301, 2270 },
 };