From 047fa50ccf00dd565838fd43e3d8270be1a17bd6 Mon Sep 17 00:00:00 2001
From: Will Robertson <wspr81@gmail.com>
Date: Tue, 31 Jul 2018 20:39:11 +0930
Subject: [PATCH] some more var declarations

---
 fontspec-api.dtx      |  4 ++--
 fontspec-graphite.dtx | 16 ++++++++--------
 fontspec-vars.dtx     |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/fontspec-api.dtx b/fontspec-api.dtx
index 20ca93e7..079227f9 100644
--- a/fontspec-api.dtx
+++ b/fontspec-api.dtx
@@ -173,8 +173,8 @@
     \@@_set_font_type:N \font
     \bool_if:NTF \l_@@_ot_bool
      {
-      \prop_get:cnN {g_@@_fontinfo_ \f@family _prop} {script-num} \l_@@_tmpf_tl
-      \int_set:Nn \l_@@_script_int {\l_@@_tmpf_tl}
+      \prop_get:cnN {g_@@_fontinfo_ \f@family _prop} {script-num} \l_@@_tmp_tl
+      \int_set:Nn \l_@@_script_int {\l_@@_tmp_tl}
       \prop_get:cnN {g_@@_fontinfo_ \f@family _prop} {script-tag}  \l_fontspec_script_tl
 
       \@@_check_lang:NnTF \font {#1} \prg_return_true: \prg_return_false:
diff --git a/fontspec-graphite.dtx b/fontspec-graphite.dtx
index 1c5b7711..1ab63f68 100644
--- a/fontspec-graphite.dtx
+++ b/fontspec-graphite.dtx
@@ -66,31 +66,31 @@
 %    \begin{macrocode}
 \prg_new_conditional:Nnn \@@_make_AAT_feature_string:Nnn {TF,T,F}
  {
-  \tl_set:Nx \l_tmpa_tl { \XeTeXfeaturename #1 #2 }
-  \tl_if_empty:NTF \l_tmpa_tl
+  \tl_set:Nx \l_@@_tmpa_tl { \XeTeXfeaturename #1 #2 }
+  \tl_if_empty:NTF \l_@@_tmpa_tl
    { \prg_return_false: }
    {
     \int_compare:nTF { \XeTeXisexclusivefeature #1 #2 > 0 }
      {
-      \tl_set:Nx \l_tmpb_tl {\XeTeXselectorname #1 #2\space #3}
+      \tl_set:Nx \l_@@_tmpb_tl {\XeTeXselectorname #1 #2\space #3}
      }
      {
       \int_if_even:nTF {#3}
        {
-        \tl_set:Nx \l_tmpb_tl {\XeTeXselectorname #1 #2\space #3}
+        \tl_set:Nx \l_@@_tmpb_tl {\XeTeXselectorname #1 #2\space #3}
        }
        {
-        \tl_set:Nx \l_tmpb_tl
+        \tl_set:Nx \l_@@_tmpb_tl
          {
           \XeTeXselectorname #1 #2\space \numexpr#3-1\relax
          }
-        \tl_if_empty:NF \l_tmpb_tl { \tl_put_left:Nn \l_tmpb_tl {!} }
+        \tl_if_empty:NF \l_@@_tmpb_tl { \tl_put_left:Nn \l_@@_tmpb_tl {!} }
        }
     }
-    \tl_if_empty:NTF \l_tmpb_tl
+    \tl_if_empty:NTF \l_@@_tmpb_tl
      { \prg_return_false: }
      {
-      \tl_set:Nx \l_fontspec_feature_string_tl { \l_tmpa_tl = \l_tmpb_tl }
+      \tl_set:Nx \l_fontspec_feature_string_tl { \l_@@_tmpa_tl = \l_@@_tmpb_tl }
       \prg_return_true:
      }
    }
diff --git a/fontspec-vars.dtx b/fontspec-vars.dtx
index 33109926..2b928d8a 100644
--- a/fontspec-vars.dtx
+++ b/fontspec-vars.dtx
@@ -181,6 +181,8 @@
 \tl_new:N \l_@@_sizedfont_tl
 \tl_new:N \l_@@_this_font_tl
 \tl_new:N \l_@@_tmp_tl
+\tl_new:N \l_@@_tmpa_tl
+\tl_new:N \l_@@_tmpb_tl
 \tl_new:N \l_@@_ttc_index_tl
 \tl_new:N \l_@@_emshape_query_tl
 \tl_new:N \l_@@_em_switch_tl