From e40db02fe6279b6482eecd461cf95d49d2069fda Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 20 Apr 2006 12:05:53 +0000 Subject: [PATCH] Updated to use doc/common (id-docbook-common) --- configure.ac | 9 ++- doc/Makefile.am | 27 +++----- doc/id.png | Bin 1638 -> 0 bytes doc/tkl.xsl.in | 47 -------------- doc/xml.dcl | 179 --------------------------------------------------- doc/yazhtml.dsl.in | 26 -------- doc/yazphp.dsl.in | 98 ---------------------------- doc/yazprint.dsl.in | 21 ------ doc/yazproxy.xml.in | 6 +- 9 files changed, 19 insertions(+), 394 deletions(-) delete mode 100644 doc/id.png delete mode 100644 doc/tkl.xsl.in delete mode 100644 doc/xml.dcl delete mode 100644 doc/yazhtml.dsl.in delete mode 100644 doc/yazphp.dsl.in delete mode 100644 doc/yazprint.dsl.in diff --git a/configure.ac b/configure.ac index 688d7d4..881bda2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl yazproxy, Index Data 1994-2006 dnl See the file LICENSE for details. -dnl $Id: configure.ac,v 1.4 2006-04-16 07:46:03 adam Exp $ +dnl $Id: configure.ac,v 1.5 2006-04-20 12:05:53 adam Exp $ AC_PREREQ(2.59) AC_INIT([yazproxy],[1.1.0.3],[adam@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) @@ -65,7 +65,10 @@ AC_OUTPUT([ include/yazproxy/Makefile doc/Makefile doc/yazproxy.xml - doc/yazprint.dsl doc/yazphp.dsl doc/yazhtml.dsl - doc/tkl.xsl + doc/common/Makefile + doc/common/html.dsl + doc/common/html.xsl + doc/common/print.dsl + doc/common/tkl.xsl etc/Makefile ]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 04a0120..4384417 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,12 +1,8 @@ -## $Id: Makefile.am,v 1.8 2005-09-07 09:28:46 adam Exp $ +## $Id: Makefile.am,v 1.9 2006-04-20 12:05:54 adam Exp $ docdir=$(datadir)/doc/@PACKAGE@ -SUPPORTFILES = \ - yazhtml.dsl.in \ - yazphp.dsl.in \ - yazprint.dsl.in \ - tkl.xsl.in \ - xml.dcl +SUBDIRS = common + XMLFILES = \ introduction.xml \ installation.xml \ @@ -41,30 +37,27 @@ HTMLFILES = \ yazproxy-schema.html \ yazproxy.html -doc_DATA = $(HTMLFILES) yazproxy.pdf id.png yaz.css +doc_DATA = $(HTMLFILES) yazproxy.pdf man_MANS = $(MANFILES) -EXTRA_DIST = $(SUPPORTFILES) $(XMLFILES) $(doc_DATA) $(man_MANS) +EXTRA_DIST = $(XMLFILES) $(doc_DATA) $(man_MANS) $(HTMLFILES): $(XMLFILES) - jade -E14 -D $(srcdir) -d yazhtml.dsl -t sgml $(srcdir)/xml.dcl $(TOP) + jade -E14 -D $(srcdir) -d common/html.dsl -t sgml $(srcdir)/common/xml.dcl $(TOP) yazproxy.8: yaz-proxy-man.xml yaz-proxy-ref.xml docbook2man $(srcdir)/yaz-proxy-man.xml -yazproxy.php: $(XMLFILES) - jade -E14 -D $(srcdir) -d yazphp.dsl -t sgml $(srcdir)/xml.dcl $(TOP) - yazproxy.pdf: $(XMLFILES) - if test ! -f id.png ; then ln -s $(srcdir)/id.png .; fi - jade -E14 -D $(srcdir) -d yazprint.dsl -t tex $(srcdir)/xml.dcl $(TOP) + if test ! -f common/id.png ; then cp $(srcdir)/common/id.png common; fi + jade -E14 -D $(srcdir) -d common/print.dsl -t tex $(srcdir)/common/xml.dcl $(TOP) pdfjadetex yazproxy.tex >pdfjadetex.log 2>&1 pdfjadetex yazproxy.tex >pdfjadetex.log 2>&1 pdfjadetex yazproxy.tex >pdfjadetex.log 2>&1 -index.tkl: $(XMLFILES) tkl.xsl - xsltproc tkl.xsl $(TOP) +index.tkl: $(XMLFILES) common/tkl.xsl + xsltproc common/tkl.xsl $(TOP) clean-data-hook: rm -f [0-9]* *.bak diff --git a/doc/id.png b/doc/id.png deleted file mode 100644 index 454a74679a129560fbc3bc4810dd3168b52a8a03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1638 zcmV-s2ATPZP)HP_Nc400001VoOIv z0Eh)0NB{r;32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^RN1px~v3R0t2!~g&Vj7da6 zRCt{2+Y5KwDhvSN)Fn=92MjiD9!>E7|CbXuj**a)rfau*S2$eyV0LSUGo0ZJXZQvzoY8YK6{L`5zOPFJ zkJZ#Tf82-9w9ev=6)8W9@Qjw%kIu0Fdque9#&#Gki=sH8W2~ZtZ5dV- z2q_FZYZ@|!hs%rr?dk%-oufrr7VeDVV11o(+=1Vlrr97E&cbBcz`(x42jKQ{b}b*{ z)~RihLvye;mVx_gBt5w#hRbW!c!YiF9r_?sLkzCf^upR(fzy^J2o zp|4ufI2SFIh~SEh*qdcJ)lhH2Hi4lpVeouIy6wVj0=qcx{E`t5%IFWk zOCx5FG01n1v4lT+2DVOSol57Df-E`)id7u4BMWWxTn>Pu<8HC(%Ek57ep`ZX}p)5o|3Ic zwB#!U)&z))~lhQi_1NjPLjyA5& z=U4JorpRGAY(5OqE&d8H?e2sI2;Duy`0l|ZEIR&{{4&5Y42N+39Q5|;hqK}$hsCft zT)3JRVVB^Sc*M}z@p$yz-h^q`oMk$z)7Km<{DgMw%jL0odQKyU<**6XwP}ZR*?S7p zv)UgwxIm9&UsE^(^b07*qoM6N<$f~3+X5&!@I 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/xml.dcl b/doc/xml.dcl deleted file mode 100644 index fed2103..0000000 --- a/doc/xml.dcl +++ /dev/null @@ -1,179 +0,0 @@ -" - PIC "?>" - SHORTREF NONE - - NAMES - SGMLREF - - QUANTITY NONE - - ENTITIES - "amp" 38 - "lt" 60 - "gt" 62 - "quot" 34 - "apos" 39 - - FEATURES - MINIMIZE - DATATAG NO - OMITTAG NO - RANK NO - SHORTTAG - STARTTAG - EMPTY NO - UNCLOSED NO - NETENABL IMMEDNET - ENDTAG - EMPTY NO - UNCLOSED NO - ATTRIB - DEFAULT YES - OMITNAME NO - VALUE NO - EMPTYNRM YES - IMPLYDEF - ATTLIST NO - DOCTYPE NO - ELEMENT NO - ENTITY NO - NOTATION NO - LINK - SIMPLE NO - IMPLICIT NO - EXPLICIT NO - OTHER - CONCUR NO - SUBDOC NO - FORMAL NO - URN NO - KEEPRSRE YES - VALIDITY TYPE - ENTITIES - REF ANY - INTEGRAL YES - APPINFO NONE - SEEALSO "ISO 8879:1986//NOTATION - Extensible Markup Language (XML) 1.0//EN" -> diff --git a/doc/yazhtml.dsl.in b/doc/yazhtml.dsl.in deleted file mode 100644 index 3ac6ed6..0000000 --- a/doc/yazhtml.dsl.in +++ /dev/null @@ -1,26 +0,0 @@ - -]> - - - - - -(define %use-id-as-filename% #t) -(define %output-dir% "html") -(define %html-ext% ".html") -(define %stylesheet% "yaz.css") - - - - - - - diff --git a/doc/yazphp.dsl.in b/doc/yazphp.dsl.in deleted file mode 100644 index ea769e9..0000000 --- a/doc/yazphp.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/yazprint.dsl.in b/doc/yazprint.dsl.in deleted file mode 100644 index 3ffe3d0..0000000 --- a/doc/yazprint.dsl.in +++ /dev/null @@ -1,21 +0,0 @@ - -]> - - - - - - - - - - - diff --git a/doc/yazproxy.xml.in b/doc/yazproxy.xml.in index 26e1182..badb5fe 100644 --- a/doc/yazproxy.xml.in +++ b/doc/yazproxy.xml.in @@ -8,7 +8,7 @@ ]> - + YAZ proxy User's Guide and Reference @@ -29,12 +29,12 @@ This manual covers version @VERSION@. - CVS ID: $Id: yazproxy.xml.in,v 1.5 2006-04-13 00:10:27 adam Exp $ + CVS ID: $Id: yazproxy.xml.in,v 1.6 2006-04-20 12:05:54 adam Exp $ - + -- 1.7.10.4