Overhauled commands to work with Pandoc 1.8

dsanson · Jan 31, 2011 · b4e2028 · b4e2028
1 parent 85b8b16
commit b4e2028
Show file tree

Hide file tree

Showing 26 changed files with 219 additions and 1,572 deletions.
diff --git a/Commands/Center Pandoc Metadata.tmCommand b/Commands/Center Pandoc Metadata.tmCommand
@@ -6,6 +6,10 @@
 	<string>nop</string>
 	<key>command</key>
 	<string>#!/usr/bin/env ruby
+#
+# This script centers pandoc title blocks
+# to make them look nice.
+#
 
 meta = 1
 width = ENV['TM_COLUMNS'].to_i
@@ -25,7 +29,7 @@ end
 	<key>input</key>
 	<string>document</string>
 	<key>name</key>
-	<string>Center Pandoc Metadata</string>
+	<string>Center Title Block</string>
 	<key>output</key>
 	<string>replaceDocument</string>
 	<key>scope</key>

diff --git a/Commands/Convert HTML to Markdown.tmCommand b/Commands/Convert HTML to Markdown.tmCommand
@@ -11,7 +11,7 @@
 	<key>keyEquivalent</key>
 	<string>^~@m</string>
 	<key>name</key>
-	<string>HTML to Markdown</string>
+	<string>Convert HTML to Markdown</string>
 	<key>output</key>
 	<string>openAsNewDocument</string>
 	<key>scope</key>

diff --git a/Commands/Convert MMD Citations to Pandoc Citations.tmCommand b/Commands/Convert MMD Citations to Pandoc Citations.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>perl -pe 's/\[\]\[#(.*?)\]/[$1]/g' | perl -pe 's/\[(.*?)\]\[#(.*?)\]/[$2\@$1]/g'
+	<string>perl -pe 's/\[\]\[#(.*?)\]/[@$1]/g' | perl -pe 's/\[(.*?)\]\[\#(.*?)\]/[\@$2, $1]/g'
 
 </string>
 	<key>input</key>

diff --git a/Commands/Convert to ConTeXt (citations).tmCommand b/Commands/Convert to ConTeXt (citations).tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>pandoc -Ss -w context </string>
+	<string>pandoc -Ss -w context --bibliography=$TM_PANDOC_BIB</string>
 	<key>input</key>
 	<string>selection</string>
 	<key>keyEquivalent</key>

diff --git a/Commands/Convert to LaTeX (citations).tmCommand b/Commands/Convert to LaTeX (citations).tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>pandoc -sS -w latex --biblio=$TM_PANDOC_BIB --biblio-format=$TM_PANDOC_BIBTYPE --csl=$TM_PANDOC_CSL</string>
+	<string>pandoc -sS -w latex --bibliography=$TM_PANDOC_BIB</string>
 	<key>input</key>
 	<string>selection</string>
 	<key>keyEquivalent</key>

diff --git a/Commands/Convert to ODT (author-date citations).tmCommand b/Commands/Convert to ODT (author-date citations).tmCommand
@@ -7,8 +7,8 @@
 	<key>command</key>
 	<string># $TM_FILEPATH: full path of current doc
 
-filename=${TM_FILEPATH}
+filename="${TM_FILEPATH}"
-basename=${filename%.*}
+basename="${filename%.*}"
 
 # Find a unique name
 
@@ -26,7 +26,7 @@ targetname="$basename$connective$inc.odt"
 # run pandoc
 
 echo "&lt;pre&gt;"
-	pandoc -sS -o "$targetname" --biblio=$TM_PANDOC_BIB --biblio-format=$TM_PANDOC_BIBTYPE --csl=$TM_PANDOC_CSL
+	pandoc -sS -o "$targetname" --bibliography=$TM_PANDOC_BIB
 echo "&lt;/pre&gt;"
 
 # verify that the file exists

diff --git a/Commands/Convert to PDF (citations).tmCommand b/Commands/Convert to PDF (citations).tmCommand
diff --git a/Commands/Convert to PDF (no citations).tmCommand b/Commands/Convert to PDF (no citations).tmCommand
diff --git a/Commands/Convert to PDF via LaTeX (citations).tmCommand b/Commands/Convert to PDF via LaTeX (citations).tmCommand
@@ -17,14 +17,14 @@ if [ -f "$basename.pdf" ]; then
    cp "$basename.pdf" "$basename-old.pdf"
 fi
 echo "&lt;pre&gt;"
-markdown2pdf $opts --biblio="$TM_PANDOC_BIB" --biblio-format="$TM_PANDOC_BIBTYPE" --csl="$TM_PANDOC_CSL" -o "$basename.pdf" &amp;&amp; open "$basename.pdf"
+markdown2pdf $opts --bibliography="$TM_PANDOC_BIB" -o "$basename.pdf" &amp;&amp; open "$basename.pdf"
 echo "&lt;/pre&gt;"</string>
 	<key>input</key>
 	<string>selection</string>
 	<key>keyEquivalent</key>
 	<string>^~@p</string>
 	<key>name</key>
-	<string>Convert to PDF via LaTeX (citations)</string>
+	<string>Convert to PDF (citations)</string>
 	<key>output</key>
 	<string>showAsHTML</string>
 	<key>scope</key>

diff --git a/Commands/Convert to PDF via LaTeX.tmCommand b/Commands/Convert to PDF via LaTeX.tmCommand
@@ -24,7 +24,7 @@ echo "&lt;/pre&gt;"</string>
 	<key>keyEquivalent</key>
 	<string>^~@p</string>
 	<key>name</key>
-	<string>Convert to PDF via LaTeX</string>
+	<string>Convert to PDF</string>
 	<key>output</key>
 	<string>showAsHTML</string>
 	<key>scope</key>

diff --git a/Commands/Convert to PDF via XeLaTeX (citations).tmCommand b/Commands/Convert to PDF via XeLaTeX (citations).tmCommand
diff --git a/Commands/Convert to PDF via XeLaTeX.tmCommand b/Commands/Convert to PDF via XeLaTeX.tmCommand
diff --git a/Commands/Demote Headers.tmCommand b/Commands/Demote Headers.tmCommand
@@ -5,7 +5,8 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string># this calls a compiled haskell program. The source is in the
+	<string># this calls a compiled haskell program. 
+# The source is in the
 # Pandoc.tmbundle/Support/bin
 
 demoteheaders</string>

diff --git a/Commands/Freshen Date.tmCommand b/Commands/Freshen Date.tmCommand
@@ -5,7 +5,16 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>date=`date "+%B %d, %Y"`
+	<string># If the document has a three-line pandoc title
+# block, this should put the current date
+# on the third line.
+#
+# Note that it is pretty dumb: it won't handle
+# the multi-line title or author fields that
+# pandoc allows
+#
+
+date=`date "+%B %d, %Y"`
 sed "3 s/%.*/% $date/"</string>
 	<key>input</key>
 	<string>document</string>

diff --git a/Commands/Generate HTML (author-date citations).tmCommand b/Commands/Generate HTML (author-date citations).tmCommand
@@ -5,8 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>pandoc -Ss --biblio=$TM_PANDOC_BIB --biblio-format=$TM_PANDOC_BIBTYPE --csl=$TM_PANDOC_CSL
+	<string>pandoc -Ss --bibliography=$TM_PANDOC_BIB</string>
-</string>
 	<key>input</key>
 	<string>selection</string>
 	<key>keyEquivalent</key>

diff --git a/Commands/Preview as HTML (author-date citations) copy.tmCommand b/Commands/Preview as HTML (author-date citations) copy.tmCommand
@@ -5,8 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>pandoc -Ss --biblio=$TM_PANDOC_BIB --biblio-format=$TM_PANDOC_BIBTYPE --csl=$TM_PANDOC_CSL
+	<string>pandoc -Ss --bibliography=$TM_PANDOC_BIB
-
 </string>
 	<key>input</key>
 	<string>selection</string>

diff --git a/Commands/Promote Headers.tmCommand b/Commands/Promote Headers.tmCommand
@@ -5,7 +5,8 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string># this calls a compiled haskell program. The source is in the
+	<string># this calls a compiled haskell program. 
+# The source is in the
 # Pandoc.tmbundle/Support/bin
 
 promoteheaders</string>

diff --git a/Commands/Tabs to Bullets.tmCommand b/Commands/Tabs to Bullets.tmCommand
@@ -5,9 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string># Adapted from the wonderful Outlines Bundle, modified
+	<string># Taken from the wonderful Outlines Bundle.
-# so that the conversion looks more like the bullets pandoc
-# generates. 
 
 perl -pe 's/^(\s*)/\1-   /'</string>
 	<key>input</key>

diff --git a/Commands/m2m: nowrap, ref, cites.tmCommand b/Commands/m2m: nowrap, ref, cites.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>pandoc -s -t markdown --no-wrap --reference-links --biblio=$TM_PANDOC_BIB --biblio-format=$TM_PANDOC_BIBTYPE --csl=$TM_PANDOC_CSL</string>
+	<string>pandoc -s -t markdown --no-wrap --reference-links --bibliography=$TM_PANDOC_BIB</string>
 	<key>input</key>
 	<string>selection</string>
 	<key>keyEquivalent</key>

diff --git a/Commands/m2m: wrap, inline, ref.tmCommand b/Commands/m2m: wrap, inline, ref.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>pandoc -s -t markdown --biblio=$TM_PANDOC_BIB --biblio-format=$TM_PANDOC_BIBTYPE --csl=$TM_PANDOC_CSL --reference-links</string>
+	<string>pandoc -s -t markdown --bibliography=$TM_PANDOC_BIB --reference-links</string>
 	<key>input</key>
 	<string>selection</string>
 	<key>keyEquivalent</key>

diff --git a/Commands/untitled 2.tmCommand b/Commands/untitled 2.tmCommand