5 files changed, 45 insertions, 51 deletions
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias b/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias
index 1499aa845..e69de29bb 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias
+++ b/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias
@@ -1 +0,0 @@
-! So the file isn't empty
diff --git a/XpConfig/C/print/models/HPDJ1600C/model-config b/XpConfig/C/print/models/HPDJ1600C/model-config
index f3bd8af3a..5d45d4495 100644
--- a/XpConfig/C/print/models/HPDJ1600C/model-config
+++ b/XpConfig/C/print/models/HPDJ1600C/model-config
@@ -1,28 +1,16 @@
-# $Xorg: model-config,v 1.3 2000/08/17 19:48:04 cpqbld Exp $
+# $Xprint.org: HPDJ1600C model-config,v 1.4 2002/11/07 19:48:04 gisburn Exp $
 # This is the configuration file for the HP DeskJet 1600C printer.
 #
 # The CDEnext SI supports two 1600C drivers XP-PCL-MONO and
 # XP-PCL-COLOR, which work with this configuration file.
 #
-# Attribute IDs must be qualified using either the printer-model
-# identifier or an asterisk ('*').  For example, if "HPDJ1600C" is the
-# printer-model, then to initialize the 'plexes-supported' attribute
-# to 'simplex', use: "HPDJ1600C.plexes-supported: simplex". For the
-# asterisk, use: "*.plexes-supported: simplex". If the same attribute
-# is specified using each method, the printer-model qualified entry
-# takes precedence.
-
-HPDJ1600C.printer-model: "Hewlett-Packard DeskJet 1600C"
-HPDJ1600C.printer-resolutions-supported: 300
-HPDJ1600C.content-orientations-supported: portrait landscape
-HPDJ1600C.document-formats-supported: {PCL 5} {PostScript 2}
-HPDJ1600C.plexes-supported: simplex duplex
-HPDJ1600C.xp-ddx-identifier: XP-PCL-COLOR
-HPDJ1600C.xp-embedded-formats-supported: { PCL 5 } { PostScript 2 }
-HPDJ1600C.xp-setup-proviso: setup-optional
 
+*content-orientations-supported: portrait landscape
+*descriptor: Hewlett-Packard DeskJet 1600C
+*document-formats-supported: {PCL 5} {PostScript 2}
+*input-trays-supported:
 # 1/4" unprintable margins
-HPDJ1600C.medium-source-sizes-supported:\
+*medium-source-sizes-supported:\
 { '' \
     {na-letter			FALSE {6.35 209.55 6.35 273.05}}\
     {executive			FALSE {6.35 177.75 6.35 260.35}}\
@@ -41,4 +29,12 @@ HPDJ1600C.medium-source-sizes-supported:\
     {hp-japanese-postcard	FALSE {6     94	   6	142   }}\
     {hp-japanese-doublepostcard FALSE {6    142	   6	194   }}\
 }
-
+*plexes-supported: simplex duplex
+*printer-model: "Hewlett-Packard DeskJet 1600C"
+*printer-resolutions-supported: 300
+*xp-ddx-identifier: XP-PCL-COLOR
+*xp-listfonts-modes-supported: xp-list-internal-printer-fonts xp-list-glyph-fonts
+*xp-embedded-formats-supported: { PCL 5 } { PostScript 2 }
+*xp-raw-formats-supported: { PCL 5 }
+*xp-setup-proviso: setup-optional
+# EOF.
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias b/XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias
index 1499aa845..e69de29bb 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias
+++ b/XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias
@@ -1 +0,0 @@
-! So the file isn't empty
diff --git a/XpConfig/C/print/models/HPLJ4family/model-config b/XpConfig/C/print/models/HPLJ4family/model-config
index f69e25718..1ac997ebe 100644
--- a/XpConfig/C/print/models/HPLJ4family/model-config
+++ b/XpConfig/C/print/models/HPLJ4family/model-config
@@ -1,28 +1,15 @@
-# $Xorg: model-config,v 1.3 2000/08/17 19:48:04 cpqbld Exp $
+# $Xprint.org: HPLJ4family model-config,v 1.4 2002/11/07 19:48:04 gisburn Exp $
 # This is the configuration file for the HP LaserJet 4 Printers.
 #
 # Though not a deliverable for the CDEnext SI, the XP-PCL-MONO
 # driver should be able to support the LaserJet 4 printers.
 #
-# Attribute IDs must be qualified using either the printer-model
-# identifier or an asterisk ('*').  For example, if "HPLJ4family" is the
-# printer-model, then to initialize the 'plexes-supported' attribute
-# to 'simplex', use: "HPLJ4family.plexes-supported: simplex". For the
-# asterisk, use: "*.plexes-supported: simplex". If the same attribute
-# is specified using each method, the printer-model qualified entry
-# takes precedence.
-
-HPLJ4family.printer-model: "Hewlett-Packard LaserJet 4 Series"
-HPLJ4family.printer-resolutions-supported: 300 600
-HPLJ4family.content-orientations-supported: portrait landscape
-HPLJ4family.document-formats-supported: {PCL 5} {PostScript 2}
-HPLJ4family.plexes-supported: simplex duplex
-HPLJ4family.xp-ddx-identifier: XP-PCL-MONO
-HPLJ4family.xp-embedded-formats-supported: { PCL 5 } { PostScript 2 }
-HPLJ4family.xp-setup-proviso: setup-optional
-
+*content-orientations-supported: portrait landscape
+*descriptor: Hewlett-Packard LaserJet 4 Series
+*document-formats-supported: {PCL 5} {PostScript 2}
+*input-trays-supported:
 # 1/4" unprintable margins
-HPLJ4family.medium-source-sizes-supported:\
+*medium-source-sizes-supported:\
 { '' \
     {na-letter			FALSE {6.35 209.55 6.35 273.05}}\
     {executive			FALSE {6.35 177.75 6.35 260.35}}\
@@ -41,4 +28,12 @@ HPLJ4family.medium-source-sizes-supported:\
     {hp-japanese-postcard	FALSE {6     94	   6	142   }}\
     {hp-japanese-doublepostcard FALSE {6    142	   6	194   }}\
 }
-
+*plexes-supported: simplex duplex
+*printer-model: "Hewlett-Packard LaserJet 4 Series"
+*printer-resolutions-supported: 300 600
+*xp-ddx-identifier: XP-PCL-MONO
+*xp-listfonts-modes-supported: xp-list-internal-printer-fonts xp-list-glyph-fonts
+*xp-embedded-formats-supported: { PCL 5 } { PostScript 2 }
+*xp-raw-formats-supported: { PCL 5 }
+*xp-setup-proviso: setup-optional
+# EOF.
diff --git a/XpConfig/C/print/models/SPSPARC2/model-config b/XpConfig/C/print/models/SPSPARC2/model-config
index 959e9ff7b..9f29b9992 100644
--- a/XpConfig/C/print/models/SPSPARC2/model-config
+++ b/XpConfig/C/print/models/SPSPARC2/model-config
@@ -1,13 +1,18 @@
-# $Xorg: model-config,v 1.3 2000/08/17 19:48:04 cpqbld Exp $
-SPSPARC2.printer-model: "SunPics SPARCprinter II"
-SPSPARC2.printer-resolutions-supported: 300
-SPSPARC2.content-orientations-supported: portrait landscape
-SPSPARC2.document-formats-supported: {PostScript 2}
-SPSPARC2.plexes-supported: simplex
-SPSPARC2.xp-ddx-identifier: XP-POSTSCRIPT
-SPSPARC2.xp-embedded-formats-supported: { PostScript 2 }
-*xp-setup-proviso: setup-optional
-SPSPARC2.medium-source-sizes-supported: \
+# $Xprint.org: SPSPARC2 model-config,v 1.4 2002/11/07 19:48:04 gisburn Exp $
+*content-orientations-supported: portrait landscape
+*descriptor: SunPics SPARCprinter II
+*document-formats-supported: {POSTSCRIPT 2}
+*input-trays-supported:
+*medium-source-sizes-supported: \
     { '' {na-letter FALSE {6.35 209.55 6.35 273.05}} \
 	 {na-legal  FALSE {6.35 209.55 6.35 349.25}} \
 	 {iso-a4    FALSE {6.35 203.65 6.35 290.65}}}
+*plexes-supported: simplex
+*printer-model: "SunPics SPARCprinter II"
+*printer-resolutions-supported: 300
+*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
+# EOF.