Re: ifinfo vs ifnottex

[Luc Teirlinck]

Eli Zaretskii wrote:

   (And please remember that @ifnottex affects everything except TeX,
   i.e. XML and DocBook output as well.)

Of course, that text or those references should not be missing from
them either.

   Please post the suggested changes here _before_ installing them.  I'm
   not sure such a replacement should be automatic; I need to see the
   surrounding context to say for sure.

===File ~/trouble.texi-diff=================================
*** trouble.texi        06 May 2006 08:33:12 -0500      1.62
--- trouble.texi        06 May 2006 18:39:51 -0500      
***************
*** 890,899 ****
  trying to fix, or why your patch should be an improvement, we mustn't
  install it.
  
! @ifinfo
  @xref{Sending Patches}, for guidelines on how to make it easy for us to
  understand and install your patches.
! @end ifinfo
  
  @item
  A guess about what the bug is or what it depends on.
--- 890,899 ----
  trying to fix, or why your patch should be an improvement, we mustn't
  install it.
  
! @ifnottex
  @xref{Sending Patches}, for guidelines on how to make it easy for us to
  understand and install your patches.
! @end ifnottex
  
  @item
  A guess about what the bug is or what it depends on.
============================================================

===File ~/text.texi-diff====================================
*** text.texi   06 May 2006 11:27:06 -0500      1.66
--- text.texi   06 May 2006 18:39:52 -0500      
***************
*** 39,47 ****
  @iftex
  mode (@pxref{TeX Mode}).
  @end iftex
! @ifinfo
  mode.
! @end ifinfo
  For input to groff or nroff, use Nroff mode.
  
    Instead of using a text formatter, you can edit formatted text in
--- 39,47 ----
  @iftex
  mode (@pxref{TeX Mode}).
  @end iftex
! @ifnottex
  mode.
! @end ifnottex
  For input to groff or nroff, use Nroff mode.
  
    Instead of using a text formatter, you can edit formatted text in
***************
*** 473,481 ****
  cannot merge lines.  So editing in the middle of a paragraph can result in
  a paragraph that is not correctly filled.  The easiest way to make the
  paragraph properly filled again is usually with the explicit fill commands.
! @ifinfo
  @xref{Fill Commands}.
! @end ifinfo
  
    Many users like Auto Fill mode and want to use it in all text files.
  The section on init files says how to arrange this permanently for yourself.
--- 473,481 ----
  cannot merge lines.  So editing in the middle of a paragraph can result in
  a paragraph that is not correctly filled.  The easiest way to make the
  paragraph properly filled again is usually with the explicit fill commands.
! @ifnottex
  @xref{Fill Commands}.
! @end ifnottex
  
    Many users like Auto Fill mode and want to use it in all text files.
  The section on init files says how to arrange this permanently for yourself.
***************
*** 934,940 ****
  @code{text-mode-hook} can look at the value of @code{major-mode} to see
  which of these modes is actually being entered.  @xref{Hooks}.
  
! @ifinfo
    Emacs provides two other modes for editing text that is to be passed
  through a text formatter to produce fancy formatted printed output.
  @xref{Nroff Mode}, for editing input to the formatter nroff.
--- 934,940 ----
  @code{text-mode-hook} can look at the value of @code{major-mode} to see
  which of these modes is actually being entered.  @xref{Hooks}.
  
! @ifnottex
    Emacs provides two other modes for editing text that is to be passed
  through a text formatter to produce fancy formatted printed output.
  @xref{Nroff Mode}, for editing input to the formatter nroff.
***************
*** 945,951 ****
  headings alone or both headings and text; you can also hide some of the
  headings at lower levels from view to make the high level structure more
  visible.  @xref{Outline Mode}.
! @end ifinfo
  
  @node Outline Mode
  @section Outline Mode
--- 945,951 ----
  headings alone or both headings and text; you can also hide some of the
  headings at lower levels from view to make the high level structure more
  visible.  @xref{Outline Mode}.
! @end ifnottex
  
  @node Outline Mode
  @section Outline Mode
============================================================

===File ~/search.texi-diff==================================
*** search.texi 12 Apr 2006 16:57:15 -0500      1.76
--- search.texi 06 May 2006 18:39:52 -0500      
***************
*** 372,380 ****
  useless.)  But it does not call @code{search-forward} right away.  First
  it checks the next input character to see if is @kbd{C-w},
  which specifies a word search.
! @ifinfo
  @xref{Word Search}.
! @end ifinfo
  @kbd{C-r @key{RET}} does likewise, for a reverse incremental search.
  
  @findex search-forward
--- 372,380 ----
  useless.)  But it does not call @code{search-forward} right away.  First
  it checks the next input character to see if is @kbd{C-w},
  which specifies a word search.
! @ifnottex
  @xref{Word Search}.
! @end ifnottex
  @kbd{C-r @key{RET}} does likewise, for a reverse incremental search.
  
  @findex search-forward
============================================================

===File ~/rmail.texi-diff===================================
*** rmail.texi  07 Feb 2006 18:27:55 -0600      1.32
--- rmail.texi  06 May 2006 18:39:52 -0500      
***************
*** 550,558 ****
  message.  A few label names have standard meanings and are given to
  messages automatically by Rmail when appropriate; these special labels
  are called @dfn{attributes}.
! @ifinfo
  (@xref{Rmail Attributes}.)
! @end ifinfo
  All other labels are assigned only by users.
  
  @table @kbd
--- 550,558 ----
  message.  A few label names have standard meanings and are given to
  messages automatically by Rmail when appropriate; these special labels
  are called @dfn{attributes}.
! @ifnottex
  (@xref{Rmail Attributes}.)
! @end ifnottex
  All other labels are assigned only by users.
  
  @table @kbd
============================================================

===File ~/mule.texi-diff====================================
Index: mule.texi
===================================================================
RCS file: /sources/emacs/emacs/man/mule.texi,v
retrieving revision 1.91
diff -c -r1.91 mule.texi
*** mule.texi   12 May 2006 17:41:17 -0000      1.91
--- mule.texi   18 May 2006 03:57:33 -0000
***************
*** 429,437 ****
    Another method, more general but not quite as easy to type, is to use
  @kbd{C-\ C-\} between two characters to stop them from combining.  This
  is the command @kbd{C-\} (@code{toggle-input-method}) used twice.
! @ifinfo
  @xref{Select Input Method}.
! @end ifinfo
  
  @cindex incremental search, input method interference
    @kbd{C-\ C-\} is especially useful inside an incremental search,
--- 429,437 ----
    Another method, more general but not quite as easy to type, is to use
  @kbd{C-\ C-\} between two characters to stop them from combining.  This
  is the command @kbd{C-\} (@code{toggle-input-method}) used twice.
! @ifnottex
  @xref{Select Input Method}.
! @end ifnottex
  
  @cindex incremental search, input method interference
    @kbd{C-\ C-\} is especially useful inside an incremental search,
***************
*** 563,571 ****
  @iftex
  (see above).
  @end iftex
! @ifinfo
  (@pxref{Language Environments}).
! @end ifinfo
  If you do not specify a choice, the default is Latin-1.
  
    If you insert a character in the range 0200 through 0237, which
--- 563,571 ----
  @iftex
  (see above).
  @end iftex
! @ifnottex
  (@pxref{Language Environments}).
! @end ifnottex
  If you do not specify a choice, the default is Latin-1.
  
    If you insert a character in the range 0200 through 0237, which
============================================================

===File ~/misc.texi-diff====================================
Index: misc.texi
===================================================================
RCS file: /sources/emacs/emacs/man/misc.texi,v
retrieving revision 1.84
diff -c -r1.84 misc.texi
*** misc.texi   6 May 2006 20:27:14 -0000       1.84
--- misc.texi   18 May 2006 03:56:36 -0000
***************
*** 30,38 ****
  number of other sources---mail, remote directories, digests, and so on.
  
  Here we introduce Gnus and describe several basic features.
! @ifinfo
  For full details, see @ref{Top, Gnus,, gnus, The Gnus Manual}.
! @end ifinfo
  @iftex
  For full details on Gnus, type @kbd{M-x info} and then select the Gnus
  manual.
--- 30,38 ----
  number of other sources---mail, remote directories, digests, and so on.
  
  Here we introduce Gnus and describe several basic features.
! @ifnottex
  For full details, see @ref{Top, Gnus,, gnus, The Gnus Manual}.
! @end ifnottex
  @iftex
  For full details on Gnus, type @kbd{M-x info} and then select the Gnus
  manual.
***************
*** 1503,1511 ****
  can be customized in group @code{handwrite}.  This function only
  supports ISO 8859-1 characters.
  
! @ifinfo
    The following section describes variables for customizing these commands.
! @end ifinfo
  
  @node PostScript Variables, Printing Package, PostScript, Printing
  @section Variables for PostScript Hardcopy
--- 1503,1511 ----
  can be customized in group @code{handwrite}.  This function only
  supports ISO 8859-1 characters.
  
! @ifnottex
    The following section describes variables for customizing these commands.
! @end ifnottex
  
  @node PostScript Variables, Printing Package, PostScript, Printing
  @section Variables for PostScript Hardcopy
============================================================

===File ~/maintaining.texi-diff=============================
*** maintaining.texi    06 May 2006 08:33:10 -0500      1.44
--- maintaining.texi    06 May 2006 18:39:54 -0500      
***************
*** 355,363 ****
  @iftex
  the previous section.
  @end iftex
! @ifinfo
  @ref{Tag Syntax}.
! @end ifinfo
  Here is how to run @code{etags}:
  
  @example
--- 355,363 ----
  @iftex
  the previous section.
  @end iftex
! @ifnottex
  @ref{Tag Syntax}.
! @end ifnottex
  Here is how to run @code{etags}:
  
  @example
============================================================

===File ~/indent.texi-diff==================================
*** indent.texi 05 Feb 2006 16:45:32 -0600      1.19
--- indent.texi 06 May 2006 18:39:54 -0500      
***************
*** 154,162 ****
  An indentation point is the end of a sequence of whitespace or the end of
  the line.  If point is farther right than any indentation point in the
  previous line, @code{indent-relative} runs @code{tab-to-tab-stop}
! @ifinfo
  (@pxref{Tab Stops}),
! @end ifinfo
  @iftex
  (see next section),
  @end iftex
--- 154,162 ----
  An indentation point is the end of a sequence of whitespace or the end of
  the line.  If point is farther right than any indentation point in the
  previous line, @code{indent-relative} runs @code{tab-to-tab-stop}
! @ifnottex
  (@pxref{Tab Stops}),
! @end ifnottex
  @iftex
  (see next section),
  @end iftex
============================================================

===File ~/fixit.texi-diff===================================
*** fixit.texi  05 Feb 2006 16:45:32 -0600      1.25
--- fixit.texi  06 May 2006 18:39:55 -0500      
***************
*** 267,275 ****
    This section describes the commands to check the spelling of a single
  word or of a portion of a buffer.  These commands work with the spelling
  checker programs Aspell and Ispell, which are not part of Emacs.
! @ifinfo
  @xref{Top, Aspell,, aspell, The Aspell Manual}.
! @end ifinfo
  
  @table @kbd
  @item M-x flyspell-mode
--- 267,275 ----
    This section describes the commands to check the spelling of a single
  word or of a portion of a buffer.  These commands work with the spelling
  checker programs Aspell and Ispell, which are not part of Emacs.
! @ifnottex
  @xref{Top, Aspell,, aspell, The Aspell Manual}.
! @end ifnottex
  
  @table @kbd
  @item M-x flyspell-mode
============================================================

===File ~/emacs.texi-diff===================================
*** emacs.texi  06 May 2006 08:33:06 -0500      1.133
--- emacs.texi  06 May 2006 18:24:02 -0500      
***************
*** 1227,1235 ****
  @iftex
  @unnumberedsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  @end iftex
! @ifinfo
  @center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
! @end ifinfo
  
  @enumerate 0
  @item
--- 1227,1235 ----
  @iftex
  @unnumberedsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  @end iftex
! @ifnottex
  @center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
! @end ifnottex
  
  @enumerate 0
  @item
***************
*** 1452,1460 ****
  @iftex
  @heading NO WARRANTY
  @end iftex
! @ifinfo
  @center NO WARRANTY
! @end ifinfo
  
  @item
  BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
--- 1452,1460 ----
  @iftex
  @heading NO WARRANTY
  @end iftex
! @ifnottex
  @center NO WARRANTY
! @end ifnottex
  
  @item
  BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
***************
*** 1482,1490 ****
  @iftex
  @heading END OF TERMS AND CONDITIONS
  @end iftex
! @ifinfo
  @center END OF TERMS AND CONDITIONS
! @end ifinfo
  
  @page
  @unnumberedsec How to Apply These Terms to Your New Programs
--- 1482,1490 ----
  @iftex
  @heading END OF TERMS AND CONDITIONS
  @end iftex
! @ifnottex
  @center END OF TERMS AND CONDITIONS
! @end ifnottex
  
  @page
  @unnumberedsec How to Apply These Terms to Your New Programs
============================================================

===File ~/custom.texi-diff==================================
Index: custom.texi
===================================================================
RCS file: /sources/emacs/emacs/man/custom.texi,v
retrieving revision 1.117
diff -c -r1.117 custom.texi
*** custom.texi 8 May 2006 05:16:29 -0000       1.117
--- custom.texi 18 May 2006 03:53:34 -0000
***************
*** 2111,2120 ****
  
    If you are going to write actual Emacs Lisp programs that go beyond
  minor customization, you should read the @cite{Emacs Lisp Reference Manual}.
! @ifinfo
  @xref{Top, Emacs Lisp, Emacs Lisp, elisp, the Emacs Lisp Reference
  Manual}.
! @end ifinfo
  
  @menu
  * Init Syntax::               Syntax of constants in Emacs Lisp.
--- 2111,2120 ----
  
    If you are going to write actual Emacs Lisp programs that go beyond
  minor customization, you should read the @cite{Emacs Lisp Reference Manual}.
! @ifnottex
  @xref{Top, Emacs Lisp, Emacs Lisp, elisp, the Emacs Lisp Reference
  Manual}.
! @end ifnottex
  
  @menu
  * Init Syntax::               Syntax of constants in Emacs Lisp.
============================================================