diff --git a/README b/README --- a/README +++ b/README @@ -3598,8 +3598,9 @@ with the `src` attribute. For example: Literate Haskell support diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,12 @@ +pandoc (1.15.2.1) + + * Added two missing test files, and `stack.yaml`, to + `extra-source-files` so they're included in the source tarball. + + * reveal.js template: Fixed parallaxBackground options. + `parallaxBackgroundHorizontal` and `parallaxBackgroundVertical` + need integer values, not strings. (Vaughn Iverson) + pandoc (1.15.2) * `pandoc my.md -t context -o my.pdf` will now create a PDF using @@ -112,8 +121,9 @@ the tags linking to media that should not be downloaded. Example: * HTML writer: use width on whole table if col widths sum to < 100%. diff --git a/data/templates/default.revealjs b/data/templates/default.revealjs --- a/data/templates/default.revealjs +++ b/data/templates/default.revealjs @@ -198,10 +198,10 @@ $if(parallaxBackgroundHorizontal)$ // Amount to move parallax background (horizontal and vertical) on slide change // Number, e.g. 100 - parallaxBackgroundHorizontal: '$parallaxBackgroundHorizontal$', + parallaxBackgroundHorizontal: $parallaxBackgroundHorizontal$, $endif$ $if(parallaxBackgroundVertical)$ - parallaxBackgroundVertical: '$parallaxBackgroundVertical$', + parallaxBackgroundVertical: $parallaxBackgroundVertical$, $endif$ $if(width)$ // The "normal" size of the presentation, aspect ratio will be preserved diff --git a/man/pandoc.1 b/man/pandoc.1 --- a/man/pandoc.1 +++ b/man/pandoc.1 @@ -1,5 +1,5 @@ .\"t -.TH PANDOC 1 "November 12, 2015" "pandoc 1.15.2" +.TH PANDOC 1 "November 12, 2015" "pandoc 1.15.2.1" .SH NAME pandoc - general markup converter .SH SYNOPSIS @@ -4491,8 +4491,9 @@ .nf \f[C] -\ +\ \ +\ \ \f[] .fi diff --git a/pandoc.cabal b/pandoc.cabal --- a/pandoc.cabal +++ b/pandoc.cabal @@ -1,5 +1,5 @@ Name: pandoc -Version: 1.15.2 +Version: 1.15.2.1 Cabal-Version: >= 1.10 Build-Type: Custom License: GPL @@ -113,6 +113,8 @@ -- documentation INSTALL, BUGS, CONTRIBUTING.md, changelog man/pandoc.1 + -- stack build plan + stack.yaml -- files needed to build man page man/capitalizeHeaders.hs man/removeNotes.hs @@ -187,6 +189,8 @@ tests/writer.fb2 tests/writer.opml tests/writer.dokuwiki + tests/writers-lang-and-dir.latex + tests/writers-lang-and-dir.context tests/dokuwiki_inline_formatting.dokuwiki tests/lhs-test.markdown tests/lhs-test.markdown+lhs diff --git a/stack.yaml b/stack.yaml new file mode 100644 --- /dev/null +++ b/stack.yaml @@ -0,0 +1,11 @@ +flags: + pandoc: + trypandoc: false + https: true + embed_data_files: false + old-locale: false + network-uri: true +packages: +- '.' +extra-deps: [] +resolver: lts-3.13 diff --git a/tests/writers-lang-and-dir.context b/tests/writers-lang-and-dir.context new file mode 100644 --- /dev/null +++ b/tests/writers-lang-and-dir.context @@ -0,0 +1,113 @@ +% Enable hyperlinks +\setupinteraction + [state=start, + style=, + color=, + contrastcolor=] +% make chapter, section bookmarks visible when opening document +\placebookmarks[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][chapter, section] +\setupinteractionscreen[option=bookmark] +\setuptagging[state=start] + +% use microtypography +\definefontfeature[default][default][protrusion=quality,expansion=quality,onum=yes,pnum=yes] +\definefontfeature[smallcaps][smallcaps][protrusion=quality,expansion=quality,onum=yes,pnum=yes] +\setupalign[hz,hanging] +\setupbodyfontenvironment[default][em=italic] % use italic as em, not slanted +\setupbodyfont[mainfont] +\setupwhitespace[medium] + +\setuphead[chapter] [style=\tfd,header=empty] +\setuphead[section] [style=\tfc] +\setuphead[subsection] [style=\tfb] +\setuphead[subsubsection] [style=\bf] +\setuphead[subsubsubsection] [style=\sc] +\setuphead[subsubsubsubsection][style=\it] + +\setuphead[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][number=no] + +\definedescription + [description] + [headstyle=bold, style=normal, location=hanging, width=broad, margin=1cm, alternative=hanging] + +\setupitemize[autointro] % prevent orphan list intro +\setupitemize[indentnext=no] + +\setupfloat[figure][default={here,nonumber}] +\setupfloat[table][default={here,nonumber}] + +\setupthinrules[width=15em] % width of horizontal rules + +\setuphead[title][ + style={\tfd\raggedcenter}, + before={\startalignment[middle]}, + after={ + \bigskip\stopalignment}] + + +\starttext + +\section[empty-divs-and-spans]{Empty Divs and Spans} + +Some text and + +div contents + +and more text. + +Next paragraph with a span and a word-thatincludesaspanright? + +\section[directionality]{Directionality} + +Some text and + +\startalignment[righttoleft] +rtl div contents + +\stopalignment + +and more text. + +\startalignment[lefttoright] +and a ltr div. with a {\righttoleft rtl span}. + +\stopalignment + +Next paragraph with a {\righttoleft rtl span} and a +word-that-includesa{\lefttoright ltrspan}right? + +\section[languages]{Languages} + +Some text and + +\start\language[de] +German div contents + +\stop + +and more text. + +Next paragraph with a \start\language[en-gb]British span\stop and a +word-that-includesa\start\language[de-ch]Swiss German span\stop right? + +Some \start\language[es]Spanish text\stop . + +\section[combined]{Combined} + +Some text and + +\start\language[fr] +\startalignment[righttoleft] +French rtl div contents + +\stopalignment +\stop + +and more text. + +Next paragraph with a \start\language[en-gb]{\lefttoright British ltr +span}\stop and a +word-that-includesa\start\language[de-ch]{\lefttoright Swiss German ltr +span}\stop right? + +\stoptext diff --git a/tests/writers-lang-and-dir.latex b/tests/writers-lang-and-dir.latex new file mode 100644 --- /dev/null +++ b/tests/writers-lang-and-dir.latex @@ -0,0 +1,145 @@ +\documentclass[english,]{article} +\usepackage{lmodern} +\usepackage{amssymb,amsmath} +\usepackage{ifxetex,ifluatex} +\usepackage{fixltx2e} % provides \textsubscript +\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex + \usepackage[T1]{fontenc} + \usepackage[utf8]{inputenc} +\else % if luatex or xelatex + \ifxetex + \usepackage{mathspec} + \else + \usepackage{fontspec} + \fi + \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} + \newcommand{\euro}{€} +\fi +% use upquote if available, for straight quotes in verbatim environments +\IfFileExists{upquote.sty}{\usepackage{upquote}}{} +% use microtype if available +\IfFileExists{microtype.sty}{% +\usepackage{microtype} +\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} +\usepackage{hyperref} +\PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref +\hypersetup{unicode=true, + pdfborder={0 0 0}, + 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} + \newcommand{\textgerman}[2][]{\foreignlanguage{ngerman}{#2}} + \newenvironment{german}[1]{\begin{otherlanguage}{ngerman}}{\end{otherlanguage}} + \newcommand{\textenglish}[2][]{\foreignlanguage{british}{#2}} + \newenvironment{english}[1]{\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}} +\else + \usepackage{polyglossia} + \setmainlanguage[]{english} + \setotherlanguage[]{german} + \setotherlanguage[variant=british]{english} + \setotherlanguage[variant=swiss]{german} + \setotherlanguage[]{spanish} + \setotherlanguage[]{french} +\fi +\setlength{\parindent}{0pt} +\setlength{\parskip}{6pt plus 2pt minus 1pt} +\setlength{\emergencystretch}{3em} % prevent overfull lines +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} +\setcounter{secnumdepth}{0} +\ifxetex + % load bidi as late as possible as it modifies e.g. graphicx + \usepackage{bidi} + \fi +\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex + \TeXXeTstate=1 + \newcommand{\RL}[1]{\beginR #1\endR} + \newcommand{\LR}[1]{\beginL #1\endL} + \newenvironment{RTL}{\beginR}{\endR} + \newenvironment{LTR}{\beginL}{\endL} +\fi + +\date{} + +% Redefines (sub)paragraphs to behave more like sections +\ifx\paragraph\undefined\else +\let\oldparagraph\paragraph +\renewcommand{\paragraph}[1]{\oldparagraph{#1}\mbox{}} +\fi +\ifx\subparagraph\undefined\else +\let\oldsubparagraph\subparagraph +\renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}} +\fi + +\begin{document} + +\section{Empty Divs and Spans}\label{empty-divs-and-spans} + +Some text and + +div contents + +and more text. + +Next paragraph with a span and a word-thatincludesaspanright? + +\section{Directionality}\label{directionality} + +Some text and + +\begin{RTL} +rtl div contents +\end{RTL} + +and more text. + +\begin{LTR} +and a ltr div. with a \RL{rtl span}. +\end{LTR} + +Next paragraph with a \RL{rtl span} and a +word-that-includesa\LR{ltrspan}right? + +\section{Languages}\label{languages} + +Some text and + +\begin{german} + +German div contents + +\end{german} + +and more text. + +Next paragraph with a \textenglish[variant=british]{British span} and a +word-that-includesa\textgerman[variant=swiss]{Swiss German span}right? + +Some \textspanish{Spanish text}. + +\section{Combined}\label{combined} + +Some text and + +\begin{RTL} +\begin{french} + +French rtl div contents + +\end{french} +\end{RTL} + +and more text. + +Next paragraph with a \LR{\textenglish[variant=british]{British ltr +span}} and a word-that-includesa\LR{\textgerman[variant=swiss]{Swiss +German ltr span}}right? + +\end{document}