From 1bb6f88d298d1019c0c635dbff197a6a57d16c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 26 Jul 2014 01:15:37 +0200 Subject: Add docbook catalogs in xml format Switch docbook catalogs to xml This resolves Bug 2077 --- kdoctools/customization/af/catalog.xml | 41 +++++++++ kdoctools/customization/bg/catalog.xml | 43 ++++++++++ kdoctools/customization/ca/catalog.xml | 43 ++++++++++ kdoctools/customization/catalog.xml | 129 ++++++++++++++++++++++++++++ kdoctools/customization/cs/catalog.xml | 41 +++++++++ kdoctools/customization/da/catalog.xml | 43 ++++++++++ kdoctools/customization/de/catalog.xml | 43 ++++++++++ kdoctools/customization/el/catalog.xml | 47 ++++++++++ kdoctools/customization/en-GB/catalog.xml | 43 ++++++++++ kdoctools/customization/en/catalog.xml | 43 ++++++++++ kdoctools/customization/es/catalog.xml | 41 +++++++++ kdoctools/customization/et/catalog.xml | 41 +++++++++ kdoctools/customization/fi/catalog.xml | 47 ++++++++++ kdoctools/customization/fo/catalog.xml | 43 ++++++++++ kdoctools/customization/fr/catalog.xml | 41 +++++++++ kdoctools/customization/he/catalog.xml | 42 +++++++++ kdoctools/customization/hu/catalog.xml | 41 +++++++++ kdoctools/customization/id/catalog.xml | 42 +++++++++ kdoctools/customization/it/catalog.xml | 43 ++++++++++ kdoctools/customization/ja/catalog.xml | 41 +++++++++ kdoctools/customization/ko/catalog.xml | 47 ++++++++++ kdoctools/customization/lt/catalog.xml | 43 ++++++++++ kdoctools/customization/nl/catalog.xml | 41 +++++++++ kdoctools/customization/nn/catalog.xml | 41 +++++++++ kdoctools/customization/no/catalog.xml | 41 +++++++++ kdoctools/customization/pl/catalog.xml | 41 +++++++++ kdoctools/customization/pt-BR/catalog.xml | 43 ++++++++++ kdoctools/customization/pt/catalog.xml | 41 +++++++++ kdoctools/customization/ro/catalog.xml | 47 ++++++++++ kdoctools/customization/ru/catalog.xml | 41 +++++++++ kdoctools/customization/sk/catalog.xml | 41 +++++++++ kdoctools/customization/sl/catalog.xml | 41 +++++++++ kdoctools/customization/sr/catalog.xml | 41 +++++++++ kdoctools/customization/sv/catalog.xml | 43 ++++++++++ kdoctools/customization/tr/catalog.xml | 41 +++++++++ kdoctools/customization/uk/catalog.xml | 42 +++++++++ kdoctools/customization/wa/catalog.xml | 43 ++++++++++ kdoctools/customization/xh/catalog.xml | 43 ++++++++++ kdoctools/customization/xx/catalog.xml | 43 ++++++++++ kdoctools/customization/zh-CN/catalog.xml | 43 ++++++++++ kdoctools/customization/zh-TW/catalog.xml | 47 ++++++++++ kdoctools/docbook/xml-dtd-4.1.2/catalog.xml | 91 ++++++++++++++++++++ kdoctools/meinproc.cpp | 8 +- kdoctools/xslt.cpp | 6 +- 44 files changed, 1930 insertions(+), 7 deletions(-) create mode 100644 kdoctools/customization/af/catalog.xml create mode 100644 kdoctools/customization/bg/catalog.xml create mode 100644 kdoctools/customization/ca/catalog.xml create mode 100644 kdoctools/customization/catalog.xml create mode 100644 kdoctools/customization/cs/catalog.xml create mode 100644 kdoctools/customization/da/catalog.xml create mode 100644 kdoctools/customization/de/catalog.xml create mode 100644 kdoctools/customization/el/catalog.xml create mode 100644 kdoctools/customization/en-GB/catalog.xml create mode 100644 kdoctools/customization/en/catalog.xml create mode 100644 kdoctools/customization/es/catalog.xml create mode 100644 kdoctools/customization/et/catalog.xml create mode 100644 kdoctools/customization/fi/catalog.xml create mode 100644 kdoctools/customization/fo/catalog.xml create mode 100644 kdoctools/customization/fr/catalog.xml create mode 100644 kdoctools/customization/he/catalog.xml create mode 100644 kdoctools/customization/hu/catalog.xml create mode 100644 kdoctools/customization/id/catalog.xml create mode 100644 kdoctools/customization/it/catalog.xml create mode 100644 kdoctools/customization/ja/catalog.xml create mode 100644 kdoctools/customization/ko/catalog.xml create mode 100644 kdoctools/customization/lt/catalog.xml create mode 100644 kdoctools/customization/nl/catalog.xml create mode 100644 kdoctools/customization/nn/catalog.xml create mode 100644 kdoctools/customization/no/catalog.xml create mode 100644 kdoctools/customization/pl/catalog.xml create mode 100644 kdoctools/customization/pt-BR/catalog.xml create mode 100644 kdoctools/customization/pt/catalog.xml create mode 100644 kdoctools/customization/ro/catalog.xml create mode 100644 kdoctools/customization/ru/catalog.xml create mode 100644 kdoctools/customization/sk/catalog.xml create mode 100644 kdoctools/customization/sl/catalog.xml create mode 100644 kdoctools/customization/sr/catalog.xml create mode 100644 kdoctools/customization/sv/catalog.xml create mode 100644 kdoctools/customization/tr/catalog.xml create mode 100644 kdoctools/customization/uk/catalog.xml create mode 100644 kdoctools/customization/wa/catalog.xml create mode 100644 kdoctools/customization/xh/catalog.xml create mode 100644 kdoctools/customization/xx/catalog.xml create mode 100644 kdoctools/customization/zh-CN/catalog.xml create mode 100644 kdoctools/customization/zh-TW/catalog.xml create mode 100644 kdoctools/docbook/xml-dtd-4.1.2/catalog.xml (limited to 'kdoctools') diff --git a/kdoctools/customization/af/catalog.xml b/kdoctools/customization/af/catalog.xml new file mode 100644 index 000000000..b81e28055 --- /dev/null +++ b/kdoctools/customization/af/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/bg/catalog.xml b/kdoctools/customization/bg/catalog.xml new file mode 100644 index 000000000..23df55b3b --- /dev/null +++ b/kdoctools/customization/bg/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/ca/catalog.xml b/kdoctools/customization/ca/catalog.xml new file mode 100644 index 000000000..cd864172e --- /dev/null +++ b/kdoctools/customization/ca/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/catalog.xml b/kdoctools/customization/catalog.xml new file mode 100644 index 000000000..88b44d27d --- /dev/null +++ b/kdoctools/customization/catalog.xml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/cs/catalog.xml b/kdoctools/customization/cs/catalog.xml new file mode 100644 index 000000000..17522aada --- /dev/null +++ b/kdoctools/customization/cs/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/da/catalog.xml b/kdoctools/customization/da/catalog.xml new file mode 100644 index 000000000..35c26425b --- /dev/null +++ b/kdoctools/customization/da/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/de/catalog.xml b/kdoctools/customization/de/catalog.xml new file mode 100644 index 000000000..8891d7ad2 --- /dev/null +++ b/kdoctools/customization/de/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/el/catalog.xml b/kdoctools/customization/el/catalog.xml new file mode 100644 index 000000000..f7cc06c26 --- /dev/null +++ b/kdoctools/customization/el/catalog.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/en-GB/catalog.xml b/kdoctools/customization/en-GB/catalog.xml new file mode 100644 index 000000000..6f280ea56 --- /dev/null +++ b/kdoctools/customization/en-GB/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/en/catalog.xml b/kdoctools/customization/en/catalog.xml new file mode 100644 index 000000000..835524d28 --- /dev/null +++ b/kdoctools/customization/en/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/es/catalog.xml b/kdoctools/customization/es/catalog.xml new file mode 100644 index 000000000..db4c8b233 --- /dev/null +++ b/kdoctools/customization/es/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/et/catalog.xml b/kdoctools/customization/et/catalog.xml new file mode 100644 index 000000000..55fae7a01 --- /dev/null +++ b/kdoctools/customization/et/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/fi/catalog.xml b/kdoctools/customization/fi/catalog.xml new file mode 100644 index 000000000..bcbae6faa --- /dev/null +++ b/kdoctools/customization/fi/catalog.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/fo/catalog.xml b/kdoctools/customization/fo/catalog.xml new file mode 100644 index 000000000..f9bd94885 --- /dev/null +++ b/kdoctools/customization/fo/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/fr/catalog.xml b/kdoctools/customization/fr/catalog.xml new file mode 100644 index 000000000..f462492af --- /dev/null +++ b/kdoctools/customization/fr/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/he/catalog.xml b/kdoctools/customization/he/catalog.xml new file mode 100644 index 000000000..0ad4f82d8 --- /dev/null +++ b/kdoctools/customization/he/catalog.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/hu/catalog.xml b/kdoctools/customization/hu/catalog.xml new file mode 100644 index 000000000..b62fba7b9 --- /dev/null +++ b/kdoctools/customization/hu/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/id/catalog.xml b/kdoctools/customization/id/catalog.xml new file mode 100644 index 000000000..ef1a702b0 --- /dev/null +++ b/kdoctools/customization/id/catalog.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/it/catalog.xml b/kdoctools/customization/it/catalog.xml new file mode 100644 index 000000000..bfc79f828 --- /dev/null +++ b/kdoctools/customization/it/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/ja/catalog.xml b/kdoctools/customization/ja/catalog.xml new file mode 100644 index 000000000..0a9ae248f --- /dev/null +++ b/kdoctools/customization/ja/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/ko/catalog.xml b/kdoctools/customization/ko/catalog.xml new file mode 100644 index 000000000..f07eda306 --- /dev/null +++ b/kdoctools/customization/ko/catalog.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/lt/catalog.xml b/kdoctools/customization/lt/catalog.xml new file mode 100644 index 000000000..c9f6b89d3 --- /dev/null +++ b/kdoctools/customization/lt/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/nl/catalog.xml b/kdoctools/customization/nl/catalog.xml new file mode 100644 index 000000000..bb706c006 --- /dev/null +++ b/kdoctools/customization/nl/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/nn/catalog.xml b/kdoctools/customization/nn/catalog.xml new file mode 100644 index 000000000..74f7b5c0d --- /dev/null +++ b/kdoctools/customization/nn/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/no/catalog.xml b/kdoctools/customization/no/catalog.xml new file mode 100644 index 000000000..7170d7f7b --- /dev/null +++ b/kdoctools/customization/no/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/pl/catalog.xml b/kdoctools/customization/pl/catalog.xml new file mode 100644 index 000000000..6359a2cf4 --- /dev/null +++ b/kdoctools/customization/pl/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/pt-BR/catalog.xml b/kdoctools/customization/pt-BR/catalog.xml new file mode 100644 index 000000000..b1492ad94 --- /dev/null +++ b/kdoctools/customization/pt-BR/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/pt/catalog.xml b/kdoctools/customization/pt/catalog.xml new file mode 100644 index 000000000..04f52dead --- /dev/null +++ b/kdoctools/customization/pt/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/ro/catalog.xml b/kdoctools/customization/ro/catalog.xml new file mode 100644 index 000000000..d2487959c --- /dev/null +++ b/kdoctools/customization/ro/catalog.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/ru/catalog.xml b/kdoctools/customization/ru/catalog.xml new file mode 100644 index 000000000..77fc8987f --- /dev/null +++ b/kdoctools/customization/ru/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + /> + + + + + + + + + + + diff --git a/kdoctools/customization/sk/catalog.xml b/kdoctools/customization/sk/catalog.xml new file mode 100644 index 000000000..ef6bd3f57 --- /dev/null +++ b/kdoctools/customization/sk/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/sl/catalog.xml b/kdoctools/customization/sl/catalog.xml new file mode 100644 index 000000000..0745afc64 --- /dev/null +++ b/kdoctools/customization/sl/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/sr/catalog.xml b/kdoctools/customization/sr/catalog.xml new file mode 100644 index 000000000..a7390cd1c --- /dev/null +++ b/kdoctools/customization/sr/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/sv/catalog.xml b/kdoctools/customization/sv/catalog.xml new file mode 100644 index 000000000..5cdf8d113 --- /dev/null +++ b/kdoctools/customization/sv/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/tr/catalog.xml b/kdoctools/customization/tr/catalog.xml new file mode 100644 index 000000000..4003cd63b --- /dev/null +++ b/kdoctools/customization/tr/catalog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/uk/catalog.xml b/kdoctools/customization/uk/catalog.xml new file mode 100644 index 000000000..cc13b4635 --- /dev/null +++ b/kdoctools/customization/uk/catalog.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/wa/catalog.xml b/kdoctools/customization/wa/catalog.xml new file mode 100644 index 000000000..3cc45a586 --- /dev/null +++ b/kdoctools/customization/wa/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/xh/catalog.xml b/kdoctools/customization/xh/catalog.xml new file mode 100644 index 000000000..9daee4a5c --- /dev/null +++ b/kdoctools/customization/xh/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/xx/catalog.xml b/kdoctools/customization/xx/catalog.xml new file mode 100644 index 000000000..39403fa7f --- /dev/null +++ b/kdoctools/customization/xx/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/zh-CN/catalog.xml b/kdoctools/customization/zh-CN/catalog.xml new file mode 100644 index 000000000..7a0557e11 --- /dev/null +++ b/kdoctools/customization/zh-CN/catalog.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/customization/zh-TW/catalog.xml b/kdoctools/customization/zh-TW/catalog.xml new file mode 100644 index 000000000..d287f23c6 --- /dev/null +++ b/kdoctools/customization/zh-TW/catalog.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/docbook/xml-dtd-4.1.2/catalog.xml b/kdoctools/docbook/xml-dtd-4.1.2/catalog.xml new file mode 100644 index 000000000..91c0e9e9f --- /dev/null +++ b/kdoctools/docbook/xml-dtd-4.1.2/catalog.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 601f53f25..a63f1e185 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -153,11 +153,11 @@ int main(int argc, char **argv) { } TQString catalogs; - catalogs += locate( "dtd", "customization/catalog" ); + catalogs += locate( "dtd", "customization/catalog.xml" ); catalogs += " "; - catalogs += locate( "dtd", "docbook/xml-dtd-4.1.2/docbook.cat" ); + catalogs += locate( "dtd", "docbook/xml-dtd-4.1.2/catalog.xml" ); - setenv( "SGML_CATALOG_FILES", TQFile::encodeName( catalogs ).data(), 1); + setenv( "XML_CATALOG_FILES", TQFile::encodeName( catalogs ).data(), 1); TQString exe; #if defined( XMLLINT ) exe = XMLLINT; @@ -170,7 +170,7 @@ int main(int argc, char **argv) { if ( ::access( TQFile::encodeName( exe ), X_OK )==0 ) { chdir( TQFile::encodeName( file.dirPath( true ) ) ); TQString cmd = exe; - cmd += " --catalogs --valid --noout "; + cmd += " --valid --noout "; cmd += TDEProcess::quote(file.fileName()); cmd += " 2>&1"; FILE *xmllint = popen( TQFile::encodeName( cmd ), "r"); diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp index a6e144ce8..94c66ff6a 100644 --- a/kdoctools/xslt.cpp +++ b/kdoctools/xslt.cpp @@ -183,12 +183,12 @@ void fillInstance(TDEInstance &ins, const TQString &srcdir) { TQString catalogs; if ( srcdir.isEmpty() ) { - catalogs += ins.dirs()->findResource("data", "ksgmltools2/customization/catalog"); + catalogs += ins.dirs()->findResource("data", "ksgmltools2/customization/catalog.xml"); catalogs += ':'; - catalogs += ins.dirs()->findResource("data", "ksgmltools2/docbook/xml-dtd-4.2/docbook.cat"); + catalogs += ins.dirs()->findResource("data", "ksgmltools2/docbook/xml-dtd-4.2/catalog.xml"); ins.dirs()->addResourceType("dtd", TDEStandardDirs::kde_default("data") + "ksgmltools2"); } else { - catalogs += srcdir +"/customization/catalog:" + srcdir + "/docbook/xml-dtd-4.2/docbook.cat"; + catalogs += srcdir +"/customization/catalog.xml:" + srcdir + "/docbook/xml-dtd-4.2/catalog.xml"; ins.dirs()->addResourceDir("dtd", srcdir); } -- cgit v1.2.3