cross merge and sort de/en special_chars

diff --git a/locale/de/special_chars b/locale/de/special_chars
index b82440bfab024264a8a7aaf7d0bfd36ebc5e3959..314fabcd4c38a103915dde735f841faf0cfc0d7f 100644 (file)
--- a/locale/de/special_chars
+++ b/locale/de/special_chars
@@ -31,8 +31,10 @@ order=< > \n
 order=\\ <pagebreak> & \n \r " $ <bullet> % _ # ^ { } < > £ ± ² ³ ° § ® © ~ \xad \xa0 ➔ → ← ↔ ↕ | − ≤ ≥ ‐ ​ Ω μ Δ λ Ø ø ‑
 \\=\\textbackslash\s
 <pagebreak>=
 order=\\ <pagebreak> & \n \r " $ <bullet> % _ # ^ { } < > £ ± ² ³ ° § ® © ~ \xad \xa0 ➔ → ← ↔ ↕ | − ≤ ≥ ‐ ​ Ω μ Δ λ Ø ø ‑
 \\=\\textbackslash\s
 <pagebreak>=

-"=''

 &=\\&
 &=\\&

+\n=\\newline\s
+\r=
+"=''

 $=\\$
 <bullet>=$\\bullet$
 %=\\%
 $=\\$
 <bullet>=$\\bullet$
 %=\\%


@@ -40,41 +42,39 @@ _=\\_
 # A hash mark starts a comment; therefore the line is ignored. So use
 # its hex code instead.
 \x23=\\#
 # A hash mark starts a comment; therefore the line is ignored. So use
 # its hex code instead.
 \x23=\\#

+^=\\^\\\s

 {=\\{
 }=\\}
 <=$<$
 >=$>$
 £=\\pounds\s
 {=\\{
 }=\\}
 <=$<$
 >=$>$
 £=\\pounds\s

-\n=\\newline\s
-\r=

 ±=$\\pm$
 ±=$\\pm$

-^=\\^\\\s

 ²=$^2$
 ³=$^3$
 °=$^\\circ$
 §=\\S\s
 ®={\\textregistered}
 ©={\\textcopyright}
 ²=$^2$
 ³=$^3$
 °=$^\\circ$
 §=\\S\s
 ®={\\textregistered}
 ©={\\textcopyright}

+~={\\raisebox{0.5ex}{\\texttildelow}}

 \xad=\\-
 \xad=\\-

+\xa0=~

 ➔=$\\rightarrow$
 →=$\\rightarrow$
 ←=$\\leftarrow$
 ↔=$\\leftrightarrow$
 ↕=$\\updownarrow$
 ➔=$\\rightarrow$
 →=$\\rightarrow$
 ←=$\\leftarrow$
 ↔=$\\leftrightarrow$
 ↕=$\\updownarrow$

-\xa0=~

 |={\\textbar}
 −={\\textemdash}
 ≤=$\\leq$
 ≥=$\\geq$
 ‐={}-{}
 ​={\\hspace{0pt}}
 |={\\textbar}
 −={\\textemdash}
 ≤=$\\leq$
 ≥=$\\geq$
 ‐={}-{}
 ​={\\hspace{0pt}}

+Ω=$\\Omega$

 μ={\\textmu}
 Δ=$\\Delta$
 μ={\\textmu}
 Δ=$\\Delta$

-Ω=$\\Omega$

 λ=$\\lambda$
 λ=$\\lambda$

-ø={\\o}

 Ø={\\O}
 Ø={\\O}

-~={\\raisebox{0.5ex}{\\texttildelow}}
+ø={\\o}

 ‑={}-{}
 
 [Template/OpenDocument]
 ‑={}-{}
 
 [Template/OpenDocument]

diff --git a/locale/en/special_chars b/locale/en/special_chars
index 84373742a66a154e29a1fde7c8712c16a641d7a5..104dd4dbc029b925c10a6e414a342368b9e1e06a 100644 (file)
--- a/locale/en/special_chars
+++ b/locale/en/special_chars
@@ -29,11 +29,13 @@ order=< > \n
 \n=<br>
 
 [Template/LaTeX]
 \n=<br>
 
 [Template/LaTeX]

-order=\\ <pagebreak> & \n \r " $ <bullet> % _ # ^ { } < > £ ± ² ³ ° § ® © ~ \xad \xa0 ➔ → ← | − ≤ ≥ ‐ ​ Ω μ Δ λ Ø ø ‑
+order=\\ <pagebreak> & \n \r " $ <bullet> % _ # ^ { } < > £ ± ² ³ ° § ® © ~ \xad \xa0 ➔ → ← ↔ ↕ | − ≤ ≥ ‐ <200b> Ω μ Δ λ Ø ø ‑

 \\=\\textbackslash\s
 <pagebreak>=
 \\=\\textbackslash\s
 <pagebreak>=

-"=''

 &=\\&
 &=\\&

+\n=\\newline\s
+\r=
+"=''

 $=\\$
 <bullet>=$\\bullet$
 %=\\%
 $=\\$
 <bullet>=$\\bullet$
 %=\\%


@@ -41,39 +43,39 @@ _=\\_
 # A hash mark starts a comment; therefore the line is ignored. So use
 # its hex code instead.
 \x23=\\#
 # A hash mark starts a comment; therefore the line is ignored. So use
 # its hex code instead.
 \x23=\\#

+^=\\^\\\s

 {=\\{
 }=\\}
 <=$<$
 >=$>$
 £=\\pounds\s
 {=\\{
 }=\\}
 <=$<$
 >=$>$
 £=\\pounds\s

-\n=\\newline\s
-\r=

 ±=$\\pm$
 ±=$\\pm$

-^=\\^\\\s

 ²=$^2$
 ³=$^3$
 °=$^\\circ$
 ²=$^2$
 ³=$^3$
 °=$^\\circ$

-§=\\S\s
-®={\\textregistered}
-©={\\textcopyright}
+§=\\S
+®=\\textregistered
+©=\\textcopyright
+~={\\raisebox{0.5ex}{\\texttildelow}}

 \xad=\\-
 \xad=\\-

+\xa0=~

 ➔=$\\rightarrow$
 →=$\\rightarrow$
 ←=$\\leftarrow$
 ➔=$\\rightarrow$
 →=$\\rightarrow$
 ←=$\\leftarrow$

-\xa0=~
+↔=$\\leftrightarrow$
+↕=$\\updownarrow$

 |={\\textbar}
 −={\\textemdash}
 ≤=$\\leq$
 ≥=$\\geq$
 ‐={}-{}
 ​={\\hspace{0pt}}
 |={\\textbar}
 −={\\textemdash}
 ≤=$\\leq$
 ≥=$\\geq$
 ‐={}-{}
 ​={\\hspace{0pt}}

+Ω=$\\Omega$

 μ={\\textmu}
 Δ=$\\Delta$
 μ={\\textmu}
 Δ=$\\Delta$

-Ω=$\\Omega$
-~={\\raisebox{0.5ex}{\\texttildelow}}

 λ=$\\lambda$
 λ=$\\lambda$

-ø={\\o}

 Ø={\\O}
 Ø={\\O}

+ø={\\o}

 ‑={}-{}
 
 [Template/OpenDocument]
 ‑={}-{}
 
 [Template/OpenDocument]