diff options
| -rw-r--r-- | default.beamer | 15 | ||||
| -rw-r--r-- | default.docbook4 (renamed from default.docbook) | 0 | ||||
| -rw-r--r-- | default.docbook5 | 7 | ||||
| -rw-r--r-- | default.epub2 (renamed from default.epub) | 0 | ||||
| -rw-r--r-- | default.html4 (renamed from default.html) | 0 | ||||
| -rw-r--r-- | default.latex | 31 |
6 files changed, 36 insertions, 17 deletions
diff --git a/default.beamer b/default.beamer index 04604fdfd..58b90d7b3 100644 --- a/default.beamer +++ b/default.beamer @@ -97,6 +97,9 @@ $for(bibliography)$ \addbibresource{$bibliography$} $endfor$ $endif$ +$if(verbatim-in-note)$ +\usepackage{fancyvrb} +$endif$ \hypersetup{ $if(title-meta)$ pdftitle={$title-meta$}, @@ -105,7 +108,7 @@ $if(author-meta)$ pdfauthor={$author-meta$}, $endif$ $if(keywords)$ - pdfkeywords={$for(keywords)$$keywords$$sep$; $endfor$}, + pdfkeywords={$for(keywords)$$keywords$$sep$, $endfor$}, $endif$ $if(colorlinks)$ colorlinks=true, @@ -116,6 +119,10 @@ $else$ pdfborder={0 0 0}, $endif$ breaklinks=true} +\urlstyle{same} % don't use monospace font for urls +$if(verbatim-in-note)$ +\VerbatimFootnotes % allows verbatim text in footnotes +$endif$ $if(listings)$ \usepackage{listings} $endif$ @@ -125,10 +132,6 @@ $endif$ $if(highlighting-macros)$ $highlighting-macros$ $endif$ -$if(verbatim-in-note)$ -\usepackage{fancyvrb} -\VerbatimFootnotes % allows verbatim text in footnotes -$endif$ $if(tables)$ \usepackage{longtable,booktabs} \usepackage{caption} @@ -189,7 +192,7 @@ $endif$ \providecommand{\tightlist}{% \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} $if(numbersections)$ -\setcounter{secnumdepth}{5} +\setcounter{secnumdepth}{$if(secnumdepth)$$secnumdepth$$else$5$endif$} $else$ \setcounter{secnumdepth}{0} $endif$ diff --git a/default.docbook b/default.docbook4 index 5313c4083..5313c4083 100644 --- a/default.docbook +++ b/default.docbook4 diff --git a/default.docbook5 b/default.docbook5 index b3a0b6def..415ccf9c3 100644 --- a/default.docbook5 +++ b/default.docbook5 @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <!DOCTYPE article> +<article + xmlns="http://docbook.org/ns/docbook" version="5.0" $if(mathml)$ -<article xmlns="http://docbook.org/ns/docbook" version="5.0"> -$else$ -<article xmlns="http://docbook.org/ns/docbook" version="5.0"> + xmlns:mml="http://www.w3.org/1998/Math/MathML" $endif$ + xmlns:xlink="http://www.w3.org/1999/xlink" > <info> <title>$title$</title> $if(author)$ diff --git a/default.epub b/default.epub2 index afcf96a3e..afcf96a3e 100644 --- a/default.epub +++ b/default.epub2 diff --git a/default.html b/default.html4 index 8caea26c8..8caea26c8 100644 --- a/default.html +++ b/default.html4 diff --git a/default.latex b/default.latex index 3b80d3cdc..030ab90f1 100644 --- a/default.latex +++ b/default.latex @@ -21,11 +21,15 @@ $if(euro)$ \usepackage{eurosym} $endif$ \else % if luatex or xelatex +$if(mathspec)$ \ifxetex \usepackage{mathspec} \else - \usepackage{fontspec} + \usepackage{unicode-math} \fi +$else$ + \usepackage{unicode-math} +$endif$ \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} $for(fontfamilies)$ \newfontfamily{$fontfamilies.name$}[$fontfamilies.options$]{$fontfamilies.font$} @@ -43,7 +47,15 @@ $if(monofont)$ \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$for(monofontoptions)$$monofontoptions$$sep$,$endfor$$endif$]{$monofont$} $endif$ $if(mathfont)$ +$if(mathspec)$ + \ifxetex \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} + \else + \setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} + \fi +$else$ + \setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} +$endif$ $endif$ $if(CJKmainfont)$ \usepackage{xeCJK} @@ -54,11 +66,12 @@ $endif$ \IfFileExists{upquote.sty}{\usepackage{upquote}}{} % use microtype if available \IfFileExists{microtype.sty}{% -\usepackage{microtype} +\usepackage[$for(microtypeoptions)$$microtypeoptions$$sep$,$endfor$]{microtype} \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts }{} -$if(geometry)$ -\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry} +\PassOptionsToPackage{hyphens}{url} % url is loaded by hyperref +$if(verbatim-in-note)$ +\usepackage{fancyvrb} $endif$ \usepackage[unicode=true]{hyperref} $if(colorlinks)$ @@ -84,6 +97,12 @@ $else$ $endif$ breaklinks=true} \urlstyle{same} % don't use monospace font for urls +$if(verbatim-in-note)$ +\VerbatimFootnotes % allows verbatim text in footnotes +$endif$ +$if(geometry)$ +\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry} +$endif$ $if(lang)$ \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$,$endfor$main=$babel-lang$]{babel} @@ -117,10 +136,6 @@ $endif$ $if(highlighting-macros)$ $highlighting-macros$ $endif$ -$if(verbatim-in-note)$ -\usepackage{fancyvrb} -\VerbatimFootnotes % allows verbatim text in footnotes -$endif$ $if(tables)$ \usepackage{longtable,booktabs} % Fix footnotes in tables (requires footnote package) |