git.iko.soy/typeable/pandoc
on master help sign in
Removed deprecated -C/--custom-header option.

Use --template instead.

commitc6b79d794eb25cb11777d2b720ce01595c780de1 authorJohn MacFarlane <jgm@berkeley.edu> dateSat 11 Dec 2010, 00:22 (16 years ago) parentf5c2082
10 files changed−54
compare with master
unifiedsplit
README−7 man/man1/markdown2pdf.1.md−4 src/pandoc.hs−17 templates/context.template−4 templates/docbook.template−4 templates/latex.template−4 templates/mediawiki.template−3 templates/rtf.template−4 templates/texinfo.template−4 templates/textile.template−3
README−7
@@ -336,11 +336,6 @@ Options
336336 repeatedly to include multiple files. They will be included in the
337337 order specified. Implies `--standalone`.
338338
339−`-C` *FILE*, `--custom-header=`*FILE*
340−: Use contents of *FILE* as the document header. Implies `--standalone`.
341− *Note: This option is deprecated. Users should transition to using
342− `--template` instead.*
343−
344339`--reference-odt=`*FILE*
345340: Use the specified file as a style reference in producing an ODT.
346341 For best results, the reference ODT should be a modified version
@@ -486,8 +481,6 @@ To write a literal `$` in a template, use `$$`.
486481Some variables are set automatically by pandoc. These vary somewhat
487482depending on the output format, but include:
488483
489−`legacy-header`
490−: contents specified by `-C/--custom-header`
491484`header-includes`
492485: contents specified by `-H/--include-in-header` (may have multiple
493486 values)
man/man1/markdown2pdf.1.md−4
@@ -71,10 +71,6 @@ packages are not included in your latex setup, they can be obtained from
7171-A *FILE*, \--include-after-body=*FILE*
7272: Include (LaTeX) contents of *FILE* at the end of the document body.
7373
74−-C *FILE*, \--custom-header=*FILE*
75−: Use contents of *FILE* as the document header. *Note: This option is
76− deprecated. Users should transition to using `--template` instead.*
77−
7874\--bibliography=*FILE*
7975: Specify bibliography database to be used in resolving
8076 citations. The database type will be determined from the
src/pandoc.hs−17
@@ -409,16 +409,6 @@ options =
409409 "FILENAME")
410410 "" -- "File to include after document body"
411411
412− , Option "C" ["custom-header"]
413− (ReqArg
414− (\arg opt -> do
415− text <- UTF8.readFile arg
416− let newVars = ("legacy-header", text) : optVariables opt
417− return opt { optVariables = newVars
418− , optStandalone = True })
419− "FILENAME")
420− "" -- "File to use for custom header (implies -s)"
421−
422412 , Option "T" ["title-prefix"]
423413 (ReqArg
424414 (\arg opt -> do
@@ -635,13 +625,6 @@ main = do
635625 mapM_ (\arg -> UTF8.hPutStrLn stdout arg) args
636626 exitWith ExitSuccess
637627
638− -- warn about deprecated options
639− case lookup "legacy-header" variables of
640− Just _ -> UTF8.hPutStrLn stderr $
641− "Warning: The -C/--custom-header is deprecated.\n" ++
642− "Please transition to using --template instead."
643− Nothing -> return ()
644−
645628 let sources = if ignoreArgs then [] else args
646629
647630 datadir <- case mbDataDir of
templates/context.template−4
@@ -1,6 +1,3 @@
1−$if(legacy-header)$
2−$legacy-header$
3−$else$
41\enableregime[utf] % use UTF-8
52
63\setupcolors[state=start]
@@ -52,7 +49,6 @@ after={\blank[medium]},
5249]
5350
5451\protect
55−$endif$
5652$for(header-includes)$
5753$header-includes$
5854$endfor$
templates/docbook.template−4
@@ -1,10 +1,6 @@
1−$if(legacy-header)$
2−$legacy-header$
3−$else$
41<?xml version="1.0" encoding="utf-8" ?>
52<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
63 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
7−$endif$
84<article>
95 <articleinfo>
106 <title>$title$</title>
templates/latex.template−4
@@ -1,6 +1,3 @@
1−$if(legacy-header)$
2−$legacy-header$
3−$else$
41\documentclass$if(fontsize)$[$fontsize$]$endif${article}
52\usepackage{amssymb,amsmath}
63$if(xetex)$
@@ -20,7 +17,6 @@ $if(lhs)$
2017\usepackage{listings}
2118\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
2219$endif$
23−$endif$
2420$if(verbatim-in-note)$
2521\usepackage{fancyvrb}
2622$endif$
templates/mediawiki.template−3
@@ -1,6 +1,3 @@
1−$if(legacy-header)$
2−$legacy-header$
3−$endif$
41$for(include-before)$
52$include-before$
63
templates/rtf.template−4
@@ -1,10 +1,6 @@
1−$if(legacy-header)$
2−$legacy-header$
3−$else$
41{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 Courier;}}
52{\colortbl;\red255\green0\blue0;\red0\green0\blue255;}
63\widowctrl\hyphauto
7−$endif$
84$for(header-includes)$
95$header-includes$
106$endfor$
templates/texinfo.template−4
@@ -1,9 +1,5 @@
1−$if(legacy-header)$
2−$legacy-header$
3−$else$
41\input texinfo
52@documentencoding utf-8
6−$endif$
73$for(header-includes)$
84$header-includes$
95$endfor$
templates/textile.template−3
@@ -1,6 +1,3 @@
1−$if(legacy-header)$
2−$legacy-header$
3−$endif$
41$for(include-before)$
52$include-before$
63