Updated to use doc/common (id-docbook-common)

diff --git a/configure.ac b/configure.ac
index 688d7d4..881bda2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl yazproxy, Index Data 1994-2006
 dnl See the file LICENSE for details.
 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)
 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
        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
 ])
        etc/Makefile
 ])

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 04a0120..4384417 100644 (file)
--- 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@
 
 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 \
 XMLFILES = \
  introduction.xml \
  installation.xml \

@@ -41,30 +37,27 @@ HTMLFILES =  \
  yazproxy-schema.html \
  yazproxy.html
 
  yazproxy-schema.html \
  yazproxy.html
 

-doc_DATA = $(HTMLFILES) yazproxy.pdf id.png yaz.css
+doc_DATA = $(HTMLFILES) yazproxy.pdf

 
 man_MANS = $(MANFILES)
 
 
 man_MANS = $(MANFILES)
 

-EXTRA_DIST = $(SUPPORTFILES) $(XMLFILES) $(doc_DATA) $(man_MANS)
+EXTRA_DIST = $(XMLFILES) $(doc_DATA) $(man_MANS)

 
 $(HTMLFILES): $(XMLFILES)
 
 $(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.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)
 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
 
        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
 
 clean-data-hook:
        rm -f [0-9]* *.bak

diff --git a/doc/id.png b/doc/id.png
deleted file mode 100644 (file)
index 454a746..0000000
Binary files a/doc/id.png and /dev/null differ

diff --git a/doc/tkl.xsl.in b/doc/tkl.xsl.in
deleted file mode 100644 (file)
index 9265a0f..0000000
--- a/doc/tkl.xsl.in
+++ /dev/null
@@ -1,47 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-               version="1.0">
-
-  <xsl:include href="@XSL_DIR@/xhtml/chunk.xsl"/>
-
-  <xsl:variable name="use.id.as.filename">1</xsl:variable>
-  <xsl:variable name="html.ext">.tkl</xsl:variable>
-  <xsl:variable name="navig.showtitles">0</xsl:variable>
-  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/> 
-
-<xsl:template name="chunk-element-content">
-  <xsl:param name="prev"/>
-  <xsl:param name="next"/>
-
-  <xsl:element name="document">
-    <title>
-       <xsl:apply-templates select="." mode="object.title.markup"/>
-    </title>
-    <nonews>1</nonews>
-    <body>
-      <xsl:call-template name="body.attributes"/>
-      <xsl:call-template name="user.header.navigation"/>
-
-      <xsl:call-template name="header.navigation">
-        <xsl:with-param name="prev" select="$prev"/>
-        <xsl:with-param name="next" select="$next"/>
-      </xsl:call-template>
-
-      <xsl:call-template name="user.header.content"/>
-
-      <xsl:apply-imports/>
-
-      <xsl:call-template name="user.footer.content"/>
-
-      <xsl:call-template name="footer.navigation">
-        <xsl:with-param name="prev" select="$prev"/>
-        <xsl:with-param name="next" select="$next"/>
-      </xsl:call-template>
-
-      <xsl:call-template name="user.footer.navigation"/>
-    </body>
-  </xsl:element>
-</xsl:template>
-
-</xsl:stylesheet>
-
-

diff --git a/doc/xml.dcl b/doc/xml.dcl
deleted file mode 100644 (file)
index fed2103..0000000
--- a/doc/xml.dcl
+++ /dev/null
@@ -1,179 +0,0 @@
-<!SGML -- SGML Declaration for valid XML documents --
-     "ISO 8879:1986 (WWW)"
-
-     CHARSET
-         BASESET
-             "ISO Registration Number 176//CHARSET
-             ISO/IEC 10646-1:1993 UCS-4 with implementation 
-             level 3//ESC 2/5 2/15 4/6"
-         DESCSET
-                0       9       UNUSED
-                9       2       9
-                11      2       UNUSED
-                13      1       13
-                14      18      UNUSED
-                32      95      32
-                127     1       UNUSED
-                128     32      UNUSED
-             -- use this instead of the official declaration because SP only
-                supports 16-bit characters --
-                160     65374   160
-                65534   2       UNUSED 
-             -- 55296   2048    UNUSED
-                57344   8190    57344
-                65534   2       UNUSED
-                65536   1048576 65536 --
-     CAPACITY NONE
-
-     SCOPE DOCUMENT
-
-     SYNTAX
-         SHUNCHAR NONE
-         BASESET "ISO Registration Number 176//CHARSET
-                 ISO/IEC 10646-1:1993 UCS-4 with implementation 
-                 level 3//ESC 2/5 2/15 4/6"
-         DESCSET
-             0 1114112 0
-         FUNCTION
-             RE    13
-             RS    10
-             SPACE 32
-             TAB   SEPCHAR 9
-
-         NAMING
-             LCNMSTRT ""
-             UCNMSTRT ""
-             NAMESTRT
-                 58 95 192-214 216-246 248-305 308-318 321-328
-                 330-382 384-451 461-496 500-501 506-535 592-680
-                 699-705 902 904-906 908 910-929 931-974 976-982
-                 986 988 990 992 994-1011 1025-1036 1038-1103
-                 1105-1116 1118-1153 1168-1220 1223-1224
-                 1227-1228 1232-1259 1262-1269 1272-1273
-                 1329-1366 1369 1377-1414 1488-1514 1520-1522
-                 1569-1594 1601-1610 1649-1719 1722-1726
-                 1728-1742 1744-1747 1749 1765-1766 2309-2361
-                 2365 2392-2401 2437-2444 2447-2448 2451-2472
-                 2474-2480 2482 2486-2489 2524-2525 2527-2529
-                 2544-2545 2565-2570 2575-2576 2579-2600
-                 2602-2608 2610-2611 2613-2614 2616-2617
-                 2649-2652 2654 2674-2676 2693-2699 2701
-                 2703-2705 2707-2728 2730-2736 2738-2739
-                 2741-2745 2749 2784 2821-2828 2831-2832
-                 2835-2856 2858-2864 2866-2867 2870-2873 2877
-                 2908-2909 2911-2913 2949-2954 2958-2960
-                 2962-2965 2969-2970 2972 2974-2975 2979-2980
-                 2984-2986 2990-2997 2999-3001 3077-3084
-                 3086-3088 3090-3112 3114-3123 3125-3129
-                 3168-3169 3205-3212 3214-3216 3218-3240
-                 3242-3251 3253-3257 3294 3296-3297 3333-3340
-                 3342-3344 3346-3368 3370-3385 3424-3425
-                 3585-3630 3632 3634-3635 3648-3653 3713-3714
-                 3716 3719-3720 3722 3725 3732-3735 3737-3743
-                 3745-3747 3749 3751 3754-3755 3757-3758 3760
-                 3762-3763 3773 3776-3780 3904-3911 3913-3945
-                 4256-4293 4304-4342 4352 4354-4355 4357-4359
-                 4361 4363-4364 4366-4370 4412 4414 4416 4428
-                 4430 4432 4436-4437 4441 4447-4449 4451 4453
-                 4455 4457 4461-4462 4466-4467 4469 4510 4520
-                 4523 4526-4527 4535-4536 4538 4540-4546 4587
-                 4592 4601 7680-7835 7840-7929 7936-7957
-                 7960-7965 7968-8005 8008-8013 8016-8023 8025
-                 8027 8029 8031-8061 8064-8116 8118-8124 8126
-                 8130-8132 8134-8140 8144-8147 8150-8155
-                 8160-8172 8178-8180 8182-8188 8486 8490-8491
-                 8494 8576-8578 12295 12321-12329 12353-12436
-                 12449-12538 12549-12588 19968-40869 44032-55203
-
-             LCNMCHAR ""
-             UCNMCHAR ""
-             NAMECHAR
-                 45-46 183 720-721 768-837 864-865 903 1155-1158
-                 1425-1441 1443-1465 1467-1469 1471 1473-1474
-                 1476 1600 1611-1618 1632-1641 1648 1750-1764
-                 1767-1768 1770-1773 1776-1785 2305-2307 2364
-                 2366-2381 2385-2388 2402-2403 2406-2415
-                 2433-2435 2492 2494-2500 2503-2504 2507-2509
-                 2519 2530-2531 2534-2543 2562 2620 2622-2626
-                 2631-2632 2635-2637 2662-2673 2689-2691 2748
-                 2750-2757 2759-2761 2763-2765 2790-2799
-                 2817-2819 2876 2878-2883 2887-2888 2891-2893
-                 2902-2903 2918-2927 2946-2947 3006-3010
-                 3014-3016 3018-3021 3031 3047-3055 3073-3075
-                 3134-3140 3142-3144 3146-3149 3157-3158
-                 3174-3183 3202-3203 3262-3268 3270-3272
-                 3274-3277 3285-3286 3302-3311 3330-3331
-                 3390-3395 3398-3400 3402-3405 3415 3430-3439
-                 3633 3636-3642 3654-3662 3664-3673 3761
-                 3764-3769 3771-3772 3782 3784-3789 3792-3801
-                 3864-3865 3872-3881 3893 3895 3897 3902-3903
-                 3953-3972 3974-3979 3984-3989 3991 3993-4013
-                 4017-4023 4025 8400-8412 8417 12293 12330-12335
-                 12337-12341 12441-12442 12445-12446 12540-12542
-
-             NAMECASE
-                 GENERAL NO
-                 ENTITY  NO
-
-         DELIM
-             GENERAL SGMLREF
-             HCRO "&#38;#x" -- 38 is the number for ampersand --
-             NESTC "/"
-             NET ">"
-             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 (file)
index 3ac6ed6..0000000
--- a/doc/yazhtml.dsl.in
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY docbook.dsl SYSTEM "@DSSSL_DIR@/html/docbook.dsl"
-  CDATA DSSSL>
-]>
-<!--
-  $Id: yazhtml.dsl.in,v 1.1 2004-04-11 11:36:53 adam Exp $
--->
-<style-sheet>
-<style-specification use="docbook">
-<style-specification-body>
-
-(define %use-id-as-filename% #t)
-(define %output-dir% "html")
-(define %html-ext% ".html")
-(define %stylesheet% "yaz.css")
-
-</style-specification-body>
-</style-specification>
-<external-specification id="docbook" document="docbook.dsl">
-</style-sheet>
-  
-<!--
-Local Variables:
-mode: scheme
-End:
--->

diff --git a/doc/yazphp.dsl.in b/doc/yazphp.dsl.in
deleted file mode 100644 (file)
index ea769e9..0000000
--- a/doc/yazphp.dsl.in
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY docbook.dsl SYSTEM "@DSSSL_DIR@/html/docbook.dsl"
-  CDATA DSSSL>
-]>
-<!--
-  $Id: yazphp.dsl.in,v 1.1 2004-04-11 11:36:53 adam Exp $
--->
-<style-sheet>
-<style-specification use="docbook">
-<style-specification-body>
-
-(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)
-       )
-    )
-  )
-
-</style-specification-body>
-</style-specification>
-<external-specification id="docbook" document="docbook.dsl">
-</style-sheet>
-
-<!--
-Local Variables:
-mode: scheme
-End:
--->

diff --git a/doc/yazprint.dsl.in b/doc/yazprint.dsl.in
deleted file mode 100644 (file)
index 3ffe3d0..0000000
--- a/doc/yazprint.dsl.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY docbook.dsl SYSTEM "@DSSSL_DIR@/print/docbook.dsl"
-  CDATA DSSSL>
-]>
-<!--
-  $Id: yazprint.dsl.in,v 1.1 2004-04-11 11:36:53 adam Exp $
--->
-<style-sheet>
-<style-specification use="docbook">
-<style-specification-body>
-
-</style-specification-body>
-</style-specification>
-<external-specification id="docbook" document="docbook.dsl">
-</style-sheet>
-
-<!--
-Local Variables:
-mode: scheme
-End:
--->

diff --git a/doc/yazproxy.xml.in b/doc/yazproxy.xml.in
index 26e1182..badb5fe 100644 (file)
--- a/doc/yazproxy.xml.in
+++ b/doc/yazproxy.xml.in
@@ -8,7 +8,7 @@
      <!ENTITY yaz-proxy-ref SYSTEM "yaz-proxy-ref.xml">
      <!ENTITY app-license SYSTEM "license.xml">
 ]>
      <!ENTITY yaz-proxy-ref SYSTEM "yaz-proxy-ref.xml">
      <!ENTITY app-license SYSTEM "license.xml">
 ]>

-<!-- $Id: yazproxy.xml.in,v 1.5 2006-04-13 00:10:27 adam Exp $ -->
+<!-- $Id: yazproxy.xml.in,v 1.6 2006-04-20 12:05:54 adam Exp $ -->

 <book id="yazproxy">
  <bookinfo>
   <title>YAZ proxy User's Guide and Reference</title>
 <book id="yazproxy">
  <bookinfo>
   <title>YAZ proxy User's Guide and Reference</title>

@@ -29,12 +29,12 @@
     This manual covers version @VERSION@.
     </simpara>
    <simpara>
     This manual covers version @VERSION@.
     </simpara>
    <simpara>

-    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 $

    </simpara>
    <simpara>
     <inlinemediaobject>
      <imageobject>
    </simpara>
    <simpara>
     <inlinemediaobject>
      <imageobject>

-      <imagedata fileref="id.png" format="PNG"/>
+      <imagedata fileref="common/id.png" format="PNG"/>

      </imageobject>
     </inlinemediaobject>
    </simpara>
      </imageobject>
     </inlinemediaobject>
    </simpara>