From f38a9927a3d27709173564848bda4a4a61abeadb Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Fri, 27 May 2016 10:50:00 +0200
Subject: [PATCH] Bug 16608 - Missing entity nbsp in some XML files

The special character "non breaking space" &nbsp; is not contained in XML syntax by default.
So we add it in the file header :
<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>

Even if the source code files do no contain this character, it can be that translated files contain it.
French for example "Titre&nbsp;:".

This entity is missing in all files in koha-tmpl/intranet-tmpl/prog/en/data/ and in some files of koha-tmpl/intranet-tmpl/prog/en/xslt.

Test plan :
  - generate French templates:
    cd misc/translator
    ./translate install fr-FR
    cd ../..
  - run test:
    prove -v t/00-valid-xml.t
    you get failing error message
  - apply this patch
  - translate again
  - run test again: it passes

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works as described following test plan
Tes pass, no errors.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml      | 3 +++
 koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml      | 3 +++
 koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd       | 3 +++
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl       | 3 +++
 .../intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl  | 3 +++
 koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl      | 3 +++
 .../intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl | 3 +++
 7 files changed, 21 insertions(+)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml
index cfd16e8f82..ae0a641aa0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml
+++ b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+
 <Tagfield tag="006" xmlns="http://koha-community.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="./marc21_field_CF.xsd">
   <Material id="BKS"><name>Books</name><description></description>
     <Position pos="00"><name>Form of material</name><description></description>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml
index 32055a717a..eb62dd503f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml
+++ b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+
 <Tagfield tag="008" xmlns="http://koha-community.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="./marc21_field_CF.xsd">
   <Material id="BKS"><name>Books</name><description></description>
     <Position pos="00-05"><name>Date entered on file</name><description>Computer-generated, six-character numeric string that indicates the date the MARC record was created. Recorded in the pattern yymmdd.</description></Position>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd
index 3398ba8d40..be91f27bb8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd
+++ b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
+
+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+
 <xs:schema xmlns="http://koha-community.org" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://koha-community.org" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
   <xs:annotation>
     <xs:documentation>Control field plugin type of materials schema</xs:documentation>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl
index 15aa17a880..8af36c9d2a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+
 <xsl:stylesheet version="1.0" xmlns:mads="http://www.loc.gov/mads/v2"
     xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:marc="http://www.loc.gov/MARC21/slim"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
index d692ef6e4f..bf4af4b931 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
+
+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
   xmlns:items="http://www.koha-community.org/items"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
index 293f4cf887..7d1400a2d0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
@@ -1,4 +1,7 @@
 <?xml version='1.0'?>
+
+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	<xsl:template name="datafield">
 		<xsl:param name="tag"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
index fcc45103e4..3e30890cd5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
-- 
2.39.2