[latex3-commits] [git/LaTeX3-latex3-latex3] master: Anticipate file primitives in XeTeX (867851a)

[Joseph Wright]

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

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

commit 867851a4e66b9216dbcacd73ce479d771f1eda77
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun May 13 23:05:03 2018 +0100

    Anticipate file primitives in XeTeX


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

867851a4e66b9216dbcacd73ce479d771f1eda77
 l3kernel/l3candidates.dtx              |   12 ++++++------
 l3kernel/testfiles/m3expl001.xetex.tlg |    2 +-
 l3kernel/testfiles/m3expl003.xetex.tlg |    2 +-
 l3kernel/testfiles/m3file001.xetex.tlg |   32 ++++++++++++++++----------------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index d5dd4f9..d35e171 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -2180,22 +2180,22 @@
               { \l_@@_full_name_str }
           }
       }
-    \sys_if_engine_xetex:T
+    \cs_if_exist:NF \tex_filesize:D
       {
         \cs_set_protected:Npn \@@_get_details:nnN #1#2#3
           {
             \tl_clear:N #3
             \__kernel_msg_error:nnx
-              { kernel } { xetex-primitive-not-available }
-              { \exp_not:c { pdffile #2 } }
+              { kernel } { primitive-not-available }
+              { \exp_not:c { (pdf)file #2 } }
           }
       }
   }
-\__kernel_msg_new:nnnn { kernel } { xetex-primitive-not-available }
+\__kernel_msg_new:nnnn { kernel } { primitive-not-available }
   { Primitive~\token_to_str:N #1 not~available }
   {
-    XeTeX~does~not~currently~provide~functionality~equivalent~to~the~
-    \token_to_str:N #1 primitive.
+    The~version~of~XeTeX~in~use~does~not~provide~functionality~equivalent~to~
+    the~\token_to_str:N #1 primitive.
   }
 %    \end{macrocode}
 % \end{macro}
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 51f7677..adf021c 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5693,7 +5693,7 @@ Defining \file_get_mdfive_hash:nN on line ...
 Defining \file_get_size:nN on line ...
 Defining \file_get_timestamp:nN on line ...
 Defining \__file_get_details:nnN on line ...
-Defining message LaTeX/kernel/xetex-primitive-not-available on line ...
+Defining message LaTeX/kernel/primitive-not-available on line ...
 Defining \file_if_exist_input:n on line ...
 Defining \file_if_exist_input:nF on line ...
 Defining \file_input_stop: on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 51f7677..adf021c 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5693,7 +5693,7 @@ Defining \file_get_mdfive_hash:nN on line ...
 Defining \file_get_size:nN on line ...
 Defining \file_get_timestamp:nN on line ...
 Defining \__file_get_details:nnN on line ...
-Defining message LaTeX/kernel/xetex-primitive-not-available on line ...
+Defining message LaTeX/kernel/primitive-not-available on line ...
 Defining \file_if_exist_input:n on line ...
 Defining \file_if_exist_input:nF on line ...
 Defining \file_input_stop: on line ...
diff --git a/l3kernel/testfiles/m3file001.xetex.tlg b/l3kernel/testfiles/m3file001.xetex.tlg
index 01c1a7b..b7fe1d1 100644
--- a/l3kernel/testfiles/m3file001.xetex.tlg
+++ b/l3kernel/testfiles/m3file001.xetex.tlg
@@ -219,9 +219,9 @@ TEST 9: Getting file information
 ============================================================
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "kernel/xetex-primitive-not-available"
+! LaTeX error: "kernel/primitive-not-available"
 ! 
-! Primitive \pdffilesize not available
+! Primitive \(pdf)filesize not available
 ! 
 ! See the LaTeX3 documentation for further information.
 ! 
@@ -229,8 +229,8 @@ TEST 9: Getting file information
 !...............................................  
 l. ...  }
 |'''''''''''''''''''''''''''''''''''''''''''''''
-| XeTeX does not currently provide functionality equivalent to the
-| \pdffilesize primitive.
+| The version of XeTeX in use does not provide functionality equivalent to the
+| \(pdf)filesize primitive.
 |...............................................
 TRUE
 > \l_tmpa_str=.
@@ -238,9 +238,9 @@ TRUE
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "kernel/xetex-primitive-not-available"
+! LaTeX error: "kernel/primitive-not-available"
 ! 
-! Primitive \pdffilesize not available
+! Primitive \(pdf)filesize not available
 ! 
 ! See the LaTeX3 documentation for further information.
 ! 
@@ -248,17 +248,17 @@ l. ...  }
 !...............................................  
 l. ...  }
 |'''''''''''''''''''''''''''''''''''''''''''''''
-| XeTeX does not currently provide functionality equivalent to the
-| \pdffilesize primitive.
+| The version of XeTeX in use does not provide functionality equivalent to the
+| \(pdf)filesize primitive.
 |...............................................
 > \l_tmpa_str=.
 <recently read> }
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "kernel/xetex-primitive-not-available"
+! LaTeX error: "kernel/primitive-not-available"
 ! 
-! Primitive \pdffilemoddate not available
+! Primitive \(pdf)filemoddate not available
 ! 
 ! See the LaTeX3 documentation for further information.
 ! 
@@ -266,8 +266,8 @@ l. ...  }
 !...............................................  
 l. ...  }
 |'''''''''''''''''''''''''''''''''''''''''''''''
-| XeTeX does not currently provide functionality equivalent to the
-| \pdffilemoddate primitive.
+| The version of XeTeX in use does not provide functionality equivalent to the
+| \(pdf)filemoddate primitive.
 |...............................................
 ! Undefined control sequence.
 <argument> \ERROR 
@@ -279,9 +279,9 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 and I'll forget about whatever was undefined.
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! LaTeX error: "kernel/xetex-primitive-not-available"
+! LaTeX error: "kernel/primitive-not-available"
 ! 
-! Primitive \pdffilemoddate not available
+! Primitive \(pdf)filemoddate not available
 ! 
 ! See the LaTeX3 documentation for further information.
 ! 
@@ -289,8 +289,8 @@ and I'll forget about whatever was undefined.
 !...............................................  
 l. ...  }
 |'''''''''''''''''''''''''''''''''''''''''''''''
-| XeTeX does not currently provide functionality equivalent to the
-| \pdffilemoddate primitive.
+| The version of XeTeX in use does not provide functionality equivalent to the
+| \(pdf)filemoddate primitive.
 |...............................................
 > \l_tmpa_str=.
 <recently read> }