From 3362cb89d9034b84ec9504ff55ed0f79aa02f7e4 Mon Sep 17 00:00:00 2001
From: Albert Krewinkel <albert@zeitkraut.de>
Date: Sun, 30 Apr 2017 11:28:03 +0200
Subject: [PATCH] Lua module: make Header argument order consistent
Attributes are always passed as the last element, making it possible to
omit this argument. Argument order for `Header` was wrong and is fixed.
---
data/pandoc.lua | 4 ++--
src/Text/Pandoc/Lua/StackInstances.hs | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/pandoc.lua b/data/pandoc.lua
index bb79724aa..bd3822514 100644
--- a/data/pandoc.lua
+++ b/data/pandoc.lua
@@ -265,12 +265,12 @@ M.Div = M.Block:create_constructor(
--- Creates a block quote element.
-- @function Header
-- @tparam int level header level
--- @tparam Attributes attributes element attributes
-- @tparam {Inline,...} content inline content
+-- @tparam Attributes attributes element attributes
-- @treturn Block header element
M.Header = M.Block:create_constructor(
"Header",
- function(level, attributes, content)
+ function(level, content, attributes)
return {c = {level, attributes, content}}
end,
{"level", {"identifier", "classes", "attributes"}, "content"}
diff --git a/src/Text/Pandoc/Lua/StackInstances.hs b/src/Text/Pandoc/Lua/StackInstances.hs
index 52151ce64..acf2b7eb1 100644
--- a/src/Text/Pandoc/Lua/StackInstances.hs
+++ b/src/Text/Pandoc/Lua/StackInstances.hs
@@ -173,7 +173,7 @@ pushBlock lua = \case
CodeBlock attr code -> pushViaConstructor lua "CodeBlock" code (LuaAttr attr)
DefinitionList items -> pushViaConstructor lua "DefinitionList" items
Div attr blcks -> pushViaConstructor lua "Div" blcks (LuaAttr attr)
- Header lvl attr inlns -> pushViaConstructor lua "Header" lvl (LuaAttr attr) inlns
+ Header lvl attr inlns -> pushViaConstructor lua "Header" lvl inlns (LuaAttr attr)
HorizontalRule -> pushViaConstructor lua "HorizontalRule"
LineBlock blcks -> pushViaConstructor lua "LineBlock" blcks
OrderedList lstAttr list -> pushViaConstructor lua "OrderedList" list lstAttr