texinfo/doc texinfo.tex,1.16,1.17

[karl]

Update of /cvsroot/texinfo/texinfo/doc
In directory sheep:/tmp/cvs-serv18914

Modified Files:
        texinfo.tex 
Log Message:
2004-01-04  Stepan Kasal  <address@hidden>

        * doc/texinfo.tex (\makedispenv): Determine the size of the fonts
          according to the value of SETdispenvsize, using ...
          (\setnormaldispenv, \setsmalldispenv, \SETdispenvsize, \smallword):
          (\nosmallword): ... these new macros.
          (\flushleft): No longer defined via \makedispenv.


Index: texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** texinfo.tex 2004/01/03 23:00:09     1.16
--- texinfo.tex 2004/01/04 14:37:06     1.17
***************
*** 4,8 ****
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-01-03.14}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
--- 4,8 ----
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-01-04.06}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
***************
*** 4743,4757 ****
  }
  
  % We often define two environments, @foo and @smallfoo.
  % Let's do it by one command:
  \def\makedispenv #1#2{
!   \expandafter\envdef\csname#1\endcsname{#2}
!   \expandafter\envdef\csname small#1\endcsname
!     {\smallexamplefonts \rm #2}
    \expandafter\let\csname E#1\endcsname \afterenvbreak
    \expandafter\let\csname Esmall#1\endcsname \afterenvbreak
  }
  
! % And there are often two synonyms:
  \def\maketwodispenvs #1#2#3{
    \makedispenv{#1}{#3}
--- 4743,4776 ----
  }
  
+ % If you want all examples etc. small: @set dispenvsize small.
+ % If you want even small examples the full size: @set dispenvsize nosmall.
+ % This affects the following displayed environments:
+ %    @example, @display, @format, @lisp
+ %
+ \def\smallword{small}
+ \def\nosmallword{nosmall}
+ \let\SETdispenvsize\relax
+ \def\setnormaldispenv{%
+   \ifx\SETdispenvsize\smallword
+     \smallexamplefonts \rm
+   \fi
+ }
+ \def\setsmalldispenv{%
+   \ifx\SETdispenvsize\nosmallword
+   \else
+     \smallexamplefonts \rm
+   \fi
+ }
+ 
  % We often define two environments, @foo and @smallfoo.
  % Let's do it by one command:
  \def\makedispenv #1#2{
!   \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}
!   \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}
    \expandafter\let\csname E#1\endcsname \afterenvbreak
    \expandafter\let\csname Esmall#1\endcsname \afterenvbreak
  }
  
! % Define two synonyms:
  \def\maketwodispenvs #1#2#3{
    \makedispenv{#1}{#3}
***************
*** 4779,4789 ****
  
  % @format/@smallformat: same as @display except don't narrow margins.
- % @flushleft (same as @format).  (Note: @smallflushleft not documeted.)
  %
! \maketwodispenvs {format}{flushleft}{%
    \let\nonarrowing = t%
    \nonfillstart
    \gobble
  }
  
  % @flushright.
--- 4798,4815 ----
  
  % @format/@smallformat: same as @display except don't narrow margins.
  %
! \makedispenv{format}{%
!   \let\nonarrowing = t%
!   \nonfillstart
!   \gobble
! }
! 
! % @flushleft: same as @format, but doesn't obey \SETdispenvsize.
! \envdef\flushleft{%
    \let\nonarrowing = t%
    \nonfillstart
    \gobble
  }
+ \let\Eflushleft = \afterenvbreak
  
  % @flushright.