Attachment 417 Details for Bug 791 – Same patch for 2004-06-24-trunk (Xorg CVS)

[patch] Same patch for 2004-06-24-trunk (Xorg CVS)

patch.gudiff (text/plain), 6.86 KB, created by Roland Mainz on 2004-06-24 16:58:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-06-24 16:58:52 UTC

Size: 6.86 KB

patch

obsolete

>Index: xc/programs/Xserver/XpConfig/C/print/attributes/document
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/XpConfig/C/print/attributes/document,v
>retrieving revision 1.3
>diff -u -2 -0 -r1.3 document
>--- xc/programs/Xserver/XpConfig/C/print/attributes/document	21 Jun 2004 00:29:46 -0000	1.3
>+++ xc/programs/Xserver/XpConfig/C/print/attributes/document	24 Jun 2004 23:52:27 -0000
>@@ -17,32 +17,33 @@
> #	Example: "*.plex: duplex"
> 
> 
> *content-orientation: portrait
> *copy-count: 1
> *default-medium: iso-a4
> *default-printer-resolution: 600
> 
> # "PSspooldir" jobs should always be 300 DPI
> # (to be compatible to DPS-based PostScript viewers such as sdtimage)
> PSspooldir.default-printer-resolution: 300
> 
> # "PS2PDFspooldir-GS" jobs should always be 600 DPI
> PS2PDFspooldir-GS.default-printer-resolution: 600
> 
> # Some resolution defaults to make applications happy which are too lazy
> # to pick an own default in absence of "default-printer-resolution"
> HPLJ4050-PS.default-printer-resolution: 600
> SPSPARC2.default-printer-resolution: 300
> CANONBJ10E-GS.default-printer-resolution: 360
>+CANONC3200-PS.default-printer-resolution: 600
> 
> # EXAMPLES
> #
> # *content-orientation: landscape
> # *copy-count: 3
> # *default-input-tray: main
> # *default-medium: iso-a4
> # *default-printer-resolution: 600
> # *document-format: {PCL 5}
> # *plex: simplex
> # *xp-listfonts-modes: xp-list-internal-printer-fonts
> 
>Index: xc/programs/Xserver/XpConfig/C/print/models/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/XpConfig/C/print/models/Imakefile,v
>retrieving revision 1.2
>diff -u -2 -0 -r1.2 Imakefile
>--- xc/programs/Xserver/XpConfig/C/print/models/Imakefile	23 Apr 2004 18:47:32 -0000	1.2
>+++ xc/programs/Xserver/XpConfig/C/print/models/Imakefile	24 Jun 2004 23:52:27 -0000
>@@ -1,29 +1,30 @@
> XCOMM $Xorg: Imakefile,v 1.1 2002/06/09 05:42:52 gisburn Exp $
> #define IHaveSubdirs
> #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
> 
> #if XpPostScriptDDX
> PS_MODELDIRS = \
> 	PSdefault \
> 	SPSPARC2 \
>         HPLJ4050-PS \
>+	CANONC3200-PS \
> 	PSspooldir
> 
> #if HasGhostScript
> XCOMM Models for printers which need GhostScript for post-processing
> GS_MODELDIRS = \
> 	GSdefault \
> 	CANONBJ10E-GS \
> 	PS2PDFspooldir-GS
> #endif /* HasGhostScript */
> #endif /* XpPostScriptDDX */
> 
> #if XpColorPclDDX
> PCL_COLOR_MODELDIRS = \
> 	HPDJ1600C
> #endif
> 
> #if XpMonoPclDDX
> PCL_MONO_MODELDIRS = \
> 	HPLJ4family
> #endif
>Index: xc/programs/Xserver/XpConfig/C/print/models/CANONC3200-PS/Imakefile
>===================================================================
>RCS file: xc/programs/Xserver/XpConfig/C/print/models/CANONC3200-PS/Imakefile
>diff -N xc/programs/Xserver/XpConfig/C/print/models/CANONC3200-PS/Imakefile
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ xc/programs/Xserver/XpConfig/C/print/models/CANONC3200-PS/Imakefile	24 Jun 2004 23:52:27 -0000
>@@ -0,0 +1,15 @@
>+XCOMM $Xorg: Imakefile,v 1.1 2004/06/24 09:25:02 gisburn Exp $
>+#define IHaveSubdirs
>+#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
>+
>+SUBDIRS = fonts
>+
>+XPMODELNAME = CANONC3200-PS
>+
>+MODELDIR = $(XPRINTDIR)/C/print/models/$(XPMODELNAME)
>+
>+InstallNonExecFile(model-config,$(MODELDIR))
>+
>+MakeSubdirs($(SUBDIRS))
>+DependSubdirs($(SUBDIRS))
>+
>Index: xc/programs/Xserver/XpConfig/C/print/models/CANONC3200-PS/model-config
>===================================================================
>RCS file: xc/programs/Xserver/XpConfig/C/print/models/CANONC3200-PS/model-config
>diff -N xc/programs/Xserver/XpConfig/C/print/models/CANONC3200-PS/model-config
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ xc/programs/Xserver/XpConfig/C/print/models/CANONC3200-PS/model-config	24 Jun 2004 23:52:27 -0000
>@@ -0,0 +1,40 @@
>+# $Xprint.org: CANONC3200-PS model-config,v 1.1 2004/06/24 09:18:04 gisburn Exp $
>+# model-config for the PostScript DDX
>+#
>+# automatically generated by xpppdtomodelconfig V0.1
>+#
>+# DO NOT MODIFY THIS FILE!!
>+#
>+# Attributes supported for this printer model
>+*content-orientations-supported: portrait landscape reverse-portrait reverse-landscape
>+*descriptor: Canon iR C3200
>+*document-formats-supported: {POSTSCRIPT 2}
>+*input-trays-supported:
>+*medium-source-sizes-supported: \
>+{ '' \
>+    {iso-a4 FALSE {4.002 206 4.002 293}}\
>+    {na-letter FALSE {4.002 211.9 4.002 275.4}}\
>+    {na-legal FALSE {4.002 211.9 4.002 351.6}}\
>+    {iso-a3 FALSE {4.002 293 4.002 416}}\
>+    {iso-a5 FALSE {4.002 144 4.002 206}}\
>+    {iso-b4 FALSE {4.002 246 4.002 349}}\
>+    {iso-b5 FALSE {4.002 172 4.002 246}}\
>+    {executive FALSE {4.002 180.1 4.002 262.7}}\
>+    {invoice FALSE {4.002 135.7 4.002 211.9}}\
>+    {monarch-envelope FALSE {4.002 94.3 4.002 186.5}}\
>+    {na-number-10-envelop FALSE {4.002 100.8 4.002 237.3}}\
>+    {iso-c5 FALSE {4.002 158 4.002 225}}\
>+}
>+
>+*plexes-supported: simplex duplex tumble
>+*printer-model: "Canon iR C3200"
>+*printer-resolutions-supported:  600
>+*xp-ddx-identifier: XP-POSTSCRIPT
>+*xp-listfonts-modes-supported: xp-list-internal-printer-fonts xp-list-glyph-fonts
>+*xp-embedded-formats-supported: {POSTSCRIPT 2}
>+*xp-raw-formats-supported: {POSTSCRIPT 2}
>+*xp-setup-proviso: setup-optional
>+# NOTE: xp-psddx-* attributes are EXPERIMENTAL for now.
>+*xp-psddx-download-fonts: pfa pfb ttf ttc otf otc
>+*xp-psddx-download-font-type: pstype1
>+# EOF.
>Index: xc/programs/Xserver/XpConfig/C/print/models/CANONC3200-PS/fonts/Imakefile
>===================================================================
>RCS file: xc/programs/Xserver/XpConfig/C/print/models/CANONC3200-PS/fonts/Imakefile
>diff -N xc/programs/Xserver/XpConfig/C/print/models/CANONC3200-PS/fonts/Imakefile
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ xc/programs/Xserver/XpConfig/C/print/models/CANONC3200-PS/fonts/Imakefile	24 Jun 2004 23:52:27 -0000
>@@ -0,0 +1,45 @@
>+XCOMM $Xorg: Imakefile,v 1.1 2004/06/24 09:25:23 gisburn Exp $
>+
>+XPFONTS = \
>+	AvantGarde-Book.pmf \
>+	AvantGarde-BookOblique.pmf \
>+	AvantGarde-Demi.pmf \
>+	AvantGarde-DemiOblique.pmf \
>+	Courier-Bold.pmf \
>+	Courier-BoldOblique.pmf \
>+	Courier-Oblique.pmf \
>+	Courier.pmf \
>+	Helvetica-Bold.pmf \
>+	Helvetica-BoldOblique.pmf \
>+	Helvetica-Oblique.pmf \
>+	Helvetica.pmf \
>+	LubalinGraph-Book.pmf \
>+	LubalinGraph-BookOblique.pmf \
>+	LubalinGraph-Demi.pmf \
>+	LubalinGraph-DemiOblique.pmf \
>+	NewCenturySchlbk-Bold.pmf \
>+	NewCenturySchlbk-BoldItalic.pmf \
>+	NewCenturySchlbk-Italic.pmf \
>+	NewCenturySchlbk-Roman.pmf \
>+	Souvenir-Demi.pmf \
>+	Souvenir-DemiItalic.pmf \
>+	Souvenir-Light.pmf \
>+	Souvenir-LightItalic.pmf \
>+	Symbol.pmf \
>+	Times-Bold.pmf \
>+	Times-BoldItalic.pmf \
>+	Times-Italic.pmf \
>+	Times-Roman.pmf \
>+	ZapfDingbats.pmf
>+
>+XPMODELNAME = CANONC3200-PS
>+
>+MODELDIR = $(XPRINTDIR)/C/print/models/$(XPMODELNAME)
>+MODELFONTDIR = $(MODELDIR)/fonts
>+
>+# We reuse some of the PSdefault fonts
>+PARENTMODELFONTDIR=../../PSdefault/fonts
>+
>+InstallXpMultiplePMFLinks($(XPFONTS),$(PARENTMODELFONTDIR),$(MODELFONTDIR))
>+InstallXpPMFFontsDir($(MODELFONTDIR))
>+

Actions: View | Splinter Review

Attachments on bug 791: 406 | 416 | 417

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.