1 files changed, 2 insertions, 133 deletions
diff --git a/src/xml/escp2/model/model_42.xml b/src/xml/escp2/model/model_42.xml
index 018e8fd..8808790 100644
--- a/src/xml/escp2/model/model_42.xml
+++ b/src/xml/escp2/model/model_42.xml
@@ -17,140 +17,9 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see https://www.gnu.org/licenses/.
 </copyright>
-<escp2Model id="42">
- <media src="escp2/media/x80.xml"/>
- <inputSlots src="escp2/inputslots/default.xml"/>
- <qualityPresets src="escp2/qualitypresets/standard.xml"/>
- <inkGroup src="escp2/inks/x80.xml"/>
- <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
- <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
- <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
- <commandSet>2000</commandSet>
- <borderless>No</borderless>
- <supportsVariableDropsizes/>
- <hasFastGraymode/>
- <sendZeroAdvance/>
- <supportsInkChange/>
- <supportsD4Mode/>
- <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
- <headConfiguration type="default">
-  <Nozzles>15</Nozzles>
-  <MinNozzles>15</MinNozzles>
-  <FirstNozzle>0</FirstNozzle>
-  <NozzleSeparation>3</NozzleSeparation>
- </headConfiguration>
- <headConfiguration type="black">
-  <Nozzles>48</Nozzles>
-  <MinNozzles>48</MinNozzles>
-  <FirstNozzle>0</FirstNozzle>
-  <NozzleSeparation>3</NozzleSeparation>
- </headConfiguration>
- <headConfiguration type="fast">
-  <Nozzles>48</Nozzles>
-  <MinNozzles>48</MinNozzles>
-  <FirstNozzle>0</FirstNozzle>
-  <NozzleSeparation>3</NozzleSeparation>
- </headConfiguration>
- <physicalChannels>4</physicalChannels>
- <baseSeparation>360</baseSeparation>
- <resolutionScale>14400</resolutionScale>
- <minimumResolution>90 90</minimumResolution>
- <maximumResolution>720 720</maximumResolution>
- <separationRows>1</separationRows>
- <initialVerticalOffset>-99</initialVerticalOffset>
- <minHorizontalAlignment>1</minHorizontalAlignment>
- <baseHorizontalAlignment>28800</baseHorizontalAlignment>
- <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
- <minimumMediaSize>144 144</minimumMediaSize>
- <maximumMediaSize>684 86400</maximumMediaSize>
- <maximumImageableArea>612 86400</maximumImageableArea>
- <margins interleave="soft" media="sheet">9 9 0 9</margins>
+<escp2Model id="42" base="escp2/model/base/c2x.xml">
  <margins interleave="printer" media="sheet">9 9 9 9</margins>
- <margins interleave="soft" media="roll">9 9 0 0</margins>
- <margins interleave="printer" media="roll">9 9 0 0</margins>
- <AlignmentChoices>3 15 0 0</AlignmentChoices>
- <ChannelNames>
-  <ChannelName translate="text" name="Black" text="Black"/>
-  <ChannelName translate="text" name="Cyan" text="Cyan"/>
-  <ChannelName translate="text" name="Magenta" text="Magenta"/>
-  <ChannelName translate="text" name="Yellow" text="Yellow"/>
- </ChannelNames>
- <resolutions>
-  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
-   <physicalResolution>360 120</physicalResolution>
-   <parameter type="float" name="escp2_density">2.800000</parameter>
-   <parameter type="integer" name="escp2_ink_type">19</parameter>
-   <parameter type="integer" name="escp2_base_res">360</parameter>
-   <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.325000</parameter>
-   <parameter type="float" name="DropSize2">0.500000</parameter>
-   <parameter type="float" name="DropSize3">1.000000</parameter>
-  </resolution>
-  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
-   <physicalResolution>360 240</physicalResolution>
-   <parameter type="float" name="escp2_density">2.800000</parameter>
-   <parameter type="integer" name="escp2_ink_type">19</parameter>
-   <parameter type="integer" name="escp2_base_res">360</parameter>
-   <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.325000</parameter>
-   <parameter type="float" name="DropSize2">0.500000</parameter>
-   <parameter type="float" name="DropSize3">1.000000</parameter>
-  </resolution>
-  <resolution translate="text" name="360sw" text="360 DPI">
-   <physicalResolution>360 360</physicalResolution>
-   <parameter type="float" name="escp2_density">1.400000</parameter>
-   <parameter type="integer" name="escp2_ink_type">19</parameter>
-   <parameter type="integer" name="escp2_base_res">360</parameter>
-   <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.325000</parameter>
-   <parameter type="float" name="DropSize2">0.500000</parameter>
-   <parameter type="float" name="DropSize3">1.000000</parameter>
-  </resolution>
-  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
-   <physicalResolution>720 360</physicalResolution>
-   <parameter type="float" name="escp2_density">0.700000</parameter>
-   <parameter type="integer" name="escp2_ink_type">19</parameter>
-   <parameter type="integer" name="escp2_base_res">360</parameter>
-   <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.325000</parameter>
-   <parameter type="float" name="DropSize2">0.500000</parameter>
-   <parameter type="float" name="DropSize3">1.000000</parameter>
-  </resolution>
-  <resolution translate="text" name="720sw" text="720 DPI">
-   <physicalResolution>720 720</physicalResolution>
-   <parameter type="float" name="escp2_density">0.710000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
-   <parameter type="integer" name="escp2_base_res">360</parameter>
-   <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.325000</parameter>
-   <parameter type="float" name="DropSize2">0.500000</parameter>
-   <parameter type="float" name="DropSize3">1.000000</parameter>
-  </resolution>
-  <resolution translate="text" name="720hq" text="720 DPI High Quality">
-   <physicalResolution>720 720</physicalResolution>
-   <verticalPasses>2</verticalPasses>
-   <parameter type="float" name="escp2_density">0.710000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
-   <parameter type="integer" name="escp2_base_res">360</parameter>
-   <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.325000</parameter>
-   <parameter type="float" name="DropSize2">0.500000</parameter>
-   <parameter type="float" name="DropSize3">1.000000</parameter>
-  </resolution>
-  <resolution translate="text" name="720hq2" text="720 DPI Highest Quality">
-   <physicalResolution>720 720</physicalResolution>
-   <verticalPasses>4</verticalPasses>
-   <parameter type="float" name="escp2_density">0.710000</parameter>
-   <parameter type="integer" name="escp2_ink_type">16</parameter>
-   <parameter type="integer" name="escp2_base_res">360</parameter>
-   <parameter type="integer" name="escp2_bits">2</parameter>
-   <parameter type="float" name="DropSize1">0.325000</parameter>
-   <parameter type="float" name="DropSize2">0.500000</parameter>
-   <parameter type="float" name="DropSize3">1.000000</parameter>
-  </resolution>
- </resolutions>
 </escp2Model>
 </gutenprint>