X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fpaper_names_offsets.c;h=dfb97883c945c67279452a64da8d14a9c54e0ffc;hb=d97861bd8b338c3d25d7ffb5496edee9eee9bfbb;hp=2d213ddff6af7d2f16fc831519793793d963debc;hpb=a35e29588080ef902640aad9db26d9da436f771d;p=~andy%2Fgtk

diff --git a/gtk/paper_names_offsets.c b/gtk/paper_names_offsets.c
index 2d213ddff..dfb97883c 100644
--- a/gtk/paper_names_offsets.c
+++ b/gtk/paper_names_offsets.c
@@ -1,337 +1,174 @@
 /* Generated by gen-paper-names */
 
 #if 0
-/* translators, strip everything up to the first | */
-N_("paper size|asme_f")
-/* translators, strip everything up to the first | */
-N_("paper size|A0x2")
-/* translators, strip everything up to the first | */
-N_("paper size|A0")
-/* translators, strip everything up to the first | */
-N_("paper size|A0x3")
-/* translators, strip everything up to the first | */
-N_("paper size|A1")
-/* translators, strip everything up to the first | */
-N_("paper size|A10")
-/* translators, strip everything up to the first | */
-N_("paper size|A1x3")
-/* translators, strip everything up to the first | */
-N_("paper size|A1x4")
-/* translators, strip everything up to the first | */
-N_("paper size|A2")
-/* translators, strip everything up to the first | */
-N_("paper size|A2x3")
-/* translators, strip everything up to the first | */
-N_("paper size|A2x4")
-/* translators, strip everything up to the first | */
-N_("paper size|A2x5")
-/* translators, strip everything up to the first | */
-N_("paper size|A3")
-/* translators, strip everything up to the first | */
-N_("paper size|A3 Extra")
-/* translators, strip everything up to the first | */
-N_("paper size|A3x3")
-/* translators, strip everything up to the first | */
-N_("paper size|A3x4")
-/* translators, strip everything up to the first | */
-N_("paper size|A3x5")
-/* translators, strip everything up to the first | */
-N_("paper size|A3x6")
-/* translators, strip everything up to the first | */
-N_("paper size|A3x7")
-/* translators, strip everything up to the first | */
-N_("paper size|A4")
-/* translators, strip everything up to the first | */
-N_("paper size|A4 Extra")
-/* translators, strip everything up to the first | */
-N_("paper size|A4 Tab")
-/* translators, strip everything up to the first | */
-N_("paper size|A4x3")
-/* translators, strip everything up to the first | */
-N_("paper size|A4x4")
-/* translators, strip everything up to the first | */
-N_("paper size|A4x5")
-/* translators, strip everything up to the first | */
-N_("paper size|A4x6")
-/* translators, strip everything up to the first | */
-N_("paper size|A4x7")
-/* translators, strip everything up to the first | */
-N_("paper size|A4x8")
-/* translators, strip everything up to the first | */
-N_("paper size|A4x9")
-/* translators, strip everything up to the first | */
-N_("paper size|A5")
-/* translators, strip everything up to the first | */
-N_("paper size|A5 Extra")
-/* translators, strip everything up to the first | */
-N_("paper size|A6")
-/* translators, strip everything up to the first | */
-N_("paper size|A7")
-/* translators, strip everything up to the first | */
-N_("paper size|A8")
-/* translators, strip everything up to the first | */
-N_("paper size|A9")
-/* translators, strip everything up to the first | */
-N_("paper size|B0")
-/* translators, strip everything up to the first | */
-N_("paper size|B1")
-/* translators, strip everything up to the first | */
-N_("paper size|B10")
-/* translators, strip everything up to the first | */
-N_("paper size|B2")
-/* translators, strip everything up to the first | */
-N_("paper size|B3")
-/* translators, strip everything up to the first | */
-N_("paper size|B4")
-/* translators, strip everything up to the first | */
-N_("paper size|B5")
-/* translators, strip everything up to the first | */
-N_("paper size|B5 Extra")
-/* translators, strip everything up to the first | */
-N_("paper size|B6")
-/* translators, strip everything up to the first | */
-N_("paper size|B6/C4")
-/* translators, strip everything up to the first | */
-N_("paper size|B7")
-/* translators, strip everything up to the first | */
-N_("paper size|B8")
-/* translators, strip everything up to the first | */
-N_("paper size|B9")
-/* translators, strip everything up to the first | */
-N_("paper size|C0")
-/* translators, strip everything up to the first | */
-N_("paper size|C1")
-/* translators, strip everything up to the first | */
-N_("paper size|C10")
-/* translators, strip everything up to the first | */
-N_("paper size|C2")
-/* translators, strip everything up to the first | */
-N_("paper size|C3")
-/* translators, strip everything up to the first | */
-N_("paper size|C4")
-/* translators, strip everything up to the first | */
-N_("paper size|C5")
-/* translators, strip everything up to the first | */
-N_("paper size|C6")
-/* translators, strip everything up to the first | */
-N_("paper size|C6/C5")
-/* translators, strip everything up to the first | */
-N_("paper size|C7")
-/* translators, strip everything up to the first | */
-N_("paper size|C7/C6")
-/* translators, strip everything up to the first | */
-N_("paper size|C8")
-/* translators, strip everything up to the first | */
-N_("paper size|C9")
-/* translators, strip everything up to the first | */
-N_("paper size|DL Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|RA0")
-/* translators, strip everything up to the first | */
-N_("paper size|RA1")
-/* translators, strip everything up to the first | */
-N_("paper size|RA2")
-/* translators, strip everything up to the first | */
-N_("paper size|SRA0")
-/* translators, strip everything up to the first | */
-N_("paper size|SRA1")
-/* translators, strip everything up to the first | */
-N_("paper size|SRA2")
-/* translators, strip everything up to the first | */
-N_("paper size|JB0")
-/* translators, strip everything up to the first | */
-N_("paper size|JB1")
-/* translators, strip everything up to the first | */
-N_("paper size|JB10")
-/* translators, strip everything up to the first | */
-N_("paper size|JB2")
-/* translators, strip everything up to the first | */
-N_("paper size|JB3")
-/* translators, strip everything up to the first | */
-N_("paper size|JB4")
-/* translators, strip everything up to the first | */
-N_("paper size|JB5")
-/* translators, strip everything up to the first | */
-N_("paper size|JB6")
-/* translators, strip everything up to the first | */
-N_("paper size|JB7")
-/* translators, strip everything up to the first | */
-N_("paper size|JB8")
-/* translators, strip everything up to the first | */
-N_("paper size|JB9")
-/* translators, strip everything up to the first | */
-N_("paper size|jis exec")
-/* translators, strip everything up to the first | */
-N_("paper size|Choukei 2 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|Choukei 3 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|Choukei 4 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|hagaki (postcard)")
-/* translators, strip everything up to the first | */
-N_("paper size|kahu Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|kaku2 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|oufuku (reply postcard)")
-/* translators, strip everything up to the first | */
-N_("paper size|you4 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|10x11")
-/* translators, strip everything up to the first | */
-N_("paper size|10x13")
-/* translators, strip everything up to the first | */
-N_("paper size|10x14")
-/* translators, strip everything up to the first | */
-N_("paper size|10x15")
-/* translators, strip everything up to the first | */
-N_("paper size|10x15")
-/* translators, strip everything up to the first | */
-N_("paper size|11x12")
-/* translators, strip everything up to the first | */
-N_("paper size|11x15")
-/* translators, strip everything up to the first | */
-N_("paper size|12x19")
-/* translators, strip everything up to the first | */
-N_("paper size|5x7")
-/* translators, strip everything up to the first | */
-N_("paper size|6x9 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|7x9 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|9x11 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|a2 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|Arch A")
-/* translators, strip everything up to the first | */
-N_("paper size|Arch B")
-/* translators, strip everything up to the first | */
-N_("paper size|Arch C")
-/* translators, strip everything up to the first | */
-N_("paper size|Arch D")
-/* translators, strip everything up to the first | */
-N_("paper size|Arch E")
-/* translators, strip everything up to the first | */
-N_("paper size|b-plus")
-/* translators, strip everything up to the first | */
-N_("paper size|c")
-/* translators, strip everything up to the first | */
-N_("paper size|c5 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|d")
-/* translators, strip everything up to the first | */
-N_("paper size|e")
-/* translators, strip everything up to the first | */
-N_("paper size|edp")
-/* translators, strip everything up to the first | */
-N_("paper size|European edp")
-/* translators, strip everything up to the first | */
-N_("paper size|Executive")
-/* translators, strip everything up to the first | */
-N_("paper size|f")
-/* translators, strip everything up to the first | */
-N_("paper size|FanFold European")
-/* translators, strip everything up to the first | */
-N_("paper size|FanFold US")
-/* translators, strip everything up to the first | */
-N_("paper size|FanFold German Legal")
-/* translators, strip everything up to the first | */
-N_("paper size|Government Legal")
-/* translators, strip everything up to the first | */
-N_("paper size|Government Letter")
-/* translators, strip everything up to the first | */
-N_("paper size|Index 3x5")
-/* translators, strip everything up to the first | */
-N_("paper size|Index 4x6 (postcard)")
-/* translators, strip everything up to the first | */
-N_("paper size|Index 4x6 ext")
-/* translators, strip everything up to the first | */
-N_("paper size|Index 5x8")
-/* translators, strip everything up to the first | */
-N_("paper size|Invoice")
-/* translators, strip everything up to the first | */
-N_("paper size|Tabloid")
-/* translators, strip everything up to the first | */
-N_("paper size|US Legal")
-/* translators, strip everything up to the first | */
-N_("paper size|US Legal Extra")
-/* translators, strip everything up to the first | */
-N_("paper size|US Letter")
-/* translators, strip everything up to the first | */
-N_("paper size|US Letter Extra")
-/* translators, strip everything up to the first | */
-N_("paper size|US Letter Plus")
-/* translators, strip everything up to the first | */
-N_("paper size|Monarch Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|#10 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|#11 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|#12 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|#14 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|#9 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|Personal Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|Quarto")
-/* translators, strip everything up to the first | */
-N_("paper size|Super A")
-/* translators, strip everything up to the first | */
-N_("paper size|Super B")
-/* translators, strip everything up to the first | */
-N_("paper size|Wide Format")
-/* translators, strip everything up to the first | */
-N_("paper size|Dai-pa-kai")
-/* translators, strip everything up to the first | */
-N_("paper size|Folio")
-/* translators, strip everything up to the first | */
-N_("paper size|Folio sp")
-/* translators, strip everything up to the first | */
-N_("paper size|Invite Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|Italian Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|juuro-ku-kai")
-/* translators, strip everything up to the first | */
-N_("paper size|pa-kai")
-/* translators, strip everything up to the first | */
-N_("paper size|Postfix Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|Small Photo")
-/* translators, strip everything up to the first | */
-N_("paper size|prc1 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc10 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc 16k")
-/* translators, strip everything up to the first | */
-N_("paper size|prc2 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc3 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc 32k")
-/* translators, strip everything up to the first | */
-N_("paper size|prc4 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc5 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc6 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc7 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc8 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|ROC 16k")
-/* translators, strip everything up to the first | */
-N_("paper size|ROC 8k")
+NC_("paper size", "asme_f")
+NC_("paper size", "A0x2")
+NC_("paper size", "A0")
+NC_("paper size", "A0x3")
+NC_("paper size", "A1")
+NC_("paper size", "A10")
+NC_("paper size", "A1x3")
+NC_("paper size", "A1x4")
+NC_("paper size", "A2")
+NC_("paper size", "A2x3")
+NC_("paper size", "A2x4")
+NC_("paper size", "A2x5")
+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", "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", "A5")
+NC_("paper size", "A5 Extra")
+NC_("paper size", "A6")
+NC_("paper size", "A7")
+NC_("paper size", "A8")
+NC_("paper size", "A9")
+NC_("paper size", "B0")
+NC_("paper size", "B1")
+NC_("paper size", "B10")
+NC_("paper size", "B2")
+NC_("paper size", "B3")
+NC_("paper size", "B4")
+NC_("paper size", "B5")
+NC_("paper size", "B5 Extra")
+NC_("paper size", "B6")
+NC_("paper size", "B6/C4")
+NC_("paper size", "B7")
+NC_("paper size", "B8")
+NC_("paper size", "B9")
+NC_("paper size", "C0")
+NC_("paper size", "C1")
+NC_("paper size", "C10")
+NC_("paper size", "C2")
+NC_("paper size", "C3")
+NC_("paper size", "C4")
+NC_("paper size", "C5")
+NC_("paper size", "C6")
+NC_("paper size", "C6/C5")
+NC_("paper size", "C7")
+NC_("paper size", "C7/C6")
+NC_("paper size", "C8")
+NC_("paper size", "C9")
+NC_("paper size", "DL Envelope")
+NC_("paper size", "RA0")
+NC_("paper size", "RA1")
+NC_("paper size", "RA2")
+NC_("paper size", "SRA0")
+NC_("paper size", "SRA1")
+NC_("paper size", "SRA2")
+NC_("paper size", "JB0")
+NC_("paper size", "JB1")
+NC_("paper size", "JB10")
+NC_("paper size", "JB2")
+NC_("paper size", "JB3")
+NC_("paper size", "JB4")
+NC_("paper size", "JB5")
+NC_("paper size", "JB6")
+NC_("paper size", "JB7")
+NC_("paper size", "JB8")
+NC_("paper size", "JB9")
+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", "hagaki (postcard)")
+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", "a2 Envelope")
+NC_("paper size", "Arch A")
+NC_("paper size", "Arch B")
+NC_("paper size", "Arch C")
+NC_("paper size", "Arch D")
+NC_("paper size", "Arch E")
+NC_("paper size", "b-plus")
+NC_("paper size", "c")
+NC_("paper size", "c5 Envelope")
+NC_("paper size", "d")
+NC_("paper size", "e")
+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", "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", "Invoice")
+NC_("paper size", "Tabloid")
+NC_("paper size", "US Legal")
+NC_("paper size", "US Legal Extra")
+NC_("paper size", "US Letter")
+NC_("paper size", "US Letter Extra")
+NC_("paper size", "US Letter Plus")
+NC_("paper size", "Monarch Envelope")
+NC_("paper size", "#10 Envelope")
+NC_("paper size", "#11 Envelope")
+NC_("paper size", "#12 Envelope")
+NC_("paper size", "#14 Envelope")
+NC_("paper size", "#9 Envelope")
+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", "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", "pa-kai")
+NC_("paper size", "Postfix Envelope")
+NC_("paper size", "Small Photo")
+NC_("paper size", "prc1 Envelope")
+NC_("paper size", "prc10 Envelope")
+NC_("paper size", "prc 16k")
+NC_("paper size", "prc2 Envelope")
+NC_("paper size", "prc3 Envelope")
+NC_("paper size", "prc 32k")
+NC_("paper size", "prc4 Envelope")
+NC_("paper size", "prc5 Envelope")
+NC_("paper size", "prc6 Envelope")
+NC_("paper size", "prc7 Envelope")
+NC_("paper size", "prc8 Envelope")
+NC_("paper size", "prc9 Envelope")
+NC_("paper size", "ROC 16k")
+NC_("paper size", "ROC 8k")
 #endif
 
-const char paper_names[] =
+static const char paper_names[] =
   "asme_f\0"
   "iso_2a0\0"
   "A0x2\0"
@@ -681,6 +518,9 @@ 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"
@@ -695,7 +535,7 @@ typedef struct {
   int ppd_name;
 } PaperInfo;
 
-const PaperInfo standard_names_offsets[] = {
+static const PaperInfo standard_names_offsets[] = {
   {    0, 711.2, 1016,    0,   -1 },
   {    7, 1189, 1682,   15,   -1 },
   {   20, 841, 1189,  918,  918 },
@@ -855,21 +695,22 @@ 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 },
 };
 
-const struct {
+static const struct {
   int ppd_name;
   int standard_name;
 } extra_ppd_names_offsets[] = {
   {  634,  743 },
   {  766,  756 },
   {  779,  769 },
-  { 3152, 2309 },
+  { 3180, 2309 },
   {  880,  858 },
   { 2301, 2270 },
 };