# HG changeset patch
# User jlarmour
# Date 1051830051 0
# Node ID e8c26a87a317888f024566f7d161d36ad9167866
# Parent  82f8569b6d403436e52dfcc06bde114dbfcda20b
	* pkgconf/rules.doc: Use three stylesheets instead of one.
	One for HTML the other for PDF-letter and the third one for PDF-A4
	format. (Stylesheets do not support two printable targets in
	same stylesheet). Added copyfiles to PDF targets.
	* pkgconf/ssletter.dsl: New file.
	* pkgconf/ssa4.dsl: New file.
	* pkgconf/stylesheet.dsl: remove print stylesheet.

diff --git a/packages/ChangeLog b/packages/ChangeLog
--- a/packages/ChangeLog
+++ b/packages/ChangeLog
@@ -1,3 +1,13 @@
+2003-03-23  Iztok Zupet  <iz@vsr.si>
+
+	* pkgconf/rules.doc: Use three stylesheets instead of one.
+	One for HTML the other for PDF-letter and the third one for PDF-A4
+	format. (Stylesheets do not support two printable targets in 
+	same stylesheet). Added copyfiles to PDF targets.
+	* pkgconf/ssletter.dsl: New file.
+	* pkgconf/ssa4.dsl: New file.
+	* pkgconf/stylesheet.dsl: remove print stylesheet.
+
 2003-04-24  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* ecos.db: Shorten some long target names to stop them overrunning
diff --git a/packages/pkgconf/rules.doc b/packages/pkgconf/rules.doc
--- a/packages/pkgconf/rules.doc
+++ b/packages/pkgconf/rules.doc
@@ -77,7 +77,10 @@ else
     endif
   endif
 endif
-ECOS_STYLESHEET  := $(TOPLEVEL)/pkgconf/stylesheet.dsl
+
+A4_STYLESHEET  := $(TOPLEVEL)/pkgconf/ssa4.dsl
+LETTER_STYLESHEET  := $(TOPLEVEL)/pkgconf/ssletter.dsl
+HTML_STYLESHEET  := $(TOPLEVEL)/pkgconf/stylesheet.dsl
 FIXHTML          := $(TOPLEVEL)/pkgconf/fixhtml.tcl
 
 # The files that will be generated:
@@ -88,6 +91,9 @@ ifeq (,$(MAIN_PDF))
  MAIN_PDF         := $(subst .sgml,.pdf,$(MAIN_SGML))
 endif
 
+MAIN_PDFA4        := $(subst .pdf,-a4.pdf,$(MAIN_PDF))
+MAIN_PDFLETTER    := $(subst .pdf,-letter.pdf,$(MAIN_PDF))
+
 # Rules for generating pictures
 GIFS := $(foreach x,$(PICTURES),$(x).gif)
 EPS  := $(foreach x,$(PICTURES),$(x).eps)
@@ -96,6 +102,9 @@ PNGS :=$(foreach x,$(PICTURES),$(x).png)
 %.gif: %.fig
 	convert -crop 0x0 $< $@
 
+%.png: %.fig
+	fig2dev -L png $< $@
+
 %.eps: %.fig
 	convert -crop 0x0 $< $@
 
@@ -118,18 +127,26 @@ check: $(MAIN_SGML) $(OTHER_SGML) $(GIFS
 # can be ignored.
 html: copyfiles $(MAIN_HTML)
 
-$(MAIN_HTML): $(MAIN_SGML) $(OTHER_SGML) $(GIFS) $(ECOS_STYLESHEET) $(FIXHTML)
-	jade -t sgml -i html -c $(DSSSL_CATALOG) -d $(ECOS_STYLESHEET)#html $<
+$(MAIN_HTML): $(MAIN_SGML) $(OTHER_SGML) $(GIFS) $(HTML_STYLESHEET) $(FIXHTML)
+	jade -t sgml -i html -c $(DSSSL_CATALOG) -d $(HTML_STYLESHEET)#html $<
 	tclsh $(FIXHTML)
 
 # PDF files can be generated in a similar fashion.
-pdf: $(MAIN_PDF)
+pdfa4: copyfiles $(MAIN_PDFA4)
+
+$(MAIN_PDFA4):  $(MAIN_SGML) $(OTHER_SGML) $(PNGS) $(A4_STYLESHEET)
+	jade -o $(subst .pdf,.tex,$(MAIN_PDFA4)) -t tex -V tex-backend -c $(DSSSL_CATALOG) -d $(A4_STYLESHEET)#print $<
+	pdfjadetex $(subst .pdf,.tex,$(MAIN_PDFA4))
+	pdfjadetex $(subst .pdf,.tex,$(MAIN_PDFA4))
+	pdfjadetex $(subst .pdf,.tex,$(MAIN_PDFA4))
 
-$(MAIN_PDF):  $(MAIN_SGML) $(OTHER_SGML) $(PNGS) $(ECOS_STYLESHEET)
-	jade -o $(subst .pdf,.tex,$(MAIN_PDF)) -t tex -V tex-backend -c $(DSSSL_CATALOG) -d $(ECOS_STYLESHEET)#print $<
-	pdfjadetex $(subst .pdf,.tex,$(MAIN_PDF))
-	pdfjadetex $(subst .pdf,.tex,$(MAIN_PDF))
-	pdfjadetex $(subst .pdf,.tex,$(MAIN_PDF))
+pdfletter: copyfiles $(MAIN_PDFLETTER)
+
+$(MAIN_PDFLETTER):  $(MAIN_SGML) $(OTHER_SGML) $(PNGS) $(LETTER_STYLESHEET)
+	jade -o $(subst .pdf,.tex,$(MAIN_PDFLETTER)) -t tex -V tex-backend -c $(DSSSL_CATALOG) -d $(LETTER_STYLESHEET)#print $<
+	pdfjadetex $(subst .pdf,.tex,$(MAIN_PDFLETTER))
+	pdfjadetex $(subst .pdf,.tex,$(MAIN_PDFLETTER))
+	pdfjadetex $(subst .pdf,.tex,$(MAIN_PDFLETTER))
 
 #$(MAIN_PDF):  $(MAIN_SGML) $(OTHER_SGML) $(EPS) $(ECOS_STYLESHEET)
 #	jade -o $(subst .sgml,.tex,$(MAIN_SGML)) -t tex -V tex-backend -d $(ECOS_STYLESHEET)#print $<
@@ -141,5 +158,4 @@ pdf: $(MAIN_PDF)
 
 # Clean. For now assume that all .html, .gif etc files are generated
 clean:
-	rm -rf *.html *.tex *.dvi *.aux *.log *.out *.ps *.pdf *.gif *.eps
-
+	rm -rf *.html *.tex *.dvi *.aux *.log *.out *.ps *.pdf *.gif *.eps *.png
diff --git a/packages/pkgconf/ssa4.dsl b/packages/pkgconf/ssa4.dsl
new file mode 100644
--- /dev/null
+++ b/packages/pkgconf/ssa4.dsl
@@ -0,0 +1,110 @@
+<!-- {{{ Banner                 -->
+
+<!-- =============================================================== -->
+<!--                                                                 -->
+<!--     stylesheet.sgml                                             -->
+<!--                                                                 -->
+<!--     Customize the nwalsh modular stylesheets.                   -->
+<!--                                                                 -->
+<!-- =============================================================== -->
+<!-- ####ECOSGPLCOPYRIGHTBEGIN####                                          -->
+<!-- This file is part of eCos, the Embedded Configurable Operating System. -->
+<!-- Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.               -->
+<!--                                                                        -->
+<!-- eCos 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 or (at your option) any later    -->
+<!-- version.                                                               -->
+<!--                                                                        -->
+<!-- eCos 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 eCos; if not, write to the Free Software Foundation, Inc.,        -->
+<!-- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                 -->
+<!--                                                                        -->
+<!-- As a special exception, if other files instantiate templates or use    -->
+<!-- macros or inline functions from this file, or you compile this file and-->
+<!-- link it with other works to produce a work based on this file, this    -->
+<!-- file does not by itself cause the resulting work to be covered by the  -->
+<!-- GNU General Public License. However the source code for this file must -->
+<!-- still be made available in accordance with section (3) of the GNU      -->
+<!-- General Public License.                                                -->
+<!--                                                                        -->
+<!-- This exception does not invalidate any other reasons why a work based  -->
+<!-- on this file might be covered by the GNU General Public License.       -->
+<!--                                                                        -->
+<!-- Alternative licenses for eCos may be arranged by contacting            -->
+<!-- Red Hat, Inc. at http://sources.redhat.com/ecos/ecos-license/          -->
+<!-- ####ECOSGPLCOPYRIGHTEND####                                            -->
+<!-- =============================================================== -->
+<!-- #####DESCRIPTIONBEGIN####                                       -->
+<!--                                                                 -->
+<!-- Author(s):   bartv                                              -->
+<!--              Based on cygnus-both.dsl by Mark Galassi           -->
+<!-- Contact(s):  bartv                                              -->
+<!-- Date:        2000/03/15                                         -->
+<!-- Version:     0.01                                               -->
+<!--                                                                 -->
+<!-- ####DESCRIPTIONEND####                                          -->
+<!-- =============================================================== -->
+
+<!-- }}} -->
+
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY % html "IGNORE">
+<![%html;[
+<!ENTITY % print "IGNORE">
+<!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA dsssl>
+]]>
+<!ENTITY % print "INCLUDE">
+<![%print;[
+<!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA dsssl>
+]]>
+]>
+
+<style-sheet>
+<style-specification id="print" use="docbook">
+<style-specification-body> 
+
+;; ====================
+;; customize the print (PDF) A4 stylesheet
+;; ====================
+
+;; Set the paper parameters as per other eCos documentation
+(define %page-width%   210mm)
+(define %page-height%  297mm)
+(define %left-margin%  0.75in)
+(define %right-margin% 0.75in)
+
+;; Assume that we are only producing books, a reasonable assumption
+;; given the primary author :-)
+(define %two-side% #t)
+
+;; Use 12pt
+;;(define %visual-acuity% "presbyopic")
+
+;; Do not use graphics in admonitions, our documentation is supposed
+;; to look boring :-(
+(define %admon-graphics% #f)
+
+;; Justified text please.
+(define %default-quadding% 'justify)
+
+;; A separate page for each man page please.
+(define %refentry-new-page% #t)
+
+;; The component writer's guide man pages do not describe functions
+(define %refentry-functions% #f)
+
+;; Program listings should use smaller font to fit on page width
+(define %verbatim-size-factor% 0.84)
+
+
+</style-specification-body>
+</style-specification>
+<external-specification id="docbook" document="docbook.dsl">
+</style-sheet>
+
diff --git a/packages/pkgconf/ssletter.dsl b/packages/pkgconf/ssletter.dsl
new file mode 100644
--- /dev/null
+++ b/packages/pkgconf/ssletter.dsl
@@ -0,0 +1,110 @@
+<!-- {{{ Banner                 -->
+
+<!-- =============================================================== -->
+<!--                                                                 -->
+<!--     stylesheet.sgml                                             -->
+<!--                                                                 -->
+<!--     Customize the nwalsh modular stylesheets.                   -->
+<!--                                                                 -->
+<!-- =============================================================== -->
+<!-- ####ECOSGPLCOPYRIGHTBEGIN####                                          -->
+<!-- This file is part of eCos, the Embedded Configurable Operating System. -->
+<!-- Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.               -->
+<!--                                                                        -->
+<!-- eCos 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 or (at your option) any later    -->
+<!-- version.                                                               -->
+<!--                                                                        -->
+<!-- eCos 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 eCos; if not, write to the Free Software Foundation, Inc.,        -->
+<!-- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                 -->
+<!--                                                                        -->
+<!-- As a special exception, if other files instantiate templates or use    -->
+<!-- macros or inline functions from this file, or you compile this file and-->
+<!-- link it with other works to produce a work based on this file, this    -->
+<!-- file does not by itself cause the resulting work to be covered by the  -->
+<!-- GNU General Public License. However the source code for this file must -->
+<!-- still be made available in accordance with section (3) of the GNU      -->
+<!-- General Public License.                                                -->
+<!--                                                                        -->
+<!-- This exception does not invalidate any other reasons why a work based  -->
+<!-- on this file might be covered by the GNU General Public License.       -->
+<!--                                                                        -->
+<!-- Alternative licenses for eCos may be arranged by contacting            -->
+<!-- Red Hat, Inc. at http://sources.redhat.com/ecos/ecos-license/          -->
+<!-- ####ECOSGPLCOPYRIGHTEND####                                            -->
+<!-- =============================================================== -->
+<!-- #####DESCRIPTIONBEGIN####                                       -->
+<!--                                                                 -->
+<!-- Author(s):   bartv                                              -->
+<!--              Based on cygnus-both.dsl by Mark Galassi           -->
+<!-- Contact(s):  bartv                                              -->
+<!-- Date:        2000/03/15                                         -->
+<!-- Version:     0.01                                               -->
+<!--                                                                 -->
+<!-- ####DESCRIPTIONEND####                                          -->
+<!-- =============================================================== -->
+
+<!-- }}} -->
+
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY % html "IGNORE">
+<![%html;[
+<!ENTITY % print "IGNORE">
+<!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA dsssl>
+]]>
+<!ENTITY % print "INCLUDE">
+<![%print;[
+<!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA dsssl>
+]]>
+]>
+
+<style-sheet>
+<style-specification id="print" use="docbook">
+<style-specification-body> 
+
+;; ====================
+;; customize the print (PDF) US letter stylesheet
+;; ====================
+
+;; Set the paper parameters as per other eCos documentation
+(define %page-width%   8.5in)
+(define %page-height%  11in)
+(define %left-margin%  0.75in)
+(define %right-margin% 0.75in)
+
+;; Assume that we are only producing books, a reasonable assumption
+;; given the primary author :-)
+(define %two-side% #t)
+
+;; Use 12pt
+;;(define %visual-acuity% "presbyopic")
+
+;; Do not use graphics in admonitions, our documentation is supposed
+;; to look boring :-(
+(define %admon-graphics% #f)
+
+;; Justified text please.
+(define %default-quadding% 'justify)
+
+;; A separate page for each man page please.
+(define %refentry-new-page% #t)
+
+;; The component writer's guide man pages do not describe functions
+(define %refentry-functions% #f)
+
+;; Program listings should use smaller font to fit on page width
+(define %verbatim-size-factor% 0.87)
+
+
+</style-specification-body>
+</style-specification>
+<external-specification id="docbook" document="docbook.dsl">
+</style-sheet>
+
diff --git a/packages/pkgconf/stylesheet.dsl b/packages/pkgconf/stylesheet.dsl
--- a/packages/pkgconf/stylesheet.dsl
+++ b/packages/pkgconf/stylesheet.dsl
@@ -67,42 +67,6 @@
 
 <style-sheet>
 
-<style-specification id="print" use="docbook">
-<style-specification-body> 
-
-;; ====================
-;; customize the print stylesheet
-;; ====================
-
-;; Set the paper parameters as per other eCos documentation
-(define %page-width%   7.5in)
-(define %page-height%  10.2in)
-(define %left-margin%  0.75in)
-(define %right-margin% 0.75in)
-
-;; Assume that we are only producing books, a reasonable assumption
-;; given the primary author :-)
-(define %two-side% #t)
-
-;; Use 12pt
-;;(define %visual-acuity% "presbyopic")
-
-;; Do not use graphics in admonitions, our documentation is supposed
-;; to look boring :-(
-(define %admon-graphics% #f)
-
-;; Justified text please.
-(define %default-quadding% 'justify)
-
-;; A separate page for each man page please.
-(define %refentry-new-page% #t)
-
-;; The component writer's guide man pages do not describe functions
-(define %refentry-functions% #f)
-
-</style-specification-body>
-</style-specification>
-
 <!--
 ;; ====================
 ;; customize the html stylesheet