diff options
author | ickc <ickc@users.noreply.github.com> | 2016-05-09 19:24:40 -0700 |
---|---|---|
committer | ickc <ickc@users.noreply.github.com> | 2016-05-09 19:24:40 -0700 |
commit | 0ae60a91535a8f55f3061f36fdb3a54f6ddda85d (patch) | |
tree | f0c74ae411967ed5f67bd8b0bdf175ee5ca964ab /tests/writers-lang-and-dir.latex | |
parent | 846fa8704618e7e544313f5b3b627ccb6e65b550 (diff) | |
parent | f7601297f0ff184a59efdc3ea279137fc6012eef (diff) | |
download | pandoc-0ae60a91535a8f55f3061f36fdb3a54f6ddda85d.tar.gz |
Merge pull request #1 from jgm/master
Merge from jgm's master
Diffstat (limited to 'tests/writers-lang-and-dir.latex')
-rw-r--r-- | tests/writers-lang-and-dir.latex | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/writers-lang-and-dir.latex b/tests/writers-lang-and-dir.latex index 056809a5e..346675353 100644 --- a/tests/writers-lang-and-dir.latex +++ b/tests/writers-lang-and-dir.latex @@ -27,16 +27,16 @@ breaklinks=true} \urlstyle{same} % don't use monospace font for urls \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex - \usepackage[shorthands=off,ngerman,british,ngerman,spanish,french,main=english]{babel} + \usepackage[shorthands=off,ngerman,british,nswissgerman,spanish,french,main=english]{babel} \newcommand{\textgerman}[2][]{\foreignlanguage{ngerman}{#2}} - \newenvironment{german}[1]{\begin{otherlanguage}{ngerman}}{\end{otherlanguage}} + \newenvironment{german}[2][]{\begin{otherlanguage}{ngerman}}{\end{otherlanguage}} \newcommand{\textenglish}[2][]{\foreignlanguage{british}{#2}} - \newenvironment{english}[1]{\begin{otherlanguage}{british}}{\end{otherlanguage}} + \newenvironment{english}[2][]{\begin{otherlanguage}{british}}{\end{otherlanguage}} \let\oritextspanish\textspanish \AddBabelHook{spanish}{beforeextras}{\renewcommand{\textspanish}{\oritextspanish}} \AddBabelHook{spanish}{afterextras}{\renewcommand{\textspanish}[2][]{\foreignlanguage{spanish}{##2}}} \newcommand{\textfrench}[2][]{\foreignlanguage{french}{#2}} - \newenvironment{french}[1]{\begin{otherlanguage}{french}}{\end{otherlanguage}} + \newenvironment{french}[2][]{\begin{otherlanguage}{french}}{\end{otherlanguage}} \else \usepackage{polyglossia} \setmainlanguage[]{english} |