[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: Regression alert for redhat.xsl (was Re: xsl redhat.xsl,1.1,1.2)



Hi Karsten,

With the xsl changes I submitted, the import of docbook.xsl happens only
in main-html-nochunk.xsl.  While main-html-chunks.xsl imports chunk.xsl.
>From what I could see online (through docbook doc and google searches),
we only needed one system import in our custom xsl.  So I replaced the
following three imports in the original main-html.xsl:

<xsl:import href="redhat.xsl"/>
<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/chunk-common.xsl"/>
<xsl:include href="/usr/share/sgml/docbook/xsl-stylesheets/html/manifest.xsl"/>
<xsl:include href="/usr/share/sgml/docbook/xsl-stylesheets/html/chunk-code.xsl"/>
<xsl:include href="html-common.xsl"/>

with just ...

<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl"/>
<xsl:import href="redhat.xsl"/>
<xsl:include href="html-common.xsl"/>

My rough understanding was that the local imports need to come after the
system imports so that the local settings overload system-wide settings.
So I think the order and type of imports in main-html.xsl is incorrect.
If you look inside chunk.xsl ... it already imports docbook.xsl,
chunk-common.xsl, manifest.xsl, and chunk-code.xsl.  I modified all our
Makefile's to use the new main-html-chunk.xsl and main-html-nochunk.xsl.
That would be my recommendation going forward.

Thoughts?
James Laska



On Wed, 2005-06-01 at 17:04 -0700, Karsten Wade wrote:
> For those not on the commits list ... or overwhelmed by the entries this
> week ...
> 
> I checked in a change to redhat.xsl that caused a build error in the
> install-guide module.  This change to the XSL had been to support the
> no-chunking (single HTML file output from DocBook) that James Laska
> patched.  The no-chunking is working great, but this particular change
> isn't.  This is me checking my local 1.2 against the 1.3 version that
> caused the regression:
> 
> [kwade erato xsl]$ diff -u redhat.xsl.~1.2.~ redhat.xsl
> --- redhat.xsl.~1.2.~   2003-10-01 12:02:56.000000000 -0700
> +++ redhat.xsl  2005-05-30 12:05:47.000000000 -0700
> @@ -7,7 +7,6 @@
>                 version="1.0"
>                  exclude-result-prefixes="exsl">
> 
> -<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl"/>
> 
>  <!-- This sets the extension for HTML files to ".html".     -->
>  <!-- (The stylesheet's default for XHTML files is ".xhtm".) -->
> 
> I reverted the XSL to 1.2 and tried it out locally.  Both the
> Installation Guide (chunking) and the Release Notes (no-chunking) built
> ok.  For the FC4 release, those are the only two we care about.
> 
> James, what problems did you have with the docbook.xsl being imported at
> that point in redhat.xsl?
> 
> - Karsten
> On Wed, 2005-06-01 at 19:58 -0400, Karsten Wade wrote:
> > Author: kwade
> > 
> > Update of /cvs/docs/xsl
> > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14057
> > 
> > Modified Files:
> > 	redhat.xsl 
> > Log Message:
> > This is probably the wrong way to do this, I reverted to 1.1 when I
> > meant to rever to 1.2, so I am now recommitting 1.2.  The version in
> > 1.3 caused a regression in the Installation Guide and I'm sure all
> > other guides.  Ver. 1.3 had removed the import of docbook.xsl, which
> > caused the build to fail.  I tested this version 1.2 on release-
> > notes/FC4/ and the install-guide/ and it seems to work with chunking
> > and non-chunking.  I will talk with jlaska and find out why he removed
> > this call ... I know it broke something for them.  Further regressions
> > are a possibility, just hopefully not in the only two documents that
> > we *must* have build for FC4.
> > 
> > 
> > Index: redhat.xsl
> > ===================================================================
> > RCS file: /cvs/docs/xsl/redhat.xsl,v
> > retrieving revision 1.1
> > retrieving revision 1.2
> > diff -u -r1.1 -r1.2
> > --- redhat.xsl	17 Jul 2003 19:48:07 -0000	1.1
> > +++ redhat.xsl	1 Jun 2005 23:58:27 -0000	1.2
> > @@ -1,4 +1,4 @@
> > -<!-- created by Tammy Fox tfox redhat com for the RHL Project -->
> > +<!-- created by Tammy Fox tfox redhat com for the Fedora Project -->
> >  <!-- License: GPL -->
> >  <!-- Copyright 2003 Tammy Fox, Red Hat, Inc. -->
> 
> 
> 
> -- 
> fedora-docs-list mailing list
> fedora-docs-list redhat com
> To unsubscribe: 
> http://www.redhat.com/mailman/listinfo/fedora-docs-list


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]