[latex3-commits] [git/LaTeX3-latex3-latex3] master: Slightly clearer names for PostScript functions (657ae4f)

[Joseph Wright]

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

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

commit 657ae4fefc60f1d4a25d83542d4c1db4ee70b4e7
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Apr 11 11:16:56 2019 +0100

    Slightly clearer names for PostScript functions
    
    The short names look great .. until we want all of the
    stuff to break dvips hyperlinks. Also, they likely should
    be more organised.


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

657ae4fefc60f1d4a25d83542d4c1db4ee70b4e7
 l3kernel/l3drivers-color.dtx |    4 +++-
 l3kernel/l3drivers-draw.dtx  |   12 +++++++-----
 l3kernel/l3drivers-pdf.dtx   |   12 +++++++-----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/l3kernel/l3drivers-color.dtx b/l3kernel/l3drivers-color.dtx
index 27a61c2..9bd1664 100644
--- a/l3kernel/l3drivers-color.dtx
+++ b/l3kernel/l3drivers-color.dtx
@@ -117,6 +117,7 @@
 % \begin{macro}{\driver_color_spot:nn}
 % \begin{macro}{\@@_color_select:n, \@@_color_select:x}
 % \begin{macro}{\@@_color_reset:}
+% \begin{macro}{driver.fc}
 %    Push the data to the stack. In the case of \texttt{dvips} also reset the
 %    drawing fill color in raw PostScript.
 %    \begin{macrocode}
@@ -142,7 +143,7 @@
   {
     \@@_literal:n { color~push~ #1 }
 %<*dvips>
-    \@@_literal_postscript:n { /l3fc~{ }~def }
+    \@@_literal_postscript:n { /driver.fc~{ }~def }
 %</dvips>
     \group_insert_after:N \@@_color_reset:
   }
@@ -156,6 +157,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 %    \begin{macrocode}
 %</dvisvgm|dvipdfmx|dvips|xdvipdfmx>
diff --git a/l3kernel/l3drivers-draw.dtx b/l3kernel/l3drivers-draw.dtx
index 21fe082..737aaa2 100644
--- a/l3kernel/l3drivers-draw.dtx
+++ b/l3kernel/l3drivers-draw.dtx
@@ -76,11 +76,12 @@
 % \end{macro}
 %
 % \begin{macro}{\driver_draw_begin:, \driver_draw_end:}
+% \begin{macro}{driver.fc}
 %   The |ps::[begin]| special here deals with positioning but allows us to
 %   continue on to a matching |ps::[end]|: contrast with |ps:|, which positions
 %   but where we can't split material between separate calls. The
 %   |@beginspecial|/|@endspecial| pair are from |special.pro| and correct the
-%   scale and $y$-axis direction. The definition of |/l3fc| deals with fill
+%   scale and $y$-axis direction. The definition of |/driver.fc| deals with fill
 %   color in paths. In contrast to \pkg{pgf}, we don't save the current point:
 %   discussion with Tom Rokici suggested a better way to handle the necessary
 %   translations (see \cs{driver_draw_box_use:Nnnnn}). (Note that
@@ -93,7 +94,7 @@
   {
     \@@_literal:n { ps::[begin] }
     \@@_draw_literal:n { @beginspecial }
-    \@@_draw_literal:n { /l3fc~{ }~def }
+    \@@_draw_literal:n { /driver.fc~{ }~def }
   }
 \cs_new_protected:Npn \driver_draw_end:
   {
@@ -102,6 +103,7 @@
   }
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\driver_draw_scope_begin:, \driver_draw_scope_end:}
 %   Scope here may need to contain saved definitions, so the entire memory
@@ -220,7 +222,7 @@
 \cs_new_protected:Npn \driver_draw_fill:
   {
     \@@_draw_literal:n { gsave }
-    \@@_draw_literal:n { l3fc }
+    \@@_draw_literal:n { driver.fc }
     \@@_draw_literal:x
       {
         \bool_if:NT \g_@@_draw_eor_bool { eo }
@@ -241,7 +243,7 @@
 \cs_new_protected:Npn \driver_draw_fillstroke:
   {
     \@@_draw_literal:n { gsave }
-    \@@_draw_literal:n { l3fc }
+    \@@_draw_literal:n { driver.fc }
     \@@_draw_literal:x
       {
         \bool_if:NT \g_@@_draw_eor_bool { eo }
@@ -389,7 +391,7 @@
       { rgb ~ \fp_eval:n {#1} ~ \fp_eval:n {#2} ~ \fp_eval:n {#3} }
   }
 \cs_new_protected:Npn \@@_draw_color_fill:n #1
-  { \@@_draw_literal:n { /l3fc ~ { #1 } ~ def } }
+  { \@@_draw_literal:n { /driver.fc ~ { #1 } ~ def } }
 \cs_generate_variant:Nn \@@_draw_color_fill:n { x }
 \cs_new_protected:Npn \@@_draw_color_stroke:n #1
   {
diff --git a/l3kernel/l3drivers-pdf.dtx b/l3kernel/l3drivers-pdf.dtx
index e64803f..d3403d1 100644
--- a/l3kernel/l3drivers-pdf.dtx
+++ b/l3kernel/l3drivers-pdf.dtx
@@ -182,6 +182,7 @@
 % \end{variable}
 %
 % \begin{macro}{\driver_pdf_annotation:nnnn}
+% \begin{macro}{driver.llx, driver.lly, driver.urx, driver.ury}
 %   Annotations are objects, but we track them separately. Notably, they are
 %   not in the object data lists. Here, to get the co-ordinates of the
 %   annotation, we need to have the data collected at the PostScript level.
@@ -203,8 +204,8 @@
                   \@@_literal:n
                     {
                       ps: currentpoint ~
-                      /l3lly ~ exch ~ def ~
-                      /l3llx ~ exch ~ def
+                      /driver.lly ~ exch ~ def ~
+                      /driver.llx ~ exch ~ def
                     }
                 }
             }
@@ -216,8 +217,8 @@
                   \@@_literal:n
                     {
                       ps: currentpoint ~
-                      /l3ury ~ exch ~ def ~
-                      /l3urx ~ exch ~ def
+                      /driver.ury ~ exch ~ def ~
+                      /driver.urx ~ exch ~ def
                     }
                 }
             }
@@ -229,13 +230,14 @@
       {
         ps:
           mark ~ /_objdef ~ { l3obj \int_use:N \g_@@_pdf_object_int }
-          /Rect ~ [ l3llx ~ l3lly ~ l3urx  ~ l3ury ]
+          /Rect ~ [ driver.llx ~ driver.lly ~ driver.urx ~ driver.ury ]
           #4
           /ANN ~ pdfmark
       }
   }
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}[EXP]{\driver_pdf_annotation_last:}
 %   Provide the last annotation we created: could get tricky of course if