commit e84f6dff77b8c20a3a6bb0ba597d7677031c7190
Author: Günter Milde <[email protected]>
Date: Fri Apr 26 22:57:21 2019 +0200
Fixes for Japanese documents
PDF outline improves with unicode/utf8 (although some chars still wrong).
Math: ERT for umlauts no longer required (now force-converted with
unicodesymbols)
---
lib/doc/ja/Additional.lyx | 2 +-
lib/doc/ja/Customization.lyx | 2 +-
lib/doc/ja/DummyDocument1.lyx | 2 +-
lib/doc/ja/DummyDocument2.lyx | 2 +-
lib/doc/ja/EmbeddedObjects.lyx | 2 +-
lib/doc/ja/Formula-numbering.lyx | 2 +-
lib/doc/ja/Intro.lyx | 2 +-
lib/doc/ja/LaTeXConfig.lyx | 2 +-
lib/doc/ja/Math.lyx | 175 +-------------------
lib/doc/ja/MergedManuals.lyx | 2 +-
lib/doc/ja/Shortcuts.lyx | 2 +-
lib/doc/ja/Tutorial.lyx | 2 +-
lib/doc/ja/UserGuide.lyx | 2 +-
.../ja/Multilingual_Typesetting_%28platex%29.lyx | 2 +-
lib/examples/ja/Presentations/Beamer.lyx | 2 +-
lib/examples/ja/Welcome.lyx | 2 +-
src/PDFOptions.cpp | 3 +-
17 files changed, 22 insertions(+), 186 deletions(-)
diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx
index 5e355f1..c7c8214 100644
--- a/lib/doc/ja/Additional.lyx
+++ b/lib/doc/ja/Additional.lyx
@@ -92,7 +92,7 @@ End
\end_local_layout
\language japanese
\language_package default
-\inputencoding jis-platex
+\inputencoding utf8-platex
\fontencoding global
\font_roman "lmodern" "IPAexMincho"
\font_sans "default" "IPAexGothic"
diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx
index d381923..e6ef1b6 100644
--- a/lib/doc/ja/Customization.lyx
+++ b/lib/doc/ja/Customization.lyx
@@ -83,7 +83,7 @@ End
\end_local_layout
\language japanese
\language_package default
-\inputencoding jis-platex
+\inputencoding utf8-platex
\fontencoding auto
\font_roman "lmodern" "IPAexMincho"
\font_sans "default" "IPAexGothic"
diff --git a/lib/doc/ja/DummyDocument1.lyx b/lib/doc/ja/DummyDocument1.lyx
index e71e4fc..b6c1b54 100644
--- a/lib/doc/ja/DummyDocument1.lyx
+++ b/lib/doc/ja/DummyDocument1.lyx
@@ -9,7 +9,7 @@
\maintain_unincluded_children false
\language japanese
\language_package default
-\inputencoding jis-platex
+\inputencoding utf8-platex
\fontencoding global
\font_roman "lmodern" "IPAexMincho"
\font_sans "default" "IPAexGothic"
diff --git a/lib/doc/ja/DummyDocument2.lyx b/lib/doc/ja/DummyDocument2.lyx
index a122e76..c9cc4de 100644
--- a/lib/doc/ja/DummyDocument2.lyx
+++ b/lib/doc/ja/DummyDocument2.lyx
@@ -9,7 +9,7 @@
\maintain_unincluded_children false
\language japanese
\language_package default
-\inputencoding jis-platex
+\inputencoding utf8-platex
\fontencoding global
\font_roman "lmodern" "IPAexMincho"
\font_sans "default" "IPAexGothic"
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index a020431..1b95711 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -205,7 +205,7 @@ End
\end_local_layout
\language japanese
\language_package default
-\inputencoding jis-platex
+\inputencoding utf8-platex
\fontencoding global
\font_roman "lmodern" "IPAexMincho"
\font_sans "default" "IPAexGothic"
diff --git a/lib/doc/ja/Formula-numbering.lyx b/lib/doc/ja/Formula-numbering.lyx
index 3792420..60464e5 100644
--- a/lib/doc/ja/Formula-numbering.lyx
+++ b/lib/doc/ja/Formula-numbering.lyx
@@ -47,7 +47,7 @@
\maintain_unincluded_children false
\language japanese
\language_package default
-\inputencoding jis-platex
+\inputencoding utf8-platex
\fontencoding global
\font_roman "lmodern" "IPAexMincho"
\font_sans "default" "IPAexGothic"
diff --git a/lib/doc/ja/Intro.lyx b/lib/doc/ja/Intro.lyx
index 3ab2556..9f98608 100644
--- a/lib/doc/ja/Intro.lyx
+++ b/lib/doc/ja/Intro.lyx
@@ -56,7 +56,7 @@ End
\end_local_layout
\language japanese
\language_package auto
-\inputencoding jis-platex
+\inputencoding utf8-platex
\fontencoding global
\font_roman "lmodern" "IPAexMincho"
\font_sans "default" "IPAexGothic"
diff --git a/lib/doc/ja/LaTeXConfig.lyx b/lib/doc/ja/LaTeXConfig.lyx
index 4fa5914..a6b246b 100644
--- a/lib/doc/ja/LaTeXConfig.lyx
+++ b/lib/doc/ja/LaTeXConfig.lyx
@@ -9,7 +9,7 @@
\maintain_unincluded_children false
\language japanese
\language_package default
-\inputencoding jis-platex
+\inputencoding utf8-platex
\fontencoding global
\font_roman "lmodern" "IPAexMincho"
\font_sans "default" "IPAexGothic"
diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx
index e3042fe..492a10b 100644
--- a/lib/doc/ja/Math.lyx
+++ b/lib/doc/ja/Math.lyx
@@ -35214,61 +35214,11 @@ begin{multicols}{2}
\lang ngerman
Das Spektrum wird fouriertransformiert.
Die Fouriertransformation wird verwendet, um die
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-
-\begin_inset Quotes erd
-\end_inset
-
-u
-\end_layout
-
-\end_inset
-
-berlagerten Signale (Netzwerk, L
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-
-\begin_inset Quotes erd
-\end_inset
-
-o
-\end_layout
-
-\end_inset
-
-sungsmittel) zu trennen.
+ überlagerten Signale (Netzwerk, Lösungsmittel) zu trennen.
Nachdem wir die Phasenverschiebung bestimmen konnten, interessiert uns
nun das Aussehen des Ausgangssignals.
Im Experiment haben wir es mit sehr vielen Teilchen zu tun, so das man
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-
-\begin_inset Quotes erd
-\end_inset
-
-u
-\end_layout
-
-\end_inset
-
-ber alle Phasen integrieren muss.
+ über alle Phasen integrieren muss.
Sei nun
\begin_inset Formula $S$
\end_inset
@@ -35328,37 +35278,7 @@ wobei
\end_inset
gilt.
- Nun d
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-
-\begin_inset Quotes erd
-\end_inset
-
-u
-\end_layout
-
-\end_inset
-
-rfen wir aber nicht den Relaxationsprozess au
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-ss
-\end_layout
-
-\end_inset
-
-er Acht lassen.
+ Nun dürfen wir aber nicht den Relaxationsprozess außer Acht lassen.
Direkt nach dem
\begin_inset Formula $\nicefrac{\pi}{2}$
\end_inset
@@ -35368,93 +35288,8 @@ er Acht lassen.
\end_inset
-rf-Puls beginnt sich die Magnetisierung zu entfokussieren, wodurch sich
- das Signal zus
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-
-\begin_inset Quotes erd
-\end_inset
-
-a
-\end_layout
-
-\end_inset
-
-tzlich abschw
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-
-\begin_inset Quotes erd
-\end_inset
-
-a
-\end_layout
-
-\end_inset
-
-cht.
- Diese Abschw
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-
-\begin_inset Quotes erd
-\end_inset
-
-a
-\end_layout
-
-\end_inset
-
-chung verl
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-
-\begin_inset Quotes erd
-\end_inset
-
-a
-\end_layout
-
-\end_inset
-
-uft exponentiell in Abh
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-
-\begin_inset Quotes erd
-\end_inset
-
-a
-\end_layout
-
-\end_inset
-
-ngigkeit der so genannten
+ das Signal zusätzlich abschwächt.
+ Diese Abschwächung verläuft exponentiell in Abhängigkeit der so genannten
\begin_inset Formula $T_{2}$
\end_inset
diff --git a/lib/doc/ja/MergedManuals.lyx b/lib/doc/ja/MergedManuals.lyx
index 1958f05..3fd59e7 100644
--- a/lib/doc/ja/MergedManuals.lyx
+++ b/lib/doc/ja/MergedManuals.lyx
@@ -19,7 +19,7 @@ initials
\maintain_unincluded_children false
\language japanese
\language_package default
-\inputencoding jis-platex
+\inputencoding utf8-platex
\fontencoding global
\font_roman "lmodern" "IPAexMincho"
\font_sans "default" "IPAexGothic"
diff --git a/lib/doc/ja/Shortcuts.lyx b/lib/doc/ja/Shortcuts.lyx
index 272e804..dbcfb0c 100644
--- a/lib/doc/ja/Shortcuts.lyx
+++ b/lib/doc/ja/Shortcuts.lyx
@@ -36,7 +36,7 @@ End
\end_local_layout
\language japanese
\language_package auto
-\inputencoding jis-platex
+\inputencoding utf8-platex
\fontencoding global
\font_roman "lmodern" "IPAexMincho"
\font_sans "default" "IPAexGothic"
diff --git a/lib/doc/ja/Tutorial.lyx b/lib/doc/ja/Tutorial.lyx
index 474d93c..b698437 100644
--- a/lib/doc/ja/Tutorial.lyx
+++ b/lib/doc/ja/Tutorial.lyx
@@ -36,7 +36,7 @@ End
\end_local_layout
\language japanese
\language_package auto
-\inputencoding utf8
+\inputencoding utf8-platex
\fontencoding global
\font_roman "lmodern" "IPAexMincho"
\font_sans "default" "IPAexGothic"
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index fdcad87..8759112 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -84,7 +84,7 @@ End
\end_local_layout
\language japanese
\language_package auto
-\inputencoding jis-platex
+\inputencoding utf8-platex
\fontencoding global
\font_roman "lmodern" "IPAexMincho"
\font_sans "default" "IPAexGothic"
diff --git a/lib/examples/ja/Multilingual_Typesetting_%28platex%29.lyx
b/lib/examples/ja/Multilingual_Typesetting_%28platex%29.lyx
index 71c8921..51a038d 100644
--- a/lib/examples/ja/Multilingual_Typesetting_%28platex%29.lyx
+++ b/lib/examples/ja/Multilingual_Typesetting_%28platex%29.lyx
@@ -9,7 +9,7 @@
\maintain_unincluded_children false
\language japanese
\language_package auto
-\inputencoding utf8
+\inputencoding utf8-platex
\fontencoding auto
\font_roman "DejaVuSerif" "IPAexMincho"
\font_sans "DejaVuSans" "IPAexGothic"
diff --git a/lib/examples/ja/Presentations/Beamer.lyx
b/lib/examples/ja/Presentations/Beamer.lyx
index 5bbc3eb..ddb51c5 100644
--- a/lib/examples/ja/Presentations/Beamer.lyx
+++ b/lib/examples/ja/Presentations/Beamer.lyx
@@ -22,7 +22,7 @@
\maintain_unincluded_children false
\language japanese
\language_package default
-\inputencoding jis-platex
+\inputencoding utf8-platex
\fontencoding global
\font_roman "default" "IPAexMincho"
\font_sans "default" "IPAexGothic"
diff --git a/lib/examples/ja/Welcome.lyx b/lib/examples/ja/Welcome.lyx
index d3fb668..5dbdfdd 100644
--- a/lib/examples/ja/Welcome.lyx
+++ b/lib/examples/ja/Welcome.lyx
@@ -9,7 +9,7 @@
\maintain_unincluded_children false
\language japanese
\language_package auto
-\inputencoding utf8
+\inputencoding utf8-platex
\fontencoding auto
\font_roman "lmodern" "IPAexMincho"
\font_sans "default" "IPAexGothic"
diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 0b5b139..d64cc29 100644
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -105,7 +105,8 @@ void PDFOptions::writeLaTeX(OutputParams & runparams,
otexstream & os,
// with the hyperref option "unicode".
// (With Xe/LuaTeX and pTeX, unicode=true is the default
// and the option leads to errors with some Japanese document classes)
- if (!runparams.isFullUnicode() && !runparams.use_japanese)
+ if (!runparams.isFullUnicode()
+ && (!runparams.use_japanese || runparams.encoding->iconvName()
== "UTF-8"))
opt += "unicode=true,";
// only use the hyperref settings if hyperref is enabled by the user
