diff --git a/de_DE.ISO8859-1/share/sgml/catalog b/de_DE.ISO8859-1/share/sgml/catalog
new file mode 100644
index 0000000000..5ebe8768fc
--- /dev/null
+++ b/de_DE.ISO8859-1/share/sgml/catalog
@@ -0,0 +1,9 @@
+ -- ...................................................................... --
+ -- FreeBSD SGML Public Identifiers ...................................... --
+
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+ --
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
+
diff --git a/de_DE.ISO8859-1/share/sgml/freebsd.dsl b/de_DE.ISO8859-1/share/sgml/freebsd.dsl
index b9912bbffb..2536dfd538 100644
--- a/de_DE.ISO8859-1/share/sgml/freebsd.dsl
+++ b/de_DE.ISO8859-1/share/sgml/freebsd.dsl
@@ -1,30 +1,30 @@
-
+
+
]>
.")
(make empty-element gi: "br")
(literal "For questions about this documentation, e-mail <")
(make element gi: "a"
attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
(literal "doc@FreeBSD.org"))
(literal ">.")))
]]>
diff --git a/de_DE.ISO_8859-1/share/sgml/catalog b/de_DE.ISO_8859-1/share/sgml/catalog
new file mode 100644
index 0000000000..5ebe8768fc
--- /dev/null
+++ b/de_DE.ISO_8859-1/share/sgml/catalog
@@ -0,0 +1,9 @@
+ -- ...................................................................... --
+ -- FreeBSD SGML Public Identifiers ...................................... --
+
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+ --
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
+
diff --git a/de_DE.ISO_8859-1/share/sgml/freebsd.dsl b/de_DE.ISO_8859-1/share/sgml/freebsd.dsl
index b9912bbffb..2536dfd538 100644
--- a/de_DE.ISO_8859-1/share/sgml/freebsd.dsl
+++ b/de_DE.ISO_8859-1/share/sgml/freebsd.dsl
@@ -1,30 +1,30 @@
-
+
+
]>
.")
(make empty-element gi: "br")
(literal "For questions about this documentation, e-mail <")
(make element gi: "a"
attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
(literal "doc@FreeBSD.org"))
(literal ">.")))
]]>
diff --git a/en_US.ISO8859-1/share/sgml/catalog b/en_US.ISO8859-1/share/sgml/catalog
new file mode 100644
index 0000000000..5ebe8768fc
--- /dev/null
+++ b/en_US.ISO8859-1/share/sgml/catalog
@@ -0,0 +1,9 @@
+ -- ...................................................................... --
+ -- FreeBSD SGML Public Identifiers ...................................... --
+
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+ --
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
+
diff --git a/en_US.ISO8859-1/share/sgml/freebsd.dsl b/en_US.ISO8859-1/share/sgml/freebsd.dsl
index 2c77bfca6f..6c2b0451bc 100644
--- a/en_US.ISO8859-1/share/sgml/freebsd.dsl
+++ b/en_US.ISO8859-1/share/sgml/freebsd.dsl
@@ -1,39 +1,39 @@
-
+
+
]>
.")
(make empty-element gi: "br")
(literal "For questions about this documentation, e-mail <")
(make element gi: "a"
attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
(literal "doc@FreeBSD.org"))
(literal ">.")))
(element quote
(make sequence
(literal "``")
(process-children)
(literal "''")))
]]>
diff --git a/en_US.ISO_8859-1/share/sgml/catalog b/en_US.ISO_8859-1/share/sgml/catalog
new file mode 100644
index 0000000000..5ebe8768fc
--- /dev/null
+++ b/en_US.ISO_8859-1/share/sgml/catalog
@@ -0,0 +1,9 @@
+ -- ...................................................................... --
+ -- FreeBSD SGML Public Identifiers ...................................... --
+
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+ --
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
+
diff --git a/en_US.ISO_8859-1/share/sgml/freebsd.dsl b/en_US.ISO_8859-1/share/sgml/freebsd.dsl
index 2c77bfca6f..6c2b0451bc 100644
--- a/en_US.ISO_8859-1/share/sgml/freebsd.dsl
+++ b/en_US.ISO_8859-1/share/sgml/freebsd.dsl
@@ -1,39 +1,39 @@
-
+
+
]>
.")
(make empty-element gi: "br")
(literal "For questions about this documentation, e-mail <")
(make element gi: "a"
attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
(literal "doc@FreeBSD.org"))
(literal ">.")))
(element quote
(make sequence
(literal "``")
(process-children)
(literal "''")))
]]>
diff --git a/es_ES.ISO8859-1/share/sgml/catalog b/es_ES.ISO8859-1/share/sgml/catalog
new file mode 100644
index 0000000000..5ebe8768fc
--- /dev/null
+++ b/es_ES.ISO8859-1/share/sgml/catalog
@@ -0,0 +1,9 @@
+ -- ...................................................................... --
+ -- FreeBSD SGML Public Identifiers ...................................... --
+
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+ --
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
+
diff --git a/es_ES.ISO8859-1/share/sgml/freebsd.dsl b/es_ES.ISO8859-1/share/sgml/freebsd.dsl
index b9912bbffb..899594b4f6 100644
--- a/es_ES.ISO8859-1/share/sgml/freebsd.dsl
+++ b/es_ES.ISO8859-1/share/sgml/freebsd.dsl
@@ -1,30 +1,30 @@
-
+
+
]>
.")
(make empty-element gi: "br")
(literal "For questions about this documentation, e-mail <")
(make element gi: "a"
attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
(literal "doc@FreeBSD.org"))
(literal ">.")))
]]>
diff --git a/es_ES.ISO_8859-1/share/sgml/catalog b/es_ES.ISO_8859-1/share/sgml/catalog
new file mode 100644
index 0000000000..5ebe8768fc
--- /dev/null
+++ b/es_ES.ISO_8859-1/share/sgml/catalog
@@ -0,0 +1,9 @@
+ -- ...................................................................... --
+ -- FreeBSD SGML Public Identifiers ...................................... --
+
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+ --
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
+
diff --git a/es_ES.ISO_8859-1/share/sgml/freebsd.dsl b/es_ES.ISO_8859-1/share/sgml/freebsd.dsl
index b9912bbffb..899594b4f6 100644
--- a/es_ES.ISO_8859-1/share/sgml/freebsd.dsl
+++ b/es_ES.ISO_8859-1/share/sgml/freebsd.dsl
@@ -1,30 +1,30 @@
-
+
+
]>
.")
(make empty-element gi: "br")
(literal "For questions about this documentation, e-mail <")
(make element gi: "a"
attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
(literal "doc@FreeBSD.org"))
(literal ">.")))
]]>
diff --git a/fr_FR.ISO8859-1/share/sgml/catalog b/fr_FR.ISO8859-1/share/sgml/catalog
new file mode 100644
index 0000000000..5ebe8768fc
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/sgml/catalog
@@ -0,0 +1,9 @@
+ -- ...................................................................... --
+ -- FreeBSD SGML Public Identifiers ...................................... --
+
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+ --
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
+
diff --git a/fr_FR.ISO8859-1/share/sgml/freebsd.dsl b/fr_FR.ISO8859-1/share/sgml/freebsd.dsl
index 3f957ed651..bbf8283036 100644
--- a/fr_FR.ISO8859-1/share/sgml/freebsd.dsl
+++ b/fr_FR.ISO8859-1/share/sgml/freebsd.dsl
@@ -1,37 +1,37 @@
-
+
+
]>
(define (gentext-fr-nav-prev prev)
(make sequence (literal "Pr\U-00E9;c\U-00E9;dent")))
(define ($email-footer$)
(make sequence
(literal "For questions about FreeBSD, e-mail <")
(make element gi: "a"
attributes: (list (list "href" "mailto:questions@FreeBSD.org"))
(literal "questions@FreeBSD.org"))
(literal ">.")
(make empty-element gi: "br")
(literal "For questions about this documentation, e-mail <")
(make element gi: "a"
attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
(literal "doc@FreeBSD.org"))
(literal ">.")))
]]>
diff --git a/fr_FR.ISO_8859-1/share/sgml/catalog b/fr_FR.ISO_8859-1/share/sgml/catalog
new file mode 100644
index 0000000000..5ebe8768fc
--- /dev/null
+++ b/fr_FR.ISO_8859-1/share/sgml/catalog
@@ -0,0 +1,9 @@
+ -- ...................................................................... --
+ -- FreeBSD SGML Public Identifiers ...................................... --
+
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+ --
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
+
diff --git a/fr_FR.ISO_8859-1/share/sgml/freebsd.dsl b/fr_FR.ISO_8859-1/share/sgml/freebsd.dsl
index 3f957ed651..bbf8283036 100644
--- a/fr_FR.ISO_8859-1/share/sgml/freebsd.dsl
+++ b/fr_FR.ISO_8859-1/share/sgml/freebsd.dsl
@@ -1,37 +1,37 @@
-
+
+
]>
(define (gentext-fr-nav-prev prev)
(make sequence (literal "Pr\U-00E9;c\U-00E9;dent")))
(define ($email-footer$)
(make sequence
(literal "For questions about FreeBSD, e-mail <")
(make element gi: "a"
attributes: (list (list "href" "mailto:questions@FreeBSD.org"))
(literal "questions@FreeBSD.org"))
(literal ">.")
(make empty-element gi: "br")
(literal "For questions about this documentation, e-mail <")
(make element gi: "a"
attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
(literal "doc@FreeBSD.org"))
(literal ">.")))
]]>
diff --git a/ja_JP.eucJP/share/sgml/catalog b/ja_JP.eucJP/share/sgml/catalog
new file mode 100644
index 0000000000..5ebe8768fc
--- /dev/null
+++ b/ja_JP.eucJP/share/sgml/catalog
@@ -0,0 +1,9 @@
+ -- ...................................................................... --
+ -- FreeBSD SGML Public Identifiers ...................................... --
+
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+ --
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
+
diff --git a/ja_JP.eucJP/share/sgml/freebsd.dsl b/ja_JP.eucJP/share/sgml/freebsd.dsl
index dfd77a1fc8..0f79964460 100644
--- a/ja_JP.eucJP/share/sgml/freebsd.dsl
+++ b/ja_JP.eucJP/share/sgml/freebsd.dsl
@@ -1,20 +1,20 @@
-
+
+
]>
(define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=EUC-JP"))))
diff --git a/nl_NL.ISO8859-1/share/sgml/catalog b/nl_NL.ISO8859-1/share/sgml/catalog
new file mode 100644
index 0000000000..5ebe8768fc
--- /dev/null
+++ b/nl_NL.ISO8859-1/share/sgml/catalog
@@ -0,0 +1,9 @@
+ -- ...................................................................... --
+ -- FreeBSD SGML Public Identifiers ...................................... --
+
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+ --
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
+
diff --git a/nl_NL.ISO_8859-1/share/sgml/catalog b/nl_NL.ISO_8859-1/share/sgml/catalog
new file mode 100644
index 0000000000..5ebe8768fc
--- /dev/null
+++ b/nl_NL.ISO_8859-1/share/sgml/catalog
@@ -0,0 +1,9 @@
+ -- ...................................................................... --
+ -- FreeBSD SGML Public Identifiers ...................................... --
+
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+ --
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
+
diff --git a/ru_RU.KOI8-R/share/sgml/catalog b/ru_RU.KOI8-R/share/sgml/catalog
new file mode 100644
index 0000000000..5ebe8768fc
--- /dev/null
+++ b/ru_RU.KOI8-R/share/sgml/catalog
@@ -0,0 +1,9 @@
+ -- ...................................................................... --
+ -- FreeBSD SGML Public Identifiers ...................................... --
+
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+ --
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
+
diff --git a/ru_RU.KOI8-R/share/sgml/freebsd.dsl b/ru_RU.KOI8-R/share/sgml/freebsd.dsl
index e32011a5a9..a3da959afa 100644
--- a/ru_RU.KOI8-R/share/sgml/freebsd.dsl
+++ b/ru_RU.KOI8-R/share/sgml/freebsd.dsl
@@ -1,20 +1,20 @@
-
+
+
]>
(define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=koi8-r"))))
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 03bb35e6a5..f894b30fc6 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -1,398 +1,400 @@
#
-# $FreeBSD: doc/share/mk/doc.docbook.mk,v 1.16 2000/07/18 16:30:45 nik Exp $
+# $FreeBSD: doc/share/mk/doc.docbook.mk,v 1.17 2000/09/25 08:17:03 nik Exp $
#
# This include file handles building and installing of
# DocBook documentation in the FreeBSD Documentation Project.
#
# Documentation using DOCFORMAT=docbook is expected to be marked up
# according to the DocBook DTD
#
# ------------------------------------------------------------------------
#
# Document-specific variables
#
# DOC This should be set to the name of the DocBook
# marked-up file, without the .sgml or .docb suffix.
#
# It also determins the name of the output files -
# ${DOC}.html.
#
# DOCBOOKSUFFIX The suffix of your document, defaulting to .sgml
#
# SRCS The names of all the files that are needed to
# build this document - This is useful if any of
# them need to be generated. Changing any file in
# SRCS causes the documents to be rebuilt.
#
# ------------------------------------------------------------------------
#
# Variables used by both users and documents:
#
# JADEFLAGS Additional options to pass to Jade. Typically
# used to define "IGNORE" entities to "INCLUDE"
# with "-i"
#
# TIDYFLAGS Additional flags to pass to Tidy. Typically
# used to set "-raw" flag to handle 8bit characters.
#
# EXTRA_CATALOGS Additional catalog files that should be used by
# any SGML processing applications.
#
# NO_TIDY If you do not want to use tidy, set this to "YES".
#
# Documents should use the += format to access these.
#
MASTERDOC?= ${.CURDIR}/${DOC}.sgml
JADE= ${PREFIX}/bin/jade
-DSLHTML?= ${DOC_PREFIX}/${LANGCODE}/share/sgml/freebsd.dsl
-DSLPRINT?= ${DOC_PREFIX}/${LANGCODE}/share/sgml/freebsd.dsl
+DSLHTML?= ${DOC_PREFIX}/share/sgml/default.dsl
+DSLPRINT?= ${DOC_PREFIX}/share/sgml/default.dsl
FREEBSDCATALOG= ${DOC_PREFIX}/share/sgml/catalog
+LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog
DOCBOOKCATALOG= ${PREFIX}/share/sgml/docbook/catalog
JADECATALOG= ${PREFIX}/share/sgml/jade/catalog
DSSSLCATALOG= ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
LIB_IMAGES?=
-JADEOPTS= ${JADEFLAGS} -c ${FREEBSDCATALOG} -c ${DSSSLCATALOG} -c ${DOCBOOKCATALOG} -c ${JADECATALOG} ${EXTRA_CATALOGS:S/^/-c /g}
+JADEOPTS= ${JADEFLAGS} -c ${LANGUAGECATALOG} -c ${FREEBSDCATALOG} -c ${DSSSLCATALOG} -c ${DOCBOOKCATALOG} -c ${JADECATALOG} ${EXTRA_CATALOGS:S/^/-c /g}
KNOWN_FORMATS= html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar pdb
# ------------------------------------------------------------------------
#
# Look at ${FORMATS} and work out which documents need to be generated.
# It is assumed that the HTML transformation will always create a file
# called index.html, and that for every other transformation the name
# of the generated file is ${DOC}.format.
#
# ${_docs} will be set to a list of all documents that must be made
# up to date.
#
# ${CLEANFILES} is a list of files that should be removed by the "clean"
# target. ${COMPRESS_EXT:S/^/${DOC}.${_cf}.&/ takes the COMPRESS_EXT
# var, and prepends the filename to each listed extension, building a
# second list of files with the compressed extensions added.
#
# Note: ".for _curformat in ${KNOWN_FORMATS}" is used several times in
# this file. I know they could have been rolled together in to one, much
# larger, loop. However, that would have made things more complicated
# for a newcomer to this file to unravel and understand, and a syntax
# error in the loop would have affected the entire
# build/compress/install process, instead of just one of them, making it
# more difficult to debug.
#
# Note: It is the aim of this file that *all* the targets be available,
# not just those appropriate to the current ${FORMATS} and
# ${INSTALL_COMPRESSED} values.
#
# For example, if FORMATS=html and INSTALL_COMPRESSED=gz you could still
# type
#
# make book.rtf.bz2
#
# and it will do the right thing. Or
#
# make install-rtf.bz2
#
# for that matter. But don't expect "make clean" to work if the FORMATS
# and INSTALL_COMPRESSED variables are wrong.
#
.for _curformat in ${FORMATS}
_cf=${_curformat}
.if ${_cf} == "html-split"
_docs+= index.html HTML.manifest
CLEANFILES+= `[ -f HTML.manifest ] && xargs < HTML.manifest` HTML.manifest
.elif ${_cf} == "html-split.tar"
_docs+= ${DOC}.html-split.tar
CLEANFILES+= `[ -f HTML.manifest ] && xargs < HTML.manifest` HTML.manifest
CLEANFILES+= ${DOC}.html-split.tar
.elif ${_cf} == "html"
_docs+= ${DOC}.html
CLEANFILES+= ${DOC}.html
.elif ${_cf} == "html.tar"
_docs+= ${DOC}.html.tar
CLEANFILES+= ${DOC}.html ${DOC}.html.tar
.elif ${_cf} == "txt"
_docs+= ${DOC}.txt
CLEANFILES+= ${DOC}.html ${DOC}.txt
.elif ${_cf} == "dvi"
_docs+= ${DOC}.dvi
CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.tex
.elif ${_cf} == "ps"
_docs+= ${DOC}.ps
CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.tex ${DOC}.ps
.elif ${_cf} == "pdf"
_docs+= ${DOC}.pdf
CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.tex ${DOC}.pdf
.elif ${_cf} == "rtf"
_docs+= ${DOC}.rtf
CLEANFILES+= ${DOC}.rtf
.elif ${_cf} == "tar"
_docs+= ${DOC}.tar
CLEANFILES+= ${DOC}.tar
-.elif ${_cf} == "doc"
-_docs+= ${DOC}.doc
-CLEANFILES+= ${DOC}.doc
.elif ${_cf} == "pdb"
_docs+= ${DOC}.pdb ${.CURDIR:T}.pdb
+CLEANFILES+= ${DOC}.pdb ${.CURDIR:T}.pdb
.endif
.endfor
#
# Build a list of install-${format}.${compress_format} targets to be
# by "make install". Also, add ${DOC}.${format}.${compress_format} to
# ${_docs} and ${CLEANFILES} so they get built/cleaned by "all" and
# "clean".
#
.if defined(INSTALL_COMPRESSED) && !empty(INSTALL_COMPRESSED)
.for _curformat in ${FORMATS}
_cf=${_curformat}
.for _curcomp in ${INSTALL_COMPRESSED}
.if ${_cf} != "html-split" && ${_cf} != "html"
_curinst+= install-${_curformat}.${_curcomp}
_docs+= ${DOC}.${_curformat}.${_curcomp}
CLEANFILES+= ${DOC}.${_curformat}.${_curcomp}
.endif
.endfor
.endfor
.endif
.MAIN: all
all: ${_docs}
-index.html HTML.manifest: ${SRCS} ${LIB_IMAGES}
+index.html HTML.manifest: ${SRCS}
${JADE} -V html-manifest -ioutput.html ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC}
.if !defined(NO_TIDY)
-tidy -i -m -f /dev/null ${TIDYFLAGS} `xargs < HTML.manifest`
.endif
-${DOC}.html: ${SRCS} ${LIB_IMAGES}
+${DOC}.html: ${SRCS}
${JADE} -ioutput.html -V nochunks ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > ${.TARGET}
.if !defined(NO_TIDY)
-tidy -i -m -f /dev/null ${TIDYFLAGS} ${.TARGET}
.endif
+.for _curimage in ${LIB_IMAGES}
+${_docs}: ${LOCAL_LIB_IMAGES_DIR}/${_curimage}
+.endfor
+
${DOC}.html-split.tar: HTML.manifest
tar cf ${.TARGET} `xargs < HTML.manifest`
tar uf ${.TARGET} ${LIB_IMAGES}
${DOC}.html.tar: ${DOC}.html
tar cf ${.TARGET} ${DOC}.html
tar uf ${.TARGET} ${LIB_IMAGES}
${DOC}.txt: ${DOC}.html
w3m -S -dump ${.ALLSRC} > ${.TARGET}
${DOC}.pdb: ${DOC}.html
iSiloBSD -y -d0 -Idef ${DOC}.html ${DOC}.pdb
${.CURDIR:T}.pdb: ${DOC}.pdb
ln -f ${DOC}.pdb ${.CURDIR}.pdb
${DOC}.rtf: ${SRCS}
${JADE} -Vrtf-backend -ioutput.print ${JADEOPTS} -d ${DSLPRINT} -t rtf -o ${.TARGET} ${MASTERDOC}
${DOC}.tex: ${SRCS}
${JADE} -Vtex-backend -ioutput.print ${JADEOPTS} -d ${DSLPRINT} -t tex -o ${.TARGET} ${MASTERDOC}
${DOC}.dvi: ${DOC}.tex
@echo "==> TeX pass 1/3"
-tex "&jadetex" ${.ALLSRC}
@echo "==> TeX pass 2/3"
-tex "&jadetex" ${.ALLSRC}
@echo "==> TeX pass 3/3"
-tex "&jadetex" ${.ALLSRC}
${DOC}.pdf: ${DOC}.tex
@echo "==> PDFTeX pass 1/3"
-pdftex "&pdfjadetex" ${.ALLSRC}
@echo "==> PDFTeX pass 2/3"
-pdftex "&pdfjadetex" ${.ALLSRC}
@echo "==> PDFTeX pass 3/3"
pdftex "&pdfjadetex" ${.ALLSRC}
${DOC}.ps: ${DOC}.dvi
dvips -o ${.TARGET} ${.ALLSRC}
${DOC}.tar: ${SRCS}
tar cf ${.TARGET} ${.ALLSRC}
# ------------------------------------------------------------------------
#
# Validation targets
#
#
# Lets you quickly check that the document conforms to the DTD without
# having to convert it to any other formats
#
lint validate:
nsgmls -s -c ${FREEBSDCATALOG} -c ${DSSSLCATALOG} -c ${DOCBOOKCATALOG} -c ${JADECATALOG} ${EXTRA_CATALOGS:S/^/-c /g} ${MASTERDOC}
# ------------------------------------------------------------------------
#
# Compress targets
#
#
# The list of compression extensions this Makefile knows about. If you
# add new compression schemes, add to this list (which is a list of
# extensions, hence bz2, *not* bzip2) and extend the _PROG_COMPRESS_*
# targets.
#
KNOWN_COMPRESS= gz bz2 zip
#
# You can't build suffix rules to do compression, since you can't
# wildcard the source suffix. So these are defined .USE, to be tacked on
# as dependencies of the compress-* targets.
#
_PROG_COMPRESS_gz: .USE
gzip -9 -c ${.ALLSRC} > ${.TARGET}
_PROG_COMPRESS_bz2: .USE
bzip2 -9 -c ${.ALLSRC} > ${.TARGET}
_PROG_COMPRESS_zip: .USE
zip -j -9 ${.TARGET} ${.ALLSRC}
#
# Build a list of targets for each compression scheme and output format.
# Don't compress the html-split or html output format (because they need
# to be rolled in to tar files first).
#
.for _curformat in ${KNOWN_FORMATS}
_cf=${_curformat}
.for _curcompress in ${KNOWN_COMPRESS}
.if ${_cf} == "html-split" || ${_cf} == "html"
${DOC}.${_cf}.tar.${_curcompress}: ${DOC}.${_cf}.tar _PROG_COMPRESS_${_curcompress}
.else
${DOC}.${_cf}.${_curcompress}: ${DOC}.${_cf} _PROG_COMPRESS_${_curcompress}
.endif
.endfor
.endfor
# ------------------------------------------------------------------------
#
# Install targets
#
# Build install-* targets, one per allowed value in FORMATS. Need to
# build two specific targets;
#
# install-html-split - Handles multiple .html files being generated
# from one source. Uses the HTML.manifest file
# created by the stylesheets, which should list
# each .html file that's been created.
#
# install-* - Every other format. The wildcard expands to
# the other allowed formats, all of which should
# generate just one file.
#
# "beforeinstall" and "afterinstall" are hooks in to this process.
# Redefine them to do things before and after the files are installed,
# respectively.
#
# Build a list of install-format targets to be installed. These will be
# dependencies for the "realinstall" target.
#
.if !defined(INSTALL_ONLY_COMPRESSED) || empty(INSTALL_ONLY_COMPRESSED)
_curinst+= ${FORMATS:S/^/install-/g}
.endif
realinstall: ${_curinst}
.for _curformat in ${KNOWN_FORMATS}
_cf=${_curformat}
.if !target(install-${_cf})
.if ${_cf} == "html-split"
install-${_cf}: index.html
@[ -d ${DESTDIR} ] || mkdir -p ${DESTDIR}
${INSTALL_DOCS} `xargs < HTML.manifest` ${DESTDIR}
@if [ -f ${.OBJDIR}/${DOC}.ln ]; then \
(cd ${DESTDIR}; sh ${.OBJDIR}/${DOC}.ln); \
fi
.for _curimage in ${LIB_IMAGES}
@[ -d ${DESTDIR}/${LOCAL_LIB_IMAGES_DIR}/${_curimage:H} ] || mkdir -p ${DESTDIR}/${LOCAL_LIB_IMAGES_DIR}/${_curimage:H}
${INSTALL_DOCS} ${LOCAL_LIB_IMAGES_DIR}/${_curimage} ${DESTDIR}/${LOCAL_LIB_IMAGES_DIR}/${_curimage:H}
.endfor
.for _compressext in ${KNOWN_COMPRESS}
install-${_cf}.tar.${_compressext}: ${DOC}.${_cf}.tar.${_compressext}
@[ -d ${DESTDIR} ] || mkdir -p ${DESTDIR}
${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
.endfor
.elif ${_cf} == "html"
install-${_cf}: ${DOC}.${_cf}
@[ -d ${DESTDIR} ] || mkdir -p ${DESTDIR}
${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
.for _curimage in ${LIB_IMAGES}
@[ -d ${DESTDIR}/${LOCAL_LIB_IMAGES_DIR}/${_curimage:H} ] || mkdir -p ${DESTDIR}/${LOCAL_LIB_IMAGES_DIR}/${_curimage:H}
${INSTALL_DOCS} ${LOCAL_LIB_IMAGES_DIR}/${_curimage} ${DESTDIR}/${LOCAL_LIB_IMAGES_DIR}/${_curimage:H}
.endfor
.else
install-${_cf}: ${DOC}.${_cf}
@[ -d ${DESTDIR} ] || mkdir -p ${DESTDIR}
${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
.for _compressext in ${KNOWN_COMPRESS}
install-${_cf}.${_compressext}: ${DOC}.${_cf}.${_compressext}
@[ -d ${DESTDIR} ] || mkdir -p ${DESTDIR}
${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
.endfor
.endif
.endif
.endfor
# ------------------------------------------------------------------------
#
# Package building
#
#
# realpackage is what is called in each subdirectory when a package
# target is called, or, rather, package calls realpackage in each
# subdirectory as it goes.
#
# packagelist returns the list of targets that would be called during
# package building.
#
realpackage: ${FORMATS:S/^/package-/}
packagelist:
@echo ${FORMATS:S/^/package-/}
#
# Build a list of package targets for each output target. Each package
# target depends on the corresponding install target running.
#
.for _curformat in ${KNOWN_FORMATS}
_cf=${_curformat}
package-${_curformat}: install-${_curformat}
.if ${_cf} == "html-split"
@cp HTML.manifest PLIST
.else
@echo ${DOC}.${_curformat} > PLIST
@for lib_images in ${LIB_IMAGES}; do \
echo $$lib_images >> PLIST; \
done
.endif
@pkg_create -v -c -"FDP ${.CURDIR:T} ${_curformat} package" \
-d -"FDP ${.CURDIR:T} ${_curformat} package" -f PLIST \
-p ${DESTDIR} ${PACKAGES}/${.CURDIR:T}.${LANGCODE}.${_curformat}.tgz
.endfor
diff --git a/share/mk/doc.images.mk b/share/mk/doc.images.mk
index 2dfe01132c..d5623cced5 100644
--- a/share/mk/doc.images.mk
+++ b/share/mk/doc.images.mk
@@ -1,66 +1,66 @@
#
-# $FreeBSD: doc/share/mk/doc.images.mk,v 1.1 2000/07/16 16:27:30 nik Exp $
+# $FreeBSD: doc/share/mk/doc.images.mk,v 1.2 2000/07/18 16:30:45 nik Exp $
#
# This include file handles image processing.
#
# There are two types of images that must be handled:
#
# 1. Images from the library directory, that are shared across multiple
# documents.
#
# 2. Images that are document specific.
#
# For library images this file ensures that they are copied in to the
# documents directory so that they can be reference properly.
#
# For library images *and* document specific images, this file ensures
# that the images are converted from their repository format to the
# correct output format.
#
# Note that this latter functionality is not yet implemented.
#
#
# Using library images
# --------------------
#
# Each document that wants to use one or more library images has to
# list them in the LIB_IMAGES variable. For example, a document that wants
# to use callouts 1 thru 4 has to list
#
# LIB_IMAGES= callouts/1.png callouts/2.png callouts/3.png callouts/4.png
#
# in the controlling Makefile.
#
# This code ensures they exist in the current directory, and copies them in
# as necessary.
#
#
# The name of the directory that contains all the library images for this
# language and encoding
#
LIB_IMAGES_DIR?= ${.CURDIR}/../../share/images
#
# The name of the directory *in* the document directory where files and
# directory hierarchies should be copied to. "images" is too generic, and
# might clash with local document images, so use "imagelib" by default
# instead. If you redefine this then you must also update the
# %callout-graphics-path% variable in the .dsl file.
#
LOCAL_LIB_IMAGES_DIR?= imagelib
CP?= /bin/cp
MKDIR?= /bin/mkdir
#
# Create a target for each image used from the library. This target just
# ensures that each image required is copied from its location in
# ${LIB_IMAGES_DIR} to the same place in ${LOCAL_LIB_IMAGES_DIR}.
#
.for _curimage in ${LIB_IMAGES}
-${_curimage}: ${LIB_IMAGES_DIR}/${_curimage}
- [ -d ${LOCAL_LIB_IMAGES_DIR}/${_curimage:H} ] || ${MKDIR} -p ${LOCAL_LIB_IMAGES_DIR}/${_curimage:H}
- ${CP} ${LIB_IMAGES_DIR}/${_curimage} ${LOCAL_LIB_IMAGES_DIR}/${_curimage}
+${LOCAL_LIB_IMAGES_DIR}/${_curimage}: ${LIB_IMAGES_DIR}/${_curimage}
+ @[ -d ${LOCAL_LIB_IMAGES_DIR}/${_curimage:H} ] || ${MKDIR} -p ${LOCAL_LIB_IMAGES_DIR}/${_curimage:H}
+ ${INSTALL} -C -c ${LIB_IMAGES_DIR}/${_curimage} ${LOCAL_LIB_IMAGES_DIR}/${_curimage}
.endfor
diff --git a/share/mk/doc.project.mk b/share/mk/doc.project.mk
index d99d55935e..225fc0f5df 100644
--- a/share/mk/doc.project.mk
+++ b/share/mk/doc.project.mk
@@ -1,84 +1,85 @@
#
-# $FreeBSD: doc/share/mk/doc.project.mk,v 1.4 2000/07/16 16:29:18 nik Exp $
+# $FreeBSD: doc/share/mk/doc.project.mk,v 1.5 2000/07/23 16:27:58 nik Exp $
#
# This include file is the FreeBSD Documentation Project
# co-ordination make file.
#
# This file includes the other makefiles, which contain enough
# knowledge to perform their duties without the system make files.
#
# ------------------------------------------------------------------------
#
# Document-specific variables:
#
# DOC This _must_ be set if there is a document to
# build. It should be without prefix.
#
# DOCFORMAT Format of the document. Defaults to docbook.
# docbook is also the only option currently.
#
# MAINTAINER This denotes who is responsible for maintaining
# this section of the project. If unset, set to
# doc@FreeBSD.org
#
# ------------------------------------------------------------------------
#
# User-modifiable variables:
#
# PREFIX Standard path to document-building applications
# installed to serve the documentation build
# process, usually by installing the docproj port
# or package. Default is /usr/local
#
# NOINCLUDEMK Whether to include the standard BSD make files,
# or just to emulate them poorly. Set this if you
# aren't on FreeBSD, or a compatible sibling. By
# default is not set.
#
# ------------------------------------------------------------------------
#
# Make files included:
#
# doc.install.mk Installation specific information, including
# ownership and permissions.
#
# doc.subdir.mk Subdirectory related configuration, including
# handling "obj" builds.
#
# DOCFORMAT-specific make files, like:
#
# doc.docbook.mk Building and installing docbook documentation.
# Currently the only method.
#
# Document-specific defaults
DOCFORMAT?= docbook
MAINTAINER?= doc@FreeBSD.org
# Master list of known target formats. The doc..mk files implement
# the code to convert from their source format to one or more of these target
# formats
ALL_FORMATS= html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar pdb
# User-modifiable
PREFIX?= /usr/local
PRI_LANG?= en_US.ISO_8859-1
+.include "doc.images.mk"
+
# Format-specific configuration
.if defined(DOC)
.if ${DOCFORMAT} == "docbook"
.include "doc.docbook.mk"
.endif
.if ${DOCFORMAT} == "html"
.include "doc.html.mk"
.endif
.endif
# Subdirectory glue and ownership information.
.include "doc.subdir.mk"
.include "doc.install.mk"
-.include "doc.images.mk"
diff --git a/share/sgml/catalog b/share/sgml/catalog
index 1c2499d7c9..e50ddc5659 100644
--- a/share/sgml/catalog
+++ b/share/sgml/catalog
@@ -1,60 +1,66 @@
-- ...................................................................... --
-- FreeBSD SGML Public Identifiers ...................................... --
- -- $FreeBSD: doc/share/sgml/catalog,v 1.8 1999/11/14 17:57:31 nik Exp $
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
--
-- ...................................................................... --
-- Language neutral ..................................................... --
-- These identifiers are shared across all translations of the FreeBSD
documentation, even though the listed language is "EN"
--
PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN"
"freebsd.dtd"
PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
"man-refs.ent"
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN"
+ "freebsd.dsl"
+
-- ...................................................................... --
-- English specific ..................................................... --
-- These identifiers should only be used by English language versions of
the FreeBSD Documentation.
All other translations should base their FPIs on these, but change the
final parameter in the FPI to represent the target language, as
appropriate. Do not change the rest of the FPI
--
PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN"
"../../en_US.ISO_8859-1/share/sgml/bookinfo.ent"
PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
"../../en_US.ISO_8859-1/books/handbook/authors.ent"
-- ...................................................................... --
-- French specific ...................................................... --
PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//FR"
"../../fr_FR.ISO_8859-1/share/sgml/bookinfo.ent"
PUBLIC "-//FreeBSD//ENTITIES Common Document URL Entities//FR"
"../../fr_FR.ISO_8859-1/share/sgml/urls.ent"
PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"
"../../fr_FR.ISO_8859-1/share/sgml/translators.ent"
PUBLIC "-//FreeBSD//ENTITIES DocBook Abstract Entities//FR"
"../../fr_FR.ISO_8859-1/share/sgml/abstract.ent"
PUBLIC "-//FreeBSD//ENTITIES DocBook ArtHeader Entities//FR"
"../../fr_FR.ISO_8859-1/share/sgml/artheader.ent"
-- ...................................................................... --
-- Russian specific ...................................................... --
PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//RU"
"../../ru_RU.KOI8-R/share/sgml/bookinfo.ent"
diff --git a/share/sgml/default.dsl b/share/sgml/default.dsl
new file mode 100644
index 0000000000..8edeed51a2
--- /dev/null
+++ b/share/sgml/default.dsl
@@ -0,0 +1,14 @@
+
+
+
+]>
+
+
+
+
+
+
+
+
+
diff --git a/zh_TW.Big5/share/sgml/catalog b/zh_TW.Big5/share/sgml/catalog
new file mode 100644
index 0000000000..5ebe8768fc
--- /dev/null
+++ b/zh_TW.Big5/share/sgml/catalog
@@ -0,0 +1,9 @@
+ -- ...................................................................... --
+ -- FreeBSD SGML Public Identifiers ...................................... --
+
+ -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+ --
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+ "freebsd.dsl"
+
diff --git a/zh_TW.Big5/share/sgml/freebsd.dsl b/zh_TW.Big5/share/sgml/freebsd.dsl
index e7de9dbfbd..941cdc2f05 100644
--- a/zh_TW.Big5/share/sgml/freebsd.dsl
+++ b/zh_TW.Big5/share/sgml/freebsd.dsl
@@ -1,21 +1,21 @@
-
+
+
]>
(define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=Big5-TW"))))