Merge remote-tracking branch 'origin/master' into features/latexargs

[lyx.git] / lib / encodings

diff --git a/lib/encodings b/lib/encodings
index b0a001baa9610d8528f081f756b0debfa5f05fff..899a1a813acf5281e4c9cc82a14b303380abfeba 100644 (file)
--- a/lib/encodings
+++ b/lib/encodings
@@ -177,11 +177,13 @@ End
 
 # Traditional Japanese TeX programs require the japanese package.
 # that is incompatible with CJK and inputenc.
-Encoding euc-jp-plain EUC-JP-pLaTeX "Japanese (non-CJK) (EUC-JP)" EUC-JP variable japanese
+Encoding euc-jp-plain euc "Japanese (non-CJK) (EUC-JP)" EUC-JP variable japanese
 End
-Encoding jis-plain JIS-pLaTeX "Japanese (non-CJK) (JIS)" ISO-2022-JP variable japanese
+Encoding jis-plain jis "Japanese (non-CJK) (JIS)" ISO-2022-JP variable japanese
 End
-Encoding shift-jis-plain SJIS-pLaTeX "Japanese (non-CJK) (SJIS)" CP932 variable japanese
+Encoding shift-jis-plain sjis "Japanese (non-CJK) (SJIS)" CP932 variable japanese
+End
+Encoding utf8 utf8 "Japanese (non-CJK) (utf8)" UTF-8 variable japanese
 End
 
 # This one needs hardcoded support, since the inputenc package does not know