[7023] @setcontentsaftertitlepage obsolete

[Gavin D. Smith]

Revision: 7023
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7023
Author:   gavin
Date:     2016-02-20 22:22:27 +0000 (Sat, 20 Feb 2016)
Log Message:
-----------
@setcontentsaftertitlepage obsolete

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo.tex
    trunk/doc/texinfo.texi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-02-20 20:29:27 UTC (rev 7022)
+++ trunk/ChangeLog     2016-02-20 22:22:27 UTC (rev 7023)
@@ -1,9 +1,28 @@
 2016-02-20  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.tex (\setcontentsaftertitlepage)
+       (\setshortcontentsaftertitlepage): Replace definitions with a 
+       message saying that these aren't Texinfo commands any more.
+       (\Etitlepage): Remove handling of @setcontentsaftertitlepage.
+       and @setshortcontentsaftertitlepage.
+       (Karl Berry, bug-texinfo 2016-02-03).
+
+       * doc/texinfo.texi (@-Command Details, Obsolete @-Commands): New 
+       section node of appendix.
+       (Obsolete @-Commands): Add @setcontentsaftertitlepage and
+       @setshortcontentsaftertitlepage.
+       (Command List): Remove the same.
+       (Contents): Move information about @setcontentsaftertitlepage 
+       and @setshortcontentsaftertitlepage to appendix.
+
+       NB not done in texi2any yet.
+
+2016-02-20  Gavin Smith  <address@hidden>
+
        * info/info.c (get_initial_file): Handle --file option here 
        instead of in 'main', as well as handling invocation as "info 
        '(FILE)NODE'", and the full path to FILE as the "initial file".  Use 
-       "dir" as the last resort of the initial file.  Don't add a node to the 
+       "dir" as the last resort for the initial file.  Don't add a node to the 
        list of nodes to load.
        (add_initial_nodes): Add "Top" node to list of nodes to load if no 
        others are given.  Remove error message for initial_file undefined.

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-02-20 20:29:27 UTC (rev 7022)
+++ trunk/doc/texinfo.tex       2016-02-20 22:22:27 UTC (rev 7023)
@@ -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-16.15}
+\def\texinfoversion{2016-02-20.22}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -3477,13 +3477,16 @@
 \newif\ifseenauthor
 \newif\iffinishedtitlepage
 
-% Do an implicit @contents or @shortcontents after @end titlepage if the
-% user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage.
-%
-\newif\ifsetcontentsaftertitlepage
- \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue
-\newif\ifsetshortcontentsaftertitlepage
- \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
+% @setcontentsaftertitlepage used to do an implicit @contents or
+% @shortcontents after @end titlepage, but it is now obsolete.
+\def\setcontentsaftertitlepage{%
+  address@hidden has been removed as a Texinfo
+              command; move your @contents command if you want the contents
+              after the title page.}}%
+\def\setshortcontentsaftertitlepage{%
+  address@hidden has been removed as a Texinfo
+              command; move your @shortcontents and @contents commands if you 
+              want the contents after the title page.}}%
 
 \parseargdef\shorttitlepage{%
   \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}%
@@ -3525,20 +3528,6 @@
   % Need this before the \...aftertitlepage checks so that if they are
   % in effect the toc pages will come out with page numbers.
   \HEADINGSon
-  %
-  % If they want short, they certainly want long too.
-  \ifsetshortcontentsaftertitlepage
-    \shortcontents
-    \contents
-    \global\let\shortcontents = \relax
-    \global\let\contents = \relax
-  \fi
-  %
-  \ifsetcontentsaftertitlepage
-    \contents
-    \global\let\contents = \relax
-    \global\let\shortcontents = \relax
-  \fi
 }
 
 \def\finishtitlepage{%

Modified: trunk/doc/texinfo.texi
===================================================================
--- trunk/doc/texinfo.texi      2016-02-20 20:29:27 UTC (rev 7022)
+++ trunk/doc/texinfo.texi      2016-02-20 22:22:27 UTC (rev 7023)
@@ -2578,42 +2578,7 @@
 of the document. The links in the full table of contents point to the
 main text of the document.
 
-In the past, the contents commands were sometimes placed at the end of
-the file, after any indices and just before the @code{@@bye}, but we
-no longer recommend this.
 
address@hidden setcontentsaftertitlepage
address@hidden setshortcontentsaftertitlepage
address@hidden Contents, after title page
address@hidden Table of contents, after title page
-However, since many existing Texinfo documents still do have the
address@hidden@@contents} at the end of the manual, if you are a user printing
-a manual, you may wish to force the contents to be printed after the
-title page.  You can do this by specifying
address@hidden@@setcontentsaftertitlepage} and/or
address@hidden@@setshortcontentsaftertitlepage}.  The first prints only the
-main contents after the @code{@@end titlepage}; the second prints both
-the short contents and the main contents.  In either case, any
-subsequent @code{@@contents} or @code{@@shortcontents} is ignored.
-
-You need to include the @code{@@address@hidden
-commands early in the document (just after @code{@@setfilename}, for
-example).  We recommend using @command{texi2dvi} (@pxref{Format with
address@hidden) to specify this without altering the source file at
-all.  For example:
-
address@hidden
-texi2dvi --texinfo=@@setcontentsaftertitlepage foo.texi
address@hidden example
-
-An alternative invocation, using @command{texi2any}:
-
address@hidden
-texi2any --dvi --Xopt --texinfo=@@setcontentsaftertitlepage foo.texi
address@hidden example
-
-
-
 @node The Top Node
 @section The `Top' Node and Master Menu
 @cindex Top node
@@ -20583,19 +20548,10 @@
 Specify whether chapters start on new pages, and if so, whether on
 odd-numbered (right-hand) new pages.  @address@hidden@@setchapternewpage}}.
 
address@hidden @@setcontentsaftertitlepage
-Put the table of contents after the @samp{@@end titlepage} even if the
address@hidden@@contents} command is at the end.  @xref{Contents}.
-
 @item @@setfilename @var{info-file-name}
 Provide a name to be used for the output files.  This command is ignored
 for @TeX{} formatting.  @address@hidden@@setfilename}}.
 
address@hidden @@setshortcontentsaftertitlepage
-Place the short table of contents after the @samp{@@end titlepage}
-command even if the @code{@@shortcontents} command is at the end.
address@hidden
-
 @item @@settitle @var{title}
 Specify the title for page headers in a printed manual, and the
 default document title for HTML @samp{<head>}.
@@ -20954,6 +20910,32 @@
 test suite in the sources, which exhaustively tries combinations.
 
 
address@hidden Obsolete @@-Commands
address@hidden Obsolete @@-Commands
+
+Here are Texinfo @@-commands which are obsolete or have been removed 
+completely.  This section is for historical purposes.
+
address@hidden @code
address@hidden @@setcontentsaftertitlepage
address@hidden Contents, after title page
address@hidden Table of contents, after title page
+In the past, the contents commands were sometimes placed at the end of
+the file, after any indices and just before the @code{@@bye}, but we
+no longer recommend this.
+This command could be used by a user printing a manual, to force the 
+contents to be printed after the title page
+(after the @samp{@@end titlepage} line)
+even if the @code{@@contents} command was at the end of the manual.  It 
+now does nothing.
+
address@hidden @@setshortcontentsaftertitlepage
+This placed the short table of contents after the @samp{@@end titlepage}
+command even if the @code{@@shortcontents} command was at the end.  It 
+now does nothing.
address@hidden ftable
+
+
 @node Tips
 @appendix Tips and Hints