Import Upstream version 1.1~pre8
This commit is contained in:
Guus Sliepen
parent
2ebbac3278
commit
f5c641f5cc
151 changed files with 11360 additions and 4420 deletions
188
doc/Makefile.in
188
doc/Makefile.in
|
|
@ -1,9 +1,8 @@
|
|||
# Makefile.in generated by automake 1.11.6 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.13.3 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
||||
# Foundation, Inc.
|
||||
# Copyright (C) 1994-2013 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.
|
||||
|
|
@ -15,23 +14,51 @@
|
|||
|
||||
@SET_MAKE@
|
||||
VPATH = @srcdir@
|
||||
am__make_dryrun = \
|
||||
{ \
|
||||
am__dry=no; \
|
||||
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
||||
am__make_running_with_option = \
|
||||
case $${target_option-} in \
|
||||
?) ;; \
|
||||
*) echo "am__make_running_with_option: internal error: invalid" \
|
||||
"target option '$${target_option-}' specified" >&2; \
|
||||
exit 1;; \
|
||||
esac; \
|
||||
has_opt=no; \
|
||||
sane_makeflags=$$MAKEFLAGS; \
|
||||
if $(am__is_gnu_make); then \
|
||||
sane_makeflags=$$MFLAGS; \
|
||||
else \
|
||||
case $$MAKEFLAGS in \
|
||||
*\\[\ \ ]*) \
|
||||
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
|
||||
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
|
||||
*) \
|
||||
for am__flg in $$MAKEFLAGS; do \
|
||||
case $$am__flg in \
|
||||
*=*|--*) ;; \
|
||||
*n*) am__dry=yes; break;; \
|
||||
esac; \
|
||||
done;; \
|
||||
bs=\\; \
|
||||
sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
|
||||
| sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
|
||||
esac; \
|
||||
test $$am__dry = yes; \
|
||||
}
|
||||
fi; \
|
||||
skip_next=no; \
|
||||
strip_trailopt () \
|
||||
{ \
|
||||
flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
|
||||
}; \
|
||||
for flg in $$sane_makeflags; do \
|
||||
test $$skip_next = yes && { skip_next=no; continue; }; \
|
||||
case $$flg in \
|
||||
*=*|--*) continue;; \
|
||||
-*I) strip_trailopt 'I'; skip_next=yes;; \
|
||||
-*I?*) strip_trailopt 'I';; \
|
||||
-*O) strip_trailopt 'O'; skip_next=yes;; \
|
||||
-*O?*) strip_trailopt 'O';; \
|
||||
-*l) strip_trailopt 'l'; skip_next=yes;; \
|
||||
-*l?*) strip_trailopt 'l';; \
|
||||
-[dEDm]) skip_next=yes;; \
|
||||
-[JT]) skip_next=yes;; \
|
||||
esac; \
|
||||
case $$flg in \
|
||||
*$$target_option*) has_opt=yes; break;; \
|
||||
esac; \
|
||||
done; \
|
||||
test $$has_opt = yes
|
||||
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
|
||||
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
|
|
@ -50,20 +77,60 @@ POST_UNINSTALL = :
|
|||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = doc
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in texinfo.tex
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am texinfo.tex
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/attribute.m4 \
|
||||
$(top_srcdir)/m4/curses.m4 $(top_srcdir)/m4/lzo.m4 \
|
||||
$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/readline.m4 \
|
||||
$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/configure.in
|
||||
$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
AM_V_P = $(am__v_P_@AM_V@)
|
||||
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
|
||||
am__v_P_0 = false
|
||||
am__v_P_1 = :
|
||||
AM_V_GEN = $(am__v_GEN_@AM_V@)
|
||||
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
|
||||
am__v_GEN_0 = @echo " GEN " $@;
|
||||
am__v_GEN_1 =
|
||||
AM_V_at = $(am__v_at_@AM_V@)
|
||||
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
|
||||
am__v_at_0 = @
|
||||
am__v_at_1 =
|
||||
SOURCES =
|
||||
DIST_SOURCES =
|
||||
AM_V_DVIPS = $(am__v_DVIPS_@AM_V@)
|
||||
am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@)
|
||||
am__v_DVIPS_0 = @echo " DVIPS " $@;
|
||||
am__v_DVIPS_1 =
|
||||
AM_V_MAKEINFO = $(am__v_MAKEINFO_@AM_V@)
|
||||
am__v_MAKEINFO_ = $(am__v_MAKEINFO_@AM_DEFAULT_V@)
|
||||
am__v_MAKEINFO_0 = @echo " MAKEINFO" $@;
|
||||
am__v_MAKEINFO_1 =
|
||||
AM_V_INFOHTML = $(am__v_INFOHTML_@AM_V@)
|
||||
am__v_INFOHTML_ = $(am__v_INFOHTML_@AM_DEFAULT_V@)
|
||||
am__v_INFOHTML_0 = @echo " INFOHTML" $@;
|
||||
am__v_INFOHTML_1 =
|
||||
AM_V_TEXI2DVI = $(am__v_TEXI2DVI_@AM_V@)
|
||||
am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_@AM_DEFAULT_V@)
|
||||
am__v_TEXI2DVI_0 = @echo " TEXI2DVI" $@;
|
||||
am__v_TEXI2DVI_1 =
|
||||
AM_V_TEXI2PDF = $(am__v_TEXI2PDF_@AM_V@)
|
||||
am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_@AM_DEFAULT_V@)
|
||||
am__v_TEXI2PDF_0 = @echo " TEXI2PDF" $@;
|
||||
am__v_TEXI2PDF_1 =
|
||||
AM_V_texinfo = $(am__v_texinfo_@AM_V@)
|
||||
am__v_texinfo_ = $(am__v_texinfo_@AM_DEFAULT_V@)
|
||||
am__v_texinfo_0 = -q
|
||||
am__v_texinfo_1 =
|
||||
AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
|
||||
am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
|
||||
am__v_texidevnull_0 = > /dev/null
|
||||
am__v_texidevnull_1 =
|
||||
INFO_DEPS = tinc.info
|
||||
am__TEXINFO_TEX_DIR = $(srcdir)
|
||||
DVIS = tinc.dvi
|
||||
|
|
@ -114,6 +181,7 @@ man5dir = $(mandir)/man5
|
|||
man8dir = $(mandir)/man8
|
||||
NROFF = nroff
|
||||
MANS = $(man_MANS)
|
||||
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
# Use `ginstall' in the definition of man_MANS to avoid
|
||||
|
|
@ -122,6 +190,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|||
transform = s/ginstall/install/; @program_transform_name@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
|
|
@ -141,7 +210,6 @@ ECHO_T = @ECHO_T@
|
|||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
GREP = @GREP@
|
||||
INCLUDES = @INCLUDES@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
@ -155,7 +223,6 @@ LIBOBJS = @LIBOBJS@
|
|||
LIBS = @LIBS@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
OBJEXT = @OBJEXT@
|
||||
|
|
@ -237,7 +304,7 @@ all: all-am
|
|||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .dvi .ps
|
||||
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
|
||||
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
||||
@for dep in $?; do \
|
||||
case '$(am__configure_deps)' in \
|
||||
*$$dep*) \
|
||||
|
|
@ -262,14 +329,14 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
|
||||
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||
$(top_srcdir)/configure: $(am__configure_deps)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
$(am__aclocal_m4_deps):
|
||||
|
||||
tinc.info: tinc.texi
|
||||
restore=: && backupdir="$(am__leading_dot)am$$$$" && \
|
||||
$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
|
||||
rm -rf $$backupdir && mkdir $$backupdir && \
|
||||
if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
|
||||
for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
|
||||
|
|
@ -287,18 +354,20 @@ tinc.info: tinc.texi
|
|||
rm -rf $$backupdir; exit $$rc
|
||||
|
||||
tinc.dvi: tinc.texi
|
||||
TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
|
||||
$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
|
||||
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
|
||||
$(TEXI2DVI) -o $@ `test -f 'tinc.texi' || echo '$(srcdir)/'`tinc.texi
|
||||
$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
|
||||
`test -f 'tinc.texi' || echo '$(srcdir)/'`tinc.texi
|
||||
|
||||
tinc.pdf: tinc.texi
|
||||
TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
|
||||
$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
|
||||
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
|
||||
$(TEXI2PDF) -o $@ `test -f 'tinc.texi' || echo '$(srcdir)/'`tinc.texi
|
||||
$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
|
||||
`test -f 'tinc.texi' || echo '$(srcdir)/'`tinc.texi
|
||||
|
||||
tinc.html: tinc.texi
|
||||
rm -rf $(@:.html=.htp)
|
||||
if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
|
||||
$(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
|
||||
$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
|
||||
-o $(@:.html=.htp) `test -f 'tinc.texi' || echo '$(srcdir)/'`tinc.texi; \
|
||||
then \
|
||||
rm -rf $@; \
|
||||
|
|
@ -310,8 +379,8 @@ tinc.html: tinc.texi
|
|||
exit 1; \
|
||||
fi
|
||||
.dvi.ps:
|
||||
TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
|
||||
$(DVIPS) -o $@ $<
|
||||
$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
|
||||
$(DVIPS) $(AM_V_texinfo) -o $@ $<
|
||||
|
||||
uninstall-dvi-am:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
|
|
@ -390,9 +459,7 @@ dist-info: $(INFO_DEPS)
|
|||
done
|
||||
|
||||
mostlyclean-aminfo:
|
||||
-rm -rf tinc.aux tinc.cp tinc.cps tinc.fn tinc.fns tinc.ky tinc.kys \
|
||||
tinc.log tinc.pg tinc.pgs tinc.tmp tinc.toc tinc.tp tinc.tps \
|
||||
tinc.vr tinc.vrs
|
||||
-rm -rf tinc.t2d tinc.t2p
|
||||
|
||||
clean-aminfo:
|
||||
-test -z "tinc.dvi tinc.pdf tinc.ps tinc.html" \
|
||||
|
|
@ -490,27 +557,14 @@ uninstall-man8:
|
|||
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
|
||||
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
|
||||
dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
|
||||
tags: TAGS
|
||||
TAGS:
|
||||
tags TAGS:
|
||||
|
||||
ctags: CTAGS
|
||||
CTAGS:
|
||||
ctags CTAGS:
|
||||
|
||||
cscope cscopelist:
|
||||
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
@list='$(MANS)'; if test -n "$$list"; then \
|
||||
list=`for p in $$list; do \
|
||||
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
|
||||
if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
|
||||
if test -n "$$list" && \
|
||||
grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
|
||||
echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
|
||||
grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
|
||||
echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
|
||||
echo " typically \`make maintainer-clean' will remove them" >&2; \
|
||||
exit 1; \
|
||||
else :; fi; \
|
||||
else :; fi
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
list='$(DISTFILES)'; \
|
||||
|
|
@ -745,19 +799,19 @@ uninstall-man: uninstall-man5 uninstall-man8
|
|||
.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: all all-am check check-am clean clean-aminfo clean-generic \
|
||||
dist-info distclean distclean-generic distdir dvi dvi-am html \
|
||||
html-am info info-am install install-am install-data \
|
||||
install-data-am install-dvi install-dvi-am install-exec \
|
||||
install-exec-am install-html install-html-am install-info \
|
||||
install-info-am install-man install-man5 install-man8 \
|
||||
install-pdf install-pdf-am install-ps install-ps-am \
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
maintainer-clean maintainer-clean-aminfo \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-aminfo \
|
||||
mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
|
||||
uninstall-dvi-am uninstall-html-am uninstall-info-am \
|
||||
uninstall-man uninstall-man5 uninstall-man8 uninstall-pdf-am \
|
||||
uninstall-ps-am
|
||||
cscopelist-am ctags-am dist-info distclean distclean-generic \
|
||||
distdir dvi dvi-am html html-am info info-am install \
|
||||
install-am install-data install-data-am install-dvi \
|
||||
install-dvi-am install-exec install-exec-am install-html \
|
||||
install-html-am install-info install-info-am install-man \
|
||||
install-man5 install-man8 install-pdf install-pdf-am \
|
||||
install-ps install-ps-am install-strip installcheck \
|
||||
installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
|
||||
mostlyclean-aminfo mostlyclean-generic pdf pdf-am ps ps-am \
|
||||
tags-am uninstall uninstall-am uninstall-dvi-am \
|
||||
uninstall-html-am uninstall-info-am uninstall-man \
|
||||
uninstall-man5 uninstall-man8 uninstall-pdf-am uninstall-ps-am
|
||||
|
||||
|
||||
# For additional rules usually of interest only to the maintainer,
|
||||
|
|
|
|||
Binary file not shown.
414
doc/texinfo.tex
414
doc/texinfo.tex
|
|
@ -3,11 +3,11 @@
|
|||
% Load plain if necessary, i.e., if running under initex.
|
||||
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
||||
%
|
||||
\def\texinfoversion{2012-03-11.15}
|
||||
\def\texinfoversion{2013-02-01.11}
|
||||
%
|
||||
% 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, 2012 Free Software Foundation, Inc.
|
||||
% 2007, 2008, 2009, 2010, 2011, 2012, 2013 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
|
||||
|
|
@ -24,13 +24,14 @@
|
|||
%
|
||||
% 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.)
|
||||
% restriction. This Exception is an additional permission under section 7
|
||||
% of the GNU General Public License, version 3 ("GPLv3").
|
||||
%
|
||||
% 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).
|
||||
% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
|
||||
% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
|
||||
% http://www.gnu.org/software/texinfo/ (the Texinfo home page)
|
||||
% The texinfo.tex in any given distribution could well be out
|
||||
% of date, so if that's what you're using, please check.
|
||||
%
|
||||
|
|
@ -594,7 +595,7 @@
|
|||
\def\:{\spacefactor=1000 }
|
||||
|
||||
% @* forces a line break.
|
||||
\def\*{\hfil\break\hbox{}\ignorespaces}
|
||||
\def\*{\unskip\hfil\break\hbox{}\ignorespaces}
|
||||
|
||||
% @/ allows a line break.
|
||||
\let\/=\allowbreak
|
||||
|
|
@ -1117,7 +1118,7 @@ where each line of input produces a line of output.}
|
|||
% #1 is a control sequence in which to do the replacements,
|
||||
% which we \xdef.
|
||||
\def\txiescapepdf#1{%
|
||||
\ifx\pdfescapestring\relax
|
||||
\ifx\pdfescapestring\thisisundefined
|
||||
% No primitive available; should we give a warning or log?
|
||||
% Many times it won't matter.
|
||||
\else
|
||||
|
|
@ -1367,9 +1368,8 @@ output) for that.)}
|
|||
\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
|
||||
\addtokens{\filename}{\PP}%
|
||||
\advance\filenamelength by 1
|
||||
\fi
|
||||
\nextsp}
|
||||
\def\getfilename#1{%
|
||||
|
|
@ -1475,9 +1475,6 @@ output) for that.)}
|
|||
\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.
|
||||
|
|
@ -1489,6 +1486,7 @@ output) for that.)}
|
|||
% can get a sort of poor man's double spacing by redefining this.
|
||||
\def\baselinefactor{1}
|
||||
%
|
||||
\newdimen\textleading
|
||||
\def\setleading#1{%
|
||||
\dimen0 = #1\relax
|
||||
\normalbaselineskip = \baselinefactor\dimen0
|
||||
|
|
@ -1761,18 +1759,24 @@ end
|
|||
\fi\fi
|
||||
|
||||
|
||||
% Set the font macro #1 to the font named #2, adding on the
|
||||
% specified font prefix (normally `cm').
|
||||
% Set the font macro #1 to the font named \fontprefix#2.
|
||||
% #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).
|
||||
% encoding (only OT1, OT1IT and OT1TT are allowed, or empty to omit).
|
||||
% Example:
|
||||
% #1 = \textrm
|
||||
% #2 = \rmshape
|
||||
% #3 = 10
|
||||
% #4 = \mainmagstep
|
||||
% #5 = OT1
|
||||
%
|
||||
\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
|
||||
%
|
||||
% (end of cmaps)
|
||||
|
||||
% Use cm as the default font prefix.
|
||||
% To specify the font prefix, you must define \fontprefix
|
||||
|
|
@ -1782,7 +1786,7 @@ end
|
|||
\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\rmbshape{bx} % where the normal face is bold
|
||||
\def\bfshape{b}
|
||||
\def\bxshape{bx}
|
||||
\def\ttshape{tt}
|
||||
|
|
@ -1797,8 +1801,7 @@ end
|
|||
\def\scshape{csc}
|
||||
\def\scbshape{csc}
|
||||
|
||||
% Definitions for a main text size of 11pt. This is the default in
|
||||
% Texinfo.
|
||||
% Definitions for a main text size of 11pt. (The default in Texinfo.)
|
||||
%
|
||||
\def\definetextfontsizexi{%
|
||||
% Text fonts (11.2pt, magstep1).
|
||||
|
|
@ -1923,7 +1926,7 @@ end
|
|||
\textleading = 13.2pt % line spacing for 11pt CM
|
||||
\textfonts % reset the current fonts
|
||||
\rm
|
||||
} % end of 11pt text font size definitions
|
||||
} % end of 11pt text font size definitions, \definetextfontsizexi
|
||||
|
||||
|
||||
% Definitions to make the main text be 10pt Computer Modern, with
|
||||
|
|
@ -2055,7 +2058,7 @@ end
|
|||
\textleading = 12pt % line spacing for 10pt CM
|
||||
\textfonts % reset the current fonts
|
||||
\rm
|
||||
} % end of 10pt text font size definitions
|
||||
} % end of 10pt text font size definitions, \definetextfontsizex
|
||||
|
||||
|
||||
% We provide the user-level command
|
||||
|
|
@ -2270,8 +2273,6 @@ end
|
|||
|
||||
\gdef\markupsetcodequoteleft{\let`\codequoteleft}
|
||||
\gdef\markupsetcodequoteright{\let'\codequoteright}
|
||||
|
||||
\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft}
|
||||
}
|
||||
|
||||
\let\markupsetuplqcode \markupsetcodequoteleft
|
||||
|
|
@ -2280,6 +2281,9 @@ end
|
|||
\let\markupsetuplqexample \markupsetcodequoteleft
|
||||
\let\markupsetuprqexample \markupsetcodequoteright
|
||||
%
|
||||
\let\markupsetuplqkbd \markupsetcodequoteleft
|
||||
\let\markupsetuprqkbd \markupsetcodequoteright
|
||||
%
|
||||
\let\markupsetuplqsamp \markupsetcodequoteleft
|
||||
\let\markupsetuprqsamp \markupsetcodequoteright
|
||||
%
|
||||
|
|
@ -2289,8 +2293,6 @@ end
|
|||
\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
|
||||
|
|
@ -2380,8 +2382,7 @@ end
|
|||
\aftersmartic
|
||||
}
|
||||
|
||||
% like \smartslanted except unconditionally uses \ttsl, and no ic.
|
||||
% @var is set to this for defun arguments.
|
||||
% Unconditional use \ttsl, and no ic. @var is set to this for defuns.
|
||||
\def\ttslanted#1{{\ttsl #1}}
|
||||
|
||||
% @cite is like \smartslanted except unconditionally use \sl. We never want
|
||||
|
|
@ -2446,34 +2447,12 @@ end
|
|||
% @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}}}}
|
||||
% @indicateurl is \samp, that is, with quotes.
|
||||
\let\indicateurl=\samp
|
||||
|
||||
% 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.
|
||||
% @code (and similar) prints in typewriter, but with spaces the same
|
||||
% size as normal in the surrounding text, without hyphenation, etc.
|
||||
% This is a subroutine for that.
|
||||
\def\tclose#1{%
|
||||
{%
|
||||
% Change normal interword space to be same as for the current font.
|
||||
|
|
@ -2498,7 +2477,7 @@ end
|
|||
% 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)
|
||||
|
|
@ -2517,7 +2496,7 @@ end
|
|||
\let-\codedash
|
||||
\let_\codeunder
|
||||
\else
|
||||
\let-\realdash
|
||||
\let-\normaldash
|
||||
\let_\realunder
|
||||
\fi
|
||||
\codex
|
||||
|
|
@ -2526,7 +2505,7 @@ end
|
|||
|
||||
\def\codex #1{\tclose{#1}\endgroup}
|
||||
|
||||
\def\realdash{-}
|
||||
\def\normaldash{-}
|
||||
\def\codedash{-\discretionary{}{}{}}
|
||||
\def\codeunder{%
|
||||
% this is all so @math{@code{var_name}+1} can work. In math mode, _
|
||||
|
|
@ -2541,9 +2520,9 @@ end
|
|||
}
|
||||
|
||||
% 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.
|
||||
% each of the four underscores in __typeof__. This is bad.
|
||||
% @allowcodebreaks provides a document-level way to turn breaking at -
|
||||
% and _ on and off.
|
||||
%
|
||||
\newif\ifallowcodebreaks \allowcodebreakstrue
|
||||
|
||||
|
|
@ -2562,6 +2541,13 @@ end
|
|||
\fi\fi
|
||||
}
|
||||
|
||||
% For @command, @env, @file, @option quotes seem unnecessary,
|
||||
% so use \code rather than \samp.
|
||||
\let\command=\code
|
||||
\let\env=\code
|
||||
\let\file=\code
|
||||
\let\option=\code
|
||||
|
||||
% @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
|
||||
|
|
@ -2708,10 +2694,6 @@ end
|
|||
\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).
|
||||
|
|
@ -2735,16 +2717,36 @@ end
|
|||
% 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}
|
||||
% @kbd is like @code, except that if the argument is just one @key command,
|
||||
% then @kbd has no effect.
|
||||
\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}}
|
||||
|
||||
% For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
|
||||
\let\indicateurl=\code
|
||||
\let\env=\code
|
||||
\let\command=\code
|
||||
\def\xkey{\key}
|
||||
\def\kbdsub#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
|
||||
}
|
||||
|
||||
% 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}
|
||||
|
||||
% @clicksequence{File @click{} Open ...}
|
||||
\def\clicksequence#1{\begingroup #1\endgroup}
|
||||
|
|
@ -2852,6 +2854,9 @@ end
|
|||
}
|
||||
}
|
||||
|
||||
% ctrl is no longer a Texinfo command, but leave this definition for fun.
|
||||
\def\ctrl #1{{\tt \rawbackslash \hat}#1}
|
||||
|
||||
% @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.
|
||||
|
|
@ -3142,12 +3147,17 @@ end
|
|||
% 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
|
||||
\ifmonospace
|
||||
% typewriter:
|
||||
\font\thisecfont = ectt\ecsize \space at \nominalsize
|
||||
\else
|
||||
% regular:
|
||||
\font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
|
||||
\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
|
||||
\fi
|
||||
\thisecfont
|
||||
}
|
||||
|
|
@ -3260,6 +3270,20 @@ end
|
|||
\finishedtitlepagetrue
|
||||
}
|
||||
|
||||
% Settings used for typesetting titles: no hyphenation, no indentation,
|
||||
% don't worry much about spacing, ragged right. This should be used
|
||||
% inside a \vbox, and fonts need to be set appropriately first. Because
|
||||
% it is always used for titles, nothing else, we call \rmisbold. \par
|
||||
% should be specified before the end of the \vbox, since a vbox is a group.
|
||||
%
|
||||
\def\raggedtitlesettings{%
|
||||
\rmisbold
|
||||
\hyphenpenalty=10000
|
||||
\parindent=0pt
|
||||
\tolerance=5000
|
||||
\ptexraggedright
|
||||
}
|
||||
|
||||
% Macros to be used within @titlepage:
|
||||
|
||||
\let\subtitlerm=\tenrm
|
||||
|
|
@ -3267,7 +3291,7 @@ end
|
|||
|
||||
\parseargdef\title{%
|
||||
\checkenv\titlepage
|
||||
\leftline{\titlefonts\rmisbold #1}
|
||||
\vbox{\titlefonts \raggedtitlesettings #1\par}%
|
||||
% print a rule at the page bottom also.
|
||||
\finishedtitlepagefalse
|
||||
\vskip4pt \hrule height 4pt width \hsize \vskip4pt
|
||||
|
|
@ -4164,7 +4188,7 @@ end
|
|||
% ..., 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
|
||||
\let-\normaldash \let_\normalunderscore
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -4204,7 +4228,7 @@ end
|
|||
}
|
||||
\def\ifsetfail{\doignore{ifset}}
|
||||
|
||||
% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
|
||||
% @ifclear VAR ... @end executes 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
|
||||
|
|
@ -4215,6 +4239,35 @@ end
|
|||
\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
|
||||
\def\ifclearfail{\doignore{ifclear}}
|
||||
|
||||
% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written
|
||||
% without the @) is in fact defined. We can only feasibly check at the
|
||||
% TeX level, so something like `mathcode' is going to considered
|
||||
% defined even though it is not a Texinfo command.
|
||||
%
|
||||
\makecond{ifcommanddefined}
|
||||
\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}}
|
||||
%
|
||||
\def\doifcmddefined#1#2{{%
|
||||
\makevalueexpandable
|
||||
\let\next=\empty
|
||||
\expandafter\ifx\csname #2\endcsname\relax
|
||||
#1% If not defined, \let\next as above.
|
||||
\fi
|
||||
\expandafter
|
||||
}\next
|
||||
}
|
||||
\def\ifcmddefinedfail{\doignore{ifcommanddefined}}
|
||||
|
||||
% @ifcommandnotdefined CMD ... handled similar to @ifclear above.
|
||||
\makecond{ifcommandnotdefined}
|
||||
\def\ifcommandnotdefined{%
|
||||
\parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}}
|
||||
\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}}
|
||||
|
||||
% Set the `txicommandconditionals' variable, so documents have a way to
|
||||
% test if the @ifcommand...defined conditionals are available.
|
||||
\set txicommandconditionals
|
||||
|
||||
% @dircategory CATEGORY -- specify a category of the dir file
|
||||
% which this file should belong to. Ignore this in TeX.
|
||||
\let\dircategory=\comment
|
||||
|
|
@ -4451,6 +4504,7 @@ end
|
|||
\definedummyword\guillemetright
|
||||
\definedummyword\guilsinglleft
|
||||
\definedummyword\guilsinglright
|
||||
\definedummyword\lbracechar
|
||||
\definedummyword\leq
|
||||
\definedummyword\minus
|
||||
\definedummyword\ogonek
|
||||
|
|
@ -4463,6 +4517,7 @@ end
|
|||
\definedummyword\quoteleft
|
||||
\definedummyword\quoteright
|
||||
\definedummyword\quotesinglbase
|
||||
\definedummyword\rbracechar
|
||||
\definedummyword\result
|
||||
\definedummyword\textdegree
|
||||
%
|
||||
|
|
@ -4514,6 +4569,7 @@ end
|
|||
\definedummyword\t
|
||||
%
|
||||
% Commands that take arguments.
|
||||
\definedummyword\abbr
|
||||
\definedummyword\acronym
|
||||
\definedummyword\anchor
|
||||
\definedummyword\cite
|
||||
|
|
@ -4525,7 +4581,9 @@ end
|
|||
\definedummyword\emph
|
||||
\definedummyword\env
|
||||
\definedummyword\file
|
||||
\definedummyword\image
|
||||
\definedummyword\indicateurl
|
||||
\definedummyword\inforef
|
||||
\definedummyword\kbd
|
||||
\definedummyword\key
|
||||
\definedummyword\math
|
||||
|
|
@ -4572,7 +4630,10 @@ end
|
|||
% 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\lbracechar{|a}%
|
||||
%
|
||||
\def\}{|b}%
|
||||
\def\rbracechar{|b}%
|
||||
%
|
||||
% Non-English letters.
|
||||
\def\AA{AA}%
|
||||
|
|
@ -5533,14 +5594,6 @@ end
|
|||
|
||||
% 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
|
||||
|
|
@ -5548,10 +5601,8 @@ end
|
|||
|
||||
\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
|
||||
\vbox{\chapfonts \raggedtitlesettings #1\par}%
|
||||
\nobreak\bigskip \nobreak
|
||||
\suppressfirstparagraphindent
|
||||
}
|
||||
|
||||
|
|
@ -5710,8 +5761,7 @@ end
|
|||
%
|
||||
% Typeset the actual heading.
|
||||
\nobreak % Avoid page breaks at the interline glue.
|
||||
\vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
|
||||
\hangindent=\wd0 \centerparametersmaybe
|
||||
\vbox{\raggedtitlesettings \hangindent=\wd0 \centerparametersmaybe
|
||||
\unhbox0 #1\par}%
|
||||
}%
|
||||
\nobreak\bigskip % no page break after a chapter title
|
||||
|
|
@ -5733,18 +5783,18 @@ end
|
|||
\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
|
||||
\chapoddpage
|
||||
\vbox{\chapfonts \raggedtitlesettings #1\par}%
|
||||
\nobreak\bigskip\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
|
||||
\chapoddpage
|
||||
\vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}%
|
||||
\nobreak\bigskip \nobreak
|
||||
}
|
||||
\def\CHAPFopen{%
|
||||
\global\let\chapmacro=\chfopen
|
||||
|
|
@ -6510,16 +6560,9 @@ end
|
|||
\makedispenvdef{quotation}{\quotationstart}
|
||||
%
|
||||
\def\quotationstart{%
|
||||
{\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
|
||||
\parindent=0pt
|
||||
%
|
||||
% @cartouche defines \nonarrowing to inhibit narrowing at next level down.
|
||||
\indentedblockstart % same as \indentedblock, but increase right margin too.
|
||||
\ifx\nonarrowing\relax
|
||||
\advance\leftskip by \lispnarrowing
|
||||
\advance\rightskip by \lispnarrowing
|
||||
\exdentamount = \lispnarrowing
|
||||
\else
|
||||
\let\nonarrowing = \relax
|
||||
\fi
|
||||
\parsearg\quotationlabel
|
||||
}
|
||||
|
|
@ -6545,6 +6588,32 @@ end
|
|||
\fi
|
||||
}
|
||||
|
||||
% @indentedblock is like @quotation, but indents only on the left and
|
||||
% has no optional argument.
|
||||
%
|
||||
\makedispenvdef{indentedblock}{\indentedblockstart}
|
||||
%
|
||||
\def\indentedblockstart{%
|
||||
{\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
|
||||
\exdentamount = \lispnarrowing
|
||||
\else
|
||||
\let\nonarrowing = \relax
|
||||
\fi
|
||||
}
|
||||
|
||||
% Keep a nonzero parskip for the environment, since we're doing normal filling.
|
||||
%
|
||||
\def\Eindentedblock{%
|
||||
\par
|
||||
{\parskip=0pt \afterenvbreak}%
|
||||
}
|
||||
\def\Esmallindentedblock{\Eindentedblock}
|
||||
|
||||
|
||||
% LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>}
|
||||
% If we want to allow any <char> as delimiter,
|
||||
|
|
@ -7023,7 +7092,10 @@ end
|
|||
\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.
|
||||
% want a way to get ttsl. We used to recommend @var for that, so
|
||||
% leave the code in, but it's strange for @var to lead to typewriter.
|
||||
% Nowadays we recommend @code, since the difference between a ttsl hyphen
|
||||
% and a tt hyphen is pretty tiny. @code also disables ?` !`.
|
||||
\def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}%
|
||||
#1%
|
||||
\sl\hyphenchar\font=45
|
||||
|
|
@ -7807,7 +7879,7 @@ end
|
|||
\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
|
||||
|
|
@ -7817,16 +7889,21 @@ end
|
|||
\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
|
||||
\def\ref#1{\xrefX[#1,,,,,,,]}
|
||||
%
|
||||
\newbox\topbox
|
||||
\newbox\toprefbox
|
||||
\newbox\printedrefnamebox
|
||||
\newbox\infofilenamebox
|
||||
\newbox\printedmanualbox
|
||||
%
|
||||
\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
|
||||
\unsepspaces
|
||||
%
|
||||
% Get args without leading/trailing spaces.
|
||||
\def\printedrefname{\ignorespaces #3}%
|
||||
\setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
|
||||
%
|
||||
\def\infofilename{\ignorespaces #4}%
|
||||
\setbox\infofilenamebox = \hbox{\infofilename\unskip}%
|
||||
%
|
||||
\def\printedmanual{\ignorespaces #5}%
|
||||
\setbox\printedmanualbox = \hbox{\printedmanual\unskip}%
|
||||
%
|
||||
|
|
@ -7861,11 +7938,18 @@ end
|
|||
\turnoffactive
|
||||
\makevalueexpandable
|
||||
% This expands tokens, so do it after making catcode changes, so _
|
||||
% etc. don't get their TeX definitions.
|
||||
% etc. don't get their TeX definitions. This ignores all spaces in
|
||||
% #4, including (wrongly) those in the middle of the filename.
|
||||
\getfilename{#4}%
|
||||
%
|
||||
% This (wrongly) does not take account of leading or trailing
|
||||
% spaces in #1, which should be ignored.
|
||||
\edef\pdfxrefdest{#1}%
|
||||
\txiescapepdf\pdfxrefdest
|
||||
\ifx\pdfxrefdest\empty
|
||||
\def\pdfxrefdest{Top}% no empty targets
|
||||
\else
|
||||
\txiescapepdf\pdfxrefdest % escape PDF special chars
|
||||
\fi
|
||||
%
|
||||
\leavevmode
|
||||
\startlink attr{/Border [0 0 0]}%
|
||||
|
|
@ -7898,7 +7982,7 @@ end
|
|||
\printedrefname
|
||||
\fi
|
||||
%
|
||||
% if the user also gave the printed manual name (fifth arg), append
|
||||
% If the user also gave the printed manual name (fifth arg), append
|
||||
% "in MANUALNAME".
|
||||
\ifdim \wd\printedmanualbox > 0pt
|
||||
\space \putwordin{} \cite{\printedmanual}%
|
||||
|
|
@ -7913,32 +7997,20 @@ end
|
|||
% 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.
|
||||
%
|
||||
% Cross-manual reference. Only include the "Section ``foo'' in" if
|
||||
% the foo is neither missing or Top. Thus, @xref{,,,foo,The Foo Manual}
|
||||
% outputs simply "see The Foo Manual".
|
||||
\ifdim \wd\printedmanualbox > 0pt
|
||||
% What is the 7sp about? The idea is that we also want to omit
|
||||
% the Section part if we would be printing "Top", since they are
|
||||
% clearly trying to refer to the whole manual. But, this being
|
||||
% TeX, we can't easily compare strings while ignoring the possible
|
||||
% spaces before and after in the input. By adding the arbitrary
|
||||
% 7sp, we make it much less likely that a real node name would
|
||||
% happen to have the same width as "Top" (e.g., in a monospaced font).
|
||||
% I hope it will never happen in practice.
|
||||
% Cross-manual reference with a printed manual name.
|
||||
%
|
||||
% For the same basic reason, we retypeset the "Top" at every
|
||||
% reference, since the current font is indeterminate.
|
||||
\crossmanualxref{\cite{\printedmanual\unskip}}%
|
||||
%
|
||||
\else\ifdim \wd\infofilenamebox > 0pt
|
||||
% Cross-manual reference with only an info filename (arg 4), no
|
||||
% printed manual name (arg 5). This is essentially the same as
|
||||
% the case above; we output the filename, since we have nothing else.
|
||||
%
|
||||
\setbox\topbox = \hbox{Top\kern7sp}%
|
||||
\setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
|
||||
\ifdim \wd2 > 7sp
|
||||
\ifdim \wd2 = \wd\topbox \else
|
||||
\putwordSection{} ``\printedrefname'' \putwordin{}\space
|
||||
\fi
|
||||
\fi
|
||||
\cite{\printedmanual}%
|
||||
\crossmanualxref{\code{\infofilename\unskip}}%
|
||||
%
|
||||
\else
|
||||
% Reference in this manual.
|
||||
% Reference within this manual.
|
||||
%
|
||||
% _ (for example) has to be the character _ for the purposes of the
|
||||
% control sequence corresponding to the node, but it has to expand
|
||||
|
|
@ -7959,11 +8031,37 @@ end
|
|||
%
|
||||
% output the `page 3'.
|
||||
\turnoffactive \putwordpage\tie\refx{#1-pg}{}%
|
||||
\fi
|
||||
\fi\fi
|
||||
\fi
|
||||
\endlink
|
||||
\endgroup}
|
||||
|
||||
% Output a cross-manual xref to #1. Used just above (twice).
|
||||
%
|
||||
% Only include the text "Section ``foo'' in" if the foo is neither
|
||||
% missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply
|
||||
% "see The Foo Manual", the idea being to refer to the whole manual.
|
||||
%
|
||||
% But, this being TeX, we can't easily compare our node name against the
|
||||
% string "Top" while ignoring the possible spaces before and after in
|
||||
% the input. By adding the arbitrary 7sp below, we make it much less
|
||||
% likely that a real node name would have the same width as "Top" (e.g.,
|
||||
% in a monospaced font). Hopefully it will never happen in practice.
|
||||
%
|
||||
% For the same basic reason, we retypeset the "Top" at every
|
||||
% reference, since the current font is indeterminate.
|
||||
%
|
||||
\def\crossmanualxref#1{%
|
||||
\setbox\toprefbox = \hbox{Top\kern7sp}%
|
||||
\setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
|
||||
\ifdim \wd2 > 7sp % nonempty?
|
||||
\ifdim \wd2 = \wd\toprefbox \else % same as Top?
|
||||
\putwordSection{} ``\printedrefname'' \putwordin{}\space
|
||||
\fi
|
||||
\fi
|
||||
#1%
|
||||
}
|
||||
|
||||
% 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
|
||||
|
|
@ -9895,22 +9993,26 @@ directory should work if nowhere else does.}
|
|||
@gdef@otherbackslash{@let\=@realbackslash}
|
||||
|
||||
% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
|
||||
% the literal character `\'.
|
||||
% the literal character `\'. Also revert - to its normal character, in
|
||||
% case the active - from code has slipped in.
|
||||
%
|
||||
@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
|
||||
{@catcode`- = @active
|
||||
@gdef@normalturnoffactive{%
|
||||
@let-=@normaldash
|
||||
@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.
|
||||
|
|
|
|||
|
|
@ -90,6 +90,15 @@ is used.
|
|||
The same as export followed by import.
|
||||
.It exchange-all Op Fl -force
|
||||
The same as export-all followed by import.
|
||||
.It invite Ar name
|
||||
Prepares an invitation for a new node with the given
|
||||
.Ar name ,
|
||||
and prints a short invitation URL that can be used with the join command.
|
||||
.It join Op Ar URL
|
||||
Join an existing VPN using an invitation URL created using the invite command.
|
||||
If no
|
||||
.Ar URL
|
||||
is given, it will be read from standard input.
|
||||
.It start Op tincd options
|
||||
Start
|
||||
.Xr tincd 8 ,
|
||||
|
|
@ -97,9 +106,10 @@ optionally with the given extra options.
|
|||
.It stop
|
||||
Stop
|
||||
.Xr tincd 8 .
|
||||
.It restart
|
||||
.It restart Op tincd options
|
||||
Restart
|
||||
.Xr tincd 8 .
|
||||
.Xr tincd 8 ,
|
||||
optionally with the given extra options.
|
||||
.It reload
|
||||
Partially rereads configuration files. Connections to hosts whose host
|
||||
config files are removed are closed. New outgoing connections specified
|
||||
|
|
|
|||
|
|
@ -274,14 +274,12 @@ The file in which the private ECDSA key of this tinc daemon resides.
|
|||
This is only used if
|
||||
.Va ExperimentalProtocol
|
||||
is enabled.
|
||||
.It Va ExperimentalProtocol Li = yes | no Po no Pc Bq experimental
|
||||
When this option is enabled, experimental protocol enhancements will be used.
|
||||
.It Va ExperimentalProtocol Li = yes | no Pq yes
|
||||
When this option is enabled, the SPTPS protocol will be used when connecting to nodes that also support it.
|
||||
Ephemeral ECDH will be used for key exchanges,
|
||||
and ECDSA will be used instead of RSA for authentication.
|
||||
When enabled, an ECDSA key must have been generated before with
|
||||
.Nm tinc generate-ecdsa-keys .
|
||||
The experimental protocol may change at any time,
|
||||
and there is no guarantee that tinc will run stable when it is used.
|
||||
.It Va Forwarding Li = off | internal | kernel Po internal Pc Bq experimental
|
||||
This option selects the way indirect packets are forwarded.
|
||||
.Bl -tag -width indent
|
||||
|
|
@ -328,12 +326,20 @@ which normally would prevent the peers from learning each other's LAN address.
|
|||
.Pp
|
||||
Currently, local discovery is implemented by sending broadcast packets to the LAN during path MTU discovery.
|
||||
This feature may not work in all possible situations.
|
||||
.It Va LocalDiscoveryAddress Li = Ar address
|
||||
If this variable is specified, local discovery packets are sent to the given
|
||||
.Ar address .
|
||||
.It Va MACExpire Li = Ar seconds Pq 600
|
||||
This option controls the amount of time MAC addresses are kept before they are removed.
|
||||
This only has effect when
|
||||
.Va Mode
|
||||
is set to
|
||||
.Qq switch .
|
||||
.It Va MaxConnectionBurst Li = Ar count Pq 100
|
||||
This option controls how many connections tinc accepts in quick succession.
|
||||
If there are more connections than the given number in a short time interval,
|
||||
tinc will reduce the number of accepted connections to only one per second,
|
||||
until the burst has passed.
|
||||
.It Va MaxTimeout Li = Ar seconds Pq 900
|
||||
This is the maximum delay before trying to reconnect to other tinc daemons.
|
||||
.It Va Mode Li = router | switch | hub Pq router
|
||||
|
|
|
|||
1665
doc/tinc.info
1665
doc/tinc.info
File diff suppressed because it is too large
Load diff
|
|
@ -1002,14 +1002,12 @@ The file in which the private ECDSA key of this tinc daemon resides.
|
|||
This is only used if ExperimentalProtocol is enabled.
|
||||
|
||||
@cindex ExperimentalProtocol
|
||||
@item ExperimentalProtocol = <yes|no> (no) [experimental]
|
||||
When this option is enabled, experimental protocol enhancements will be used.
|
||||
@item ExperimentalProtocol = <yes|no> (yes)
|
||||
When this option is enabled, the SPTPS protocol will be used when connecting to nodes that also support it.
|
||||
Ephemeral ECDH will be used for key exchanges,
|
||||
and ECDSA will be used instead of RSA for authentication.
|
||||
When enabled, an ECDSA key must have been generated before with
|
||||
@samp{tinc generate-ecdsa-keys}.
|
||||
The experimental protocol may change at any time,
|
||||
and there is no guarantee that tinc will run stable when it is used.
|
||||
|
||||
@cindex Forwarding
|
||||
@item Forwarding = <off|internal|kernel> (internal) [experimental]
|
||||
|
|
@ -1058,6 +1056,10 @@ which normally would prevent the peers from learning each other's LAN address.
|
|||
Currently, local discovery is implemented by sending broadcast packets to the LAN during path MTU discovery.
|
||||
This feature may not work in all possible situations.
|
||||
|
||||
@cindex LocalDiscoveryAddress
|
||||
@item LocalDiscoveryAddress <@var{address}>
|
||||
If this variable is specified, local discovery packets are sent to the given @var{address}.
|
||||
|
||||
@cindex Mode
|
||||
@item Mode = <router|switch|hub> (router)
|
||||
This option selects the way packets are routed to other daemons.
|
||||
|
|
@ -1099,6 +1101,13 @@ impossible to crack a single key.
|
|||
This option controls the amount of time MAC addresses are kept before they are removed.
|
||||
This only has effect when Mode is set to "switch".
|
||||
|
||||
@cindex MaxConnectionBurst
|
||||
@item MaxConnectionBurst = <@var{count}> (100)
|
||||
This option controls how many connections tinc accepts in quick succession.
|
||||
If there are more connections than the given number in a short time interval,
|
||||
tinc will reduce the number of accepted connections to only one per second,
|
||||
until the burst has passed.
|
||||
|
||||
@cindex Name
|
||||
@item Name = <@var{name}> [required]
|
||||
This is a symbolic name for this connection.
|
||||
|
|
@ -1180,7 +1189,6 @@ reordering. Setting this to zero will disable replay tracking completely and
|
|||
pass all traffic, but leaves tinc vulnerable to replay-based attacks on your
|
||||
traffic.
|
||||
|
||||
|
||||
@cindex StrictSubnets
|
||||
@item StrictSubnets <yes|no> (no) [experimental]
|
||||
When this option is enabled tinc will only use Subnet statements which are
|
||||
|
|
@ -2216,14 +2224,22 @@ The same as export followed by import.
|
|||
@item exchange-all [--force]
|
||||
The same as export-all followed by import.
|
||||
|
||||
@item invite @var{name}
|
||||
Prepares an invitation for a new node with the given @var{name},
|
||||
and prints a short invitation URL that can be used with the join command.
|
||||
|
||||
@item join [@var{URL}]
|
||||
Join an existing VPN using an invitation URL created using the invite command.
|
||||
If no @var{URL} is given, it will be read from standard input.
|
||||
|
||||
@item start [tincd options]
|
||||
Start @samp{tincd}, optionally with the given extra options.
|
||||
|
||||
@item stop
|
||||
Stop @samp{tincd}.
|
||||
|
||||
@item restart
|
||||
Restart @samp{tincd}.
|
||||
@item restart [tincd options]
|
||||
Restart @samp{tincd}, optionally with the given extra options.
|
||||
|
||||
@item reload
|
||||
Partially rereads configuration files. Connections to hosts whose host
|
||||
|
|
@ -2234,10 +2250,17 @@ in @file{tinc.conf} will be made.
|
|||
Shows the PID of the currently running @samp{tincd}.
|
||||
|
||||
@item generate-keys [@var{bits}]
|
||||
Generate public/private keypair of @var{bits} length. If @var{bits} is not specified,
|
||||
1024 is the default. tinc will ask where you want to store the files,
|
||||
but will default to the configuration directory (you can use the -c or -n
|
||||
option).
|
||||
Generate both RSA and ECDSA keypairs (see below) and exit.
|
||||
tinc will ask where you want to store the files, but will default to the
|
||||
configuration directory (you can use the -c or -n option).
|
||||
|
||||
@item generate-ecdsa-keys
|
||||
Generate public/private ECDSA keypair and exit.
|
||||
|
||||
@item generate-rsa-keys [@var{bits}]
|
||||
Generate public/private RSA keypair and exit. If @var{bits} is omitted, the
|
||||
default length will be 2048 bits. When saving keys to existing files, tinc
|
||||
will not delete the old keys; you have to remove them manually.
|
||||
|
||||
@item dump [reachable] nodes
|
||||
Dump a list of all known nodes in the VPN.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue