From owner-cvs-all@FreeBSD.ORG Thu Aug 7 06:13:56 2003 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F359237B404; Thu, 7 Aug 2003 06:13:55 -0700 (PDT) Received: from smtp.eos.ocn.ne.jp (eos.ocn.ne.jp [211.6.83.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3453543F93; Thu, 7 Aug 2003 06:13:54 -0700 (PDT) (envelope-from hrs@eos.ocn.ne.jp) Received: from mail.d.allbsd.org (p59230-adsao12honb4-acca.tokyo.ocn.ne.jp [220.96.141.230]) by smtp.eos.ocn.ne.jp (Postfix) with ESMTP id 2E0A8AA8; Thu, 7 Aug 2003 22:13:53 +0900 (JST) Received: from localhost (alph.allbsd.org [192.168.0.10]) h77DDUd0022758; Thu, 7 Aug 2003 22:13:30 +0900 (JST) (envelope-from hrs@eos.ocn.ne.jp) Date: Thu, 07 Aug 2003 22:12:04 +0900 (JST) Message-Id: <20030807.221204.35461928.hrs@eos.ocn.ne.jp> To: simon@FreeBSD.org From: Hiroki Sato In-Reply-To: <20030807120540.GB388@FreeBSD.org> References: <20030807.091621.59658151.hrs@eos.ocn.ne.jp> <20030807113201.GA388@FreeBSD.org> <20030807120540.GB388@FreeBSD.org> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 3.3 on Emacs 20.7 / Mule 4.0 (HANANOEN) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: doc-committers@FreeBSD.org cc: cvs-doc@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: doc/en_US.ISO8859-1/articles/5-roadmap article.sgml doc/en_US.ISO8859-1/articles/checkpoint article.sgml doc/en_US.ISO8859-1/articles/committers-guide article.sgml doc/en_US.ISO8859-1/articles/contributing article.sgml doc/en_US.ISO8859-1/articles/contributors article.sgml doc/en_US.ISO8859-1/share/sgml catalog trademarks.ent X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Aug 2003 13:13:56 -0000 "Simon L. Nielsen" wrote in <20030807120540.GB388@FreeBSD.org>: simon> In share/sgml/catalog there is : simon> simon> PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN" simon> "../../en_US.ISO8859-1/share/sgml/authors.ent" SGML catalog/entity resolution is performed on a "first match" basis. So this declaration is used if a localized SGML catalog does not declare "-//FreeBSD//ENTITIES DocBook Author Entities//EN". simon> In en_US.ISO8859-1/share/sgml/catalog there is : simon> simon> PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN" simon> "mailing-lists.ent" All docs in en_US.ISO8859-1/ always honor this declaration. This is because ${CATALOGS} in doc.docbook.mk is defined as follows: .for c in ${LANGUAGECATALOG} ${FREEBSDCATALOG} ${DSSSLCATALOG} ${ISO8879CATALOG} ${DOCBOOKCATALOG} ${JADECATALOG} ${EXTRA_CATALOGS} ${CATALOG_PORTS_SGML} .if exists(${c}) CATALOGS+= -c ${c} .endif .endfor and due to the first match rule. The resolution order is: 1) /share/sgml/catalog 2) share/sgml/catalog 3) ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog .... If we put the localized version of a file and the same declaration into /share/sgml, the localized one has priority. This, however, can only be used to replace a file entirely. Now we have to replace a part of entities in a file. To realize it, define localized entity set like ja_JP.eucJP/share/sgml/authors.ent. ja_JP.eucJP/share/sgml/authors.ent is not a true counterpart in en_US.ISO8859-1/. The file includes Japanese committers' name only which is written in Japanese. And, in ja_JP.eucJP/share/sgml/catalog PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA" "authors.ent" is declared, and both of the English and the localized version %ja-authors; %authors; are used in books/handbook/book.sgml. To do so, the entities in %ja-authors; partly override ones in %authors;. Consequently, I suggest the following: 1) move trademarks.ent to share/sgml/. 2) declare PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN" "trademarks.ent" in share/sgml/catalog. At this point, all of the docs can use the entities using %trademarks;. 3) for the localized docs, translators have to declare PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//XX" "trademarks.ent" in /share/sgml/catalog and put the localized subset of trademarks.ent into in /share/sgml/. "XX" should be replaced the langcode like JA, FR, and so on. And use %xx-trademarks;. %trademarks;. to override the entities in %trademarks; with ones in %xx-trademarks;. If the localized declaration does not exist, the English version is used naturally. Probably l10n.ent is another good example. When we need to replace a file entirely, declare the same PI (Public Identifier) in the localized catalog, and when we need to replace a part of the entities, declare the localized PI in the localized catalog and take the both of them in the localized docs to override. -- | Hiroki SATO /