1 files changed, 132 insertions, 128 deletions
diff --git a/Xprint/OidStrs.h b/Xprint/OidStrs.h
index 81119378c..3aab300dc 100644
--- a/Xprint/OidStrs.h
+++ b/Xprint/OidStrs.h
@@ -30,136 +30,140 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* This is an automatically-generated file. Do not edit. */
+/* $XFree86: xc/programs/Xserver/Xprint/OidStrs.h,v 1.5 2001/12/21 21:02:05 dawes Exp $ */
 
 static int XpOidStringMapCount = 127;
 
+#define OIDATA(name) { name, sizeof(name)-1, 0, 0, 0 }
+
 static const XpOidStringMapEntry XpOidStringMap[] = {
-    { "", 0 },
-    { "", 0 },
-    { "descriptor", 10 },
-    { "content-orientation", 19 },
-    { "copy-count", 10 },
-    { "default-printer-resolution", 26 },
-    { "default-input-tray", 18 },
-    { "default-medium", 14 },
-    { "document-format", 15 },
-    { "plex", 4 },
-    { "xp-listfonts-modes", 18 },
-    { "job-name", 8 },
-    { "job-owner", 9 },
-    { "notification-profile", 20 },
-    { "xp-setup-state", 14 },
-    { "xp-spooler-command-options", 26 },
-    { "content-orientations-supported", 30 },
-    { "document-formats-supported", 26 },
-    { "dt-pdm-command", 14 },
-    { "input-trays-medium", 18 },
-    { "medium-source-sizes-supported", 29 },
-    { "plexes-supported", 16 },
-    { "printer-model", 13 },
-    { "printer-name", 12 },
-    { "printer-resolutions-supported", 29 },
-    { "xp-embedded-formats-supported", 29 },
-    { "xp-listfonts-modes-supported", 28 },
-    { "xp-page-attributes-supported", 28 },
-    { "xp-raw-formats-supported", 24 },
-    { "xp-setup-proviso", 16 },
-    { "document-attributes-supported", 29 },
-    { "job-attributes-supported", 24 },
-    { "locale", 6 },
-    { "multiple-documents-supported", 28 },
-    { "available-compression", 21 },
-    { "available-compressions-supported", 32 },
-    { "portrait", 8 },
-    { "landscape", 9 },
-    { "reverse-portrait", 16 },
-    { "reverse-landscape", 17 },
-    { "iso-a0", 6 },
-    { "iso-a1", 6 },
-    { "iso-a2", 6 },
-    { "iso-a3", 6 },
-    { "iso-a4", 6 },
-    { "iso-a5", 6 },
-    { "iso-a6", 6 },
-    { "iso-a7", 6 },
-    { "iso-a8", 6 },
-    { "iso-a9", 6 },
-    { "iso-a10", 7 },
-    { "iso-b0", 6 },
-    { "iso-b1", 6 },
-    { "iso-b2", 6 },
-    { "iso-b3", 6 },
-    { "iso-b4", 6 },
-    { "iso-b5", 6 },
-    { "iso-b6", 6 },
-    { "iso-b7", 6 },
-    { "iso-b8", 6 },
-    { "iso-b9", 6 },
-    { "iso-b10", 7 },
-    { "na-letter", 9 },
-    { "na-legal", 8 },
-    { "executive", 9 },
-    { "folio", 5 },
-    { "invoice", 7 },
-    { "ledger", 6 },
-    { "quarto", 6 },
-    { "iso-c3", 6 },
-    { "iso-c4", 6 },
-    { "iso-c5", 6 },
-    { "iso-c6", 6 },
-    { "iso-designated-long", 19 },
-    { "na-10x13-envelope", 17 },
-    { "na-9x12-envelope", 16 },
-    { "na-number-10-envelope", 21 },
-    { "na-7x9-envelope", 15 },
-    { "na-9x11-envelope", 16 },
-    { "na-10x14-envelope", 17 },
-    { "na-number-9-envelope", 20 },
-    { "na-6x9-envelope", 15 },
-    { "na-10x15-envelope", 17 },
-    { "monarch-envelope", 16 },
-    { "a", 1 },
-    { "b", 1 },
-    { "c", 1 },
-    { "d", 1 },
-    { "e", 1 },
-    { "jis-b0", 6 },
-    { "jis-b1", 6 },
-    { "jis-b2", 6 },
-    { "jis-b3", 6 },
-    { "jis-b4", 6 },
-    { "jis-b5", 6 },
-    { "jis-b6", 6 },
-    { "jis-b7", 6 },
-    { "jis-b8", 6 },
-    { "jis-b9", 6 },
-    { "jis-b10", 7 },
-    { "simplex", 7 },
-    { "duplex", 6 },
-    { "tumble", 6 },
-    { "top", 3 },
-    { "middle", 6 },
-    { "bottom", 6 },
-    { "envelope", 8 },
-    { "manual", 6 },
-    { "large-capacity", 14 },
-    { "main", 4 },
-    { "side", 4 },
-    { "event-report-job-completed", 26 },
-    { "electronic-mail", 15 },
-    { "xp-setup-mandatory", 18 },
-    { "xp-setup-optional", 17 },
-    { "xp-setup-ok", 11 },
-    { "xp-setup-incomplete", 19 },
-    { "xp-list-glyph-fonts", 19 },
-    { "xp-list-internal-printer-fonts", 30 },
-    { "0", 1 },
-    { "01", 2 },
-    { "02", 2 },
-    { "03", 2 },
-    { "012", 3 },
-    { "013", 3 },
-    { "023", 3 },
-    { "0123", 4 }
+    OIDATA(""),
+    OIDATA(""),
+    OIDATA("descriptor"),
+    OIDATA("content-orientation"),
+    OIDATA("copy-count"),
+    OIDATA("default-printer-resolution"),
+    OIDATA("default-input-tray"),
+    OIDATA("default-medium"),
+    OIDATA("document-format"),
+    OIDATA("plex"),
+    OIDATA("xp-listfonts-modes"),
+    OIDATA("job-name"),
+    OIDATA("job-owner"),
+    OIDATA("notification-profile"),
+    OIDATA("xp-setup-state"),
+    OIDATA("xp-spooler-command-options"),
+    OIDATA("content-orientations-supported"),
+    OIDATA("document-formats-supported"),
+    OIDATA("dt-pdm-command"),
+    OIDATA("input-trays-medium"),
+    OIDATA("medium-source-sizes-supported"),
+    OIDATA("plexes-supported"),
+    OIDATA("printer-model"),
+    OIDATA("printer-name"),
+    OIDATA("printer-resolutions-supported"),
+    OIDATA("xp-embedded-formats-supported"),
+    OIDATA("xp-listfonts-modes-supported"),
+    OIDATA("xp-page-attributes-supported"),
+    OIDATA("xp-raw-formats-supported"),
+    OIDATA("xp-setup-proviso"),
+    OIDATA("document-attributes-supported"),
+    OIDATA("job-attributes-supported"),
+    OIDATA("locale"),
+    OIDATA("multiple-documents-supported"),
+    OIDATA("available-compression"),
+    OIDATA("available-compressions-supported"),
+    OIDATA("portrait"),
+    OIDATA("landscape"),
+    OIDATA("reverse-portrait"),
+    OIDATA("reverse-landscape"),
+    OIDATA("iso-a0"),
+    OIDATA("iso-a1"),
+    OIDATA("iso-a2"),
+    OIDATA("iso-a3"),
+    OIDATA("iso-a4"),
+    OIDATA("iso-a5"),
+    OIDATA("iso-a6"),
+    OIDATA("iso-a7"),
+    OIDATA("iso-a8"),
+    OIDATA("iso-a9"),
+    OIDATA("iso-a10"),
+    OIDATA("iso-b0"),
+    OIDATA("iso-b1"),
+    OIDATA("iso-b2"),
+    OIDATA("iso-b3"),
+    OIDATA("iso-b4"),
+    OIDATA("iso-b5"),
+    OIDATA("iso-b6"),
+    OIDATA("iso-b7"),
+    OIDATA("iso-b8"),
+    OIDATA("iso-b9"),
+    OIDATA("iso-b10"),
+    OIDATA("na-letter"),
+    OIDATA("na-legal"),
+    OIDATA("executive"),
+    OIDATA("folio"),
+    OIDATA("invoice"),
+    OIDATA("ledger"),
+    OIDATA("quarto"),
+    OIDATA("iso-c3"),
+    OIDATA("iso-c4"),
+    OIDATA("iso-c5"),
+    OIDATA("iso-c6"),
+    OIDATA("iso-designated-long"),
+    OIDATA("na-10x13-envelope"),
+    OIDATA("na-9x12-envelope"),
+    OIDATA("na-number-10-envelope"),
+    OIDATA("na-7x9-envelope"),
+    OIDATA("na-9x11-envelope"),
+    OIDATA("na-10x14-envelope"),
+    OIDATA("na-number-9-envelope"),
+    OIDATA("na-6x9-envelope"),
+    OIDATA("na-10x15-envelope"),
+    OIDATA("monarch-envelope"),
+    OIDATA("a"),
+    OIDATA("b"),
+    OIDATA("c"),
+    OIDATA("d"),
+    OIDATA("e"),
+    OIDATA("jis-b0"),
+    OIDATA("jis-b1"),
+    OIDATA("jis-b2"),
+    OIDATA("jis-b3"),
+    OIDATA("jis-b4"),
+    OIDATA("jis-b5"),
+    OIDATA("jis-b6"),
+    OIDATA("jis-b7"),
+    OIDATA("jis-b8"),
+    OIDATA("jis-b9"),
+    OIDATA("jis-b10"),
+    OIDATA("simplex"),
+    OIDATA("duplex"),
+    OIDATA("tumble"),
+    OIDATA("top"),
+    OIDATA("middle"),
+    OIDATA("bottom"),
+    OIDATA("envelope"),
+    OIDATA("manual"),
+    OIDATA("large-capacity"),
+    OIDATA("main"),
+    OIDATA("side"),
+    OIDATA("event-report-job-completed"),
+    OIDATA("electronic-mail"),
+    OIDATA("xp-setup-mandatory"),
+    OIDATA("xp-setup-optional"),
+    OIDATA("xp-setup-ok"),
+    OIDATA("xp-setup-incomplete"),
+    OIDATA("xp-list-glyph-fonts"),
+    OIDATA("xp-list-internal-printer-fonts"),
+    OIDATA("0"),
+    OIDATA("01"),
+    OIDATA("02"),
+    OIDATA("03"),
+    OIDATA("012"),
+    OIDATA("013"),
+    OIDATA("023"),
+    OIDATA("0123")
 };
+
+#undef OIDATA