improve message

it's a bit confusing the variations on messages we have! not rationalising now to keep diffs under control
latex3 · Feb 4, 2019 · 3935eb0 · 3935eb0
1 parent 5423732
commit 3935eb0
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 62 deletions.
diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
@@ -1775,9 +1775,9 @@
             \cs_if_exist:NTF ##1
               { ##2 }
               {
-                ##3
                 \__kernel_msg_expandable_error:nnn
-                  { kernel } { non-declared-variable } { ##1 }
+                  { kernel } { variable-not-defined } { ##1 }
+                ##3
               }
           }
         \cs_set:Npn \__kernel_chk_exp_var_exist:NT ##1 ##2

diff --git a/l3kernel/testfiles/m3chk001.luatex.tlg b/l3kernel/testfiles/m3chk001.luatex.tlg
@@ -35,7 +35,7 @@ TEST 2: Use variables (undefined)
 CS
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Control sequence \cs_bbb:  undefined or invalid.
+                Control sequence \cs_bbb:  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -53,7 +53,7 @@ and I'll forget about whatever was undefined.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Control sequence \cs_bbb:  undefined or invalid.
+                Control sequence \cs_bbb:  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -64,7 +64,7 @@ and I'll forget about whatever was undefined.
 TL
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_tl  has not been declared \msg_line_context: 
+                Variable \l_B_tl  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -82,7 +82,7 @@ and I'll forget about whatever was undefined.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_tl  has not been declared \msg_line_context: 
+                Variable \l_B_tl  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -93,7 +93,7 @@ and I'll forget about whatever was undefined.
 STR
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_str  has not been declared \msg_line_context:
+                Variable \l_B_str  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -111,7 +111,7 @@ and I'll forget about whatever was undefined.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_str  has not been declared \msg_line_context:
+                Variable \l_B_str  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -137,7 +137,7 @@ I'm forgetting what you said and using zero instead.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_int  has not been declared \msg_line_context:
+                Variable \l_B_int  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -163,7 +163,7 @@ I'm forgetting what you said and using zero instead.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_dim  has not been declared \msg_line_context:
+                Variable \l_B_dim  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -189,7 +189,7 @@ I'm forgetting what you said and using zero instead.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_skip  has not been declared \msg_line_context
+                Variable \l_B_skip  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -215,7 +215,7 @@ I'm forgetting what you said and using zero instead.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_muskip  has not been declared \msg_line_conte
+                Variable \l_B_muskip  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -350,7 +350,7 @@ and I'll forget about whatever was undefined.
 FP
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_fp  has not been declared \msg_line_context: 
+                Variable \l_B_fp  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -360,7 +360,7 @@ and I'll forget about whatever was undefined.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_fp  has not been declared \msg_line_context: 
+                Variable \l_B_fp  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

diff --git a/l3kernel/testfiles/m3chk001.tlg b/l3kernel/testfiles/m3chk001.tlg
@@ -35,7 +35,7 @@ TEST 2: Use variables (undefined)
 CS
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Control sequence \cs_bbb:  undefined or invalid.
+                           Control sequence \cs_bbb:  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -53,7 +53,7 @@ and I'll forget about whatever was undefined.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Control sequence \cs_bbb:  undefined or invalid.
+                           Control sequence \cs_bbb:  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -64,7 +64,7 @@ and I'll forget about whatever was undefined.
 TL
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The variable \l_B_tl  has not been declared \msg_...
+                           Variable \l_B_tl  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -82,7 +82,7 @@ and I'll forget about whatever was undefined.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The variable \l_B_tl  has not been declared \msg_...
+                           Variable \l_B_tl  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -93,7 +93,7 @@ and I'll forget about whatever was undefined.
 STR
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The variable \l_B_str  has not been declared \msg...
+                           Variable \l_B_str  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -111,7 +111,7 @@ and I'll forget about whatever was undefined.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The variable \l_B_str  has not been declared \msg...
+                           Variable \l_B_str  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -137,7 +137,7 @@ I'm forgetting what you said and using zero instead.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The variable \l_B_int  has not been declared \msg...
+                           Variable \l_B_int  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -163,7 +163,7 @@ I'm forgetting what you said and using zero instead.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The variable \l_B_dim  has not been declared \msg...
+                           Variable \l_B_dim  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -189,7 +189,7 @@ I'm forgetting what you said and using zero instead.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The variable \l_B_skip  has not been declared \ms...
+                           Variable \l_B_skip  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -215,7 +215,7 @@ I'm forgetting what you said and using zero instead.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The variable \l_B_muskip  has not been declared \...
+                           Variable \l_B_muskip  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -350,7 +350,7 @@ and I'll forget about whatever was undefined.
 FP
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The variable \l_B_fp  has not been declared \msg_...
+                           Variable \l_B_fp  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -360,7 +360,7 @@ and I'll forget about whatever was undefined.
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The variable \l_B_fp  has not been declared \msg_...
+                           Variable \l_B_fp  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

diff --git a/l3kernel/testfiles/m3chk004.luatex.tlg b/l3kernel/testfiles/m3chk004.luatex.tlg
@@ -50,7 +50,7 @@ TEST 2: Use variables (undefined)
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Control sequence \cs_bbb:  undefined or invalid.
+                Control sequence \cs_bbb:  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -69,7 +69,7 @@ CS:
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Control sequence \cs_bbb:  undefined or invalid.
+                Control sequence \cs_bbb:  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -80,7 +80,7 @@ CS:\cs_bbb:
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_tl  has not been declared \msg_line_context: 
+                Variable \l_B_tl  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -99,7 +99,7 @@ TL:
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_tl  has not been declared \msg_line_context: 
+                Variable \l_B_tl  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -110,7 +110,7 @@ TL:\l_B_tl
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_str  has not been declared \msg_line_context:
+                Variable \l_B_str  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -129,7 +129,7 @@ STR:
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_str  has not been declared \msg_line_context:
+                Variable \l_B_str  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -165,7 +165,7 @@ INT:0
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_int  has not been declared \msg_line_context:
+                Variable \l_B_int  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -201,7 +201,7 @@ DIM:0
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_dim  has not been declared \msg_line_context:
+                Variable \l_B_dim  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -237,7 +237,7 @@ SKIP:0
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_skip  has not been declared \msg_line_context
+                Variable \l_B_skip  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -273,7 +273,7 @@ MUSKIP:0
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_muskip  has not been declared \msg_line_conte
+                Variable \l_B_muskip  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -328,7 +328,7 @@ CLIST:
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_fp  has not been declared \msg_line_context: 
+                Variable \l_B_fp  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -339,7 +339,7 @@ FP:
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                The variable \l_B_fp  has not been declared \msg_line_context: 
+                Variable \l_B_fp  undefined.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have