diff --git a/eittlanda.org b/eittlanda.org index ed84fa3..bd126fd 100644 --- a/eittlanda.org +++ b/eittlanda.org @@ -4,14 +4,13 @@ #+HTML_HEAD: #+HTML_HEAD: #+HTML_HEAD: -#+LATEX_CLASS: book -#+LATEX_HEADER: \usepackage{tocloft} \setlength{\cftchapnumwidth}{3em} +#+LATEX_CLASS: conlang #+LATEX_HEADER: \usepackage{allrunes} #+MACRO: rune-manual @@latex:\textara{$1}@@ @@html:$2@@ #+MACRO: rune (eval (conlanging/eittlanda-org-export-runes "$1")) #+STARTUP: align shrink -#+OPTIONS: toc:nil auto-id:t -#+TOC: headlines +#+OPTIONS: auto-id:t +# #+TOC: headlines * Propos préliminaires :PROPERTIES: @@ -176,6 +175,7 @@ trouvé avec la carte [[img:map-typo]] #+NAME: img:map-typo + #+ATTR_LATEX: :float sideways #+CAPTION: Topologie d’Eittlande [[./img/eittlanda/map-hq.jpg]] @@ -205,8 +205,9 @@ Il nomma alors son fils co-roi - #+NAME: Eittland-kings - #+CAPTION: Liste des rois Eittlandais + #+NAME: Eittland-kings:1 + #+ATTR_LATEX: :float sideways + #+CAPTION: Liste des rois Eittlandais de 915 à 1392 | | | | | | | | | | | | roi | naissance | mort | âge | règne | co-roi | naissance | mort | âge | règne | |-------------------------------+-----------+------+------+-----------+--------------------------------+-----------+------+------+-----------| diff --git a/headers/headers.org b/headers/headers.org index 0c20f1c..dfda703 100644 --- a/headers/headers.org +++ b/headers/headers.org @@ -4,36 +4,24 @@ #+CREATOR: Lucien Cartier-Tilet #+LANGUAGE: fr -# ### LaTeX #################################################################### - -#+LATEX_CLASS: article -#+LaTeX_CLASS_OPTIONS: [a5paper,twoside] -#+LATEX_HEADER: \usepackage{xltxtra,fontspec,xunicode} -#+LATEX_HEADER: \usepackage[total={11cm,17cm}]{geometry} -#+LATEX_HEADER: \setromanfont{Charis SIL} -#+LATEX_HEADER: \usepackage{xcolor} -#+LATEX_HEADER: \usepackage{hyperref} -#+LATEX_HEADER: \hypersetup{colorlinks=true,linkbordercolor=red,linkcolor=blue,pdfborderstyle={/S/U/W 1}} -#+LATEX_HEADER: \usepackage{multicol} -#+LATEX_HEADER: \usepackage{indentfirst} -#+LATEX_HEADER: \sloppy - -# ### HTML ##################################################################### - -#+HTML_DOCTYPE: html5 -#+HTML_HEAD: -#+HTML_HEAD: -#+HTML_HEAD: -#+HTML_HEAD: -#+HTML_HEAD: -#+HTML_HEAD: -#+HTML_HEAD: -#+HTML_HEAD: - # ### CODE ##################################################################### +#+name: setup +#+begin_src emacs-lisp :results silent :exports none + (unless (find "per-file-class" org-latex-classes :key 'car + :test 'equal) + (add-to-list 'org-latex-classes + '("conlang" + "\\documentclass{book}" + ;; ("\\part{%s}" . "\\part*{%s}") + ("\\chapter{%s}" . "\\chapter*{%s}") + ("\\section{%s}" . "\\section*{%s}") + ("\\subsection{%s}" . "\\subsection*{%s}") + ("\\subsubsection{%s}" . "\\subsubsection*{%s}")))) +#+end_src + #+NAME: tree-dot -#+BEGIN_SRC emacs-lisp :noweb yes :exports none :eval yes :cache yes +#+BEGIN_SRC emacs-lisp :noweb yes :exports none :eval yes (defun declare-node (node-text node-generation) "Declares a node in the graphviz source code. The node’s identifier will be ~node-generation~, and it will bear the label ~node-text~." @@ -85,6 +73,33 @@ "}"))) #+END_SRC +# ### LaTeX #################################################################### + +#+LATEX_CLASS: conlang +#+LaTeX_CLASS_OPTIONS: [a4paper,twoside] +#+LATEX_HEADER: \usepackage{tocloft} \setlength{\cftchapnumwidth}{3em} +#+LATEX_HEADER: \usepackage{xltxtra,fontspec,xunicode} +#+LATEX_HEADER: \usepackage[total={17cm,22cm}]{geometry} +#+LATEX_HEADER: \setromanfont{Charis SIL} +#+LATEX_HEADER: \usepackage{xcolor} +#+LATEX_HEADER: \usepackage{hyperref} +#+LATEX_HEADER: \hypersetup{colorlinks=true,linkbordercolor=red,linkcolor=blue,pdfborderstyle={/S/U/W 1}} +#+LATEX_HEADER: \usepackage{multicol} +#+LATEX_HEADER: \usepackage{indentfirst} +#+LATEX_HEADER: \sloppy + +# ### HTML ##################################################################### + +#+HTML_DOCTYPE: html5 +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: + # ### MACROS ################################################################### #+MACRO: newline @@latex:\hspace{0pt}\\@@ @@html:
@@ #+MACRO: newpage @@latex:\newpage@@