[pandoc] update pandoc-default.latex-no-luatex.patch
Jens Petersen
petersen at fedoraproject.org
Sun Jun 10 12:48:55 UTC 2012
commit f56aa4037b966b768e06d157d95da0c8213d9793
Author: Jens Petersen <petersen at redhat.com>
Date: Sun Jun 10 21:48:47 2012 +0900
update pandoc-default.latex-no-luatex.patch
remove a couple of old unused 1.8 patches
pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch | 17 -----
pandoc-default.latex-no-luatex.patch | 72 +++++---------------
pandoc-enable-highlighting-flag.patch | 11 ---
pandoc.spec | 4 +-
4 files changed, 19 insertions(+), 85 deletions(-)
---
diff --git a/pandoc-default.latex-no-luatex.patch b/pandoc-default.latex-no-luatex.patch
index a299375..b72c6c8 100644
--- a/pandoc-default.latex-no-luatex.patch
+++ b/pandoc-default.latex-no-luatex.patch
@@ -1,59 +1,23 @@
-diff -u pandoc-1.9.2/templates/default.latex\~ pandoc-1.9.2/templates/default.latex
---- pandoc-1.9.2/templates/default.latex~ 2012-04-06 05:13:56.000000000 +0900
-+++ pandoc-1.9.2/templates/default.latex 2012-04-25 13:20:25.024947625 +0900
-@@ -1,6 +1,7 @@
- \documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$lang$,$endif$]{$documentclass$}
+diff -u pandoc-1.9.4.1/templates/default.latex\~ pandoc-1.9.4.1/templates/default.latex
+--- pandoc-1.9.4.1/templates/default.latex~ 2012-06-09 05:53:31.000000000 +0900
++++ pandoc-1.9.4.1/templates/default.latex 2012-06-10 21:43:32.321646301 +0900
+@@ -2,16 +2,16 @@
+ \usepackage[T1]{fontenc}
+ \usepackage{lmodern}
\usepackage{amssymb,amsmath}
-\usepackage{ifxetex,ifluatex}
-+%\usepackage{ifxetex,ifluatex}
+\usepackage{ifxetex}
- \ifxetex
- \usepackage{fontspec,xltxtra,xunicode}
- \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
-@@ -18,28 +19,28 @@
- \setmathfont{$mathfont$}
- $endif$
- \else
-- \ifluatex
-- \usepackage{fontspec}
-- \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
-- \newcommand{\euro}{€}
--$if(mainfont)$
-- \setmainfont{$mainfont$}
--$endif$
--$if(sansfont)$
-- \setsansfont{$sansfont$}
--$endif$
--$if(monofont)$
-- \setmonofont{$monofont$}
--$endif$
--$if(mathfont)$
-- \setmathfont{$mathfont$}
--$endif$
-- \else
-+% \ifluatex
-+% \usepackage{fontspec}
-+% \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
-+% \newcommand{\euro}{€}
-+%$if(mainfont)$
-+% \setmainfont{$mainfont$}
-+%$endif$
-+%$if(sansfont)$
-+% \setsansfont{$sansfont$}
-+%$endif$
-+%$if(monofont)$
-+% \setmonofont{$monofont$}
-+%$endif$
-+%$if(mathfont)$
-+% \setmathfont{$mathfont$}
-+%$endif$
-+% \else
- \usepackage[utf8]{inputenc}
+ \usepackage{fixltx2e} % provides \textsubscript
+ % use microtype if available
+ \IfFileExists{microtype.sty}{\usepackage{microtype}}{}
+-\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
++\ifnum 0\ifxetex 1\fi=0 % if pdftex
+ \usepackage[utf8]{inputenc}
$if(euro)$
- \usepackage{eurosym}
+ \usepackage{eurosym}
$endif$
-- \fi
-+% \fi
- \fi
- $if(geometry)$
- \usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
+-\else % if luatex or xelatex
++\else % if xelatex
+ \usepackage{fontspec}
+ \ifxetex
+ \usepackage{xltxtra,xunicode}
diff --git a/pandoc.spec b/pandoc.spec
index 1de7428..181c1e6 100644
--- a/pandoc.spec
+++ b/pandoc.spec
@@ -47,9 +47,8 @@ BuildRequires: ghc-xml-prof
BuildRequires: ghc-zip-archive-prof
BuildRequires: ghc-zlib-prof
Obsoletes: pandoc-markdown2pdf < %{version}-%{release}
-# these two patches should be removed when texlive gets updated
+# this patch should be removed when texlive gets updated
Patch1: pandoc-default.latex-no-luatex.patch
-#Patch2: pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch
%description
%{common_description}
@@ -58,7 +57,6 @@ Patch1: pandoc-default.latex-no-luatex.patch
%prep
%setup -q
%patch1 -p1 -b .orig
-#%%patch2 -p1 -b .orig
%build
More information about the scm-commits
mailing list