[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6979] allow \chapmacro in \titlepage
From: |
Gavin D. Smith |
Subject: |
[6979] allow \chapmacro in \titlepage |
Date: |
Tue, 02 Feb 2016 19:02:59 +0000 |
Revision: 6979
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6979
Author: gavin
Date: 2016-02-02 19:02:59 +0000 (Tue, 02 Feb 2016)
Log Message:
-----------
allow \chapmacro in \titlepage
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/texinfo.tex
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2016-02-02 07:53:46 UTC (rev 6978)
+++ trunk/ChangeLog 2016-02-02 19:02:59 UTC (rev 6979)
@@ -1,3 +1,14 @@
+2016-02-02 Gavin Smith <address@hidden>
+
+ * doc/texinfo.tex (\chapmacro): Allow this macro to occur inside
+ \titlepage, in case \setcontentsaftertitlepage is used. Report
+ of error message from Akim Demaille.
+
+2016-02-02 Gavin Smith <address@hidden>
+
+ * doc/texinfo.tex (\xrefX): Don't expand a control sequence
+ following \if. Report of possible problem from Karl Berry.
+
2016-02-01 Gavin Smith <address@hidden>
* doc/texinfo.tex (\xrefX): Add a comma after the page number
Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex 2016-02-02 07:53:46 UTC (rev 6978)
+++ trunk/doc/texinfo.tex 2016-02-02 19:02:59 UTC (rev 6979)
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2016-02-02.07}
+\def\texinfoversion{2016-02-02.19}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -6054,7 +6054,13 @@
\def\Yomitfromtockeyword{Yomitfromtoc}
%
\def\chapmacro#1#2#3{%
- \checkenv{}% chapters, etc., should not start inside an environment.
+ \expandafter\ifx\thisenv\titlepage\else
+ \checkenv{}% chapters, etc., should not start inside an environment.
+ \fi
+ % FIXME: \chapmacro is currently called from inside \titlepage when
+ % \setcontentsaftertitlepage to print the "Table of Contents" heading, but
+ % this should probably be done by \sectionheading with an option to print
+ % in chapter size.
%
% Insert the first mark before the heading break (see notes for \domark).
\let\prevchapterdefs=\lastchapterdefs
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [6979] allow \chapmacro in \titlepage,
Gavin D. Smith <=