From: Günter Milde Date: Fri, 22 Mar 2019 00:13:23 +0000 (+0100) Subject: Fix inputencoding for documentation, examples, and templates. X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=13c9acd48f03a93336e14bb3e86fb5645b3c184e;p=features.git Fix inputencoding for documentation, examples, and templates. * "platex" fails with "inputencoding default", if there is text in other languages. "jis-platex" works fine, "jis-utf8" fails with German Umlauts (maybe more). * The expert setting "inputencoding default" switches the inpute encoding with language switches without marking this in the LaTeX source. It is rarely required (if ever) and makes documents easy to break. It is not required for AMS Books, Simple CV, ... (probabely a tex2lyx issue). "utf8" and "auto" work fine. --- diff --git a/lib/doc/id/Intro.lyx b/lib/doc/id/Intro.lyx index a1d529ec49..443713fc5b 100644 --- a/lib/doc/id/Intro.lyx +++ b/lib/doc/id/Intro.lyx @@ -36,7 +36,7 @@ \maintain_unincluded_children false \language bahasa \language_package default -\inputencoding default +\inputencoding auto \fontencoding global \font_roman "palatino" "default" \font_sans "helvet" "default" diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx index 228846d6db..4fd2d531c3 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 auto +\inputencoding jis-platex \fontencoding global \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx index 0c5e92ab51..0552c879c4 100644 --- a/lib/doc/ja/Customization.lyx +++ b/lib/doc/ja/Customization.lyx @@ -87,7 +87,7 @@ End \end_local_layout \language japanese \language_package default -\inputencoding auto +\inputencoding jis-platex \fontencoding auto \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/doc/ja/DummyDocument1.lyx b/lib/doc/ja/DummyDocument1.lyx index 7db92335ec..23151ec388 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 auto +\inputencoding jis-platex \fontencoding global \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/doc/ja/DummyDocument2.lyx b/lib/doc/ja/DummyDocument2.lyx index 6bdf60d584..4b951a2a86 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 auto +\inputencoding jis-platex \fontencoding global \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx index 835b3be4a5..c27c9fd7c5 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 auto +\inputencoding jis-platex \fontencoding global \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/doc/ja/Formula-numbering.lyx b/lib/doc/ja/Formula-numbering.lyx index f3e6322d3b..02a0204e5c 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 auto +\inputencoding jis-platex \fontencoding global \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/doc/ja/Intro.lyx b/lib/doc/ja/Intro.lyx index 7f515f9eb7..ff5042eb06 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 auto +\inputencoding jis-platex \fontencoding global \font_roman "palatino" "default" \font_sans "helvet" "default" diff --git a/lib/doc/ja/LaTeXConfig.lyx b/lib/doc/ja/LaTeXConfig.lyx index d7bf124e55..c5e5fbd610 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 auto +\inputencoding jis-platex \fontencoding global \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx index ceb9233b2d..0e86a5ee65 100644 --- a/lib/doc/ja/Math.lyx +++ b/lib/doc/ja/Math.lyx @@ -176,7 +176,7 @@ End \end_local_layout \language japanese \language_package default -\inputencoding auto +\inputencoding jis-platex \fontencoding global \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/doc/ja/MergedManuals.lyx b/lib/doc/ja/MergedManuals.lyx index 545b1916d4..e840d99ac7 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 auto +\inputencoding jis-platex \fontencoding global \font_roman "lmodern" "default" \font_sans "default" "default" diff --git a/lib/doc/ja/Shortcuts.lyx b/lib/doc/ja/Shortcuts.lyx index d69e96672f..076e134459 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 auto +\inputencoding jis-platex \fontencoding global \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/doc/ja/Tutorial.lyx b/lib/doc/ja/Tutorial.lyx index d6f6870a32..5af7b3a381 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 auto +\inputencoding jis-platex \fontencoding global \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index 3180781ea9..1413c3e2d5 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 auto +\inputencoding jis-platex \fontencoding global \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/examples/Articles/American_Mathematical_Society_(AMS).lyx b/lib/examples/Articles/American_Mathematical_Society_(AMS).lyx index 499f344646..09a0013ba8 100644 --- a/lib/examples/Articles/American_Mathematical_Society_(AMS).lyx +++ b/lib/examples/Articles/American_Mathematical_Society_(AMS).lyx @@ -1,9 +1,9 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ -\lyxformat 544 +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 567 \begin_document \begin_header \save_transient_properties true -\origin /systemlyxdir/examples/ +\origin /systemlyxdir/examples/Articles/ \textclass amsart \use_default_options false \begin_modules @@ -15,9 +15,9 @@ theorems-ams-extended \maintain_unincluded_children false \language english \language_package default -\inputencoding default -\fontencoding global -\font_roman "default" "default" +\inputencoding utf8 +\fontencoding auto +\font_roman "lmodern" "default" \font_sans "default" "default" \font_typewriter "default" "default" \font_math "auto" "auto" @@ -34,6 +34,8 @@ theorems-ams-extended \output_sync 0 \bibtex_command default \index_command default +\float_placement class +\float_alignment class \paperfontsize default \spacing single \use_hyperref false diff --git a/lib/examples/Articles/DocBook_Article_(SGML).lyx b/lib/examples/Articles/DocBook_Article_(SGML).lyx index 190d150a68..5138cfee5d 100644 --- a/lib/examples/Articles/DocBook_Article_(SGML).lyx +++ b/lib/examples/Articles/DocBook_Article_(SGML).lyx @@ -1,16 +1,16 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ -\lyxformat 544 +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 567 \begin_document \begin_header \save_transient_properties true -\origin /systemlyxdir/examples/ +\origin /systemlyxdir/examples/Articles/ \textclass docbook \use_default_options false \maintain_unincluded_children false \language english \language_package default -\inputencoding default -\fontencoding global +\inputencoding utf8 +\fontencoding auto \font_roman "default" "default" \font_sans "default" "default" \font_typewriter "default" "default" @@ -24,10 +24,12 @@ \use_microtype false \use_dash_ligatures false \graphics default -\default_output_format pdf +\default_output_format default \output_sync 0 \bibtex_command default \index_command default +\float_placement class +\float_alignment class \paperfontsize default \spacing single \use_hyperref false @@ -290,13 +292,14 @@ Notice that when the docbook code is exported the filename extension is \begin_layout Standard \begin_inset Float figure placement htbp +alignment document wide false sideways false status open \begin_layout Plain Layout \begin_inset Graphics - filename ../doc/clipart/platypus.eps + filename ../../doc/clipart/platypus.eps width 2cm height 3cm scaleBeforeRotation @@ -332,13 +335,14 @@ Wide figures are treated as normal figures. \begin_layout Standard \begin_inset Float figure placement htbp +alignment document wide true sideways false status open \begin_layout Plain Layout \begin_inset Graphics - filename ../doc/clipart/platypus.eps + filename ../../doc/clipart/platypus.eps width 2cm height 3cm scaleBeforeRotation @@ -376,6 +380,7 @@ Tables There is also basic support for tables. \begin_inset Float table placement htbp +alignment document wide false sideways false status open diff --git a/lib/examples/Books/American_Mathematical_Society_(AMS).lyx b/lib/examples/Books/American_Mathematical_Society_(AMS).lyx index d40c25cecb..ff48da0d2e 100644 --- a/lib/examples/Books/American_Mathematical_Society_(AMS).lyx +++ b/lib/examples/Books/American_Mathematical_Society_(AMS).lyx @@ -1,9 +1,9 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ -\lyxformat 544 +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 567 \begin_document \begin_header \save_transient_properties true -\origin /systemlyxdir/examples/ +\origin /systemlyxdir/examples/Books/ \textclass amsbook \use_default_options false \begin_modules @@ -15,9 +15,9 @@ theorems-ams-extended \maintain_unincluded_children false \language english \language_package default -\inputencoding default -\fontencoding global -\font_roman "default" "default" +\inputencoding utf8 +\fontencoding auto +\font_roman "lmodern" "default" \font_sans "default" "default" \font_typewriter "default" "default" \font_math "auto" "auto" @@ -34,6 +34,8 @@ theorems-ams-extended \output_sync 0 \bibtex_command default \index_command default +\float_placement class +\float_alignment class \paperfontsize default \spacing single \use_hyperref false diff --git a/lib/examples/Curricula_Vitae/Simple_CV.lyx b/lib/examples/Curricula_Vitae/Simple_CV.lyx index cd630f9ce7..dde382ec09 100644 --- a/lib/examples/Curricula_Vitae/Simple_CV.lyx +++ b/lib/examples/Curricula_Vitae/Simple_CV.lyx @@ -1,9 +1,9 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ -\lyxformat 544 +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 567 \begin_document \begin_header \save_transient_properties true -\origin /systemlyxdir/examples/ +\origin /systemlyxdir/examples/Curricula_Vitae/ \textclass simplecv \begin_preamble %% You can modify the fonts used in the document be using the @@ -30,9 +30,9 @@ \maintain_unincluded_children false \language english \language_package default -\inputencoding default -\fontencoding global -\font_roman "default" "default" +\inputencoding utf8 +\fontencoding auto +\font_roman "lmodern" "default" \font_sans "default" "default" \font_typewriter "default" "default" \font_math "auto" "auto" @@ -49,6 +49,8 @@ \output_sync 0 \bibtex_command default \index_command default +\float_placement class +\float_alignment class \paperfontsize default \spacing single \use_hyperref false diff --git a/lib/examples/Modules/Noweb.lyx b/lib/examples/Modules/Noweb.lyx index ae16f52f19..f6536e25f6 100644 --- a/lib/examples/Modules/Noweb.lyx +++ b/lib/examples/Modules/Noweb.lyx @@ -1,9 +1,9 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header \save_transient_properties true -\origin /systemlyxdir/examples/ +\origin /systemlyxdir/examples/Modules/ \textclass article \use_default_options false \begin_modules @@ -12,9 +12,9 @@ noweb \maintain_unincluded_children false \language english \language_package default -\inputencoding default +\inputencoding auto \fontencoding global -\font_roman "default" "default" +\font_roman "lmodern" "default" \font_sans "default" "default" \font_typewriter "default" "default" \font_math "auto" "auto" diff --git a/lib/examples/Modules/Noweb2LyX.lyx b/lib/examples/Modules/Noweb2LyX.lyx index 5acd467f64..8ac62a0452 100644 --- a/lib/examples/Modules/Noweb2LyX.lyx +++ b/lib/examples/Modules/Noweb2LyX.lyx @@ -1,9 +1,9 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header \save_transient_properties true -\origin /systemlyxdir/examples/ +\origin /systemlyxdir/examples/Modules/ \textclass article \begin_preamble % @@ -22,9 +22,9 @@ noweb \maintain_unincluded_children false \language english \language_package default -\inputencoding default +\inputencoding auto \fontencoding global -\font_roman "default" "default" +\font_roman "lmodern" "default" \font_sans "default" "default" \font_typewriter "default" "default" \font_math "auto" "auto" diff --git a/lib/examples/Modules/Sweave.lyx b/lib/examples/Modules/Sweave.lyx index e11bcf9fef..d7f6fc904b 100644 --- a/lib/examples/Modules/Sweave.lyx +++ b/lib/examples/Modules/Sweave.lyx @@ -24,7 +24,7 @@ sweave \maintain_unincluded_children false \language english \language_package auto -\inputencoding default +\inputencoding auto \fontencoding global \font_roman "palatino" "default" \font_sans "lmss" "default" diff --git a/lib/examples/Presentations/Foils.lyx b/lib/examples/Presentations/Foils.lyx index 0f3d6b8274..6eb05e2ce6 100644 --- a/lib/examples/Presentations/Foils.lyx +++ b/lib/examples/Presentations/Foils.lyx @@ -14,7 +14,7 @@ \maintain_unincluded_children false \language english \language_package default -\inputencoding default +\inputencoding utf8 \fontencoding global \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/examples/Presentations/Foils_Landslide.lyx b/lib/examples/Presentations/Foils_Landslide.lyx index d76b4e8f9d..f5fdb1479f 100644 --- a/lib/examples/Presentations/Foils_Landslide.lyx +++ b/lib/examples/Presentations/Foils_Landslide.lyx @@ -9,7 +9,7 @@ \maintain_unincluded_children false \language english \language_package default -\inputencoding default +\inputencoding utf8 \fontencoding global \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/examples/ja/Graphics_&_Insets/Feynman_Diagrams.lyx b/lib/examples/ja/Graphics_&_Insets/Feynman_Diagrams.lyx index 5da6c676c3..4f5ccd7d2e 100644 --- a/lib/examples/ja/Graphics_&_Insets/Feynman_Diagrams.lyx +++ b/lib/examples/ja/Graphics_&_Insets/Feynman_Diagrams.lyx @@ -34,7 +34,7 @@ \maintain_unincluded_children false \language japanese \language_package default -\inputencoding auto +\inputencoding utf8-platex \fontencoding global \font_roman "lmodern" "default" \font_sans "default" "default" diff --git a/lib/examples/ja/Graphics_&_Insets/XY-Pic.lyx b/lib/examples/ja/Graphics_&_Insets/XY-Pic.lyx index 48bdaaeca5..e83bf19c7a 100644 --- a/lib/examples/ja/Graphics_&_Insets/XY-Pic.lyx +++ b/lib/examples/ja/Graphics_&_Insets/XY-Pic.lyx @@ -33,7 +33,7 @@ \maintain_unincluded_children false \language japanese \language_package default -\inputencoding auto +\inputencoding utf8-platex \fontencoding global \font_roman "ae" "default" \font_sans "default" "default" diff --git a/lib/examples/ja/Modules/Braille.lyx b/lib/examples/ja/Modules/Braille.lyx index 0ed846726f..16c8acac94 100644 --- a/lib/examples/ja/Modules/Braille.lyx +++ b/lib/examples/ja/Modules/Braille.lyx @@ -17,7 +17,7 @@ braille \maintain_unincluded_children false \language japanese \language_package default -\inputencoding auto +\inputencoding utf8-platex \fontencoding global \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/examples/ja/Modules/Linguistics.lyx b/lib/examples/ja/Modules/Linguistics.lyx index 5c9a9653c7..80778c208a 100644 --- a/lib/examples/ja/Modules/Linguistics.lyx +++ b/lib/examples/ja/Modules/Linguistics.lyx @@ -17,7 +17,7 @@ linguistics \maintain_unincluded_children false \language japanese \language_package default -\inputencoding auto +\inputencoding utf8-platex \fontencoding global \font_roman "lmodern" "FreeSerif" \font_sans "default" "FreeSans" diff --git a/lib/examples/ja/Multilingual_Typesetting_(platex).lyx b/lib/examples/ja/Multilingual_Typesetting_(platex).lyx new file mode 100644 index 0000000000..c4a2dba9cd --- /dev/null +++ b/lib/examples/ja/Multilingual_Typesetting_(platex).lyx @@ -0,0 +1,217 @@ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 567 +\begin_document +\begin_header +\save_transient_properties true +\origin /systemlyxdir/examples/ja/ +\textclass jarticle +\use_default_options false +\maintain_unincluded_children false +\language japanese +\language_package auto +\inputencoding jis-platex +\fontencoding OT1 +\font_roman "default" "default" +\font_sans "default" "default" +\font_typewriter "default" "default" +\font_math "auto" "auto" +\font_default_family default +\use_non_tex_fonts false +\font_sc false +\font_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures false +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\float_placement class +\float_alignment class +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\use_package mathtools 1 +\use_package mhchem 1 +\use_package stackrel 1 +\use_package stmaryrd 1 +\use_package undertilde 1 +\cite_engine basic +\cite_engine_type default +\biblio_style plain +\use_bibtopic false +\use_indices false +\paperorientation portrait +\suppress_date false +\justification true +\use_refstyle 0 +\use_minted 0 +\index 索引 +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style english +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Title +\SpecialChar LyX +へようこそ！ +\end_layout + +\begin_layout Section* +\SpecialChar LyX +を使うために最初に知っておくべきことがら +\end_layout + +\begin_layout Standard +Text in other languages: +\end_layout + +\begin_layout Quotation +English: Hello Mr. + Sandman! +\end_layout + +\begin_layout Quotation +Deutsch: Grüße aus Österreich! +\end_layout + +\begin_layout Standard +Greek and Cyrillic script use too wide characters (except for force-converted + letters): +\end_layout + +\begin_layout Quotation +Griechisch: χαιρετισμός! +\end_layout + +\begin_layout Quotation +Russisch: Привет с +\series bold +новым +\series default + годом! +\end_layout + +\begin_layout Standard +Text in other languages with correct language setting - works only for some + languages: +\end_layout + +\begin_layout Standard + +\lang english +English: Hello Mr. + Sandman! +\end_layout + +\begin_layout Standard + +\lang afrikaans +Afrikaans: Good dag minher. +\end_layout + +\begin_layout Standard + +\lang french +French: «Bonsoir à vous.» +\end_layout + +\begin_layout Standard + +\lang swedish +Swedish: Hej dÃ¥. +\end_layout + +\begin_layout Standard +Compilation error with inputenc +\begin_inset Quotes eld +\end_inset + +auto +\begin_inset Quotes erd +\end_inset + + (language default): +\end_layout + +\begin_layout Standard + +\lang ngerman +Deutsch: Grüße aus Österreich! +\lang japanese + +\begin_inset Note Note +status open + +\begin_layout Plain Layout +wrong encoding?, (Umlaut not as +\backslash + +\begin_inset Quotes erd +\end_inset + +{O}) +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +Wrong characters with inputenc +\begin_inset Quotes eld +\end_inset + +auto +\begin_inset Quotes erd +\end_inset + + (language default): +\end_layout + +\begin_layout Standard + +\lang greek +Griechisch: χαιρετισμός! +\end_layout + +\begin_layout Standard + +\lang russian +Russisch: Привет с +\series bold +новым +\series default + годом! +\end_layout + +\end_body +\end_document diff --git a/lib/examples/ja/Welcome.lyx b/lib/examples/ja/Welcome.lyx index 4d9e5cc46b..691f14633c 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 default +\inputencoding jis-platex \fontencoding OT1 \font_roman "default" "default" \font_sans "default" "default" diff --git a/lib/templates/ja/Presentations/Beamer.lyx b/lib/templates/ja/Presentations/Beamer.lyx index 3ae53b1269..b7a280f90c 100644 --- a/lib/templates/ja/Presentations/Beamer.lyx +++ b/lib/templates/ja/Presentations/Beamer.lyx @@ -21,7 +21,7 @@ \maintain_unincluded_children false \language japanese \language_package default -\inputencoding auto +\inputencoding utf8-platex \fontencoding global \font_roman "times" "default" \font_sans "default" "default"