summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-27 23:12:57 +0000
committerKarl Berry <karl@freefriends.org>2017-01-27 23:12:57 +0000
commit9ee28d233e2554f776311bd6120cc332fbc00985 (patch)
tree4ec9cdc098d229e6809194d5e445609f018d7dd6 /Master
parent37131b317fcc431f7335301f6f5afbb575974835 (diff)
forest (27jan17)
git-svn-id: svn://tug.org/texlive/trunk@43063 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/forest/README4
-rw-r--r--Master/texmf-dist/doc/latex/forest/forest-doc.pdfbin1208014 -> 1314346 bytes
-rw-r--r--Master/texmf-dist/doc/latex/forest/forest-doc.tex24
-rw-r--r--Master/texmf-dist/doc/latex/forest/forest.pdfbin496994 -> 496508 bytes
-rw-r--r--Master/texmf-dist/source/latex/forest/forest-index.dtx8
-rw-r--r--Master/texmf-dist/source/latex/forest/forest-libs.dtx8
-rw-r--r--Master/texmf-dist/source/latex/forest/forest.dtx6
-rw-r--r--Master/texmf-dist/source/latex/forest/forest.ins2
-rw-r--r--Master/texmf-dist/tex/latex/forest/forest-compat.sty6
-rw-r--r--Master/texmf-dist/tex/latex/forest/forest-doc.sty8
-rw-r--r--Master/texmf-dist/tex/latex/forest/forest-index.sty8
-rw-r--r--Master/texmf-dist/tex/latex/forest/forest-lib-edges.sty2
-rw-r--r--Master/texmf-dist/tex/latex/forest/forest-lib-linguistics.sty8
-rw-r--r--Master/texmf-dist/tex/latex/forest/forest.sty6
14 files changed, 57 insertions, 33 deletions
diff --git a/Master/texmf-dist/doc/latex/forest/README b/Master/texmf-dist/doc/latex/forest/README
index 066ba7a8a79..fbe9a4aee3c 100644
--- a/Master/texmf-dist/doc/latex/forest/README
+++ b/Master/texmf-dist/doc/latex/forest/README
@@ -1,6 +1,6 @@
-LaTeX package: forest [2016/12/31 v2.1.2 Drawing (linguistic) trees]
+LaTeX package: forest [2017/01/27 v2.1.3 Drawing (linguistic) trees]
-Copyright (c) 2016 Saso Zivanovic
+Copyright (c) 2012-2017 Saso Zivanovic
(Sa\v{s}o \v{Z}ivanovi\'{c})
saso.zivanovic@guest.arnes.si
diff --git a/Master/texmf-dist/doc/latex/forest/forest-doc.pdf b/Master/texmf-dist/doc/latex/forest/forest-doc.pdf
index a7776501215..78e647869a9 100644
--- a/Master/texmf-dist/doc/latex/forest/forest-doc.pdf
+++ b/Master/texmf-dist/doc/latex/forest/forest-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/forest/forest-doc.tex b/Master/texmf-dist/doc/latex/forest/forest-doc.tex
index 6c313f06e08..579f0a9a433 100644
--- a/Master/texmf-dist/doc/latex/forest/forest-doc.tex
+++ b/Master/texmf-dist/doc/latex/forest/forest-doc.tex
@@ -1,8 +1,8 @@
%% forest-doc.tex
%% `forest-doc.tex` is a main documentation source of package `forest`.
%%
-%% Copyright (c) 2016 Saso Zivanovic
-%% (Sa\v{s}o \v{Z}ivanovi\'{c})
+%% Copyright (c) 2012-2017 Saso Zivanovic
+%% (Sa\v{s}o \v{Z}ivanovi\'{c})
%% saso.zivanovic@guest.arnes.si
%%
%% This work may be distributed and/or modified under the
@@ -812,7 +812,19 @@ matter) being that they get processed before all other root node options, even t
If you find yourself writing the same preamble for every tree in your document,
consider modifying \index{default preamble}, which is implicitely included at the beginning
-of every preamble.
+of every preamble.
+
+\begin{forestexample}[index={default preamble}]
+ \forestset{
+ ~default preamble~={
+ font=\Huge,
+ for tree={circle,draw}
+ }
+ }
+ \begin{forest} [A[B][C]] \end{forest}
+ \begin{forest} red [D[E][F]] \end{forest}
+ \begin{forest} for tree={dotted} [G[H][I]] \end{forest}
+\end{forestexample}
\subsection{Decorating the tree}
\label{tut:decorating}
@@ -6397,6 +6409,12 @@ in |-all| styles.
\subsubsection{v2.1}
\begin{description}
+\item[v2.1.3 (2017/01/27)] \mbox{}
+ Bugfixes:
+ \begin{itemize}
+ \item Update \index{nice empty nodes} to use \index{for step=\index{current and siblings}}.
+ \end{itemize}
+
\item[v2.1.2 (2016/12/31)] \mbox{}
Bugfixes:
diff --git a/Master/texmf-dist/doc/latex/forest/forest.pdf b/Master/texmf-dist/doc/latex/forest/forest.pdf
index 9a08e1553fa..0bd16e0ba26 100644
--- a/Master/texmf-dist/doc/latex/forest/forest.pdf
+++ b/Master/texmf-dist/doc/latex/forest/forest.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/forest/forest-index.dtx b/Master/texmf-dist/source/latex/forest/forest-index.dtx
index 1db075d33df..df2979690a7 100644
--- a/Master/texmf-dist/source/latex/forest/forest-index.dtx
+++ b/Master/texmf-dist/source/latex/forest/forest-index.dtx
@@ -1,10 +1,12 @@
% \CheckSum{755}
% \iffalse meta-comment
% forest-index.dtx
-%% `forest-index' is an indexing system for the documentation of package `forest', using the package itself.
+%% `forest-index' is an indexing system for the documentation of package
+%% `forest', using the package itself. (The derived `forest-index.sty' is not
+%% needed to use the package.)
%%
-%% Copyright (c) 2016 Saso Zivanovic
-%% (Sa\v{s}o \v{Z}ivanovi\'{c})
+%% Copyright (c) 2012-2017 Saso Zivanovic
+%% (Sa\v{s}o \v{Z}ivanovi\'{c})
%% saso.zivanovic@guest.arnes.si
%%
%% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/source/latex/forest/forest-libs.dtx b/Master/texmf-dist/source/latex/forest/forest-libs.dtx
index 360d954afa1..90816b44b55 100644
--- a/Master/texmf-dist/source/latex/forest/forest-libs.dtx
+++ b/Master/texmf-dist/source/latex/forest/forest-libs.dtx
@@ -3,7 +3,7 @@
% forest-libs.dtx
%% `forest-libs' is a collection of libraries for package `forest'.
%%
-%% Copyright (c) 2016 Saso Zivanovic
+%% Copyright (c) 2012-2017 Saso Zivanovic
%% (Sa\v{s}o \v{Z}ivanovi\'{c})
%% saso.zivanovic@guest.arnes.si
%%
@@ -45,7 +45,7 @@
%\fi
% \librarysection{linguistics}
% \begin{macrocode}
-\ProvidesForestLibrary{linguistics}[2015/11/14 v0.1]
+\ProvidesForestLibrary{linguistics}[2017/01/27 v0.1.1]
% \end{macrocode}
%
% Defaults:
@@ -214,8 +214,8 @@
\forestset{
nice empty nodes/.style={
for tree={calign=fixed edge angles},
- delay={where content={}{shape=coordinate,for parent={
- for children={anchor=north}}}{}}
+ delay={where content={}{shape=coordinate,
+ for current and siblings={anchor=north}}{}}
},
}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/forest/forest.dtx b/Master/texmf-dist/source/latex/forest/forest.dtx
index 642734499d5..01ae642c752 100644
--- a/Master/texmf-dist/source/latex/forest/forest.dtx
+++ b/Master/texmf-dist/source/latex/forest/forest.dtx
@@ -3,8 +3,8 @@
% forest.dtx
%% `forest' is a `pgf/tikz'-based package for drawing (linguistic) trees.
%%
-%% Copyright (c) 2016 Saso Zivanovic
-%% (Sa\v{s}o \v{Z}ivanovi\'{c})
+%% Copyright (c) 2012-2017 Saso Zivanovic
+%% (Sa\v{s}o \v{Z}ivanovi\'{c})
%% saso.zivanovic@guest.arnes.si
%%
%% This work may be distributed and/or modified under the
@@ -83,7 +83,7 @@
%
% \section{Identification}
% \begin{macrocode}
-\ProvidesPackage{forest}[2016/12/31 v2.1.2 Drawing (linguistic) trees]
+\ProvidesPackage{forest}[2017/01/27 v2.1.3 Drawing (linguistic) trees]
\RequirePackage{tikz}[2013/12/13]
\usetikzlibrary{shapes}
diff --git a/Master/texmf-dist/source/latex/forest/forest.ins b/Master/texmf-dist/source/latex/forest/forest.ins
index 1b9b63f6c3f..4bbad239b9f 100644
--- a/Master/texmf-dist/source/latex/forest/forest.ins
+++ b/Master/texmf-dist/source/latex/forest/forest.ins
@@ -1,6 +1,6 @@
%% forest.ins
%%
-%% Copyright (c) 2015 Saso Zivanovic
+%% Copyright (c) 2012-2017 Saso Zivanovic
%% saso.zivanovic@guest.arnes.si
%%
%% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/forest/forest-compat.sty b/Master/texmf-dist/tex/latex/forest/forest-compat.sty
index 03b5c39b27d..c69220844c3 100644
--- a/Master/texmf-dist/tex/latex/forest/forest-compat.sty
+++ b/Master/texmf-dist/tex/latex/forest/forest-compat.sty
@@ -3,8 +3,8 @@
% forest-index.dtx
%% `forest-compat' defines a compatibility layer of package `forest'.
%%
-%% Copyright (c) 2016 Saso Zivanovic
-%% (Sa\v{s}o \v{Z}ivanovi\'{c})
+%% Copyright (c) 2012-2017 Saso Zivanovic
+%% (Sa\v{s}o \v{Z}ivanovi\'{c})
%% saso.zivanovic@guest.arnes.si
%%
%% This work may be distributed and/or modified under the
@@ -23,7 +23,7 @@
%% constituting the package see main source file of the package,
%% `forest.dtx', or the derived `forest.sty'.
-\ProvidesPackage{forest-compat}[2016/12/05]
+\ProvidesPackage{forest-compat}[2016/12/31]
\def\forest@deprecated#1{%
\PackageWarning{forest}{Compatibility mode for #1}%
diff --git a/Master/texmf-dist/tex/latex/forest/forest-doc.sty b/Master/texmf-dist/tex/latex/forest/forest-doc.sty
index 9bffa050280..865ed8bc1cb 100644
--- a/Master/texmf-dist/tex/latex/forest/forest-doc.sty
+++ b/Master/texmf-dist/tex/latex/forest/forest-doc.sty
@@ -1,8 +1,10 @@
%% forest-doc.sty
-%% `forest-doc.sty` is an auxiliary package needed to compile the documentation of package `forest`.
%%
-%% Copyright (c) 2016 Saso Zivanovic
-%% (Sa\v{s}o \v{Z}ivanovi\'{c})
+%% `forest-doc.sty` is an auxiliary package needed to compile the documentation of package
+%% `forest`. (It is not needed to use the package.)
+%%
+%% Copyright (c) 2012-2017 Saso Zivanovic
+%% (Sa\v{s}o \v{Z}ivanovi\'{c})
%% saso.zivanovic@guest.arnes.si
%%
%% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/forest/forest-index.sty b/Master/texmf-dist/tex/latex/forest/forest-index.sty
index 36690d8664f..10e9a7cda3f 100644
--- a/Master/texmf-dist/tex/latex/forest/forest-index.sty
+++ b/Master/texmf-dist/tex/latex/forest/forest-index.sty
@@ -6,10 +6,12 @@
%%
%% forest-index.dtx
%%
-%% `forest-index' is an indexing system for the documentation of package `forest', using the package itself.
+%% `forest-index' is an indexing system for the documentation of package
+%% `forest', using the package itself. (The derived `forest-index.sty' is not
+%% needed to use the package.)
%%
-%% Copyright (c) 2016 Saso Zivanovic
-%% (Sa\v{s}o \v{Z}ivanovi\'{c})
+%% Copyright (c) 2012-2017 Saso Zivanovic
+%% (Sa\v{s}o \v{Z}ivanovi\'{c})
%% saso.zivanovic@guest.arnes.si
%%
%% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/forest/forest-lib-edges.sty b/Master/texmf-dist/tex/latex/forest/forest-lib-edges.sty
index e982d849f2c..3182ad46de4 100644
--- a/Master/texmf-dist/tex/latex/forest/forest-lib-edges.sty
+++ b/Master/texmf-dist/tex/latex/forest/forest-lib-edges.sty
@@ -8,7 +8,7 @@
%%
%% `forest-libs' is a collection of libraries for package `forest'.
%%
-%% Copyright (c) 2016 Saso Zivanovic
+%% Copyright (c) 2012-2017 Saso Zivanovic
%% (Sa\v{s}o \v{Z}ivanovi\'{c})
%% saso.zivanovic@guest.arnes.si
%%
diff --git a/Master/texmf-dist/tex/latex/forest/forest-lib-linguistics.sty b/Master/texmf-dist/tex/latex/forest/forest-lib-linguistics.sty
index 9c3b9228ac5..74c883ba3f9 100644
--- a/Master/texmf-dist/tex/latex/forest/forest-lib-linguistics.sty
+++ b/Master/texmf-dist/tex/latex/forest/forest-lib-linguistics.sty
@@ -8,7 +8,7 @@
%%
%% `forest-libs' is a collection of libraries for package `forest'.
%%
-%% Copyright (c) 2016 Saso Zivanovic
+%% Copyright (c) 2012-2017 Saso Zivanovic
%% (Sa\v{s}o \v{Z}ivanovi\'{c})
%% saso.zivanovic@guest.arnes.si
%%
@@ -29,7 +29,7 @@
%% `forest.dtx', or the derived `forest.sty'.
%%
\RequirePackage{forest}
-\ProvidesForestLibrary{linguistics}[2015/11/14 v0.1]
+\ProvidesForestLibrary{linguistics}[2017/01/27 v0.1.1]
\forestset{
libraries/linguistics/defaults/.style={
default preamble={
@@ -59,8 +59,8 @@
\forestset{
nice empty nodes/.style={
for tree={calign=fixed edge angles},
- delay={where content={}{shape=coordinate,for parent={
- for children={anchor=north}}}{}}
+ delay={where content={}{shape=coordinate,
+ for current and siblings={anchor=north}}{}}
},
}
\providecommand\text[1]{\mbox{\scriptsize#1}}
diff --git a/Master/texmf-dist/tex/latex/forest/forest.sty b/Master/texmf-dist/tex/latex/forest/forest.sty
index 39ab9a6a43c..47a19b90cd2 100644
--- a/Master/texmf-dist/tex/latex/forest/forest.sty
+++ b/Master/texmf-dist/tex/latex/forest/forest.sty
@@ -8,8 +8,8 @@
%%
%% `forest' is a `pgf/tikz'-based package for drawing (linguistic) trees.
%%
-%% Copyright (c) 2016 Saso Zivanovic
-%% (Sa\v{s}o \v{Z}ivanovi\'{c})
+%% Copyright (c) 2012-2017 Saso Zivanovic
+%% (Sa\v{s}o \v{Z}ivanovi\'{c})
%% saso.zivanovic@guest.arnes.si
%%
%% This work may be distributed and/or modified under the
@@ -44,7 +44,7 @@
%% - LICENCE
%% To use the package, only the files marked with + need to be installed.
%%
-\ProvidesPackage{forest}[2016/12/31 v2.1.2 Drawing (linguistic) trees]
+\ProvidesPackage{forest}[2017/01/27 v2.1.3 Drawing (linguistic) trees]
\RequirePackage{tikz}[2013/12/13]
\usetikzlibrary{shapes}