summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-08-26 21:05:47 +0000
committerKarl Berry <karl@freefriends.org>2019-08-26 21:05:47 +0000
commitbfd55e1fa306b0e1c0db5fc689fb45b81d5da0c8 (patch)
tree7abd27cdb5a328a0ba00c48698439588ec5edab8 /Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
parent69257bb16c7433813887ca515263e76c85c6c0e9 (diff)
l3 (26aug19)
git-svn-id: svn://tug.org/texlive/trunk@51962 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty46
1 files changed, 29 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
index 5b152e2b9b3..b91028c3d68 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
@@ -28,7 +28,7 @@
%%
%% File: l3draw.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3draw}{2019-07-01}{}
+\ProvidesExplPackage{l3draw}{2019-08-25}{}
{L3 Experimental core drawing support}
\RequirePackage { l3color }
%% File: l3draw-boxes.dtx
@@ -440,23 +440,23 @@
{ \__draw_path_arc_auxiii:nn }
{
\__draw_point_transform_noshift:n
- { \draw_point_polar:nnn { #1 #4 90 } {#7} {#8} }
+ { \draw_point_polar:nnn {#7} {#8} { #1 #4 90 } }
}
\__draw_point_process:nnn
{ \__draw_path_arc_auxiv:nnnn }
{
\draw_point_transform:n
- { \draw_point_polar:nnn {#1} {#5} {#6} }
+ { \draw_point_polar:nnn {#5} {#6} {#1} }
}
{
\draw_point_transform:n
- { \draw_point_polar:nnn {#2} {#5} {#6} }
+ { \draw_point_polar:nnn {#5} {#6} {#2} }
}
\__draw_point_process:nn
{ \__draw_path_arc_auxv:nn }
{
\__draw_point_transform_noshift:n
- { \draw_point_polar:nnn { #2 #4 -90 } {#7} {#8} }
+ { \draw_point_polar:nnn {#7} {#8} { #2 #4 -90 } }
}
\exp_after:wN \__draw_path_curveto:nnnnnn \l__draw_path_tmp_tl
\fp_set:Nn \l__draw_path_arc_delta_fp { abs ( #2 - #3 ) }
@@ -854,9 +854,9 @@
\cs_generate_variant:Nn \__draw_point_to_dim_aux:n { f }
\cs_new:Npn \__draw_point_to_dim_aux:w ( #1 , ~ #2 ) { #1pt , #2pt }
\cs_new:Npn \draw_point_polar:nn #1#2
- { \draw_point_polar:nnn {#1} {#2} {#2} }
+ { \draw_point_polar:nnn {#1} {#1} {#2} }
\cs_new:Npn \draw_point_polar:nnn #1#2#3
- { \__draw_draw_polar:fnn { \fp_eval:n {#1} } {#2} {#3} }
+ { \__draw_draw_polar:fnn { \fp_eval:n {#3} } {#1} {#2} }
\cs_new:Npn \__draw_draw_polar:nnn #1#2#3
{ \__draw_point_to_dim:n { cosd(#1) * (#2) , sind(#1) * (#3) } }
\cs_generate_variant:Nn \__draw_draw_polar:nnn { f }
@@ -864,8 +864,18 @@
{ \__draw_point_process:nn { \__draw_point_unit_vector:nn } {#1} }
\cs_new:Npn \__draw_point_unit_vector:nn #1#2
{
- \__draw_point_to_dim:n
- { ( #1 , #2 ) / (sqrt(#1 * #1 + #2 * #2)) }
+ \exp_args:Nf \__draw_point_unit_vector:nnn
+ { \fp_eval:n { (sqrt(#1 * #1 + #2 * #2)) } }
+ {#1} {#2}
+ }
+\cs_new:Npn \__draw_point_unit_vector:nnn #1#2#3
+ {
+ \fp_compare:nNnTF {#1} = \c_zero_fp
+ { 0pt, 1pt }
+ {
+ \__draw_point_to_dim:n
+ { ( #2 , #3 ) / #1 }
+ }
}
\cs_new:Npn \draw_point_intersect_lines:nnnn #1#2#3#4
{
@@ -1129,9 +1139,9 @@
}
\cs_generate_variant:Nn \__draw_point_vec:nnn { fff }
\cs_new:Npn \draw_point_vec_polar:nn #1#2
- { \draw_point_vec_polar:nnn {#1} {#2} {#2} }
+ { \draw_point_vec_polar:nnn {#1} {#1} {#2} }
\cs_new:Npn \draw_point_vec_polar:nnn #1#2#3
- { \__draw_draw_vec_polar:fnn { \fp_eval:n {#1} } {#2} {#3} }
+ { \__draw_draw_vec_polar:fnn { \fp_eval:n {#3} } {#1} {#2} }
\cs_new:Npn \__draw_draw_vec_polar:nnn #1#2#3
{
\__draw_point_to_dim:n
@@ -1514,8 +1524,9 @@
{ \token_if_eq_meaning_p:NN #4 \__draw_softpath_close_op:nn }
}
{
- \__draw_softpath_round_calc:nnnNnn
- \__draw_softpath_round_loop:Nnn {#5} {#6}
+ \__draw_softpath_round_calc:NnnNnn
+ \__draw_softpath_round_loop:Nnn
+ {#5} {#6}
}
{
\token_if_eq_meaning:NNTF #4 \__draw_softpath_roundpoint_op:nn
@@ -1528,12 +1539,13 @@
\cs_new_protected:Npn \__draw_softpath_round_roundpoint:NnnNnnNnn
#1#2#3#4#5#6#7#8#9
{
- \__draw_softpath_round_calc:nnnNnn
+ \__draw_softpath_round_calc:NnnNnn
\__draw_softpath_round_loop:Nnn
- {#8} {#9} #1 {#2} {#3}
+ {#8} {#9}
+ #1 {#2} {#3}
#4 {#5} {#6} #7 {#8} {#9}
}
-\cs_new_protected:Npn \__draw_softpath_round_calc:nnnNnn #1#2#3#4#5#6
+\cs_new_protected:Npn \__draw_softpath_round_calc:NnnNnn #1#2#3#4#5#6
{
\tl_set:Nx \l__draw_softpath_curve_end_tl
{
@@ -1596,7 +1608,7 @@
{
\use:x
{
- \__draw_softpath_round_calc:nnnNnn
+ \__draw_softpath_round_calc:NnnNnn
{
\tl_set:Nx \exp_not:N \l__draw_softpath_move_tl
{