[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE_3_3_BRANCH: kdegraphics/kghostview
From: Luís Pedro Coelho <luis () luispedro ! org>
Date: 2004-10-15 22:07:22
Message-ID: 20041015220722.7112616D91 () office ! kde ! org
[Download RAW message or body]
CVS commit by luis_pedro:
Add missing paper sizes.
Patch by Jens Krueger
M +40 -2 dscparse.cpp 1.12.4.1
M +2 -3 dscparse.h 1.7.4.1
--- kdegraphics/kghostview/dscparse.cpp #1.12:1.12.4.1
@@ -153,16 +153,54 @@ dsc_private const int dsc_severity[] = {
#define DSC_MAX_ERROR ((sizeof(dsc_severity) / sizeof(int))-2)
-const CDSCMEDIA dsc_known_media[CDSC_KNOWN_MEDIA] = {
+const CDSCMEDIA dsc_known_media[] = {
/* These sizes taken from Ghostscript gs_statd.ps */
{"11x17", 792, 1224, 0, NULL, NULL},
+ {"A0", 2380, 3368, 0, NULL, NULL},
+ {"A1", 1684, 2380, 0, NULL, NULL},
+ {"A2", 1190, 1684, 0, NULL, NULL},
{"A3", 842, 1190, 0, NULL, NULL},
{"A4", 595, 842, 0, NULL, NULL},
{"A5", 421, 595, 0, NULL, NULL},
+ {"A6", 297, 421, 0, NULL, NULL},
+ {"A7", 210, 297, 0, NULL, NULL},
+ {"A8", 148, 210, 0, NULL, NULL},
+ {"A9", 105, 148, 0, NULL, NULL},
+ {"A10", 74, 105, 0, NULL, NULL},
+ {"B0", 2836, 4008, 0, NULL, NULL},
+ {"B1", 2004, 2836, 0, NULL, NULL},
+ {"B2", 1418, 2004, 0, NULL, NULL},
+ {"B3", 1002, 1418, 0, NULL, NULL},
{"B4", 709, 1002, 0, NULL, NULL}, /* ISO, but not Adobe standard */
{"B5", 501, 709, 0, NULL, NULL}, /* ISO, but not Adobe standard */
+ {"B6", 354, 501, 0, NULL, NULL},
+ {"C0", 2600, 3677, 0, NULL, NULL},
+ {"C1", 1837, 2600, 0, NULL, NULL},
+ {"C2", 1298, 1837, 0, NULL, NULL},
+ {"C3", 918, 1298, 0, NULL, NULL},
+ {"C4", 649, 918, 0, NULL, NULL},
+ {"C5", 459, 649, 0, NULL, NULL},
+ {"C6", 323, 459, 0, NULL, NULL},
{"Ledger", 1224, 792, 0, NULL, NULL},
{"Legal", 612, 1008, 0, NULL, NULL},
{"Letter", 612, 792, 0, NULL, NULL},
{"Note", 612, 792, 0, NULL, NULL},
+// ISO and JIS B sizes are different....
+ {"jisb0", 2916, 4128, 0, NULL, NULL},
+ {"jisb1", 2064, 2916, 0, NULL, NULL},
+ {"jisb2", 1458, 2064, 0, NULL, NULL},
+ {"jisb3", 1032, 1458, 0, NULL, NULL},
+ {"jisb4", 729, 1032, 0, NULL, NULL},
+ {"jisb5", 516, 729, 0, NULL, NULL},
+ {"jisb6", 363, 516, 0, NULL, NULL},
+// U.S. CAD standard paper sizes
+ {"archE", 2592, 3456, 0, NULL, NULL},
+ {"archD", 1728, 2592, 0, NULL, NULL},
+ {"archC", 1296, 1728, 0, NULL, NULL},
+ {"archB", 864, 1296, 0, NULL, NULL},
+ {"archA", 648, 864, 0, NULL, NULL},
+// Other paper sizes
+ {"flsa", 612, 936, 0, NULL, NULL}, /* U.S. foolscap */
+ {"flse", 612, 936, 0, NULL, NULL}, /* European foolscap */
+ {"halfletter", 396, 612, 0, NULL, NULL},
{NULL, 0, 0, 0, NULL, NULL}
};
--- kdegraphics/kghostview/dscparse.h #1.7:1.7.4.1
@@ -240,6 +240,5 @@ typedef struct CDSCMEDIA_S {
} CDSCMEDIA;
-#define CDSC_KNOWN_MEDIA 11
-extern const CDSCMEDIA dsc_known_media[CDSC_KNOWN_MEDIA];
+extern const CDSCMEDIA dsc_known_media[];
typedef struct CDSCCTM_S { /* used for %%ViewingOrientation */
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic