From 8294e92cdecaeeb98bc42ae2bac74bee7f4f08b0 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 20 Apr 2006 10:25:17 +0000 Subject: [PATCH] Updated to use doc/common (id-docbook-common) --- configure.ac | 11 +++--- doc/Makefile.am | 24 ++++-------- doc/tkl.xsl.in | 47 ------------------------ doc/zebrahtml.dsl.in | 26 ------------- doc/zebraphp.dsl.in | 98 ------------------------------------------------- doc/zebraprint.dsl.in | 21 ----------- 6 files changed, 13 insertions(+), 214 deletions(-) delete mode 100644 doc/tkl.xsl.in delete mode 100644 doc/zebrahtml.dsl.in delete mode 100644 doc/zebraphp.dsl.in delete mode 100644 doc/zebraprint.dsl.in diff --git a/configure.ac b/configure.ac index 501a1b1..255f75b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Zebra, Index Data ApS, 1995-2006 -dnl $Id: configure.ac,v 1.2 2006-04-05 02:01:21 adam Exp $ +dnl $Id: configure.ac,v 1.3 2006-04-20 10:25:17 adam Exp $ dnl AC_PREREQ(2.59) AC_INIT([idzebra],[1.4.0],[adam@indexdata.dk]) @@ -348,10 +348,11 @@ AC_OUTPUT([ tab/Makefile doc/Makefile doc/zebra.xml - doc/zebrahtml.dsl - doc/zebraprint.dsl - doc/zebraphp.dsl - doc/tkl.xsl + doc/common/Makefile + doc/common/html.dsl + doc/common/html.xsl + doc/common/print.dsl + doc/common/tkl.xsl test/Makefile test/gils/Makefile test/usmarc/Makefile test/api/Makefile test/xslt/Makefile test/xpath/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index 2e40961..1ed8838 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,12 +1,7 @@ -## $Id: Makefile.am,v 1.41 2006-02-20 07:13:31 adam Exp $ +## $Id: Makefile.am,v 1.42 2006-04-20 10:25:17 adam Exp $ docdir=$(datadir)/doc/@PACKAGE@ -SUPPORTFILES = \ - zebrahtml.dsl \ - zebraphp.dsl \ - zebraprint.dsl \ - tkl.xsl \ - xml.dcl +SUBDIRS = common XMLFILES = zebra.xml.in \ administration.xml \ @@ -72,7 +67,6 @@ HTMLFILES = \ zebra.html \ zebraidx.html - PNGFILES=zebra.png EPSFILES=zebra.eps @@ -80,11 +74,10 @@ MANFILES=zebraidx.1 zebrasrv.8 idzebra-config.1 REFFILES=zebraidx-man.sgml zebrasrv-man.sgml idzebra-config-man.sgml -#doc_DATA = $(HTMLFILES) zebra.pdf $(PNGFILES) -doc_DATA = $(HTMLFILES) $(PNGFILES) +doc_DATA = $(HTMLFILES) zebra.pdf $(PNGFILES) man_MANS = $(MANFILES) -EXTRA_DIST = $(XMLFILES) $(SUPPORTFILES) $(REFFILES) \ +EXTRA_DIST = $(XMLFILES) $(REFFILES) \ $(doc_DATA) $(EPSFILES) $(man_MANS) $(REFFILES) \ zvrank.txt marc_indexing.xml @@ -102,22 +95,19 @@ idzebra-config.1: idzebra-config-man.sgml docbook2man $(srcdir)/idzebra-config-man.sgml $(HTMLFILES): $(XMLFILES) - jade -E14 -D $(srcdir) -d zebrahtml.dsl -t sgml $(srcdir)/xml.dcl zebra.xml - -zebra.php: $(XMLFILES) - jade -E14 -D $(srcdir) -d zebraphp.dsl -t sgml $(srcdir)/xml.dcl zebra.xml + jade -E14 -D $(srcdir) -d common/html.dsl -t sgml $(srcdir)/common/xml.dcl zebra.xml zebra.pdf: $(XMLFILES) for i in $(PNGFILES); do \ if test ! -f $$i; then ln -s $(srcdir)/$$i .; fi; \ done - jade -E14 -D $(srcdir) -d zebraprint.dsl -t tex $(srcdir)/xml.dcl zebra.xml + jade -E14 -D $(srcdir) -d common/print.dsl -t tex $(srcdir)/common/xml.dcl zebra.xml pdfjadetex zebra.tex >/dev/null pdfjadetex zebra.tex >/dev/null pdfjadetex zebra.tex >/dev/null index.tkl: $(XMLFILES) tkl.xsl - xsltproc tkl.xsl zebra.xml + xsltproc common/tkl.xsl zebra.xml gils.txt: gils.sgml sgml2txt -f gils.sgml diff --git a/doc/tkl.xsl.in b/doc/tkl.xsl.in deleted file mode 100644 index 9265a0f..0000000 --- a/doc/tkl.xsl.in +++ /dev/null @@ -1,47 +0,0 @@ - - - - - 1 - .tkl - 0 - - - - - - - - - <xsl:apply-templates select="." mode="object.title.markup"/> - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/zebrahtml.dsl.in b/doc/zebrahtml.dsl.in deleted file mode 100644 index 842ff4f..0000000 --- a/doc/zebrahtml.dsl.in +++ /dev/null @@ -1,26 +0,0 @@ - -]> - - - - - -(define %use-id-as-filename% #t) -(define %output-dir% "html") -(define %html-ext% ".html") -(define %shade-verbatim% #t) - - - - - - - diff --git a/doc/zebraphp.dsl.in b/doc/zebraphp.dsl.in deleted file mode 100644 index a6ca884..0000000 --- a/doc/zebraphp.dsl.in +++ /dev/null @@ -1,98 +0,0 @@ - -]> - - - - - -(define %use-id-as-filename% #t) -(define %output-dir% "php") -(define %html-ext% ".php") -(define %shade-verbatim% #t) - -(define newline "\U-000D") - -(define (html-document title-sosofo body-sosofo) - (let* (;; Let's look these up once, so that we can avoid calculating - ;; them over and over again. - (prev (prev-chunk-element)) - (next (next-chunk-element)) - (prevm (prev-major-component-chunk-element)) - (nextm (next-major-component-chunk-element)) - (navlist (list prev next prevm nextm)) - - ;; Let's make it possible to control the output even in the - ;; nochunks case. Note: in the nochunks case, (chunk?) will - ;; return #t for only the root element. - (make-entity? (and (or (not nochunks) rootchunk) - (chunk?))) - - (make-head? (or make-entity? - (and nochunks - (node-list=? (current-node) - (sgml-root-element))))) - (doc-sosofo - (if make-head? - (make sequence - (make formatting-instruction data: - (string-append "<" "?php " - newline - "require \"../../id_common.inc\";" - newline - "id_header(\"" - ) - ) - title-sosofo - (make formatting-instruction data: - (string-append "\");" - newline - "?" ">" - ) - ) - (header-navigation (current-node) navlist) - body-sosofo - (footer-navigation (current-node) navlist) - (make formatting-instruction data: - (string-append "<" "?php id_footer() ?>") - ) - ) - body-sosofo - ) - ) - ) - (if make-entity? - (make entity - system-id: (html-entity-file (html-file)) - (if %html-pubid% - (make document-type - name: "HTML" - public-id: %html-pubid%) - (empty-sosofo)) - doc-sosofo) - (if (node-list=? (current-node) (sgml-root-element)) - (make sequence - (if %html-pubid% - (make document-type - name: "HTML" - public-id: %html-pubid%) - (empty-sosofo)) - doc-sosofo) - doc-sosofo) - ) - ) - ) - - - - - - - diff --git a/doc/zebraprint.dsl.in b/doc/zebraprint.dsl.in deleted file mode 100644 index fce3256..0000000 --- a/doc/zebraprint.dsl.in +++ /dev/null @@ -1,21 +0,0 @@ - -]> - - - - - - - - - - - -- 1.7.10.4