Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use .open/.write instead of .tm to emit TOC.

Browse Source
This commit is contained in:
uwe 2019-11-28 00:06:39 +00:00
parent 1d838ef35a
commit 3295b861c7
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
distrib/notes/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.50 2019/11/27 23:19:13 uwe Exp $
# $NetBSD: Makefile.inc,v 1.51 2019/11/28 00:06:39 uwe Exp $
#
# Ross Harvey <ross@NetBSD.org>
@ -107,32 +107,26 @@ ${TARG}.more: ${SRCS} ${TOC.more} ${DISTRIBVERDEP}
# They are generated twice to take into account the
# space taken by the TOC itself.
# TOC is emitted with .tm on groff's stderr, divert those lines to stdout.
# NB: /dev/stderr is nawk's internal designation, not /dev/stderr file.
# TODO: use .open/.write instead.
TOCPROC = 2>&1 >/dev/null | \
${TOOL_AWK} '{ if ($$1 == ".Ti") print; else print > "/dev/stderr"; }'
${TARG}.PostScript.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
${TARG}.ASCII.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_TXT} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
${TOOL_GROFF} -dTOC=1 ${ARGS_TXT} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
${TOOL_GROFF} -dTOC=1 ${ARGS_TXT} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
${TOOL_GROFF} -dTOC=1 ${ARGS_TXT} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
${TARG}.HTML.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
${TARG}.more.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@

6
distrib/notes/common/macros
View File

@ -1,4 +1,4 @@
.\" $NetBSD: macros,v 1.48 2019/11/27 23:57:41 uwe Exp $
.\" $NetBSD: macros,v 1.49 2019/11/28 00:06:39 uwe Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -311,10 +311,12 @@
.\" .Ti depth page "item" (internal) output an entry
.ds toc-file INSTALL.\*[format].toc
.if dTOC \{\
.tm ...writing \*[toc-file].tmp
.open toc-tmp \*[toc-file].tmp
.de mktoc
.nr mktoc-level \\$1
.shift
.tm .Ti \\n[toc-level] \\n% "\\$*"
.write toc-tmp .Ti \\n[toc-level] \\n% "\\$*"
..
.rn Ss Ss-toc
.de Ss