[latex3-commits] [git/LaTeX3-latex3-latex3] master: l3draw: 'inner' linewidth (e1c0f31)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/e1c0f3188451d9b475d888a33ede21f7f9a9d821

>---------------------------------------------------------------

commit e1c0f3188451d9b475d888a33ede21f7f9a9d821
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Feb 13 10:36:05 2018 +0000

    l3draw: 'inner' linewidth


>---------------------------------------------------------------

e1c0f3188451d9b475d888a33ede21f7f9a9d821
 l3trial/l3draw/l3draw-state.dtx        |   14 +++++++++-----
 l3trial/l3draw/l3draw.dtx              |    2 +-
 l3trial/l3draw/testfiles/m3draw000.tlg |    1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/l3trial/l3draw/l3draw-state.dtx b/l3trial/l3draw/l3draw-state.dtx
index 5ae3b29..cbf6e41 100644
--- a/l3trial/l3draw/l3draw-state.dtx
+++ b/l3trial/l3draw/l3draw-state.dtx
@@ -58,11 +58,12 @@
 %<@@=draw>
 %    \end{macrocode}
 %
-% \begin{variable}{\g_@@_linewidth_dim}
-%   Linewidth for strokes: global as the scope for this relies on
-%   the graphics state.
+% \begin{variable}{\g_@@_linewidth_dim, \g_@@_inner_linewidth_dim}
+%   Linewidth for strokes: global as the scope for this relies on the graphics
+%   state. The inner line width is used for places where two lines are used.
 %    \begin{macrocode}
 \dim_new:N \g_@@_linewidth_dim
+\dim_new:N \g_@@_inner_linewidth_dim
 %    \end{macrocode}
 % \end{variable}
 %
@@ -74,15 +75,18 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{macro}{\draw_linewidth_set:n}
+% \begin{macro}{\draw_linewidth_set:n, \draw_inner_linewidth_set:n}
 %   Set the linewidth: we need a wrapper as this has to pass to the driver
-%   layer.
+%   layer. The inner version is handled at the macro layer but is given a
+%   consistent interface here.
 %    \begin{macrocode}
 \cs_new_protected:Npn \draw_linewidth_set:n #1
   {
     \dim_gset:Nn \g_@@_linewidth_dim { \fp_to_dim:n {#1} }
     \driver_draw_linewidth:n \g_@@_linewidth_dim
   }
+\cs_new_protected:Npn \draw_inner_linewidth_set:n #1
+  { \dim_gset:Nn \g_@@_inner_linewidth_dim { \fp_to_dim:n {#1} }  }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/l3trial/l3draw/l3draw.dtx b/l3trial/l3draw/l3draw.dtx
index bb8fd3d..b6109bc 100644
--- a/l3trial/l3draw/l3draw.dtx
+++ b/l3trial/l3draw/l3draw.dtx
@@ -65,7 +65,7 @@
 % \begin{function}{\g_draw_linewidth_default_dim}
 % \end{function}
 %
-% \begin{function}{\draw_linewidth_set:n}
+% \begin{function}{\draw_linewidth_set:n, \draw_inner_linewidth_set:n}
 %   \begin{syntax}
 %     \cs{draw_linewidth_set:n} \marg{dim}
 %   \end{syntax}
diff --git a/l3trial/l3draw/testfiles/m3draw000.tlg b/l3trial/l3draw/testfiles/m3draw000.tlg
index 90e8b40..90838e7 100644
--- a/l3trial/l3draw/testfiles/m3draw000.tlg
+++ b/l3trial/l3draw/testfiles/m3draw000.tlg
@@ -20,6 +20,7 @@ Author: Joseph Wright
 \g__draw_ymin_dim=\dimen...
 \l__draw_main_box=\box...
 \g__draw_linewidth_dim=\dimen...
+\g__draw_inner_linewidth_dim=\dimen...
 \l_draw_default_linewidth_dim=\dimen...
 \l__draw_transformcm_xshift_dim=\dimen...
 \l__draw_transformcm_yshift_dim=\dimen...