From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rasmus Subject: [patch] language support for da, no, sv. Date: Wed, 03 Jul 2013 12:26:56 +0200 Message-ID: <87ehbggcr3.fsf@pank.eu> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UuKHN-000863-GZ for emacs-orgmode@gnu.org; Wed, 03 Jul 2013 06:27:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UuKHJ-0007Fk-Fl for emacs-orgmode@gnu.org; Wed, 03 Jul 2013 06:27:17 -0400 Received: from plane.gmane.org ([80.91.229.3]:49478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UuKHJ-0007Fb-2S for emacs-orgmode@gnu.org; Wed, 03 Jul 2013 06:27:13 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1UuKHE-000234-0c for emacs-orgmode@gnu.org; Wed, 03 Jul 2013 12:27:08 +0200 Received: from business-213-023-238-209.static.arcor-ip.net ([213.23.238.209]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 03 Jul 2013 12:27:08 +0200 Received: from rasmus by business-213-023-238-209.static.arcor-ip.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 03 Jul 2013 12:27:08 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Hi, Attached are two minor patches with respect to languages plus one change to the org translation dictionary. The first fixes inconsistencies between the language code in ox.el and ox-latex.el for Norwegian. Before #+LANGUAGE: no would not work. It also adds support for Nynorsk. The second patch adds some more variables to the docstring of org-export-default-language. Why? Because, people may look there when wanting to add support for more languages, and currently it takes a bit of effort to find all the variables that needs fixing. The third patch adds some support for Norwegian, Danish and Swedish languages in the translation dictionary. I'm open to criticism of these translations, of course. –Rasmus -- When the facts change, I change my mind. What do you do, sir? --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-Extended-org-export-default-language-docstring.patch >From 730ab3e4590ff7f98e88b15ed1ab45180e302124 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. TINYCHANGE --- lisp/ox.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/ox.el b/lisp/ox.el index a043dd6..6531fa3 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")) -- 1.8.3.2 --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0003-Some-language-support-for-Danish-Swedish-and-Norwegi.patch Content-Transfer-Encoding: 8bit >From 70f9800b97596ab247c61e42abd45c2f434a9423 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 6531fa3..92ad356 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") -- 1.8.3.2 --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-Bugfix-for-Norwegian-in-ox.el.patch Content-Transfer-Encoding: 8bit >From f78487862ea006458ad90084b29a2fa9fc5d6543 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. TINYCHANGE --- 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 dcbed54..de6f6f9 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 -- 1.8.3.2 --=-=-=--