On 2010-11-15, Guenter Milde wrote:
> On 2010-11-15, Guenter Milde wrote:
>> On 2010-11-15, Jürgen Spitzmüller wrote:

>>> Maybe. Don't know. I think I would prefer them to be enabled with
>>> German (I always use them quite excessively). But then, I have not yet
>>> used polyglossia myself.

>>>> However, in any case might it be better to provide a PolyglossiaOpts
>>>> keyword, even if it is not used in the first version of the new file...

>>> I guess we should go for the PolyglossiaOpts right away.

> Done.

And here is the diff.

Günter

Exec: git 'diff' 'languages' 2>&1
Dir: /usr/local/src/lyx/lib/

diff --git a/lib/languages b/lib/languages
index ff87033..449ea3a 100644
--- a/lib/languages
+++ b/lib/languages
@@ -7,7 +7,9 @@
 # Language <lyxname>
 #      GuiName            "<Gui Name>"
 #      BabelName          <babelname>
-#      Encoding           <encoding>
+#      PolyglossiaName    <polyglossianame>
+#      PolyglossiaOpts    <language-specific options>
+#      Encoding           <default_encoding> (not with XeTeX/LuaTeX)
 #      InternalEncoding   <true|false>
 #      RTL                <true|false>
 #      AsBabelOptions     <true|false>
@@ -21,8 +23,12 @@
 #      EndPostBabelPreamble
 # End
 #
-# Omitted elements will be treated as empty
-# (omitted AsBabelOptions, RTL and InternalEncoding as "false")
+# LangCode: code according to Best Current Practice (BCP 47)
+#           http://www.rfc-editor.org/rfc/bcp/bcp47.txt
+#           http://www.w3.org/International/articles/language-tags/
+#           http://www.iana.org/assignments/language-subtag-registry
+#
+# Omitted elements will be treated as empty or (if boolean) "false".
 #
 ########################################################################
 
@@ -33,6 +39,7 @@
 Language ignore
        GuiName         "Ignore"
        BabelName       ignore
+       PolyglossiaName ignore
        Encoding        iso8859-1
        LangCode        ignore
 End
@@ -57,6 +64,7 @@ End
 Language albanian
        GuiName         "Albanian"
        BabelName       albanian
+       PolyglossiaName albanian
        Encoding        iso8859-2
        LangCode        sq_AL
 End
@@ -64,10 +72,19 @@ End
 Language american
        GuiName         "English (USA)"
        BabelName       american
+       PolyglossiaName english
+       PolyglossiaOpts variant=american
        Encoding        iso8859-15
        LangCode        en_US
 End
 
+Language ancientgreek
+       GuiName         "Greek (ancient)"
+       PolyglossiaName greek
+       PolyglossiaOpts variant=ancient
+       LangCode        grc
+End
+
 # FIXME: dummy babel language for arabic_arabtex to be able
 # to switch the language the way of the ArabTeX-package
 Language arabic_arabtex
@@ -81,6 +98,7 @@ End
 Language arabic_arabi
        GuiName         "Arabic (Arabi)"
        BabelName       arabic
+       PolyglossiaName arabic
        Encoding        cp1256
        RTL             true
        LangCode        ar_SA
@@ -88,6 +106,7 @@ End
 
 Language armenian
        GuiName         "Armenian"
+       PolyglossiaName armenian
        Encoding        armscii8
        LangCode        hy_AM
 End
@@ -96,7 +115,7 @@ Language austrian
        GuiName         "German (Austria, old spelling)"
        BabelName       austrian
        Encoding        iso8859-15
-       LangCode        de_AT
+       LangCode        de_AT_1901
 End
 
 Language naustrian
@@ -109,6 +128,7 @@ End
 Language bahasa
        GuiName         "Indonesian"
        BabelName       bahasa
+       PolyglossiaName bahasai
        Encoding        iso8859-15
        LangCode        id_ID
 End
@@ -116,6 +136,7 @@ End
 Language bahasam
        GuiName         "Malay"
        BabelName       bahasam
+       PolyglossiaName bahasam
        Encoding        iso8859-15
        LangCode        ms_MY
 End
@@ -123,6 +144,7 @@ End
 Language basque
        GuiName         "Basque"
        BabelName       basque
+       PolyglossiaName basque
        Encoding        iso8859-15
        LangCode        eu_ES
 End
@@ -137,6 +159,7 @@ End
 Language brazilian
        GuiName         "Portuguese (Brazil)"
        BabelName       brazil
+       PolyglossiaName brazil
        Encoding        iso8859-15
        LangCode        pt_BR
 End
@@ -144,6 +167,7 @@ End
 Language breton
        GuiName         "Breton"
        BabelName       breton
+       PolyglossiaName breton
        Encoding        iso8859-15
        LangCode        br_FR
 End
@@ -151,6 +175,8 @@ End
 Language british
        GuiName         "English (UK)"
        BabelName       british
+       PolyglossiaName english
+       PolyglossiaOpts variant=british
        Encoding        iso8859-15
        LangCode        en_GB
 End
@@ -158,6 +184,7 @@ End
 Language bulgarian
        GuiName         "Bulgarian"
        BabelName       bulgarian
+       PolyglossiaName bulgarian
        Encoding        cp1251
        LangCode        bg_BG
 End
@@ -165,6 +192,8 @@ End
 Language canadian
        GuiName         "English (Canada)"
        BabelName       canadian
+       # PolyglossiaName english
+       # PolyglossiaOpts variant=canadian
        Encoding        iso8859-15
        LangCode        en_CA
 End
@@ -172,6 +201,8 @@ End
 Language canadien
        GuiName         "French (Canada)"
        BabelName       canadien
+       # PolyglossiaName french
+       # PolyglossiaOpts variant=canadien
        Encoding        iso8859-15
        LangCode        fr_CA
 End
@@ -179,6 +210,8 @@ End
 Language catalan
        GuiName         "Catalan"
        BabelName       catalan
+       PolyglossiaName catalan
+       PolyglossiaOpts babelshorthands=true
        Encoding        iso8859-15
        LangCode        ca_ES
 End
@@ -195,9 +228,16 @@ Language chinese-traditional
        LangCode        zh_CN
 End
 
+Language coptic
+       GuiName         "Coptic"
+       PolyglossiaName coptic
+       LangCode        cop
+End
+
 Language croatian
        GuiName         "Croatian"
        BabelName       croatian
+       PolyglossiaName croatian
        Encoding        iso8859-2
        LangCode        hr_HR
 End
@@ -205,6 +245,7 @@ End
 Language czech
        GuiName         "Czech"
        BabelName       czech
+       PolyglossiaName czech
        Encoding        iso8859-2
        LangCode        cs_CZ
 End
@@ -212,13 +253,22 @@ End
 Language danish
        GuiName         "Danish"
        BabelName       danish
+       PolyglossiaName danish
        Encoding        iso8859-15
        LangCode        da_DK
 End
 
+Language divehi
+       GuiName         "Divehi (Maldivian)"
+       PolyglossiaName divehi
+       LangCode        dv
+End
+
 Language dutch
        GuiName         "Dutch"
        BabelName       dutch
+       PolyglossiaName dutch
+       PolyglossiaOpts babelshorthands=true
        Encoding        iso8859-15
        LangCode        nl_NL
 End
@@ -226,6 +276,7 @@ End
 Language english
        GuiName         "English"
        BabelName       english
+       PolyglossiaName english
        Encoding        iso8859-15
        LangCode        en_US
 End
@@ -234,6 +285,7 @@ End
 Language esperanto
        GuiName         "Esperanto"
        BabelName       esperanto
+       PolyglossiaName esperanto
        Encoding        iso8859-3
        LangCode        eo
 End
@@ -241,6 +293,7 @@ End
 Language estonian
        GuiName         "Estonian"
        BabelName       estonian
+       PolyglossiaName estonian
        Encoding        iso8859-15
        LangCode        et_EE
 End
@@ -250,6 +303,7 @@ End
 Language farsi
        GuiName         "Farsi"
        BabelName       farsi
+       PolyglossiaName farsi
        Encoding        utf8
        RTL             true
        LangCode        fa_IR
@@ -262,6 +316,7 @@ End
 Language finnish
        GuiName         "Finnish"
        BabelName       finnish
+       PolyglossiaName finnish
        Encoding        iso8859-15
        LangCode        fi_FI
 End
@@ -270,6 +325,7 @@ End
 Language french
        GuiName         "French"
        BabelName       french
+       PolyglossiaName french
        Encoding        iso8859-15
        LangCode        fr_FR
        PostBabelPreamble
@@ -283,22 +339,26 @@ End
 Language galician
        GuiName         "Galician"
        BabelName       galician
+       PolyglossiaName galician
        Encoding        iso8859-15
        LangCode        gl_ES
 End
 
-# german does not use a country code (due to the variety)
 Language german
        GuiName         "German (old spelling)"
        BabelName       german
+       PolyglossiaName german
+       PolyglossiaOpts spelling=old,babelshorthands=true
        Encoding        iso8859-15
-       LangCode        de
-       LangVariety     alt
+       LangCode        de_DE_1901
+       # LangVariety     alt
 End
 
 Language ngerman
        GuiName         "German"
        BabelName       ngerman
+       PolyglossiaName german
+       PolyglossiaOpts babelshorthands=true
        Encoding        iso8859-15
        LangCode        de_DE
 End
@@ -306,6 +366,7 @@ End
 Language german-ch
        GuiName         "German (Switzerland)"
        BabelName       ngerman
+       # PolyglossiaName ngerman
        Encoding        iso8859-15
        LangCode        de_CH
 End
@@ -313,6 +374,7 @@ End
 Language greek
        GuiName          "Greek"
        BabelName        greek
+       PolyglossiaName  greek
        Encoding         iso8859-7
        InternalEncoding true
        LangCode         el_GR
@@ -321,6 +383,8 @@ End
 Language polutonikogreek
        GuiName          "Greek (polytonic)"
        BabelName        polutonikogreek
+       PolyglossiaName  greek
+       PolyglossiaOpts  variant=polytonic
        Encoding         iso8859-7
        InternalEncoding true
        LangCode         el_GR
@@ -329,12 +393,19 @@ End
 Language hebrew
        GuiName          "Hebrew"
        BabelName        hebrew
+       PolyglossiaName  hebrew
        Encoding         cp1255
        InternalEncoding true
        RTL              true
        LangCode         he_IL
 End
 
+Language hindi
+       GuiName         "Hindi"
+       PolyglossiaName hindi
+       LangCode        hi
+End
+
 # "hungarian" is a synonym for the "magyar" babel language option
 # "hungarian" might be used for special purposes,
 # see http://www.math.bme.hu/latex/magyar_pre_tug2004.pdf
@@ -348,6 +419,7 @@ End
 Language icelandic
        GuiName         "Icelandic"
        BabelName       icelandic
+       PolyglossiaName icelandic
        Encoding        iso8859-15
        LangCode        is_IS
 End
@@ -356,6 +428,7 @@ End
 Language interlingua
        GuiName         "Interlingua"
        BabelName       interlingua
+       PolyglossiaName interlingua
        Encoding        iso8859-15
        LangCode        ia
 End
@@ -363,6 +436,7 @@ End
 Language irish
        GuiName         "Irish"
        BabelName       irish
+       PolyglossiaName irish
        Encoding        iso8859-15
        LangCode        ga_IE
 End
@@ -370,6 +444,7 @@ End
 Language italian
        GuiName         "Italian"
        BabelName       italian
+       PolyglossiaName italian
        Encoding        iso8859-15
        LangCode        it_IT
 End
@@ -405,10 +480,17 @@ Language korean
        LangCode        ko
 End
 
+Language lao
+       GuiName         "Lao"
+       PolyglossiaName lao
+       LangCode        lo
+End
+
 # there is no country code for Latin because it is a dead language
 Language latin
        GuiName         "Latin"
        BabelName       latin
+       PolyglossiaName latin
        Encoding        iso8859-15
        LangCode        la
 End
@@ -418,6 +500,7 @@ End
 Language latvian
        GuiName         "Latvian"
        BabelName       latvian
+       PolyglossiaName latvian
        Encoding        iso8859-4
        LangCode        lv_LV
        AsBabelOptions  true
@@ -428,6 +511,7 @@ End
 Language lithuanian
        GuiName         "Lithuanian"
        BabelName       lithuanian
+       PolyglossiaName lithuanian
        Encoding        iso8859-13
        LangCode        lt_LT
        AsBabelOptions  true
@@ -436,6 +520,7 @@ End
 Language lowersorbian
        GuiName         "Lower Sorbian"
        BabelName       lowersorbian
+       PolyglossiaName lsorbian
        Encoding        iso8859-2
        LangCode        dsb_DE
 End
@@ -443,15 +528,23 @@ End
 Language magyar
        GuiName         "Hungarian"
        BabelName       magyar
+       PolyglossiaName magyar
        Encoding        iso8859-2
        LangCode        hu_HU
 End
 
+Language marathi
+       GuiName         "Marathi"
+       PolyglossiaName marathi
+       LangCode        mr
+End
+
 # mongolian must be loaded locally with babel options,
 # not globally via class options
 Language mongolian
        GuiName         "Mongolian"
        BabelName       mongolian
+       # PolyglossiaName mongolian
        Encoding        utf8
        LangCode        mn_MN
        AsBabelOptions  true
@@ -460,6 +553,7 @@ End
 Language norsk
        GuiName         "Norsk"
        BabelName       norsk
+       PolyglossiaName norsk
        Encoding        iso8859-15
        LangCode        nb_NO
 End
@@ -467,13 +561,30 @@ End
 Language nynorsk
        GuiName         "Nynorsk"
        BabelName       nynorsk
+       PolyglossiaName nynorsk
        Encoding        iso8859-15
        LangCode        nn_NO
 End
 
+Language occitan
+       GuiName         "Occitan"
+       PolyglossiaName occitan
+       LangCode        oc
+End
+
+# Russian orthography from the Petrine orthographic reforms of
+# 1708 to the 1917 orthographic reform
+# Language oldrussian
+#      GuiName         "Russian (Petrine orthography)"
+#      PolyglossiaName russian
+#      PolyglossiaOpts spelling=old
+#      LangCode        ru_petr1708
+# End
+
 Language polish
        GuiName         "Polish"
        BabelName       polish
+       PolyglossiaName polish
        Encoding        iso8859-2
        LangCode        pl_PL
 End
@@ -481,6 +592,7 @@ End
 Language portuguese
        GuiName         "Portuguese"
        BabelName       portuges
+       PolyglossiaName portuges
        Encoding        iso8859-15
        LangCode        pt_PT
 End
@@ -488,6 +600,7 @@ End
 Language romanian
        GuiName         "Romanian"
        BabelName       romanian
+       PolyglossiaName romanian
        Encoding        iso8859-2
        LangCode        ro_RO
 End
@@ -495,6 +608,7 @@ End
 Language russian
        GuiName         "Russian"
        BabelName       russian
+       PolyglossiaName russian
        Encoding        koi8
        LangCode        ru_RU
 End
@@ -502,13 +616,21 @@ End
 Language samin
        GuiName         "North Sami"
        BabelName       samin
+       PolyglossiaName samin
        Encoding        iso8859-15
        LangCode        se_NO
 End
 
+Language sanskrit
+       GuiName         "Sanskrit"
+       PolyglossiaName sanskrit
+       LangCode        sa
+End
+
 Language scottish
        GuiName         "Scottish"
        BabelName       scottish
+       PolyglossiaName scottish
        Encoding        iso8859-15
        LangCode        gd_GB
 End
@@ -516,6 +638,7 @@ End
 Language serbian
        GuiName         "Serbian"
        BabelName       serbian
+       PolyglossiaName serbian
        Encoding        iso8859-5
        LangCode        sr_RS
 End
@@ -523,6 +646,8 @@ End
 Language serbian-latin
        GuiName         "Serbian (Latin)"
        BabelName       serbian
+       PolyglossiaName serbian
+       PolyglossiaOpts script=latin
        Encoding        iso8859-2
        LangCode        sr_RS
 End
@@ -530,13 +655,15 @@ End
 Language slovak
        GuiName         "Slovak"
        BabelName       slovak
+       PolyglossiaName slovak
        Encoding        iso8859-2
        LangCode        sk_SK
 End
 
 Language slovene
-       GuiName         "Slovene"
+       GuiName         "Slovenian"
        BabelName       slovene
+       PolyglossiaName slovenian
        Encoding        iso8859-2
        LangCode        sl_SI
 End
@@ -544,6 +671,7 @@ End
 Language spanish
        GuiName         "Spanish"
        BabelName       spanish
+       PolyglossiaName spanish
        Encoding        iso8859-15
        LangCode        es_ES
        PostBabelPreamble
@@ -551,9 +679,11 @@ Language spanish
        EndPostBabelPreamble
 End
 
+# there are no spanish shorthands in polyglossia
 Language spanish-mexico
        GuiName         "Spanish (Mexico)"
        BabelName       spanish
+       PolyglossiaName spanish
        Encoding        iso8859-15
        LangCode        es_MX
        PostBabelPreamble
@@ -564,13 +694,34 @@ End
 Language swedish
        GuiName         "Swedish"
        BabelName       swedish
+       PolyglossiaName swedish
        Encoding        iso8859-15
        LangCode        sv_SE
 End
 
+Language syriac
+       GuiName         "Syriac"
+       PolyglossiaName syriac
+       LangCode        syr
+End
+
+Language tamil
+       GuiName         "Tamil"
+       PolyglossiaName tamil
+       LangCode        Taml
+End
+
+Language telugu
+       GuiName         "Telugu"
+       PolyglossiaName telugu
+       LangCode        te
+End
+
+
 Language thai
        GuiName         "Thai"
        BabelName       thai
+       PolyglossiaName thai
        Encoding        tis620-0
        LangCode        th_TH
        PostBabelPreamble
@@ -581,6 +732,7 @@ End
 Language turkish
        GuiName         "Turkish"
        BabelName       turkish
+       PolyglossiaName turkish
        Encoding        iso8859-9
        LangCode        tr_TR
 End
@@ -590,6 +742,7 @@ End
 Language turkmen
        GuiName         "Turkmen"
        BabelName       turkmen
+       PolyglossiaName turkmen
        Encoding        utf8
        LangCode        tk_TM
        AsBabelOptions  true
@@ -598,6 +751,7 @@ End
 Language ukrainian
        GuiName         "Ukrainian"
        BabelName       ukrainian
+       PolyglossiaName ukrainian
        Encoding        koi8-u
        LangCode        uk_UA
 End
@@ -605,16 +759,26 @@ End
 Language uppersorbian
        GuiName         "Upper Sorbian"
        BabelName       uppersorbian
+       PolyglossiaName usorbian
        Encoding        iso8859-2
        LangCode        hsb_DE
 End
 
+Language urdu
+       GuiName         "Urdu"
+       PolyglossiaName urdu
+       LangCode        ur
+End
+
+
+
 # vietnam must be loaded locally with babel options,
 # not globally via class options, see
 # http://www.mail-archive.com/lyx-de...@lists.lyx.org/msg129417.html
 Language vietnamese
        GuiName         "Vietnamese"
        BabelName       vietnam
+       PolyglossiaName vietnamese
        Encoding        utf8
        LangCode        vi_VN
        AsBabelOptions  true
@@ -623,6 +787,7 @@ End
 Language welsh
        GuiName         "Welsh"
        BabelName       welsh
+       PolyglossiaName welsh
        Encoding        iso8859-15
        LangCode        cy_GB
 End

Reply via email to