update pandoc-default.latex-no-luatex.patch

remove a couple of old unused 1.8 patches
epel9
Jens Petersen 13 years ago
parent 5a7c748db3
commit f56aa4037b

@ -1,17 +0,0 @@
--- pandoc-1.8.2.1/src/markdown2pdf.hs~ 2011-08-02 03:02:52.000000000 +0900
+++ pandoc-1.8.2.1/src/markdown2pdf.hs 2011-12-22 12:08:02.528735085 +0900
@@ -173,8 +173,12 @@
saveOutput :: FilePath -> FilePath -> IO ()
saveOutput input output = do
- copyFile (encodeString input) (encodeString output)
- UTF8.hPutStrLn stderr $! "Created " ++ output
+ inExists <- doesFileExist (encodeString input)
+ when inExists $
+ copyFile (encodeString input) (encodeString output)
+ outExists <- doesFileExist (encodeString input)
+ when outExists $
+ UTF8.hPutStrLn stderr $! "Created " ++ output
main :: IO ()
main = bracket

@ -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}

@ -1,11 +0,0 @@
--- pandoc-1.8.2.1/pandoc.cabal~ 2011-08-02 03:02:52.000000000 +0900
+++ pandoc-1.8.2.1/pandoc.cabal 2012-01-26 11:44:45.097493599 +0900
@@ -168,7 +168,7 @@
Default: True
Flag highlighting
Description: Compile in support for syntax highlighting of code blocks.
- Default: False
+ Default: True
Flag executable
Description: Build the pandoc executable.
Default: True

@ -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

Loading…
Cancel
Save