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

Re: {RFC] XSLT for draft watermarking?



On Wed, 2005-11-30 at 11:41 -0600, Tommy Reynolds wrote:
> Does this mean that document authors can't generate official document
> renderings?  Yes, if by that you mean "Fedora Documentation Project"
> official copies.  Anyone wanting to produce their own published
> renderings are free to take the "fedora-draft.css" stylesheet and
> edit as desired.
> 
> I would agree to change the XSLT and Makefile.common stuff to
> reference "fedora.css" and to make "fedora.css" a symlink to the
> "fedora-draft.css" file.  That would make switching the CSS
> stylesheet easier because a change would not corrupt the local CVS
> image. 

All sounds great to me!  As someone using the fedora/docs-common
toolchain for internal process documentation, I would very much like the
ability to overload with a custom *production* css.  As you suggest, I
think it makes sense to not have that information live in the document.
I like the XSLHTML and XSLHTMLNOCHUNK environment variable approach
because it allows us to keep in sync with fdp docs-common and use our
own xsl tweaks when it comes to *production*.

I made a few Makefile.common changes that allow for passing in a CSS env
var that points to a css file.  That file is then copied over as
fedora.css.  I would have liked to use ${DOCBASE}.css but I can't figure
out how to use variables in the html-common.xsl.  I have attached those
changes just to show where I was headed.

Thoughts/concerns?

Thanks,
James Laska
-- 
==========================================
 James Laska         -- jlaska redhat com
 Quality Engineering -- Red Hat, Inc.
==========================================

Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.15
diff -u -u -r1.15 Makefile.common
--- Makefile.common	29 Nov 2005 21:42:28 -0000	1.15
+++ Makefile.common	30 Nov 2005 18:41:50 -0000
@@ -43,6 +43,9 @@
 ifeq	(${XSLHTMLNOCHUNKS},)
 XSLHTMLNOCHUNKS	= ${FDPDIR}/docs-common/xsl/main-html-nochunks.xsl
 endif
+ifeq	(${CSS},)
+CSS        	= ${FDPDIR}/docs-common/css/fedora-draft.css
+endif
 #########################################################################
 # Define a macro to locate xmlto(1) so we can choose a specific version
 # by "make XMLTO=/path/to/xmlto", if we so desire.
@@ -64,7 +67,7 @@
 #  LANG=en.UTF-8 ${XMLTO} html -x $(XSLHTML) -o mydoc-en mydoc-en.xml
 #  mkdir -p mydoc-en/stylesheet-images
 #  cp ${FDPDIR}/docs-common/stylesheet-images/*.png mydoc-en/stylesheet-images/
-#  cp ${FDPDIR}/docs-common/css/fedora*.css mydoc-en/
+#  cp ${CSS} mydoc-en/
 #  cp ${FDPDIR}/docs-common/images/watermark.png mydoc-en/
 #  mkdir -p mydoc-en/figs
 #  cp -p figs/*-${LANG}.* mydoc-en/figs
@@ -77,7 +80,7 @@
 	LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1) $(DOCBASE)-$(1).xml
 	mkdir -p $(DOCBASE)-$(1)/stylesheet-images/
 	cp ${FDPDIR}/docs-common/stylesheet-images/*.png $(DOCBASE)-$(1)/stylesheet-images
-	cp ${FDPDIR}/docs-common/css/fedora*.css $$(DOCBASE)-$(1)/
+	cp ${CSS} $$(DOCBASE)-$(1)/fedora.css
 	cp ${FDPDIR}/docs-common/images/watermark.png $${DOCBASE}-$(1)/
 	[ ! -d figs ] || (						\
 		mkdir -p ${DOCBASE}-$(1)/figs;				\
@@ -99,7 +102,7 @@
 	${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(DOCBASE)-$(1).xml
 	mkdir -p stylesheet-images/
 	cp ${FDPDIR}/docs-common/stylesheet-images/*.png stylesheet-images/
-	cp ${FDPDIR}/docs-common/css/fedora*.css .
+	cp ${CSS} fedora.css
 	cp ${FDPDIR}/docs-common/images/watermark.png .
 endef
 #
@@ -139,7 +142,7 @@
 	${RM} -r ${DOCBASE}-$(1).html stylesheet-images
 	${RM} -r ${DOCBASE}-$(1).pdf
 	${RM} -r ${DOCBASE}-$(1).tar.gz
-	${RM} fedora*.css watermark.png
+	${RM} fedora.css watermark.png
 endef
 #
 distclean clean:: $(foreach LANG,${LANGUAGES},${DOCBASE}-${LANG}-clean)
Index: xsl/html-common.xsl
===================================================================
RCS file: /cvs/docs/docs-common/xsl/html-common.xsl,v
retrieving revision 1.10
diff -u -u -r1.10 html-common.xsl
--- xsl/html-common.xsl	29 Nov 2005 21:42:39 -0000	1.10
+++ xsl/html-common.xsl	30 Nov 2005 18:41:50 -0000
@@ -25,7 +25,7 @@
 
 <xsl:output method="html" indent="no"/>
 
-<xsl:param name="html.stylesheet" select="'fedora-draft.css'"></xsl:param>
+<xsl:param name="html.stylesheet" select="'fedora.css'"></xsl:param>
 <xsl:param name="html.stylesheet.type">text/css</xsl:param>
 
 <xsl:param name="html.cleanup" select="1"></xsl:param>

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