From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id iAE3IWyj/WQuggAAauVa8A:P1 (envelope-from ) for ; Sun, 10 Sep 2023 13:07:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iAE3IWyj/WQuggAAauVa8A (envelope-from ) for ; Sun, 10 Sep 2023 13:07:24 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9D76C88F3 for ; Sun, 10 Sep 2023 13:07:23 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=posteo.net header.s=2017 header.b=T2PbG03y; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=posteo.net ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1694344044; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=WfjNFGwcTNPjg+yFl4DSpcO5UOO+9njysgYdZyGqnPQ=; b=Gb/Xwno2bYmVzbvXOVf4IyghG/ZhLAEi+846tQz3/1nI5CL/kH5xRAI32bFE53xuOeDGCU G9x2Jq1ylUuOLBBaVF/XsMTZ+pqBvmBwMmXMriB/7CSYpROf5e2wjkTqvCN3fcKKja8Bf8 AvAZqucHg6xslbX/8OSU1F7jfxK+XcjbmSxz3fXbRnv3cF8VlFPxWXGtGTXyZxLnQ4A5Kx mmnHOGuX1skeTHezTXwErSKZYwrdDBfsWhzwdA8pplfCUJhu7+58Jptzt4NL7LbtQ+srCb elkLFvsj5IGjbGB3E0B3h10wmbWnqtHWyYvNzwUbOCfqrjAVwj4/UcenxFYLcQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1694344044; a=rsa-sha256; cv=none; b=Vu8fhvG9BrXk/4CSm9RG+fFU5IGlByvuom0Nf7uu/SeqH41ESyYZLexdLtOR9Mo3JaC+sd cND5oqwoeeaD9fiblrdbvrxb1r96Mhw4tjPnqsQJTMdULxQbJqNT086Y70ZxiLTDbeC6Ld qDIql04rbeCYO0pAEheXOeSVM0qg/ntdJz8BmbqMyBtWIwjQYngx33dRKGsGrT0Kb1VJP7 u0I+E692y+AgEMPM8HcjdmZcEcqkC5eIZ5bwyuS4gu4CatbKNyyNvKpLCLELzamcjYTUTl XjM+3Ww0hy4ZP84vJ+BYcGKsxNAEeJatc3UgRVwEvGiVbvViRQ9Ttwh9p8kspw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=posteo.net header.s=2017 header.b=T2PbG03y; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=posteo.net Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfIGm-00026x-UR; Sun, 10 Sep 2023 07:06:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qfIGk-00026b-Ik for emacs-orgmode@gnu.org; Sun, 10 Sep 2023 07:06:22 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qfIGf-0005ud-PR for emacs-orgmode@gnu.org; Sun, 10 Sep 2023 07:06:22 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2F22C240028 for ; Sun, 10 Sep 2023 13:06:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694343975; bh=XXBgY6cVBh4Srj39GMAUgN0FgHS6Tg/7e9IKn9eLolc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:From; b=T2PbG03ySO93gFQK9nwREdCiAfKrh6GajDFTg5W4gFLsWcNyGuWa5t4eDBlkNeKTu 7BuesFfWAWgeaqMSJtf2AkvPw3y4rir8QyIYtR9QTRNtTjiCITqbnnfg0FAo29OIiC FOYWJfJnYyi5uhBK/0EocZgUzojOBU30x9XsYtbCiDHebou7cZKp0WdtV6FYq0yOAt 3itXmLUhnfHSOVVaio670LpZHMqFR+hOGlnUqvn2ngxZ6IuXuA68Nc6BAkGdkTAm5j RpQLVuDpclEAzoOoR8HHS3bF6n6TdKflYybQTixyUYE7cyT8OXyfdaRX7zzajmyWEZ Y5TWHPCvw1SqQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Rk6Tr5phDz6tsg; Sun, 10 Sep 2023 13:06:08 +0200 (CEST) From: =?utf-8?Q?Juan_Manuel_Mac=C3=ADas?= To: Ihor Radchenko Cc: emacs-orgmode@gnu.org, Max Nikulin Subject: Re: [patch] Fixes and improvements in org-latex-language-alist In-Reply-To: <87o7iajwch.fsf@localhost> (Ihor Radchenko's message of "Sun, 10 Sep 2023 07:55:42 +0000") References: <87v8cneyfu.fsf@posteo.net> <87edjanqxb.fsf@localhost> <87o7ieukum.fsf@posteo.net> <877cp0ybdg.fsf@posteo.net> <8734zoxzd0.fsf_-_@posteo.net> <87tts37lsx.fsf@localhost> <87msxvzl9o.fsf@posteo.net> <87a5tv7f9n.fsf@localhost> <878r9ezyn1.fsf@posteo.net> <87o7iajwch.fsf@localhost> Date: Sun, 10 Sep 2023 11:06:06 +0000 Message-ID: <877coywan5.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=185.67.36.65; envelope-from=maciaschain@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -2.81 X-Spam-Score: -2.81 X-Migadu-Queue-Id: 9D76C88F3 X-TUID: xHasJtL9fXdG --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ihor Radchenko writes: > It is not that complex, really. I suggested the above approach because: > 1. It is easy to read - clearly, ,@de-plist and ,@de-plist are the same > thing. > 2. If we ever need to change de-plist, we should only do it in a single > place. The fact of avoiding copy/paste is already an advantage. New patch attached with your suggestions. I have simply modified the variable name a little. de-plist may seem a bit confusing, because there is also de-at (Austrian German). I have set de-default-plist, since for babel and polyglossia German (de) and German from Germany (de-de) are the default variant. The same with the case of the Chinese (Chinese =3D Chinese Simplified). --=20 Juan Manuel Mac=C3=ADas https://juanmanuelmacias.com https://lunotipia.juanmanuelmacias.com https://gnutas.juanmanuelmacias.com --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-ox-latex.el-Fixes-and-improvements-in-org-latex-lang.patch Content-Transfer-Encoding: quoted-printable >From 73057fc06990f861468c397c94b7076d025acbc8 Mon Sep 17 00:00:00 2001 From: Juan Manuel Macias Date: Fri, 8 Sep 2023 19:33:25 +0200 Subject: [PATCH] ox-latex.el: Fixes and improvements in `org-latex-language-alist'. * (org-latex-language-alist): Fix a language code (`de-de') removed when `org-latex-babel-language-alist' and `org-latex-polyglossia-language-alist' were merged. To allow language codes that can have a similar translation in `babel' or `polyglossia' now in each element of `org-latex-language-alist' car can also be a list of language codes. New admitted properties: `:babel-ini-alt', `:script' and `:script-tag'. Add language code for ancient Greek. Fix Afrikaans (was previously removed). New languages: Chinese Simplified and Traditional. Correction of some typos, errors and inaccuracies. `let' bindings suggested by Ihor Radchenko. * (org-latex-guess-babel-language): Some necessary modifications. --- lisp/ox-latex.el | 197 ++++++++++++++++++++++++++--------------------- 1 file changed, 109 insertions(+), 88 deletions(-) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 241ef603a..14105c7cc 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -177,94 +177,105 @@ ;;; Internal Variables =20 (defconst org-latex-language-alist - '(("am" :babel-ini-only "amharic" :polyglossia "amharic" :lang-name "Amh= aric") - ("ar" :babel "arabic" :polyglossia "arabic" :lang-name "Arabic") - ("ast" :babel-ini-only "asturian" :polyglossia "asturian" :lang-name "= Asturian") - ("bg" :babel "bulgarian" :polyglossia "bulgarian" :lang-name "Bulgari= an") - ("bn" :babel-ini-only "bengali" :polyglossia "bengali" :lang-name "Be= ngali") - ("bo" :babel-ini-only "tibetan" :polyglossia "tibetan" :lang-name "Ti= betan") - ("br" :babel "breton" :polyglossia "breton" :lang-name "Breton") - ("ca" :babel "catalan" :polyglossia "catalan" :lang-name "Catalan") - ("cop" :babel-ini-only "coptic" :polyglossia "coptic" :lang-name "Cop= tic") - ("cs" :babel "czech" :polyglossia "czech" :lang-name "Czech") - ("cy" :babel "welsh" :polyglossia "welsh" :lang-name "Welsh") - ("da" :babel "danish" :polyglossia "danish" :lang-name "Danish") - ("de" :babel "ngerman" :polyglossia "german" :polyglossia-variant "ge= rman" :lang-name "German") - ("de-at" :babel "naustrian" :polyglossia "german" :polyglossia-varian= t "austrian" :lang-name "German") - ("dsb" :babel "lsorbian" :polyglossia "sorbian" :polyglossia-variant = "lower" :lang-name "Lower Sorbian") - ("dv" :babel-ini-only "divehi" :polyglossia "divehi" :lang-name "Dive= hi") - ("el" :babel "greek" :polyglossia "greek" :lang-name "Greek") - ("el-polyton" :babel "polutonikogreek" :polyglossia "greek" :polyglos= sia-variant "polytonic" :lang-name "Polytonic Greek") - ("en" :babel "american" :polyglossia "english" :polyglossia-variant "= usmax" :lang-name "English") - ("en-au" :babel "australian" :polyglossia "english" :polyglossia-vari= ant "australian" :lang-name "English") - ("en-gb" :babel "british" :polyglossia "english" :polyglossia-variant= "uk" :lang-name "English") - ("en-nz" :babel "newzealand" :polyglossia "english" :polyglossia-vari= ant "newzealand" :lang-name "English") - ("en-us" :babel "american" :polyglossia "english" :polyglossia-varian= t "usmax" :lang-name "English") - ("eo" :babel "esperanto" :polyglossia "esperanto" :lang-name "Esperan= to") - ("es" :babel "spanish" :polyglossia "spanish" :lang-name "Spanish") - ("es-mx" :babel "spanishmx" :polyglossia "spanish" :polyglossia-varia= nt "mexican" :lang-name "Spanish") - ("et" :babel "estonian" :polyglossia "estonian" :lang-name "Estonian") - ("eu" :babel "basque" :polyglossia "basque" :lang-name "Basque") - ("fa" :babel "farsi" :polyglossia "farsi" :lang-name "Farsi") - ("fi" :babel "finnish" :polyglossia "finnish" :lang-name "Finnish") - ("fr" :babel "french" :polyglossia "french" :lang-name "French") - ("fr-ca" :babel "canadien" :polyglossia "french" :polyglossia-variant= "canadian" :lang-name "French") - ("fur" :babel "friulan" :polyglossia "friulan" :lang-name "Friulian") - ("ga" :babel "irish" :polyglossia "irish" :lang-name "Irish") - ("gd" :babel "scottish" :polyglossia "scottish" :lang-name "Scottish = Gaelic") - ("gl" :babel "galician" :polyglossia "galician" :lang-name "Galician") - ("he" :babel "hebrew" :polyglossia "hebrew" :lang-name "Hebrew") - ("hi" :babel "hindi" :polyglossia "hindi" :lang-name "Hindi") - ("hr" :babel "croatian" :polyglossia "croatian" :lang-name "Croatian") - ("hsb" :babel "uppersorbian" :polyglossia "sorbian" :polyglossia-vari= ant "upper" :lang-name "Upper Sorbian") - ("hu" :babel "magyar" :polyglossia "magyar" :lang-name "Magyar") - ("hy" :babel-ini-only "armenian" :polyglossia "armenian" :lang-name "= Armenian") - ("ia" :babel "interlingua" :polyglossia "interlingua" :lang-name "Int= erlingua") - ("id" :babel-ini-only "bahasai" :polyglossia "bahasai" :lang-name "Ba= hasai") - ("is" :babel "icelandic" :polyglossia "icelandic" :lang-name "Iceland= ic") - ("it" :babel "italian" :polyglossia "italian" :lang-name "Italian") - ("kn" :babel-ini-only "kannada" :polyglossia "kannada" :lang-name "Ka= nnada") - ("la" :babel "latin" :polyglossia "latin" :lang-name "Latin") - ("la-classic" :babel "classiclatin" :polyglossia "latin" :polyglossia= -variant "classic" :lang-name "Classic Latin") - ("la-medieval" :babel "medievallatin" :polyglossia "latin" :polygloss= ia-variant "medieval" :lang-name "Medieval Latin") - ("la-ecclesiastic" :babel "ecclesiasticlatin" :polyglossia "latin" :p= olyglossia-variant "ecclesiastic" :lang-name "Ecclesiastic Latin") - ("lo" :babel-ini-only "lao" :polyglossia "lao" :lang-name "Lao") - ("lt" :babel "lithuanian" :polyglossia "lithuanian" :lang-name "Lithu= anian") - ("lv" :babel "latvian" :polyglossia "latvian" :lang-name "Latvian") - ("ml" :babel-ini-only "malayalam" :polyglossia "malayalam" :lang-name= "Malayalam") - ("mr" :babel-ini-only "maranthi" :polyglossia "maranthi" :lang-name "= Maranthi") - ("nb" :babel "norsk" :polyglossia "norwegian" :polyglossia-variant "b= okmal" :lang-name "Norwegian Bokm=C3=A5l") - ("nl" :babel "dutch" :polyglossia "dutch" :lang-name "Dutch") - ("nn" :babel "nynorsk" :polyglossia "norwegian" :polyglossia-variant = "nynorsk" :lang-name "Norwegian Nynorsk") - ("no" :babel "norsk" :polyglossia "norsk" :lang-name "Norwegian") - ("oc" :babel "occitan" :polyglossia "occitan" :lang-name "Occitan") - ("pl" :babel "polish" :polyglossia "polish" :lang-name "Polish") - ("pms" :babel "piedmontese" :polyglossia "piedmontese" :lang-name "Pi= edmontese") - ("pt" :babel "portuges" :polyglossia "portuges" :lang-name "Portuges") - ("pt-br" :babel "brazilian" :polyglossia "brazilian" :lang-name "Port= uges") - ("rm" :babel-ini-only "romansh" :polyglossia "romansh" :lang-name "Ro= mansh") - ("ro" :babel "romanian" :polyglossia "romanian" :lang-name "Romanian") - ("ru" :babel "russian" :polyglossia "russian" :lang-name "Russian") - ("sa" :babel-ini-only "sanskrit" :polyglossia "sanskrit" :lang-name "= Sanskrit") - ("sk" :babel "slovak" :polyglossia "slovak" :lang-name "Slovak") - ("sl" :babel "slovene" :polyglossia "slovene" :lang-name "Slovene") - ("sq" :babel "albanian" :polyglossia "albanian" :lang-name "Albanian") - ("sr" :babel "serbian" :polyglossia "serbian" :lang-name "Serbian") - ("sv" :babel "swedish" :polyglossia "swedish" :lang-name "Swedish") - ("syr" :babel-ini-only "syriac" :polyglossia "syriac" :lang-name "Syr= iac") - ("ta" :babel-ini-only "tamil" :polyglossia "tamil" :lang-name "Tamil") - ("te" :babel-ini-only "telugu" :polyglossia "telugu" :lang-name "Telu= gu") - ("th" :babel "thai" :polyglossia "thai" :lang-name "Thai") - ("tk" :babel "turkmen" :polyglossia "turkmen" :lang-name "Turkmen") - ("tr" :babel "turkish" :polyglossia "turkish" :lang-name "Turkish") - ("uk" :babel "ukrainian" :polyglossia "ukrainian" :lang-name "Ukraini= an") - ("ur" :babel-ini-only "urdu" :polyglossia "urdu" :lang-name "Urdu") - ("vi" :babel "vietnamese" :polyglossia "vietnamese" :lang-name "Vietn= amese")) + (let ((de-default-plist '(:babel "ngerman" :babel-ini-alt "german" :poly= glossia "german" :polyglossia-variant "german" :lang-name "German" :script = "latin" :script-tag "latn")) + (zh-default-plist '(:babel-ini-only "chinese" :polyglossia "chines= e" :polyglossia-variant "simplified" :lang-name "Chinese Simplified" :scrip= t "hans" :script-tag "hans"))) + `(("af" :babel "afrikaans" :polyglossia "afrikaans" :lang-name "Afrika= ans" :script "latin" :script-tag "latn") + ("am" :babel-ini-only "amharic" :polyglossia "amharic" :lang-name "A= mharic" :script "ethiopic" :script-tag "ethi") + ("ar" :babel-ini-only "arabic" :polyglossia "arabic" :lang-name "Ara= bic" :script "arabic" :script-tag "arab") + ("ast" :babel-ini-only "asturian" :polyglossia "asturian" :lang-name= "Asturian" :script "latin" :script-tag "latn") + ("bg" :babel "bulgarian" :polyglossia "bulgarian" :lang-name "Bulga= rian" :script "cyrillic" :script-tag "cyrl") + ("bn" :babel-ini-only "bengali" :polyglossia "bengali" :lang-name "= Bengali" :script "bengali" :script-tag: "beng") + ("bo" :babel-ini-only "tibetan" :polyglossia "tibetan" :lang-name "= Tibetan" :script "tibetan" :script-tag "tib") + ("br" :babel "breton" :polyglossia "breton" :lang-name "Breton" :sc= ript "latin" :script-tag "latn") + ("ca" :babel "catalan" :polyglossia "catalan" :lang-name "Catalan" = :script "latin" :script-tag "latn") + ("cop" :babel-ini-only "coptic" :polyglossia "coptic" :lang-name "C= optic" :script "coptic" :script-tag "copt") + ("cs" :babel "czech" :polyglossia "czech" :lang-name "Czech" :scrip= t "latin" :script-tag "latn") + ("cy" :babel "welsh" :polyglossia "welsh" :lang-name "Welsh" :scrip= t "latin" :script-tag "latn") + ("da" :babel "danish" :polyglossia "danish" :lang-name "Danish" :sc= ript "latin" :script-tag "latn") + ("de" ,@de-default-plist) + ("de-de" ,@de-default-plist) + ("de-at" :babel "naustrian" :babel-ini-alt "german-austria" :polyglo= ssia "german" :polyglossia-variant "austrian" :lang-name "German" :script "= latin" :script-tag "latn") + ("dsb" :babel "lowersorbian" :babel-ini-alt "lsorbian" :polyglossia = "sorbian" :polyglossia-variant "lower" :lang-name "Lower Sorbian" :script "= latin" :script-tag "latn") + ("dv" :polyglossia "divehi" :lang-name "Dhivehi" :script "latin" :sc= ript-tag "latn") + ("el" :babel "greek" :polyglossia "greek" :lang-name "Greek" :script= "greek" :script-tag "grek") + ("el-polyton" :babel "polutonikogreek" :babel-ini-alt "polytonicgre= ek" :polyglossia "greek" :polyglossia-variant "polytonic" :lang-name "Polyt= onic Greek" :script "greek" :script-tag "grek") + ("grc" :babel "greek.ancient" :babel-ini-alt "ancientgreek" :polyglo= ssia "greek" :polyglossia-variant "ancient" :lang-name "Ancient Greek" :scr= ipt "greek" :script-tag "grek") + ("en" :babel "english" :polyglossia "english" :polyglossia-variant "= usmax" :lang-name "English" :script "latin" :script-tag "latn") + ("en-au" :babel "australian" :polyglossia "english" :polyglossia-var= iant "australian" :lang-name "English" :script "latin" :script-tag "latn") + ("en-ca" :babel "canadian" :polyglossia "english" :polyglossia-varia= nt "canadian" :lang-name "English" :script "latin" :script-tag "latn") + ("en-gb" :babel "british" :polyglossia "english" :polyglossia-varian= t "uk" :lang-name "English" :script "latin" :script-tag "latn") + ("en-nz" :babel "newzealand" :polyglossia "english" :polyglossia-var= iant "newzealand" :lang-name "English" :script "latin" :script-tag "latn") + ("en-us" :babel "american" :polyglossia "english" :polyglossia-varia= nt "usmax" :lang-name "English" :script "latin" :script-tag "latn") + ("eo" :babel "esperanto" :polyglossia "esperanto" :lang-name "Espera= nto" :script "latin" :script-tag "latn") + ("es" :babel "spanish" :polyglossia "spanish" :lang-name "Spanish" := script "latin" :script-tag "latn") + ("es-mx" :babel "spanishmx" :polyglossia "spanish" :polyglossia-vari= ant "mexican" :lang-name "Spanish" :script "latin" :script-tag "latn") + ("et" :babel "estonian" :polyglossia "estonian" :lang-name "Estonian= " :script "latin" :script-tag "latn") + ("eu" :babel "basque" :polyglossia "basque" :lang-name "Basque" :scr= ipt "latin" :script-tag "latn") + ("fa" :babel "persian" :polyglossia "persian" :lang-name "Persian" := script "arabic" :script-tag "arab") + ("fi" :babel "finnish" :polyglossia "finnish" :lang-name "Finnish" := script "latin" :script-tag "latn") + ("fr" :babel "french" :polyglossia "french" :lang-name "French" :scr= ipt "latin" :script-tag "latn") + ("fr-ca" :babel "canadien" :babel-ini-alt "canadian" :polyglossia "f= rench" :polyglossia-variant "canadian" :lang-name "French" :script "latin" = :script-tag "latn") + ("fur" :babel "friulian" :polyglossia "friulian" :lang-name "Friulia= n" :script "latin" :script-tag "latn") + ("ga" :babel "irish" :polyglossia "gaelic" :polyglossia-variant "iri= sh" :lang-name "Irish Gaelic" :script "latin" :script-tag "latn") + ("gd" :babel "scottish" :polyglossia "gaelic" :polyglossia-variant "= scottish" :lang-name "Scottish Gaelic" :script "latin" :script-tag "latn") + ("gl" :babel "galician" :polyglossia "galician" :lang-name "Galician= " :script "latin" :script-tag "latn") + ("he" :babel "hebrew" :polyglossia "hebrew" :lang-name "Hebrew" :scr= ipt "hebrew" :script-tag "hebr") + ("hi" :babel "hindi" :polyglossia "hindi" :lang-name "Hindi" :script= "devanagari" :script-tag "deva") + ("hr" :babel "croatian" :polyglossia "croatian" :lang-name "Croatian= " :script "latin" :script-tag "latn") + ("hsb" :babel "uppersorbian" :polyglossia "sorbian" :polyglossia-var= iant "upper" :lang-name "Upper Sorbian" :script "latin" :script-tag "latn") + ("hu" :babel "magyar" :polyglossia "magyar" :lang-name "Magyar" :scr= ipt "latin" :script-tag "latn") + ("hy" :babel-ini-only "armenian" :polyglossia "armenian" :lang-name = "Armenian" :script "armenian" :script-tag "armn") + ("ia" :babel "interlingua" :polyglossia "interlingua" :lang-name "In= terlingua" :script "latin" :script-tag "latn") + ("id" :babel "indonesian" :polyglossia "malay" :polyglossia-variant = "indonesian" :lang-name "Indonesian" :script "latin" :script-tag "latn") + ("is" :babel "icelandic" :polyglossia "icelandic" :lang-name "Icelan= dic" :script "latin" :script-tag "latn") + ("it" :babel "italian" :polyglossia "italian" :lang-name "Italian" := script "latin" :script-tag "latn") + ("kn" :babel-ini-only "kannada" :polyglossia "kannada" :lang-name "K= annada" :script "kannada" :script-tag "knda") + ("la" :babel "latin" :polyglossia "latin" :lang-name "Latin" :script= "latin" :script-tag "latn") + ("la-classic" :babel "classiclatin" :polyglossia "latin" :polygloss= ia-variant "classic" :lang-name "Classic Latin" :script "latin" :script-tag= "latn") + ("la-medieval" :babel "medievallatin" :polyglossia "latin" :polyglo= ssia-variant "medieval" :lang-name "Medieval Latin" :script "latin" :script= -tag "latn") + ("la-ecclesiastic" :babel "ecclesiasticlatin" :polyglossia "latin" = :polyglossia-variant "ecclesiastic" :lang-name "Ecclesiastic Latin" :script= "latin" :script-tag "latn") + ("lo" :babel-ini-only "lao" :polyglossia "lao" :lang-name "Lao" :scr= ipt "lao" :script-tag "lao") + ("lt" :babel "lithuanian" :polyglossia "lithuanian" :lang-name "Lith= uanian" :script "latin" :script-tag "latn") + ("lv" :babel "latvian" :polyglossia "latvian" :lang-name "Latvian" := script "latin" :script-tag "latn") + ("ml" :babel-ini-only "malayalam" :polyglossia "malayalam" :lang-nam= e "Malayalam" :script "malayalam" :script-tag "mlym") + ("mr" :babel-ini-only "marathi" :polyglossia "marathi" :lang-name "M= arathi" :script "devanagari" :script-tag "deva") + ("ms" :babel "malay" :polyglossia "malay" :polyglossia-variant "mala= ysian" :lang-name "Malay" :script "latin" :script-tag "latn") + ("nb" :babel "norsk" :polyglossia "norwegian" :polyglossia-variant "= bokmal" :lang-name "Norwegian Bokm=C3=A5l" :script "latin" :script-tag "lat= n") + ("nl" :babel "dutch" :polyglossia "dutch" :lang-name "Dutch" :script= "latin" :script-tag "latn") + ("nn" :babel "nynorsk" :polyglossia "norwegian" :polyglossia-variant= "nynorsk" :lang-name "Norwegian Nynorsk" :script "latin" :script-tag "latn= ") + ("no" :babel "norsk" :polyglossia "norsk" :lang-name "Norwegian" :sc= ript "latin" :script-tag "latn") + ("oc" :babel "occitan" :polyglossia "occitan" :lang-name "Occitan" := script "latin" :script-tag "latn") + ("pl" :babel "polish" :polyglossia "polish" :lang-name "Polish" :scr= ipt "latin" :script-tag "latn") + ("pms" :babel "piedmontese" :polyglossia "piedmontese" :lang-name "P= iedmontese" :script "latin" :script-tag "latn") + ("pt" :babel "portuges" :polyglossia "portuges" :lang-name "Portuge= s" :script "latin" :script-tag "latn") + ("pt-br" :babel "brazilian" :polyglossia "brazilian" :lang-name "Por= tuges" :script "latin" :script-tag "latn") + ("rm" :babel-ini-only "romansh" :polyglossia "romansh" :lang-name "R= omansh" :script "latin" :script-tag "latn") + ("ro" :babel "romanian" :polyglossia "romanian" :lang-name "Romanian= " :script "latin" :script-tag "latn") + ("ru" :babel "russian" :polyglossia "russian" :lang-name "Russian" := script "cyrillic" :script-tag "cyrl") + ("sa" :babel-ini-only "sanskrit" :polyglossia "sanskrit" :lang-name = "Sanskrit" :script "devanagari" :script-tag "deva") + ("sk" :babel "slovak" :polyglossia "slovak" :lang-name "Slovak" :scr= ipt "latin" :script-tag "latn") + ("sl" :babel "slovene" :polyglossia "slovene" :lang-name "Slovene" := script "latin" :script-tag "latn") + ("sq" :babel "albanian" :polyglossia "albanian" :lang-name "Albanian= " :script "latin" :script-tag "latn") + ("sr" :babel "serbian" :polyglossia "serbian" :lang-name "Serbian" := script "latin" :script-tag "latn") + ("sr-cyrl" :babel-ini-only "serbian-cyrl" :polyglossia "serbian" :la= ng-name "Serbian" :script "cyrillic" :script-tag "cyrl") + ("sr-latn" :babel-ini-only "serbian-latin" :polyglossia "serbian" :l= ang-name "Serbian" :script "latin" :script-tag "latn") + ("sv" :babel "swedish" :polyglossia "swedish" :lang-name "Swedish" = :script "latin" :script-tag "latn") + ("syr" :babel-ini-only "syriac" :polyglossia "syriac" :lang-name "Sy= riac" :script "syriac" :script-tag "syrc") + ("ta" :babel-ini-only "tamil" :polyglossia "tamil" :lang-name "Tamil= " :script "tamil" :script-tag "taml") + ("te" :babel-ini-only "telugu" :polyglossia "telugu" :lang-name "Tel= ugu" :script "telugu" :script-tag "telu") + ("th" :babel "thai" :polyglossia "thai" :lang-name "Thai" :script "t= hai" :script-tag "thai") + ("tk" :babel "turkmen" :polyglossia "turkmen" :lang-name "Turkmen" := script "latin" :script-tag "latn") + ("tr" :babel "turkish" :polyglossia "turkish" :lang-name "Turkish" := script "latin" :script-tag "latn") + ("uk" :babel "ukrainian" :polyglossia "ukrainian" :lang-name "Ukrain= ian" :script "cyrillic" :script-tag "cyrl") + ("ur" :babel-ini-only "urdu" :polyglossia "urdu" :lang-name "Urdu" := script "arabic" :script-tag "arab") + ("vi" :babel "vietnamese" :polyglossia "vietnamese" :lang-name "Viet= namese" :script "latin" :script-tag "latn") + ("zh" ,@zh-default-plist) + ("zh-cn" ,@zh-default-plist) + ("zh-tw" :babel-ini-only "chinese-traditional" :polyglossia "chinese= " :polyglossia-variant "traditional" :lang-name "Chinese Traditional" :scri= pt "hant" :script-tag "hant"))) "Alist between language code and its properties for LaTeX export. =20 -In each element of the list car is always the code of the -language and cdr is a property list. Valid keywords for this -list can be: +In each element of the list car is always the language code and +cdr is a property list. Valid keywords for this list can be: =20 - `:babel' the name of the language loaded by the Babel LaTeX package =20 @@ -275,9 +286,17 @@ list can be: exclusively through the new ini files method. See `http://mirrors.ctan.org/macros/latex/required/babel/base/babel.pdf' =20 +- `:babel-ini-alt' an alternative language name when it is loaded + using ini files + - `:polyglossia-variant' the language variant loaded by Polyglossia =20 -- `:lang-name' the actual name of the language.") +- `:lang-name' the actual name of the language + +- `:script' the script name + +- `:script-tag' the script otf tag.") + =20 (defconst org-latex-line-break-safe "\\\\[0pt]" "Linebreak protecting the following [...]. @@ -1660,6 +1679,7 @@ Return the new header." (assoc language-code org-latex-language-alist))) (language (plist-get plist :babel)) (language-ini-only (plist-get plist :babel-ini-only)) + (language-ini-alt (plist-get plist :babel-ini-alt)) ;; If no language is set, or Babel package is not loaded, or ;; LANGUAGE keyword value is a language served by Babel ;; exclusively through ini files, return HEADER as-is. @@ -1691,7 +1711,8 @@ Return the new header." (replace-regexp-in-string (format "\\(\\\\babelprovide\\[.*\\]\\)\\({\\)%s}" prov) (format "\\1\\2%s}" - (or language language-ini-only)) + (if language-ini-alt language-ini-alt + (or language language-ini-= only))) header t) header))))) =20 --=20 2.42.0 --=-=-=--