summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2014-10-12 20:35:00 +0200
committerWerner Lemberg <wl@gnu.org>2014-10-12 20:35:00 +0200
commit3dc991b4733add0e48d773b01e5e83308c792751 (patch)
treea3d3427984808b5976fcb969aae4e432d81eecef
parentceb92d2666fb74af40d2d5681175e89ce74dde76 (diff)
downloadgroff-git-3dc991b4733add0e48d773b01e5e83308c792751.tar.gz
* doc/groff.texinfo: Make PDF version compilable with makeinfo 5.x.
makeinfo 5.x handles macro expansion better, which changes the way how an \LE macro (for a less-than sign) has to be defined. However, since we can't be sure that the latest version of `texinfo.tex' gets used with makeinfo 5.x only, we would have to support both 4.x and 5.x. No idea whether this is possible at all... For this reason, we now simply use @value directly instead of wrapping it into a macro, avoiding any issues.
-rw-r--r--ChangeLog12
-rw-r--r--doc/groff.texinfo19
2 files changed, 18 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 091a79919..b0edbc849 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2014-10-12 Werner LEMBERG <wl@gnu.org>
+ * doc/groff.texinfo: Make PDF version compilable with makeinfo 5.x.
+
+ makeinfo 5.x handles macro expansion better, which changes the way
+ how an \LE macro (for a less-than sign) has to be defined. However,
+ since we can't be sure that the latest version of `texinfo.tex' gets
+ used with makeinfo 5.x only, we would have to support both 4.x and
+ 5.x. No idea whether this is possible at all... For this reason,
+ we now simply use @value directly instead of wrapping it into a
+ macro, avoiding any issues.
+
+2014-10-12 Werner LEMBERG <wl@gnu.org>
+
[doc] Protect against picky `sed' programs.
Problem reported by Axel Kielhorn <tex@axelkielhorn.de>.
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index 6cb352dae..066b52748 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -428,28 +428,21 @@ developing GNU and promoting software freedom.''
@c a <= sign
@c
-@c A value defined with @set is embedded into three group levels if
-@c called with @value, so we need seven \aftergroup to put \le outside
-@c of the groups -- this is necessary to get proper mathematical
-@c spacing.
+@c Since expansion of macros has changed between texinfo 4.x and 5.x,
+@c we can't define a macro but have to use @value directly.
@tex
-\gdef\LEmacro{\aftergroup\aftergroup\aftergroup\aftergroup
- \aftergroup\aftergroup\aftergroup\le}
+\gdef\LE{\le}
@end tex
@iftex
-@set LEmacro @LEmacro
+@set LE @LE
@end iftex
@ifnottex
-@set LEmacro <=
+@set LE <=
@end ifnottex
-@macro LE
-@value{LEmacro}
-@end macro
-
@c Special care is required with parentheses, brackets, and braces:
@c
@@ -16195,7 +16188,7 @@ The argument@tie{}@var{n} must be an integer in the range @math{-32767}
to 32767.
@table @asis
-@item @math{0 @LE{} @var{n} @LE{} 1000}
+@item @math{0 @value{LE} @var{n} @value{LE} 1000}
Set the color for filling solid drawing objects to a shade of gray,
where 0 corresponds to solid white, 1000 (the default) to solid black,
and values in between to intermediate shades of gray; this is obsoleted