From: Günter Milde Date: Fri, 26 Apr 2019 20:57:21 +0000 (+0200) Subject: Fixes for Japanese documents X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5f3a6bde4c215a0e442ce442ab2d08226266bfed;p=features.git 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 5e355f1c4a..c7c8214327 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 d3819230dd..e6ef1b666b 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 e71e4fce07..b6c1b549a9 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 a122e76890..c9cc4de83a 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 a020431c65..1b95711888 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 379242041d..60464e5d74 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 3ab2556b2d..9f986087f6 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 4fa5914793..a6b246bc44 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 e3042fe685..492a10b941 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 1958f057ce..3fd59e7557 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 272e8048c8..dbcfb0c76b 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 474d93cb02..b69843768a 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 fdcad878c8..8759112123 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 71c892142a..51a038d9ba 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 5bbc3ebca6..ddb51c50ca 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 d3fb668775..5dbdfdd292 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 0b5b139e95..d64cc2975e 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