unicodesymbols: Use \r{A} instead of \AA for "Latin letter A with ring" and "Ångström...

Xe/LuaTeX convert \AA to the deprecated character u212B (which is missing
in the default LatinModern font) instead of the recommended u00C5.

Also fix some of the "missing character" errors in Math.lyx if compiled with
Xe/LuaTeX which were caused by the replacement of \AA with literal u212B characters
in math-insets due to the old definitions in unicodesymbols.

Update the minimal example for failures of Math.lyx with system fonts.

diff --git a/autotests/export/latex/systemfonts-Math-missingchars.lyx b/autotests/export/latex/systemfonts-Math-missingchars.lyx
index cf1988b7bf2505e05888a16e6b9fdbe39a173801..3c5947742a64b516ece1cd44eb806319bb59b902 100644 (file)
--- a/autotests/export/latex/systemfonts-Math-missingchars.lyx
+++ b/autotests/export/latex/systemfonts-Math-missingchars.lyx
@@ -65,7 +65,7 @@
 \use_indices false
 \paperorientation portrait
 \suppress_date false
-\justification true
+\justification false
 \use_refstyle 0
 \use_minted 0
 \notefontcolor #0000ff
@@ -101,8 +101,62 @@ Minimal failing example for Math.lyx
 \end_layout
 
 \begin_layout Standard
-\SpecialChar LyX
-'s detailed Math manual fails with 
+Compiling \SpecialChar LyX
+'s detailed Math manual fails with non-TeX fonts due to missing
+ characters.
+ The documents uses the default set for LyX documentation: 
+\emph on
+Latin Modern
+\emph default
+ as text and 
+\emph on
+Computer Modern
+\emph default
+ for maths.
+\end_layout
+
+\begin_layout Standard
+There is no easy solution because of the nature of the Maths documentation:
+ 
+\end_layout
+
+\begin_layout Enumerate
+Changing only the text font results in a bad font mix — LyX documentation
+ must not give a bad example/showcase.
+\end_layout
+
+\begin_layout Enumerate
+Changing the math font does not work for Math.lyx:
+\end_layout
+
+\begin_deeper
+\begin_layout Itemize
+Some of the documented packages and examples only work with the default
+ math font (no 
+\backslash
+maltese in 
+\begin_inset Quotes eld
+\end_inset
+
+txmath
+\begin_inset Quotes erd
+\end_inset
+
+, package incompatibilities with unicode-math, ...).
+\end_layout
+
+\begin_layout Itemize
+Besides: support for most math fonts is of inferiour quality (missing optical
+ sizes for indices, limited set of symbols)
+\end_layout
+
+\end_deeper
+\begin_layout Subsection*
+Missing characters with Latin Modern
+\end_layout
+
+\begin_layout Standard
+Excerpts from Math.lyx that lead to 
 \begin_inset Quotes eld
 \end_inset
 
@@ -110,15 +164,14 @@ missing character
 \begin_inset Quotes erd
 \end_inset
 
- errors for the following reasons:
+ errors and discussion of reasons and possible workarounds:
 \end_layout
 
 \begin_layout Quote
 Bold Formulas
 \end_layout
 
-\begin_deeper
-\begin_layout Standard
+\begin_layout Quote
 To make a complete formula bold, the command 
 \series bold
 
@@ -129,9 +182,6 @@ mathbf
  small Greek letters.
  Furthermore it prints Latin letters always upright, like in the following
  equation:
-\end_layout
-
-\begin_layout Standard
 \begin_inset Formula 
 \[
 \mathbf{\int_{n}^{2}f(\theta)=\Gamma}\qquad\textrm{equation with \textbackslash mathbf}
@@ -142,7 +192,6 @@ mathbf
 
 \end_layout
 
-\end_deeper
 \begin_layout Standard
 Capital Greek characters in 
 \backslash
@@ -171,310 +220,13 @@ fixmath
 Accents in Text
 \end_layout
 
-\begin_deeper
-\begin_layout Standard
+\begin_layout Quote
 With the following commands all letters can be accented.
  The commands must be inserted in \SpecialChar TeX
  mode.
 \end_layout
 
-\begin_layout Standard
-\begin_inset space \hfill{}
-\end_inset
-
-
-\begin_inset Tabular
-<lyxtabular version="3" rows="8" columns="2">
-<features booktabs="true" tabularvalignment="middle">
-<column alignment="left" valignment="top" width="0pt">
-<column alignment="block" valignment="top">
-<row>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Command
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Result
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\backslash
-
-\begin_inset Quotes grd
-\end_inset
-
-e
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-"e
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\backslash
-`e
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-`e
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\backslash
-^
-\begin_inset space \textvisiblespace{}
-\end_inset
-
-e
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-^e
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\backslash
-=e
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-=e
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\backslash
-u
-\begin_inset space \textvisiblespace{}
-\end_inset
-
-e
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-u e
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\backslash
-b
-\begin_inset space \textvisiblespace{}
-\end_inset
-
-e
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-b e
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\backslash
-t
-\begin_inset space \textvisiblespace{}
-\end_inset
-
-ee
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-t ee
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\begin_inset space \hfill{}
-\end_inset
-
-
+\begin_layout Quote
 \begin_inset Tabular
 <lyxtabular version="3" rows="8" columns="2">
 <features booktabs="true" tabularvalignment="middle">
@@ -769,102 +521,43 @@ c e
 \end_inset
 
 
-\begin_inset space \hfill{}
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
-\begin_inset VSpace medskip
-\end_inset
-
-With the command 
-\series bold
-
-\backslash
-t
-\series default
- also two different characters can be accented.
- The command 
-\series bold
-
-\backslash
-t
-\begin_inset space \textvisiblespace{}
-\end_inset
-
-sz
-\series default
- creates: 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-t sz
+Accented characters missing in Latin Modern:
 \end_layout
 
-\end_inset
-
-
-\end_layout
-
-\end_deeper
-\begin_layout Standard
-Examples for accented characters missing in Latin Modern:
-\end_layout
-
-\begin_layout Standard
-
-\family typewriter
-
-\backslash
-t
-\family default
- leads to 0x0361 COMBINING DOUBLE INVERTED BREVE (ligature tie) and
-\end_layout
-
-\begin_layout Standard
-Missing character: There is no ͡ in font [lmroman12-regular]:mapping=tex-text!
- 
-\end_layout
-
-\begin_layout Standard
+\begin_layout Quote
 
 \family typewriter
 
 \backslash
 c e
 \family default
- leads to 0229 LATIN SMALL LETTER E WITH CEDILLA and
+ leads to 
 \end_layout
 
-\begin_layout Standard
-Missing character: There is no ȩ in font [lmroman12-regular]:mapping=tex-text!
- 
-\end_layout
+\begin_layout Quote
+Missing character: There is no
+\begin_inset Note Note
+status open
 
-\begin_layout Standard
-Using a different non-tex font is not recommended for the 
-\begin_inset Quotes eld
-\end_inset
+\begin_layout Plain Layout
+̧ 
+\end_layout
 
-Math
-\begin_inset Quotes erd
 \end_inset
 
- manual, because TeX-Maths uses Computer Modern which matches with Latin
- Modern and looks suboptimal with other fonts.
- 
+(U+0327) in font [lmroman12-regular]:+tlig;!
 \end_layout
 
 \begin_layout Standard
 OTOH, examples for ERT commands to get accented text letters are not really
- helpfull in a mathematics documentation even when mathematical text can
- be (ab)used to get them.
+ helpfull in a 
+\emph on
+mathematics
+\emph default
+ documentation even when mathematical text can be (ab)used to get them.
 \end_layout
 
 \begin_layout Standard
@@ -1045,5 +738,21 @@ TeX Code
  (ERT) inset .
 \end_layout
 
+\begin_layout Labeling
+\labelwidthstring 00
+- Example 
+\backslash
+c e
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00
++ Example 
+\backslash
+c c or 
+\backslash
+c s (converted to pre-composed character available in LatinModern).
+\end_layout
+
 \end_body
 \end_document

diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx
index 86a4ad7bf28688f8f65944b07223f5c82c2fe838..98b14c5ab5ccfdba2c0b961dc24e1de587949728 100644 (file)
--- a/lib/doc/Math.lyx
+++ b/lib/doc/Math.lyx
@@ -26153,7 +26153,7 @@ AA
 \begin_inset Text
 
 \begin_layout Plain Layout
-\begin_inset Formula $\textrm{Å}$
+\begin_inset Formula $\textrm{Å}$
 \end_inset
 
 
@@ -26438,11 +26438,11 @@ j
 
 \begin_layout Standard
 The characters 
-\begin_inset Formula $\textrm{\textrm{Å}}$
+\begin_inset Formula $\textrm{Å}$
 \end_inset
 
  and 
-\begin_inset Formula $\textrm{\textrm{Ø}}$
+\begin_inset Formula $\textrm{Ø}$
 \end_inset
 
  can also be inserted via the math toolbar button 

diff --git a/lib/unicodesymbols b/lib/unicodesymbols
index 4186747a3aaca60d4699eb711876d8f15493e757..a6f470aa41d10e514bab25dff31c59dd6da8d1e3 100644 (file)
--- a/lib/unicodesymbols
+++ b/lib/unicodesymbols
@@ -95,7 +95,7 @@
 0x00c2 "\\^{A}"                   "" "mathalpha,force=euc-jp" "\\hat{A}" # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
 0x00c3 "\\~{A}"                   "" "mathalpha,force=euc-jp" "\\tilde{A}" # LATIN CAPITAL LETTER A WITH TILDE
 0x00c4 "\\\"{A}"                  "" "mathalpha,force=euc-jp" "\\ddot{A}" # LATIN CAPITAL LETTER A WITH DIAERESIS
-0x00c5 "\\AA"                     "" "mathalpha,force=euc-jp" "\\mathring{A}" "" # LATIN CAPITAL LETTER A WITH RING ABOVE
+0x00c5 "\\r{A}"                   "" "mathalpha,force=euc-jp" "\\mathring{A}" "" # LATIN CAPITAL LETTER A WITH RING ABOVE
 0x00c6 "\\AE"                     "" "force=euc-jp;euc-kr" # LATIN CAPITAL LETTER AE
 0x00c7 "\\c{C}"                   "" "mathalpha,force=euc-jp" "\\cedilla{C}" "accents,cedilla" # LATIN CAPITAL LETTER C WITH CEDILLA
 0x00c8 "\\`{E}"                   "" "mathalpha,force=euc-jp" "\\grave{E}" # LATIN CAPITAL LETTER E WITH GRAVE
@@ -127,7 +127,7 @@
 0x00e2 "\\^{a}"                   "" "mathalpha,force=cp1256;euc-jp" "\\hat{a}" # LATIN SMALL LETTER A WITH CIRCUMFLEX
 0x00e3 "\\~{a}"                   "" "mathalpha,force=euc-jp" "\\tilde{a}" # LATIN SMALL LETTER A WITH TILDE
 0x00e4 "\\\"{a}"                  "" "mathalpha,force=euc-jp" "\\ddot{a}" # LATIN SMALL LETTER A WITH DIAERESIS
-0x00e5 "\\aa"                     "" "mathalpha,force=euc-jp" "\\mathring{a}" "" # LATIN SMALL LETTER A WITH RING ABOVE
+0x00e5 "\\r{a}"                   "" "mathalpha,force=euc-jp" "\\mathring{a}" "" # LATIN SMALL LETTER A WITH RING ABOVE
 0x00e6 "\\ae"                     "" "force=euc-jp;euc-kr" # LATIN SMALL LETTER AE
 0x00e7 "\\c{c}"                   "" "mathalpha,force=cp1256;euc-jp" "\\cedilla{c}" "accents,cedilla" # LATIN SMALL LETTER C WITH CEDILLA
 0x00e8 "\\`{e}"                   "" "mathalpha,force=cp1256;euc-cn;euc-jp;gbk" "\\grave{e}" # LATIN SMALL LETTER E WITH GRAVE
@@ -1857,7 +1857,7 @@
 0x20a9 "\\textwon"                "textcomp" "force=euc-kr" # WON SIGN
 #0x20aa ""                         "" "" # NEW SHEQEL SIGN
 0x20ab "\\textdong"               "textcomp" "" # DONG SIGN
-0x20ac "\\texteuro"               "textcomp" "force=iso8859-7;euc-kr" # EURO SIGN
+0x20ac "\\texteuro"               "textcomp" "force=iso8859-7;euc-kr;gbk" # EURO SIGN
 0x20b1 "\\textpeso"               "textcomp" "force=utf8x" # PESO SIGN
 0x20b2 "\\textguarani"            "textcomp" "force=utf8;utf8x;utf8-cjk" # GUARANI SIGN
 0x20b9 "\\rupee"                  "tfrupee" "" "" "" # INDIAN RUPEE SIGN
@@ -1908,7 +1908,7 @@
 0x2128 ""                         "" "force=utf8;utf8-cjk" "\\mathfrak{Z}" "amssymb" # BLACK-LETTER CAPITAL Z
 #0x2129 ""                         "" "" "" "" # TURNED GREEK SMALL LETTER IOTA
 0x212a "K"                        "" "notermination=text" "" "" # KELVIN SIGN
-0x212b "\\AA"                     "" "force=utf8;utf8-cjk,deprecated" "" "" # ANGSTROM SIGN
+0x212b "\\r{A}"                   "" "force=utf8;utf8-cjk,deprecated" "" "" # ANGSTROM SIGN
 0x212c ""                         "" "force=utf8;utf8-cjk" "\\mathscr{B}" "mathrsfs" # SCRIPT CAPITAL B
 0x212d ""                         "" "force=utf8;utf8-cjk" "\\mathfrak{C}" "amssymb" # BLACK-LETTER CAPITAL C
 0x212e "\\textestimated"          "textcomp" "force=utf8x" # ESTIMATED SYMBOL