Revert "Ensure HTML output is not wrapped"

This reverts commit 9ad52f1.

This currently breaks tests. The update will have to wait until the next
pandoc version is released.

Author: tarleb

first-line-indent/Makefile

@@ -5,16 +5,16 @@ PANDOC ?= pandoc
 
 test: test_latex test_html
 
-test_html: sample.md first-line-indent.lua
-	@$(PANDOC) -s --lua-filter first-line-indent.lua --to=html --wrap=none $< \
+test_html: sample.md expected.html first-line-indent.lua
+	@$(PANDOC) -s --lua-filter first-line-indent.lua --to=html $< \
 		| $(DIFF) expected.html -
 
-test_latex: sample.md first-line-indent.lua
+test_latex: sample.md expected.tex first-line-indent.lua
 	@$(PANDOC) -s --lua-filter first-line-indent.lua --to=latex $< \
 		| $(DIFF) expected.tex -
 
 expected.html: sample.md first-line-indent.lua
-	$(PANDOC) -s --lua-filter first-line-indent.lua --wrap=none --output $@ $<
+	$(PANDOC) -s --lua-filter first-line-indent.lua --output $@ $<
 
 expected.tex: sample.md first-line-indent.lua
 	$(PANDOC) -s --lua-filter first-line-indent.lua --output $@ $<

math2svg/Makefile

@@ -5,7 +5,6 @@ test: sample.md math2svg.lua
 	@$(PANDOC) \
 		--mathml --lua-filter=math2svg.lua \
 			-M math2svg_font='Gyre-Pagella' \
-		--wrap=none \
 		--to=html sample.yaml $< \
 	    | $(DIFF) expected.html -
 
@@ -14,7 +13,6 @@ expected: sample.md math2svg.lua
 		--mathml --lua-filter=math2svg.lua \
 			-M math2svg_tex2svg='/usr/local/bin/tex2svg' \
 			-M math2svg_font='Gyre-Pagella' \
-		--wrap=none \
 		--output=expected.html sample.yaml $<
 
 .PHONY: test

not-in-format/Makefile

@@ -6,15 +6,15 @@ PANDOC ?= pandoc
 test: test_html test_latex
 
 test_html: sample.md expected.html not-in-format.lua
-	@$(PANDOC) --lua-filter not-in-format.lua --to=html --wrap=none $< \
+	@$(PANDOC) --lua-filter not-in-format.lua --to=html $< \
 		| $(DIFF) expected.html -
 
 test_latex: sample.md expected.tex not-in-format.lua
 	@$(PANDOC) --lua-filter not-in-format.lua --to=latex $< \
 		| $(DIFF) expected.tex -
 
 expected.html: sample.md not-in-format.lua
-	$(PANDOC) --lua-filter not-in-format.lua --wrap=none --output $@ $<
+	$(PANDOC) --lua-filter not-in-format.lua --output $@ $<
 
 expected.tex: sample.md not-in-format.lua
 	$(PANDOC) --lua-filter not-in-format.lua --output $@ $<

pagebreak/Makefile

@@ -4,15 +4,12 @@ PANDOC ?= pandoc
 test: test-asciidoc test-html test-md
 
 test-asciidoc:
-	@$(PANDOC) --lua-filter=pagebreak.lua sample.md --to asciidoc | \
-	  $(DIFF) expected.adoc -
+	@$(PANDOC) --lua-filter=pagebreak.lua sample.md --to asciidoc | $(DIFF) expected.adoc -
 
 test-html:
-	@$(PANDOC) --lua-filter=pagebreak.lua --wrap=none sample.md | \
-	  $(DIFF) expected.html -
+	@$(PANDOC) --lua-filter=pagebreak.lua sample.md | $(DIFF) expected.html -
 
 test-md:
-	@$(PANDOC) -t ms --lua-filter=pagebreak.lua sample.md | \
-	  $(DIFF) expected.ms -
+	@$(PANDOC) -t ms --lua-filter=pagebreak.lua sample.md | $(DIFF) expected.ms -
 
 .PHONY: test test-asciidoc test-html test-md

pandoc-quotes.lua/Makefile

@@ -15,13 +15,13 @@ prepare-tmp:
 	@rm -f test/tmp/*
 
 test-noop: prepare-tmp
-	@$(PANDOC) --lua-filter ./pandoc-quotes.lua -f markdown-smart -t html \
-		--wrap=none -o $(TMP_DIR)/$@.out $(DATA_DIR)/$@.md
+	@$(PANDOC) --lua-filter ./$(PANDOC)-quotes.lua -f markdown-smart -t html \
+		-o $(TMP_DIR)/$@.out $(DATA_DIR)/$@.md
 	@$(DIFF) $(TMP_DIR)/$@.out $(NORM_DIR)/$@.out
 
 $(TESTS): prepare-tmp
-	@$(PANDOC) --lua-filter ./pandoc-quotes.lua -t html \
-		--wrap=none -o $(TMP_DIR)/$@.out $(DATA_DIR)/$@.md
+	@$(PANDOC) --lua-filter ./$(PANDOC)-quotes.lua -t html \
+		-o $(TMP_DIR)/$@.out $(DATA_DIR)/$@.md
 	@$(DIFF) $(TMP_DIR)/$@.out $(NORM_DIR)/$@.out
 
 

revealjs-codeblock/Makefile

@@ -2,10 +2,7 @@ DIFF ?= diff --strip-trailing-cr -u
 PANDOC ?= pandoc
 
 test:
-	@$(PANDOC) --lua-filter=revealjs-codeblock.lua \
-	        --to=revealjs \
-	        --wrap=none \
-	        sample.md | \
+	@$(PANDOC) --lua-filter=revealjs-codeblock.lua sample.md -t revealjs | \
 		$(DIFF) expected.html -
 
 .PHONY: test