From 7ff935bb60415fbd05cf4ee363ab2c3c7e1e4401 Mon Sep 17 00:00:00 2001 From: rasmus Date: Wed, 3 Jul 2013 12:06:24 +0200 Subject: [PATCH 1/3] Bugfix for Norwegian in ox.el MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ox-latex.el (org-latex-babel-language-alist): Added 'nb', 'nn', and 'no' for Norwegian. Removed 'no-no'. In ox.el Norwegian is given by 'no' for Norwegian, 'nb' for bokmål, and 'nn' for nynorsk, correspond to the ISO-2 language codes. 'no-no' is not defined in ox.el. --- lisp/ox-latex.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index dcbed54d5..de6f6f91b 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -143,7 +143,9 @@ ("la" . "latin") ("ms" . "malay") ("nl" . "dutch") - ("no-no" . "nynorsk") + ("nb" . "norsk") + ("nn" . "nynorsk") + ("no" . "norsk") ("pl" . "polish") ("pt" . "portuguese") ("ro" . "romanian") @@ -342,7 +344,6 @@ the toc:nil option, not to those generated with #+TOC keyword." :group 'org-export-latex :type 'boolean) - ;;;; Headline (defcustom org-latex-format-headline-function From e7609fb904e607be340c61e9513905ca1ddc32ce Mon Sep 17 00:00:00 2001 From: rasmus Date: Wed, 3 Jul 2013 12:09:21 +0200 Subject: [PATCH 2/3] Extended org-export-default-language docstring * ox.el (org-export-default-language): mention other variables affected by language. --- lisp/ox.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/ox.el b/lisp/ox.el index a043dd67b..6531fa345 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -501,8 +501,9 @@ e.g. \"H:2\"." (defcustom org-export-default-language "en" "The default language for export and clocktable translations, as a string. This may have an association in -`org-clock-clocktable-language-setup'. This option can also be -set with the LANGUAGE keyword." +`org-clock-clocktable-language-setup', +`org-export-smart-quotes-alist' and `org-export-dictionary'. +This option can also be set with the LANGUAGE keyword." :group 'org-export-general :type '(string :tag "Language")) From 733fb0713e6717c21bccaf0fb216ef2be0d6d97b Mon Sep 17 00:00:00 2001 From: rasmus Date: Wed, 3 Jul 2013 12:15:26 +0200 Subject: [PATCH 3/3] Some language support for Danish, Swedish and Norwegian * ox.el (org-export-smart-quotes-alist): Added ("da" "no" "nb" "nn" "sv"). * ox.el (org-export-dictionary): Added some entries ("da" "no" "nb" "nn" "sv"). These languages are rather unrestricted, so some changes may to some extend reflect my preferences. --- lisp/ox.el | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 3 deletions(-) diff --git a/lisp/ox.el b/lisp/ox.el index 6531fa345..92ad3562f 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -4893,7 +4893,20 @@ Return a list of src-block elements with a caption." ;; `org-export-smart-quotes-regexps'. (defconst org-export-smart-quotes-alist - '(("de" + '(("da" + ;; one may use: »...«, "...", ›...‹, or '...'. + ;; http://sproget.dk/raad-og-regler/retskrivningsregler/retskrivningsregler/a7-40-60/a7-58-anforselstegn/ + ;; LaTeX quotes require Babel! + (opening-double-quote :utf-8 "»" :html "»" :latex ">>" + :texinfo "@guillemetright{}") + (closing-double-quote :utf-8 "«" :html "«" :latex "<<" + :texinfo "@guillemetleft{}") + (opening-single-quote :utf-8 "›" :html "›" :latex "\\frq{}" + :texinfo "@guilsinglright{}") + (closing-single-quote :utf-8 "‹" :html "‹" :latex "\\flq{}" + :texinfo "@guilsingleft{}") + (apostrophe :utf-8 "’" :html "’")) + ("de" (opening-double-quote :utf-8 "„" :html "„" :latex "\"`" :texinfo "@quotedblbase{}") (closing-double-quote :utf-8 "“" :html "“" :latex "\"'" @@ -4926,7 +4939,42 @@ Return a list of src-block elements with a caption." :texinfo "@guillemetleft{}@tie{}") (closing-single-quote :utf-8 " »" :html " »" :latex "\\fg{}" :texinfo "@tie{}@guillemetright{}") - (apostrophe :utf-8 "’" :html "’"))) + (apostrophe :utf-8 "’" :html "’")) + ("no" + ;; https://nn.wikipedia.org/wiki/Sitatteikn + (opening-double-quote :utf-8 "«" :html "«" :latex "\\guillemotleft{}" + :texinfo "@guillemetleft{}") + (closing-double-quote :utf-8 "»" :html "»" :latex "\\guillemotright{}" + :texinfo "@guillemetright{}") + (opening-single-quote :utf-8 "‘" :html "‘" :latex "`" :texinfo "`") + (closing-single-quote :utf-8 "’" :html "’" :latex "'" :texinfo "'") + (apostrophe :utf-8 "’" :html "’")) + ("nb" + ;; https://nn.wikipedia.org/wiki/Sitatteikn + (opening-double-quote :utf-8 "«" :html "«" :latex "\\guillemotleft{}" + :texinfo "@guillemetleft{}") + (closing-double-quote :utf-8 "»" :html "»" :latex "\\guillemotright{}" + :texinfo "@guillemetright{}") + (opening-single-quote :utf-8 "‘" :html "‘" :latex "`" :texinfo "`") + (closing-single-quote :utf-8 "’" :html "’" :latex "'" :texinfo "'") + (apostrophe :utf-8 "’" :html "’")) + ("nn" + ;; https://nn.wikipedia.org/wiki/Sitatteikn + (opening-double-quote :utf-8 "«" :html "«" :latex "\\guillemotleft{}" + :texinfo "@guillemetleft{}") + (closing-double-quote :utf-8 "»" :html "»" :latex "\\guillemotright{}" + :texinfo "@guillemetright{}") + (opening-single-quote :utf-8 "‘" :html "‘" :latex "`" :texinfo "`") + (closing-single-quote :utf-8 "’" :html "’" :latex "'" :texinfo "'") + (apostrophe :utf-8 "’" :html "’")) + ("sv" + ;; based on https://sv.wikipedia.org/wiki/Citattecken + (opening-double-quote :utf-8 "”" :html "”" :latex "’’" :texinfo "’’") + (closing-double-quote :utf-8 "”" :html "”" :latex "’’" :texinfo "’’") + (opening-single-quote :utf-8 "’" :html "’" :latex "’" :texinfo "`") + (closing-single-quote :utf-8 "’" :html "’" :latex "’" :texinfo "'") + (apostrophe :utf-8 "’" :html "’")) + ) "Smart quotes translations. Alist whose CAR is a language string and CDR is an alist with @@ -5220,7 +5268,7 @@ them." ("Author" ("ca" :default "Autor") ("cs" :default "Autor") - ("da" :default "Ophavsmand") + ("da" :default "Forfatter") ("de" :default "Autor") ("eo" :html "Aŭtoro") ("es" :default "Autor") @@ -5263,20 +5311,35 @@ them." ("zh-CN" :html "日期" :utf-8 "日期") ("zh-TW" :html "日期" :utf-8 "日期")) ("Equation" + ("da" :default "Ligning") ("de" :default "Gleichung") ("es" :html "Ecuación" :default "Ecuación") ("fr" :ascii "Equation" :default "Équation") + ("no" :default "Ligning") + ("nb" :default "Ligning") + ("nn" :default "Likning") + ("sv" :default "Ekvation") ("zh-CN" :html "方程" :utf-8 "方程")) ("Figure" + ("da" :default "Figur") ("de" :default "Abbildung") ("es" :default "Figura") ("ja" :html "図" :utf-8 "図") + ("no" :default "Illustrasjon") + ("nb" :default "Illustrasjon") + ("nn" :default "Illustrasjon") + ("sv" :default "Illustration") ("zh-CN" :html "图" :utf-8 "图")) ("Figure %d:" + ("da" :default "Figur %d") ("de" :default "Abbildung %d:") ("es" :default "Figura %d:") ("fr" :default "Figure %d :" :html "Figure %d :") ("ja" :html "図%d: " :utf-8 "図%d: ") + ("no" :default "Illustrasjon %d") + ("nb" :default "Illustrasjon %d") + ("nn" :default "Illustrasjon %d") + ("sv" :default "Illustration %d") ("zh-CN" :html "图%d " :utf-8 "图%d ")) ("Footnotes" ("ca" :html "Peus de pàgina") @@ -5303,21 +5366,33 @@ them." ("zh-CN" :html "脚注" :utf-8 "脚注") ("zh-TW" :html "腳註" :utf-8 "腳註")) ("List of Listings" + ("da" :default "Programmer") ("de" :default "Programmauflistungsverzeichnis") ("es" :default "Indice de Listados de programas") ("fr" :default "Liste des programmes") + ("no" :default "Dataprogrammer") + ("nb" :default "Dataprogrammer") ("zh-CN" :html "代码目录" :utf-8 "代码目录")) ("List of Tables" + ("da" :default "Tabeller") ("de" :default "Tabellenverzeichnis") ("es" :default "Indice de tablas") ("fr" :default "Liste des tableaux") + ("no" :default "Tabeller") + ("nb" :default "Tabeller") + ("nn" :default "Tabeller") + ("sv" :default "Tabeller") ("zh-CN" :html "表格目录" :utf-8 "表格目录")) ("Listing %d:" + ("da" :default "Program %d") ("de" :default "Programmlisting %d") ("es" :default "Listado de programa %d") ("fr" :default "Programme %d :" :html "Programme %d :") + ("no" :default "Dataprogram") + ("nb" :default "Dataprogram") ("zh-CN" :html "代码%d " :utf-8 "代码%d ")) ("See section %s" + ("da" :default "jævnfør afsnit %s") ("de" :default "siehe Abschnitt %s") ("es" :default "vea seccion %s") ("fr" :default "cf. section %s") @@ -5329,10 +5404,15 @@ them." ("ja" :html "表" :utf-8 "表") ("zh-CN" :html "表" :utf-8 "表")) ("Table %d:" + ("da" :default "Tabel %d") ("de" :default "Tabelle %d") ("es" :default "Tabla %d") ("fr" :default "Tableau %d :") ("ja" :html "表%d:" :utf-8 "表%d:") + ("no" :default "Tabell %d") + ("nb" :default "Tabell %d") + ("nn" :default "Tabell %d") + ("sv" :default "Tabell %d") ("zh-CN" :html "表%d " :utf-8 "表%d ")) ("Table of Contents" ("ca" :html "Índex") @@ -5359,6 +5439,7 @@ them." ("zh-CN" :html "目录" :utf-8 "目录") ("zh-TW" :html "目錄" :utf-8 "目錄")) ("Unknown reference" + ("da" :default "ukendt reference") ("de" :default "Unbekannter Verweis") ("es" :default "referencia desconocida") ("fr" :ascii "Destination inconnue" :default "Référence inconnue")