Output UTF-8 instead of legacy encodings by default.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20940 b3059339-0415-0410-9bf9-f77b7e298cf2

9 files changed, 7 insertions, 68 deletions

diff --git a/DOCS/xml/html-common.xsl b/DOCS/xml/html-common.xsl
index cfe3841ece..dc3cb14cea 100644
--- a/DOCS/xml/html-common.xsl
+++ b/DOCS/xml/html-common.xsl
@@ -8,6 +8,9 @@
      Set parameters
      ************** -->
 
+  <xsl:param name="chunker.output.encoding" select="'utf-8'"/>
+  <xsl:output encoding="utf-8"/>
+
   <xsl:param name="toc.section.depth" select="'4'"/>
 
   <xsl:param name="html.stylesheet" select="'default.css'"/>
diff --git a/DOCS/xml/pl/Makefile b/DOCS/xml/pl/Makefile
index 8457da2abd..e36fbfffa5 100644
--- a/DOCS/xml/pl/Makefile
+++ b/DOCS/xml/pl/Makefile
@@ -5,7 +5,7 @@
 USE_SYMLINKS = no
 
 # Dependency information.
-$(HTMLDIR)/index.html: $(wildcard *.xml) html-common.xsl
-$(HTMLFILE): $(wildcard *.xml) html-common.xsl
+$(HTMLDIR)/index.html: $(wildcard *.xml)
+$(HTMLFILE): $(wildcard *.xml)
 
 include ../Makefile.inc
diff --git a/DOCS/xml/pl/html-chunk.xsl b/DOCS/xml/pl/html-chunk.xsl
deleted file mode 100644
index 8e82e1b8dd..0000000000
--- a/DOCS/xml/pl/html-chunk.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <xsl:import href="../html-chunk.xsl"/>
-  <xsl:include href="html-common.xsl"/>
-
-</xsl:stylesheet>
diff --git a/DOCS/xml/pl/html-common.xsl b/DOCS/xml/pl/html-common.xsl
deleted file mode 100644
index e7973224c8..0000000000
--- a/DOCS/xml/pl/html-common.xsl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <xsl:param name="chunker.output.encoding" select="'iso-8859-2'"/>
-  <xsl:output encoding="iso-8859-2"/>
-  <xsl:param name="local.l10n.xml" select="document('')"/>
-  <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
-    <l:l10n language="pl">
-	  <l:gentext key="NOTE" text="Informacja"/>
-	  <l:gentext key="Note" text="Informacja"/>
-	  <l:gentext key="note" text="Informacja"/>
-	</l:l10n>
-  </l:i18n>
-
-</xsl:stylesheet>
diff --git a/DOCS/xml/pl/html-single.xsl b/DOCS/xml/pl/html-single.xsl
deleted file mode 100644
index 03cccf55f7..0000000000
--- a/DOCS/xml/pl/html-single.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <xsl:import href="../html-single.xsl"/>
-  <xsl:include href="html-common.xsl"/>
-
-</xsl:stylesheet>
diff --git a/DOCS/xml/ru/Makefile b/DOCS/xml/ru/Makefile
index 0df3544fb0..e18885f6df 100644
--- a/DOCS/xml/ru/Makefile
+++ b/DOCS/xml/ru/Makefile
@@ -5,7 +5,7 @@
 USE_SYMLINKS = yes
 
 # Dependency information.
-$(HTMLDIR)/index.html: $(wildcard *.xml) html-common.xsl
-$(HTMLFILE): $(wildcard *.xml) html-common.xsl
+$(HTMLDIR)/index.html: $(wildcard *.xml)
+$(HTMLFILE): $(wildcard *.xml)
 
 include ../Makefile.inc
diff --git a/DOCS/xml/ru/html-chunk.xsl b/DOCS/xml/ru/html-chunk.xsl
deleted file mode 100644
index 8e82e1b8dd..0000000000
--- a/DOCS/xml/ru/html-chunk.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <xsl:import href="../html-chunk.xsl"/>
-  <xsl:include href="html-common.xsl"/>
-
-</xsl:stylesheet>
diff --git a/DOCS/xml/ru/html-common.xsl b/DOCS/xml/ru/html-common.xsl
deleted file mode 100644
index 1cf1887e5d..0000000000
--- a/DOCS/xml/ru/html-common.xsl
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <xsl:param name="chunker.output.encoding" select="'KOI8-R'"/>
-  <xsl:output encoding="KOI8-R"/>
-
-  <!-- This forces Saxon to output chars from KOI8-R as is and not as something like &#444;
-    WARNING: This will probably work with HTML output, and won't with output XML.
-    Anyway, this file will generate only HTML :)
-    -->
-  <xsl:param name="saxon.character.representation" select="'native;decimal'"/>
-
-</xsl:stylesheet>
diff --git a/DOCS/xml/ru/html-single.xsl b/DOCS/xml/ru/html-single.xsl
deleted file mode 100644
index 03cccf55f7..0000000000
--- a/DOCS/xml/ru/html-single.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <xsl:import href="../html-single.xsl"/>
-  <xsl:include href="html-common.xsl"/>
-
-</xsl:stylesheet>