diff --git a/autotests/folding/test.pbl.fold b/autotests/folding/test.pbl.fold index ce2257e..d32529c 100644 --- a/autotests/folding/test.pbl.fold +++ b/autotests/folding/test.pbl.fold @@ -1,101 +1,101 @@ # Wesnoth Markup Language #textdomain wesnoth-libs #define __GUI_WINDOW_HEIGHT ( if(window_height = 0, 9999, window_height) )#enddef #define __GUI_WINDOW_FUNCTIONS def reevaluate_best_size(w, s) ( [ 0, # debug_print('window ', w), debug_print('screen ', s) # ][0] ); #enddef # Don't highlight array indices as tags stored_unit[1].moves other[0][1][2] other[foo][bar] foo[{MACRO}] foo[$index] foo[ 12 ] # Nested tags [allow_undo][/allow_undo][not][true]text[/true][/not] [foo][bar]text[/bar][/foo] [about] title= _ "Campaign Designer" text="Your Name" [/about] [window] id = "tooltip" [resolution] definition = "tooltip" automatic_placement = false functions = "{__GUI_WINDOW_FUNCTIONS}" [grid] [row] [column] [label] id = "label" definition = "default_small" use_markup = true wrap = true [/label] [/column] [/row] [/grid] [/resolution] [/window] [event] name = preload first_time_only = no [lua] code = << - function narrator(t) + function narrator(t) -- Behave like the [message] tag. wesnoth.fire("message", - { speaker = "narrator", message = t.sentence }) - end + { speaker = "narrator", message = t.sentence }) + end >> [/lua] [/event] [event] name = turn 1 [lua] code = << narrator(...) >> [args] sentence = _ "Hello world!" [/args] [/lua] [lua] code = << narrator(...) >> [args] sentence = _ "How are you today?" [/args] [/lua] [/event] diff --git a/autotests/html/test.pbl.html b/autotests/html/test.pbl.html index 4b1a970..f57092f 100644 --- a/autotests/html/test.pbl.html +++ b/autotests/html/test.pbl.html @@ -1,108 +1,108 @@ test.pbl
 # Wesnoth Markup Language
 
 #textdomain wesnoth-libs
 
 #define __GUI_WINDOW_HEIGHT
 (
 	if(window_height = 0, 9999, window_height)
 )#enddef
 
 #define __GUI_WINDOW_FUNCTIONS
 def reevaluate_best_size(w, s)
 (
 [
 	0,
 #
 	debug_print('window ', w),
 	debug_print('screen ', s)
 #
 ][0]
 );
 #enddef
 
 # Don't highlight array indices as tags
 stored_unit[1].moves
 other[0][1][2]
 other[foo][bar]
 
 foo[{MACRO}]
 foo[$index]
 foo[  12 ]
 
 # Nested tags
 [allow_undo][/allow_undo][not][true]text[/true][/not]
 [foo][bar]text[/bar][/foo]
 
 [about]
 	title= _ "Campaign Designer"
 	text="Your Name"
 [/about]
 
 [window]
 	id = "tooltip"
 
 	[resolution]
 		definition = "tooltip"
 		automatic_placement = false
 		functions = "{__GUI_WINDOW_FUNCTIONS}"
 
 		[grid]
 
 			[row]
 
 				[column]
 
 					[label]
 						id = "label"
 						definition = "default_small"
 
 						use_markup = true
 						wrap = true
 					[/label]
 
 				[/column]
 
 			[/row]
 
 		[/grid]
 
 	[/resolution]
 
 [/window]
 
 [event]
 	name = preload
 	first_time_only = no
 	[lua]
 		code = <<
-			function narrator(t)
-				-- Behave like the [message] tag.
-				wesnoth.fire("message",
-				  { speaker = "narrator", message = t.sentence })
-			end
-		>>
+			function narrator(t)
+				-- Behave like the [message] tag.
+				wesnoth.fire("message",
+				  { speaker = "narrator", message = t.sentence })
+			end
+		>>
 	[/lua]
 [/event]
 
 [event]
 	name = turn 1
 	[lua]
-		code = << narrator(...) >>
+		code = << narrator(...) >>
 		[args]
 			sentence = _ "Hello world!"
 		[/args]
 	[/lua]
 	[lua]
-		code = << narrator(...) >>
+		code = << narrator(...) >>
 		[args]
 			sentence = _ "How are you today?"
 		[/args]
 	[/lua]
 [/event]
 
diff --git a/autotests/reference/test.pbl.ref b/autotests/reference/test.pbl.ref index ff40900..30b7aaa 100644 --- a/autotests/reference/test.pbl.ref +++ b/autotests/reference/test.pbl.ref @@ -1,101 +1,101 @@ # Wesnoth Markup Language

#textdomain wesnoth-libs

#define __GUI_WINDOW_HEIGHT
(
if(window_height = 0, 9999, window_height)
)#enddef

#define __GUI_WINDOW_FUNCTIONS
def reevaluate_best_size(w, s)
(
[
0,
#
debug_print('window ', w),
debug_print('screen ', s)
#
][0]
);
#enddef

# Don't highlight array indices as tags
stored_unit[1].moves
other[0][1][2]
other[foo][bar]

foo[{MACRO}]
foo[$index]
foo[ 12 ]

# Nested tags
[allow_undo][/allow_undo][not][true]text[/true][/not]
[foo][bar]text[/bar][/foo]

[about]
title= _ "Campaign Designer"
text="Your Name"
[/about]

[window]
id = "tooltip"

[resolution]
definition = "tooltip"
automatic_placement = false
functions = "{__GUI_WINDOW_FUNCTIONS}"

[grid]

[row]

[column]

[label]
id = "label"
definition = "default_small"

use_markup = true
wrap = true
[/label]

[/column]

[/row]

[/grid]

[/resolution]

[/window]

[event]
name = preload
first_time_only = no
[lua]
code = <<
- function narrator(t)
- -- Behave like the [message] tag.
- wesnoth.fire("message",
- { speaker = "narrator", message = t.sentence })
- end
- >>
+ function narrator(t)
+ -- Behave like the [message] tag.
+ wesnoth.fire("message",
+ { speaker = "narrator", message = t.sentence })
+ end
+ >>
[/lua]
[/event]

[event]
name = turn 1
[lua]
- code = << narrator(...) >>
+ code = << narrator(...) >>
[args]
sentence = _ "Hello world!"
[/args]
[/lua]
[lua]
- code = << narrator(...) >>
+ code = << narrator(...) >>
[args]
sentence = _ "How are you today?"
[/args]
[/lua]
[/event]
diff --git a/data/syntax/wml.xml b/data/syntax/wml.xml index 600a8e3..f4f4714 100644 --- a/data/syntax/wml.xml +++ b/data/syntax/wml.xml @@ -1,213 +1,214 @@ - wmllint wmlindent wmlscope po #textdomain #else #undef #error #warning #define #ifdef #ifndef #ifhave #ifnhave #ifver #ifnver #enddef #endif - + - + - + - + - - + +