[7993] remove markup conditionals

[gavinsmith0123]

Revision: 7993
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7993
Author:   gavin
Date:     2017-12-26 15:47:56 -0500 (Tue, 26 Dec 2017)
Log Message:
-----------
remove markup conditionals

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-12-26 20:35:36 UTC (rev 7992)
+++ trunk/ChangeLog     2017-12-26 20:47:56 UTC (rev 7993)
@@ -1,5 +1,11 @@
 2017-12-26  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.tex (\setupmarkupstyle): Remove conditionals used 
+       for checking "markup styles in effect".  They are not used 
+       anywhere.
+
+2017-12-26  Gavin Smith  <address@hidden>
+
        * doc/texinfo.tex (\codequoteright, \codequoteleft): Check if we 
        are still in a monospace font in case we are inside @r, like
        @address@hidden  Report from rms.

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2017-12-26 20:35:36 UTC (rev 7992)
+++ trunk/doc/texinfo.tex       2017-12-26 20:47:56 UTC (rev 7993)
@@ -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{2017-12-26.20}
+\def\texinfoversion{2017-12-26.21}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2619,26 +2619,11 @@
 % Markup style infrastructure.  \defmarkupstylesetup\INITMACRO will
 % define and register \INITMACRO to be called on markup style changes.
 % \INITMACRO can check \currentmarkupstyle for the innermost
-% style and the set of \ifmarkupSTYLE switches for all styles
-% currently in effect.
-\newif\ifmarkupvar
-\newif\ifmarkupsamp
-\newif\ifmarkupkey
-%\newif\ifmarkupfile % @file == @samp.
-%\newif\ifmarkupoption % @option == @samp.
-\newif\ifmarkupcode
-\newif\ifmarkupkbd
-%\newif\ifmarkupenv % @env == @code.
-%\newif\ifmarkupcommand % @command == @code.
-\newif\ifmarkuptex % @tex (and part of @math, for now).
-\newif\ifmarkupexample
-\newif\ifmarkupverb
-\newif\ifmarkupverbatim
+% style.
 
 \let\currentmarkupstyle\empty
 
 \def\setupmarkupstyle#1{%
-  \csname markup#1true\endcsname
   \def\currentmarkupstyle{#1}%
   \markupstylesetup
 }