This is a multi-part message in MIME format. --------------090405010402050201010905 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, as you probably know, I am working to remove the embedded copies of DocBook XML (done) and XSLT from kdelibs/kdoctools. If you missed the previous episodes, please check here: http://kde.markmail.org/thread/rp6gj6evd3zwgl3j In order to remove our copy of XSLT stylesheets, customizations made directly to kdoctools/docbook/xsl have to be moved inside kdoctools/customization. The changes that needs to be made can be divided into two categories: 1) l10n-related changes. They are a but tricky, but I think that I figured out how to handle them inside customization (two custom l10n.xml must be created, one for languages and the other for our language customizations; they names are used to overwrite to values for 'l10n.xml' and 'local.l10n.xml'). I will write a more detailed email (with a first patch) in the next days, but I'd like to first fix point 2). 2) other changes. xsl_diff_167.txt shows the diff between original DocBook XSLT 1.67 and our copy. kde-custom-xslt1.diff contains my proposal to cleanup our copy. Just a few comments on the patch: * common/l10n.xsl : gentext.footer-doc-comment, gentext.footer-doc-feedback and gentext.footer-doc-teamname have been moved to customization/kde-navig.xsl, where they are really used * html/chunk-common.xsl: the custom content has been moved (with a bit of magic) to customization/kde-chunk-common.xsl, which contains shared templates for kde-chunk.xsl, kde-chunk-online.xsl and kde-nochunk.xsl. * kde-include-*.xsl: these new files contain the common includes to all kde-*xsl. I have isolated them because in the (not so far) future these files will be created by cmake and they will contain the path to system-installed stylesheets. I have also some question: - There are two versions of kde-navig-online.xsl and kde-chunk-online.xsl, the first one under kdelibs/kdoctools/customization (with the other stylesheets), the other one under www/areas/docs/; the latter ones seem to be more updated. Would it be possible to keep only one copy of them? - Is kde-man.xsl still used? KDE4_CREATE_MANPAGE refers to docbook/xsl/manpages/docbook.xsl... Regards -- Luigi --------------090405010402050201010905 Content-Type: text/x-patch; name="kde-custom-xslt1.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="kde-custom-xslt1.diff" Index: kdelibs/kdoctools/docbook/xsl/html/chunk-common.xsl =================================================================== --- kdelibs/kdoctools/docbook/xsl/html/chunk-common.xsl (revision 1140347) +++ kdelibs/kdoctools/docbook/xsl/html/chunk-common.xsl (working copy) @@ -983,7 +983,6 @@ -
@@ -995,9 +994,7 @@ -
- -
+ @@ -1008,7 +1005,6 @@ -
Index: kdelibs/kdoctools/docbook/xsl/common/l10n.xsl =================================================================== --- kdelibs/kdoctools/docbook/xsl/common/l10n.xsl (revision 1140347) +++ kdelibs/kdoctools/docbook/xsl/common/l10n.xsl (working copy) @@ -292,25 +292,7 @@ - - - - - - - - - - - - - - - - - - Index: kdelibs/kdoctools/customization/kde-include-common.xsl =================================================================== --- kdelibs/kdoctools/customization/kde-include-common.xsl (revision 0) +++ kdelibs/kdoctools/customization/kde-include-common.xsl (revision 0) @@ -0,0 +1,7 @@ + + + + + + Index: kdelibs/kdoctools/customization/kde-chunk-online.xsl =================================================================== --- kdelibs/kdoctools/customization/kde-chunk-online.xsl (revision 1140347) +++ kdelibs/kdoctools/customization/kde-chunk-online.xsl (working copy) @@ -1,8 +1,7 @@ - - + @@ -46,27 +45,6 @@ - - - - - - - - - index.html - - - - - - - - - - - - + <div id="content"> + + + + <div id="contentBody"> + + + </div> + + + + </div> + + + Index: kdelibs/kdoctools/customization/kde-man.xsl =================================================================== --- kdelibs/kdoctools/customization/kde-man.xsl (revision 1140347) +++ kdelibs/kdoctools/customization/kde-man.xsl (working copy) @@ -1,11 +1,12 @@ - + - + + Index: kdelibs/kdoctools/customization/kde-nochunk.xsl =================================================================== --- kdelibs/kdoctools/customization/kde-nochunk.xsl (revision 1140347) +++ kdelibs/kdoctools/customization/kde-nochunk.xsl (working copy) @@ -1,8 +1,7 @@ - - + @@ -25,26 +24,6 @@ - - - - - - - - index.html - - - - - - - - - - - -