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)

diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx
index 5e355f1c4a1e2c1f94d3baf22c5ba168a6577246..c7c821432794f03fc697e7bbbfb8d92856313bb3 100644 (file)
--- 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 d3819230ddf0470ebfeaa6a263fae6a766cd0633..e6ef1b666b2e59ea4263d3ee96bf479631cbe292 100644 (file)
--- 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 e71e4fce07304eff2895734cc481304d6cfc1a2b..b6c1b549a96405e846b6e26eacc0f7ee205088a6 100644 (file)
--- 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 a122e76890b709176da7762fa3756b465ffb0b50..c9cc4de83ab6dad83183ef29740e42ea260548dc 100644 (file)
--- 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 a020431c653db8a30f4cfbaf61e2bfb72230768e..1b95711888973e86cefb10a50ef3cd0aff2cb6a5 100644 (file)
--- 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 379242041da15b29677dc355bd93f6ffe16bacb8..60464e5d74410e63fde9d4008ecd5bc146f0be72 100644 (file)
--- 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 3ab2556b2d6aa13803345ddfa50c6bcb00cc4b21..9f986087f6e1aedf07922b984359c748d39f6424 100644 (file)
--- 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 4fa5914793759b1f6894bc7b2a96a7940de9ad5d..a6b246bc440889de78508a2d6767afc14d045463 100644 (file)
--- 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 e3042fe68528e8b750973db2f86883390d614206..492a10b941b59df8916dc8f95ebb85e48655aee9 100644 (file)
--- 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 1958f057ceca796d128497a2081e3baf65837c13..3fd59e75576b80132df51a4f6b7db8b79a03a267 100644 (file)
--- 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 272e8048c8022f53a7bd5e95b103e601ab36dac5..dbcfb0c76bd7356ace123724bfe15b7fe0ea1eb6 100644 (file)
--- 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 474d93cb027c4aa89aab0f5ce05e26de35b7fd18..b69843768a00ac679b08e6d04582e8b1f3a3541b 100644 (file)
--- 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 fdcad878c8a03c4826d14cbe5e4223c84014ea40..8759112123b24acdcae1b478181aff808acf2e71 100644 (file)
--- 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 71c892142a58a9178a06fb44f8042f472d1aa6ee..51a038d9ba757800a7d046f00102b6f018482923 100644 (file)
--- 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 5bbc3ebca67270946568fe8fc246cd9227eaaa0c..ddb51c50ca82b511c687b98e4cb1344a08fb109f 100644 (file)
--- 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 d3fb6687757057cd3c9f435224a0e113d78d9166..5dbdfdd29214a1d7f7ade7d76ddf965bbd61d4ab 100644 (file)
--- 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 0b5b139e95a55d1b3023f584ef219b3c1bb08591..d64cc2975e90ffc8f9057c14cca6ecd22faa5b7b 100644 (file)
--- 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