diff --git a/l3experimental/l3draw/l3draw-scopes.dtx b/l3experimental/l3draw/l3draw-scopes.dtx
index 451226ccde..b2a212a187 100644
--- a/l3experimental/l3draw/l3draw-scopes.dtx
+++ b/l3experimental/l3draw/l3draw-scopes.dtx
@@ -129,6 +129,11 @@
         \@@_softpath_clear:
         \draw_linewidth:n { \l_draw_default_linewidth_dim }
         \draw_color:n { . }
+        \draw_nonzero_rule:
+        \draw_cap_butt:
+        \draw_join_miter:
+        \draw_miterlimit:n { 10 }
+        \draw_dash_pattern:nn { } { 0cm }
   }
 \cs_new_protected:Npn \draw_end:
   {
diff --git a/l3experimental/l3draw/l3draw.dtx b/l3experimental/l3draw/l3draw.dtx
index fa6c879ab4..9a1257c815 100644
--- a/l3experimental/l3draw/l3draw.dtx
+++ b/l3experimental/l3draw/l3draw.dtx
@@ -165,6 +165,14 @@
 %   drawing using |\int_step_function:nnnn| or similar. On the other hand,
 %   text should not be included directly in drawings, but should rather be
 %   inserted using the appropriate \pkg{l3draw} command.
+%
+%   The drawing environment sets the following standard behaviors
+%   \begin{itemize}
+%      \item Non-zero rule for fill overlaps
+%      \item Butt caps for lines
+%      \item Mitering for line joins with a miter factor of $10$
+%      \item Solid line strokes
+%   \end{itemize}
 % \end{function}
 %
 % Within a drawing, there are different ways of referring to a position.
diff --git a/l3experimental/l3draw/testfiles/m3draw003.ptex.tlg b/l3experimental/l3draw/testfiles/m3draw003.ptex.tlg
index 866a580f64..43e6423b4c 100644
--- a/l3experimental/l3draw/testfiles/m3draw003.ptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw003.ptex.tlg
@@ -11,6 +11,10 @@ TEST 1: \draw_path_moveto:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 9.96265 9.96265 m}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -30,6 +34,10 @@ TEST 2: \draw_path_lineto:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 9.96265 9.96265 l}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -49,6 +57,10 @@ TEST 3: \draw_path_curveto:nnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -68,6 +80,10 @@ TEST 4: \draw_path_close:
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0.99626 0 l}
 ...\special{pdf:literal 0.99626 0.99626 l}
@@ -91,6 +107,10 @@ TEST 5: \draw_path_curveto:nnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 18.89764 19.22972 28.34647 37.79527 28.34647 56.69292 c}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -110,6 +130,10 @@ TEST 6: \draw_path_arc:nnn (n)
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\special{pdf:literal S}
@@ -126,6 +150,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\special{pdf:literal -88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
@@ -143,6 +171,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\special{pdf:literal -88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
@@ -161,6 +193,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\special{pdf:literal -88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
@@ -180,6 +216,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\special{pdf:literal S}
@@ -196,6 +236,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\special{pdf:literal -88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
@@ -213,6 +257,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\special{pdf:literal -88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
@@ -231,6 +279,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\special{pdf:literal -88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
@@ -250,6 +302,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -12.69115 56.69292 -28.34647 56.69292 c}
 ...\special{pdf:literal S}
@@ -270,6 +326,10 @@ TEST 7: \draw_path_arc_axes:nnnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal -28.34647 88.00356 -53.72874 113.38583 -85.03938 113.3858\ETC.}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -289,6 +349,10 @@ TEST 8: \draw_path_ellipse:nnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1.99252 1.99252 m}
 ...\special{pdf:literal 0.89209 3.09297 -0.44603 3.53902 -0.99626 2.98878 c}
 ...\special{pdf:literal -1.5465 2.43857 -1.10045 1.10045 0 0 c}
@@ -310,6 +374,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 70.86615 0 m}
 ...\special{pdf:literal 70.86615 15.65532 51.82942 28.34647 28.34647 28.34647 c}
 ...\special{pdf:literal 4.86348 28.34647 -14.17323 15.65532 -14.17323 0 c}
@@ -335,6 +403,10 @@ TEST 9: \draw_path_circle:nn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 86.03563 0.99626 m}
 ...\special{pdf:literal 86.03563 47.96222 47.96222 86.03563 0.99626 86.03563 c}
 ...\special{pdf:literal -45.96968 86.03563 -84.0431 47.96222 -84.0431 0.99626 c}
@@ -360,6 +432,10 @@ TEST 10: \draw_path_rectangle:nn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 56.69292 56.69292 28.34647 28.34647 re}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -375,6 +451,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 226.77168 85.03938 m}
 ...\special{pdf:literal 198.42522 85.03938 l}
 ...\special{pdf:literal 170.07875 56.69292 l}
@@ -395,6 +475,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 83.04684 85.03938 m}
 ...\special{pdf:literal 58.68544 85.03938 l}
 ...\special{pdf:literal 57.585 85.03938 56.69292 84.1473 56.69292 83.04684 c}
@@ -420,6 +504,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 56.69292 56.69292 28.34647 28.34647 re}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -439,6 +527,10 @@ TEST 11: \draw_path_grid:nn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 141.73228 l}
 ...\special{pdf:literal 28.34645 0 m}
@@ -477,6 +569,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 141.73228 l}
 ...\special{pdf:literal 28.34645 0 m}
@@ -515,6 +611,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 141.73228 l}
 ...\special{pdf:literal 28.34645 0 m}
@@ -553,6 +653,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 141.73228 l}
 ...\special{pdf:literal 28.34645 0 m}
@@ -589,6 +693,10 @@ TEST 12: \draw_path_canvas_moveto:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 9.96265 9.96265 m}
 ...\special{pdf:literal 9.96265 9.96265 m}
 ...\special{pdf:literal S}
@@ -609,6 +717,10 @@ TEST 13: \draw_path_canvas_lineto:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 9.96265 9.96265 l}
 ...\special{pdf:literal 9.96265 9.96265 l}
 ...\special{pdf:literal S}
@@ -629,6 +741,10 @@ TEST 14: \draw_path_canvas_curveto:nnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
 ...\special{pdf:literal 0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
 ...\special{pdf:literal S}
diff --git a/l3experimental/l3draw/testfiles/m3draw003.tlg b/l3experimental/l3draw/testfiles/m3draw003.tlg
index 23f6267d0d..70583b1242 100644
--- a/l3experimental/l3draw/testfiles/m3draw003.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw003.tlg
@@ -11,6 +11,10 @@ TEST 1: \draw_path_moveto:n
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{9.96265 9.96265 m}
 ...\pdfliteral{S}
 ...\pdfrestore
@@ -30,6 +34,10 @@ TEST 2: \draw_path_lineto:n
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{9.96265 9.96265 l}
 ...\pdfliteral{S}
 ...\pdfrestore
@@ -49,6 +57,10 @@ TEST 3: \draw_path_curveto:nnn
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
 ...\pdfliteral{S}
 ...\pdfrestore
@@ -68,6 +80,10 @@ TEST 4: \draw_path_close:
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{0.99626 0 l}
 ...\pdfliteral{0.99626 0.99626 l}
@@ -91,6 +107,10 @@ TEST 5: \draw_path_curveto:nnn
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{18.89764 19.22972 28.34647 37.79527 28.34647 56.69292 c}
 ...\pdfliteral{S}
 ...\pdfrestore
@@ -110,6 +130,10 @@ TEST 6: \draw_path_arc:nnn (n)
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\pdfliteral{S}
@@ -126,6 +150,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\pdfliteral{-88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
@@ -143,6 +171,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\pdfliteral{-88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
@@ -161,6 +193,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\pdfliteral{-88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
@@ -180,6 +216,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\pdfliteral{S}
@@ -196,6 +236,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\pdfliteral{-88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
@@ -213,6 +257,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\pdfliteral{-88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
@@ -231,6 +279,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\pdfliteral{-88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
@@ -250,6 +302,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{0 31.31062 -12.69115 56.69292 -28.34647 56.69292 c}
 ...\pdfliteral{S}
@@ -270,6 +326,10 @@ TEST 7: \draw_path_arc_axes:nnnn
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{-28.34647 88.00356 -53.72874 113.38583 -85.03938 113.38583 c}
 ...\pdfliteral{S}
 ...\pdfrestore
@@ -289,6 +349,10 @@ TEST 8: \draw_path_ellipse:nnn
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{1.99252 1.99252 m}
 ...\pdfliteral{0.89209 3.09297 -0.44603 3.53902 -0.99626 2.98878 c}
 ...\pdfliteral{-1.5465 2.43857 -1.10045 1.10045 0 0 c}
@@ -310,6 +374,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{70.86615 0 m}
 ...\pdfliteral{70.86615 15.65532 51.82942 28.34647 28.34647 28.34647 c}
 ...\pdfliteral{4.86348 28.34647 -14.17323 15.65532 -14.17323 0 c}
@@ -335,6 +403,10 @@ TEST 9: \draw_path_circle:nn
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{86.03563 0.99626 m}
 ...\pdfliteral{86.03563 47.96222 47.96222 86.03563 0.99626 86.03563 c}
 ...\pdfliteral{-45.96968 86.03563 -84.0431 47.96222 -84.0431 0.99626 c}
@@ -360,6 +432,10 @@ TEST 10: \draw_path_rectangle:nn
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{56.69292 56.69292 28.34647 28.34647 re}
 ...\pdfliteral{S}
 ...\pdfrestore
@@ -375,6 +451,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{226.77168 85.03938 m}
 ...\pdfliteral{198.42522 85.03938 l}
 ...\pdfliteral{170.07875 56.69292 l}
@@ -395,6 +475,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{83.04684 85.03938 m}
 ...\pdfliteral{58.68544 85.03938 l}
 ...\pdfliteral{57.585 85.03938 56.69292 84.1473 56.69292 83.04684 c}
@@ -420,6 +504,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{56.69292 56.69292 28.34647 28.34647 re}
 ...\pdfliteral{S}
 ...\pdfrestore
@@ -439,6 +527,10 @@ TEST 11: \draw_path_grid:nn
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{0 141.73228 l}
 ...\pdfliteral{28.34645 0 m}
@@ -477,6 +569,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{0 141.73228 l}
 ...\pdfliteral{28.34645 0 m}
@@ -515,6 +611,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{0 141.73228 l}
 ...\pdfliteral{28.34645 0 m}
@@ -553,6 +653,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{0 141.73228 l}
 ...\pdfliteral{28.34645 0 m}
@@ -589,6 +693,10 @@ TEST 12: \draw_path_canvas_moveto:n
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{9.96265 9.96265 m}
 ...\pdfliteral{9.96265 9.96265 m}
 ...\pdfliteral{S}
@@ -609,6 +717,10 @@ TEST 13: \draw_path_canvas_lineto:n
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{9.96265 9.96265 l}
 ...\pdfliteral{9.96265 9.96265 l}
 ...\pdfliteral{S}
@@ -629,6 +741,10 @@ TEST 14: \draw_path_canvas_curveto:nnn
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
 ...\pdfliteral{0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
 ...\pdfliteral{S}
diff --git a/l3experimental/l3draw/testfiles/m3draw003.uptex.tlg b/l3experimental/l3draw/testfiles/m3draw003.uptex.tlg
index 866a580f64..43e6423b4c 100644
--- a/l3experimental/l3draw/testfiles/m3draw003.uptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw003.uptex.tlg
@@ -11,6 +11,10 @@ TEST 1: \draw_path_moveto:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 9.96265 9.96265 m}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -30,6 +34,10 @@ TEST 2: \draw_path_lineto:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 9.96265 9.96265 l}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -49,6 +57,10 @@ TEST 3: \draw_path_curveto:nnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -68,6 +80,10 @@ TEST 4: \draw_path_close:
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0.99626 0 l}
 ...\special{pdf:literal 0.99626 0.99626 l}
@@ -91,6 +107,10 @@ TEST 5: \draw_path_curveto:nnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 18.89764 19.22972 28.34647 37.79527 28.34647 56.69292 c}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -110,6 +130,10 @@ TEST 6: \draw_path_arc:nnn (n)
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\special{pdf:literal S}
@@ -126,6 +150,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\special{pdf:literal -88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
@@ -143,6 +171,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\special{pdf:literal -88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
@@ -161,6 +193,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\special{pdf:literal -88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
@@ -180,6 +216,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\special{pdf:literal S}
@@ -196,6 +236,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\special{pdf:literal -88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
@@ -213,6 +257,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\special{pdf:literal -88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
@@ -231,6 +279,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\special{pdf:literal -88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
@@ -250,6 +302,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -12.69115 56.69292 -28.34647 56.69292 c}
 ...\special{pdf:literal S}
@@ -270,6 +326,10 @@ TEST 7: \draw_path_arc_axes:nnnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal -28.34647 88.00356 -53.72874 113.38583 -85.03938 113.3858\ETC.}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -289,6 +349,10 @@ TEST 8: \draw_path_ellipse:nnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1.99252 1.99252 m}
 ...\special{pdf:literal 0.89209 3.09297 -0.44603 3.53902 -0.99626 2.98878 c}
 ...\special{pdf:literal -1.5465 2.43857 -1.10045 1.10045 0 0 c}
@@ -310,6 +374,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 70.86615 0 m}
 ...\special{pdf:literal 70.86615 15.65532 51.82942 28.34647 28.34647 28.34647 c}
 ...\special{pdf:literal 4.86348 28.34647 -14.17323 15.65532 -14.17323 0 c}
@@ -335,6 +403,10 @@ TEST 9: \draw_path_circle:nn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 86.03563 0.99626 m}
 ...\special{pdf:literal 86.03563 47.96222 47.96222 86.03563 0.99626 86.03563 c}
 ...\special{pdf:literal -45.96968 86.03563 -84.0431 47.96222 -84.0431 0.99626 c}
@@ -360,6 +432,10 @@ TEST 10: \draw_path_rectangle:nn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 56.69292 56.69292 28.34647 28.34647 re}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -375,6 +451,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 226.77168 85.03938 m}
 ...\special{pdf:literal 198.42522 85.03938 l}
 ...\special{pdf:literal 170.07875 56.69292 l}
@@ -395,6 +475,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 83.04684 85.03938 m}
 ...\special{pdf:literal 58.68544 85.03938 l}
 ...\special{pdf:literal 57.585 85.03938 56.69292 84.1473 56.69292 83.04684 c}
@@ -420,6 +504,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 56.69292 56.69292 28.34647 28.34647 re}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -439,6 +527,10 @@ TEST 11: \draw_path_grid:nn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 141.73228 l}
 ...\special{pdf:literal 28.34645 0 m}
@@ -477,6 +569,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 141.73228 l}
 ...\special{pdf:literal 28.34645 0 m}
@@ -515,6 +611,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 141.73228 l}
 ...\special{pdf:literal 28.34645 0 m}
@@ -553,6 +653,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 141.73228 l}
 ...\special{pdf:literal 28.34645 0 m}
@@ -589,6 +693,10 @@ TEST 12: \draw_path_canvas_moveto:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 9.96265 9.96265 m}
 ...\special{pdf:literal 9.96265 9.96265 m}
 ...\special{pdf:literal S}
@@ -609,6 +717,10 @@ TEST 13: \draw_path_canvas_lineto:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 9.96265 9.96265 l}
 ...\special{pdf:literal 9.96265 9.96265 l}
 ...\special{pdf:literal S}
@@ -629,6 +741,10 @@ TEST 14: \draw_path_canvas_curveto:nnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
 ...\special{pdf:literal 0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
 ...\special{pdf:literal S}
diff --git a/l3experimental/l3draw/testfiles/m3draw003.xetex.tlg b/l3experimental/l3draw/testfiles/m3draw003.xetex.tlg
index 866a580f64..43e6423b4c 100644
--- a/l3experimental/l3draw/testfiles/m3draw003.xetex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw003.xetex.tlg
@@ -11,6 +11,10 @@ TEST 1: \draw_path_moveto:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 9.96265 9.96265 m}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -30,6 +34,10 @@ TEST 2: \draw_path_lineto:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 9.96265 9.96265 l}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -49,6 +57,10 @@ TEST 3: \draw_path_curveto:nnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -68,6 +80,10 @@ TEST 4: \draw_path_close:
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0.99626 0 l}
 ...\special{pdf:literal 0.99626 0.99626 l}
@@ -91,6 +107,10 @@ TEST 5: \draw_path_curveto:nnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 18.89764 19.22972 28.34647 37.79527 28.34647 56.69292 c}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -110,6 +130,10 @@ TEST 6: \draw_path_arc:nnn (n)
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\special{pdf:literal S}
@@ -126,6 +150,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\special{pdf:literal -88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
@@ -143,6 +171,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\special{pdf:literal -88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
@@ -161,6 +193,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -25.38228 56.69292 -56.69292 56.69292 c}
 ...\special{pdf:literal -88.00354 56.69292 -113.38583 31.31064 -113.38583 0 c}
@@ -180,6 +216,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\special{pdf:literal S}
@@ -196,6 +236,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\special{pdf:literal -88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
@@ -213,6 +257,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\special{pdf:literal -88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
@@ -231,6 +279,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 -31.31062 -25.38228 -56.69292 -56.69292 -56.69292 c}
 ...\special{pdf:literal -88.00354 -56.69292 -113.38583 -31.31064 -113.38583 0 c}
@@ -250,6 +302,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 31.31062 -12.69115 56.69292 -28.34647 56.69292 c}
 ...\special{pdf:literal S}
@@ -270,6 +326,10 @@ TEST 7: \draw_path_arc_axes:nnnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal -28.34647 88.00356 -53.72874 113.38583 -85.03938 113.3858\ETC.}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -289,6 +349,10 @@ TEST 8: \draw_path_ellipse:nnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1.99252 1.99252 m}
 ...\special{pdf:literal 0.89209 3.09297 -0.44603 3.53902 -0.99626 2.98878 c}
 ...\special{pdf:literal -1.5465 2.43857 -1.10045 1.10045 0 0 c}
@@ -310,6 +374,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 70.86615 0 m}
 ...\special{pdf:literal 70.86615 15.65532 51.82942 28.34647 28.34647 28.34647 c}
 ...\special{pdf:literal 4.86348 28.34647 -14.17323 15.65532 -14.17323 0 c}
@@ -335,6 +403,10 @@ TEST 9: \draw_path_circle:nn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 86.03563 0.99626 m}
 ...\special{pdf:literal 86.03563 47.96222 47.96222 86.03563 0.99626 86.03563 c}
 ...\special{pdf:literal -45.96968 86.03563 -84.0431 47.96222 -84.0431 0.99626 c}
@@ -360,6 +432,10 @@ TEST 10: \draw_path_rectangle:nn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 56.69292 56.69292 28.34647 28.34647 re}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -375,6 +451,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 226.77168 85.03938 m}
 ...\special{pdf:literal 198.42522 85.03938 l}
 ...\special{pdf:literal 170.07875 56.69292 l}
@@ -395,6 +475,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 83.04684 85.03938 m}
 ...\special{pdf:literal 58.68544 85.03938 l}
 ...\special{pdf:literal 57.585 85.03938 56.69292 84.1473 56.69292 83.04684 c}
@@ -420,6 +504,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 56.69292 56.69292 28.34647 28.34647 re}
 ...\special{pdf:literal S}
 ...\special{x:grestore}
@@ -439,6 +527,10 @@ TEST 11: \draw_path_grid:nn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 141.73228 l}
 ...\special{pdf:literal 28.34645 0 m}
@@ -477,6 +569,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 141.73228 l}
 ...\special{pdf:literal 28.34645 0 m}
@@ -515,6 +611,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 141.73228 l}
 ...\special{pdf:literal 28.34645 0 m}
@@ -553,6 +653,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 0 141.73228 l}
 ...\special{pdf:literal 28.34645 0 m}
@@ -589,6 +693,10 @@ TEST 12: \draw_path_canvas_moveto:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 9.96265 9.96265 m}
 ...\special{pdf:literal 9.96265 9.96265 m}
 ...\special{pdf:literal S}
@@ -609,6 +717,10 @@ TEST 13: \draw_path_canvas_lineto:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 9.96265 9.96265 l}
 ...\special{pdf:literal 9.96265 9.96265 l}
 ...\special{pdf:literal S}
@@ -629,6 +741,10 @@ TEST 14: \draw_path_canvas_curveto:nnn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
 ...\special{pdf:literal 0 28.34647 28.34647 28.34647 28.34647 56.69292 c}
 ...\special{pdf:literal S}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg b/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg
index afe78ed86c..490df888fe 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.ptex.tlg
@@ -11,6 +11,10 @@ TEST 1: \l_draw_default_linewidth_dim
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
 ...\special{pdf:literal 56.69292 0 l}
@@ -28,6 +32,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.99626 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
 ...\special{pdf:literal 56.69292 0 l}
@@ -49,6 +57,10 @@ TEST 2: \draw_linewidth:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0.99626 w}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -71,6 +83,10 @@ TEST 3: \draw_dash_pattern:nn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -89,6 +105,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal [5.6693 5.6693] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -107,6 +127,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal [5.6693 5.6693] 2.83464 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -130,6 +154,10 @@ TEST 4: \draw_cap_ ...
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
 ...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
+...\special{pdf:literal 0 J}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
 ...\special{pdf:literal 56.69292 0 l}
@@ -147,6 +175,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 2 J}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -165,6 +197,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1 J}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -187,6 +223,10 @@ TEST 5: \draw_join_ ...
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 2 j}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -205,6 +245,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 j}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -223,6 +267,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1 j}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -245,6 +293,10 @@ TEST 6: \draw_miterlimit:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1 M}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -263,6 +315,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 2 M}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -281,6 +337,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 10 M}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -303,6 +363,10 @@ TEST 7: \draw_color:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{color push rgb 1 0 0}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -322,6 +386,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{color push rgb 1 0 0}
 ...\special{pdf:literal 0 0 28.34647 28.34647 re}
 ...\special{pdf:literal f}
@@ -353,6 +421,10 @@ TEST 8: \draw_color_fill:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1 0 0 rg}
 ...\special{pdf:literal 0 0 28.34647 28.34647 re}
 ...\special{pdf:literal f}
@@ -381,6 +453,10 @@ TEST 9: \draw_color_stroke:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{color push 1 0 0 RG}
 ...\special{pdf:literal 0 0 28.34647 28.34647 re}
 ...\special{pdf:literal f}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.tlg b/l3experimental/l3draw/testfiles/m3draw004.tlg
index 272a06ca8b..18f02a5b2b 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.tlg
@@ -11,6 +11,10 @@ TEST 1: \l_draw_default_linewidth_dim
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
 ...\pdfliteral{56.69292 0 l}
@@ -28,6 +32,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.99626 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
 ...\pdfliteral{56.69292 0 l}
@@ -49,6 +57,10 @@ TEST 2: \draw_linewidth:n
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0.99626 w}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
@@ -71,6 +83,10 @@ TEST 3: \draw_dash_pattern:nn
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
@@ -89,6 +105,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{[5.6693 5.6693] 0 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
@@ -107,6 +127,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{[5.6693 5.6693] 2.83464 d}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
@@ -130,6 +154,10 @@ TEST 4: \draw_cap_ ...
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
 ...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
+...\pdfliteral{0 J}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
 ...\pdfliteral{56.69292 0 l}
@@ -147,6 +175,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{2 J}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
@@ -165,6 +197,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{1 J}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
@@ -187,6 +223,10 @@ TEST 5: \draw_join_ ...
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{2 j}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
@@ -205,6 +245,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{0 j}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
@@ -223,6 +267,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{1 j}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
@@ -245,6 +293,10 @@ TEST 6: \draw_miterlimit:n
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{1 M}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
@@ -263,6 +315,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{2 M}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
@@ -281,6 +337,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfliteral{10 M}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
@@ -303,6 +363,10 @@ TEST 7: \draw_color:n
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG}
 ...\pdfliteral{0 0 m}
 ...\pdfliteral{28.34647 283.46457 l}
@@ -322,6 +386,10 @@ l. ...  }
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG}
 ...\pdfliteral{0 0 28.34647 28.34647 re}
 ...\pdfliteral{f}
@@ -353,6 +421,10 @@ TEST 8: \draw_color_fill:n
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfcolorstack 0 push {1 0 0 rg}
 ...\pdfliteral{0 0 28.34647 28.34647 re}
 ...\pdfliteral{f}
@@ -384,6 +456,10 @@ TEST 9: \draw_color_stroke:n
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfcolorstack 0 push {1 0 0 RG}
 ...\pdfliteral{0 0 28.34647 28.34647 re}
 ...\pdfliteral{f}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg b/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
index afe78ed86c..490df888fe 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.uptex.tlg
@@ -11,6 +11,10 @@ TEST 1: \l_draw_default_linewidth_dim
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
 ...\special{pdf:literal 56.69292 0 l}
@@ -28,6 +32,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.99626 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
 ...\special{pdf:literal 56.69292 0 l}
@@ -49,6 +57,10 @@ TEST 2: \draw_linewidth:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0.99626 w}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -71,6 +83,10 @@ TEST 3: \draw_dash_pattern:nn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -89,6 +105,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal [5.6693 5.6693] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -107,6 +127,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal [5.6693 5.6693] 2.83464 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -130,6 +154,10 @@ TEST 4: \draw_cap_ ...
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
 ...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
+...\special{pdf:literal 0 J}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
 ...\special{pdf:literal 56.69292 0 l}
@@ -147,6 +175,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 2 J}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -165,6 +197,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1 J}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -187,6 +223,10 @@ TEST 5: \draw_join_ ...
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 2 j}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -205,6 +245,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 j}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -223,6 +267,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1 j}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -245,6 +293,10 @@ TEST 6: \draw_miterlimit:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1 M}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -263,6 +315,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 2 M}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -281,6 +337,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 10 M}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -303,6 +363,10 @@ TEST 7: \draw_color:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{color push rgb 1 0 0}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -322,6 +386,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{color push rgb 1 0 0}
 ...\special{pdf:literal 0 0 28.34647 28.34647 re}
 ...\special{pdf:literal f}
@@ -353,6 +421,10 @@ TEST 8: \draw_color_fill:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1 0 0 rg}
 ...\special{pdf:literal 0 0 28.34647 28.34647 re}
 ...\special{pdf:literal f}
@@ -381,6 +453,10 @@ TEST 9: \draw_color_stroke:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{color push 1 0 0 RG}
 ...\special{pdf:literal 0 0 28.34647 28.34647 re}
 ...\special{pdf:literal f}
diff --git a/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg b/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
index afe78ed86c..490df888fe 100644
--- a/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw004.xetex.tlg
@@ -11,6 +11,10 @@ TEST 1: \l_draw_default_linewidth_dim
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
 ...\special{pdf:literal 56.69292 0 l}
@@ -28,6 +32,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.99626 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
 ...\special{pdf:literal 56.69292 0 l}
@@ -49,6 +57,10 @@ TEST 2: \draw_linewidth:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0.99626 w}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -71,6 +83,10 @@ TEST 3: \draw_dash_pattern:nn
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -89,6 +105,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal [5.6693 5.6693] 0 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -107,6 +127,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal [5.6693 5.6693] 2.83464 d}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -130,6 +154,10 @@ TEST 4: \draw_cap_ ...
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
 ...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
+...\special{pdf:literal 0 J}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
 ...\special{pdf:literal 56.69292 0 l}
@@ -147,6 +175,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 2 J}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -165,6 +197,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1 J}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -187,6 +223,10 @@ TEST 5: \draw_join_ ...
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 2 j}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -205,6 +245,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 0 j}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -223,6 +267,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1 j}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -245,6 +293,10 @@ TEST 6: \draw_miterlimit:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1 M}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -263,6 +315,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 2 M}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -281,6 +337,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 10 M}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -303,6 +363,10 @@ TEST 7: \draw_color:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{color push rgb 1 0 0}
 ...\special{pdf:literal 0 0 m}
 ...\special{pdf:literal 28.34647 283.46457 l}
@@ -322,6 +386,10 @@ l. ...  }
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{color push rgb 1 0 0}
 ...\special{pdf:literal 0 0 28.34647 28.34647 re}
 ...\special{pdf:literal f}
@@ -353,6 +421,10 @@ TEST 8: \draw_color_fill:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{pdf:literal 1 0 0 rg}
 ...\special{pdf:literal 0 0 28.34647 28.34647 re}
 ...\special{pdf:literal f}
@@ -381,6 +453,10 @@ TEST 9: \draw_color_stroke:n
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{color push 1 0 0 RG}
 ...\special{pdf:literal 0 0 28.34647 28.34647 re}
 ...\special{pdf:literal f}
diff --git a/l3experimental/l3draw/testfiles/m3draw005.ptex.tlg b/l3experimental/l3draw/testfiles/m3draw005.ptex.tlg
index b81e226d94..8ca84c7bf4 100644
--- a/l3experimental/l3draw/testfiles/m3draw005.ptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw005.ptex.tlg
@@ -11,6 +11,10 @@ TEST 1: \draw_scope_begin:
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{x:gsave}
 ...\special{pdf:literal 0.99626 w}
 ...\special{pdf:literal 0 0 m}
@@ -39,6 +43,10 @@ TEST 2: \draw_suspend_begin:
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\hbox(0.0+0.0)x0.0
 ....\kern 0.0
 ....\hbox(285.52756+0.0)x0.0
@@ -52,6 +60,10 @@ TEST 2: \draw_suspend_begin:
 .........\special{x:gsave}
 .........\special{pdf:literal 0.3985 w}
 .........\special{color push gray 0}
+.........\special{pdf:literal 0 J}
+.........\special{pdf:literal 0 j}
+.........\special{pdf:literal 10 M}
+.........\special{pdf:literal [] 0 d}
 .........\special{pdf:literal 0.99626 w}
 .........\special{pdf:literal 0 0 m}
 .........\special{pdf:literal 28.34647 283.46457 l}
diff --git a/l3experimental/l3draw/testfiles/m3draw005.tlg b/l3experimental/l3draw/testfiles/m3draw005.tlg
index fba24a0b55..5b00ec3d68 100644
--- a/l3experimental/l3draw/testfiles/m3draw005.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw005.tlg
@@ -11,6 +11,10 @@ TEST 1: \draw_scope_begin:
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\pdfsave
 ...\pdfliteral{0.99626 w}
 ...\pdfliteral{0 0 m}
@@ -39,6 +43,10 @@ TEST 2: \draw_suspend_begin:
 ...\pdfsave
 ...\pdfliteral{0.3985 w}
 ...\pdfcolorstack 0 push {0 g 0 G}
+...\pdfliteral{0 J}
+...\pdfliteral{0 j}
+...\pdfliteral{10 M}
+...\pdfliteral{[] 0 d}
 ...\hbox(0.0+0.0)x0.0
 ....\kern 0.0
 ....\hbox(285.52756+0.0)x0.0
@@ -52,6 +60,10 @@ TEST 2: \draw_suspend_begin:
 .........\pdfsave
 .........\pdfliteral{0.3985 w}
 .........\pdfcolorstack 0 push {0 g 0 G}
+.........\pdfliteral{0 J}
+.........\pdfliteral{0 j}
+.........\pdfliteral{10 M}
+.........\pdfliteral{[] 0 d}
 .........\pdfliteral{0.99626 w}
 .........\pdfliteral{0 0 m}
 .........\pdfliteral{28.34647 283.46457 l}
diff --git a/l3experimental/l3draw/testfiles/m3draw005.uptex.tlg b/l3experimental/l3draw/testfiles/m3draw005.uptex.tlg
index b81e226d94..8ca84c7bf4 100644
--- a/l3experimental/l3draw/testfiles/m3draw005.uptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw005.uptex.tlg
@@ -11,6 +11,10 @@ TEST 1: \draw_scope_begin:
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{x:gsave}
 ...\special{pdf:literal 0.99626 w}
 ...\special{pdf:literal 0 0 m}
@@ -39,6 +43,10 @@ TEST 2: \draw_suspend_begin:
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\hbox(0.0+0.0)x0.0
 ....\kern 0.0
 ....\hbox(285.52756+0.0)x0.0
@@ -52,6 +60,10 @@ TEST 2: \draw_suspend_begin:
 .........\special{x:gsave}
 .........\special{pdf:literal 0.3985 w}
 .........\special{color push gray 0}
+.........\special{pdf:literal 0 J}
+.........\special{pdf:literal 0 j}
+.........\special{pdf:literal 10 M}
+.........\special{pdf:literal [] 0 d}
 .........\special{pdf:literal 0.99626 w}
 .........\special{pdf:literal 0 0 m}
 .........\special{pdf:literal 28.34647 283.46457 l}
diff --git a/l3experimental/l3draw/testfiles/m3draw005.xetex.tlg b/l3experimental/l3draw/testfiles/m3draw005.xetex.tlg
index b81e226d94..8ca84c7bf4 100644
--- a/l3experimental/l3draw/testfiles/m3draw005.xetex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw005.xetex.tlg
@@ -11,6 +11,10 @@ TEST 1: \draw_scope_begin:
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\special{x:gsave}
 ...\special{pdf:literal 0.99626 w}
 ...\special{pdf:literal 0 0 m}
@@ -39,6 +43,10 @@ TEST 2: \draw_suspend_begin:
 ...\special{x:gsave}
 ...\special{pdf:literal 0.3985 w}
 ...\special{color push gray 0}
+...\special{pdf:literal 0 J}
+...\special{pdf:literal 0 j}
+...\special{pdf:literal 10 M}
+...\special{pdf:literal [] 0 d}
 ...\hbox(0.0+0.0)x0.0
 ....\kern 0.0
 ....\hbox(285.52756+0.0)x0.0
@@ -52,6 +60,10 @@ TEST 2: \draw_suspend_begin:
 .........\special{x:gsave}
 .........\special{pdf:literal 0.3985 w}
 .........\special{color push gray 0}
+.........\special{pdf:literal 0 J}
+.........\special{pdf:literal 0 j}
+.........\special{pdf:literal 10 M}
+.........\special{pdf:literal [] 0 d}
 .........\special{pdf:literal 0.99626 w}
 .........\special{pdf:literal 0 0 m}
 .........\special{pdf:literal 28.34647 283.46457 l}