diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-10-19 23:01:46 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-10-19 23:01:46 -0700 |
| commit | 5d0aaa0b395c069b76b71a06c60a5292e94c1ef8 (patch) | |
| tree | e90b6ffb074002a80a6f75ceeda90e80e3b8c91e | |
| parent | 60228b40052fd4afaacd69f7d4f253d7ce045734 (diff) | |
| parent | e3cfba292613faa21c61d539f6e33929fd08fade (diff) | |
| download | pandoc-5d0aaa0b395c069b76b71a06c60a5292e94c1ef8.tar.gz | |
Merge pull request #137 from mb21/lang-inlines
LaTeX template: add babel-otherlangs and babel-newcommands
| -rw-r--r-- | default.beamer | 7 | ||||
| -rw-r--r-- | default.latex | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/default.beamer b/default.beamer index 3a0d76b43..dcbc16196 100644 --- a/default.beamer +++ b/default.beamer @@ -67,14 +67,15 @@ $endif$ \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts }{} $if(lang)$ -\ifxetex +\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex + \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$$sep$,$endfor$,main=$babel-lang$]{babel} + $babel-newcommands$ +\else \usepackage{polyglossia} \setmainlanguage[$polyglossia-lang.options$]{$polyglossia-lang.name$} $for(polyglossia-otherlangs)$ \setotherlanguage[$polyglossia-otherlangs.options$]{$polyglossia-otherlangs.name$} $endfor$ -\else - \usepackage[shorthands=off,$babel-lang$]{babel} \fi $endif$ $if(natbib)$ diff --git a/default.latex b/default.latex index fd599648f..b2ae26ba9 100644 --- a/default.latex +++ b/default.latex @@ -80,14 +80,15 @@ $endif$ $if(hidelinks)$,hidelinks,$endif$} \urlstyle{same} % don't use monospace font for urls $if(lang)$ -\ifxetex +\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex + \usepackage[shorthands=off,$for(babel-otherlangs)$$babel-otherlangs$$sep$,$endfor$,main=$babel-lang$]{babel} + $babel-newcommands$ +\else \usepackage{polyglossia} \setmainlanguage[$polyglossia-lang.options$]{$polyglossia-lang.name$} $for(polyglossia-otherlangs)$ \setotherlanguage[$polyglossia-otherlangs.options$]{$polyglossia-otherlangs.name$} $endfor$ -\else - \usepackage[shorthands=off,$babel-lang$]{babel} \fi $endif$ $if(natbib)$ |