diff -uNr octave-3.6.1/aclocal.m4 octave-3.6.2/aclocal.m4 --- octave-3.6.1/aclocal.m4 2012-02-22 14:46:01.000000000 -0500 +++ octave-3.6.2/aclocal.m4 2012-05-31 11:24:20.000000000 -0400 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -469,12 +470,15 @@ XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" ]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -484,7 +488,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -500,19 +504,21 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -594,14 +600,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -641,6 +647,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -705,7 +712,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -770,10 +777,13 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -995,12 +1005,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -1132,12 +1145,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -1160,13 +1176,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -1174,13 +1191,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -1191,12 +1208,14 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_RUN_LOG(COMMAND) # ------------------- # Run COMMAND, save the exit status in ac_status, and log it. @@ -1273,12 +1292,14 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -1301,13 +1322,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -1316,13 +1337,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1344,10 +1365,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) diff -uNr octave-3.6.1/build-aux/texinfo.tex octave-3.6.2/build-aux/texinfo.tex --- octave-3.6.1/build-aux/texinfo.tex 2012-02-22 14:34:53.000000000 -0500 +++ octave-3.6.2/build-aux/texinfo.tex 1969-12-31 19:00:00.000000000 -0500 @@ -1,9913 +0,0 @@ -% texinfo.tex -- TeX macros to handle Texinfo files. -% -% Load plain if necessary, i.e., if running under initex. -\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi -% -\def\texinfoversion{2012-01-04.16} -% -% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, -% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -% 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -% -% This texinfo.tex file is free software: you can redistribute it and/or -% modify it under the terms of the GNU General Public License as -% published by the Free Software Foundation, either version 3 of the -% License, or (at your option) any later version. -% -% This texinfo.tex file is distributed in the hope that it will be -% useful, but WITHOUT ANY WARRANTY; without even the implied warranty -% of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -% General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with this program. If not, see . -% -% As a special exception, when this file is read by TeX when processing -% a Texinfo source document, you may use the result without -% restriction. (This has been our intent since Texinfo was invented.) -% -% Please try the latest version of texinfo.tex before submitting bug -% reports; you can get the latest version from: -% http://www.gnu.org/software/texinfo/ (the Texinfo home page), or -% ftp://tug.org/tex/texinfo.tex -% (and all CTAN mirrors, see http://www.ctan.org). -% The texinfo.tex in any given distribution could well be out -% of date, so if that's what you're using, please check. -% -% Send bug reports to bug-texinfo@gnu.org. Please include including a -% complete document in each bug report with which we can reproduce the -% problem. Patches are, of course, greatly appreciated. -% -% To process a Texinfo manual with TeX, it's most reliable to use the -% texi2dvi shell script that comes with the distribution. For a simple -% manual foo.texi, however, you can get away with this: -% tex foo.texi -% texindex foo.?? -% tex foo.texi -% tex foo.texi -% dvips foo.dvi -o # or whatever; this makes foo.ps. -% The extra TeX runs get the cross-reference information correct. -% Sometimes one run after texindex suffices, and sometimes you need more -% than two; texi2dvi does it as many times as necessary. -% -% It is possible to adapt texinfo.tex for other languages, to some -% extent. You can get the existing language-specific files from the -% full Texinfo distribution. -% -% The GNU Texinfo home page is http://www.gnu.org/software/texinfo. - - -\message{Loading texinfo [version \texinfoversion]:} - -% If in a .fmt file, print the version number -% and turn on active characters that we couldn't do earlier because -% they might have appeared in the input file name. -\everyjob{\message{[Texinfo version \texinfoversion]}% - \catcode`+=\active \catcode`\_=\active} - -\chardef\other=12 - -% We never want plain's \outer definition of \+ in Texinfo. -% For @tex, we can use \tabalign. -\let\+ = \relax - -% Save some plain tex macros whose names we will redefine. -\let\ptexb=\b -\let\ptexbullet=\bullet -\let\ptexc=\c -\let\ptexcomma=\, -\let\ptexdot=\. -\let\ptexdots=\dots -\let\ptexend=\end -\let\ptexequiv=\equiv -\let\ptexexclam=\! -\let\ptexfootnote=\footnote -\let\ptexgtr=> -\let\ptexhat=^ -\let\ptexi=\i -\let\ptexindent=\indent -\let\ptexinsert=\insert -\let\ptexlbrace=\{ -\let\ptexless=< -\let\ptexnewwrite\newwrite -\let\ptexnoindent=\noindent -\let\ptexplus=+ -\let\ptexraggedright=\raggedright -\let\ptexrbrace=\} -\let\ptexslash=\/ -\let\ptexstar=\* -\let\ptext=\t -\let\ptextop=\top -{\catcode`\'=\active \global\let\ptexquoteright'}% active in plain's math mode - -% If this character appears in an error message or help string, it -% starts a new line in the output. -\newlinechar = `^^J - -% Use TeX 3.0's \inputlineno to get the line number, for better error -% messages, but if we're using an old version of TeX, don't do anything. -% -\ifx\inputlineno\thisisundefined - \let\linenumber = \empty % Pre-3.0. -\else - \def\linenumber{l.\the\inputlineno:\space} -\fi - -% Set up fixed words for English if not already set. -\ifx\putwordAppendix\undefined \gdef\putwordAppendix{Appendix}\fi -\ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi -\ifx\putworderror\undefined \gdef\putworderror{error}\fi -\ifx\putwordfile\undefined \gdef\putwordfile{file}\fi -\ifx\putwordin\undefined \gdef\putwordin{in}\fi -\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi -\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi -\ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi -\ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi -\ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi -\ifx\putwordNoTitle\undefined \gdef\putwordNoTitle{No Title}\fi -\ifx\putwordof\undefined \gdef\putwordof{of}\fi -\ifx\putwordon\undefined \gdef\putwordon{on}\fi -\ifx\putwordpage\undefined \gdef\putwordpage{page}\fi -\ifx\putwordsection\undefined \gdef\putwordsection{section}\fi -\ifx\putwordSection\undefined \gdef\putwordSection{Section}\fi -\ifx\putwordsee\undefined \gdef\putwordsee{see}\fi -\ifx\putwordSee\undefined \gdef\putwordSee{See}\fi -\ifx\putwordShortTOC\undefined \gdef\putwordShortTOC{Short Contents}\fi -\ifx\putwordTOC\undefined \gdef\putwordTOC{Table of Contents}\fi -% -\ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi -\ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi -\ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi -\ifx\putwordMApr\undefined \gdef\putwordMApr{April}\fi -\ifx\putwordMMay\undefined \gdef\putwordMMay{May}\fi -\ifx\putwordMJun\undefined \gdef\putwordMJun{June}\fi -\ifx\putwordMJul\undefined \gdef\putwordMJul{July}\fi -\ifx\putwordMAug\undefined \gdef\putwordMAug{August}\fi -\ifx\putwordMSep\undefined \gdef\putwordMSep{September}\fi -\ifx\putwordMOct\undefined \gdef\putwordMOct{October}\fi -\ifx\putwordMNov\undefined \gdef\putwordMNov{November}\fi -\ifx\putwordMDec\undefined \gdef\putwordMDec{December}\fi -% -\ifx\putwordDefmac\undefined \gdef\putwordDefmac{Macro}\fi -\ifx\putwordDefspec\undefined \gdef\putwordDefspec{Special Form}\fi -\ifx\putwordDefvar\undefined \gdef\putwordDefvar{Variable}\fi -\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi -\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi - -% Since the category of space is not known, we have to be careful. -\chardef\spacecat = 10 -\def\spaceisspace{\catcode`\ =\spacecat} - -% sometimes characters are active, so we need control sequences. -\chardef\ampChar = `\& -\chardef\colonChar = `\: -\chardef\commaChar = `\, -\chardef\dashChar = `\- -\chardef\dotChar = `\. -\chardef\exclamChar= `\! -\chardef\hashChar = `\# -\chardef\lquoteChar= `\` -\chardef\questChar = `\? -\chardef\rquoteChar= `\' -\chardef\semiChar = `\; -\chardef\slashChar = `\/ -\chardef\underChar = `\_ - -% Ignore a token. -% -\def\gobble#1{} - -% The following is used inside several \edef's. -\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname} - -% Hyphenation fixes. -\hyphenation{ - Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script - ap-pen-dix bit-map bit-maps - data-base data-bases eshell fall-ing half-way long-est man-u-script - man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm - par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces - spell-ing spell-ings - stand-alone strong-est time-stamp time-stamps which-ever white-space - wide-spread wrap-around -} - -% Margin to add to right of even pages, to left of odd pages. -\newdimen\bindingoffset -\newdimen\normaloffset -\newdimen\pagewidth \newdimen\pageheight - -% For a final copy, take out the rectangles -% that mark overfull boxes (in case you have decided -% that the text looks ok even though it passes the margin). -% -\def\finalout{\overfullrule=0pt } - -% Sometimes it is convenient to have everything in the transcript file -% and nothing on the terminal. We don't just call \tracingall here, -% since that produces some useless output on the terminal. We also make -% some effort to order the tracing commands to reduce output in the log -% file; cf. trace.sty in LaTeX. -% -\def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}% -\def\loggingall{% - \tracingstats2 - \tracingpages1 - \tracinglostchars2 % 2 gives us more in etex - \tracingparagraphs1 - \tracingoutput1 - \tracingmacros2 - \tracingrestores1 - \showboxbreadth\maxdimen \showboxdepth\maxdimen - \ifx\eTeXversion\thisisundefined\else % etex gives us more logging - \tracingscantokens1 - \tracingifs1 - \tracinggroups1 - \tracingnesting2 - \tracingassigns1 - \fi - \tracingcommands3 % 3 gives us more in etex - \errorcontextlines16 -}% - -% @errormsg{MSG}. Do the index-like expansions on MSG, but if things -% aren't perfect, it's not the end of the world, being an error message, -% after all. -% -\def\errormsg{\begingroup \indexnofonts \doerrormsg} -\def\doerrormsg#1{\errmessage{#1}} - -% add check for \lastpenalty to plain's definitions. If the last thing -% we did was a \nobreak, we don't want to insert more space. -% -\def\smallbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\smallskipamount - \removelastskip\penalty-50\smallskip\fi\fi} -\def\medbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\medskipamount - \removelastskip\penalty-100\medskip\fi\fi} -\def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount - \removelastskip\penalty-200\bigskip\fi\fi} - -% Do @cropmarks to get crop marks. -% -\newif\ifcropmarks -\let\cropmarks = \cropmarkstrue -% -% Dimensions to add cropmarks at corners. -% Added by P. A. MacKay, 12 Nov. 1986 -% -\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines -\newdimen\cornerlong \cornerlong=1pc -\newdimen\cornerthick \cornerthick=.3pt -\newdimen\topandbottommargin \topandbottommargin=.75in - -% Output a mark which sets \thischapter, \thissection and \thiscolor. -% We dump everything together because we only have one kind of mark. -% This works because we only use \botmark / \topmark, not \firstmark. -% -% A mark contains a subexpression of the \ifcase ... \fi construct. -% \get*marks macros below extract the needed part using \ifcase. -% -% Another complication is to let the user choose whether \thischapter -% (\thissection) refers to the chapter (section) in effect at the top -% of a page, or that at the bottom of a page. The solution is -% described on page 260 of The TeXbook. It involves outputting two -% marks for the sectioning macros, one before the section break, and -% one after. I won't pretend I can describe this better than DEK... -\def\domark{% - \toks0=\expandafter{\lastchapterdefs}% - \toks2=\expandafter{\lastsectiondefs}% - \toks4=\expandafter{\prevchapterdefs}% - \toks6=\expandafter{\prevsectiondefs}% - \toks8=\expandafter{\lastcolordefs}% - \mark{% - \the\toks0 \the\toks2 - \noexpand\or \the\toks4 \the\toks6 - \noexpand\else \the\toks8 - }% -} -% \topmark doesn't work for the very first chapter (after the title -% page or the contents), so we use \firstmark there -- this gets us -% the mark with the chapter defs, unless the user sneaks in, e.g., -% @setcolor (or @url, or @link, etc.) between @contents and the very -% first @chapter. -\def\gettopheadingmarks{% - \ifcase0\topmark\fi - \ifx\thischapter\empty \ifcase0\firstmark\fi \fi -} -\def\getbottomheadingmarks{\ifcase1\botmark\fi} -\def\getcolormarks{\ifcase2\topmark\fi} - -% Avoid "undefined control sequence" errors. -\def\lastchapterdefs{} -\def\lastsectiondefs{} -\def\prevchapterdefs{} -\def\prevsectiondefs{} -\def\lastcolordefs{} - -% Main output routine. -\chardef\PAGE = 255 -\output = {\onepageout{\pagecontents\PAGE}} - -\newbox\headlinebox -\newbox\footlinebox - -% \onepageout takes a vbox as an argument. Note that \pagecontents -% does insertions, but you have to call it yourself. -\def\onepageout#1{% - \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi - % - \ifodd\pageno \advance\hoffset by \bindingoffset - \else \advance\hoffset by -\bindingoffset\fi - % - % Do this outside of the \shipout so @code etc. will be expanded in - % the headline as they should be, not taken literally (outputting ''code). - \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi - \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}% - \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi - \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}% - % - {% - % Have to do this stuff outside the \shipout because we want it to - % take effect in \write's, yet the group defined by the \vbox ends - % before the \shipout runs. - % - \indexdummies % don't expand commands in the output. - \normalturnoffactive % \ in index entries must not stay \, e.g., if - % the page break happens to be in the middle of an example. - % We don't want .vr (or whatever) entries like this: - % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}} - % "\acronym" won't work when it's read back in; - % it needs to be - % {\code {{\tt \backslashcurfont }acronym} - \shipout\vbox{% - % Do this early so pdf references go to the beginning of the page. - \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi - % - \ifcropmarks \vbox to \outervsize\bgroup - \hsize = \outerhsize - \vskip-\topandbottommargin - \vtop to0pt{% - \line{\ewtop\hfil\ewtop}% - \nointerlineskip - \line{% - \vbox{\moveleft\cornerthick\nstop}% - \hfill - \vbox{\moveright\cornerthick\nstop}% - }% - \vss}% - \vskip\topandbottommargin - \line\bgroup - \hfil % center the page within the outer (page) hsize. - \ifodd\pageno\hskip\bindingoffset\fi - \vbox\bgroup - \fi - % - \unvbox\headlinebox - \pagebody{#1}% - \ifdim\ht\footlinebox > 0pt - % Only leave this space if the footline is nonempty. - % (We lessened \vsize for it in \oddfootingyyy.) - % The \baselineskip=24pt in plain's \makefootline has no effect. - \vskip 24pt - \unvbox\footlinebox - \fi - % - \ifcropmarks - \egroup % end of \vbox\bgroup - \hfil\egroup % end of (centering) \line\bgroup - \vskip\topandbottommargin plus1fill minus1fill - \boxmaxdepth = \cornerthick - \vbox to0pt{\vss - \line{% - \vbox{\moveleft\cornerthick\nsbot}% - \hfill - \vbox{\moveright\cornerthick\nsbot}% - }% - \nointerlineskip - \line{\ewbot\hfil\ewbot}% - }% - \egroup % \vbox from first cropmarks clause - \fi - }% end of \shipout\vbox - }% end of group with \indexdummies - \advancepageno - \ifnum\outputpenalty>-20000 \else\dosupereject\fi -} - -\newinsert\margin \dimen\margin=\maxdimen - -\def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}} -{\catcode`\@ =11 -\gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi -% marginal hacks, juha@viisa.uucp (Juha Takala) -\ifvoid\margin\else % marginal info is present - \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi -\dimen@=\dp#1\relax \unvbox#1\relax -\ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi -\ifr@ggedbottom \kern-\dimen@ \vfil \fi} -} - -% Here are the rules for the cropmarks. Note that they are -% offset so that the space between them is truly \outerhsize or \outervsize -% (P. A. MacKay, 12 November, 1986) -% -\def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong} -\def\nstop{\vbox - {\hrule height\cornerthick depth\cornerlong width\cornerthick}} -\def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong} -\def\nsbot{\vbox - {\hrule height\cornerlong depth\cornerthick width\cornerthick}} - -% Parse an argument, then pass it to #1. The argument is the rest of -% the input line (except we remove a trailing comment). #1 should be a -% macro which expects an ordinary undelimited TeX argument. -% -\def\parsearg{\parseargusing{}} -\def\parseargusing#1#2{% - \def\argtorun{#2}% - \begingroup - \obeylines - \spaceisspace - #1% - \parseargline\empty% Insert the \empty token, see \finishparsearg below. -} - -{\obeylines % - \gdef\parseargline#1^^M{% - \endgroup % End of the group started in \parsearg. - \argremovecomment #1\comment\ArgTerm% - }% -} - -% First remove any @comment, then any @c comment. -\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm} -\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} - -% Each occurrence of `\^^M' or `\^^M' is replaced by a single space. -% -% \argremovec might leave us with trailing space, e.g., -% @end itemize @c foo -% This space token undergoes the same procedure and is eventually removed -% by \finishparsearg. -% -\def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M} -\def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M} -\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{% - \def\temp{#3}% - \ifx\temp\empty - % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp: - \let\temp\finishparsearg - \else - \let\temp\argcheckspaces - \fi - % Put the space token in: - \temp#1 #3\ArgTerm -} - -% If a _delimited_ argument is enclosed in braces, they get stripped; so -% to get _exactly_ the rest of the line, we had to prevent such situation. -% We prepended an \empty token at the very beginning and we expand it now, -% just before passing the control to \argtorun. -% (Similarly, we have to think about #3 of \argcheckspacesY above: it is -% either the null string, or it ends with \^^M---thus there is no danger -% that a pair of braces would be stripped. -% -% But first, we have to remove the trailing space token. -% -\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}} - -% \parseargdef\foo{...} -% is roughly equivalent to -% \def\foo{\parsearg\Xfoo} -% \def\Xfoo#1{...} -% -% Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my -% favourite TeX trick. --kasal, 16nov03 - -\def\parseargdef#1{% - \expandafter \doparseargdef \csname\string#1\endcsname #1% -} -\def\doparseargdef#1#2{% - \def#2{\parsearg#1}% - \def#1##1% -} - -% Several utility definitions with active space: -{ - \obeyspaces - \gdef\obeyedspace{ } - - % Make each space character in the input produce a normal interword - % space in the output. Don't allow a line break at this space, as this - % is used only in environments like @example, where each line of input - % should produce a line of output anyway. - % - \gdef\sepspaces{\obeyspaces\let =\tie} - - % If an index command is used in an @example environment, any spaces - % therein should become regular spaces in the raw index file, not the - % expansion of \tie (\leavevmode \penalty \@M \ ). - \gdef\unsepspaces{\let =\space} -} - - -\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next} - -% Define the framework for environments in texinfo.tex. It's used like this: -% -% \envdef\foo{...} -% \def\Efoo{...} -% -% It's the responsibility of \envdef to insert \begingroup before the -% actual body; @end closes the group after calling \Efoo. \envdef also -% defines \thisenv, so the current environment is known; @end checks -% whether the environment name matches. The \checkenv macro can also be -% used to check whether the current environment is the one expected. -% -% Non-false conditionals (@iftex, @ifset) don't fit into this, so they -% are not treated as environments; they don't open a group. (The -% implementation of @end takes care not to call \endgroup in this -% special case.) - - -% At run-time, environments start with this: -\def\startenvironment#1{\begingroup\def\thisenv{#1}} -% initialize -\let\thisenv\empty - -% ... but they get defined via ``\envdef\foo{...}'': -\long\def\envdef#1#2{\def#1{\startenvironment#1#2}} -\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}} - -% Check whether we're in the right environment: -\def\checkenv#1{% - \def\temp{#1}% - \ifx\thisenv\temp - \else - \badenverr - \fi -} - -% Environment mismatch, #1 expected: -\def\badenverr{% - \errhelp = \EMsimple - \errmessage{This command can appear only \inenvironment\temp, - not \inenvironment\thisenv}% -} -\def\inenvironment#1{% - \ifx#1\empty - outside of any environment% - \else - in environment \expandafter\string#1% - \fi -} - -% @end foo executes the definition of \Efoo. -% But first, it executes a specialized version of \checkenv -% -\parseargdef\end{% - \if 1\csname iscond.#1\endcsname - \else - % The general wording of \badenverr may not be ideal. - \expandafter\checkenv\csname#1\endcsname - \csname E#1\endcsname - \endgroup - \fi -} - -\newhelp\EMsimple{Press RETURN to continue.} - - -% Be sure we're in horizontal mode when doing a tie, since we make space -% equivalent to this in @example-like environments. Otherwise, a space -% at the beginning of a line will start with \penalty -- and -% since \penalty is valid in vertical mode, we'd end up putting the -% penalty on the vertical list instead of in the new paragraph. -{\catcode`@ = 11 - % Avoid using \@M directly, because that causes trouble - % if the definition is written into an index file. - \global\let\tiepenalty = \@M - \gdef\tie{\leavevmode\penalty\tiepenalty\ } -} - -% @: forces normal size whitespace following. -\def\:{\spacefactor=1000 } - -% @* forces a line break. -\def\*{\hfil\break\hbox{}\ignorespaces} - -% @/ allows a line break. -\let\/=\allowbreak - -% @. is an end-of-sentence period. -\def\.{.\spacefactor=\endofsentencespacefactor\space} - -% @! is an end-of-sentence bang. -\def\!{!\spacefactor=\endofsentencespacefactor\space} - -% @? is an end-of-sentence query. -\def\?{?\spacefactor=\endofsentencespacefactor\space} - -% @frenchspacing on|off says whether to put extra space after punctuation. -% -\def\onword{on} -\def\offword{off} -% -\parseargdef\frenchspacing{% - \def\temp{#1}% - \ifx\temp\onword \plainfrenchspacing - \else\ifx\temp\offword \plainnonfrenchspacing - \else - \errhelp = \EMsimple - \errmessage{Unknown @frenchspacing option `\temp', must be on|off}% - \fi\fi -} - -% @w prevents a word break. Without the \leavevmode, @w at the -% beginning of a paragraph, when TeX is still in vertical mode, would -% produce a whole line of output instead of starting the paragraph. -\def\w#1{\leavevmode\hbox{#1}} - -% @group ... @end group forces ... to be all on one page, by enclosing -% it in a TeX vbox. We use \vtop instead of \vbox to construct the box -% to keep its height that of a normal line. According to the rules for -% \topskip (p.114 of the TeXbook), the glue inserted is -% max (\topskip - \ht (first item), 0). If that height is large, -% therefore, no glue is inserted, and the space between the headline and -% the text is small, which looks bad. -% -% Another complication is that the group might be very large. This can -% cause the glue on the previous page to be unduly stretched, because it -% does not have much material. In this case, it's better to add an -% explicit \vfill so that the extra space is at the bottom. The -% threshold for doing this is if the group is more than \vfilllimit -% percent of a page (\vfilllimit can be changed inside of @tex). -% -\newbox\groupbox -\def\vfilllimit{0.7} -% -\envdef\group{% - \ifnum\catcode`\^^M=\active \else - \errhelp = \groupinvalidhelp - \errmessage{@group invalid in context where filling is enabled}% - \fi - \startsavinginserts - % - \setbox\groupbox = \vtop\bgroup - % Do @comment since we are called inside an environment such as - % @example, where each end-of-line in the input causes an - % end-of-line in the output. We don't want the end-of-line after - % the `@group' to put extra space in the output. Since @group - % should appear on a line by itself (according to the Texinfo - % manual), we don't worry about eating any user text. - \comment -} -% -% The \vtop produces a box with normal height and large depth; thus, TeX puts -% \baselineskip glue before it, and (when the next line of text is done) -% \lineskip glue after it. Thus, space below is not quite equal to space -% above. But it's pretty close. -\def\Egroup{% - % To get correct interline space between the last line of the group - % and the first line afterwards, we have to propagate \prevdepth. - \endgraf % Not \par, as it may have been set to \lisppar. - \global\dimen1 = \prevdepth - \egroup % End the \vtop. - % \dimen0 is the vertical size of the group's box. - \dimen0 = \ht\groupbox \advance\dimen0 by \dp\groupbox - % \dimen2 is how much space is left on the page (more or less). - \dimen2 = \pageheight \advance\dimen2 by -\pagetotal - % if the group doesn't fit on the current page, and it's a big big - % group, force a page break. - \ifdim \dimen0 > \dimen2 - \ifdim \pagetotal < \vfilllimit\pageheight - \page - \fi - \fi - \box\groupbox - \prevdepth = \dimen1 - \checkinserts -} -% -% TeX puts in an \escapechar (i.e., `@') at the beginning of the help -% message, so this ends up printing `@group can only ...'. -% -\newhelp\groupinvalidhelp{% -group can only be used in environments such as @example,^^J% -where each line of input produces a line of output.} - -% @need space-in-mils -% forces a page break if there is not space-in-mils remaining. - -\newdimen\mil \mil=0.001in - -\parseargdef\need{% - % Ensure vertical mode, so we don't make a big box in the middle of a - % paragraph. - \par - % - % If the @need value is less than one line space, it's useless. - \dimen0 = #1\mil - \dimen2 = \ht\strutbox - \advance\dimen2 by \dp\strutbox - \ifdim\dimen0 > \dimen2 - % - % Do a \strut just to make the height of this box be normal, so the - % normal leading is inserted relative to the preceding line. - % And a page break here is fine. - \vtop to #1\mil{\strut\vfil}% - % - % TeX does not even consider page breaks if a penalty added to the - % main vertical list is 10000 or more. But in order to see if the - % empty box we just added fits on the page, we must make it consider - % page breaks. On the other hand, we don't want to actually break the - % page after the empty box. So we use a penalty of 9999. - % - % There is an extremely small chance that TeX will actually break the - % page at this \penalty, if there are no other feasible breakpoints in - % sight. (If the user is using lots of big @group commands, which - % almost-but-not-quite fill up a page, TeX will have a hard time doing - % good page breaking, for example.) However, I could not construct an - % example where a page broke at this \penalty; if it happens in a real - % document, then we can reconsider our strategy. - \penalty9999 - % - % Back up by the size of the box, whether we did a page break or not. - \kern -#1\mil - % - % Do not allow a page break right after this kern. - \nobreak - \fi -} - -% @br forces paragraph break (and is undocumented). - -\let\br = \par - -% @page forces the start of a new page. -% -\def\page{\par\vfill\supereject} - -% @exdent text.... -% outputs text on separate line in roman font, starting at standard page margin - -% This records the amount of indent in the innermost environment. -% That's how much \exdent should take out. -\newskip\exdentamount - -% This defn is used inside fill environments such as @defun. -\parseargdef\exdent{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break} - -% This defn is used inside nofill environments such as @example. -\parseargdef\nofillexdent{{\advance \leftskip by -\exdentamount - \leftline{\hskip\leftskip{\rm#1}}}} - -% @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current -% paragraph. For more general purposes, use the \margin insertion -% class. WHICH is `l' or `r'. Not documented, written for gawk manual. -% -\newskip\inmarginspacing \inmarginspacing=1cm -\def\strutdepth{\dp\strutbox} -% -\def\doinmargin#1#2{\strut\vadjust{% - \nobreak - \kern-\strutdepth - \vtop to \strutdepth{% - \baselineskip=\strutdepth - \vss - % if you have multiple lines of stuff to put here, you'll need to - % make the vbox yourself of the appropriate size. - \ifx#1l% - \llap{\ignorespaces #2\hskip\inmarginspacing}% - \else - \rlap{\hskip\hsize \hskip\inmarginspacing \ignorespaces #2}% - \fi - \null - }% -}} -\def\inleftmargin{\doinmargin l} -\def\inrightmargin{\doinmargin r} -% -% @inmargin{TEXT [, RIGHT-TEXT]} -% (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right; -% else use TEXT for both). -% -\def\inmargin#1{\parseinmargin #1,,\finish} -\def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing. - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0 > 0pt - \def\lefttext{#1}% have both texts - \def\righttext{#2}% - \else - \def\lefttext{#1}% have only one text - \def\righttext{#1}% - \fi - % - \ifodd\pageno - \def\temp{\inrightmargin\righttext}% odd page -> outside is right margin - \else - \def\temp{\inleftmargin\lefttext}% - \fi - \temp -} - -% @| inserts a changebar to the left of the current line. It should -% surround any changed text. This approach does *not* work if the -% change spans more than two lines of output. To handle that, we would -% have adopt a much more difficult approach (putting marks into the main -% vertical list for the beginning and end of each change). This command -% is not documented, not supported, and doesn't work. -% -\def\|{% - % \vadjust can only be used in horizontal mode. - \leavevmode - % - % Append this vertical mode material after the current line in the output. - \vadjust{% - % We want to insert a rule with the height and depth of the current - % leading; that is exactly what \strutbox is supposed to record. - \vskip-\baselineskip - % - % \vadjust-items are inserted at the left edge of the type. So - % the \llap here moves out into the left-hand margin. - \llap{% - % - % For a thicker or thinner bar, change the `1pt'. - \vrule height\baselineskip width1pt - % - % This is the space between the bar and the text. - \hskip 12pt - }% - }% -} - -% @include FILE -- \input text of FILE. -% -\def\include{\parseargusing\filenamecatcodes\includezzz} -\def\includezzz#1{% - \pushthisfilestack - \def\thisfile{#1}% - {% - \makevalueexpandable % we want to expand any @value in FILE. - \turnoffactive % and allow special characters in the expansion - \indexnofonts % Allow `@@' and other weird things in file names. - \wlog{texinfo.tex: doing @include of #1^^J}% - \edef\temp{\noexpand\input #1 }% - % - % This trickery is to read FILE outside of a group, in case it makes - % definitions, etc. - \expandafter - }\temp - \popthisfilestack -} -\def\filenamecatcodes{% - \catcode`\\=\other - \catcode`~=\other - \catcode`^=\other - \catcode`_=\other - \catcode`|=\other - \catcode`<=\other - \catcode`>=\other - \catcode`+=\other - \catcode`-=\other - \catcode`\`=\other - \catcode`\'=\other -} - -\def\pushthisfilestack{% - \expandafter\pushthisfilestackX\popthisfilestack\StackTerm -} -\def\pushthisfilestackX{% - \expandafter\pushthisfilestackY\thisfile\StackTerm -} -\def\pushthisfilestackY #1\StackTerm #2\StackTerm {% - \gdef\popthisfilestack{\gdef\thisfile{#1}\gdef\popthisfilestack{#2}}% -} - -\def\popthisfilestack{\errthisfilestackempty} -\def\errthisfilestackempty{\errmessage{Internal error: - the stack of filenames is empty.}} - -\def\thisfile{} - -% @center line -% outputs that line, centered. -% -\parseargdef\center{% - \ifhmode - \let\next\centerH - \else - \let\next\centerV - \fi - \next{\hfil \ignorespaces#1\unskip \hfil}% -} -\def\centerH#1{% - {% - \hfil\break - \advance\hsize by -\leftskip - \advance\hsize by -\rightskip - \line{#1}% - \break - }% -} -\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}} - -% @sp n outputs n lines of vertical space - -\parseargdef\sp{\vskip #1\baselineskip} - -% @comment ...line which is ignored... -% @c is the same as @comment -% @ignore ... @end ignore is another way to write a comment - -\def\comment{\begingroup \catcode`\^^M=\other% -\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other% -\commentxxx} -{\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}} - -\let\c=\comment - -% @paragraphindent NCHARS -% We'll use ems for NCHARS, close enough. -% NCHARS can also be the word `asis' or `none'. -% We cannot feasibly implement @paragraphindent asis, though. -% -\def\asisword{asis} % no translation, these are keywords -\def\noneword{none} -% -\parseargdef\paragraphindent{% - \def\temp{#1}% - \ifx\temp\asisword - \else - \ifx\temp\noneword - \defaultparindent = 0pt - \else - \defaultparindent = #1em - \fi - \fi - \parindent = \defaultparindent -} - -% @exampleindent NCHARS -% We'll use ems for NCHARS like @paragraphindent. -% It seems @exampleindent asis isn't necessary, but -% I preserve it to make it similar to @paragraphindent. -\parseargdef\exampleindent{% - \def\temp{#1}% - \ifx\temp\asisword - \else - \ifx\temp\noneword - \lispnarrowing = 0pt - \else - \lispnarrowing = #1em - \fi - \fi -} - -% @firstparagraphindent WORD -% If WORD is `none', then suppress indentation of the first paragraph -% after a section heading. If WORD is `insert', then do indent at such -% paragraphs. -% -% The paragraph indentation is suppressed or not by calling -% \suppressfirstparagraphindent, which the sectioning commands do. -% We switch the definition of this back and forth according to WORD. -% By default, we suppress indentation. -% -\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent} -\def\insertword{insert} -% -\parseargdef\firstparagraphindent{% - \def\temp{#1}% - \ifx\temp\noneword - \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent - \else\ifx\temp\insertword - \let\suppressfirstparagraphindent = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @firstparagraphindent option `\temp'}% - \fi\fi -} - -% Here is how we actually suppress indentation. Redefine \everypar to -% \kern backwards by \parindent, and then reset itself to empty. -% -% We also make \indent itself not actually do anything until the next -% paragraph. -% -\gdef\dosuppressfirstparagraphindent{% - \gdef\indent{% - \restorefirstparagraphindent - \indent - }% - \gdef\noindent{% - \restorefirstparagraphindent - \noindent - }% - \global\everypar = {% - \kern -\parindent - \restorefirstparagraphindent - }% -} - -\gdef\restorefirstparagraphindent{% - \global \let \indent = \ptexindent - \global \let \noindent = \ptexnoindent - \global \everypar = {}% -} - - -% @refill is a no-op. -\let\refill=\relax - -% If working on a large document in chapters, it is convenient to -% be able to disable indexing, cross-referencing, and contents, for test runs. -% This is done with @novalidate (before @setfilename). -% -\newif\iflinks \linkstrue % by default we want the aux files. -\let\novalidate = \linksfalse - -% @setfilename is done at the beginning of every texinfo file. -% So open here the files we need to have open while reading the input. -% This makes it possible to make a .fmt file for texinfo. -\def\setfilename{% - \fixbackslash % Turn off hack to swallow `\input texinfo'. - \iflinks - \tryauxfile - % Open the new aux file. TeX will close it automatically at exit. - \immediate\openout\auxfile=\jobname.aux - \fi % \openindices needs to do some work in any case. - \openindices - \let\setfilename=\comment % Ignore extra @setfilename cmds. - % - % If texinfo.cnf is present on the system, read it. - % Useful for site-wide @afourpaper, etc. - \openin 1 texinfo.cnf - \ifeof 1 \else \input texinfo.cnf \fi - \closein 1 - % - \comment % Ignore the actual filename. -} - -% Called from \setfilename. -% -\def\openindices{% - \newindex{cp}% - \newcodeindex{fn}% - \newcodeindex{vr}% - \newcodeindex{tp}% - \newcodeindex{ky}% - \newcodeindex{pg}% -} - -% @bye. -\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend} - - -\message{pdf,} -% adobe `portable' document format -\newcount\tempnum -\newcount\lnkcount -\newtoks\filename -\newcount\filenamelength -\newcount\pgn -\newtoks\toksA -\newtoks\toksB -\newtoks\toksC -\newtoks\toksD -\newbox\boxA -\newcount\countA -\newif\ifpdf -\newif\ifpdfmakepagedest - -% when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1 -% can be set). So we test for \relax and 0 as well as being undefined. -\ifx\pdfoutput\thisisundefined -\else - \ifx\pdfoutput\relax - \else - \ifcase\pdfoutput - \else - \pdftrue - \fi - \fi -\fi - -% PDF uses PostScript string constants for the names of xref targets, -% for display in the outlines, and in other places. Thus, we have to -% double any backslashes. Otherwise, a name like "\node" will be -% interpreted as a newline (\n), followed by o, d, e. Not good. -% -% See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and -% related messages. The final outcome is that it is up to the TeX user -% to double the backslashes and otherwise make the string valid, so -% that's what we do. pdftex 1.30.0 (ca.2005) introduced a primitive to -% do this reliably, so we use it. - -% #1 is a control sequence in which to do the replacements, -% which we \xdef. -\def\txiescapepdf#1{% - \ifx\pdfescapestring\relax - % No primitive available; should we give a warning or log? - % Many times it won't matter. - \else - % The expandable \pdfescapestring primitive escapes parentheses, - % backslashes, and other special chars. - \xdef#1{\pdfescapestring{#1}}% - \fi -} - -\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images -with PDF output, and none of those formats could be found. (.eps cannot -be supported due to the design of the PDF format; use regular TeX (DVI -output) for that.)} - -\ifpdf - % - % Color manipulation macros based on pdfcolor.tex, - % except using rgb instead of cmyk; the latter is said to render as a - % very dark gray on-screen and a very dark halftone in print, instead - % of actual black. - \def\rgbDarkRed{0.50 0.09 0.12} - \def\rgbBlack{0 0 0} - % - % k sets the color for filling (usual text, etc.); - % K sets the color for stroking (thin rules, e.g., normal _'s). - \def\pdfsetcolor#1{\pdfliteral{#1 rg #1 RG}} - % - % Set color, and create a mark which defines \thiscolor accordingly, - % so that \makeheadline knows which color to restore. - \def\setcolor#1{% - \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}% - \domark - \pdfsetcolor{#1}% - } - % - \def\maincolor{\rgbBlack} - \pdfsetcolor{\maincolor} - \edef\thiscolor{\maincolor} - \def\lastcolordefs{} - % - \def\makefootline{% - \baselineskip24pt - \line{\pdfsetcolor{\maincolor}\the\footline}% - } - % - \def\makeheadline{% - \vbox to 0pt{% - \vskip-22.5pt - \line{% - \vbox to8.5pt{}% - % Extract \thiscolor definition from the marks. - \getcolormarks - % Typeset the headline with \maincolor, then restore the color. - \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}% - }% - \vss - }% - \nointerlineskip - } - % - % - \pdfcatalog{/PageMode /UseOutlines} - % - % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto). - \def\dopdfimage#1#2#3{% - \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}% - \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}% - % - % pdftex (and the PDF format) support .pdf, .png, .jpg (among - % others). Let's try in that order, PDF first since if - % someone has a scalable image, presumably better to use that than a - % bitmap. - \let\pdfimgext=\empty - \begingroup - \openin 1 #1.pdf \ifeof 1 - \openin 1 #1.PDF \ifeof 1 - \openin 1 #1.png \ifeof 1 - \openin 1 #1.jpg \ifeof 1 - \openin 1 #1.jpeg \ifeof 1 - \openin 1 #1.JPG \ifeof 1 - \errhelp = \nopdfimagehelp - \errmessage{Could not find image file #1 for pdf}% - \else \gdef\pdfimgext{JPG}% - \fi - \else \gdef\pdfimgext{jpeg}% - \fi - \else \gdef\pdfimgext{jpg}% - \fi - \else \gdef\pdfimgext{png}% - \fi - \else \gdef\pdfimgext{PDF}% - \fi - \else \gdef\pdfimgext{pdf}% - \fi - \closein 1 - \endgroup - % - % without \immediate, ancient pdftex seg faults when the same image is - % included twice. (Version 3.14159-pre-1.0-unofficial-20010704.) - \ifnum\pdftexversion < 14 - \immediate\pdfimage - \else - \immediate\pdfximage - \fi - \ifdim \wd0 >0pt width \imagewidth \fi - \ifdim \wd2 >0pt height \imageheight \fi - \ifnum\pdftexversion<13 - #1.\pdfimgext - \else - {#1.\pdfimgext}% - \fi - \ifnum\pdftexversion < 14 \else - \pdfrefximage \pdflastximage - \fi} - % - \def\pdfmkdest#1{{% - % We have to set dummies so commands such as @code, and characters - % such as \, aren't expanded when present in a section title. - \indexnofonts - \turnoffactive - \makevalueexpandable - \def\pdfdestname{#1}% - \txiescapepdf\pdfdestname - \safewhatsit{\pdfdest name{\pdfdestname} xyz}% - }} - % - % used to mark target names; must be expandable. - \def\pdfmkpgn#1{#1} - % - % by default, use a color that is dark enough to print on paper as - % nearly black, but still distinguishable for online viewing. - \def\urlcolor{\rgbDarkRed} - \def\linkcolor{\rgbDarkRed} - \def\endlink{\setcolor{\maincolor}\pdfendlink} - % - % Adding outlines to PDF; macros for calculating structure of outlines - % come from Petr Olsak - \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0% - \else \csname#1\endcsname \fi} - \def\advancenumber#1{\tempnum=\expnumber{#1}\relax - \advance\tempnum by 1 - \expandafter\xdef\csname#1\endcsname{\the\tempnum}} - % - % #1 is the section text, which is what will be displayed in the - % outline by the pdf viewer. #2 is the pdf expression for the number - % of subentries (or empty, for subsubsections). #3 is the node text, - % which might be empty if this toc entry had no corresponding node. - % #4 is the page number - % - \def\dopdfoutline#1#2#3#4{% - % Generate a link to the node text if that exists; else, use the - % page number. We could generate a destination for the section - % text in the case where a section has no node, but it doesn't - % seem worth the trouble, since most documents are normally structured. - \edef\pdfoutlinedest{#3}% - \ifx\pdfoutlinedest\empty - \def\pdfoutlinedest{#4}% - \else - \txiescapepdf\pdfoutlinedest - \fi - % - % Also escape PDF chars in the display string. - \edef\pdfoutlinetext{#1}% - \txiescapepdf\pdfoutlinetext - % - \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}% - } - % - \def\pdfmakeoutlines{% - \begingroup - % Read toc silently, to get counts of subentries for \pdfoutline. - \def\partentry##1##2##3##4{}% ignore parts in the outlines - \def\numchapentry##1##2##3##4{% - \def\thischapnum{##2}% - \def\thissecnum{0}% - \def\thissubsecnum{0}% - }% - \def\numsecentry##1##2##3##4{% - \advancenumber{chap\thischapnum}% - \def\thissecnum{##2}% - \def\thissubsecnum{0}% - }% - \def\numsubsecentry##1##2##3##4{% - \advancenumber{sec\thissecnum}% - \def\thissubsecnum{##2}% - }% - \def\numsubsubsecentry##1##2##3##4{% - \advancenumber{subsec\thissubsecnum}% - }% - \def\thischapnum{0}% - \def\thissecnum{0}% - \def\thissubsecnum{0}% - % - % use \def rather than \let here because we redefine \chapentry et - % al. a second time, below. - \def\appentry{\numchapentry}% - \def\appsecentry{\numsecentry}% - \def\appsubsecentry{\numsubsecentry}% - \def\appsubsubsecentry{\numsubsubsecentry}% - \def\unnchapentry{\numchapentry}% - \def\unnsecentry{\numsecentry}% - \def\unnsubsecentry{\numsubsecentry}% - \def\unnsubsubsecentry{\numsubsubsecentry}% - \readdatafile{toc}% - % - % Read toc second time, this time actually producing the outlines. - % The `-' means take the \expnumber as the absolute number of - % subentries, which we calculated on our first read of the .toc above. - % - % We use the node names as the destinations. - \def\numchapentry##1##2##3##4{% - \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}% - \def\numsecentry##1##2##3##4{% - \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}% - \def\numsubsecentry##1##2##3##4{% - \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}% - \def\numsubsubsecentry##1##2##3##4{% count is always zero - \dopdfoutline{##1}{}{##3}{##4}}% - % - % PDF outlines are displayed using system fonts, instead of - % document fonts. Therefore we cannot use special characters, - % since the encoding is unknown. For example, the eogonek from - % Latin 2 (0xea) gets translated to a | character. Info from - % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100. - % - % TODO this right, we have to translate 8-bit characters to - % their "best" equivalent, based on the @documentencoding. Too - % much work for too little return. Just use the ASCII equivalents - % we use for the index sort strings. - % - \indexnofonts - \setupdatafile - % We can have normal brace characters in the PDF outlines, unlike - % Texinfo index files. So set that up. - \def\{{\lbracecharliteral}% - \def\}{\rbracecharliteral}% - \catcode`\\=\active \otherbackslash - \input \tocreadfilename - \endgroup - } - {\catcode`[=1 \catcode`]=2 - \catcode`{=\other \catcode`}=\other - \gdef\lbracecharliteral[{]% - \gdef\rbracecharliteral[}]% - ] - % - \def\skipspaces#1{\def\PP{#1}\def\D{|}% - \ifx\PP\D\let\nextsp\relax - \else\let\nextsp\skipspaces - \ifx\p\space\else\addtokens{\filename}{\PP}% - \advance\filenamelength by 1 - \fi - \fi - \nextsp} - \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax} - \ifnum\pdftexversion < 14 - \let \startlink \pdfannotlink - \else - \let \startlink \pdfstartlink - \fi - % make a live url in pdf output. - \def\pdfurl#1{% - \begingroup - % it seems we really need yet another set of dummies; have not - % tried to figure out what each command should do in the context - % of @url. for now, just make @/ a no-op, that's the only one - % people have actually reported a problem with. - % - \normalturnoffactive - \def\@{@}% - \let\/=\empty - \makevalueexpandable - % do we want to go so far as to use \indexnofonts instead of just - % special-casing \var here? - \def\var##1{##1}% - % - \leavevmode\setcolor{\urlcolor}% - \startlink attr{/Border [0 0 0]}% - user{/Subtype /Link /A << /S /URI /URI (#1) >>}% - \endgroup} - \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}} - \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} - \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks} - \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}} - \def\maketoks{% - \expandafter\poptoks\the\toksA|ENDTOKS|\relax - \ifx\first0\adn0 - \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3 - \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6 - \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9 - \else - \ifnum0=\countA\else\makelink\fi - \ifx\first.\let\next=\done\else - \let\next=\maketoks - \addtokens{\toksB}{\the\toksD} - \ifx\first,\addtokens{\toksB}{\space}\fi - \fi - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi - \next} - \def\makelink{\addtokens{\toksB}% - {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} - \def\pdflink#1{% - \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}} - \setcolor{\linkcolor}#1\endlink} - \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} -\else - % non-pdf mode - \let\pdfmkdest = \gobble - \let\pdfurl = \gobble - \let\endlink = \relax - \let\setcolor = \gobble - \let\pdfsetcolor = \gobble - \let\pdfmakeoutlines = \relax -\fi % \ifx\pdfoutput - - -\message{fonts,} - -% Change the current font style to #1, remembering it in \curfontstyle. -% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in -% italics, not bold italics. -% -\def\setfontstyle#1{% - \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd. - \csname ten#1\endcsname % change the current font -} - -% Select #1 fonts with the current style. -% -\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname} - -\def\rm{\fam=0 \setfontstyle{rm}} -\def\it{\fam=\itfam \setfontstyle{it}} -\def\sl{\fam=\slfam \setfontstyle{sl}} -\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf} -\def\tt{\fam=\ttfam \setfontstyle{tt}} - -% Unfortunately, we have to override this for titles and the like, since -% in those cases "rm" is bold. Sigh. -\def\rmisbold{\rm\def\curfontstyle{bf}} - -% Texinfo sort of supports the sans serif font style, which plain TeX does not. -% So we set up a \sf. -\newfam\sffam -\def\sf{\fam=\sffam \setfontstyle{sf}} -\let\li = \sf % Sometimes we call it \li, not \sf. - -% We don't need math for this font style. -\def\ttsl{\setfontstyle{ttsl}} - - -% Default leading. -\newdimen\textleading \textleading = 13.2pt - -% Set the baselineskip to #1, and the lineskip and strut size -% correspondingly. There is no deep meaning behind these magic numbers -% used as factors; they just match (closely enough) what Knuth defined. -% -\def\lineskipfactor{.08333} -\def\strutheightpercent{.70833} -\def\strutdepthpercent {.29167} -% -% can get a sort of poor man's double spacing by redefining this. -\def\baselinefactor{1} -% -\def\setleading#1{% - \dimen0 = #1\relax - \normalbaselineskip = \baselinefactor\dimen0 - \normallineskip = \lineskipfactor\normalbaselineskip - \normalbaselines - \setbox\strutbox =\hbox{% - \vrule width0pt height\strutheightpercent\baselineskip - depth \strutdepthpercent \baselineskip - }% -} - -% PDF CMaps. See also LaTeX's t1.cmap. -% -% do nothing with this by default. -\expandafter\let\csname cmapOT1\endcsname\gobble -\expandafter\let\csname cmapOT1IT\endcsname\gobble -\expandafter\let\csname cmapOT1TT\endcsname\gobble - -% if we are producing pdf, and we have \pdffontattr, then define cmaps. -% (\pdffontattr was introduced many years ago, but people still run -% older pdftex's; it's easy to conditionalize, so we do.) -\ifpdf \ifx\pdffontattr\thisisundefined \else - \begingroup - \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. - \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-OT1-0) -%%Title: (TeX-OT1-0 TeX OT1 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (OT1) -/Supplement 0 ->> def -/CMapName /TeX-OT1-0 def -/CMapType 2 def -1 begincodespacerange -<00> <7F> -endcodespacerange -8 beginbfrange -<00> <01> <0393> -<09> <0A> <03A8> -<23> <26> <0023> -<28> <3B> <0028> -<3F> <5B> <003F> -<5D> <5E> <005D> -<61> <7A> <0061> -<7B> <7C> <2013> -endbfrange -40 beginbfchar -<02> <0398> -<03> <039B> -<04> <039E> -<05> <03A0> -<06> <03A3> -<07> <03D2> -<08> <03A6> -<0B> <00660066> -<0C> <00660069> -<0D> <0066006C> -<0E> <006600660069> -<0F> <00660066006C> -<10> <0131> -<11> <0237> -<12> <0060> -<13> <00B4> -<14> <02C7> -<15> <02D8> -<16> <00AF> -<17> <02DA> -<18> <00B8> -<19> <00DF> -<1A> <00E6> -<1B> <0153> -<1C> <00F8> -<1D> <00C6> -<1E> <0152> -<1F> <00D8> -<21> <0021> -<22> <201D> -<27> <2019> -<3C> <00A1> -<3D> <003D> -<3E> <00BF> -<5C> <201C> -<5F> <02D9> -<60> <2018> -<7D> <02DD> -<7E> <007E> -<7F> <00A8> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - }\endgroup - \expandafter\edef\csname cmapOT1\endcsname#1{% - \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% - }% -% -% \cmapOT1IT - \begingroup - \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. - \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-OT1IT-0) -%%Title: (TeX-OT1IT-0 TeX OT1IT 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (OT1IT) -/Supplement 0 ->> def -/CMapName /TeX-OT1IT-0 def -/CMapType 2 def -1 begincodespacerange -<00> <7F> -endcodespacerange -8 beginbfrange -<00> <01> <0393> -<09> <0A> <03A8> -<25> <26> <0025> -<28> <3B> <0028> -<3F> <5B> <003F> -<5D> <5E> <005D> -<61> <7A> <0061> -<7B> <7C> <2013> -endbfrange -42 beginbfchar -<02> <0398> -<03> <039B> -<04> <039E> -<05> <03A0> -<06> <03A3> -<07> <03D2> -<08> <03A6> -<0B> <00660066> -<0C> <00660069> -<0D> <0066006C> -<0E> <006600660069> -<0F> <00660066006C> -<10> <0131> -<11> <0237> -<12> <0060> -<13> <00B4> -<14> <02C7> -<15> <02D8> -<16> <00AF> -<17> <02DA> -<18> <00B8> -<19> <00DF> -<1A> <00E6> -<1B> <0153> -<1C> <00F8> -<1D> <00C6> -<1E> <0152> -<1F> <00D8> -<21> <0021> -<22> <201D> -<23> <0023> -<24> <00A3> -<27> <2019> -<3C> <00A1> -<3D> <003D> -<3E> <00BF> -<5C> <201C> -<5F> <02D9> -<60> <2018> -<7D> <02DD> -<7E> <007E> -<7F> <00A8> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - }\endgroup - \expandafter\edef\csname cmapOT1IT\endcsname#1{% - \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% - }% -% -% \cmapOT1TT - \begingroup - \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. - \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-OT1TT-0) -%%Title: (TeX-OT1TT-0 TeX OT1TT 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (OT1TT) -/Supplement 0 ->> def -/CMapName /TeX-OT1TT-0 def -/CMapType 2 def -1 begincodespacerange -<00> <7F> -endcodespacerange -5 beginbfrange -<00> <01> <0393> -<09> <0A> <03A8> -<21> <26> <0021> -<28> <5F> <0028> -<61> <7E> <0061> -endbfrange -32 beginbfchar -<02> <0398> -<03> <039B> -<04> <039E> -<05> <03A0> -<06> <03A3> -<07> <03D2> -<08> <03A6> -<0B> <2191> -<0C> <2193> -<0D> <0027> -<0E> <00A1> -<0F> <00BF> -<10> <0131> -<11> <0237> -<12> <0060> -<13> <00B4> -<14> <02C7> -<15> <02D8> -<16> <00AF> -<17> <02DA> -<18> <00B8> -<19> <00DF> -<1A> <00E6> -<1B> <0153> -<1C> <00F8> -<1D> <00C6> -<1E> <0152> -<1F> <00D8> -<20> <2423> -<27> <2019> -<60> <2018> -<7F> <00A8> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - }\endgroup - \expandafter\edef\csname cmapOT1TT\endcsname#1{% - \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% - }% -\fi\fi - - -% Set the font macro #1 to the font named #2, adding on the -% specified font prefix (normally `cm'). -% #3 is the font's design size, #4 is a scale factor, #5 is the CMap -% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass -% empty to omit). -\def\setfont#1#2#3#4#5{% - \font#1=\fontprefix#2#3 scaled #4 - \csname cmap#5\endcsname#1% -} -% This is what gets called when #5 of \setfont is empty. -\let\cmap\gobble -% emacs-page end of cmaps - -% Use cm as the default font prefix. -% To specify the font prefix, you must define \fontprefix -% before you read in texinfo.tex. -\ifx\fontprefix\thisisundefined -\def\fontprefix{cm} -\fi -% Support font families that don't use the same naming scheme as CM. -\def\rmshape{r} -\def\rmbshape{bx} %where the normal face is bold -\def\bfshape{b} -\def\bxshape{bx} -\def\ttshape{tt} -\def\ttbshape{tt} -\def\ttslshape{sltt} -\def\itshape{ti} -\def\itbshape{bxti} -\def\slshape{sl} -\def\slbshape{bxsl} -\def\sfshape{ss} -\def\sfbshape{ss} -\def\scshape{csc} -\def\scbshape{csc} - -% Definitions for a main text size of 11pt. This is the default in -% Texinfo. -% -\def\definetextfontsizexi{% -% Text fonts (11.2pt, magstep1). -\def\textnominalsize{11pt} -\edef\mainmagstep{\magstephalf} -\setfont\textrm\rmshape{10}{\mainmagstep}{OT1} -\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT} -\setfont\textbf\bfshape{10}{\mainmagstep}{OT1} -\setfont\textit\itshape{10}{\mainmagstep}{OT1IT} -\setfont\textsl\slshape{10}{\mainmagstep}{OT1} -\setfont\textsf\sfshape{10}{\mainmagstep}{OT1} -\setfont\textsc\scshape{10}{\mainmagstep}{OT1} -\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT} -\font\texti=cmmi10 scaled \mainmagstep -\font\textsy=cmsy10 scaled \mainmagstep -\def\textecsize{1095} - -% A few fonts for @defun names and args. -\setfont\defbf\bfshape{10}{\magstep1}{OT1} -\setfont\deftt\ttshape{10}{\magstep1}{OT1TT} -\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT} -\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} - -% Fonts for indices, footnotes, small examples (9pt). -\def\smallnominalsize{9pt} -\setfont\smallrm\rmshape{9}{1000}{OT1} -\setfont\smalltt\ttshape{9}{1000}{OT1TT} -\setfont\smallbf\bfshape{10}{900}{OT1} -\setfont\smallit\itshape{9}{1000}{OT1IT} -\setfont\smallsl\slshape{9}{1000}{OT1} -\setfont\smallsf\sfshape{9}{1000}{OT1} -\setfont\smallsc\scshape{10}{900}{OT1} -\setfont\smallttsl\ttslshape{10}{900}{OT1TT} -\font\smalli=cmmi9 -\font\smallsy=cmsy9 -\def\smallecsize{0900} - -% Fonts for small examples (8pt). -\def\smallernominalsize{8pt} -\setfont\smallerrm\rmshape{8}{1000}{OT1} -\setfont\smallertt\ttshape{8}{1000}{OT1TT} -\setfont\smallerbf\bfshape{10}{800}{OT1} -\setfont\smallerit\itshape{8}{1000}{OT1IT} -\setfont\smallersl\slshape{8}{1000}{OT1} -\setfont\smallersf\sfshape{8}{1000}{OT1} -\setfont\smallersc\scshape{10}{800}{OT1} -\setfont\smallerttsl\ttslshape{10}{800}{OT1TT} -\font\smalleri=cmmi8 -\font\smallersy=cmsy8 -\def\smallerecsize{0800} - -% Fonts for title page (20.4pt): -\def\titlenominalsize{20pt} -\setfont\titlerm\rmbshape{12}{\magstep3}{OT1} -\setfont\titleit\itbshape{10}{\magstep4}{OT1IT} -\setfont\titlesl\slbshape{10}{\magstep4}{OT1} -\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT} -\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT} -\setfont\titlesf\sfbshape{17}{\magstep1}{OT1} -\let\titlebf=\titlerm -\setfont\titlesc\scbshape{10}{\magstep4}{OT1} -\font\titlei=cmmi12 scaled \magstep3 -\font\titlesy=cmsy10 scaled \magstep4 -\def\titleecsize{2074} - -% Chapter (and unnumbered) fonts (17.28pt). -\def\chapnominalsize{17pt} -\setfont\chaprm\rmbshape{12}{\magstep2}{OT1} -\setfont\chapit\itbshape{10}{\magstep3}{OT1IT} -\setfont\chapsl\slbshape{10}{\magstep3}{OT1} -\setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT} -\setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT} -\setfont\chapsf\sfbshape{17}{1000}{OT1} -\let\chapbf=\chaprm -\setfont\chapsc\scbshape{10}{\magstep3}{OT1} -\font\chapi=cmmi12 scaled \magstep2 -\font\chapsy=cmsy10 scaled \magstep3 -\def\chapecsize{1728} - -% Section fonts (14.4pt). -\def\secnominalsize{14pt} -\setfont\secrm\rmbshape{12}{\magstep1}{OT1} -\setfont\secit\itbshape{10}{\magstep2}{OT1IT} -\setfont\secsl\slbshape{10}{\magstep2}{OT1} -\setfont\sectt\ttbshape{12}{\magstep1}{OT1TT} -\setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT} -\setfont\secsf\sfbshape{12}{\magstep1}{OT1} -\let\secbf\secrm -\setfont\secsc\scbshape{10}{\magstep2}{OT1} -\font\seci=cmmi12 scaled \magstep1 -\font\secsy=cmsy10 scaled \magstep2 -\def\sececsize{1440} - -% Subsection fonts (13.15pt). -\def\ssecnominalsize{13pt} -\setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1} -\setfont\ssecit\itbshape{10}{1315}{OT1IT} -\setfont\ssecsl\slbshape{10}{1315}{OT1} -\setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT} -\setfont\ssecttsl\ttslshape{10}{1315}{OT1TT} -\setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1} -\let\ssecbf\ssecrm -\setfont\ssecsc\scbshape{10}{1315}{OT1} -\font\sseci=cmmi12 scaled \magstephalf -\font\ssecsy=cmsy10 scaled 1315 -\def\ssececsize{1200} - -% Reduced fonts for @acro in text (10pt). -\def\reducednominalsize{10pt} -\setfont\reducedrm\rmshape{10}{1000}{OT1} -\setfont\reducedtt\ttshape{10}{1000}{OT1TT} -\setfont\reducedbf\bfshape{10}{1000}{OT1} -\setfont\reducedit\itshape{10}{1000}{OT1IT} -\setfont\reducedsl\slshape{10}{1000}{OT1} -\setfont\reducedsf\sfshape{10}{1000}{OT1} -\setfont\reducedsc\scshape{10}{1000}{OT1} -\setfont\reducedttsl\ttslshape{10}{1000}{OT1TT} -\font\reducedi=cmmi10 -\font\reducedsy=cmsy10 -\def\reducedecsize{1000} - -\textleading = 13.2pt % line spacing for 11pt CM -\textfonts % reset the current fonts -\rm -} % end of 11pt text font size definitions - - -% Definitions to make the main text be 10pt Computer Modern, with -% section, chapter, etc., sizes following suit. This is for the GNU -% Press printing of the Emacs 22 manual. Maybe other manuals in the -% future. Used with @smallbook, which sets the leading to 12pt. -% -\def\definetextfontsizex{% -% Text fonts (10pt). -\def\textnominalsize{10pt} -\edef\mainmagstep{1000} -\setfont\textrm\rmshape{10}{\mainmagstep}{OT1} -\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT} -\setfont\textbf\bfshape{10}{\mainmagstep}{OT1} -\setfont\textit\itshape{10}{\mainmagstep}{OT1IT} -\setfont\textsl\slshape{10}{\mainmagstep}{OT1} -\setfont\textsf\sfshape{10}{\mainmagstep}{OT1} -\setfont\textsc\scshape{10}{\mainmagstep}{OT1} -\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT} -\font\texti=cmmi10 scaled \mainmagstep -\font\textsy=cmsy10 scaled \mainmagstep -\def\textecsize{1000} - -% A few fonts for @defun names and args. -\setfont\defbf\bfshape{10}{\magstephalf}{OT1} -\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT} -\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT} -\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} - -% Fonts for indices, footnotes, small examples (9pt). -\def\smallnominalsize{9pt} -\setfont\smallrm\rmshape{9}{1000}{OT1} -\setfont\smalltt\ttshape{9}{1000}{OT1TT} -\setfont\smallbf\bfshape{10}{900}{OT1} -\setfont\smallit\itshape{9}{1000}{OT1IT} -\setfont\smallsl\slshape{9}{1000}{OT1} -\setfont\smallsf\sfshape{9}{1000}{OT1} -\setfont\smallsc\scshape{10}{900}{OT1} -\setfont\smallttsl\ttslshape{10}{900}{OT1TT} -\font\smalli=cmmi9 -\font\smallsy=cmsy9 -\def\smallecsize{0900} - -% Fonts for small examples (8pt). -\def\smallernominalsize{8pt} -\setfont\smallerrm\rmshape{8}{1000}{OT1} -\setfont\smallertt\ttshape{8}{1000}{OT1TT} -\setfont\smallerbf\bfshape{10}{800}{OT1} -\setfont\smallerit\itshape{8}{1000}{OT1IT} -\setfont\smallersl\slshape{8}{1000}{OT1} -\setfont\smallersf\sfshape{8}{1000}{OT1} -\setfont\smallersc\scshape{10}{800}{OT1} -\setfont\smallerttsl\ttslshape{10}{800}{OT1TT} -\font\smalleri=cmmi8 -\font\smallersy=cmsy8 -\def\smallerecsize{0800} - -% Fonts for title page (20.4pt): -\def\titlenominalsize{20pt} -\setfont\titlerm\rmbshape{12}{\magstep3}{OT1} -\setfont\titleit\itbshape{10}{\magstep4}{OT1IT} -\setfont\titlesl\slbshape{10}{\magstep4}{OT1} -\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT} -\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT} -\setfont\titlesf\sfbshape{17}{\magstep1}{OT1} -\let\titlebf=\titlerm -\setfont\titlesc\scbshape{10}{\magstep4}{OT1} -\font\titlei=cmmi12 scaled \magstep3 -\font\titlesy=cmsy10 scaled \magstep4 -\def\titleecsize{2074} - -% Chapter fonts (14.4pt). -\def\chapnominalsize{14pt} -\setfont\chaprm\rmbshape{12}{\magstep1}{OT1} -\setfont\chapit\itbshape{10}{\magstep2}{OT1IT} -\setfont\chapsl\slbshape{10}{\magstep2}{OT1} -\setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT} -\setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT} -\setfont\chapsf\sfbshape{12}{\magstep1}{OT1} -\let\chapbf\chaprm -\setfont\chapsc\scbshape{10}{\magstep2}{OT1} -\font\chapi=cmmi12 scaled \magstep1 -\font\chapsy=cmsy10 scaled \magstep2 -\def\chapecsize{1440} - -% Section fonts (12pt). -\def\secnominalsize{12pt} -\setfont\secrm\rmbshape{12}{1000}{OT1} -\setfont\secit\itbshape{10}{\magstep1}{OT1IT} -\setfont\secsl\slbshape{10}{\magstep1}{OT1} -\setfont\sectt\ttbshape{12}{1000}{OT1TT} -\setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT} -\setfont\secsf\sfbshape{12}{1000}{OT1} -\let\secbf\secrm -\setfont\secsc\scbshape{10}{\magstep1}{OT1} -\font\seci=cmmi12 -\font\secsy=cmsy10 scaled \magstep1 -\def\sececsize{1200} - -% Subsection fonts (10pt). -\def\ssecnominalsize{10pt} -\setfont\ssecrm\rmbshape{10}{1000}{OT1} -\setfont\ssecit\itbshape{10}{1000}{OT1IT} -\setfont\ssecsl\slbshape{10}{1000}{OT1} -\setfont\ssectt\ttbshape{10}{1000}{OT1TT} -\setfont\ssecttsl\ttslshape{10}{1000}{OT1TT} -\setfont\ssecsf\sfbshape{10}{1000}{OT1} -\let\ssecbf\ssecrm -\setfont\ssecsc\scbshape{10}{1000}{OT1} -\font\sseci=cmmi10 -\font\ssecsy=cmsy10 -\def\ssececsize{1000} - -% Reduced fonts for @acro in text (9pt). -\def\reducednominalsize{9pt} -\setfont\reducedrm\rmshape{9}{1000}{OT1} -\setfont\reducedtt\ttshape{9}{1000}{OT1TT} -\setfont\reducedbf\bfshape{10}{900}{OT1} -\setfont\reducedit\itshape{9}{1000}{OT1IT} -\setfont\reducedsl\slshape{9}{1000}{OT1} -\setfont\reducedsf\sfshape{9}{1000}{OT1} -\setfont\reducedsc\scshape{10}{900}{OT1} -\setfont\reducedttsl\ttslshape{10}{900}{OT1TT} -\font\reducedi=cmmi9 -\font\reducedsy=cmsy9 -\def\reducedecsize{0900} - -\divide\parskip by 2 % reduce space between paragraphs -\textleading = 12pt % line spacing for 10pt CM -\textfonts % reset the current fonts -\rm -} % end of 10pt text font size definitions - - -% We provide the user-level command -% @fonttextsize 10 -% (or 11) to redefine the text font size. pt is assumed. -% -\def\xiword{11} -\def\xword{10} -\def\xwordpt{10pt} -% -\parseargdef\fonttextsize{% - \def\textsizearg{#1}% - %\wlog{doing @fonttextsize \textsizearg}% - % - % Set \globaldefs so that documents can use this inside @tex, since - % makeinfo 4.8 does not support it, but we need it nonetheless. - % - \begingroup \globaldefs=1 - \ifx\textsizearg\xword \definetextfontsizex - \else \ifx\textsizearg\xiword \definetextfontsizexi - \else - \errhelp=\EMsimple - \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'} - \fi\fi - \endgroup -} - - -% In order for the font changes to affect most math symbols and letters, -% we have to define the \textfont of the standard families. Since -% texinfo doesn't allow for producing subscripts and superscripts except -% in the main text, we don't bother to reset \scriptfont and -% \scriptscriptfont (which would also require loading a lot more fonts). -% -\def\resetmathfonts{% - \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy - \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf - \textfont\ttfam=\tentt \textfont\sffam=\tensf -} - -% The font-changing commands redefine the meanings of \tenSTYLE, instead -% of just \STYLE. We do this because \STYLE needs to also set the -% current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire -% \tenSTYLE to set the current font. -% -% Each font-changing command also sets the names \lsize (one size lower) -% and \lllsize (three sizes lower). These relative commands are used in -% the LaTeX logo and acronyms. -% -% This all needs generalizing, badly. -% -\def\textfonts{% - \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl - \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc - \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy - \let\tenttsl=\textttsl - \def\curfontsize{text}% - \def\lsize{reduced}\def\lllsize{smaller}% - \resetmathfonts \setleading{\textleading}} -\def\titlefonts{% - \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl - \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc - \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy - \let\tenttsl=\titlettsl - \def\curfontsize{title}% - \def\lsize{chap}\def\lllsize{subsec}% - \resetmathfonts \setleading{27pt}} -\def\titlefont#1{{\titlefonts\rmisbold #1}} -\def\chapfonts{% - \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl - \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc - \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy - \let\tenttsl=\chapttsl - \def\curfontsize{chap}% - \def\lsize{sec}\def\lllsize{text}% - \resetmathfonts \setleading{19pt}} -\def\secfonts{% - \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl - \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc - \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy - \let\tenttsl=\secttsl - \def\curfontsize{sec}% - \def\lsize{subsec}\def\lllsize{reduced}% - \resetmathfonts \setleading{16pt}} -\def\subsecfonts{% - \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl - \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc - \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy - \let\tenttsl=\ssecttsl - \def\curfontsize{ssec}% - \def\lsize{text}\def\lllsize{small}% - \resetmathfonts \setleading{15pt}} -\let\subsubsecfonts = \subsecfonts -\def\reducedfonts{% - \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl - \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc - \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy - \let\tenttsl=\reducedttsl - \def\curfontsize{reduced}% - \def\lsize{small}\def\lllsize{smaller}% - \resetmathfonts \setleading{10.5pt}} -\def\smallfonts{% - \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl - \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc - \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy - \let\tenttsl=\smallttsl - \def\curfontsize{small}% - \def\lsize{smaller}\def\lllsize{smaller}% - \resetmathfonts \setleading{10.5pt}} -\def\smallerfonts{% - \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl - \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc - \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy - \let\tenttsl=\smallerttsl - \def\curfontsize{smaller}% - \def\lsize{smaller}\def\lllsize{smaller}% - \resetmathfonts \setleading{9.5pt}} - -% Fonts for short table of contents. -\setfont\shortcontrm\rmshape{12}{1000}{OT1} -\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 -\setfont\shortcontsl\slshape{12}{1000}{OT1} -\setfont\shortconttt\ttshape{12}{1000}{OT1TT} - -% Define these just so they can be easily changed for other fonts. -\def\angleleft{$\langle$} -\def\angleright{$\rangle$} - -% Set the fonts to use with the @small... environments. -\let\smallexamplefonts = \smallfonts - -% About \smallexamplefonts. If we use \smallfonts (9pt), @smallexample -% can fit this many characters: -% 8.5x11=86 smallbook=72 a4=90 a5=69 -% If we use \scriptfonts (8pt), then we can fit this many characters: -% 8.5x11=90+ smallbook=80 a4=90+ a5=77 -% For me, subjectively, the few extra characters that fit aren't worth -% the additional smallness of 8pt. So I'm making the default 9pt. -% -% By the way, for comparison, here's what fits with @example (10pt): -% 8.5x11=71 smallbook=60 a4=75 a5=58 -% --karl, 24jan03. - -% Set up the default fonts, so we can use them for creating boxes. -% -\definetextfontsizexi - - -\message{markup,} - -% Check if we are currently using a typewriter font. Since all the -% Computer Modern typewriter fonts have zero interword stretch (and -% shrink), and it is reasonable to expect all typewriter fonts to have -% this property, we can check that font parameter. -% -\def\ifmonospace{\ifdim\fontdimen3\font=0pt } - -% 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 - -\let\currentmarkupstyle\empty - -\def\setupmarkupstyle#1{% - \csname markup#1true\endcsname - \def\currentmarkupstyle{#1}% - \markupstylesetup -} - -\let\markupstylesetup\empty - -\def\defmarkupstylesetup#1{% - \expandafter\def\expandafter\markupstylesetup - \expandafter{\markupstylesetup #1}% - \def#1% -} - -% Markup style setup for left and right quotes. -\defmarkupstylesetup\markupsetuplq{% - \expandafter\let\expandafter \temp - \csname markupsetuplq\currentmarkupstyle\endcsname - \ifx\temp\relax \markupsetuplqdefault \else \temp \fi -} - -\defmarkupstylesetup\markupsetuprq{% - \expandafter\let\expandafter \temp - \csname markupsetuprq\currentmarkupstyle\endcsname - \ifx\temp\relax \markupsetuprqdefault \else \temp \fi -} - -{ -\catcode`\'=\active -\catcode`\`=\active - -\gdef\markupsetuplqdefault{\let`\lq} -\gdef\markupsetuprqdefault{\let'\rq} - -\gdef\markupsetcodequoteleft{\let`\codequoteleft} -\gdef\markupsetcodequoteright{\let'\codequoteright} - -\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft} -} - -\let\markupsetuplqcode \markupsetcodequoteleft -\let\markupsetuprqcode \markupsetcodequoteright -% -\let\markupsetuplqexample \markupsetcodequoteleft -\let\markupsetuprqexample \markupsetcodequoteright -% -\let\markupsetuplqsamp \markupsetcodequoteleft -\let\markupsetuprqsamp \markupsetcodequoteright -% -\let\markupsetuplqverb \markupsetcodequoteleft -\let\markupsetuprqverb \markupsetcodequoteright -% -\let\markupsetuplqverbatim \markupsetcodequoteleft -\let\markupsetuprqverbatim \markupsetcodequoteright - -\let\markupsetuplqkbd \markupsetnoligaturesquoteleft - -% Allow an option to not use regular directed right quote/apostrophe -% (char 0x27), but instead the undirected quote from cmtt (char 0x0d). -% The undirected quote is ugly, so don't make it the default, but it -% works for pasting with more pdf viewers (at least evince), the -% lilypond developers report. xpdf does work with the regular 0x27. -% -\def\codequoteright{% - \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax - \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax - '% - \else \char'15 \fi - \else \char'15 \fi -} -% -% and a similar option for the left quote char vs. a grave accent. -% Modern fonts display ASCII 0x60 as a grave accent, so some people like -% the code environments to do likewise. -% -\def\codequoteleft{% - \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax - \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax - % [Knuth] pp. 380,381,391 - % \relax disables Spanish ligatures ?` and !` of \tt font. - \relax`% - \else \char'22 \fi - \else \char'22 \fi -} - -% Commands to set the quote options. -% -\parseargdef\codequoteundirected{% - \def\temp{#1}% - \ifx\temp\onword - \expandafter\let\csname SETtxicodequoteundirected\endcsname - = t% - \else\ifx\temp\offword - \expandafter\let\csname SETtxicodequoteundirected\endcsname - = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}% - \fi\fi -} -% -\parseargdef\codequotebacktick{% - \def\temp{#1}% - \ifx\temp\onword - \expandafter\let\csname SETtxicodequotebacktick\endcsname - = t% - \else\ifx\temp\offword - \expandafter\let\csname SETtxicodequotebacktick\endcsname - = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @codequotebacktick value `\temp', must be on|off}% - \fi\fi -} - -% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font. -\def\noligaturesquoteleft{\relax\lq} - -% Count depth in font-changes, for error checks -\newcount\fontdepth \fontdepth=0 - -% Font commands. - -% #1 is the font command (\sl or \it), #2 is the text to slant. -% If we are in a monospaced environment, however, 1) always use \ttsl, -% and 2) do not add an italic correction. -\def\dosmartslant#1#2{% - \ifusingtt - {{\ttsl #2}\let\next=\relax}% - {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}% - \next -} -\def\smartslanted{\dosmartslant\sl} -\def\smartitalic{\dosmartslant\it} - -% Output an italic correction unless \next (presumed to be the following -% character) is such as not to need one. -\def\smartitaliccorrection{% - \ifx\next,% - \else\ifx\next-% - \else\ifx\next.% - \else\ptexslash - \fi\fi\fi - \aftersmartic -} - -% like \smartslanted except unconditionally uses \ttsl, and no ic. -% @var is set to this for defun arguments. -\def\ttslanted#1{{\ttsl #1}} - -% @cite is like \smartslanted except unconditionally use \sl. We never want -% ttsl for book titles, do we? -\def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection} - -\def\aftersmartic{} -\def\var#1{% - \let\saveaftersmartic = \aftersmartic - \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}% - \smartslanted{#1}% -} - -\let\i=\smartitalic -\let\slanted=\smartslanted -\let\dfn=\smartslanted -\let\emph=\smartitalic - -% Explicit font changes: @r, @sc, undocumented @ii. -\def\r#1{{\rm #1}} % roman font -\def\sc#1{{\smallcaps#1}} % smallcaps font -\def\ii#1{{\it #1}} % italic font - -% @b, explicit bold. Also @strong. -\def\b#1{{\bf #1}} -\let\strong=\b - -% @sansserif, explicit sans. -\def\sansserif#1{{\sf #1}} - -% We can't just use \exhyphenpenalty, because that only has effect at -% the end of a paragraph. Restore normal hyphenation at the end of the -% group within which \nohyphenation is presumably called. -% -\def\nohyphenation{\hyphenchar\font = -1 \aftergroup\restorehyphenation} -\def\restorehyphenation{\hyphenchar\font = `- } - -% Set sfcode to normal for the chars that usually have another value. -% Can't use plain's \frenchspacing because it uses the `\x notation, and -% sometimes \x has an active definition that messes things up. -% -\catcode`@=11 - \def\plainfrenchspacing{% - \sfcode\dotChar =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m - \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m - \def\endofsentencespacefactor{1000}% for @. and friends - } - \def\plainnonfrenchspacing{% - \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000 - \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250 - \def\endofsentencespacefactor{3000}% for @. and friends - } -\catcode`@=\other -\def\endofsentencespacefactor{3000}% default - -% @t, explicit typewriter. -\def\t#1{% - {\tt \rawbackslash \plainfrenchspacing #1}% - \null -} - -% @samp. -\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}} - -% definition of @key that produces a lozenge. Doesn't adjust to text size. -%\setfont\keyrm\rmshape{8}{1000}{OT1} -%\font\keysy=cmsy9 -%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% -% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% -% \vbox{\hrule\kern-0.4pt -% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% -% \kern-0.4pt\hrule}% -% \kern-.06em\raise0.4pt\hbox{\angleright}}}} - -% definition of @key with no lozenge. If the current font is already -% monospace, don't change it; that way, we respect @kbdinputstyle. But -% if it isn't monospace, then use \tt. -% -\def\key#1{{\setupmarkupstyle{key}% - \nohyphenation - \ifmonospace\else\tt\fi - #1}\null} - -% ctrl is no longer a Texinfo command. -\def\ctrl #1{{\tt \rawbackslash \hat}#1} - -% @file, @option are the same as @samp. -\let\file=\samp -\let\option=\samp - -% @code is a modification of @t, -% which makes spaces the same size as normal in the surrounding text. -\def\tclose#1{% - {% - % Change normal interword space to be same as for the current font. - \spaceskip = \fontdimen2\font - % - % Switch to typewriter. - \tt - % - % But `\ ' produces the large typewriter interword space. - \def\ {{\spaceskip = 0pt{} }}% - % - % Turn off hyphenation. - \nohyphenation - % - \rawbackslash - \plainfrenchspacing - #1% - }% - \null % reset spacefactor to 1000 -} - -% We *must* turn on hyphenation at `-' and `_' in @code. -% Otherwise, it is too hard to avoid overfull hboxes -% in the Emacs manual, the Library manual, etc. - -% Unfortunately, TeX uses one parameter (\hyphenchar) to control -% both hyphenation at - and hyphenation within words. -% We must therefore turn them both off (\tclose does that) -% and arrange explicitly to hyphenate at a dash. -% -- rms. -{ - \catcode`\-=\active \catcode`\_=\active - \catcode`\'=\active \catcode`\`=\active - \global\let'=\rq \global\let`=\lq % default definitions - % - \global\def\code{\begingroup - \setupmarkupstyle{code}% - % The following should really be moved into \setupmarkupstyle handlers. - \catcode\dashChar=\active \catcode\underChar=\active - \ifallowcodebreaks - \let-\codedash - \let_\codeunder - \else - \let-\realdash - \let_\realunder - \fi - \codex - } -} - -\def\codex #1{\tclose{#1}\endgroup} - -\def\realdash{-} -\def\codedash{-\discretionary{}{}{}} -\def\codeunder{% - % this is all so @math{@code{var_name}+1} can work. In math mode, _ - % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.) - % will therefore expand the active definition of _, which is us - % (inside @code that is), therefore an endless loop. - \ifusingtt{\ifmmode - \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_. - \else\normalunderscore \fi - \discretionary{}{}{}}% - {\_}% -} - -% An additional complication: the above will allow breaks after, e.g., -% each of the four underscores in __typeof__. This is undesirable in -% some manuals, especially if they don't have long identifiers in -% general. @allowcodebreaks provides a way to control this. -% -\newif\ifallowcodebreaks \allowcodebreakstrue - -\def\keywordtrue{true} -\def\keywordfalse{false} - -\parseargdef\allowcodebreaks{% - \def\txiarg{#1}% - \ifx\txiarg\keywordtrue - \allowcodebreakstrue - \else\ifx\txiarg\keywordfalse - \allowcodebreaksfalse - \else - \errhelp = \EMsimple - \errmessage{Unknown @allowcodebreaks option `\txiarg', must be true|false}% - \fi\fi -} - -% @uref (abbreviation for `urlref') takes an optional (comma-separated) -% second argument specifying the text to display and an optional third -% arg as text to display instead of (rather than in addition to) the url -% itself. First (mandatory) arg is the url. -% (This \urefnobreak definition isn't used now, leaving it for a while -% for comparison.) -\def\urefnobreak#1{\dourefnobreak #1,,,\finish} -\def\dourefnobreak#1,#2,#3,#4\finish{\begingroup - \unsepspaces - \pdfurl{#1}% - \setbox0 = \hbox{\ignorespaces #3}% - \ifdim\wd0 > 0pt - \unhbox0 % third arg given, show only that - \else - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0 > 0pt - \ifpdf - \unhbox0 % PDF: 2nd arg given, show only it - \else - \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url - \fi - \else - \code{#1}% only url given, so show it - \fi - \fi - \endlink -\endgroup} - -% This \urefbreak definition is the active one. -\def\urefbreak{\begingroup \urefcatcodes \dourefbreak} -\let\uref=\urefbreak -\def\dourefbreak#1{\urefbreakfinish #1,,,\finish} -\def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example - \unsepspaces - \pdfurl{#1}% - \setbox0 = \hbox{\ignorespaces #3}% - \ifdim\wd0 > 0pt - \unhbox0 % third arg given, show only that - \else - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0 > 0pt - \ifpdf - \unhbox0 % PDF: 2nd arg given, show only it - \else - \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url - \fi - \else - \urefcode{#1}% only url given, so show it - \fi - \fi - \endlink -\endgroup} - -% Allow line breaks around only a few characters (only). -\def\urefcatcodes{% - \catcode\ampChar=\active \catcode\dotChar=\active - \catcode\hashChar=\active \catcode\questChar=\active - \catcode\slashChar=\active -} -{ - \urefcatcodes - % - \global\def\urefcode{\begingroup - \setupmarkupstyle{code}% - \urefcatcodes - \let&\urefcodeamp - \let.\urefcodedot - \let#\urefcodehash - \let?\urefcodequest - \let/\urefcodeslash - \codex - } - % - % By default, they are just regular characters. - \global\def&{\normalamp} - \global\def.{\normaldot} - \global\def#{\normalhash} - \global\def?{\normalquest} - \global\def/{\normalslash} -} - -% we put a little stretch before and after the breakable chars, to help -% line breaking of long url's. The unequal skips make look better in -% cmtt at least, especially for dots. -\def\urefprestretch{\urefprebreak \hskip0pt plus.13em } -\def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em } -% -\def\urefcodeamp{\urefprestretch \&\urefpoststretch} -\def\urefcodedot{\urefprestretch .\urefpoststretch} -\def\urefcodehash{\urefprestretch \#\urefpoststretch} -\def\urefcodequest{\urefprestretch ?\urefpoststretch} -\def\urefcodeslash{\futurelet\next\urefcodeslashfinish} -{ - \catcode`\/=\active - \global\def\urefcodeslashfinish{% - \urefprestretch \slashChar - % Allow line break only after the final / in a sequence of - % slashes, to avoid line break between the slashes in http://. - \ifx\next/\else \urefpoststretch \fi - } -} - -% One more complication: by default we'll break after the special -% characters, but some people like to break before the special chars, so -% allow that. Also allow no breaking at all, for manual control. -% -\parseargdef\urefbreakstyle{% - \def\txiarg{#1}% - \ifx\txiarg\wordnone - \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak} - \else\ifx\txiarg\wordbefore - \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak} - \else\ifx\txiarg\wordafter - \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak} - \else - \errhelp = \EMsimple - \errmessage{Unknown @urefbreakstyle setting `\txiarg'}% - \fi\fi\fi -} -\def\wordafter{after} -\def\wordbefore{before} -\def\wordnone{none} - -\urefbreakstyle after - -% @url synonym for @uref, since that's how everyone uses it. -% -\let\url=\uref - -% rms does not like angle brackets --karl, 17may97. -% So now @email is just like @uref, unless we are pdf. -% -%\def\email#1{\angleleft{\tt #1}\angleright} -\ifpdf - \def\email#1{\doemail#1,,\finish} - \def\doemail#1,#2,#3\finish{\begingroup - \unsepspaces - \pdfurl{mailto:#1}% - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi - \endlink - \endgroup} -\else - \let\email=\uref -\fi - -% @kbd is like @code, except that if the argument is just one @key command, -% then @kbd has no effect. -\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}} - -% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), -% `example' (@kbd uses ttsl only inside of @example and friends), -% or `code' (@kbd uses normal tty font always). -\parseargdef\kbdinputstyle{% - \def\txiarg{#1}% - \ifx\txiarg\worddistinct - \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}% - \else\ifx\txiarg\wordexample - \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}% - \else\ifx\txiarg\wordcode - \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}% - \else - \errhelp = \EMsimple - \errmessage{Unknown @kbdinputstyle setting `\txiarg'}% - \fi\fi\fi -} -\def\worddistinct{distinct} -\def\wordexample{example} -\def\wordcode{code} - -% Default is `distinct'. -\kbdinputstyle distinct - -\def\xkey{\key} -\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}% -\ifx\one\xkey\ifx\threex\three \key{#2}% -\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi -\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi} - -% For @indicateurl, @env, @command quotes seem unnecessary, so use \code. -\let\indicateurl=\code -\let\env=\code -\let\command=\code - -% @clicksequence{File @click{} Open ...} -\def\clicksequence#1{\begingroup #1\endgroup} - -% @clickstyle @arrow (by default) -\parseargdef\clickstyle{\def\click{#1}} -\def\click{\arrow} - -% Typeset a dimension, e.g., `in' or `pt'. The only reason for the -% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt. -% -\def\dmn#1{\thinspace #1} - -% @l was never documented to mean ``switch to the Lisp font'', -% and it is not used as such in any manual I can find. We need it for -% Polish suppressed-l. --karl, 22sep96. -%\def\l#1{{\li #1}\null} - -% @acronym for "FBI", "NATO", and the like. -% We print this one point size smaller, since it's intended for -% all-uppercase. -% -\def\acronym#1{\doacronym #1,,\finish} -\def\doacronym#1,#2,#3\finish{% - {\selectfonts\lsize #1}% - \def\temp{#2}% - \ifx\temp\empty \else - \space ({\unsepspaces \ignorespaces \temp \unskip})% - \fi - \null % reset \spacefactor=1000 -} - -% @abbr for "Comput. J." and the like. -% No font change, but don't do end-of-sentence spacing. -% -\def\abbr#1{\doabbr #1,,\finish} -\def\doabbr#1,#2,#3\finish{% - {\plainfrenchspacing #1}% - \def\temp{#2}% - \ifx\temp\empty \else - \space ({\unsepspaces \ignorespaces \temp \unskip})% - \fi - \null % reset \spacefactor=1000 -} - -% @asis just yields its argument. Used with @table, for example. -% -\def\asis#1{#1} - -% @math outputs its argument in math mode. -% -% One complication: _ usually means subscripts, but it could also mean -% an actual _ character, as in @math{@var{some_variable} + 1}. So make -% _ active, and distinguish by seeing if the current family is \slfam, -% which is what @var uses. -{ - \catcode`\_ = \active - \gdef\mathunderscore{% - \catcode`\_=\active - \def_{\ifnum\fam=\slfam \_\else\sb\fi}% - } -} -% Another complication: we want \\ (and @\) to output a math (or tt) \. -% FYI, plain.tex uses \\ as a temporary control sequence (for no -% particular reason), but this is not advertised and we don't care. -% -% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\. -\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi} -% -\def\math{% - \tex - \mathunderscore - \let\\ = \mathbackslash - \mathactive - % make the texinfo accent commands work in math mode - \let\"=\ddot - \let\'=\acute - \let\==\bar - \let\^=\hat - \let\`=\grave - \let\u=\breve - \let\v=\check - \let\~=\tilde - \let\dotaccent=\dot - $\finishmath -} -\def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. - -% Some active characters (such as <) are spaced differently in math. -% We have to reset their definitions in case the @math was an argument -% to a command which sets the catcodes (such as @item or @section). -% -{ - \catcode`^ = \active - \catcode`< = \active - \catcode`> = \active - \catcode`+ = \active - \catcode`' = \active - \gdef\mathactive{% - \let^ = \ptexhat - \let< = \ptexless - \let> = \ptexgtr - \let+ = \ptexplus - \let' = \ptexquoteright - } -} - -% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}. -% Ignore unless FMTNAME == tex; then it is like @iftex and @tex, -% except specified as a normal braced arg, so no newlines to worry about. -% -\def\outfmtnametex{tex} -% -\long\def\inlinefmt#1{\doinlinefmt #1,\finish} -\long\def\doinlinefmt#1,#2,\finish{% - \def\inlinefmtname{#1}% - \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi -} -% For raw, must switch into @tex before parsing the argument, to avoid -% setting catcodes prematurely. Doing it this way means that, for -% example, @inlineraw{html, foo{bar} gets a parse error instead of being -% ignored. But this isn't important because if people want a literal -% *right* brace they would have to use a command anyway, so they may as -% well use a command to get a left brace too. We could re-use the -% delimiter character idea from \verb, but it seems like overkill. -% -\long\def\inlineraw{\tex \doinlineraw} -\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish} -\def\doinlinerawtwo#1,#2,\finish{% - \def\inlinerawname{#1}% - \ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi - \endgroup % close group opened by \tex. -} - - -\message{glyphs,} -% and logos. - -% @@ prints an @, as does @atchar{}. -\def\@{\char64 } -\let\atchar=\@ - -% @{ @} @lbracechar{} @rbracechar{} all generate brace characters. -% Unless we're in typewriter, use \ecfont because the CM text fonts do -% not have braces, and we don't want to switch into math. -\def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}} -\def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}} -\let\{=\mylbrace \let\lbracechar=\{ -\let\}=\myrbrace \let\rbracechar=\} -\begingroup - % Definitions to produce \{ and \} commands for indices, - % and @{ and @} for the aux/toc files. - \catcode`\{ = \other \catcode`\} = \other - \catcode`\[ = 1 \catcode`\] = 2 - \catcode`\! = 0 \catcode`\\ = \other - !gdef!lbracecmd[\{]% - !gdef!rbracecmd[\}]% - !gdef!lbraceatcmd[@{]% - !gdef!rbraceatcmd[@}]% -!endgroup - -% @comma{} to avoid , parsing problems. -\let\comma = , - -% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent -% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H. -\let\, = \ptexc -\let\dotaccent = \ptexdot -\def\ringaccent#1{{\accent23 #1}} -\let\tieaccent = \ptext -\let\ubaraccent = \ptexb -\let\udotaccent = \d - -% Other special characters: @questiondown @exclamdown @ordf @ordm -% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss. -\def\questiondown{?`} -\def\exclamdown{!`} -\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}} -\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}} - -% Dotless i and dotless j, used for accents. -\def\imacro{i} -\def\jmacro{j} -\def\dotless#1{% - \def\temp{#1}% - \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi - \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi - \else \errmessage{@dotless can be used only with i or j}% - \fi\fi -} - -% The \TeX{} logo, as in plain, but resetting the spacing so that a -% period following counts as ending a sentence. (Idea found in latex.) -% -\edef\TeX{\TeX \spacefactor=1000 } - -% @LaTeX{} logo. Not quite the same results as the definition in -% latex.ltx, since we use a different font for the raised A; it's most -% convenient for us to use an explicitly smaller font, rather than using -% the \scriptstyle font (since we don't reset \scriptstyle and -% \scriptscriptstyle). -% -\def\LaTeX{% - L\kern-.36em - {\setbox0=\hbox{T}% - \vbox to \ht0{\hbox{% - \ifx\textnominalsize\xwordpt - % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX. - % Revert to plain's \scriptsize, which is 7pt. - \count255=\the\fam $\fam\count255 \scriptstyle A$% - \else - % For 11pt, we can use our lllsize. - \selectfonts\lllsize A% - \fi - }% - \vss - }}% - \kern-.15em - \TeX -} - -% Some math mode symbols. -\def\bullet{$\ptexbullet$} -\def\geq{\ifmmode \ge\else $\ge$\fi} -\def\leq{\ifmmode \le\else $\le$\fi} -\def\minus{\ifmmode -\else $-$\fi} - -% @dots{} outputs an ellipsis using the current font. -% We do .5em per period so that it has the same spacing in the cm -% typewriter fonts as three actual period characters; on the other hand, -% in other typewriter fonts three periods are wider than 1.5em. So do -% whichever is larger. -% -\def\dots{% - \leavevmode - \setbox0=\hbox{...}% get width of three periods - \ifdim\wd0 > 1.5em - \dimen0 = \wd0 - \else - \dimen0 = 1.5em - \fi - \hbox to \dimen0{% - \hskip 0pt plus.25fil - .\hskip 0pt plus1fil - .\hskip 0pt plus1fil - .\hskip 0pt plus.5fil - }% -} - -% @enddots{} is an end-of-sentence ellipsis. -% -\def\enddots{% - \dots - \spacefactor=\endofsentencespacefactor -} - -% @point{}, @result{}, @expansion{}, @print{}, @equiv{}. -% -% Since these characters are used in examples, they should be an even number of -% \tt widths. Each \tt character is 1en, so two makes it 1em. -% -\def\point{$\star$} -\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}} -\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} -\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}} -\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} -\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}} - -% The @error{} command. -% Adapted from the TeXbook's \boxit. -% -\newbox\errorbox -% -{\tentt \global\dimen0 = 3em}% Width of the box. -\dimen2 = .55pt % Thickness of rules -% The text. (`r' is open on the right, `e' somewhat less so on the left.) -\setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt} -% -\setbox\errorbox=\hbox to \dimen0{\hfil - \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. - \advance\hsize by -2\dimen2 % Rules. - \vbox{% - \hrule height\dimen2 - \hbox{\vrule width\dimen2 \kern3pt % Space to left of text. - \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below. - \kern3pt\vrule width\dimen2}% Space to right. - \hrule height\dimen2} - \hfil} -% -\def\error{\leavevmode\lower.7ex\copy\errorbox} - -% @pounds{} is a sterling sign, which Knuth put in the CM italic font. -% -\def\pounds{{\it\$}} - -% @euro{} comes from a separate font, depending on the current style. -% We use the free feym* fonts from the eurosym package by Henrik -% Theiling, which support regular, slanted, bold and bold slanted (and -% "outlined" (blackboard board, sort of) versions, which we don't need). -% It is available from http://www.ctan.org/tex-archive/fonts/eurosym. -% -% Although only regular is the truly official Euro symbol, we ignore -% that. The Euro is designed to be slightly taller than the regular -% font height. -% -% feymr - regular -% feymo - slanted -% feybr - bold -% feybo - bold slanted -% -% There is no good (free) typewriter version, to my knowledge. -% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide. -% Hmm. -% -% Also doesn't work in math. Do we need to do math with euro symbols? -% Hope not. -% -% -\def\euro{{\eurofont e}} -\def\eurofont{% - % We set the font at each command, rather than predefining it in - % \textfonts and the other font-switching commands, so that - % installations which never need the symbol don't have to have the - % font installed. - % - % There is only one designed size (nominal 10pt), so we always scale - % that to the current nominal size. - % - % By the way, simply using "at 1em" works for cmr10 and the like, but - % does not work for cmbx10 and other extended/shrunken fonts. - % - \def\eurosize{\csname\curfontsize nominalsize\endcsname}% - % - \ifx\curfontstyle\bfstylename - % bold: - \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize - \else - % regular: - \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize - \fi - \thiseurofont -} - -% Glyphs from the EC fonts. We don't use \let for the aliases, because -% sometimes we redefine the original macro, and the alias should reflect -% the redefinition. -% -% Use LaTeX names for the Icelandic letters. -\def\DH{{\ecfont \char"D0}} % Eth -\def\dh{{\ecfont \char"F0}} % eth -\def\TH{{\ecfont \char"DE}} % Thorn -\def\th{{\ecfont \char"FE}} % thorn -% -\def\guillemetleft{{\ecfont \char"13}} -\def\guillemotleft{\guillemetleft} -\def\guillemetright{{\ecfont \char"14}} -\def\guillemotright{\guillemetright} -\def\guilsinglleft{{\ecfont \char"0E}} -\def\guilsinglright{{\ecfont \char"0F}} -\def\quotedblbase{{\ecfont \char"12}} -\def\quotesinglbase{{\ecfont \char"0D}} -% -% This positioning is not perfect (see the ogonek LaTeX package), but -% we have the precomposed glyphs for the most common cases. We put the -% tests to use those glyphs in the single \ogonek macro so we have fewer -% dummy definitions to worry about for index entries, etc. -% -% ogonek is also used with other letters in Lithuanian (IOU), but using -% the precomposed glyphs for those is not so easy since they aren't in -% the same EC font. -\def\ogonek#1{{% - \def\temp{#1}% - \ifx\temp\macrocharA\Aogonek - \else\ifx\temp\macrochara\aogonek - \else\ifx\temp\macrocharE\Eogonek - \else\ifx\temp\macrochare\eogonek - \else - \ecfont \setbox0=\hbox{#1}% - \ifdim\ht0=1ex\accent"0C #1% - \else\ooalign{\unhbox0\crcr\hidewidth\char"0C \hidewidth}% - \fi - \fi\fi\fi\fi - }% -} -\def\Aogonek{{\ecfont \char"81}}\def\macrocharA{A} -\def\aogonek{{\ecfont \char"A1}}\def\macrochara{a} -\def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E} -\def\eogonek{{\ecfont \char"A6}}\def\macrochare{e} -% -% Use the ec* fonts (cm-super in outline format) for non-CM glyphs. -\def\ecfont{% - % We can't distinguish serif/sans and italic/slanted, but this - % is used for crude hacks anyway (like adding French and German - % quotes to documents typeset with CM, where we lose kerning), so - % hopefully nobody will notice/care. - \edef\ecsize{\csname\curfontsize ecsize\endcsname}% - \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% - \ifx\curfontstyle\bfstylename - % bold: - \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize - \else - % regular: - \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize - \fi - \thisecfont -} - -% @registeredsymbol - R in a circle. The font for the R should really -% be smaller yet, but lllsize is the best we can do for now. -% Adapted from the plain.tex definition of \copyright. -% -\def\registeredsymbol{% - $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}% - \hfil\crcr\Orb}}% - }$% -} - -% @textdegree - the normal degrees sign. -% -\def\textdegree{$^\circ$} - -% Laurent Siebenmann reports \Orb undefined with: -% Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 -% so we'll define it if necessary. -% -\ifx\Orb\thisisundefined -\def\Orb{\mathhexbox20D} -\fi - -% Quotes. -\chardef\quotedblleft="5C -\chardef\quotedblright=`\" -\chardef\quoteleft=`\` -\chardef\quoteright=`\' - - -\message{page headings,} - -\newskip\titlepagetopglue \titlepagetopglue = 1.5in -\newskip\titlepagebottomglue \titlepagebottomglue = 2pc - -% First the title page. Must do @settitle before @titlepage. -\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 - -\parseargdef\shorttitlepage{% - \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% - \endgroup\page\hbox{}\page} - -\envdef\titlepage{% - % Open one extra group, as we want to close it in the middle of \Etitlepage. - \begingroup - \parindent=0pt \textfonts - % Leave some space at the very top of the page. - \vglue\titlepagetopglue - % No rule at page bottom unless we print one at the top with @title. - \finishedtitlepagetrue - % - % Most title ``pages'' are actually two pages long, with space - % at the top of the second. We don't want the ragged left on the second. - \let\oldpage = \page - \def\page{% - \iffinishedtitlepage\else - \finishtitlepage - \fi - \let\page = \oldpage - \page - \null - }% -} - -\def\Etitlepage{% - \iffinishedtitlepage\else - \finishtitlepage - \fi - % It is important to do the page break before ending the group, - % because the headline and footline are only empty inside the group. - % If we use the new definition of \page, we always get a blank page - % after the title page, which we certainly don't want. - \oldpage - \endgroup - % - % 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{% - \vskip4pt \hrule height 2pt width \hsize - \vskip\titlepagebottomglue - \finishedtitlepagetrue -} - -% Macros to be used within @titlepage: - -\let\subtitlerm=\tenrm -\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines} - -\parseargdef\title{% - \checkenv\titlepage - \leftline{\titlefonts\rmisbold #1} - % print a rule at the page bottom also. - \finishedtitlepagefalse - \vskip4pt \hrule height 4pt width \hsize \vskip4pt -} - -\parseargdef\subtitle{% - \checkenv\titlepage - {\subtitlefont \rightline{#1}}% -} - -% @author should come last, but may come many times. -% It can also be used inside @quotation. -% -\parseargdef\author{% - \def\temp{\quotation}% - \ifx\thisenv\temp - \def\quotationauthor{#1}% printed in \Equotation. - \else - \checkenv\titlepage - \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi - {\secfonts\rmisbold \leftline{#1}}% - \fi -} - - -% Set up page headings and footings. - -\let\thispage=\folio - -\newtoks\evenheadline % headline on even pages -\newtoks\oddheadline % headline on odd pages -\newtoks\evenfootline % footline on even pages -\newtoks\oddfootline % footline on odd pages - -% Now make TeX use those variables -\headline={{\textfonts\rm \ifodd\pageno \the\oddheadline - \else \the\evenheadline \fi}} -\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline - \else \the\evenfootline \fi}\HEADINGShook} -\let\HEADINGShook=\relax - -% Commands to set those variables. -% For example, this is what @headings on does -% @evenheading @thistitle|@thispage|@thischapter -% @oddheading @thischapter|@thispage|@thistitle -% @evenfooting @thisfile|| -% @oddfooting ||@thisfile - - -\def\evenheading{\parsearg\evenheadingxxx} -\def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish} -\def\evenheadingyyy #1\|#2\|#3\|#4\finish{% -\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} - -\def\oddheading{\parsearg\oddheadingxxx} -\def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish} -\def\oddheadingyyy #1\|#2\|#3\|#4\finish{% -\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} - -\parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}% - -\def\evenfooting{\parsearg\evenfootingxxx} -\def\evenfootingxxx #1{\evenfootingyyy #1\|\|\|\|\finish} -\def\evenfootingyyy #1\|#2\|#3\|#4\finish{% -\global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} - -\def\oddfooting{\parsearg\oddfootingxxx} -\def\oddfootingxxx #1{\oddfootingyyy #1\|\|\|\|\finish} -\def\oddfootingyyy #1\|#2\|#3\|#4\finish{% - \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}% - % - % Leave some space for the footline. Hopefully ok to assume - % @evenfooting will not be used by itself. - \global\advance\pageheight by -12pt - \global\advance\vsize by -12pt -} - -\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}} - -% @evenheadingmarks top \thischapter <- chapter at the top of a page -% @evenheadingmarks bottom \thischapter <- chapter at the bottom of a page -% -% The same set of arguments for: -% -% @oddheadingmarks -% @evenfootingmarks -% @oddfootingmarks -% @everyheadingmarks -% @everyfootingmarks - -\def\evenheadingmarks{\headingmarks{even}{heading}} -\def\oddheadingmarks{\headingmarks{odd}{heading}} -\def\evenfootingmarks{\headingmarks{even}{footing}} -\def\oddfootingmarks{\headingmarks{odd}{footing}} -\def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1} - \headingmarks{odd}{heading}{#1} } -\def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1} - \headingmarks{odd}{footing}{#1} } -% #1 = even/odd, #2 = heading/footing, #3 = top/bottom. -\def\headingmarks#1#2#3 {% - \expandafter\let\expandafter\temp \csname get#3headingmarks\endcsname - \global\expandafter\let\csname get#1#2marks\endcsname \temp -} - -\everyheadingmarks bottom -\everyfootingmarks bottom - -% @headings double turns headings on for double-sided printing. -% @headings single turns headings on for single-sided printing. -% @headings off turns them off. -% @headings on same as @headings double, retained for compatibility. -% @headings after turns on double-sided headings after this page. -% @headings doubleafter turns on double-sided headings after this page. -% @headings singleafter turns on single-sided headings after this page. -% By default, they are off at the start of a document, -% and turned `on' after @end titlepage. - -\def\headings #1 {\csname HEADINGS#1\endcsname} - -\def\headingsoff{% non-global headings elimination - \evenheadline={\hfil}\evenfootline={\hfil}% - \oddheadline={\hfil}\oddfootline={\hfil}% -} - -\def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting -\HEADINGSoff % it's the default - -% When we turn headings on, set the page number to 1. -% For double-sided printing, put current file name in lower left corner, -% chapter name on inside top of right hand pages, document -% title on inside top of left hand pages, and page numbers on outside top -% edge of all pages. -\def\HEADINGSdouble{% -\global\pageno=1 -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\folio\hfil\thistitle}} -\global\oddheadline={\line{\thischapter\hfil\folio}} -\global\let\contentsalignmacro = \chapoddpage -} -\let\contentsalignmacro = \chappager - -% For single-sided printing, chapter title goes across top left of page, -% page number on top right. -\def\HEADINGSsingle{% -\global\pageno=1 -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\thischapter\hfil\folio}} -\global\oddheadline={\line{\thischapter\hfil\folio}} -\global\let\contentsalignmacro = \chappager -} -\def\HEADINGSon{\HEADINGSdouble} - -\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex} -\let\HEADINGSdoubleafter=\HEADINGSafter -\def\HEADINGSdoublex{% -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\folio\hfil\thistitle}} -\global\oddheadline={\line{\thischapter\hfil\folio}} -\global\let\contentsalignmacro = \chapoddpage -} - -\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex} -\def\HEADINGSsinglex{% -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\thischapter\hfil\folio}} -\global\oddheadline={\line{\thischapter\hfil\folio}} -\global\let\contentsalignmacro = \chappager -} - -% Subroutines used in generating headings -% This produces Day Month Year style of output. -% Only define if not already defined, in case a txi-??.tex file has set -% up a different format (e.g., txi-cs.tex does this). -\ifx\today\thisisundefined -\def\today{% - \number\day\space - \ifcase\month - \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr - \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug - \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec - \fi - \space\number\year} -\fi - -% @settitle line... specifies the title of the document, for headings. -% It generates no output of its own. -\def\thistitle{\putwordNoTitle} -\def\settitle{\parsearg{\gdef\thistitle}} - - -\message{tables,} -% Tables -- @table, @ftable, @vtable, @item(x). - -% default indentation of table text -\newdimen\tableindent \tableindent=.8in -% default indentation of @itemize and @enumerate text -\newdimen\itemindent \itemindent=.3in -% margin between end of table item and start of table text. -\newdimen\itemmargin \itemmargin=.1in - -% used internally for \itemindent minus \itemmargin -\newdimen\itemmax - -% Note @table, @ftable, and @vtable define @item, @itemx, etc., with -% these defs. -% They also define \itemindex -% to index the item name in whatever manner is desired (perhaps none). - -\newif\ifitemxneedsnegativevskip - -\def\itemxpar{\par\ifitemxneedsnegativevskip\nobreak\vskip-\parskip\nobreak\fi} - -\def\internalBitem{\smallbreak \parsearg\itemzzz} -\def\internalBitemx{\itemxpar \parsearg\itemzzz} - -\def\itemzzz #1{\begingroup % - \advance\hsize by -\rightskip - \advance\hsize by -\tableindent - \setbox0=\hbox{\itemindicate{#1}}% - \itemindex{#1}% - \nobreak % This prevents a break before @itemx. - % - % If the item text does not fit in the space we have, put it on a line - % by itself, and do not allow a page break either before or after that - % line. We do not start a paragraph here because then if the next - % command is, e.g., @kindex, the whatsit would get put into the - % horizontal list on a line by itself, resulting in extra blank space. - \ifdim \wd0>\itemmax - % - % Make this a paragraph so we get the \parskip glue and wrapping, - % but leave it ragged-right. - \begingroup - \advance\leftskip by-\tableindent - \advance\hsize by\tableindent - \advance\rightskip by0pt plus1fil\relax - \leavevmode\unhbox0\par - \endgroup - % - % We're going to be starting a paragraph, but we don't want the - % \parskip glue -- logically it's part of the @item we just started. - \nobreak \vskip-\parskip - % - % Stop a page break at the \parskip glue coming up. However, if - % what follows is an environment such as @example, there will be no - % \parskip glue; then the negative vskip we just inserted would - % cause the example and the item to crash together. So we use this - % bizarre value of 10001 as a signal to \aboveenvbreak to insert - % \parskip glue after all. Section titles are handled this way also. - % - \penalty 10001 - \endgroup - \itemxneedsnegativevskipfalse - \else - % The item text fits into the space. Start a paragraph, so that the - % following text (if any) will end up on the same line. - \noindent - % Do this with kerns and \unhbox so that if there is a footnote in - % the item text, it can migrate to the main vertical list and - % eventually be printed. - \nobreak\kern-\tableindent - \dimen0 = \itemmax \advance\dimen0 by \itemmargin \advance\dimen0 by -\wd0 - \unhbox0 - \nobreak\kern\dimen0 - \endgroup - \itemxneedsnegativevskiptrue - \fi -} - -\def\item{\errmessage{@item while not in a list environment}} -\def\itemx{\errmessage{@itemx while not in a list environment}} - -% @table, @ftable, @vtable. -\envdef\table{% - \let\itemindex\gobble - \tablecheck{table}% -} -\envdef\ftable{% - \def\itemindex ##1{\doind {fn}{\code{##1}}}% - \tablecheck{ftable}% -} -\envdef\vtable{% - \def\itemindex ##1{\doind {vr}{\code{##1}}}% - \tablecheck{vtable}% -} -\def\tablecheck#1{% - \ifnum \the\catcode`\^^M=\active - \endgroup - \errmessage{This command won't work in this context; perhaps the problem is - that we are \inenvironment\thisenv}% - \def\next{\doignore{#1}}% - \else - \let\next\tablex - \fi - \next -} -\def\tablex#1{% - \def\itemindicate{#1}% - \parsearg\tabley -} -\def\tabley#1{% - {% - \makevalueexpandable - \edef\temp{\noexpand\tablez #1\space\space\space}% - \expandafter - }\temp \endtablez -} -\def\tablez #1 #2 #3 #4\endtablez{% - \aboveenvbreak - \ifnum 0#1>0 \advance \leftskip by #1\mil \fi - \ifnum 0#2>0 \tableindent=#2\mil \fi - \ifnum 0#3>0 \advance \rightskip by #3\mil \fi - \itemmax=\tableindent - \advance \itemmax by -\itemmargin - \advance \leftskip by \tableindent - \exdentamount=\tableindent - \parindent = 0pt - \parskip = \smallskipamount - \ifdim \parskip=0pt \parskip=2pt \fi - \let\item = \internalBitem - \let\itemx = \internalBitemx -} -\def\Etable{\endgraf\afterenvbreak} -\let\Eftable\Etable -\let\Evtable\Etable -\let\Eitemize\Etable -\let\Eenumerate\Etable - -% This is the counter used by @enumerate, which is really @itemize - -\newcount \itemno - -\envdef\itemize{\parsearg\doitemize} - -\def\doitemize#1{% - \aboveenvbreak - \itemmax=\itemindent - \advance\itemmax by -\itemmargin - \advance\leftskip by \itemindent - \exdentamount=\itemindent - \parindent=0pt - \parskip=\smallskipamount - \ifdim\parskip=0pt \parskip=2pt \fi - % - % Try typesetting the item mark that if the document erroneously says - % something like @itemize @samp (intending @table), there's an error - % right away at the @itemize. It's not the best error message in the - % world, but it's better than leaving it to the @item. This means if - % the user wants an empty mark, they have to say @w{} not just @w. - \def\itemcontents{#1}% - \setbox0 = \hbox{\itemcontents}% - % - % @itemize with no arg is equivalent to @itemize @bullet. - \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi - % - \let\item=\itemizeitem -} - -% Definition of @item while inside @itemize and @enumerate. -% -\def\itemizeitem{% - \advance\itemno by 1 % for enumerations - {\let\par=\endgraf \smallbreak}% reasonable place to break - {% - % If the document has an @itemize directly after a section title, a - % \nobreak will be last on the list, and \sectionheading will have - % done a \vskip-\parskip. In that case, we don't want to zero - % parskip, or the item text will crash with the heading. On the - % other hand, when there is normal text preceding the item (as there - % usually is), we do want to zero parskip, or there would be too much - % space. In that case, we won't have a \nobreak before. At least - % that's the theory. - \ifnum\lastpenalty<10000 \parskip=0in \fi - \noindent - \hbox to 0pt{\hss \itemcontents \kern\itemmargin}% - % - \vadjust{\penalty 1200}}% not good to break after first line of item. - \flushcr -} - -% \splitoff TOKENS\endmark defines \first to be the first token in -% TOKENS, and \rest to be the remainder. -% -\def\splitoff#1#2\endmark{\def\first{#1}\def\rest{#2}}% - -% Allow an optional argument of an uppercase letter, lowercase letter, -% or number, to specify the first label in the enumerated list. No -% argument is the same as `1'. -% -\envparseargdef\enumerate{\enumeratey #1 \endenumeratey} -\def\enumeratey #1 #2\endenumeratey{% - % If we were given no argument, pretend we were given `1'. - \def\thearg{#1}% - \ifx\thearg\empty \def\thearg{1}\fi - % - % Detect if the argument is a single token. If so, it might be a - % letter. Otherwise, the only valid thing it can be is a number. - % (We will always have one token, because of the test we just made. - % This is a good thing, since \splitoff doesn't work given nothing at - % all -- the first parameter is undelimited.) - \expandafter\splitoff\thearg\endmark - \ifx\rest\empty - % Only one token in the argument. It could still be anything. - % A ``lowercase letter'' is one whose \lccode is nonzero. - % An ``uppercase letter'' is one whose \lccode is both nonzero, and - % not equal to itself. - % Otherwise, we assume it's a number. - % - % We need the \relax at the end of the \ifnum lines to stop TeX from - % continuing to look for a . - % - \ifnum\lccode\expandafter`\thearg=0\relax - \numericenumerate % a number (we hope) - \else - % It's a letter. - \ifnum\lccode\expandafter`\thearg=\expandafter`\thearg\relax - \lowercaseenumerate % lowercase letter - \else - \uppercaseenumerate % uppercase letter - \fi - \fi - \else - % Multiple tokens in the argument. We hope it's a number. - \numericenumerate - \fi -} - -% An @enumerate whose labels are integers. The starting integer is -% given in \thearg. -% -\def\numericenumerate{% - \itemno = \thearg - \startenumeration{\the\itemno}% -} - -% The starting (lowercase) letter is in \thearg. -\def\lowercaseenumerate{% - \itemno = \expandafter`\thearg - \startenumeration{% - % Be sure we're not beyond the end of the alphabet. - \ifnum\itemno=0 - \errmessage{No more lowercase letters in @enumerate; get a bigger - alphabet}% - \fi - \char\lccode\itemno - }% -} - -% The starting (uppercase) letter is in \thearg. -\def\uppercaseenumerate{% - \itemno = \expandafter`\thearg - \startenumeration{% - % Be sure we're not beyond the end of the alphabet. - \ifnum\itemno=0 - \errmessage{No more uppercase letters in @enumerate; get a bigger - alphabet} - \fi - \char\uccode\itemno - }% -} - -% Call \doitemize, adding a period to the first argument and supplying the -% common last two arguments. Also subtract one from the initial value in -% \itemno, since @item increments \itemno. -% -\def\startenumeration#1{% - \advance\itemno by -1 - \doitemize{#1.}\flushcr -} - -% @alphaenumerate and @capsenumerate are abbreviations for giving an arg -% to @enumerate. -% -\def\alphaenumerate{\enumerate{a}} -\def\capsenumerate{\enumerate{A}} -\def\Ealphaenumerate{\Eenumerate} -\def\Ecapsenumerate{\Eenumerate} - - -% @multitable macros -% Amy Hendrickson, 8/18/94, 3/6/96 -% -% @multitable ... @end multitable will make as many columns as desired. -% Contents of each column will wrap at width given in preamble. Width -% can be specified either with sample text given in a template line, -% or in percent of \hsize, the current width of text on page. - -% Table can continue over pages but will only break between lines. - -% To make preamble: -% -% Either define widths of columns in terms of percent of \hsize: -% @multitable @columnfractions .25 .3 .45 -% @item ... -% -% Numbers following @columnfractions are the percent of the total -% current hsize to be used for each column. You may use as many -% columns as desired. - - -% Or use a template: -% @multitable {Column 1 template} {Column 2 template} {Column 3 template} -% @item ... -% using the widest term desired in each column. - -% Each new table line starts with @item, each subsequent new column -% starts with @tab. Empty columns may be produced by supplying @tab's -% with nothing between them for as many times as empty columns are needed, -% ie, @tab@tab@tab will produce two empty columns. - -% @item, @tab do not need to be on their own lines, but it will not hurt -% if they are. - -% Sample multitable: - -% @multitable {Column 1 template} {Column 2 template} {Column 3 template} -% @item first col stuff @tab second col stuff @tab third col -% @item -% first col stuff -% @tab -% second col stuff -% @tab -% third col -% @item first col stuff @tab second col stuff -% @tab Many paragraphs of text may be used in any column. -% -% They will wrap at the width determined by the template. -% @item@tab@tab This will be in third column. -% @end multitable - -% Default dimensions may be reset by user. -% @multitableparskip is vertical space between paragraphs in table. -% @multitableparindent is paragraph indent in table. -% @multitablecolmargin is horizontal space to be left between columns. -% @multitablelinespace is space to leave between table items, baseline -% to baseline. -% 0pt means it depends on current normal line spacing. -% -\newskip\multitableparskip -\newskip\multitableparindent -\newdimen\multitablecolspace -\newskip\multitablelinespace -\multitableparskip=0pt -\multitableparindent=6pt -\multitablecolspace=12pt -\multitablelinespace=0pt - -% Macros used to set up halign preamble: -% -\let\endsetuptable\relax -\def\xendsetuptable{\endsetuptable} -\let\columnfractions\relax -\def\xcolumnfractions{\columnfractions} -\newif\ifsetpercent - -% #1 is the @columnfraction, usually a decimal number like .5, but might -% be just 1. We just use it, whatever it is. -% -\def\pickupwholefraction#1 {% - \global\advance\colcount by 1 - \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}% - \setuptable -} - -\newcount\colcount -\def\setuptable#1{% - \def\firstarg{#1}% - \ifx\firstarg\xendsetuptable - \let\go = \relax - \else - \ifx\firstarg\xcolumnfractions - \global\setpercenttrue - \else - \ifsetpercent - \let\go\pickupwholefraction - \else - \global\advance\colcount by 1 - \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a - % separator; typically that is always in the input, anyway. - \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}% - \fi - \fi - \ifx\go\pickupwholefraction - % Put the argument back for the \pickupwholefraction call, so - % we'll always have a period there to be parsed. - \def\go{\pickupwholefraction#1}% - \else - \let\go = \setuptable - \fi% - \fi - \go -} - -% multitable-only commands. -% -% @headitem starts a heading row, which we typeset in bold. -% Assignments have to be global since we are inside the implicit group -% of an alignment entry. \everycr resets \everytab so we don't have to -% undo it ourselves. -\def\headitemfont{\b}% for people to use in the template row; not changeable -\def\headitem{% - \checkenv\multitable - \crcr - \global\everytab={\bf}% can't use \headitemfont since the parsing differs - \the\everytab % for the first item -}% -% -% A \tab used to include \hskip1sp. But then the space in a template -% line is not enough. That is bad. So let's go back to just `&' until -% we again encounter the problem the 1sp was intended to solve. -% --karl, nathan@acm.org, 20apr99. -\def\tab{\checkenv\multitable &\the\everytab}% - -% @multitable ... @end multitable definitions: -% -\newtoks\everytab % insert after every tab. -% -\envdef\multitable{% - \vskip\parskip - \startsavinginserts - % - % @item within a multitable starts a normal row. - % We use \def instead of \let so that if one of the multitable entries - % contains an @itemize, we don't choke on the \item (seen as \crcr aka - % \endtemplate) expanding \doitemize. - \def\item{\crcr}% - % - \tolerance=9500 - \hbadness=9500 - \setmultitablespacing - \parskip=\multitableparskip - \parindent=\multitableparindent - \overfullrule=0pt - \global\colcount=0 - % - \everycr = {% - \noalign{% - \global\everytab={}% - \global\colcount=0 % Reset the column counter. - % Check for saved footnotes, etc. - \checkinserts - % Keeps underfull box messages off when table breaks over pages. - %\filbreak - % Maybe so, but it also creates really weird page breaks when the - % table breaks over pages. Wouldn't \vfil be better? Wait until the - % problem manifests itself, so it can be fixed for real --karl. - }% - }% - % - \parsearg\domultitable -} -\def\domultitable#1{% - % To parse everything between @multitable and @item: - \setuptable#1 \endsetuptable - % - % This preamble sets up a generic column definition, which will - % be used as many times as user calls for columns. - % \vtop will set a single line and will also let text wrap and - % continue for many paragraphs if desired. - \halign\bgroup &% - \global\advance\colcount by 1 - \multistrut - \vtop{% - % Use the current \colcount to find the correct column width: - \hsize=\expandafter\csname col\the\colcount\endcsname - % - % In order to keep entries from bumping into each other - % we will add a \leftskip of \multitablecolspace to all columns after - % the first one. - % - % If a template has been used, we will add \multitablecolspace - % to the width of each template entry. - % - % If the user has set preamble in terms of percent of \hsize we will - % use that dimension as the width of the column, and the \leftskip - % will keep entries from bumping into each other. Table will start at - % left margin and final column will justify at right margin. - % - % Make sure we don't inherit \rightskip from the outer environment. - \rightskip=0pt - \ifnum\colcount=1 - % The first column will be indented with the surrounding text. - \advance\hsize by\leftskip - \else - \ifsetpercent \else - % If user has not set preamble in terms of percent of \hsize - % we will advance \hsize by \multitablecolspace. - \advance\hsize by \multitablecolspace - \fi - % In either case we will make \leftskip=\multitablecolspace: - \leftskip=\multitablecolspace - \fi - % Ignoring space at the beginning and end avoids an occasional spurious - % blank line, when TeX decides to break the line at the space before the - % box from the multistrut, so the strut ends up on a line by itself. - % For example: - % @multitable @columnfractions .11 .89 - % @item @code{#} - % @tab Legal holiday which is valid in major parts of the whole country. - % Is automatically provided with highlighting sequences respectively - % marking characters. - \noindent\ignorespaces##\unskip\multistrut - }\cr -} -\def\Emultitable{% - \crcr - \egroup % end the \halign - \global\setpercentfalse -} - -\def\setmultitablespacing{% - \def\multistrut{\strut}% just use the standard line spacing - % - % Compute \multitablelinespace (if not defined by user) for use in - % \multitableparskip calculation. We used define \multistrut based on - % this, but (ironically) that caused the spacing to be off. - % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100. -\ifdim\multitablelinespace=0pt -\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip -\global\advance\multitablelinespace by-\ht0 -\fi -% Test to see if parskip is larger than space between lines of -% table. If not, do nothing. -% If so, set to same dimension as multitablelinespace. -\ifdim\multitableparskip>\multitablelinespace -\global\multitableparskip=\multitablelinespace -\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller - % than skip between lines in the table. -\fi% -\ifdim\multitableparskip=0pt -\global\multitableparskip=\multitablelinespace -\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller - % than skip between lines in the table. -\fi} - - -\message{conditionals,} - -% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext, -% @ifnotxml always succeed. They currently do nothing; we don't -% attempt to check whether the conditionals are properly nested. But we -% have to remember that they are conditionals, so that @end doesn't -% attempt to close an environment group. -% -\def\makecond#1{% - \expandafter\let\csname #1\endcsname = \relax - \expandafter\let\csname iscond.#1\endcsname = 1 -} -\makecond{iftex} -\makecond{ifnotdocbook} -\makecond{ifnothtml} -\makecond{ifnotinfo} -\makecond{ifnotplaintext} -\makecond{ifnotxml} - -% Ignore @ignore, @ifhtml, @ifinfo, and the like. -% -\def\direntry{\doignore{direntry}} -\def\documentdescription{\doignore{documentdescription}} -\def\docbook{\doignore{docbook}} -\def\html{\doignore{html}} -\def\ifdocbook{\doignore{ifdocbook}} -\def\ifhtml{\doignore{ifhtml}} -\def\ifinfo{\doignore{ifinfo}} -\def\ifnottex{\doignore{ifnottex}} -\def\ifplaintext{\doignore{ifplaintext}} -\def\ifxml{\doignore{ifxml}} -\def\ignore{\doignore{ignore}} -\def\menu{\doignore{menu}} -\def\xml{\doignore{xml}} - -% Ignore text until a line `@end #1', keeping track of nested conditionals. -% -% A count to remember the depth of nesting. -\newcount\doignorecount - -\def\doignore#1{\begingroup - % Scan in ``verbatim'' mode: - \obeylines - \catcode`\@ = \other - \catcode`\{ = \other - \catcode`\} = \other - % - % Make sure that spaces turn into tokens that match what \doignoretext wants. - \spaceisspace - % - % Count number of #1's that we've seen. - \doignorecount = 0 - % - % Swallow text until we reach the matching `@end #1'. - \dodoignore{#1}% -} - -{ \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source. - \obeylines % - % - \gdef\dodoignore#1{% - % #1 contains the command name as a string, e.g., `ifinfo'. - % - % Define a command to find the next `@end #1'. - \long\def\doignoretext##1^^M@end #1{% - \doignoretextyyy##1^^M@#1\_STOP_}% - % - % And this command to find another #1 command, at the beginning of a - % line. (Otherwise, we would consider a line `@c @ifset', for - % example, to count as an @ifset for nesting.) - \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}% - % - % And now expand that command. - \doignoretext ^^M% - }% -} - -\def\doignoreyyy#1{% - \def\temp{#1}% - \ifx\temp\empty % Nothing found. - \let\next\doignoretextzzz - \else % Found a nested condition, ... - \advance\doignorecount by 1 - \let\next\doignoretextyyy % ..., look for another. - % If we're here, #1 ends with ^^M\ifinfo (for example). - \fi - \next #1% the token \_STOP_ is present just after this macro. -} - -% We have to swallow the remaining "\_STOP_". -% -\def\doignoretextzzz#1{% - \ifnum\doignorecount = 0 % We have just found the outermost @end. - \let\next\enddoignore - \else % Still inside a nested condition. - \advance\doignorecount by -1 - \let\next\doignoretext % Look for the next @end. - \fi - \next -} - -% Finish off ignored text. -{ \obeylines% - % Ignore anything after the last `@end #1'; this matters in verbatim - % environments, where otherwise the newline after an ignored conditional - % would result in a blank line in the output. - \gdef\enddoignore#1^^M{\endgroup\ignorespaces}% -} - - -% @set VAR sets the variable VAR to an empty value. -% @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE. -% -% Since we want to separate VAR from REST-OF-LINE (which might be -% empty), we can't just use \parsearg; we have to insert a space of our -% own to delimit the rest of the line, and then take it out again if we -% didn't need it. -% We rely on the fact that \parsearg sets \catcode`\ =10. -% -\parseargdef\set{\setyyy#1 \endsetyyy} -\def\setyyy#1 #2\endsetyyy{% - {% - \makevalueexpandable - \def\temp{#2}% - \edef\next{\gdef\makecsname{SET#1}}% - \ifx\temp\empty - \next{}% - \else - \setzzz#2\endsetzzz - \fi - }% -} -% Remove the trailing space \setxxx inserted. -\def\setzzz#1 \endsetzzz{\next{#1}} - -% @clear VAR clears (i.e., unsets) the variable VAR. -% -\parseargdef\clear{% - {% - \makevalueexpandable - \global\expandafter\let\csname SET#1\endcsname=\relax - }% -} - -% @value{foo} gets the text saved in variable foo. -\def\value{\begingroup\makevalueexpandable\valuexxx} -\def\valuexxx#1{\expandablevalue{#1}\endgroup} -{ - \catcode`\- = \active \catcode`\_ = \active - % - \gdef\makevalueexpandable{% - \let\value = \expandablevalue - % We don't want these characters active, ... - \catcode`\-=\other \catcode`\_=\other - % ..., but we might end up with active ones in the argument if - % we're called from @code, as @code{@value{foo-bar_}}, though. - % So \let them to their normal equivalents. - \let-\realdash \let_\normalunderscore - } -} - -% We have this subroutine so that we can handle at least some @value's -% properly in indexes (we call \makevalueexpandable in \indexdummies). -% The command has to be fully expandable (if the variable is set), since -% the result winds up in the index file. This means that if the -% variable's value contains other Texinfo commands, it's almost certain -% it will fail (although perhaps we could fix that with sufficient work -% to do a one-level expansion on the result, instead of complete). -% -\def\expandablevalue#1{% - \expandafter\ifx\csname SET#1\endcsname\relax - {[No value for ``#1'']}% - \message{Variable `#1', used in @value, is not set.}% - \else - \csname SET#1\endcsname - \fi -} - -% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined -% with @set. -% -% To get special treatment of `@end ifset,' call \makeond and the redefine. -% -\makecond{ifset} -\def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}} -\def\doifset#1#2{% - {% - \makevalueexpandable - \let\next=\empty - \expandafter\ifx\csname SET#2\endcsname\relax - #1% If not set, redefine \next. - \fi - \expandafter - }\next -} -\def\ifsetfail{\doignore{ifset}} - -% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been -% defined with @set, or has been undefined with @clear. -% -% The `\else' inside the `\doifset' parameter is a trick to reuse the -% above code: if the variable is not set, do nothing, if it is set, -% then redefine \next to \ifclearfail. -% -\makecond{ifclear} -\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}} -\def\ifclearfail{\doignore{ifclear}} - -% @dircategory CATEGORY -- specify a category of the dir file -% which this file should belong to. Ignore this in TeX. -\let\dircategory=\comment - -% @defininfoenclose. -\let\definfoenclose=\comment - - -\message{indexing,} -% Index generation facilities - -% Define \newwrite to be identical to plain tex's \newwrite -% except not \outer, so it can be used within macros and \if's. -\edef\newwrite{\makecsname{ptexnewwrite}} - -% \newindex {foo} defines an index named foo. -% It automatically defines \fooindex such that -% \fooindex ...rest of line... puts an entry in the index foo. -% It also defines \fooindfile to be the number of the output channel for -% the file that accumulates this index. The file's extension is foo. -% The name of an index should be no more than 2 characters long -% for the sake of vms. -% -\def\newindex#1{% - \iflinks - \expandafter\newwrite \csname#1indfile\endcsname - \openout \csname#1indfile\endcsname \jobname.#1 % Open the file - \fi - \expandafter\xdef\csname#1index\endcsname{% % Define @#1index - \noexpand\doindex{#1}} -} - -% @defindex foo == \newindex{foo} -% -\def\defindex{\parsearg\newindex} - -% Define @defcodeindex, like @defindex except put all entries in @code. -% -\def\defcodeindex{\parsearg\newcodeindex} -% -\def\newcodeindex#1{% - \iflinks - \expandafter\newwrite \csname#1indfile\endcsname - \openout \csname#1indfile\endcsname \jobname.#1 - \fi - \expandafter\xdef\csname#1index\endcsname{% - \noexpand\docodeindex{#1}}% -} - - -% @synindex foo bar makes index foo feed into index bar. -% Do this instead of @defindex foo if you don't want it as a separate index. -% -% @syncodeindex foo bar similar, but put all entries made for index foo -% inside @code. -% -\def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}} -\def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}} - -% #1 is \doindex or \docodeindex, #2 the index getting redefined (foo), -% #3 the target index (bar). -\def\dosynindex#1#2#3{% - % Only do \closeout if we haven't already done it, else we'll end up - % closing the target index. - \expandafter \ifx\csname donesynindex#2\endcsname \relax - % The \closeout helps reduce unnecessary open files; the limit on the - % Acorn RISC OS is a mere 16 files. - \expandafter\closeout\csname#2indfile\endcsname - \expandafter\let\csname donesynindex#2\endcsname = 1 - \fi - % redefine \fooindfile: - \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname - \expandafter\let\csname#2indfile\endcsname=\temp - % redefine \fooindex: - \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}% -} - -% Define \doindex, the driver for all \fooindex macros. -% Argument #1 is generated by the calling \fooindex macro, -% and it is "foo", the name of the index. - -% \doindex just uses \parsearg; it calls \doind for the actual work. -% This is because \doind is more useful to call from other macros. - -% There is also \dosubind {index}{topic}{subtopic} -% which makes an entry in a two-level index such as the operation index. - -\def\doindex#1{\edef\indexname{#1}\parsearg\singleindexer} -\def\singleindexer #1{\doind{\indexname}{#1}} - -% like the previous two, but they put @code around the argument. -\def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer} -\def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}} - -% Take care of Texinfo commands that can appear in an index entry. -% Since there are some commands we want to expand, and others we don't, -% we have to laboriously prevent expansion for those that we don't. -% -\def\indexdummies{% - \escapechar = `\\ % use backslash in output files. - \def\@{@}% change to @@ when we switch to @ as escape char in index files. - \def\ {\realbackslash\space }% - % - % Need these unexpandable (because we define \tt as a dummy) - % definitions when @{ or @} appear in index entry text. Also, more - % complicated, when \tex is in effect and \{ is a \delimiter again. - % We can't use \lbracecmd and \rbracecmd because texindex assumes - % braces and backslashes are used only as delimiters. Perhaps we - % should define @lbrace and @rbrace commands a la @comma. - \def\{{{\tt\char123}}% - \def\}{{\tt\char125}}% - % - % I don't entirely understand this, but when an index entry is - % generated from a macro call, the \endinput which \scanmacro inserts - % causes processing to be prematurely terminated. This is, - % apparently, because \indexsorttmp is fully expanded, and \endinput - % is an expandable command. The redefinition below makes \endinput - % disappear altogether for that purpose -- although logging shows that - % processing continues to some further point. On the other hand, it - % seems \endinput does not hurt in the printed index arg, since that - % is still getting written without apparent harm. - % - % Sample source (mac-idx3.tex, reported by Graham Percival to - % help-texinfo, 22may06): - % @macro funindex {WORD} - % @findex xyz - % @end macro - % ... - % @funindex commtest - % - % The above is not enough to reproduce the bug, but it gives the flavor. - % - % Sample whatsit resulting: - % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} - % - % So: - \let\endinput = \empty - % - % Do the redefinitions. - \commondummies -} - -% For the aux and toc files, @ is the escape character. So we want to -% redefine everything using @ as the escape character (instead of -% \realbackslash, still used for index files). When everything uses @, -% this will be simpler. -% -\def\atdummies{% - \def\@{@@}% - \def\ {@ }% - \let\{ = \lbraceatcmd - \let\} = \rbraceatcmd - % - % Do the redefinitions. - \commondummies - \otherbackslash -} - -% Called from \indexdummies and \atdummies. -% -\def\commondummies{% - % - % \definedummyword defines \#1 as \string\#1\space, thus effectively - % preventing its expansion. This is used only for control words, - % not control letters, because the \space would be incorrect for - % control characters, but is needed to separate the control word - % from whatever follows. - % - % For control letters, we have \definedummyletter, which omits the - % space. - % - % These can be used both for control words that take an argument and - % those that do not. If it is followed by {arg} in the input, then - % that will dutifully get written to the index (or wherever). - % - \def\definedummyword ##1{\def##1{\string##1\space}}% - \def\definedummyletter##1{\def##1{\string##1}}% - \let\definedummyaccent\definedummyletter - % - \commondummiesnofonts - % - \definedummyletter\_% - \definedummyletter\-% - % - % Non-English letters. - \definedummyword\AA - \definedummyword\AE - \definedummyword\DH - \definedummyword\L - \definedummyword\O - \definedummyword\OE - \definedummyword\TH - \definedummyword\aa - \definedummyword\ae - \definedummyword\dh - \definedummyword\exclamdown - \definedummyword\l - \definedummyword\o - \definedummyword\oe - \definedummyword\ordf - \definedummyword\ordm - \definedummyword\questiondown - \definedummyword\ss - \definedummyword\th - % - % Although these internal commands shouldn't show up, sometimes they do. - \definedummyword\bf - \definedummyword\gtr - \definedummyword\hat - \definedummyword\less - \definedummyword\sf - \definedummyword\sl - \definedummyword\tclose - \definedummyword\tt - % - \definedummyword\LaTeX - \definedummyword\TeX - % - % Assorted special characters. - \definedummyword\arrow - \definedummyword\bullet - \definedummyword\comma - \definedummyword\copyright - \definedummyword\registeredsymbol - \definedummyword\dots - \definedummyword\enddots - \definedummyword\entrybreak - \definedummyword\equiv - \definedummyword\error - \definedummyword\euro - \definedummyword\expansion - \definedummyword\geq - \definedummyword\guillemetleft - \definedummyword\guillemetright - \definedummyword\guilsinglleft - \definedummyword\guilsinglright - \definedummyword\leq - \definedummyword\minus - \definedummyword\ogonek - \definedummyword\pounds - \definedummyword\point - \definedummyword\print - \definedummyword\quotedblbase - \definedummyword\quotedblleft - \definedummyword\quotedblright - \definedummyword\quoteleft - \definedummyword\quoteright - \definedummyword\quotesinglbase - \definedummyword\result - \definedummyword\textdegree - % - % We want to disable all macros so that they are not expanded by \write. - \macrolist - % - \normalturnoffactive - % - % Handle some cases of @value -- where it does not contain any - % (non-fully-expandable) commands. - \makevalueexpandable -} - -% \commondummiesnofonts: common to \commondummies and \indexnofonts. -% -\def\commondummiesnofonts{% - % Control letters and accents. - \definedummyletter\!% - \definedummyaccent\"% - \definedummyaccent\'% - \definedummyletter\*% - \definedummyaccent\,% - \definedummyletter\.% - \definedummyletter\/% - \definedummyletter\:% - \definedummyaccent\=% - \definedummyletter\?% - \definedummyaccent\^% - \definedummyaccent\`% - \definedummyaccent\~% - \definedummyword\u - \definedummyword\v - \definedummyword\H - \definedummyword\dotaccent - \definedummyword\ogonek - \definedummyword\ringaccent - \definedummyword\tieaccent - \definedummyword\ubaraccent - \definedummyword\udotaccent - \definedummyword\dotless - % - % Texinfo font commands. - \definedummyword\b - \definedummyword\i - \definedummyword\r - \definedummyword\sansserif - \definedummyword\sc - \definedummyword\slanted - \definedummyword\t - % - % Commands that take arguments. - \definedummyword\acronym - \definedummyword\anchor - \definedummyword\cite - \definedummyword\code - \definedummyword\command - \definedummyword\dfn - \definedummyword\dmn - \definedummyword\email - \definedummyword\emph - \definedummyword\env - \definedummyword\file - \definedummyword\indicateurl - \definedummyword\kbd - \definedummyword\key - \definedummyword\math - \definedummyword\option - \definedummyword\pxref - \definedummyword\ref - \definedummyword\samp - \definedummyword\strong - \definedummyword\tie - \definedummyword\uref - \definedummyword\url - \definedummyword\var - \definedummyword\verb - \definedummyword\w - \definedummyword\xref -} - -% \indexnofonts is used when outputting the strings to sort the index -% by, and when constructing control sequence names. It eliminates all -% control sequences and just writes whatever the best ASCII sort string -% would be for a given command (usually its argument). -% -\def\indexnofonts{% - % Accent commands should become @asis. - \def\definedummyaccent##1{\let##1\asis}% - % We can just ignore other control letters. - \def\definedummyletter##1{\let##1\empty}% - % All control words become @asis by default; overrides below. - \let\definedummyword\definedummyaccent - % - \commondummiesnofonts - % - % Don't no-op \tt, since it isn't a user-level command - % and is used in the definitions of the active chars like <, >, |, etc. - % Likewise with the other plain tex font commands. - %\let\tt=\asis - % - \def\ { }% - \def\@{@}% - \def\_{\normalunderscore}% - \def\-{}% @- shouldn't affect sorting - % - % Unfortunately, texindex is not prepared to handle braces in the - % content at all. So for index sorting, we map @{ and @} to strings - % starting with |, since that ASCII character is between ASCII { and }. - \def\{{|a}% - \def\}{|b}% - % - % Non-English letters. - \def\AA{AA}% - \def\AE{AE}% - \def\DH{DZZ}% - \def\L{L}% - \def\OE{OE}% - \def\O{O}% - \def\TH{ZZZ}% - \def\aa{aa}% - \def\ae{ae}% - \def\dh{dzz}% - \def\exclamdown{!}% - \def\l{l}% - \def\oe{oe}% - \def\ordf{a}% - \def\ordm{o}% - \def\o{o}% - \def\questiondown{?}% - \def\ss{ss}% - \def\th{zzz}% - % - \def\LaTeX{LaTeX}% - \def\TeX{TeX}% - % - % Assorted special characters. - % (The following {} will end up in the sort string, but that's ok.) - \def\arrow{->}% - \def\bullet{bullet}% - \def\comma{,}% - \def\copyright{copyright}% - \def\dots{...}% - \def\enddots{...}% - \def\equiv{==}% - \def\error{error}% - \def\euro{euro}% - \def\expansion{==>}% - \def\geq{>=}% - \def\guillemetleft{<<}% - \def\guillemetright{>>}% - \def\guilsinglleft{<}% - \def\guilsinglright{>}% - \def\leq{<=}% - \def\minus{-}% - \def\point{.}% - \def\pounds{pounds}% - \def\print{-|}% - \def\quotedblbase{"}% - \def\quotedblleft{"}% - \def\quotedblright{"}% - \def\quoteleft{`}% - \def\quoteright{'}% - \def\quotesinglbase{,}% - \def\registeredsymbol{R}% - \def\result{=>}% - \def\textdegree{o}% - % - \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax - \else \indexlquoteignore \fi - % - % We need to get rid of all macros, leaving only the arguments (if present). - % Of course this is not nearly correct, but it is the best we can do for now. - % makeinfo does not expand macros in the argument to @deffn, which ends up - % writing an index entry, and texindex isn't prepared for an index sort entry - % that starts with \. - % - % Since macro invocations are followed by braces, we can just redefine them - % to take a single TeX argument. The case of a macro invocation that - % goes to end-of-line is not handled. - % - \macrolist -} - -% Undocumented (for FSFS 2nd ed.): @set txiindexlquoteignore makes us -% ignore left quotes in the sort term. -{\catcode`\`=\active - \gdef\indexlquoteignore{\let`=\empty}} - -\let\indexbackslash=0 %overridden during \printindex. -\let\SETmarginindex=\relax % put index entries in margin (undocumented)? - -% Most index entries go through here, but \dosubind is the general case. -% #1 is the index name, #2 is the entry text. -\def\doind#1#2{\dosubind{#1}{#2}{}} - -% Workhorse for all \fooindexes. -% #1 is name of index, #2 is stuff to put there, #3 is subentry -- -% empty if called from \doind, as we usually are (the main exception -% is with most defuns, which call us directly). -% -\def\dosubind#1#2#3{% - \iflinks - {% - % Store the main index entry text (including the third arg). - \toks0 = {#2}% - % If third arg is present, precede it with a space. - \def\thirdarg{#3}% - \ifx\thirdarg\empty \else - \toks0 = \expandafter{\the\toks0 \space #3}% - \fi - % - \edef\writeto{\csname#1indfile\endcsname}% - % - \safewhatsit\dosubindwrite - }% - \fi -} - -% Write the entry in \toks0 to the index file: -% -\def\dosubindwrite{% - % Put the index entry in the margin if desired. - \ifx\SETmarginindex\relax\else - \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}% - \fi - % - % Remember, we are within a group. - \indexdummies % Must do this here, since \bf, etc expand at this stage - \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now - % so it will be output as is; and it will print as backslash. - % - % Process the index entry with all font commands turned off, to - % get the string to sort by. - {\indexnofonts - \edef\temp{\the\toks0}% need full expansion - \xdef\indexsorttmp{\temp}% - }% - % - % Set up the complete index entry, with both the sort key and - % the original text, including any font commands. We write - % three arguments to \entry to the .?? file (four in the - % subentry case), texindex reduces to two when writing the .??s - % sorted result. - \edef\temp{% - \write\writeto{% - \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}% - }% - \temp -} - -% Take care of unwanted page breaks/skips around a whatsit: -% -% If a skip is the last thing on the list now, preserve it -% by backing up by \lastskip, doing the \write, then inserting -% the skip again. Otherwise, the whatsit generated by the -% \write or \pdfdest will make \lastskip zero. The result is that -% sequences like this: -% @end defun -% @tindex whatever -% @defun ... -% will have extra space inserted, because the \medbreak in the -% start of the @defun won't see the skip inserted by the @end of -% the previous defun. -% -% But don't do any of this if we're not in vertical mode. We -% don't want to do a \vskip and prematurely end a paragraph. -% -% Avoid page breaks due to these extra skips, too. -% -% But wait, there is a catch there: -% We'll have to check whether \lastskip is zero skip. \ifdim is not -% sufficient for this purpose, as it ignores stretch and shrink parts -% of the skip. The only way seems to be to check the textual -% representation of the skip. -% -% The following is almost like \def\zeroskipmacro{0.0pt} except that -% the ``p'' and ``t'' characters have catcode \other, not 11 (letter). -% -\edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname} -% -\newskip\whatsitskip -\newcount\whatsitpenalty -% -% ..., ready, GO: -% -\def\safewhatsit#1{% -\ifhmode - #1% -\else - % \lastskip and \lastpenalty cannot both be nonzero simultaneously. - \whatsitskip = \lastskip - \edef\lastskipmacro{\the\lastskip}% - \whatsitpenalty = \lastpenalty - % - % If \lastskip is nonzero, that means the last item was a - % skip. And since a skip is discardable, that means this - % -\whatsitskip glue we're inserting is preceded by a - % non-discardable item, therefore it is not a potential - % breakpoint, therefore no \nobreak needed. - \ifx\lastskipmacro\zeroskipmacro - \else - \vskip-\whatsitskip - \fi - % - #1% - % - \ifx\lastskipmacro\zeroskipmacro - % If \lastskip was zero, perhaps the last item was a penalty, and - % perhaps it was >=10000, e.g., a \nobreak. In that case, we want - % to re-insert the same penalty (values >10000 are used for various - % signals); since we just inserted a non-discardable item, any - % following glue (such as a \parskip) would be a breakpoint. For example: - % - % @deffn deffn-whatever - % @vindex index-whatever - % Description. - % would allow a break between the index-whatever whatsit - % and the "Description." paragraph. - \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi - \else - % On the other hand, if we had a nonzero \lastskip, - % this make-up glue would be preceded by a non-discardable item - % (the whatsit from the \write), so we must insert a \nobreak. - \nobreak\vskip\whatsitskip - \fi -\fi -} - -% The index entry written in the file actually looks like -% \entry {sortstring}{page}{topic} -% or -% \entry {sortstring}{page}{topic}{subtopic} -% The texindex program reads in these files and writes files -% containing these kinds of lines: -% \initial {c} -% before the first topic whose initial is c -% \entry {topic}{pagelist} -% for a topic that is used without subtopics -% \primary {topic} -% for the beginning of a topic that is used with subtopics -% \secondary {subtopic}{pagelist} -% for each subtopic. - -% Define the user-accessible indexing commands -% @findex, @vindex, @kindex, @cindex. - -\def\findex {\fnindex} -\def\kindex {\kyindex} -\def\cindex {\cpindex} -\def\vindex {\vrindex} -\def\tindex {\tpindex} -\def\pindex {\pgindex} - -\def\cindexsub {\begingroup\obeylines\cindexsub} -{\obeylines % -\gdef\cindexsub "#1" #2^^M{\endgroup % -\dosubind{cp}{#2}{#1}}} - -% Define the macros used in formatting output of the sorted index material. - -% @printindex causes a particular index (the ??s file) to get printed. -% It does not print any chapter heading (usually an @unnumbered). -% -\parseargdef\printindex{\begingroup - \dobreak \chapheadingskip{10000}% - % - \smallfonts \rm - \tolerance = 9500 - \plainfrenchspacing - \everypar = {}% don't want the \kern\-parindent from indentation suppression. - % - % See if the index file exists and is nonempty. - % Change catcode of @ here so that if the index file contains - % \initial {@} - % as its first line, TeX doesn't complain about mismatched braces - % (because it thinks @} is a control sequence). - \catcode`\@ = 11 - \openin 1 \jobname.#1s - \ifeof 1 - % \enddoublecolumns gets confused if there is no text in the index, - % and it loses the chapter title and the aux file entries for the - % index. The easiest way to prevent this problem is to make sure - % there is some text. - \putwordIndexNonexistent - \else - % - % If the index file exists but is empty, then \openin leaves \ifeof - % false. We have to make TeX try to read something from the file, so - % it can discover if there is anything in it. - \read 1 to \temp - \ifeof 1 - \putwordIndexIsEmpty - \else - % Index files are almost Texinfo source, but we use \ as the escape - % character. It would be better to use @, but that's too big a change - % to make right now. - \def\indexbackslash{\backslashcurfont}% - \catcode`\\ = 0 - \escapechar = `\\ - \begindoublecolumns - \input \jobname.#1s - \enddoublecolumns - \fi - \fi - \closein 1 -\endgroup} - -% These macros are used by the sorted index file itself. -% Change them to control the appearance of the index. - -\def\initial#1{{% - % Some minor font changes for the special characters. - \let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt - % - % Remove any glue we may have, we'll be inserting our own. - \removelastskip - % - % We like breaks before the index initials, so insert a bonus. - \nobreak - \vskip 0pt plus 3\baselineskip - \penalty 0 - \vskip 0pt plus -3\baselineskip - % - % Typeset the initial. Making this add up to a whole number of - % baselineskips increases the chance of the dots lining up from column - % to column. It still won't often be perfect, because of the stretch - % we need before each entry, but it's better. - % - % No shrink because it confuses \balancecolumns. - \vskip 1.67\baselineskip plus .5\baselineskip - \leftline{\secbf #1}% - % Do our best not to break after the initial. - \nobreak - \vskip .33\baselineskip plus .1\baselineskip -}} - -% \entry typesets a paragraph consisting of the text (#1), dot leaders, and -% then page number (#2) flushed to the right margin. It is used for index -% and table of contents entries. The paragraph is indented by \leftskip. -% -% A straightforward implementation would start like this: -% \def\entry#1#2{... -% But this freezes the catcodes in the argument, and can cause problems to -% @code, which sets - active. This problem was fixed by a kludge--- -% ``-'' was active throughout whole index, but this isn't really right. -% The right solution is to prevent \entry from swallowing the whole text. -% --kasal, 21nov03 -\def\entry{% - \begingroup - % - % Start a new paragraph if necessary, so our assignments below can't - % affect previous text. - \par - % - % Do not fill out the last line with white space. - \parfillskip = 0in - % - % No extra space above this paragraph. - \parskip = 0in - % - % Do not prefer a separate line ending with a hyphen to fewer lines. - \finalhyphendemerits = 0 - % - % \hangindent is only relevant when the entry text and page number - % don't both fit on one line. In that case, bob suggests starting the - % dots pretty far over on the line. Unfortunately, a large - % indentation looks wrong when the entry text itself is broken across - % lines. So we use a small indentation and put up with long leaders. - % - % \hangafter is reset to 1 (which is the value we want) at the start - % of each paragraph, so we need not do anything with that. - \hangindent = 2em - % - % When the entry text needs to be broken, just fill out the first line - % with blank space. - \rightskip = 0pt plus1fil - % - % A bit of stretch before each entry for the benefit of balancing - % columns. - \vskip 0pt plus1pt - % - % When reading the text of entry, convert explicit line breaks - % from @* into spaces. The user might give these in long section - % titles, for instance. - \def\*{\unskip\space\ignorespaces}% - \def\entrybreak{\hfil\break}% - % - % Swallow the left brace of the text (first parameter): - \afterassignment\doentry - \let\temp = -} -\def\entrybreak{\unskip\space\ignorespaces}% -\def\doentry{% - \bgroup % Instead of the swallowed brace. - \noindent - \aftergroup\finishentry - % And now comes the text of the entry. -} -\def\finishentry#1{% - % #1 is the page number. - % - % The following is kludged to not output a line of dots in the index if - % there are no page numbers. The next person who breaks this will be - % cursed by a Unix daemon. - \setbox\boxA = \hbox{#1}% - \ifdim\wd\boxA = 0pt - \ % - \else - % - % If we must, put the page number on a line of its own, and fill out - % this line with blank space. (The \hfil is overwhelmed with the - % fill leaders glue in \indexdotfill if the page number does fit.) - \hfil\penalty50 - \null\nobreak\indexdotfill % Have leaders before the page number. - % - % The `\ ' here is removed by the implicit \unskip that TeX does as - % part of (the primitive) \par. Without it, a spurious underfull - % \hbox ensues. - \ifpdf - \pdfgettoks#1.% - \ \the\toksA - \else - \ #1% - \fi - \fi - \par - \endgroup -} - -% Like plain.tex's \dotfill, except uses up at least 1 em. -\def\indexdotfill{\cleaders - \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill} - -\def\primary #1{\line{#1\hfil}} - -\newskip\secondaryindent \secondaryindent=0.5cm -\def\secondary#1#2{{% - \parfillskip=0in - \parskip=0in - \hangindent=1in - \hangafter=1 - \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill - \ifpdf - \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. - \else - #2 - \fi - \par -}} - -% Define two-column mode, which we use to typeset indexes. -% Adapted from the TeXbook, page 416, which is to say, -% the manmac.tex format used to print the TeXbook itself. -\catcode`\@=11 - -\newbox\partialpage -\newdimen\doublecolumnhsize - -\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns - % Grab any single-column material above us. - \output = {% - % - % Here is a possibility not foreseen in manmac: if we accumulate a - % whole lot of material, we might end up calling this \output - % routine twice in a row (see the doublecol-lose test, which is - % essentially a couple of indexes with @setchapternewpage off). In - % that case we just ship out what is in \partialpage with the normal - % output routine. Generally, \partialpage will be empty when this - % runs and this will be a no-op. See the indexspread.tex test case. - \ifvoid\partialpage \else - \onepageout{\pagecontents\partialpage}% - \fi - % - \global\setbox\partialpage = \vbox{% - % Unvbox the main output page. - \unvbox\PAGE - \kern-\topskip \kern\baselineskip - }% - }% - \eject % run that output routine to set \partialpage - % - % Use the double-column output routine for subsequent pages. - \output = {\doublecolumnout}% - % - % Change the page size parameters. We could do this once outside this - % routine, in each of @smallbook, @afourpaper, and the default 8.5x11 - % format, but then we repeat the same computation. Repeating a couple - % of assignments once per index is clearly meaningless for the - % execution time, so we may as well do it in one place. - % - % First we halve the line length, less a little for the gutter between - % the columns. We compute the gutter based on the line length, so it - % changes automatically with the paper format. The magic constant - % below is chosen so that the gutter has the same value (well, +-<1pt) - % as it did when we hard-coded it. - % - % We put the result in a separate register, \doublecolumhsize, so we - % can restore it in \pagesofar, after \hsize itself has (potentially) - % been clobbered. - % - \doublecolumnhsize = \hsize - \advance\doublecolumnhsize by -.04154\hsize - \divide\doublecolumnhsize by 2 - \hsize = \doublecolumnhsize - % - % Double the \vsize as well. (We don't need a separate register here, - % since nobody clobbers \vsize.) - \vsize = 2\vsize -} - -% The double-column output routine for all double-column pages except -% the last. -% -\def\doublecolumnout{% - \splittopskip=\topskip \splitmaxdepth=\maxdepth - % Get the available space for the double columns -- the normal - % (undoubled) page height minus any material left over from the - % previous page. - \dimen@ = \vsize - \divide\dimen@ by 2 - \advance\dimen@ by -\ht\partialpage - % - % box0 will be the left-hand column, box2 the right. - \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@ - \onepageout\pagesofar - \unvbox255 - \penalty\outputpenalty -} -% -% Re-output the contents of the output page -- any previous material, -% followed by the two boxes we just split, in box0 and box2. -\def\pagesofar{% - \unvbox\partialpage - % - \hsize = \doublecolumnhsize - \wd0=\hsize \wd2=\hsize - \hbox to\pagewidth{\box0\hfil\box2}% -} -% -% All done with double columns. -\def\enddoublecolumns{% - % The following penalty ensures that the page builder is exercised - % _before_ we change the output routine. This is necessary in the - % following situation: - % - % The last section of the index consists only of a single entry. - % Before this section, \pagetotal is less than \pagegoal, so no - % break occurs before the last section starts. However, the last - % section, consisting of \initial and the single \entry, does not - % fit on the page and has to be broken off. Without the following - % penalty the page builder will not be exercised until \eject - % below, and by that time we'll already have changed the output - % routine to the \balancecolumns version, so the next-to-last - % double-column page will be processed with \balancecolumns, which - % is wrong: The two columns will go to the main vertical list, with - % the broken-off section in the recent contributions. As soon as - % the output routine finishes, TeX starts reconsidering the page - % break. The two columns and the broken-off section both fit on the - % page, because the two columns now take up only half of the page - % goal. When TeX sees \eject from below which follows the final - % section, it invokes the new output routine that we've set after - % \balancecolumns below; \onepageout will try to fit the two columns - % and the final section into the vbox of \pageheight (see - % \pagebody), causing an overfull box. - % - % Note that glue won't work here, because glue does not exercise the - % page builder, unlike penalties (see The TeXbook, pp. 280-281). - \penalty0 - % - \output = {% - % Split the last of the double-column material. Leave it on the - % current page, no automatic page break. - \balancecolumns - % - % If we end up splitting too much material for the current page, - % though, there will be another page break right after this \output - % invocation ends. Having called \balancecolumns once, we do not - % want to call it again. Therefore, reset \output to its normal - % definition right away. (We hope \balancecolumns will never be - % called on to balance too much material, but if it is, this makes - % the output somewhat more palatable.) - \global\output = {\onepageout{\pagecontents\PAGE}}% - }% - \eject - \endgroup % started in \begindoublecolumns - % - % \pagegoal was set to the doubled \vsize above, since we restarted - % the current page. We're now back to normal single-column - % typesetting, so reset \pagegoal to the normal \vsize (after the - % \endgroup where \vsize got restored). - \pagegoal = \vsize -} -% -% Called at the end of the double column material. -\def\balancecolumns{% - \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120. - \dimen@ = \ht0 - \advance\dimen@ by \topskip - \advance\dimen@ by-\baselineskip - \divide\dimen@ by 2 % target to split to - %debug\message{final 2-column material height=\the\ht0, target=\the\dimen@.}% - \splittopskip = \topskip - % Loop until we get a decent breakpoint. - {% - \vbadness = 10000 - \loop - \global\setbox3 = \copy0 - \global\setbox1 = \vsplit3 to \dimen@ - \ifdim\ht3>\dimen@ - \global\advance\dimen@ by 1pt - \repeat - }% - %debug\message{split to \the\dimen@, column heights: \the\ht1, \the\ht3.}% - \setbox0=\vbox to\dimen@{\unvbox1}% - \setbox2=\vbox to\dimen@{\unvbox3}% - % - \pagesofar -} -\catcode`\@ = \other - - -\message{sectioning,} -% Chapters, sections, etc. - -% Let's start with @part. -\outer\parseargdef\part{\partzzz{#1}} -\def\partzzz#1{% - \chapoddpage - \null - \vskip.3\vsize % move it down on the page a bit - \begingroup - \noindent \titlefonts\rmisbold #1\par % the text - \let\lastnode=\empty % no node to associate with - \writetocentry{part}{#1}{}% but put it in the toc - \headingsoff % no headline or footline on the part page - \chapoddpage - \endgroup -} - -% \unnumberedno is an oxymoron. But we count the unnumbered -% sections so that we can refer to them unambiguously in the pdf -% outlines by their "section number". We avoid collisions with chapter -% numbers by starting them at 10000. (If a document ever has 10000 -% chapters, we're in trouble anyway, I'm sure.) -\newcount\unnumberedno \unnumberedno = 10000 -\newcount\chapno -\newcount\secno \secno=0 -\newcount\subsecno \subsecno=0 -\newcount\subsubsecno \subsubsecno=0 - -% This counter is funny since it counts through charcodes of letters A, B, ... -\newcount\appendixno \appendixno = `\@ -% -% \def\appendixletter{\char\the\appendixno} -% We do the following ugly conditional instead of the above simple -% construct for the sake of pdftex, which needs the actual -% letter in the expansion, not just typeset. -% -\def\appendixletter{% - \ifnum\appendixno=`A A% - \else\ifnum\appendixno=`B B% - \else\ifnum\appendixno=`C C% - \else\ifnum\appendixno=`D D% - \else\ifnum\appendixno=`E E% - \else\ifnum\appendixno=`F F% - \else\ifnum\appendixno=`G G% - \else\ifnum\appendixno=`H H% - \else\ifnum\appendixno=`I I% - \else\ifnum\appendixno=`J J% - \else\ifnum\appendixno=`K K% - \else\ifnum\appendixno=`L L% - \else\ifnum\appendixno=`M M% - \else\ifnum\appendixno=`N N% - \else\ifnum\appendixno=`O O% - \else\ifnum\appendixno=`P P% - \else\ifnum\appendixno=`Q Q% - \else\ifnum\appendixno=`R R% - \else\ifnum\appendixno=`S S% - \else\ifnum\appendixno=`T T% - \else\ifnum\appendixno=`U U% - \else\ifnum\appendixno=`V V% - \else\ifnum\appendixno=`W W% - \else\ifnum\appendixno=`X X% - \else\ifnum\appendixno=`Y Y% - \else\ifnum\appendixno=`Z Z% - % The \the is necessary, despite appearances, because \appendixletter is - % expanded while writing the .toc file. \char\appendixno is not - % expandable, thus it is written literally, thus all appendixes come out - % with the same letter (or @) in the toc without it. - \else\char\the\appendixno - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} - -% Each @chapter defines these (using marks) as the number+name, number -% and name of the chapter. Page headings and footings can use -% these. @section does likewise. -\def\thischapter{} -\def\thischapternum{} -\def\thischaptername{} -\def\thissection{} -\def\thissectionnum{} -\def\thissectionname{} - -\newcount\absseclevel % used to calculate proper heading level -\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count - -% @raisesections: treat @section as chapter, @subsection as section, etc. -\def\raisesections{\global\advance\secbase by -1} -\let\up=\raisesections % original BFox name - -% @lowersections: treat @chapter as section, @section as subsection, etc. -\def\lowersections{\global\advance\secbase by 1} -\let\down=\lowersections % original BFox name - -% we only have subsub. -\chardef\maxseclevel = 3 -% -% A numbered section within an unnumbered changes to unnumbered too. -% To achieve this, remember the "biggest" unnum. sec. we are currently in: -\chardef\unnlevel = \maxseclevel -% -% Trace whether the current chapter is an appendix or not: -% \chapheadtype is "N" or "A", unnumbered chapters are ignored. -\def\chapheadtype{N} - -% Choose a heading macro -% #1 is heading type -% #2 is heading level -% #3 is text for heading -\def\genhead#1#2#3{% - % Compute the abs. sec. level: - \absseclevel=#2 - \advance\absseclevel by \secbase - % Make sure \absseclevel doesn't fall outside the range: - \ifnum \absseclevel < 0 - \absseclevel = 0 - \else - \ifnum \absseclevel > 3 - \absseclevel = 3 - \fi - \fi - % The heading type: - \def\headtype{#1}% - \if \headtype U% - \ifnum \absseclevel < \unnlevel - \chardef\unnlevel = \absseclevel - \fi - \else - % Check for appendix sections: - \ifnum \absseclevel = 0 - \edef\chapheadtype{\headtype}% - \else - \if \headtype A\if \chapheadtype N% - \errmessage{@appendix... within a non-appendix chapter}% - \fi\fi - \fi - % Check for numbered within unnumbered: - \ifnum \absseclevel > \unnlevel - \def\headtype{U}% - \else - \chardef\unnlevel = 3 - \fi - \fi - % Now print the heading: - \if \headtype U% - \ifcase\absseclevel - \unnumberedzzz{#3}% - \or \unnumberedseczzz{#3}% - \or \unnumberedsubseczzz{#3}% - \or \unnumberedsubsubseczzz{#3}% - \fi - \else - \if \headtype A% - \ifcase\absseclevel - \appendixzzz{#3}% - \or \appendixsectionzzz{#3}% - \or \appendixsubseczzz{#3}% - \or \appendixsubsubseczzz{#3}% - \fi - \else - \ifcase\absseclevel - \chapterzzz{#3}% - \or \seczzz{#3}% - \or \numberedsubseczzz{#3}% - \or \numberedsubsubseczzz{#3}% - \fi - \fi - \fi - \suppressfirstparagraphindent -} - -% an interface: -\def\numhead{\genhead N} -\def\apphead{\genhead A} -\def\unnmhead{\genhead U} - -% @chapter, @appendix, @unnumbered. Increment top-level counter, reset -% all lower-level sectioning counters to zero. -% -% Also set \chaplevelprefix, which we prepend to @float sequence numbers -% (e.g., figures), q.v. By default (before any chapter), that is empty. -\let\chaplevelprefix = \empty -% -\outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz -\def\chapterzzz#1{% - % section resetting is \global in case the chapter is in a group, such - % as an @include file. - \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 - \global\advance\chapno by 1 - % - % Used for \float. - \gdef\chaplevelprefix{\the\chapno.}% - \resetallfloatnos - % - % \putwordChapter can contain complex things in translations. - \toks0=\expandafter{\putwordChapter}% - \message{\the\toks0 \space \the\chapno}% - % - % Write the actual heading. - \chapmacro{#1}{Ynumbered}{\the\chapno}% - % - % So @section and the like are numbered underneath this chapter. - \global\let\section = \numberedsec - \global\let\subsection = \numberedsubsec - \global\let\subsubsection = \numberedsubsubsec -} - -\outer\parseargdef\appendix{\apphead0{#1}} % normally calls appendixzzz -% -\def\appendixzzz#1{% - \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 - \global\advance\appendixno by 1 - \gdef\chaplevelprefix{\appendixletter.}% - \resetallfloatnos - % - % \putwordAppendix can contain complex things in translations. - \toks0=\expandafter{\putwordAppendix}% - \message{\the\toks0 \space \appendixletter}% - % - \chapmacro{#1}{Yappendix}{\appendixletter}% - % - \global\let\section = \appendixsec - \global\let\subsection = \appendixsubsec - \global\let\subsubsection = \appendixsubsubsec -} - -% normally unnmhead0 calls unnumberedzzz: -\outer\parseargdef\unnumbered{\unnmhead0{#1}} -\def\unnumberedzzz#1{% - \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 - \global\advance\unnumberedno by 1 - % - % Since an unnumbered has no number, no prefix for figures. - \global\let\chaplevelprefix = \empty - \resetallfloatnos - % - % This used to be simply \message{#1}, but TeX fully expands the - % argument to \message. Therefore, if #1 contained @-commands, TeX - % expanded them. For example, in `@unnumbered The @cite{Book}', TeX - % expanded @cite (which turns out to cause errors because \cite is meant - % to be executed, not expanded). - % - % Anyway, we don't want the fully-expanded definition of @cite to appear - % as a result of the \message, we just want `@cite' itself. We use - % \the to achieve this: TeX expands \the only once, - % simply yielding the contents of . (We also do this for - % the toc entries.) - \toks0 = {#1}% - \message{(\the\toks0)}% - % - \chapmacro{#1}{Ynothing}{\the\unnumberedno}% - % - \global\let\section = \unnumberedsec - \global\let\subsection = \unnumberedsubsec - \global\let\subsubsection = \unnumberedsubsubsec -} - -% @centerchap is like @unnumbered, but the heading is centered. -\outer\parseargdef\centerchap{% - % Well, we could do the following in a group, but that would break - % an assumption that \chapmacro is called at the outermost level. - % Thus we are safer this way: --kasal, 24feb04 - \let\centerparametersmaybe = \centerparameters - \unnmhead0{#1}% - \let\centerparametersmaybe = \relax -} - -% @top is like @unnumbered. -\let\top\unnumbered - -% Sections. -% -\outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz -\def\seczzz#1{% - \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 - \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}% -} - -% normally calls appendixsectionzzz: -\outer\parseargdef\appendixsection{\apphead1{#1}} -\def\appendixsectionzzz#1{% - \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 - \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}% -} -\let\appendixsec\appendixsection - -% normally calls unnumberedseczzz: -\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} -\def\unnumberedseczzz#1{% - \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 - \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}% -} - -% Subsections. -% -% normally calls numberedsubseczzz: -\outer\parseargdef\numberedsubsec{\numhead2{#1}} -\def\numberedsubseczzz#1{% - \global\subsubsecno=0 \global\advance\subsecno by 1 - \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}% -} - -% normally calls appendixsubseczzz: -\outer\parseargdef\appendixsubsec{\apphead2{#1}} -\def\appendixsubseczzz#1{% - \global\subsubsecno=0 \global\advance\subsecno by 1 - \sectionheading{#1}{subsec}{Yappendix}% - {\appendixletter.\the\secno.\the\subsecno}% -} - -% normally calls unnumberedsubseczzz: -\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} -\def\unnumberedsubseczzz#1{% - \global\subsubsecno=0 \global\advance\subsecno by 1 - \sectionheading{#1}{subsec}{Ynothing}% - {\the\unnumberedno.\the\secno.\the\subsecno}% -} - -% Subsubsections. -% -% normally numberedsubsubseczzz: -\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} -\def\numberedsubsubseczzz#1{% - \global\advance\subsubsecno by 1 - \sectionheading{#1}{subsubsec}{Ynumbered}% - {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}% -} - -% normally appendixsubsubseczzz: -\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} -\def\appendixsubsubseczzz#1{% - \global\advance\subsubsecno by 1 - \sectionheading{#1}{subsubsec}{Yappendix}% - {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}% -} - -% normally unnumberedsubsubseczzz: -\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} -\def\unnumberedsubsubseczzz#1{% - \global\advance\subsubsecno by 1 - \sectionheading{#1}{subsubsec}{Ynothing}% - {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}% -} - -% These macros control what the section commands do, according -% to what kind of chapter we are in (ordinary, appendix, or unnumbered). -% Define them by default for a numbered chapter. -\let\section = \numberedsec -\let\subsection = \numberedsubsec -\let\subsubsection = \numberedsubsubsec - -% Define @majorheading, @heading and @subheading - -% NOTE on use of \vbox for chapter headings, section headings, and such: -% 1) We use \vbox rather than the earlier \line to permit -% overlong headings to fold. -% 2) \hyphenpenalty is set to 10000 because hyphenation in a -% heading is obnoxious; this forbids it. -% 3) Likewise, headings look best if no \parindent is used, and -% if justification is not attempted. Hence \raggedright. - -\def\majorheading{% - {\advance\chapheadingskip by 10pt \chapbreak }% - \parsearg\chapheadingzzz -} - -\def\chapheading{\chapbreak \parsearg\chapheadingzzz} -\def\chapheadingzzz#1{% - {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\ptexraggedright - \rmisbold #1\hfill}}% - \bigskip \par\penalty 200\relax - \suppressfirstparagraphindent -} - -% @heading, @subheading, @subsubheading. -\parseargdef\heading{\sectionheading{#1}{sec}{Yomitfromtoc}{} - \suppressfirstparagraphindent} -\parseargdef\subheading{\sectionheading{#1}{subsec}{Yomitfromtoc}{} - \suppressfirstparagraphindent} -\parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{} - \suppressfirstparagraphindent} - -% These macros generate a chapter, section, etc. heading only -% (including whitespace, linebreaking, etc. around it), -% given all the information in convenient, parsed form. - -% Args are the skip and penalty (usually negative) -\def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi} - -% Parameter controlling skip before chapter headings (if needed) -\newskip\chapheadingskip - -% Define plain chapter starts, and page on/off switching for it. -\def\chapbreak{\dobreak \chapheadingskip {-4000}} -\def\chappager{\par\vfill\supereject} -% Because \domark is called before \chapoddpage, the filler page will -% get the headings for the next chapter, which is wrong. But we don't -% care -- we just disable all headings on the filler page. -\def\chapoddpage{% - \chappager - \ifodd\pageno \else - \begingroup - \headingsoff - \null - \chappager - \endgroup - \fi -} - -\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname} - -\def\CHAPPAGoff{% -\global\let\contentsalignmacro = \chappager -\global\let\pchapsepmacro=\chapbreak -\global\let\pagealignmacro=\chappager} - -\def\CHAPPAGon{% -\global\let\contentsalignmacro = \chappager -\global\let\pchapsepmacro=\chappager -\global\let\pagealignmacro=\chappager -\global\def\HEADINGSon{\HEADINGSsingle}} - -\def\CHAPPAGodd{% -\global\let\contentsalignmacro = \chapoddpage -\global\let\pchapsepmacro=\chapoddpage -\global\let\pagealignmacro=\chapoddpage -\global\def\HEADINGSon{\HEADINGSdouble}} - -\CHAPPAGon - -% Chapter opening. -% -% #1 is the text, #2 is the section type (Ynumbered, Ynothing, -% Yappendix, Yomitfromtoc), #3 the chapter number. -% -% To test against our argument. -\def\Ynothingkeyword{Ynothing} -\def\Yomitfromtockeyword{Yomitfromtoc} -\def\Yappendixkeyword{Yappendix} -% -\def\chapmacro#1#2#3{% - % Insert the first mark before the heading break (see notes for \domark). - \let\prevchapterdefs=\lastchapterdefs - \let\prevsectiondefs=\lastsectiondefs - \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}% - \gdef\thissection{}}% - % - \def\temptype{#2}% - \ifx\temptype\Ynothingkeyword - \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% - \gdef\thischapter{\thischaptername}}% - \else\ifx\temptype\Yomitfromtockeyword - \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% - \gdef\thischapter{}}% - \else\ifx\temptype\Yappendixkeyword - \toks0={#1}% - \xdef\lastchapterdefs{% - \gdef\noexpand\thischaptername{\the\toks0}% - \gdef\noexpand\thischapternum{\appendixletter}% - % \noexpand\putwordAppendix avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thischapter{\noexpand\putwordAppendix{} - \noexpand\thischapternum: - \noexpand\thischaptername}% - }% - \else - \toks0={#1}% - \xdef\lastchapterdefs{% - \gdef\noexpand\thischaptername{\the\toks0}% - \gdef\noexpand\thischapternum{\the\chapno}% - % \noexpand\putwordChapter avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thischapter{\noexpand\putwordChapter{} - \noexpand\thischapternum: - \noexpand\thischaptername}% - }% - \fi\fi\fi - % - % Output the mark. Pass it through \safewhatsit, to take care of - % the preceding space. - \safewhatsit\domark - % - % Insert the chapter heading break. - \pchapsepmacro - % - % Now the second mark, after the heading break. No break points - % between here and the heading. - \let\prevchapterdefs=\lastchapterdefs - \let\prevsectiondefs=\lastsectiondefs - \domark - % - {% - \chapfonts \rmisbold - % - % Have to define \lastsection before calling \donoderef, because the - % xref code eventually uses it. On the other hand, it has to be called - % after \pchapsepmacro, or the headline will change too soon. - \gdef\lastsection{#1}% - % - % Only insert the separating space if we have a chapter/appendix - % number, and don't print the unnumbered ``number''. - \ifx\temptype\Ynothingkeyword - \setbox0 = \hbox{}% - \def\toctype{unnchap}% - \else\ifx\temptype\Yomitfromtockeyword - \setbox0 = \hbox{}% contents like unnumbered, but no toc entry - \def\toctype{omit}% - \else\ifx\temptype\Yappendixkeyword - \setbox0 = \hbox{\putwordAppendix{} #3\enspace}% - \def\toctype{app}% - \else - \setbox0 = \hbox{#3\enspace}% - \def\toctype{numchap}% - \fi\fi\fi - % - % Write the toc entry for this chapter. Must come before the - % \donoderef, because we include the current node name in the toc - % entry, and \donoderef resets it to empty. - \writetocentry{\toctype}{#1}{#3}% - % - % For pdftex, we have to write out the node definition (aka, make - % the pdfdest) after any page break, but before the actual text has - % been typeset. If the destination for the pdf outline is after the - % text, then jumping from the outline may wind up with the text not - % being visible, for instance under high magnification. - \donoderef{#2}% - % - % Typeset the actual heading. - \nobreak % Avoid page breaks at the interline glue. - \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright - \hangindent=\wd0 \centerparametersmaybe - \unhbox0 #1\par}% - }% - \nobreak\bigskip % no page break after a chapter title - \nobreak -} - -% @centerchap -- centered and unnumbered. -\let\centerparametersmaybe = \relax -\def\centerparameters{% - \advance\rightskip by 3\rightskip - \leftskip = \rightskip - \parfillskip = 0pt -} - - -% I don't think this chapter style is supported any more, so I'm not -% updating it with the new noderef stuff. We'll see. --karl, 11aug03. -% -\def\setchapterstyle #1 {\csname CHAPF#1\endcsname} -% -\def\unnchfopen #1{% -\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\ptexraggedright - \rmisbold #1\hfill}}\bigskip \par\nobreak -} -\def\chfopen #1#2{\chapoddpage {\chapfonts -\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% -\par\penalty 5000 % -} -\def\centerchfopen #1{% -\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt - \hfill {\rmisbold #1}\hfill}}\bigskip \par\nobreak -} -\def\CHAPFopen{% - \global\let\chapmacro=\chfopen - \global\let\centerchapmacro=\centerchfopen} - - -% Section titles. These macros combine the section number parts and -% call the generic \sectionheading to do the printing. -% -\newskip\secheadingskip -\def\secheadingbreak{\dobreak \secheadingskip{-1000}} - -% Subsection titles. -\newskip\subsecheadingskip -\def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}} - -% Subsubsection titles. -\def\subsubsecheadingskip{\subsecheadingskip} -\def\subsubsecheadingbreak{\subsecheadingbreak} - - -% Print any size, any type, section title. -% -% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is -% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the -% section number. -% -\def\seckeyword{sec} -% -\def\sectionheading#1#2#3#4{% - {% - \checkenv{}% should not be in an environment. - % - % Switch to the right set of fonts. - \csname #2fonts\endcsname \rmisbold - % - \def\sectionlevel{#2}% - \def\temptype{#3}% - % - % Insert first mark before the heading break (see notes for \domark). - \let\prevsectiondefs=\lastsectiondefs - \ifx\temptype\Ynothingkeyword - \ifx\sectionlevel\seckeyword - \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}% - \gdef\thissection{\thissectionname}}% - \fi - \else\ifx\temptype\Yomitfromtockeyword - % Don't redefine \thissection. - \else\ifx\temptype\Yappendixkeyword - \ifx\sectionlevel\seckeyword - \toks0={#1}% - \xdef\lastsectiondefs{% - \gdef\noexpand\thissectionname{\the\toks0}% - \gdef\noexpand\thissectionnum{#4}% - % \noexpand\putwordSection avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thissection{\noexpand\putwordSection{} - \noexpand\thissectionnum: - \noexpand\thissectionname}% - }% - \fi - \else - \ifx\sectionlevel\seckeyword - \toks0={#1}% - \xdef\lastsectiondefs{% - \gdef\noexpand\thissectionname{\the\toks0}% - \gdef\noexpand\thissectionnum{#4}% - % \noexpand\putwordSection avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thissection{\noexpand\putwordSection{} - \noexpand\thissectionnum: - \noexpand\thissectionname}% - }% - \fi - \fi\fi\fi - % - % Go into vertical mode. Usually we'll already be there, but we - % don't want the following whatsit to end up in a preceding paragraph - % if the document didn't happen to have a blank line. - \par - % - % Output the mark. Pass it through \safewhatsit, to take care of - % the preceding space. - \safewhatsit\domark - % - % Insert space above the heading. - \csname #2headingbreak\endcsname - % - % Now the second mark, after the heading break. No break points - % between here and the heading. - \let\prevsectiondefs=\lastsectiondefs - \domark - % - % Only insert the space after the number if we have a section number. - \ifx\temptype\Ynothingkeyword - \setbox0 = \hbox{}% - \def\toctype{unn}% - \gdef\lastsection{#1}% - \else\ifx\temptype\Yomitfromtockeyword - % for @headings -- no section number, don't include in toc, - % and don't redefine \lastsection. - \setbox0 = \hbox{}% - \def\toctype{omit}% - \let\sectionlevel=\empty - \else\ifx\temptype\Yappendixkeyword - \setbox0 = \hbox{#4\enspace}% - \def\toctype{app}% - \gdef\lastsection{#1}% - \else - \setbox0 = \hbox{#4\enspace}% - \def\toctype{num}% - \gdef\lastsection{#1}% - \fi\fi\fi - % - % Write the toc entry (before \donoderef). See comments in \chapmacro. - \writetocentry{\toctype\sectionlevel}{#1}{#4}% - % - % Write the node reference (= pdf destination for pdftex). - % Again, see comments in \chapmacro. - \donoderef{#3}% - % - % Interline glue will be inserted when the vbox is completed. - % That glue will be a valid breakpoint for the page, since it'll be - % preceded by a whatsit (usually from the \donoderef, or from the - % \writetocentry if there was no node). We don't want to allow that - % break, since then the whatsits could end up on page n while the - % section is on page n+1, thus toc/etc. are wrong. Debian bug 276000. - \nobreak - % - % Output the actual section heading. - \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright - \hangindent=\wd0 % zero if no section number - \unhbox0 #1}% - }% - % Add extra space after the heading -- half of whatever came above it. - % Don't allow stretch, though. - \kern .5 \csname #2headingskip\endcsname - % - % Do not let the kern be a potential breakpoint, as it would be if it - % was followed by glue. - \nobreak - % - % We'll almost certainly start a paragraph next, so don't let that - % glue accumulate. (Not a breakpoint because it's preceded by a - % discardable item.) - \vskip-\parskip - % - % This is purely so the last item on the list is a known \penalty > - % 10000. This is so \startdefun can avoid allowing breakpoints after - % section headings. Otherwise, it would insert a valid breakpoint between: - % @section sec-whatever - % @deffn def-whatever - \penalty 10001 -} - - -\message{toc,} -% Table of contents. -\newwrite\tocfile - -% Write an entry to the toc file, opening it if necessary. -% Called from @chapter, etc. -% -% Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno} -% We append the current node name (if any) and page number as additional -% arguments for the \{chap,sec,...}entry macros which will eventually -% read this. The node name is used in the pdf outlines as the -% destination to jump to. -% -% We open the .toc file for writing here instead of at @setfilename (or -% any other fixed time) so that @contents can be anywhere in the document. -% But if #1 is `omit', then we don't do anything. This is used for the -% table of contents chapter openings themselves. -% -\newif\iftocfileopened -\def\omitkeyword{omit}% -% -\def\writetocentry#1#2#3{% - \edef\writetoctype{#1}% - \ifx\writetoctype\omitkeyword \else - \iftocfileopened\else - \immediate\openout\tocfile = \jobname.toc - \global\tocfileopenedtrue - \fi - % - \iflinks - {\atdummies - \edef\temp{% - \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}% - \temp - }% - \fi - \fi - % - % Tell \shipout to create a pdf destination on each page, if we're - % writing pdf. These are used in the table of contents. We can't - % just write one on every page because the title pages are numbered - % 1 and 2 (the page numbers aren't printed), and so are the first - % two pages of the document. Thus, we'd have two destinations named - % `1', and two named `2'. - \ifpdf \global\pdfmakepagedesttrue \fi -} - - -% These characters do not print properly in the Computer Modern roman -% fonts, so we must take special care. This is more or less redundant -% with the Texinfo input format setup at the end of this file. -% -\def\activecatcodes{% - \catcode`\"=\active - \catcode`\$=\active - \catcode`\<=\active - \catcode`\>=\active - \catcode`\\=\active - \catcode`\^=\active - \catcode`\_=\active - \catcode`\|=\active - \catcode`\~=\active -} - - -% Read the toc file, which is essentially Texinfo input. -\def\readtocfile{% - \setupdatafile - \activecatcodes - \input \tocreadfilename -} - -\newskip\contentsrightmargin \contentsrightmargin=1in -\newcount\savepageno -\newcount\lastnegativepageno \lastnegativepageno = -1 - -% Prepare to read what we've written to \tocfile. -% -\def\startcontents#1{% - % If @setchapternewpage on, and @headings double, the contents should - % start on an odd page, unlike chapters. Thus, we maintain - % \contentsalignmacro in parallel with \pagealignmacro. - % From: Torbjorn Granlund - \contentsalignmacro - \immediate\closeout\tocfile - % - % Don't need to put `Contents' or `Short Contents' in the headline. - % It is abundantly clear what they are. - \chapmacro{#1}{Yomitfromtoc}{}% - % - \savepageno = \pageno - \begingroup % Set up to handle contents files properly. - \raggedbottom % Worry more about breakpoints than the bottom. - \advance\hsize by -\contentsrightmargin % Don't use the full line length. - % - % Roman numerals for page numbers. - \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi -} - -% redefined for the two-volume lispref. We always output on -% \jobname.toc even if this is redefined. -% -\def\tocreadfilename{\jobname.toc} - -% Normal (long) toc. -% -\def\contents{% - \startcontents{\putwordTOC}% - \openin 1 \tocreadfilename\space - \ifeof 1 \else - \readtocfile - \fi - \vfill \eject - \contentsalignmacro % in case @setchapternewpage odd is in effect - \ifeof 1 \else - \pdfmakeoutlines - \fi - \closein 1 - \endgroup - \lastnegativepageno = \pageno - \global\pageno = \savepageno -} - -% And just the chapters. -\def\summarycontents{% - \startcontents{\putwordShortTOC}% - % - \let\partentry = \shortpartentry - \let\numchapentry = \shortchapentry - \let\appentry = \shortchapentry - \let\unnchapentry = \shortunnchapentry - % We want a true roman here for the page numbers. - \secfonts - \let\rm=\shortcontrm \let\bf=\shortcontbf - \let\sl=\shortcontsl \let\tt=\shortconttt - \rm - \hyphenpenalty = 10000 - \advance\baselineskip by 1pt % Open it up a little. - \def\numsecentry##1##2##3##4{} - \let\appsecentry = \numsecentry - \let\unnsecentry = \numsecentry - \let\numsubsecentry = \numsecentry - \let\appsubsecentry = \numsecentry - \let\unnsubsecentry = \numsecentry - \let\numsubsubsecentry = \numsecentry - \let\appsubsubsecentry = \numsecentry - \let\unnsubsubsecentry = \numsecentry - \openin 1 \tocreadfilename\space - \ifeof 1 \else - \readtocfile - \fi - \closein 1 - \vfill \eject - \contentsalignmacro % in case @setchapternewpage odd is in effect - \endgroup - \lastnegativepageno = \pageno - \global\pageno = \savepageno -} -\let\shortcontents = \summarycontents - -% Typeset the label for a chapter or appendix for the short contents. -% The arg is, e.g., `A' for an appendix, or `3' for a chapter. -% -\def\shortchaplabel#1{% - % This space should be enough, since a single number is .5em, and the - % widest letter (M) is 1em, at least in the Computer Modern fonts. - % But use \hss just in case. - % (This space doesn't include the extra space that gets added after - % the label; that gets put in by \shortchapentry above.) - % - % We'd like to right-justify chapter numbers, but that looks strange - % with appendix letters. And right-justifying numbers and - % left-justifying letters looks strange when there is less than 10 - % chapters. Have to read the whole toc once to know how many chapters - % there are before deciding ... - \hbox to 1em{#1\hss}% -} - -% These macros generate individual entries in the table of contents. -% The first argument is the chapter or section name. -% The last argument is the page number. -% The arguments in between are the chapter number, section number, ... - -% Parts, in the main contents. Replace the part number, which doesn't -% exist, with an empty box. Let's hope all the numbers have the same width. -% Also ignore the page number, which is conventionally not printed. -\def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}} -\def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}} -% -% Parts, in the short toc. -\def\shortpartentry#1#2#3#4{% - \penalty-300 - \vskip.5\baselineskip plus.15\baselineskip minus.1\baselineskip - \shortchapentry{{\bf #1}}{\numeralbox}{}{}% -} - -% Chapters, in the main contents. -\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}} -% -% Chapters, in the short toc. -% See comments in \dochapentry re vbox and related settings. -\def\shortchapentry#1#2#3#4{% - \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}% -} - -% Appendices, in the main contents. -% Need the word Appendix, and a fixed-size box. -% -\def\appendixbox#1{% - % We use M since it's probably the widest letter. - \setbox0 = \hbox{\putwordAppendix{} M}% - \hbox to \wd0{\putwordAppendix{} #1\hss}} -% -\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}} - -% Unnumbered chapters. -\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}} -\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}} - -% Sections. -\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}} -\let\appsecentry=\numsecentry -\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}} - -% Subsections. -\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}} -\let\appsubsecentry=\numsubsecentry -\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}} - -% And subsubsections. -\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}} -\let\appsubsubsecentry=\numsubsubsecentry -\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}} - -% This parameter controls the indentation of the various levels. -% Same as \defaultparindent. -\newdimen\tocindent \tocindent = 15pt - -% Now for the actual typesetting. In all these, #1 is the text and #2 is the -% page number. -% -% If the toc has to be broken over pages, we want it to be at chapters -% if at all possible; hence the \penalty. -\def\dochapentry#1#2{% - \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip - \begingroup - \chapentryfonts - \tocentry{#1}{\dopageno\bgroup#2\egroup}% - \endgroup - \nobreak\vskip .25\baselineskip plus.1\baselineskip -} - -\def\dosecentry#1#2{\begingroup - \secentryfonts \leftskip=\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% -\endgroup} - -\def\dosubsecentry#1#2{\begingroup - \subsecentryfonts \leftskip=2\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% -\endgroup} - -\def\dosubsubsecentry#1#2{\begingroup - \subsubsecentryfonts \leftskip=3\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% -\endgroup} - -% We use the same \entry macro as for the index entries. -\let\tocentry = \entry - -% Space between chapter (or whatever) number and the title. -\def\labelspace{\hskip1em \relax} - -\def\dopageno#1{{\rm #1}} -\def\doshortpageno#1{{\rm #1}} - -\def\chapentryfonts{\secfonts \rm} -\def\secentryfonts{\textfonts} -\def\subsecentryfonts{\textfonts} -\def\subsubsecentryfonts{\textfonts} - - -\message{environments,} -% @foo ... @end foo. - -% @tex ... @end tex escapes into raw TeX temporarily. -% One exception: @ is still an escape character, so that @end tex works. -% But \@ or @@ will get a plain @ character. - -\envdef\tex{% - \setupmarkupstyle{tex}% - \catcode `\\=0 \catcode `\{=1 \catcode `\}=2 - \catcode `\$=3 \catcode `\&=4 \catcode `\#=6 - \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie - \catcode `\%=14 - \catcode `\+=\other - \catcode `\"=\other - \catcode `\|=\other - \catcode `\<=\other - \catcode `\>=\other - \catcode`\`=\other - \catcode`\'=\other - \escapechar=`\\ - % - % ' is active in math mode (mathcode"8000). So reset it, and all our - % other math active characters (just in case), to plain's definitions. - \mathactive - % - \let\b=\ptexb - \let\bullet=\ptexbullet - \let\c=\ptexc - \let\,=\ptexcomma - \let\.=\ptexdot - \let\dots=\ptexdots - \let\equiv=\ptexequiv - \let\!=\ptexexclam - \let\i=\ptexi - \let\indent=\ptexindent - \let\noindent=\ptexnoindent - \let\{=\ptexlbrace - \let\+=\tabalign - \let\}=\ptexrbrace - \let\/=\ptexslash - \let\*=\ptexstar - \let\t=\ptext - \expandafter \let\csname top\endcsname=\ptextop % outer - \let\frenchspacing=\plainfrenchspacing - % - \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}% - \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}% - \def\@{@}% -} -% There is no need to define \Etex. - -% Define @lisp ... @end lisp. -% @lisp environment forms a group so it can rebind things, -% including the definition of @end lisp (which normally is erroneous). - -% Amount to narrow the margins by for @lisp. -\newskip\lispnarrowing \lispnarrowing=0.4in - -% This is the definition that ^^M gets inside @lisp, @example, and other -% such environments. \null is better than a space, since it doesn't -% have any width. -\def\lisppar{\null\endgraf} - -% This space is always present above and below environments. -\newskip\envskipamount \envskipamount = 0pt - -% Make spacing and below environment symmetrical. We use \parskip here -% to help in doing that, since in @example-like environments \parskip -% is reset to zero; thus the \afterenvbreak inserts no space -- but the -% start of the next paragraph will insert \parskip. -% -\def\aboveenvbreak{{% - % =10000 instead of <10000 because of a special case in \itemzzz and - % \sectionheading, q.v. - \ifnum \lastpenalty=10000 \else - \advance\envskipamount by \parskip - \endgraf - \ifdim\lastskip<\envskipamount - \removelastskip - % it's not a good place to break if the last penalty was \nobreak - % or better ... - \ifnum\lastpenalty<10000 \penalty-50 \fi - \vskip\envskipamount - \fi - \fi -}} - -\let\afterenvbreak = \aboveenvbreak - -% \nonarrowing is a flag. If "set", @lisp etc don't narrow margins; it will -% also clear it, so that its embedded environments do the narrowing again. -\let\nonarrowing=\relax - -% @cartouche ... @end cartouche: draw rectangle w/rounded corners around -% environment contents. -\font\circle=lcircle10 -\newdimen\circthick -\newdimen\cartouter\newdimen\cartinner -\newskip\normbskip\newskip\normpskip\newskip\normlskip -\circthick=\fontdimen8\circle -% -\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth -\def\ctr{{\hskip 6pt\circle\char'010}} -\def\cbl{{\circle\char'012\hskip -6pt}} -\def\cbr{{\hskip 6pt\circle\char'011}} -\def\carttop{\hbox to \cartouter{\hskip\lskip - \ctl\leaders\hrule height\circthick\hfil\ctr - \hskip\rskip}} -\def\cartbot{\hbox to \cartouter{\hskip\lskip - \cbl\leaders\hrule height\circthick\hfil\cbr - \hskip\rskip}} -% -\newskip\lskip\newskip\rskip - -\envdef\cartouche{% - \ifhmode\par\fi % can't be in the midst of a paragraph. - \startsavinginserts - \lskip=\leftskip \rskip=\rightskip - \leftskip=0pt\rightskip=0pt % we want these *outside*. - \cartinner=\hsize \advance\cartinner by-\lskip - \advance\cartinner by-\rskip - \cartouter=\hsize - \advance\cartouter by 18.4pt % allow for 3pt kerns on either - % side, and for 6pt waste from - % each corner char, and rule thickness - \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip - % Flag to tell @lisp, etc., not to narrow margin. - \let\nonarrowing = t% - % - % If this cartouche directly follows a sectioning command, we need the - % \parskip glue (backspaced over by default) or the cartouche can - % collide with the section heading. - \ifnum\lastpenalty>10000 \vskip\parskip \fi - % - \vbox\bgroup - \baselineskip=0pt\parskip=0pt\lineskip=0pt - \carttop - \hbox\bgroup - \hskip\lskip - \vrule\kern3pt - \vbox\bgroup - \kern3pt - \hsize=\cartinner - \baselineskip=\normbskip - \lineskip=\normlskip - \parskip=\normpskip - \vskip -\parskip - \comment % For explanation, see the end of def\group. -} -\def\Ecartouche{% - \ifhmode\par\fi - \kern3pt - \egroup - \kern3pt\vrule - \hskip\rskip - \egroup - \cartbot - \egroup - \checkinserts -} - - -% This macro is called at the beginning of all the @example variants, -% inside a group. -\newdimen\nonfillparindent -\def\nonfillstart{% - \aboveenvbreak - \hfuzz = 12pt % Don't be fussy - \sepspaces % Make spaces be word-separators rather than space tokens. - \let\par = \lisppar % don't ignore blank lines - \obeylines % each line of input is a line of output - \parskip = 0pt - % Turn off paragraph indentation but redefine \indent to emulate - % the normal \indent. - \nonfillparindent=\parindent - \parindent = 0pt - \let\indent\nonfillindent - % - \emergencystretch = 0pt % don't try to avoid overfull boxes - \ifx\nonarrowing\relax - \advance \leftskip by \lispnarrowing - \exdentamount=\lispnarrowing - \else - \let\nonarrowing = \relax - \fi - \let\exdent=\nofillexdent -} - -\begingroup -\obeyspaces -% We want to swallow spaces (but not other tokens) after the fake -% @indent in our nonfill-environments, where spaces are normally -% active and set to @tie, resulting in them not being ignored after -% @indent. -\gdef\nonfillindent{\futurelet\temp\nonfillindentcheck}% -\gdef\nonfillindentcheck{% -\ifx\temp % -\expandafter\nonfillindentgobble% -\else% -\leavevmode\nonfillindentbox% -\fi% -}% -\endgroup -\def\nonfillindentgobble#1{\nonfillindent} -\def\nonfillindentbox{\hbox to \nonfillparindent{\hss}} - -% 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 - % end paragraph for sake of leading, in case document has no blank - % line. This is redundant with what happens in \aboveenvbreak, but - % we need to do it before changing the fonts, and it's inconvenient - % to change the fonts afterward. - \ifnum \lastpenalty=10000 \else \endgraf \fi - \smallexamplefonts \rm - \fi -} -\def\setsmalldispenv{% - \ifx\SETdispenvsize\nosmallword - \else - \ifnum \lastpenalty=10000 \else \endgraf \fi - \smallexamplefonts \rm - \fi -} - -% We often define two environments, @foo and @smallfoo. -% Let's do it in one command. #1 is the env name, #2 the definition. -\def\makedispenvdef#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 environment synonyms (#1 and #2) for an environment. -\def\maketwodispenvdef#1#2#3{% - \makedispenvdef{#1}{#3}% - \makedispenvdef{#2}{#3}% -} -% -% @lisp: indented, narrowed, typewriter font; -% @example: same as @lisp. -% -% @smallexample and @smalllisp: use smaller fonts. -% Originally contributed by Pavel@xerox. -% -\maketwodispenvdef{lisp}{example}{% - \nonfillstart - \tt\setupmarkupstyle{example}% - \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. - \gobble % eat return -} -% @display/@smalldisplay: same as @lisp except keep current font. -% -\makedispenvdef{display}{% - \nonfillstart - \gobble -} - -% @format/@smallformat: same as @display except don't narrow margins. -% -\makedispenvdef{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. -% -\envdef\flushright{% - \let\nonarrowing = t% - \nonfillstart - \advance\leftskip by 0pt plus 1fill\relax - \gobble -} -\let\Eflushright = \afterenvbreak - - -% @raggedright does more-or-less normal line breaking but no right -% justification. From plain.tex. -\envdef\raggedright{% - \rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax -} -\let\Eraggedright\par - -\envdef\raggedleft{% - \parindent=0pt \leftskip0pt plus2em - \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt - \hbadness=10000 % Last line will usually be underfull, so turn off - % badness reporting. -} -\let\Eraggedleft\par - -\envdef\raggedcenter{% - \parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em - \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt - \hbadness=10000 % Last line will usually be underfull, so turn off - % badness reporting. -} -\let\Eraggedcenter\par - - -% @quotation does normal linebreaking (hence we can't use \nonfillstart) -% and narrows the margins. We keep \parskip nonzero in general, since -% we're doing normal filling. So, when using \aboveenvbreak and -% \afterenvbreak, temporarily make \parskip 0. -% -\makedispenvdef{quotation}{\quotationstart} -% -\def\quotationstart{% - {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip - \parindent=0pt - % - % @cartouche defines \nonarrowing to inhibit narrowing at next level down. - \ifx\nonarrowing\relax - \advance\leftskip by \lispnarrowing - \advance\rightskip by \lispnarrowing - \exdentamount = \lispnarrowing - \else - \let\nonarrowing = \relax - \fi - \parsearg\quotationlabel -} - -% We have retained a nonzero parskip for the environment, since we're -% doing normal filling. -% -\def\Equotation{% - \par - \ifx\quotationauthor\thisisundefined\else - % indent a bit. - \leftline{\kern 2\leftskip \sl ---\quotationauthor}% - \fi - {\parskip=0pt \afterenvbreak}% -} -\def\Esmallquotation{\Equotation} - -% If we're given an argument, typeset it in bold with a colon after. -\def\quotationlabel#1{% - \def\temp{#1}% - \ifx\temp\empty \else - {\bf #1: }% - \fi -} - - -% LaTeX-like @verbatim...@end verbatim and @verb{...} -% If we want to allow any as delimiter, -% we need the curly braces so that makeinfo sees the @verb command, eg: -% `@verbx...x' would look like the '@verbx' command. --janneke@gnu.org -% -% [Knuth]: Donald Ervin Knuth, 1996. The TeXbook. -% -% [Knuth] p.344; only we need to do the other characters Texinfo sets -% active too. Otherwise, they get lost as the first character on a -% verbatim line. -\def\dospecials{% - \do\ \do\\\do\{\do\}\do\$\do\&% - \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~% - \do\<\do\>\do\|\do\@\do+\do\"% - % Don't do the quotes -- if we do, @set txicodequoteundirected and - % @set txicodequotebacktick will not have effect on @verb and - % @verbatim, and ?` and !` ligatures won't get disabled. - %\do\`\do\'% -} -% -% [Knuth] p. 380 -\def\uncatcodespecials{% - \def\do##1{\catcode`##1=\other}\dospecials} -% -% Setup for the @verb command. -% -% Eight spaces for a tab -\begingroup - \catcode`\^^I=\active - \gdef\tabeightspaces{\catcode`\^^I=\active\def^^I{\ \ \ \ \ \ \ \ }} -\endgroup -% -\def\setupverb{% - \tt % easiest (and conventionally used) font for verbatim - \def\par{\leavevmode\endgraf}% - \setupmarkupstyle{verb}% - \tabeightspaces - % Respect line breaks, - % print special symbols as themselves, and - % make each space count - % must do in this order: - \obeylines \uncatcodespecials \sepspaces -} - -% Setup for the @verbatim environment -% -% Real tab expansion. -\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount -% -% We typeset each line of the verbatim in an \hbox, so we can handle -% tabs. The \global is in case the verbatim line starts with an accent, -% or some other command that starts with a begin-group. Otherwise, the -% entire \verbbox would disappear at the corresponding end-group, before -% it is typeset. Meanwhile, we can't have nested verbatim commands -% (can we?), so the \global won't be overwriting itself. -\newbox\verbbox -\def\starttabbox{\global\setbox\verbbox=\hbox\bgroup} -% -\begingroup - \catcode`\^^I=\active - \gdef\tabexpand{% - \catcode`\^^I=\active - \def^^I{\leavevmode\egroup - \dimen\verbbox=\wd\verbbox % the width so far, or since the previous tab - \divide\dimen\verbbox by\tabw - \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw - \advance\dimen\verbbox by\tabw % advance to next multiple of \tabw - \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox - }% - } -\endgroup - -% start the verbatim environment. -\def\setupverbatim{% - \let\nonarrowing = t% - \nonfillstart - \tt % easiest (and conventionally used) font for verbatim - % The \leavevmode here is for blank lines. Otherwise, we would - % never \starttabox and the \egroup would end verbatim mode. - \def\par{\leavevmode\egroup\box\verbbox\endgraf}% - \tabexpand - \setupmarkupstyle{verbatim}% - % Respect line breaks, - % print special symbols as themselves, and - % make each space count. - % Must do in this order: - \obeylines \uncatcodespecials \sepspaces - \everypar{\starttabbox}% -} - -% Do the @verb magic: verbatim text is quoted by unique -% delimiter characters. Before first delimiter expect a -% right brace, after last delimiter expect closing brace: -% -% \def\doverb'{'#1'}'{#1} -% -% [Knuth] p. 382; only eat outer {} -\begingroup - \catcode`[=1\catcode`]=2\catcode`\{=\other\catcode`\}=\other - \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next] -\endgroup -% -\def\verb{\begingroup\setupverb\doverb} -% -% -% Do the @verbatim magic: define the macro \doverbatim so that -% the (first) argument ends when '@end verbatim' is reached, ie: -% -% \def\doverbatim#1@end verbatim{#1} -% -% For Texinfo it's a lot easier than for LaTeX, -% because texinfo's \verbatim doesn't stop at '\end{verbatim}': -% we need not redefine '\', '{' and '}'. -% -% Inspired by LaTeX's verbatim command set [latex.ltx] -% -\begingroup - \catcode`\ =\active - \obeylines % - % ignore everything up to the first ^^M, that's the newline at the end - % of the @verbatim input line itself. Otherwise we get an extra blank - % line in the output. - \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}% - % We really want {...\end verbatim} in the body of the macro, but - % without the active space; thus we have to use \xdef and \gobble. -\endgroup -% -\envdef\verbatim{% - \setupverbatim\doverbatim -} -\let\Everbatim = \afterenvbreak - - -% @verbatiminclude FILE - insert text of file in verbatim environment. -% -\def\verbatiminclude{\parseargusing\filenamecatcodes\doverbatiminclude} -% -\def\doverbatiminclude#1{% - {% - \makevalueexpandable - \setupverbatim - \indexnofonts % Allow `@@' and other weird things in file names. - \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}% - \input #1 - \afterenvbreak - }% -} - -% @copying ... @end copying. -% Save the text away for @insertcopying later. -% -% We save the uninterpreted tokens, rather than creating a box. -% Saving the text in a box would be much easier, but then all the -% typesetting commands (@smallbook, font changes, etc.) have to be done -% beforehand -- and a) we want @copying to be done first in the source -% file; b) letting users define the frontmatter in as flexible order as -% possible is very desirable. -% -\def\copying{\checkenv{}\begingroup\scanargctxt\docopying} -\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}} -% -\def\insertcopying{% - \begingroup - \parindent = 0pt % paragraph indentation looks wrong on title page - \scanexp\copyingtext - \endgroup -} - - -\message{defuns,} -% @defun etc. - -\newskip\defbodyindent \defbodyindent=.4in -\newskip\defargsindent \defargsindent=50pt -\newskip\deflastargmargin \deflastargmargin=18pt -\newcount\defunpenalty - -% Start the processing of @deffn: -\def\startdefun{% - \ifnum\lastpenalty<10000 - \medbreak - \defunpenalty=10003 % Will keep this @deffn together with the - % following @def command, see below. - \else - % If there are two @def commands in a row, we'll have a \nobreak, - % which is there to keep the function description together with its - % header. But if there's nothing but headers, we need to allow a - % break somewhere. Check specifically for penalty 10002, inserted - % by \printdefunline, instead of 10000, since the sectioning - % commands also insert a nobreak penalty, and we don't want to allow - % a break between a section heading and a defun. - % - % As a further refinement, we avoid "club" headers by signalling - % with penalty of 10003 after the very first @deffn in the - % sequence (see above), and penalty of 10002 after any following - % @def command. - \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi - % - % Similarly, after a section heading, do not allow a break. - % But do insert the glue. - \medskip % preceded by discardable penalty, so not a breakpoint - \fi - % - \parindent=0in - \advance\leftskip by \defbodyindent - \exdentamount=\defbodyindent -} - -\def\dodefunx#1{% - % First, check whether we are in the right environment: - \checkenv#1% - % - % As above, allow line break if we have multiple x headers in a row. - % It's not a great place, though. - \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi - % - % And now, it's time to reuse the body of the original defun: - \expandafter\gobbledefun#1% -} -\def\gobbledefun#1\startdefun{} - -% \printdefunline \deffnheader{text} -% -\def\printdefunline#1#2{% - \begingroup - % call \deffnheader: - #1#2 \endheader - % common ending: - \interlinepenalty = 10000 - \advance\rightskip by 0pt plus 1fil\relax - \endgraf - \nobreak\vskip -\parskip - \penalty\defunpenalty % signal to \startdefun and \dodefunx - % Some of the @defun-type tags do not enable magic parentheses, - % rendering the following check redundant. But we don't optimize. - \checkparencounts - \endgroup -} - -\def\Edefun{\endgraf\medbreak} - -% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn; -% the only thing remaining is to define \deffnheader. -% -\def\makedefun#1{% - \expandafter\let\csname E#1\endcsname = \Edefun - \edef\temp{\noexpand\domakedefun - \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}% - \temp -} - -% \domakedefun \deffn \deffnx \deffnheader -% -% Define \deffn and \deffnx, without parameters. -% \deffnheader has to be defined explicitly. -% -\def\domakedefun#1#2#3{% - \envdef#1{% - \startdefun - \doingtypefnfalse % distinguish typed functions from all else - \parseargusing\activeparens{\printdefunline#3}% - }% - \def#2{\dodefunx#1}% - \def#3% -} - -\newif\ifdoingtypefn % doing typed function? -\newif\ifrettypeownline % typeset return type on its own line? - -% @deftypefnnewline on|off says whether the return type of typed functions -% are printed on their own line. This affects @deftypefn, @deftypefun, -% @deftypeop, and @deftypemethod. -% -\parseargdef\deftypefnnewline{% - \def\temp{#1}% - \ifx\temp\onword - \expandafter\let\csname SETtxideftypefnnl\endcsname - = \empty - \else\ifx\temp\offword - \expandafter\let\csname SETtxideftypefnnl\endcsname - = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @txideftypefnnl value `\temp', - must be on|off}% - \fi\fi -} - -% Untyped functions: - -% @deffn category name args -\makedefun{deffn}{\deffngeneral{}} - -% @deffn category class name args -\makedefun{defop}#1 {\defopon{#1\ \putwordon}} - -% \defopon {category on}class name args -\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } - -% \deffngeneral {subind}category name args -% -\def\deffngeneral#1#2 #3 #4\endheader{% - % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}. - \dosubind{fn}{\code{#3}}{#1}% - \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}% -} - -% Typed functions: - -% @deftypefn category type name args -\makedefun{deftypefn}{\deftypefngeneral{}} - -% @deftypeop category class type name args -\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}} - -% \deftypeopon {category on}class type name args -\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } - -% \deftypefngeneral {subind}category type name args -% -\def\deftypefngeneral#1#2 #3 #4 #5\endheader{% - \dosubind{fn}{\code{#4}}{#1}% - \doingtypefntrue - \defname{#2}{#3}{#4}\defunargs{#5\unskip}% -} - -% Typed variables: - -% @deftypevr category type var args -\makedefun{deftypevr}{\deftypecvgeneral{}} - -% @deftypecv category class type var args -\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}} - -% \deftypecvof {category of}class type var args -\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} } - -% \deftypecvgeneral {subind}category type var args -% -\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{% - \dosubind{vr}{\code{#4}}{#1}% - \defname{#2}{#3}{#4}\defunargs{#5\unskip}% -} - -% Untyped variables: - -% @defvr category var args -\makedefun{defvr}#1 {\deftypevrheader{#1} {} } - -% @defcv category class var args -\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}} - -% \defcvof {category of}class var args -\def\defcvof#1#2 {\deftypecvof{#1}#2 {} } - -% Types: - -% @deftp category name args -\makedefun{deftp}#1 #2 #3\endheader{% - \doind{tp}{\code{#2}}% - \defname{#1}{}{#2}\defunargs{#3\unskip}% -} - -% Remaining @defun-like shortcuts: -\makedefun{defun}{\deffnheader{\putwordDeffunc} } -\makedefun{defmac}{\deffnheader{\putwordDefmac} } -\makedefun{defspec}{\deffnheader{\putwordDefspec} } -\makedefun{deftypefun}{\deftypefnheader{\putwordDeffunc} } -\makedefun{defvar}{\defvrheader{\putwordDefvar} } -\makedefun{defopt}{\defvrheader{\putwordDefopt} } -\makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} } -\makedefun{defmethod}{\defopon\putwordMethodon} -\makedefun{deftypemethod}{\deftypeopon\putwordMethodon} -\makedefun{defivar}{\defcvof\putwordInstanceVariableof} -\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof} - -% \defname, which formats the name of the @def (not the args). -% #1 is the category, such as "Function". -% #2 is the return type, if any. -% #3 is the function name. -% -% We are followed by (but not passed) the arguments, if any. -% -\def\defname#1#2#3{% - \par - % Get the values of \leftskip and \rightskip as they were outside the @def... - \advance\leftskip by -\defbodyindent - % - % Determine if we are typesetting the return type of a typed function - % on a line by itself. - \rettypeownlinefalse - \ifdoingtypefn % doing a typed function specifically? - % then check user option for putting return type on its own line: - \expandafter\ifx\csname SETtxideftypefnnl\endcsname\relax \else - \rettypeownlinetrue - \fi - \fi - % - % How we'll format the category name. Putting it in brackets helps - % distinguish it from the body text that may end up on the next line - % just below it. - \def\temp{#1}% - \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi} - % - % Figure out line sizes for the paragraph shape. We'll always have at - % least two. - \tempnum = 2 - % - % The first line needs space for \box0; but if \rightskip is nonzero, - % we need only space for the part of \box0 which exceeds it: - \dimen0=\hsize \advance\dimen0 by -\wd0 \advance\dimen0 by \rightskip - % - % If doing a return type on its own line, we'll have another line. - \ifrettypeownline - \advance\tempnum by 1 - \def\maybeshapeline{0in \hsize}% - \else - \def\maybeshapeline{}% - \fi - % - % The continuations: - \dimen2=\hsize \advance\dimen2 by -\defargsindent - % - % The final paragraph shape: - \parshape \tempnum 0in \dimen0 \maybeshapeline \defargsindent \dimen2 - % - % Put the category name at the right margin. - \noindent - \hbox to 0pt{% - \hfil\box0 \kern-\hsize - % \hsize has to be shortened this way: - \kern\leftskip - % Intentionally do not respect \rightskip, since we need the space. - }% - % - % Allow all lines to be underfull without complaint: - \tolerance=10000 \hbadness=10000 - \exdentamount=\defbodyindent - {% - % defun fonts. We use typewriter by default (used to be bold) because: - % . we're printing identifiers, they should be in tt in principle. - % . in languages with many accents, such as Czech or French, it's - % common to leave accents off identifiers. The result looks ok in - % tt, but exceedingly strange in rm. - % . we don't want -- and --- to be treated as ligatures. - % . this still does not fix the ?` and !` ligatures, but so far no - % one has made identifiers using them :). - \df \tt - \def\temp{#2}% text of the return type - \ifx\temp\empty\else - \tclose{\temp}% typeset the return type - \ifrettypeownline - % put return type on its own line; prohibit line break following: - \hfil\vadjust{\nobreak}\break - \else - \space % type on same line, so just followed by a space - \fi - \fi % no return type - #3% output function name - }% - {\rm\enskip}% hskip 0.5 em of \tenrm - % - \boldbrax - % arguments will be output next, if any. -} - -% Print arguments in slanted roman (not ttsl), inconsistently with using -% tt for the name. This is because literal text is sometimes needed in -% the argument list (groff manual), and ttsl and tt are not very -% distinguishable. Prevent hyphenation at `-' chars. -% -\def\defunargs#1{% - % use sl by default (not ttsl), - % tt for the names. - \df \sl \hyphenchar\font=0 - % - % On the other hand, if an argument has two dashes (for instance), we - % want a way to get ttsl. Let's try @var for that. - \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}% - #1% - \sl\hyphenchar\font=45 -} - -% We want ()&[] to print specially on the defun line. -% -\def\activeparens{% - \catcode`\(=\active \catcode`\)=\active - \catcode`\[=\active \catcode`\]=\active - \catcode`\&=\active -} - -% Make control sequences which act like normal parenthesis chars. -\let\lparen = ( \let\rparen = ) - -% Be sure that we always have a definition for `(', etc. For example, -% if the fn name has parens in it, \boldbrax will not be in effect yet, -% so TeX would otherwise complain about undefined control sequence. -{ - \activeparens - \global\let(=\lparen \global\let)=\rparen - \global\let[=\lbrack \global\let]=\rbrack - \global\let& = \& - - \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb} - \gdef\magicamp{\let&=\amprm} -} - -\newcount\parencount - -% If we encounter &foo, then turn on ()-hacking afterwards -\newif\ifampseen -\def\amprm#1 {\ampseentrue{\bf\ }} - -\def\parenfont{% - \ifampseen - % At the first level, print parens in roman, - % otherwise use the default font. - \ifnum \parencount=1 \rm \fi - \else - % The \sf parens (in \boldbrax) actually are a little bolder than - % the contained text. This is especially needed for [ and ] . - \sf - \fi -} -\def\infirstlevel#1{% - \ifampseen - \ifnum\parencount=1 - #1% - \fi - \fi -} -\def\bfafterword#1 {#1 \bf} - -\def\opnr{% - \global\advance\parencount by 1 - {\parenfont(}% - \infirstlevel \bfafterword -} -\def\clnr{% - {\parenfont)}% - \infirstlevel \sl - \global\advance\parencount by -1 -} - -\newcount\brackcount -\def\lbrb{% - \global\advance\brackcount by 1 - {\bf[}% -} -\def\rbrb{% - {\bf]}% - \global\advance\brackcount by -1 -} - -\def\checkparencounts{% - \ifnum\parencount=0 \else \badparencount \fi - \ifnum\brackcount=0 \else \badbrackcount \fi -} -% these should not use \errmessage; the glibc manual, at least, actually -% has such constructs (when documenting function pointers). -\def\badparencount{% - \message{Warning: unbalanced parentheses in @def...}% - \global\parencount=0 -} -\def\badbrackcount{% - \message{Warning: unbalanced square brackets in @def...}% - \global\brackcount=0 -} - - -\message{macros,} -% @macro. - -% To do this right we need a feature of e-TeX, \scantokens, -% which we arrange to emulate with a temporary file in ordinary TeX. -\ifx\eTeXversion\thisisundefined - \newwrite\macscribble - \def\scantokens#1{% - \toks0={#1}% - \immediate\openout\macscribble=\jobname.tmp - \immediate\write\macscribble{\the\toks0}% - \immediate\closeout\macscribble - \input \jobname.tmp - } -\fi - -\def\scanmacro#1{\begingroup - \newlinechar`\^^M - \let\xeatspaces\eatspaces - % - % Undo catcode changes of \startcontents and \doprintindex - % When called from @insertcopying or (short)caption, we need active - % backslash to get it printed correctly. Previously, we had - % \catcode`\\=\other instead. We'll see whether a problem appears - % with macro expansion. --kasal, 19aug04 - \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ - % - % ... and for \example: - \spaceisspace - % - % The \empty here causes a following catcode 5 newline to be eaten as - % part of reading whitespace after a control sequence. It does not - % eat a catcode 13 newline. There's no good way to handle the two - % cases (untried: maybe e-TeX's \everyeof could help, though plain TeX - % would then have different behavior). See the Macro Details node in - % the manual for the workaround we recommend for macros and - % line-oriented commands. - % - \scantokens{#1\empty}% -\endgroup} - -\def\scanexp#1{% - \edef\temp{\noexpand\scanmacro{#1}}% - \temp -} - -\newcount\paramno % Count of parameters -\newtoks\macname % Macro name -\newif\ifrecursive % Is it recursive? - -% List of all defined macros in the form -% \definedummyword\macro1\definedummyword\macro2... -% Currently is also contains all @aliases; the list can be split -% if there is a need. -\def\macrolist{} - -% Add the macro to \macrolist -\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname} -\def\addtomacrolistxxx#1{% - \toks0 = \expandafter{\macrolist\definedummyword#1}% - \xdef\macrolist{\the\toks0}% -} - -% Utility routines. -% This does \let #1 = #2, with \csnames; that is, -% \let \csname#1\endcsname = \csname#2\endcsname -% (except of course we have to play expansion games). -% -\def\cslet#1#2{% - \expandafter\let - \csname#1\expandafter\endcsname - \csname#2\endcsname -} - -% Trim leading and trailing spaces off a string. -% Concepts from aro-bend problem 15 (see CTAN). -{\catcode`\@=11 -\gdef\eatspaces #1{\expandafter\trim@\expandafter{#1 }} -\gdef\trim@ #1{\trim@@ @#1 @ #1 @ @@} -\gdef\trim@@ #1@ #2@ #3@@{\trim@@@\empty #2 @} -\def\unbrace#1{#1} -\unbrace{\gdef\trim@@@ #1 } #2@{#1} -} - -% Trim a single trailing ^^M off a string. -{\catcode`\^^M=\other \catcode`\Q=3% -\gdef\eatcr #1{\eatcra #1Q^^MQ}% -\gdef\eatcra#1^^MQ{\eatcrb#1Q}% -\gdef\eatcrb#1Q#2Q{#1}% -} - -% Macro bodies are absorbed as an argument in a context where -% all characters are catcode 10, 11 or 12, except \ which is active -% (as in normal texinfo). It is necessary to change the definition of \ -% to recognize macro arguments; this is the job of \mbodybackslash. -% -% Non-ASCII encodings make 8-bit characters active, so un-activate -% them to avoid their expansion. Must do this non-globally, to -% confine the change to the current group. -% -% It's necessary to have hard CRs when the macro is executed. This is -% done by making ^^M (\endlinechar) catcode 12 when reading the macro -% body, and then making it the \newlinechar in \scanmacro. -% -\def\scanctxt{% used as subroutine - \catcode`\"=\other - \catcode`\+=\other - \catcode`\<=\other - \catcode`\>=\other - \catcode`\@=\other - \catcode`\^=\other - \catcode`\_=\other - \catcode`\|=\other - \catcode`\~=\other - \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi -} - -\def\scanargctxt{% used for copying and captions, not macros. - \scanctxt - \catcode`\\=\other - \catcode`\^^M=\other -} - -\def\macrobodyctxt{% used for @macro definitions - \scanctxt - \catcode`\{=\other - \catcode`\}=\other - \catcode`\^^M=\other - \usembodybackslash -} - -\def\macroargctxt{% used when scanning invocations - \scanctxt - \catcode`\\=0 -} -% why catcode 0 for \ in the above? To recognize \\ \{ \} as "escapes" -% for the single characters \ { }. Thus, we end up with the "commands" -% that would be written @\ @{ @} in a Texinfo document. -% -% We already have @{ and @}. For @\, we define it here, and only for -% this purpose, to produce a typewriter backslash (so, the @\ that we -% define for @math can't be used with @macro calls): -% -\def\\{\normalbackslash}% -% -% We would like to do this for \, too, since that is what makeinfo does. -% But it is not possible, because Texinfo already has a command @, for a -% cedilla accent. Documents must use @comma{} instead. -% -% \anythingelse will almost certainly be an error of some kind. - - -% \mbodybackslash is the definition of \ in @macro bodies. -% It maps \foo\ => \csname macarg.foo\endcsname => #N -% where N is the macro parameter number. -% We define \csname macarg.\endcsname to be \realbackslash, so -% \\ in macro replacement text gets you a backslash. -% -{\catcode`@=0 @catcode`@\=@active - @gdef@usembodybackslash{@let\=@mbodybackslash} - @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname} -} -\expandafter\def\csname macarg.\endcsname{\realbackslash} - -\def\margbackslash#1{\char`\#1 } - -\def\macro{\recursivefalse\parsearg\macroxxx} -\def\rmacro{\recursivetrue\parsearg\macroxxx} - -\def\macroxxx#1{% - \getargs{#1}% now \macname is the macname and \argl the arglist - \ifx\argl\empty % no arguments - \paramno=0\relax - \else - \expandafter\parsemargdef \argl;% - \if\paramno>256\relax - \ifx\eTeXversion\thisisundefined - \errhelp = \EMsimple - \errmessage{You need eTeX to compile a file with macros with more than 256 arguments} - \fi - \fi - \fi - \if1\csname ismacro.\the\macname\endcsname - \message{Warning: redefining \the\macname}% - \else - \expandafter\ifx\csname \the\macname\endcsname \relax - \else \errmessage{Macro name \the\macname\space already defined}\fi - \global\cslet{macsave.\the\macname}{\the\macname}% - \global\expandafter\let\csname ismacro.\the\macname\endcsname=1% - \addtomacrolist{\the\macname}% - \fi - \begingroup \macrobodyctxt - \ifrecursive \expandafter\parsermacbody - \else \expandafter\parsemacbody - \fi} - -\parseargdef\unmacro{% - \if1\csname ismacro.#1\endcsname - \global\cslet{#1}{macsave.#1}% - \global\expandafter\let \csname ismacro.#1\endcsname=0% - % Remove the macro name from \macrolist: - \begingroup - \expandafter\let\csname#1\endcsname \relax - \let\definedummyword\unmacrodo - \xdef\macrolist{\macrolist}% - \endgroup - \else - \errmessage{Macro #1 not defined}% - \fi -} - -% Called by \do from \dounmacro on each macro. The idea is to omit any -% macro definitions that have been changed to \relax. -% -\def\unmacrodo#1{% - \ifx #1\relax - % remove this - \else - \noexpand\definedummyword \noexpand#1% - \fi -} - -% This makes use of the obscure feature that if the last token of a -% is #, then the preceding argument is delimited by -% an opening brace, and that opening brace is not consumed. -\def\getargs#1{\getargsxxx#1{}} -\def\getargsxxx#1#{\getmacname #1 \relax\getmacargs} -\def\getmacname#1 #2\relax{\macname={#1}} -\def\getmacargs#1{\def\argl{#1}} - -% For macro processing make @ a letter so that we can make Texinfo private macro names. -\edef\texiatcatcode{\the\catcode`\@} -\catcode `@=11\relax - -% Parse the optional {params} list. Set up \paramno and \paramlist -% so \defmacro knows what to do. Define \macarg.BLAH for each BLAH -% in the params list to some hook where the argument si to be expanded. If -% there are less than 10 arguments that hook is to be replaced by ##N where N -% is the position in that list, that is to say the macro arguments are to be -% defined `a la TeX in the macro body. -% -% That gets used by \mbodybackslash (above). -% -% We need to get `macro parameter char #' into several definitions. -% The technique used is stolen from LaTeX: let \hash be something -% unexpandable, insert that wherever you need a #, and then redefine -% it to # just before using the token list produced. -% -% The same technique is used to protect \eatspaces till just before -% the macro is used. -% -% If there are 10 or more arguments, a different technique is used, where the -% hook remains in the body, and when macro is to be expanded the body is -% processed again to replace the arguments. -% -% In that case, the hook is \the\toks N-1, and we simply set \toks N-1 to the -% argument N value and then \edef the body (nothing else will expand because of -% the catcode regime underwhich the body was input). -% -% If you compile with TeX (not eTeX), and you have macros with 10 or more -% arguments, you need that no macro has more than 256 arguments, otherwise an -% error is produced. -\def\parsemargdef#1;{% - \paramno=0\def\paramlist{}% - \let\hash\relax - \let\xeatspaces\relax - \parsemargdefxxx#1,;,% - % In case that there are 10 or more arguments we parse again the arguments - % list to set new definitions for the \macarg.BLAH macros corresponding to - % each BLAH argument. It was anyhow needed to parse already once this list - % in order to count the arguments, and as macros with at most 9 arguments - % are by far more frequent than macro with 10 or more arguments, defining - % twice the \macarg.BLAH macros does not cost too much processing power. - \ifnum\paramno<10\relax\else - \paramno0\relax - \parsemmanyargdef@@#1,;,% 10 or more arguments - \fi -} -\def\parsemargdefxxx#1,{% - \if#1;\let\next=\relax - \else \let\next=\parsemargdefxxx - \advance\paramno by 1 - \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname - {\xeatspaces{\hash\the\paramno}}% - \edef\paramlist{\paramlist\hash\the\paramno,}% - \fi\next} - -\def\parsemmanyargdef@@#1,{% - \if#1;\let\next=\relax - \else - \let\next=\parsemmanyargdef@@ - \edef\tempb{\eatspaces{#1}}% - \expandafter\def\expandafter\tempa - \expandafter{\csname macarg.\tempb\endcsname}% - % Note that we need some extra \noexpand\noexpand, this is because we - % don't want \the to be expanded in the \parsermacbody as it uses an - % \xdef . - \expandafter\edef\tempa - {\noexpand\noexpand\noexpand\the\toks\the\paramno}% - \advance\paramno by 1\relax - \fi\next} - -% These two commands read recursive and nonrecursive macro bodies. -% (They're different since rec and nonrec macros end differently.) -% - -\catcode `\@\texiatcatcode -\long\def\parsemacbody#1@end macro% -{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% -\long\def\parsermacbody#1@end rmacro% -{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% -\catcode `\@=11\relax - -\let\endargs@\relax -\let\nil@\relax -\def\nilm@{\nil@}% -\long\def\nillm@{\nil@}% - -% This macro is expanded during the Texinfo macro expansion, not during its -% definition. It gets all the arguments values and assigns them to macros -% macarg.ARGNAME -% -% #1 is the macro name -% #2 is the list of argument names -% #3 is the list of argument values -\def\getargvals@#1#2#3{% - \def\macargdeflist@{}% - \def\saveparamlist@{#2}% Need to keep a copy for parameter expansion. - \def\paramlist{#2,\nil@}% - \def\macroname{#1}% - \begingroup - \macroargctxt - \def\argvaluelist{#3,\nil@}% - \def\@tempa{#3}% - \ifx\@tempa\empty - \setemptyargvalues@ - \else - \getargvals@@ - \fi -} - -% -\def\getargvals@@{% - \ifx\paramlist\nilm@ - % Some sanity check needed here that \argvaluelist is also empty. - \ifx\argvaluelist\nillm@ - \else - \errhelp = \EMsimple - \errmessage{Too many arguments in macro `\macroname'!}% - \fi - \let\next\macargexpandinbody@ - \else - \ifx\argvaluelist\nillm@ - % No more arguments values passed to macro. Set remaining named-arg - % macros to empty. - \let\next\setemptyargvalues@ - \else - % pop current arg name into \@tempb - \def\@tempa##1{\pop@{\@tempb}{\paramlist}##1\endargs@}% - \expandafter\@tempa\expandafter{\paramlist}% - % pop current argument value into \@tempc - \def\@tempa##1{\longpop@{\@tempc}{\argvaluelist}##1\endargs@}% - \expandafter\@tempa\expandafter{\argvaluelist}% - % Here \@tempb is the current arg name and \@tempc is the current arg value. - % First place the new argument macro definition into \@tempd - \expandafter\macname\expandafter{\@tempc}% - \expandafter\let\csname macarg.\@tempb\endcsname\relax - \expandafter\def\expandafter\@tempe\expandafter{% - \csname macarg.\@tempb\endcsname}% - \edef\@tempd{\long\def\@tempe{\the\macname}}% - \push@\@tempd\macargdeflist@ - \let\next\getargvals@@ - \fi - \fi - \next -} - -\def\push@#1#2{% - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter#2% - \expandafter\expandafter\expandafter{% - \expandafter#1#2}% -} - -% Replace arguments by their values in the macro body, and place the result -% in macro \@tempa -\def\macvalstoargs@{% - % To do this we use the property that token registers that are \the'ed - % within an \edef expand only once. So we are going to place all argument - % values into respective token registers. - % - % First we save the token context, and initialize argument numbering. - \begingroup - \paramno0\relax - % Then, for each argument number #N, we place the corresponding argument - % value into a new token list register \toks#N - \expandafter\putargsintokens@\saveparamlist@,;,% - % Then, we expand the body so that argument are replaced by their - % values. The trick for values not to be expanded themselves is that they - % are within tokens and that tokens expand only once in an \edef . - \edef\@tempc{\csname mac.\macroname .body\endcsname}% - % Now we restore the token stack pointer to free the token list registers - % which we have used, but we make sure that expanded body is saved after - % group. - \expandafter - \endgroup - \expandafter\def\expandafter\@tempa\expandafter{\@tempc}% - } - -\def\macargexpandinbody@{% - %% Define the named-macro outside of this group and then close this group. - \expandafter - \endgroup - \macargdeflist@ - % First the replace in body the macro arguments by their values, the result - % is in \@tempa . - \macvalstoargs@ - % Then we point at the \norecurse or \gobble (for recursive) macro value - % with \@tempb . - \expandafter\let\expandafter\@tempb\csname mac.\macroname .recurse\endcsname - % Depending on whether it is recursive or not, we need some tailing - % \egroup . - \ifx\@tempb\gobble - \let\@tempc\relax - \else - \let\@tempc\egroup - \fi - % And now we do the real job: - \edef\@tempd{\noexpand\@tempb{\macroname}\noexpand\scanmacro{\@tempa}\@tempc}% - \@tempd -} - -\def\putargsintokens@#1,{% - \if#1;\let\next\relax - \else - \let\next\putargsintokens@ - % First we allocate the new token list register, and give it a temporary - % alias \@tempb . - \toksdef\@tempb\the\paramno - % Then we place the argument value into that token list register. - \expandafter\let\expandafter\@tempa\csname macarg.#1\endcsname - \expandafter\@tempb\expandafter{\@tempa}% - \advance\paramno by 1\relax - \fi - \next -} - -% Save the token stack pointer into macro #1 -\def\texisavetoksstackpoint#1{\edef#1{\the\@cclvi}} -% Restore the token stack pointer from number in macro #1 -\def\texirestoretoksstackpoint#1{\expandafter\mathchardef\expandafter\@cclvi#1\relax} -% newtoks that can be used non \outer . -\def\texinonouternewtoks{\alloc@ 5\toks \toksdef \@cclvi} - -% Tailing missing arguments are set to empty -\def\setemptyargvalues@{% - \ifx\paramlist\nilm@ - \let\next\macargexpandinbody@ - \else - \expandafter\setemptyargvaluesparser@\paramlist\endargs@ - \let\next\setemptyargvalues@ - \fi - \next -} - -\def\setemptyargvaluesparser@#1,#2\endargs@{% - \expandafter\def\expandafter\@tempa\expandafter{% - \expandafter\def\csname macarg.#1\endcsname{}}% - \push@\@tempa\macargdeflist@ - \def\paramlist{#2}% -} - -% #1 is the element target macro -% #2 is the list macro -% #3,#4\endargs@ is the list value -\def\pop@#1#2#3,#4\endargs@{% - \def#1{#3}% - \def#2{#4}% -} -\long\def\longpop@#1#2#3,#4\endargs@{% - \long\def#1{#3}% - \long\def#2{#4}% -} - -% This defines a Texinfo @macro. There are eight cases: recursive and -% nonrecursive macros of zero, one, up to nine, and many arguments. -% Much magic with \expandafter here. -% \xdef is used so that macro definitions will survive the file -% they're defined in; @include reads the file inside a group. -% -\def\defmacro{% - \let\hash=##% convert placeholders to macro parameter chars - \ifrecursive - \ifcase\paramno - % 0 - \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\scanmacro{\temp}}% - \or % 1 - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt - \noexpand\braceorline - \expandafter\noexpand\csname\the\macname xxx\endcsname}% - \expandafter\xdef\csname\the\macname xxx\endcsname##1{% - \egroup\noexpand\scanmacro{\temp}}% - \else - \ifnum\paramno<10\relax % at most 9 - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt - \noexpand\csname\the\macname xx\endcsname}% - \expandafter\xdef\csname\the\macname xx\endcsname##1{% - \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% - \expandafter\expandafter - \expandafter\xdef - \expandafter\expandafter - \csname\the\macname xxx\endcsname - \paramlist{\egroup\noexpand\scanmacro{\temp}}% - \else % 10 or more - \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\getargvals@{\the\macname}{\argl}% - }% - \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp - \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble - \fi - \fi - \else - \ifcase\paramno - % 0 - \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\norecurse{\the\macname}% - \noexpand\scanmacro{\temp}\egroup}% - \or % 1 - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt - \noexpand\braceorline - \expandafter\noexpand\csname\the\macname xxx\endcsname}% - \expandafter\xdef\csname\the\macname xxx\endcsname##1{% - \egroup - \noexpand\norecurse{\the\macname}% - \noexpand\scanmacro{\temp}\egroup}% - \else % at most 9 - \ifnum\paramno<10\relax - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt - \expandafter\noexpand\csname\the\macname xx\endcsname}% - \expandafter\xdef\csname\the\macname xx\endcsname##1{% - \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% - \expandafter\expandafter - \expandafter\xdef - \expandafter\expandafter - \csname\the\macname xxx\endcsname - \paramlist{% - \egroup - \noexpand\norecurse{\the\macname}% - \noexpand\scanmacro{\temp}\egroup}% - \else % 10 or more: - \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\getargvals@{\the\macname}{\argl}% - }% - \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp - \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\norecurse - \fi - \fi - \fi} - -\catcode `\@\texiatcatcode\relax - -\def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}} - -% \braceorline decides whether the next nonwhitespace character is a -% {. If so it reads up to the closing }, if not, it reads the whole -% line. Whatever was read is then fed to the next control sequence -% as an argument (by \parsebrace or \parsearg). -% -\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} -\def\braceorlinexxx{% - \ifx\nchar\bgroup\else - \expandafter\parsearg - \fi \macnamexxx} - - -% @alias. -% We need some trickery to remove the optional spaces around the equal -% sign. Make them active and then expand them all to nothing. -% -\def\alias{\parseargusing\obeyspaces\aliasxxx} -\def\aliasxxx #1{\aliasyyy#1\relax} -\def\aliasyyy #1=#2\relax{% - {% - \expandafter\let\obeyedspace=\empty - \addtomacrolist{#1}% - \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}% - }% - \next -} - - -\message{cross references,} - -\newwrite\auxfile -\newif\ifhavexrefs % True if xref values are known. -\newif\ifwarnedxrefs % True if we warned once that they aren't known. - -% @inforef is relatively simple. -\def\inforef #1{\inforefzzz #1,,,,**} -\def\inforefzzz #1,#2,#3,#4**{% - \putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, - node \samp{\ignorespaces#1{}}} - -% @node's only job in TeX is to define \lastnode, which is used in -% cross-references. The @node line might or might not have commas, and -% might or might not have spaces before the first comma, like: -% @node foo , bar , ... -% We don't want such trailing spaces in the node name. -% -\parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse} -% -% also remove a trailing comma, in case of something like this: -% @node Help-Cross, , , Cross-refs -\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse} -\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}} - -\let\nwnode=\node -\let\lastnode=\empty - -% Write a cross-reference definition for the current node. #1 is the -% type (Ynumbered, Yappendix, Ynothing). -% -\def\donoderef#1{% - \ifx\lastnode\empty\else - \setref{\lastnode}{#1}% - \global\let\lastnode=\empty - \fi -} - -% @anchor{NAME} -- define xref target at arbitrary point. -% -\newcount\savesfregister -% -\def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi} -\def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi} -\def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces} - -% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an -% anchor), which consists of three parts: -% 1) NAME-title - the current sectioning name taken from \lastsection, -% or the anchor name. -% 2) NAME-snt - section number and type, passed as the SNT arg, or -% empty for anchors. -% 3) NAME-pg - the page number. -% -% This is called from \donoderef, \anchor, and \dofloat. In the case of -% floats, there is an additional part, which is not written here: -% 4) NAME-lof - the text as it should appear in a @listoffloats. -% -\def\setref#1#2{% - \pdfmkdest{#1}% - \iflinks - {% - \atdummies % preserve commands, but don't expand them - \edef\writexrdef##1##2{% - \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef - ##1}{##2}}% these are parameters of \writexrdef - }% - \toks0 = \expandafter{\lastsection}% - \immediate \writexrdef{title}{\the\toks0 }% - \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. - \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout - }% - \fi -} - -% @xrefautosectiontitle on|off says whether @section(ing) names are used -% automatically in xrefs, if the third arg is not explicitly specified. -% This was provided as a "secret" @set xref-automatic-section-title -% variable, now it's official. -% -\parseargdef\xrefautomaticsectiontitle{% - \def\temp{#1}% - \ifx\temp\onword - \expandafter\let\csname SETxref-automatic-section-title\endcsname - = \empty - \else\ifx\temp\offword - \expandafter\let\csname SETxref-automatic-section-title\endcsname - = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @xrefautomaticsectiontitle value `\temp', - must be on|off}% - \fi\fi -} - - -% @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is -% the node name, #2 the name of the Info cross-reference, #3 the printed -% node name, #4 the name of the Info file, #5 the name of the printed -% manual. All but the node name can be omitted. -% -\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]} -\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]} -\def\ref#1{\xrefX[#1,,,,,,,]} -\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup - \unsepspaces - \def\printedmanual{\ignorespaces #5}% - \def\printedrefname{\ignorespaces #3}% - \setbox1=\hbox{\printedmanual\unskip}% - \setbox0=\hbox{\printedrefname\unskip}% - \ifdim \wd0 = 0pt - % No printed node name was explicitly given. - \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax - % Use the node name inside the square brackets. - \def\printedrefname{\ignorespaces #1}% - \else - % Use the actual chapter/section title appear inside - % the square brackets. Use the real section title if we have it. - \ifdim \wd1 > 0pt - % It is in another manual, so we don't have it. - \def\printedrefname{\ignorespaces #1}% - \else - \ifhavexrefs - % We know the real title if we have the xref values. - \def\printedrefname{\refx{#1-title}{}}% - \else - % Otherwise just copy the Info node name. - \def\printedrefname{\ignorespaces #1}% - \fi% - \fi - \fi - \fi - % - % Make link in pdf output. - \ifpdf - {\indexnofonts - \turnoffactive - % This expands tokens, so do it after making catcode changes, so _ - % etc. don't get their TeX definitions. - \getfilename{#4}% - % - \edef\pdfxrefdest{#1}% - \txiescapepdf\pdfxrefdest - % - \leavevmode - \startlink attr{/Border [0 0 0]}% - \ifnum\filenamelength>0 - goto file{\the\filename.pdf} name{\pdfxrefdest}% - \else - goto name{\pdfmkpgn{\pdfxrefdest}}% - \fi - }% - \setcolor{\linkcolor}% - \fi - % - % Float references are printed completely differently: "Figure 1.2" - % instead of "[somenode], p.3". We distinguish them by the - % LABEL-title being set to a magic string. - {% - % Have to otherify everything special to allow the \csname to - % include an _ in the xref name, etc. - \indexnofonts - \turnoffactive - \expandafter\global\expandafter\let\expandafter\Xthisreftitle - \csname XR#1-title\endcsname - }% - \iffloat\Xthisreftitle - % If the user specified the print name (third arg) to the ref, - % print it instead of our usual "Figure 1.2". - \ifdim\wd0 = 0pt - \refx{#1-snt}{}% - \else - \printedrefname - \fi - % - % if the user also gave the printed manual name (fifth arg), append - % "in MANUALNAME". - \ifdim \wd1 > 0pt - \space \putwordin{} \cite{\printedmanual}% - \fi - \else - % node/anchor (non-float) references. - % - % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not - % insert empty discretionaries after hyphens, which means that it will - % not find a line break at a hyphen in a node names. Since some manuals - % are best written with fairly long node names, containing hyphens, this - % is a loss. Therefore, we give the text of the node name again, so it - % is as if TeX is seeing it for the first time. - \ifdim \wd1 > 0pt - \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}% - \else - % _ (for example) has to be the character _ for the purposes of the - % control sequence corresponding to the node, but it has to expand - % into the usual \leavevmode...\vrule stuff for purposes of - % printing. So we \turnoffactive for the \refx-snt, back on for the - % printing, back off for the \refx-pg. - {\turnoffactive - % Only output a following space if the -snt ref is nonempty; for - % @unnumbered and @anchor, it won't be. - \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% - \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi - }% - % output the `[mynode]' via a macro so it can be overridden. - \xrefprintnodename\printedrefname - % - % But we always want a comma and a space: - ,\space - % - % output the `page 3'. - \turnoffactive \putwordpage\tie\refx{#1-pg}{}% - \fi - \fi - \endlink -\endgroup} - -% This macro is called from \xrefX for the `[nodename]' part of xref -% output. It's a separate macro only so it can be changed more easily, -% since square brackets don't work well in some documents. Particularly -% one that Bob is working on :). -% -\def\xrefprintnodename#1{[#1]} - -% Things referred to by \setref. -% -\def\Ynothing{} -\def\Yomitfromtoc{} -\def\Ynumbered{% - \ifnum\secno=0 - \putwordChapter@tie \the\chapno - \else \ifnum\subsecno=0 - \putwordSection@tie \the\chapno.\the\secno - \else \ifnum\subsubsecno=0 - \putwordSection@tie \the\chapno.\the\secno.\the\subsecno - \else - \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno - \fi\fi\fi -} -\def\Yappendix{% - \ifnum\secno=0 - \putwordAppendix@tie @char\the\appendixno{}% - \else \ifnum\subsecno=0 - \putwordSection@tie @char\the\appendixno.\the\secno - \else \ifnum\subsubsecno=0 - \putwordSection@tie @char\the\appendixno.\the\secno.\the\subsecno - \else - \putwordSection@tie - @char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno - \fi\fi\fi -} - -% Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME. -% If its value is nonempty, SUFFIX is output afterward. -% -\def\refx#1#2{% - {% - \indexnofonts - \otherbackslash - \expandafter\global\expandafter\let\expandafter\thisrefX - \csname XR#1\endcsname - }% - \ifx\thisrefX\relax - % If not defined, say something at least. - \angleleft un\-de\-fined\angleright - \iflinks - \ifhavexrefs - {\toks0 = {#1}% avoid expansion of possibly-complex value - \message{\linenumber Undefined cross reference `\the\toks0'.}}% - \else - \ifwarnedxrefs\else - \global\warnedxrefstrue - \message{Cross reference values unknown; you must run TeX again.}% - \fi - \fi - \fi - \else - % It's defined, so just use it. - \thisrefX - \fi - #2% Output the suffix in any case. -} - -% This is the macro invoked by entries in the aux file. Usually it's -% just a \def (we prepend XR to the control sequence name to avoid -% collisions). But if this is a float type, we have more work to do. -% -\def\xrdef#1#2{% - {% The node name might contain 8-bit characters, which in our current - % implementation are changed to commands like @'e. Don't let these - % mess up the control sequence name. - \indexnofonts - \turnoffactive - \xdef\safexrefname{#1}% - }% - % - \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref - % - % Was that xref control sequence that we just defined for a float? - \expandafter\iffloat\csname XR\safexrefname\endcsname - % it was a float, and we have the (safe) float type in \iffloattype. - \expandafter\let\expandafter\floatlist - \csname floatlist\iffloattype\endcsname - % - % Is this the first time we've seen this float type? - \expandafter\ifx\floatlist\relax - \toks0 = {\do}% yes, so just \do - \else - % had it before, so preserve previous elements in list. - \toks0 = \expandafter{\floatlist\do}% - \fi - % - % Remember this xref in the control sequence \floatlistFLOATTYPE, - % for later use in \listoffloats. - \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0 - {\safexrefname}}% - \fi -} - -% Read the last existing aux file, if any. No error if none exists. -% -\def\tryauxfile{% - \openin 1 \jobname.aux - \ifeof 1 \else - \readdatafile{aux}% - \global\havexrefstrue - \fi - \closein 1 -} - -\def\setupdatafile{% - \catcode`\^^@=\other - \catcode`\^^A=\other - \catcode`\^^B=\other - \catcode`\^^C=\other - \catcode`\^^D=\other - \catcode`\^^E=\other - \catcode`\^^F=\other - \catcode`\^^G=\other - \catcode`\^^H=\other - \catcode`\^^K=\other - \catcode`\^^L=\other - \catcode`\^^N=\other - \catcode`\^^P=\other - \catcode`\^^Q=\other - \catcode`\^^R=\other - \catcode`\^^S=\other - \catcode`\^^T=\other - \catcode`\^^U=\other - \catcode`\^^V=\other - \catcode`\^^W=\other - \catcode`\^^X=\other - \catcode`\^^Z=\other - \catcode`\^^[=\other - \catcode`\^^\=\other - \catcode`\^^]=\other - \catcode`\^^^=\other - \catcode`\^^_=\other - % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc. - % in xref tags, i.e., node names. But since ^^e4 notation isn't - % supported in the main text, it doesn't seem desirable. Furthermore, - % that is not enough: for node names that actually contain a ^ - % character, we would end up writing a line like this: 'xrdef {'hat - % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first - % argument, and \hat is not an expandable control sequence. It could - % all be worked out, but why? Either we support ^^ or we don't. - % - % The other change necessary for this was to define \auxhat: - % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter - % and then to call \auxhat in \setq. - % - \catcode`\^=\other - % - % Special characters. Should be turned off anyway, but... - \catcode`\~=\other - \catcode`\[=\other - \catcode`\]=\other - \catcode`\"=\other - \catcode`\_=\other - \catcode`\|=\other - \catcode`\<=\other - \catcode`\>=\other - \catcode`\$=\other - \catcode`\#=\other - \catcode`\&=\other - \catcode`\%=\other - \catcode`+=\other % avoid \+ for paranoia even though we've turned it off - % - % This is to support \ in node names and titles, since the \ - % characters end up in a \csname. It's easier than - % leaving it active and making its active definition an actual \ - % character. What I don't understand is why it works in the *value* - % of the xrdef. Seems like it should be a catcode12 \, and that - % should not typeset properly. But it works, so I'm moving on for - % now. --karl, 15jan04. - \catcode`\\=\other - % - % Make the characters 128-255 be printing characters. - {% - \count1=128 - \def\loop{% - \catcode\count1=\other - \advance\count1 by 1 - \ifnum \count1<256 \loop \fi - }% - }% - % - % @ is our escape character in .aux files, and we need braces. - \catcode`\{=1 - \catcode`\}=2 - \catcode`\@=0 -} - -\def\readdatafile#1{% -\begingroup - \setupdatafile - \input\jobname.#1 -\endgroup} - - -\message{insertions,} -% including footnotes. - -\newcount \footnoteno - -% The trailing space in the following definition for supereject is -% vital for proper filling; pages come out unaligned when you do a -% pagealignmacro call if that space before the closing brace is -% removed. (Generally, numeric constants should always be followed by a -% space to prevent strange expansion errors.) -\def\supereject{\par\penalty -20000\footnoteno =0 } - -% @footnotestyle is meaningful for Info output only. -\let\footnotestyle=\comment - -{\catcode `\@=11 -% -% Auto-number footnotes. Otherwise like plain. -\gdef\footnote{% - \let\indent=\ptexindent - \let\noindent=\ptexnoindent - \global\advance\footnoteno by \@ne - \edef\thisfootno{$^{\the\footnoteno}$}% - % - % In case the footnote comes at the end of a sentence, preserve the - % extra spacing after we do the footnote number. - \let\@sf\empty - \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\ptexslash\fi - % - % Remove inadvertent blank space before typesetting the footnote number. - \unskip - \thisfootno\@sf - \dofootnote -}% - -% Don't bother with the trickery in plain.tex to not require the -% footnote text as a parameter. Our footnotes don't need to be so general. -% -% Oh yes, they do; otherwise, @ifset (and anything else that uses -% \parseargline) fails inside footnotes because the tokens are fixed when -% the footnote is read. --karl, 16nov96. -% -\gdef\dofootnote{% - \insert\footins\bgroup - % We want to typeset this text as a normal paragraph, even if the - % footnote reference occurs in (for example) a display environment. - % So reset some parameters. - \hsize=\pagewidth - \interlinepenalty\interfootnotelinepenalty - \splittopskip\ht\strutbox % top baseline for broken footnotes - \splitmaxdepth\dp\strutbox - \floatingpenalty\@MM - \leftskip\z@skip - \rightskip\z@skip - \spaceskip\z@skip - \xspaceskip\z@skip - \parindent\defaultparindent - % - \smallfonts \rm - % - % Because we use hanging indentation in footnotes, a @noindent appears - % to exdent this text, so make it be a no-op. makeinfo does not use - % hanging indentation so @noindent can still be needed within footnote - % text after an @example or the like (not that this is good style). - \let\noindent = \relax - % - % Hang the footnote text off the number. Use \everypar in case the - % footnote extends for more than one paragraph. - \everypar = {\hang}% - \textindent{\thisfootno}% - % - % Don't crash into the line above the footnote text. Since this - % expands into a box, it must come within the paragraph, lest it - % provide a place where TeX can split the footnote. - \footstrut - % - % Invoke rest of plain TeX footnote routine. - \futurelet\next\fo@t -} -}%end \catcode `\@=11 - -% In case a @footnote appears in a vbox, save the footnote text and create -% the real \insert just after the vbox finished. Otherwise, the insertion -% would be lost. -% Similarly, if a @footnote appears inside an alignment, save the footnote -% text to a box and make the \insert when a row of the table is finished. -% And the same can be done for other insert classes. --kasal, 16nov03. - -% Replace the \insert primitive by a cheating macro. -% Deeper inside, just make sure that the saved insertions are not spilled -% out prematurely. -% -\def\startsavinginserts{% - \ifx \insert\ptexinsert - \let\insert\saveinsert - \else - \let\checkinserts\relax - \fi -} - -% This \insert replacement works for both \insert\footins{foo} and -% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}. -% -\def\saveinsert#1{% - \edef\next{\noexpand\savetobox \makeSAVEname#1}% - \afterassignment\next - % swallow the left brace - \let\temp = -} -\def\makeSAVEname#1{\makecsname{SAVE\expandafter\gobble\string#1}} -\def\savetobox#1{\global\setbox#1 = \vbox\bgroup \unvbox#1} - -\def\checksaveins#1{\ifvoid#1\else \placesaveins#1\fi} - -\def\placesaveins#1{% - \ptexinsert \csname\expandafter\gobblesave\string#1\endcsname - {\box#1}% -} - -% eat @SAVE -- beware, all of them have catcode \other: -{ - \def\dospecials{\do S\do A\do V\do E} \uncatcodespecials % ;-) - \gdef\gobblesave @SAVE{} -} - -% initialization: -\def\newsaveins #1{% - \edef\next{\noexpand\newsaveinsX \makeSAVEname#1}% - \next -} -\def\newsaveinsX #1{% - \csname newbox\endcsname #1% - \expandafter\def\expandafter\checkinserts\expandafter{\checkinserts - \checksaveins #1}% -} - -% initialize: -\let\checkinserts\empty -\newsaveins\footins -\newsaveins\margin - - -% @image. We use the macros from epsf.tex to support this. -% If epsf.tex is not installed and @image is used, we complain. -% -% Check for and read epsf.tex up front. If we read it only at @image -% time, we might be inside a group, and then its definitions would get -% undone and the next image would fail. -\openin 1 = epsf.tex -\ifeof 1 \else - % Do not bother showing banner with epsf.tex v2.7k (available in - % doc/epsf.tex and on ctan). - \def\epsfannounce{\toks0 = }% - \input epsf.tex -\fi -\closein 1 -% -% We will only complain once about lack of epsf.tex. -\newif\ifwarnednoepsf -\newhelp\noepsfhelp{epsf.tex must be installed for images to - work. It is also included in the Texinfo distribution, or you can get - it from ftp://tug.org/tex/epsf.tex.} -% -\def\image#1{% - \ifx\epsfbox\thisiundefined - \ifwarnednoepsf \else - \errhelp = \noepsfhelp - \errmessage{epsf.tex not found, images will be ignored}% - \global\warnednoepsftrue - \fi - \else - \imagexxx #1,,,,,\finish - \fi -} -% -% Arguments to @image: -% #1 is (mandatory) image filename; we tack on .eps extension. -% #2 is (optional) width, #3 is (optional) height. -% #4 is (ignored optional) html alt text. -% #5 is (ignored optional) extension. -% #6 is just the usual extra ignored arg for parsing stuff. -\newif\ifimagevmode -\def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup - \catcode`\^^M = 5 % in case we're inside an example - \normalturnoffactive % allow _ et al. in names - % If the image is by itself, center it. - \ifvmode - \imagevmodetrue - \nobreak\medskip - % Usually we'll have text after the image which will insert - % \parskip glue, so insert it here too to equalize the space - % above and below. - \nobreak\vskip\parskip - \nobreak - \fi - % - % Leave vertical mode so that indentation from an enclosing - % environment such as @quotation is respected. On the other hand, if - % it's at the top level, we don't want the normal paragraph indentation. - \noindent - % - % Output the image. - \ifpdf - \dopdfimage{#1}{#2}{#3}% - \else - % \epsfbox itself resets \epsf?size at each figure. - \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi - \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi - \epsfbox{#1.eps}% - \fi - % - \ifimagevmode \medskip \fi % space after the standalone image -\endgroup} - - -% @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables, -% etc. We don't actually implement floating yet, we always include the -% float "here". But it seemed the best name for the future. -% -\envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish} - -% There may be a space before second and/or third parameter; delete it. -\def\eatcommaspace#1, {#1,} - -% #1 is the optional FLOATTYPE, the text label for this float, typically -% "Figure", "Table", "Example", etc. Can't contain commas. If omitted, -% this float will not be numbered and cannot be referred to. -% -% #2 is the optional xref label. Also must be present for the float to -% be referable. -% -% #3 is the optional positioning argument; for now, it is ignored. It -% will somehow specify the positions allowed to float to (here, top, bottom). -% -% We keep a separate counter for each FLOATTYPE, which we reset at each -% chapter-level command. -\let\resetallfloatnos=\empty -% -\def\dofloat#1,#2,#3,#4\finish{% - \let\thiscaption=\empty - \let\thisshortcaption=\empty - % - % don't lose footnotes inside @float. - % - % BEWARE: when the floats start float, we have to issue warning whenever an - % insert appears inside a float which could possibly float. --kasal, 26may04 - % - \startsavinginserts - % - % We can't be used inside a paragraph. - \par - % - \vtop\bgroup - \def\floattype{#1}% - \def\floatlabel{#2}% - \def\floatloc{#3}% we do nothing with this yet. - % - \ifx\floattype\empty - \let\safefloattype=\empty - \else - {% - % the floattype might have accents or other special characters, - % but we need to use it in a control sequence name. - \indexnofonts - \turnoffactive - \xdef\safefloattype{\floattype}% - }% - \fi - % - % If label is given but no type, we handle that as the empty type. - \ifx\floatlabel\empty \else - % We want each FLOATTYPE to be numbered separately (Figure 1, - % Table 1, Figure 2, ...). (And if no label, no number.) - % - \expandafter\getfloatno\csname\safefloattype floatno\endcsname - \global\advance\floatno by 1 - % - {% - % This magic value for \lastsection is output by \setref as the - % XREFLABEL-title value. \xrefX uses it to distinguish float - % labels (which have a completely different output format) from - % node and anchor labels. And \xrdef uses it to construct the - % lists of floats. - % - \edef\lastsection{\floatmagic=\safefloattype}% - \setref{\floatlabel}{Yfloat}% - }% - \fi - % - % start with \parskip glue, I guess. - \vskip\parskip - % - % Don't suppress indentation if a float happens to start a section. - \restorefirstparagraphindent -} - -% we have these possibilities: -% @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap -% @float Foo,lbl & no caption: Foo 1.1 -% @float Foo & @caption{Cap}: Foo: Cap -% @float Foo & no caption: Foo -% @float ,lbl & Caption{Cap}: 1.1: Cap -% @float ,lbl & no caption: 1.1 -% @float & @caption{Cap}: Cap -% @float & no caption: -% -\def\Efloat{% - \let\floatident = \empty - % - % In all cases, if we have a float type, it comes first. - \ifx\floattype\empty \else \def\floatident{\floattype}\fi - % - % If we have an xref label, the number comes next. - \ifx\floatlabel\empty \else - \ifx\floattype\empty \else % if also had float type, need tie first. - \appendtomacro\floatident{\tie}% - \fi - % the number. - \appendtomacro\floatident{\chaplevelprefix\the\floatno}% - \fi - % - % Start the printed caption with what we've constructed in - % \floatident, but keep it separate; we need \floatident again. - \let\captionline = \floatident - % - \ifx\thiscaption\empty \else - \ifx\floatident\empty \else - \appendtomacro\captionline{: }% had ident, so need a colon between - \fi - % - % caption text. - \appendtomacro\captionline{\scanexp\thiscaption}% - \fi - % - % If we have anything to print, print it, with space before. - % Eventually this needs to become an \insert. - \ifx\captionline\empty \else - \vskip.5\parskip - \captionline - % - % Space below caption. - \vskip\parskip - \fi - % - % If have an xref label, write the list of floats info. Do this - % after the caption, to avoid chance of it being a breakpoint. - \ifx\floatlabel\empty \else - % Write the text that goes in the lof to the aux file as - % \floatlabel-lof. Besides \floatident, we include the short - % caption if specified, else the full caption if specified, else nothing. - {% - \atdummies - % - % since we read the caption text in the macro world, where ^^M - % is turned into a normal character, we have to scan it back, so - % we don't write the literal three characters "^^M" into the aux file. - \scanexp{% - \xdef\noexpand\gtemp{% - \ifx\thisshortcaption\empty - \thiscaption - \else - \thisshortcaption - \fi - }% - }% - \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident - \ifx\gtemp\empty \else : \gtemp \fi}}% - }% - \fi - \egroup % end of \vtop - % - % place the captured inserts - % - % BEWARE: when the floats start floating, we have to issue warning - % whenever an insert appears inside a float which could possibly - % float. --kasal, 26may04 - % - \checkinserts -} - -% Append the tokens #2 to the definition of macro #1, not expanding either. -% -\def\appendtomacro#1#2{% - \expandafter\def\expandafter#1\expandafter{#1#2}% -} - -% @caption, @shortcaption -% -\def\caption{\docaption\thiscaption} -\def\shortcaption{\docaption\thisshortcaption} -\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption} -\def\defcaption#1#2{\egroup \def#1{#2}} - -% The parameter is the control sequence identifying the counter we are -% going to use. Create it if it doesn't exist and assign it to \floatno. -\def\getfloatno#1{% - \ifx#1\relax - % Haven't seen this figure type before. - \csname newcount\endcsname #1% - % - % Remember to reset this floatno at the next chap. - \expandafter\gdef\expandafter\resetallfloatnos - \expandafter{\resetallfloatnos #1=0 }% - \fi - \let\floatno#1% -} - -% \setref calls this to get the XREFLABEL-snt value. We want an @xref -% to the FLOATLABEL to expand to "Figure 3.1". We call \setref when we -% first read the @float command. -% -\def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}% - -% Magic string used for the XREFLABEL-title value, so \xrefX can -% distinguish floats from other xref types. -\def\floatmagic{!!float!!} - -% #1 is the control sequence we are passed; we expand into a conditional -% which is true if #1 represents a float ref. That is, the magic -% \lastsection value which we \setref above. -% -\def\iffloat#1{\expandafter\doiffloat#1==\finish} -% -% #1 is (maybe) the \floatmagic string. If so, #2 will be the -% (safe) float type for this float. We set \iffloattype to #2. -% -\def\doiffloat#1=#2=#3\finish{% - \def\temp{#1}% - \def\iffloattype{#2}% - \ifx\temp\floatmagic -} - -% @listoffloats FLOATTYPE - print a list of floats like a table of contents. -% -\parseargdef\listoffloats{% - \def\floattype{#1}% floattype - {% - % the floattype might have accents or other special characters, - % but we need to use it in a control sequence name. - \indexnofonts - \turnoffactive - \xdef\safefloattype{\floattype}% - }% - % - % \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE. - \expandafter\ifx\csname floatlist\safefloattype\endcsname \relax - \ifhavexrefs - % if the user said @listoffloats foo but never @float foo. - \message{\linenumber No `\safefloattype' floats to list.}% - \fi - \else - \begingroup - \leftskip=\tocindent % indent these entries like a toc - \let\do=\listoffloatsdo - \csname floatlist\safefloattype\endcsname - \endgroup - \fi -} - -% This is called on each entry in a list of floats. We're passed the -% xref label, in the form LABEL-title, which is how we save it in the -% aux file. We strip off the -title and look up \XRLABEL-lof, which -% has the text we're supposed to typeset here. -% -% Figures without xref labels will not be included in the list (since -% they won't appear in the aux file). -% -\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish} -\def\listoffloatsdoentry#1-title\finish{{% - % Can't fully expand XR#1-lof because it can contain anything. Just - % pass the control sequence. On the other hand, XR#1-pg is just the - % page number, and we want to fully expand that so we can get a link - % in pdf output. - \toksA = \expandafter{\csname XR#1-lof\endcsname}% - % - % use the same \entry macro we use to generate the TOC and index. - \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}% - \writeentry -}} - - -\message{localization,} - -% For single-language documents, @documentlanguage is usually given very -% early, just after @documentencoding. Single argument is the language -% (de) or locale (de_DE) abbreviation. -% -{ - \catcode`\_ = \active - \globaldefs=1 -\parseargdef\documentlanguage{\begingroup - \let_=\normalunderscore % normal _ character for filenames - \tex % read txi-??.tex file in plain TeX. - % Read the file by the name they passed if it exists. - \openin 1 txi-#1.tex - \ifeof 1 - \documentlanguagetrywithoutunderscore{#1_\finish}% - \else - \globaldefs = 1 % everything in the txi-LL files needs to persist - \input txi-#1.tex - \fi - \closein 1 - \endgroup % end raw TeX -\endgroup} -% -% If they passed de_DE, and txi-de_DE.tex doesn't exist, -% try txi-de.tex. -% -\gdef\documentlanguagetrywithoutunderscore#1_#2\finish{% - \openin 1 txi-#1.tex - \ifeof 1 - \errhelp = \nolanghelp - \errmessage{Cannot read language file txi-#1.tex}% - \else - \globaldefs = 1 % everything in the txi-LL files needs to persist - \input txi-#1.tex - \fi - \closein 1 -} -}% end of special _ catcode -% -\newhelp\nolanghelp{The given language definition file cannot be found or -is empty. Maybe you need to install it? Putting it in the current -directory should work if nowhere else does.} - -% This macro is called from txi-??.tex files; the first argument is the -% \language name to set (without the "\lang@" prefix), the second and -% third args are \{left,right}hyphenmin. -% -% The language names to pass are determined when the format is built. -% See the etex.log file created at that time, e.g., -% /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log. -% -% With TeX Live 2008, etex now includes hyphenation patterns for all -% available languages. This means we can support hyphenation in -% Texinfo, at least to some extent. (This still doesn't solve the -% accented characters problem.) -% -\catcode`@=11 -\def\txisetlanguage#1#2#3{% - % do not set the language if the name is undefined in the current TeX. - \expandafter\ifx\csname lang@#1\endcsname \relax - \message{no patterns for #1}% - \else - \global\language = \csname lang@#1\endcsname - \fi - % but there is no harm in adjusting the hyphenmin values regardless. - \global\lefthyphenmin = #2\relax - \global\righthyphenmin = #3\relax -} - -% Helpers for encodings. -% Set the catcode of characters 128 through 255 to the specified number. -% -\def\setnonasciicharscatcode#1{% - \count255=128 - \loop\ifnum\count255<256 - \global\catcode\count255=#1\relax - \advance\count255 by 1 - \repeat -} - -\def\setnonasciicharscatcodenonglobal#1{% - \count255=128 - \loop\ifnum\count255<256 - \catcode\count255=#1\relax - \advance\count255 by 1 - \repeat -} - -% @documentencoding sets the definition of non-ASCII characters -% according to the specified encoding. -% -\parseargdef\documentencoding{% - % Encoding being declared for the document. - \def\declaredencoding{\csname #1.enc\endcsname}% - % - % Supported encodings: names converted to tokens in order to be able - % to compare them with \ifx. - \def\ascii{\csname US-ASCII.enc\endcsname}% - \def\latnine{\csname ISO-8859-15.enc\endcsname}% - \def\latone{\csname ISO-8859-1.enc\endcsname}% - \def\lattwo{\csname ISO-8859-2.enc\endcsname}% - \def\utfeight{\csname UTF-8.enc\endcsname}% - % - \ifx \declaredencoding \ascii - \asciichardefs - % - \else \ifx \declaredencoding \lattwo - \setnonasciicharscatcode\active - \lattwochardefs - % - \else \ifx \declaredencoding \latone - \setnonasciicharscatcode\active - \latonechardefs - % - \else \ifx \declaredencoding \latnine - \setnonasciicharscatcode\active - \latninechardefs - % - \else \ifx \declaredencoding \utfeight - \setnonasciicharscatcode\active - \utfeightchardefs - % - \else - \message{Unknown document encoding #1, ignoring.}% - % - \fi % utfeight - \fi % latnine - \fi % latone - \fi % lattwo - \fi % ascii -} - -% A message to be logged when using a character that isn't available -% the default font encoding (OT1). -% -\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}} - -% Take account of \c (plain) vs. \, (Texinfo) difference. -\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi} - -% First, make active non-ASCII characters in order for them to be -% correctly categorized when TeX reads the replacement text of -% macros containing the character definitions. -\setnonasciicharscatcode\active -% -% Latin1 (ISO-8859-1) character definitions. -\def\latonechardefs{% - \gdef^^a0{\tie} - \gdef^^a1{\exclamdown} - \gdef^^a2{\missingcharmsg{CENT SIGN}} - \gdef^^a3{{\pounds}} - \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} - \gdef^^a5{\missingcharmsg{YEN SIGN}} - \gdef^^a6{\missingcharmsg{BROKEN BAR}} - \gdef^^a7{\S} - \gdef^^a8{\"{}} - \gdef^^a9{\copyright} - \gdef^^aa{\ordf} - \gdef^^ab{\guillemetleft} - \gdef^^ac{$\lnot$} - \gdef^^ad{\-} - \gdef^^ae{\registeredsymbol} - \gdef^^af{\={}} - % - \gdef^^b0{\textdegree} - \gdef^^b1{$\pm$} - \gdef^^b2{$^2$} - \gdef^^b3{$^3$} - \gdef^^b4{\'{}} - \gdef^^b5{$\mu$} - \gdef^^b6{\P} - % - \gdef^^b7{$^.$} - \gdef^^b8{\cedilla\ } - \gdef^^b9{$^1$} - \gdef^^ba{\ordm} - % - \gdef^^bb{\guillemetright} - \gdef^^bc{$1\over4$} - \gdef^^bd{$1\over2$} - \gdef^^be{$3\over4$} - \gdef^^bf{\questiondown} - % - \gdef^^c0{\`A} - \gdef^^c1{\'A} - \gdef^^c2{\^A} - \gdef^^c3{\~A} - \gdef^^c4{\"A} - \gdef^^c5{\ringaccent A} - \gdef^^c6{\AE} - \gdef^^c7{\cedilla C} - \gdef^^c8{\`E} - \gdef^^c9{\'E} - \gdef^^ca{\^E} - \gdef^^cb{\"E} - \gdef^^cc{\`I} - \gdef^^cd{\'I} - \gdef^^ce{\^I} - \gdef^^cf{\"I} - % - \gdef^^d0{\DH} - \gdef^^d1{\~N} - \gdef^^d2{\`O} - \gdef^^d3{\'O} - \gdef^^d4{\^O} - \gdef^^d5{\~O} - \gdef^^d6{\"O} - \gdef^^d7{$\times$} - \gdef^^d8{\O} - \gdef^^d9{\`U} - \gdef^^da{\'U} - \gdef^^db{\^U} - \gdef^^dc{\"U} - \gdef^^dd{\'Y} - \gdef^^de{\TH} - \gdef^^df{\ss} - % - \gdef^^e0{\`a} - \gdef^^e1{\'a} - \gdef^^e2{\^a} - \gdef^^e3{\~a} - \gdef^^e4{\"a} - \gdef^^e5{\ringaccent a} - \gdef^^e6{\ae} - \gdef^^e7{\cedilla c} - \gdef^^e8{\`e} - \gdef^^e9{\'e} - \gdef^^ea{\^e} - \gdef^^eb{\"e} - \gdef^^ec{\`{\dotless i}} - \gdef^^ed{\'{\dotless i}} - \gdef^^ee{\^{\dotless i}} - \gdef^^ef{\"{\dotless i}} - % - \gdef^^f0{\dh} - \gdef^^f1{\~n} - \gdef^^f2{\`o} - \gdef^^f3{\'o} - \gdef^^f4{\^o} - \gdef^^f5{\~o} - \gdef^^f6{\"o} - \gdef^^f7{$\div$} - \gdef^^f8{\o} - \gdef^^f9{\`u} - \gdef^^fa{\'u} - \gdef^^fb{\^u} - \gdef^^fc{\"u} - \gdef^^fd{\'y} - \gdef^^fe{\th} - \gdef^^ff{\"y} -} - -% Latin9 (ISO-8859-15) encoding character definitions. -\def\latninechardefs{% - % Encoding is almost identical to Latin1. - \latonechardefs - % - \gdef^^a4{\euro} - \gdef^^a6{\v S} - \gdef^^a8{\v s} - \gdef^^b4{\v Z} - \gdef^^b8{\v z} - \gdef^^bc{\OE} - \gdef^^bd{\oe} - \gdef^^be{\"Y} -} - -% Latin2 (ISO-8859-2) character definitions. -\def\lattwochardefs{% - \gdef^^a0{\tie} - \gdef^^a1{\ogonek{A}} - \gdef^^a2{\u{}} - \gdef^^a3{\L} - \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} - \gdef^^a5{\v L} - \gdef^^a6{\'S} - \gdef^^a7{\S} - \gdef^^a8{\"{}} - \gdef^^a9{\v S} - \gdef^^aa{\cedilla S} - \gdef^^ab{\v T} - \gdef^^ac{\'Z} - \gdef^^ad{\-} - \gdef^^ae{\v Z} - \gdef^^af{\dotaccent Z} - % - \gdef^^b0{\textdegree} - \gdef^^b1{\ogonek{a}} - \gdef^^b2{\ogonek{ }} - \gdef^^b3{\l} - \gdef^^b4{\'{}} - \gdef^^b5{\v l} - \gdef^^b6{\'s} - \gdef^^b7{\v{}} - \gdef^^b8{\cedilla\ } - \gdef^^b9{\v s} - \gdef^^ba{\cedilla s} - \gdef^^bb{\v t} - \gdef^^bc{\'z} - \gdef^^bd{\H{}} - \gdef^^be{\v z} - \gdef^^bf{\dotaccent z} - % - \gdef^^c0{\'R} - \gdef^^c1{\'A} - \gdef^^c2{\^A} - \gdef^^c3{\u A} - \gdef^^c4{\"A} - \gdef^^c5{\'L} - \gdef^^c6{\'C} - \gdef^^c7{\cedilla C} - \gdef^^c8{\v C} - \gdef^^c9{\'E} - \gdef^^ca{\ogonek{E}} - \gdef^^cb{\"E} - \gdef^^cc{\v E} - \gdef^^cd{\'I} - \gdef^^ce{\^I} - \gdef^^cf{\v D} - % - \gdef^^d0{\DH} - \gdef^^d1{\'N} - \gdef^^d2{\v N} - \gdef^^d3{\'O} - \gdef^^d4{\^O} - \gdef^^d5{\H O} - \gdef^^d6{\"O} - \gdef^^d7{$\times$} - \gdef^^d8{\v R} - \gdef^^d9{\ringaccent U} - \gdef^^da{\'U} - \gdef^^db{\H U} - \gdef^^dc{\"U} - \gdef^^dd{\'Y} - \gdef^^de{\cedilla T} - \gdef^^df{\ss} - % - \gdef^^e0{\'r} - \gdef^^e1{\'a} - \gdef^^e2{\^a} - \gdef^^e3{\u a} - \gdef^^e4{\"a} - \gdef^^e5{\'l} - \gdef^^e6{\'c} - \gdef^^e7{\cedilla c} - \gdef^^e8{\v c} - \gdef^^e9{\'e} - \gdef^^ea{\ogonek{e}} - \gdef^^eb{\"e} - \gdef^^ec{\v e} - \gdef^^ed{\'{\dotless{i}}} - \gdef^^ee{\^{\dotless{i}}} - \gdef^^ef{\v d} - % - \gdef^^f0{\dh} - \gdef^^f1{\'n} - \gdef^^f2{\v n} - \gdef^^f3{\'o} - \gdef^^f4{\^o} - \gdef^^f5{\H o} - \gdef^^f6{\"o} - \gdef^^f7{$\div$} - \gdef^^f8{\v r} - \gdef^^f9{\ringaccent u} - \gdef^^fa{\'u} - \gdef^^fb{\H u} - \gdef^^fc{\"u} - \gdef^^fd{\'y} - \gdef^^fe{\cedilla t} - \gdef^^ff{\dotaccent{}} -} - -% UTF-8 character definitions. -% -% This code to support UTF-8 is based on LaTeX's utf8.def, with some -% changes for Texinfo conventions. It is included here under the GPL by -% permission from Frank Mittelbach and the LaTeX team. -% -\newcount\countUTFx -\newcount\countUTFy -\newcount\countUTFz - -\gdef\UTFviiiTwoOctets#1#2{\expandafter - \UTFviiiDefined\csname u8:#1\string #2\endcsname} -% -\gdef\UTFviiiThreeOctets#1#2#3{\expandafter - \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname} -% -\gdef\UTFviiiFourOctets#1#2#3#4{\expandafter - \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname} - -\gdef\UTFviiiDefined#1{% - \ifx #1\relax - \message{\linenumber Unicode char \string #1 not defined for Texinfo}% - \else - \expandafter #1% - \fi -} - -\begingroup - \catcode`\~13 - \catcode`\"12 - - \def\UTFviiiLoop{% - \global\catcode\countUTFx\active - \uccode`\~\countUTFx - \uppercase\expandafter{\UTFviiiTmp}% - \advance\countUTFx by 1 - \ifnum\countUTFx < \countUTFy - \expandafter\UTFviiiLoop - \fi} - - \countUTFx = "C2 - \countUTFy = "E0 - \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiTwoOctets\string~}} - \UTFviiiLoop - - \countUTFx = "E0 - \countUTFy = "F0 - \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiThreeOctets\string~}} - \UTFviiiLoop - - \countUTFx = "F0 - \countUTFy = "F4 - \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiFourOctets\string~}} - \UTFviiiLoop -\endgroup - -\begingroup - \catcode`\"=12 - \catcode`\<=12 - \catcode`\.=12 - \catcode`\,=12 - \catcode`\;=12 - \catcode`\!=12 - \catcode`\~=13 - - \gdef\DeclareUnicodeCharacter#1#2{% - \countUTFz = "#1\relax - %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% - \begingroup - \parseXMLCharref - \def\UTFviiiTwoOctets##1##2{% - \csname u8:##1\string ##2\endcsname}% - \def\UTFviiiThreeOctets##1##2##3{% - \csname u8:##1\string ##2\string ##3\endcsname}% - \def\UTFviiiFourOctets##1##2##3##4{% - \csname u8:##1\string ##2\string ##3\string ##4\endcsname}% - \expandafter\expandafter\expandafter\expandafter - \expandafter\expandafter\expandafter - \gdef\UTFviiiTmp{#2}% - \endgroup} - - \gdef\parseXMLCharref{% - \ifnum\countUTFz < "A0\relax - \errhelp = \EMsimple - \errmessage{Cannot define Unicode char value < 00A0}% - \else\ifnum\countUTFz < "800\relax - \parseUTFviiiA,% - \parseUTFviiiB C\UTFviiiTwoOctets.,% - \else\ifnum\countUTFz < "10000\relax - \parseUTFviiiA;% - \parseUTFviiiA,% - \parseUTFviiiB E\UTFviiiThreeOctets.{,;}% - \else - \parseUTFviiiA;% - \parseUTFviiiA,% - \parseUTFviiiA!% - \parseUTFviiiB F\UTFviiiFourOctets.{!,;}% - \fi\fi\fi - } - - \gdef\parseUTFviiiA#1{% - \countUTFx = \countUTFz - \divide\countUTFz by 64 - \countUTFy = \countUTFz - \multiply\countUTFz by 64 - \advance\countUTFx by -\countUTFz - \advance\countUTFx by 128 - \uccode `#1\countUTFx - \countUTFz = \countUTFy} - - \gdef\parseUTFviiiB#1#2#3#4{% - \advance\countUTFz by "#10\relax - \uccode `#3\countUTFz - \uppercase{\gdef\UTFviiiTmp{#2#3#4}}} -\endgroup - -\def\utfeightchardefs{% - \DeclareUnicodeCharacter{00A0}{\tie} - \DeclareUnicodeCharacter{00A1}{\exclamdown} - \DeclareUnicodeCharacter{00A3}{\pounds} - \DeclareUnicodeCharacter{00A8}{\"{ }} - \DeclareUnicodeCharacter{00A9}{\copyright} - \DeclareUnicodeCharacter{00AA}{\ordf} - \DeclareUnicodeCharacter{00AB}{\guillemetleft} - \DeclareUnicodeCharacter{00AD}{\-} - \DeclareUnicodeCharacter{00AE}{\registeredsymbol} - \DeclareUnicodeCharacter{00AF}{\={ }} - - \DeclareUnicodeCharacter{00B0}{\ringaccent{ }} - \DeclareUnicodeCharacter{00B4}{\'{ }} - \DeclareUnicodeCharacter{00B8}{\cedilla{ }} - \DeclareUnicodeCharacter{00BA}{\ordm} - \DeclareUnicodeCharacter{00BB}{\guillemetright} - \DeclareUnicodeCharacter{00BF}{\questiondown} - - \DeclareUnicodeCharacter{00C0}{\`A} - \DeclareUnicodeCharacter{00C1}{\'A} - \DeclareUnicodeCharacter{00C2}{\^A} - \DeclareUnicodeCharacter{00C3}{\~A} - \DeclareUnicodeCharacter{00C4}{\"A} - \DeclareUnicodeCharacter{00C5}{\AA} - \DeclareUnicodeCharacter{00C6}{\AE} - \DeclareUnicodeCharacter{00C7}{\cedilla{C}} - \DeclareUnicodeCharacter{00C8}{\`E} - \DeclareUnicodeCharacter{00C9}{\'E} - \DeclareUnicodeCharacter{00CA}{\^E} - \DeclareUnicodeCharacter{00CB}{\"E} - \DeclareUnicodeCharacter{00CC}{\`I} - \DeclareUnicodeCharacter{00CD}{\'I} - \DeclareUnicodeCharacter{00CE}{\^I} - \DeclareUnicodeCharacter{00CF}{\"I} - - \DeclareUnicodeCharacter{00D0}{\DH} - \DeclareUnicodeCharacter{00D1}{\~N} - \DeclareUnicodeCharacter{00D2}{\`O} - \DeclareUnicodeCharacter{00D3}{\'O} - \DeclareUnicodeCharacter{00D4}{\^O} - \DeclareUnicodeCharacter{00D5}{\~O} - \DeclareUnicodeCharacter{00D6}{\"O} - \DeclareUnicodeCharacter{00D8}{\O} - \DeclareUnicodeCharacter{00D9}{\`U} - \DeclareUnicodeCharacter{00DA}{\'U} - \DeclareUnicodeCharacter{00DB}{\^U} - \DeclareUnicodeCharacter{00DC}{\"U} - \DeclareUnicodeCharacter{00DD}{\'Y} - \DeclareUnicodeCharacter{00DE}{\TH} - \DeclareUnicodeCharacter{00DF}{\ss} - - \DeclareUnicodeCharacter{00E0}{\`a} - \DeclareUnicodeCharacter{00E1}{\'a} - \DeclareUnicodeCharacter{00E2}{\^a} - \DeclareUnicodeCharacter{00E3}{\~a} - \DeclareUnicodeCharacter{00E4}{\"a} - \DeclareUnicodeCharacter{00E5}{\aa} - \DeclareUnicodeCharacter{00E6}{\ae} - \DeclareUnicodeCharacter{00E7}{\cedilla{c}} - \DeclareUnicodeCharacter{00E8}{\`e} - \DeclareUnicodeCharacter{00E9}{\'e} - \DeclareUnicodeCharacter{00EA}{\^e} - \DeclareUnicodeCharacter{00EB}{\"e} - \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}} - \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}} - \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}} - \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}} - - \DeclareUnicodeCharacter{00F0}{\dh} - \DeclareUnicodeCharacter{00F1}{\~n} - \DeclareUnicodeCharacter{00F2}{\`o} - \DeclareUnicodeCharacter{00F3}{\'o} - \DeclareUnicodeCharacter{00F4}{\^o} - \DeclareUnicodeCharacter{00F5}{\~o} - \DeclareUnicodeCharacter{00F6}{\"o} - \DeclareUnicodeCharacter{00F8}{\o} - \DeclareUnicodeCharacter{00F9}{\`u} - \DeclareUnicodeCharacter{00FA}{\'u} - \DeclareUnicodeCharacter{00FB}{\^u} - \DeclareUnicodeCharacter{00FC}{\"u} - \DeclareUnicodeCharacter{00FD}{\'y} - \DeclareUnicodeCharacter{00FE}{\th} - \DeclareUnicodeCharacter{00FF}{\"y} - - \DeclareUnicodeCharacter{0100}{\=A} - \DeclareUnicodeCharacter{0101}{\=a} - \DeclareUnicodeCharacter{0102}{\u{A}} - \DeclareUnicodeCharacter{0103}{\u{a}} - \DeclareUnicodeCharacter{0104}{\ogonek{A}} - \DeclareUnicodeCharacter{0105}{\ogonek{a}} - \DeclareUnicodeCharacter{0106}{\'C} - \DeclareUnicodeCharacter{0107}{\'c} - \DeclareUnicodeCharacter{0108}{\^C} - \DeclareUnicodeCharacter{0109}{\^c} - \DeclareUnicodeCharacter{0118}{\ogonek{E}} - \DeclareUnicodeCharacter{0119}{\ogonek{e}} - \DeclareUnicodeCharacter{010A}{\dotaccent{C}} - \DeclareUnicodeCharacter{010B}{\dotaccent{c}} - \DeclareUnicodeCharacter{010C}{\v{C}} - \DeclareUnicodeCharacter{010D}{\v{c}} - \DeclareUnicodeCharacter{010E}{\v{D}} - - \DeclareUnicodeCharacter{0112}{\=E} - \DeclareUnicodeCharacter{0113}{\=e} - \DeclareUnicodeCharacter{0114}{\u{E}} - \DeclareUnicodeCharacter{0115}{\u{e}} - \DeclareUnicodeCharacter{0116}{\dotaccent{E}} - \DeclareUnicodeCharacter{0117}{\dotaccent{e}} - \DeclareUnicodeCharacter{011A}{\v{E}} - \DeclareUnicodeCharacter{011B}{\v{e}} - \DeclareUnicodeCharacter{011C}{\^G} - \DeclareUnicodeCharacter{011D}{\^g} - \DeclareUnicodeCharacter{011E}{\u{G}} - \DeclareUnicodeCharacter{011F}{\u{g}} - - \DeclareUnicodeCharacter{0120}{\dotaccent{G}} - \DeclareUnicodeCharacter{0121}{\dotaccent{g}} - \DeclareUnicodeCharacter{0124}{\^H} - \DeclareUnicodeCharacter{0125}{\^h} - \DeclareUnicodeCharacter{0128}{\~I} - \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}} - \DeclareUnicodeCharacter{012A}{\=I} - \DeclareUnicodeCharacter{012B}{\={\dotless{i}}} - \DeclareUnicodeCharacter{012C}{\u{I}} - \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}} - - \DeclareUnicodeCharacter{0130}{\dotaccent{I}} - \DeclareUnicodeCharacter{0131}{\dotless{i}} - \DeclareUnicodeCharacter{0132}{IJ} - \DeclareUnicodeCharacter{0133}{ij} - \DeclareUnicodeCharacter{0134}{\^J} - \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}} - \DeclareUnicodeCharacter{0139}{\'L} - \DeclareUnicodeCharacter{013A}{\'l} - - \DeclareUnicodeCharacter{0141}{\L} - \DeclareUnicodeCharacter{0142}{\l} - \DeclareUnicodeCharacter{0143}{\'N} - \DeclareUnicodeCharacter{0144}{\'n} - \DeclareUnicodeCharacter{0147}{\v{N}} - \DeclareUnicodeCharacter{0148}{\v{n}} - \DeclareUnicodeCharacter{014C}{\=O} - \DeclareUnicodeCharacter{014D}{\=o} - \DeclareUnicodeCharacter{014E}{\u{O}} - \DeclareUnicodeCharacter{014F}{\u{o}} - - \DeclareUnicodeCharacter{0150}{\H{O}} - \DeclareUnicodeCharacter{0151}{\H{o}} - \DeclareUnicodeCharacter{0152}{\OE} - \DeclareUnicodeCharacter{0153}{\oe} - \DeclareUnicodeCharacter{0154}{\'R} - \DeclareUnicodeCharacter{0155}{\'r} - \DeclareUnicodeCharacter{0158}{\v{R}} - \DeclareUnicodeCharacter{0159}{\v{r}} - \DeclareUnicodeCharacter{015A}{\'S} - \DeclareUnicodeCharacter{015B}{\'s} - \DeclareUnicodeCharacter{015C}{\^S} - \DeclareUnicodeCharacter{015D}{\^s} - \DeclareUnicodeCharacter{015E}{\cedilla{S}} - \DeclareUnicodeCharacter{015F}{\cedilla{s}} - - \DeclareUnicodeCharacter{0160}{\v{S}} - \DeclareUnicodeCharacter{0161}{\v{s}} - \DeclareUnicodeCharacter{0162}{\cedilla{t}} - \DeclareUnicodeCharacter{0163}{\cedilla{T}} - \DeclareUnicodeCharacter{0164}{\v{T}} - - \DeclareUnicodeCharacter{0168}{\~U} - \DeclareUnicodeCharacter{0169}{\~u} - \DeclareUnicodeCharacter{016A}{\=U} - \DeclareUnicodeCharacter{016B}{\=u} - \DeclareUnicodeCharacter{016C}{\u{U}} - \DeclareUnicodeCharacter{016D}{\u{u}} - \DeclareUnicodeCharacter{016E}{\ringaccent{U}} - \DeclareUnicodeCharacter{016F}{\ringaccent{u}} - - \DeclareUnicodeCharacter{0170}{\H{U}} - \DeclareUnicodeCharacter{0171}{\H{u}} - \DeclareUnicodeCharacter{0174}{\^W} - \DeclareUnicodeCharacter{0175}{\^w} - \DeclareUnicodeCharacter{0176}{\^Y} - \DeclareUnicodeCharacter{0177}{\^y} - \DeclareUnicodeCharacter{0178}{\"Y} - \DeclareUnicodeCharacter{0179}{\'Z} - \DeclareUnicodeCharacter{017A}{\'z} - \DeclareUnicodeCharacter{017B}{\dotaccent{Z}} - \DeclareUnicodeCharacter{017C}{\dotaccent{z}} - \DeclareUnicodeCharacter{017D}{\v{Z}} - \DeclareUnicodeCharacter{017E}{\v{z}} - - \DeclareUnicodeCharacter{01C4}{D\v{Z}} - \DeclareUnicodeCharacter{01C5}{D\v{z}} - \DeclareUnicodeCharacter{01C6}{d\v{z}} - \DeclareUnicodeCharacter{01C7}{LJ} - \DeclareUnicodeCharacter{01C8}{Lj} - \DeclareUnicodeCharacter{01C9}{lj} - \DeclareUnicodeCharacter{01CA}{NJ} - \DeclareUnicodeCharacter{01CB}{Nj} - \DeclareUnicodeCharacter{01CC}{nj} - \DeclareUnicodeCharacter{01CD}{\v{A}} - \DeclareUnicodeCharacter{01CE}{\v{a}} - \DeclareUnicodeCharacter{01CF}{\v{I}} - - \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}} - \DeclareUnicodeCharacter{01D1}{\v{O}} - \DeclareUnicodeCharacter{01D2}{\v{o}} - \DeclareUnicodeCharacter{01D3}{\v{U}} - \DeclareUnicodeCharacter{01D4}{\v{u}} - - \DeclareUnicodeCharacter{01E2}{\={\AE}} - \DeclareUnicodeCharacter{01E3}{\={\ae}} - \DeclareUnicodeCharacter{01E6}{\v{G}} - \DeclareUnicodeCharacter{01E7}{\v{g}} - \DeclareUnicodeCharacter{01E8}{\v{K}} - \DeclareUnicodeCharacter{01E9}{\v{k}} - - \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}} - \DeclareUnicodeCharacter{01F1}{DZ} - \DeclareUnicodeCharacter{01F2}{Dz} - \DeclareUnicodeCharacter{01F3}{dz} - \DeclareUnicodeCharacter{01F4}{\'G} - \DeclareUnicodeCharacter{01F5}{\'g} - \DeclareUnicodeCharacter{01F8}{\`N} - \DeclareUnicodeCharacter{01F9}{\`n} - \DeclareUnicodeCharacter{01FC}{\'{\AE}} - \DeclareUnicodeCharacter{01FD}{\'{\ae}} - \DeclareUnicodeCharacter{01FE}{\'{\O}} - \DeclareUnicodeCharacter{01FF}{\'{\o}} - - \DeclareUnicodeCharacter{021E}{\v{H}} - \DeclareUnicodeCharacter{021F}{\v{h}} - - \DeclareUnicodeCharacter{0226}{\dotaccent{A}} - \DeclareUnicodeCharacter{0227}{\dotaccent{a}} - \DeclareUnicodeCharacter{0228}{\cedilla{E}} - \DeclareUnicodeCharacter{0229}{\cedilla{e}} - \DeclareUnicodeCharacter{022E}{\dotaccent{O}} - \DeclareUnicodeCharacter{022F}{\dotaccent{o}} - - \DeclareUnicodeCharacter{0232}{\=Y} - \DeclareUnicodeCharacter{0233}{\=y} - \DeclareUnicodeCharacter{0237}{\dotless{j}} - - \DeclareUnicodeCharacter{02DB}{\ogonek{ }} - - \DeclareUnicodeCharacter{1E02}{\dotaccent{B}} - \DeclareUnicodeCharacter{1E03}{\dotaccent{b}} - \DeclareUnicodeCharacter{1E04}{\udotaccent{B}} - \DeclareUnicodeCharacter{1E05}{\udotaccent{b}} - \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}} - \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}} - \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}} - \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}} - \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}} - \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}} - \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}} - \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}} - - \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}} - \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}} - - \DeclareUnicodeCharacter{1E20}{\=G} - \DeclareUnicodeCharacter{1E21}{\=g} - \DeclareUnicodeCharacter{1E22}{\dotaccent{H}} - \DeclareUnicodeCharacter{1E23}{\dotaccent{h}} - \DeclareUnicodeCharacter{1E24}{\udotaccent{H}} - \DeclareUnicodeCharacter{1E25}{\udotaccent{h}} - \DeclareUnicodeCharacter{1E26}{\"H} - \DeclareUnicodeCharacter{1E27}{\"h} - - \DeclareUnicodeCharacter{1E30}{\'K} - \DeclareUnicodeCharacter{1E31}{\'k} - \DeclareUnicodeCharacter{1E32}{\udotaccent{K}} - \DeclareUnicodeCharacter{1E33}{\udotaccent{k}} - \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}} - \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}} - \DeclareUnicodeCharacter{1E36}{\udotaccent{L}} - \DeclareUnicodeCharacter{1E37}{\udotaccent{l}} - \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}} - \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}} - \DeclareUnicodeCharacter{1E3E}{\'M} - \DeclareUnicodeCharacter{1E3F}{\'m} - - \DeclareUnicodeCharacter{1E40}{\dotaccent{M}} - \DeclareUnicodeCharacter{1E41}{\dotaccent{m}} - \DeclareUnicodeCharacter{1E42}{\udotaccent{M}} - \DeclareUnicodeCharacter{1E43}{\udotaccent{m}} - \DeclareUnicodeCharacter{1E44}{\dotaccent{N}} - \DeclareUnicodeCharacter{1E45}{\dotaccent{n}} - \DeclareUnicodeCharacter{1E46}{\udotaccent{N}} - \DeclareUnicodeCharacter{1E47}{\udotaccent{n}} - \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}} - \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}} - - \DeclareUnicodeCharacter{1E54}{\'P} - \DeclareUnicodeCharacter{1E55}{\'p} - \DeclareUnicodeCharacter{1E56}{\dotaccent{P}} - \DeclareUnicodeCharacter{1E57}{\dotaccent{p}} - \DeclareUnicodeCharacter{1E58}{\dotaccent{R}} - \DeclareUnicodeCharacter{1E59}{\dotaccent{r}} - \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}} - \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}} - \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}} - \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}} - - \DeclareUnicodeCharacter{1E60}{\dotaccent{S}} - \DeclareUnicodeCharacter{1E61}{\dotaccent{s}} - \DeclareUnicodeCharacter{1E62}{\udotaccent{S}} - \DeclareUnicodeCharacter{1E63}{\udotaccent{s}} - \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}} - \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}} - \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}} - \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}} - \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}} - \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}} - - \DeclareUnicodeCharacter{1E7C}{\~V} - \DeclareUnicodeCharacter{1E7D}{\~v} - \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}} - \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}} - - \DeclareUnicodeCharacter{1E80}{\`W} - \DeclareUnicodeCharacter{1E81}{\`w} - \DeclareUnicodeCharacter{1E82}{\'W} - \DeclareUnicodeCharacter{1E83}{\'w} - \DeclareUnicodeCharacter{1E84}{\"W} - \DeclareUnicodeCharacter{1E85}{\"w} - \DeclareUnicodeCharacter{1E86}{\dotaccent{W}} - \DeclareUnicodeCharacter{1E87}{\dotaccent{w}} - \DeclareUnicodeCharacter{1E88}{\udotaccent{W}} - \DeclareUnicodeCharacter{1E89}{\udotaccent{w}} - \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}} - \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}} - \DeclareUnicodeCharacter{1E8C}{\"X} - \DeclareUnicodeCharacter{1E8D}{\"x} - \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}} - \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}} - - \DeclareUnicodeCharacter{1E90}{\^Z} - \DeclareUnicodeCharacter{1E91}{\^z} - \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}} - \DeclareUnicodeCharacter{1E93}{\udotaccent{z}} - \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}} - \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}} - \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}} - \DeclareUnicodeCharacter{1E97}{\"t} - \DeclareUnicodeCharacter{1E98}{\ringaccent{w}} - \DeclareUnicodeCharacter{1E99}{\ringaccent{y}} - - \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}} - \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}} - - \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}} - \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}} - \DeclareUnicodeCharacter{1EBC}{\~E} - \DeclareUnicodeCharacter{1EBD}{\~e} - - \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}} - \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}} - \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}} - \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}} - - \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}} - \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}} - - \DeclareUnicodeCharacter{1EF2}{\`Y} - \DeclareUnicodeCharacter{1EF3}{\`y} - \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}} - - \DeclareUnicodeCharacter{1EF8}{\~Y} - \DeclareUnicodeCharacter{1EF9}{\~y} - - \DeclareUnicodeCharacter{2013}{--} - \DeclareUnicodeCharacter{2014}{---} - \DeclareUnicodeCharacter{2018}{\quoteleft} - \DeclareUnicodeCharacter{2019}{\quoteright} - \DeclareUnicodeCharacter{201A}{\quotesinglbase} - \DeclareUnicodeCharacter{201C}{\quotedblleft} - \DeclareUnicodeCharacter{201D}{\quotedblright} - \DeclareUnicodeCharacter{201E}{\quotedblbase} - \DeclareUnicodeCharacter{2022}{\bullet} - \DeclareUnicodeCharacter{2026}{\dots} - \DeclareUnicodeCharacter{2039}{\guilsinglleft} - \DeclareUnicodeCharacter{203A}{\guilsinglright} - \DeclareUnicodeCharacter{20AC}{\euro} - - \DeclareUnicodeCharacter{2192}{\expansion} - \DeclareUnicodeCharacter{21D2}{\result} - - \DeclareUnicodeCharacter{2212}{\minus} - \DeclareUnicodeCharacter{2217}{\point} - \DeclareUnicodeCharacter{2261}{\equiv} -}% end of \utfeightchardefs - - -% US-ASCII character definitions. -\def\asciichardefs{% nothing need be done - \relax -} - -% Make non-ASCII characters printable again for compatibility with -% existing Texinfo documents that may use them, even without declaring a -% document encoding. -% -\setnonasciicharscatcode \other - - -\message{formatting,} - -\newdimen\defaultparindent \defaultparindent = 15pt - -\chapheadingskip = 15pt plus 4pt minus 2pt -\secheadingskip = 12pt plus 3pt minus 2pt -\subsecheadingskip = 9pt plus 2pt minus 2pt - -% Prevent underfull vbox error messages. -\vbadness = 10000 - -% Don't be very finicky about underfull hboxes, either. -\hbadness = 6666 - -% Following George Bush, get rid of widows and orphans. -\widowpenalty=10000 -\clubpenalty=10000 - -% Use TeX 3.0's \emergencystretch to help line breaking, but if we're -% using an old version of TeX, don't do anything. We want the amount of -% stretch added to depend on the line length, hence the dependence on -% \hsize. We call this whenever the paper size is set. -% -\def\setemergencystretch{% - \ifx\emergencystretch\thisisundefined - % Allow us to assign to \emergencystretch anyway. - \def\emergencystretch{\dimen0}% - \else - \emergencystretch = .15\hsize - \fi -} - -% Parameters in order: 1) textheight; 2) textwidth; -% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip; -% 7) physical page height; 8) physical page width. -% -% We also call \setleading{\textleading}, so the caller should define -% \textleading. The caller should also set \parskip. -% -\def\internalpagesizes#1#2#3#4#5#6#7#8{% - \voffset = #3\relax - \topskip = #6\relax - \splittopskip = \topskip - % - \vsize = #1\relax - \advance\vsize by \topskip - \outervsize = \vsize - \advance\outervsize by 2\topandbottommargin - \pageheight = \vsize - % - \hsize = #2\relax - \outerhsize = \hsize - \advance\outerhsize by 0.5in - \pagewidth = \hsize - % - \normaloffset = #4\relax - \bindingoffset = #5\relax - % - \ifpdf - \pdfpageheight #7\relax - \pdfpagewidth #8\relax - % if we don't reset these, they will remain at "1 true in" of - % whatever layout pdftex was dumped with. - \pdfhorigin = 1 true in - \pdfvorigin = 1 true in - \fi - % - \setleading{\textleading} - % - \parindent = \defaultparindent - \setemergencystretch -} - -% @letterpaper (the default). -\def\letterpaper{{\globaldefs = 1 - \parskip = 3pt plus 2pt minus 1pt - \textleading = 13.2pt - % - % If page is nothing but text, make it come out even. - \internalpagesizes{607.2pt}{6in}% that's 46 lines - {\voffset}{.25in}% - {\bindingoffset}{36pt}% - {11in}{8.5in}% -}} - -% Use @smallbook to reset parameters for 7x9.25 trim size. -\def\smallbook{{\globaldefs = 1 - \parskip = 2pt plus 1pt - \textleading = 12pt - % - \internalpagesizes{7.5in}{5in}% - {-.2in}{0in}% - {\bindingoffset}{16pt}% - {9.25in}{7in}% - % - \lispnarrowing = 0.3in - \tolerance = 700 - \hfuzz = 1pt - \contentsrightmargin = 0pt - \defbodyindent = .5cm -}} - -% Use @smallerbook to reset parameters for 6x9 trim size. -% (Just testing, parameters still in flux.) -\def\smallerbook{{\globaldefs = 1 - \parskip = 1.5pt plus 1pt - \textleading = 12pt - % - \internalpagesizes{7.4in}{4.8in}% - {-.2in}{-.4in}% - {0pt}{14pt}% - {9in}{6in}% - % - \lispnarrowing = 0.25in - \tolerance = 700 - \hfuzz = 1pt - \contentsrightmargin = 0pt - \defbodyindent = .4cm -}} - -% Use @afourpaper to print on European A4 paper. -\def\afourpaper{{\globaldefs = 1 - \parskip = 3pt plus 2pt minus 1pt - \textleading = 13.2pt - % - % Double-side printing via postscript on Laserjet 4050 - % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm. - % To change the settings for a different printer or situation, adjust - % \normaloffset until the front-side and back-side texts align. Then - % do the same for \bindingoffset. You can set these for testing in - % your texinfo source file like this: - % @tex - % \global\normaloffset = -6mm - % \global\bindingoffset = 10mm - % @end tex - \internalpagesizes{673.2pt}{160mm}% that's 51 lines - {\voffset}{\hoffset}% - {\bindingoffset}{44pt}% - {297mm}{210mm}% - % - \tolerance = 700 - \hfuzz = 1pt - \contentsrightmargin = 0pt - \defbodyindent = 5mm -}} - -% Use @afivepaper to print on European A5 paper. -% From romildo@urano.iceb.ufop.br, 2 July 2000. -% He also recommends making @example and @lisp be small. -\def\afivepaper{{\globaldefs = 1 - \parskip = 2pt plus 1pt minus 0.1pt - \textleading = 12.5pt - % - \internalpagesizes{160mm}{120mm}% - {\voffset}{\hoffset}% - {\bindingoffset}{8pt}% - {210mm}{148mm}% - % - \lispnarrowing = 0.2in - \tolerance = 800 - \hfuzz = 1.2pt - \contentsrightmargin = 0pt - \defbodyindent = 2mm - \tableindent = 12mm -}} - -% A specific text layout, 24x15cm overall, intended for A4 paper. -\def\afourlatex{{\globaldefs = 1 - \afourpaper - \internalpagesizes{237mm}{150mm}% - {\voffset}{4.6mm}% - {\bindingoffset}{7mm}% - {297mm}{210mm}% - % - % Must explicitly reset to 0 because we call \afourpaper. - \globaldefs = 0 -}} - -% Use @afourwide to print on A4 paper in landscape format. -\def\afourwide{{\globaldefs = 1 - \afourpaper - \internalpagesizes{241mm}{165mm}% - {\voffset}{-2.95mm}% - {\bindingoffset}{7mm}% - {297mm}{210mm}% - \globaldefs = 0 -}} - -% @pagesizes TEXTHEIGHT[,TEXTWIDTH] -% Perhaps we should allow setting the margins, \topskip, \parskip, -% and/or leading, also. Or perhaps we should compute them somehow. -% -\parseargdef\pagesizes{\pagesizesyyy #1,,\finish} -\def\pagesizesyyy#1,#2,#3\finish{{% - \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi - \globaldefs = 1 - % - \parskip = 3pt plus 2pt minus 1pt - \setleading{\textleading}% - % - \dimen0 = #1\relax - \advance\dimen0 by \voffset - % - \dimen2 = \hsize - \advance\dimen2 by \normaloffset - % - \internalpagesizes{#1}{\hsize}% - {\voffset}{\normaloffset}% - {\bindingoffset}{44pt}% - {\dimen0}{\dimen2}% -}} - -% Set default to letter. -% -\letterpaper - - -\message{and turning on texinfo input format.} - -\def^^L{\par} % remove \outer, so ^L can appear in an @comment - -% DEL is a comment character, in case @c does not suffice. -\catcode`\^^? = 14 - -% Define macros to output various characters with catcode for normal text. -\catcode`\"=\other \def\normaldoublequote{"} -\catcode`\$=\other \def\normaldollar{$}%$ font-lock fix -\catcode`\+=\other \def\normalplus{+} -\catcode`\<=\other \def\normalless{<} -\catcode`\>=\other \def\normalgreater{>} -\catcode`\^=\other \def\normalcaret{^} -\catcode`\_=\other \def\normalunderscore{_} -\catcode`\|=\other \def\normalverticalbar{|} -\catcode`\~=\other \def\normaltilde{~} - -% This macro is used to make a character print one way in \tt -% (where it can probably be output as-is), and another way in other fonts, -% where something hairier probably needs to be done. -% -% #1 is what to print if we are indeed using \tt; #2 is what to print -% otherwise. Since all the Computer Modern typewriter fonts have zero -% interword stretch (and shrink), and it is reasonable to expect all -% typewriter fonts to have this, we can check that font parameter. -% -\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi} - -% Same as above, but check for italic font. Actually this also catches -% non-italic slanted fonts since it is impossible to distinguish them from -% italic fonts. But since this is only used by $ and it uses \sl anyway -% this is not a problem. -\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi} - -% Turn off all special characters except @ -% (and those which the user can use as if they were ordinary). -% Most of these we simply print from the \tt font, but for some, we can -% use math or other variants that look better in normal text. - -\catcode`\"=\active -\def\activedoublequote{{\tt\char34}} -\let"=\activedoublequote -\catcode`\~=\active -\def~{{\tt\char126}} -\chardef\hat=`\^ -\catcode`\^=\active -\def^{{\tt \hat}} - -\catcode`\_=\active -\def_{\ifusingtt\normalunderscore\_} -\let\realunder=_ -% Subroutine for the previous macro. -\def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em } - -\catcode`\|=\active -\def|{{\tt\char124}} -\chardef \less=`\< -\catcode`\<=\active -\def<{{\tt \less}} -\chardef \gtr=`\> -\catcode`\>=\active -\def>{{\tt \gtr}} -\catcode`\+=\active -\def+{{\tt \char 43}} -\catcode`\$=\active -\def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix - -% If a .fmt file is being used, characters that might appear in a file -% name cannot be active until we have parsed the command line. -% So turn them off again, and have \everyjob (or @setfilename) turn them on. -% \otherifyactive is called near the end of this file. -\def\otherifyactive{\catcode`+=\other \catcode`\_=\other} - -% Used sometimes to turn off (effectively) the active characters even after -% parsing them. -\def\turnoffactive{% - \normalturnoffactive - \otherbackslash -} - -\catcode`\@=0 - -% \backslashcurfont outputs one backslash character in current font, -% as in \char`\\. -\global\chardef\backslashcurfont=`\\ -\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work - -% \realbackslash is an actual character `\' with catcode other, and -% \doublebackslash is two of them (for the pdf outlines). -{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}} - -% In texinfo, backslash is an active character; it prints the backslash -% in fixed width font. -\catcode`\\=\active % @ for escape char from now on. - -% The story here is that in math mode, the \char of \backslashcurfont -% ends up printing the roman \ from the math symbol font (because \char -% in math mode uses the \mathcode, and plain.tex sets -% \mathcode`\\="026E). It seems better for @backslashchar{} to always -% print a typewriter backslash, hence we use an explicit \mathchar, -% which is the decimal equivalent of "715c (class 7, e.g., use \fam; -% ignored family value; char position "5C). We can't use " for the -% usual hex value because it has already been made active. -@def@normalbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}} -@let@backslashchar = @normalbackslash % @backslashchar{} is for user documents. - -% On startup, @fixbackslash assigns: -% @let \ = @normalbackslash -% \rawbackslash defines an active \ to do \backslashcurfont. -% \otherbackslash defines an active \ to be a literal `\' character with -% catcode other. We switch back and forth between these. -@gdef@rawbackslash{@let\=@backslashcurfont} -@gdef@otherbackslash{@let\=@realbackslash} - -% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of -% the literal character `\'. -% -@def@normalturnoffactive{% - @let"=@normaldoublequote - @let$=@normaldollar %$ font-lock fix - @let+=@normalplus - @let<=@normalless - @let>=@normalgreater - @let\=@normalbackslash - @let^=@normalcaret - @let_=@normalunderscore - @let|=@normalverticalbar - @let~=@normaltilde - @markupsetuplqdefault - @markupsetuprqdefault - @unsepspaces -} - -% Make _ and + \other characters, temporarily. -% This is canceled by @fixbackslash. -@otherifyactive - -% If a .fmt file is being used, we don't want the `\input texinfo' to show up. -% That is what \eatinput is for; after that, the `\' should revert to printing -% a backslash. -% -@gdef@eatinput input texinfo{@fixbackslash} -@global@let\ = @eatinput - -% On the other hand, perhaps the file did not have a `\input texinfo'. Then -% the first `\' in the file would cause an error. This macro tries to fix -% that, assuming it is called before the first `\' could plausibly occur. -% Also turn back on active characters that might appear in the input -% file name, in case not using a pre-dumped format. -% -@gdef@fixbackslash{% - @ifx\@eatinput @let\ = @normalbackslash @fi - @catcode`+=@active - @catcode`@_=@active -} - -% Say @foo, not \foo, in error messages. -@escapechar = `@@ - -% These (along with & and #) are made active for url-breaking, so need -% active definitions as the normal characters. -@def@normaldot{.} -@def@normalquest{?} -@def@normalslash{/} - -% These look ok in all fonts, so just make them not special. -% @hashchar{} gets its own user-level command, because of #line. -@catcode`@& = @other @def@normalamp{&} -@catcode`@# = @other @def@normalhash{#} -@catcode`@% = @other @def@normalpercent{%} - -@let @hashchar = @normalhash - -@c Finally, make ` and ' active, so that txicodequoteundirected and -@c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we -@c don't make ` and ' active, @code will not get them as active chars. -@c Do this last of all since we use ` in the previous @catcode assignments. -@catcode`@'=@active -@catcode`@`=@active -@markupsetuplqdefault -@markupsetuprqdefault - -@c Local variables: -@c eval: (add-hook 'write-file-hooks 'time-stamp) -@c page-delimiter: "^\\\\message" -@c time-stamp-start: "def\\\\texinfoversion{" -@c time-stamp-format: "%:y-%02m-%02d.%02H" -@c time-stamp-end: "}" -@c End: - -@c vim:sw=2: - -@ignore - arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115 -@end ignore diff -uNr octave-3.6.1/build-aux/ylwrap octave-3.6.2/build-aux/ylwrap --- octave-3.6.1/build-aux/ylwrap 2012-02-22 14:46:13.000000000 -0500 +++ octave-3.6.2/build-aux/ylwrap 2012-05-31 11:24:31.000000000 -0400 @@ -1,10 +1,10 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-08-25.18; # UTC # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, -# 2007, 2009 Free Software Foundation, Inc. +# 2007, 2009, 2010, 2011 Free Software Foundation, Inc. # # Written by Tom Tromey . # @@ -99,7 +99,11 @@ # FIXME: add hostname here for parallel makes that run commands on # other machines. But that might take us over the 14-char limit. dirname=ylwrap$$ -trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15 +do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret' +trap "ret=129; $do_exit" 1 +trap "ret=130; $do_exit" 2 +trap "ret=141; $do_exit" 13 +trap "ret=143; $do_exit" 15 mkdir $dirname || exit 1 cd $dirname @@ -133,19 +137,19 @@ # Handle y_tab.c and y_tab.h output by DOS if test $y_tab_nodot = "yes"; then if test $from = "y.tab.c"; then - from="y_tab.c" + from="y_tab.c" else - if test $from = "y.tab.h"; then - from="y_tab.h" - fi + if test $from = "y.tab.h"; then + from="y_tab.h" + fi fi fi if test -f "$from"; then # If $2 is an absolute path name, then just use that, # otherwise prepend `../'. case "$2" in - [\\/]* | ?:[\\/]*) target="$2";; - *) target="../$2";; + [\\/]* | ?:[\\/]*) target="$2";; + *) target="../$2";; esac # We do not want to overwrite a header file if it hasn't @@ -155,8 +159,8 @@ # Makefile. Divert the output of all other files to a temporary # file so we can compare them to existing versions. if test $first = no; then - realtarget="$target" - target="tmp-`echo $target | sed s/.*[\\/]//g`" + realtarget="$target" + target="tmp-`echo $target | sed s/.*[\\/]//g`" fi # Edit out `#line' or `#' directives. # @@ -180,10 +184,10 @@ # Check whether header files must be updated. if test $first = no; then - if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then - echo "$2" is unchanged - rm -f "$target" - else + if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then + echo "$2" is unchanged + rm -f "$target" + else echo updating "$2" mv -f "$target" "$realtarget" fi diff -uNr octave-3.6.1/ChangeLog octave-3.6.2/ChangeLog --- octave-3.6.1/ChangeLog 2012-02-22 15:04:31.000000000 -0500 +++ octave-3.6.2/ChangeLog 2012-05-31 11:43:29.000000000 -0400 @@ -1,3 +1,379 @@ +2012-05-31 John W. Eaton + + Version 3.6.2 released. + + * configure.ac (AC_INIT): Version is now 3.6.2. + (OCTAVE_RELEASE_DATE): Now 2012-05-31. + + Files: configure.ac + +2012-05-25 Jordi Gutiérrez Hermoso + + Fix bad two-arg call of randperm (bug #36535) + + * rand.cc (Frandperm): Rewrite algorithm for short_shuffle. Add another test. + + Files: src/DLD-FUNCTIONS/rand.cc + +2012-05-24 John W. Eaton + + Added tag rc-3-6-2-2 for changeset 4460c4fb20e6 + + Files: .hgtags + + 3.6.2-rc2 release candidate + + * configure.ac (AC_INIT): Version is now 3.6.2-rc2. + + Files: configure.ac + + 3.6.2-rc1 release candidate + + * configure.ac (AC_INIT): Version is now 3.6.2-rc1. + (OCTAVE_RELEASE_DATE): Now 2012-05-24. + + Files: configure.ac + +2012-05-12 John W. Eaton + + maint: update library version numbers for release + + * libcruft/Makefile.am (libcruft_revision): Incrememnt. + * liboctave/Makefile.am (liboctave_revision): Set to 0. + (liboctave_current, liboctave_age): Incrememnt. + * src/Makefile.am (liboctinterp_revision): Increment. + + Files: libcruft/Makefile.am liboctave/Makefile.am src/Makefile.am + + preserve DiagArray2 interface for stable release series + + * DiagArray2.h (DiagArray2::checkelem): Restore function. Provide + non-const version. + (DiagArray2::check_idx): Return bool status. + (DiagArray2::operator ()): Call checkelem, not check_idx. + + Files: liboctave/DiagArray2.cc liboctave/DiagArray2.h + +2012-05-11 John W. Eaton + + Added tag rc-3-6-2-0 for changeset f947d2922feb + + Files: .hgtags + + 3.6.2-rc0 release candidate + + * configure.ac (AC_INIT): Version is now 3.6.2-rc0. + (OCTAVE_RELEASE_DATE): Now 2012-05-11. + + Files: configure.ac + + when redimensioning, always pad dim_vector objects with 1 (bug #33216) + + * dim-vector.cc (dim_vector::redim): Always pad with 1. + * dim-vector.h (dim_vector::redim): Update comment. + * Array.cc (Array::assign): Query dimensions for all zeros before + redimensioning. + * ov-struct.cc: New test. + + Files: liboctave/Array.cc liboctave/dim-vector.cc liboctave/dim-vector.h + src/ov-struct.cc + +2012-05-03 Jordi Gutiérrez Hermoso + + conv2.c: Unmark a test as a known failure (bug #34893) + + Files: src/DLD-FUNCTIONS/conv2.cc + +2012-04-17 Sunghyun Cho + + perform convolution properly independently of matrix orientation (bug #34893) + + * cconv2.f (cconv2i), csconv2.f (csconv2i), dconv2.f (dconv2i), + sconv2.f (sconv2i), zconv2.f (zconv2i), zdconv2.f (zdconv2i): Fix + iteration over the a matrix, so it's properly reversed. + + * conv2.cc: Uncomment test to check for this, and add a new xtest. + + Files: libcruft/blas-xtra/cconv2.f libcruft/blas-xtra/csconv2.f libcruft + /blas-xtra/dconv2.f libcruft/blas-xtra/sconv2.f libcruft/blas- + xtra/zconv2.f libcruft/blas-xtra/zdconv2.f src/DLD- + FUNCTIONS/conv2.cc + +2012-05-02 Jordi Gutiérrez Hermoso + + Implement proper op() indexing for diagonal matrices (bug #36368) + + * DiagArray2.h (DiagArray2::check_idx): New function. + (DiagArray2::checkelem): Deleted. (DiagArray2::operator()): New + non-const version, returns references. Conditionally call check_idx. + + * DiagArray2.cc (DiagArray2::check_idx): Contents copied over from + checkelem. + (DiagArray2::checkelem): Deleted. + + * ov-base-diag.cc (octave_base_diag::do_index_op): Replace + call to now-inaccessible checkelem() with elem(). + + * ov-cx-diag.cc: Add a test for this bug. + + Files: liboctave/DiagArray2.cc liboctave/DiagArray2.h src/ov-base-diag.cc + src/ov-cx-diag.cc + +2012-04-30 Ben Abbott + + poissrnd should return zero when lambda = 0. (Bug # 36326) + + poissrnd.m: poissonrnd should return zero when lambda = 0. + Add demos. + + Files: scripts/statistics/distributions/poissrnd.m + +2012-04-19 John W. Eaton + + avoid error for calls to functions returning varargout that ignore final outputs (bug #36221) + + * pt-assign.cc (tree_multi_assignment::rvalue): Don't error if more + output values are requested than returned when the requested outputs + are ignored. New test. + + Files: src/pt-assign.cc + +2012-04-18 John W. Eaton + + ensure isargout is not sticky + + * ov-usr-fcn.cc (octave_user_function::bind_automatic_vars): + Ensure .ignored. is undefined by default. New tests. + + Files: src/ov-usr-fcn.cc + +2012-04-17 John W. Eaton + + seconds after the minute can be 0-60, not 0-61 + + * system.txi (Timing Utilities): Correct possible values for number of + seconds in time structures. From Rafael Arndt . + + Files: doc/interpreter/system.txi + + correctly fill struct arrays for assignments that cause resizing (bug #33178) + + * oct-map.cc (octave_map::assign): Pass Matrix fill value to cell + array assignment functions. New test. + + Files: src/oct-map.cc + + correctly fill cell arrays for three-arg diag function calls + + * data.cc (Fdiag): Special case for cell arrays so that off-diagonal + elements are filled with []. + + Files: src/data.cc + +2012-04-16 John W. Eaton + + avoid unnecessary index overflow error when printing sparse array (bug #35148) + + * ov-base-sparse.cc (octave_base_sparse::print_info): Don't use + numel when computing percentage of non-zero elements. + + Files: src/ov-base-sparse.cc + +2012-04-14 Rik + + Restore 'TextureMap' option for surface objects (Bug #35661) + + * graphics.h.in (surface::properties): Add 'TextureMap' to option + to 'FaceColor' property. + + Files: src/graphics.h.in + +2012-04-12 John W. Eaton + + allow kron to work for two diag matrix arguments (bug #35647) + + * kron.cc (dispatch_kron): Fix recursive call for case of two diagonal + matrix objects as arguments. New tests. + + Files: src/DLD-FUNCTIONS/kron.cc + +2012-04-05 Rik + + Fix regression after 3.4.0 with '-r0' option to print (bug #36092). + + * __print_parse_opts__.m: Don't convert numeric value (resolution) to string. + + Files: scripts/plot/private/__print_parse_opts__.m + +2012-03-28 Jordi Gutiérrez Hermoso + + doc: Fix typo in logspace.m docstring (bug #36024) + + Files: scripts/general/logspace.m + +2012-03-24 Rik + + Stop segfault when regular expression contains malformed lookbehind atom (bug #35961) + + * liboctave/regexp.cc (compile_internal): Change '<=' to '<' in while loop condition + to stop running beyond length of pattern. + + Files: liboctave/regexp.cc + +2012-03-22 Jordi Gutiérrez Hermoso + + Initialise memory in non-square diag call (bug #35946) + + * diag.cc (Fdiag): Initialise memory in call to resize(), and write a + test to check for this. + + Files: src/data.cc + +2012-03-21 Mike Miller + + doc: Fix edit command default mode description + + Files: scripts/miscellaneous/edit.m + +2012-03-13 Marco Caliari + + Fix logm for complex matrix with real eigenvalues (bug #34893). + + * crsf2csf, zrsf2csf: Fix off-by-one error. + * logm.m: Only truncate imaginary parts for real matrices. Add a test. + * schur.cc: Add a test for rsf2csf.x + + Files: libcruft/lapack-xtra/crsf2csf.f libcruft/lapack-xtra/zrsf2csf.f + scripts/linear-algebra/logm.m src/DLD-FUNCTIONS/schur.cc + +2012-03-17 Jordi Gutiérrez Hermoso + + doc: Reword the manual section on getting build dependencies + + Files: doc/interpreter/install.txi doc/interpreter/octave.texi + +2012-03-16 Rik + + Fix regression in bin2dec which did not allow space-separated input. + + * base2dec.m: Squeeze spaces from input before applying algorithm. + + * bin2dec.m: Add tests for using spaces in binary number. + + Files: scripts/strings/base2dec.m scripts/strings/bin2dec.m + +2012-03-15 John W. Eaton + + fix scalar indexing in anonymous function bug (bug #34765) + + * ov-base-scalar.h (octave_base_scalar::do_multi_index_op): + New function. + + Files: src/ov-base-scalar.h + +2012-03-14 Jordi Gutiérrez Hermoso + + Fix segfault in pchip when input array is too small (bug #35835). + + * __pchip_deriv__.cc (F__pchip_deriv__): Error out if x isn't at least + of length 2. + * pchip.m: Write two tests for this. + + Files: scripts/polynomial/pchip.m src/DLD-FUNCTIONS/__pchip_deriv__.cc + +2012-03-11 Rik + + Stop segfault when using regular expressions with named capture buffers (bug #35683). + + liboctave/regexp.cc (match): Check current match has a named buffer before assigning it. + + DLD-FUNCTIONS/regexp.cc: Add %!test for mix of named and unnamed buffers. + + Files: liboctave/regexp.cc src/DLD-FUNCTIONS/regexp.cc + +2012-03-01 Miguel Bazdresch + + pkg: bug fix - accessing non-existent variable for error message + + Files: scripts/pkg/pkg.m + +2012-03-07 Jordi Gutiérrez Hermoso + + NEWS: mention randperm changes + + Files: NEWS + + Fix segfault on multidimensional median call (bug #35679). + + * Array.c (Array::nth_elemnt): Readjust dim after chopping singletons. + * median.m: Add tests. + + Files: liboctave/Array.cc scripts/statistics/base/median.m + +2012-03-05 Marco Caliari + + Fix sparse range indexing bug (bug #35570) + + * Sparse.cc (Sparse::index): Correctly compute and assign the row and + column index vectors. Also add a test to check for this bug. + + Files: liboctave/Sparse.cc + +2012-02-25 Rik + + doc: Correct a few typos in NEWS. + + * NEWS: Correct a few typos. + + Files: NEWS + +2012-02-24 Rik + + doc: Fix wording in NEWS file. + + * NEWS: Improve wording and correct typo. + + Files: NEWS + + base2dec.m: Fix incorrect bin2dec results (bug #35621). + + * base2dec.m: Fix incorrect bin2dec results (bug #35621). + + Files: scripts/strings/base2dec.m + +2012-02-23 John W. Eaton + + maint: Move @CPPFLAGS@ to end of AM_CPPFLAGS lists in Makefiles. + + * libcruft/Makefile.am (AM_CPPFLAGS): Move @CPPFLAGS@ to the end of + the list. + * liboctave/Makefile.am: Likewise. + * src/Makefile.am: Likewise. + + Files: libcruft/Makefile.am liboctave/Makefile.am src/Makefile.am + + maint: avoid $(echo ...) in shell script string (bug #35572) + + * mk-ops.awk, sparse-mk-ops.awk: Print lists of source files on one line. + * config-ops.sh: Don't call $(echo ...) inside string. + + Files: liboctave/config-ops.sh liboctave/mk-ops.awk liboctave/sparse-mk- + ops.awk + + correctly fill result for M * v for Nx0 * 0x1 operations + + * dColVector.cc (operator * (const Matrix&, const ColumnVector&)): + Fill result if NC is 0. + * CColVector.cc (operator * (const ComplexMatrix&, const + ComplexColumnVector&)): Likewise. + * fCColVector.cc (const FloatComplexMatrix&, const + FloatComplexColumnVector&)): Likewise. + * fColVector.cc (const FloatMatrix&, const FloatColumnVector&)): + Likewise. + + Files: liboctave/CColVector.cc liboctave/dColVector.cc + liboctave/fCColVector.cc liboctave/fColVector.cc + 2012-02-22 John W. Eaton Version 3.6.1 released. diff -uNr octave-3.6.1/configure octave-3.6.2/configure --- octave-3.6.1/configure 2012-02-22 14:46:14.000000000 -0500 +++ octave-3.6.2/configure 2012-05-31 11:24:32.000000000 -0400 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision: 1.603 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for GNU Octave 3.6.1. +# Generated by GNU Autoconf 2.68 for GNU Octave 3.6.2. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='GNU Octave' PACKAGE_TARNAME='octave' -PACKAGE_VERSION='3.6.1' -PACKAGE_STRING='GNU Octave 3.6.1' +PACKAGE_VERSION='3.6.2' +PACKAGE_STRING='GNU Octave 3.6.2' PACKAGE_BUGREPORT='http://octave.org/bugs.html' PACKAGE_URL='http://www.gnu.org/software/octave/' @@ -1778,6 +1778,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -2522,7 +2523,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU Octave 3.6.1 to adapt to many kinds of systems. +\`configure' configures GNU Octave 3.6.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2596,7 +2597,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Octave 3.6.1:";; + short | recursive ) echo "Configuration of GNU Octave 3.6.2:";; esac cat <<\_ACEOF @@ -2859,7 +2860,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU Octave configure 3.6.1 +GNU Octave configure 3.6.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -4072,7 +4073,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU Octave $as_me 3.6.1, which was +It was created by GNU Octave $as_me 3.6.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -4492,7 +4493,7 @@ OCTAVE_VERSION="$PACKAGE_VERSION" OCTAVE_API_VERSION_NUMBER="48" OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+" -OCTAVE_RELEASE_DATE="2012-02-22" +OCTAVE_RELEASE_DATE="2012-05-31" OCTAVE_COPYRIGHT="Copyright (C) 2012 John W. Eaton and others." @@ -4975,7 +4976,7 @@ # Define the identity of the package. PACKAGE='octave' - VERSION='3.6.1' + VERSION='3.6.2' cat >>confdefs.h <<_ACEOF @@ -5005,9 +5006,9 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 @@ -5253,6 +5254,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -6066,6 +6068,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -6125,7 +6128,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -7410,6 +7413,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -7469,7 +7473,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -8409,6 +8413,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -8468,7 +8473,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -61537,7 +61542,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU Octave $as_me 3.6.1, which was +This file was extended by GNU Octave $as_me 3.6.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -61605,7 +61610,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU Octave config.status 3.6.1 +GNU Octave config.status 3.6.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -uNr octave-3.6.1/configure.ac octave-3.6.2/configure.ac --- octave-3.6.1/configure.ac 2012-02-22 14:38:34.000000000 -0500 +++ octave-3.6.2/configure.ac 2012-05-31 11:20:35.000000000 -0400 @@ -27,13 +27,13 @@ EXTERN_CFLAGS="$CFLAGS" EXTERN_CXXFLAGS="$CXXFLAGS" -AC_INIT([GNU Octave], [3.6.1], [http://octave.org/bugs.html], [octave]) +AC_INIT([GNU Octave], [3.6.2], [http://octave.org/bugs.html], [octave]) dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg OCTAVE_VERSION="$PACKAGE_VERSION" OCTAVE_API_VERSION_NUMBER="48" OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+" -OCTAVE_RELEASE_DATE="2012-02-22" +OCTAVE_RELEASE_DATE="2012-05-31" OCTAVE_COPYRIGHT="Copyright (C) 2012 John W. Eaton and others." AC_SUBST(OCTAVE_VERSION) AC_SUBST(OCTAVE_API_VERSION_NUMBER) diff -uNr octave-3.6.1/doc/faq/Makefile.in octave-3.6.2/doc/faq/Makefile.in --- octave-3.6.1/doc/faq/Makefile.in 2012-02-22 14:46:07.000000000 -0500 +++ octave-3.6.2/doc/faq/Makefile.in 2012-05-31 11:24:26.000000000 -0400 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -195,6 +195,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -1578,6 +1584,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/build-aux/common.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1798,10 +1805,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -1860,13 +1872,14 @@ for p in $$list; do \ if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ $(am__strip_dir) \ - if test -d "$$d$$p"; then \ + d2=$$d$$p; \ + if test -d "$$d2"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ - echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ + echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ else \ - list2="$$list2 $$d$$p"; \ + list2="$$list2 $$d2"; \ fi; \ done; \ test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ @@ -1898,8 +1911,13 @@ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done @$(POST_INSTALL) - @if (install-info --version && \ - install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ + @am__run_installinfo=yes; \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) am__run_installinfo=no;; \ + *) (install-info --version) >/dev/null 2>&1 \ + || am__run_installinfo=no;; \ + esac; \ + if test $$am__run_installinfo = yes; then \ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ Binary files octave-3.6.1/doc/faq/OctaveFAQ.dvi and octave-3.6.2/doc/faq/OctaveFAQ.dvi differ Binary files octave-3.6.1/doc/faq/OctaveFAQ.pdf and octave-3.6.2/doc/faq/OctaveFAQ.pdf differ diff -uNr octave-3.6.1/doc/faq/OctaveFAQ.ps octave-3.6.2/doc/faq/OctaveFAQ.ps --- octave-3.6.1/doc/faq/OctaveFAQ.ps 2012-02-22 14:55:57.000000000 -0500 +++ octave-3.6.2/doc/faq/OctaveFAQ.ps 2012-05-31 11:33:53.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 -%%Creator: dvips(k) 5.98 Copyright 2009 Radical Eye Software +%%Creator: dvips(k) 5.991 Copyright 2011 Radical Eye Software %%Title: OctaveFAQ.dvi -%%CreationDate: Wed Feb 22 14:55:57 2012 +%%CreationDate: Thu May 31 11:33:53 2012 %%Pages: 21 %%PageOrder: Ascend %%BoundingBox: 0 0 612 792 @@ -12,7 +12,7 @@ %DVIPSWebPage: (www.radicaleye.com) %DVIPSCommandLine: dvips -o OctaveFAQ.ps OctaveFAQ.dvi %DVIPSParameters: dpi=600 -%DVIPSSource: TeX output 2012.02.22:1455 +%DVIPSSource: TeX output 2012.05.31:1133 %%BeginProcSet: tex.pro 0 0 %! /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S @@ -44,19 +44,21 @@ userdict/start-hook known{start-hook}if pop/VResolution X/Resolution X 1000 div/DVImag X/IEn 256 array N 2 string 0 1 255{IEn S A 360 add 36 4 index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N -/p{show}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0 N/Ry 0 N/V{}B/RV/v{ -/Ry X/Rx X V}B statusdict begin/product where{pop false[(Display)(NeXT) -(LaserWriter 16/600)]{A length product length le{A length product exch 0 -exch getinterval eq{pop true exit}if}{pop}ifelse}forall}{false}ifelse -end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagemask -grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat{BDot} -imagemask grestore}}ifelse B/QV{gsave newpath transform round exch round -exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 rlineto -fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B/M{S p -delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}B/g{0 M} -B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p -3 w}B/n{ -p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{0 S -rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end +/dir 0 def/dyy{/dir 0 def}B/dyt{/dir 1 def}B/dty{/dir 2 def}B/dtt{/dir 3 +def}B/p{dir 2 eq{-90 rotate show 90 rotate}{dir 3 eq{-90 rotate show 90 +rotate}{show}ifelse}ifelse}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0 +N/Ry 0 N/V{}B/RV/v{/Ry X/Rx X V}B statusdict begin/product where{pop +false[(Display)(NeXT)(LaserWriter 16/600)]{A length product length le{A +length product exch 0 exch getinterval eq{pop true exit}if}{pop}ifelse} +forall}{false}ifelse end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{ +BDot}imagemask grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat +{BDot}imagemask grestore}}ifelse B/QV{gsave newpath transform round exch +round exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 +rlineto fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B +/M{S p delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M} +B/g{0 M}B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p +-3 w}B/n{p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{ +0 S rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end %%EndProcSet %%BeginProcSet: texps.pro 0 0 @@ -6208,10 +6210,9 @@ %%Page: 1 1 TeXDict begin 1 0 bop 150 1317 a Fu(Octa)-5 b(v)g(e)65 b(F)-22 b(A)-5 b(Q)p 150 1417 3600 34 v 2116 1513 a Ft(F)d(requen)m -(tly)31 b(ask)m(ed)g(questions)g(ab)s(out)f(Octa)m(v)m(e)3059 -1621 y(22)h(F)-8 b(ebruary)30 b(2012)150 5091 y Fs(John)45 -b(W.)g(Eaton)h(and)f(Da)l(vid)g(Bateman)p 150 5141 3600 -17 v eop end +(tly)31 b(ask)m(ed)g(questions)g(ab)s(out)f(Octa)m(v)m(e)3242 +1621 y(31)i(Ma)m(y)f(2012)150 5091 y Fs(John)45 b(W.)g(Eaton)h(and)f +(Da)l(vid)g(Bateman)p 150 5141 3600 17 v eop end %%Page: 2 2 TeXDict begin 2 1 bop eop end %%Page: 1 3 @@ -7041,7 +7042,7 @@ g(pro\014ler)e(sometime)j(in)e(the)g(future.)40 b(See)31 b(the)f(thread)330 544 y Fq(http://octave.1599824.n4)o(.nab)o(ble.)o (com)o(/Oct)o(ave-)o(pro)o(file)o(r-td)o(164)o(1945)o(.htm)o(l#a)o -(1641)o(947)p 3916 564 42 84 v 330 679 a Ft(for)g(more)h(details.)225 +(1641)o(947)p 3910 564 42 84 v 330 679 a Ft(for)g(more)h(details.)225 814 y Fk(\017)60 b Ft(T)-8 b(o)s(olb)s(o)m(xes)77 b(Octa)m(v)m(e)i(is)d (a)h(comm)m(unit)m(y)g(pro)5 b(ject)77 b(and)f(so)g(the)h(to)s(olb)s(o) m(xes)g(that)g(exist)330 923 y(are)72 b(donated)g(b)m(y)f(those)i(in)m diff -uNr octave-3.6.1/doc/icons/Makefile.in octave-3.6.2/doc/icons/Makefile.in --- octave-3.6.1/doc/icons/Makefile.in 2012-02-22 14:46:07.000000000 -0500 +++ octave-3.6.2/doc/icons/Makefile.in 2012-05-31 11:24:26.000000000 -0400 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -185,6 +185,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(imagedir)" DATA = $(image_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -1578,6 +1584,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/build-aux/common.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1610,9 +1617,7 @@ @$(NORMAL_UNINSTALL) @list='$(image_DATA)'; test -n "$(imagedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(imagedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(imagedir)" && rm -f $$files + dir='$(DESTDIR)$(imagedir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -1667,10 +1672,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -uNr octave-3.6.1/doc/interpreter/convhull.eps octave-3.6.2/doc/interpreter/convhull.eps --- octave-3.6.1/doc/interpreter/convhull.eps 2012-02-22 15:01:39.000000000 -0500 +++ octave-3.6.2/doc/interpreter/convhull.eps 2012-05-31 11:40:45.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: convhull.eps -%%Creator: gnuplot 4.4 patchlevel 0 -%%CreationDate: Wed Feb 22 15:01:38 2012 +%%Creator: gnuplot 4.6 patchlevel 0 +%%CreationDate: Thu May 31 11:40:45 2012 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments @@ -20,10 +20,12 @@ /Level1 false def /Rounded false def /ClipToBoundingBox false def +/SuppressPDFMark false def /TransparentPatterns false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /Gamma 1.0 def +/BackgroundColor {-1.000 -1.000 -1.000} def % /vshift -66 def /dl1 { @@ -38,22 +40,6 @@ /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def -Level1 {} { -/SDict 10 dict def -systemdict /pdfmark known not { - userdict /pdfmark systemdict /cleartomark get put -} if -SDict begin [ - /Title (convhull.eps) - /Subject (gnuplot plot) - /Creator (gnuplot 4.4 patchlevel 0) - /Author (jwe) -% /Producer (gnuplot) -% /Keywords () - /CreationDate (Wed Feb 22 15:01:38 2012) - /DOCINFO pdfmark -end -} ifelse /doclip { ClipToBoundingBox { newpath 50 50 moveto 410 50 lineto 410 302 lineto 50 302 lineto closepath @@ -61,7 +47,7 @@ } if } def % -% Gnuplot Prolog Version 4.4 (January 2010) +% Gnuplot Prolog Version 4.4 (August 2010) % %/SuppressPDFMark true def % @@ -73,6 +59,7 @@ /Z {closepath} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def +/g {setgray} bind def /Gshow {show} def % May be redefined later in the file to support UTF-8 /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def @@ -94,6 +81,7 @@ dup 1 lt {pop 1} if 10 mul /udl exch def} def /PL {stroke userlinewidth setlinewidth Rounded {1 setlinejoin 1 setlinecap} if} def +3.8 setmiterlimit % Default Line colors /LCw {1 1 1} def /LCb {0 0 0} def @@ -459,8 +447,26 @@ Blacktext {gsave 0 setgray MFshow grestore} {MFshow} ifelse } bind def /XYsave { [( ) 1 2 true false 3 ()] } bind def /XYrestore { [( ) 1 2 true false 4 ()] } bind def +Level1 SuppressPDFMark or +{} { +/SDict 10 dict def +systemdict /pdfmark known not { + userdict /pdfmark systemdict /cleartomark get put +} if +SDict begin [ + /Title (convhull.eps) + /Subject (gnuplot plot) + /Creator (gnuplot 4.6 patchlevel 0) + /Author (jwe) +% /Producer (gnuplot) +% /Keywords () + /CreationDate (Thu May 31 11:40:45 2012) + /DOCINFO pdfmark +end +} ifelse end %%EndProlog +%%Page: 1 1 gnudict begin gsave doclip @@ -469,6 +475,7 @@ 0 setgray newpath (Helvetica) findfont 200 scalefont setfont +BackgroundColor 0 lt 3 1 roll 0 lt exch 0 lt or or not {BackgroundColor C 1.000 0 0 7200.00 5040.00 BoxColFill} if gsave % colour palette begin /maxcolors 64 def /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray @@ -545,143 +552,143 @@ } ifelse 0.500 UL LTb -780 600 M +660 600 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 600 M +0.00 0.00 0.00 C 540 600 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MRshow 0.500 UL LTb -780 1400 M +660 1400 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 1400 M +0.00 0.00 0.00 C 540 1400 M [ [({}) 200.0 0.0 true true 0 (0.2)] ] -66.7 MRshow 0.500 UL LTb -780 2200 M +660 2200 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 2200 M +0.00 0.00 0.00 C 540 2200 M [ [({}) 200.0 0.0 true true 0 (0.4)] ] -66.7 MRshow 0.500 UL LTb -780 2999 M +660 2999 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 2999 M +0.00 0.00 0.00 C 540 2999 M [ [({}) 200.0 0.0 true true 0 (0.6)] ] -66.7 MRshow 0.500 UL LTb -780 3799 M +660 3799 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 3799 M +0.00 0.00 0.00 C 540 3799 M [ [({}) 200.0 0.0 true true 0 (0.8)] ] -66.7 MRshow 0.500 UL LTb -780 4599 M +660 4599 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 4599 M +0.00 0.00 0.00 C 540 4599 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MRshow 0.500 UL LTb -830 400 M +711 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 830 200 M +0.00 0.00 0.00 C 711 200 M [ [({}) 200.0 0.0 true true 0 (-3)] ] -66.7 MCshow 0.500 UL LTb -1833 400 M +1724 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 1833 200 M +0.00 0.00 0.00 C 1724 200 M [ [({}) 200.0 0.0 true true 0 (-2)] ] -66.7 MCshow 0.500 UL LTb -2836 400 M +2737 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 2836 200 M +0.00 0.00 0.00 C 2737 200 M [ [({}) 200.0 0.0 true true 0 (-1)] ] -66.7 MCshow 0.500 UL LTb -3840 400 M +3750 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 3840 200 M +0.00 0.00 0.00 C 3750 200 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MCshow 0.500 UL LTb -4843 400 M +4762 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 4843 200 M +0.00 0.00 0.00 C 4762 200 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MCshow 0.500 UL LTb -5846 400 M +5775 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 5846 200 M +0.00 0.00 0.00 C 5775 200 M [ [({}) 200.0 0.0 true true 0 (2)] ] -66.7 MCshow 0.500 UL LTb -6849 400 M +6788 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6849 200 M +0.00 0.00 0.00 C 6788 200 M [ [({}) 200.0 0.0 true true 0 (3)] ] -66.7 MCshow 0.500 UL LTb 0.500 UL LTb -780 4799 N -780 400 L -6119 0 V +660 4799 N +660 400 L +6179 0 V 0 4399 V --6119 0 V +-6179 0 V Z stroke 1.000 UP 0.500 UL @@ -689,194 +696,194 @@ % Begin plot #1 0.500 UL LT0 -1.00 0.00 0.00 C 830 1164 M -3840 600 L -3009 564 V +1.00 0.00 0.00 C 711 1164 M +3750 600 L +3038 564 V -50 197 V --50 196 V +-51 196 V -51 193 V -50 190 V --50 186 V --50 183 V +-51 186 V +-51 183 V -50 179 V --50 173 V --51 169 V --50 163 V --50 157 V +-51 173 V +-50 169 V +-51 163 V +-51 157 V -50 151 V --50 144 V --50 137 V +-51 144 V +-51 137 V -50 130 V -51 121 V --50 114 V +-51 114 V -50 105 V --50 97 V --50 87 V +-51 97 V +-51 87 V -50 79 V -51 69 V --50 60 V +-51 60 V -50 50 V --50 41 V +-51 41 V -50 31 V --50 21 V +-51 21 V -51 10 V -50 1 V --3109 0 V +-3141 0 V -50 -1 V -51 -10 V --50 -21 V +-51 -21 V -50 -31 V --50 -41 V +-51 -41 V -50 -50 V --50 -60 V +-51 -60 V -51 -69 V -50 -79 V --50 -87 V --50 -97 V +-51 -87 V +-51 -97 V -50 -105 V --50 -114 V +-51 -114 V -51 -121 V -50 -130 V --50 -137 V --50 -144 V +-51 -137 V +-51 -144 V -50 -151 V --50 -157 V --50 -163 V --51 -169 V --50 -173 V +-51 -157 V +-51 -163 V +-50 -169 V +-51 -173 V -50 -179 V --50 -183 V --50 -186 V -981 1750 L -930 1557 L -880 1361 L -830 1164 L +964 2126 L +913 1940 L +863 1750 L +812 1557 L +761 1361 L +711 1164 L % End plot #1 % Begin plot #2 2.000 UP stroke LT1 -0.00 0.00 1.00 C 830 1164 Pls -880 1361 Pls -930 1557 Pls -981 1750 Pls -1031 1940 Pls -1081 2126 Pls -1131 2309 Pls -1181 2488 Pls -1231 2661 Pls -1282 2830 Pls -1332 2993 Pls -1382 3150 Pls -1432 3301 Pls -1482 3445 Pls -1532 3582 Pls -1582 3712 Pls -1633 3833 Pls -1683 3947 Pls -1733 4052 Pls -1783 4149 Pls -1833 4236 Pls -1883 4315 Pls -1934 4384 Pls -1984 4444 Pls -2034 4494 Pls -2084 4535 Pls -2134 4566 Pls -2184 4587 Pls -2235 4597 Pls -2285 4598 Pls -2335 4589 Pls -2385 4570 Pls -2435 4541 Pls -2485 4502 Pls -2535 4453 Pls -2586 4395 Pls -2636 4327 Pls -2686 4250 Pls -2736 4164 Pls -2786 4069 Pls -2836 3965 Pls -2887 3853 Pls -2937 3733 Pls -2987 3604 Pls -3037 3469 Pls -3087 3326 Pls -3137 3176 Pls -3187 3020 Pls -3238 2858 Pls -3288 2690 Pls -3338 2517 Pls -3388 2339 Pls -3438 2157 Pls -3488 1971 Pls -3539 1782 Pls -3589 1589 Pls -3639 1394 Pls -3689 1198 Pls -3739 999 Pls -3789 800 Pls -3840 600 Pls -3890 800 Pls -3940 999 Pls -3990 1198 Pls -4040 1394 Pls -4090 1589 Pls -4140 1782 Pls -4191 1971 Pls -4241 2157 Pls -4291 2339 Pls -4341 2517 Pls -4391 2690 Pls -4441 2858 Pls -4492 3020 Pls -4542 3176 Pls -4592 3326 Pls -4642 3469 Pls -4692 3604 Pls -4742 3733 Pls -4792 3853 Pls -4843 3965 Pls -4893 4069 Pls -4943 4164 Pls -4993 4250 Pls -5043 4327 Pls -5093 4395 Pls -5144 4453 Pls -5194 4502 Pls -5244 4541 Pls -5294 4570 Pls -5344 4589 Pls -5394 4598 Pls -5444 4597 Pls -5495 4587 Pls -5545 4566 Pls -5595 4535 Pls -5645 4494 Pls -5695 4444 Pls -5745 4384 Pls -5796 4315 Pls -5846 4236 Pls -5896 4149 Pls -5946 4052 Pls -5996 3947 Pls -6046 3833 Pls -6097 3712 Pls -6147 3582 Pls -6197 3445 Pls -6247 3301 Pls -6297 3150 Pls -6347 2993 Pls -6397 2830 Pls -6448 2661 Pls -6498 2488 Pls -6548 2309 Pls -6598 2126 Pls -6648 1940 Pls -6698 1750 Pls -6749 1557 Pls -6799 1361 Pls -6849 1164 Pls +0.00 0.00 1.00 C 711 1164 Pls +761 1361 Pls +812 1557 Pls +863 1750 Pls +913 1940 Pls +964 2126 Pls +1015 2309 Pls +1065 2488 Pls +1116 2661 Pls +1166 2830 Pls +1217 2993 Pls +1268 3150 Pls +1318 3301 Pls +1369 3445 Pls +1420 3582 Pls +1470 3712 Pls +1521 3833 Pls +1572 3947 Pls +1622 4052 Pls +1673 4149 Pls +1724 4236 Pls +1774 4315 Pls +1825 4384 Pls +1876 4444 Pls +1926 4494 Pls +1977 4535 Pls +2027 4566 Pls +2078 4587 Pls +2129 4597 Pls +2179 4598 Pls +2230 4589 Pls +2281 4570 Pls +2331 4541 Pls +2382 4502 Pls +2433 4453 Pls +2483 4395 Pls +2534 4327 Pls +2585 4250 Pls +2635 4164 Pls +2686 4069 Pls +2737 3965 Pls +2787 3853 Pls +2838 3733 Pls +2888 3604 Pls +2939 3469 Pls +2990 3326 Pls +3040 3176 Pls +3091 3020 Pls +3142 2858 Pls +3192 2690 Pls +3243 2517 Pls +3294 2339 Pls +3344 2157 Pls +3395 1971 Pls +3446 1782 Pls +3496 1589 Pls +3547 1394 Pls +3598 1198 Pls +3648 999 Pls +3699 800 Pls +3750 600 Pls +3800 800 Pls +3851 999 Pls +3901 1198 Pls +3952 1394 Pls +4003 1589 Pls +4053 1782 Pls +4104 1971 Pls +4155 2157 Pls +4205 2339 Pls +4256 2517 Pls +4307 2690 Pls +4357 2858 Pls +4408 3020 Pls +4459 3176 Pls +4509 3326 Pls +4560 3469 Pls +4611 3604 Pls +4661 3733 Pls +4712 3853 Pls +4762 3965 Pls +4813 4069 Pls +4864 4164 Pls +4914 4250 Pls +4965 4327 Pls +5016 4395 Pls +5066 4453 Pls +5117 4502 Pls +5168 4541 Pls +5218 4570 Pls +5269 4589 Pls +5320 4598 Pls +5370 4597 Pls +5421 4587 Pls +5472 4566 Pls +5522 4535 Pls +5573 4494 Pls +5623 4444 Pls +5674 4384 Pls +5725 4315 Pls +5775 4236 Pls +5826 4149 Pls +5877 4052 Pls +5927 3947 Pls +5978 3833 Pls +6029 3712 Pls +6079 3582 Pls +6130 3445 Pls +6181 3301 Pls +6231 3150 Pls +6282 2993 Pls +6333 2830 Pls +6383 2661 Pls +6434 2488 Pls +6484 2309 Pls +6535 2126 Pls +6586 1940 Pls +6636 1750 Pls +6687 1557 Pls +6738 1361 Pls +6788 1164 Pls % End plot #2 1.000 UP 0.500 UL Binary files octave-3.6.1/doc/interpreter/convhull.pdf and octave-3.6.2/doc/interpreter/convhull.pdf differ Binary files octave-3.6.1/doc/interpreter/convhull.png and octave-3.6.2/doc/interpreter/convhull.png differ diff -uNr octave-3.6.1/doc/interpreter/delaunay.eps octave-3.6.2/doc/interpreter/delaunay.eps --- octave-3.6.1/doc/interpreter/delaunay.eps 2012-02-22 15:01:39.000000000 -0500 +++ octave-3.6.2/doc/interpreter/delaunay.eps 2012-05-31 11:40:46.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: delaunay.eps -%%Creator: gnuplot 4.4 patchlevel 0 -%%CreationDate: Wed Feb 22 15:01:39 2012 +%%Creator: gnuplot 4.6 patchlevel 0 +%%CreationDate: Thu May 31 11:40:45 2012 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments @@ -20,10 +20,12 @@ /Level1 false def /Rounded false def /ClipToBoundingBox false def +/SuppressPDFMark false def /TransparentPatterns false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /Gamma 1.0 def +/BackgroundColor {-1.000 -1.000 -1.000} def % /vshift -66 def /dl1 { @@ -38,22 +40,6 @@ /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def -Level1 {} { -/SDict 10 dict def -systemdict /pdfmark known not { - userdict /pdfmark systemdict /cleartomark get put -} if -SDict begin [ - /Title (delaunay.eps) - /Subject (gnuplot plot) - /Creator (gnuplot 4.4 patchlevel 0) - /Author (jwe) -% /Producer (gnuplot) -% /Keywords () - /CreationDate (Wed Feb 22 15:01:39 2012) - /DOCINFO pdfmark -end -} ifelse /doclip { ClipToBoundingBox { newpath 50 50 moveto 410 50 lineto 410 302 lineto 50 302 lineto closepath @@ -61,7 +47,7 @@ } if } def % -% Gnuplot Prolog Version 4.4 (January 2010) +% Gnuplot Prolog Version 4.4 (August 2010) % %/SuppressPDFMark true def % @@ -73,6 +59,7 @@ /Z {closepath} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def +/g {setgray} bind def /Gshow {show} def % May be redefined later in the file to support UTF-8 /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def @@ -94,6 +81,7 @@ dup 1 lt {pop 1} if 10 mul /udl exch def} def /PL {stroke userlinewidth setlinewidth Rounded {1 setlinejoin 1 setlinecap} if} def +3.8 setmiterlimit % Default Line colors /LCw {1 1 1} def /LCb {0 0 0} def @@ -459,8 +447,26 @@ Blacktext {gsave 0 setgray MFshow grestore} {MFshow} ifelse } bind def /XYsave { [( ) 1 2 true false 3 ()] } bind def /XYrestore { [( ) 1 2 true false 4 ()] } bind def +Level1 SuppressPDFMark or +{} { +/SDict 10 dict def +systemdict /pdfmark known not { + userdict /pdfmark systemdict /cleartomark get put +} if +SDict begin [ + /Title (delaunay.eps) + /Subject (gnuplot plot) + /Creator (gnuplot 4.6 patchlevel 0) + /Author (jwe) +% /Producer (gnuplot) +% /Keywords () + /CreationDate (Thu May 31 11:40:45 2012) + /DOCINFO pdfmark +end +} ifelse end %%EndProlog +%%Page: 1 1 gnudict begin gsave doclip @@ -469,6 +475,7 @@ 0 setgray newpath (Helvetica) findfont 200 scalefont setfont +BackgroundColor 0 lt 3 1 roll 0 lt exch 0 lt or or not {BackgroundColor C 1.000 0 0 7200.00 5040.00 BoxColFill} if gsave % colour palette begin /maxcolors 64 def /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray @@ -545,133 +552,133 @@ } ifelse 0.500 UL LTb -780 400 M +660 400 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 400 M +0.00 0.00 0.00 C 540 400 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MRshow 0.500 UL LTb -780 1280 M +660 1280 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 1280 M +0.00 0.00 0.00 C 540 1280 M [ [({}) 200.0 0.0 true true 0 (0.2)] ] -66.7 MRshow 0.500 UL LTb -780 2160 M +660 2160 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 2160 M +0.00 0.00 0.00 C 540 2160 M [ [({}) 200.0 0.0 true true 0 (0.4)] ] -66.7 MRshow 0.500 UL LTb -780 3039 M +660 3039 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 3039 M +0.00 0.00 0.00 C 540 3039 M [ [({}) 200.0 0.0 true true 0 (0.6)] ] -66.7 MRshow 0.500 UL LTb -780 3919 M +660 3919 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 3919 M +0.00 0.00 0.00 C 540 3919 M [ [({}) 200.0 0.0 true true 0 (0.8)] ] -66.7 MRshow 0.500 UL LTb -780 4799 M +660 4799 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 4799 M +0.00 0.00 0.00 C 540 4799 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MRshow 0.500 UL LTb -780 400 M +660 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 780 200 M +0.00 0.00 0.00 C 660 200 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MCshow 0.500 UL LTb -2004 400 M +1896 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 2004 200 M +0.00 0.00 0.00 C 1896 200 M [ [({}) 200.0 0.0 true true 0 (0.2)] ] -66.7 MCshow 0.500 UL LTb -3228 400 M +3132 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 3228 200 M +0.00 0.00 0.00 C 3132 200 M [ [({}) 200.0 0.0 true true 0 (0.4)] ] -66.7 MCshow 0.500 UL LTb -4451 400 M +4367 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 4451 200 M +0.00 0.00 0.00 C 4367 200 M [ [({}) 200.0 0.0 true true 0 (0.6)] ] -66.7 MCshow 0.500 UL LTb -5675 400 M +5603 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 5675 200 M +0.00 0.00 0.00 C 5603 200 M [ [({}) 200.0 0.0 true true 0 (0.8)] ] -66.7 MCshow 0.500 UL LTb -6899 400 M +6839 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6899 200 M +0.00 0.00 0.00 C 6839 200 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MCshow 0.500 UL LTb 0.500 UL LTb -780 4799 N -780 400 L -6119 0 V +660 4799 N +660 400 L +6179 0 V 0 4399 V --6119 0 V +-6179 0 V Z stroke 1.000 UP 0.500 UL @@ -679,113 +686,113 @@ % Begin plot #1 0.500 UL LT0 -0.00 0.00 1.00 C 5454 3753 M -152 805 V -5965 2304 L -5454 3753 L +0.00 0.00 1.00 C 5379 3753 M +155 805 V +5896 2304 L +5379 3753 L % End plot #1 % Begin plot #2 stroke LT0 -0.00 0.00 1.00 C 5454 3753 M -3530 3574 L -2076 984 V -5454 3753 L +0.00 0.00 1.00 C 5379 3753 M +3437 3574 L +2097 984 V +5379 3753 L % End plot #2 % Begin plot #3 stroke LT0 -0.00 0.00 1.00 C 5454 3753 M -3812 2359 L -2153 -55 V -5454 3753 L +0.00 0.00 1.00 C 5379 3753 M +3721 2359 L +2175 -55 V +5379 3753 L % End plot #3 % Begin plot #4 stroke LT0 -0.00 0.00 1.00 C 5454 3753 M -3812 2359 L -3530 3574 L -1924 179 V +0.00 0.00 1.00 C 5379 3753 M +3721 2359 L +3437 3574 L +1942 179 V % End plot #4 % Begin plot #5 stroke LT0 -0.00 0.00 1.00 C 1602 4077 M -3812 2359 L -953 535 L -649 3542 V +0.00 0.00 1.00 C 1490 4077 M +3721 2359 L +835 535 L +655 3542 V % End plot #5 % Begin plot #6 stroke LT0 -0.00 0.00 1.00 C 1602 4077 M -3812 2359 L -3530 3574 L -1602 4077 L +0.00 0.00 1.00 C 1490 4077 M +3721 2359 L +3437 3574 L +1490 4077 L % End plot #6 % Begin plot #7 stroke LT0 -0.00 0.00 1.00 C 4767 1406 M --955 953 V -2153 -55 V -4767 1406 L +0.00 0.00 1.00 C 4686 1406 M +-965 953 V +2175 -55 V +4686 1406 L % End plot #7 % Begin plot #8 stroke LT0 -0.00 0.00 1.00 C 1354 4365 M -3530 3574 L -2076 984 V -1354 4365 L +0.00 0.00 1.00 C 1240 4365 M +3437 3574 L +2097 984 V +1240 4365 L % End plot #8 % Begin plot #9 stroke LT0 -0.00 0.00 1.00 C 1354 4365 M -248 -288 V -3530 3574 L -1354 4365 L +0.00 0.00 1.00 C 1240 4365 M +250 -288 V +3437 3574 L +1240 4365 L % End plot #9 % Begin plot #10 stroke LT0 -0.00 0.00 1.00 C 1354 4365 M -248 -288 V -953 535 L -401 3830 V +0.00 0.00 1.00 C 1240 4365 M +250 -288 V +835 535 L +405 3830 V % End plot #10 % Begin plot #11 stroke LT0 -0.00 0.00 1.00 C 2341 409 M -3812 2359 L -953 535 L -2341 409 L +0.00 0.00 1.00 C 2236 409 M +3721 2359 L +835 535 L +2236 409 L % End plot #11 % Begin plot #12 stroke LT0 -0.00 0.00 1.00 C 2341 409 M -2426 997 V --955 953 V -2341 409 L +0.00 0.00 1.00 C 2236 409 M +2450 997 V +-965 953 V +2236 409 L % End plot #12 % Begin plot #13 2.000 UP stroke LT3 -1.00 0.00 0.00 C 1602 4077 Star -5965 2304 Star -5454 3753 Star -2341 409 Star -3812 2359 Star -3530 3574 Star -4767 1406 Star -5606 4558 Star -1354 4365 Star -953 535 Star +1.00 0.00 0.00 C 1490 4077 Star +5896 2304 Star +5379 3753 Star +2236 409 Star +3721 2359 Star +3437 3574 Star +4686 1406 Star +5534 4558 Star +1240 4365 Star +835 535 Star % End plot #13 1.000 UP 0.500 UL Binary files octave-3.6.1/doc/interpreter/delaunay.pdf and octave-3.6.2/doc/interpreter/delaunay.pdf differ Binary files octave-3.6.1/doc/interpreter/delaunay.png and octave-3.6.2/doc/interpreter/delaunay.png differ diff -uNr octave-3.6.1/doc/interpreter/errorbar.eps octave-3.6.2/doc/interpreter/errorbar.eps --- octave-3.6.1/doc/interpreter/errorbar.eps 2012-02-22 15:01:45.000000000 -0500 +++ octave-3.6.2/doc/interpreter/errorbar.eps 2012-05-31 11:40:52.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: errorbar.eps -%%Creator: gnuplot 4.4 patchlevel 0 -%%CreationDate: Wed Feb 22 15:01:45 2012 +%%Creator: gnuplot 4.6 patchlevel 0 +%%CreationDate: Thu May 31 11:40:52 2012 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments @@ -20,10 +20,12 @@ /Level1 false def /Rounded false def /ClipToBoundingBox false def +/SuppressPDFMark false def /TransparentPatterns false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /Gamma 1.0 def +/BackgroundColor {-1.000 -1.000 -1.000} def % /vshift -66 def /dl1 { @@ -38,22 +40,6 @@ /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def -Level1 {} { -/SDict 10 dict def -systemdict /pdfmark known not { - userdict /pdfmark systemdict /cleartomark get put -} if -SDict begin [ - /Title (errorbar.eps) - /Subject (gnuplot plot) - /Creator (gnuplot 4.4 patchlevel 0) - /Author (jwe) -% /Producer (gnuplot) -% /Keywords () - /CreationDate (Wed Feb 22 15:01:45 2012) - /DOCINFO pdfmark -end -} ifelse /doclip { ClipToBoundingBox { newpath 50 50 moveto 410 50 lineto 410 302 lineto 50 302 lineto closepath @@ -61,7 +47,7 @@ } if } def % -% Gnuplot Prolog Version 4.4 (January 2010) +% Gnuplot Prolog Version 4.4 (August 2010) % %/SuppressPDFMark true def % @@ -73,6 +59,7 @@ /Z {closepath} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def +/g {setgray} bind def /Gshow {show} def % May be redefined later in the file to support UTF-8 /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def @@ -94,6 +81,7 @@ dup 1 lt {pop 1} if 10 mul /udl exch def} def /PL {stroke userlinewidth setlinewidth Rounded {1 setlinejoin 1 setlinecap} if} def +3.8 setmiterlimit % Default Line colors /LCw {1 1 1} def /LCb {0 0 0} def @@ -459,8 +447,26 @@ Blacktext {gsave 0 setgray MFshow grestore} {MFshow} ifelse } bind def /XYsave { [( ) 1 2 true false 3 ()] } bind def /XYrestore { [( ) 1 2 true false 4 ()] } bind def +Level1 SuppressPDFMark or +{} { +/SDict 10 dict def +systemdict /pdfmark known not { + userdict /pdfmark systemdict /cleartomark get put +} if +SDict begin [ + /Title (errorbar.eps) + /Subject (gnuplot plot) + /Creator (gnuplot 4.6 patchlevel 0) + /Author (jwe) +% /Producer (gnuplot) +% /Keywords () + /CreationDate (Thu May 31 11:40:52 2012) + /DOCINFO pdfmark +end +} ifelse end %%EndProlog +%%Page: 1 1 gnudict begin gsave doclip @@ -469,6 +475,7 @@ 0 setgray newpath (Helvetica) findfont 200 scalefont setfont +BackgroundColor 0 lt 3 1 roll 0 lt exch 0 lt or or not {BackgroundColor C 1.000 0 0 7200.00 5040.00 BoxColFill} if gsave % colour palette begin /maxcolors 64 def /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray @@ -545,123 +552,123 @@ } ifelse 0.500 UL LTb -900 600 M +780 600 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 600 M +0.00 0.00 0.00 C 660 600 M [ [({}) 200.0 0.0 true true 0 (-1)] ] -66.7 MRshow 0.500 UL LTb -900 1600 M +780 1600 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 1600 M +0.00 0.00 0.00 C 660 1600 M [ [({}) 200.0 0.0 true true 0 (-0.5)] ] -66.7 MRshow 0.500 UL LTb -900 2600 M +780 2600 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 2600 M +0.00 0.00 0.00 C 660 2600 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MRshow 0.500 UL LTb -900 3599 M +780 3599 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 3599 M +0.00 0.00 0.00 C 660 3599 M [ [({}) 200.0 0.0 true true 0 (0.5)] ] -66.7 MRshow 0.500 UL LTb -900 4599 M +780 4599 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 4599 M +0.00 0.00 0.00 C 660 4599 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MRshow 0.500 UL LTb -900 400 M +780 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 900 200 M +0.00 0.00 0.00 C 780 200 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MCshow 0.500 UL LTb -2100 400 M +1992 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 2100 200 M +0.00 0.00 0.00 C 1992 200 M [ [({}) 200.0 0.0 true true 0 (2)] ] -66.7 MCshow 0.500 UL LTb -3300 400 M +3204 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 3300 200 M +0.00 0.00 0.00 C 3204 200 M [ [({}) 200.0 0.0 true true 0 (4)] ] -66.7 MCshow 0.500 UL LTb -4499 400 M +4415 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 4499 200 M +0.00 0.00 0.00 C 4415 200 M [ [({}) 200.0 0.0 true true 0 (6)] ] -66.7 MCshow 0.500 UL LTb -5699 400 M +5627 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 5699 200 M +0.00 0.00 0.00 C 5627 200 M [ [({}) 200.0 0.0 true true 0 (8)] ] -66.7 MCshow 0.500 UL LTb -6899 400 M +6839 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6899 200 M +0.00 0.00 0.00 C 6839 200 M [ [({}) 200.0 0.0 true true 0 (10)] ] -66.7 MCshow 0.500 UL LTb 0.500 UL LTb -900 4799 N -900 400 L -5999 0 V +780 4799 N +780 400 L +6059 0 V 0 4399 V --5999 0 V +-6059 0 V Z stroke 1.000 UP 0.500 UL @@ -669,721 +676,721 @@ % Begin plot #1 0.500 UL LT0 -0.00 0.00 1.00 C 900 2600 M -60 199 V +0.00 0.00 1.00 C 780 2600 M +61 199 V 60 198 V -60 193 V +61 193 V 60 188 V -60 180 V -60 171 V +61 180 V +61 171 V 60 159 V -60 146 V +61 146 V 60 132 V -60 116 V +61 116 V 60 100 V -60 81 V -60 63 V +61 81 V +61 63 V 60 44 V -60 24 V +61 24 V 60 4 V -60 -16 V -60 -35 V +61 -16 V +61 -35 V 60 -55 V -60 -74 V +61 -74 V 60 -92 V -60 -110 V -60 -125 V +61 -110 V +61 -125 V 60 -141 V -60 -154 V +61 -154 V 60 -166 V -60 -176 V -60 -185 V +61 -176 V +61 -185 V 60 -191 V -60 -196 V +61 -196 V 60 -199 V -60 -200 V +61 -200 V 60 -199 V -60 -195 V -60 -191 V +61 -195 V +61 -191 V 60 -183 V -60 -175 V +61 -175 V 60 -164 V -60 -152 V -60 -138 V +61 -152 V +61 -138 V 60 -123 V -60 -106 V +61 -106 V 60 -89 V -60 -71 V -60 -52 V +61 -71 V +61 -52 V 60 -32 V -60 -13 V +61 -13 V 60 8 V -60 27 V -60 47 V -59 66 V -60 85 V +61 27 V +61 47 V +60 66 V +61 85 V 60 102 V -60 119 V +61 119 V 60 135 V -60 148 V -60 161 V +61 148 V +61 161 V 60 173 V -60 181 V +61 181 V 60 189 V -60 194 V -60 198 V -60 200 V +61 194 V +61 198 V 60 200 V +61 200 V 60 197 V -60 192 V -60 187 V +61 192 V +61 187 V 60 179 V -60 168 V +61 168 V 60 157 V -60 144 V +61 144 V 60 129 V -60 114 V -60 97 V +61 114 V +61 97 V 60 78 V -60 60 V +61 60 V 60 40 V -60 21 V -60 1 V +61 21 V +61 1 V 60 -19 V -60 -39 V +61 -39 V 60 -58 V -60 -78 V -60 -95 V +61 -78 V +61 -95 V 60 -112 V -60 -128 V +61 -128 V 60 -143 V -60 -156 V -60 -168 V +61 -156 V +61 -168 V 60 -177 V -60 -186 V +61 -186 V 60 -193 V -60 -197 V +61 -197 V 60 -199 V -60 -200 V -60 -198 V +61 -200 V +61 -198 V 60 -195 V -60 -189 V +61 -189 V 60 -182 V -60 -173 V +61 -173 V % End plot #1 % Begin plot #2 stroke LT0 -0.00 0.00 1.00 C 900 2408 M +0.00 0.00 1.00 C 780 2408 M 0 264 V -60 0 V -900 2408 M -60 0 V +61 0 V +780 2408 M +61 0 V 0 202 R 0 223 V --60 0 R -120 0 V -900 2610 M -120 0 V +-61 0 R +121 0 V +780 2610 M +121 0 V 0 375 R 0 146 V -60 0 R -120 0 V -960 2985 M -120 0 V +121 0 V +841 2985 M +121 0 V 0 188 R 0 34 V --60 0 R -120 0 V --120 -34 R -120 0 V +-61 0 R +121 0 V +901 3173 M +121 0 V 0 38 R 0 358 V -60 0 R -120 0 V -1080 3211 M -120 0 V +121 0 V +962 3211 M +121 0 V 0 200 R 0 152 V --60 0 R -120 0 V -1140 3411 M -120 0 V +-61 0 R +122 0 V +1022 3411 M +122 0 V 0 184 R 0 279 V --60 0 R -120 0 V -1200 3595 M -120 0 V +-61 0 R +121 0 V +1083 3595 M +121 0 V 0 231 R 0 66 V -60 0 R -120 0 V --120 -66 R -120 0 V +121 0 V +-121 -66 R +121 0 V 0 87 R 0 172 V --60 0 R -120 0 V -1320 3913 M -120 0 V +-61 0 R +121 0 V +1204 3913 M +121 0 V 0 131 R 0 284 V -60 0 R -120 0 V -1380 4044 M -120 0 V +121 0 V +1265 4044 M +121 0 V 0 122 R 0 147 V --60 0 R -120 0 V -1440 4166 M -120 0 V +-61 0 R +121 0 V +1325 4166 M +121 0 V 0 184 R 0 68 V -60 0 R -120 0 V --120 -68 R -120 0 V +121 0 V +-121 -68 R +121 0 V 0 27 R 0 224 V --60 0 R -120 0 V -1560 4377 M -120 0 V +-61 0 R +122 0 V +1446 4377 M +122 0 V 0 70 R 0 156 V --60 0 R -120 0 V -1620 4447 M -120 0 V +-61 0 R +121 0 V +1507 4447 M +121 0 V 0 -22 R 0 154 V -60 0 R -120 0 V -1680 4425 M -120 0 V +121 0 V +1568 4425 M +121 0 V 0 -30 R 0 397 V --60 0 R -120 0 V -1740 4395 M -120 0 V +-61 0 R +121 0 V +1628 4395 M +121 0 V 0 13 R 0 220 V -60 0 R -120 0 V -1800 4408 M -120 0 V +121 0 V +1689 4408 M +121 0 V 0 66 R 0 116 V --60 0 R -120 0 V -stroke 1980 4590 M -1860 4474 M -120 0 V +-61 0 R +122 0 V +stroke 1871 4590 M +1749 4474 M +122 0 V 0 -16 R 0 158 V --60 0 R -120 0 V -1920 4458 M -120 0 V +-61 0 R +121 0 V +1810 4458 M +121 0 V 0 -20 R 0 177 V -60 0 R -120 0 V -1980 4438 M -120 0 V +121 0 V +1871 4438 M +121 0 V 0 -28 R 0 156 V --60 0 R -120 0 V -2040 4410 M -120 0 V +-61 0 R +121 0 V +1931 4410 M +121 0 V 0 -90 R 0 28 V -60 0 R -120 0 V --120 -28 R -120 0 V +121 0 V +-121 -28 R +121 0 V 0 -197 R 0 161 V --60 0 R -120 0 V -2160 4123 M -120 0 V +-61 0 R +122 0 V +2052 4123 M +122 0 V 0 -96 R 0 70 V --60 0 R -120 0 V --120 -70 R -120 0 V +-61 0 R +121 0 V +-121 -70 R +121 0 V 0 -153 R 0 166 V -60 0 R -120 0 V -2280 3874 M -120 0 V +121 0 V +2174 3874 M +121 0 V 0 -256 R 0 331 V --60 0 R -120 0 V -2340 3618 M -120 0 V +-61 0 R +121 0 V +2234 3618 M +121 0 V 0 -93 R 0 253 V -60 0 R -120 0 V -2400 3525 M -120 0 V +121 0 V +2295 3525 M +121 0 V 0 -183 R 0 292 V --60 0 R -120 0 V -2460 3342 M -120 0 V +-61 0 R +122 0 V +2355 3342 M +122 0 V 0 -120 R 0 198 V --60 0 R -120 0 V -2520 3222 M -120 0 V +-61 0 R +121 0 V +2416 3222 M +121 0 V 0 -149 R 0 177 V -60 0 R -120 0 V -2580 3073 M -120 0 V +121 0 V +2477 3073 M +121 0 V 0 -256 R 0 206 V --60 0 R -120 0 V -2640 2817 M -120 0 V +-61 0 R +121 0 V +2537 2817 M +121 0 V 0 -162 R 0 122 V -60 0 R -120 0 V -2700 2655 M -120 0 V +121 0 V +2598 2655 M +121 0 V 0 -274 R 0 147 V --60 0 R -120 0 V -2760 2381 M -120 0 V +-61 0 R +121 0 V +2658 2381 M +121 0 V 0 -297 R 0 332 V -60 0 R -120 0 V -2820 2084 M -120 0 V +121 0 V +2719 2084 M +121 0 V 0 -130 R 0 198 V --60 0 R -120 0 V -2880 1954 M -120 0 V -stroke 3000 1954 M +-61 0 R +122 0 V +2779 1954 M +122 0 V +stroke 2901 1954 M 0 -92 R 0 56 V --60 0 R -120 0 V --120 -56 R -120 0 V +-61 0 R +121 0 V +-121 -56 R +121 0 V 0 -326 R 0 268 V -60 0 R -120 0 V -3000 1536 M -120 0 V +121 0 V +2901 1536 M +121 0 V 0 -155 R 0 334 V --60 0 R -120 0 V -3060 1381 M -120 0 V +-61 0 R +121 0 V +2961 1381 M +121 0 V 0 -152 R 0 173 V -60 0 R -120 0 V -3120 1229 M -120 0 V +121 0 V +3022 1229 M +121 0 V 0 -186 R 0 298 V --60 0 R -120 0 V -3180 1043 M -120 0 V +-61 0 R +122 0 V +3082 1043 M +122 0 V 0 -109 R 0 231 V --60 0 R -120 0 V -3240 934 M -120 0 V +-61 0 R +121 0 V +3143 934 M +121 0 V 0 -129 R 0 261 V -60 0 R -120 0 V -3300 805 M -120 0 V +121 0 V +3204 805 M +121 0 V 0 -19 R 0 100 V --60 0 R -120 0 V -3360 786 M -120 0 V +-61 0 R +121 0 V +3264 786 M +121 0 V 0 -215 R 0 388 V -60 0 R -120 0 V -3420 571 M -120 0 V +121 0 V +3325 571 M +121 0 V 0 -67 R 0 245 V --60 0 R -120 0 V -3480 504 M -120 0 V +-61 0 R +122 0 V +3385 504 M +122 0 V 0 109 R 0 153 V --60 0 R -120 0 V -3540 613 M -120 0 V +-61 0 R +121 0 V +3446 613 M +121 0 V 0 -151 R 0 235 V -60 0 R -120 0 V -3600 462 M -120 0 V +121 0 V +3507 462 M +121 0 V 0 -5 R 0 147 V --60 0 R -120 0 V -3660 457 M -120 0 V +-61 0 R +121 0 V +3567 457 M +121 0 V 0 58 R 0 204 V -60 0 R -120 0 V -3720 515 M -120 0 V +121 0 V +3628 515 M +121 0 V 0 14 R 0 134 V --60 0 R -120 0 V -3780 529 M -120 0 V +-61 0 R +122 0 V +3688 529 M +122 0 V 0 55 R 0 109 V --60 0 R -119 0 V -3840 584 M -119 0 V +-61 0 R +121 0 V +3749 584 M +121 0 V 0 -21 R 0 192 V --59 0 R -119 0 V -3900 563 M -119 0 V +-60 0 R +121 0 V +3810 563 M +121 0 V 0 170 R 0 132 V -stroke 4019 865 M --60 0 R -120 0 V -3959 733 M -120 0 V +stroke 3931 865 M +-61 0 R +121 0 V +3870 733 M +121 0 V 0 36 R 0 186 V -60 0 R -120 0 V -4019 769 M -120 0 V +121 0 V +3931 769 M +121 0 V 0 215 R 0 197 V --60 0 R -120 0 V -4079 984 M -120 0 V +-61 0 R +121 0 V +3991 984 M +121 0 V 0 28 R 0 278 V -60 0 R -120 0 V -4139 1012 M -120 0 V +121 0 V +4052 1012 M +121 0 V 0 145 R 0 377 V --60 0 R -120 0 V -4199 1157 M -120 0 V +-61 0 R +122 0 V +4112 1157 M +122 0 V 0 249 R 0 279 V --60 0 R -120 0 V -4259 1406 M -120 0 V +-61 0 R +121 0 V +4173 1406 M +121 0 V 0 151 R 0 312 V -60 0 R -120 0 V -4319 1557 M -120 0 V +121 0 V +4234 1557 M +121 0 V 0 111 R 0 230 V --60 0 R -120 0 V -4379 1668 M -120 0 V +-61 0 R +121 0 V +4294 1668 M +121 0 V 0 228 R 0 234 V -60 0 R -120 0 V -4439 1896 M -120 0 V +121 0 V +4355 1896 M +121 0 V 0 242 R 0 147 V --60 0 R -120 0 V -4499 2138 M -120 0 V +-61 0 R +122 0 V +4415 2138 M +122 0 V 0 251 R 0 163 V --60 0 R -120 0 V -4559 2389 M -120 0 V +-61 0 R +121 0 V +4476 2389 M +121 0 V 0 179 R 0 190 V -60 0 R -120 0 V -4619 2568 M -120 0 V +121 0 V +4537 2568 M +121 0 V 0 125 R 0 300 V --60 0 R -120 0 V -4679 2693 M -120 0 V +-61 0 R +121 0 V +4597 2693 M +121 0 V 0 303 R 0 176 V -60 0 R -120 0 V -4739 2996 M -120 0 V +121 0 V +4658 2996 M +121 0 V 0 45 R 0 233 V --60 0 R -120 0 V -4799 3041 M -120 0 V +-61 0 R +122 0 V +4718 3041 M +122 0 V 0 314 R 0 139 V --60 0 R -120 0 V -4859 3355 M -120 0 V +-61 0 R +121 0 V +4779 3355 M +121 0 V 0 50 R 0 288 V -60 0 R -120 0 V -4919 3405 M -120 0 V +121 0 V +4840 3405 M +121 0 V 0 289 R 0 63 V --60 0 R -120 0 V -stroke 5099 3757 M --120 -63 R -120 0 V +-61 0 R +121 0 V +stroke 5021 3757 M +-121 -63 R +121 0 V 0 28 R 0 198 V -60 0 R -120 0 V -5039 3722 M -120 0 V +121 0 V +4961 3722 M +121 0 V 0 194 R 0 223 V --60 0 R -120 0 V -5099 3916 M -120 0 V +-61 0 R +121 0 V +5021 3916 M +121 0 V 0 170 R 0 123 V -60 0 R -120 0 V -5159 4086 M -120 0 V +121 0 V +5082 4086 M +121 0 V 0 110 R 0 249 V --60 0 R -120 0 V -5219 4196 M -120 0 V +-61 0 R +122 0 V +5142 4196 M +122 0 V 0 70 R 0 179 V --60 0 R -120 0 V -5279 4266 M -120 0 V +-61 0 R +121 0 V +5203 4266 M +121 0 V 0 92 R 0 137 V -60 0 R -120 0 V -5339 4358 M -120 0 V +121 0 V +5264 4358 M +121 0 V 0 115 R 0 98 V --60 0 R -120 0 V --120 -98 R -120 0 V +-61 0 R +121 0 V +-121 -98 R +121 0 V 0 61 R 0 88 V -60 0 R -120 0 V --120 -88 R -120 0 V +121 0 V +-121 -88 R +121 0 V 0 -40 R 0 146 V --60 0 R -120 0 V -5519 4494 M -120 0 V +-61 0 R +122 0 V +5445 4494 M +122 0 V 0 -84 R 0 291 V --60 0 R -120 0 V -5579 4410 M -120 0 V +-61 0 R +121 0 V +5506 4410 M +121 0 V 0 43 R 0 218 V -60 0 R -120 0 V -5639 4453 M -120 0 V +121 0 V +5567 4453 M +121 0 V 0 71 R 0 77 V --60 0 R -120 0 V --120 -77 R -120 0 V +-61 0 R +121 0 V +-121 -77 R +121 0 V 0 -208 R 0 293 V -60 0 R -120 0 V -5759 4316 M -120 0 V +121 0 V +5688 4316 M +121 0 V 0 -58 R 0 188 V --60 0 R -120 0 V -5819 4258 M -120 0 V +-61 0 R +122 0 V +5748 4258 M +122 0 V 0 -131 R 0 363 V --60 0 R -120 0 V -5879 4127 M -120 0 V +-61 0 R +121 0 V +5809 4127 M +121 0 V 0 31 R 0 231 V -60 0 R -120 0 V -5939 4158 M -120 0 V +121 0 V +5870 4158 M +121 0 V 0 -239 R 0 295 V --60 0 R -120 0 V -5999 3919 M -120 0 V -stroke 6119 3919 M +-61 0 R +121 0 V +5930 3919 M +121 0 V +stroke 6051 3919 M 0 -6 R 0 99 V -60 0 R -120 0 V --120 -99 R -120 0 V +121 0 V +-121 -99 R +121 0 V 0 -274 R 0 232 V --60 0 R -120 0 V -6119 3639 M -120 0 V +-61 0 R +122 0 V +6051 3639 M +122 0 V 0 -92 R 0 171 V --60 0 R -120 0 V -6179 3547 M -120 0 V +-61 0 R +121 0 V +6112 3547 M +121 0 V 0 -169 R 0 56 V -60 0 R -120 0 V --120 -56 R -120 0 V +121 0 V +-121 -56 R +121 0 V 0 -316 R 0 259 V --60 0 R -120 0 V -6299 3062 M -120 0 V +-61 0 R +121 0 V +6233 3062 M +121 0 V 0 -38 R 0 126 V -60 0 R -120 0 V -6359 3024 M -120 0 V +121 0 V +6294 3024 M +121 0 V 0 -280 R 0 141 V --60 0 R -120 0 V -6419 2744 M -120 0 V +-61 0 R +121 0 V +6354 2744 M +121 0 V 0 -266 R 0 190 V -60 0 R -120 0 V -6479 2478 M -120 0 V +121 0 V +6415 2478 M +121 0 V 0 -78 R 0 210 V --60 0 R -120 0 V -6539 2400 M -120 0 V +-61 0 R +122 0 V +6475 2400 M +122 0 V 0 -191 R 0 115 V --60 0 R -120 0 V -6599 2209 M -120 0 V +-61 0 R +121 0 V +6536 2209 M +121 0 V 0 -329 R 0 280 V -60 0 R -120 0 V -6659 1880 M -120 0 V +121 0 V +6597 1880 M +121 0 V 0 -98 R 0 269 V --60 0 R -120 0 V -6719 1782 M -120 0 V +-61 0 R +121 0 V +6657 1782 M +121 0 V 0 -241 R 0 266 V -60 0 R -120 0 V -6779 1541 M -120 0 V +121 0 V +6718 1541 M +121 0 V 0 -36 R 0 65 V --60 0 R -60 0 V --60 -65 R -60 0 V +-61 0 R +61 0 V +-61 -65 R +61 0 V % End plot #2 1.000 UP stroke Binary files octave-3.6.1/doc/interpreter/errorbar.pdf and octave-3.6.2/doc/interpreter/errorbar.pdf differ Binary files octave-3.6.1/doc/interpreter/errorbar.png and octave-3.6.2/doc/interpreter/errorbar.png differ diff -uNr octave-3.6.1/doc/interpreter/extended.eps octave-3.6.2/doc/interpreter/extended.eps --- octave-3.6.1/doc/interpreter/extended.eps 2012-02-22 15:01:48.000000000 -0500 +++ octave-3.6.2/doc/interpreter/extended.eps 2012-05-31 11:40:55.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: extended.eps -%%Creator: gnuplot 4.4 patchlevel 0 -%%CreationDate: Wed Feb 22 15:01:48 2012 +%%Creator: gnuplot 4.6 patchlevel 0 +%%CreationDate: Thu May 31 11:40:55 2012 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments @@ -20,10 +20,12 @@ /Level1 false def /Rounded false def /ClipToBoundingBox false def +/SuppressPDFMark false def /TransparentPatterns false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /Gamma 1.0 def +/BackgroundColor {-1.000 -1.000 -1.000} def % /vshift -66 def /dl1 { @@ -38,22 +40,6 @@ /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def -Level1 {} { -/SDict 10 dict def -systemdict /pdfmark known not { - userdict /pdfmark systemdict /cleartomark get put -} if -SDict begin [ - /Title (extended.eps) - /Subject (gnuplot plot) - /Creator (gnuplot 4.4 patchlevel 0) - /Author (jwe) -% /Producer (gnuplot) -% /Keywords () - /CreationDate (Wed Feb 22 15:01:48 2012) - /DOCINFO pdfmark -end -} ifelse /doclip { ClipToBoundingBox { newpath 50 50 moveto 410 50 lineto 410 302 lineto 50 302 lineto closepath @@ -61,7 +47,7 @@ } if } def % -% Gnuplot Prolog Version 4.4 (January 2010) +% Gnuplot Prolog Version 4.4 (August 2010) % %/SuppressPDFMark true def % @@ -73,6 +59,7 @@ /Z {closepath} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def +/g {setgray} bind def /Gshow {show} def % May be redefined later in the file to support UTF-8 /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def @@ -94,6 +81,7 @@ dup 1 lt {pop 1} if 10 mul /udl exch def} def /PL {stroke userlinewidth setlinewidth Rounded {1 setlinejoin 1 setlinecap} if} def +3.8 setmiterlimit % Default Line colors /LCw {1 1 1} def /LCb {0 0 0} def @@ -459,8 +447,26 @@ Blacktext {gsave 0 setgray MFshow grestore} {MFshow} ifelse } bind def /XYsave { [( ) 1 2 true false 3 ()] } bind def /XYrestore { [( ) 1 2 true false 4 ()] } bind def +Level1 SuppressPDFMark or +{} { +/SDict 10 dict def +systemdict /pdfmark known not { + userdict /pdfmark systemdict /cleartomark get put +} if +SDict begin [ + /Title (extended.eps) + /Subject (gnuplot plot) + /Creator (gnuplot 4.6 patchlevel 0) + /Author (jwe) +% /Producer (gnuplot) +% /Keywords () + /CreationDate (Thu May 31 11:40:55 2012) + /DOCINFO pdfmark +end +} ifelse end %%EndProlog +%%Page: 1 1 gnudict begin gsave doclip @@ -469,6 +475,7 @@ 0 setgray newpath (Helvetica) findfont 200 scalefont setfont +BackgroundColor 0 lt 3 1 roll 0 lt exch 0 lt or or not {BackgroundColor C 1.000 0 0 7200.00 5040.00 BoxColFill} if gsave % colour palette begin /maxcolors 64 def /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray @@ -545,143 +552,143 @@ } ifelse 0.500 UL LTb -780 400 M +660 400 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 400 M +0.00 0.00 0.00 C 540 400 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MRshow 0.500 UL LTb -780 1280 M +660 1280 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 1280 M +0.00 0.00 0.00 C 540 1280 M [ [({}) 200.0 0.0 true true 0 (0.2)] ] -66.7 MRshow 0.500 UL LTb -780 2160 M +660 2160 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 2160 M +0.00 0.00 0.00 C 540 2160 M [ [({}) 200.0 0.0 true true 0 (0.4)] ] -66.7 MRshow 0.500 UL LTb -780 3039 M +660 3039 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 3039 M +0.00 0.00 0.00 C 540 3039 M [ [({}) 200.0 0.0 true true 0 (0.6)] ] -66.7 MRshow 0.500 UL LTb -780 3919 M +660 3919 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 3919 M +0.00 0.00 0.00 C 540 3919 M [ [({}) 200.0 0.0 true true 0 (0.8)] ] -66.7 MRshow 0.500 UL LTb -780 4799 M +660 4799 M 88 0 V -6031 0 R +6091 0 R -88 0 V stroke -0.00 0.00 0.00 C 660 4799 M +0.00 0.00 0.00 C 540 4799 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MRshow 0.500 UL LTb -780 400 M +660 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 780 200 M +0.00 0.00 0.00 C 660 200 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MCshow 0.500 UL LTb -1800 400 M +1690 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 1800 200 M +0.00 0.00 0.00 C 1690 200 M [ [({}) 200.0 0.0 true true 0 (0.5)] ] -66.7 MCshow 0.500 UL LTb -2820 400 M +2720 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 2820 200 M +0.00 0.00 0.00 C 2720 200 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MCshow 0.500 UL LTb -3840 400 M +3750 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 3840 200 M +0.00 0.00 0.00 C 3750 200 M [ [({}) 200.0 0.0 true true 0 (1.5)] ] -66.7 MCshow 0.500 UL LTb -4859 400 M +4779 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 4859 200 M +0.00 0.00 0.00 C 4779 200 M [ [({}) 200.0 0.0 true true 0 (2)] ] -66.7 MCshow 0.500 UL LTb -5879 400 M +5809 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 5879 200 M +0.00 0.00 0.00 C 5809 200 M [ [({}) 200.0 0.0 true true 0 (2.5)] ] -66.7 MCshow 0.500 UL LTb -6899 400 M +6839 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6899 200 M +0.00 0.00 0.00 C 6839 200 M [ [({}) 200.0 0.0 true true 0 (3)] ] -66.7 MCshow 0.500 UL LTb 0.500 UL LTb -780 4799 N -780 400 L -6119 0 V +660 4799 N +660 400 L +6179 0 V 0 4399 V --6119 0 V +-6179 0 V Z stroke 1.000 UP 0.500 UL @@ -689,418 +696,418 @@ % Begin plot #1 0.500 UL LT0 -0.00 0.00 1.00 C 780 400 M -20 50 V -21 49 V -20 50 V -21 49 V -20 50 V -20 49 V +0.00 0.00 1.00 C 660 400 M 21 50 V 20 49 V 21 50 V 20 49 V -20 49 V +21 50 V +21 49 V +20 50 V +21 49 V +20 50 V +21 49 V 21 49 V 20 49 V -21 48 V -20 49 V -20 48 V 21 49 V 20 48 V +21 49 V +21 48 V +20 49 V 21 48 V 20 48 V -20 47 V 21 48 V -20 47 V +21 47 V +20 48 V 21 47 V 20 47 V -20 46 V +21 47 V 21 46 V 20 46 V 21 46 V 20 46 V +21 46 V 20 45 V 21 45 V -20 44 V +21 44 V 20 45 V 21 44 V 20 44 V 21 43 V -20 43 V +21 43 V 20 43 V 21 42 V 20 43 V 21 41 V -20 42 V +21 42 V 20 41 V 21 41 V 20 40 V 21 40 V -20 40 V +21 40 V 20 39 V 21 39 V 20 38 V 21 38 V -20 38 V +21 38 V 20 37 V 21 37 V 20 37 V 21 36 V -20 35 V +21 35 V 20 36 V 21 34 V 20 35 V 21 34 V -20 33 V +21 33 V 20 34 V 21 32 V 20 33 V 21 32 V -20 31 V +21 31 V 20 31 V 21 31 V 20 30 V 21 30 V -20 29 V +21 29 V 20 29 V 21 28 V 20 28 V 21 28 V -20 27 V +21 27 V 20 27 V 21 27 V 20 25 V 21 26 V -20 25 V +21 25 V 20 25 V 21 24 V 20 24 V 21 24 V -20 23 V +21 23 V 20 22 V 21 23 V 20 21 V -20 22 V -21 21 V +21 22 V 20 21 V +21 21 V 21 20 V 20 20 V -20 20 V -21 19 V +21 20 V 20 19 V +21 19 V 21 18 V 20 18 V -20 18 V -21 17 V +21 18 V 20 17 V -stroke 2901 4177 M 21 17 V -20 16 V +stroke 2802 4177 M +21 17 V 20 16 V 21 16 V -20 15 V +20 16 V +21 15 V 21 15 V 20 15 V -20 14 V 21 14 V 20 14 V +21 14 V 21 13 V 20 13 V -20 13 V -21 12 V -20 13 V +21 13 V +20 12 V +21 13 V 21 11 V 20 12 V -20 11 V -21 12 V -20 10 V 21 11 V -20 10 V +20 12 V +21 10 V +21 11 V 20 10 V 21 10 V -20 9 V +20 10 V +21 9 V 21 10 V 20 9 V -20 9 V -21 8 V -20 8 V 21 9 V 20 8 V -20 7 V 21 8 V -20 7 V +21 9 V +20 8 V +21 7 V +20 8 V +21 7 V 21 7 V 20 7 V -20 7 V -21 6 V -20 7 V -21 6 V +21 7 V 20 6 V -20 5 V +21 7 V 21 6 V 20 6 V 21 5 V -20 5 V +20 6 V +21 6 V +21 5 V 20 5 V 21 5 V 20 5 V -20 4 V 21 5 V 20 4 V +21 5 V 21 4 V 20 4 V -20 4 V 21 4 V -20 3 V +20 4 V 21 4 V -20 3 V +21 3 V +20 4 V +21 3 V 20 4 V 21 3 V -20 3 V 21 3 V 20 3 V +21 3 V 20 3 V 21 2 V -20 3 V 21 3 V -20 2 V +20 3 V +21 2 V 20 2 V 21 3 V -20 2 V 21 2 V 20 2 V -20 2 V 21 2 V 20 2 V 21 2 V -20 1 V +21 2 V 20 2 V 21 1 V 20 2 V 21 1 V -20 2 V +21 2 V 20 1 V 21 2 V 20 1 V +21 2 V 21 1 V 20 1 V -20 1 V 21 1 V -20 2 V -21 1 V -20 0 V 20 1 V 21 1 V +21 2 V +20 1 V +21 0 V 20 1 V 21 1 V +21 1 V 20 1 V +21 1 V 20 1 V 21 0 V -20 1 V 21 1 V -stroke 5023 4785 M -20 0 V 20 1 V +stroke 4944 4785 M 21 0 V 20 1 V +21 0 V 20 1 V +21 1 V 21 0 V 20 1 V 21 0 V 20 1 V -20 0 V +21 0 V 21 0 V 20 1 V 21 0 V 20 1 V -20 0 V +21 0 V 21 0 V 20 1 V 21 0 V 20 0 V -20 0 V +21 0 V 21 1 V 20 0 V 21 0 V 20 0 V -20 1 V +21 1 V 21 0 V 20 0 V 21 0 V 20 0 V -20 1 V +21 1 V 21 0 V 20 0 V 21 0 V 20 0 V -20 0 V +21 0 V 21 1 V 20 0 V 21 0 V 20 0 V -20 0 V 21 0 V -20 0 V 21 0 V 20 0 V +21 0 V 20 0 V +21 0 V 21 1 V 20 0 V 21 0 V 20 0 V -20 0 V 21 0 V -20 0 V 21 0 V 20 0 V +21 0 V 20 0 V 21 0 V +21 0 V 20 0 V 21 0 V 20 0 V +21 0 V +21 0 V 20 0 V 21 0 V 20 0 V +21 1 V 20 0 V 21 0 V -20 1 V 21 0 V 20 0 V -20 0 V 21 0 V 20 0 V 21 0 V -20 0 V -20 0 V 21 0 V 20 0 V 21 0 V 20 0 V -20 0 V 21 0 V -20 0 V 21 0 V 20 0 V -20 0 V 21 0 V 20 0 V 21 0 V +21 0 V 20 0 V +21 0 V 20 0 V 21 0 V +21 0 V 20 0 V 21 0 V 20 0 V +21 0 V % End plot #1 % Begin plot #2 stroke LT0 -1.00 0.00 0.00 C 780 400 M -20 44 V +1.00 0.00 0.00 C 660 400 M 21 44 V 20 44 V 21 44 V 20 44 V -20 44 V 21 44 V -20 44 V 21 44 V 20 44 V -20 44 V 21 44 V 20 44 V 21 44 V -20 44 V -20 44 V 21 44 V 20 44 V 21 44 V 20 44 V -20 44 V 21 44 V -20 44 V 21 44 V 20 44 V -20 44 V 21 44 V 20 44 V 21 44 V -20 44 V +21 44 V 20 44 V 21 44 V 20 44 V +21 44 V +21 44 V 20 44 V 21 44 V 20 44 V 21 44 V 20 44 V +21 44 V +21 44 V 20 44 V 21 44 V 20 44 V 21 44 V +21 44 V 20 44 V +21 44 V 20 44 V 21 44 V +21 44 V 20 44 V 21 44 V 20 44 V +21 44 V +21 44 V 20 44 V 21 44 V 20 43 V 21 44 V -20 44 V -20 44 V 21 44 V 20 44 V 21 44 V 20 44 V -20 44 V 21 44 V -20 44 V 21 44 V 20 44 V -20 44 V 21 44 V 20 44 V 21 44 V -20 44 V -20 44 V 21 44 V 20 44 V 21 44 V 20 44 V -20 44 V 21 44 V -20 44 V 21 44 V 20 44 V -20 44 V 21 44 V 20 44 V 21 44 V +21 44 V 20 44 V +21 44 V 20 44 V 21 44 V +21 44 V 20 44 V 21 44 V 20 44 V +21 44 V +21 44 V 20 44 V 21 44 V 20 44 V +21 44 V +21 44 V 20 44 V 21 44 V 20 44 V 21 44 V 20 44 V +21 44 V +21 44 V 20 44 V 21 44 V 20 44 V 21 44 V +21 44 V % End plot #2 1.000 UP stroke -0.00 0.00 0.00 C 2106 3116 M +0.00 0.00 0.00 C 1999 3116 M [ [(Symbol) 200.0 0.0 true true 0 (\254)] [({}) 200.0 0.0 true true 0 ( x = )] [({}) 200.0 0.0 true true 0 (2/)] Binary files octave-3.6.1/doc/interpreter/extended.pdf and octave-3.6.2/doc/interpreter/extended.pdf differ Binary files octave-3.6.1/doc/interpreter/extended.png and octave-3.6.2/doc/interpreter/extended.png differ diff -uNr octave-3.6.1/doc/interpreter/func.texi octave-3.6.2/doc/interpreter/func.texi --- octave-3.6.1/doc/interpreter/func.texi 2012-02-22 14:56:00.000000000 -0500 +++ octave-3.6.2/doc/interpreter/func.texi 2012-05-31 11:40:34.000000000 -0400 @@ -1075,8 +1075,8 @@ @item mode This value determines whether the editor should be started in async mode (editor is started in the background and Octave continues) or sync mode -(Octave waits until the editor exits). Set it to "async" to start the editor -in async mode. The default is "sync" (see also "system"). +(Octave waits until the editor exits). Set it to "sync" to start the editor +in sync mode. The default is "async" (see also "system"). @item editinplace Determines whether files should be edited in place, without regard to diff -uNr octave-3.6.1/doc/interpreter/gplot.eps octave-3.6.2/doc/interpreter/gplot.eps --- octave-3.6.1/doc/interpreter/gplot.eps 2012-02-22 15:01:49.000000000 -0500 +++ octave-3.6.2/doc/interpreter/gplot.eps 2012-05-31 11:40:56.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: gplot.eps -%%Creator: gnuplot 4.4 patchlevel 0 -%%CreationDate: Wed Feb 22 15:01:49 2012 +%%Creator: gnuplot 4.6 patchlevel 0 +%%CreationDate: Thu May 31 11:40:56 2012 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments @@ -20,10 +20,12 @@ /Level1 false def /Rounded false def /ClipToBoundingBox false def +/SuppressPDFMark false def /TransparentPatterns false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /Gamma 1.0 def +/BackgroundColor {-1.000 -1.000 -1.000} def % /vshift -66 def /dl1 { @@ -38,22 +40,6 @@ /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def -Level1 {} { -/SDict 10 dict def -systemdict /pdfmark known not { - userdict /pdfmark systemdict /cleartomark get put -} if -SDict begin [ - /Title (gplot.eps) - /Subject (gnuplot plot) - /Creator (gnuplot 4.4 patchlevel 0) - /Author (jwe) -% /Producer (gnuplot) -% /Keywords () - /CreationDate (Wed Feb 22 15:01:49 2012) - /DOCINFO pdfmark -end -} ifelse /doclip { ClipToBoundingBox { newpath 50 50 moveto 410 50 lineto 410 302 lineto 50 302 lineto closepath @@ -61,7 +47,7 @@ } if } def % -% Gnuplot Prolog Version 4.4 (January 2010) +% Gnuplot Prolog Version 4.4 (August 2010) % %/SuppressPDFMark true def % @@ -73,6 +59,7 @@ /Z {closepath} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def +/g {setgray} bind def /Gshow {show} def % May be redefined later in the file to support UTF-8 /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def @@ -94,6 +81,7 @@ dup 1 lt {pop 1} if 10 mul /udl exch def} def /PL {stroke userlinewidth setlinewidth Rounded {1 setlinejoin 1 setlinecap} if} def +3.8 setmiterlimit % Default Line colors /LCw {1 1 1} def /LCb {0 0 0} def @@ -459,8 +447,26 @@ Blacktext {gsave 0 setgray MFshow grestore} {MFshow} ifelse } bind def /XYsave { [( ) 1 2 true false 3 ()] } bind def /XYrestore { [( ) 1 2 true false 4 ()] } bind def +Level1 SuppressPDFMark or +{} { +/SDict 10 dict def +systemdict /pdfmark known not { + userdict /pdfmark systemdict /cleartomark get put +} if +SDict begin [ + /Title (gplot.eps) + /Subject (gnuplot plot) + /Creator (gnuplot 4.6 patchlevel 0) + /Author (jwe) +% /Producer (gnuplot) +% /Keywords () + /CreationDate (Thu May 31 11:40:56 2012) + /DOCINFO pdfmark +end +} ifelse end %%EndProlog +%%Page: 1 1 gnudict begin gsave doclip @@ -469,6 +475,7 @@ 0 setgray newpath (Helvetica) findfont 200 scalefont setfont +BackgroundColor 0 lt 3 1 roll 0 lt exch 0 lt or or not {BackgroundColor C 1.000 0 0 7200.00 5040.00 BoxColFill} if gsave % colour palette begin /maxcolors 64 def /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray @@ -545,183 +552,183 @@ } ifelse 0.500 UL LTb -540 400 M +420 400 M 88 0 V -6271 0 R +6331 0 R -88 0 V stroke -0.00 0.00 0.00 C 420 400 M +0.00 0.00 0.00 C 300 400 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MRshow 0.500 UL LTb -540 1028 M +420 1028 M 88 0 V -6271 0 R +6331 0 R -88 0 V stroke -0.00 0.00 0.00 C 420 1028 M +0.00 0.00 0.00 C 300 1028 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MRshow 0.500 UL LTb -540 1657 M +420 1657 M 88 0 V -6271 0 R +6331 0 R -88 0 V stroke -0.00 0.00 0.00 C 420 1657 M +0.00 0.00 0.00 C 300 1657 M [ [({}) 200.0 0.0 true true 0 (2)] ] -66.7 MRshow 0.500 UL LTb -540 2285 M +420 2285 M 88 0 V -6271 0 R +6331 0 R -88 0 V stroke -0.00 0.00 0.00 C 420 2285 M +0.00 0.00 0.00 C 300 2285 M [ [({}) 200.0 0.0 true true 0 (3)] ] -66.7 MRshow 0.500 UL LTb -540 2914 M +420 2914 M 88 0 V -6271 0 R +6331 0 R -88 0 V stroke -0.00 0.00 0.00 C 420 2914 M +0.00 0.00 0.00 C 300 2914 M [ [({}) 200.0 0.0 true true 0 (4)] ] -66.7 MRshow 0.500 UL LTb -540 3542 M +420 3542 M 88 0 V -6271 0 R +6331 0 R -88 0 V stroke -0.00 0.00 0.00 C 420 3542 M +0.00 0.00 0.00 C 300 3542 M [ [({}) 200.0 0.0 true true 0 (5)] ] -66.7 MRshow 0.500 UL LTb -540 4171 M +420 4171 M 88 0 V -6271 0 R +6331 0 R -88 0 V stroke -0.00 0.00 0.00 C 420 4171 M +0.00 0.00 0.00 C 300 4171 M [ [({}) 200.0 0.0 true true 0 (6)] ] -66.7 MRshow 0.500 UL LTb -540 4799 M +420 4799 M 88 0 V -6271 0 R +6331 0 R -88 0 V stroke -0.00 0.00 0.00 C 420 4799 M +0.00 0.00 0.00 C 300 4799 M [ [({}) 200.0 0.0 true true 0 (7)] ] -66.7 MRshow 0.500 UL LTb -540 400 M +420 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 540 200 M +0.00 0.00 0.00 C 420 200 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MCshow 0.500 UL LTb -1335 400 M +1222 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 1335 200 M +0.00 0.00 0.00 C 1222 200 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MCshow 0.500 UL LTb -2130 400 M +2025 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 2130 200 M +0.00 0.00 0.00 C 2025 200 M [ [({}) 200.0 0.0 true true 0 (2)] ] -66.7 MCshow 0.500 UL LTb -2925 400 M +2827 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 2925 200 M +0.00 0.00 0.00 C 2827 200 M [ [({}) 200.0 0.0 true true 0 (3)] ] -66.7 MCshow 0.500 UL LTb -3720 400 M +3630 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 3720 200 M +0.00 0.00 0.00 C 3630 200 M [ [({}) 200.0 0.0 true true 0 (4)] ] -66.7 MCshow 0.500 UL LTb -4514 400 M +4432 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 4514 200 M +0.00 0.00 0.00 C 4432 200 M [ [({}) 200.0 0.0 true true 0 (5)] ] -66.7 MCshow 0.500 UL LTb -5309 400 M +5234 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 5309 200 M +0.00 0.00 0.00 C 5234 200 M [ [({}) 200.0 0.0 true true 0 (6)] ] -66.7 MCshow 0.500 UL LTb -6104 400 M +6037 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6104 200 M +0.00 0.00 0.00 C 6037 200 M [ [({}) 200.0 0.0 true true 0 (7)] ] -66.7 MCshow 0.500 UL LTb -6899 400 M +6839 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6899 200 M +0.00 0.00 0.00 C 6839 200 M [ [({}) 200.0 0.0 true true 0 (8)] ] -66.7 MCshow 0.500 UL LTb 0.500 UL LTb -540 4799 N -540 400 L -6359 0 V +420 4799 N +420 400 L +6419 0 V 0 4399 V --6359 0 V +-6419 0 V Z stroke 1.000 UP 0.500 UL @@ -729,26 +736,26 @@ % Begin plot #1 0.500 UL LT0 -0.00 0.00 1.00 C 3720 400 M -540 3542 L -2130 4799 M -540 3542 L -3720 400 L -6899 3542 M -3720 400 L -6899 3542 L -5309 4799 M -6899 3542 L -5309 4799 L -3720 3542 M -5309 4799 L -3720 3542 L -2130 4799 M -3720 3542 L --3180 0 R -2130 4799 L -3720 3542 M -2130 4799 L +0.00 0.00 1.00 C 3630 400 M +420 3542 L +2025 4799 M +420 3542 L +3630 400 L +6839 3542 M +3630 400 L +6839 3542 L +5234 4799 M +6839 3542 L +5234 4799 L +3630 3542 M +5234 4799 L +3630 3542 L +2025 4799 M +3630 3542 L +-3210 0 R +2025 4799 L +3630 3542 M +2025 4799 L % End plot #1 1.000 UP stroke Binary files octave-3.6.1/doc/interpreter/gplot.pdf and octave-3.6.2/doc/interpreter/gplot.pdf differ Binary files octave-3.6.1/doc/interpreter/gplot.png and octave-3.6.2/doc/interpreter/gplot.png differ diff -uNr octave-3.6.1/doc/interpreter/griddata.eps octave-3.6.2/doc/interpreter/griddata.eps --- octave-3.6.1/doc/interpreter/griddata.eps 2012-02-22 15:01:38.000000000 -0500 +++ octave-3.6.2/doc/interpreter/griddata.eps 2012-05-31 11:40:44.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: griddata.eps -%%Creator: gnuplot 4.4 patchlevel 0 -%%CreationDate: Wed Feb 22 15:01:38 2012 +%%Creator: gnuplot 4.6 patchlevel 0 +%%CreationDate: Thu May 31 11:40:44 2012 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments @@ -20,10 +20,12 @@ /Level1 false def /Rounded false def /ClipToBoundingBox false def +/SuppressPDFMark false def /TransparentPatterns false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /Gamma 1.0 def +/BackgroundColor {-1.000 -1.000 -1.000} def % /vshift -66 def /dl1 { @@ -38,22 +40,6 @@ /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def -Level1 {} { -/SDict 10 dict def -systemdict /pdfmark known not { - userdict /pdfmark systemdict /cleartomark get put -} if -SDict begin [ - /Title (griddata.eps) - /Subject (gnuplot plot) - /Creator (gnuplot 4.4 patchlevel 0) - /Author (jwe) -% /Producer (gnuplot) -% /Keywords () - /CreationDate (Wed Feb 22 15:01:38 2012) - /DOCINFO pdfmark -end -} ifelse /doclip { ClipToBoundingBox { newpath 50 50 moveto 410 50 lineto 410 302 lineto 50 302 lineto closepath @@ -61,7 +47,7 @@ } if } def % -% Gnuplot Prolog Version 4.4 (January 2010) +% Gnuplot Prolog Version 4.4 (August 2010) % %/SuppressPDFMark true def % @@ -73,6 +59,7 @@ /Z {closepath} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def +/g {setgray} bind def /Gshow {show} def % May be redefined later in the file to support UTF-8 /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def @@ -94,6 +81,7 @@ dup 1 lt {pop 1} if 10 mul /udl exch def} def /PL {stroke userlinewidth setlinewidth Rounded {1 setlinejoin 1 setlinecap} if} def +3.8 setmiterlimit % Default Line colors /LCw {1 1 1} def /LCb {0 0 0} def @@ -459,8 +447,26 @@ Blacktext {gsave 0 setgray MFshow grestore} {MFshow} ifelse } bind def /XYsave { [( ) 1 2 true false 3 ()] } bind def /XYrestore { [( ) 1 2 true false 4 ()] } bind def +Level1 SuppressPDFMark or +{} { +/SDict 10 dict def +systemdict /pdfmark known not { + userdict /pdfmark systemdict /cleartomark get put +} if +SDict begin [ + /Title (griddata.eps) + /Subject (gnuplot plot) + /Creator (gnuplot 4.6 patchlevel 0) + /Author (jwe) +% /Producer (gnuplot) +% /Keywords () + /CreationDate (Thu May 31 11:40:44 2012) + /DOCINFO pdfmark +end +} ifelse end %%EndProlog +%%Page: 1 1 gnudict begin gsave doclip @@ -469,6 +475,7 @@ 0 setgray newpath (Helvetica) findfont 200 scalefont setfont +BackgroundColor 0 lt 3 1 roll 0 lt exch 0 lt or or not {BackgroundColor C 1.000 0 0 7200.00 5040.00 BoxColFill} if gsave % colour palette begin /maxcolors 64 def /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray @@ -546,36 +553,37 @@ 0.500 UL LTb 1.000 UP +% Begin plot #1 1.000 UL -LT1 +LT0 .0847 g 1203 2054 M -74 -307 V stroke -LT1 +LT0 .0835 g 1226 2104 M -97 -357 V stroke -LT1 +LT0 .2494 g 1300 2413 M -74 -309 V stroke -LT1 +LT0 .2448 g 1322 2449 M -96 -345 V stroke -LT1 +LT0 .2477 g 1277 2346 M -74 -292 V stroke -LT1 +LT0 .2506 g 1300 2413 M -97 -359 V stroke -LT1 +LT0 .3962 g 1388 2713 M -66 -264 V stroke -LT1 +LT0 .3918 g 1419 2746 M -97 -297 V stroke @@ -671,11 +679,11 @@ .9889 g 3983 4169 M 97 0 V stroke -LT1 +LT0 .3576 g 1323 2503 M -23 -90 V stroke -LT1 +LT0 .3952 g 1378 2683 M -78 -270 V stroke @@ -723,11 +731,11 @@ .6576 g 3819 3348 M 74 -133 V stroke -LT1 +LT0 .5035 g 1460 2907 M -41 -161 V stroke -LT1 +LT0 .5225 g 1515 3026 M -96 -280 V stroke @@ -1099,7 +1107,7 @@ .9827 g 2576 4095 M 96 19 V stroke -LT1 +LT0 .3983 g 1351 2603 M -74 -257 V stroke @@ -1107,7 +1115,7 @@ .4099 g 1374 2704 M -97 -358 V stroke -LT1 +LT0 .3928 g 1353 2608 M -76 -262 V stroke @@ -1535,11 +1543,11 @@ .9172 g 4449 3933 M -96 -129 V stroke -LT1 +LT0 .2923 g 3736 2168 M -74 -18 V stroke -LT1 +LT0 .2913 g 3833 2188 M -171 -38 V stroke @@ -1635,15 +1643,15 @@ .9975 g 2457 4046 M 96 19 V stroke -LT1 +LT0 .3223 g 3907 2237 M -74 -49 V stroke -LT1 +LT0 .3272 g 4003 2281 M -170 -93 V stroke -LT1 +LT0 .3034 g 3736 2168 M 97 20 V stroke @@ -1743,11 +1751,11 @@ .9994 g 2361 4025 M 96 21 V stroke -LT1 +LT0 .3224 g 3810 2210 M -74 -42 V stroke -LT1 +LT0 .3086 g 3667 2168 M 69 0 V stroke @@ -1823,15 +1831,15 @@ .8103 g 4649 3597 M -96 -186 V stroke -LT1 +LT0 .3767 g 4077 2350 M -74 -69 V stroke -LT1 +LT0 .3898 g 4174 2427 M 4003 2281 L stroke -LT1 +LT0 .3471 g 3907 2237 M 96 44 V stroke @@ -1883,15 +1891,15 @@ .4165 g 5804 2522 M 96 -293 V stroke -LT1 +LT0 .3431 g 3714 2210 M -38 -22 V stroke -LT1 +LT0 .3672 g 3981 2308 M -74 -71 V stroke -LT1 +LT0 .3413 g 3810 2210 M 97 27 V stroke @@ -1975,11 +1983,11 @@ .8164 g 4723 3577 M -96 -184 V stroke -LT1 +LT0 .3669 g 3884 2286 M -74 -76 V stroke -LT1 +LT0 .3465 g 3714 2210 M 96 0 V stroke @@ -2031,15 +2039,15 @@ .9466 g 4842 3894 M -97 -132 V stroke -LT1 +LT0 .4919 g 4344 2611 M -74 -91 V stroke -LT1 +LT0 .5137 g 4440 2722 M 4270 2520 L stroke -LT1 +LT0 .4448 g 4174 2427 M 96 93 V stroke @@ -2055,11 +2063,11 @@ .7978 g 2441 3431 M 97 -60 V stroke -LT1 +LT0 .4558 g 4248 2510 M -74 -83 V stroke -LT1 +LT0 .4145 g 4077 2350 M 97 77 V stroke @@ -2087,11 +2095,11 @@ .3968 g 5781 2413 M 97 -265 V stroke -LT1 +LT0 .4333 g 4151 2448 M -74 -98 V stroke -LT1 +LT0 .3969 g 3981 2308 M 96 42 V stroke @@ -2107,7 +2115,7 @@ .9752 g 4916 3871 M -74 23 V stroke -LT1 +LT0 .5479 g 2789 2687 M 19 -24 V stroke @@ -2119,11 +2127,11 @@ .6609 g 5678 3109 M 97 -246 V stroke -LT1 +LT0 .3775 g 3788 2281 M -74 -71 V stroke -LT1 +LT0 .3564 g 3689 2221 M 25 -11 V stroke @@ -2159,11 +2167,11 @@ .9974 g 2145 3923 M 97 13 V stroke -LT1 +LT0 .4204 g 4055 2391 M -74 -83 V stroke -LT1 +LT0 .3928 g 3884 2286 M 97 22 V stroke @@ -2251,11 +2259,11 @@ .903 g 4893 3734 M -96 -161 V stroke -LT1 +LT0 .4223 g 3958 2373 M -74 -87 V stroke -LT1 +LT0 .3979 g 3788 2281 M 96 5 V stroke @@ -2335,15 +2343,15 @@ .9597 g 4990 3851 M -97 -117 V stroke -LT1 +LT0 .519 g 4322 2620 M -74 -110 V stroke -LT1 +LT0 .5029 g 4344 2611 M -96 -101 V stroke -LT1 +LT0 .4745 g 4151 2448 M 97 62 V stroke @@ -2367,11 +2375,11 @@ .9735 g 5234 3833 M 97 -54 V stroke -LT1 +LT0 .5551 g 4418 2713 M -74 -102 V stroke -LT1 +LT0 .5437 g 4440 2722 M -96 -111 V stroke @@ -2391,11 +2399,11 @@ .8313 g 5530 3498 M 97 -208 V stroke -LT1 +LT0 .5705 g 2789 2687 M -74 94 V stroke -LT1 +LT0 .6241 g 2618 2911 M 97 -130 V stroke @@ -2403,19 +2411,19 @@ .9841 g 5064 3826 M -74 25 V stroke -LT1 +LT0 .5983 g 4514 2824 M -74 -102 V stroke -LT1 +LT0 .6243 g 4611 2953 M 4440 2722 L stroke -LT1 +LT0 .4317 g 3862 2369 M -74 -88 V stroke -LT1 +LT0 .4121 g 3724 2304 M 64 -23 V stroke @@ -2427,11 +2435,11 @@ .6854 g 5656 3118 M 96 -273 V stroke -LT1 +LT0 .4985 g 4225 2553 M -74 -105 V stroke -LT1 +LT0 .4569 g 4055 2391 M 96 57 V stroke @@ -2459,11 +2467,11 @@ .8812 g 5479 3598 M 33 -72 V stroke -LT1 +LT0 .5521 g 2805 2669 M -16 18 V stroke -LT1 +LT0 .5926 g 2692 2816 M 97 -129 V stroke @@ -2515,11 +2523,11 @@ .9752 g 1930 3807 M -74 -43 V stroke -LT1 +LT0 .4838 g 4129 2503 M -74 -112 V stroke -LT1 +LT0 .4499 g 3958 2373 M 97 18 V stroke @@ -2555,7 +2563,7 @@ .9928 g 2026 3841 M 97 1 V stroke -LT1 +LT0 .6046 g 2766 2742 M 11 -15 V stroke @@ -2599,11 +2607,11 @@ .8802 g 4945 3599 M -96 -154 V stroke -LT1 +LT0 .4854 g 4032 2480 M -74 -107 V stroke -LT1 +LT0 .4561 g 3862 2369 M 96 4 V stroke @@ -2683,15 +2691,15 @@ .9905 g 5212 3786 M 96 -1 V stroke -LT1 +LT0 .6252 g 4492 2832 M -74 -119 V stroke -LT1 +LT0 .6097 g 4514 2824 M -96 -111 V stroke -LT1 +LT0 .5711 g 4322 2620 M 96 93 V stroke @@ -2699,19 +2707,19 @@ .9728 g 5115 3736 M -74 -12 V stroke -LT1 +LT0 .5922 g 4396 2744 M -74 -124 V stroke -LT1 +LT0 .5429 g 4225 2553 M 97 67 V stroke -LT1 +LT0 .6462 g 2692 2816 M -74 95 V stroke -LT1 +LT0 .701 g 2522 3046 M 96 -135 V stroke @@ -2723,11 +2731,11 @@ .9773 g 1833 3718 M 97 89 V stroke -LT1 +LT0 .4972 g 3936 2484 M -74 -115 V stroke -LT1 +LT0 .4743 g 3766 2399 M 96 -30 V stroke @@ -2783,11 +2791,11 @@ .7564 g 1596 3268 M -97 -268 V stroke -LT1 +LT0 .6667 g 4588 2937 M -74 -113 V stroke -LT1 +LT0 .657 g 4611 2953 M -97 -129 V stroke @@ -2815,19 +2823,19 @@ .8821 g 2226 3509 M 96 -79 V stroke -LT1 +LT0 .57 g 4299 2675 M -74 -122 V stroke -LT1 +LT0 .5254 g 4129 2503 M 96 50 V stroke -LT1 +LT0 .6197 g 2766 2742 M -74 74 V stroke -LT1 +LT0 .6718 g 2596 2960 M 96 -144 V stroke @@ -2851,7 +2859,7 @@ .9805 g 5286 3755 M 96 -41 V stroke -LT1 +LT0 .716 g 4685 3056 M -74 -103 V stroke @@ -2863,11 +2871,11 @@ .8776 g 1715 3556 M -97 -196 V stroke -LT1 +LT0 .5583 g 4203 2630 M -74 -127 V stroke -LT1 +LT0 .5192 g 4032 2480 M 97 23 V stroke @@ -2891,11 +2899,11 @@ .9233 g 5434 3616 M 96 -118 V stroke -LT1 +LT0 .6087 g 2772 2738 M -6 4 V stroke -LT1 +LT0 .6507 g 2670 2887 M 96 -145 V stroke @@ -2923,7 +2931,7 @@ .9626 g 5115 3736 M -96 -109 V stroke -LT1 +LT0 .5243 g 3839 2511 M -71 -108 V stroke @@ -2931,11 +2939,11 @@ .9869 g 5189 3719 M -74 17 V stroke -LT1 +LT0 .5588 g 4106 2609 M -74 -129 V stroke -LT1 +LT0 .5264 g 3936 2484 M 96 -4 V stroke @@ -3039,15 +3047,15 @@ .8761 g 2277 3375 M 23 -25 V stroke -LT1 +LT0 .7266 g 2596 2960 M -74 86 V stroke -LT1 +LT0 .7707 g 2451 3153 M 71 -107 V stroke -LT1 +LT0 .7699 g 2428 3171 M 94 -125 V stroke @@ -3059,15 +3067,15 @@ .9874 g 1885 3694 M 96 7 V stroke -LT1 +LT0 .7022 g 4566 2963 M -74 -131 V stroke -LT1 +LT0 .6823 g 4588 2937 M -96 -105 V stroke -LT1 +LT0 .6463 g 4396 2744 M 96 88 V stroke @@ -3087,19 +3095,19 @@ .9425 g 5093 3643 M -96 -114 V stroke -LT1 +LT0 .5711 g 4010 2606 M -74 -122 V stroke -LT1 +LT0 .5458 g 3839 2511 M 97 -27 V stroke -LT1 +LT0 .6714 g 4470 2879 M -74 -135 V stroke -LT1 +LT0 .6193 g 4299 2675 M 97 69 V stroke @@ -3111,11 +3119,11 @@ .8858 g 5485 3464 M 97 -138 V stroke -LT1 +LT0 .7398 g 4662 3058 M -74 -121 V stroke -LT1 +LT0 .7257 g 4685 3056 M -97 -119 V stroke @@ -3147,27 +3155,27 @@ .8262 g 1670 3363 M -97 -237 V stroke -LT1 +LT0 .7027 g 2670 2887 M -74 73 V stroke -LT1 +LT0 .7545 g 2499 3104 M 97 -144 V stroke -LT1 +LT0 .6502 g 4373 2815 M -74 -140 V stroke -LT1 +LT0 .6028 g 4203 2630 M 96 45 V stroke -LT1 +LT0 .7841 g 4759 3167 M -74 -111 V stroke -LT1 +LT0 .7894 g 4806 3214 M 4685 3056 L stroke @@ -3211,19 +3219,19 @@ .9817 g 1959 3657 M 96 -5 V stroke -LT1 +LT0 .6911 g 2688 2875 M -18 12 V stroke -LT1 +LT0 .7345 g 2573 3034 M 97 -147 V stroke -LT1 +LT0 .6402 g 4277 2772 M -74 -142 V stroke -LT1 +LT0 .5979 g 4106 2609 M 97 21 V stroke @@ -3259,11 +3267,11 @@ .887 g 4974 3449 M -80 -104 V stroke -LT1 +LT0 .5966 g 3913 2635 M -74 -124 V stroke -LT1 +LT0 .5603 g 3826 2516 M 13 -5 V stroke @@ -3295,11 +3303,11 @@ .9313 g 5071 3569 M -97 -120 V stroke -LT1 +LT0 .6404 g 4180 2748 M -74 -139 V stroke -LT1 +LT0 .6034 g 4010 2606 M 96 3 V stroke @@ -3395,11 +3403,11 @@ .95 g 5389 3539 M 96 -75 V stroke -LT1 +LT0 .6505 g 4084 2744 M -74 -138 V stroke -LT1 +LT0 .6219 g 3913 2635 M 97 -29 V stroke @@ -3407,23 +3415,23 @@ .9708 g 1840 3569 M -74 -23 V stroke -LT1 +LT0 .8131 g 4736 3173 M -74 -115 V stroke -LT1 +LT0 .7982 g 4759 3167 M -97 -109 V stroke -LT1 +LT0 .7597 g 4566 2963 M 96 95 V stroke -LT1 +LT0 .7806 g 4640 3088 M -74 -125 V stroke -LT1 +LT0 .7272 g 4470 2879 M 96 84 V stroke @@ -3435,31 +3443,31 @@ .8869 g 1744 3428 M -97 -183 V stroke -LT1 +LT0 .7535 g 4544 3015 M -74 -136 V stroke -LT1 +LT0 .7022 g 4373 2815 M 97 64 V stroke -LT1 +LT0 .8336 g 4792 3212 M -33 -45 V stroke -LT1 +LT0 .8309 g 4799 3213 M -40 -46 V stroke -LT1 +LT0 .7862 g 2573 3034 M -74 70 V stroke -LT1 +LT0 .8044 g 2477 3133 M 22 -29 V stroke -LT1 +LT0 .804 g 2470 3138 M 29 -34 V stroke @@ -3483,11 +3491,11 @@ .7377 g 5492 2973 M 97 -148 V stroke -LT1 +LT0 .7344 g 4447 2955 M -74 -140 V stroke -LT1 +LT0 .6875 g 4277 2772 M 96 43 V stroke @@ -3523,11 +3531,11 @@ .9651 g 5122 3532 M -74 -27 V stroke -LT1 +LT0 .7742 g 2612 3008 M -39 26 V stroke -LT1 +LT0 .7948 g 2530 3097 M 43 -63 V stroke @@ -3547,11 +3555,11 @@ .8777 g 5441 3315 M 96 -92 V stroke -LT1 +LT0 .7251 g 4351 2912 M -74 -140 V stroke -LT1 +LT0 .6827 g 4180 2748 M 97 24 V stroke @@ -3579,11 +3587,11 @@ .9552 g 1840 3569 M -96 -141 V stroke -LT1 +LT0 .674 g 3987 2762 M -74 -127 V stroke -LT1 +LT0 .6369 g 3901 2639 M 12 -4 V stroke @@ -3603,11 +3611,11 @@ .9848 g 5293 3557 M 96 -18 V stroke -LT1 +LT0 .7253 g 4254 2890 M -74 -142 V stroke -LT1 +LT0 .6875 g 4084 2744 M 96 4 V stroke @@ -3659,15 +3667,15 @@ .9833 g 1988 3527 M 97 -19 V stroke -LT1 +LT0 .8595 g 4759 3206 M -23 -33 V stroke -LT1 +LT0 .8556 g 4772 3209 M -36 -36 V stroke -LT1 +LT0 .834 g 4640 3088 M 96 85 V stroke @@ -3683,19 +3691,19 @@ .9703 g 5100 3490 M -74 -31 V stroke -LT1 +LT0 .8517 g 4705 3193 M -65 -105 V stroke -LT1 +LT0 .8069 g 4544 3015 M 96 73 V stroke -LT1 +LT0 .7344 g 4158 2883 M -74 -139 V stroke -LT1 +LT0 .7027 g 3987 2762 M 97 -18 V stroke @@ -3719,11 +3727,11 @@ .9948 g 5199 3533 M 94 24 V stroke -LT1 +LT0 .8324 g 4618 3137 M -74 -122 V stroke -LT1 +LT0 .7857 g 4447 2955 M 97 60 V stroke @@ -3743,11 +3751,11 @@ .8138 g 5396 3086 M 96 -113 V stroke -LT1 +LT0 .816 g 4521 3084 M -74 -129 V stroke -LT1 +LT0 .772 g 4351 2912 M 96 43 V stroke @@ -3787,11 +3795,11 @@ .9895 g 1892 3486 M 96 41 V stroke -LT1 +LT0 .8074 g 4425 3044 M -74 -132 V stroke -LT1 +LT0 .7677 g 4254 2890 M 97 22 V stroke @@ -3803,11 +3811,11 @@ .9568 g 1892 3486 M -97 -139 V stroke -LT1 +LT0 .7186 g 3998 2780 M -11 -18 V stroke -LT1 +LT0 .7133 g 3985 2762 M 2 0 V stroke @@ -3859,11 +3867,11 @@ .9543 g 4907 3353 M 96 76 V stroke -LT1 +LT0 .8065 g 4328 3015 M -74 -125 V stroke -LT1 +LT0 .7722 g 4158 2883 M 96 7 V stroke @@ -3895,7 +3903,7 @@ .8717 g 5299 3160 M 97 -74 V stroke -LT1 +LT0 .8777 g 4618 3137 M 63 47 V stroke @@ -3919,19 +3927,19 @@ .9958 g 2040 3448 M -74 26 V stroke -LT1 +LT0 .8802 g 4642 3168 M -24 -31 V stroke -LT1 +LT0 .8627 g 4521 3084 M 97 53 V stroke -LT1 +LT0 .7989 g 4199 2957 M -41 -74 V stroke -LT1 +LT0 .782 g 4094 2890 M 64 -7 V stroke @@ -3943,11 +3951,11 @@ .9924 g 2040 3448 M 96 4 V stroke -LT1 +LT0 .8734 g 4558 3141 M -37 -57 V stroke -LT1 +LT0 .8514 g 4425 3044 M 96 40 V stroke @@ -4003,11 +4011,11 @@ .9671 g 4885 3332 M 96 61 V stroke -LT1 +LT0 .8659 g 4461 3103 M -36 -59 V stroke -LT1 +LT0 .8463 g 4328 3015 M 97 29 V stroke @@ -4047,11 +4055,11 @@ .9854 g 2188 3390 M 96 -32 V stroke -LT1 +LT0 .8502 g 4338 3032 M -10 -17 V stroke -LT1 +LT0 .8462 g 4310 3015 M 18 0 V stroke @@ -4898,10 +4906,11 @@ LT0 .9437 g 3535 3013 M -96 -109 V -% Begin plot #1 +% End plot #1 +% Begin plot #2 stroke LT0 -.262 g % End plot #1 +.262 g % End plot #2 0.500 UL LTb 3253 724 M @@ -5201,8 +5210,10 @@ 509 125 V 4026 -36 R -613 257 V -6241 2658 M --463 194 V +899 -376 R +-2 1 V +463 -194 R +-461 193 V stroke LTb 1047 2881 M Binary files octave-3.6.1/doc/interpreter/griddata.pdf and octave-3.6.2/doc/interpreter/griddata.pdf differ Binary files octave-3.6.1/doc/interpreter/griddata.png and octave-3.6.2/doc/interpreter/griddata.png differ diff -uNr octave-3.6.1/doc/interpreter/grid.eps octave-3.6.2/doc/interpreter/grid.eps --- octave-3.6.1/doc/interpreter/grid.eps 2012-02-22 15:01:50.000000000 -0500 +++ octave-3.6.2/doc/interpreter/grid.eps 2012-05-31 11:40:57.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: grid.eps -%%Creator: gnuplot 4.4 patchlevel 0 -%%CreationDate: Wed Feb 22 15:01:50 2012 +%%Creator: gnuplot 4.6 patchlevel 0 +%%CreationDate: Thu May 31 11:40:57 2012 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments @@ -20,10 +20,12 @@ /Level1 false def /Rounded false def /ClipToBoundingBox false def +/SuppressPDFMark false def /TransparentPatterns false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /Gamma 1.0 def +/BackgroundColor {-1.000 -1.000 -1.000} def % /vshift -66 def /dl1 { @@ -38,22 +40,6 @@ /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def -Level1 {} { -/SDict 10 dict def -systemdict /pdfmark known not { - userdict /pdfmark systemdict /cleartomark get put -} if -SDict begin [ - /Title (grid.eps) - /Subject (gnuplot plot) - /Creator (gnuplot 4.4 patchlevel 0) - /Author (jwe) -% /Producer (gnuplot) -% /Keywords () - /CreationDate (Wed Feb 22 15:01:50 2012) - /DOCINFO pdfmark -end -} ifelse /doclip { ClipToBoundingBox { newpath 50 50 moveto 410 50 lineto 410 302 lineto 50 302 lineto closepath @@ -61,7 +47,7 @@ } if } def % -% Gnuplot Prolog Version 4.4 (January 2010) +% Gnuplot Prolog Version 4.4 (August 2010) % %/SuppressPDFMark true def % @@ -73,6 +59,7 @@ /Z {closepath} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def +/g {setgray} bind def /Gshow {show} def % May be redefined later in the file to support UTF-8 /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def @@ -94,6 +81,7 @@ dup 1 lt {pop 1} if 10 mul /udl exch def} def /PL {stroke userlinewidth setlinewidth Rounded {1 setlinejoin 1 setlinecap} if} def +3.8 setmiterlimit % Default Line colors /LCw {1 1 1} def /LCb {0 0 0} def @@ -459,8 +447,26 @@ Blacktext {gsave 0 setgray MFshow grestore} {MFshow} ifelse } bind def /XYsave { [( ) 1 2 true false 3 ()] } bind def /XYrestore { [( ) 1 2 true false 4 ()] } bind def +Level1 SuppressPDFMark or +{} { +/SDict 10 dict def +systemdict /pdfmark known not { + userdict /pdfmark systemdict /cleartomark get put +} if +SDict begin [ + /Title (grid.eps) + /Subject (gnuplot plot) + /Creator (gnuplot 4.6 patchlevel 0) + /Author (jwe) +% /Producer (gnuplot) +% /Keywords () + /CreationDate (Thu May 31 11:40:57 2012) + /DOCINFO pdfmark +end +} ifelse end %%EndProlog +%%Page: 1 1 gnudict begin gsave doclip @@ -469,6 +475,7 @@ 0 setgray newpath (Helvetica) findfont 200 scalefont setfont +BackgroundColor 0 lt 3 1 roll 0 lt exch 0 lt or or not {BackgroundColor C 1.000 0 0 7200.00 5040.00 BoxColFill} if gsave % colour palette begin /maxcolors 64 def /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray @@ -546,1446 +553,1848 @@ 0.500 UL LTb 1.000 UP +% Begin plot #1 0.500 UL LT0 -0.00 0.75 0.75 C 1941 1589 M +LC6 setrgbcolor +1941 1589 M 131 83 V stroke LT0 -0.00 0.75 0.75 C 2127 1784 M +LC6 setrgbcolor +2127 1784 M -55 -112 V stroke LT0 -0.00 0.00 1.00 C 2258 1867 M +LC5 setrgbcolor +2258 1867 M 2072 1672 L stroke LT0 -0.00 0.00 1.00 C 2127 1784 M +LC5 setrgbcolor +2127 1784 M -55 -112 V stroke LT0 -0.00 0.00 1.00 C 2127 1784 M +LC5 setrgbcolor +2127 1784 M 131 83 V stroke LT0 -0.75 0.00 0.75 C 2127 1784 M +LC4 setrgbcolor +2127 1784 M 131 83 V stroke LT0 -0.75 0.00 0.75 C 2312 1979 M +LC4 setrgbcolor +2312 1979 M -54 -112 V stroke LT0 -0.00 0.50 0.00 C 2443 2062 M +LC3 setrgbcolor +2443 2062 M 2258 1867 L stroke LT0 -0.00 0.50 0.00 C 2312 1979 M +LC3 setrgbcolor +2312 1979 M -54 -112 V stroke LT0 -0.00 0.50 0.00 C 2312 1979 M +LC3 setrgbcolor +2312 1979 M 131 83 V stroke LT0 -0.75 0.75 0.00 C 2312 1979 M +LC2 setrgbcolor +2312 1979 M 131 83 V stroke LT0 -0.75 0.75 0.00 C 2684 2171 M +LC2 setrgbcolor +2684 2171 M 2443 2062 L stroke LT0 -1.00 0.00 0.00 C 2814 2253 M +LC1 setrgbcolor +2814 2253 M 2443 2062 L stroke LT0 -1.00 0.00 0.00 C 2684 2171 M +LC1 setrgbcolor +2684 2171 M 2443 2062 L stroke LT0 -1.00 0.00 0.00 C 2684 2171 M +LC1 setrgbcolor +2684 2171 M 130 82 V stroke LT0 -0.25 0.25 0.25 C 2684 2171 M +LC0 setrgbcolor +2684 2171 M 130 82 V stroke LT0 -0.25 0.25 0.25 C 3055 2362 M +LC0 setrgbcolor +3055 2362 M 2814 2253 L stroke LT0 -0.00 0.75 0.75 C 3186 2445 M +LC8 setrgbcolor +3186 2445 M 2814 2253 L stroke LT0 -0.00 0.75 0.75 C 3055 2362 M +LC8 setrgbcolor +3055 2362 M 2814 2253 L stroke LT0 -0.00 0.75 0.75 C 3055 2362 M +LC8 setrgbcolor +3055 2362 M 131 83 V stroke LT0 -0.00 0.00 1.00 C 3055 2362 M +LC7 setrgbcolor +3055 2362 M 131 83 V stroke LT0 -0.00 0.00 1.00 C 3796 2744 M +LC7 setrgbcolor +3796 2744 M 3186 2445 L stroke LT0 -0.75 0.00 0.75 C 3927 2827 M +LC6 setrgbcolor +3927 2827 M 3186 2445 L stroke LT0 -0.75 0.00 0.75 C 3796 2744 M +LC6 setrgbcolor +3796 2744 M 3186 2445 L stroke LT0 -0.75 0.00 0.75 C 3796 2744 M +LC6 setrgbcolor +3796 2744 M 131 83 V stroke LT0 -0.00 0.50 0.00 C 3796 2744 M +LC5 setrgbcolor +3796 2744 M 131 83 V stroke LT0 -0.00 0.50 0.00 C 4538 3126 M +LC5 setrgbcolor +4538 3126 M 3927 2827 L stroke LT0 -0.75 0.75 0.00 C 4669 3209 M +LC4 setrgbcolor +4669 3209 M 3927 2827 L stroke LT0 -0.75 0.75 0.00 C 4538 3126 M +LC4 setrgbcolor +4538 3126 M 3927 2827 L stroke LT0 -1.00 0.00 0.00 C 1745 1465 M +LC4 setrgbcolor +1745 1465 M 196 124 V stroke LT0 -1.00 0.00 0.00 C 1931 1660 M +LC4 setrgbcolor +1931 1660 M 10 -71 V stroke LT0 -0.00 0.75 0.75 C 2127 1784 M +LC6 setrgbcolor +2127 1784 M 1941 1589 L stroke LT0 -0.25 0.25 0.25 C 2127 1784 M +LC3 setrgbcolor +2127 1784 M 1941 1589 L stroke LT0 -0.25 0.25 0.25 C 1931 1660 M +LC3 setrgbcolor +1931 1660 M 10 -71 V stroke LT0 -0.25 0.25 0.25 C 1931 1660 M +LC3 setrgbcolor +1931 1660 M 196 124 V stroke LT0 -0.00 0.75 0.75 C 1931 1660 M +LC2 setrgbcolor +1931 1660 M 196 124 V stroke LT0 -0.00 0.75 0.75 C 2116 1855 M +LC2 setrgbcolor +2116 1855 M 11 -71 V stroke LT0 -0.75 0.00 0.75 C 2312 1979 M +LC4 setrgbcolor +2312 1979 M 2127 1784 L stroke LT0 -0.00 0.00 1.00 C 2312 1979 M +LC1 setrgbcolor +2312 1979 M 2127 1784 L stroke LT0 -0.00 0.00 1.00 C 2116 1855 M +LC1 setrgbcolor +2116 1855 M 11 -71 V stroke LT0 -0.75 0.75 0.00 C 4538 3126 M +LC4 setrgbcolor +4538 3126 M 131 83 V stroke LT0 -1.00 0.00 0.00 C 4538 3126 M +LC3 setrgbcolor +4538 3126 M 131 83 V stroke LT0 -1.00 0.00 0.00 C 4909 3318 M +LC3 setrgbcolor +4909 3318 M 4669 3209 L stroke LT0 -0.25 0.25 0.25 C 5040 3401 M +LC2 setrgbcolor +5040 3401 M 4669 3209 L stroke LT0 -0.25 0.25 0.25 C 4909 3318 M +LC2 setrgbcolor +4909 3318 M 4669 3209 L stroke LT0 -0.00 0.00 1.00 C 2116 1855 M +LC1 setrgbcolor +2116 1855 M 196 124 V stroke LT0 -0.75 0.00 0.75 C 2116 1855 M +LC0 setrgbcolor +2116 1855 M 196 124 V stroke LT0 -0.75 0.00 0.75 C 2487 2046 M +LC0 setrgbcolor +2487 2046 M -175 -67 V stroke LT0 -0.75 0.75 0.00 C 2684 2171 M +LC2 setrgbcolor +2684 2171 M 2312 1979 L stroke LT0 -0.00 0.50 0.00 C 2684 2171 M +LC8 setrgbcolor +2684 2171 M 2312 1979 L stroke LT0 -0.00 0.50 0.00 C 2487 2046 M +LC8 setrgbcolor +2487 2046 M -175 -67 V stroke LT0 -0.25 0.25 0.25 C 4909 3318 M +LC2 setrgbcolor +4909 3318 M 131 83 V stroke LT0 -0.00 0.75 0.75 C 4909 3318 M +LC1 setrgbcolor +4909 3318 M 131 83 V stroke LT0 -0.00 0.75 0.75 C 5280 3509 M +LC1 setrgbcolor +5280 3509 M 5040 3401 L stroke LT0 -0.00 0.00 1.00 C 5411 3592 M +LC0 setrgbcolor +5411 3592 M 5040 3401 L stroke LT0 -0.00 0.00 1.00 C 5280 3509 M +LC0 setrgbcolor +5280 3509 M 5040 3401 L stroke LT0 -0.00 0.50 0.00 C 2487 2046 M +LC8 setrgbcolor +2487 2046 M 197 125 V stroke LT0 -0.75 0.75 0.00 C 2487 2046 M +LC7 setrgbcolor +2487 2046 M 197 125 V stroke LT0 -0.75 0.75 0.00 C 2858 2238 M +LC7 setrgbcolor +2858 2238 M -174 -67 V stroke LT0 -0.25 0.25 0.25 C 3055 2362 M +LC0 setrgbcolor +3055 2362 M 2684 2171 L stroke LT0 -1.00 0.00 0.00 C 3055 2362 M +LC6 setrgbcolor +3055 2362 M 2684 2171 L stroke LT0 -1.00 0.00 0.00 C 2858 2238 M +LC6 setrgbcolor +2858 2238 M -174 -67 V stroke LT0 -0.00 0.00 1.00 C 5280 3509 M +LC0 setrgbcolor +5280 3509 M 131 83 V stroke LT0 -0.75 0.00 0.75 C 5280 3509 M +LC8 setrgbcolor +5280 3509 M 131 83 V stroke LT0 -0.75 0.00 0.75 C 5466 3704 M +LC8 setrgbcolor +5466 3704 M -55 -112 V stroke LT0 -0.00 0.50 0.00 C 5596 3787 M +LC7 setrgbcolor +5596 3787 M 5411 3592 L stroke LT0 -0.00 0.50 0.00 C 5466 3704 M +LC7 setrgbcolor +5466 3704 M -55 -112 V stroke LT0 -1.00 0.00 0.00 C 2858 2238 M +LC6 setrgbcolor +2858 2238 M 197 124 V stroke LT0 -0.25 0.25 0.25 C 2858 2238 M +LC5 setrgbcolor +2858 2238 M 197 124 V stroke LT0 -0.25 0.25 0.25 C 3600 2620 M +LC5 setrgbcolor +3600 2620 M 3055 2362 L stroke LT0 -0.00 0.00 1.00 C 3796 2744 M +LC7 setrgbcolor +3796 2744 M 3055 2362 L stroke LT0 -0.00 0.75 0.75 C 3796 2744 M +LC4 setrgbcolor +3796 2744 M 3055 2362 L stroke LT0 -0.00 0.75 0.75 C 3600 2620 M +LC4 setrgbcolor +3600 2620 M 3055 2362 L stroke LT0 -0.00 0.50 0.00 C 5466 3704 M +LC7 setrgbcolor +5466 3704 M 130 83 V stroke LT0 -0.75 0.75 0.00 C 5466 3704 M +LC6 setrgbcolor +5466 3704 M 130 83 V stroke LT0 -0.75 0.75 0.00 C 5651 3899 M +LC6 setrgbcolor +5651 3899 M -55 -112 V stroke LT0 -1.00 0.00 0.00 C 5782 3982 M +LC5 setrgbcolor +5782 3982 M 5596 3787 L stroke LT0 -1.00 0.00 0.00 C 5651 3899 M +LC5 setrgbcolor +5651 3899 M -55 -112 V stroke LT0 -1.00 0.00 0.00 C 5651 3899 M +LC5 setrgbcolor +5651 3899 M 131 83 V stroke LT0 -0.00 0.75 0.75 C 3600 2620 M +LC4 setrgbcolor +3600 2620 M 196 124 V stroke LT0 -0.00 0.00 1.00 C 3600 2620 M +LC3 setrgbcolor +3600 2620 M 196 124 V stroke LT0 -0.00 0.00 1.00 C 4342 3002 M +LC3 setrgbcolor +4342 3002 M 3796 2744 L stroke LT0 -0.00 0.50 0.00 C 4538 3126 M +LC5 setrgbcolor +4538 3126 M 3796 2744 L stroke LT0 -0.75 0.00 0.75 C 4538 3126 M +LC2 setrgbcolor +4538 3126 M 3796 2744 L stroke LT0 -0.75 0.00 0.75 C 4342 3002 M +LC2 setrgbcolor +4342 3002 M 3796 2744 L stroke LT0 -0.75 0.00 0.75 C 4342 3002 M +LC2 setrgbcolor +4342 3002 M 196 124 V stroke LT0 -0.00 0.50 0.00 C 4342 3002 M +LC1 setrgbcolor +4342 3002 M 196 124 V stroke LT0 -0.00 0.50 0.00 C 4713 3194 M +LC1 setrgbcolor +4713 3194 M -175 -68 V stroke LT0 -1.00 0.00 0.00 C 4909 3318 M +LC3 setrgbcolor +4909 3318 M 4538 3126 L stroke LT0 -0.75 0.75 0.00 C 4909 3318 M +LC0 setrgbcolor +4909 3318 M 4538 3126 L stroke LT0 -0.75 0.75 0.00 C 4713 3194 M +LC0 setrgbcolor +4713 3194 M -175 -68 V stroke LT0 -0.75 0.75 0.00 C 4713 3194 M +LC0 setrgbcolor +4713 3194 M 196 124 V stroke LT0 -1.00 0.00 0.00 C 4713 3194 M +LC8 setrgbcolor +4713 3194 M 196 124 V stroke LT0 -1.00 0.00 0.00 C 5084 3385 M +LC8 setrgbcolor +5084 3385 M -175 -67 V stroke LT0 -0.00 0.75 0.75 C 5280 3509 M +LC1 setrgbcolor +5280 3509 M 4909 3318 L stroke LT0 -0.25 0.25 0.25 C 5280 3509 M +LC7 setrgbcolor +5280 3509 M 4909 3318 L stroke LT0 -0.25 0.25 0.25 C 5084 3385 M +LC7 setrgbcolor +5084 3385 M -175 -67 V stroke LT0 -0.00 0.50 0.00 C 1549 1341 M +LC2 setrgbcolor +1549 1341 M 196 124 V stroke LT0 -0.00 0.50 0.00 C 1734 1536 M +LC2 setrgbcolor +1734 1536 M 11 -71 V stroke LT0 -1.00 0.00 0.00 C 1931 1660 M +LC4 setrgbcolor +1931 1660 M 1745 1465 L stroke LT0 -0.75 0.75 0.00 C 1931 1660 M +LC1 setrgbcolor +1931 1660 M 1745 1465 L stroke LT0 -0.75 0.75 0.00 C 1734 1536 M +LC1 setrgbcolor +1734 1536 M 11 -71 V stroke LT0 -0.25 0.25 0.25 C 5084 3385 M +LC7 setrgbcolor +5084 3385 M 196 124 V stroke LT0 -0.00 0.75 0.75 C 5084 3385 M +LC6 setrgbcolor +5084 3385 M 196 124 V stroke LT0 -0.00 0.75 0.75 C 5269 3580 M +LC6 setrgbcolor +5269 3580 M 11 -71 V stroke LT0 -0.75 0.00 0.75 C 5466 3704 M +LC8 setrgbcolor +5466 3704 M 5280 3509 L stroke LT0 -0.00 0.00 1.00 C 5466 3704 M +LC5 setrgbcolor +5466 3704 M 5280 3509 L stroke LT0 -0.00 0.00 1.00 C 5269 3580 M +LC5 setrgbcolor +5269 3580 M 11 -71 V stroke LT0 -0.75 0.75 0.00 C 1734 1536 M +LC1 setrgbcolor +1734 1536 M 197 124 V stroke LT0 -1.00 0.00 0.00 C 1734 1536 M +LC0 setrgbcolor +1734 1536 M 197 124 V stroke LT0 -1.00 0.00 0.00 C 1920 1731 M +LC0 setrgbcolor +1920 1731 M 11 -71 V stroke LT0 -0.00 0.75 0.75 C 2116 1855 M +LC2 setrgbcolor +2116 1855 M 1931 1660 L stroke LT0 -0.25 0.25 0.25 C 2116 1855 M +LC8 setrgbcolor +2116 1855 M 1931 1660 L stroke LT0 -0.25 0.25 0.25 C 1920 1731 M +LC8 setrgbcolor +1920 1731 M 11 -71 V stroke LT0 -0.00 0.00 1.00 C 5269 3580 M +LC5 setrgbcolor +5269 3580 M 197 124 V stroke LT0 -0.75 0.00 0.75 C 5269 3580 M +LC4 setrgbcolor +5269 3580 M 197 124 V stroke LT0 -0.75 0.00 0.75 C 5455 3775 M +LC4 setrgbcolor +5455 3775 M 11 -71 V stroke LT0 -0.75 0.75 0.00 C 5651 3899 M +LC6 setrgbcolor +5651 3899 M 5466 3704 L stroke LT0 -0.00 0.50 0.00 C 5651 3899 M +LC3 setrgbcolor +5651 3899 M 5466 3704 L stroke LT0 -0.00 0.50 0.00 C 5455 3775 M +LC3 setrgbcolor +5455 3775 M 11 -71 V stroke LT0 -0.25 0.25 0.25 C 1920 1731 M +LC8 setrgbcolor +1920 1731 M 196 124 V stroke LT0 -0.00 0.75 0.75 C 1920 1731 M +LC7 setrgbcolor +1920 1731 M 196 124 V stroke LT0 -0.00 0.75 0.75 C 2291 1922 M +LC7 setrgbcolor +2291 1922 M -175 -67 V stroke LT0 -0.75 0.00 0.75 C 2487 2046 M +LC0 setrgbcolor +2487 2046 M 2116 1855 L stroke LT0 -0.00 0.00 1.00 C 2487 2046 M +LC6 setrgbcolor +2487 2046 M 2116 1855 L stroke LT0 -0.00 0.00 1.00 C 2291 1922 M +LC6 setrgbcolor +2291 1922 M -175 -67 V stroke LT0 -0.00 0.50 0.00 C 5455 3775 M +LC3 setrgbcolor +5455 3775 M 196 124 V stroke LT0 -0.00 0.00 1.00 C 2291 1922 M +LC6 setrgbcolor +2291 1922 M 196 124 V stroke LT0 -0.75 0.00 0.75 C 2291 1922 M +LC5 setrgbcolor +2291 1922 M 196 124 V stroke LT0 -0.75 0.00 0.75 C 2662 2114 M +LC5 setrgbcolor +2662 2114 M -175 -68 V stroke LT0 -0.75 0.75 0.00 C 2858 2238 M +LC7 setrgbcolor +2858 2238 M 2487 2046 L stroke LT0 -0.00 0.50 0.00 C 2858 2238 M +LC4 setrgbcolor +2858 2238 M 2487 2046 L stroke LT0 -0.00 0.50 0.00 C 2662 2114 M +LC4 setrgbcolor +2662 2114 M -175 -68 V stroke LT0 -0.00 0.50 0.00 C 2662 2114 M +LC4 setrgbcolor +2662 2114 M 196 124 V stroke LT0 -0.75 0.75 0.00 C 2662 2114 M +LC3 setrgbcolor +2662 2114 M 196 124 V stroke LT0 -0.75 0.75 0.00 C 3404 2496 M +LC3 setrgbcolor +3404 2496 M 2858 2238 L stroke LT0 -0.25 0.25 0.25 C 3600 2620 M +LC5 setrgbcolor +3600 2620 M 2858 2238 L stroke LT0 -1.00 0.00 0.00 C 3600 2620 M +LC2 setrgbcolor +3600 2620 M 2858 2238 L stroke LT0 -1.00 0.00 0.00 C 3404 2496 M +LC2 setrgbcolor +3404 2496 M 2858 2238 L stroke LT0 -1.00 0.00 0.00 C 3404 2496 M +LC2 setrgbcolor +3404 2496 M 196 124 V stroke LT0 -0.25 0.25 0.25 C 3404 2496 M +LC1 setrgbcolor +3404 2496 M 196 124 V stroke LT0 -0.25 0.25 0.25 C 4145 2878 M +LC1 setrgbcolor +4145 2878 M 3600 2620 L stroke LT0 -0.00 0.00 1.00 C 4342 3002 M +LC3 setrgbcolor +4342 3002 M 3600 2620 L stroke LT0 -0.00 0.75 0.75 C 4342 3002 M +LC0 setrgbcolor +4342 3002 M 3600 2620 L stroke LT0 -0.00 0.75 0.75 C 4145 2878 M +LC0 setrgbcolor +4145 2878 M 3600 2620 L stroke LT0 -0.00 0.75 0.75 C 4145 2878 M +LC0 setrgbcolor +4145 2878 M 197 124 V stroke LT0 -0.00 0.00 1.00 C 4145 2878 M +LC8 setrgbcolor +4145 2878 M 197 124 V stroke LT0 -0.00 0.00 1.00 C 4516 3069 M +LC8 setrgbcolor +4516 3069 M -174 -67 V stroke LT0 -0.00 0.50 0.00 C 4713 3194 M +LC1 setrgbcolor +4713 3194 M 4342 3002 L stroke LT0 -0.75 0.00 0.75 C 4713 3194 M +LC7 setrgbcolor +4713 3194 M 4342 3002 L stroke LT0 -0.75 0.00 0.75 C 4516 3069 M +LC7 setrgbcolor +4516 3069 M -174 -67 V stroke LT0 -0.75 0.00 0.75 C 4516 3069 M +LC7 setrgbcolor +4516 3069 M 197 125 V stroke LT0 -0.00 0.50 0.00 C 4516 3069 M +LC6 setrgbcolor +4516 3069 M 197 125 V stroke LT0 -0.00 0.50 0.00 C 4888 3261 M +LC6 setrgbcolor +4888 3261 M -175 -67 V stroke LT0 -1.00 0.00 0.00 C 5084 3385 M +LC8 setrgbcolor +5084 3385 M 4713 3194 L stroke LT0 -0.75 0.75 0.00 C 5084 3385 M +LC5 setrgbcolor +5084 3385 M 4713 3194 L stroke LT0 -0.75 0.75 0.00 C 4888 3261 M +LC5 setrgbcolor +4888 3261 M -175 -67 V stroke LT0 -0.00 0.00 1.00 C 1418 1258 M +LC0 setrgbcolor +1418 1258 M 131 83 V stroke LT0 -0.00 0.00 1.00 C 1604 1453 M +LC0 setrgbcolor +1604 1453 M -55 -112 V stroke LT0 -0.00 0.50 0.00 C 1734 1536 M +LC2 setrgbcolor +1734 1536 M 1549 1341 L stroke LT0 -0.75 0.00 0.75 C 1734 1536 M +LC8 setrgbcolor +1734 1536 M 1549 1341 L stroke LT0 -0.75 0.00 0.75 C 1604 1453 M +LC8 setrgbcolor +1604 1453 M -55 -112 V stroke LT0 -0.75 0.75 0.00 C 4888 3261 M +LC5 setrgbcolor +4888 3261 M 196 124 V stroke LT0 -1.00 0.00 0.00 C 4888 3261 M +LC4 setrgbcolor +4888 3261 M 196 124 V stroke LT0 -1.00 0.00 0.00 C 5073 3456 M +LC4 setrgbcolor +5073 3456 M 11 -71 V stroke LT0 -0.00 0.75 0.75 C 5269 3580 M +LC6 setrgbcolor +5269 3580 M 5084 3385 L stroke LT0 -0.25 0.25 0.25 C 5269 3580 M +LC3 setrgbcolor +5269 3580 M 5084 3385 L stroke LT0 -0.25 0.25 0.25 C 5073 3456 M +LC3 setrgbcolor +5073 3456 M 11 -71 V stroke LT0 -0.75 0.00 0.75 C 1604 1453 M +LC8 setrgbcolor +1604 1453 M 130 83 V stroke LT0 -0.00 0.50 0.00 C 1604 1453 M +LC7 setrgbcolor +1604 1453 M 130 83 V stroke LT0 -0.00 0.50 0.00 C 1789 1648 M +LC7 setrgbcolor +1789 1648 M -55 -112 V stroke LT0 -1.00 0.00 0.00 C 1920 1731 M +LC0 setrgbcolor +1920 1731 M 1734 1536 L stroke LT0 -0.75 0.75 0.00 C 1920 1731 M +LC6 setrgbcolor +1920 1731 M 1734 1536 L stroke LT0 -0.75 0.75 0.00 C 1789 1648 M +LC6 setrgbcolor +1789 1648 M -55 -112 V stroke LT0 -0.25 0.25 0.25 C 5073 3456 M +LC3 setrgbcolor +5073 3456 M 196 124 V stroke LT0 -0.00 0.75 0.75 C 5073 3456 M +LC2 setrgbcolor +5073 3456 M 196 124 V stroke LT0 -0.00 0.75 0.75 C 5259 3651 M +LC2 setrgbcolor +5259 3651 M 10 -71 V stroke LT0 -0.75 0.00 0.75 C 5455 3775 M +LC4 setrgbcolor +5455 3775 M 5269 3580 L stroke LT0 -0.00 0.00 1.00 C 5455 3775 M +LC1 setrgbcolor +5455 3775 M 5269 3580 L stroke LT0 -0.00 0.00 1.00 C 5259 3651 M +LC1 setrgbcolor +5259 3651 M 10 -71 V stroke LT0 -0.75 0.75 0.00 C 1789 1648 M +LC6 setrgbcolor +1789 1648 M 131 83 V stroke LT0 -1.00 0.00 0.00 C 1789 1648 M +LC5 setrgbcolor +1789 1648 M 131 83 V stroke LT0 -1.00 0.00 0.00 C 2160 1839 M +LC5 setrgbcolor +2160 1839 M 1920 1731 L stroke LT0 -0.00 0.75 0.75 C 2291 1922 M +LC7 setrgbcolor +2291 1922 M 1920 1731 L stroke LT0 -0.25 0.25 0.25 C 2291 1922 M +LC4 setrgbcolor +2291 1922 M 1920 1731 L stroke LT0 -0.25 0.25 0.25 C 2160 1839 M +LC4 setrgbcolor +2160 1839 M 1920 1731 L stroke LT0 -0.00 0.00 1.00 C 5259 3651 M +LC1 setrgbcolor +5259 3651 M 196 124 V stroke LT0 -0.25 0.25 0.25 C 2160 1839 M +LC4 setrgbcolor +2160 1839 M 131 83 V stroke LT0 -0.00 0.75 0.75 C 2160 1839 M +LC3 setrgbcolor +2160 1839 M 131 83 V stroke LT0 -0.00 0.75 0.75 C 2531 2031 M +LC3 setrgbcolor +2531 2031 M 2291 1922 L stroke LT0 -0.75 0.00 0.75 C 2662 2114 M +LC5 setrgbcolor +2662 2114 M 2291 1922 L stroke LT0 -0.00 0.00 1.00 C 2662 2114 M +LC2 setrgbcolor +2662 2114 M 2291 1922 L stroke LT0 -0.00 0.00 1.00 C 2531 2031 M +LC2 setrgbcolor +2531 2031 M 2291 1922 L stroke LT0 -0.00 0.00 1.00 C 2531 2031 M +LC2 setrgbcolor +2531 2031 M 131 83 V stroke LT0 -0.75 0.00 0.75 C 2531 2031 M +LC1 setrgbcolor +2531 2031 M 131 83 V stroke LT0 -0.75 0.00 0.75 C 3273 2413 M +LC1 setrgbcolor +3273 2413 M 2662 2114 L stroke LT0 -0.75 0.75 0.00 C 3404 2496 M +LC3 setrgbcolor +3404 2496 M 2662 2114 L stroke LT0 -0.00 0.50 0.00 C 3404 2496 M +LC0 setrgbcolor +3404 2496 M 2662 2114 L stroke LT0 -0.00 0.50 0.00 C 3273 2413 M +LC0 setrgbcolor +3273 2413 M 2662 2114 L stroke LT0 -0.00 0.50 0.00 C 3273 2413 M +LC0 setrgbcolor +3273 2413 M 131 83 V stroke LT0 -0.75 0.75 0.00 C 3273 2413 M +LC8 setrgbcolor +3273 2413 M 131 83 V stroke LT0 -0.75 0.75 0.00 C 4014 2795 M +LC8 setrgbcolor +4014 2795 M 3404 2496 L stroke LT0 -0.25 0.25 0.25 C 4145 2878 M +LC1 setrgbcolor +4145 2878 M 3404 2496 L stroke LT0 -1.00 0.00 0.00 C 4145 2878 M +LC7 setrgbcolor +4145 2878 M 3404 2496 L stroke LT0 -1.00 0.00 0.00 C 4014 2795 M +LC7 setrgbcolor +4014 2795 M 3404 2496 L stroke LT0 -0.00 0.00 1.00 C 1604 1453 M +LC0 setrgbcolor +1604 1453 M 1418 1258 L stroke LT0 -0.00 0.50 0.00 C 1789 1648 M +LC7 setrgbcolor +1789 1648 M 1604 1453 L stroke LT0 -1.00 0.00 0.00 C 4014 2795 M +LC7 setrgbcolor +4014 2795 M 131 83 V stroke LT0 -0.25 0.25 0.25 C 4014 2795 M +LC6 setrgbcolor +4014 2795 M 131 83 V stroke LT0 -0.25 0.25 0.25 C 4386 2987 M +LC6 setrgbcolor +4386 2987 M 4145 2878 L stroke LT0 -0.00 0.00 1.00 C 4516 3069 M +LC8 setrgbcolor +4516 3069 M 4145 2878 L stroke LT0 -0.00 0.75 0.75 C 4516 3069 M +LC5 setrgbcolor +4516 3069 M 4145 2878 L stroke LT0 -0.00 0.75 0.75 C 4386 2987 M +LC5 setrgbcolor +4386 2987 M 4145 2878 L stroke LT0 -1.00 0.00 0.00 C 2160 1839 M +LC5 setrgbcolor +2160 1839 M 1789 1648 L stroke LT0 -0.00 0.75 0.75 C 4386 2987 M +LC5 setrgbcolor +4386 2987 M 130 82 V stroke LT0 -0.00 0.00 1.00 C 4386 2987 M +LC4 setrgbcolor +4386 2987 M 130 82 V stroke LT0 -0.00 0.00 1.00 C 4757 3178 M +LC4 setrgbcolor +4757 3178 M 4516 3069 L stroke LT0 -0.00 0.50 0.00 C 4888 3261 M +LC6 setrgbcolor +4888 3261 M 4516 3069 L stroke LT0 -0.75 0.00 0.75 C 4888 3261 M +LC3 setrgbcolor +4888 3261 M 4516 3069 L stroke LT0 -0.75 0.00 0.75 C 4757 3178 M +LC3 setrgbcolor +4757 3178 M 4516 3069 L stroke LT0 -0.00 0.75 0.75 C 2531 2031 M +LC3 setrgbcolor +2531 2031 M 2160 1839 L stroke LT0 -0.75 0.00 0.75 C 4757 3178 M +LC3 setrgbcolor +4757 3178 M 131 83 V stroke LT0 -0.00 0.50 0.00 C 4757 3178 M +LC2 setrgbcolor +4757 3178 M 131 83 V stroke LT0 -0.00 0.50 0.00 C 4942 3373 M +LC2 setrgbcolor +4942 3373 M -54 -112 V stroke LT0 -1.00 0.00 0.00 C 5073 3456 M +LC4 setrgbcolor +5073 3456 M 4888 3261 L stroke LT0 -0.75 0.75 0.00 C 5073 3456 M +LC1 setrgbcolor +5073 3456 M 4888 3261 L stroke LT0 -0.75 0.75 0.00 C 4942 3373 M +LC1 setrgbcolor +4942 3373 M -54 -112 V stroke LT0 -0.75 0.00 0.75 C 3273 2413 M +LC1 setrgbcolor +3273 2413 M 2531 2031 L stroke LT0 -0.75 0.75 0.00 C 4942 3373 M +LC1 setrgbcolor +4942 3373 M 131 83 V stroke LT0 -1.00 0.00 0.00 C 4942 3373 M +LC0 setrgbcolor +4942 3373 M 131 83 V stroke LT0 -1.00 0.00 0.00 C 5128 3568 M +LC0 setrgbcolor +5128 3568 M -55 -112 V stroke LT0 -0.00 0.75 0.75 C 5259 3651 M +LC2 setrgbcolor +5259 3651 M 5073 3456 L stroke LT0 -0.25 0.25 0.25 C 5259 3651 M +LC8 setrgbcolor +5259 3651 M 5073 3456 L stroke LT0 -0.25 0.25 0.25 C 5128 3568 M +LC8 setrgbcolor +5128 3568 M -55 -112 V stroke LT0 -0.25 0.25 0.25 C 5128 3568 M +LC8 setrgbcolor +5128 3568 M 131 83 V stroke LT0 -0.75 0.75 0.00 C 4014 2795 M +LC8 setrgbcolor +4014 2795 M 3273 2413 L stroke LT0 -0.25 0.25 0.25 C 4386 2987 M +LC6 setrgbcolor +4386 2987 M 4014 2795 L stroke LT0 -0.00 0.00 1.00 C 4757 3178 M +LC4 setrgbcolor +4757 3178 M 4386 2987 L stroke LT0 -0.00 0.50 0.00 C 4942 3373 M +LC2 setrgbcolor +4942 3373 M 4757 3178 L stroke LT0 -1.00 0.00 0.00 C 5128 3568 M +LC0 setrgbcolor +5128 3568 M 4942 3373 L +% End plot #1 +% Begin plot #2 %pm3d_map_begin -%pm3d_map_end -% Begin plot #1 stroke LT0 -0.00 0.00 1.00 C % End plot #1 +0.00 0.00 1.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.00 1.00 C % End plot #2 +% Begin plot #3 %pm3d_map_begin -%pm3d_map_end -% Begin plot #2 0.500 UL LT0 -0.00 0.50 0.00 C % End plot #2 +0.00 0.50 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.50 0.00 C % End plot #3 +% Begin plot #4 %pm3d_map_begin -%pm3d_map_end -% Begin plot #3 0.500 UL LT0 -1.00 0.00 0.00 C % End plot #3 +1.00 0.00 0.00 C %pm3d_map_end +0.500 UL +LT0 +1.00 0.00 0.00 C % End plot #4 +% Begin plot #5 %pm3d_map_begin -%pm3d_map_end -% Begin plot #4 0.500 UL LT0 -0.00 0.75 0.75 C % End plot #4 +0.00 0.75 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.75 0.75 C % End plot #5 +% Begin plot #6 %pm3d_map_begin -%pm3d_map_end -% Begin plot #5 0.500 UL LT0 -0.75 0.00 0.75 C % End plot #5 +0.75 0.00 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.00 0.75 C % End plot #6 +% Begin plot #7 %pm3d_map_begin -%pm3d_map_end -% Begin plot #6 0.500 UL LT0 -0.75 0.75 0.00 C % End plot #6 +0.75 0.75 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.75 0.00 C % End plot #7 +% Begin plot #8 %pm3d_map_begin -%pm3d_map_end -% Begin plot #7 0.500 UL LT0 -0.25 0.25 0.25 C % End plot #7 +0.25 0.25 0.25 C %pm3d_map_end +0.500 UL +LT0 +0.25 0.25 0.25 C % End plot #8 +% Begin plot #9 %pm3d_map_begin -%pm3d_map_end -% Begin plot #8 0.500 UL LT0 -0.00 0.00 1.00 C % End plot #8 +0.00 0.00 1.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.00 1.00 C % End plot #9 +% Begin plot #10 %pm3d_map_begin -%pm3d_map_end -% Begin plot #9 0.500 UL LT0 -0.00 0.50 0.00 C % End plot #9 +0.00 0.50 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.50 0.00 C % End plot #10 +% Begin plot #11 %pm3d_map_begin -%pm3d_map_end -% Begin plot #10 0.500 UL LT0 -1.00 0.00 0.00 C % End plot #10 +1.00 0.00 0.00 C %pm3d_map_end +0.500 UL +LT0 +1.00 0.00 0.00 C % End plot #11 +% Begin plot #12 %pm3d_map_begin -%pm3d_map_end -% Begin plot #11 0.500 UL LT0 -0.00 0.75 0.75 C % End plot #11 +0.00 0.75 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.75 0.75 C % End plot #12 +% Begin plot #13 %pm3d_map_begin -%pm3d_map_end -% Begin plot #12 0.500 UL LT0 -0.75 0.00 0.75 C % End plot #12 +0.75 0.00 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.00 0.75 C % End plot #13 +% Begin plot #14 %pm3d_map_begin -%pm3d_map_end -% Begin plot #13 0.500 UL LT0 -0.75 0.75 0.00 C % End plot #13 +0.75 0.75 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.75 0.00 C % End plot #14 +% Begin plot #15 %pm3d_map_begin -%pm3d_map_end -% Begin plot #14 0.500 UL LT0 -0.25 0.25 0.25 C % End plot #14 +0.25 0.25 0.25 C %pm3d_map_end +0.500 UL +LT0 +0.25 0.25 0.25 C % End plot #15 +% Begin plot #16 %pm3d_map_begin -%pm3d_map_end -% Begin plot #15 0.500 UL LT0 -0.00 0.00 1.00 C % End plot #15 +0.00 0.00 1.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.00 1.00 C % End plot #16 +% Begin plot #17 %pm3d_map_begin -%pm3d_map_end -% Begin plot #16 0.500 UL LT0 -0.00 0.50 0.00 C % End plot #16 +0.00 0.50 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.50 0.00 C % End plot #17 +% Begin plot #18 %pm3d_map_begin -%pm3d_map_end -% Begin plot #17 0.500 UL LT0 -1.00 0.00 0.00 C % End plot #17 +1.00 0.00 0.00 C %pm3d_map_end +0.500 UL +LT0 +1.00 0.00 0.00 C % End plot #18 +% Begin plot #19 %pm3d_map_begin -%pm3d_map_end -% Begin plot #18 0.500 UL LT0 -0.00 0.75 0.75 C % End plot #18 +0.00 0.75 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.75 0.75 C % End plot #19 +% Begin plot #20 %pm3d_map_begin -%pm3d_map_end -% Begin plot #19 0.500 UL LT0 -0.75 0.00 0.75 C % End plot #19 +0.75 0.00 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.00 0.75 C % End plot #20 +% Begin plot #21 %pm3d_map_begin -%pm3d_map_end -% Begin plot #20 0.500 UL LT0 -0.75 0.75 0.00 C % End plot #20 +0.75 0.75 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.75 0.00 C % End plot #21 +% Begin plot #22 %pm3d_map_begin -%pm3d_map_end -% Begin plot #21 0.500 UL LT0 -0.25 0.25 0.25 C % End plot #21 +0.25 0.25 0.25 C %pm3d_map_end +0.500 UL +LT0 +0.25 0.25 0.25 C % End plot #22 +% Begin plot #23 %pm3d_map_begin -%pm3d_map_end -% Begin plot #22 0.500 UL LT0 -0.00 0.00 1.00 C % End plot #22 +0.00 0.00 1.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.00 1.00 C % End plot #23 +% Begin plot #24 %pm3d_map_begin -%pm3d_map_end -% Begin plot #23 0.500 UL LT0 -0.00 0.50 0.00 C % End plot #23 +0.00 0.50 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.50 0.00 C % End plot #24 +% Begin plot #25 %pm3d_map_begin -%pm3d_map_end -% Begin plot #24 0.500 UL LT0 -1.00 0.00 0.00 C % End plot #24 +1.00 0.00 0.00 C %pm3d_map_end +0.500 UL +LT0 +1.00 0.00 0.00 C % End plot #25 +% Begin plot #26 %pm3d_map_begin -%pm3d_map_end -% Begin plot #25 0.500 UL LT0 -0.00 0.75 0.75 C % End plot #25 +0.00 0.75 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.75 0.75 C % End plot #26 +% Begin plot #27 %pm3d_map_begin -%pm3d_map_end -% Begin plot #26 0.500 UL LT0 -0.75 0.00 0.75 C % End plot #26 +0.75 0.00 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.00 0.75 C % End plot #27 +% Begin plot #28 %pm3d_map_begin -%pm3d_map_end -% Begin plot #27 0.500 UL LT0 -0.75 0.75 0.00 C % End plot #27 +0.75 0.75 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.75 0.00 C % End plot #28 +% Begin plot #29 %pm3d_map_begin -%pm3d_map_end -% Begin plot #28 0.500 UL LT0 -0.25 0.25 0.25 C % End plot #28 +0.25 0.25 0.25 C %pm3d_map_end +0.500 UL +LT0 +0.25 0.25 0.25 C % End plot #29 +% Begin plot #30 %pm3d_map_begin -%pm3d_map_end -% Begin plot #29 0.500 UL LT0 -0.00 0.00 1.00 C % End plot #29 +0.00 0.00 1.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.00 1.00 C % End plot #30 +% Begin plot #31 %pm3d_map_begin -%pm3d_map_end -% Begin plot #30 0.500 UL LT0 -0.00 0.50 0.00 C % End plot #30 +0.00 0.50 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.50 0.00 C % End plot #31 +% Begin plot #32 %pm3d_map_begin -%pm3d_map_end -% Begin plot #31 0.500 UL LT0 -1.00 0.00 0.00 C % End plot #31 +1.00 0.00 0.00 C %pm3d_map_end +0.500 UL +LT0 +1.00 0.00 0.00 C % End plot #32 +% Begin plot #33 %pm3d_map_begin -%pm3d_map_end -% Begin plot #32 0.500 UL LT0 -0.00 0.75 0.75 C % End plot #32 +0.00 0.75 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.75 0.75 C % End plot #33 +% Begin plot #34 %pm3d_map_begin -%pm3d_map_end -% Begin plot #33 0.500 UL LT0 -0.75 0.00 0.75 C % End plot #33 +0.75 0.00 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.00 0.75 C % End plot #34 +% Begin plot #35 %pm3d_map_begin -%pm3d_map_end -% Begin plot #34 0.500 UL LT0 -0.75 0.75 0.00 C % End plot #34 +0.75 0.75 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.75 0.00 C % End plot #35 +% Begin plot #36 %pm3d_map_begin -%pm3d_map_end -% Begin plot #35 0.500 UL LT0 -0.25 0.25 0.25 C % End plot #35 +0.25 0.25 0.25 C %pm3d_map_end +0.500 UL +LT0 +0.25 0.25 0.25 C % End plot #36 +% Begin plot #37 %pm3d_map_begin -%pm3d_map_end -% Begin plot #36 0.500 UL LT0 -0.00 0.00 1.00 C % End plot #36 +0.00 0.00 1.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.00 1.00 C % End plot #37 +% Begin plot #38 %pm3d_map_begin -%pm3d_map_end -% Begin plot #37 0.500 UL LT0 -0.00 0.50 0.00 C % End plot #37 +0.00 0.50 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.50 0.00 C % End plot #38 +% Begin plot #39 %pm3d_map_begin -%pm3d_map_end -% Begin plot #38 0.500 UL LT0 -1.00 0.00 0.00 C % End plot #38 +1.00 0.00 0.00 C %pm3d_map_end +0.500 UL +LT0 +1.00 0.00 0.00 C % End plot #39 +% Begin plot #40 %pm3d_map_begin -%pm3d_map_end -% Begin plot #39 0.500 UL LT0 -0.00 0.75 0.75 C % End plot #39 +0.00 0.75 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.75 0.75 C % End plot #40 +% Begin plot #41 %pm3d_map_begin -%pm3d_map_end -% Begin plot #40 0.500 UL LT0 -0.75 0.00 0.75 C % End plot #40 +0.75 0.00 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.00 0.75 C % End plot #41 +% Begin plot #42 %pm3d_map_begin -%pm3d_map_end -% Begin plot #41 0.500 UL LT0 -0.75 0.75 0.00 C % End plot #41 +0.75 0.75 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.75 0.00 C % End plot #42 +% Begin plot #43 %pm3d_map_begin -%pm3d_map_end -% Begin plot #42 0.500 UL LT0 -0.25 0.25 0.25 C % End plot #42 +0.25 0.25 0.25 C %pm3d_map_end +0.500 UL +LT0 +0.25 0.25 0.25 C % End plot #43 +% Begin plot #44 %pm3d_map_begin -%pm3d_map_end -% Begin plot #43 0.500 UL LT0 -0.00 0.00 1.00 C % End plot #43 +0.00 0.00 1.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.00 1.00 C % End plot #44 +% Begin plot #45 %pm3d_map_begin -%pm3d_map_end -% Begin plot #44 0.500 UL LT0 -0.00 0.50 0.00 C % End plot #44 +0.00 0.50 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.50 0.00 C % End plot #45 +% Begin plot #46 %pm3d_map_begin -%pm3d_map_end -% Begin plot #45 0.500 UL LT0 -1.00 0.00 0.00 C % End plot #45 +1.00 0.00 0.00 C %pm3d_map_end +0.500 UL +LT0 +1.00 0.00 0.00 C % End plot #46 +% Begin plot #47 %pm3d_map_begin -%pm3d_map_end -% Begin plot #46 0.500 UL LT0 -0.00 0.75 0.75 C % End plot #46 +0.00 0.75 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.75 0.75 C % End plot #47 +% Begin plot #48 %pm3d_map_begin -%pm3d_map_end -% Begin plot #47 0.500 UL LT0 -0.75 0.00 0.75 C % End plot #47 +0.75 0.00 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.00 0.75 C % End plot #48 +% Begin plot #49 %pm3d_map_begin -%pm3d_map_end -% Begin plot #48 0.500 UL LT0 -0.75 0.75 0.00 C % End plot #48 +0.75 0.75 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.75 0.00 C % End plot #49 +% Begin plot #50 %pm3d_map_begin -%pm3d_map_end -% Begin plot #49 0.500 UL LT0 -0.25 0.25 0.25 C % End plot #49 +0.25 0.25 0.25 C %pm3d_map_end +0.500 UL +LT0 +0.25 0.25 0.25 C % End plot #50 +% Begin plot #51 %pm3d_map_begin -%pm3d_map_end -% Begin plot #50 0.500 UL LT0 -0.00 0.00 1.00 C % End plot #50 +0.00 0.00 1.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.00 1.00 C % End plot #51 +% Begin plot #52 %pm3d_map_begin -%pm3d_map_end -% Begin plot #51 0.500 UL LT0 -0.00 0.50 0.00 C % End plot #51 +0.00 0.50 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.50 0.00 C % End plot #52 +% Begin plot #53 %pm3d_map_begin -%pm3d_map_end -% Begin plot #52 0.500 UL LT0 -1.00 0.00 0.00 C % End plot #52 +1.00 0.00 0.00 C %pm3d_map_end +0.500 UL +LT0 +1.00 0.00 0.00 C % End plot #53 +% Begin plot #54 %pm3d_map_begin -%pm3d_map_end -% Begin plot #53 0.500 UL LT0 -0.00 0.75 0.75 C % End plot #53 +0.00 0.75 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.75 0.75 C % End plot #54 +% Begin plot #55 %pm3d_map_begin -%pm3d_map_end -% Begin plot #54 0.500 UL LT0 -0.75 0.00 0.75 C % End plot #54 +0.75 0.00 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.00 0.75 C % End plot #55 +% Begin plot #56 %pm3d_map_begin -%pm3d_map_end -% Begin plot #55 0.500 UL LT0 -0.75 0.75 0.00 C % End plot #55 +0.75 0.75 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.75 0.00 C % End plot #56 +% Begin plot #57 %pm3d_map_begin -%pm3d_map_end -% Begin plot #56 0.500 UL LT0 -0.25 0.25 0.25 C % End plot #56 +0.25 0.25 0.25 C %pm3d_map_end +0.500 UL +LT0 +0.25 0.25 0.25 C % End plot #57 +% Begin plot #58 %pm3d_map_begin -%pm3d_map_end -% Begin plot #57 0.500 UL LT0 -0.00 0.00 1.00 C % End plot #57 +0.00 0.00 1.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.00 1.00 C % End plot #58 +% Begin plot #59 %pm3d_map_begin -%pm3d_map_end -% Begin plot #58 0.500 UL LT0 -0.00 0.50 0.00 C % End plot #58 +0.00 0.50 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.50 0.00 C % End plot #59 +% Begin plot #60 %pm3d_map_begin -%pm3d_map_end -% Begin plot #59 0.500 UL LT0 -1.00 0.00 0.00 C % End plot #59 +1.00 0.00 0.00 C %pm3d_map_end +0.500 UL +LT0 +1.00 0.00 0.00 C % End plot #60 +% Begin plot #61 %pm3d_map_begin -%pm3d_map_end -% Begin plot #60 0.500 UL LT0 -0.00 0.75 0.75 C % End plot #60 +0.00 0.75 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.75 0.75 C % End plot #61 +% Begin plot #62 %pm3d_map_begin -%pm3d_map_end -% Begin plot #61 0.500 UL LT0 -0.75 0.00 0.75 C % End plot #61 +0.75 0.00 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.00 0.75 C % End plot #62 +% Begin plot #63 %pm3d_map_begin -%pm3d_map_end -% Begin plot #62 0.500 UL LT0 -0.75 0.75 0.00 C % End plot #62 +0.75 0.75 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.75 0.00 C % End plot #63 +% Begin plot #64 %pm3d_map_begin -%pm3d_map_end -% Begin plot #63 0.500 UL LT0 -0.25 0.25 0.25 C % End plot #63 +0.25 0.25 0.25 C %pm3d_map_end +0.500 UL +LT0 +0.25 0.25 0.25 C % End plot #64 +% Begin plot #65 %pm3d_map_begin -%pm3d_map_end -% Begin plot #64 0.500 UL LT0 -0.00 0.00 1.00 C % End plot #64 +0.00 0.00 1.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.00 1.00 C % End plot #65 +% Begin plot #66 %pm3d_map_begin -%pm3d_map_end -% Begin plot #65 0.500 UL LT0 -0.00 0.50 0.00 C % End plot #65 +0.00 0.50 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.50 0.00 C % End plot #66 +% Begin plot #67 %pm3d_map_begin -%pm3d_map_end -% Begin plot #66 0.500 UL LT0 -1.00 0.00 0.00 C % End plot #66 +1.00 0.00 0.00 C %pm3d_map_end +0.500 UL +LT0 +1.00 0.00 0.00 C % End plot #67 +% Begin plot #68 %pm3d_map_begin -%pm3d_map_end -% Begin plot #67 0.500 UL LT0 -0.00 0.75 0.75 C % End plot #67 +0.00 0.75 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.75 0.75 C % End plot #68 +% Begin plot #69 %pm3d_map_begin -%pm3d_map_end -% Begin plot #68 0.500 UL LT0 -0.75 0.00 0.75 C % End plot #68 +0.75 0.00 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.00 0.75 C % End plot #69 +% Begin plot #70 %pm3d_map_begin -%pm3d_map_end -% Begin plot #69 0.500 UL LT0 -0.75 0.75 0.00 C % End plot #69 +0.75 0.75 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.75 0.00 C % End plot #70 +% Begin plot #71 %pm3d_map_begin -%pm3d_map_end -% Begin plot #70 0.500 UL LT0 -0.25 0.25 0.25 C % End plot #70 +0.25 0.25 0.25 C %pm3d_map_end +0.500 UL +LT0 +0.25 0.25 0.25 C % End plot #71 +% Begin plot #72 %pm3d_map_begin -%pm3d_map_end -% Begin plot #71 0.500 UL LT0 -0.00 0.00 1.00 C % End plot #71 +0.00 0.00 1.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.00 1.00 C % End plot #72 +% Begin plot #73 %pm3d_map_begin -%pm3d_map_end -% Begin plot #72 0.500 UL LT0 -0.00 0.50 0.00 C % End plot #72 +0.00 0.50 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.50 0.00 C % End plot #73 +% Begin plot #74 %pm3d_map_begin -%pm3d_map_end -% Begin plot #73 0.500 UL LT0 -1.00 0.00 0.00 C % End plot #73 +1.00 0.00 0.00 C %pm3d_map_end +0.500 UL +LT0 +1.00 0.00 0.00 C % End plot #74 +% Begin plot #75 %pm3d_map_begin -%pm3d_map_end -% Begin plot #74 0.500 UL LT0 -0.00 0.75 0.75 C % End plot #74 +0.00 0.75 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.75 0.75 C % End plot #75 +% Begin plot #76 %pm3d_map_begin -%pm3d_map_end -% Begin plot #75 0.500 UL LT0 -0.75 0.00 0.75 C % End plot #75 +0.75 0.00 0.75 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.00 0.75 C % End plot #76 +% Begin plot #77 %pm3d_map_begin -%pm3d_map_end -% Begin plot #76 0.500 UL LT0 -0.75 0.75 0.00 C % End plot #76 +0.75 0.75 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.75 0.75 0.00 C % End plot #77 +% Begin plot #78 %pm3d_map_begin -%pm3d_map_end -% Begin plot #77 0.500 UL LT0 -0.25 0.25 0.25 C % End plot #77 +0.25 0.25 0.25 C %pm3d_map_end +0.500 UL +LT0 +0.25 0.25 0.25 C % End plot #78 +% Begin plot #79 %pm3d_map_begin -%pm3d_map_end -% Begin plot #78 0.500 UL LT0 -0.00 0.00 1.00 C % End plot #78 +0.00 0.00 1.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.00 1.00 C % End plot #79 +% Begin plot #80 %pm3d_map_begin -%pm3d_map_end -% Begin plot #79 0.500 UL LT0 -0.00 0.50 0.00 C % End plot #79 +0.00 0.50 0.00 C %pm3d_map_end +0.500 UL +LT0 +0.00 0.50 0.00 C % End plot #80 +% Begin plot #81 %pm3d_map_begin -%pm3d_map_end -% Begin plot #80 0.500 UL LT0 -1.00 0.00 0.00 C % End plot #80 +1.00 0.00 0.00 C %pm3d_map_end +0.500 UL +LT0 +1.00 0.00 0.00 C % End plot #81 0.500 UL LTb 5782 1599 M Binary files octave-3.6.1/doc/interpreter/grid.pdf and octave-3.6.2/doc/interpreter/grid.pdf differ Binary files octave-3.6.1/doc/interpreter/grid.png and octave-3.6.2/doc/interpreter/grid.png differ diff -uNr octave-3.6.1/doc/interpreter/hist.eps octave-3.6.2/doc/interpreter/hist.eps --- octave-3.6.1/doc/interpreter/hist.eps 2012-02-22 15:01:45.000000000 -0500 +++ octave-3.6.2/doc/interpreter/hist.eps 2012-05-31 11:40:51.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: hist.eps -%%Creator: gnuplot 4.4 patchlevel 0 -%%CreationDate: Wed Feb 22 15:01:45 2012 +%%Creator: gnuplot 4.6 patchlevel 0 +%%CreationDate: Thu May 31 11:40:51 2012 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments @@ -20,10 +20,12 @@ /Level1 false def /Rounded false def /ClipToBoundingBox false def +/SuppressPDFMark false def /TransparentPatterns false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /Gamma 1.0 def +/BackgroundColor {-1.000 -1.000 -1.000} def % /vshift -66 def /dl1 { @@ -38,22 +40,6 @@ /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def -Level1 {} { -/SDict 10 dict def -systemdict /pdfmark known not { - userdict /pdfmark systemdict /cleartomark get put -} if -SDict begin [ - /Title (hist.eps) - /Subject (gnuplot plot) - /Creator (gnuplot 4.4 patchlevel 0) - /Author (jwe) -% /Producer (gnuplot) -% /Keywords () - /CreationDate (Wed Feb 22 15:01:45 2012) - /DOCINFO pdfmark -end -} ifelse /doclip { ClipToBoundingBox { newpath 50 50 moveto 410 50 lineto 410 302 lineto 50 302 lineto closepath @@ -61,7 +47,7 @@ } if } def % -% Gnuplot Prolog Version 4.4 (January 2010) +% Gnuplot Prolog Version 4.4 (August 2010) % %/SuppressPDFMark true def % @@ -73,6 +59,7 @@ /Z {closepath} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def +/g {setgray} bind def /Gshow {show} def % May be redefined later in the file to support UTF-8 /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def @@ -94,6 +81,7 @@ dup 1 lt {pop 1} if 10 mul /udl exch def} def /PL {stroke userlinewidth setlinewidth Rounded {1 setlinejoin 1 setlinecap} if} def +3.8 setmiterlimit % Default Line colors /LCw {1 1 1} def /LCb {0 0 0} def @@ -459,8 +447,26 @@ Blacktext {gsave 0 setgray MFshow grestore} {MFshow} ifelse } bind def /XYsave { [( ) 1 2 true false 3 ()] } bind def /XYrestore { [( ) 1 2 true false 4 ()] } bind def +Level1 SuppressPDFMark or +{} { +/SDict 10 dict def +systemdict /pdfmark known not { + userdict /pdfmark systemdict /cleartomark get put +} if +SDict begin [ + /Title (hist.eps) + /Subject (gnuplot plot) + /Creator (gnuplot 4.6 patchlevel 0) + /Author (jwe) +% /Producer (gnuplot) +% /Keywords () + /CreationDate (Thu May 31 11:40:51 2012) + /DOCINFO pdfmark +end +} ifelse end %%EndProlog +%%Page: 1 1 gnudict begin gsave doclip @@ -469,6 +475,7 @@ 0 setgray newpath (Helvetica) findfont 200 scalefont setfont +BackgroundColor 0 lt 3 1 roll 0 lt exch 0 lt or or not {BackgroundColor C 1.000 0 0 7200.00 5040.00 BoxColFill} if gsave % colour palette begin /maxcolors 64 def /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray @@ -545,143 +552,143 @@ } ifelse 0.500 UL LTb -900 400 M +780 400 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 400 M +0.00 0.00 0.00 C 660 400 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MRshow 0.500 UL LTb -900 1133 M +780 1133 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 1133 M +0.00 0.00 0.00 C 660 1133 M [ [({}) 200.0 0.0 true true 0 (200)] ] -66.7 MRshow 0.500 UL LTb -900 1866 M +780 1866 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 1866 M +0.00 0.00 0.00 C 660 1866 M [ [({}) 200.0 0.0 true true 0 (400)] ] -66.7 MRshow 0.500 UL LTb -900 2600 M +780 2600 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 2600 M +0.00 0.00 0.00 C 660 2600 M [ [({}) 200.0 0.0 true true 0 (600)] ] -66.7 MRshow 0.500 UL LTb -900 3333 M +780 3333 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 3333 M +0.00 0.00 0.00 C 660 3333 M [ [({}) 200.0 0.0 true true 0 (800)] ] -66.7 MRshow 0.500 UL LTb -900 4066 M +780 4066 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 4066 M +0.00 0.00 0.00 C 660 4066 M [ [({}) 200.0 0.0 true true 0 (1000)] ] -66.7 MRshow 0.500 UL LTb -900 4799 M +780 4799 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 4799 M +0.00 0.00 0.00 C 660 4799 M [ [({}) 200.0 0.0 true true 0 (1200)] ] -66.7 MRshow 0.500 UL LTb -900 400 M +780 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 900 200 M +0.00 0.00 0.00 C 780 200 M [ [({}) 200.0 0.0 true true 0 (-6)] ] -66.7 MCshow 0.500 UL LTb -2100 400 M +1992 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 2100 200 M +0.00 0.00 0.00 C 1992 200 M [ [({}) 200.0 0.0 true true 0 (-4)] ] -66.7 MCshow 0.500 UL LTb -3300 400 M +3204 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 3300 200 M +0.00 0.00 0.00 C 3204 200 M [ [({}) 200.0 0.0 true true 0 (-2)] ] -66.7 MCshow 0.500 UL LTb -4499 400 M +4415 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 4499 200 M +0.00 0.00 0.00 C 4415 200 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MCshow 0.500 UL LTb -5699 400 M +5627 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 5699 200 M +0.00 0.00 0.00 C 5627 200 M [ [({}) 200.0 0.0 true true 0 (2)] ] -66.7 MCshow 0.500 UL LTb -6899 400 M +6839 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6899 200 M +0.00 0.00 0.00 C 6839 200 M [ [({}) 200.0 0.0 true true 0 (4)] ] -66.7 MCshow 0.500 UL LTb 0.500 UL LTb -900 4799 N -900 400 L -5999 0 V +780 4799 N +780 400 L +6059 0 V 0 4399 V --5999 0 V +-6059 0 V Z stroke 1.000 UP 0.500 UL @@ -689,607 +696,603 @@ % Begin plot #1 1.000 UL LT0 -0.53 1.00 0.47 C gsave 2068 400 N 0 0 V 0 7 V 158 0 V 0 -7 V 1 PolyFill -2068 400 M -0 7 V -158 0 V -0 -7 V +0.53 1.00 0.47 C gsave 1777 400 N 0 0 V 0 4 V 166 0 V 0 -4 V 1 PolyFill +1777 400 M +0 4 V +166 0 V +0 -4 V % End plot #1 % Begin plot #2 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 2068 400 M -0 7 V -158 0 V -0 -7 V --158 0 V +0.00 0.00 0.00 C 1777 400 M +0 4 V +166 0 V +0 -4 V +-166 0 V % End plot #2 % Begin plot #3 stroke 1.000 UL LT2 -0.53 1.00 0.47 C gsave 2226 400 N 0 0 V 0 7 V 157 0 V 0 -7 V 1 PolyFill -2226 400 M -0 7 V -157 0 V -0 -7 V +0.53 1.00 0.47 C gsave 1943 400 N 0 0 V 0 0 V 165 0 V 0 0 V 1 PolyFill +1943 400 M +165 0 V % End plot #3 % Begin plot #4 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 2226 400 M -0 7 V -157 0 V -0 -7 V --157 0 V +0.00 0.00 0.00 C 1943 400 M +165 0 V +-165 0 V % End plot #4 % Begin plot #5 stroke 1.000 UL LT4 -0.53 1.00 0.47 C gsave 2383 400 N 0 0 V 0 15 V 158 0 V 0 -15 V 1 PolyFill -2383 400 M -0 15 V -158 0 V -0 -15 V +0.53 1.00 0.47 C gsave 2108 400 N 0 0 V 0 7 V 166 0 V 0 -7 V 1 PolyFill +2108 400 M +0 7 V +166 0 V +0 -7 V % End plot #5 % Begin plot #6 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 2383 400 M -0 15 V -158 0 V -0 -15 V --158 0 V +0.00 0.00 0.00 C 2108 400 M +0 7 V +166 0 V +0 -7 V +-166 0 V % End plot #6 % Begin plot #7 stroke 1.000 UL LT6 -0.53 1.00 0.47 C gsave 2541 400 N 0 0 V 0 18 V 158 0 V 0 -18 V 1 PolyFill -2541 400 M -0 18 V -158 0 V -0 -18 V +0.53 1.00 0.47 C gsave 2274 400 N 0 0 V 0 4 V 165 0 V 0 -4 V 1 PolyFill +2274 400 M +0 4 V +165 0 V +0 -4 V % End plot #7 % Begin plot #8 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 2541 400 M -0 18 V -158 0 V -0 -18 V --158 0 V +0.00 0.00 0.00 C 2274 400 M +0 4 V +165 0 V +0 -4 V +-165 0 V % End plot #8 % Begin plot #9 stroke 1.000 UL LT8 -0.53 1.00 0.47 C gsave 2699 400 N 0 0 V 0 55 V 157 0 V 0 -55 V 1 PolyFill -2699 400 M -0 55 V -157 0 V -0 -55 V +0.53 1.00 0.47 C gsave 2439 400 N 0 0 V 0 4 V 166 0 V 0 -4 V 1 PolyFill +2439 400 M +0 4 V +166 0 V +0 -4 V % End plot #9 % Begin plot #10 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 2699 400 M -0 55 V -157 0 V -0 -55 V --157 0 V +0.00 0.00 0.00 C 2439 400 M +0 4 V +166 0 V +0 -4 V +-166 0 V % End plot #10 % Begin plot #11 stroke 1.000 UL LT1 -0.53 1.00 0.47 C gsave 2856 400 N 0 0 V 0 139 V 158 0 V 0 -139 V 1 PolyFill -2856 400 M -0 139 V -158 0 V -0 -139 V +0.53 1.00 0.47 C gsave 2605 400 N 0 0 V 0 62 V 165 0 V 0 -62 V 1 PolyFill +2605 400 M +0 62 V +165 0 V +0 -62 V % End plot #11 % Begin plot #12 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 2856 400 M -0 139 V -158 0 V -0 -139 V --158 0 V +0.00 0.00 0.00 C 2605 400 M +0 62 V +165 0 V +0 -62 V +-165 0 V % End plot #12 % Begin plot #13 stroke 1.000 UL LT3 -0.53 1.00 0.47 C gsave 3014 400 N 0 0 V 0 264 V 157 0 V 0 -264 V 1 PolyFill -3014 400 M -0 264 V -157 0 V -0 -264 V +0.53 1.00 0.47 C gsave 2770 400 N 0 0 V 0 183 V 166 0 V 0 -183 V 1 PolyFill +2770 400 M +0 183 V +166 0 V +0 -183 V % End plot #13 % Begin plot #14 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 3014 400 M -0 264 V -157 0 V -0 -264 V --157 0 V +0.00 0.00 0.00 C 2770 400 M +0 183 V +166 0 V +0 -183 V +-166 0 V % End plot #14 % Begin plot #15 stroke 1.000 UL LT5 -0.53 1.00 0.47 C gsave 3171 400 N 0 0 V 0 436 V 158 0 V 0 -436 V 1 PolyFill -3171 400 M -0 436 V -158 0 V -0 -436 V +0.53 1.00 0.47 C gsave 2936 400 N 0 0 V 0 297 V 166 0 V 0 -297 V 1 PolyFill +2936 400 M +0 297 V +166 0 V +0 -297 V % End plot #15 % Begin plot #16 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 3171 400 M -0 436 V -158 0 V -0 -436 V --158 0 V +0.00 0.00 0.00 C 2936 400 M +0 297 V +166 0 V +0 -297 V +-166 0 V % End plot #16 % Begin plot #17 stroke 1.000 UL LT7 -0.53 1.00 0.47 C gsave 3329 400 N 0 0 V 0 730 V 158 0 V 0 -730 V 1 PolyFill -3329 400 M -0 730 V -158 0 V -0 -730 V +0.53 1.00 0.47 C gsave 3102 400 N 0 0 V 0 491 V 165 0 V 0 -491 V 1 PolyFill +3102 400 M +0 491 V +165 0 V +0 -491 V % End plot #17 % Begin plot #18 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 3329 400 M -0 730 V -158 0 V -0 -730 V --158 0 V +0.00 0.00 0.00 C 3102 400 M +0 491 V +165 0 V +0 -491 V +-165 0 V % End plot #18 % Begin plot #19 stroke 1.000 UL LT0 -0.53 1.00 0.47 C gsave 3487 400 N 0 0 V 0 1118 V 157 0 V 0 -1118 V 1 PolyFill -3487 400 M -0 1118 V -157 0 V -0 -1118 V +0.53 1.00 0.47 C gsave 3267 400 N 0 0 V 0 821 V 166 0 V 0 -821 V 1 PolyFill +3267 400 M +0 821 V +166 0 V +0 -821 V % End plot #19 % Begin plot #20 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 3487 400 M -0 1118 V -157 0 V -0 -1118 V --157 0 V +0.00 0.00 0.00 C 3267 400 M +0 821 V +166 0 V +0 -821 V +-166 0 V % End plot #20 % Begin plot #21 stroke 1.000 UL LT2 -0.53 1.00 0.47 C gsave 3644 400 N 0 0 V 0 1719 V 158 0 V 0 -1719 V 1 PolyFill -3644 400 M -0 1719 V -158 0 V -0 -1719 V +0.53 1.00 0.47 C gsave 3433 400 N 0 0 V 0 1345 V 165 0 V 0 -1345 V 1 PolyFill +3433 400 M +0 1345 V +165 0 V +0 -1345 V % End plot #21 % Begin plot #22 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 3644 400 M -0 1719 V -158 0 V -0 -1719 V --158 0 V +0.00 0.00 0.00 C 3433 400 M +0 1345 V +165 0 V +0 -1345 V +-165 0 V % End plot #22 % Begin plot #23 stroke 1.000 UL LT4 -0.53 1.00 0.47 C gsave 3802 400 N 0 0 V 0 2379 V 157 0 V 0 -2379 V 1 PolyFill -3802 400 M -0 2379 V -157 0 V -0 -2379 V +0.53 1.00 0.47 C gsave 3598 400 N 0 0 V 0 1914 V 166 0 V 0 -1914 V 1 PolyFill +3598 400 M +0 1914 V +166 0 V +0 -1914 V % End plot #23 % Begin plot #24 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 3802 400 M -0 2379 V -157 0 V -0 -2379 V --157 0 V +0.00 0.00 0.00 C 3598 400 M +0 1914 V +166 0 V +0 -1914 V +-166 0 V % End plot #24 % Begin plot #25 stroke 1.000 UL LT6 -0.53 1.00 0.47 C gsave 3959 400 N 0 0 V 0 2977 V 158 0 V 0 -2977 V 1 PolyFill -3959 400 M -0 2977 V -158 0 V -0 -2977 V +0.53 1.00 0.47 C gsave 3764 400 N 0 0 V 0 2566 V 165 0 V 0 -2566 V 1 PolyFill +3764 400 M +0 2566 V +165 0 V +0 -2566 V % End plot #25 % Begin plot #26 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 3959 400 M -0 2977 V -158 0 V -0 -2977 V --158 0 V +0.00 0.00 0.00 C 3764 400 M +0 2566 V +165 0 V +0 -2566 V +-165 0 V % End plot #26 % Begin plot #27 stroke 1.000 UL LT8 -0.53 1.00 0.47 C gsave 4117 400 N 0 0 V 0 3380 V 158 0 V 0 -3380 V 1 PolyFill -4117 400 M -0 3380 V -158 0 V -0 -3380 V +0.53 1.00 0.47 C gsave 3929 400 N 0 0 V 0 3336 V 166 0 V 0 -3336 V 1 PolyFill +3929 400 M +0 3336 V +166 0 V +0 -3336 V % End plot #27 % Begin plot #28 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 4117 400 M -0 3380 V -158 0 V -0 -3380 V --158 0 V +0.00 0.00 0.00 C 3929 400 M +0 3336 V +166 0 V +0 -3336 V +-166 0 V % End plot #28 % Begin plot #29 stroke 1.000 UL LT1 -0.53 1.00 0.47 C gsave 4275 400 N 0 0 V 0 3702 V 157 0 V 0 -3702 V 1 PolyFill -4275 400 M -0 3702 V -157 0 V -0 -3702 V +0.53 1.00 0.47 C gsave 4095 400 N 0 0 V 0 3889 V 165 0 V 0 -3889 V 1 PolyFill +4095 400 M +0 3889 V +165 0 V +0 -3889 V % End plot #29 % Begin plot #30 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 4275 400 M -0 3702 V -157 0 V -0 -3702 V --157 0 V +0.00 0.00 0.00 C 4095 400 M +0 3889 V +165 0 V +0 -3889 V +-165 0 V % End plot #30 % Begin plot #31 stroke 1.000 UL LT3 -0.53 1.00 0.47 C gsave 4432 400 N 0 0 V 0 3853 V 158 0 V 0 -3853 V 1 PolyFill -4432 400 M -0 3853 V -158 0 V -0 -3853 V +0.53 1.00 0.47 C gsave 4260 400 N 0 0 V 0 3904 V 166 0 V 0 -3904 V 1 PolyFill +4260 400 M +0 3904 V +166 0 V +0 -3904 V % End plot #31 % Begin plot #32 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 4432 400 M -0 3853 V -158 0 V -0 -3853 V --158 0 V +0.00 0.00 0.00 C 4260 400 M +0 3904 V +166 0 V +0 -3904 V +-166 0 V % End plot #32 % Begin plot #33 stroke 1.000 UL LT5 -0.53 1.00 0.47 C gsave 4590 400 N 0 0 V 0 3860 V 158 0 V 0 -3860 V 1 PolyFill -4590 400 M -0 3860 V -158 0 V -0 -3860 V +0.53 1.00 0.47 C gsave 4426 400 N 0 0 V 0 3878 V 165 0 V 0 -3878 V 1 PolyFill +4426 400 M +0 3878 V +165 0 V +0 -3878 V % End plot #33 % Begin plot #34 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 4590 400 M -0 3860 V -158 0 V -0 -3860 V --158 0 V +0.00 0.00 0.00 C 4426 400 M +0 3878 V +165 0 V +0 -3878 V +-165 0 V % End plot #34 % Begin plot #35 stroke 1.000 UL LT7 -0.53 1.00 0.47 C gsave 4748 400 N 0 0 V 0 3167 V 157 0 V 0 -3167 V 1 PolyFill -4748 400 M -0 3167 V -157 0 V -0 -3167 V +0.53 1.00 0.47 C gsave 4591 400 N 0 0 V 0 3516 V 166 0 V 0 -3516 V 1 PolyFill +4591 400 M +0 3516 V +166 0 V +0 -3516 V % End plot #35 % Begin plot #36 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 4748 400 M -0 3167 V -157 0 V -0 -3167 V --157 0 V +0.00 0.00 0.00 C 4591 400 M +0 3516 V +166 0 V +0 -3516 V +-166 0 V % End plot #36 % Begin plot #37 stroke 1.000 UL LT0 -0.53 1.00 0.47 C gsave 4905 400 N 0 0 V 0 2698 V 158 0 V 0 -2698 V 1 PolyFill -4905 400 M -0 2698 V -158 0 V -0 -2698 V +0.53 1.00 0.47 C gsave 4757 400 N 0 0 V 0 3105 V 165 0 V 0 -3105 V 1 PolyFill +4757 400 M +0 3105 V +165 0 V +0 -3105 V % End plot #37 % Begin plot #38 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 4905 400 M -0 2698 V -158 0 V -0 -2698 V --158 0 V +0.00 0.00 0.00 C 4757 400 M +0 3105 V +165 0 V +0 -3105 V +-165 0 V % End plot #38 % Begin plot #39 stroke 1.000 UL LT2 -0.53 1.00 0.47 C gsave 5063 400 N 0 0 V 0 2112 V 157 0 V 0 -2112 V 1 PolyFill -5063 400 M -0 2112 V -157 0 V -0 -2112 V +0.53 1.00 0.47 C gsave 4922 400 N 0 0 V 0 2493 V 166 0 V 0 -2493 V 1 PolyFill +4922 400 M +0 2493 V +166 0 V +0 -2493 V % End plot #39 % Begin plot #40 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 5063 400 M -0 2112 V -157 0 V -0 -2112 V --157 0 V +0.00 0.00 0.00 C 4922 400 M +0 2493 V +166 0 V +0 -2493 V +-166 0 V % End plot #40 % Begin plot #41 stroke 1.000 UL LT4 -0.53 1.00 0.47 C gsave 5220 400 N 0 0 V 0 1437 V 158 0 V 0 -1437 V 1 PolyFill -5220 400 M -0 1437 V -158 0 V -0 -1437 V +0.53 1.00 0.47 C gsave 5088 400 N 0 0 V 0 1947 V 165 0 V 0 -1947 V 1 PolyFill +5088 400 M +0 1947 V +165 0 V +0 -1947 V % End plot #41 % Begin plot #42 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 5220 400 M -0 1437 V -158 0 V -0 -1437 V --158 0 V +0.00 0.00 0.00 C 5088 400 M +0 1947 V +165 0 V +0 -1947 V +-165 0 V % End plot #42 % Begin plot #43 stroke 1.000 UL LT6 -0.53 1.00 0.47 C gsave 5378 400 N 0 0 V 0 1059 V 158 0 V 0 -1059 V 1 PolyFill -5378 400 M -0 1059 V -158 0 V -0 -1059 V +0.53 1.00 0.47 C gsave 5253 400 N 0 0 V 0 1188 V 166 0 V 0 -1188 V 1 PolyFill +5253 400 M +0 1188 V +166 0 V +0 -1188 V % End plot #43 % Begin plot #44 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 5378 400 M -0 1059 V -158 0 V -0 -1059 V --158 0 V +0.00 0.00 0.00 C 5253 400 M +0 1188 V +166 0 V +0 -1188 V +-166 0 V % End plot #44 % Begin plot #45 stroke 1.000 UL LT8 -0.53 1.00 0.47 C gsave 5536 400 N 0 0 V 0 649 V 157 0 V 0 -649 V 1 PolyFill -5536 400 M -0 649 V -157 0 V -0 -649 V +0.53 1.00 0.47 C gsave 5419 400 N 0 0 V 0 828 V 166 0 V 0 -828 V 1 PolyFill +5419 400 M +0 828 V +166 0 V +0 -828 V % End plot #45 % Begin plot #46 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 5536 400 M -0 649 V -157 0 V -0 -649 V --157 0 V +0.00 0.00 0.00 C 5419 400 M +0 828 V +166 0 V +0 -828 V +-166 0 V % End plot #46 % Begin plot #47 stroke 1.000 UL LT1 -0.53 1.00 0.47 C gsave 5693 400 N 0 0 V 0 436 V 158 0 V 0 -436 V 1 PolyFill -5693 400 M -0 436 V -158 0 V -0 -436 V +0.53 1.00 0.47 C gsave 5585 400 N 0 0 V 0 429 V 165 0 V 0 -429 V 1 PolyFill +5585 400 M +0 429 V +165 0 V +0 -429 V % End plot #47 % Begin plot #48 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 5693 400 M -0 436 V -158 0 V -0 -436 V --158 0 V +0.00 0.00 0.00 C 5585 400 M +0 429 V +165 0 V +0 -429 V +-165 0 V % End plot #48 % Begin plot #49 stroke 1.000 UL LT3 -0.53 1.00 0.47 C gsave 5851 400 N 0 0 V 0 260 V 157 0 V 0 -260 V 1 PolyFill -5851 400 M +0.53 1.00 0.47 C gsave 5750 400 N 0 0 V 0 260 V 166 0 V 0 -260 V 1 PolyFill +5750 400 M 0 260 V -157 0 V +166 0 V 0 -260 V % End plot #49 % Begin plot #50 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 5851 400 M +0.00 0.00 0.00 C 5750 400 M 0 260 V -157 0 V +166 0 V 0 -260 V --157 0 V +-166 0 V % End plot #50 % Begin plot #51 stroke 1.000 UL LT5 -0.53 1.00 0.47 C gsave 6008 400 N 0 0 V 0 106 V 158 0 V 0 -106 V 1 PolyFill -6008 400 M -0 106 V -158 0 V -0 -106 V +0.53 1.00 0.47 C gsave 5916 400 N 0 0 V 0 99 V 165 0 V 0 -99 V 1 PolyFill +5916 400 M +0 99 V +165 0 V +0 -99 V % End plot #51 % Begin plot #52 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 6008 400 M -0 106 V -158 0 V -0 -106 V --158 0 V +0.00 0.00 0.00 C 5916 400 M +0 99 V +165 0 V +0 -99 V +-165 0 V % End plot #52 % Begin plot #53 stroke 1.000 UL LT7 -0.53 1.00 0.47 C gsave 6166 400 N 0 0 V 0 37 V 158 0 V 0 -37 V 1 PolyFill -6166 400 M -0 37 V -158 0 V -0 -37 V +0.53 1.00 0.47 C gsave 6081 400 N 0 0 V 0 55 V 166 0 V 0 -55 V 1 PolyFill +6081 400 M +0 55 V +166 0 V +0 -55 V % End plot #53 % Begin plot #54 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 6166 400 M -0 37 V -158 0 V -0 -37 V --158 0 V +0.00 0.00 0.00 C 6081 400 M +0 55 V +166 0 V +0 -55 V +-166 0 V % End plot #54 % Begin plot #55 stroke 1.000 UL LT0 -0.53 1.00 0.47 C gsave 6324 400 N 0 0 V 0 18 V 157 0 V 0 -18 V 1 PolyFill -6324 400 M -0 18 V -157 0 V -0 -18 V +0.53 1.00 0.47 C gsave 6247 400 N 0 0 V 0 15 V 165 0 V 0 -15 V 1 PolyFill +6247 400 M +0 15 V +165 0 V +0 -15 V % End plot #55 % Begin plot #56 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 6324 400 M -0 18 V -157 0 V -0 -18 V --157 0 V +0.00 0.00 0.00 C 6247 400 M +0 15 V +165 0 V +0 -15 V +-165 0 V % End plot #56 % Begin plot #57 stroke 1.000 UL LT2 -0.53 1.00 0.47 C gsave 6481 400 N 0 0 V 0 15 V 158 0 V 0 -15 V 1 PolyFill -6481 400 M -0 15 V -158 0 V -0 -15 V +0.53 1.00 0.47 C gsave 6412 400 N 0 0 V 0 11 V 166 0 V 0 -11 V 1 PolyFill +6412 400 M +0 11 V +166 0 V +0 -11 V % End plot #57 % Begin plot #58 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 6481 400 M -0 15 V -158 0 V -0 -15 V --158 0 V +0.00 0.00 0.00 C 6412 400 M +0 11 V +166 0 V +0 -11 V +-166 0 V % End plot #58 % Begin plot #59 stroke 1.000 UL LT4 -0.53 1.00 0.47 C gsave 6639 400 N 0 0 V 0 4 V 157 0 V 0 -4 V 1 PolyFill -6639 400 M -0 4 V -157 0 V -0 -4 V +0.53 1.00 0.47 C gsave 6578 400 N 0 0 V 0 7 V 165 0 V 0 -7 V 1 PolyFill +6578 400 M +0 7 V +165 0 V +0 -7 V % End plot #59 % Begin plot #60 stroke 0.500 UL LT0 -0.00 0.00 0.00 C 6639 400 M -0 4 V -157 0 V -0 -4 V --157 0 V +0.00 0.00 0.00 C 6578 400 M +0 7 V +165 0 V +0 -7 V +-165 0 V % End plot #60 % Begin plot #61 stroke LT0 -0.00 0.00 0.00 C 900 400 M -5999 0 V +0.00 0.00 0.00 C 780 400 M +6059 0 V % End plot #61 1.000 UP stroke Binary files octave-3.6.1/doc/interpreter/hist.pdf and octave-3.6.2/doc/interpreter/hist.pdf differ Binary files octave-3.6.1/doc/interpreter/hist.png and octave-3.6.2/doc/interpreter/hist.png differ diff -uNr octave-3.6.1/doc/interpreter/inpolygon.eps octave-3.6.2/doc/interpreter/inpolygon.eps --- octave-3.6.1/doc/interpreter/inpolygon.eps 2012-02-22 15:01:40.000000000 -0500 +++ octave-3.6.2/doc/interpreter/inpolygon.eps 2012-05-31 11:40:46.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: inpolygon.eps -%%Creator: gnuplot 4.4 patchlevel 0 -%%CreationDate: Wed Feb 22 15:01:40 2012 +%%Creator: gnuplot 4.6 patchlevel 0 +%%CreationDate: Thu May 31 11:40:46 2012 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments @@ -20,10 +20,12 @@ /Level1 false def /Rounded false def /ClipToBoundingBox false def +/SuppressPDFMark false def /TransparentPatterns false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /Gamma 1.0 def +/BackgroundColor {-1.000 -1.000 -1.000} def % /vshift -66 def /dl1 { @@ -38,22 +40,6 @@ /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def -Level1 {} { -/SDict 10 dict def -systemdict /pdfmark known not { - userdict /pdfmark systemdict /cleartomark get put -} if -SDict begin [ - /Title (inpolygon.eps) - /Subject (gnuplot plot) - /Creator (gnuplot 4.4 patchlevel 0) - /Author (jwe) -% /Producer (gnuplot) -% /Keywords () - /CreationDate (Wed Feb 22 15:01:40 2012) - /DOCINFO pdfmark -end -} ifelse /doclip { ClipToBoundingBox { newpath 50 50 moveto 410 50 lineto 410 302 lineto 50 302 lineto closepath @@ -61,7 +47,7 @@ } if } def % -% Gnuplot Prolog Version 4.4 (January 2010) +% Gnuplot Prolog Version 4.4 (August 2010) % %/SuppressPDFMark true def % @@ -73,6 +59,7 @@ /Z {closepath} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def +/g {setgray} bind def /Gshow {show} def % May be redefined later in the file to support UTF-8 /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def @@ -94,6 +81,7 @@ dup 1 lt {pop 1} if 10 mul /udl exch def} def /PL {stroke userlinewidth setlinewidth Rounded {1 setlinejoin 1 setlinecap} if} def +3.8 setmiterlimit % Default Line colors /LCw {1 1 1} def /LCb {0 0 0} def @@ -459,8 +447,26 @@ Blacktext {gsave 0 setgray MFshow grestore} {MFshow} ifelse } bind def /XYsave { [( ) 1 2 true false 3 ()] } bind def /XYrestore { [( ) 1 2 true false 4 ()] } bind def +Level1 SuppressPDFMark or +{} { +/SDict 10 dict def +systemdict /pdfmark known not { + userdict /pdfmark systemdict /cleartomark get put +} if +SDict begin [ + /Title (inpolygon.eps) + /Subject (gnuplot plot) + /Creator (gnuplot 4.6 patchlevel 0) + /Author (jwe) +% /Producer (gnuplot) +% /Keywords () + /CreationDate (Thu May 31 11:40:46 2012) + /DOCINFO pdfmark +end +} ifelse end %%EndProlog +%%Page: 1 1 gnudict begin gsave doclip @@ -469,6 +475,7 @@ 0 setgray newpath (Helvetica) findfont 200 scalefont setfont +BackgroundColor 0 lt 3 1 roll 0 lt exch 0 lt or or not {BackgroundColor C 1.000 0 0 7200.00 5040.00 BoxColFill} if gsave % colour palette begin /maxcolors 64 def /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray @@ -545,193 +552,193 @@ } ifelse 0.500 UL LTb -900 400 M +780 400 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 400 M +0.00 0.00 0.00 C 660 400 M [ [({}) 200.0 0.0 true true 0 (-2)] ] -66.7 MRshow 0.500 UL LTb -900 950 M +780 950 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 950 M +0.00 0.00 0.00 C 660 950 M [ [({}) 200.0 0.0 true true 0 (-1.5)] ] -66.7 MRshow 0.500 UL LTb -900 1500 M +780 1500 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 1500 M +0.00 0.00 0.00 C 660 1500 M [ [({}) 200.0 0.0 true true 0 (-1)] ] -66.7 MRshow 0.500 UL LTb -900 2050 M +780 2050 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 2050 M +0.00 0.00 0.00 C 660 2050 M [ [({}) 200.0 0.0 true true 0 (-0.5)] ] -66.7 MRshow 0.500 UL LTb -900 2600 M +780 2600 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 2600 M +0.00 0.00 0.00 C 660 2600 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MRshow 0.500 UL LTb -900 3149 M +780 3149 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 3149 M +0.00 0.00 0.00 C 660 3149 M [ [({}) 200.0 0.0 true true 0 (0.5)] ] -66.7 MRshow 0.500 UL LTb -900 3699 M +780 3699 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 3699 M +0.00 0.00 0.00 C 660 3699 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MRshow 0.500 UL LTb -900 4249 M +780 4249 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 4249 M +0.00 0.00 0.00 C 660 4249 M [ [({}) 200.0 0.0 true true 0 (1.5)] ] -66.7 MRshow 0.500 UL LTb -900 4799 M +780 4799 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 4799 M +0.00 0.00 0.00 C 660 4799 M [ [({}) 200.0 0.0 true true 0 (2)] ] -66.7 MRshow 0.500 UL LTb -900 400 M +780 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 900 200 M +0.00 0.00 0.00 C 780 200 M [ [({}) 200.0 0.0 true true 0 (-2)] ] -66.7 MCshow 0.500 UL LTb -1650 400 M +1537 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 1650 200 M +0.00 0.00 0.00 C 1537 200 M [ [({}) 200.0 0.0 true true 0 (-1.5)] ] -66.7 MCshow 0.500 UL LTb -2400 400 M +2295 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 2400 200 M +0.00 0.00 0.00 C 2295 200 M [ [({}) 200.0 0.0 true true 0 (-1)] ] -66.7 MCshow 0.500 UL LTb -3150 400 M +3052 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 3150 200 M +0.00 0.00 0.00 C 3052 200 M [ [({}) 200.0 0.0 true true 0 (-0.5)] ] -66.7 MCshow 0.500 UL LTb -3900 400 M +3810 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 3900 200 M +0.00 0.00 0.00 C 3810 200 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MCshow 0.500 UL LTb -4649 400 M +4567 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 4649 200 M +0.00 0.00 0.00 C 4567 200 M [ [({}) 200.0 0.0 true true 0 (0.5)] ] -66.7 MCshow 0.500 UL LTb -5399 400 M +5324 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 5399 200 M +0.00 0.00 0.00 C 5324 200 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MCshow 0.500 UL LTb -6149 400 M +6082 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6149 200 M +0.00 0.00 0.00 C 6082 200 M [ [({}) 200.0 0.0 true true 0 (1.5)] ] -66.7 MCshow 0.500 UL LTb -6899 400 M +6839 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6899 200 M +0.00 0.00 0.00 C 6839 200 M [ [({}) 200.0 0.0 true true 0 (2)] ] -66.7 MCshow 0.500 UL LTb 0.500 UL LTb -900 4799 N -900 400 L -5999 0 V +780 4799 N +780 400 L +6059 0 V 0 4399 V --5999 0 V +-6059 0 V Z stroke 1.000 UP 0.500 UL @@ -739,128 +746,128 @@ % Begin plot #1 0.500 UL LT0 -0.00 0.00 1.00 C 2400 2599 M -73 -339 V -213 -307 V -332 -243 V -418 -156 V -464 -54 V -463 54 V -418 156 V -332 243 V -213 307 V -73 340 V --73 339 V --213 307 V --332 243 V --418 156 V --463 54 V --464 -54 V -3018 3489 L -2686 3246 L -2473 2939 L --73 -339 V +0.00 0.00 1.00 C 2295 2599 M +74 -339 V +215 -307 V +335 -243 V +422 -156 V +469 -54 V +468 54 V +422 156 V +335 243 V +215 307 V +74 340 V +-74 339 V +-215 307 V +-335 243 V +-422 156 V +-468 54 V +-469 -54 V +2919 3489 L +2584 3246 L +2369 2939 L +-74 -339 V % End plot #1 % Begin plot #2 2.000 UP stroke LT1 -1.00 0.00 0.00 C 3203 2806 Pls -4252 2632 Pls -2875 2941 Pls -2659 2292 Pls -2702 2118 Pls -3511 1650 Pls -3600 2521 Pls -4092 2148 Pls -3103 3103 Pls -2879 2438 Pls -5080 2559 Pls -3846 2851 Pls -2467 2744 Pls -5106 2756 Pls -2820 2727 Pls -4271 2600 Pls -4407 3224 Pls -4243 2139 Pls -4406 1878 Pls -3472 3045 Pls -3862 3315 Pls -4429 2250 Pls -4412 2840 Pls -3687 2829 Pls -3322 2756 Pls -4086 3605 Pls -5222 2266 Pls -5202 3112 Pls -4213 3002 Pls -3913 1826 Pls +1.00 0.00 0.00 C 3106 2806 Pls +4166 2632 Pls +2774 2941 Pls +2557 2292 Pls +2600 2118 Pls +3417 1650 Pls +3507 2521 Pls +4004 2148 Pls +3005 3103 Pls +2779 2438 Pls +5001 2559 Pls +3755 2851 Pls +2363 2744 Pls +5028 2756 Pls +2719 2727 Pls +4184 2600 Pls +4322 3224 Pls +4157 2139 Pls +4322 1878 Pls +3377 3045 Pls +3772 3315 Pls +4345 2250 Pls +4327 2840 Pls +3595 2829 Pls +3226 2756 Pls +3998 3605 Pls +5145 2266 Pls +5125 3112 Pls +4126 3002 Pls +3823 1826 Pls % End plot #2 % Begin plot #3 2.000 UP 0.500 UL LT2 -0.00 0.00 1.00 C 1474 3791 Circle -1020 848 Circle -5025 4348 Circle -4239 4213 Circle -1653 3480 Circle -5529 2790 Circle -1736 3049 Circle -3349 1401 Circle -6148 578 Circle -3293 1279 Circle -4142 952 Circle -5616 3115 Circle -4848 3468 Circle -2949 1603 Circle -4283 3798 Circle -4502 4070 Circle -5554 3493 Circle -5973 2964 Circle -4963 1557 Circle -1955 1591 Circle -5255 3398 Circle -4970 1547 Circle -4535 4201 Circle -5560 3045 Circle -1560 1484 Circle -5673 4717 Circle -6834 3091 Circle -4647 3594 Circle -6304 2664 Circle -2493 3559 Circle -1543 3332 Circle -2422 2410 Circle -5978 1659 Circle -5528 3215 Circle -2634 1688 Circle -5381 1591 Circle -4343 798 Circle -3998 491 Circle -5566 3027 Circle -5106 1748 Circle -3333 688 Circle -2189 2419 Circle -5722 3142 Circle -1382 2203 Circle -5178 3177 Circle -5442 2642 Circle -5792 3194 Circle -4801 4136 Circle -5756 3344 Circle -2582 1624 Circle -4273 1406 Circle -6210 1862 Circle -5230 3161 Circle -1714 4716 Circle -5141 1733 Circle -3507 472 Circle -5204 1291 Circle -2892 3578 Circle -5528 1861 Circle -3440 964 Circle -3026 4398 Circle +0.00 0.00 1.00 C 1360 3791 Circle +901 848 Circle +4946 4348 Circle +4152 4213 Circle +1540 3480 Circle +5455 2790 Circle +1625 3049 Circle +3254 1401 Circle +6081 578 Circle +3197 1279 Circle +4054 952 Circle +5543 3115 Circle +4768 3468 Circle +2849 1603 Circle +4196 3798 Circle +4418 4070 Circle +5481 3493 Circle +5903 2964 Circle +4883 1557 Circle +1846 1591 Circle +5178 3398 Circle +4890 1547 Circle +4452 4201 Circle +5486 3045 Circle +1446 1484 Circle +5601 4717 Circle +6773 3091 Circle +4565 3594 Circle +6238 2664 Circle +2389 3559 Circle +1429 3332 Circle +2317 2410 Circle +5908 1659 Circle +5455 3215 Circle +2531 1688 Circle +5306 1591 Circle +4258 798 Circle +3909 491 Circle +5493 3027 Circle +5028 1748 Circle +3237 688 Circle +2082 2419 Circle +5650 3142 Circle +1267 2203 Circle +5101 3177 Circle +5367 2642 Circle +5721 3194 Circle +4720 4136 Circle +5685 3344 Circle +2479 1624 Circle +4187 1406 Circle +6143 1862 Circle +5153 3161 Circle +1602 4716 Circle +5063 1733 Circle +3413 472 Circle +5127 1291 Circle +2792 3578 Circle +5454 1861 Circle +3346 964 Circle +2927 4398 Circle % End plot #3 1.000 UP 0.500 UL Binary files octave-3.6.1/doc/interpreter/inpolygon.pdf and octave-3.6.2/doc/interpreter/inpolygon.pdf differ Binary files octave-3.6.1/doc/interpreter/inpolygon.png and octave-3.6.2/doc/interpreter/inpolygon.png differ diff -uNr octave-3.6.1/doc/interpreter/install.texi octave-3.6.2/doc/interpreter/install.texi --- octave-3.6.1/doc/interpreter/install.texi 2012-02-22 14:56:01.000000000 -0500 +++ octave-3.6.2/doc/interpreter/install.texi 2012-05-31 11:40:35.000000000 -0400 @@ -67,16 +67,19 @@ yourself. @menu -* Tips for Specific Systems:: +* Obtaining the Depencies Automatically:: * Build Tools:: * External Packages:: @end menu -@node Tips for Specific Systems -@subsection Tips for Specific Systems +@node Obtaining the Depencies Automatically +@subsection Obtaining the Depencies Automatically -The names of pre-compiled packages vary by system and do not always -match exactly the names listed above. +On some systems you can obtain many of Octave's build dependencies +automatically. The commands for doing this vary by system. Similarly, +the names of pre-compiled packages vary by system and do not always +match exactly the names listed in @ref{Build Tools} and @ref{External +Packages}. You will usually need the development version of an external dependency so that you get the libraries and header files for building software, diff -uNr octave-3.6.1/doc/interpreter/install.txi octave-3.6.2/doc/interpreter/install.txi --- octave-3.6.1/doc/interpreter/install.txi 2012-02-22 14:34:53.000000000 -0500 +++ octave-3.6.2/doc/interpreter/install.txi 2012-05-30 21:43:28.000000000 -0400 @@ -65,16 +65,19 @@ yourself. @menu -* Tips for Specific Systems:: +* Obtaining the Depencies Automatically:: * Build Tools:: * External Packages:: @end menu -@node Tips for Specific Systems -@subsection Tips for Specific Systems +@node Obtaining the Depencies Automatically +@subsection Obtaining the Depencies Automatically -The names of pre-compiled packages vary by system and do not always -match exactly the names listed above. +On some systems you can obtain many of Octave's build dependencies +automatically. The commands for doing this vary by system. Similarly, +the names of pre-compiled packages vary by system and do not always +match exactly the names listed in @ref{Build Tools} and @ref{External +Packages}. You will usually need the development version of an external dependency so that you get the libraries and header files for building software, diff -uNr octave-3.6.1/doc/interpreter/interpderiv1.eps octave-3.6.2/doc/interpreter/interpderiv1.eps --- octave-3.6.1/doc/interpreter/interpderiv1.eps 2012-02-22 15:01:42.000000000 -0500 +++ octave-3.6.2/doc/interpreter/interpderiv1.eps 2012-05-31 11:40:49.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: interpderiv1.eps -%%Creator: gnuplot 4.4 patchlevel 0 -%%CreationDate: Wed Feb 22 15:01:42 2012 +%%Creator: gnuplot 4.6 patchlevel 0 +%%CreationDate: Thu May 31 11:40:49 2012 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments @@ -20,10 +20,12 @@ /Level1 false def /Rounded false def /ClipToBoundingBox false def +/SuppressPDFMark false def /TransparentPatterns false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /Gamma 1.0 def +/BackgroundColor {-1.000 -1.000 -1.000} def % /vshift -66 def /dl1 { @@ -38,22 +40,6 @@ /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def -Level1 {} { -/SDict 10 dict def -systemdict /pdfmark known not { - userdict /pdfmark systemdict /cleartomark get put -} if -SDict begin [ - /Title (interpderiv1.eps) - /Subject (gnuplot plot) - /Creator (gnuplot 4.4 patchlevel 0) - /Author (jwe) -% /Producer (gnuplot) -% /Keywords () - /CreationDate (Wed Feb 22 15:01:42 2012) - /DOCINFO pdfmark -end -} ifelse /doclip { ClipToBoundingBox { newpath 50 50 moveto 410 50 lineto 410 302 lineto 50 302 lineto closepath @@ -61,7 +47,7 @@ } if } def % -% Gnuplot Prolog Version 4.4 (January 2010) +% Gnuplot Prolog Version 4.4 (August 2010) % %/SuppressPDFMark true def % @@ -73,6 +59,7 @@ /Z {closepath} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def +/g {setgray} bind def /Gshow {show} def % May be redefined later in the file to support UTF-8 /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def @@ -94,6 +81,7 @@ dup 1 lt {pop 1} if 10 mul /udl exch def} def /PL {stroke userlinewidth setlinewidth Rounded {1 setlinejoin 1 setlinecap} if} def +3.8 setmiterlimit % Default Line colors /LCw {1 1 1} def /LCb {0 0 0} def @@ -459,8 +447,26 @@ Blacktext {gsave 0 setgray MFshow grestore} {MFshow} ifelse } bind def /XYsave { [( ) 1 2 true false 3 ()] } bind def /XYrestore { [( ) 1 2 true false 4 ()] } bind def +Level1 SuppressPDFMark or +{} { +/SDict 10 dict def +systemdict /pdfmark known not { + userdict /pdfmark systemdict /cleartomark get put +} if +SDict begin [ + /Title (interpderiv1.eps) + /Subject (gnuplot plot) + /Creator (gnuplot 4.6 patchlevel 0) + /Author (jwe) +% /Producer (gnuplot) +% /Keywords () + /CreationDate (Thu May 31 11:40:49 2012) + /DOCINFO pdfmark +end +} ifelse end %%EndProlog +%%Page: 1 1 gnudict begin gsave doclip @@ -469,6 +475,7 @@ 0 setgray newpath (Helvetica) findfont 200 scalefont setfont +BackgroundColor 0 lt 3 1 roll 0 lt exch 0 lt or or not {BackgroundColor C 1.000 0 0 7200.00 5040.00 BoxColFill} if gsave % colour palette begin /maxcolors 64 def /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray @@ -545,173 +552,173 @@ } ifelse 0.500 UL LTb -900 400 M +780 400 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 400 M +0.00 0.00 0.00 C 660 400 M [ [({}) 200.0 0.0 true true 0 (-1.5)] ] -66.7 MRshow 0.500 UL LTb -900 1133 M +780 1133 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 1133 M +0.00 0.00 0.00 C 660 1133 M [ [({}) 200.0 0.0 true true 0 (-1)] ] -66.7 MRshow 0.500 UL LTb -900 1866 M +780 1866 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 1866 M +0.00 0.00 0.00 C 660 1866 M [ [({}) 200.0 0.0 true true 0 (-0.5)] ] -66.7 MRshow 0.500 UL LTb -900 2600 M +780 2600 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 2600 M +0.00 0.00 0.00 C 660 2600 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MRshow 0.500 UL LTb -900 3333 M +780 3333 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 3333 M +0.00 0.00 0.00 C 660 3333 M [ [({}) 200.0 0.0 true true 0 (0.5)] ] -66.7 MRshow 0.500 UL LTb -900 4066 M +780 4066 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 4066 M +0.00 0.00 0.00 C 660 4066 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MRshow 0.500 UL LTb -900 4799 M +780 4799 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 4799 M +0.00 0.00 0.00 C 660 4799 M [ [({}) 200.0 0.0 true true 0 (1.5)] ] -66.7 MRshow 0.500 UL LTb -900 400 M +780 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 900 200 M +0.00 0.00 0.00 C 780 200 M [ [({}) 200.0 0.0 true true 0 (-2)] ] -66.7 MCshow 0.500 UL LTb -1650 400 M +1537 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 1650 200 M +0.00 0.00 0.00 C 1537 200 M [ [({}) 200.0 0.0 true true 0 (-1.5)] ] -66.7 MCshow 0.500 UL LTb -2400 400 M +2295 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 2400 200 M +0.00 0.00 0.00 C 2295 200 M [ [({}) 200.0 0.0 true true 0 (-1)] ] -66.7 MCshow 0.500 UL LTb -3150 400 M +3052 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 3150 200 M +0.00 0.00 0.00 C 3052 200 M [ [({}) 200.0 0.0 true true 0 (-0.5)] ] -66.7 MCshow 0.500 UL LTb -3900 400 M +3810 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 3900 200 M +0.00 0.00 0.00 C 3810 200 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MCshow 0.500 UL LTb -4649 400 M +4567 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 4649 200 M +0.00 0.00 0.00 C 4567 200 M [ [({}) 200.0 0.0 true true 0 (0.5)] ] -66.7 MCshow 0.500 UL LTb -5399 400 M +5324 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 5399 200 M +0.00 0.00 0.00 C 5324 200 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MCshow 0.500 UL LTb -6149 400 M +6082 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6149 200 M +0.00 0.00 0.00 C 6082 200 M [ [({}) 200.0 0.0 true true 0 (1.5)] ] -66.7 MCshow 0.500 UL LTb -6899 400 M +6839 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6899 200 M +0.00 0.00 0.00 C 6839 200 M [ [({}) 200.0 0.0 true true 0 (2)] ] -66.7 MCshow 0.500 UL LTb 0.500 UL LTb -900 4799 N -900 400 L -5999 0 V +780 4799 N +780 400 L +6059 0 V 0 4399 V --5999 0 V +-6059 0 V Z stroke 1.000 UP 0.500 UL @@ -720,347 +727,347 @@ 0.500 UL LT0 1.00 0.00 0.00 C LCb setrgbcolor -5996 763 M +5936 763 M [ [({}) 200.0 0.0 true true 0 (spline)] ] -66.7 MRshow LT0 -1.00 0.00 0.00 C 6116 763 M +1.00 0.00 0.00 C 6056 763 M 543 0 V -900 1133 M -37 -29 V +780 1133 M +38 -29 V 38 -28 V -37 -26 V -38 -25 V -37 -22 V +38 -26 V +37 -25 V +38 -22 V 38 -21 V -37 -19 V +38 -19 V 38 -18 V -37 -15 V +38 -15 V 38 -14 V -37 -13 V -38 -11 V -37 -9 V +38 -13 V +37 -11 V +38 -9 V 38 -8 V -37 -7 V +38 -7 V 38 -5 V -37 -3 V +38 -3 V 38 -2 V -37 -1 V -38 1 V -37 2 V +38 -1 V +37 1 V +38 2 V 38 4 V -37 5 V +38 5 V 38 6 V -37 8 V +38 8 V 38 8 V 37 10 V 38 11 V -37 13 V 38 13 V -37 15 V +38 13 V +38 15 V 38 16 V -37 17 V +38 17 V 38 18 V 37 19 V 38 20 V -37 21 V +38 21 V 38 22 V -37 23 V +38 23 V 38 24 V -37 25 V -38 26 V -37 27 V +38 25 V +37 26 V 38 27 V -37 28 V +38 27 V +38 28 V 38 29 V -37 30 V +38 30 V +38 31 V 38 31 V -37 31 V -38 33 V -37 32 V +37 33 V +38 32 V 38 34 V -37 34 V +38 34 V +38 35 V 38 35 V -37 35 V 38 36 V -37 36 V -38 37 V -37 38 V +38 36 V +37 37 V +38 38 V 38 38 V -37 38 V +38 38 V +38 39 V 38 39 V -37 39 V 38 40 V 37 40 V 38 40 V -37 41 V 38 41 V -37 41 V +38 41 V +38 41 V 38 42 V -37 41 V +38 41 V 38 42 V 37 42 V 38 43 V -37 42 V +38 42 V 38 43 V -37 42 V +38 42 V 38 43 V -37 43 V 38 43 V -37 42 V -37 43 V 38 43 V 37 42 V 38 43 V -37 42 V +38 43 V +38 42 V +38 43 V +38 42 V 38 43 V 37 42 V 38 42 V -37 41 V +38 41 V 38 42 V -37 41 V 38 41 V -37 41 V +38 41 V +38 41 V 38 40 V 37 40 V 38 40 V -37 39 V 38 39 V -37 38 V +38 39 V 38 38 V -37 38 V -stroke 4724 3500 M -38 37 V -37 36 V +38 38 V +38 38 V +stroke 4643 3500 M +37 37 V 38 36 V -37 35 V +38 36 V +38 35 V 38 35 V -37 34 V 38 34 V -37 32 V -38 33 V -37 31 V +38 34 V +38 32 V +37 33 V +38 31 V 38 31 V -37 30 V +38 30 V 38 29 V -37 28 V +38 28 V 38 27 V -37 27 V -38 26 V -37 25 V +38 27 V +37 26 V +38 25 V 38 24 V -37 23 V +38 23 V 38 22 V -37 21 V +38 21 V 38 20 V 37 19 V 38 18 V -37 17 V +38 17 V 38 16 V -37 15 V +38 15 V +38 13 V 38 13 V -37 13 V 38 11 V 37 10 V 38 8 V -37 8 V +38 8 V 38 6 V -37 5 V +38 5 V 38 4 V -37 2 V -38 1 V -37 -1 V +38 2 V +37 1 V +38 -1 V 38 -2 V -37 -3 V +38 -3 V 38 -5 V -37 -7 V +38 -7 V 38 -8 V -37 -9 V -38 -11 V -37 -13 V +38 -9 V +37 -11 V +38 -13 V 38 -14 V -37 -15 V +38 -15 V 38 -18 V -37 -19 V +38 -19 V 38 -21 V -37 -22 V -38 -25 V -37 -26 V +38 -22 V +37 -25 V +38 -26 V 38 -28 V -37 -29 V +38 -29 V % End plot #1 % Begin plot #2 stroke LT0 0.00 1.00 0.00 C LCb setrgbcolor -5996 563 M +5936 563 M [ [({}) 200.0 0.0 true true 0 (pchip)] ] -66.7 MRshow LT0 -0.00 1.00 0.00 C 6116 563 M +0.00 1.00 0.00 C 6056 563 M 543 0 V -900 1133 M -37 0 V +780 1133 M 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V 37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V 37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V 37 0 V 38 0 V +38 0 V +38 0 V +38 0 V +38 0 V +38 0 V 37 0 V 38 0 V +38 0 V +38 0 V +38 0 V +38 0 V +38 0 V +38 0 V 37 0 V 38 0 V -37 2 V -38 5 V -37 9 V +38 0 V +38 0 V +38 0 V +38 0 V +38 2 V +37 5 V +38 9 V 38 12 V -37 15 V +38 15 V 38 18 V -37 21 V +38 21 V 38 24 V -37 26 V -38 29 V -37 30 V +38 26 V +37 29 V +38 30 V 38 34 V -37 35 V +38 35 V 38 37 V -37 38 V +38 38 V 38 41 V -37 41 V -38 43 V -37 45 V +38 41 V +37 43 V +38 45 V 38 45 V -37 46 V +38 46 V 38 47 V -37 48 V +38 48 V 38 48 V 37 49 V 38 49 V -37 48 V +38 48 V 38 49 V -37 49 V +38 49 V +38 48 V 38 48 V -37 48 V 38 47 V 37 47 V 38 46 V -37 44 V 38 44 V -37 42 V +38 44 V +38 42 V 38 41 V -37 39 V +38 39 V 38 38 V 37 37 V -37 39 V +38 39 V 38 41 V -37 42 V +38 42 V +38 44 V 38 44 V -37 44 V 38 46 V 37 47 V 38 47 V -37 48 V 38 48 V -37 49 V +38 48 V 38 49 V -37 48 V +38 49 V +38 48 V 38 49 V 37 49 V 38 48 V -37 48 V +38 48 V 38 47 V -37 46 V +38 46 V 38 45 V -37 45 V -stroke 4724 3606 M -38 43 V -37 41 V +38 45 V +stroke 4643 3606 M +37 43 V 38 41 V -37 38 V +38 41 V +38 38 V 38 37 V -37 35 V +38 35 V 38 34 V -37 30 V -38 29 V -37 26 V +38 30 V +37 29 V +38 26 V 38 24 V -37 21 V +38 21 V 38 18 V -37 15 V +38 15 V 38 12 V -37 9 V -38 5 V -37 2 V +38 9 V +37 5 V +38 2 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V 37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V 37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V -37 0 V 38 0 V 37 0 V 38 0 V +38 0 V +38 0 V +38 0 V +38 0 V +38 0 V +38 0 V 37 0 V 38 0 V +38 0 V +38 0 V +38 0 V +38 0 V +38 0 V +38 0 V 37 0 V +38 0 V +38 0 V +38 0 V % End plot #2 1.000 UP stroke Binary files octave-3.6.1/doc/interpreter/interpderiv1.pdf and octave-3.6.2/doc/interpreter/interpderiv1.pdf differ Binary files octave-3.6.1/doc/interpreter/interpderiv1.png and octave-3.6.2/doc/interpreter/interpderiv1.png differ diff -uNr octave-3.6.1/doc/interpreter/interpderiv2.eps octave-3.6.2/doc/interpreter/interpderiv2.eps --- octave-3.6.1/doc/interpreter/interpderiv2.eps 2012-02-22 15:01:43.000000000 -0500 +++ octave-3.6.2/doc/interpreter/interpderiv2.eps 2012-05-31 11:40:50.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: interpderiv2.eps -%%Creator: gnuplot 4.4 patchlevel 0 -%%CreationDate: Wed Feb 22 15:01:43 2012 +%%Creator: gnuplot 4.6 patchlevel 0 +%%CreationDate: Thu May 31 11:40:50 2012 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments @@ -20,10 +20,12 @@ /Level1 false def /Rounded false def /ClipToBoundingBox false def +/SuppressPDFMark false def /TransparentPatterns false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /Gamma 1.0 def +/BackgroundColor {-1.000 -1.000 -1.000} def % /vshift -66 def /dl1 { @@ -38,22 +40,6 @@ /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def -Level1 {} { -/SDict 10 dict def -systemdict /pdfmark known not { - userdict /pdfmark systemdict /cleartomark get put -} if -SDict begin [ - /Title (interpderiv2.eps) - /Subject (gnuplot plot) - /Creator (gnuplot 4.4 patchlevel 0) - /Author (jwe) -% /Producer (gnuplot) -% /Keywords () - /CreationDate (Wed Feb 22 15:01:43 2012) - /DOCINFO pdfmark -end -} ifelse /doclip { ClipToBoundingBox { newpath 50 50 moveto 410 50 lineto 410 302 lineto 50 302 lineto closepath @@ -61,7 +47,7 @@ } if } def % -% Gnuplot Prolog Version 4.4 (January 2010) +% Gnuplot Prolog Version 4.4 (August 2010) % %/SuppressPDFMark true def % @@ -73,6 +59,7 @@ /Z {closepath} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def +/g {setgray} bind def /Gshow {show} def % May be redefined later in the file to support UTF-8 /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def @@ -94,6 +81,7 @@ dup 1 lt {pop 1} if 10 mul /udl exch def} def /PL {stroke userlinewidth setlinewidth Rounded {1 setlinejoin 1 setlinecap} if} def +3.8 setmiterlimit % Default Line colors /LCw {1 1 1} def /LCb {0 0 0} def @@ -459,8 +447,26 @@ Blacktext {gsave 0 setgray MFshow grestore} {MFshow} ifelse } bind def /XYsave { [( ) 1 2 true false 3 ()] } bind def /XYrestore { [( ) 1 2 true false 4 ()] } bind def +Level1 SuppressPDFMark or +{} { +/SDict 10 dict def +systemdict /pdfmark known not { + userdict /pdfmark systemdict /cleartomark get put +} if +SDict begin [ + /Title (interpderiv2.eps) + /Subject (gnuplot plot) + /Creator (gnuplot 4.6 patchlevel 0) + /Author (jwe) +% /Producer (gnuplot) +% /Keywords () + /CreationDate (Thu May 31 11:40:50 2012) + /DOCINFO pdfmark +end +} ifelse end %%EndProlog +%%Page: 1 1 gnudict begin gsave doclip @@ -469,6 +475,7 @@ 0 setgray newpath (Helvetica) findfont 200 scalefont setfont +BackgroundColor 0 lt 3 1 roll 0 lt exch 0 lt or or not {BackgroundColor C 1.000 0 0 7200.00 5040.00 BoxColFill} if gsave % colour palette begin /maxcolors 64 def /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray @@ -545,193 +552,193 @@ } ifelse 0.500 UL LTb -660 400 M +540 400 M 88 0 V -6151 0 R +6211 0 R -88 0 V stroke -0.00 0.00 0.00 C 540 400 M +0.00 0.00 0.00 C 420 400 M [ [({}) 200.0 0.0 true true 0 (-4)] ] -66.7 MRshow 0.500 UL LTb -660 950 M +540 950 M 88 0 V -6151 0 R +6211 0 R -88 0 V stroke -0.00 0.00 0.00 C 540 950 M +0.00 0.00 0.00 C 420 950 M [ [({}) 200.0 0.0 true true 0 (-3)] ] -66.7 MRshow 0.500 UL LTb -660 1500 M +540 1500 M 88 0 V -6151 0 R +6211 0 R -88 0 V stroke -0.00 0.00 0.00 C 540 1500 M +0.00 0.00 0.00 C 420 1500 M [ [({}) 200.0 0.0 true true 0 (-2)] ] -66.7 MRshow 0.500 UL LTb -660 2050 M +540 2050 M 88 0 V -6151 0 R +6211 0 R -88 0 V stroke -0.00 0.00 0.00 C 540 2050 M +0.00 0.00 0.00 C 420 2050 M [ [({}) 200.0 0.0 true true 0 (-1)] ] -66.7 MRshow 0.500 UL LTb -660 2600 M +540 2600 M 88 0 V -6151 0 R +6211 0 R -88 0 V stroke -0.00 0.00 0.00 C 540 2600 M +0.00 0.00 0.00 C 420 2600 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MRshow 0.500 UL LTb -660 3149 M +540 3149 M 88 0 V -6151 0 R +6211 0 R -88 0 V stroke -0.00 0.00 0.00 C 540 3149 M +0.00 0.00 0.00 C 420 3149 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MRshow 0.500 UL LTb -660 3699 M +540 3699 M 88 0 V -6151 0 R +6211 0 R -88 0 V stroke -0.00 0.00 0.00 C 540 3699 M +0.00 0.00 0.00 C 420 3699 M [ [({}) 200.0 0.0 true true 0 (2)] ] -66.7 MRshow 0.500 UL LTb -660 4249 M +540 4249 M 88 0 V -6151 0 R +6211 0 R -88 0 V stroke -0.00 0.00 0.00 C 540 4249 M +0.00 0.00 0.00 C 420 4249 M [ [({}) 200.0 0.0 true true 0 (3)] ] -66.7 MRshow 0.500 UL LTb -660 4799 M +540 4799 M 88 0 V -6151 0 R +6211 0 R -88 0 V stroke -0.00 0.00 0.00 C 540 4799 M +0.00 0.00 0.00 C 420 4799 M [ [({}) 200.0 0.0 true true 0 (4)] ] -66.7 MRshow 0.500 UL LTb -660 400 M +540 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 660 200 M +0.00 0.00 0.00 C 540 200 M [ [({}) 200.0 0.0 true true 0 (-2)] ] -66.7 MCshow 0.500 UL LTb -1440 400 M +1327 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 1440 200 M +0.00 0.00 0.00 C 1327 200 M [ [({}) 200.0 0.0 true true 0 (-1.5)] ] -66.7 MCshow 0.500 UL LTb -2220 400 M +2115 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 2220 200 M +0.00 0.00 0.00 C 2115 200 M [ [({}) 200.0 0.0 true true 0 (-1)] ] -66.7 MCshow 0.500 UL LTb -3000 400 M +2902 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 3000 200 M +0.00 0.00 0.00 C 2902 200 M [ [({}) 200.0 0.0 true true 0 (-0.5)] ] -66.7 MCshow 0.500 UL LTb -3780 400 M +3690 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 3780 200 M +0.00 0.00 0.00 C 3690 200 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MCshow 0.500 UL LTb -4559 400 M +4477 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 4559 200 M +0.00 0.00 0.00 C 4477 200 M [ [({}) 200.0 0.0 true true 0 (0.5)] ] -66.7 MCshow 0.500 UL LTb -5339 400 M +5264 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 5339 200 M +0.00 0.00 0.00 C 5264 200 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MCshow 0.500 UL LTb -6119 400 M +6052 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6119 200 M +0.00 0.00 0.00 C 6052 200 M [ [({}) 200.0 0.0 true true 0 (1.5)] ] -66.7 MCshow 0.500 UL LTb -6899 400 M +6839 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6899 200 M +0.00 0.00 0.00 C 6839 200 M [ [({}) 200.0 0.0 true true 0 (2)] ] -66.7 MCshow 0.500 UL LTb 0.500 UL LTb -660 4799 N -660 400 L -6239 0 V +540 4799 N +540 400 L +6299 0 V 0 4399 V --6239 0 V +-6299 0 V Z stroke 1.000 UP 0.500 UL @@ -741,340 +748,340 @@ 0.500 UL LT0 1.00 0.00 0.00 C LCb setrgbcolor -5996 4636 M +5936 4636 M [ [({}) 200.0 0.0 true true 0 (spline)] ] -66.7 MRshow LT0 -1.00 0.00 0.00 C 699 3686 Star -738 3672 Star -777 3658 Star -816 3644 Star -855 3631 Star -894 3617 Star -933 3603 Star -972 3589 Star -1011 3576 Star -1050 3562 Star -1089 3548 Star -1128 3534 Star -1167 3521 Star -1206 3507 Star -1245 3493 Star -1284 3479 Star -1323 3466 Star -1362 3452 Star -1401 3438 Star -1440 3424 Star -1479 3411 Star -1518 3397 Star -1557 3383 Star -1596 3369 Star -1635 3356 Star -1674 3342 Star -1713 3328 Star -1752 3314 Star -1791 3301 Star -1830 3287 Star -1869 3273 Star -1908 3259 Star -1947 3246 Star -1986 3232 Star -2025 3218 Star -2064 3204 Star -2103 3191 Star -2142 3177 Star -2181 3163 Star -2220 3149 Star -2259 3136 Star -2298 3122 Star -2337 3108 Star -2376 3094 Star -2415 3081 Star -2454 3067 Star -2493 3053 Star -2532 3039 Star -2571 3026 Star -2610 3012 Star -2649 2998 Star -2688 2984 Star -2727 2971 Star -2766 2957 Star -2805 2943 Star -2844 2929 Star -2883 2916 Star -2922 2902 Star -2961 2888 Star -3000 2874 Star -3039 2861 Star -3078 2847 Star -3117 2833 Star -3156 2819 Star -3195 2806 Star -3234 2792 Star -3273 2778 Star -3312 2764 Star -3351 2751 Star -3390 2737 Star -3429 2723 Star -3468 2709 Star -3507 2696 Star -3546 2682 Star -3585 2668 Star -3624 2654 Star -3663 2641 Star -3702 2627 Star -3741 2613 Star -3780 2600 Star -3818 2586 Star -3857 2572 Star -3896 2558 Star -3935 2545 Star -3974 2531 Star -4013 2517 Star -4052 2503 Star -4091 2490 Star -4130 2476 Star -4169 2462 Star -4208 2448 Star -4247 2435 Star -4286 2421 Star -4325 2407 Star -4364 2393 Star -4403 2380 Star -4442 2366 Star -4481 2352 Star -4520 2338 Star -4559 2325 Star -4598 2311 Star -4637 2297 Star -4676 2283 Star -4715 2270 Star -4754 2256 Star -4793 2242 Star -4832 2228 Star -4871 2215 Star -4910 2201 Star -4949 2187 Star -4988 2173 Star -5027 2160 Star -5066 2146 Star -5105 2132 Star -5144 2118 Star -5183 2105 Star -5222 2091 Star -5261 2077 Star -5300 2063 Star -5339 2050 Star -5378 2036 Star -5417 2022 Star -5456 2008 Star -5495 1995 Star -5534 1981 Star -5573 1967 Star -5612 1953 Star -5651 1940 Star -5690 1926 Star -5729 1912 Star -5768 1898 Star -5807 1885 Star -5846 1871 Star -5885 1857 Star -5924 1843 Star -5963 1830 Star -6002 1816 Star -6041 1802 Star -6080 1788 Star -6119 1775 Star -6158 1761 Star -6197 1747 Star -6236 1733 Star -6275 1720 Star -6314 1706 Star -6353 1692 Star -6392 1678 Star -6431 1665 Star -6470 1651 Star -6509 1637 Star -6548 1623 Star -6587 1610 Star -6626 1596 Star -6665 1582 Star -6704 1568 Star -6743 1555 Star -6782 1541 Star -6821 1527 Star -6860 1513 Star -6387 4636 Star +1.00 0.00 0.00 C 579 3686 Star +619 3672 Star +658 3658 Star +697 3644 Star +737 3631 Star +776 3617 Star +816 3603 Star +855 3589 Star +894 3576 Star +934 3562 Star +973 3548 Star +1012 3534 Star +1052 3521 Star +1091 3507 Star +1131 3493 Star +1170 3479 Star +1209 3466 Star +1249 3452 Star +1288 3438 Star +1327 3424 Star +1367 3411 Star +1406 3397 Star +1445 3383 Star +1485 3369 Star +1524 3356 Star +1564 3342 Star +1603 3328 Star +1642 3314 Star +1682 3301 Star +1721 3287 Star +1760 3273 Star +1800 3259 Star +1839 3246 Star +1879 3232 Star +1918 3218 Star +1957 3204 Star +1997 3191 Star +2036 3177 Star +2075 3163 Star +2115 3149 Star +2154 3136 Star +2193 3122 Star +2233 3108 Star +2272 3094 Star +2312 3081 Star +2351 3067 Star +2390 3053 Star +2430 3039 Star +2469 3026 Star +2508 3012 Star +2548 2998 Star +2587 2984 Star +2627 2971 Star +2666 2957 Star +2705 2943 Star +2745 2929 Star +2784 2916 Star +2823 2902 Star +2863 2888 Star +2902 2874 Star +2941 2861 Star +2981 2847 Star +3020 2833 Star +3060 2819 Star +3099 2806 Star +3138 2792 Star +3178 2778 Star +3217 2764 Star +3256 2751 Star +3296 2737 Star +3335 2723 Star +3375 2709 Star +3414 2696 Star +3453 2682 Star +3493 2668 Star +3532 2654 Star +3571 2641 Star +3611 2627 Star +3650 2613 Star +3690 2600 Star +3729 2586 Star +3768 2572 Star +3808 2558 Star +3847 2545 Star +3886 2531 Star +3926 2517 Star +3965 2503 Star +4004 2490 Star +4044 2476 Star +4083 2462 Star +4123 2448 Star +4162 2435 Star +4201 2421 Star +4241 2407 Star +4280 2393 Star +4319 2380 Star +4359 2366 Star +4398 2352 Star +4438 2338 Star +4477 2325 Star +4516 2311 Star +4556 2297 Star +4595 2283 Star +4634 2270 Star +4674 2256 Star +4713 2242 Star +4752 2228 Star +4792 2215 Star +4831 2201 Star +4871 2187 Star +4910 2173 Star +4949 2160 Star +4989 2146 Star +5028 2132 Star +5067 2118 Star +5107 2105 Star +5146 2091 Star +5186 2077 Star +5225 2063 Star +5264 2050 Star +5304 2036 Star +5343 2022 Star +5382 2008 Star +5422 1995 Star +5461 1981 Star +5500 1967 Star +5540 1953 Star +5579 1940 Star +5619 1926 Star +5658 1912 Star +5697 1898 Star +5737 1885 Star +5776 1871 Star +5815 1857 Star +5855 1843 Star +5894 1830 Star +5934 1816 Star +5973 1802 Star +6012 1788 Star +6052 1775 Star +6091 1761 Star +6130 1747 Star +6170 1733 Star +6209 1720 Star +6248 1706 Star +6288 1692 Star +6327 1678 Star +6367 1665 Star +6406 1651 Star +6445 1637 Star +6485 1623 Star +6524 1610 Star +6563 1596 Star +6603 1582 Star +6642 1568 Star +6682 1555 Star +6721 1541 Star +6760 1527 Star +6800 1513 Star +6327 4636 Star % End plot #1 % Begin plot #2 2.000 UP 0.500 UL LT1 0.00 1.00 0.00 C LCb setrgbcolor -5996 4436 M +5936 4436 M [ [({}) 200.0 0.0 true true 0 (pchip)] ] -66.7 MRshow LT1 -0.00 1.00 0.00 C 699 2600 Pls -738 2600 Pls -777 2600 Pls +0.00 1.00 0.00 C 579 2600 Pls +619 2600 Pls +658 2600 Pls +697 2600 Pls +737 2600 Pls +776 2600 Pls 816 2600 Pls 855 2600 Pls 894 2600 Pls -933 2600 Pls -972 2600 Pls -1011 2600 Pls -1050 2600 Pls -1089 2600 Pls -1128 2600 Pls -1167 2600 Pls -1206 2600 Pls -1245 2600 Pls -1284 2600 Pls -1323 2600 Pls -1362 2600 Pls -1401 2600 Pls -1440 2600 Pls -1479 2600 Pls -1518 2600 Pls -1557 2600 Pls -1596 2600 Pls -1635 2600 Pls -1674 2600 Pls -1713 2600 Pls -1752 2600 Pls -1791 2600 Pls -1830 2600 Pls -1869 2600 Pls -1908 2600 Pls -1947 2600 Pls -1986 2600 Pls -2025 2600 Pls -2064 2600 Pls -2103 2600 Pls -2142 2600 Pls -2181 2600 Pls -2220 3686 Pls -2259 4717 Pls -2298 4634 Pls -2337 4552 Pls -2376 4469 Pls -2415 4387 Pls -2454 4304 Pls -2493 4222 Pls -2532 4139 Pls -2571 4057 Pls -2610 3974 Pls -2649 3892 Pls -2688 3809 Pls -2727 3727 Pls -2766 3644 Pls -2805 3562 Pls -2844 3479 Pls -2883 3397 Pls -2922 3314 Pls -2961 3232 Pls -3000 3149 Pls -3039 3067 Pls -3078 2984 Pls -3117 2902 Pls -3156 2819 Pls -3195 2737 Pls -3234 2654 Pls -3273 2572 Pls -3312 2490 Pls -3351 2407 Pls -3390 2325 Pls -3429 2242 Pls -3468 2160 Pls -3507 2077 Pls -3546 1995 Pls -3585 1912 Pls -3624 1830 Pls -3663 1747 Pls -3702 1665 Pls -3741 1582 Pls -3780 2599 Pls -3818 3617 Pls -3857 3534 Pls -3896 3452 Pls -3935 3369 Pls -3974 3287 Pls -4013 3204 Pls -4052 3122 Pls -4091 3039 Pls -4130 2957 Pls -4169 2874 Pls -4208 2792 Pls -4247 2709 Pls -4286 2627 Pls -4325 2545 Pls -4364 2462 Pls -4403 2380 Pls -4442 2297 Pls -4481 2215 Pls -4520 2132 Pls -4559 2050 Pls -4598 1967 Pls -4637 1885 Pls -4676 1802 Pls -4715 1720 Pls -4754 1637 Pls -4793 1555 Pls -4832 1472 Pls -4871 1390 Pls -4910 1307 Pls -4949 1225 Pls -4988 1142 Pls -5027 1060 Pls -5066 977 Pls -5105 895 Pls -5144 812 Pls -5183 730 Pls -5222 647 Pls -5261 565 Pls -5300 482 Pls -5339 1513 Pls -5378 2600 Pls -5417 2600 Pls -5456 2600 Pls -5495 2600 Pls -5534 2600 Pls -5573 2600 Pls -5612 2600 Pls -5651 2600 Pls -5690 2600 Pls -5729 2600 Pls -5768 2600 Pls -5807 2600 Pls -5846 2600 Pls -5885 2600 Pls -5924 2600 Pls -5963 2600 Pls -6002 2600 Pls -6041 2600 Pls -6080 2600 Pls -6119 2600 Pls -6158 2600 Pls -6197 2600 Pls -6236 2600 Pls -6275 2600 Pls -6314 2600 Pls -6353 2600 Pls -6392 2600 Pls -6431 2600 Pls -6470 2600 Pls -6509 2600 Pls -6548 2600 Pls -6587 2600 Pls -6626 2600 Pls -6665 2600 Pls -6704 2600 Pls -6743 2600 Pls -6782 2600 Pls -6821 2600 Pls -6860 2600 Pls -6387 4436 Pls +934 2600 Pls +973 2600 Pls +1012 2600 Pls +1052 2600 Pls +1091 2600 Pls +1131 2600 Pls +1170 2600 Pls +1209 2600 Pls +1249 2600 Pls +1288 2600 Pls +1327 2600 Pls +1367 2600 Pls +1406 2600 Pls +1445 2600 Pls +1485 2600 Pls +1524 2600 Pls +1564 2600 Pls +1603 2600 Pls +1642 2600 Pls +1682 2600 Pls +1721 2600 Pls +1760 2600 Pls +1800 2600 Pls +1839 2600 Pls +1879 2600 Pls +1918 2600 Pls +1957 2600 Pls +1997 2600 Pls +2036 2600 Pls +2075 2600 Pls +2115 3686 Pls +2154 4717 Pls +2193 4634 Pls +2233 4552 Pls +2272 4469 Pls +2312 4387 Pls +2351 4304 Pls +2390 4222 Pls +2430 4139 Pls +2469 4057 Pls +2508 3974 Pls +2548 3892 Pls +2587 3809 Pls +2627 3727 Pls +2666 3644 Pls +2705 3562 Pls +2745 3479 Pls +2784 3397 Pls +2823 3314 Pls +2863 3232 Pls +2902 3149 Pls +2941 3067 Pls +2981 2984 Pls +3020 2902 Pls +3060 2819 Pls +3099 2737 Pls +3138 2654 Pls +3178 2572 Pls +3217 2490 Pls +3256 2407 Pls +3296 2325 Pls +3335 2242 Pls +3375 2160 Pls +3414 2077 Pls +3453 1995 Pls +3493 1912 Pls +3532 1830 Pls +3571 1747 Pls +3611 1665 Pls +3650 1582 Pls +3690 2599 Pls +3729 3617 Pls +3768 3534 Pls +3808 3452 Pls +3847 3369 Pls +3886 3287 Pls +3926 3204 Pls +3965 3122 Pls +4004 3039 Pls +4044 2957 Pls +4083 2874 Pls +4123 2792 Pls +4162 2709 Pls +4201 2627 Pls +4241 2545 Pls +4280 2462 Pls +4319 2380 Pls +4359 2297 Pls +4398 2215 Pls +4438 2132 Pls +4477 2050 Pls +4516 1967 Pls +4556 1885 Pls +4595 1802 Pls +4634 1720 Pls +4674 1637 Pls +4713 1555 Pls +4752 1472 Pls +4792 1390 Pls +4831 1307 Pls +4871 1225 Pls +4910 1142 Pls +4949 1060 Pls +4989 977 Pls +5028 895 Pls +5067 812 Pls +5107 730 Pls +5146 647 Pls +5186 565 Pls +5225 482 Pls +5264 1513 Pls +5304 2600 Pls +5343 2600 Pls +5382 2600 Pls +5422 2600 Pls +5461 2600 Pls +5500 2600 Pls +5540 2600 Pls +5579 2600 Pls +5619 2600 Pls +5658 2600 Pls +5697 2600 Pls +5737 2600 Pls +5776 2600 Pls +5815 2600 Pls +5855 2600 Pls +5894 2600 Pls +5934 2600 Pls +5973 2600 Pls +6012 2600 Pls +6052 2600 Pls +6091 2600 Pls +6130 2600 Pls +6170 2600 Pls +6209 2600 Pls +6248 2600 Pls +6288 2600 Pls +6327 2600 Pls +6367 2600 Pls +6406 2600 Pls +6445 2600 Pls +6485 2600 Pls +6524 2600 Pls +6563 2600 Pls +6603 2600 Pls +6642 2600 Pls +6682 2600 Pls +6721 2600 Pls +6760 2600 Pls +6800 2600 Pls +6327 4436 Pls % End plot #2 1.000 UP 0.500 UL Binary files octave-3.6.1/doc/interpreter/interpderiv2.pdf and octave-3.6.2/doc/interpreter/interpderiv2.pdf differ Binary files octave-3.6.1/doc/interpreter/interpderiv2.png and octave-3.6.2/doc/interpreter/interpderiv2.png differ diff -uNr octave-3.6.1/doc/interpreter/interpft.eps octave-3.6.2/doc/interpreter/interpft.eps --- octave-3.6.1/doc/interpreter/interpft.eps 2012-02-22 15:01:41.000000000 -0500 +++ octave-3.6.2/doc/interpreter/interpft.eps 2012-05-31 11:40:47.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: interpft.eps -%%Creator: gnuplot 4.4 patchlevel 0 -%%CreationDate: Wed Feb 22 15:01:41 2012 +%%Creator: gnuplot 4.6 patchlevel 0 +%%CreationDate: Thu May 31 11:40:47 2012 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments @@ -20,10 +20,12 @@ /Level1 false def /Rounded false def /ClipToBoundingBox false def +/SuppressPDFMark false def /TransparentPatterns false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /Gamma 1.0 def +/BackgroundColor {-1.000 -1.000 -1.000} def % /vshift -66 def /dl1 { @@ -38,22 +40,6 @@ /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def -Level1 {} { -/SDict 10 dict def -systemdict /pdfmark known not { - userdict /pdfmark systemdict /cleartomark get put -} if -SDict begin [ - /Title (interpft.eps) - /Subject (gnuplot plot) - /Creator (gnuplot 4.4 patchlevel 0) - /Author (jwe) -% /Producer (gnuplot) -% /Keywords () - /CreationDate (Wed Feb 22 15:01:41 2012) - /DOCINFO pdfmark -end -} ifelse /doclip { ClipToBoundingBox { newpath 50 50 moveto 410 50 lineto 410 302 lineto 50 302 lineto closepath @@ -61,7 +47,7 @@ } if } def % -% Gnuplot Prolog Version 4.4 (January 2010) +% Gnuplot Prolog Version 4.4 (August 2010) % %/SuppressPDFMark true def % @@ -73,6 +59,7 @@ /Z {closepath} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def +/g {setgray} bind def /Gshow {show} def % May be redefined later in the file to support UTF-8 /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def @@ -94,6 +81,7 @@ dup 1 lt {pop 1} if 10 mul /udl exch def} def /PL {stroke userlinewidth setlinewidth Rounded {1 setlinejoin 1 setlinecap} if} def +3.8 setmiterlimit % Default Line colors /LCw {1 1 1} def /LCb {0 0 0} def @@ -459,8 +447,26 @@ Blacktext {gsave 0 setgray MFshow grestore} {MFshow} ifelse } bind def /XYsave { [( ) 1 2 true false 3 ()] } bind def /XYrestore { [( ) 1 2 true false 4 ()] } bind def +Level1 SuppressPDFMark or +{} { +/SDict 10 dict def +systemdict /pdfmark known not { + userdict /pdfmark systemdict /cleartomark get put +} if +SDict begin [ + /Title (interpft.eps) + /Subject (gnuplot plot) + /Creator (gnuplot 4.6 patchlevel 0) + /Author (jwe) +% /Producer (gnuplot) +% /Keywords () + /CreationDate (Thu May 31 11:40:47 2012) + /DOCINFO pdfmark +end +} ifelse end %%EndProlog +%%Page: 1 1 gnudict begin gsave doclip @@ -469,6 +475,7 @@ 0 setgray newpath (Helvetica) findfont 200 scalefont setfont +BackgroundColor 0 lt 3 1 roll 0 lt exch 0 lt or or not {BackgroundColor C 1.000 0 0 7200.00 5040.00 BoxColFill} if gsave % colour palette begin /maxcolors 64 def /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray @@ -545,153 +552,153 @@ } ifelse 0.500 UL LTb -900 400 M +780 400 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 400 M +0.00 0.00 0.00 C 660 400 M [ [({}) 200.0 0.0 true true 0 (-1)] ] -66.7 MRshow 0.500 UL LTb -900 1280 M +780 1280 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 1280 M +0.00 0.00 0.00 C 660 1280 M [ [({}) 200.0 0.0 true true 0 (-0.5)] ] -66.7 MRshow 0.500 UL LTb -900 2160 M +780 2160 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 2160 M +0.00 0.00 0.00 C 660 2160 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MRshow 0.500 UL LTb -900 3039 M +780 3039 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 3039 M +0.00 0.00 0.00 C 660 3039 M [ [({}) 200.0 0.0 true true 0 (0.5)] ] -66.7 MRshow 0.500 UL LTb -900 3919 M +780 3919 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 3919 M +0.00 0.00 0.00 C 660 3919 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MRshow 0.500 UL LTb -900 4799 M +780 4799 M 88 0 V -5911 0 R +5971 0 R -88 0 V stroke -0.00 0.00 0.00 C 780 4799 M +0.00 0.00 0.00 C 660 4799 M [ [({}) 200.0 0.0 true true 0 (1.5)] ] -66.7 MRshow 0.500 UL LTb -900 400 M +780 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 900 200 M +0.00 0.00 0.00 C 780 200 M [ [({}) 200.0 0.0 true true 0 (0)] ] -66.7 MCshow 0.500 UL LTb -1757 400 M +1646 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 1757 200 M +0.00 0.00 0.00 C 1646 200 M [ [({}) 200.0 0.0 true true 0 (0.5)] ] -66.7 MCshow 0.500 UL LTb -2614 400 M +2511 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 2614 200 M +0.00 0.00 0.00 C 2511 200 M [ [({}) 200.0 0.0 true true 0 (1)] ] -66.7 MCshow 0.500 UL LTb -3471 400 M +3377 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 3471 200 M +0.00 0.00 0.00 C 3377 200 M [ [({}) 200.0 0.0 true true 0 (1.5)] ] -66.7 MCshow 0.500 UL LTb -4328 400 M +4242 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 4328 200 M +0.00 0.00 0.00 C 4242 200 M [ [({}) 200.0 0.0 true true 0 (2)] ] -66.7 MCshow 0.500 UL LTb -5185 400 M +5108 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 5185 200 M +0.00 0.00 0.00 C 5108 200 M [ [({}) 200.0 0.0 true true 0 (2.5)] ] -66.7 MCshow 0.500 UL LTb -6042 400 M +5973 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6042 200 M +0.00 0.00 0.00 C 5973 200 M [ [({}) 200.0 0.0 true true 0 (3)] ] -66.7 MCshow 0.500 UL LTb -6899 400 M +6839 400 M 0 88 V 0 4311 R 0 -88 V stroke -0.00 0.00 0.00 C 6899 200 M +0.00 0.00 0.00 C 6839 200 M [ [({}) 200.0 0.0 true true 0 (3.5)] ] -66.7 MCshow 0.500 UL LTb 0.500 UL LTb -900 4799 N -900 400 L -5999 0 V +780 4799 N +780 400 L +6059 0 V 0 4399 V --5999 0 V +-6059 0 V Z stroke 1.000 UP 0.500 UL @@ -700,212 +707,212 @@ 0.500 UL LT0 0.00 1.00 0.00 C LCb setrgbcolor -5996 4636 M +5936 4636 M [ [({}) 200.0 0.0 true true 0 (sin\(4t+0.3\)cos\(3t-0.1\))] ] -66.7 MRshow LT0 -0.00 1.00 0.00 C 6116 4636 M +0.00 1.00 0.00 C 6056 4636 M 543 0 V -900 2677 M +780 2677 M 57 219 V -56 200 V +57 200 V 57 170 V -56 133 V +58 133 V 57 91 V -56 45 V +57 45 V 57 -3 V -56 -49 V +57 -49 V 57 -90 V 57 -127 V -56 -155 V -57 -174 V -56 -183 V +57 -155 V +58 -174 V +57 -183 V 57 -180 V -56 -168 V +57 -168 V 57 -145 V 57 -113 V -56 -76 V +57 -76 V 57 -33 V -56 13 V +58 13 V 57 59 V -56 102 V +57 102 V 57 140 V -56 172 V +57 172 V 57 195 V 57 209 V -56 211 V -57 203 V -56 185 V +57 211 V +58 203 V +57 185 V 57 156 V -56 121 V +57 121 V 57 78 V 57 33 V -56 -15 V +57 -15 V 57 -62 V -56 -106 V +58 -106 V 57 -143 V -56 -174 V +57 -174 V 57 -194 V -56 -206 V +57 -206 V 57 -206 V 57 -195 V -56 -175 V -57 -145 V -56 -109 V +57 -175 V +58 -145 V +57 -109 V 57 -66 V -56 -22 V +57 -22 V 57 25 V 57 68 V -56 108 V -57 141 V -56 167 V +57 108 V +58 141 V +57 167 V 57 181 V -56 187 V +57 187 V 57 180 V -56 165 V +57 165 V 57 138 V 57 104 V -56 64 V +58 64 V 57 18 V -56 -29 V +57 -29 V 57 -76 V -56 -120 V +57 -120 V 57 -159 V 57 -190 V -56 -213 V -57 -225 V -56 -227 V +57 -213 V +58 -225 V +57 -227 V 57 -219 V -56 -199 V +57 -199 V 57 -171 V -56 -135 V +57 -135 V 57 -94 V 57 -47 V -56 -2 V +58 -2 V 57 44 V -56 85 V +57 85 V 57 120 V -56 148 V +57 148 V 57 165 V 57 174 V -56 171 V -57 157 V -56 133 V +57 171 V +58 157 V +57 133 V 57 102 V -56 63 V +57 63 V 57 19 V -56 -27 V +57 -27 V 57 -73 V 57 -118 V -56 -156 V +58 -156 V 57 -189 V -56 -212 V +57 -212 V 57 -227 V -56 -229 V +57 -229 V 57 -223 V 57 -204 V -56 -176 V +58 -176 V 57 -142 V % End plot #1 % Begin plot #2 stroke LT0 0.00 0.00 1.00 C LCb setrgbcolor -5996 4436 M +5936 4436 M [ [({}) 200.0 0.0 true true 0 (spline)] ] -66.7 MRshow LT0 -0.00 0.00 1.00 C 6116 4436 M +0.00 0.00 1.00 C 6056 4436 M 543 0 V -900 2677 M +780 2677 M 57 377 V -56 282 V +57 282 V 57 197 V -56 119 V +58 119 V 57 51 V -56 -8 V +57 -8 V 57 -60 V -56 -103 V +57 -103 V 57 -136 V 57 -161 V -56 -179 V -57 -186 V -56 -185 V +57 -179 V +58 -186 V +57 -185 V 57 -177 V -56 -158 V +57 -158 V 57 -133 V 57 -97 V -56 -53 V +57 -53 V 57 -2 V -56 45 V +58 45 V 57 86 V -56 119 V +57 119 V 57 145 V -56 164 V +57 164 V 57 174 V 57 178 V -56 175 V -57 163 V -56 148 V +57 175 V +58 163 V +57 148 V 57 128 V -56 104 V +57 104 V 57 77 V 57 45 V -56 10 V +57 10 V 57 -30 V -56 -73 V +58 -73 V 57 -119 V -56 -161 V +57 -161 V 57 -189 V -56 -207 V +57 -207 V 57 -211 V 57 -204 V -56 -185 V -57 -153 V -56 -111 V +57 -185 V +58 -153 V +57 -111 V 57 -56 V -56 1 V +57 1 V 57 47 V 57 88 V -56 118 V -57 140 V -56 155 V +57 118 V +58 140 V +57 155 V 57 160 V -56 157 V +57 157 V 57 146 V -56 129 V +57 129 V 57 108 V 57 84 V -56 57 V +58 57 V 57 25 V -56 -8 V +57 -8 V 57 -46 V -56 -88 V +57 -88 V 57 -131 V 57 -173 V -56 -203 V -57 -223 V -56 -230 V +57 -203 V +58 -223 V +57 -230 V 57 -225 V -56 -209 V +57 -209 V 57 -182 V -56 -143 V +57 -143 V 57 -92 V 57 -36 V -56 14 V +58 14 V 57 57 V -56 92 V +57 92 V 57 119 V -56 140 V +57 140 V 57 153 V 57 158 V -56 156 V -57 147 V -56 130 V +57 156 V +58 147 V +57 130 V 57 106 V -56 75 V +57 75 V 57 35 V -56 -11 V +57 -11 V 57 -64 V 57 -126 V % End plot #2 @@ -913,111 +920,111 @@ stroke LT0 0.00 1.00 1.00 C LCb setrgbcolor -5996 4236 M +5936 4236 M [ [({}) 200.0 0.0 true true 0 (interpft)] ] -66.7 MRshow LT0 -0.00 1.00 1.00 C 6116 4236 M +0.00 1.00 1.00 C 6056 4236 M 543 0 V -900 2677 M +780 2677 M 57 120 V -56 130 V +57 130 V 57 131 V -56 124 V +58 124 V 57 107 V -56 80 V +57 80 V 57 47 V -56 7 V +57 7 V 57 -35 V 57 -78 V -56 -117 V -57 -150 V -56 -173 V +57 -117 V +58 -150 V +57 -173 V +57 -185 V 57 -185 V -56 -185 V 57 -171 V 57 -145 V -56 -107 V +57 -107 V 57 -60 V -56 -10 V +58 -10 V 57 45 V -56 96 V +57 96 V 57 143 V -56 182 V +57 182 V 57 210 V 57 225 V -56 228 V -57 217 V -56 195 V +57 228 V +58 217 V +57 195 V 57 163 V -56 122 V +57 122 V 57 75 V 57 27 V -56 -22 V +57 -22 V 57 -68 V -56 -110 V +58 -110 V 57 -147 V -56 -173 V +57 -173 V 57 -193 V -56 -202 V +57 -202 V 57 -203 V 57 -192 V -56 -175 V -57 -147 V -56 -114 V +57 -175 V +58 -147 V +57 -114 V 57 -74 V -56 -30 V +57 -30 V 57 15 V 57 61 V -56 103 V -57 140 V -56 171 V +57 103 V +58 140 V +57 171 V 57 191 V -56 200 V +57 200 V 57 197 V -56 182 V +57 182 V 57 155 V 57 117 V -56 70 V +58 70 V 57 18 V -56 -38 V +57 -38 V 57 -91 V -56 -141 V +57 -141 V 57 -184 V 57 -216 V -56 -236 V -57 -243 V -56 -237 V +57 -236 V +58 -243 V +57 -237 V 57 -218 V -56 -189 V +57 -189 V 57 -150 V -56 -106 V +57 -106 V 57 -59 V 57 -12 V -56 31 V +58 31 V 57 70 V -56 100 V +57 100 V 57 122 V -56 134 V +57 134 V 57 139 V 57 133 V -56 121 V -57 103 V -56 80 V +57 121 V +58 103 V +57 80 V 57 55 V -56 29 V +57 29 V 57 5 V -56 -17 V +57 -17 V 57 -34 V 57 -47 V -56 -54 V +58 -54 V 57 -53 V -56 -48 V +57 -48 V 57 -35 V -56 -17 V +57 -17 V 57 5 V 57 30 V -56 56 V +58 56 V 57 81 V % End plot #3 % Begin plot #4 @@ -1025,22 +1032,22 @@ stroke LT3 1.00 0.00 0.00 C LCb setrgbcolor -5996 4036 M +5936 4036 M [ [({}) 200.0 0.0 true true 0 (data)] ] -66.7 MRshow LT3 -1.00 0.00 0.00 C 900 2677 Pls -1414 3382 Pls -1928 2063 Pls -2443 3197 Pls -2957 3685 Pls -3471 2151 Pls -3985 3075 Pls -4499 3322 Pls -5014 1608 Pls -5528 2414 Pls -6042 2560 Pls -6387 4036 Pls +1.00 0.00 0.00 C 780 2677 Pls +1299 3382 Pls +1819 2063 Pls +2338 3197 Pls +2857 3685 Pls +3377 2151 Pls +3896 3075 Pls +4415 3322 Pls +4935 1608 Pls +5454 2414 Pls +5973 2560 Pls +6327 4036 Pls % End plot #4 1.000 UP 0.500 UL Binary files octave-3.6.1/doc/interpreter/interpft.pdf and octave-3.6.2/doc/interpreter/interpft.pdf differ Binary files octave-3.6.1/doc/interpreter/interpft.png and octave-3.6.2/doc/interpreter/interpft.png differ diff -uNr octave-3.6.1/doc/interpreter/interpn.eps octave-3.6.2/doc/interpreter/interpn.eps --- octave-3.6.1/doc/interpreter/interpn.eps 2012-02-22 15:01:42.000000000 -0500 +++ octave-3.6.2/doc/interpreter/interpn.eps 2012-05-31 11:40:48.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: interpn.eps -%%Creator: gnuplot 4.4 patchlevel 0 -%%CreationDate: Wed Feb 22 15:01:42 2012 +%%Creator: gnuplot 4.6 patchlevel 0 +%%CreationDate: Thu May 31 11:40:48 2012 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments @@ -20,10 +20,12 @@ /Level1 false def /Rounded false def /ClipToBoundingBox false def +/SuppressPDFMark false def /TransparentPatterns false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /Gamma 1.0 def +/BackgroundColor {-1.000 -1.000 -1.000} def % /vshift -66 def /dl1 { @@ -38,22 +40,6 @@ /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def -Level1 {} { -/SDict 10 dict def -systemdict /pdfmark known not { - userdict /pdfmark systemdict /cleartomark get put -} if -SDict begin [ - /Title (interpn.eps) - /Subject (gnuplot plot) - /Creator (gnuplot 4.4 patchlevel 0) - /Author (jwe) -% /Producer (gnuplot) -% /Keywords () - /CreationDate (Wed Feb 22 15:01:42 2012) - /DOCINFO pdfmark -end -} ifelse /doclip { ClipToBoundingBox { newpath 50 50 moveto 410 50 lineto 410 302 lineto 50 302 lineto closepath @@ -61,7 +47,7 @@ } if } def % -% Gnuplot Prolog Version 4.4 (January 2010) +% Gnuplot Prolog Version 4.4 (August 2010) % %/SuppressPDFMark true def % @@ -73,6 +59,7 @@ /Z {closepath} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def +/g {setgray} bind def /Gshow {show} def % May be redefined later in the file to support UTF-8 /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def @@ -94,6 +81,7 @@ dup 1 lt {pop 1} if 10 mul /udl exch def} def /PL {stroke userlinewidth setlinewidth Rounded {1 setlinejoin 1 setlinecap} if} def +3.8 setmiterlimit % Default Line colors /LCw {1 1 1} def /LCb {0 0 0} def @@ -459,8 +447,26 @@ Blacktext {gsave 0 setgray MFshow grestore} {MFshow} ifelse } bind def /XYsave { [( ) 1 2 true false 3 ()] } bind def /XYrestore { [( ) 1 2 true false 4 ()] } bind def +Level1 SuppressPDFMark or +{} { +/SDict 10 dict def +systemdict /pdfmark known not { + userdict /pdfmark systemdict /cleartomark get put +} if +SDict begin [ + /Title (interpn.eps) + /Subject (gnuplot plot) + /Creator (gnuplot 4.6 patchlevel 0) + /Author (jwe) +% /Producer (gnuplot) +% /Keywords () + /CreationDate (Thu May 31 11:40:48 2012) + /DOCINFO pdfmark +end +} ifelse end %%EndProlog +%%Page: 1 1 gnudict begin gsave doclip @@ -469,6 +475,7 @@ 0 setgray newpath (Helvetica) findfont 200 scalefont setfont +BackgroundColor 0 lt 3 1 roll 0 lt exch 0 lt or or not {BackgroundColor C 1.000 0 0 7200.00 5040.00 BoxColFill} if gsave % colour palette begin /maxcolors 64 def /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray @@ -546,6 +553,7 @@ 0.500 UL LTb 1.000 UP +% Begin plot #1 1.000 UL LT0 .3069 g 4177 2995 M @@ -571,11 +579,11 @@ .4525 g 3912 3383 M 150 -162 V stroke -LT1 +LT0 .0625 g 4750 2179 M -115 121 V stroke -LT1 +LT0 .0982 g 4578 2363 M 57 -63 V stroke @@ -583,19 +591,19 @@ .5475 g 3798 3630 M 149 -162 V stroke -LT1 +LT0 .0325 g 4865 2079 M -115 100 V stroke -LT1 +LT0 .0925 g 4601 2341 M 149 -162 V stroke -LT1 +LT0 .0125 g 4979 1999 M -114 80 V stroke -LT1 +LT0 .0675 g 4715 2241 M 150 -162 V stroke @@ -631,11 +639,11 @@ .5425 g 3763 3525 M 149 -142 V stroke -LT1 +LT0 .0025 g 5094 1941 M -115 58 V stroke -LT1 +LT0 .0525 g 4830 2161 M 149 -162 V stroke @@ -643,27 +651,27 @@ .6375 g 3648 3772 M 150 -142 V stroke -LT1 +LT0 .1275 g 4715 2241 M -114 100 V stroke -LT1 +LT0 .1662 g 4509 2428 M 92 -87 V stroke -LT1 +LT0 .0025 g 5209 1903 M -115 38 V stroke -LT1 +LT0 .0475 g 4945 2103 M 149 -162 V stroke -LT1 +LT0 .1075 g 4830 2161 M -115 80 V stroke -LT1 +LT0 .1575 g 4566 2382 M 149 -141 V stroke @@ -707,19 +715,19 @@ .6225 g 3614 3645 M 149 -120 V stroke -LT1 +LT0 .0125 g 5324 1887 M -115 16 V stroke -LT1 +LT0 .0525 g 5059 2065 M 150 -162 V stroke -LT1 +LT0 .0975 g 4945 2103 M -115 58 V stroke -LT1 +LT0 .1425 g 4681 2303 M 149 -142 V stroke @@ -727,27 +735,27 @@ .7175 g 3500 3892 M 148 -120 V stroke -LT1 +LT0 .0975 g 5059 2065 M -114 38 V stroke -LT1 +LT0 .1375 g 4795 2244 M 150 -141 V stroke -LT1 +LT0 .0325 g 5438 1891 M -114 -4 V stroke -LT1 +LT0 .0675 g 5174 2049 M 150 -162 V stroke -LT1 +LT0 .1925 g 4681 2303 M -115 79 V stroke -LT1 +LT0 .2318 g 4439 2485 M 127 -103 V stroke @@ -799,19 +807,19 @@ .3933 g 4038 2823 M 31 -21 V stroke -LT1 +LT0 .1075 g 5174 2049 M -115 16 V stroke -LT1 +LT0 .1425 g 4910 2207 M 149 -142 V stroke -LT1 +LT0 .1825 g 4795 2244 M -114 59 V stroke -LT1 +LT0 .2225 g 4531 2423 M 150 -120 V stroke @@ -819,19 +827,19 @@ .7875 g 3350 3992 M 150 -100 V stroke -LT1 +LT0 .0625 g 5553 1916 M -115 -25 V stroke -LT1 +LT0 .0925 g 5289 2053 M 149 -162 V stroke -LT1 +LT0 .1825 g 4910 2207 M -115 37 V stroke -LT1 +LT0 .2175 g 4646 2365 M 149 -121 V stroke @@ -863,11 +871,11 @@ .6675 g 3430 3597 M 150 -79 V stroke -LT1 +LT0 .1275 g 5289 2053 M -115 -4 V stroke -LT1 +LT0 .1575 g 5025 2190 M 149 -141 V stroke @@ -899,27 +907,27 @@ .8475 g 3201 4070 M 149 -78 V stroke -LT1 +LT0 .2575 g 4646 2365 M -115 58 V stroke -LT1 +LT0 .2925 g 4382 2523 M 149 -100 V stroke -LT1 +LT0 .1025 g 5668 1963 M -115 -47 V stroke -LT1 +LT0 .1275 g 5403 2079 M 150 -163 V stroke -LT1 +LT0 .1925 g 5025 2190 M -115 17 V stroke -LT1 +LT0 .2225 g 4760 2327 M 150 -120 V stroke @@ -927,11 +935,11 @@ .4153 g 4003 2780 M 25 -13 V stroke -LT1 +LT0 .1575 g 5403 2079 M -114 -26 V stroke -LT1 +LT0 .1825 g 5139 2195 M 150 -142 V stroke @@ -963,11 +971,11 @@ .7175 g 3281 3654 M 149 -57 V stroke -LT1 +LT0 .2575 g 4760 2327 M -114 38 V stroke -LT1 +LT0 .2875 g 4496 2464 M 150 -99 V stroke @@ -987,11 +995,11 @@ .8025 g 3166 3880 M 150 -57 V stroke -LT1 +LT0 .2125 g 5139 2195 M -114 -5 V stroke -LT1 +LT0 .2375 g 4875 2311 M 150 -121 V stroke @@ -1007,19 +1015,19 @@ .8975 g 3051 4128 M 150 -58 V stroke -LT1 +LT0 .3225 g 4496 2464 M -114 59 V stroke -LT1 +LT0 .333 g 4338 2545 M 44 -22 V stroke -LT1 +LT0 .1525 g 5782 2030 M -114 -67 V stroke -LT1 +LT0 .1725 g 5518 2125 M 150 -162 V stroke @@ -1031,11 +1039,11 @@ .4425 g 3853 2838 M 150 -58 V stroke -LT1 +LT0 .2675 g 4875 2311 M -115 16 V stroke -LT1 +LT0 .2925 g 4611 2427 M 149 -100 V stroke @@ -1051,11 +1059,11 @@ .6825 g 3246 3485 M 150 -36 V stroke -LT1 +LT0 .1975 g 5518 2125 M -115 -46 V stroke -LT1 +LT0 .2175 g 5254 2220 M 149 -141 V stroke @@ -1095,19 +1103,19 @@ .8425 g 3017 3917 M 149 -37 V stroke -LT1 +LT0 .3225 g 4611 2427 M -115 37 V stroke -LT1 +LT0 .3475 g 4347 2543 M 149 -79 V stroke -LT1 +LT0 .2425 g 5254 2220 M -115 -25 V stroke -LT1 +LT0 .2625 g 4990 2315 M 149 -120 V stroke @@ -1123,11 +1131,11 @@ .9375 g 2902 4164 M 149 -36 V stroke -LT1 +LT0 .2875 g 4990 2315 M -115 -4 V stroke -LT1 +LT0 .3075 g 4726 2410 M 149 -99 V stroke @@ -1159,11 +1167,11 @@ .6475 g 3211 3317 M 150 -16 V stroke -LT1 +LT0 .2125 g 5897 2118 M -115 -88 V stroke -LT1 +LT0 .2275 g 5633 2192 M 149 -162 V stroke @@ -1175,11 +1183,11 @@ .7875 g 2982 3706 M 149 -15 V stroke -LT1 +LT0 .3325 g 4726 2410 M -115 17 V stroke -LT1 +LT0 .3525 g 4462 2505 M 149 -78 V stroke @@ -1199,11 +1207,11 @@ .8725 g 2867 3933 M 150 -16 V stroke -LT1 +LT0 .2475 g 5633 2192 M -115 -67 V stroke -LT1 +LT0 .2625 g 5369 2266 M 149 -141 V stroke @@ -1227,19 +1235,19 @@ .9675 g 2753 4180 M 149 -16 V stroke -LT1 +LT0 .3775 g 4462 2505 M -115 38 V stroke -LT1 +LT0 .3873 g 4265 2574 M 82 -31 V stroke -LT1 +LT0 .2825 g 5369 2266 M -115 -46 V stroke -LT1 +LT0 .2975 g 5105 2340 M 149 -120 V stroke @@ -1251,11 +1259,11 @@ .5125 g 3555 2890 M 149 -16 V stroke -LT1 +LT0 .3175 g 5105 2340 M -115 -25 V stroke -LT1 +LT0 .3325 g 4840 2414 M 150 -99 V stroke @@ -1299,11 +1307,11 @@ .6125 g 3177 3148 M 149 5 V stroke -LT1 +LT0 .3525 g 4840 2414 M -114 -4 V stroke -LT1 +LT0 .3675 g 4576 2489 M 150 -79 V stroke @@ -1331,11 +1339,11 @@ .5675 g 3291 3006 M 150 5 V stroke -LT1 +LT0 .3875 g 4576 2489 M -114 16 V stroke -LT1 +LT0 .4025 g 4312 2563 M 150 -58 V stroke @@ -1343,11 +1351,11 @@ .9875 g 2603 4174 M 150 6 V stroke -LT1 +LT0 .2825 g 6012 2227 M 5897 2118 L stroke -LT1 +LT0 .2925 g 5748 2281 M 149 -163 V stroke @@ -1379,11 +1387,11 @@ .8175 g 2683 3675 M 149 26 V stroke -LT1 +LT0 .3075 g 5748 2281 M -115 -89 V stroke -LT1 +LT0 .3175 g 5483 2334 M 150 -142 V stroke @@ -1403,11 +1411,11 @@ .6225 g 3027 3122 M 150 26 V stroke -LT1 +LT0 .3325 g 5483 2334 M -114 -68 V stroke -LT1 +LT0 .3425 g 5219 2387 M 150 -121 V stroke @@ -1427,11 +1435,11 @@ .4725 g 3784 2710 M 149 -16 V stroke -LT1 +LT0 .3575 g 5219 2387 M -114 -47 V stroke -LT1 +LT0 .3675 g 4955 2440 M 150 -100 V stroke @@ -1443,11 +1451,11 @@ .5775 g 3142 2979 M 149 27 V stroke -LT1 +LT0 .3825 g 4955 2440 M -115 -26 V stroke -LT1 +LT0 .3925 g 4691 2493 M 149 -79 V stroke @@ -1483,11 +1491,11 @@ .6775 g 2763 3238 M 149 47 V stroke -LT1 +LT0 .4075 g 4691 2493 M -115 -4 V stroke -LT1 +LT0 .4175 g 4427 2546 M 149 -57 V stroke @@ -1515,11 +1523,11 @@ .6225 g 2878 3074 M 149 48 V stroke -LT1 +LT0 .4325 g 4427 2546 M -115 17 V stroke -LT1 +LT0 .4386 g 4196 2591 M 116 -28 V stroke @@ -1699,19 +1707,19 @@ .5475 g 1108 2967 M 959 2731 L stroke -LT1 +LT0 .3625 g 6126 2358 M 6012 2227 L stroke -LT1 +LT0 .3675 g 5862 2390 M 150 -163 V stroke -LT1 +LT0 .3775 g 5862 2390 M 5748 2281 L stroke -LT1 +LT0 .3825 g 5598 2422 M 150 -141 V stroke @@ -1727,11 +1735,11 @@ .7125 g 2349 3264 M 150 90 V stroke -LT1 +LT0 .3925 g 5598 2422 M -115 -88 V stroke -LT1 +LT0 .3975 g 5334 2454 M 149 -120 V stroke @@ -1759,11 +1767,11 @@ .6475 g 2464 3080 M 149 89 V stroke -LT1 +LT0 .4075 g 5334 2454 M -115 -67 V stroke -LT1 +LT0 .4125 g 5070 2486 M 149 -99 V stroke @@ -1783,11 +1791,11 @@ .5475 g 1108 2967 M 115 -247 V stroke -LT1 +LT0 .4225 g 5070 2486 M -115 -46 V stroke -LT1 +LT0 .4275 g 4806 2518 M 149 -78 V stroke @@ -1795,11 +1803,11 @@ .9875 g 2155 4032 M 149 69 V stroke -LT1 +LT0 .4375 g 4806 2518 M -115 -25 V stroke -LT1 +LT0 .4425 g 4541 2550 M 150 -57 V stroke @@ -1823,11 +1831,11 @@ .0925 g 1911 1678 M 1762 1442 L stroke -LT1 +LT0 .4525 g 4541 2550 M -114 -4 V stroke -LT1 +LT0 .4575 g 4277 2583 M 150 -37 V stroke @@ -2275,19 +2283,19 @@ .1575 g 2175 1793 M 2026 1578 L stroke -LT1 +LT0 .4875 g 4392 2587 M -115 -4 V stroke -LT1 +LT0 .4875 g 4128 2598 M 149 -15 V stroke -LT1 +LT0 .4825 g 4656 2576 M -115 -26 V stroke -LT1 +LT0 .4825 g 4392 2587 M 149 -37 V stroke @@ -2307,11 +2315,11 @@ .0525 g 2141 1498 M 1991 1262 L stroke -LT1 +LT0 .4775 g 4920 2565 M -114 -47 V stroke -LT1 +LT0 .4775 g 4656 2576 M 150 -58 V stroke @@ -2331,11 +2339,11 @@ .4425 g 2509 2413 M 150 131 V stroke -LT1 +LT0 .4725 g 5184 2553 M -114 -67 V stroke -LT1 +LT0 .4725 g 4920 2565 M 150 -79 V stroke @@ -2351,11 +2359,11 @@ .4075 g 2624 2312 M -115 101 V stroke -LT1 +LT0 .4675 g 5449 2542 M -115 -88 V stroke -LT1 +LT0 .4675 g 5184 2553 M 150 -99 V stroke @@ -2367,11 +2375,11 @@ .4925 g 3187 2563 M 149 68 V stroke -LT1 +LT0 .4625 g 5713 2531 M 5598 2422 L stroke -LT1 +LT0 .4625 g 5449 2542 M 149 -120 V stroke @@ -2383,11 +2391,11 @@ .2375 g 2325 1987 M 2175 1793 L stroke -LT1 +LT0 .4575 g 5977 2520 M 5862 2390 L stroke -LT1 +LT0 .4575 g 5713 2531 M 149 -141 V stroke @@ -2399,11 +2407,11 @@ .4575 g 2773 2443 M 150 111 V stroke -LT1 +LT0 .4525 g 6241 2509 M 6126 2358 L stroke -LT1 +LT0 .4525 g 5977 2520 M 149 -162 V stroke @@ -2491,11 +2499,11 @@ .4875 g 3302 2505 M 149 68 V stroke -LT1 +LT0 .5175 g 4507 2612 M -115 -25 V stroke -LT1 +LT0 .5125 g 4243 2603 M 149 -16 V stroke @@ -2515,11 +2523,11 @@ .2925 g 2589 2081 M 2440 1907 L stroke -LT1 +LT0 .5225 g 4771 2621 M -115 -45 V stroke -LT1 +LT0 .5175 g 4507 2612 M 149 -36 V stroke @@ -2559,11 +2567,11 @@ .3775 g 2853 2174 M -115 59 V stroke -LT1 +LT0 .5275 g 5035 2631 M -115 -66 V stroke -LT1 +LT0 .5225 g 4771 2621 M 149 -56 V stroke @@ -2575,11 +2583,11 @@ .4675 g 3152 2416 M 150 89 V stroke -LT1 +LT0 .5325 g 5299 2641 M -115 -88 V stroke -LT1 +LT0 .5275 g 5035 2631 M 149 -78 V stroke @@ -2599,11 +2607,11 @@ .2175 g 2554 1849 M 2405 1655 L stroke -LT1 +LT0 .5375 g 5563 2651 M 5449 2542 L stroke -LT1 +LT0 .5325 g 5299 2641 M 150 -99 V stroke @@ -2631,19 +2639,19 @@ .2875 g 2704 2022 M 2554 1849 L stroke -LT1 +LT0 .5428 g 4357 2627 M -113 -24 V stroke -LT1 +LT0 .5325 g 4093 2597 M 150 6 V stroke -LT1 +LT0 .5425 g 5827 2660 M 5713 2531 L stroke -LT1 +LT0 .5375 g 5563 2651 M 150 -120 V stroke @@ -2675,19 +2683,19 @@ .1425 g 2519 1617 M 2370 1402 L stroke -LT1 +LT0 .5475 g 6092 2670 M 5977 2520 L stroke -LT1 +LT0 .5425 g 5827 2660 M 150 -140 V stroke -LT1 +LT0 .5575 g 4621 2658 M -114 -46 V stroke -LT1 +LT0 .5475 g 4357 2627 M 150 -15 V stroke @@ -2703,7 +2711,7 @@ .4725 g 3267 2378 M 149 89 V stroke -LT1 +LT0 .5475 g 6092 2670 M 149 -161 V stroke @@ -2715,11 +2723,11 @@ .2225 g 2669 1811 M 2519 1617 L stroke -LT1 +LT0 .5725 g 4886 2688 M -115 -67 V stroke -LT1 +LT0 .5625 g 4621 2658 M 150 -37 V stroke @@ -2739,11 +2747,11 @@ .4425 g 3117 2268 M 150 110 V stroke -LT1 +LT0 .5575 g 4208 2622 M -115 -25 V stroke -LT1 +LT0 .5412 g 4022 2585 M 71 12 V stroke @@ -2755,11 +2763,11 @@ .2925 g 2818 1984 M 2669 1811 L stroke -LT1 +LT0 .5875 g 5150 2719 M -115 -88 V stroke -LT1 +LT0 .5775 g 4886 2688 M 149 -57 V stroke @@ -2799,19 +2807,19 @@ .1575 g 2634 1601 M 2485 1386 L stroke -LT1 +LT0 .5825 g 4472 2673 M -115 -46 V stroke -LT1 +LT0 .5675 g 4208 2622 M 149 5 V stroke -LT1 +LT0 .6025 g 5414 2750 M 5299 2641 L stroke -LT1 +LT0 .5925 g 5150 2719 M 149 -78 V stroke @@ -2823,11 +2831,11 @@ .4875 g 3381 2362 M 150 89 V stroke -LT1 +LT0 .6175 g 5678 2781 M 5563 2651 L stroke -LT1 +LT0 .6075 g 5414 2750 M 149 -99 V stroke @@ -2839,11 +2847,11 @@ .2375 g 2784 1795 M 2634 1601 L stroke -LT1 +LT0 .6075 g 4736 2725 M -115 -67 V stroke -LT1 +LT0 .5925 g 4472 2673 M 149 -15 V stroke @@ -2871,11 +2879,11 @@ .3075 g 2933 1968 M 2784 1795 L stroke -LT1 +LT0 .6325 g 5942 2811 M 5827 2660 L stroke -LT1 +LT0 .6225 g 5678 2781 M 149 -121 V stroke @@ -2899,11 +2907,11 @@ .4075 g 3197 2124 M -114 -4 V stroke -LT1 +LT0 .5975 g 4322 2668 M -114 -46 V stroke -LT1 +LT0 .5775 g 4058 2596 M 150 26 V stroke @@ -2911,15 +2919,15 @@ .5323 g 3645 2455 M 146 67 V stroke -LT1 +LT0 .6325 g 5000 2777 M -114 -89 V stroke -LT1 +LT0 .6175 g 4736 2725 M 150 -37 V stroke -LT1 +LT0 .6375 g 5942 2811 M 150 -141 V stroke @@ -2939,19 +2947,19 @@ .5125 g 3496 2366 M 149 89 V stroke -LT1 +LT0 .6575 g 5264 2828 M 5150 2719 L stroke -LT1 +LT0 .6425 g 5000 2777 M 150 -58 V stroke -LT1 +LT0 .6325 g 4587 2741 M -115 -68 V stroke -LT1 +LT0 .6125 g 4322 2668 M 150 5 V stroke @@ -2963,11 +2971,11 @@ .2625 g 2898 1799 M 2749 1605 L stroke -LT1 +LT0 .6025 g 4173 2641 M -115 -45 V stroke -LT1 +LT0 .5782 g 3952 2563 M 106 33 V stroke @@ -2979,11 +2987,11 @@ .4825 g 3347 2256 M 149 110 V stroke -LT1 +LT0 .6825 g 5529 2880 M 5414 2750 L stroke -LT1 +LT0 .6675 g 5264 2828 M 150 -78 V stroke @@ -3019,11 +3027,11 @@ .3925 g 3197 2124 M 3048 1972 L stroke -LT1 +LT0 .6675 g 4851 2813 M -115 -88 V stroke -LT1 +LT0 .6475 g 4587 2741 M 149 -16 V stroke @@ -3031,19 +3039,19 @@ .4375 g 3312 2150 M -115 -26 V stroke -LT1 +LT0 .7075 g 5793 2932 M 5678 2781 L stroke -LT1 +LT0 .6925 g 5529 2880 M 149 -99 V stroke -LT1 +LT0 .6475 g 4437 2735 M -115 -67 V stroke -LT1 +LT0 .6225 g 4173 2641 M 149 27 V stroke @@ -3055,11 +3063,11 @@ .2175 g 2864 1630 M 2714 1415 L stroke -LT1 +LT0 .7025 g 5115 2886 M 5000 2777 L stroke -LT1 +LT0 .6825 g 4851 2813 M 149 -36 V stroke @@ -3071,7 +3079,7 @@ .5459 g 3610 2391 M 130 78 V stroke -LT1 +LT0 .7175 g 5793 2932 M 149 -121 V stroke @@ -3083,11 +3091,11 @@ .2975 g 3013 1825 M 2864 1630 L stroke -LT1 +LT0 .6925 g 4701 2829 M -114 -88 V stroke -LT1 +LT0 .6675 g 4437 2735 M 150 6 V stroke @@ -3103,11 +3111,11 @@ .5175 g 3461 2281 M 149 110 V stroke -LT1 +LT0 .6525 g 4288 2709 M -115 -68 V stroke -LT1 +LT0 .6225 g 4023 2595 M 150 46 V stroke @@ -3119,11 +3127,11 @@ .3675 g 3162 1998 M 3013 1825 L stroke -LT1 +LT0 .7375 g 5379 2959 M 5264 2828 L stroke -LT1 +LT0 .7175 g 5115 2886 M 149 -58 V stroke @@ -3155,35 +3163,35 @@ .1725 g 2829 1462 M 2679 1226 L stroke -LT1 +LT0 .6475 g 4138 2661 M -115 -66 V stroke -LT1 +LT0 .6131 g 3886 2532 M 137 63 V stroke -LT1 +LT0 .7375 g 4965 2922 M 4851 2813 L stroke -LT1 +LT0 .7125 g 4701 2829 M 150 -16 V stroke -LT1 +LT0 .7725 g 5643 3031 M 5529 2880 L stroke -LT1 +LT0 .7525 g 5379 2959 M 150 -79 V stroke -LT1 +LT0 .7075 g 4552 2823 M -115 -88 V stroke -LT1 +LT0 .6775 g 4288 2709 M 149 26 V stroke @@ -3203,15 +3211,15 @@ .3425 g 3128 1871 M 2978 1677 L stroke -LT1 +LT0 .7875 g 5643 3031 M 150 -99 V stroke -LT1 +LT0 .7825 g 5230 3016 M 5115 2886 L stroke -LT1 +LT0 .7575 g 4965 2922 M 150 -36 V stroke @@ -3223,11 +3231,11 @@ .5602 g 3576 2327 M 129 96 V stroke -LT1 +LT0 .7125 g 4402 2797 M -114 -88 V stroke -LT1 +LT0 .6775 g 4138 2661 M 150 48 V stroke @@ -3247,11 +3255,11 @@ .5225 g 3427 2196 M 149 131 V stroke -LT1 +LT0 .7625 g 4816 2938 M 4701 2829 L stroke -LT1 +LT0 .7325 g 4552 2823 M 149 6 V stroke @@ -3275,19 +3283,19 @@ .2275 g 2943 1529 M 2794 1293 L stroke -LT1 +LT0 .8275 g 5494 3110 M 5379 2959 L stroke -LT1 +LT0 .8025 g 5230 3016 M 149 -57 V stroke -LT1 +LT0 .7075 g 4253 2750 M -115 -89 V stroke -LT1 +LT0 .6675 g 3989 2594 M 149 67 V stroke @@ -3299,31 +3307,31 @@ .3175 g 3093 1744 M 2943 1529 L stroke -LT1 +LT0 .8175 g 5080 3053 M 4965 2922 L stroke -LT1 +LT0 .7875 g 4816 2938 M 149 -16 V stroke -LT1 +LT0 .7775 g 4666 2933 M 4552 2823 L stroke -LT1 +LT0 .7425 g 4402 2797 M 150 26 V stroke -LT1 +LT0 .6925 g 4103 2681 M -114 -87 V stroke -LT1 +LT0 .6475 g 3839 2505 M 150 89 V stroke -LT1 +LT0 .8475 g 5494 3110 M 149 -79 V stroke @@ -3335,11 +3343,11 @@ .3975 g 3242 1938 M 3093 1744 L stroke -LT1 +LT0 .6675 g 3954 2593 M -115 -88 V stroke -LT1 +LT0 .6279 g 3778 2460 M 61 45 V stroke @@ -3355,11 +3363,11 @@ .5743 g 3541 2263 M 128 113 V stroke -LT1 +LT0 .7825 g 4517 2906 M 4402 2797 L stroke -LT1 +LT0 .7425 g 4253 2750 M 149 47 V stroke @@ -3375,19 +3383,19 @@ .5839 g 3642 2342 M -101 -79 V stroke -LT1 +LT0 .8725 g 5344 3167 M 5230 3016 L stroke -LT1 +LT0 .8425 g 5080 3053 M 150 -37 V stroke -LT1 +LT0 .8425 g 4931 3068 M 4816 2938 L stroke -LT1 +LT0 .8075 g 4666 2933 M 150 5 V stroke @@ -3399,11 +3407,11 @@ .2925 g 3058 1617 M 2909 1381 L stroke -LT1 +LT0 .7775 g 4368 2859 M 4253 2750 L stroke -LT1 +LT0 .7325 g 4103 2681 M 150 69 V stroke @@ -3415,31 +3423,31 @@ .3825 g 3208 1832 M 3058 1617 L stroke -LT1 +LT0 .8975 g 5344 3167 M 150 -57 V stroke -LT1 +LT0 .7625 g 4218 2791 M 4103 2681 L stroke -LT1 +LT0 .7125 g 3954 2593 M 149 88 V stroke -LT1 +LT0 .8575 g 4781 3063 M 4666 2933 L stroke -LT1 +LT0 .8175 g 4517 2906 M 149 27 V stroke -LT1 +LT0 .9075 g 5195 3204 M 5080 3053 L stroke -LT1 +LT0 .8725 g 4931 3068 M 149 -15 V stroke @@ -3451,11 +3459,11 @@ .4625 g 3357 2026 M 3208 1832 L stroke -LT1 +LT0 .7375 g 4069 2701 M 3954 2593 L stroke -LT1 +LT0 .6825 g 3804 2483 M 150 110 V stroke @@ -3467,11 +3475,11 @@ .5325 g 3507 2200 M 3357 2026 L stroke -LT1 +LT0 .7025 g 3919 2592 M 3804 2483 L stroke -LT1 +LT0 .6506 g 3709 2399 M 95 84 V stroke @@ -3483,15 +3491,15 @@ .5881 g 3631 2327 M 3507 2200 L stroke -LT1 +LT0 .8625 g 4632 3036 M 4517 2906 L stroke -LT1 +LT0 .8175 g 4368 2859 M 149 47 V stroke -LT1 +LT0 .9375 g 5195 3204 M 149 -37 V stroke @@ -3503,19 +3511,19 @@ .3675 g 3173 1727 M 3023 1491 L stroke -LT1 +LT0 .9325 g 5045 3219 M 4931 3068 L stroke -LT1 +LT0 .8925 g 4781 3063 M 150 5 V stroke -LT1 +LT0 .8575 g 4482 2989 M 4368 2859 L stroke -LT1 +LT0 .8075 g 4218 2791 M 150 68 V stroke @@ -3527,19 +3535,19 @@ .4575 g 3322 1942 M 3173 1727 L stroke -LT1 +LT0 .8425 g 4333 2921 M 4218 2791 L stroke -LT1 +LT0 .7875 g 4069 2701 M 149 90 V stroke -LT1 +LT0 .9475 g 4896 3214 M 4781 3063 L stroke -LT1 +LT0 .9025 g 4632 3036 M 149 27 V stroke @@ -3551,15 +3559,15 @@ .5375 g 3472 2136 M 3322 1942 L stroke -LT1 +LT0 .8175 g 4183 2832 M 4069 2701 L stroke -LT1 +LT0 .7575 g 3919 2592 M 150 109 V stroke -LT1 +LT0 .9675 g 5045 3219 M 150 -15 V stroke @@ -3571,27 +3579,27 @@ .6006 g 3589 2272 M 3472 2136 L stroke -LT1 +LT0 .7825 g 4034 2721 M 3919 2592 L stroke -LT1 +LT0 .7175 g 3770 2461 M 149 131 V stroke -LT1 +LT0 .671 g 3770 2461 M 3639 2328 L stroke -LT1 +LT0 .7375 g 3884 2591 M 3770 2461 L stroke -LT1 +LT0 .9525 g 4746 3188 M 4632 3036 L stroke -LT1 +LT0 .9025 g 4482 2989 M 150 47 V stroke @@ -3603,15 +3611,15 @@ .4525 g 3288 1857 M 3138 1621 L stroke -LT1 +LT0 .9875 g 4896 3214 M 149 5 V stroke -LT1 +LT0 .9475 g 4597 3140 M 4482 2989 L stroke -LT1 +LT0 .8925 g 4333 2921 M 149 68 V stroke @@ -3623,11 +3631,11 @@ .5425 g 3437 2072 M 3288 1857 L stroke -LT1 +LT0 .9325 g 4447 3072 M 4333 2921 L stroke -LT1 +LT0 .8725 g 4183 2832 M 150 89 V stroke @@ -3635,51 +3643,51 @@ .6325 g 3552 2223 M 3437 2072 L stroke -LT1 +LT0 .6473 g 3586 2266 M -50 -66 V stroke -LT1 +LT0 .9975 g 4746 3188 M 150 26 V stroke -LT1 +LT0 .9075 g 4298 2983 M 4183 2832 L stroke -LT1 +LT0 .8425 g 4034 2721 M 149 111 V stroke -LT1 +LT0 .7075 g 3700 2417 M 3586 2266 L stroke -LT1 +LT0 .6925 g 3735 2439 M 3586 2266 L stroke -LT1 +LT0 .8725 g 4149 2873 M 4034 2721 L stroke -LT1 +LT0 .8025 g 3884 2591 M 150 130 V stroke -LT1 +LT0 .7725 g 3850 2590 M 3735 2439 L stroke -LT1 +LT0 .7525 g 3884 2591 M 3735 2439 L stroke -LT1 +LT0 .8275 g 3999 2741 M 3884 2591 L stroke -LT1 +LT0 .9975 g 4597 3140 M 149 48 V stroke @@ -3687,7 +3695,7 @@ .5475 g 3402 2008 M 3253 1772 L stroke -LT1 +LT0 .9875 g 4447 3072 M 150 68 V stroke @@ -3695,33 +3703,34 @@ .6375 g 3552 2223 M 3402 2008 L stroke -LT1 +LT0 .9675 g 4298 2983 M 149 89 V stroke -LT1 +LT0 .7175 g 3700 2417 M 3552 2223 L stroke -LT1 +LT0 .9375 g 4149 2873 M 149 110 V stroke -LT1 +LT0 .7875 g 3850 2590 M 3700 2417 L stroke -LT1 +LT0 .8975 g 3999 2741 M 150 132 V stroke -LT1 +LT0 .8475 g 3999 2741 M 3850 2590 L -% Begin plot #1 +% End plot #1 +% Begin plot #2 stroke LT0 -0 g % End plot #1 +0 g % End plot #2 0.500 UL LTb 3253 724 M Binary files octave-3.6.1/doc/interpreter/interpn.pdf and octave-3.6.2/doc/interpreter/interpn.pdf differ Binary files octave-3.6.1/doc/interpreter/interpn.png and octave-3.6.2/doc/interpreter/interpn.png differ diff -uNr octave-3.6.1/doc/interpreter/Makefile.in octave-3.6.2/doc/interpreter/Makefile.in --- octave-3.6.1/doc/interpreter/Makefile.in 2012-02-22 14:46:08.000000000 -0500 +++ octave-3.6.2/doc/interpreter/Makefile.in 2012-05-31 11:24:26.000000000 -0400 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -218,6 +218,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } NROFF = nroff MANS = $(dist_man1_MANS) DATA = $(octetc_DATA) @@ -1781,6 +1787,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/build-aux/common.mk $(srcdir)/images.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1799,7 +1806,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -munge-texi$(EXEEXT): $(munge_texi_OBJECTS) $(munge_texi_DEPENDENCIES) +munge-texi$(EXEEXT): $(munge_texi_OBJECTS) $(munge_texi_DEPENDENCIES) $(EXTRA_munge_texi_DEPENDENCIES) @rm -f munge-texi$(EXEEXT) $(CXXLINK) $(munge_texi_OBJECTS) $(munge_texi_LDADD) $(LIBS) @@ -2033,9 +2040,7 @@ files=`{ for i in $$list; do echo "$$i"; done; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-octetcDATA: $(octetc_DATA) @$(NORMAL_INSTALL) test -z "$(octetcdir)" || $(MKDIR_P) "$(DESTDIR)$(octetcdir)" @@ -2053,9 +2058,7 @@ @$(NORMAL_UNINSTALL) @list='$(octetc_DATA)'; test -n "$(octetcdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(octetcdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(octetcdir)" && rm -f $$files + dir='$(DESTDIR)$(octetcdir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -2172,10 +2175,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -2239,13 +2247,14 @@ for p in $$list; do \ if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ $(am__strip_dir) \ - if test -d "$$d$$p"; then \ + d2=$$d$$p; \ + if test -d "$$d2"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ - echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ + echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ else \ - list2="$$list2 $$d$$p"; \ + list2="$$list2 $$d2"; \ fi; \ done; \ test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ @@ -2277,8 +2286,13 @@ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done @$(POST_INSTALL) - @if (install-info --version && \ - install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ + @am__run_installinfo=yes; \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) am__run_installinfo=no;; \ + *) (install-info --version) >/dev/null 2>&1 \ + || am__run_installinfo=no;; \ + esac; \ + if test $$am__run_installinfo = yes; then \ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ diff -uNr octave-3.6.1/doc/interpreter/matrix.texi octave-3.6.2/doc/interpreter/matrix.texi --- octave-3.6.1/doc/interpreter/matrix.texi 2012-02-22 14:56:02.000000000 -0500 +++ octave-3.6.2/doc/interpreter/matrix.texi 2012-05-31 11:40:35.000000000 -0400 @@ -1225,7 +1225,7 @@ @c logspace scripts/general/logspace.m @anchor{doc-logspace} @deftypefn {Function File} {} logspace (@var{a}, @var{b}) -@deftypefnx {Function File} {} logspace (@var{b}, @var{b}, @var{n}) +@deftypefnx {Function File} {} logspace (@var{a}, @var{b}, @var{n}) @deftypefnx {Function File} {} logspace (@var{a}, pi, @var{n}) Return a row vector with @var{n} elements logarithmically spaced from @tex diff -uNr octave-3.6.1/doc/interpreter/mesh.eps octave-3.6.2/doc/interpreter/mesh.eps --- octave-3.6.1/doc/interpreter/mesh.eps 2012-02-22 15:01:47.000000000 -0500 +++ octave-3.6.2/doc/interpreter/mesh.eps 2012-05-31 11:40:53.000000000 -0400 @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: mesh.eps -%%Creator: gnuplot 4.4 patchlevel 0 -%%CreationDate: Wed Feb 22 15:01:47 2012 +%%Creator: gnuplot 4.6 patchlevel 0 +%%CreationDate: Thu May 31 11:40:53 2012 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments @@ -20,10 +20,12 @@ /Level1 false def /Rounded false def /ClipToBoundingBox false def +/SuppressPDFMark false def /TransparentPatterns false def /gnulinewidth 5.000 def /userlinewidth gnulinewidth def /Gamma 1.0 def +/BackgroundColor {-1.000 -1.000 -1.000} def % /vshift -66 def /dl1 { @@ -38,22 +40,6 @@ /vpt_ 31.5 def /hpt hpt_ def /vpt vpt_ def -Level1 {} { -/SDict 10 dict def -systemdict /pdfmark known not { - userdict /pdfmark systemdict /cleartomark get put -} if -SDict begin [ - /Title (mesh.eps) - /Subject (gnuplot plot) - /Creator (gnuplot 4.4 patchlevel 0) - /Author (jwe) -% /Producer (gnuplot) -% /Keywords () - /CreationDate (Wed Feb 22 15:01:47 2012) - /DOCINFO pdfmark -end -} ifelse /doclip { ClipToBoundingBox { newpath 50 50 moveto 410 50 lineto 410 302 lineto 50 302 lineto closepath @@ -61,7 +47,7 @@ } if } def % -% Gnuplot Prolog Version 4.4 (January 2010) +% Gnuplot Prolog Version 4.4 (August 2010) % %/SuppressPDFMark true def % @@ -73,6 +59,7 @@ /Z {closepath} bind def /C {setrgbcolor} bind def /f {rlineto fill} bind def +/g {setgray} bind def /Gshow {show} def % May be redefined later in the file to support UTF-8 /vpt2 vpt 2 mul def /hpt2 hpt 2 mul def @@ -94,6 +81,7 @@ dup 1 lt {pop 1} if 10 mul /udl exch def} def /PL {stroke userlinewidth setlinewidth Rounded {1 setlinejoin 1 setlinecap} if} def +3.8 setmiterlimit % Default Line colors /LCw {1 1 1} def /LCb {0 0 0} def @@ -459,8 +447,26 @@ Blacktext {gsave 0 setgray MFshow grestore} {MFshow} ifelse } bind def /XYsave { [( ) 1 2 true false 3 ()] } bind def /XYrestore { [( ) 1 2 true false 4 ()] } bind def +Level1 SuppressPDFMark or +{} { +/SDict 10 dict def +systemdict /pdfmark known not { + userdict /pdfmark systemdict /cleartomark get put +} if +SDict begin [ + /Title (mesh.eps) + /Subject (gnuplot plot) + /Creator (gnuplot 4.6 patchlevel 0) + /Author (jwe) +% /Producer (gnuplot) +% /Keywords () + /CreationDate (Thu May 31 11:40:53 2012) + /DOCINFO pdfmark +end +} ifelse end %%EndProlog +%%Page: 1 1 gnudict begin gsave doclip @@ -469,6 +475,7 @@ 0 setgray newpath (Helvetica) findfont 200 scalefont setfont +BackgroundColor 0 lt 3 1 roll 0 lt exch 0 lt or or not {BackgroundColor C 1.000 0 0 7200.00 5040.00 BoxColFill} if gsave % colour palette begin /maxcolors 64 def /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray @@ -546,6 +553,7 @@ 0.500 UL LTb 1.000 UP +% Begin plot #1 1.000 UL LT0 .2804 g 3193 2811 M @@ -3795,15 +3803,15 @@ .1074 g 5561 1982 M 60 3 V stroke -LT1 +LT0 .0214 g 2745 1758 M -45 35 V stroke -LT1 +LT0 .0351 g 2672 1820 M 28 -27 V stroke -LT1 +LT0 .0503 g 2655 1836 M 15 -15 V stroke @@ -3963,11 +3971,11 @@ .2803 g 5061 2388 M 60 2 V stroke -LT1 +LT0 .0143 g 2791 1729 M -46 29 V stroke -LT1 +LT0 .0352 g 2686 1810 M 59 -52 V stroke @@ -3995,15 +4003,15 @@ .1214 g 3030 2021 M -28 -73 V stroke -LT1 +LT0 .0603 g 4569 1865 M -46 -53 V stroke -LT1 +LT0 .0531 g 4582 1872 M -59 -60 V stroke -LT1 +LT0 .0311 g 4463 1763 M 60 49 V stroke @@ -4015,11 +4023,11 @@ .1168 g 5501 1990 M 60 -8 V stroke -LT1 +LT0 .087 g 4628 1931 M -46 -59 V stroke -LT1 +LT0 .0777 g 4628 1927 M -46 -55 V stroke @@ -4051,23 +4059,23 @@ .255 g 4941 2323 M -46 -15 V stroke -LT1 +LT0 .0394 g 4509 1808 M -46 -45 V stroke -LT1 +LT0 .017 g 4418 1735 M 42 26 V stroke -LT1 +LT0 .1186 g 4688 2004 M -46 -60 V stroke -LT1 +LT0 .0924 g 2594 1900 M -46 57 V stroke -LT1 +LT0 .1234 g 2499 2020 M 49 -63 V stroke @@ -4107,11 +4115,11 @@ .276 g 2048 2353 M 59 35 V stroke -LT1 +LT0 .0243 g 4449 1760 M -46 -34 V stroke -LT1 +LT0 .0088 g 4387 1719 M 16 7 V stroke @@ -4131,19 +4139,19 @@ .2806 g 2153 2373 M 60 3 V stroke -LT1 +LT0 .0739 g 2640 1851 M -46 49 V stroke -LT1 +LT0 .1074 g 2534 1978 M 60 -78 V stroke -LT1 +LT0 .0102 g 2837 1704 M -46 25 V stroke -LT1 +LT0 .0284 g 2732 1775 M 59 -46 V stroke @@ -4231,11 +4239,11 @@ .2589 g 2034 2312 M -46 -9 V stroke -LT1 +LT0 .061 g 2675 1819 M -35 32 V stroke -LT1 +LT0 .0908 g 2580 1928 M 60 -77 V stroke @@ -4291,11 +4299,11 @@ .2231 g 4881 2262 M -59 -73 V stroke -LT1 +LT0 .0084 g 2883 1684 M -46 20 V stroke -LT1 +LT0 .0246 g 2777 1747 M 60 -43 V stroke @@ -4359,11 +4367,11 @@ .2708 g 4987 2327 M -46 -4 V stroke -LT1 +LT0 .0494 g 2732 1775 M -46 35 V stroke -LT1 +LT0 .0793 g 2626 1884 M 57 -71 V stroke @@ -4439,23 +4447,23 @@ .2732 g 2034 2312 M 59 39 V stroke -LT1 +LT0 .105 g 4614 1931 M -43 -62 V stroke -LT1 +LT0 .0966 g 4628 1931 M -50 -56 V stroke -LT1 +LT0 .0686 g 4509 1808 M 60 57 V stroke -LT1 +LT0 .0798 g 4555 1872 M -46 -64 V stroke -LT1 +LT0 .0479 g 4449 1760 M 60 48 V stroke @@ -4483,11 +4491,11 @@ .276 g 5093 2331 M 59 -6 V stroke -LT1 +LT0 .1315 g 4674 1996 M -46 -65 V stroke -LT1 +LT0 .1243 g 4688 2004 M -60 -73 V stroke @@ -4511,19 +4519,19 @@ .1505 g 5382 2029 M 60 -23 V stroke -LT1 +LT0 .0605 g 4495 1820 M -46 -60 V stroke -LT1 +LT0 .0323 g 4389 1721 M 60 39 V stroke -LT1 +LT0 .0428 g 2777 1747 M -45 28 V stroke -LT1 +LT0 .0693 g 2672 1848 M 60 -73 V stroke @@ -4539,11 +4547,11 @@ .1293 g 4086 1976 M 12 -42 V stroke -LT1 +LT0 .0084 g 2929 1666 M -46 18 V stroke -LT1 +LT0 .0234 g 2823 1725 M 60 -41 V stroke @@ -4567,11 +4575,11 @@ .1069 g 5533 1912 M 60 5 V stroke -LT1 +LT0 .1427 g 4694 2011 M -6 -7 V stroke -LT1 +LT0 .1422 g 4694 2011 M -6 -7 V stroke @@ -4587,11 +4595,11 @@ .3111 g 4068 2455 M 60 -143 V stroke -LT1 +LT0 .0457 g 4435 1775 M -46 -54 V stroke -LT1 +LT0 .0214 g 4329 1691 M 60 30 V stroke @@ -4615,11 +4623,11 @@ .2004 g 4808 2155 M -24 -30 V stroke -LT1 +LT0 .1243 g 2580 1928 M -46 50 V stroke -LT1 +LT0 .1458 g 2504 2018 M 30 -40 V stroke @@ -4667,19 +4675,19 @@ .1406 g 3168 1995 M -24 -66 V stroke -LT1 +LT0 .0352 g 4375 1738 M -46 -47 V stroke -LT1 +LT0 .0143 g 4270 1666 M 59 25 V stroke -LT1 +LT0 .0396 g 2823 1725 M -46 22 V stroke -LT1 +LT0 .064 g 2718 1819 M 59 -72 V stroke @@ -4711,11 +4719,11 @@ .2825 g 5033 2319 M 60 12 V stroke -LT1 +LT0 .1093 g 2626 1884 M -46 44 V stroke -LT1 +LT0 .1423 g 2520 2009 M 60 -81 V stroke @@ -4731,11 +4739,11 @@ .1147 g 5474 1916 M 59 -4 V stroke -LT1 +LT0 .0097 g 2959 1657 M -30 9 V stroke -LT1 +LT0 .0246 g 2869 1709 M 60 -43 V stroke @@ -4783,11 +4791,11 @@ .2195 g 1960 2205 M -60 -70 V stroke -LT1 +LT0 .0284 g 4315 1708 M -45 -42 V stroke -LT1 +LT0 .0102 g 4210 1646 M 60 20 V stroke @@ -4811,11 +4819,11 @@ .1345 g 3214 1944 M -8 -20 V stroke -LT1 +LT0 .098 g 2672 1848 M -46 36 V stroke -LT1 +LT0 .1296 g 2566 1968 M 60 -84 V stroke @@ -4879,11 +4887,11 @@ .2234 g 4040 2183 M 60 -55 V stroke -LT1 +LT0 .0396 g 2869 1709 M -46 16 V stroke -LT1 +LT0 .0623 g 2763 1796 M 60 -71 V stroke @@ -4931,11 +4939,11 @@ .2329 g 2337 2197 M 46 -37 V stroke -LT1 +LT0 .0246 g 4256 1685 M -46 -39 V stroke -LT1 +LT0 .0084 g 4150 1630 M 60 16 V stroke @@ -4951,7 +4959,7 @@ .3736 g 3164 2620 M -60 -233 V stroke -LT1 +LT0 .0386 g 2915 1698 M 24 -18 V stroke @@ -4963,43 +4971,43 @@ .2645 g 5125 2261 M 59 -14 V stroke -LT1 +LT0 .1278 g 4600 1944 M -45 -72 V stroke -LT1 +LT0 .1149 g 4614 1931 M -59 -59 V stroke -LT1 +LT0 .0924 g 4495 1820 M 60 52 V stroke -LT1 +LT0 .1514 g 4660 2000 M -46 -69 V stroke -LT1 +LT0 .1409 g 4674 1996 M -60 -65 V stroke -LT1 +LT0 .0905 g 2718 1819 M -46 29 V stroke -LT1 +LT0 .1204 g 2612 1932 M 60 -84 V stroke -LT1 +LT0 .1592 g 4683 2009 M -9 -13 V stroke -LT1 +LT0 .1074 g 4541 1893 M -46 -73 V stroke -LT1 +LT0 .0739 g 4435 1775 M 60 45 V stroke @@ -5027,11 +5035,11 @@ .2767 g 2066 2267 M 59 35 V stroke -LT1 +LT0 .0908 g 4481 1847 M -46 -72 V stroke -LT1 +LT0 .0596 g 4375 1738 M 60 37 V stroke @@ -5099,19 +5107,19 @@ .1603 g 3967 1990 M 59 4 V stroke -LT1 +LT0 .0234 g 4196 1667 M -46 -37 V stroke -LT1 +LT0 .0084 g 4090 1617 M 60 13 V stroke -LT1 +LT0 .0428 g 2915 1698 M -46 11 V stroke -LT1 +LT0 .064 g 2809 1780 M 60 -71 V stroke @@ -5139,11 +5147,11 @@ .2602 g 2006 2213 M 60 54 V stroke -LT1 +LT0 .0781 g 4421 1809 M -46 -71 V stroke -LT1 +LT0 .0494 g 4315 1708 M 60 30 V stroke @@ -5159,11 +5167,11 @@ .2554 g 2052 2215 M -46 -2 V stroke -LT1 +LT0 .0868 g 2763 1796 M -45 23 V stroke -LT1 +LT0 .1148 g 2658 1903 M 60 -84 V stroke @@ -5207,7 +5215,7 @@ .333 g 3196 2503 M -60 -253 V stroke -LT1 +LT0 .1626 g 2566 1968 M -46 41 V stroke @@ -5223,11 +5231,11 @@ .4927 g 3976 2852 M 60 -201 V stroke -LT1 +LT0 .0693 g 4361 1777 M -46 -69 V stroke -LT1 +LT0 .0428 g 4256 1685 M 59 23 V stroke @@ -5247,11 +5255,11 @@ .2812 g 2111 2261 M 60 25 V stroke -LT1 +LT0 .0246 g 4136 1655 M -46 -38 V stroke -LT1 +LT0 .0102 g 4030 1607 M 60 10 V stroke @@ -5279,15 +5287,15 @@ .1603 g 3907 1964 M 60 26 V stroke -LT1 +LT0 .0087 g 3971 1602 M -46 -11 V stroke -LT1 +LT0 .006 g 4030 1607 M -105 -16 V stroke -LT1 +LT0 .0017 g 3865 1581 M 60 10 V stroke @@ -5307,35 +5315,35 @@ .2629 g 5111 2223 M 60 -13 V stroke -LT1 +LT0 .0459 g 2923 1698 M -8 0 V stroke -LT1 +LT0 .066 g 2863 1761 M 52 -63 V stroke -LT1 +LT0 .0868 g 2809 1780 M -46 16 V stroke -LT1 +LT0 .113 g 2704 1880 M 59 -84 V stroke -LT1 +LT0 .152 g 2612 1932 M -46 36 V stroke -LT1 +LT0 .1666 g 2542 1999 M 24 -31 V stroke -LT1 +LT0 .064 g 4302 1752 M -46 -67 V stroke -LT1 +LT0 .0396 g 4196 1667 M 60 18 V stroke @@ -5435,11 +5443,11 @@ .172 g 3741 2039 M 33 -130 V stroke -LT1 +LT0 .0284 g 4076 1649 M -46 -42 V stroke -LT1 +LT0 .0143 g 3971 1602 M 59 5 V stroke @@ -5511,47 +5519,47 @@ .4309 g 3210 2715 M -60 -254 V stroke -LT1 +LT0 .0144 g 3911 1603 M -46 -22 V stroke -LT1 +LT0 .0064 g 3805 1579 M 60 2 V stroke -LT1 +LT0 .1766 g 4660 2000 M 5 5 V stroke -LT1 +LT0 .1447 g 2658 1903 M -46 29 V stroke -LT1 +LT0 .1636 g 2575 1982 M 37 -50 V stroke -LT1 +LT0 .1772 g 4664 2005 M -4 -5 V stroke -LT1 +LT0 .1642 g 4600 1944 M 60 56 V stroke -LT1 +LT0 .0623 g 4242 1733 M -46 -66 V stroke -LT1 +LT0 .0396 g 4136 1655 M 60 12 V stroke -LT1 +LT0 .1722 g 4637 1999 M -37 -55 V stroke -LT1 +LT0 .1428 g 4541 1893 M 59 51 V stroke @@ -5579,19 +5587,19 @@ .1807 g 3320 2057 M 45 -104 V stroke -LT1 +LT0 .1583 g 4587 1967 M -46 -74 V stroke -LT1 +LT0 .1243 g 4481 1847 M 60 46 V stroke -LT1 +LT0 .0904 g 2854 1772 M -45 8 V stroke -LT1 +LT0 .1148 g 2750 1865 M 59 -85 V stroke @@ -5611,15 +5619,15 @@ .2753 g 5051 2226 M 60 -3 V stroke -LT1 +LT0 .1423 g 4527 1924 M -46 -77 V stroke -LT1 +LT0 .1093 g 4421 1809 M 60 38 V stroke -LT1 +LT0 .0073 g 3805 1579 M -71 -6 V stroke @@ -5663,11 +5671,11 @@ .2234 g 3274 2147 M 46 -90 V stroke -LT1 +LT0 .0352 g 4017 1650 M -46 -48 V stroke -LT1 +LT0 .0214 g 3911 1603 M 60 -1 V stroke @@ -5679,11 +5687,11 @@ .333 g 3288 2464 M -60 -252 V stroke -LT1 +LT0 .1296 g 4467 1887 M -46 -78 V stroke -LT1 +LT0 .098 g 4361 1777 M 60 32 V stroke @@ -5695,11 +5703,11 @@ .2589 g 5097 2182 M 60 -13 V stroke -LT1 +LT0 .1411 g 2704 1880 M -46 23 V stroke -LT1 +LT0 .1597 g 2618 1958 M 40 -55 V stroke @@ -5711,11 +5719,11 @@ .2041 g 3636 2129 M 45 -190 V stroke -LT1 +LT0 .064 g 4182 1722 M -46 -67 V stroke -LT1 +LT0 .0428 g 4076 1649 M 60 6 V stroke @@ -5731,11 +5739,11 @@ .2589 g 2038 2156 M 60 57 V stroke -LT1 +LT0 .0243 g 3851 1613 M -46 -34 V stroke -LT1 +LT0 .0153 g 3750 1585 M 55 -6 V stroke @@ -5779,11 +5787,11 @@ .2746 g 4886 2197 M 59 33 V stroke -LT1 +LT0 .1204 g 4407 1856 M -46 -79 V stroke -LT1 +LT0 .0905 g 4302 1752 M 59 25 V stroke @@ -5851,35 +5859,35 @@ .2625 g 4826 2156 M 60 41 V stroke -LT1 +LT0 .0457 g 3957 1657 M -46 -54 V stroke -LT1 +LT0 .0323 g 3851 1613 M 60 -10 V stroke -LT1 +LT0 .1411 g 2750 1865 M -46 15 V stroke -LT1 +LT0 .1542 g 2672 1924 M 32 -44 V stroke -LT1 +LT0 .0693 g 4122 1718 M -46 -69 V stroke -LT1 +LT0 .0494 g 4017 1650 M 59 -1 V stroke -LT1 +LT0 .1148 g 4347 1831 M -45 -79 V stroke -LT1 +LT0 .0868 g 4242 1733 M 60 19 V stroke @@ -5995,15 +6003,15 @@ .1957 g 5175 1997 M 59 -18 V stroke -LT1 +LT0 .113 g 4288 1813 M -46 -80 V stroke -LT1 +LT0 .0868 g 4182 1722 M 60 11 V stroke -LT1 +LT0 .1896 g 4587 1967 M 39 30 V stroke @@ -6015,19 +6023,19 @@ .2819 g 2189 2193 M 60 19 V stroke -LT1 +LT0 .1932 g 4606 1993 M -19 -26 V stroke -LT1 +LT0 .1763 g 4527 1924 M 60 43 V stroke -LT1 +LT0 .0781 g 4062 1720 M -45 -70 V stroke -LT1 +LT0 .0596 g 3957 1657 M 60 -7 V stroke @@ -6039,11 +6047,11 @@ .3026 g 3591 2337 M 45 -208 V stroke -LT1 +LT0 .0605 g 3897 1672 M -46 -59 V stroke -LT1 +LT0 .0463 g 3802 1628 M 49 -15 V stroke @@ -6063,11 +6071,11 @@ .2791 g 4872 2174 M 59 26 V stroke -LT1 +LT0 .1897 g 4567 1984 M -40 -60 V stroke -LT1 +LT0 .1626 g 4467 1887 M 60 37 V stroke @@ -6119,11 +6127,11 @@ .3394 g 3334 2384 M 45 -112 V stroke -LT1 +LT0 .1148 g 4228 1802 M -46 -80 V stroke -LT1 +LT0 .0905 g 4122 1718 M 60 4 V stroke @@ -6143,11 +6151,11 @@ .4808 g 3302 2777 M -60 -273 V stroke -LT1 +LT0 .1817 g 4513 1960 M -46 -73 V stroke -LT1 +LT0 .152 g 4407 1856 M 60 31 V stroke @@ -6199,19 +6207,19 @@ .2127 g 5115 2012 M 60 -15 V stroke -LT1 +LT0 .1735 g 4453 1932 M -46 -76 V stroke -LT1 +LT0 .1447 g 4347 1831 M 60 25 V stroke -LT1 +LT0 .0908 g 4003 1729 M -46 -72 V stroke -LT1 +LT0 .0739 g 3897 1672 M 60 -15 V stroke @@ -6251,11 +6259,11 @@ .2616 g 4764 2113 M 48 29 V stroke -LT1 +LT0 .1204 g 4168 1797 M -46 -79 V stroke -LT1 +LT0 .098 g 4062 1720 M 60 -2 V stroke @@ -6275,11 +6283,11 @@ .2806 g 2281 2160 M 60 3 V stroke -LT1 +LT0 .1685 g 4393 1909 M -46 -78 V stroke -LT1 +LT0 .1411 g 4288 1813 M 59 18 V stroke @@ -6371,19 +6379,19 @@ .468 g 3769 2714 M 46 -272 V stroke -LT1 +LT0 .1668 g 4334 1891 M -46 -78 V stroke -LT1 +LT0 .1411 g 4228 1802 M 60 11 V stroke -LT1 +LT0 .1001 g 3930 1724 M -33 -52 V stroke -LT1 +LT0 .0864 g 3872 1682 M 25 -10 V stroke @@ -6391,11 +6399,11 @@ .279 g 2327 2141 M 60 -3 V stroke -LT1 +LT0 .1296 g 4108 1799 M -46 -79 V stroke -LT1 +LT0 .1093 g 4003 1729 M 59 -9 V stroke @@ -6415,7 +6423,7 @@ .279 g 4798 2127 M 60 24 V stroke -LT1 +LT0 .21 g 4513 1960 M 36 20 V stroke @@ -6447,19 +6455,19 @@ .7472 g 3389 3377 M 3284 3059 L stroke -LT1 +LT0 .2121 g 4524 1974 M -11 -14 V stroke -LT1 +LT0 .2033 g 4453 1932 M 60 28 V stroke -LT1 +LT0 .1685 g 4274 1879 M -46 -77 V stroke -LT1 +LT0 .1447 g 4168 1797 M 60 5 V stroke @@ -6507,19 +6515,19 @@ .2805 g 2267 2114 M 60 27 V stroke -LT1 +LT0 .1392 g 4043 1797 M -40 -68 V stroke -LT1 +LT0 .1226 g 3956 1742 M 47 -13 V stroke -LT1 +LT0 .2105 g 4476 1962 M -23 -30 V stroke -LT1 +LT0 .1973 g 4393 1909 M 60 23 V stroke @@ -6559,11 +6567,11 @@ .278 g 2313 2098 M -46 16 V stroke -LT1 +LT0 .1735 g 4214 1873 M -46 -76 V stroke -LT1 +LT0 .152 g 4108 1799 M 60 -2 V stroke @@ -6591,11 +6599,11 @@ .2764 g 2419 2101 M 59 -10 V stroke -LT1 +LT0 .2089 g 4422 1947 M -29 -38 V stroke -LT1 +LT0 .1942 g 4334 1891 M 59 18 V stroke @@ -6655,11 +6663,11 @@ .6064 g 3407 2997 M -60 -265 V stroke -LT1 +LT0 .2074 g 4362 1930 M -28 -39 V stroke -LT1 +LT0 .1942 g 4274 1879 M 60 12 V stroke @@ -6675,11 +6683,11 @@ .5618 g 3663 2881 M 46 -256 V stroke -LT1 +LT0 .173 g 4138 1847 M -30 -48 V stroke -LT1 +LT0 .1616 g 4058 1805 M 50 -6 V stroke @@ -6739,11 +6747,11 @@ .6064 g 3723 2984 M 46 -270 V stroke -LT1 +LT0 .2057 g 4296 1909 M -22 -30 V stroke -LT1 +LT0 .1973 g 4214 1873 M 60 6 V stroke @@ -6831,11 +6839,11 @@ .7895 g 3389 3377 M -60 -183 V stroke -LT1 +LT0 .203 g 4221 1882 M -7 -9 V stroke -LT1 +LT0 .2006 g 4198 1873 M 16 0 V stroke @@ -8342,10 +8350,11 @@ LT0 .1067 g 3322 1367 M 60 4 V -% Begin plot #1 +% End plot #1 +% Begin plot #2 stroke LT0 -.1784 g % End plot #1 +.1784 g % End plot #2 0.500 UL LTb 3253 724 M @@ -8484,11 +8493,9 @@ 70 18 V stroke LTa -4580 1814 M -514 127 V 4510 1797 M -68 16 V --76 -18 R +584 144 V +4502 1795 M 7 1 V 2106 1204 M 1036 255 V @@ -8508,8 +8515,10 @@ 70 18 V stroke LTa +2737 1741 M +25 6 V 1532 1444 M -1230 303 V +1204 297 V stroke LTb 1532 1444 M Binary files octave-3.6.1/doc/interpreter/mesh.pdf and octave-3.6.2/doc/interpreter/mesh.pdf differ Binary files octave-3.6.1/doc/interpreter/mesh.png and octave-3.6.2/doc/interpreter/mesh.png differ Binary files octave-3.6.1/doc/interpreter/octave.dvi and octave-3.6.2/doc/interpreter/octave.dvi differ diff -uNr octave-3.6.1/doc/interpreter/octave.html/Build-Dependencies.html octave-3.6.2/doc/interpreter/octave.html/Build-Dependencies.html --- octave-3.6.1/doc/interpreter/octave.html/Build-Dependencies.html 2012-02-22 15:02:29.000000000 -0500 +++ octave-3.6.2/doc/interpreter/octave.html/Build-Dependencies.html 2012-05-31 11:41:35.000000000 -0400 @@ -38,7 +38,7 @@ yourself. diff -uNr octave-3.6.1/doc/interpreter/octave.html/Build-Tools.html octave-3.6.2/doc/interpreter/octave.html/Build-Tools.html --- octave-3.6.1/doc/interpreter/octave.html/Build-Tools.html 2012-02-22 15:02:29.000000000 -0500 +++ octave-3.6.2/doc/interpreter/octave.html/Build-Tools.html 2012-05-31 11:41:35.000000000 -0400 @@ -6,7 +6,7 @@ - + @@ -27,7 +27,7 @@

Next: , -Previous: Tips for Specific Systems, +Previous: Obtaining the Depencies Automatically, Up: Build Dependencies


Binary files octave-3.6.1/doc/interpreter/octave.html/convhull.png and octave-3.6.2/doc/interpreter/octave.html/convhull.png differ Binary files octave-3.6.1/doc/interpreter/octave.html/delaunay.png and octave-3.6.2/doc/interpreter/octave.html/delaunay.png differ Binary files octave-3.6.1/doc/interpreter/octave.html/errorbar.png and octave-3.6.2/doc/interpreter/octave.html/errorbar.png differ Binary files octave-3.6.1/doc/interpreter/octave.html/extended.png and octave-3.6.2/doc/interpreter/octave.html/extended.png differ diff -uNr octave-3.6.1/doc/interpreter/octave.html/Function-Files.html octave-3.6.2/doc/interpreter/octave.html/Function-Files.html --- octave-3.6.1/doc/interpreter/octave.html/Function-Files.html 2012-02-22 15:02:27.000000000 -0500 +++ octave-3.6.2/doc/interpreter/octave.html/Function-Files.html 2012-05-31 11:41:33.000000000 -0400 @@ -181,8 +181,8 @@
mode
This value determines whether the editor should be started in async mode (editor is started in the background and Octave continues) or sync mode -(Octave waits until the editor exits). Set it to "async" to start the editor -in async mode. The default is "sync" (see also "system"). +(Octave waits until the editor exits). Set it to "sync" to start the editor +in sync mode. The default is "async" (see also "system").
editinplace
Determines whether files should be edited in place, without regard to whether they are modifiable or not. The default is false. Binary files octave-3.6.1/doc/interpreter/octave.html/gplot.png and octave-3.6.2/doc/interpreter/octave.html/gplot.png differ Binary files octave-3.6.1/doc/interpreter/octave.html/griddata.png and octave-3.6.2/doc/interpreter/octave.html/griddata.png differ Binary files octave-3.6.1/doc/interpreter/octave.html/grid.png and octave-3.6.2/doc/interpreter/octave.html/grid.png differ Binary files octave-3.6.1/doc/interpreter/octave.html/hist.png and octave-3.6.2/doc/interpreter/octave.html/hist.png differ diff -uNr octave-3.6.1/doc/interpreter/octave.html/index.html octave-3.6.2/doc/interpreter/octave.html/index.html --- octave-3.6.1/doc/interpreter/octave.html/index.html 2012-02-22 15:02:29.000000000 -0500 +++ octave-3.6.2/doc/interpreter/octave.html/index.html 2012-05-31 11:41:35.000000000 -0400 @@ -666,7 +666,7 @@
  • G.1 Build Dependencies @@ -705,7 +705,7 @@

    This manual documents how to run, install and port GNU Octave, as well as its new features and incompatibilities, and how to report bugs. -It corresponds to GNU Octave version 3.6.1. +It corresponds to GNU Octave version 3.6.2.