From e9f61ed7121f3980dee02d7bc39309bbb7fd3c4a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 20 Feb 2016 23:37:36 +0000 Subject: hobby (20feb16) git-svn-id: svn://tug.org/texlive/trunk@39793 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hobby/hobby.pdf | Bin 368666 -> 523029 bytes Master/texmf-dist/doc/latex/hobby/hobby_code.pdf | Bin 0 -> 444451 bytes Master/texmf-dist/doc/latex/hobby/hobby_doc.pdf | Bin 521638 -> 0 bytes Master/texmf-dist/source/latex/hobby/hobby.dtx | 44 ++++++++++----------- Master/texmf-dist/source/latex/hobby/hobby.ins | 6 ++- Master/texmf-dist/tex/latex/hobby/hobby.code.tex | 7 ++-- .../tex/latex/hobby/pgflibraryhobby.code.tex | 3 +- Master/texmf-dist/tex/latex/hobby/pml3array.sty | 33 ++++++---------- .../tex/latex/hobby/tikzlibraryhobby.code.tex | 3 +- 9 files changed, 46 insertions(+), 50 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/hobby/hobby_code.pdf delete mode 100644 Master/texmf-dist/doc/latex/hobby/hobby_doc.pdf diff --git a/Master/texmf-dist/doc/latex/hobby/hobby.pdf b/Master/texmf-dist/doc/latex/hobby/hobby.pdf index a5790e73d19..0c9b734b35d 100644 Binary files a/Master/texmf-dist/doc/latex/hobby/hobby.pdf and b/Master/texmf-dist/doc/latex/hobby/hobby.pdf differ diff --git a/Master/texmf-dist/doc/latex/hobby/hobby_code.pdf b/Master/texmf-dist/doc/latex/hobby/hobby_code.pdf new file mode 100644 index 00000000000..832c2eaa9e6 Binary files /dev/null and b/Master/texmf-dist/doc/latex/hobby/hobby_code.pdf differ diff --git a/Master/texmf-dist/doc/latex/hobby/hobby_doc.pdf b/Master/texmf-dist/doc/latex/hobby/hobby_doc.pdf deleted file mode 100644 index 476c7998964..00000000000 Binary files a/Master/texmf-dist/doc/latex/hobby/hobby_doc.pdf and /dev/null differ diff --git a/Master/texmf-dist/source/latex/hobby/hobby.dtx b/Master/texmf-dist/source/latex/hobby/hobby.dtx index 39f96042d33..e5937b7f202 100644 --- a/Master/texmf-dist/source/latex/hobby/hobby.dtx +++ b/Master/texmf-dist/source/latex/hobby/hobby.dtx @@ -61,9 +61,10 @@ This work consists of the files hobby.dtx and the derived files hobby.code.tex pgflibraryhobby.code.tex tikzlibraryhobby.code.tex + pml3array.sty hobby.ins hobby.pdf - hobby_doc.pdf + hobby_code.pdf README.txt \endpostamble @@ -110,7 +111,7 @@ and the derived files hobby.code.tex % % \fi % -% \CheckSum{3380} +% \CheckSum{3373} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -182,8 +183,8 @@ and the derived files hobby.code.tex \tl_new:N \g__hobby_version \tl_new:N \g__hobby_date -\tl_set:Nn \g__hobby_version {1.6} -\tl_set:Nn \g__hobby_date {2014-08-11} +\tl_set:Nn \g__hobby_version {1.7} +\tl_set:Nn \g__hobby_date {2016-02-19} \DeclareDocumentCommand \hobbyVersion {} { \tl_use:N \g__hobby_version @@ -3051,7 +3052,7 @@ sin ( (\array_get:Nn \l_hobby_angles_array {##1}) % \begin{macro}[EXP]{\array_get:Nn} % \begin{macrocode} \cs_new:Npn \array_get:Nn #1#2 { - \exp_args:NNf \prop_get:Nn #1 { \int_eval:n {#2} } + \exp_args:NNf \prop_item:Nn #1 { \int_eval:n {#2} } } % \end{macrocode} % \end{macro} @@ -3077,6 +3078,12 @@ sin ( (\array_get:Nn \l_hobby_angles_array {##1}) % \end{macrocode} % \end{macro} % +% \begin{macro}{\array_if_exist:NTF} +% \begin{macrocode} +\prg_new_eq_conditional:NNn \array_if_exist:N \cs_if_exist:N { p, T, F, TF } +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\array_new:N} % \begin{macrocode} \cs_new_eq:NN \array_new:N \prop_new:N @@ -3193,7 +3200,7 @@ sin ( (\array_get:Nn \l_hobby_angles_array {##1}) % % For displaying arrays, we need some messages. % \begin{macrocode} -\__msg_kernel_new:nnn { kernel } { show-array } +\msg_new:nnn { kernel } { show-array } { The~array~\token_to_str:N #1~ \array_if_empty:NTF #1 @@ -3207,22 +3214,13 @@ sin ( (\array_get:Nn \l_hobby_angles_array {##1}) % \begin{macrocode} \cs_new_protected:Npn \array_show:N #1 { - \tl_clear:N \l_array_show_tl - \array_map_function:NN #1 \array_show_aux:nn - \__msg_show_variable:Nno - #1 + \__msg_show_variable:NNNnn + #1 + \array_if_exist:NTF + \array_if_empty:NTF { array } - { \l_array_show_tl } + { \array_map_function:NN #1 \__msg_show_item:nn } } -\cs_generate_variant:Nn \__msg_show_variable:Nnn { Nno } - -\cs_new_protected:Npn \array_show_aux:nn #1#2 -{ - \tl_if_eq:nnTF {#2} {\q_no_value} {} - { - \tl_put_right:No \l_array_show_tl {\__msg_show_item:nn {#1}{#2}} - } -} \cs_generate_variant:Nn \array_show:N { c } % \end{macrocode} % \end{macro} @@ -3367,7 +3365,7 @@ sin ( (\array_get:Nn \l_hobby_angles_array {##1}) % \begin{macrocode} \cs_new:Npn \array_top:N #1 { - \array_get:Nn #1 {\prop_get:Nn #1 {top}} + \array_get:Nn #1 {\prop_item:Nn #1 {top}} } % \end{macrocode} % \end{macro} @@ -3376,7 +3374,7 @@ sin ( (\array_get:Nn \l_hobby_angles_array {##1}) % \begin{macrocode} \cs_new:Npn \array_base:N #1 { - \array_get:Nn #1 {\prop_get:Nn #1 {base}} + \array_get:Nn #1 {\prop_item:Nn #1 {base}} } % \end{macrocode} % \end{macro} @@ -3485,7 +3483,7 @@ sin ( (\array_get:Nn \l_hobby_angles_array {##1}) % \begin{macrocode} \cs_new_protected:Npn \array_length:N #1 { - \int_eval:n {\prop_get:Nn #1 {top} - \prop_get:Nn #1 {base}} + \int_eval:n {\prop_item:Nn #1 {top} - \prop_item:Nn #1 {base}} } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/hobby/hobby.ins b/Master/texmf-dist/source/latex/hobby/hobby.ins index 74168ef3366..bb46a8c08ba 100644 --- a/Master/texmf-dist/source/latex/hobby/hobby.ins +++ b/Master/texmf-dist/source/latex/hobby/hobby.ins @@ -48,9 +48,10 @@ This work consists of the files hobby.dtx and the derived files hobby.code.tex pgflibraryhobby.code.tex tikzlibraryhobby.code.tex + pml3array.sty hobby.ins hobby.pdf - hobby_doc.pdf + hobby_code.pdf README.txt \endpostamble @@ -83,9 +84,10 @@ and the derived files hobby.code.tex %% and the derived files hobby.code.tex %% pgflibraryhobby.code.tex %% tikzlibraryhobby.code.tex +%% pml3array.sty %% hobby.ins %% hobby.pdf -%% hobby_doc.pdf +%% hobby_code.pdf %% README.txt %% %% diff --git a/Master/texmf-dist/tex/latex/hobby/hobby.code.tex b/Master/texmf-dist/tex/latex/hobby/hobby.code.tex index 1d13c52a384..74da1f1e335 100644 --- a/Master/texmf-dist/tex/latex/hobby/hobby.code.tex +++ b/Master/texmf-dist/tex/latex/hobby/hobby.code.tex @@ -33,8 +33,8 @@ \tl_new:N \g__hobby_version \tl_new:N \g__hobby_date -\tl_set:Nn \g__hobby_version {1.6} -\tl_set:Nn \g__hobby_date {2014-08-11} +\tl_set:Nn \g__hobby_version {1.7} +\tl_set:Nn \g__hobby_date {2016-02-19} \DeclareDocumentCommand \hobbyVersion {} { \tl_use:N \g__hobby_version @@ -924,9 +924,10 @@ sin ( (\array_get:Nn \l_hobby_angles_array {##1}) %% and the derived files hobby.code.tex %% pgflibraryhobby.code.tex %% tikzlibraryhobby.code.tex +%% pml3array.sty %% hobby.ins %% hobby.pdf -%% hobby_doc.pdf +%% hobby_code.pdf %% README.txt %% %% diff --git a/Master/texmf-dist/tex/latex/hobby/pgflibraryhobby.code.tex b/Master/texmf-dist/tex/latex/hobby/pgflibraryhobby.code.tex index 8653c635ea2..578f3beee0c 100644 --- a/Master/texmf-dist/tex/latex/hobby/pgflibraryhobby.code.tex +++ b/Master/texmf-dist/tex/latex/hobby/pgflibraryhobby.code.tex @@ -275,9 +275,10 @@ %% and the derived files hobby.code.tex %% pgflibraryhobby.code.tex %% tikzlibraryhobby.code.tex +%% pml3array.sty %% hobby.ins %% hobby.pdf -%% hobby_doc.pdf +%% hobby_code.pdf %% README.txt %% %% diff --git a/Master/texmf-dist/tex/latex/hobby/pml3array.sty b/Master/texmf-dist/tex/latex/hobby/pml3array.sty index d8722d9f75d..6f9d18148c5 100644 --- a/Master/texmf-dist/tex/latex/hobby/pml3array.sty +++ b/Master/texmf-dist/tex/latex/hobby/pml3array.sty @@ -84,7 +84,7 @@ \exp_args:NNx \prop_get:NnN #1 {\int_eval:n {#2}} #3 } \cs_new:Npn \array_get:Nn #1#2 { - \exp_args:NNf \prop_get:Nn #1 { \int_eval:n {#2} } + \exp_args:NNf \prop_item:Nn #1 { \int_eval:n {#2} } } \cs_new:Npn \array_get:NnNTF #1#2#3#4#5 { \exp_args:NNx \prop_get:NnNTF #1 {\int_eval:n {#2}} #3 {#4}{#5} @@ -97,6 +97,7 @@ \prg_return_false: \fi: } +\prg_new_eq_conditional:NNn \array_if_exist:N \cs_if_exist:N { p, T, F, TF } \cs_new_eq:NN \array_new:N \prop_new:N \cs_new_eq:NN \array_clear:N \prop_clear:N \cs_new_eq:NN \array_gclear:N \prop_gclear:N @@ -166,7 +167,7 @@ { \__prg_map_break:Nn \array_map_break: { } } \cs_new_nopar:Npn \array_map_break:n { \__prg_map_break:Nn \array_map_break: } -\__msg_kernel_new:nnn { kernel } { show-array } +\msg_new:nnn { kernel } { show-array } { The~array~\token_to_str:N #1~ \array_if_empty:NTF #1 @@ -175,22 +176,13 @@ } \cs_new_protected:Npn \array_show:N #1 { - \tl_clear:N \l_array_show_tl - \array_map_function:NN #1 \array_show_aux:nn - \__msg_show_variable:Nno - #1 + \__msg_show_variable:NNNnn + #1 + \array_if_exist:NTF + \array_if_empty:NTF { array } - { \l_array_show_tl } + { \array_map_function:NN #1 \__msg_show_item:nn } } -\cs_generate_variant:Nn \__msg_show_variable:Nnn { Nno } - -\cs_new_protected:Npn \array_show_aux:nn #1#2 -{ - \tl_if_eq:nnTF {#2} {\q_no_value} {} - { - \tl_put_right:No \l_array_show_tl {\__msg_show_item:nn {#1}{#2}} - } -} \cs_generate_variant:Nn \array_show:N { c } \cs_new_protected:Npn \array_push:Nn #1#2 { @@ -280,11 +272,11 @@ } \cs_new:Npn \array_top:N #1 { - \array_get:Nn #1 {\prop_get:Nn #1 {top}} + \array_get:Nn #1 {\prop_item:Nn #1 {top}} } \cs_new:Npn \array_base:N #1 { - \array_get:Nn #1 {\prop_get:Nn #1 {base}} + \array_get:Nn #1 {\prop_item:Nn #1 {base}} } \cs_new_protected:Npn \array_del:Nn #1#2 { @@ -378,7 +370,7 @@ } \cs_new_protected:Npn \array_length:N #1 { - \int_eval:n {\prop_get:Nn #1 {top} - \prop_get:Nn #1 {base}} + \int_eval:n {\prop_item:Nn #1 {top} - \prop_item:Nn #1 {base}} } \ExplSyntaxOff %% @@ -402,9 +394,10 @@ %% and the derived files hobby.code.tex %% pgflibraryhobby.code.tex %% tikzlibraryhobby.code.tex +%% pml3array.sty %% hobby.ins %% hobby.pdf -%% hobby_doc.pdf +%% hobby_code.pdf %% README.txt %% %% diff --git a/Master/texmf-dist/tex/latex/hobby/tikzlibraryhobby.code.tex b/Master/texmf-dist/tex/latex/hobby/tikzlibraryhobby.code.tex index 8fde56abd6e..1a59b037cec 100644 --- a/Master/texmf-dist/tex/latex/hobby/tikzlibraryhobby.code.tex +++ b/Master/texmf-dist/tex/latex/hobby/tikzlibraryhobby.code.tex @@ -601,9 +601,10 @@ %% and the derived files hobby.code.tex %% pgflibraryhobby.code.tex %% tikzlibraryhobby.code.tex +%% pml3array.sty %% hobby.ins %% hobby.pdf -%% hobby_doc.pdf +%% hobby_code.pdf %% README.txt %% %% -- cgit v1.2.3