mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-13 09:32:19 +00:00
Code

Merge branch 'master' of orgmode.org:org-mode

Browse Source
This commit is contained in:
Bastien Guerry 2013-07-03 14:57:30 +02:00
commit 82a9f66f46
2 changed files with 90 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ox-latex.el
View File

@ -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

92
lisp/ox.el
View File

@ -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"))
@ -4892,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 "&laquo;" :latex "<<"
:texinfo "@guillemetleft{}")
(opening-single-quote :utf-8 "›" :html "&rsaquo;" :latex "\\frq{}"
:texinfo "@guilsinglright{}")
(closing-single-quote :utf-8 "‹" :html "&lsaquo;" :latex "\\flq{}"
:texinfo "@guilsingleft{}")
(apostrophe :utf-8 "’" :html "&rsquo;"))
("de"
(opening-double-quote :utf-8 "„" :html "&bdquo;" :latex "\"`"
:texinfo "@quotedblbase{}")
(closing-double-quote :utf-8 "“" :html "&ldquo;" :latex "\"'"
@ -4925,7 +4939,42 @@ Return a list of src-block elements with a caption."
:texinfo "@guillemetleft{}@tie{}")
(closing-single-quote :utf-8 " »" :html "&nbsp;&raquo;" :latex "\\fg{}"
:texinfo "@tie{}@guillemetright{}")
(apostrophe :utf-8 "’" :html "&rsquo;")))
(apostrophe :utf-8 "’" :html "&rsquo;"))
("no"
;; https://nn.wikipedia.org/wiki/Sitatteikn
(opening-double-quote :utf-8 "«" :html "&laquo;" :latex "\\guillemotleft{}"
:texinfo "@guillemetleft{}")
(closing-double-quote :utf-8 "»" :html "&raquo;" :latex "\\guillemotright{}"
:texinfo "@guillemetright{}")
(opening-single-quote :utf-8 "‘" :html "&lsquo;" :latex "`" :texinfo "`")
(closing-single-quote :utf-8 "’" :html "&rsquo;" :latex "'" :texinfo "'")
(apostrophe :utf-8 "’" :html "&rsquo;"))
("nb"
;; https://nn.wikipedia.org/wiki/Sitatteikn
(opening-double-quote :utf-8 "«" :html "&laquo;" :latex "\\guillemotleft{}"
:texinfo "@guillemetleft{}")
(closing-double-quote :utf-8 "»" :html "&raquo;" :latex "\\guillemotright{}"
:texinfo "@guillemetright{}")
(opening-single-quote :utf-8 "‘" :html "&lsquo;" :latex "`" :texinfo "`")
(closing-single-quote :utf-8 "’" :html "&rsquo;" :latex "'" :texinfo "'")
(apostrophe :utf-8 "’" :html "&rsquo;"))
("nn"
;; https://nn.wikipedia.org/wiki/Sitatteikn
(opening-double-quote :utf-8 "«" :html "&laquo;" :latex "\\guillemotleft{}"
:texinfo "@guillemetleft{}")
(closing-double-quote :utf-8 "»" :html "&raquo;" :latex "\\guillemotright{}"
:texinfo "@guillemetright{}")
(opening-single-quote :utf-8 "‘" :html "&lsquo;" :latex "`" :texinfo "`")
(closing-single-quote :utf-8 "’" :html "&rsquo;" :latex "'" :texinfo "'")
(apostrophe :utf-8 "’" :html "&rsquo;"))
("sv"
;; based on https://sv.wikipedia.org/wiki/Citattecken
(opening-double-quote :utf-8 "”" :html "&rdquo;" :latex "’’" :texinfo "’’")
(closing-double-quote :utf-8 "”" :html "&rdquo;" :latex "’’" :texinfo "’’")
(opening-single-quote :utf-8 "’" :html "&rsquo;" :latex "’" :texinfo "`")
(closing-single-quote :utf-8 "’" :html "&rsquo;" :latex "’" :texinfo "'")
(apostrophe :utf-8 "’" :html "&rsquo;"))
)
"Smart quotes translations.
Alist whose CAR is a language string and CDR is an alist with
@ -5219,7 +5268,7 @@ them."
("Author"
("ca" :default "Autor")
("cs" :default "Autor")
("da" :default "Ophavsmand")
("da" :default "Forfatter")
("de" :default "Autor")
("eo" :html "A&#365;toro")
("es" :default "Autor")
@ -5262,20 +5311,35 @@ them."
("zh-CN" :html "&#26085;&#26399;" :utf-8 "日期")
("zh-TW" :html "&#26085;&#26399;" :utf-8 "日期"))
("Equation"
("da" :default "Ligning")
("de" :default "Gleichung")
("es" :html "Ecuaci&oacute;n" :default "Ecuación")
("fr" :ascii "Equation" :default "Équation")
("no" :default "Ligning")
("nb" :default "Ligning")
("nn" :default "Likning")
("sv" :default "Ekvation")
("zh-CN" :html "&#26041;&#31243;" :utf-8 "方程"))
("Figure"
("da" :default "Figur")
("de" :default "Abbildung")
("es" :default "Figura")
("ja" :html "&#22259;" :utf-8 "図")
("no" :default "Illustrasjon")
("nb" :default "Illustrasjon")
("nn" :default "Illustrasjon")
("sv" :default "Illustration")
("zh-CN" :html "&#22270;" :utf-8 "图"))
("Figure %d:"
("da" :default "Figur %d")
("de" :default "Abbildung %d:")
("es" :default "Figura %d:")
("fr" :default "Figure %d :" :html "Figure&nbsp;%d&nbsp;:")
("ja" :html "&#22259;%d: " :utf-8 "図%d: ")
("no" :default "Illustrasjon %d")
("nb" :default "Illustrasjon %d")
("nn" :default "Illustrasjon %d")
("sv" :default "Illustration %d")
("zh-CN" :html "&#22270;%d&nbsp;" :utf-8 "图%d "))
("Footnotes"
("ca" :html "Peus de p&agrave;gina")
@ -5302,21 +5366,33 @@ them."
("zh-CN" :html "&#33050;&#27880;" :utf-8 "脚注")
("zh-TW" :html "&#33139;&#35387;" :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 "&#20195;&#30721;&#30446;&#24405;" :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 "&#34920;&#26684;&#30446;&#24405;" :utf-8 "表格目录"))
("Listing %d:"
("da" :default "Program %d")
("de" :default "Programmlisting %d")
("es" :default "Listado de programa %d")
("fr" :default "Programme %d :" :html "Programme&nbsp;%d&nbsp;:")
("no" :default "Dataprogram")
("nb" :default "Dataprogram")
("zh-CN" :html "&#20195;&#30721;%d&nbsp;" :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")
@ -5328,10 +5404,15 @@ them."
("ja" :html "&#34920;" :utf-8 "表")
("zh-CN" :html "&#34920;" :utf-8 "表"))
("Table %d:"
("da" :default "Tabel %d")
("de" :default "Tabelle %d")
("es" :default "Tabla %d")
("fr" :default "Tableau %d :")
("ja" :html "&#34920;%d:" :utf-8 "表%d:")
("no" :default "Tabell %d")
("nb" :default "Tabell %d")
("nn" :default "Tabell %d")
("sv" :default "Tabell %d")
("zh-CN" :html "&#34920;%d&nbsp;" :utf-8 "表%d "))
("Table of Contents"
("ca" :html "&Iacute;ndex")
@ -5358,6 +5439,7 @@ them."
("zh-CN" :html "&#30446;&#24405;" :utf-8 "目录")
("zh-TW" :html "&#30446;&#37636;" :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")