* [PATCH] ox-latex.el: `org-latex-language-alist' improved
@ 2022-07-31 1:00 Juan Manuel Macías
2022-08-03 11:23 ` Ihor Radchenko
0 siblings, 1 reply; 7+ messages in thread
From: Juan Manuel Macías @ 2022-07-31 1:00 UTC (permalink / raw)
To: orgmode
[-- Attachment #1: Type: text/plain, Size: 666 bytes --]
Hi,
I've managed to get some free time to remake this list, following Maxim
Nikulin's suggestion
(https://list.orgmode.org/orgmode/taeb0a$r62$1@ciao.gmane.io/). It's no
longer an anonymous list and I agree it now has a more robust structure
with name fields. I have also added the `:lang-name' property, whose
value is the actual language name. For example:
("el-polyton" . (:babel "polutonikogreek" :polyglossia "greek"
:polyglossia-variant "polytonic" :lang-name "Polytonic Greek"))
Thanks to this I think the code for org-latex-guess-babel-language,
org-latex-guess-polyglossia-language and org-latex--format-spec is also
simpler.
Best regards,
Juan Manuel
[-- Attachment #2: 0001-lisp-ox-latex.el-org-latex-language-alist-improved.patch --]
[-- Type: text/x-patch, Size: 18752 bytes --]
From b06cdd45198f470a135efad2cd1d8b22ab7e2f22 Mon Sep 17 00:00:00 2001
From: Juan Manuel Macias <maciaschain@posteo.net>
Date: Sun, 31 Jul 2022 02:31:08 +0200
Subject: [PATCH] lisp/ox-latex.el: `org-latex-language-alist' improved.
* (org-latex-language-alist): Alist between language code and
corresponding properties, such as Babel/Polyglossia options and
language names. Each element of the list consists of a cons cell,
where car is the language code and cdr is a property list.
* (org-latex-guess-babel-language): Modified to adapt the function to
the new structure of `org-latex-language-alist'.
* (org-latex-guess-polyglossia-language): Modified to adapt the function to
the new structure of `org-latex-language-alist'.
* (org-latex--format-spec): Modified to adapt the function to
the new structure of `org-latex-language-alist'.
---
lisp/ox-latex.el | 287 +++++++++++++++++++++++------------------------
1 file changed, 138 insertions(+), 149 deletions(-)
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index c56f9d347..669458913 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -173,110 +173,106 @@
;;; Internal Variables
(defconst org-latex-language-alist
- ;; TODO: replace this list with a property list (the actual
- ;; implementation is not very robust).
- '(("am" "amharic" "*")
- ("ar" "arabic")
- ("ast" "asturian" "*")
- ("bg" "bulgarian")
- ("bn" "bengali" "*")
- ("bo" "tibetan" "*")
- ("br" "breton")
- ("ca" "catalan")
- ("cop" "coptic" "*")
- ("cs" "czech")
- ("cy" "welsh")
- ("da" "danish")
- ("de" "ngerman" "german" "german")
- ("de-at" "naustrian" "german" "austrian")
- ("dsb" "lsorbian" "*")
- ("dv" "divehi" "*")
- ("el" "greek")
- ("el-polyton" "polutonikogreek" "greek" "polytonic")
- ("en" "american" "english" "usmax")
- ("en-au" "australian" "english" "australian")
- ("en-gb" "british" "english" "uk")
- ("en-nz" "newzealand" "english" "newzealand")
- ("en-us" "american" "english" "usmax")
- ("eo" "esperanto")
- ("es" "spanish")
- ("es-mx" "spanishmx" "spanish" "mexican")
- ("et" "estonian")
- ("eu" "basque")
- ("fa" "farsi")
- ("fi" "finnish")
- ("fr" "french")
- ("fr-ca" "canadien" "french" "canadian")
- ("fur" "friulan")
- ("ga" "irish")
- ("gd" "scottish")
- ("gl" "galician")
- ("he" "hebrew")
- ("hi" "hindi")
- ("hr" "croatian")
- ("hsb" "uppersorbian" "sorbian" "upper")
- ("hu" "magyar")
- ("hy" "armenian" "*")
- ("ia" "interlingua")
- ("id" "bahasai" "*")
- ("is" "icelandic")
- ("it" "italian")
- ("kn" "kannada" "*")
- ("la" "latin")
- ("la-classic" "classiclatin" "latin" "classic")
- ("la-medieval" "medievallatin" "latin" "medieval")
- ("la-ecclesiastic" "ecclesiasticlatin" "latin" "ecclesiastic")
- ("lo" "lao" "*")
- ("lt" "lithuanian")
- ("lv" "latvian")
- ("ml" "malayalam" "*")
- ("mr" "maranthi" "*")
- ("nb" "norsk" "norwegian" "bokmal")
- ("nl" "dutch")
- ("nn" "nynorsk" "norwegian" "nynorsk")
- ("no" "norsk")
- ("oc" "occitan")
- ("pl" "polish")
- ("pms" "piedmontese")
- ("pt" "portuges")
- ("pt-br" "brazilian")
- ("rm" "romansh" "*")
- ("ro" "romanian")
- ("ru" "russian")
- ("sa" "sanskrit" "*")
- ("sk" "slovak")
- ("sl" "slovene")
- ("sq" "albanian")
- ("sr" "serbian")
- ("sv" "swedish")
- ("syr" "syriac" "*")
- ("ta" "tamil" "*")
- ("te" "telugu" "*")
- ("th" "thai")
- ("tk" "turkmen")
- ("tr" "turkish")
- ("uk" "ukrainian")
- ("ur" "urdu" "*")
- ("vi" "vietnamese"))
- "Alist between language code and corresponding Babel/Polyglossia option.
-
-For the names of the languages, the Babel nomenclature is
-preferred to that of Polyglossia, in those cases where both
-coincide.
-
-The alist supports three types of members:
-
-- Members with two elements: CODE BABEL/POLYGLOSSIA OPTION.
-
-- Members with three elements: CODE BABEL/POLYGLOSSIA OPTION
-ASTERISK (the presence of the asterisk indicates that this
-language is not loaded in Babel using the old method of ldf
-files but using ini files. If Babel is loaded in an Org
-document with these languages, the \"AUTO \" argument is just
-removed, to avoid compilation errors).
-
-- Members with four elements (for variants of languages): CODE
-BABEL-OPTION POLYGLOSSIA-OPTION POLYGLOSSIA-VARIANT")
+ '(("am" . (:babel-ini-only "amharic" :polyglossia "amharic" :lang-name "Amharic"))
+ ("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 "Bulgarian"))
+ ("bn" . (:babel-ini-only "bengali" :polyglossia "bengali" :lang-name "Bengali"))
+ ("bo" . (:babel-ini-only "tibetan" :polyglossia "tibetan" :lang-name "Tibetan"))
+ ("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 "Coptic"))
+ ("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 "german" :lang-name "German"))
+ ("de-at" . (:babel "naustrian" :polyglossia "german" :polyglossia-variant "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 "Divehi"))
+ ("el" . (:babel "greek" :polyglossia "greek" :lang-name "Greek"))
+ ("el-polyton" . (:babel "polutonikogreek" :polyglossia "greek" :polyglossia-variant "polytonic" :lang-name "Polytonic Greek"))
+ ("en" . (:babel "american" :polyglossia "english" :polyglossia-variant "usmax" :lang-name "English"))
+ ("en-au" . (:babel "australian" :polyglossia "english" :polyglossia-variant "australian" :lang-name "English"))
+ ("en-gb" . (:babel "british" :polyglossia "english" :polyglossia-variant "uk" :lang-name "English"))
+ ("en-nz" . (:babel "newzealand" :polyglossia "english" :polyglossia-variant "newzealand" :lang-name "English"))
+ ("en-us" . (:babel "american" :polyglossia "english" :polyglossia-variant "usmax" :lang-name "English"))
+ ("eo" . (:babel "esperanto" :polyglossia "esperanto" :lang-name "Esperanto"))
+ ("es" . (:babel "spanish" :polyglossia "spanish" :lang-name "Spanish"))
+ ("es-mx" . (:babel "spanishmx" :polyglossia "spanish" :polyglossia-variant "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-variant "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 "Interlingua"))
+ ("id" . (:babel-ini-only "bahasai" :polyglossia "bahasai" :lang-name "Bahasai"))
+ ("is" . (:babel "icelandic" :polyglossia "icelandic" :lang-name "Icelandic"))
+ ("it" . (:babel "italian" :polyglossia "italian" :lang-name "Italian"))
+ ("kn" . (:babel-ini-only "kannada" :polyglossia "kannada" :lang-name "Kannada"))
+ ("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" :polyglossia-variant "medieval" :lang-name "Medieval Latin"))
+ ("la-ecclesiastic" . (:babel "ecclesiasticlatin" :polyglossia "latin" :polyglossia-variant "ecclesiastic" :lang-name "Ecclesiastic Latin"))
+ ("lo" . (:babel-ini-only "lao" :polyglossia "lao" :lang-name "Lao"))
+ ("lt" . (:babel "lithuanian" :polyglossia "lithuanian" :lang-name "Lithuanian"))
+ ("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 "bokmal" :lang-name "Norwegian Bokmål"))
+ ("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 "Piedmontese"))
+ ("pt" . (:babel "portuges" :polyglossia "portuges" :lang-name "Portuges"))
+ ("pt-br" . (:babel "brazilian" :polyglossia "brazilian" :lang-name "Portuges"))
+ ("rm" . (:babel-ini-only "romansh" :polyglossia "romansh" :lang-name "Romansh"))
+ ("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 "Syriac"))
+ ("ta" . (:babel-ini-only "tamil" :polyglossia "tamil" :lang-name "Tamil"))
+ ("te" . (:babel-ini-only "telugu" :polyglossia "telugu" :lang-name "Telugu"))
+ ("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 "Ukrainian"))
+ ("ur" . (:babel-ini-only "urdu" :polyglossia "urdu" :lang-name "Urdu"))
+ ("vi" . (:babel "vietnamese" :polyglossia "vietnamese" :lang-name "Vietnamese"))
+ "Alist between language code and corresponding properties, such
+as Babel/Polyglossia options and language names.
+
+Each element of the list consists of a cons cell, where car is
+the language code and cdr is a property list. Valid keywords for
+this list can be:
+
+- `:babel' the name of the language loaded by the Babel LaTeX package
+
+- `:poliglosia' the name of the language loaded by the Polyglossia LaTeX package
+
+- `:babel-ini-only' the name of the language loaded by Babel
+ exclusively through the new ini files method.
+
+- `:polyglossia-variant' the language variant loaded by Polyglossia
+
+- `:lang-name' the actual name of the language."))
(defconst org-latex-table-matrix-macros '(("bordermatrix" . "\\cr")
("qbordermatrix" . "\\cr")
@@ -1619,11 +1615,15 @@ already loaded.
Return the new header."
(let* ((language-code (plist-get info :language))
- (language (nth 1 (assoc language-code
- org-latex-language-alist)))
- ;; If no language is set or Babel package is not loaded, return
- ;; HEADER as-is.
- (header (if (or (not (stringp language-code))
+ (plist (cdr
+ (assoc language-code org-latex-language-alist)))
+ (language (plist-get plist :babel))
+ (language-ini-only (plist-get plist :babel-ini-only))
+ ;; 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.
+ (header (if (or language-ini-only
+ (not (stringp language-code))
(not (string-match "\\\\usepackage\\[\\(.*\\)\\]{babel}" header)))
header
(let ((options (save-match-data
@@ -1634,22 +1634,13 @@ Return the new header."
;; served in Babel exclusively through ini files are not added
;; to the babel argument, and must be loaded using
;; `\babelprovide'.
- (let ((l (assoc language-code org-latex-language-alist)))
- ;; Three elements imply that LANGUAGE is served
- ;; in Babel only by means of an ini file.
- ;; Therefore it will not be added to the Babel
- ;; argument. TODO: this should be improved
- ;; when `org-latex-language-alist' is replaced
- ;; by a more robust list.
- (if (and (consp l) (= (length l) 3))
- header
- (replace-match
- (mapconcat (lambda (option) (if (equal "AUTO" option) language option))
- (cond ((member language options) (delete "AUTO" options))
- ((member "AUTO" options) options)
- (t (append options (list language))))
- ", ")
- t nil header 1)))))))
+ (replace-match
+ (mapconcat (lambda (option) (if (equal "AUTO" option) language option))
+ (cond ((member language options) (delete "AUTO" options))
+ ((member "AUTO" options) options)
+ (t (append options (list language))))
+ ", ")
+ t nil header 1)))))
;; If `\babelprovide[args]{AUTO}' is present, AUTO is
;; replaced by LANGUAGE.
(if (not (string-match "\\\\babelprovide\\[.*\\]{\\(.+\\)}" header))
@@ -1658,7 +1649,9 @@ Return the new header."
(when (equal "AUTO" prov)
(replace-regexp-in-string (format
"\\(\\\\babelprovide\\[.*\\]\\)\\({\\)%s}" prov)
- (format "\\1\\2%s}" language) header t))))))
+ (format "\\1\\2%s}"
+ (or language language-ini-only))
+ header t))))))
(defun org-latex-guess-polyglossia-language (header info)
"Set the Polyglossia language according to the LANGUAGE keyword.
@@ -1675,13 +1668,13 @@ replaced with the language of the document or
using \setdefaultlanguage and not as an option to the package.
Return the new header."
- (let ((language (plist-get info :language)))
+ (let* ((language (plist-get info :language)))
;; If no language is set or Polyglossia is not loaded, return
;; HEADER as-is.
(if (or (not (stringp language))
(not (string-match
- "\\\\usepackage\\(?:\\[\\([^]]+?\\)\\]\\){polyglossia}\n"
- header)))
+ "\\\\usepackage\\(?:\\[\\([^]]+?\\)\\]\\){polyglossia}\n"
+ header)))
header
(let* ((options (org-string-nw-p (match-string 1 header)))
(languages (and options
@@ -1700,23 +1693,20 @@ Return the new header."
(concat "\\usepackage{polyglossia}\n"
(mapconcat
(lambda (l)
- (let ((l (or (assoc l org-latex-language-alist)
- l)))
- (format (if main-language-set "\\setotherlanguage%s{%s}\n"
+ (let* ((plist (cdr
+ (assoc language org-latex-language-alist)))
+ (polyglossia-variant (plist-get plist :polyglossia-variant))
+ (polyglossia-lang (plist-get plist :polyglossia))
+ (l (if (equal l language)
+ polyglossia-lang
+ l)))
+ (format (if main-language-set (format "\\setotherlanguage{%s}\n" l)
(setq main-language-set t)
"\\setmainlanguage%s{%s}\n")
- ;; Four elements implies that there is a
- ;; variant (4) for LANGUAGE when
- ;; declared by Polyglossia (3).
- ;; FIXME: This should be improved when
- ;; `org-latex-language-alist' is
- ;; replaced by a more robust list.
- (if (and (consp l) (= (length l) 4))
- (format "[variant=%s]" (nth 3 l))
+ (if polyglossia-variant
+ (format "[variant=%s]" polyglossia-variant)
"")
- (if (and (consp l) (= (length l) 4))
- (nth 2 l)
- (nth 1 l)))))
+ l)))
languages
""))
t t header 0)))))
@@ -1860,12 +1850,11 @@ INFO is a plist used as a communication channel."
(defun org-latex--format-spec (info)
"Create a format-spec for document meta-data.
INFO is a plist used as a communication channel."
- (let ((language (let ((lang (plist-get info :language)))
- ;; The second element in
- ;; `org-latex-language-alist' is always the
- ;; language name, regardless of the type of the
- ;; alist entry.
- (or (nth 1 (assoc-string lang org-latex-language-alist t))
+ (let ((language (let* ((lang (plist-get info :language))
+ (plist (cdr
+ (assoc lang org-latex-language-alist))))
+ ;; Here the actual name of the LANGUAGE or LANG is used
+ (or (plist-get plist :lang-name)
lang))))
`((?a . ,(org-export-data (plist-get info :author) info))
(?t . ,(org-export-data (plist-get info :title) info))
--
2.37.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] ox-latex.el: `org-latex-language-alist' improved
2022-07-31 1:00 [PATCH] ox-latex.el: `org-latex-language-alist' improved Juan Manuel Macías
@ 2022-08-03 11:23 ` Ihor Radchenko
2022-08-04 10:04 ` Juan Manuel Macías
0 siblings, 1 reply; 7+ messages in thread
From: Ihor Radchenko @ 2022-08-03 11:23 UTC (permalink / raw)
To: Juan Manuel Macías; +Cc: orgmode
[-- Attachment #1: Type: text/plain, Size: 2207 bytes --]
Juan Manuel Macías <maciaschain@posteo.net> writes:
> I've managed to get some free time to remake this list, following Maxim
> Nikulin's suggestion
> (https://list.orgmode.org/orgmode/taeb0a$r62$1@ciao.gmane.io/). It's no
> longer an anonymous list and I agree it now has a more robust structure
> with name fields. I have also added the `:lang-name' property, whose
> value is the actual language name. For example:
>
> ("el-polyton" . (:babel "polutonikogreek" :polyglossia "greek"
> :polyglossia-variant "polytonic" :lang-name "Polytonic Greek"))
>
> Thanks to this I think the code for org-latex-guess-babel-language,
> org-latex-guess-polyglossia-language and org-latex--format-spec is also
> simpler.
Thanks! I have some minor comments on the patch.
> From b06cdd45198f470a135efad2cd1d8b22ab7e2f22 Mon Sep 17 00:00:00 2001
> From: Juan Manuel Macias <maciaschain@posteo.net>
> Date: Sun, 31 Jul 2022 02:31:08 +0200
> Subject: [PATCH] lisp/ox-latex.el: `org-latex-language-alist' improved.
No dot after the firs message line, please.
> + '(("am" . (:babel-ini-only "amharic" :polyglossia "amharic" :lang-name
"Amharic"))
> + ("ar" . (:babel "arabic" :polyglossia "arabic" :lang-name "Arabic"))
A simpler form would be
("am" :babel-ini-only "amharic" :polyglossia "amharic" :lang-name "Amharic")
> + "Alist between language code and corresponding properties, such
> +as Babel/Polyglossia options and language names.
The first line of the docstring should fit 80 characters and be a full
sentence. It is needed to make sure that eldoc can display the short
docstring in the message area.
> +- `:poliglosia' the name of the language loaded by the Polyglossia LaTeX
package
`:polyglossia', I think.
> +- `:babel-ini-only' the name of the language loaded by Babel
> + exclusively through the new ini files method.
May we put some kind of reference to LaTeX docs here?
> + (let ((language (let* ((lang (plist-get info :language))
> + (plist (cdr
> + (assoc lang org-latex-language-alist))))
> + ;; Here the actual name of the LANGUAGE or LANG is
used
Please end the comment sentence with ".".
Best,
Ihor
[-- Attachment #2: Type: text/html, Size: 2843 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] ox-latex.el: `org-latex-language-alist' improved
2022-08-03 11:23 ` Ihor Radchenko
@ 2022-08-04 10:04 ` Juan Manuel Macías
2022-08-04 12:16 ` Max Nikulin
2022-08-06 7:13 ` Ihor Radchenko
0 siblings, 2 replies; 7+ messages in thread
From: Juan Manuel Macías @ 2022-08-04 10:04 UTC (permalink / raw)
To: Ihor Radchenko; +Cc: orgmode
[-- Attachment #1: Type: text/plain, Size: 1853 bytes --]
Hi, Ihor,
Ihor Radchenko writes:
> Thanks! I have some minor comments on the patch.
>
>> From b06cdd45198f470a135efad2cd1d8b22ab7e2f22 Mon Sep 17 00:00:00
> 2001
>> From: Juan Manuel Macias <maciaschain@posteo.net>
>> Date: Sun, 31 Jul 2022 02:31:08 +0200
>> Subject: [PATCH] lisp/ox-latex.el: `org-latex-language-alist'
> improved.
>
> No dot after the firs message line, please.
>
>> + '(("am" . (:babel-ini-only "amharic" :polyglossia "amharic" :
> lang-name "Amharic"))
>> + ("ar" . (:babel "arabic" :polyglossia "arabic" :lang-name
> "Arabic"))
>
> A simpler form would be
> ("am" :babel-ini-only "amharic" :polyglossia "amharic" :lang-name
> "Amharic")
>
>> + "Alist between language code and corresponding properties, such
>> +as Babel/Polyglossia options and language names.
>
> The first line of the docstring should fit 80 characters and be a full
> sentence. It is needed to make sure that eldoc can display the short
> docstring in the message area.
>
>> +- `:poliglosia' the name of the language loaded by the Polyglossia
> LaTeX package
>
> `:polyglossia', I think.
>
>> +- `:babel-ini-only' the name of the language loaded by Babel
>> + exclusively through the new ini files method.
>
> May we put some kind of reference to LaTeX docs here?
>
>> + (let ((language (let* ((lang (plist-get info :language))
>> + (plist (cdr
>> + (assoc lang org-latex-language-alist))))
>> + ;; Here the actual name of the LANGUAGE or LANG
> is used
>
> Please end the comment sentence with ".".
Thanks for your comments and patience, and sorry again for the typos.
I am attaching a new fixed version of the patch. If everything is ok, I
get down to work with the Manual and NEWS. I think it would be nice to
add a few usage examples, and some links to the Babel and Polyglossia
documentation.
Best regards,
Juan Manuel
[-- Attachment #2: 0001-lisp-ox-latex.el-org-latex-language-alist-improved.patch --]
[-- Type: text/x-patch, Size: 18544 bytes --]
From 3d67d46cfc3e2f4a8feab1fed0598912700118a6 Mon Sep 17 00:00:00 2001
From: Juan Manuel Macias <maciaschain@posteo.net>
Date: Thu, 4 Aug 2022 11:54:01 +0200
Subject: [PATCH] lisp/ox-latex.el: `org-latex-language-alist' improved
* (org-latex-language-alist): Alist between language code and
corresponding properties, such as Babel/Polyglossia options and
language names. Each element of the list consists of a cons cell,
where car is the language code and cdr is a property list.
* (org-latex-guess-babel-language): Modified to adapt the function to
the new structure of `org-latex-language-alist'.
* (org-latex-guess-polyglossia-language): Modified to adapt the function to
the new structure of `org-latex-language-alist'.
* (org-latex--format-spec): Modified to adapt the function to
the new structure of `org-latex-language-alist'.
---
lisp/ox-latex.el | 290 +++++++++++++++++++++++------------------------
1 file changed, 140 insertions(+), 150 deletions(-)
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index c56f9d347..69d01b9c7 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -173,110 +173,107 @@
;;; Internal Variables
(defconst org-latex-language-alist
- ;; TODO: replace this list with a property list (the actual
- ;; implementation is not very robust).
- '(("am" "amharic" "*")
- ("ar" "arabic")
- ("ast" "asturian" "*")
- ("bg" "bulgarian")
- ("bn" "bengali" "*")
- ("bo" "tibetan" "*")
- ("br" "breton")
- ("ca" "catalan")
- ("cop" "coptic" "*")
- ("cs" "czech")
- ("cy" "welsh")
- ("da" "danish")
- ("de" "ngerman" "german" "german")
- ("de-at" "naustrian" "german" "austrian")
- ("dsb" "lsorbian" "*")
- ("dv" "divehi" "*")
- ("el" "greek")
- ("el-polyton" "polutonikogreek" "greek" "polytonic")
- ("en" "american" "english" "usmax")
- ("en-au" "australian" "english" "australian")
- ("en-gb" "british" "english" "uk")
- ("en-nz" "newzealand" "english" "newzealand")
- ("en-us" "american" "english" "usmax")
- ("eo" "esperanto")
- ("es" "spanish")
- ("es-mx" "spanishmx" "spanish" "mexican")
- ("et" "estonian")
- ("eu" "basque")
- ("fa" "farsi")
- ("fi" "finnish")
- ("fr" "french")
- ("fr-ca" "canadien" "french" "canadian")
- ("fur" "friulan")
- ("ga" "irish")
- ("gd" "scottish")
- ("gl" "galician")
- ("he" "hebrew")
- ("hi" "hindi")
- ("hr" "croatian")
- ("hsb" "uppersorbian" "sorbian" "upper")
- ("hu" "magyar")
- ("hy" "armenian" "*")
- ("ia" "interlingua")
- ("id" "bahasai" "*")
- ("is" "icelandic")
- ("it" "italian")
- ("kn" "kannada" "*")
- ("la" "latin")
- ("la-classic" "classiclatin" "latin" "classic")
- ("la-medieval" "medievallatin" "latin" "medieval")
- ("la-ecclesiastic" "ecclesiasticlatin" "latin" "ecclesiastic")
- ("lo" "lao" "*")
- ("lt" "lithuanian")
- ("lv" "latvian")
- ("ml" "malayalam" "*")
- ("mr" "maranthi" "*")
- ("nb" "norsk" "norwegian" "bokmal")
- ("nl" "dutch")
- ("nn" "nynorsk" "norwegian" "nynorsk")
- ("no" "norsk")
- ("oc" "occitan")
- ("pl" "polish")
- ("pms" "piedmontese")
- ("pt" "portuges")
- ("pt-br" "brazilian")
- ("rm" "romansh" "*")
- ("ro" "romanian")
- ("ru" "russian")
- ("sa" "sanskrit" "*")
- ("sk" "slovak")
- ("sl" "slovene")
- ("sq" "albanian")
- ("sr" "serbian")
- ("sv" "swedish")
- ("syr" "syriac" "*")
- ("ta" "tamil" "*")
- ("te" "telugu" "*")
- ("th" "thai")
- ("tk" "turkmen")
- ("tr" "turkish")
- ("uk" "ukrainian")
- ("ur" "urdu" "*")
- ("vi" "vietnamese"))
- "Alist between language code and corresponding Babel/Polyglossia option.
-
-For the names of the languages, the Babel nomenclature is
-preferred to that of Polyglossia, in those cases where both
-coincide.
-
-The alist supports three types of members:
-
-- Members with two elements: CODE BABEL/POLYGLOSSIA OPTION.
-
-- Members with three elements: CODE BABEL/POLYGLOSSIA OPTION
-ASTERISK (the presence of the asterisk indicates that this
-language is not loaded in Babel using the old method of ldf
-files but using ini files. If Babel is loaded in an Org
-document with these languages, the \"AUTO \" argument is just
-removed, to avoid compilation errors).
-
-- Members with four elements (for variants of languages): CODE
-BABEL-OPTION POLYGLOSSIA-OPTION POLYGLOSSIA-VARIANT")
+ '(("am" :babel-ini-only "amharic" :polyglossia "amharic" :lang-name "Amharic")
+ ("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 "Bulgarian")
+ ("bn" :babel-ini-only "bengali" :polyglossia "bengali" :lang-name "Bengali")
+ ("bo" :babel-ini-only "tibetan" :polyglossia "tibetan" :lang-name "Tibetan")
+ ("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 "Coptic")
+ ("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 "german" :lang-name "German")
+ ("de-at" :babel "naustrian" :polyglossia "german" :polyglossia-variant "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 "Divehi")
+ ("el" :babel "greek" :polyglossia "greek" :lang-name "Greek")
+ ("el-polyton" :babel "polutonikogreek" :polyglossia "greek" :polyglossia-variant "polytonic" :lang-name "Polytonic Greek")
+ ("en" :babel "american" :polyglossia "english" :polyglossia-variant "usmax" :lang-name "English")
+ ("en-au" :babel "australian" :polyglossia "english" :polyglossia-variant "australian" :lang-name "English")
+ ("en-gb" :babel "british" :polyglossia "english" :polyglossia-variant "uk" :lang-name "English")
+ ("en-nz" :babel "newzealand" :polyglossia "english" :polyglossia-variant "newzealand" :lang-name "English")
+ ("en-us" :babel "american" :polyglossia "english" :polyglossia-variant "usmax" :lang-name "English")
+ ("eo" :babel "esperanto" :polyglossia "esperanto" :lang-name "Esperanto")
+ ("es" :babel "spanish" :polyglossia "spanish" :lang-name "Spanish")
+ ("es-mx" :babel "spanishmx" :polyglossia "spanish" :polyglossia-variant "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-variant "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 "Interlingua")
+ ("id" :babel-ini-only "bahasai" :polyglossia "bahasai" :lang-name "Bahasai")
+ ("is" :babel "icelandic" :polyglossia "icelandic" :lang-name "Icelandic")
+ ("it" :babel "italian" :polyglossia "italian" :lang-name "Italian")
+ ("kn" :babel-ini-only "kannada" :polyglossia "kannada" :lang-name "Kannada")
+ ("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" :polyglossia-variant "medieval" :lang-name "Medieval Latin")
+ ("la-ecclesiastic" :babel "ecclesiasticlatin" :polyglossia "latin" :polyglossia-variant "ecclesiastic" :lang-name "Ecclesiastic Latin")
+ ("lo" :babel-ini-only "lao" :polyglossia "lao" :lang-name "Lao")
+ ("lt" :babel "lithuanian" :polyglossia "lithuanian" :lang-name "Lithuanian")
+ ("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 "bokmal" :lang-name "Norwegian Bokmål")
+ ("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 "Piedmontese")
+ ("pt" :babel "portuges" :polyglossia "portuges" :lang-name "Portuges")
+ ("pt-br" :babel "brazilian" :polyglossia "brazilian" :lang-name "Portuges")
+ ("rm" :babel-ini-only "romansh" :polyglossia "romansh" :lang-name "Romansh")
+ ("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 "Syriac")
+ ("ta" :babel-ini-only "tamil" :polyglossia "tamil" :lang-name "Tamil")
+ ("te" :babel-ini-only "telugu" :polyglossia "telugu" :lang-name "Telugu")
+ ("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 "Ukrainian")
+ ("ur" :babel-ini-only "urdu" :polyglossia "urdu" :lang-name "Urdu")
+ ("vi" :babel "vietnamese" :polyglossia "vietnamese" :lang-name "Vietnamese"))
+ "Alist between language code and corresponding properties for LaTeX export.
+
+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:
+
+- `:babel' the name of the language loaded by the Babel LaTeX package
+
+- `:polyglosia' the name of the language loaded by the Polyglossia LaTeX package
+
+- `:babel-ini-only' the name of the language loaded by Babel
+ exclusively through the new ini files method. See
+ `http://mirrors.ctan.org/macros/latex/required/babel/base/babel.pdf'
+
+- `:polyglossia-variant' the language variant loaded by Polyglossia
+
+- `:lang-name' the actual name of the language.")
+
(defconst org-latex-table-matrix-macros '(("bordermatrix" . "\\cr")
("qbordermatrix" . "\\cr")
@@ -1619,11 +1616,15 @@ already loaded.
Return the new header."
(let* ((language-code (plist-get info :language))
- (language (nth 1 (assoc language-code
- org-latex-language-alist)))
- ;; If no language is set or Babel package is not loaded, return
- ;; HEADER as-is.
- (header (if (or (not (stringp language-code))
+ (plist (cdr
+ (assoc language-code org-latex-language-alist)))
+ (language (plist-get plist :babel))
+ (language-ini-only (plist-get plist :babel-ini-only))
+ ;; 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.
+ (header (if (or language-ini-only
+ (not (stringp language-code))
(not (string-match "\\\\usepackage\\[\\(.*\\)\\]{babel}" header)))
header
(let ((options (save-match-data
@@ -1634,22 +1635,13 @@ Return the new header."
;; served in Babel exclusively through ini files are not added
;; to the babel argument, and must be loaded using
;; `\babelprovide'.
- (let ((l (assoc language-code org-latex-language-alist)))
- ;; Three elements imply that LANGUAGE is served
- ;; in Babel only by means of an ini file.
- ;; Therefore it will not be added to the Babel
- ;; argument. TODO: this should be improved
- ;; when `org-latex-language-alist' is replaced
- ;; by a more robust list.
- (if (and (consp l) (= (length l) 3))
- header
- (replace-match
- (mapconcat (lambda (option) (if (equal "AUTO" option) language option))
- (cond ((member language options) (delete "AUTO" options))
- ((member "AUTO" options) options)
- (t (append options (list language))))
- ", ")
- t nil header 1)))))))
+ (replace-match
+ (mapconcat (lambda (option) (if (equal "AUTO" option) language option))
+ (cond ((member language options) (delete "AUTO" options))
+ ((member "AUTO" options) options)
+ (t (append options (list language))))
+ ", ")
+ t nil header 1)))))
;; If `\babelprovide[args]{AUTO}' is present, AUTO is
;; replaced by LANGUAGE.
(if (not (string-match "\\\\babelprovide\\[.*\\]{\\(.+\\)}" header))
@@ -1658,7 +1650,9 @@ Return the new header."
(when (equal "AUTO" prov)
(replace-regexp-in-string (format
"\\(\\\\babelprovide\\[.*\\]\\)\\({\\)%s}" prov)
- (format "\\1\\2%s}" language) header t))))))
+ (format "\\1\\2%s}"
+ (or language language-ini-only))
+ header t))))))
(defun org-latex-guess-polyglossia-language (header info)
"Set the Polyglossia language according to the LANGUAGE keyword.
@@ -1675,13 +1669,13 @@ replaced with the language of the document or
using \setdefaultlanguage and not as an option to the package.
Return the new header."
- (let ((language (plist-get info :language)))
+ (let* ((language (plist-get info :language)))
;; If no language is set or Polyglossia is not loaded, return
;; HEADER as-is.
(if (or (not (stringp language))
(not (string-match
- "\\\\usepackage\\(?:\\[\\([^]]+?\\)\\]\\){polyglossia}\n"
- header)))
+ "\\\\usepackage\\(?:\\[\\([^]]+?\\)\\]\\){polyglossia}\n"
+ header)))
header
(let* ((options (org-string-nw-p (match-string 1 header)))
(languages (and options
@@ -1700,23 +1694,20 @@ Return the new header."
(concat "\\usepackage{polyglossia}\n"
(mapconcat
(lambda (l)
- (let ((l (or (assoc l org-latex-language-alist)
- l)))
- (format (if main-language-set "\\setotherlanguage%s{%s}\n"
+ (let* ((plist (cdr
+ (assoc language org-latex-language-alist)))
+ (polyglossia-variant (plist-get plist :polyglossia-variant))
+ (polyglossia-lang (plist-get plist :polyglossia))
+ (l (if (equal l language)
+ polyglossia-lang
+ l)))
+ (format (if main-language-set (format "\\setotherlanguage{%s}\n" l)
(setq main-language-set t)
"\\setmainlanguage%s{%s}\n")
- ;; Four elements implies that there is a
- ;; variant (4) for LANGUAGE when
- ;; declared by Polyglossia (3).
- ;; FIXME: This should be improved when
- ;; `org-latex-language-alist' is
- ;; replaced by a more robust list.
- (if (and (consp l) (= (length l) 4))
- (format "[variant=%s]" (nth 3 l))
+ (if polyglossia-variant
+ (format "[variant=%s]" polyglossia-variant)
"")
- (if (and (consp l) (= (length l) 4))
- (nth 2 l)
- (nth 1 l)))))
+ l)))
languages
""))
t t header 0)))))
@@ -1860,13 +1851,12 @@ INFO is a plist used as a communication channel."
(defun org-latex--format-spec (info)
"Create a format-spec for document meta-data.
INFO is a plist used as a communication channel."
- (let ((language (let ((lang (plist-get info :language)))
- ;; The second element in
- ;; `org-latex-language-alist' is always the
- ;; language name, regardless of the type of the
- ;; alist entry.
- (or (nth 1 (assoc-string lang org-latex-language-alist t))
- lang))))
+ (let ((language (let* ((lang (plist-get info :language))
+ (plist (cdr
+ (assoc lang org-latex-language-alist))))
+ ;; Here the actual name of the LANGUAGE or LANG is used.
+ (or (plist-get plist :lang-name)
+ lang))))
`((?a . ,(org-export-data (plist-get info :author) info))
(?t . ,(org-export-data (plist-get info :title) info))
(?s . ,(org-export-data (plist-get info :subtitle) info))
--
2.37.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] ox-latex.el: `org-latex-language-alist' improved
2022-08-04 10:04 ` Juan Manuel Macías
@ 2022-08-04 12:16 ` Max Nikulin
2022-08-05 17:14 ` Juan Manuel Macías
2022-08-06 7:13 ` Ihor Radchenko
1 sibling, 1 reply; 7+ messages in thread
From: Max Nikulin @ 2022-08-04 12:16 UTC (permalink / raw)
To: emacs-orgmode
On 04/08/2022 17:04, Juan Manuel Macías wrote:
>>> Subject: [PATCH] lisp/ox-latex.el: `org-latex-language-alist'
>> improved.
Thank you, Juan Manuel. The patch looks like what I was trying to
suggest. However I have not tried to implement fontenc on the top of it.
> + (format "\\1\\2%s}"
> + (or language language-ini-only))
Likely never variant is ideal. Maybe language should be always in :babel
and :babel-ini-only should be boolean. I am not sure though that it will
not make code more complex in other places, so feel free to ignore this
comment.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ox-latex.el: `org-latex-language-alist' improved
2022-08-04 12:16 ` Max Nikulin
@ 2022-08-05 17:14 ` Juan Manuel Macías
0 siblings, 0 replies; 7+ messages in thread
From: Juan Manuel Macías @ 2022-08-05 17:14 UTC (permalink / raw)
To: Max Nikulin; +Cc: orgmode
Max Nikulin writes:
> Likely never variant is ideal. Maybe language should be always in
> :babel and :babel-ini-only should be boolean. I am not sure though
> that it will not make code more complex in other places, so feel free
> to ignore this comment.
What you say makes a lot of sense. Really the only reason why I avoided
doing something like that was rather the economy, so I didn't have to
put things like (two properties instead of one):
:babel xx :babel-ini-only t etc.
It is also expected that babel-ini-only is a 'temporary' property. At
least I would like it to be so.
According to the Babel documentation:
> Babel is moving gradually from the old and fuzzy concept of language
> to the more modern of locale.
Which is precisely what the new ini files are meant for. Now these files
can only be loaded via \babelprovide or by adding provide=* (and some
other variants) to the babel arguments (this last option is not
supported by my patch, for pdfLaTeX compatibility, where ini files don't
work. I imagine that when that transition is complete, there will be a
more inclusive and universal interface in babel.
Best regards,
Juan Manuel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ox-latex.el: `org-latex-language-alist' improved
2022-08-04 10:04 ` Juan Manuel Macías
2022-08-04 12:16 ` Max Nikulin
@ 2022-08-06 7:13 ` Ihor Radchenko
2022-08-06 21:32 ` Juan Manuel Macías
1 sibling, 1 reply; 7+ messages in thread
From: Ihor Radchenko @ 2022-08-06 7:13 UTC (permalink / raw)
To: Juan Manuel Macías; +Cc: orgmode
Juan Manuel Macías <maciaschain@posteo.net> writes:
> I am attaching a new fixed version of the patch. If everything is ok, I
> get down to work with the Manual and NEWS. I think it would be nice to
> add a few usage examples, and some links to the Babel and Polyglossia
> documentation.
Applied onto main via e47bcb021 with minor amendments: I fixed a typo
"polyglosia" and shortened the first line of a docstring to less than 80
chars.
FYI, there is display-fill-column-indicator-mode, which is useful to
guide the docstring in Elisp. Just need to set fill-column to 80.
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=e47bcb02133608e37bc4c532aec4d4723f8eeca8
--
Ihor Radchenko,
Org mode contributor,
Learn more about Org mode at https://orgmode.org/.
Support Org development at https://liberapay.com/org-mode,
or support my work at https://liberapay.com/yantar92
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-08-06 21:33 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-31 1:00 [PATCH] ox-latex.el: `org-latex-language-alist' improved Juan Manuel Macías
2022-08-03 11:23 ` Ihor Radchenko
2022-08-04 10:04 ` Juan Manuel Macías
2022-08-04 12:16 ` Max Nikulin
2022-08-05 17:14 ` Juan Manuel Macías
2022-08-06 7:13 ` Ihor Radchenko
2022-08-06 21:32 ` Juan Manuel Macías
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).