From 16d9a0167206a9195955dce76158ce651e1f4e41 Mon Sep 17 00:00:00 2001 From: "Simon L. B. Nielsen" Date: Sun, 14 Sep 2003 13:11:43 +0000 Subject: [PATCH] Add support for optionally showing all trademark symbols, not just the required symbols, by setting the make variable WITH_ALL_TRADEMARK_SYMBOLS, to any non empty value. This feature is mainly useful for document writers, to make sure all trademarks are marked up correctly. --- share/mk/doc.docbook.mk | 4 ++++ share/sgml/freebsd.dsl | 13 ++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk index 17d71328d9..4fe8931334 100644 --- a/share/mk/doc.docbook.mk +++ b/share/mk/doc.docbook.mk @@ -213,6 +213,10 @@ HTMLFLAGS+= -V %generate-docformat-navi-link% .elif (${FORMATS:Mhtml} == "html") && (${FORMATS:Mhtml-split} == "html-split") HTMLFLAGS+= -V %generate-docformat-navi-link% .endif +.if defined(WITH_ALL_TRADEMARK_SYMBOLS) && !empty(WITH_ALL_TRADEMARK_SYMBOLS) +HTMLFLAGS+= -V %show-all-trademark-symbols% +PRINTFLAGS+= -V %show-all-trademark-symbols% +.endif PERL?= /usr/bin/perl PKG_CREATE?= /usr/sbin/pkg_create diff --git a/share/sgml/freebsd.dsl b/share/sgml/freebsd.dsl index c30eed476c..2b153dd232 100644 --- a/share/sgml/freebsd.dsl +++ b/share/sgml/freebsd.dsl @@ -71,6 +71,11 @@ ;; Create docformat navi link for HTML output? #f) + (define %show-all-trademark-symbols% + ;; Show all the trademark symbols, not just the required + ;; symbols. + #f) + (define (book-titlepage-recto-elements) (list (normalize "title") (normalize "subtitle") @@ -1015,10 +1020,12 @@ (loop (node-list-rest nl) num))))))) ;; Determine if we should show a trademark symbol. Either in - ;; first occurrence in the proper context, or if the role - ;; attribute is set to force. + ;; first occurrence in the proper context, if the role + ;; attribute is set to force, or if %show-all-trademark-symbols% + ;; is set to true. (define (show-tm-symbol? trademark) - (or (= ($chunk-trademark-number$ trademark) 1) + (or %show-all-trademark-symbols% + (= ($chunk-trademark-number$ trademark) 1) (equal? (attribute-string (normalize "role") trademark) "force")))