pgfornament (10mar16)

git-svn-id: svn://tug.org/texlive/trunk@39988 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 45 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/pgfornament/README b/Master/texmf-dist/doc/latex/pgfornament/README
index ae27885ff75..687ffdeb5ee 100644
--- a/Master/texmf-dist/doc/latex/pgfornament/README
+++ b/Master/texmf-dist/doc/latex/pgfornament/README
@@ -6,7 +6,7 @@ The documentation presents the syntax and parameters of the macro "pgfornament".
 This archive contains :
 
 -- this document;
--- the documentation (0.2) of  pgfornament (0.2);
+-- the documentation (0.21) of  pgfornament (0.21);
 -- the documentation (0.2) of  tikzrput (0.2);
 -- the package  pgfornament.sty;
 -- the package  tikzrput.sty;
@@ -23,4 +23,16 @@ This archive contains :
 -- the package  tikzrput.sty.
 
 This material is subject to the LaTeX Project Public License. 
-See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license.
+See https://www.ctan.org/license/lppl1.3 for the details of that license.
+
+Corrections :
+Pgfornament.sty  0.21 Christian Feuersänger thank you for seeing this bug
+
+ ornament/at now replaces the key at (conflict with at from pgf) 
+
+Documentation 0.21  Peter Zimmermann thank you for seeing these bugs
+page 5 example code the ornament had number "2" instead "1"
+page 23 some ornaments seem to be identic. 
+
+New section Problem to describe some difficulties
+
diff --git a/Master/texmf-dist/doc/latex/pgfornament/ornaments.pdf b/Master/texmf-dist/doc/latex/pgfornament/ornaments.pdf
index 89c128c1caf..82c0ed6b7cd 100644
--- a/Master/texmf-dist/doc/latex/pgfornament/ornaments.pdf
+++ b/Master/texmf-dist/doc/latex/pgfornament/ornaments.pdf
diff --git a/Master/texmf-dist/doc/latex/pgfornament/ornaments.tex b/Master/texmf-dist/doc/latex/pgfornament/ornaments.tex
index c55750c9595..ed358262698 100644
--- a/Master/texmf-dist/doc/latex/pgfornament/ornaments.tex
+++ b/Master/texmf-dist/doc/latex/pgfornament/ornaments.tex
@@ -179,7 +179,7 @@ urlcolor=orange}
 \maketitle
 
 \begin{abstract}
-\noindent\lefthand\ ((Version  0.2)
+\noindent\lefthand\ ((Version  0.21)
 
 This document describes the \LaTeX\ package \emph{\docpkg{pgfornament}} and presents the syntax and parameters of the macro "pgfornament".
 It also provides examples and comments on the package's use. Firstly, I would like to thank {Till \textsc{Tantau}} for the  beautiful \LaTeX\ package, namely \TIKZ. 
@@ -270,7 +270,7 @@ You only need to add \\
 \begin{marginfigure}%
 \begin{center}
   \pgfornament[width = 2cm,
-               color = purple]{2}
+               color = red]{1}
 \end{center}
 \caption{Result of the minimal code}
 \end{marginfigure}
@@ -968,7 +968,7 @@ Example  with a pentagon
 \end{marginfigure}
 
  \newpage
-\subsection{How to use the option \tkzname{at}} \index{at} % (fold)
+\subsection{How to use the option \tkzname{ornament/at}} \index{ornament/at} % (fold)
 \label{sub:how_to_use_the_option_at}
 
 It's possible to move the ornament on the line AB. You only need to write \tkzname{at = number} where number is a percent like  \tkzname{pos}.
@@ -977,8 +977,8 @@ It's possible to move the ornament on the line AB. You only need to write \tkzna
 	\node (A) at (0,0) {};
 	\node (B) at (4,0) {};
 	\draw [help lines,color=Maroon!60]  (0,-1) grid (4,1);
-	\path  (A.center)  to [ornament=84,at=0]   (B.center);
-	\path  (A.center)  to [ornament=84,at=1]   (B.center);
+	\path  (A.center)  to [ornament=84,ornament/at=0]   (B.center);
+	\path  (A.center)  to [ornament=84,ornament/at=1]   (B.center);
 	\end{tikzpicture}
 \end{tkzexample}
 
@@ -988,8 +988,8 @@ It's possible to move the ornament on the line AB. You only need to write \tkzna
 	\node (A) at (0,0) {};
 	\node (B) at (4,0) {};
 	\draw [help lines,color=Maroon!60]  (0,-1) grid (4,1);
-	\path  (A.center)  to [ornament=84,at=0]   (B.center);
-	\path  (A.center)  to [ornament=84,at=1]   (B.center);
+	\path  (A.center)  to [ornament=84,ornament/at=0]   (B.center);
+	\path  (A.center)  to [ornament=84,ornament/at=1]   (B.center);
 	\end{tikzpicture}
 	\caption{at}
 \end{figure}
@@ -1338,12 +1338,14 @@ The next list concerns symbols used to make a line.
       \addtocounter{compt}{1}%
       \hfill\small{\thecompt)}&\hfil\pgfornament[anchor=south,width=2cm]{\thecompt}\hfil\\
       \end{tabular}\par\medskip
-\ifnum\thecompt<154 \addtocounter{compt}{1}
+\ifnum\thecompt<153 \addtocounter{compt}{1}
 \repeat
    \caption{A list of hands .}
   \label{tab:ornaments : hands }
   \end{table}
 
+Remark : Ornaments 154 and 155 are identic but their sizes are smaller.
+
 \section{Ornaments : Humans}\label{sec:humans }
 The next list concerns symbols used to make a line.
 
@@ -1375,7 +1377,7 @@ The next list concerns symbols used to make a line.
       \addtocounter{compt}{1}%
       \hfill\small{\thecompt)}&\hfil\pgfornament[anchor=south,width=2cm]{\thecompt}\hfil\\
       \end{tabular}\par\medskip
-\ifnum\thecompt<145 \addtocounter{compt}{1}
+\ifnum\thecompt<144 \addtocounter{compt}{1}
 \repeat
 
 \setcounter{compt}{160}%
@@ -1391,6 +1393,8 @@ The next list concerns symbols used to make a line.
   \label{tab:ornaments : humans }
   \end{table}
 
+Remark : Ornaments 143, 144 and 145, 146 are identic but their sizes are diffrent.
+
 \newpage
 \section{Ornaments : Objects part 1}\label{sec:objects1 }
 The next list concerns symbols used to make a line.
@@ -2167,6 +2171,22 @@ You modify the code like this : \sidenote{You can also modify all the coordinate
 % % subsection from_eps_or_mps_file (end)
 % \newpage
 
+\section{Problem} % (fold)
+\label{sec:problem}
+If you got an error like "Package tikz Error: + or - expected.", perhaps there is a conflict with the babel package.
+It's possible to resolve this type of conflict with \Verb|\shorthandoff{!}| just before your tikzpicture. You can also write in your preamble 
+
+\begin{tkzexample}[code only,small]
+\tikzset{every picture/.prefix style={%
+     execute at begin picture=\shorthandoff{!}}}	
+\end{tkzexample}	 \index{shorthandoff}
+
+and finally you can use \Verb|\usetikzlibrary{babel}| only with pgf 3.0
+In french, you can get an error with ! : , and ;. Babel makes these characters activ 
+
+If you got a problem with the option \Verb|at| replace \Verb|at| by \Verb|ornament/at|.
+% section problem (end)
+
 \printindex
 
 \end{document}  
diff --git a/Master/texmf-dist/tex/latex/pgfornament/pgfornament.sty b/Master/texmf-dist/tex/latex/pgfornament/pgfornament.sty
index cae323b366e..59702dc8df1 100644
--- a/Master/texmf-dist/tex/latex/pgfornament/pgfornament.sty
+++ b/Master/texmf-dist/tex/latex/pgfornament/pgfornament.sty
@@ -21,7 +21,7 @@
 % symmetry=c   : true/false (symétrie centrale h+v,false par défaut)
 \NeedsTeXFormat{LaTeX2e}% 
 \RequirePackage{tikz,pgfopts}%
-\ProvidesPackage{pgfornament}[2016/03/05 v0.2 vector ornaments]%
+\ProvidesPackage{pgfornament}[2016/03/05 v0.21 vector ornaments]%
 \gdef\pgfOrnamentsObject{pgflibraryvectorian.code.tex} 
 \gdef\OrnamentsFamily{vectorian}  
 \pgfkeys{
@@ -109,7 +109,7 @@ symmetry/none/.code  = {\tikzset{pgfornamentstyle/.append style={cm={1,0,0,1,(0,
 \gdef\ornamenttosymmetry{none} 
 \tikzset{options default/.style={anchor=center,sloped,allow upside down,inner sep=0pt}}
 \tikzset{%
-at/.code={\def\ornamenttopos{#1}},
+ornament/at/.code={\def\ornamenttopos{#1}},
 options/.style={options default,#1},
 ornament symmetry/.code={\def\ornamenttosymmetry{#1}},
 node anchor/.code={\def\ornamenttoanchor{#1}},