From 96809bad943557af7ac0d01d78ed7fc18dc18436 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 21 Mar 2002 21:30:44 +0000 Subject: [PATCH] --with-dtd, --with-dsssl --- configure.in | 50 +++++++++++++++++++++++++- doc/yaz.xml.in | 4 +-- doc/yazhtml.dsl | 26 -------------- doc/yazhtml.dsl.in | 26 ++++++++++++++ doc/yazphp.dsl | 98 --------------------------------------------------- doc/yazphp.dsl.in | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/yazprint.dsl | 21 ----------- doc/yazprint.dsl.in | 21 +++++++++++ 8 files changed, 196 insertions(+), 148 deletions(-) delete mode 100644 doc/yazhtml.dsl create mode 100644 doc/yazhtml.dsl.in delete mode 100644 doc/yazphp.dsl create mode 100644 doc/yazphp.dsl.in delete mode 100644 doc/yazprint.dsl create mode 100644 doc/yazprint.dsl.in diff --git a/configure.in b/configure.in index 60411a1..00c5c40 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl YAZ Toolkit, Index Data 1994-2001 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.64 2002-03-18 12:22:00 adam Exp $ +dnl $Id: configure.in,v 1.65 2002-03-21 21:30:44 adam Exp $ AC_INIT(include/yaz/yaz-version.h) AM_INIT_AUTOMAKE(yaz, 1.8.6) dnl @@ -11,6 +11,51 @@ AC_PROG_CPP AC_PROG_INSTALL AM_DISABLE_SHARED AM_PROG_LIBTOOL +dnl +dnl ----- DOCBOOK DTD +AC_SUBST(DTD_DIR) +AC_ARG_WITH(dtd, [ --with-dtd[=DIR] Use docbookx.dtd in DIR], +[ + if test -f "$withval/docbookx.dtd"; then + DTD_DIR=$withval + fi +],[ + AC_MSG_CHECKING(for docbookx.dtd) + for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \ + /usr/share/sgml/docbook/dtd/xml/4.0 \ + /usr/lib/sgml/dtd/docbook-xml + do + if test -f $d/docbookx.dtd; then + AC_MSG_RESULT($d) + DTD_DIR=$d + break + fi + done + if test -z "$DTD_DIR"; then + AC_MSG_RESULT(Not found) + fi +]) +AC_SUBST(DSSSL_DIR) +AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] Use DSSSL in DIR/{html,print}/docbook.dsl], +[ + if test -f "$withval/html/docbook.dsl"; then + DSSSL_DIR=$withval + fi +],[ + AC_MSG_CHECKING(for docbook.dsl) + for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \ + /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh + do + if test -f $d/html/docbook.dsl; then + AC_MSG_RESULT($d) + DSSSL_DIR=$d + break + fi + done + if test -z "$DSSSL_DIR"; then + AC_MSG_RESULT(Not found) + fi +]) dnl dnl ----- yaz-comp: The Yaz Compiler AC_SUBST(EXTRAMODULE) @@ -237,6 +282,9 @@ client/Makefile ztest/Makefile doc/Makefile doc/yaz.xml +doc/yazhtml.dsl +doc/yazphp.dsl +doc/yazprint.dsl yaz-config lib/yaz-config ],[chmod +x yaz-config lib/yaz-config]) diff --git a/doc/yaz.xml.in b/doc/yaz.xml.in index 0ff722a..500631a 100644 --- a/doc/yaz.xml.in +++ b/doc/yaz.xml.in @@ -1,6 +1,6 @@ @@ -22,7 +22,7 @@ COMSTACK"> ZOOM"> ]> - + YAZ User's Guide and Reference diff --git a/doc/yazhtml.dsl b/doc/yazhtml.dsl deleted file mode 100644 index 3342606..0000000 --- a/doc/yazhtml.dsl +++ /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/yazhtml.dsl.in b/doc/yazhtml.dsl.in new file mode 100644 index 0000000..f72e84c --- /dev/null +++ b/doc/yazhtml.dsl.in @@ -0,0 +1,26 @@ + +]> + + + + + +(define %use-id-as-filename% #t) +(define %output-dir% "html") +(define %html-ext% ".html") +(define %shade-verbatim% #t) + + + + + + + diff --git a/doc/yazphp.dsl b/doc/yazphp.dsl deleted file mode 100644 index e621b42..0000000 --- a/doc/yazphp.dsl +++ /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/yazphp.dsl.in b/doc/yazphp.dsl.in new file mode 100644 index 0000000..6992650 --- /dev/null +++ b/doc/yazphp.dsl.in @@ -0,0 +1,98 @@ + +]> + + + + + +(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/yazprint.dsl b/doc/yazprint.dsl deleted file mode 100644 index 3b65687..0000000 --- a/doc/yazprint.dsl +++ /dev/null @@ -1,21 +0,0 @@ - -]> - - - - - - - - - - - diff --git a/doc/yazprint.dsl.in b/doc/yazprint.dsl.in new file mode 100644 index 0000000..79b641c --- /dev/null +++ b/doc/yazprint.dsl.in @@ -0,0 +1,21 @@ + +]> + + + + + + + + + + + -- 1.7.10.4