[latex3-commits] [git/LaTeX3-latex3-latex2e] master: extend invalid UTF8 help text (475b04c)

[David Carlisle]

Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/475b04c0b4eb487a85158e060fad3213221e9b65

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

commit 475b04c0b4eb487a85158e060fad3213221e9b65
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Fri Mar 30 11:44:31 2018 +0100

    extend invalid UTF8 help text


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

475b04c0b4eb487a85158e060fad3213221e9b65
 base/testfiles/tlb-inputenc-001.tlg      |    6 ++++--
 base/testfiles/tlb-utf8-undec-cp1252.tlg |   12 ++++++++----
 base/testfiles/tlb1144.tlg               |    6 ++++--
 base/testfiles/tlb3480.tlg               |   18 ++++++++++++------
 base/utf8ienc.dtx                        |    6 ++++--
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/base/testfiles/tlb-inputenc-001.tlg b/base/testfiles/tlb-inputenc-001.tlg
index fca9cd0..2dff0a0 100644
--- a/base/testfiles/tlb-inputenc-001.tlg
+++ b/base/testfiles/tlb-inputenc-001.tlg
@@ -11,8 +11,10 @@ Type  H <return>  for immediate help.
 l. ...zz ^^c3X
               zz
 The document does not appear to be in UTF-8 encoding.
-Try specifying \UseRawInputEncoding or
-\usepackage [latin1]{inputenc}
+Try adding \UseRawInputEncoding as the first line of the file
+or specify an encoding such as \usepackage [latin1]{inputenc}
+in the document preamble.
+Alternatively, save the file in UTF-8 using your editor or another tool
 ! LaTeX Error: Command \th unavailable in encoding OT1.
 See the LaTeX manual or LaTeX Companion for explanation.
 Type  H <return>  for immediate help.
diff --git a/base/testfiles/tlb-utf8-undec-cp1252.tlg b/base/testfiles/tlb-utf8-undec-cp1252.tlg
index ab7fb08..659ca9d 100644
--- a/base/testfiles/tlb-utf8-undec-cp1252.tlg
+++ b/base/testfiles/tlb-utf8-undec-cp1252.tlg
@@ -16,16 +16,20 @@ Type  H <return>  for immediate help.
 l. ...a^^d6 ^^93x^^94
                      ^^df
 The document does not appear to be in UTF-8 encoding.
-Try specifying \UseRawInputEncoding or
-\usepackage [latin1]{inputenc}
+Try adding \UseRawInputEncoding as the first line of the file
+or specify an encoding such as \usepackage [latin1]{inputenc}
+in the document preamble.
+Alternatively, save the file in UTF-8 using your editor or another tool
 ! Package inputenc Error: Invalid UTF-8 byte sequence.
 See the inputenc package documentation for explanation.
 Type  H <return>  for immediate help.
  ...                                              
 l. ...
 The document does not appear to be in UTF-8 encoding.
-Try specifying \UseRawInputEncoding or
-\usepackage [latin1]{inputenc}
+Try adding \UseRawInputEncoding as the first line of the file
+or specify an encoding such as \usepackage [latin1]{inputenc}
+in the document preamble.
+Alternatively, save the file in UTF-8 using your editor or another tool
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0
 .\glue 16.0
diff --git a/base/testfiles/tlb1144.tlg b/base/testfiles/tlb1144.tlg
index 2d0757f..e88d352 100644
--- a/base/testfiles/tlb1144.tlg
+++ b/base/testfiles/tlb1144.tlg
@@ -183,8 +183,10 @@ Type  H <return>  for immediate help.
  ...                                              
 l. ...\showoutput
 The document does not appear to be in UTF-8 encoding.
-Try specifying \UseRawInputEncoding or
-\usepackage [latin1]{inputenc}
+Try adding \UseRawInputEncoding as the first line of the file
+or specify an encoding such as \usepackage [latin1]{inputenc}
+in the document preamble.
+Alternatively, save the file in UTF-8 using your editor or another tool
 LaTeX Font Info:    External font `cmr17 at24.88pt' loaded as
 (Font)              OT1/cmr/m/n/24.88  on input line ....
 LaTeX Font Info:    Switching to \OT1/cmr/m/n/24.88  on input line ....
diff --git a/base/testfiles/tlb3480.tlg b/base/testfiles/tlb3480.tlg
index 8346e90..73ce6ba 100644
--- a/base/testfiles/tlb3480.tlg
+++ b/base/testfiles/tlb3480.tlg
@@ -28,8 +28,10 @@ Type  H <return>  for immediate help.
 l. ...for them: ^^c3F
                      ^^e1^^a4^^b6
 The document does not appear to be in UTF-8 encoding.
-Try specifying \UseRawInputEncoding or
-\usepackage [latin1]{inputenc}
+Try adding \UseRawInputEncoding as the first line of the file
+or specify an encoding such as \usepackage [latin1]{inputenc}
+in the document preamble.
+Alternatively, save the file in UTF-8 using your editor or another tool
 ! Package inputenc Error: Unicode character ^^e1^^a4^^b6 (U+1936)
 (inputenc)                not set up for use with LaTeX.
 See the inputenc package documentation for explanation.
@@ -45,16 +47,20 @@ Type  H <return>  for immediate help.
 l. ......e that are not legal utf8 sequences: ^^c3X
                                                    ^^e1XY
 The document does not appear to be in UTF-8 encoding.
-Try specifying \UseRawInputEncoding or
-\usepackage [latin1]{inputenc}
+Try adding \UseRawInputEncoding as the first line of the file
+or specify an encoding such as \usepackage [latin1]{inputenc}
+in the document preamble.
+Alternatively, save the file in UTF-8 using your editor or another tool
 ! Package inputenc Error: Invalid UTF-8 byte sequence.
 See the inputenc package documentation for explanation.
 Type  H <return>  for immediate help.
  ...                                              
 l. ......are not legal utf8 sequences: ^^c3X ^^e1XY
 The document does not appear to be in UTF-8 encoding.
-Try specifying \UseRawInputEncoding or
-\usepackage [latin1]{inputenc}
+Try adding \UseRawInputEncoding as the first line of the file
+or specify an encoding such as \usepackage [latin1]{inputenc}
+in the document preamble.
+Alternatively, save the file in UTF-8 using your editor or another tool
 Completed box being shipped out [1]
 \vbox(578.15999+0.0)x469.75499
 .\glue 0.0
diff --git a/base/utf8ienc.dtx b/base/utf8ienc.dtx
index e32823a..e7f04ff 100644
--- a/base/utf8ienc.dtx
+++ b/base/utf8ienc.dtx
@@ -332,8 +332,10 @@
 %    \begin{macrocode}
 \def\UTFviii at invalid@help{%
    The document does not appear to be in UTF-8 encoding.\MessageBreak
-   Try specifying \noexpand\UseRawInputEncoding or\MessageBreak
-   \noexpand\usepackage[latin1]{inputenc}}%
+   Try adding \noexpand\UseRawInputEncoding as the first line of the file\MessageBreak
+   or specify an encoding such as \noexpand\usepackage[latin1]{inputenc}\MessageBreak
+   in the document preamble.\MessageBreak
+   Alternatively, save the file in UTF-8 using your editor or another tool}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}