DocBook: use the existing unicodesymbols global table to map LaTeX ERTs to Unicode...

diff --git a/autotests/export/docbook/ert_convert.lyx b/autotests/export/docbook/ert_convert.lyx
new file mode 100644 (file)
index 0000000..1ccee0c
--- /dev/null
+++ b/autotests/export/docbook/ert_convert.lyx
@@ -0,0 +1,172 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 609
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options true
+\maintain_unincluded_children no
+\language american
+\language_package default
+\inputencoding utf8
+\fontencoding auto
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment class
+\paperfontsize default
+\use_hyperref false
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\use_minted 0
+\use_lineno 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tablestyle default
+\tracking_changes false
+\output_changes false
+\change_bars false
+\postpone_fragile_content true
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\docbook_table_output 0
+\docbook_mathml_prefix 1
+\end_header
+
+\begin_body
+
+\begin_layout Title
+ERT Conversions
+\end_layout
+
+\begin_layout Standard
+These should be 
+\family typewriter
+À
+\family default
+: 
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+`A
+\end_layout
+
+\end_inset
+
+ 
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+`{A}
+\end_layout
+
+\end_inset
+
+ 
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+` A
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+This one should be 
+\family typewriter
+¡
+\family default
+: 
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+textexclamdown
+\end_layout
+
+\end_inset
+
+ 
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+!`
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_body
+\end_document

diff --git a/autotests/export/docbook/ert_convert.xml b/autotests/export/docbook/ert_convert.xml
new file mode 100644 (file)
index 0000000..e21274b
--- /dev/null
+++ b/autotests/export/docbook/ert_convert.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This DocBook file was created by LyX 2.4.0dev
+  See https://www.lyx.org/ for more information -->
+<article xml:lang="en_US" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.2">
+<title>ERT Conversions</title>
+<para>These should be <code>&amp;#192;</code>: &#192; &#192; &#192; </para>
+</article>
\ No newline at end of file

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 50b5daa3632cbba8c3f1d63c5b411286720b409f..00f497f0319f258556ea3b6b77a2aabf2bcb958b 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -28,6 +28,7 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/TempFile.h"
+#include "Encoding.h"
 
 #include <sstream>
 #include <regex>
@@ -88,311 +89,6 @@ int InsetERT::plaintext(odocstringstream & os,
 }
 
 
-static const std::map<docstring, docstring> raw_latex_encoding_to_unicode_xml{
-               // Punctuation.
-               {from_ascii("\\textquotesingle"), from_ascii("'")},
-               {from_ascii("!`"), from_ascii("&#161;")}, // inverted exclamation mark
-               {from_ascii("?`"), from_ascii("&#191;")}, // inverted interrogation mark
-
-               // Logos.
-               {from_ascii("\\LaTeX"), from_ascii("LaTeX")},
-               {from_ascii("\\LaTeXe"), from_ascii("LaTeX2&#x03b5;")}, // LaTeX 2 epsilon
-               {from_ascii("\\LyX"), from_ascii("LyX")},
-               {from_ascii("\\TeX"), from_ascii("TeX")},
-
-               // Accentuated letters (alphabetical order of description, ligatures after accents).
-               // Missing letters are only indicated for vowels (only few consonants have diacritics).
-               // Only symbols that can be expressed as one Unicode characters are present; symbols with more than one
-               // diacritic are also omitted.
-               {from_ascii("\\`{a}"), from_ascii("&#225;")}, // a acute
-               {from_ascii("\\` a"), from_ascii("&#225;")},
-               {from_ascii("\\`{A}"), from_ascii("&#193;")}, // A acute
-               {from_ascii("\\` A"), from_ascii("&#193;")},
-               {from_ascii("\\u{a}"), from_ascii("&#259;")}, // a breve
-               {from_ascii("\\u a"), from_ascii("&#259;")},
-               {from_ascii("\\u{A}"), from_ascii("&#258;")}, // A breve
-               {from_ascii("\\u A"), from_ascii("&#258;")},
-               {from_ascii("\\v{a}"), from_ascii("&#462;")}, // a caron
-               {from_ascii("\\v a"), from_ascii("&#462;")},
-               {from_ascii("\\v{A}"), from_ascii("&#461;")}, // A caron
-               {from_ascii("\\v A"), from_ascii("&#461;")},
-               // No a cedilla.
-               {from_ascii("\\^{a}"), from_ascii("&#226;")}, // a circumflex
-               {from_ascii("\\^ a"), from_ascii("&#226;")},
-               {from_ascii("\\^{A}"), from_ascii("&#194;")}, // A circumflex
-               {from_ascii("\\^ A"), from_ascii("&#194;")},
-               {from_ascii("\\\"{a}"), from_ascii("&#228;")}, // a diaeresis
-               {from_ascii("\\\" a"), from_ascii("&#228;")},
-               {from_ascii("\\\"{A}"), from_ascii("&#196;")}, // A diaeresis
-               {from_ascii("\\\" A"), from_ascii("&#196;")},
-               // No a double acute.
-               {from_ascii("\\`{a}"), from_ascii("&#224;")}, // a grave
-               {from_ascii("\\` a"), from_ascii("&#224;")},
-               {from_ascii("\\`{A}"), from_ascii("&#192;")}, // A grave
-               {from_ascii("\\` A"), from_ascii("&#192;")},
-               {from_ascii("\\~{a}"), from_ascii("&#227;")}, // a tilde
-               {from_ascii("\\~ a"), from_ascii("&#227;")},
-               {from_ascii("\\~{A}"), from_ascii("&#195;")}, // A tilde
-               {from_ascii("\\~ A"), from_ascii("&#195;")},
-               {from_ascii("\\aa"), from_ascii("&#229;")}, // a ring
-               {from_ascii("\\r{a}"), from_ascii("&#229;")},
-               {from_ascii("\\r a"), from_ascii("&#229;")},
-               {from_ascii("\\AA"), from_ascii("&#197;")}, // A ring
-               {from_ascii("\\r{A}"), from_ascii("&#197;")},
-               {from_ascii("\\r A"), from_ascii("&#197;")},
-               {from_ascii("\\ae"), from_ascii("&#230;")}, // ae ligature
-               {from_ascii("\\AE"), from_ascii("&#198;")}, // AE ligature
-               {from_ascii("\\v{c}"), from_ascii("&#269;")}, // c caron
-               {from_ascii("\\v c"), from_ascii("&#269;")},
-               {from_ascii("\\v{C}"), from_ascii("&#268;")}, // C caron
-               {from_ascii("\\v C"), from_ascii("&#268;")},
-               {from_ascii("\\c{c}"), from_ascii("&#199;")}, // c cedilla
-               {from_ascii("\\c c"), from_ascii("&#199;")},
-               {from_ascii("\\c{C}"), from_ascii("&#231;")}, // C cedilla
-               {from_ascii("\\c C"), from_ascii("&#231;")},
-               {from_ascii("\\v{d}"), from_ascii("&#271;")}, // d caron
-               {from_ascii("\\v d"), from_ascii("&#271;")},
-               {from_ascii("\\v{D}"), from_ascii("&#270;")}, // D caron
-               {from_ascii("\\v D"), from_ascii("&#270;")},
-               {from_ascii("\\`{e}"), from_ascii("&#233;")}, // e acute
-               {from_ascii("\\` e"), from_ascii("&#233;")},
-               {from_ascii("\\`{E}"), from_ascii("&#201;")}, // E acute
-               {from_ascii("\\` E"), from_ascii("&#201;")},
-               {from_ascii("\\u{e}"), from_ascii("&#277;")}, // e breve
-               {from_ascii("\\u e"), from_ascii("&#277;")},
-               {from_ascii("\\u{E}"), from_ascii("&#276;")}, // E breve
-               {from_ascii("\\u E"), from_ascii("&#276;")},
-               {from_ascii("\\v{e}"), from_ascii("&#283;")}, // e caron
-               {from_ascii("\\v e"), from_ascii("&#283;")},
-               {from_ascii("\\v{E}"), from_ascii("&#282;")}, // E caron
-               {from_ascii("\\v E"), from_ascii("&#282;")},
-               {from_ascii("\\c{e}"), from_ascii("&#553;")}, // e cedilla
-               {from_ascii("\\c e"), from_ascii("&#553;")},
-               {from_ascii("\\c{E}"), from_ascii("&#552;")}, // E cedilla
-               {from_ascii("\\c E"), from_ascii("&#552;")},
-               {from_ascii("\\^{e}"), from_ascii("&#234;")}, // e circumflex
-               {from_ascii("\\^ e"), from_ascii("&#234;")},
-               {from_ascii("\\^{E}"), from_ascii("&#202;")}, // E circumflex
-               {from_ascii("\\^ E"), from_ascii("&#202;")},
-               {from_ascii("\\\"{e}"), from_ascii("&#235;")}, // e diaeresis
-               {from_ascii("\\\" e"), from_ascii("&#235;")},
-               {from_ascii("\\\"{E}"), from_ascii("&#203;")}, // E diaeresis
-               {from_ascii("\\\" E"), from_ascii("&#203;")},
-               // No e double acute.
-               {from_ascii("\\`{e}"), from_ascii("&#232;")}, // e grave
-               {from_ascii("\\` e"), from_ascii("&#232;")},
-               {from_ascii("\\`{E}"), from_ascii("&#200;")}, // E grave
-               {from_ascii("\\` E"), from_ascii("&#200;")},
-               {from_ascii("\\~{e}"), from_ascii("&#7869;")}, // e tilde
-               {from_ascii("\\~ e"), from_ascii("&#7869;")},
-               {from_ascii("\\~{E}"), from_ascii("&#7868;")}, // E tilde
-               {from_ascii("\\~ E"), from_ascii("&#7868;")},
-               // No e ring.
-               {from_ascii("\\u{g}"), from_ascii("&#287;")}, // g breve
-               {from_ascii("\\u g"), from_ascii("&#287;")},
-               {from_ascii("\\u{G}"), from_ascii("&#286;")}, // G breve
-               {from_ascii("\\u G"), from_ascii("&#286;")},
-               {from_ascii("\\v{g}"), from_ascii("&#487;")}, // g caron
-               {from_ascii("\\v g"), from_ascii("&#487;")},
-               {from_ascii("\\v{G}"), from_ascii("&#486;")}, // G caron
-               {from_ascii("\\v G"), from_ascii("&#486;")},
-               {from_ascii("\\c{g}"), from_ascii("&#291;")}, // g cedilla
-               {from_ascii("\\c g"), from_ascii("&#291;")},
-               {from_ascii("\\c{G}"), from_ascii("&#290;")}, // G cedilla
-               {from_ascii("\\c G"), from_ascii("&#290;")},
-               {from_ascii("\\i"), from_ascii("&#305;")}, // i dotless
-               {from_ascii("\\`{i}"), from_ascii("&#237;")}, // i acute
-               {from_ascii("\\` i"), from_ascii("&#237;")},
-               {from_ascii("\\`{I}"), from_ascii("&#205;")}, // I acute
-               {from_ascii("\\` I"), from_ascii("&#205;")},
-               {from_ascii("\\u{i}"), from_ascii("&#301;")}, // i breve
-               {from_ascii("\\u i"), from_ascii("&#301;")},
-               {from_ascii("\\u{I}"), from_ascii("&#300;")}, // I breve
-               {from_ascii("\\u I"), from_ascii("&#300;")},
-               {from_ascii("\\v{i}"), from_ascii("&#464;")}, // i caron
-               {from_ascii("\\v i"), from_ascii("&#464;")},
-               {from_ascii("\\v{I}"), from_ascii("&#463;")}, // I caron
-               {from_ascii("\\v I"), from_ascii("&#463;")},
-               // No i cedilla.
-               {from_ascii("\\^{i}"), from_ascii("&#238;")}, // i circumflex
-               {from_ascii("\\^ i"), from_ascii("&#238;")},
-               {from_ascii("\\^{I}"), from_ascii("&#206;")}, // I circumflex
-               {from_ascii("\\^ I"), from_ascii("&#239;")},
-               {from_ascii("\\\"{i}"), from_ascii("&#239;")}, // i diaeresis
-               {from_ascii("\\\" i"), from_ascii("&#235;")},
-               {from_ascii("\\\"{I}"), from_ascii("&#235;")}, // I diaeresis
-               {from_ascii("\\\" I"), from_ascii("&#207;")},
-               // No i double acute.
-               {from_ascii("\\`{i}"), from_ascii("&#236;")}, // i grave
-               {from_ascii("\\` i"), from_ascii("&#236;")},
-               {from_ascii("\\`{I}"), from_ascii("&#204;")}, // I grave
-               {from_ascii("\\` I"), from_ascii("&#204;")},
-               {from_ascii("\\~{i}"), from_ascii("&#297;")}, // i tilde
-               {from_ascii("\\~ i"), from_ascii("&#297;")},
-               {from_ascii("\\~{I}"), from_ascii("&#296;")}, // I tilde
-               {from_ascii("\\~ I"), from_ascii("&#296;")},
-               // No i ring.
-               {from_ascii("\\j"), from_ascii("&#567;")}, // j dotless
-               {from_ascii("\\v{k}"), from_ascii("&#488;")}, // k caron
-               {from_ascii("\\v k"), from_ascii("&#488;")},
-               {from_ascii("\\v{K}"), from_ascii("&#489;")}, // K caron
-               {from_ascii("\\v K"), from_ascii("&#489;")},
-               {from_ascii("\\c{k}"), from_ascii("&#311;")}, // k cedilla
-               {from_ascii("\\c k"), from_ascii("&#311;")},
-               {from_ascii("\\c{K}"), from_ascii("&#310;")}, // K cedilla
-               {from_ascii("\\c K"), from_ascii("&#310;")},
-               {from_ascii("\\v{l}"), from_ascii("&#318;")}, // l caron
-               {from_ascii("\\v l"), from_ascii("&#318;")},
-               {from_ascii("\\v{L}"), from_ascii("&#317;")}, // L caron
-               {from_ascii("\\v L"), from_ascii("&#317;")},
-               {from_ascii("\\c{l}"), from_ascii("&#316;")}, // l cedilla
-               {from_ascii("\\c l"), from_ascii("&#316;")},
-               {from_ascii("\\c{L}"), from_ascii("&#315;")}, // L cedilla
-               {from_ascii("\\c L"), from_ascii("&#315;")},
-               {from_ascii("\\l"), from_ascii("&#322;")}, // l stroke
-               {from_ascii("\\L"), from_ascii("&#321;")}, // L stroke
-               {from_ascii("\\v{n}"), from_ascii("&#328;")}, // n caron
-               {from_ascii("\\v n"), from_ascii("&#328;")},
-               {from_ascii("\\v{N}"), from_ascii("&#327;")}, // N caron
-               {from_ascii("\\v N"), from_ascii("&#327;")},
-               {from_ascii("\\c{n}"), from_ascii("&#326;")}, // n cedilla
-               {from_ascii("\\c n"), from_ascii("&#326;")},
-               {from_ascii("\\c{N}"), from_ascii("&#325;")}, // N cedilla
-               {from_ascii("\\c N"), from_ascii("&#325;")},
-               {from_ascii("\\~{n}"), from_ascii("&#241;")}, // n tilde
-               {from_ascii("\\~ n"), from_ascii("&#241;")},
-               {from_ascii("\\~{N}"), from_ascii("&#209;")}, // N tilde
-               {from_ascii("\\~ N"), from_ascii("&#209;")},
-               {from_ascii("\\`{o}"), from_ascii("&#243;")}, // o acute
-               {from_ascii("\\` o"), from_ascii("&#243;")},
-               {from_ascii("\\`{O}"), from_ascii("&#211;")}, // O acute
-               {from_ascii("\\` O"), from_ascii("&#211;")},
-               {from_ascii("\\u{o}"), from_ascii("&#335;")}, // o breve
-               {from_ascii("\\u o"), from_ascii("&#335;")},
-               {from_ascii("\\u{O}"), from_ascii("&#334;")}, // O breve
-               {from_ascii("\\u O"), from_ascii("&#334;")},
-               {from_ascii("\\v{o}"), from_ascii("&#466;")}, // o caron
-               {from_ascii("\\v o"), from_ascii("&#466;")},
-               {from_ascii("\\v{O}"), from_ascii("&#465;")}, // O caron
-               {from_ascii("\\v O"), from_ascii("&#465;")},
-               // No o cedilla.
-               {from_ascii("\\^{o}"), from_ascii("&#244;")}, // o circumflex
-               {from_ascii("\\^ o"), from_ascii("&#244;")},
-               {from_ascii("\\^{O}"), from_ascii("&#212;")}, // O circumflex
-               {from_ascii("\\^ O"), from_ascii("&#212;")},
-               {from_ascii("\\\"{o}"), from_ascii("&#246;")}, // o diaeresis
-               {from_ascii("\\\" o"), from_ascii("&#246;")},
-               {from_ascii("\\\"{O}"), from_ascii("&#214;")}, // O diaeresis
-               {from_ascii("\\\" O"), from_ascii("&#214;")},
-               {from_ascii("\\H{o}"), from_ascii("&#337;")}, // o double acute
-               {from_ascii("\\H o"), from_ascii("&#337;")},
-               {from_ascii("\\H{O}"), from_ascii("&#336;")}, // O double acute
-               {from_ascii("\\H O"), from_ascii("&#336;")},
-               {from_ascii("\\`{o}"), from_ascii("&#242;")}, // o grave
-               {from_ascii("\\` o"), from_ascii("&#242;")},
-               {from_ascii("\\`{O}"), from_ascii("&#210;")}, // O grave
-               {from_ascii("\\` O"), from_ascii("&#210;")},
-               {from_ascii("\\o"), from_ascii("&#248;")}, // o stroke
-               {from_ascii("\\O"), from_ascii("&#216;")}, // O stroke
-               {from_ascii("\\~{o}"), from_ascii("&#245;")}, // o tilde
-               {from_ascii("\\~ o"), from_ascii("&#245;")},
-               {from_ascii("\\~{O}"), from_ascii("&#213;")}, // O tilde
-               {from_ascii("\\~ O"), from_ascii("&#213;")},
-               // No o ring.
-               {from_ascii("\\oe"), from_ascii("&#339;")}, // oe ligature
-               {from_ascii("\\OE"), from_ascii("&#338;")}, // OE ligature
-               {from_ascii("\\v{r}"), from_ascii("&#345;")}, // r caron
-               {from_ascii("\\v r"), from_ascii("&#345;")},
-               {from_ascii("\\v{R}"), from_ascii("&#344;")}, // R caron
-               {from_ascii("\\v R"), from_ascii("&#344;")},
-               {from_ascii("\\c{r}"), from_ascii("&#343;")}, // r cedilla
-               {from_ascii("\\c r"), from_ascii("&#343;")},
-               {from_ascii("\\c{R}"), from_ascii("&#342;")}, // R cedilla
-               {from_ascii("\\c R"), from_ascii("&#342;")},
-               {from_ascii("\\v{s}"), from_ascii("&#353;")}, // s caron
-               {from_ascii("\\v s"), from_ascii("&#353;")},
-               {from_ascii("\\v{S}"), from_ascii("&#352;")}, // S caron
-               {from_ascii("\\v S"), from_ascii("&#352;")},
-               {from_ascii("\\c{s}"), from_ascii("&#351;")}, // s cedilla
-               {from_ascii("\\c s"), from_ascii("&#351;")},
-               {from_ascii("\\c{S}"), from_ascii("&#350;")}, // S cedilla
-               {from_ascii("\\c S"), from_ascii("&#350;")},
-               {from_ascii("\\v{t}"), from_ascii("&#357;")}, // t caron
-               {from_ascii("\\v t"), from_ascii("&#357;")},
-               {from_ascii("\\v{T}"), from_ascii("&#356;")}, // T caron
-               {from_ascii("\\v T"), from_ascii("&#356;")},
-               {from_ascii("\\c{t}"), from_ascii("&#355;")}, // t cedilla
-               {from_ascii("\\c t"), from_ascii("&#355;")},
-               {from_ascii("\\c{T}"), from_ascii("&#354;")}, // T cedilla
-               {from_ascii("\\c T"), from_ascii("&#354;")},
-               {from_ascii("\\`{u}"), from_ascii("&#250;")}, // u acute
-               {from_ascii("\\` u"), from_ascii("&#250;")},
-               {from_ascii("\\`{U}"), from_ascii("&#218;")}, // U acute
-               {from_ascii("\\` U"), from_ascii("&#218;")},
-               {from_ascii("\\u{u}"), from_ascii("&#365;")}, // u breve
-               {from_ascii("\\u u"), from_ascii("&#365;")},
-               {from_ascii("\\u{U}"), from_ascii("&#364;")}, // U breve
-               {from_ascii("\\u U"), from_ascii("&#364;")},
-               {from_ascii("\\v{u}"), from_ascii("&#468;")}, // u caron
-               {from_ascii("\\v u"), from_ascii("&#468;")},
-               {from_ascii("\\v{U}"), from_ascii("&#467;")}, // U caron
-               {from_ascii("\\v U"), from_ascii("&#467;")},
-               // No u cedilla.
-               {from_ascii("\\^{u}"), from_ascii("&#251;")}, // u circumflex
-               {from_ascii("\\^ u"), from_ascii("&#251;")},
-               {from_ascii("\\^{U}"), from_ascii("&#219;")}, // U circumflex
-               {from_ascii("\\^ U"), from_ascii("&#219;")},
-               {from_ascii("\\\"{u}"), from_ascii("&#252;")}, // u diaeresis
-               {from_ascii("\\\" u"), from_ascii("&#252;")},
-               {from_ascii("\\\"{U}"), from_ascii("&#220;")}, // U diaeresis
-               {from_ascii("\\\" U"), from_ascii("&#220;")},
-               {from_ascii("\\H{u}"), from_ascii("&#369;")}, // u double acute
-               {from_ascii("\\H u"), from_ascii("&#369;")},
-               {from_ascii("\\H{U}"), from_ascii("&#368;")}, // U double acute
-               {from_ascii("\\H U"), from_ascii("&#368;")},
-               {from_ascii("\\`{u}"), from_ascii("&#249;")}, // u grave
-               {from_ascii("\\` u"), from_ascii("&#249;")},
-               {from_ascii("\\`{U}"), from_ascii("&#217;")}, // U grave
-               {from_ascii("\\` U"), from_ascii("&#217;")},
-               {from_ascii("\\~{u}"), from_ascii("&#361;")}, // u tilde
-               {from_ascii("\\~ u"), from_ascii("&#361;")},
-               {from_ascii("\\~{U}"), from_ascii("&#360;")}, // U tilde
-               {from_ascii("\\~ U"), from_ascii("&#360;")},
-               {from_ascii("\\r{u}"), from_ascii("&#229;")}, // u ring
-               {from_ascii("\\r u"), from_ascii("&#367;")},
-               {from_ascii("\\r{U}"), from_ascii("&#367;")}, // U ring
-               {from_ascii("\\r U"), from_ascii("&#366;")},
-               {from_ascii("\\`{y}"), from_ascii("&#253;")}, // y acute
-               {from_ascii("\\` y"), from_ascii("&#253;")},
-               {from_ascii("\\`{Y}"), from_ascii("&#221;")}, // Y acute
-               {from_ascii("\\` Y"), from_ascii("&#221;")},
-               {from_ascii("\\v{z}"), from_ascii("&#382;")}, // z caron
-               {from_ascii("\\v z"), from_ascii("&#382;")},
-               {from_ascii("\\v{Z}"), from_ascii("&#381;")}, // Z caron
-               {from_ascii("\\v Z"), from_ascii("&#381;")},
-               // No y breve.
-               // No y cedilla.
-               {from_ascii("\\^{y}"), from_ascii("&#375;")}, // y circumflex
-               {from_ascii("\\^ y"), from_ascii("&#375;")},
-               {from_ascii("\\^{Y}"), from_ascii("&#374;")}, // Y circumflex
-               {from_ascii("\\^ Y"), from_ascii("&#374;")},
-               {from_ascii("\\\"{y}"), from_ascii("&#255;")}, // y diaeresis
-               {from_ascii("\\\" y"), from_ascii("&#255;")},
-               {from_ascii("\\\"{Y}"), from_ascii("&#376;")}, // Y diaeresis
-               {from_ascii("\\\" Y"), from_ascii("&#376;")},
-               // No y double acute.
-               {from_ascii("\\`{y}"), from_ascii("&#7923;")}, // y grave
-               {from_ascii("\\` y"), from_ascii("&#7923;")},
-               {from_ascii("\\`{Y}"), from_ascii("&#7922;")}, // Y grave
-               {from_ascii("\\` Y"), from_ascii("&#7922;")},
-               {from_ascii("\\~{y}"), from_ascii("&#7929;")}, // y tilde
-               {from_ascii("\\~ y"), from_ascii("&#7929;")},
-               {from_ascii("\\~{Y}"), from_ascii("&#7928;")}, // Y tilde
-               {from_ascii("\\~ Y"), from_ascii("&#7928;")},
-               // No y ring.
-};
-
-
 void InsetERT::docbook(XMLStream & xs, OutputParams const & runparams) const
 {
        auto const begin = paragraphs().begin();
@@ -441,26 +137,39 @@ void InsetERT::docbook(XMLStream & xs, OutputParams const & runparams) const
 
        // First step: some commands have a direct mapping to DocBook, mostly because the mapping is simply text or
        // an XML entity.
+       // Logic is similar to that of convertLaTeXCommands in BiblioInfo.cpp.
+       // TODO: make the code even more similar by looping over the string and applying all conversions. (What is not
+       //  recognised should simply be put in comments: have a list of elements that are either already recognised or are
+       //  not yet recognised? Global transformations like \string should then come first.)
        {
                docstring os_trimmed = trim(os.str());
 
-               auto command_raw_translation = raw_latex_encoding_to_unicode_xml.find(os_trimmed);
-               if (command_raw_translation != raw_latex_encoding_to_unicode_xml.end()) {
-                       xs << command_raw_translation->second;
-                       output_as_comment = false;
-               } else {
-                       // If the trimmed ERT ends with {}, try a mapping without it.
-                       auto os_braces = os_trimmed.find(from_ascii("{}"));
+               // Rewrite \"u to \"{u}.
+               static regex const regNoBraces(R"(^\\\W\w)");
+               if (regex_search(to_utf8(os_trimmed), regNoBraces)) {
+                       os_trimmed.insert(3, from_ascii("}"));
+                       os_trimmed.insert(2, from_ascii("{"));
+               }
 
-                       if (os_braces != lyx::docstring::npos) {
-                               auto key = os_trimmed.substr(0, os_braces);
-                               auto command_braces_translation = raw_latex_encoding_to_unicode_xml.find(key);
+               // Rewrite \" u to \"{u}.
+               static regex const regSpace(R"(^\\\W \w)");
+               if (regex_search(to_utf8(os_trimmed), regSpace)) {
+                       os_trimmed[2] = '{';
+                       os_trimmed.insert(4, from_ascii("}"));
+               }
 
-                               if (command_braces_translation != raw_latex_encoding_to_unicode_xml.end()) {
-                                       xs << command_braces_translation->second;
-                                       output_as_comment = false;
-                               }
+               // Look into the global table of Unicode characters if there is a match.
+               bool termination;
+               docstring rem;
+               docstring const converted = Encodings::fromLaTeXCommand(os_trimmed,
+                                                                       Encodings::TEXT_CMD, termination, rem);
+               if (!converted.empty()) {
+                       // Don't output the characters directly, even if the document should be encoded in UTF-8, for editors that
+                       // do not support all these funky characters.
+                       for (const char_type& character : converted) {
+                               xs << XMLStream::ESCAPE_NONE << from_ascii("&#" + std::to_string(character) + ';');
                        }
+                       output_as_comment = false;
                }
        }