Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Feb 2013 16:14:01 +0000 (UTC)
From:      Gabor Kovesdan <gabor@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject:   svn commit: r41016 - in projects/xml-tools: da_DK.ISO8859-1/share/xml de_DE.ISO8859-1/share/xml el_GR.ISO8859-7/share/xml en_US.ISO8859-1/share/xml es_ES.ISO8859-1/share/xml fr_FR.ISO8859-1/share/x...
Message-ID:  <201302191614.r1JGE1RV069190@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gabor
Date: Tue Feb 19 16:14:00 2013
New Revision: 41016
URL: http://svnweb.freebsd.org/changeset/doc/41016

Log:
  - Add back SGML catalogs (trimmed to minimally necessary content) since
    they are still needed for language-specific DSSSL customizations

Added:
  projects/xml-tools/da_DK.ISO8859-1/share/xml/catalog
  projects/xml-tools/de_DE.ISO8859-1/share/xml/catalog
  projects/xml-tools/el_GR.ISO8859-7/share/xml/catalog
  projects/xml-tools/en_US.ISO8859-1/share/xml/catalog
  projects/xml-tools/es_ES.ISO8859-1/share/xml/catalog
  projects/xml-tools/fr_FR.ISO8859-1/share/xml/catalog
  projects/xml-tools/hu_HU.ISO8859-2/share/xml/catalog
  projects/xml-tools/it_IT.ISO8859-15/share/xml/catalog
  projects/xml-tools/ja_JP.eucJP/share/xml/catalog
  projects/xml-tools/mn_MN.UTF-8/share/xml/catalog
  projects/xml-tools/nl_NL.ISO8859-1/share/xml/catalog
  projects/xml-tools/pl_PL.ISO8859-2/share/xml/catalog
  projects/xml-tools/pt_BR.ISO8859-1/share/xml/catalog
  projects/xml-tools/ru_RU.KOI8-R/share/xml/catalog
  projects/xml-tools/sr_YU.ISO8859-2/share/xml/catalog
  projects/xml-tools/zh_CN.GB2312/share/xml/catalog
  projects/xml-tools/zh_TW.Big5/share/xml/catalog
Modified:
  projects/xml-tools/share/mk/doc.docbook.mk
  projects/xml-tools/share/xml/catalog

Added: projects/xml-tools/da_DK.ISO8859-1/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/da_DK.ISO8859-1/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/de_DE.ISO8859-1/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/de_DE.ISO8859-1/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/el_GR.ISO8859-7/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/el_GR.ISO8859-7/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/en_US.ISO8859-1/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/en_US.ISO8859-1/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/es_ES.ISO8859-1/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/es_ES.ISO8859-1/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/fr_FR.ISO8859-1/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/fr_FR.ISO8859-1/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/hu_HU.ISO8859-2/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/hu_HU.ISO8859-2/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/it_IT.ISO8859-15/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/it_IT.ISO8859-15/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/ja_JP.eucJP/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/ja_JP.eucJP/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/mn_MN.UTF-8/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/mn_MN.UTF-8/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/nl_NL.ISO8859-1/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/nl_NL.ISO8859-1/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/pl_PL.ISO8859-2/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/pl_PL.ISO8859-2/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/pt_BR.ISO8859-1/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/pt_BR.ISO8859-1/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/ru_RU.KOI8-R/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/ru_RU.KOI8-R/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Modified: projects/xml-tools/share/mk/doc.docbook.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.docbook.mk	Tue Feb 19 15:25:28 2013	(r41015)
+++ projects/xml-tools/share/mk/doc.docbook.mk	Tue Feb 19 16:14:00 2013	(r41016)
@@ -74,13 +74,9 @@ MASTERDOC?=	${.CURDIR}/${DOC}.xml
 # Either jade or fop
 RENDERENGINE?=	jade
 
-.if defined(SPELLCHECK)
-DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl
-.endif
-
 XMLDECL?=	/usr/local/share/sgml/docbook/dsssl/modular/dtds/decls/xml.dcl
 
-DSLHTML?=	${DOC_PREFIX}/share/xml/default.dsl
+DSLHTML?=	${DOC_PREFIX}/share/xml/spellcheck.dsl
 DSLPRINT?=	${DOC_PREFIX}/share/xml/default.dsl
 DSLPGP?=	${DOC_PREFIX}/share/xml/pgp.dsl
 
@@ -91,8 +87,23 @@ XSLFO?=		${DOC_PREFIX}/share/xsl/freebsd
 
 IMAGES_LIB?=
 
+.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
+JADECATALOG?=	${PREFIX}/share/sgml/jade/catalog
+.else
+JADECATALOG?=	${PREFIX}/share/sgml/openjade/catalog
+.endif
+FREEBSDCATALOG=	${DOC_PREFIX}/share/xml/catalog
+LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
+DSSSLCATALOG=	${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
+.for c in ${LANGUAGECATALOG} ${FREEBSDCATALOG} ${DSSSLCATALOG} ${JADECATALOG}
+.if exists(${c})
+CATALOGS+=	-c ${c}
+.endif
+.endfor
+
 JADEOPTS?=	-ijade.compat -w no-valid ${JADEFLAGS} \
-		-D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR}
+		-D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} \
+		${CATALOGS}
 XSLTPROCOPTS?=	--nonet
 
 KNOWN_FORMATS=	html html.tar html-split html-split.tar \

Modified: projects/xml-tools/share/xml/catalog
==============================================================================
--- projects/xml-tools/share/xml/catalog	Tue Feb 19 15:25:28 2013	(r41015)
+++ projects/xml-tools/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -4,13 +4,6 @@
   -- $FreeBSD$
   --
 
-  -- ...................................................................... --
-  -- Language neutral ..................................................... --
-
-  -- These identifiers are shared across all translations of the FreeBSD
-     documentation, even though the listed language is "EN"
-  --
-
 PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
 	"freebsd45.dtd"
 
@@ -20,12 +13,6 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Sty
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN"
 	"freebsd.dsl"
 
-PUBLIC "-//FreeBSD//DOCUMENT DocBook HTML Stylesheet//EN"
-	"freebsd-html.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook HTML Lanugage Neutral Stylesheet//EN"
-	"freebsd-html.dsl"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Print Stylesheet//EN"
 	"freebsd-print.dsl"
 
@@ -37,86 +24,3 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Com
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Lanugage Neutral Stylesheet//EN"
 	"freebsd-common.dsl"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"authors.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"man-refs.ent"
-
-PUBLIC	"-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
-	"freebsd.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN"
-	"l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
-	"trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
-	"urls.ent"
-
-  -- ...................................................................... --
-  -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN"
-       "html401-freebsd.dtd"
-
-PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN"
-       "iso8879.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
-       "common.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
-       "developers.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
-       "release.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-       "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header Entities//EN"
-       "header.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar Entities//EN"
-       "navibar.ent"
-
-  -- ...................................................................... --
-  -- 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 Author Entities//EN"
-        "../../en_US.ISO8859-1/share/xml/authors.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
-        "../../en_US.ISO8859-1/share/xml/teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
-	"../../en_US.ISO8859-1/share/xml/glossary.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
-        "../../en_US.ISO8859-1/share/xml/mailing-lists.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
-        "../../en_US.ISO8859-1/share/xml/newsgroups.ent"

Added: projects/xml-tools/sr_YU.ISO8859-2/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/sr_YU.ISO8859-2/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/zh_CN.GB2312/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/zh_CN.GB2312/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"

Added: projects/xml-tools/zh_TW.Big5/share/xml/catalog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/zh_TW.Big5/share/xml/catalog	Tue Feb 19 16:14:00 2013	(r41016)
@@ -0,0 +1,2 @@
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+       "freebsd.dsl"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302191614.r1JGE1RV069190>