Browse Source

Update files and references in support of bug report 1446.

tags/r14.0.0
Darrell Anderson 6 years ago
parent
commit
d6ee27dacd
33 changed files with 44 additions and 44 deletions
  1. +1
    -1
      doc/common/CMakeLists.txt
  2. +3
    -3
      doc/common/Makefile.am
  3. +1
    -1
      doc/common/artistic-license.html
  4. +1
    -1
      doc/common/bsd-license.html
  5. +1
    -1
      doc/common/fdl-license.html
  6. +1
    -1
      doc/common/gpl-license.html
  7. +1
    -1
      doc/common/header.html
  8. +1
    -1
      doc/common/lgpl-license.html
  9. +1
    -1
      doc/common/mainheader.html
  10. +1
    -1
      doc/common/qpl-license.html
  11. +0
    -0
      doc/common/tde-common.css
  12. +0
    -0
      doc/common/tde-default.css
  13. +1
    -1
      doc/common/tde-localised.css.template
  14. +0
    -0
      doc/common/tde-web.css
  15. +0
    -0
      doc/common/tde.css
  16. +1
    -1
      doc/common/x11-license.html
  17. +1
    -1
      doc/tdelibs/Makefile.am
  18. +1
    -1
      kdoctools/configure.in.in
  19. +10
    -10
      kdoctools/customization/README
  20. +4
    -4
      kdoctools/customization/tde-chunk-online.xsl
  21. +4
    -4
      kdoctools/customization/tde-chunk.xsl
  22. +0
    -0
      kdoctools/customization/tde-man.xsl
  23. +0
    -0
      kdoctools/customization/tde-navig-online.xsl
  24. +0
    -0
      kdoctools/customization/tde-navig.xsl
  25. +3
    -3
      kdoctools/customization/tde-nochunk.xsl
  26. +0
    -0
      kdoctools/customization/tde-style.xsl
  27. +0
    -0
      kdoctools/customization/tde-ttlpg-online.xsl
  28. +0
    -0
      kdoctools/customization/tde-ttlpg.xsl
  29. +0
    -0
      kdoctools/customization/tde-web-navig.xsl
  30. +3
    -3
      kdoctools/customization/tde-web.xsl
  31. +1
    -1
      kdoctools/meinproc.cpp
  32. +2
    -2
      kdoctools/tdeio_help.cpp
  33. +1
    -1
      kdoctools/xslt.cpp

+ 1
- 1
doc/common/CMakeLists.txt View File

@@ -15,7 +15,7 @@ install( FILES
artistic-license.html bottom1.png bottom2.png
bsd-license.html doctop1.png doctop2.png fdl-license
fdl-license.html gpl-license gpl-license.html
kde-common.css kde-default.css kde-web.css kde-localised.css.template
tde-common.css tde-default.css tde-web.css tde-localised.css.template
lgpl-license lgpl-license.html qpl-license.html shadow.png
web-docbottom.png x11-license.html xml.dcl web-doctop.png
doctop1a.png doctop1b.png 1.png 2.png 3.png 4.png

+ 3
- 3
doc/common/Makefile.am View File

@@ -1,4 +1,4 @@
# logotp3.png, logotp3-small.png and kde-localised.css.template
# logotp3.png, logotp3-small.png and tde-localised.css.template
# are not included in the language-specific common directory
# They serve only as `reference' versions.

@@ -6,8 +6,8 @@ commondir = $(kde_htmldir)/en/common

common_DATA = artistic-license.html bottom1.png bottom2.png bsd-license.html \
doctop1.png doctop2.png fdl-license fdl-license.html gpl-license \
gpl-license.html kde-common.css kde-default.css kde-web.css \
kde-localised.css.template lgpl-license lgpl-license.html \
gpl-license.html tde-common.css tde-default.css tde-web.css \
tde-localised.css.template lgpl-license lgpl-license.html \
qpl-license.html shadow.png web-docbottom.png \
x11-license.html xml.dcl web-doctop.png \
doctop1a.png doctop1b.png 1.png 2.png 3.png 4.png 5.png 6.png \

+ 1
- 1
doc/common/artistic-license.html View File

@@ -9,7 +9,7 @@
<META NAME="keywords" CONTENT="Artistic, artistic, Artistic License, Artistic license, Artisticlicense, artistic license, artisticlicense, Artistic Licence, Artistic licence, Artisticlicence, artistic licence, artisticlicence, license, licence, software, softwarelicense">
<META NAME="robots" CONTENT="none">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
<LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
</HEAD>
<BODY CLASS="license">
<H1>The "Artistic License"</H1>

+ 1
- 1
doc/common/bsd-license.html View File

@@ -9,7 +9,7 @@
<META NAME="keywords" CONTENT="BSD, bsd, Bsd, license, licence, software, free software, softwarelicense, BSD Software license">
<META NAME="robots" CONTENT="none">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
<LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
</HEAD>
<BODY CLASS="license">
<H1>BSD License</H1>

+ 1
- 1
doc/common/fdl-license.html View File

@@ -9,7 +9,7 @@
<META NAME="keywords" CONTENT="gnu, Gnu, GNU, license, licence, software, free software, software license, software licence, GNU general public license, GNU General Public License, documentation licence, documentation license, documentation, GNU free documentation license, GNU Free Documentation License">
<META NAME="robots" CONTENT="none">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
<LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
</HEAD>
<BODY CLASS="license">
<h3>GNU Free Documentation License</h3>

+ 1
- 1
doc/common/gpl-license.html View File

@@ -9,7 +9,7 @@
<META NAME="keywords" CONTENT="gnu, Gnu, GNU, license, licence, software, free software, software license, software licence, GNU general public license, GNU General Public License">
<META NAME="robots" CONTENT="none">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
<LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
</HEAD>
<BODY CLASS="license">
<H1>GNU General Public License</H1>

+ 1
- 1
doc/common/header.html View File

@@ -20,7 +20,7 @@
<link rel="shortcut icon" href="@topdir@/favicon.ico" /><link rel="icon" href="@topdir@/favicon.ico" />
<link rel="stylesheet" type="text/css" href="@topdir@/doxygen.css" />
<link rel="stylesheet" type="text/css" href="@topdir@/tabs.css" />
<link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/kde.css" />
<link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/tde.css" />
<link rel="stylesheet" media="print, embossed" type="text/css" href="@topdir@/print.css" />
<link rel="stylesheet" media="screen, aural, handheld, tty, braille" type="text/css" title="Flat" href="@topdir@/flat.css" />
</head>

+ 1
- 1
doc/common/lgpl-license.html View File

@@ -9,7 +9,7 @@
<META NAME="keywords" CONTENT="gnu, Gnu, GNU, license, licence, software, free software, software license, software licence, GNU general public license, GNU General Public License, library licence, library license, software library, software libraries, GNU lesser general public license, GNU Lesser General Public License">
<META NAME="robots" CONTENT="none">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
<LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
</HEAD>
<BODY CLASS="license">
<H1>GNU LESSER GENERAL PUBLIC LICENSE</H1>

+ 1
- 1
doc/common/mainheader.html View File

@@ -20,7 +20,7 @@
<link rel="shortcut icon" href="@topdir@/favicon.ico" /><link rel="icon" href="@topdir@/favicon.ico" />
<link rel="stylesheet" type="text/css" href="@topdir@/doxygen.css" />
<link rel="stylesheet" type="text/css" href="@topdir@/tabs.css" />
<link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/kde.css" />
<link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/tde.css" />
<link rel="stylesheet" media="print, embossed" type="text/css" href="@topdir@/print.css" />
<link rel="stylesheet" media="screen, aural, handheld, tty, braille" type="text/css" title="Flat" href="@topdir@/flat.css" />
</head>

+ 1
- 1
doc/common/qpl-license.html View File

@@ -9,7 +9,7 @@
<META NAME="keywords" CONTENT="Q, q, Q Public License, Q public license, q public license, public license, Q Public Licence, Q public licence, q public licence, public licence, license, licence, software, softwarelicense, Troll, troll, Troll License, troll license, Troll Licence, troll licence">
<META NAME="robots" CONTENT="none">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
<LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
</HEAD>
<BODY CLASS="license">
<H1>The Q Public License</H1>

doc/common/kde-common.css → doc/common/tde-common.css View File


doc/common/kde-default.css → doc/common/tde-default.css View File


doc/common/kde-localised.css.template → doc/common/tde-localised.css.template View File

@@ -20,7 +20,7 @@
*/

/*
These settings will override kde-default.css.
These settings will override tde-default.css.

Any updates should be validated, e.g. http://jigsaw.w3.org/css-validator/


doc/common/kde-web.css → doc/common/tde-web.css View File


doc/common/kde.css → doc/common/tde.css View File


+ 1
- 1
doc/common/x11-license.html View File

@@ -9,7 +9,7 @@
<META NAME="keywords" CONTENT="X, x, X Window, x window, X Windows, x windows, X Window System License, x window system license, X Window System Licence, x window system licence, X11R6.4, x11r6.4, x11r64, license, licence, software, softwarelicense">
<META NAME="robots" CONTENT="none">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
<LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
</HEAD>
<BODY CLASS="license">
<H1>X Window System License - X11R6.4</H1>

+ 1
- 1
doc/tdelibs/Makefile.am View File

@@ -1,5 +1,5 @@
KDE_LANG = en
KDE_MANS = AUTO
KDE_XSL_MAN_STYLESHEET = $(top_srcdir)/kdoctools/customization/kde-man.xsl
KDE_XSL_MAN_STYLESHEET = $(top_srcdir)/kdoctools/customization/tde-man.xsl

KDE_DOCS_DEPS = $(MEINPROC_DEP)

+ 1
- 1
kdoctools/configure.in.in View File

@@ -78,7 +78,7 @@ KDOCTOOLS_CHECK_BZIP2
if test -n "$HELP_SUBDIR"; then
MEINPROC='$(top_builddir)/kdoctools/meinproc --srcdir=$(top_srcdir)/kdoctools'
MEINPROC_DEP='$(top_builddir)/kdoctools/meinproc'
KDE_XSL_STYLESHEET='$(top_srcdir)/kdoctools/customization/kde-chunk.xsl'
KDE_XSL_STYLESHEET='$(top_srcdir)/kdoctools/customization/tde-chunk.xsl'
else
MEINPROC=""
MEINPROC_DEP=""

+ 10
- 10
kdoctools/customization/README View File

@@ -1,38 +1,38 @@
2002-11-12
Some short documentation on the different stylesheets, and how to use them.

kde-chunk.xsl
tde-chunk.xsl

The standard TDE stylesheet, as used to generate the content for
KHelpCenter. If you do not specify a stylesheet, this is the default.

This stylesheet includes kde-navig.xsl, which controls the
This stylesheet includes tde-navig.xsl, which controls the
presentation of the top and bottom of the page graphics, and is reused
in other places. You should probably not call kde-navig.xsl on it's own.
in other places. You should probably not call tde-navig.xsl on it's own.

kde-nochunk.xsl
tde-nochunk.xsl

This is very similar to the standard TDE stylesheet, but it creates
one single html file for the entire document. This is one way to get
print output, using html2pdf or html2ps. It's also useable to create
a "printable version" of a document to link to on a website.

kde-style.xsl
tde-style.xsl

All TDE "look and feel" customizations (other than the navigation
graphics in kde-navig.xsl) are here. This is where changes to how
graphics in tde-navig.xsl) are here. This is where changes to how
things render are placed. In most cases, the actual rendering is
controlled by the CSS files, and this file simply has the instructions
to ensure class attributes are written into the HTML as necessary, for
the CSS to display.

kde-ttlpg.xsl
tde-ttlpg.xsl

The Title Page layout for the TDE documentation. This one covers
customizing the TOC, presentation of legal notices, and a slightly
different navigation graphic.

kde-web.xsl
tde-web.xsl
(This stylesheet includes kde-web-navig.xsl, which should not be used
directly on it's own)

@@ -41,14 +41,14 @@ is constrained to a 680px wide table. You could use this for example,
to generate web pages that will print nicely and display on older
browsers nicely.

kde-chunk-online.xsl
tde-chunk-online.xsl
(This stylesheet includes kde-web-navig-online.xsl, which should not
be used directly on it's own)

Slightly altered version of the TDE stylesheet, used to generate the
website versions, among others.

kde-man.xsl
tde-man.xsl

A stylesheet for generating *roff output (for manpages) from DocBook
files. It's virtually the same as the original manpages/docbook.xsl file

kdoctools/customization/kde-chunk-online.xsl → kdoctools/customization/tde-chunk-online.xsl View File

@@ -3,9 +3,9 @@

<xsl:import href="../docbook/xsl/html/autoidx.xsl"/>
<xsl:import href="../docbook/xsl/html/chunk.xsl"/>
<xsl:include href="kde-navig-online.xsl"/>
<xsl:include href="kde-ttlpg-online.xsl"/>
<xsl:include href="kde-style.xsl"/>
<xsl:include href="tde-navig-online.xsl"/>
<xsl:include href="tde-ttlpg-online.xsl"/>
<xsl:include href="tde-style.xsl"/>
<xsl:output encoding="utf-8"/>

<xsl:variable name="TDE_VERSION">1.13</xsl:variable>
@@ -42,7 +42,7 @@
<xsl:param name="use.extensions">0</xsl:param>
<xsl:param name="admon.graphics">0</xsl:param>
<xsl:param name="kde.common">/HEAD/common/</xsl:param>
<xsl:param name="html.stylesheet" select="concat($kde.common,'kde-default.css')"/>
<xsl:param name="html.stylesheet" select="concat($kde.common,'tde-default.css')"/>
<xsl:param name="admon.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>
<xsl:param name="callout.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>


kdoctools/customization/kde-chunk.xsl → kdoctools/customization/tde-chunk.xsl View File

@@ -3,9 +3,9 @@

<xsl:import href="../docbook/xsl/html/autoidx.xsl"/>
<xsl:import href="../docbook/xsl/html/chunk.xsl"/>
<xsl:include href="kde-navig.xsl"/>
<xsl:include href="kde-ttlpg.xsl"/>
<xsl:include href="kde-style.xsl"/>
<xsl:include href="tde-navig.xsl"/>
<xsl:include href="tde-ttlpg.xsl"/>
<xsl:include href="tde-style.xsl"/>

<xsl:variable name="TDE_VERSION">1.13</xsl:variable>

@@ -41,7 +41,7 @@
<xsl:param name="use.extensions">0</xsl:param>
<xsl:param name="admon.graphics">0</xsl:param>
<xsl:param name="kde.common">help:/common/</xsl:param>
<xsl:param name="html.stylesheet" select="concat($kde.common,'kde-default.css')"/>
<xsl:param name="html.stylesheet" select="concat($kde.common,'tde-default.css')"/>
<xsl:param name="admon.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>
<xsl:param name="callout.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>


kdoctools/customization/kde-man.xsl → kdoctools/customization/tde-man.xsl View File


kdoctools/customization/kde-navig-online.xsl → kdoctools/customization/tde-navig-online.xsl View File


kdoctools/customization/kde-navig.xsl → kdoctools/customization/tde-navig.xsl View File


kdoctools/customization/kde-nochunk.xsl → kdoctools/customization/tde-nochunk.xsl View File

@@ -4,8 +4,8 @@
<xsl:import href="../docbook/xsl/html/autoidx.xsl"/>
<xsl:import href="../docbook/xsl/html/docbook.xsl"/>
<!-- <xsl:include href="kde-print-navig.xsl"/> -->
<xsl:include href="kde-ttlpg.xsl"/>
<xsl:include href="kde-style.xsl"/>
<xsl:include href="tde-ttlpg.xsl"/>
<xsl:include href="tde-style.xsl"/>

<xsl:variable name="TDE_VERSION">1.13</xsl:variable>

@@ -20,7 +20,7 @@
<xsl:param name="use.extensions">0</xsl:param>
<xsl:param name="admon.graphics">0</xsl:param>
<xsl:param name="kde.common">../common/</xsl:param>
<xsl:param name="html.stylesheet" select="concat($kde.common,'kde-web.css')"/>
<xsl:param name="html.stylesheet" select="concat($kde.common,'tde-web.css')"/>
<xsl:param name="admon.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>
<xsl:param name="callout.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>


kdoctools/customization/kde-style.xsl → kdoctools/customization/tde-style.xsl View File


kdoctools/customization/kde-ttlpg-online.xsl → kdoctools/customization/tde-ttlpg-online.xsl View File


kdoctools/customization/kde-ttlpg.xsl → kdoctools/customization/tde-ttlpg.xsl View File


kdoctools/customization/kde-web-navig.xsl → kdoctools/customization/tde-web-navig.xsl View File


kdoctools/customization/kde-web.xsl → kdoctools/customization/tde-web.xsl View File

@@ -4,8 +4,8 @@
<xsl:import href="../docbook/xsl/html/autoidx.xsl"/>
<xsl:import href="../docbook/xsl/html/chunk.xsl"/>
<xsl:include href="kde-web-navig.xsl"/>
<xsl:include href="kde-ttlpg.xsl"/>
<xsl:include href="kde-style.xsl"/>
<xsl:include href="tde-ttlpg.xsl"/>
<xsl:include href="tde-style.xsl"/>

<xsl:variable name="TDE_VERSION">1.13</xsl:variable>

@@ -41,7 +41,7 @@
<xsl:param name="use.extensions">0</xsl:param>
<xsl:param name="admon.graphics">0</xsl:param>
<xsl:param name="kde.common">../common/</xsl:param>
<xsl:param name="html.stylesheet" select="concat($kde.common,'kde-default.css')"/>
<xsl:param name="html.stylesheet" select="concat($kde.common,'tde-default.css')"/>
<xsl:param name="admon.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>
<xsl:param name="callout.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>


+ 1
- 1
kdoctools/meinproc.cpp View File

@@ -226,7 +226,7 @@ int main(int argc, char **argv) {
bool index = args->isSet( "htdig" );
TQString tss = args->getOption( "stylesheet" );
if ( tss.isEmpty() )
tss = "customization/kde-chunk.xsl";
tss = "customization/tde-chunk.xsl";
if ( index )
tss = "customization/htdig_index.xsl" ;


+ 2
- 2
kdoctools/tdeio_help.cpp View File

@@ -209,7 +209,7 @@ void HelpProtocol::get( const KURL& url )
infoMessage(i18n("Preparing document"));

if ( mGhelp ) {
TQString xsl = "customization/kde-nochunk.xsl";
TQString xsl = "customization/tde-nochunk.xsl";
mParsed = transform(file, locate("dtd", xsl));

kdDebug( 7119 ) << "parsed " << mParsed.length() << endl;
@@ -235,7 +235,7 @@ void HelpProtocol::get( const KURL& url )
kdDebug( 7119 ) << "cached parsed " << mParsed.length() << endl;

if ( mParsed.isEmpty() ) {
mParsed = transform(file, locate("dtd", "customization/kde-chunk.xsl"));
mParsed = transform(file, locate("dtd", "customization/tde-chunk.xsl"));
if ( !mParsed.isEmpty() ) {
infoMessage( i18n( "Saving to cache" ) );
TQString cache = file.left( file.length() - 7 );

+ 1
- 1
kdoctools/xslt.cpp View File

@@ -235,7 +235,7 @@ static bool readCache( const TQString &filename,
kdDebug( 7119 ) << "verifyCache " << filename << " " << cache << endl;
if ( !compareTimeStamps( filename, cache ) )
return false;
if ( !compareTimeStamps( locate( "dtd", "customization/kde-chunk.xsl"), cache ) )
if ( !compareTimeStamps( locate( "dtd", "customization/tde-chunk.xsl"), cache ) )
return false;

kdDebug( 7119 ) << "create filter" << endl;

Loading…
Cancel
Save