More message-block fixes.

data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg

@@ -228,10 +228,11 @@
 
     [event]
         name=time over
-        [message]
-            speaker=narrator
-            message=_ "Day break and stuff."
-        [/message]
+        #[message]
+        #    speaker=narrator
+        #    message=_ "Day break and stuff."
+        #    image=wesnoth-icon.png
+        #[/message]
         [endlevel]
             result=defeat
         [/endlevel]

data/campaigns/Northern_Rebirth/scenarios/14a_Epilogue.cfg

@@ -688,6 +688,7 @@
         [message]
             speaker=narrator
             message= _ "Thus, from a small, enslaved community, the people of Dwarven Doors - by their fortitude, valor, and wisdom - brought the Northlands out of the darkness and restored them to their former glory."
+            image=wesnoth-icon.png
         [/message]
 
         [endlevel]

data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg

@@ -588,7 +588,7 @@
             message= _ "Oh my!"
         [/message]
         [message]
-            description=Ut'Tan-Grilg
+            description="Ut'Tan-Grilg"
             message= _ "Oh my!"
         [/message]
         [message]
@@ -648,7 +648,7 @@
     [event]
         name=die
         [filter]
-            description=Ut'Tan-Grilg
+            description="Ut'Tan-Grilg"
         [/filter]
 
         [filter_second]
@@ -691,6 +691,7 @@
         [message]
             speaker=narrator
             message= _ "Sewer - Danger Keep Out!"
+            image=scenery/signpost.png
         [/message]
 
         [allow_undo]

data/campaigns/tutorial/scenarios/1_Tutorial.cfg

@@ -1,5 +1,7 @@
 #textdomain wesnoth-tutorial
 
+# wmllint: no-syntax-rewrite
+
 {./utils.cfg}
 
 #define DEST X Y

data/scenario-test.cfg

@@ -37,6 +37,7 @@ Xu          , Qxu         , Qxu         , Ql          , Ql          , Ql
         [message]
             speaker=narrator
             message= "You can come if you wish, but the leader is only interested in speaking to Baldras."
+            image=wesnoth-icon.png
         [/message]
     [/event]
 

data/tools/wmllint

@@ -458,7 +458,9 @@ def hack_syntax(lines):
     modcount = 0
     # Ensure that every attack has a translatable description."
     for i in range(len(lines)):
-        if "[attack]" in lines[i]:
+        if "no-syntax-rewrite" in lines[j]:
+            return modcount
+        elif "[attack]" in lines[i]:
             j = i;
             have_description = False
             while '[/attack]' not in lines[j]:
@@ -483,11 +485,14 @@ def hack_syntax(lines):
     # Ensure that every speaker=narrator block without an image uses wesnoth-icon.png as an image."
     need_image = False
     for i in range(len(lines)):
-        if "speaker=narrator" in lines[i]:
+        if "no-syntax-rewrite" in lines[j]:
+            return modcount
+        precomment = lines[i].split("#")[0]
+        if "speaker=narrator" in precomment:
             need_image = True
-        elif lines[i].strip().startswith("image"):
+        elif precomment.strip().startswith("image"):
             need_image = False
-        elif '[/message]' in lines[i]:
+        elif '[/message]' in precomment:
             if need_image:
                 # This line presumes the code has been through wmlindent
                 leader = lines[i][:lines[i].find("[/")] + "    "