[5.3.4] Fixes for XML files
Zdenek Dohnal <[email protected]>
| Newsgroups | gmane.linux.printing.gimp-print.devel |
|---|---|
| Message-ID | <[email protected]> |
Hi, we ran XML linter as a part of rpminspect project[1] on any package containing XML files during CentOS Stream development and found out the linter reports errors (attached file 'errors') for several XML files in Gutenprint 5.3.4. The attached patch applies cleanly on current GIT master of gutenprint and linter in rpminspect doesn't report errors for XML files anymore. Would you mind applying the patch to the project? Thank you in advance! Zdenek [1] https://github.com/rpminspect/rpminspect -- Zdenek Dohnal Software Engineer Red Hat Czech - Brno TPB-C _______________________________________________ Gimp-print-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/gimp-print-devel
gutenprint-xmlfixes.patch
(text/x-patch, 7 KB)
diff --git a/src/xml/escp2/inks/claria_xp.xml b/src/xml/escp2/inks/claria_xp.xml
index 44d38b5..693c2b1 100644
--- a/src/xml/escp2/inks/claria_xp.xml
+++ b/src/xml/escp2/inks/claria_xp.xml
@@ -78,7 +78,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
<InkName translate="text" name="CMYKk" text="Six Color Photo" InkID="OTHER">
<Channels>
<channel name="claria_photo_black" index="0">
- <subchannel color="0" subchannel="0" subchannel="0" name="Black" text="Black" translate="text">
+ <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
<ChannelDensityParam name="BlackDensity"/>
<SubchannelTransitionParam name="LightBlackTrans"/>
</subchannel>
diff --git a/src/xml/escp2/inputslots/standard_roll_feed.xml b/src/xml/escp2/inputslots/standard_roll_feed.xml
index 1422d39..16316c8 100644
--- a/src/xml/escp2/inputslots/standard_roll_feed.xml
+++ b/src/xml/escp2/inputslots/standard_roll_feed.xml
@@ -1,4 +1,4 @@
- <?xml version="1.0"?>
+<?xml version="1.0"?>
<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/src/xml/escp2/media/artisan.xml b/src/xml/escp2/media/artisan.xml
index 6e567ee..362759e 100644
--- a/src/xml/escp2/media/artisan.xml
+++ b/src/xml/escp2/media/artisan.xml
@@ -1125,7 +1125,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
</ink>
</paper>
-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
<parameter type="integer" name="PaperMedia">19</parameter>
<parameter type="integer" name="PrintMethod">0x41</parameter>
diff --git a/src/xml/escp2/media/claria.xml b/src/xml/escp2/media/claria.xml
index ce894f5..5b6be23 100644
--- a/src/xml/escp2/media/claria.xml
+++ b/src/xml/escp2/media/claria.xml
@@ -1933,7 +1933,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
</ink>
</paper>
-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
<parameter type="integer" name="PaperMedia">19</parameter>
<parameter type="integer" name="PrintMethod">0x54</parameter>
diff --git a/src/xml/escp2/media/claria1400.xml b/src/xml/escp2/media/claria1400.xml
index a9b36e5..6a5deb7 100644
--- a/src/xml/escp2/media/claria1400.xml
+++ b/src/xml/escp2/media/claria1400.xml
@@ -1933,7 +1933,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
</ink>
</paper>
-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
<parameter type="integer" name="PaperMedia">19</parameter>
<parameter type="integer" name="PrintMethod">0x54</parameter>
diff --git a/src/xml/escp2/media/claria_xp.xml b/src/xml/escp2/media/claria_xp.xml
index 32759b5..79f43c3 100644
--- a/src/xml/escp2/media/claria_xp.xml
+++ b/src/xml/escp2/media/claria_xp.xml
@@ -2037,7 +2037,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
</ink>
</paper>
-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
<parameter type="integer" name="PaperMedia">19</parameter>
<parameter type="integer" name="PrintMethod">0x54</parameter>
diff --git a/src/xml/escp2/weaves/standard.xml b/src/xml/escp2/weaves/standard.xml
index d9176db..efc89de 100644
--- a/src/xml/escp2/weaves/standard.xml
+++ b/src/xml/escp2/weaves/standard.xml
@@ -1,4 +1,4 @@
- <?xml version="1.0"?>
+<?xml version="1.0"?>
<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/src/xml/printers/dyesub.xml b/src/xml/printers/dyesub.xml
index 1bd62e6..aa7985d 100644
--- a/src/xml/printers/dyesub.xml
+++ b/src/xml/printers/dyesub.xml
@@ -95,7 +95,7 @@
<printer translate="name" name="Citizen CW-02" driver="citizen-cw-02" manufacturer="Citizen" model="6000" />
<printer translate="name" name="Citizen CX" driver="citizen-cx" deviceid="MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX;" manufacturer="Citizen" model="6000" />
<printer translate="name" name="Citizen CX-02" deviceid="MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX-02;" driver="citizen-cx-02" manufacturer="Citizen" model="6003" />
- <printer translate="name" name="Citizen CX-02W" "MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX-02W;" driver="citizen-cx-02w" manufacturer="Citizen" model="6007" />
+ <printer translate="name" name="Citizen CX-02W" deviceid="MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX-02W;" driver="citizen-cx-02w" manufacturer="Citizen" model="6007" />
<printer translate="name" name="Citizen CX-W" driver="citizen-cx-w" manufacturer="Citizen" model="6001" />
<printer translate="name" name="Citizen CY" driver="citizen-cy" manufacturer="Citizen" model="6002" />
<printer translate="name" name="Citizen CY-02" driver="citizen-cy-02" manufacturer="Citizen" model="6002" />
@@ -127,7 +127,7 @@
<printer translate="name" name="Kodak 1400" deviceid="MFG:Eastman Kodak Company;CMD:EK1;MDL: 1400 Printer;CLS:Printer;DES:Kodak 1400 Printer;`" driver="kodak-1400" manufacturer="Kodak" model="4004" />
<printer translate="name" name="Kodak 6800" deviceid="MFG:Eastman Kodak Company;CMD:ESC;MDL:Photo Printer 6800;CLS:PRINTER;DES:KODAK Photo Printer 6800;" driver="kodak-6800" manufacturer="Kodak" model="4001" />
<printer translate="name" name="Kodak 6850" deviceid="MFG:Eastman Kodak Company;CMD:ESC;MDL:Photo Printer 6850;CLS:PRINTER;DES:KODAK Photo Printer 6850;" driver="kodak-6850" manufacturer="Kodak" model="4002" />
- <printer translate="name" name="Kodak 6900" deviceid="MFG:Kodak Alaris Inc.;CMD:SUPCC;MDL:KODAK 6900 Photo Printer;CLS:PRINTER;DES Thermal Dye Photo Printer;"driver="kodak-6900" manufacturer="Kodak" model="4010">EXPERIMENTAL</printer>
+ <printer translate="name" name="Kodak 6900" deviceid="MFG:Kodak Alaris Inc.;CMD:SUPCC;MDL:KODAK 6900 Photo Printer;CLS:PRINTER;DES Thermal Dye Photo Printer;" driver="kodak-6900" manufacturer="Kodak" model="4010">EXPERIMENTAL</printer>
<printer translate="name" name="Kodak 7000" deviceid="MFG:Eastman Kodak Company;CMD:SUPCC;MDL:KODAK 7000 Photo Printer;CLS:PRINTER;DES:Thermal Dye Photo Printer;" driver="kodak-7000" manufacturer="Kodak" model="4008" />
<printer translate="name" name="Kodak 7010" deviceid="MFG:Eastman Kodak Company;CMD:SUPCC;MDL:KODAK 7010 Photo Printer;CLS:PRINTER;DES:Thermal Dye Photo Printer;" driver="kodak-7010" manufacturer="Kodak" model="4008">EXPERIMENTAL</printer>
<printer translate="name" name="Kodak 7015" driver="kodak-7015" manufacturer="Kodak" model="4009">EXPERIMENTAL</printer>
errors
(text/plain, 5.9 KB)
./src/xml/escp2/inputslots/standard_roll_feed.xml:1: parser error : XML declaration allowed only at the start of the document
<?xml version="1.0"?>
^
./src/xml/escp2/inks/claria_xp.xml:81: parser error : Attribute subchannel redefined
lor="0" subchannel="0" subchannel="0" name="Black" text="Black" translate="text"
^
./src/xml/escp2/media/artisan.xml:1128: parser error : attributes construct error
<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"clas
^
./src/xml/escp2/media/artisan.xml:1128: parser error : Couldn't find end of Start Tag paper line 1128
<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"clas
^
./src/xml/escp2/media/artisan.xml:1182: parser error : Opening and ending tag mismatch: escp2Papers line 22 and paper
</paper>
^
./src/xml/escp2/media/artisan.xml:1315: parser error : Opening and ending tag mismatch: gutenprint line 3 and escp2Papers
</escp2Papers>
^
./src/xml/escp2/media/artisan.xml:1316: parser error : Extra content at the end of the document
</gutenprint>
^
./src/xml/escp2/media/claria1400.xml:1936: parser error : attributes construct error
<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"clas
^
./src/xml/escp2/media/claria1400.xml:1936: parser error : Couldn't find end of Start Tag paper line 1936
<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"clas
^
./src/xml/escp2/media/claria1400.xml:2038: parser error : Opening and ending tag mismatch: escp2Papers line 22 and paper
</paper>
^
./src/xml/escp2/media/claria1400.xml:2314: parser error : Opening and ending tag mismatch: gutenprint line 3 and escp2Papers
</escp2Papers>
^
./src/xml/escp2/media/claria1400.xml:2315: parser error : Extra content at the end of the document
</gutenprint>
^
./src/xml/escp2/media/claria_xp.xml:2040: parser error : attributes construct error
<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"clas
^
./src/xml/escp2/media/claria_xp.xml:2040: parser error : Couldn't find end of Start Tag paper line 2040
<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"clas
^
./src/xml/escp2/media/claria_xp.xml:2142: parser error : Opening and ending tag mismatch: escp2Papers line 22 and paper
</paper>
^
./src/xml/escp2/media/claria_xp.xml:2419: parser error : Opening and ending tag mismatch: gutenprint line 3 and escp2Papers
</escp2Papers>
^
./src/xml/escp2/media/claria_xp.xml:2420: parser error : Extra content at the end of the document
</gutenprint>
^
./src/xml/escp2/media/claria.xml:1936: parser error : attributes construct error
<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"clas
^
./src/xml/escp2/media/claria.xml:1936: parser error : Couldn't find end of Start Tag paper line 1936
<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"clas
^
./src/xml/escp2/media/claria.xml:2038: parser error : Opening and ending tag mismatch: escp2Papers line 22 and paper
</paper>
^
./src/xml/escp2/media/claria.xml:2315: parser error : Opening and ending tag mismatch: gutenprint line 3 and escp2Papers
</escp2Papers>
^
./src/xml/escp2/media/claria.xml:2316: parser error : Extra content at the end of the document
</gutenprint>
^
./src/xml/escp2/weaves/standard.xml:1: parser error : XML declaration allowed only at the start of the document
<?xml version="1.0"?>
^
./src/xml/printers/dyesub.xml:98: parser error : error parsing attribute name
<printer translate="name" name="Citizen CX-02W" "MANUFACTURER:CITIZEN SYST
^
./src/xml/printers/dyesub.xml:98: parser error : attributes construct error
<printer translate="name" name="Citizen CX-02W" "MANUFACTURER:CITIZEN SYST
^
./src/xml/printers/dyesub.xml:98: parser error : Couldn't find end of Start Tag printer line 98
<printer translate="name" name="Citizen CX-02W" "MANUFACTURER:CITIZEN SYST
^
./src/xml/printers/dyesub.xml:137: parser error : attributes construct error
D:SUPCC;MDL:KODAK 6900 Photo Printer;CLS:PRINTER;DES Thermal Dye Photo Printer;"
^
./src/xml/printers/dyesub.xml:137: parser error : Couldn't find end of Start Tag printer line 137
D:SUPCC;MDL:KODAK 6900 Photo Printer;CLS:PRINTER;DES Thermal Dye Photo Printer;"
^
./src/xml/printers/dyesub.xml:137: parser error : Opening and ending tag mismatch: family line 46 and printer
ter;"driver="kodak-6900" manufacturer="Kodak" model="4010">EXPERIMENTAL</printer
^
./src/xml/printers/dyesub.xml:211: parser error : Opening and ending tag mismatch: printdef line 45 and family
</family>
^
./src/xml/printers/dyesub.xml:212: parser error : Opening and ending tag mismatch: gutenprint line 26 and printdef
</printdef>
^
./src/xml/printers/dyesub.xml:213: parser error : Extra content at the end of the document
</gutenprint>
^