From 39dcda1f2cac1be8fc0b1f7d5c58855d34162322 Mon Sep 17 00:00:00 2001
From: mirabilos <m@mirbsd.org>
Date: Tue, 12 Nov 2019 19:56:44 +0100
Subject: [PATCH] find first version of \UTFviii@invalid@err fix upstreamed

---
 unicodedomino_compat.def           | 9 +++++++++
 unicodedomino_kernel_cosmetics.def | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/unicodedomino_compat.def b/unicodedomino_compat.def
index f110a74..61e2504 100644
--- a/unicodedomino_compat.def
+++ b/unicodedomino_compat.def
@@ -44,3 +44,12 @@
    \the\numexpr\decode@UTFviii#2\relax})%
  }%
 \fi%
+
+% added in v1.2f 2018/10/05
+\ifx\UTFviii@two@octets@combine\@undefined%
+ % override message to give the byte in hex
+ \def\UTFviii@invalid@err#1{%
+  \PackageError{inputenc}{Invalid UTF-8 byte "\UTFviii@hexnumber{`#1}}%
+   \UTFviii@invalid@help%
+ }%
+\fi%
diff --git a/unicodedomino_kernel_cosmetics.def b/unicodedomino_kernel_cosmetics.def
index 41a9e6d..fa39367 100644
--- a/unicodedomino_kernel_cosmetics.def
+++ b/unicodedomino_kernel_cosmetics.def
@@ -5,15 +5,6 @@
 %-
 % Improve error and warning formatting.
 
-%: merged, but ifx yet to see
-\ifx\UTFviii@check@three\@undefined%
- % override message to give the byte in hex
- \def\UTFviii@invalid@err#1{%
-  \PackageError{inputenc}{Invalid UTF-8 byte "\UTFviii@hexnumber{`#1}}%
-   \UTFviii@invalid@help%
- }%
-\fi%
-
 % override to format a UCS codepoint (hexadecimal notation) correctly
 \gdef\UTFviii@hexcodepoint#1{%
  \ifnum#1<16 U+000%
-- 
GitLab