diff options
author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2001-07-09 05:46:47 +0000 |
---|---|---|
committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2001-07-09 05:46:47 +0000 |
commit | c9d2deb13d6bdd32c078a91d82198304b9b9dfcb (patch) | |
tree | 933429f3a307a8f10f093b20550099e1114bedf1 /textproc/dsssl-docbook-modular | |
parent | upgrade to 0.1.1 (diff) |
Upgrade to 1.70.
Master site was moved to sourceforge.
Use $LOCALBASE at depends line.
Notes
Notes:
svn path=/head/; revision=44948
Diffstat (limited to 'textproc/dsssl-docbook-modular')
-rw-r--r-- | textproc/dsssl-docbook-modular/Makefile | 19 | ||||
-rw-r--r-- | textproc/dsssl-docbook-modular/distinfo | 4 | ||||
-rw-r--r-- | textproc/dsssl-docbook-modular/files/patch-ab | 1425 | ||||
-rw-r--r-- | textproc/dsssl-docbook-modular/pkg-descr | 2 | ||||
-rw-r--r-- | textproc/dsssl-docbook-modular/pkg-plist | 124 |
5 files changed, 23 insertions, 1551 deletions
diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile index 7123c44dc0ac..b0f490e548f8 100644 --- a/textproc/dsssl-docbook-modular/Makefile +++ b/textproc/dsssl-docbook-modular/Makefile @@ -6,22 +6,19 @@ # PORTNAME= dsssl-docbook-modular -PORTVERSION= 1.64 -PORTREVISION= 1 +PORTVERSION= 1.70 CATEGORIES= textproc -MASTER_SITES= http://nwalsh.com/docbook/dsssl/ -DISTNAME= db${PORTVERSION:S/.//g} -DISTFILES= ${DISTNAME}.zip ${DISTNAME}d.zip +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= docbook +DISTNAME= docbook-dsssl-${PORTVERSION} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} docbook-dsssl-doc-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= kuriyama@FreeBSD.org -BUILD_DEPENDS= ${PREFIX}/share/sgml/docbook/3.0/catalog:${PORTSDIR}/textproc/docbook-300 -RUN_DEPENDS= ${PREFIX}/share/sgml/docbook/3.0/catalog:${PORTSDIR}/textproc/docbook-300 +BUILD_DEPENDS= ${LOCALBASE}/share/sgml/docbook/3.0/catalog:${PORTSDIR}/textproc/docbook-300 +RUN_DEPENDS= ${LOCALBASE}/share/sgml/docbook/3.0/catalog:${PORTSDIR}/textproc/docbook-300 -USE_ZIP= YES NO_MTREE= yes -WRKSRC= ${WRKDIR}/docbook -EXTRACT_BEFORE_ARGS= -a -q INSTDIR= ${PREFIX}/share/sgml/docbook/dsssl/modular @@ -34,7 +31,7 @@ pre-install: @find ${WRKDIR} -name '*.orig' -exec ${RM} {} \; do-install: - @${CP} -Rp ${WRKDIR}/docbook/* ${INSTDIR} + @${CP} -Rp ${WRKSRC}/* ${INSTDIR} @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR} post-install: diff --git a/textproc/dsssl-docbook-modular/distinfo b/textproc/dsssl-docbook-modular/distinfo index 8d78e450046a..1ef114434a6e 100644 --- a/textproc/dsssl-docbook-modular/distinfo +++ b/textproc/dsssl-docbook-modular/distinfo @@ -1,2 +1,2 @@ -MD5 (db164.zip) = 07a93d468ddf2efca1d2aa92132b38bf -MD5 (db164d.zip) = 13664939753c0d029956c983433d6c5a +MD5 (docbook-dsssl-1.70.tar.gz) = 3caba1bcbb7d2e49841bbd35fd2a07a9 +MD5 (docbook-dsssl-doc-1.70.tar.gz) = d1f3da1e51d2ebe6c684eb9400684d99 diff --git a/textproc/dsssl-docbook-modular/files/patch-ab b/textproc/dsssl-docbook-modular/files/patch-ab deleted file mode 100644 index 4ee17efd9834..000000000000 --- a/textproc/dsssl-docbook-modular/files/patch-ab +++ /dev/null @@ -1,1425 +0,0 @@ -diff -ur modular.org/common/dbl1ca.dsl modular/common/dbl1ca.dsl ---- modular.org/common/dbl1ca.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1ca.dsl Wed Feb 21 18:36:05 2001 -@@ -230,6 +230,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-ca-intra-label-sep) -+ (list)) -+ - (define (ca-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -259,10 +262,13 @@ - (define (gentext-ca-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-ca-intra-label-sep))) - (sep (assoc name (ca-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -272,6 +278,9 @@ - ;; abuse. - ;; - -+(define (local-ca-label-title-sep) -+ (list)) -+ - (define (ca-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -315,10 +324,13 @@ - (define (gentext-ca-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-ca-label-title-sep))) - (sep (assoc name (ca-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (ca-label-number-format-list) - (list -diff -ur modular.org/common/dbl1cs.dsl modular/common/dbl1cs.dsl ---- modular.org/common/dbl1cs.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1cs.dsl Wed Feb 21 18:37:04 2001 -@@ -229,6 +229,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-cs-intra-label-sep) -+ (list)) -+ - (define (cs-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -258,10 +261,13 @@ - (define (gentext-cs-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-cs-intra-label-sep))) - (sep (assoc name (cs-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -271,6 +277,9 @@ - ;; abuse. - ;; - -+(define (local-cs-label-title-sep) -+ (list)) -+ - (define (cs-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -314,10 +323,13 @@ - (define (gentext-cs-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-cs-label-title-sep))) - (sep (assoc name (cs-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (cs-label-number-format-list) - (list -diff -ur modular.org/common/dbl1da.dsl modular/common/dbl1da.dsl ---- modular.org/common/dbl1da.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1da.dsl Wed Feb 21 18:37:07 2001 -@@ -218,6 +218,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-da-intra-label-sep) -+ (list)) -+ - (define (da-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -247,10 +250,13 @@ - (define (gentext-da-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-da-intra-label-sep))) - (sep (assoc name (da-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -260,6 +266,9 @@ - ;; abuse. - ;; - -+(define (local-da-label-title-sep) -+ (list)) -+ - (define (da-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -303,10 +312,13 @@ - (define (gentext-da-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-da-label-title-sep))) - (sep (assoc name (da-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (da-label-number-format-list) - (list -diff -ur modular.org/common/dbl1de.dsl modular/common/dbl1de.dsl ---- modular.org/common/dbl1de.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1de.dsl Wed Feb 21 18:37:11 2001 -@@ -231,6 +231,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-de-intra-label-sep) -+ (list)) -+ - (define (de-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -260,10 +263,13 @@ - (define (gentext-de-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-de-intra-label-sep))) - (sep (assoc name (de-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -273,6 +279,9 @@ - ;; abuse. - ;; - -+(define (local-de-label-title-sep) -+ (list)) -+ - (define (de-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -316,10 +325,13 @@ - (define (gentext-de-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-de-label-title-sep))) - (sep (assoc name (de-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (de-label-number-format-list) - (list -diff -ur modular.org/common/dbl1el.dsl modular/common/dbl1el.dsl ---- modular.org/common/dbl1el.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1el.dsl Wed Feb 21 18:37:15 2001 -@@ -231,6 +231,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-el-intra-label-sep) -+ (list)) -+ - (define (el-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -260,10 +263,13 @@ - (define (gentext-el-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-el-intra-label-sep))) - (sep (assoc name (el-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -273,6 +279,9 @@ - ;; abuse. - ;; - -+(define (local-el-label-title-sep) -+ (list)) -+ - (define (el-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -316,10 +325,13 @@ - (define (gentext-el-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-el-label-title-sep))) - (sep (assoc name (el-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (el-label-number-format-list) - (list -diff -ur modular.org/common/dbl1en.dsl modular/common/dbl1en.dsl ---- modular.org/common/dbl1en.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1en.dsl Wed Feb 21 18:26:31 2001 -@@ -231,6 +231,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-en-intra-label-sep) -+ (list)) -+ - (define (en-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -260,10 +263,13 @@ - (define (gentext-en-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-en-intra-label-sep))) - (sep (assoc name (en-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -273,6 +279,9 @@ - ;; abuse. - ;; - -+(define (local-en-label-title-sep) -+ (list)) -+ - (define (en-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -316,10 +325,13 @@ - (define (gentext-en-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-en-label-title-sep))) - (sep (assoc name (en-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (en-label-number-format-list) - (list -diff -ur modular.org/common/dbl1es.dsl modular/common/dbl1es.dsl ---- modular.org/common/dbl1es.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1es.dsl Wed Feb 21 18:37:20 2001 -@@ -220,6 +220,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-es-intra-label-sep) -+ (list)) -+ - (define (es-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -249,10 +252,13 @@ - (define (gentext-es-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-es-intra-label-sep))) - (sep (assoc name (es-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -262,6 +268,9 @@ - ;; abuse. - ;; - -+(define (local-es-label-title-sep) -+ (list)) -+ - (define (es-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -305,10 +314,13 @@ - (define (gentext-es-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-es-label-title-sep))) - (sep (assoc name (es-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (es-label-number-format-list) - (list -diff -ur modular.org/common/dbl1et.dsl modular/common/dbl1et.dsl ---- modular.org/common/dbl1et.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1et.dsl Wed Feb 21 18:39:34 2001 -@@ -231,6 +231,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-et-intra-label-sep) -+ (list)) -+ - (define (et-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -260,10 +263,13 @@ - (define (gentext-et-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (et-intra-label-sep))) - (sep (assoc name (en-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -273,6 +279,9 @@ - ;; abuse. - ;; - -+(define (local-et-label-title-sep) -+ (list)) -+ - (define (et-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -316,10 +325,13 @@ - (define (gentext-et-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-et-label-title-sep))) - (sep (assoc name (et-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (et-label-number-format-list) - (list -diff -ur modular.org/common/dbl1fi.dsl modular/common/dbl1fi.dsl ---- modular.org/common/dbl1fi.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1fi.dsl Wed Feb 21 18:39:38 2001 -@@ -230,6 +230,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-fi-intra-label-sep) -+ (list)) -+ - (define (fi-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -259,10 +262,13 @@ - (define (gentext-fi-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-fi-intra-label-sep))) - (sep (assoc name (fi-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -272,6 +278,9 @@ - ;; abuse. - ;; - -+(define (local-fi-label-title-sep) -+ (list)) -+ - (define (fi-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -315,10 +324,13 @@ - (define (gentext-fi-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-fi-label-title-sep))) - (sep (assoc name (fi-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (fi-label-number-format-list) - (list -diff -ur modular.org/common/dbl1fr.dsl modular/common/dbl1fr.dsl ---- modular.org/common/dbl1fr.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1fr.dsl Wed Feb 21 18:39:43 2001 -@@ -224,6 +224,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-fr-intra-label-sep) -+ (list)) -+ - (define (fr-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -253,10 +256,13 @@ - (define (gentext-fr-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-fr-intra-label-sep))) - (sep (assoc name (fr-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -266,6 +272,9 @@ - ;; abuse. - ;; - -+(define (local-fr-label-title-sep) -+ (list)) -+ - (define (fr-label-title-sep) - (list - (list (normalize "abstract") " : ") -@@ -309,10 +318,13 @@ - (define (gentext-fr-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-fr-label-title-sep))) - (sep (assoc name (fr-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (fr-label-number-format-list) - (list -diff -ur modular.org/common/dbl1hu.dsl modular/common/dbl1hu.dsl ---- modular.org/common/dbl1hu.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1hu.dsl Wed Feb 21 18:40:09 2001 -@@ -233,6 +233,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-hu-intra-label-sep) -+ (list)) -+ - (define (hu-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -262,10 +265,13 @@ - (define (gentext-hu-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-hu-intra-label-sep))) - (sep (assoc name (hu-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -275,6 +281,9 @@ - ;; abuse. - ;; - -+(define (local-hu-label-title-sep) -+ (list)) -+ - (define (hu-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -318,10 +327,13 @@ - (define (gentext-hu-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-hu-label-title-sep))) - (sep (assoc name (hu-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (hu-label-number-format-list) - (list -diff -ur modular.org/common/dbl1it.dsl modular/common/dbl1it.dsl ---- modular.org/common/dbl1it.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1it.dsl Wed Feb 21 18:41:22 2001 -@@ -257,6 +257,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-it-intra-label-sep) -+ (list)) -+ - (define (it-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -286,10 +289,13 @@ - (define (gentext-it-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-it-intra-label-sep))) - (sep (assoc name (it-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -299,6 +305,9 @@ - ;; abuse. - ;; - -+(define (local-it-label-title-sep) -+ (list)) -+ - (define (it-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -342,10 +351,13 @@ - (define (gentext-it-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-it-label-title-sep))) - (sep (assoc name (it-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (it-label-number-format-list) - (list -diff -ur modular.org/common/dbl1ja.dsl modular/common/dbl1ja.dsl ---- modular.org/common/dbl1ja.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1ja.dsl Wed Feb 21 18:41:26 2001 -@@ -230,6 +230,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-ja-intra-label-sep) -+ (list)) -+ - (define (ja-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -259,10 +262,13 @@ - (define (gentext-ja-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-ja-intra-label-sep))) - (sep (assoc name (ja-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -272,6 +278,9 @@ - ;; abuse. - ;; - -+(define (local-ja-label-title-sep) -+ (list)) -+ - (define (ja-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -315,10 +324,13 @@ - (define (gentext-ja-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-ja-label-title-sep))) - (sep (assoc name (ja-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (ja-label-number-format-list) - (list -diff -ur modular.org/common/dbl1ko.dsl modular/common/dbl1ko.dsl ---- modular.org/common/dbl1ko.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1ko.dsl Wed Feb 21 18:41:30 2001 -@@ -242,6 +242,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-ko-intra-label-sep) -+ (list)) -+ - (define (ko-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -271,10 +274,13 @@ - (define (gentext-ko-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-ko-intra-label-sep))) - (sep (assoc name (ko-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -284,6 +290,9 @@ - ;; abuse. - ;; - -+(define (local-ko-label-title-sep) -+ (list)) -+ - (define (ko-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -327,10 +336,13 @@ - (define (gentext-ko-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-ko-label-title-sep))) - (sep (assoc name (ko-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (ko-label-number-format-list) - (list -diff -ur modular.org/common/dbl1nl.dsl modular/common/dbl1nl.dsl ---- modular.org/common/dbl1nl.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1nl.dsl Wed Feb 21 18:41:34 2001 -@@ -226,6 +226,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-nl-intra-label-sep) -+ (list)) -+ - (define (nl-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -255,10 +258,13 @@ - (define (gentext-nl-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-nl-intra-label-sep))) - (sep (assoc name (nl-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -268,6 +274,9 @@ - ;; abuse. - ;; - -+(define (local-nl-label-title-sep) -+ (list)) -+ - (define (nl-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -311,10 +320,13 @@ - (define (gentext-nl-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-nl-label-title-sep))) - (sep (assoc name (nl-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (nl-label-number-format-list) - (list -diff -ur modular.org/common/dbl1no.dsl modular/common/dbl1no.dsl ---- modular.org/common/dbl1no.dsl Wed Feb 21 18:03:32 2001 -+++ common/dbl1no.dsl Wed Feb 21 18:41:37 2001 -@@ -223,6 +223,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-no-intra-label-sep) -+ (list)) -+ - (define (no-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -252,10 +255,13 @@ - (define (gentext-no-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-no-intra-label-sep))) - (sep (assoc name (no-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -265,6 +271,9 @@ - ;; abuse. - ;; - -+(define (local-no-label-title-sep) -+ (list)) -+ - (define (no-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -308,10 +317,13 @@ - (define (gentext-no-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-no-label-title-sep))) - (sep (assoc name (no-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (no-label-number-format-list) - (list -diff -ur modular.org/common/dbl1pl.dsl modular/common/dbl1pl.dsl ---- modular.org/common/dbl1pl.dsl Wed Feb 21 18:03:33 2001 -+++ common/dbl1pl.dsl Wed Feb 21 18:41:49 2001 -@@ -220,6 +220,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-pl-intra-label-sep) -+ (list)) -+ - (define (pl-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -249,10 +252,13 @@ - (define (gentext-pl-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-pl-intra-label-sep))) - (sep (assoc name (pl-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -262,6 +268,9 @@ - ;; abuse. - ;; - -+(define (local-pl-label-title-sep) -+ (list)) -+ - (define (pl-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -305,10 +314,13 @@ - (define (gentext-pl-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-pl-label-title-sep))) - (sep (assoc name (pl-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (pl-label-number-format-list) - (list -diff -ur modular.org/common/dbl1pt.dsl modular/common/dbl1pt.dsl ---- modular.org/common/dbl1pt.dsl Wed Feb 21 18:03:33 2001 -+++ common/dbl1pt.dsl Wed Feb 21 18:41:52 2001 -@@ -220,6 +220,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-pt-intra-label-sep) -+ (list)) -+ - (define (pt-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -249,10 +252,13 @@ - (define (gentext-pt-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-pt-intra-label-sep))) - (sep (assoc name (pt-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -262,6 +268,9 @@ - ;; abuse. - ;; - -+(define (local-pt-label-title-sep) -+ (list)) -+ - (define (pt-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -305,10 +314,13 @@ - (define (gentext-pt-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-pt-label-title-sep))) - (sep (assoc name (pt-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (pt-label-number-format-list) - (list -diff -ur modular.org/common/dbl1ptbr.dsl modular/common/dbl1ptbr.dsl ---- modular.org/common/dbl1ptbr.dsl Wed Feb 21 18:03:33 2001 -+++ common/dbl1ptbr.dsl Wed Feb 21 18:41:56 2001 -@@ -221,6 +221,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-ptbr-intra-label-sep) -+ (list)) -+ - (define (ptbr-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -250,10 +253,13 @@ - (define (gentext-ptbr-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-ptbr-intra-label-sep))) - (sep (assoc name (ptbr-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -263,6 +269,9 @@ - ;; abuse. - ;; - -+(define (local-ptbr-label-title-sep) -+ (list)) -+ - (define (ptbr-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -306,10 +315,13 @@ - (define (gentext-ptbr-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-ptbr-label-title-sep))) - (sep (assoc name (ptbr-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (ptbr-label-number-format-list) - (list -diff -ur modular.org/common/dbl1ro.dsl modular/common/dbl1ro.dsl ---- modular.org/common/dbl1ro.dsl Wed Feb 21 18:03:33 2001 -+++ common/dbl1ro.dsl Wed Feb 21 18:42:04 2001 -@@ -222,6 +222,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-ro-intra-label-sep) -+ (list)) -+ - (define (ro-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -251,10 +254,13 @@ - (define (gentext-ro-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-ro-intra-label-sep))) - (sep (assoc name (ro-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -264,6 +270,9 @@ - ;; abuse. - ;; - -+(define (local-ro-label-title-sep) -+ (list)) -+ - (define (ro-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -307,10 +316,13 @@ - (define (gentext-ro-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-ro-label-title-sep))) - (sep (assoc name (ro-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (ro-label-number-format-list) - (list -diff -ur modular.org/common/dbl1ru.dsl modular/common/dbl1ru.dsl ---- modular.org/common/dbl1ru.dsl Wed Feb 21 18:03:33 2001 -+++ common/dbl1ru.dsl Wed Feb 21 18:42:07 2001 -@@ -232,6 +232,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-ru-intra-label-sep) -+ (list)) -+ - (define (ru-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -261,10 +264,13 @@ - (define (gentext-ru-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-ru-intra-label-sep))) - (sep (assoc name (ru-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -274,6 +280,9 @@ - ;; abuse. - ;; - -+(define (local-ru-label-title-sep) -+ (list)) -+ - (define (ru-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -317,10 +326,13 @@ - (define (gentext-ru-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-ru-label-title-sep))) - (sep (assoc name (ru-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (ru-label-number-format-list) - (list -diff -ur modular.org/common/dbl1sk.dsl modular/common/dbl1sk.dsl ---- modular.org/common/dbl1sk.dsl Wed Feb 21 18:03:33 2001 -+++ common/dbl1sk.dsl Wed Feb 21 18:42:12 2001 -@@ -229,6 +229,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-sk-intra-label-sep) -+ (list)) -+ - (define (sk-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -258,10 +261,13 @@ - (define (gentext-sk-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-sk-intra-label-sep))) - (sep (assoc name (sk-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -271,6 +277,9 @@ - ;; abuse. - ;; - -+(define (local-sk-label-title-sep) -+ (list)) -+ - (define (sk-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -314,10 +323,13 @@ - (define (gentext-sk-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-sk-label-title-sep))) - (sep (assoc name (sk-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (sk-label-number-format-list) - (list -diff -ur modular.org/common/dbl1sl.dsl modular/common/dbl1sl.dsl ---- modular.org/common/dbl1sl.dsl Wed Feb 21 18:03:33 2001 -+++ common/dbl1sl.dsl Wed Feb 21 18:42:14 2001 -@@ -233,6 +233,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-sl-intra-label-sep) -+ (list)) -+ - (define (sl-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -262,10 +265,13 @@ - (define (gentext-sl-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-sl-intra-label-sep))) - (sep (assoc name (sl-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -275,6 +281,9 @@ - ;; abuse. - ;; - -+(define (local-sl-label-title-sep) -+ (list)) -+ - (define (sl-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -318,10 +327,13 @@ - (define (gentext-sl-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-sl-label-title-sep))) - (sep (assoc name (sl-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (sl-label-number-format-list) - (list -diff -ur modular.org/common/dbl1sv.dsl modular/common/dbl1sv.dsl ---- modular.org/common/dbl1sv.dsl Wed Feb 21 18:03:33 2001 -+++ common/dbl1sv.dsl Wed Feb 21 18:42:21 2001 -@@ -231,6 +231,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-sv-intra-label-sep) -+ (list)) -+ - (define (sv-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -260,10 +263,13 @@ - (define (gentext-sv-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-sv-intra-label-sep))) - (sep (assoc name (sv-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -273,6 +279,9 @@ - ;; abuse. - ;; - -+(define (local-sv-label-title-sep) -+ (list)) -+ - (define (sv-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -316,10 +325,13 @@ - (define (gentext-sv-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-sv-label-title-sep))) - (sep (assoc name (sv-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (sv-label-number-format-list) - (list -diff -ur modular.org/common/dbl1zhcn.dsl modular/common/dbl1zhcn.dsl ---- modular.org/common/dbl1zhcn.dsl Wed Feb 21 18:03:33 2001 -+++ common/dbl1zhcn.dsl Wed Feb 21 18:42:27 2001 -@@ -234,6 +234,9 @@ - ;; (e.g. REFNAME) with a little abuse. - ;; - -+(define (local-zhcn-intra-label-sep) -+ (list)) -+ - (define (zhcn-intra-label-sep) - (list - (list (normalize "equation") "-") -@@ -263,10 +266,13 @@ - (define (gentext-zhcn-intra-label-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-zhcn-intra-label-sep))) - (sep (assoc name (zhcn-intra-label-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - ;; gentext-label-title-sep returns the seperator to be inserted - ;; between a label and the text following the label for the -@@ -276,6 +282,9 @@ - ;; abuse. - ;; - -+(define (local-zhcn-label-title-sep) -+ (list)) -+ - (define (zhcn-label-title-sep) - (list - (list (normalize "abstract") ": ") -@@ -319,10 +328,13 @@ - (define (gentext-zhcn-label-title-sep gind) - (let* ((giname (if (string? gind) gind (gi gind))) - (name (normalize giname)) -+ (lsep (assoc name (local-zhcn-label-title-sep))) - (sep (assoc name (zhcn-label-title-sep)))) -- (if sep -- (car (cdr sep)) -- ""))) -+ (if lsep -+ (car (cdr lsep)) -+ (if sep -+ (car (cdr sep)) -+ "")))) - - (define (zhcn-label-number-format-list) - (list diff --git a/textproc/dsssl-docbook-modular/pkg-descr b/textproc/dsssl-docbook-modular/pkg-descr index 273058d0565b..0bcb409f5c81 100644 --- a/textproc/dsssl-docbook-modular/pkg-descr +++ b/textproc/dsssl-docbook-modular/pkg-descr @@ -1,3 +1,5 @@ These are DSSSL stylesheets for the DocBook DTD by Norm Walsh. Use them in conjunction with a DSSSL processor (such as jade) to convert documents marked up as DocBook to RTF, HTML and TeX. + +WWW: http://sourceforge.net/projects/docbook/ diff --git a/textproc/dsssl-docbook-modular/pkg-plist b/textproc/dsssl-docbook-modular/pkg-plist index 5a3d33b0e193..3d4b28184610 100644 --- a/textproc/dsssl-docbook-modular/pkg-plist +++ b/textproc/dsssl-docbook-modular/pkg-plist @@ -5,13 +5,10 @@ share/sgml/docbook/dsssl/modular/TODO share/sgml/docbook/dsssl/modular/VERSION share/sgml/docbook/dsssl/modular/WhatsNew share/sgml/docbook/dsssl/modular/bin/ChangeLog -share/sgml/docbook/dsssl/modular/bin/LostLog share/sgml/docbook/dsssl/modular/bin/collateindex.pl share/sgml/docbook/dsssl/modular/catalog share/sgml/docbook/dsssl/modular/common/ChangeLog -share/sgml/docbook/dsssl/modular/common/LostLog -share/sgml/docbook/dsssl/modular/common/Oldversion.sgm -share/sgml/docbook/dsssl/modular/common/README +share/sgml/docbook/dsssl/modular/common/cs-hack.pl share/sgml/docbook/dsssl/modular/common/dbcommon.dsl share/sgml/docbook/dsssl/modular/common/dbl10n.dsl share/sgml/docbook/dsssl/modular/common/dbl1ca.dsl @@ -34,6 +31,7 @@ share/sgml/docbook/dsssl/modular/common/dbl1fi.dsl share/sgml/docbook/dsssl/modular/common/dbl1fi.ent share/sgml/docbook/dsssl/modular/common/dbl1fr.dsl share/sgml/docbook/dsssl/modular/common/dbl1fr.ent +share/sgml/docbook/dsssl/modular/common/dbl1fr.ent.bak.bak share/sgml/docbook/dsssl/modular/common/dbl1hu.dsl share/sgml/docbook/dsssl/modular/common/dbl1hu.ent share/sgml/docbook/dsssl/modular/common/dbl1id.dsl @@ -63,28 +61,27 @@ share/sgml/docbook/dsssl/modular/common/dbl1sk.dsl share/sgml/docbook/dsssl/modular/common/dbl1sk.ent share/sgml/docbook/dsssl/modular/common/dbl1sl.dsl share/sgml/docbook/dsssl/modular/common/dbl1sl.ent +share/sgml/docbook/dsssl/modular/common/dbl1sr.dsl +share/sgml/docbook/dsssl/modular/common/dbl1sr.ent share/sgml/docbook/dsssl/modular/common/dbl1sv.dsl share/sgml/docbook/dsssl/modular/common/dbl1sv.ent share/sgml/docbook/dsssl/modular/common/dbl1zhcn.dsl share/sgml/docbook/dsssl/modular/common/dbl1zhcn.ent +share/sgml/docbook/dsssl/modular/common/dbl1zhtw.dsl +share/sgml/docbook/dsssl/modular/common/dbl1zhtw.ent share/sgml/docbook/dsssl/modular/common/dbtable.dsl share/sgml/docbook/dsssl/modular/contrib/html/ChangeLog -share/sgml/docbook/dsssl/modular/contrib/html/LostLog share/sgml/docbook/dsssl/modular/contrib/html/short-biblioentry.dsl share/sgml/docbook/dsssl/modular/contrib/imagemap/ChangeLog -share/sgml/docbook/dsssl/modular/contrib/imagemap/LostLog share/sgml/docbook/dsssl/modular/contrib/imagemap/imagemap.dsl share/sgml/docbook/dsssl/modular/contrib/imagemap/testdoc.sgm share/sgml/docbook/dsssl/modular/contrib/imagemap/testimg.jpg share/sgml/docbook/dsssl/modular/contrib/print/ChangeLog -share/sgml/docbook/dsssl/modular/contrib/print/LostLog share/sgml/docbook/dsssl/modular/contrib/print/short-biblioentry.dsl share/sgml/docbook/dsssl/modular/contrib/renumberinpart/ChangeLog -share/sgml/docbook/dsssl/modular/contrib/renumberinpart/LostLog share/sgml/docbook/dsssl/modular/contrib/renumberinpart/renumberinpart.dsl share/sgml/docbook/dsssl/modular/contrib/renumberinpart/test.sgm share/sgml/docbook/dsssl/modular/contrib/subdoc/ChangeLog -share/sgml/docbook/dsssl/modular/contrib/subdoc/LostLog share/sgml/docbook/dsssl/modular/contrib/subdoc/book.sgm share/sgml/docbook/dsssl/modular/contrib/subdoc/subdoc.dsl share/sgml/docbook/dsssl/modular/contrib/subdoc/subdoc.dtd @@ -92,13 +89,11 @@ share/sgml/docbook/dsssl/modular/contrib/subdoc/subdoc1.sgm share/sgml/docbook/dsssl/modular/contrib/subdoc/subdoc2.sgm share/sgml/docbook/dsssl/modular/contrib/subdoc/subdocbc.mod share/sgml/docbook/dsssl/modular/doc/ChangeLog -share/sgml/docbook/dsssl/modular/doc/LostLog share/sgml/docbook/dsssl/modular/doc/collateindex.html share/sgml/docbook/dsssl/modular/doc/common.html share/sgml/docbook/dsssl/modular/doc/custom.html share/sgml/docbook/dsssl/modular/doc/html.html share/sgml/docbook/dsssl/modular/doc/html/ChangeLog -share/sgml/docbook/dsssl/modular/doc/html/LostLog share/sgml/docbook/dsssl/modular/doc/html/admon-graphic-width.html share/sgml/docbook/dsssl/modular/doc/html/admon-graphic.html share/sgml/docbook/dsssl/modular/doc/html/admon-graphics-path.html @@ -116,6 +111,7 @@ share/sgml/docbook/dsssl/modular/doc/html/callout-graphics-path.html share/sgml/docbook/dsssl/modular/doc/html/callout-graphics.html share/sgml/docbook/dsssl/modular/doc/html/cals-table-class.html share/sgml/docbook/dsssl/modular/doc/html/chapter-autolabel.html +share/sgml/docbook/dsssl/modular/doc/html/citerefentry-link.html share/sgml/docbook/dsssl/modular/doc/html/content-title-end-punct.html share/sgml/docbook/dsssl/modular/doc/html/css-decoration.html share/sgml/docbook/dsssl/modular/doc/html/css-liststyle-alist.html @@ -213,9 +209,13 @@ share/sgml/docbook/dsssl/modular/doc/html/r1276.htm share/sgml/docbook/dsssl/modular/doc/html/r1360.htm share/sgml/docbook/dsssl/modular/doc/html/r1438.htm share/sgml/docbook/dsssl/modular/doc/html/r1749.htm +share/sgml/docbook/dsssl/modular/doc/html/r1765.htm share/sgml/docbook/dsssl/modular/doc/html/r1836.htm +share/sgml/docbook/dsssl/modular/doc/html/r1852.htm share/sgml/docbook/dsssl/modular/doc/html/r1922.htm +share/sgml/docbook/dsssl/modular/doc/html/r1938.htm share/sgml/docbook/dsssl/modular/doc/html/r2092.htm +share/sgml/docbook/dsssl/modular/doc/html/r2108.htm share/sgml/docbook/dsssl/modular/doc/html/r22.htm share/sgml/docbook/dsssl/modular/doc/html/r228.htm share/sgml/docbook/dsssl/modular/doc/html/r396.htm @@ -249,7 +249,6 @@ share/sgml/docbook/dsssl/modular/doc/indexing.html share/sgml/docbook/dsssl/modular/doc/install.html share/sgml/docbook/dsssl/modular/doc/lib.html share/sgml/docbook/dsssl/modular/doc/lib/ChangeLog -share/sgml/docbook/dsssl/modular/doc/lib/LostLog share/sgml/docbook/dsssl/modular/doc/lib/absolute-child-number.html share/sgml/docbook/dsssl/modular/doc/lib/ancestor-member.html share/sgml/docbook/dsssl/modular/doc/lib/assoc-objs.html @@ -344,7 +343,6 @@ share/sgml/docbook/dsssl/modular/doc/olinksemantics.html share/sgml/docbook/dsssl/modular/doc/otherdoc.html share/sgml/docbook/dsssl/modular/doc/print.html share/sgml/docbook/dsssl/modular/doc/print/ChangeLog -share/sgml/docbook/dsssl/modular/doc/print/LostLog share/sgml/docbook/dsssl/modular/doc/print/admon-font-family.html share/sgml/docbook/dsssl/modular/doc/print/admon-graphic-default-extension.html share/sgml/docbook/dsssl/modular/doc/print/admon-graphic-width.html @@ -518,36 +516,28 @@ share/sgml/docbook/dsssl/modular/doc/print/verbatim-size-factor.html share/sgml/docbook/dsssl/modular/doc/print/visual-acuity.html share/sgml/docbook/dsssl/modular/doc/print/writing-mode.html share/sgml/docbook/dsssl/modular/doc/testdata/ChangeLog -share/sgml/docbook/dsssl/modular/doc/testdata/LostLog share/sgml/docbook/dsssl/modular/doc/testdata/c01.htm share/sgml/docbook/dsssl/modular/doc/testdata/jtest.dsl share/sgml/docbook/dsssl/modular/doc/testdata/jtest.rtf share/sgml/docbook/dsssl/modular/doc/testdata/jtest.sgm share/sgml/docbook/dsssl/modular/doc/testdata/test.rtf share/sgml/docbook/dsssl/modular/doc/testdata/test.sgm -share/sgml/docbook/dsssl/modular/docbook.dcl share/sgml/docbook/dsssl/modular/dtds/dbdsssl/ChangeLog -share/sgml/docbook/dsssl/modular/dtds/dbdsssl/LostLog share/sgml/docbook/dsssl/modular/dtds/dbdsssl/dbdsssl.dtd share/sgml/docbook/dsssl/modular/dtds/decls/ChangeLog -share/sgml/docbook/dsssl/modular/dtds/decls/LostLog share/sgml/docbook/dsssl/modular/dtds/decls/docbook.dcl share/sgml/docbook/dsssl/modular/dtds/decls/xml.dcl share/sgml/docbook/dsssl/modular/dtds/html/ChangeLog -share/sgml/docbook/dsssl/modular/dtds/html/LostLog share/sgml/docbook/dsssl/modular/dtds/html/ISOlat1.gml share/sgml/docbook/dsssl/modular/dtds/html/catalog share/sgml/docbook/dsssl/modular/dtds/html/dbhtml.dcl share/sgml/docbook/dsssl/modular/dtds/html/dbhtml.dtd share/sgml/docbook/dsssl/modular/dtds/html/test.htm share/sgml/docbook/dsssl/modular/dtds/imagelib/ChangeLog -share/sgml/docbook/dsssl/modular/dtds/imagelib/LostLog share/sgml/docbook/dsssl/modular/dtds/imagelib/imagelib.dtd share/sgml/docbook/dsssl/modular/dtds/olink/ChangeLog -share/sgml/docbook/dsssl/modular/dtds/olink/LostLog share/sgml/docbook/dsssl/modular/dtds/olink/olinksum.dtd share/sgml/docbook/dsssl/modular/frames/ChangeLog -share/sgml/docbook/dsssl/modular/frames/LostLog share/sgml/docbook/dsssl/modular/frames/README share/sgml/docbook/dsssl/modular/frames/docbook.css share/sgml/docbook/dsssl/modular/frames/docbook.js @@ -555,9 +545,6 @@ share/sgml/docbook/dsssl/modular/frames/frames.dsl share/sgml/docbook/dsssl/modular/frames/frames.htm share/sgml/docbook/dsssl/modular/frames/navbar.htm share/sgml/docbook/dsssl/modular/html/ChangeLog -share/sgml/docbook/dsssl/modular/html/LostLog -share/sgml/docbook/dsssl/modular/html/OldChangelog.sgm -share/sgml/docbook/dsssl/modular/html/README share/sgml/docbook/dsssl/modular/html/XREF share/sgml/docbook/dsssl/modular/html/catalog share/sgml/docbook/dsssl/modular/html/db31.dsl @@ -596,7 +583,6 @@ share/sgml/docbook/dsssl/modular/html/dbverb.dsl share/sgml/docbook/dsssl/modular/html/docbook.dsl share/sgml/docbook/dsssl/modular/html/version.dsl share/sgml/docbook/dsssl/modular/images/ChangeLog -share/sgml/docbook/dsssl/modular/images/LostLog share/sgml/docbook/dsssl/modular/images/callouts/1.gif share/sgml/docbook/dsssl/modular/images/callouts/10.gif share/sgml/docbook/dsssl/modular/images/callouts/2.gif @@ -608,7 +594,6 @@ share/sgml/docbook/dsssl/modular/images/callouts/7.gif share/sgml/docbook/dsssl/modular/images/callouts/8.gif share/sgml/docbook/dsssl/modular/images/callouts/9.gif share/sgml/docbook/dsssl/modular/images/callouts/ChangeLog -share/sgml/docbook/dsssl/modular/images/callouts/LostLog share/sgml/docbook/dsssl/modular/images/caution.gif share/sgml/docbook/dsssl/modular/images/home.gif share/sgml/docbook/dsssl/modular/images/important.gif @@ -622,18 +607,10 @@ share/sgml/docbook/dsssl/modular/images/toc-plus.gif share/sgml/docbook/dsssl/modular/images/up.gif share/sgml/docbook/dsssl/modular/images/warning.gif share/sgml/docbook/dsssl/modular/lib/ChangeLog -share/sgml/docbook/dsssl/modular/lib/LostLog -share/sgml/docbook/dsssl/modular/lib/Oldversion.sgm -share/sgml/docbook/dsssl/modular/lib/README share/sgml/docbook/dsssl/modular/lib/dblib.dsl share/sgml/docbook/dsssl/modular/olink/ChangeLog -share/sgml/docbook/dsssl/modular/olink/LostLog -share/sgml/docbook/dsssl/modular/olink/README share/sgml/docbook/dsssl/modular/olink/olink.dsl share/sgml/docbook/dsssl/modular/print/ChangeLog -share/sgml/docbook/dsssl/modular/print/LostLog -share/sgml/docbook/dsssl/modular/print/OldChangelog.sgm -share/sgml/docbook/dsssl/modular/print/README share/sgml/docbook/dsssl/modular/print/XREF share/sgml/docbook/dsssl/modular/print/catalog share/sgml/docbook/dsssl/modular/print/db31.dsl @@ -669,85 +646,6 @@ share/sgml/docbook/dsssl/modular/print/docbook.dsl share/sgml/docbook/dsssl/modular/print/notoc.dsl share/sgml/docbook/dsssl/modular/print/plain.dsl share/sgml/docbook/dsssl/modular/print/version.dsl -share/sgml/docbook/dsssl/modular/test/ChangeLog -share/sgml/docbook/dsssl/modular/test/LostLog -share/sgml/docbook/dsssl/modular/test/cases/ChangeLog -share/sgml/docbook/dsssl/modular/test/cases/LostLog -share/sgml/docbook/dsssl/modular/test/cases/biblio.sgm -share/sgml/docbook/dsssl/modular/test/cases/biblio2.sgm -share/sgml/docbook/dsssl/modular/test/cases/blocks.sgm -share/sgml/docbook/dsssl/modular/test/cases/callout.sgm -share/sgml/docbook/dsssl/modular/test/cases/cmdsyn.sgm -share/sgml/docbook/dsssl/modular/test/cases/funcsyn.sgm -share/sgml/docbook/dsssl/modular/test/cases/gloss.sgm -share/sgml/docbook/dsssl/modular/test/cases/graphic.sgm -share/sgml/docbook/dsssl/modular/test/cases/include.sgm -share/sgml/docbook/dsssl/modular/test/cases/index.sgm -share/sgml/docbook/dsssl/modular/test/cases/inlines.sgm -share/sgml/docbook/dsssl/modular/test/cases/iterms.sgm -share/sgml/docbook/dsssl/modular/test/cases/lists.sgm -share/sgml/docbook/dsssl/modular/test/cases/makemlang.pl -share/sgml/docbook/dsssl/modular/test/cases/math.sgm -share/sgml/docbook/dsssl/modular/test/cases/mlang.sgm -share/sgml/docbook/dsssl/modular/test/cases/refent.sgm -share/sgml/docbook/dsssl/modular/test/cases/refentry.sgm -share/sgml/docbook/dsssl/modular/test/cases/sections.sgm -share/sgml/docbook/dsssl/modular/test/cases/tables.sgm -share/sgml/docbook/dsssl/modular/test/cases/titlepg.sgm -share/sgml/docbook/dsssl/modular/test/db31.sgm -share/sgml/docbook/dsssl/modular/test/docbook.css -share/sgml/docbook/dsssl/modular/test/docbook40.xml -share/sgml/docbook/dsssl/modular/test/docinfo.sgm -share/sgml/docbook/dsssl/modular/test/emc2.gif -share/sgml/docbook/dsssl/modular/test/emc2i.gif -share/sgml/docbook/dsssl/modular/test/footnote.sgm -share/sgml/docbook/dsssl/modular/test/genindex.sgm -share/sgml/docbook/dsssl/modular/test/headft.dsl -share/sgml/docbook/dsssl/modular/test/imagelib/ChangeLog -share/sgml/docbook/dsssl/modular/test/imagelib/LostLog -share/sgml/docbook/dsssl/modular/test/imagelib/catalog -share/sgml/docbook/dsssl/modular/test/imagelib/imagelib.xml -share/sgml/docbook/dsssl/modular/test/multicol.dsl -share/sgml/docbook/dsssl/modular/test/multicol.sgm -share/sgml/docbook/dsssl/modular/test/refentry.sgm -share/sgml/docbook/dsssl/modular/test/struct.sgm -share/sgml/docbook/dsssl/modular/test/tennis.jpg -share/sgml/docbook/dsssl/modular/test/tennis.mpeg -share/sgml/docbook/dsssl/modular/test/xarticle.dsl -share/sgml/docbook/dsssl/modular/test/xarticle.sgm -share/sgml/docbook/dsssl/modular/test/xbadtag.sgm -share/sgml/docbook/dsssl/modular/test/xbiblio2.sgm -share/sgml/docbook/dsssl/modular/test/xblocks.sgm -share/sgml/docbook/dsssl/modular/test/xbook.sgm -share/sgml/docbook/dsssl/modular/test/xbook2.sgm -share/sgml/docbook/dsssl/modular/test/xcallout.sgm -share/sgml/docbook/dsssl/modular/test/xchapter.sgm -share/sgml/docbook/dsssl/modular/test/xcmdsyn.sgm -share/sgml/docbook/dsssl/modular/test/xfuncsyn.sgm -share/sgml/docbook/dsssl/modular/test/xgloss.sgm -share/sgml/docbook/dsssl/modular/test/xgraphic.sgm -share/sgml/docbook/dsssl/modular/test/xheadft.sgm -share/sgml/docbook/dsssl/modular/test/xinclude.sgm -share/sgml/docbook/dsssl/modular/test/xindex.sgm -share/sgml/docbook/dsssl/modular/test/xinlines.sgm -share/sgml/docbook/dsssl/modular/test/xiterms.sgm -share/sgml/docbook/dsssl/modular/test/xlists.sgm -share/sgml/docbook/dsssl/modular/test/xmath.sgm -share/sgml/docbook/dsssl/modular/test/xml/ChangeLog -share/sgml/docbook/dsssl/modular/test/xml/LostLog -share/sgml/docbook/dsssl/modular/test/xml/catalog -share/sgml/docbook/dsssl/modular/test/xml/inlines.xml -share/sgml/docbook/dsssl/modular/test/xml/xinlines.xml -share/sgml/docbook/dsssl/modular/test/xml/xml.dcl -share/sgml/docbook/dsssl/modular/test/xmlang.sgm -share/sgml/docbook/dsssl/modular/test/xreference.sgm -share/sgml/docbook/dsssl/modular/test/xsections.sgm -share/sgml/docbook/dsssl/modular/test/xset.sgm -share/sgml/docbook/dsssl/modular/test/xtables.sgm -@dirrm share/sgml/docbook/dsssl/modular/test/xml -@dirrm share/sgml/docbook/dsssl/modular/test/imagelib -@dirrm share/sgml/docbook/dsssl/modular/test/cases -@dirrm share/sgml/docbook/dsssl/modular/test @dirrm share/sgml/docbook/dsssl/modular/print @dirrm share/sgml/docbook/dsssl/modular/olink @dirrm share/sgml/docbook/dsssl/modular/lib |