X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=blobdiff_plain;f=data%2Fmedia.defs;h=8d5d278e762b253e31636770a5dfdae99642235d;hp=88036937d97e59676bfda64b79d52e84686c668a;hb=84315f460a5c9eb38f7fcc4204acf98ed2b29406;hpb=82f972324ddde683be8a6d302f9937532ab0cf81

diff --git a/data/media.defs b/data/media.defs
index 88036937d..8d5d278e7 100644
--- a/data/media.defs
+++ b/data/media.defs
@@ -30,17 +30,17 @@
 #media "A2.Transverse/A2" 1684 1191
 #media "A3/A3" 842 1191
 #media "A3.Transverse/A3" 1191 842
-#media "A3Extra/A3 (Oversize)" 913 1262
-#media "A3Extra.Transverse/A3 (Oversize)" 913 1262
+#media "A3Extra/A3 Oversize" 913 1262
+#media "A3Extra.Transverse/A3 Oversize" 913 1262
 #media "A3Rotated/A3" 1191 842
 #media "A4/A4" 595 842
-#media "A4Extra/A4 (Oversize)" 667 914
-#media "A4Plus/A4 (Oversize)" 595 936
+#media "A4Extra/A4 Oversize" 667 914
+#media "A4Plus/A4 Oversize" 595 936
 #media "A4Rotated/A4" 842 595
-#media "A4Small/A4 (Small)" 595 842
+#media "A4Small/A4 Small" 595 842
 #media "A4.Transverse/A4" 842 595
 #media "A5/A5" 420 595
-#media "A5Extra/A5 (Oversize)" 492 668
+#media "A5Extra/A5 Oversize" 492 668
 #media "A5Rotated/A5" 595 420
 #media "A5.Transverse/A5" 595 420
 #media "A6/A6" 297 420
@@ -54,117 +54,117 @@
 #media "AnsiC/ANSI C" 1224 1584
 #media "AnsiD/ANSI D" 1584 2448
 #media "AnsiE/ANSI E" 2448 3168
-#media "ARCHA/ARCH A" 648 864
-#media "ARCHA.Transverse/ARCH A" 864 648
-#media "ARCHB/ARCH B" 864 1296
-#media "ARCHB.Transverse/ARCH B" 1296 864
+#media "ARCHA/Letter Oversize" 648 864
+#media "ARCHA.Transverse/Letter Oversize" 864 648
+#media "ARCHB/Tabloid Oversize" 864 1296
+#media "ARCHB.Transverse/Tabloid Oversize" 1296 864
 #media "ARCHC/ARCH C" 1296 1728
 #media "ARCHC.Transverse/ARCH C" 1728 1296
 #media "ARCHD/ARCH D" 1728 2592
 #media "ARCHD.Transverse/ARCH D" 2592 1728
 #media "ARCHE/ARCH E" 2592 3456
 #media "ARCHE.Transverse/ARCH E" 3456 2592
-#media "B0/B0" 2920 4127
-#media "B10/B10" 91 127
-#media "B1/B1" 2064 2918
-#media "B1/B1" 2064 2920
-#media "B2/B2" 1460 2064
-#media "B3/B3" 1032 1460
-#media "B4/B4" 729 1032
-#media "B4Rotated/B4" 1032 729
-#media "B5/B5" 516 729
-#media "B5Rotated/B5" 729 516
-#media "B5.Transverse/B5" 516 729
-#media "B6/B6" 363 516
-#media "B6Rotated/B6" 516 363
-#media "B7/B7" 258 363
-#media "B8/B8" 181 258
-#media "B9/B9" 127 181
-#media "C4/C4" 649 918
-#media "C5/C5" 459 649
-#media "C6/C6" 323 459
-#media "DL/DL" 312 624
-#media "DoublePostcard/Double Postcard" 567 420
-#media "DoublePostcardRotated/Double Postcard" 420 567
-#media "Env10/#10 Envelope" 297 684
-#media "Env11/#11 Envelope" 324 747
-#media "Env12/#12 Envelope" 342 792
-#media "Env14/#14 Envelope" 360 828
-#media "Env9/#9 Envelope" 279 639
-#media "EnvC0/C0 Envelope" 2599 3676
-#media "EnvC1/C1 Envelope" 1837 2599
-#media "EnvC2/C2 Envelope" 1298 1837
-#media "EnvC3/C3 Envelope" 918 1296
-#media "EnvC4/C4 Envelope" 649 918
-#media "EnvC5/C5 Envelope" 459 649
-#media "EnvC65/C65 Envelope" 324 648
-#media "EnvC6/C6 Envelope" 323 459
-#media "EnvC7/C7 Envelope" 230 323
-#media "EnvChou3/Chou3 Envelope" 340 666
-#media "EnvChou3Rotated/Chou3 Envelope" 666 340
-#media "EnvChou4/Chou4 Envelope" 255 581
-#media "EnvChou4Rotated/Chou4 Envelope" 581 255
-#media "EnvDL/DL Envelope" 312 624
-#media "EnvInvite/Invite Envelope" 624 624
-#media "EnvISOB4/ISO B4 Envelope" 708 1001
-#media "EnvISOB5/ISO B5 Envelope" 499 709
-#media "EnvISOB6/ISO B6 Envelope" 499 354
-#media "EnvItalian/Italian Envelope" 312 652
-#media "EnvKaku2/Kaku2 Envelope" 680 941
-#media "EnvKaku2Rotated/Kaku2 Envelope" 941 680
-#media "EnvKaku3/Kaku3 Envelope" 612 785
-#media "EnvKaku3Rotated/Kaku3 Envelope" 785 612
-#media "EnvMonarch/Monarch Envelope" 279 540
-#media "EnvPersonal/Personal Envelope" 261 468
-#media "EnvPRC1/PRC1 Envelope" 289 468
-#media "EnvPRC1Rotated/PRC1 Envelope" 468 289
-#media "EnvPRC2/PRC2 Envelope" 289 499
-#media "EnvPRC2Rotated/PRC2 Envelope" 499 289
-#media "EnvPRC3/PRC3 Envelope" 354 499
-#media "EnvPRC3Rotated/PRC3 Envelope" 499 354
-#media "EnvPRC4/PRC4 Envelope" 312 590
-#media "EnvPRC4Rotated/PRC4 Envelope" 590 312
-#media "EnvPRC5/PRC5 Envelope" 312 624
-#media "EnvPRC5Rotated/PRC5 Envelope" 624 312
-#media "EnvPRC6/PRC6 Envelope" 340 652
-#media "EnvPRC6Rotated/PRC6 Envelope" 652 340
-#media "EnvPRC7/PRC7 Envelope" 454 652
-#media "EnvPRC7Rotated/PRC7 Envelope" 652 454
-#media "EnvPRC8/PRC8 Envelope" 340 876
-#media "EnvPRC8Rotated/PRC8 Envelope" 876 340
-#media "EnvPRC9/PRC9 Envelope" 649 918
-#media "EnvPRC9Rotated/PRC9 Envelope" 918 649
-#media "EnvPRC10/PRC10 Envelope" 918 1298
-#media "EnvPRC10Rotated/PRC10 Envelope" 1298 918
-#media "EnvYou4/You4 Envelope" 298 666
-#media "EnvYou4Rotated/You4 Envelope" 666 298
-#media "Executive/US Executive" 522 756
-#media "FanFoldGerman/German FanFold" 612 864
-#media "FanFoldGermanLegal/German FanFold Legal" 612 936
-#media "FanFoldUS/US Fanfold" 1071 792
+#media "B0/JB0" 2920 4127
+#media "B10/JB10" 91 127
+#media "B1/JB1" 2064 2918
+#media "B1/JB1" 2064 2920
+#media "B2/JB2" 1460 2064
+#media "B3/JB3" 1032 1460
+#media "B4/JB4" 729 1032
+#media "B4Rotated/JB4" 1032 729
+#media "B5/B5 JIS" 516 729
+#media "B5Rotated/B5 JIS" 729 516
+#media "B5.Transverse/B5 JIS" 516 729
+#media "B6/JB6" 363 516
+#media "B6Rotated/JB6" 516 363
+#media "B7/JB7" 258 363
+#media "B8/JB8" 181 258
+#media "B9/JB9" 127 181
+#media "C4/Envelope C4" 649 918
+#media "C5/Envelope C5" 459 649
+#media "C6/Envelope C6" 323 459
+#media "DL/Envelope DL" 312 624
+#media "DoublePostcard/Postcard Double " 567 420
+#media "DoublePostcardRotated/Postcard Double" 420 567
+#media "Env10/Envelope #10 " 297 684
+#media "Env11/Envelope #11" 324 747
+#media "Env12/Envelope #12" 342 792
+#media "Env14/Envelope #14" 360 828
+#media "Env9/Envelope #9" 279 639
+#media "EnvC0/Envelope C0" 2599 3676
+#media "EnvC1/Envelope C1" 1837 2599
+#media "EnvC2/Envelope C2" 1298 1837
+#media "EnvC3/Envelope C3" 918 1296
+#media "EnvC4/Envelope C4" 649 918
+#media "EnvC5/Envelope C5" 459 649
+#media "EnvC65/Envelope C65" 324 648
+#media "EnvC6/Envelope C6" 323 459
+#media "EnvC7/Envelope C7" 230 323
+#media "EnvChou3/Envelope Choukei 3" 340 666
+#media "EnvChou3Rotated/Envelope Choukei 3" 666 340
+#media "EnvChou4/Envelope Choukei 4" 255 581
+#media "EnvChou4Rotated/Envelope Choukei 4" 581 255
+#media "EnvDL/Envelope DL" 312 624
+#media "EnvInvite/Envelope Invite" 624 624
+#media "EnvISOB4/Envelope B4" 708 1001
+#media "EnvISOB5/Envelope B5" 499 709
+#media "EnvISOB6/Envelope B6" 499 354
+#media "EnvItalian/Envelope Italian" 312 652
+#media "EnvKaku2/Envelope Kaku2" 680 941
+#media "EnvKaku2Rotated/Envelope Kaku2" 941 680
+#media "EnvKaku3/Envelope Kaku3" 612 785
+#media "EnvKaku3Rotated/Envelope Kaku3" 785 612
+#media "EnvMonarch/Envelope Monarch" 279 540
+#media "EnvPersonal/Envelope Personal" 261 468
+#media "EnvPRC1/Envelope PRC1 " 289 468
+#media "EnvPRC1Rotated/Envelope PRC1 " 468 289
+#media "EnvPRC2/Envelope PRC2" 289 499
+#media "EnvPRC2Rotated/Envelope PRC2" 499 289
+#media "EnvPRC3/Envelope PRC3" 354 499
+#media "EnvPRC3Rotated/Envelope PRC3" 499 354
+#media "EnvPRC4/Envelope PRC4" 312 590
+#media "EnvPRC4Rotated/Envelope PRC4" 590 312
+#media "EnvPRC5/Envelope PRC5PRC5" 312 624
+#media "EnvPRC5Rotated/Envelope PRC5" 624 312
+#media "EnvPRC6/Envelope PRC6" 340 652
+#media "EnvPRC6Rotated/Envelope PRC6" 652 340
+#media "EnvPRC7/Envelope PRC7" 454 652
+#media "EnvPRC7Rotated/Envelope PRC7" 652 454
+#media "EnvPRC8/Envelope PRC8" 340 876
+#media "EnvPRC8Rotated/Envelope PRC8" 876 340
+#media "EnvPRC9/Envelope PRC9" 649 918
+#media "EnvPRC9Rotated/Envelope PRC9" 918 649
+#media "EnvPRC10/Envelope PRC10" 918 1298
+#media "EnvPRC10Rotated/Envelope PRC10" 1298 918
+#media "EnvYou4/Envelope You4" 298 666
+#media "EnvYou4Rotated/Envelope You4" 666 298
+#media "Executive/Executive" 522 756
+#media "FanFoldGerman/FanFold German" 612 864
+#media "FanFoldGermanLegal/FanFold Legal German" 612 936
+#media "FanFoldUS/Fanfold US" 1071 792
 #media "Folio/Folio" 595 935
-#media "ISOB0/ISO B0" 2835 4008
-#media "ISOB1/ISO B1" 2004 2835
-#media "ISOB2/ISO B2" 1417 2004
-#media "ISOB3/ISO B3" 1001 1417
-#media "ISOB4/ISO B4" 709 1001
-#media "ISOB5/ISO B5" 499 709
-#media "ISOB5Extra/ISO B5 (Oversize)" 570 782
-#media "ISOB6/ISO B6" 354 499
-#media "ISOB7/ISO B7" 249 354
-#media "ISOB8/ISO B8" 176 249
-#media "ISOB9/ISO B9" 125 176
-#media "ISOB10/ISO B10" 88 125
+#media "ISOB0/B0" 2835 4008
+#media "ISOB1/B1" 2004 2835
+#media "ISOB2/B2" 1417 2004
+#media "ISOB3/B3" 1001 1417
+#media "ISOB4/B4" 709 1001
+#media "ISOB5/B5" 499 709
+#media "ISOB5Extra/B5 Oversize" 570 782
+#media "ISOB6/B6" 354 499
+#media "ISOB7/B7" 249 354
+#media "ISOB8/B8" 176 249
+#media "ISOB9/B9" 125 176
+#media "ISOB10/B10" 88 125
 #media "Ledger/US Ledger" 1224 792
 #media "Legal/US Legal" 612 1008
-#media "LegalExtra/US Legal (Oversize)" 684 1080
+#media "LegalExtra/US Legal Oversize" 684 1080
 #media "Letter/US Letter" 612 792
 #media "Letter.Transverse/US Letter" 792 612
-#media "LetterExtra/US Letter (Oversize)" 684 864
-#media "LetterExtra.Transverse/US Letter (Oversize)" 864 684
-#media "LetterPlus/US Letter (Oversize)" 612 914
+#media "LetterExtra/US Letter Oversize" 684 864
+#media "LetterExtra.Transverse/US Letter Oversize" 864 684
+#media "LetterPlus/US Letter Oversize" 612 914
 #media "LetterRotated/US Letter" 792 612
-#media "LetterSmall/US Letter (Small)" 612 792
+#media "LetterSmall/US Letter Small" 612 792
 #media "Monarch/Monarch" 279 540
 #media "Note/Note" 612 792
 #media "Postcard/Postcard" 284 419
@@ -172,15 +172,15 @@
 #media "PRC16K/PRC16K" 414 610
 #media "PRC16KRotated/PRC16K" 610 414
 #media "PRC32K/PRC32K" 275 428
-#media "PRC32KBig/PRC32K (Oversize)" 275 428
-#media "PRC32KBigRotated/PRC32K (Oversize)" 428 275
+#media "PRC32KBig/PRC32K Oversize" 275 428
+#media "PRC32KBigRotated/PRC32K Oversize" 428 275
 #media "PRC32KRotated/PRC32K" 428 275
 #media "Quarto/Quarto" 610 780
 #media "Statement/Statement" 396 612
 #media "SuperA/Super A" 643 1009
 #media "SuperB/Super B" 864 1380
 #media "Tabloid/Tabloid" 792 1224
-#media "TabloidExtra/Tabloid (Oversize)" 864 1296
+#media "TabloidExtra/Tabloid Oversize" 864 1296
 
 /*
  * Non-standard sizes...
@@ -188,7 +188,6 @@
 
 #media "Photo4x6/Photo" 288 432
 #media "PhotoLabel/Photo Labels" 288 468
-#media "w288h418/Photo" 288 418
 #media "w936h1368/Super B/A3" 936 1368
 #media "w81h252/Address" 81 252
 #media "w101h252/Large Address" 101 252