commit kdoctools for openSUSE:Factory
Hello community, here is the log from the commit of package kdoctools for openSUSE:Factory checked in at 2014-04-02 17:21:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdoctools (Old) and /work/SRC/openSUSE:Factory/.kdoctools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdoctools" Changes: -------- --- /work/SRC/openSUSE:Factory/kdoctools/kdoctools.changes 2014-03-10 12:17:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdoctools.new/kdoctools.changes 2014-04-02 17:22:07.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:33 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 4.98.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta1.php + +------------------------------------------------------------------- Old: ---- kdoctools-4.97.0.tar.xz New: ---- kdoctools-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdoctools.spec ++++++ --- /var/tmp/diff_new_pack.4e3mPS/_old 2014-04-02 17:22:08.000000000 +0200 +++ /var/tmp/diff_new_pack.4e3mPS/_new 2014-04-02 17:22:08.000000000 +0200 @@ -17,12 +17,12 @@ Name: kdoctools -Version: 4.97.0 +Version: 4.98.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook_4 -BuildRequires: extra-cmake-modules >= 0.0.11 +BuildRequires: extra-cmake-modules >= 0.0.12 BuildRequires: fdupes BuildRequires: karchive-devel >= %{_kf5_version} BuildRequires: kf5-filesystem ++++++ kdoctools-4.97.0.tar.xz -> kdoctools-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/CMakeLists.txt new/kdoctools-4.98.0/CMakeLists.txt --- old/kdoctools-4.97.0/CMakeLists.txt 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/CMakeLists.txt 2014-03-28 19:16:42.000000000 +0100 @@ -3,7 +3,7 @@ project(KDocTools) # ECM setup -find_package(ECM 0.0.11 REQUIRED NO_MODULE) +find_package(ECM 0.0.12 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) @@ -11,7 +11,7 @@ include(ECMMarkNonGuiExecutable) include(ECMPackageConfigHelpers) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KDOCTOOLS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdoctools_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5DocToolsConfigVersion.cmake" @@ -42,7 +42,7 @@ ) -find_package(DocBookXML4 "4.2") +find_package(DocBookXML4 "4.5") set_package_properties(DocBookXML4 PROPERTIES TYPE REQUIRED @@ -57,7 +57,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) -set(_kdeBootStrapping TRUE) +set(_kdoctoolsBootStrapping TRUE) set(KDOCTOOLS_CUSTOMIZATION_DIR "${CMAKE_CURRENT_BINARY_DIR}/src/customization/") if (WIN32) set(KDOCTOOLS_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc5 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/KF5DocToolsMacros.cmake new/kdoctools-4.98.0/KF5DocToolsMacros.cmake --- old/kdoctools-4.97.0/KF5DocToolsMacros.cmake 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/KF5DocToolsMacros.cmake 2014-03-28 19:16:42.000000000 +0100 @@ -35,12 +35,17 @@ set(KDOCTOOLS_MEINPROC_EXECUTABLE ${KDOCTOOLS_SERIALIZE_TOOL} ${KDOCTOOLS_MEINPROC_EXECUTABLE}) endif(KDOCTOOLS_SERIALIZE_TOOL) +macro(_SUGGEST_TARGET_NAME _out) + string(REPLACE "${CMAKE_SOURCE_DIR}/" "" ${_out} "${CMAKE_CURRENT_SOURCE_DIR}") + string(REGEX REPLACE "[^0-9a-zA-Z]" "-" ${_out} "${${_out}}") +endmacro() + macro (KDOCTOOLS_CREATE_HANDBOOK _docbook) get_filename_component(_input ${_docbook} ABSOLUTE) set(_doc ${CMAKE_CURRENT_BINARY_DIR}/index.cache.bz2) #Bootstrap - if (_kdeBootStrapping) + if (_kdoctoolsBootStrapping) set(_bootstrapOption "--srcdir=${KDocTools_BINARY_DIR}/src") else () set(_bootstrapOption) @@ -50,8 +55,8 @@ file(GLOB _docs *.docbook) # if (CMAKE_CROSSCOMPILING) -# set(IMPORT_MEINPROC4_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc4Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc5 from a native build") -# include(${IMPORT_MEINPROC4_EXECUTABLE}) +# set(IMPORT_MEINPROC5_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc5Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc5 from a native build") +# include(${IMPORT_MEINPROC5_EXECUTABLE}) # set(KDOCTOOLS_MEINPROC_EXECUTABLE meinproc5) # endif (CMAKE_CROSSCOMPILING) @@ -60,7 +65,8 @@ DEPENDS ${_docs} ${_ssheet} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) - get_filename_component(_targ ${CMAKE_CURRENT_SOURCE_DIR} NAME) + + _suggest_target_name(_targ) set(_targ "${_targ}-handbook") add_custom_target(${_targ} ALL DEPENDS ${_doc}) @@ -118,7 +124,7 @@ string(REGEX REPLACE "/man-" "/" _outdoc ${_doc}) #Bootstrap - if (_kdeBootStrapping) + if (_kdoctoolsBootStrapping) set(_bootstrapOption "--srcdir=${KDocTools_BINARY_DIR}/src") else () set(_bootstrapOption) @@ -126,8 +132,8 @@ set(_ssheet "${KDOCTOOLS_CUSTOMIZATION_DIR}/kde-include-man.xsl") # if (CMAKE_CROSSCOMPILING) -# set(IMPORT_MEINPROC4_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc4Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc5 from a native build") -# include(${IMPORT_MEINPROC4_EXECUTABLE}) +# set(IMPORT_MEINPROC5_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc5Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc5 from a native build") +# include(${IMPORT_MEINPROC5_EXECUTABLE}) # set(KDOCTOOLS_MEINPROC_EXECUTABLE meinproc5) # endif (CMAKE_CROSSCOMPILING) @@ -135,7 +141,7 @@ COMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE} --stylesheet ${_ssheet} --check ${_bootstrapOption} ${_input} DEPENDS ${_input} ${_ssheet} ) - get_filename_component(_targ ${CMAKE_CURRENT_SOURCE_DIR} NAME) + _suggest_target_name(_targ) set(_targ "${_targ}-manpage-${_base}") add_custom_target(${_targ} ALL DEPENDS "${_outdoc}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/cmake/FindDocBookXML4.cmake new/kdoctools-4.98.0/cmake/FindDocBookXML4.cmake --- old/kdoctools-4.97.0/cmake/FindDocBookXML4.cmake 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/cmake/FindDocBookXML4.cmake 2014-03-28 19:16:42.000000000 +0100 @@ -1,5 +1,5 @@ # Try to find DocBook XML 4.x DTD. -# By default it will find version 4.2. A different version can be specified +# By default it will find version 4.5. A different version can be specified # as parameter for find_package(). # Once done, it will define: # @@ -16,7 +16,7 @@ if (NOT DocBookXML_FIND_VERSION) - set(DocBookXML_FIND_VERSION "4.2") + set(DocBookXML_FIND_VERSION "4.5") endif () set (DocBookXML4_DTD_VERSION ${DocBookXML_FIND_VERSION} @@ -70,12 +70,4 @@ REQUIRED_VARS DocBookXML4_DTD_DIR DocBookXML4_DTD_VERSION FOUND_VAR DocBookXML4_FOUND) -#maintain backwards compatibility -# legacy version -locate_version ("4.2" DOCBOOKXML_CURRENTDTD_DIR) -if (DOCBOOKXML_CURRENTDTD_DIR) - set(DOCBOOKXML_FOUND "TRUE") - set(DOCBOOKXML_CURRENTDTD_VERSION "4.2") -endif () - mark_as_advanced (DocBookXML4_DTD_DIR DocBookXML4_DTD_VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/common/kde-localised.css.template new/kdoctools-4.98.0/common/kde-localised.css.template --- old/kdoctools-4.97.0/common/kde-localised.css.template 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/common/kde-localised.css.template 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -/* - KDE CSS for <**languagecountry**> HTML documentation (all media types). - Copyright (C) 2000 <**authorname**> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - Send comments, suggestions, etc. to <**authorcontactdetails**>. -*/ - -/* - These settings will override kde-default.css. - - Any updates should be validated, e.g. http://jigsaw.w3.org/css-validator/ - - Check out http://www.richinstyle.com/ where many of the declarations and - setup in the KDE CSS are obtained from. In fact, do not change anything - without checking so on those pages whether it is wise to do. -*/ - -:lg(**language**) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/docs/checkXML5/man-checkXML5.1.docbook new/kdoctools-4.98.0/docs/checkXML5/man-checkXML5.1.docbook --- old/kdoctools-4.97.0/docs/checkXML5/man-checkXML5.1.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/docs/checkXML5/man-checkXML5.1.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/docs/kf5options/man-kf5options.7.docbook new/kdoctools-4.98.0/docs/kf5options/man-kf5options.7.docbook --- old/kdoctools-4.97.0/docs/kf5options/man-kf5options.7.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/docs/kf5options/man-kf5options.7.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/docs/meinproc5/man-meinproc5.8.docbook new/kdoctools-4.98.0/docs/meinproc5/man-meinproc5.8.docbook --- old/kdoctools-4.97.0/docs/meinproc5/man-meinproc5.8.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/docs/meinproc5/man-meinproc5.8.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"><!-- change language only here --> ]> @@ -61,7 +61,6 @@ <arg choice="opt">KDE-options</arg> <arg choice="opt">--cache<replaceable> file</replaceable></arg> <arg choice="opt">--check</arg> -<arg choice="opt">--htdig</arg> <arg choice="opt">--srcdir</arg> <arg choice="opt">--param <replaceable>key</replaceable>=<replaceable>value</replaceable></arg> @@ -182,13 +181,6 @@ </listitem> </varlistentry> -<varlistentry> -<term><option>--htdig</option></term> -<listitem> -<para>Create a ht://dig compatible index</para> -</listitem> -</varlistentry> - <varlistentry> <term><option>-o</option>, <option>--output</option><parameter> file</parameter></term> <listitem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/docs/qt5options/man-qt5options.7.docbook new/kdoctools-4.98.0/docs/qt5options/man-qt5options.7.docbook --- old/kdoctools-4.97.0/docs/qt5options/man-qt5options.7.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/docs/qt5options/man-qt5options.7.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/CMakeLists.txt new/kdoctools-4.98.0/src/CMakeLists.txt --- old/kdoctools-4.97.0/src/CMakeLists.txt 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/CMakeLists.txt 2014-03-28 19:16:42.000000000 +0100 @@ -1,6 +1,6 @@ include_directories( ${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR} ) -set (_custom_dtd_kdex "customization/dtd/kdex.dtd") +set (_custom_dtd_kdex "customization/dtd/kdedbx45.dtd") configure_file(${_custom_dtd_kdex}.cmake ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex} ) # WARNING: this is due to severe limitations on the windows platform to keep the dtd relocateable # see the .xsl.cmake files for a more verbose explanation below @@ -8,12 +8,12 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex} DESTINATION ${DATA_INSTALL_DIR}/kdoctools5/customization/dtd ) else() + get_filename_component(NORMALIZED_DTD_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/kdoctools5/customization/dtd" ABSOLUTE) # file(RELATIVE_PATH ...) returns wrong values for paths containing /../ (it doesn't normalize the path) # To work around this we make sure the variable passed has all /../ elements # removed using get_filename_component(... ABSOLUTE) install(CODE - "get_filename_component(NORMALIZED_INSTALL_PATH \"${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/kdoctools5/customization/dtd\" ABSOLUTE) - file(RELATIVE_PATH DocBookXML4_DTD_DIR \"${NORMALIZED_INSTALL_PATH}\" \"${DocBookXML4_DTD_DIR}\") + "file(RELATIVE_PATH DocBookXML4_DTD_DIR \"${NORMALIZED_DTD_INSTALL_PATH}\" \"${DocBookXML4_DTD_DIR}\") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_custom_dtd_kdex}.cmake ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex}.install)" ) get_filename_component(_custom_dtd_kdex_name ${_custom_dtd_kdex} NAME) @@ -23,8 +23,16 @@ # needed by KIO, need to export it add_library(KF5XsltKde STATIC xslt.cpp xslt_kde.cpp) add_library(KF5::XsltKde ALIAS KF5XsltKde) -target_link_libraries(KF5XsltKde Qt5::Core KF5::Archive) -set_target_properties(KF5XsltKde PROPERTIES EXPORT_NAME XsltKde) +target_link_libraries(KF5XsltKde + PUBLIC + Qt5::Core + PRIVATE + KF5::Archive +) +set_target_properties(KF5XsltKde PROPERTIES + POSITION_INDEPENDENT_CODE TRUE + EXPORT_NAME XsltKde +) target_include_directories(KF5XsltKde INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/XsltKde>") @@ -39,8 +47,8 @@ # The cross compiling parts are commented out on purpose. Alex if (CMAKE_CROSSCOMPILING) -# set(IMPORT_MEINPROC4_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc4Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc5 from a native build") -# include(${IMPORT_MEINPROC4_EXECUTABLE}) +# set(IMPORT_MEINPROC5_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc5Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc5 from a native build") +# include(${IMPORT_MEINPROC5_EXECUTABLE}) else () set_source_files_properties(xslt.cpp PROPERTIES COMPILE_FLAGS -DSIMPLE_XSLT ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/ca/user.entities new/kdoctools-4.98.0/src/customization/ca/user.entities --- old/kdoctools-4.97.0/src/customization/ca/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/ca/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -18,14 +18,6 @@ <!ENTITY etc "<abbrev>etc.</abbrev>"> <!ENTITY IGU "<acronym>IGU</acronym>"><!-- English: &GUI; --> <!ENTITY Intro "<keycap>Retorn</keycap>"><!-- English: &Enter; --> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>Les icones del &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"><!-- if image is localised, then entityref should be used - instead of fileref --> <!ENTITY kmenu "Menú <guimenu>K</guimenu>"> <!ENTITY Maj "<keycap>Majús.</keycap>"><!-- English: &Shift; --> <!ENTITY partman "<application>Gestor de particions del KDE</application>"> <!-- English: &partman; (KDE Partition Manager)--> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/catalog.xml new/kdoctools-4.98.0/src/customization/catalog.xml --- old/kdoctools-4.97.0/src/customization/catalog.xml 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/catalog.xml 2014-03-28 19:16:42.000000000 +0100 @@ -31,10 +31,10 @@ <!-- DocBook --> - <!-- DocBook 4.2 KDE Variant V1.1 --> + <!-- DocBook 4.5 KDE Variant V1.1 --> - <public publicId="-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" - uri="dtd/kdex.dtd"/> + <public publicId="-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" + uri="dtd/kdedbx45.dtd"/> <public publicId="-//KDE//ELEMENTS DocBook XML Hierarchy Redeclarations 2 V1.0//EN" uri="dtd/rdbhier2.elements"/> <public publicId="-//KDE//ELEMENTS DocBook XML Pool Redeclarations V1.1//EN" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/da/user.entities new/kdoctools-4.98.0/src/customization/da/user.entities --- old/kdoctools-4.97.0/src/customization/da/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/da/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -35,13 +35,6 @@ <!ENTITY ie "<abbrev>dvs.</abbrev>"> <!ENTITY infocenter "<application>Infocenter</application>"> <!ENTITY kcontrolcenter "<application>&kde;'s kontrolcenter</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'s K-ikon</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "<guimenu>K</guimenu>-menu"> <!ENTITY LMB "<mousebutton>venstre</mousebutton> museknap"> <!ENTITY MMB "<mousebutton>midterste</mousebutton> museknap"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/de/user.entities new/kdoctools-4.98.0/src/customization/de/user.entities --- old/kdoctools-4.97.0/src/customization/de/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/de/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -22,13 +22,6 @@ <!ENTITY kcontrolcenter "<application>&kde;-Kontrollzentrum</application>"> <!ENTITY kde "K-Arbeitsumgebung" ><!-- kde --> <!ENTITY khelpcenter-de "<application>&kde;-Hilfezentrum</application>" > -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>K-Symbol von &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon>-Symbol"><!-- kicon --> <!ENTITY kmenu "<guimenu>K</guimenu>-Menü"> <!-- kmenu --> <!ENTITY kwm "<application>kwm</application>"> <!ENTITY LMB "<mousebutton>linke</mousebutton> Maustaste"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/dtd/kdedbx45.dtd.cmake new/kdoctools-4.98.0/src/customization/dtd/kdedbx45.dtd.cmake --- old/kdoctools-4.97.0/src/customization/dtd/kdedbx45.dtd.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/dtd/kdedbx45.dtd.cmake 2014-03-28 19:16:42.000000000 +0100 @@ -0,0 +1,129 @@ +<!-- + Document Type Definition for DocBook XML as used in the KDE documentation + + Copyright (C) 2002 Frederik Fouvry + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Send suggestions, comments, etc. to the KDE docbook list + <kde-docbook@kde.org>. + + + USAGE + + Refer to this DTD as + + "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" + + For instance: + + <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" + "customization/dtd/kdedbx45.dtd"> + + and use catalog.xml or docbook.cat as the catalog file. + Note: the system identifier is interpreted relative to the place + where it is defined, unless otherwise defined by the application you use. + If you have permanent internet access, you can use any URLs (and + you don't have to install docbook). + + After a version number change, plenty of problems may occur because + of non-compatibilities (or DTDs not found, etc). That doesn't mean your + document is invalid; it just means that the reference DTD has changed + (new documentation and documentation updates). Check out the previous + version and point to the appropriate catalog or DTD and things should + work again (=still ;-). +--> + + +<!-- ============================================================= --> +<!-- Modifications to the original DocBook DTD --> +<!-- ============================================================= --> +<!-- Declarations in this part should only *restrict* the DocBook + DTD --> + +<!-- copied from docbookx.dtd: these values are for + %xml.features; = "INCLUDE" + Files that define elements need them (currently only + modifications.elements) --> +<!ENTITY % ho ""> +<!ENTITY % ubiq.inclusion ""> +<!ENTITY % beginpage.exclusion ""> + +<!-- Modifications in pool + %rdbpool; is called in the DocBook DTD + NEEDS TO BE CHECKED ON CHANGES + --> +<!ENTITY % rdbpool PUBLIC + "-//KDE//ELEMENTS DocBook XML Pool Redeclarations V1.1//EN" + "rdbpool.elements" > +<!ENTITY % dbpool.redecl.module "INCLUDE" > + +<!-- Modifications in hierarchy + %rdbhier2; is called in the DocBook DTD + NEEDS TO BE CHECKED ON CHANGES + --> +<!ENTITY % rdbhier2 PUBLIC + "-//KDE//ELEMENTS DocBook XML Hierarchy Redeclarations 2 V1.0//EN" + "rdbhier2.elements" > +<!ENTITY % dbhier.redecl2.module "INCLUDE" > + +<!-- For Java-style refentries + Based on DocBook 4.0. --> +<!--ENTITY % jrefentry PUBLIC + "-//Norman Walsh//DTD JRefEntry V1.0//EN" > +%jrefentry; --> + +<!-- Temporary solution --> +<!ENTITY copy "(c)"> <!--=copyright sign--> +<!ENTITY trade "[tm]"> <!--=trade mark sign--> +<!ENTITY reg "(R)"> <!--/circledR =registered sign--> + + +<!-- ============================================================= --> +<!-- Original DocBook DTD --> +<!-- ============================================================= --> + +<!ENTITY % DocBookDTD PUBLIC + "-//OASIS//DTD DocBook XML V4.5//EN" + "@DocBookXML4_DTD_DIR@/docbookx.dtd" > +%DocBookDTD; + + +<!-- ============================================================= --> +<!-- Modifications to the original DocBook DTD --> +<!-- ============================================================= --> +<!-- ONLY to supply declarations that were switched off in the + first "Modifications" section --> + +<!ENTITY % kde.modifications PUBLIC + "-//KDE//ELEMENTS DocBook XML Modifications V1.1//EN" + "modifications.elements" > +%kde.modifications; + + +<!-- ============================================================= --> +<!-- Extensions to the DocBook DTD --> +<!-- ============================================================= --> +<!-- Is empty, except for what could go in dbgenent.mod --> + +<!ENTITY % kde.general.entities PUBLIC + "-//KDE//ENTITIES DocBook XML General Entity Declarations V1.2//EN" + "../entities/general.entities" > +%kde.general.entities; + +<!ENTITY % kde.i18n.entities PUBLIC + "-//KDE//ENTITIES DocBook XML Localisation Entity Declarations V1.0//EN" + "../entities/l10n.entities" > +%kde.i18n.entities; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/dtd/kdex.dtd.cmake new/kdoctools-4.98.0/src/customization/dtd/kdex.dtd.cmake --- old/kdoctools-4.97.0/src/customization/dtd/kdex.dtd.cmake 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/dtd/kdex.dtd.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,129 +0,0 @@ -<!-- - Document Type Definition for DocBook XML as used in the KDE documentation - - Copyright (C) 2002 Frederik Fouvry - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - Send suggestions, comments, etc. to the KDE docbook list - <kde-docbook@kde.org>. - - - USAGE - - Refer to this DTD as - - "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" - - For instance: - - <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" - "customization/dtd/kdex.dtd"> - - and use catalog.xml or docbook.cat as the catalog file. - Note: the system identifier is interpreted relative to the place - where it is defined, unless otherwise defined by the application you use. - If you have permanent internet access, you can use any URLs (and - you don't have to install docbook). - - After a version number change, plenty of problems may occur because - of non-compatibilities (or DTDs not found, etc). That doesn't mean your - document is invalid; it just means that the reference DTD has changed - (new documentation and documentation updates). Check out the previous - version and point to the appropriate catalog or DTD and things should - work again (=still ;-). ---> - - -<!-- ============================================================= --> -<!-- Modifications to the original DocBook DTD --> -<!-- ============================================================= --> -<!-- Declarations in this part should only *restrict* the DocBook - DTD --> - -<!-- copied from docbookx.dtd: these values are for - %xml.features; = "INCLUDE" - Files that define elements need them (currently only - modifications.elements) --> -<!ENTITY % ho ""> -<!ENTITY % ubiq.inclusion ""> -<!ENTITY % beginpage.exclusion ""> - -<!-- Modifications in pool - %rdbpool; is called in the DocBook DTD - NEEDS TO BE CHECKED ON CHANGES - --> -<!ENTITY % rdbpool PUBLIC - "-//KDE//ELEMENTS DocBook XML Pool Redeclarations V1.1//EN" - "rdbpool.elements" > -<!ENTITY % dbpool.redecl.module "INCLUDE" > - -<!-- Modifications in hierarchy - %rdbhier2; is called in the DocBook DTD - NEEDS TO BE CHECKED ON CHANGES - --> -<!ENTITY % rdbhier2 PUBLIC - "-//KDE//ELEMENTS DocBook XML Hierarchy Redeclarations 2 V1.0//EN" - "rdbhier2.elements" > -<!ENTITY % dbhier.redecl2.module "INCLUDE" > - -<!-- For Java-style refentries - Based on DocBook 4.0. --> -<!--ENTITY % jrefentry PUBLIC - "-//Norman Walsh//DTD JRefEntry V1.0//EN" > -%jrefentry; --> - -<!-- Temporary solution --> -<!ENTITY copy "(c)"> <!--=copyright sign--> -<!ENTITY trade "[tm]"> <!--=trade mark sign--> -<!ENTITY reg "(R)"> <!--/circledR =registered sign--> - - -<!-- ============================================================= --> -<!-- Original DocBook DTD --> -<!-- ============================================================= --> - -<!ENTITY % DocBookDTD PUBLIC - "-//OASIS//DTD DocBook XML V4.2//EN" - "@DocBookXML4_DTD_DIR@/docbookx.dtd" > -%DocBookDTD; - - -<!-- ============================================================= --> -<!-- Modifications to the original DocBook DTD --> -<!-- ============================================================= --> -<!-- ONLY to supply declarations that were switched off in the - first "Modifications" section --> - -<!ENTITY % kde.modifications PUBLIC - "-//KDE//ELEMENTS DocBook XML Modifications V1.1//EN" - "modifications.elements" > -%kde.modifications; - - -<!-- ============================================================= --> -<!-- Extensions to the DocBook DTD --> -<!-- ============================================================= --> -<!-- Is empty, except for what could go in dbgenent.mod --> - -<!ENTITY % kde.general.entities PUBLIC - "-//KDE//ENTITIES DocBook XML General Entity Declarations V1.2//EN" - "../entities/general.entities" > -%kde.general.entities; - -<!ENTITY % kde.i18n.entities PUBLIC - "-//KDE//ENTITIES DocBook XML Localisation Entity Declarations V1.0//EN" - "../entities/l10n.entities" > -%kde.i18n.entities; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/el/user.entities new/kdoctools-4.98.0/src/customization/el/user.entities --- old/kdoctools-4.97.0/src/customization/el/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/el/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,14 +19,6 @@ <!ENTITY ie "<abbrev>δηλ.</abbrev>"> <!ENTITY infocenter "<application>Κέντρο πληροφοριών</application>"> <!ENTITY kcontrolcenter "<application>Κέντρο ελέγχου του &kde;</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'s K-icon</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"><!-- if image is localised, then entityref should be used - instead of fileref --> <!ENTITY kmenu "<guimenu>K</guimenu> menu"> <!ENTITY LMB "<mousebutton>αριστερό</mousebutton> κλικ ποντικιού"> <!ENTITY MMB "<mousebutton>μεσαίο</mousebutton> κλικ ποντικιού"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/en/user.entities new/kdoctools-4.98.0/src/customization/en/user.entities --- old/kdoctools-4.97.0/src/customization/en/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/en/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,14 +19,6 @@ <!ENTITY ie "<abbrev>i.e.</abbrev>"> <!ENTITY infocenter "<application>Info Center</application>"> <!ENTITY kcontrolcenter "<application>&kde; Control Center</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'s K-icon</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"><!-- if image is localised, then entityref should be used - instead of fileref --> <!ENTITY kmenu "<guimenu>K</guimenu> menu"> <!ENTITY LMB "<mousebutton>left</mousebutton> mouse button"> <!ENTITY MMB "<mousebutton>middle</mousebutton> mouse button"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/en-GB/user.entities new/kdoctools-4.98.0/src/customization/en-GB/user.entities --- old/kdoctools-4.97.0/src/customization/en-GB/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/en-GB/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -20,14 +20,6 @@ <!ENTITY ie "<abbrev>i.e.</abbrev>"> <!ENTITY kcontrolcenter "<application>&kde; Control Centre</application>"> <!ENTITY khelpcenter "<application>KHelpCentre</application>"> -<!ENTITY kicon " -<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'s K-icon</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"><!-- if image is localised, then entityref should be used instead of fileref --> <!ENTITY kmenu "<guimenu>K</guimenu> menu"> <!ENTITY LMB "<mousebutton>left</mousebutton> mouse button"> <!ENTITY MMB "<mousebutton>middle</mousebutton> mouse button"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/eo/user.entities new/kdoctools-4.98.0/src/customization/eo/user.entities --- old/kdoctools-4.97.0/src/customization/eo/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/eo/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,13 +19,6 @@ <!ENTITY kcc "<application>Stircentro de KDE</application>" ><!-- kcc --> <!ENTITY kcontrolcenter "<application>Stircentro de &kde;</application>"> <!ENTITY khelpcenter "<application>Helpcentro</application>" > -<!ENTITY kicon '<guiicon> -<inlinemediaobject> - <objectinfo><title>La ikono K de &kde;</title></objectinfo> - <imageobject><imagedata fileref="common/kmenu.png" format="PNG"/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> - </guiicon> icon'><!-- if image is localised, then entityref should be used instead of fileref --> <!ENTITY kmenu "menuo <guimenu>K</guimenu>"> <!ENTITY LMB "<mousebutton>musbutono maldekstra</mousebutton>"> <!ENTITY MMB "<mousebutton>musbutono meza</mousebutton>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/es/user.entities new/kdoctools-4.98.0/src/customization/es/user.entities --- old/kdoctools-4.97.0/src/customization/es/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/es/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -22,13 +22,6 @@ <!ENTITY kcc "<application>Centro de control de KDE</application>" ><!-- kcc --> <!ENTITY kcontrolcenter "<application>Centro de control de &kde;</application>"> <!ENTITY khelpcenter "<application>Centro de ayuda</application>" > -<!ENTITY kicon '<guiicon> -<inlinemediaobject> - <objectinfo><title>El icono K de &kde;</title></objectinfo> - <imageobject><imagedata fileref="common/kmenu.png" format="PNG"/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> - </guiicon> icon'><!-- if image is localised, then entityref should be used instead of fileref --> <!ENTITY kiosktool "<application>Herramienta de administración KIOSK</application>"> <!ENTITY konversation "<application>Konversation</application>"> <!ENTITY kubuntu "<application>Kubuntu</application>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/et/user.entities new/kdoctools-4.98.0/src/customization/et/user.entities --- old/kdoctools-4.97.0/src/customization/et/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/et/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -37,14 +37,6 @@ <!ENTITY infocenter "<application>Infokeskus</application>"> <!ENTITY kcontrolcenter "<application>&kde; juhtimiskeskus</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde; K-ikoon</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"><!-- if image is localised, then entityref should be used - instead of fileref --> <!ENTITY kmenu "<guimenu>K</guimenu> menüü"> <!ENTITY dpi '<acronym>dpi</acronym>'> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/fr/user.entities new/kdoctools-4.98.0/src/customization/fr/user.entities --- old/kdoctools-4.97.0/src/customization/fr/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/fr/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -401,14 +401,6 @@ <!ENTITY SE "système d'exploitation"> <!-- English: &OS; --> <!ENTITY Tab "<keycap>Tab</keycap>"> <!-- English: Tab --> -<!ENTITY iconek "icône <guiicon> -<inlinemediaobject> - <objectinfo><title>Icône K de &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon>"><!-- if image is localised, then entityref should be used - instead of fileref --> <!ENTITY menuk "menu <guimenu>K</guimenu>"> <!ENTITY partman "Gestionnaire de partitions de &kde;"> <!-- English: &partman; --> <!ENTITY krfb_fr "Partage de bureau"> <!--English: &krfb; --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/gl/user.entities new/kdoctools-4.98.0/src/customization/gl/user.entities --- old/kdoctools-4.97.0/src/customization/gl/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/gl/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -30,13 +30,6 @@ <!ENTITY Shift "<keycap>Maiúsc</keycap>"> <!ENTITY systemsettings "<application>Configuración do Sistema</application>"> <!ENTITY Tab "<keycap>Tab</keycap>"> -<!ENTITY kicon '<guiicon> -<inlinemediaobject> - <objectinfo><title>O ícone K de &kde;</title></objectinfo> - <imageobject><imagedata fileref="common/kmenu.png" format="PNG"/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> - </guiicon> icon'> <!ENTITY kmenu "menú <guimenu>K</guimenu>"> <!ENTITY kinfocenter "<application>Centro de información do KDE</application>" > <!ENTITY ksystemlog "<application>KSystemLog</application>" > diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/htdig_index.xsl new/kdoctools-4.98.0/src/customization/htdig_index.xsl --- old/kdoctools-4.97.0/src/customization/htdig_index.xsl 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/htdig_index.xsl 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -<?xml version='1.0'?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version='1.0'> - -<xsl:template match="*"> - <!-- xsl:message> - <xsl:text>No template matches </xsl:text> - <xsl:value-of select="name(.)"/> - <xsl:text>.</xsl:text> - </xsl:message --> - <xsl:apply-templates/> -</xsl:template> - -<xsl:template match="keywordset/keyword"> - <entry header="10"> - <xsl:apply-templates/> - </entry> -</xsl:template> - -<xsl:template match="book/title|bookinfo/title|abstract"> - <entry header="5"> - <xsl:apply-templates/> - </entry> -</xsl:template> - -<xsl:template match="chapter/title"> - <entry header="4"> - <xsl:apply-templates/> - </entry> -</xsl:template> - -<xsl:template match="sect1/title"> - <entry header="3"> - <xsl:apply-templates/> - </entry> -</xsl:template> - -<xsl:template match="sect*/title|emphasis"> - <entry header="2"> - <xsl:apply-templates/> - </entry> -</xsl:template> - -<xsl:template match="application|guilabel|guiicon|menuchoice|guibutton|guisubmenu|guimenuitem|term|guimenu|literal|acronym"> - <entry header="1"> - <xsl:apply-templates/> - </entry> -</xsl:template> - -<xsl:template match="book"> - <entry header="0"> - <xsl:apply-templates/> - </entry> -</xsl:template> - -<xsl:template match="date|releaseinfo|anchor|imagedata"> -</xsl:template> - -</xsl:stylesheet> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/it/user.entities new/kdoctools-4.98.0/src/customization/it/user.entities --- old/kdoctools-4.97.0/src/customization/it/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/it/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,14 +19,6 @@ <!ENTITY ie "cioè"> <!ENTITY infocenter "<application>Centro d'informazione</application>"> <!ENTITY kcontrolcenter "<application>Centro di controllo di &kde;</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>icona K di &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"><!-- if image is localised, then entityref should be used - instead of fileref --> <!ENTITY kmenu "menu <guimenu>K</guimenu>"> <!ENTITY LMB "tasto <mousebutton>sinistro</mousebutton> del mouse"> <!ENTITY MMB "tasto <mousebutton>centrale</mousebutton> del mouse"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/ko/user.entities new/kdoctools-4.98.0/src/customization/ko/user.entities --- old/kdoctools-4.97.0/src/customization/ko/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/ko/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -18,14 +18,6 @@ <!ENTITY FAQ '<acronym>FAQ</acronym>'> <!ENTITY infocenter "<application>정보 센터</application>"> <!ENTITY kcontrolcenter "<application>&kde; 제어판</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;의 K 아이콘</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> 아이콘"><!-- if image is localised, then entityref should be used - instead of fileref --> <!ENTITY kmenu "<guimenu>K</guimenu> 메뉴"> <!ENTITY LMB "<mousebutton>왼쪽</mousebutton> 마우스 단추"> <!ENTITY MMB "<mousebutton>가운데</mousebutton> 마우스 단추"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/nds/user.entities new/kdoctools-4.98.0/src/customization/nds/user.entities --- old/kdoctools-4.97.0/src/customization/nds/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/nds/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -36,13 +36,6 @@ <!ENTITY kcontrolcenter "<application>&kde;-Kuntrullzentrum</application>"> <!ENTITY kde "K-Schriefdischümgeven" ><!-- kde --> <!ENTITY khelpcenter-de "<application>&kde;-Hülpzentrum</application>" > -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>K-Symbool vun &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon>-Symbool"><!-- kicon --> <!ENTITY kmenu "<guimenu>K</guimenu>-Menü"> <!-- kmenu --> <!ENTITY kwm "<application>kwm</application>"> <!ENTITY LMB "<mousebutton>linke</mousebutton> Muusknoop"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/nl/user.entities new/kdoctools-4.98.0/src/customization/nl/user.entities --- old/kdoctools-4.97.0/src/customization/nl/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/nl/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -141,14 +141,6 @@ <!ENTITY Ctrl "<keycap>Ctrl</keycap>"> <!ENTITY enz "<abbrev>enz.</abbrev>"> <!ENTITY etc "<abbrev>etc.</abbrev>"> <!-- enz is beter --> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'s K-pictogram</title></objectinfo> - <imageobject><imagedata fileref='icon-file-to-be-filled-in' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon>"><!-- if image is localised, then entityref should be used instead - of fileref --> <!ENTITY kmenu "<guimenu>K</guimenu>-menu"> <!ENTITY LMB "<mousebutton>linkermuisknop</mousebutton>"> <!ENTITY MMB "<mousebutton>middelstemuisknop</mousebutton>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/nn/user.entities new/kdoctools-4.98.0/src/customization/nn/user.entities --- old/kdoctools-4.97.0/src/customization/nn/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/nn/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -40,14 +40,6 @@ <!ENTITY ie "<abbrev>dvs.</abbrev>"> <!ENTITY infocenter "<application>Infosenter</application>"> <!ENTITY kcontrolcenter "<application>&kde; Kontrollsenter</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>Ikonet til &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"><!-- if image is localised, then entityref should be used - instead of fileref --> <!ENTITY kmenu "<guimenu>K</guimenu> meny"> <!ENTITY LGPL "Lesser General Public License"><!-- Name of LGPL license --> <!ENTITY LMB "<mousebutton>venstre</mousebutton> museknapp"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/pl/user.entities new/kdoctools-4.98.0/src/customization/pl/user.entities --- old/kdoctools-4.97.0/src/customization/pl/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/pl/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,15 +19,6 @@ <!ENTITY Shift "<keycap>Shift</keycap>"> <!-- English: &Shift; --> <!ENTITY Tab "<keycap>Tab</keycap>"> -<!ENTITY kicon " -<guiicon> -<inlinemediaobject> - <objectinfo><title>Ikona K &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon>"><!-- if image is localised, then entityref should be used instead of fileref --> - <!ENTITY akregator-mianownik '<application>Akregator</application>'> <!ENTITY akregator-dopelniacz '<application>Akregatora</application>'> <!ENTITY akregator-celownik '<application>Akregatorowi</application>'> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/pt/user.entities new/kdoctools-4.98.0/src/customization/pt/user.entities --- old/kdoctools-4.97.0/src/customization/pt/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/pt/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -30,12 +30,5 @@ <!ENTITY OS "sistema operativo"> <!ENTITY Shift "<keycap>Shift</keycap>"> <!ENTITY Tab "<keycap>Tab</keycap>"> -<!ENTITY kicon '<guiicon> -<inlinemediaobject> - <objectinfo><title>O ícone K do &kde;</title></objectinfo> - <imageobject><imagedata fileref="common/kmenu.png" format="PNG"/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> - </guiicon> icon'> <!ENTITY kmenu "menu <guimenu>K</guimenu>"> <!ENTITY kinfocenter "<application>Centro de Informação do KDE</application>" > diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/pt-BR/user.entities new/kdoctools-4.98.0/src/customization/pt-BR/user.entities --- old/kdoctools-4.97.0/src/customization/pt-BR/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/pt-BR/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -20,14 +20,6 @@ <!ENTITY ie "isto é"> <!ENTITY infocenter "<application>Centro de informação</application>"> <!ENTITY kcontrolcenter "<application>Centro de Controle do &kde;</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>Ícone K do &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"><!-- if image is localised, then entityref should be used - instead of fileref --> <!ENTITY kmenu "menu <guimenu>K</guimenu>"> <!ENTITY BEM "botão <mousebutton>esquerdo</mousebutton> do mouse"> <!-- English: &LMB; --> <!ENTITY LMB "botão <mousebutton>esquerdo</mousebutton> do mouse"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/ro/entities/underLGPL.docbook new/kdoctools-4.98.0/src/customization/ro/entities/underLGPL.docbook --- old/kdoctools-4.97.0/src/customization/ro/entities/underLGPL.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/ro/entities/underLGPL.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,3 +1,3 @@ -<para>Acest program este licen�iat sub termenii <ulink -url="common/lgpl-license.html">Licen�ei Publice Generale Permisive GNU</ulink> +<para>Acest program este licenţiat sub termenii <ulink +url="common/lgpl-license.html">Licenţei Publice Generale Permisive GNU</ulink> (GNU Lesser General Public License).</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/ru/user.entities new/kdoctools-4.98.0/src/customization/ru/user.entities --- old/kdoctools-4.97.0/src/customization/ru/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/ru/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -21,14 +21,6 @@ (you may adapt the entity's name to transliterated Russian as well) --> <!ENTITY kcontrolcenter "<application>&kde; Control Center</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>K-нопка</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"><!-- if image is localised, then entityref should be used - instead of fileref --> <!ENTITY kmenu "<guimenu>K</guimenu>-меню"> <!ENTITY Shift "<keycap>Shift</keycap>"> <!ENTITY Alt "<keycap>Alt</keycap>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/sk/user.entities new/kdoctools-4.98.0/src/customization/sk/user.entities --- old/kdoctools-4.97.0/src/customization/sk/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/sk/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -13,12 +13,5 @@ <!ENTITY Alt "<keycap>Alt</keycap>"> <!ENTITY Esc "<keycap>Esc</keycap>"> <!ENTITY Backspace "<keycap>Backspace</keycap>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>veľké K</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> - </inlinemediaobject> - </guiicon>-Symbol"><!-- kicon --> <!ENTITY kmenu "<guimenu>K</guimenu> menu"> <!-- kmenu --> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/sq/user.entities new/kdoctools-4.98.0/src/customization/sq/user.entities --- old/kdoctools-4.97.0/src/customization/sq/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/sq/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,14 +19,6 @@ <!ENTITY ie "<abbrev>i.e.</abbrev>"> <!ENTITY infocenter "<application>Info Center</application>"> <!ENTITY kcontrolcenter "<application>&kde; Control Center</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'s K-icon</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"><!-- if image is localised, then entityref should be used - instead of fileref --> <!ENTITY kmenu "<guimenu>K</guimenu> menu"> <!ENTITY LMB "<mousebutton>left</mousebutton> mouse button"> <!ENTITY MMB "<mousebutton>middle</mousebutton> mouse button"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/th/user.entities new/kdoctools-4.98.0/src/customization/th/user.entities --- old/kdoctools-4.97.0/src/customization/th/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/th/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,14 +19,6 @@ <!ENTITY ie "<abbrev>คือ</abbrev>"> <!ENTITY infocenter "<application>ศูนย์ข้อมูล</application>"> <!ENTITY kcontrolcenter "<application>ศูนย์ควบคุม &kde;</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'s K-icon</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"><!-- if image is localised, then entityref should be used - instead of fileref --> <!ENTITY kmenu "เมนู <guimenu>K</guimenu>"> <!ENTITY LMB "ปุ่มเมาส์<mousebutton>ซ้าย</mousebutton>"> <!ENTITY MMB "ปุ่มเมาส์<mousebutton>กลาง</mousebutton>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/tr/entities/underArtisticLicense.docbook new/kdoctools-4.98.0/src/customization/tr/entities/underArtisticLicense.docbook --- old/kdoctools-4.97.0/src/customization/tr/entities/underArtisticLicense.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/tr/entities/underArtisticLicense.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,2 +1,2 @@ -<para>Bu yaz�l�m <ulink -url="common/artistic-license.html">Sanatsal Lisans</ulink> alt�nda da��t�lmaktad�r.</para> +<para>Bu yazýlým <ulink +url="common/artistic-license.html">Sanatsal Lisans</ulink> altýnda daðýtýlmaktadýr.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/tr/entities/underBSDLicense.docbook new/kdoctools-4.98.0/src/customization/tr/entities/underBSDLicense.docbook --- old/kdoctools-4.97.0/src/customization/tr/entities/underBSDLicense.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/tr/entities/underBSDLicense.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,2 +1,2 @@ -<para>Bu yaz�l�m, <ulink -url="common/bsd-license.html">BSD Lisans�</ulink> alt�nda da��t�lmaktad�r.</para> +<para>Bu yazýlým, <ulink +url="common/bsd-license.html">BSD Lisansý</ulink> altýnda daðýtýlmaktadýr.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/tr/entities/underX11License.docbook new/kdoctools-4.98.0/src/customization/tr/entities/underX11License.docbook --- old/kdoctools-4.97.0/src/customization/tr/entities/underX11License.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/tr/entities/underX11License.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,2 +1,2 @@ -<para>Bu yaz�l�m <ulink -url="common/x11-license.html">X11 Lisans�</ulink> alt�nda da��t�lmaktad�r.</para> +<para>Bu yazýlým <ulink +url="common/x11-license.html">X11 Lisansý</ulink> altýnda daðýtýlmaktadýr.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/tr/entities/update-doc.docbook new/kdoctools-4.98.0/src/customization/tr/entities/update-doc.docbook --- old/kdoctools-4.97.0/src/customization/tr/entities/update-doc.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/tr/entities/update-doc.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,4 +1,4 @@ -<!--<para>Kurulumdan sonra bu belgenin g�ncel s�r�mleri ��km�� olabilir. +<!--<para>Kurulumdan sonra bu belgenin güncel sürümleri çýkmýþ olabilir. <ulink url="http://docs.kde.org/page#&kappname;">http://docs.kde.org/page#&kappname;</ulink> -adresine bakarak daha yeni bir s�r�m�n olup olmad���n� kontrol edin.</para> --> +adresine bakarak daha yeni bir sürümün olup olmadýðýný kontrol edin.</para> --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/tr/user.entities new/kdoctools-4.98.0/src/customization/tr/user.entities --- old/kdoctools-4.97.0/src/customization/tr/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/tr/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -20,14 +20,6 @@ <!ENTITY ie "başka bir deyişle"> <!ENTITY kcontrolcenter "<application>&kde; Denetim Merkezi</application>"> <!ENTITY khelpcenter "<application>KDE Yardım Merkezi</application>"> -<!ENTITY kicon " -<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'nin K-simgesi</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"><!-- if image is localised, then entityref should be used instead of fileref --> <!ENTITY kmenu "<guimenu>K</guimenu> menü"> <!ENTITY LMB "farenin <mousebutton>sol</mousebutton> tuşu"> <!ENTITY MMB "farenin <mousebutton>orta</mousebutton> tuşu"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/uk/user.entities new/kdoctools-4.98.0/src/customization/uk/user.entities --- old/kdoctools-4.97.0/src/customization/uk/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/uk/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,14 +19,6 @@ <!ENTITY ie "<abbrev>тобто</abbrev>"> <!ENTITY infocenter "<application>Центр довідки</application>"> <!ENTITY kcontrolcenter "<application>Центр керування &kde;</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>K-піктограма &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"><!-- if image is localised, then entityref should be used - instead of fileref --> <!ENTITY kmenu "<guimenu>K-меню</guimenu>"> <!ENTITY LMB "<mousebutton>ліва</mousebutton> кнопка мишки"> <!ENTITY MMB "<mousebutton>середня</mousebutton> кнопка мишки"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/zh-CN/user.entities new/kdoctools-4.98.0/src/customization/zh-CN/user.entities --- old/kdoctools-4.97.0/src/customization/zh-CN/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/zh-CN/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -8,30 +8,22 @@ <!ENTITY Alt "<keycap>Alt</keycap>"> <!ENTITY Backspace "<keycap>Backspace</keycap>"> -<!ENTITY cdrom '<hardware>CD-ROM ������</hardware>'> +<!ENTITY cdrom '<hardware>CD-ROM 驱动器</hardware>'> <!ENTITY Ctrl "<keycap>Ctrl</keycap>"> <!ENTITY dpi '<acronym>dpi</acronym>'> -<!ENTITY eg "<abbrev>��</abbrev>"> +<!ENTITY eg "<abbrev>如</abbrev>"> <!ENTITY Enter "<keycap>Enter</keycap>"> <!ENTITY Esc "<keycap>Esc</keycap>"> -<!ENTITY etc "<abbrev>�ȵ�</abbrev>"> -<!ENTITY FAQ '����������'> +<!ENTITY etc "<abbrev>等等</abbrev>"> +<!ENTITY FAQ '常见问题解答'> <!ENTITY ie "<abbrev>i.e.</abbrev>"> -<!ENTITY infocenter "<application>��Ϣ����</application>"> -<!ENTITY kcontrolcenter "<application>&kde; ��������</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde; �� K ͼ��</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"><!-- if image is localised, then entityref should be used - instead of fileref --> -<!ENTITY kmenu "<guimenu>K</guimenu> �˵�"> -<!ENTITY LMB "���<mousebutton>��</mousebutton>��"> -<!ENTITY MMB "���<mousebutton>��</mousebutton>��"> -<!ENTITY OS "����ϵͳ"><!-- <acronym>OS</acronym>--> -<!ENTITY RMB "���<mousebutton>��</mousebutton>��"> +<!ENTITY infocenter "<application>信息中心</application>"> +<!ENTITY kcontrolcenter "<application>&kde; 控制中心</application>"> +<!ENTITY kmenu "<guimenu>K</guimenu> 菜单"> +<!ENTITY LMB "鼠标<mousebutton>左</mousebutton>键"> +<!ENTITY MMB "鼠标<mousebutton>中</mousebutton>键"> +<!ENTITY OS "操作系统"><!-- <acronym>OS</acronym>--> +<!ENTITY RMB "鼠标<mousebutton>右</mousebutton>键"> <!ENTITY Shift "<keycap>Shift</keycap>"> -<!ENTITY systemtray "<application>ϵͳ����</application>"> +<!ENTITY systemtray "<application>系统托盘</application>"> <!ENTITY Tab "<keycap>Tab</keycap>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/zh-TW/user.entities new/kdoctools-4.98.0/src/customization/zh-TW/user.entities --- old/kdoctools-4.97.0/src/customization/zh-TW/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/zh-TW/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -20,14 +20,6 @@ <!ENTITY infocenter "<application>KDE 資訊中心</application>"> <!ENTITY kcontrolcenter "<application>KDE 控制中心</application>"> <!ENTITY khelpcenter "<application>KDE 輔助中心</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>KDE 的 K 圖示</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> 圖示"><!-- if image is localised, then entityref should be used - instead of fileref --> <!ENTITY kmenu "<guimenu>K</guimenu> 選單"> <!ENTITY LMB "滑鼠<mousebutton>左鍵</mousebutton>"> <!ENTITY MMB "滑鼠<mousebutton>中鍵</mousebutton>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/man-template.docbook new/kdoctools-4.98.0/src/man-template.docbook --- old/kdoctools-4.97.0/src/man-template.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/man-template.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/meinproc.cpp new/kdoctools-4.98.0/src/meinproc.cpp --- old/kdoctools-4.97.0/src/meinproc.cpp 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/meinproc.cpp 2014-03-28 19:16:42.000000000 +0100 @@ -4,6 +4,7 @@ #include "meinproc_common.h" #include <QCoreApplication> +#include <QtCore/QDebug> #include <QtCore/QString> #include <QtCore/QFile> #include <QtCore/QDir> @@ -44,6 +45,8 @@ typedef QList<MyPair> PairList; +#define DIE(x) do { qCritical() << "Error:" << x; exit(1); } while (0) + void parseEntry(PairList &list, xmlNodePtr cur, int base) { if (!cur) { @@ -105,7 +108,6 @@ parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("stylesheet"), QCoreApplication::translate("main", "Stylesheet to use"), QStringLiteral("xsl"))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("stdout"), QCoreApplication::translate("main", "Output whole document to stdout"))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("o") << QStringLiteral("output"), QCoreApplication::translate("main", "Output whole document to file"), QStringLiteral("file"))); - parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("htdig"), QCoreApplication::translate("main", "Create a ht://dig compatible index"))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("check"), QCoreApplication::translate("main", "Check the document for validity"))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("cache"), QCoreApplication::translate("main", "Create a cache file for the document"), QStringLiteral("file"))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("srcdir"), QCoreApplication::translate("main", "Set the srcdir, for kdelibs"), QStringLiteral("dir"))); @@ -131,21 +133,23 @@ const QString checkFilename = parser.positionalArguments().first(); CheckFileResult ckr = checkFile(checkFilename); - if (ckr != CheckFileSuccess) { - if (ckr == CheckFileDoesNotExist) { - qWarning() << "File '" << checkFilename << "' does not exist."; - } else if (ckr == CheckFileIsNotFile) { - qWarning() << "'" << checkFilename << "' is not a file."; - } else if (ckr == CheckFileIsNotReadable) { - qWarning() << "File '" << checkFilename << "' is not readable."; - } - return (2); + switch (ckr) { + case CheckFileSuccess: + break; + case CheckFileDoesNotExist: + DIE("File" << checkFilename << "does not exist."); + case CheckFileIsNotFile: + DIE(checkFilename << "is not a file."); + case CheckFileIsNotReadable: + DIE("File" << checkFilename << "is not readable."); } if (parser.isSet(QStringLiteral("check"))) { - - QByteArray catalogs; - catalogs += getKDocToolsCatalogs().join(" ").toLocal8Bit(); + QStringList lst = getKDocToolsCatalogs(); + if (lst.isEmpty()) { + DIE("Could not find kdoctools catalogs"); + } + QByteArray catalogs = lst.join(" ").toLocal8Bit(); QString exe; #if defined( XMLLINT ) exe = QStringLiteral(XMLLINT); @@ -155,11 +159,13 @@ } CheckResult cr = check(checkFilename, exe, catalogs); - if (cr != CheckSuccess) { - if (cr == CheckNoXmllint) { - qWarning() << "couldn't find xmllint"; - } - return 1; + switch (cr) { + case CheckSuccess: + break; + case CheckNoXmllint: + DIE("Could not find xmllint"); + case CheckNoOut: + DIE("`xmllint --noout` outputted text"); } } @@ -167,16 +173,6 @@ xmlLoadExtDtdDefaultValue = 1; QVector<const char *> params; -#ifndef Q_OS_WIN - // libxslt parses the path given to outputFile as XPath expression which fails - // see libxslt/xsltEvalUserParams - // this parameter is used only by share/kdoctools5/docbook/xsl/html/math.xsl - // and is not supported on windows yet - if (parser.isSet(QStringLiteral("output"))) { - params.append(qstrdup("outputFile")); - params.append(qstrdup(parser.value(QStringLiteral("output")).toLocal8Bit().constData())); - } -#endif { const QStringList paramList = parser.values(QStringLiteral("param")); QStringList::ConstIterator it = paramList.constBegin(); @@ -185,8 +181,7 @@ const QString tuple = *it; const int ch = tuple.indexOf(QLatin1Char('=')); if (ch == -1) { - qWarning() << "Key-Value tuple '" << tuple << "' lacks a '='!"; - return (2); + DIE("Key-Value tuple" << tuple << "lacks a '='!"); } params.append(qstrdup(tuple.left(ch).toUtf8().constData())); params.append(qstrdup(tuple.mid(ch + 1).toUtf8().constData())); @@ -194,16 +189,15 @@ } params.append(NULL); - bool index = parser.isSet(QStringLiteral("htdig")); QString tss = parser.value(QStringLiteral("stylesheet")); if (tss.isEmpty()) { tss = QStringLiteral("customization/kde-chunk.xsl"); } - if (index) { - tss = QStringLiteral("customization/htdig_index.xsl"); - } - tss = locateFileInDtdResource(tss); + QString tssPath = locateFileInDtdResource(tss); + if (tssPath.isEmpty()) { + DIE("Unable to find the stylesheet named" << tss << "in dtd resources"); + } #ifndef MEINPROC_NO_KARCHIVE const QString cache = parser.value(QStringLiteral("cache")); #else @@ -215,59 +209,21 @@ const bool usingOutput = parser.isSet(QStringLiteral("output")); const QString outputOption = parser.value(QStringLiteral("output")); - if (index) { - xsltStylesheetPtr style_sheet = - xsltParseStylesheetFile((const xmlChar *)tss.toLatin1().data()); - - if (style_sheet != NULL) { - - xmlDocPtr doc = xmlParseFile(QFile::encodeName(checkFilename).constData()); - - xmlDocPtr res = xsltApplyStylesheet(style_sheet, doc, ¶ms[0]); - - xmlFreeDoc(doc); - xsltFreeStylesheet(style_sheet); - if (res != NULL) { - xmlNodePtr cur = xmlDocGetRootElement(res); - if (!cur || xmlStrcmp(cur->name, (const xmlChar *) "entry")) { - fprintf(stderr, "document of the wrong type, root node != entry"); - xmlFreeDoc(res); - return (1); - } - PairList list; - parseEntry(list, cur, 0); - int wi = 0; - for (PairList::ConstIterator it = list.constBegin(); it != list.constEnd(); - ++it, ++wi) - fprintf(stdout, "w\t%s\t%d\t%d\n", (*it).word.toUtf8().data(), - 1000 * wi / list.count(), (*it).base); - - xmlFreeDoc(res); - } else { - qWarning() << "couldn't parse document " << checkFilename; - } - } else { - qWarning() << "couldn't parse style sheet " << tss; - } - - } else { - QString output = transform(checkFilename, tss, params); - if (output.isEmpty()) { - fprintf(stderr, "unable to parse %s\n", checkFilename.toLocal8Bit().data()); - return (1); - } + QString output = transform(checkFilename, tssPath, params); + if (output.isEmpty()) { + DIE("Unable to parse" << checkFilename); + } #ifndef MEINPROC_NO_KARCHIVE - if (!cache.isEmpty()) { - if (!saveToCache(output, cache)) { - qWarning() << QCoreApplication::translate("main", "Could not write to cache file %1.").arg(cache); - } - goto end; + if (!cache.isEmpty()) { + if (!saveToCache(output, cache)) { + qWarning() << QCoreApplication::translate("main", "Could not write to cache file %1.").arg(cache); } + goto end; + } #endif - doOutput(output, usingStdOut, usingOutput, outputOption, true /* replaceCharset */); - } + doOutput(output, usingStdOut, usingOutput, outputOption, true /* replaceCharset */); #ifndef MEINPROC_NO_KARCHIVE end: #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/template.docbook new/kdoctools-4.98.0/src/template.docbook --- old/kdoctools-4.97.0/src/template.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/template.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!-- Define an entity for your application if it is not part of KDE Git --> <!ENTITY kmyapplication "<application>KMyApp</application>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/xslt.cpp new/kdoctools-4.98.0/src/xslt.cpp --- old/kdoctools-4.97.0/src/xslt.cpp 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/xslt.cpp 2014-03-28 19:16:42.000000000 +0100 @@ -145,7 +145,7 @@ defaultEntityLoader = xmlGetExternalEntityLoader(); xmlSetExternalEntityLoader(xsltprocExternalEntityLoader); - replaceURLList[QLatin1String("http://www.oasis-open.org/docbook/xml/4.2")] = QString("file:///%1").arg(DOCBOOK_XML_CURRDTD); + replaceURLList[QLatin1String("http://www.oasis-open.org/docbook/xml/4.5")] = QString("file:///%1").arg(DOCBOOK_XML_CURRDTD); } #endif @@ -373,48 +373,61 @@ QString locateFileInDtdResource(const QString &file, const QStandardPaths::LocateOptions option) { + const QStringList lst = locateFilesInDtdResource(file, option); + return lst.isEmpty() ? QString() : lst.first(); +} + +QStringList locateFilesInDtdResource(const QString &file, const QStandardPaths::LocateOptions option) +{ QFileInfo info(file); if (info.exists() && info.isAbsolute()) { - return file; + return QStringList() << file; } const QString srcdir = s_dtdDirs()->srcdir; if (!srcdir.isEmpty()) { const QString test = srcdir + QLatin1Char('/') + file; if (QFile::exists(test)) { - return test; + return QStringList() << test; } - qDebug() << "Could not locate file:" << file; - return QString(); + qDebug() << "Could not locate file" << file << "in" << srcdir; + return QStringList(); } - const QString result = QStandardPaths::locate(QStandardPaths::GenericDataLocation, + // Using locateAll() is necessary to be able to find all catalogs when + // running in environments where every repository is installed in its own + // prefix. + // This is the case on build.kde.org where kde4support installs catalogs + // in a different prefix than kdoctools. + const QStringList result = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kdoctools5/") + file, option); if (result.isEmpty()) { - qDebug() << "Could not locate file:" << file; + qDebug() << "Could not locate file" << file << "in standard dirs"; } return result; } QStringList getKDocToolsCatalogs() { - // find all catalogs as catalog*.xml, and add them to the list, - // starting from catalog.xml (the main one). - const QString customizationDirName = locateFileInDtdResource(QStringLiteral("customization"), - QStandardPaths::LocateDirectory); - if (customizationDirName.isEmpty()) { + // Find all catalogs as catalog*.xml, and add them to the list, starting + // from catalog.xml (the main one). + QStringList dirNames = locateFilesInDtdResource(QStringLiteral("customization"), + QStandardPaths::LocateDirectory); + if (dirNames.isEmpty()) { return QStringList(); } - QDir customizationDir = QDir(customizationDirName); - const QStringList catalogFileFilters(QStringLiteral("catalog*.xml")); - const QFileInfoList catalogInfoFiles = customizationDir.entryInfoList(catalogFileFilters, - QDir::Files | QDir::NoSymLinks, QDir::Name); QStringList catalogFiles; - foreach (const QFileInfo &fileInfo, catalogInfoFiles) { - const QString fullFileName = QUrl::fromLocalFile(fileInfo.absoluteFilePath()).toEncoded(); - if (fileInfo.fileName() == QStringLiteral("catalog.xml")) { - catalogFiles.prepend(fullFileName); - } else { - catalogFiles.append(fullFileName); + foreach (const QString &customizationDirName, dirNames) { + QDir customizationDir = QDir(customizationDirName); + const QStringList catalogFileFilters(QStringLiteral("catalog*.xml")); + const QFileInfoList catalogInfoFiles = customizationDir.entryInfoList(catalogFileFilters, + QDir::Files | QDir::NoSymLinks, QDir::Name); + foreach (const QFileInfo &fileInfo, catalogInfoFiles) { + const QString fullFileName = QUrl::fromLocalFile(fileInfo.absoluteFilePath()).toEncoded(); + if (fileInfo.fileName() == QStringLiteral("catalog.xml")) { + catalogFiles.prepend(fullFileName); + } else { + catalogFiles.append(fullFileName); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/xslt.h new/kdoctools-4.98.0/src/xslt.h --- old/kdoctools-4.97.0/src/xslt.h 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/xslt.h 2014-03-28 19:16:42.000000000 +0100 @@ -18,6 +18,7 @@ void setupStandardDirs(const QString &srcdir = QString()); QString locateFileInDtdResource(const QString &file, const QStandardPaths::LocateOptions option=QStandardPaths::LocateFile); +QStringList locateFilesInDtdResource(const QString &file, const QStandardPaths::LocateOptions option=QStandardPaths::LocateFile); QStringList getKDocToolsCatalogs(); #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de