Amend [324b8287/lyxgit]

[lyx.git] / lib / languages

diff --git a/lib/languages b/lib/languages
index 3a0b6ad234e96850944d2c28a440f743773c9663..de1b7c5f1e5ea09cdd98c769e51e39a107f59d5d 100644 (file)
--- a/lib/languages
+++ b/lib/languages
@@ -44,25 +44,29 @@
 #   (UK) -- try to select the entry that is most generic -- here
 #   English.
 # * The QuoteStyle arguments correspond to the following styles:
-#              PRIMARY         SECONDARY
-#   - british: `text'          ``text''        (6_9 -- 66_99)
-#   - danish:  >>text<<        >text<          (inward guillemets)
-#   - english: ``text''        `text'          (66_99 -- 6_9)
-#   - french:  <<text>>        ``text''        (outward guillemets -- 66_99)
-#   - frenchin: <<text>>       <<text>>        (French Imprimerie Nationale style)
-#   - german:  ,,text``        ,text`          (99/66 -- 9/6)
-#   - polish:  ,,text''        ,text'          (99/99 -- 9/9)
-#   - russian:  <<text>>        ,,text``       (outward guillemets -- 99/66)
-#   - swedish: ''text''        'text'          (99_99 -- 9_9)
-#   - swedishg: >>text>>       'text'          (Swedish Guillemets)
-#   - swiss:   <<text>>        <text>          (outward guillemets)
-#   - plain:   "text"          'text'          (non-typographical quotes)
+#                 PRIMARY              SECONDARY
+#   - british:   `text'                ``text''        (6_9 -- 66_99)
+#   - cjk:        corner brackets      white corner br.
+#   - cjk-angle:  double angle br.     angle br.
+#   - danish:    >>text<<              >text<          (inward guillemets)
+#   - english:   ``text''              `text'          (66_99 -- 6_9)
+#   - french:    <<text>>              ``text''        (outward guillemets -- 66_99)
+#   - frenchin:   <<text>>             <<text>>        (French Imprimerie Nationale style)
+#   - german:    ,,text``              ,text`          (99/66 -- 9/6)
+#   - polish:    ,,text''              ,text'          (99/99 -- 9/9)
+#   - russian:    <<text>>             ,,text``        (outward guillemets -- 99/66)
+#   - swedish:   ''text''              'text'          (99_99 -- 9_9)
+#   - swedishg:   >>text>>             'text'          (Swedish Guillemets)
+#   - swiss:     <<text>>              <text>          (outward guillemets)
+#   - plain:     "text"                'text'          (non-typographical quotes)
 #   Note that the option names have been selected (rather arbitrarily)
 #   because the respective styles are common in the respective countries.
 #   Of course this does not imply any fixed relation to those countries.
 # * Encoding is the default encoding used with TeX fonts.
 #   It is only used if Document > Settings > Language > Encoding
 #   is set to "Language Default" and "use non-TeX fonts" is FALSE.
+#   Encoding "inherit" means: keep encoding of the context (used by
+#   latex_language).
 # * InternalEncoding is used to tell LyX that babel internally sets a
 #   non-standard font encoding (such as hebrew to LHE or greek to LGR).
 #   If True, LyX cares for characters/macros that do not exist in
@@ -98,13 +102,13 @@ Language ignore
        GuiName          "Ignore"
        BabelName        ignore
        PolyglossiaName  ignore
-       Encoding         iso8859-1
+       Encoding         inherit
        LangCode         ignore
 End
 
 Language latex
        GuiName          "LaTeX"
-       Encoding         iso8859-1
+       Encoding         inherit
        LangCode         latex
 End
 
@@ -184,7 +188,7 @@ Language arabic_arabi
        PolyglossiaName  arabic
        QuoteStyle       french
        Encoding         cp1256
-       FontEncoding     "LFE,LAE"
+       FontEncoding     LAE
        RTL              true
        AsBabelOptions   true
        LangCode         ar_SA
@@ -220,6 +224,7 @@ End
 
 # In polyglossia, this is supported since release 1.33.4 (May 2014)
 # We introduce it with LyX 2.2 to give the support time to settle.
+# Due to the variety, we use no country code.
 Language austrian
        GuiName          "German (Austria, old spelling)"
        BabelName        austrian
@@ -227,7 +232,8 @@ Language austrian
        PolyglossiaOpts  "variant=austrian,spelling=old,babelshorthands=true"
        QuoteStyle       german
        Encoding         iso8859-15
-       LangCode         de_AT
+       LangCode         de
+       LangVariety      alt
 End
 
 # In polyglossia, this is supported since release 1.33.4 (May 2014)
@@ -381,9 +387,9 @@ End
 Language chinese-traditional
        GuiName         "Chinese (traditional)"
        HasGuiSupport    true
-       QuoteStyle       english
-       Encoding        utf8-cjk
-       LangCode        zh_TW
+       QuoteStyle       cjk
+       Encoding         utf8-cjk
+       LangCode         zh_TW
        Requires         CJK
 End
 
@@ -484,7 +490,7 @@ Language farsi
        BabelName        farsi
        PolyglossiaName  farsi
        Encoding         utf8
-       FontEncoding     "LFE,LAE"
+       FontEncoding     LFE
        RTL              true
        LangCode         fa_IR
        QuoteStyle       english
@@ -718,6 +724,7 @@ Language japanese
        Requires         japanese
        InternalEncoding true
        FontEncoding     None
+       QuoteStyle       cjk
 End
 
 # uses CJK package
@@ -726,6 +733,7 @@ Language japanese-cjk
        Encoding        euc-jp
        LangCode        ja_JP
        Requires        CJK
+       QuoteStyle      cjk
 End
 
 # not supported by babel
@@ -759,7 +767,7 @@ End
 Language korean
        GuiName         "Korean"
        Encoding        euc-kr
-       QuoteStyle      english
+       QuoteStyle      cjkangle
        LangCode        ko_KR
        Requires        CJK
 End
@@ -1187,18 +1195,13 @@ Language urdu
        LangCode         ur_PK
 End
 
-# vietnam must be loaded locally with babel options,
-# not globally via class options, see
-# http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129417.html
 Language vietnamese
        GuiName          "Vietnamese"
-       BabelName        vietnam
+       BabelName        vietnamese
        PolyglossiaName  vietnamese
        QuoteStyle       english
        Encoding         utf8
        LangCode         vi_VN
-       AsBabelOptions   true
-       Requires         vietnamese
 End
 
 Language welsh