Switch to Texinfo 5

* rendition.texi: Remove Texinfo 4.13 hacks.
* Makefile.am: Mark imprimatur.info as phony.
* imprimatur.texi: Minor changes.
This commit is contained in:
Sergey Poznyakoff 2015-02-28 21:36:25 +02:00
parent 04255b6d55
commit 6ddf5a88db
3 changed files with 12 additions and 45 deletions

View file

@ -1,5 +1,5 @@
# This file is part of Imprimatur.
# Copyright (C) 2011 Sergey Poznyakoff
# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
# Imprimatur is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -31,10 +31,11 @@ endif
DISTCLEANFILES = Makedoc
MAKEDOC = $(MAKE) -f Makedoc
EXTRA_DIST += Makedoc.am Makedoc.in imprimatur.texi fdl.texi
.PHONY: imprimatur.info
imprimatur.info:; $(MAKEDOC)
info: imprimatur.info
pdf:; $(MAKEDOC) pdf
dvi:; $(MAKEDOC) dvi
ps:; $(MAKEDOC) ps
clean-local:; $(MAKEDOC) clean
endif
endif

View file

@ -7,7 +7,7 @@
@c The UPDATED date is updated automatically by the Emacs magic at the
@c end of this file.
@set UPDATED 15 July 2012
@set UPDATED 27 February 2015
@set VERSION 1.0
@c This document contains examples of all the rendition macros, so it
@ -31,7 +31,7 @@ Published by the Free Software Foundation,
51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301 USA
Copyright @copyright{} 2011 Sergey Poznyakoff
Copyright @copyright{} 2011, 2015 Sergey Poznyakoff
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
@ -378,7 +378,8 @@ clarification. For example:
@example
The @@var@{fmt@} argument is a database format identifier.
If it is valid, the function returns expiration interval for that
format. @@FIXME@{It is not clear how to obtain negative expiration
format.
@@FIXME@{It is not clear how to obtain negative expiration
values.@}
@end example
@ -546,7 +547,7 @@ output formats. It is the responsibility of the caller to include
@file{Makedoc.am} to the list of configured files, e.g.:
@example
AC_CONFIG_FILES(imprimatur/Makedoc.am)
AC_CONFIG_FILES(imprimatur/Makedoc)
@end example
With this option on, the @file{Makefile} in the

View file

@ -1,5 +1,5 @@
@c This file is part of Imprimatur.
@c Copyright (C) 2001-2011 Sergey Poznyakoff
@c Copyright (C) 2001-2011, 2015 Sergey Poznyakoff
@c
@c Imprimatur is free software; you can redistribute it and/or modify
@c it under the terms of the GNU General Public License as published by
@ -59,6 +59,7 @@
@c Cannot be used inline.
@c ------------------------------------------------------------------
@macro editorsnote{text}
@ifinfo
@quotation
@center ==================================================================
@ -82,29 +83,10 @@
@c Otherwise, this macro emits a prominent editor's notice stating
@c that this node has yet to be written.
@c
@c The \errmessage function is used to indicate error when producing
@c TeX output. Otherwise, a call to undefined macro with
@c self-explaining name ``Empty-node-in-publish-rendition!'' is used.
@c
@c Texi2html (at least up to v. 1.78 mishandles unmacro directive, so
@c it is disabled for html output.
@c ------------------------------------------------------------------
@ifnothtml
@unmacro Empty-node-in-publish-rendition!
@end ifnothtml
@macro WRITEME
@ifset PUBLISH
@iftex
@errmessage{Empty node in publish rendition!}
@end iftex
@ifnottex
@comment There is no errmessage function in makeinfo nor in texi2html,
@comment so we use this command call to generate a compilation error.
@comment There is no such function, and to be on the safe side we
@comment undefined a macro with this name.
@Empty-node-in-publish-rendition!
@end ifnottex
@errormsg{Empty node in publish rendition!}
@end ifset
@ifclear PUBLISH
@editorsnote{This node is to be written.}
@ -118,27 +100,10 @@
@c Otherwise, this macro emits a prominent editor's notice stating
@c that this node is not revised.
@c
@c The \errmessage function is used to indicate error when producing
@c TeX output. Otherwise, a call to undefined macro with
@c self-explaining name ``Unrevised-node-in-publish-rendition!'' is
@c used.
@c ------------------------------------------------------------------
@ifnothtml
@unmacro Unrevised-node-in-publish-rendition!
@end ifnothtml
@macro UNREVISED
@ifset PUBLISH
@iftex
@errmessage{Unrevised node in publish rendition!}
@end iftex
@ifnottex
@comment There is no errmessage function in makeinfo nor in texi2html,
@comment so we use this command call to generate a compilation error.
@comment There is no such function, and to be on the safe side we
@comment undefined a macro with this name.
@Unrevised-node-in-publish-rendition!
@end ifnottex
@errormsg{Unrevised node in publish rendition!}
@end ifset
@ifclear PUBLISH
@editorsnote{The information in this node may be obsolete or