Author: esr
Date: Mon Nov 10 12:25:55 2008
New Revision: 30689
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30689&view=rev
Log:
Systematically doublequote enclose IDs containing single quotes.
This avoids confusing wesnoth-mode.el.
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
trunk/data/core/about.cfg
trunk/data/core/units/monsters/Skeletal_Dragon.cfg
trunk/data/tools/wmllint
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg?rev=30689&r1=30688&r2=30689&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg Mon
Nov 10 12:25:55 2008
@@ -362,7 +362,7 @@
[store_unit]
[filter]
- id=Li'sar
+ id="Li'sar"
[/filter]
kill=yes
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg?rev=30689&r1=30688&r2=30689&view=diff
==============================================================================
---
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
(original)
+++
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
Mon Nov 10 12:25:55 2008
@@ -318,7 +318,7 @@
[/message]
[message]
- speaker=Kapou'e
+ speaker="Kapou'e"
message= _ "Grüü is right. It is not wise to let these undead
remain here cutting off our supply lines and path of retreat. In these days of
turmoil, we don't know what lies ahead, so it is best not to leave any threats
in our rear."
[/message]
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg?rev=30689&r1=30688&r2=30689&view=diff
==============================================================================
---
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
(original)
+++
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
Mon Nov 10 12:25:55 2008
@@ -418,7 +418,7 @@
value=0
[/set_variable]
- # create AI=guardian units. They can't move unless an enemy
+ # create AI="guardian units. They can't move unless an enemy"
# moves nearby. I create them at the beginning because when the
# player sees them, events will fire.
Modified: trunk/data/core/about.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/about.cfg?rev=30689&r1=30688&r2=30689&view=diff
==============================================================================
--- trunk/data/core/about.cfg (original)
+++ trunk/data/core/about.cfg Mon Nov 10 12:25:55 2008
@@ -398,7 +398,7 @@
[/entry]
[entry]
name = "Gideon Chia (Deonjo)"
- comment = "new 'units' icon for general status bar"
+ comment ="new 'units' icon for general status bar"
[/entry]
[entry]
name = "Highhole"
Modified: trunk/data/core/units/monsters/Skeletal_Dragon.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/monsters/Skeletal_Dragon.cfg?rev=30689&r1=30688&r2=30689&view=diff
==============================================================================
--- trunk/data/core/units/monsters/Skeletal_Dragon.cfg (original)
+++ trunk/data/core/units/monsters/Skeletal_Dragon.cfg Mon Nov 10 12:25:55 2008
@@ -2,7 +2,7 @@
[unit_type]
id=Skeletal Dragon
name= _ "Skeletal Dragon"
- #not 'race=monster', because we need the not_living attribute
+ #not 'race="monster', because we need the not_living attribute"
race=undead
image="units/monsters/skeletal-dragon.png"
hitpoints=86
Modified: trunk/data/tools/wmllint
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wmllint?rev=30689&r1=30688&r2=30689&view=diff
==============================================================================
--- trunk/data/tools/wmllint (original)
+++ trunk/data/tools/wmllint Mon Nov 10 12:25:55 2008
@@ -847,7 +847,20 @@
n = "NEW_BATTLE"
x = int(m.group(2)) + 5
y = int(m.group(3)) + 5
- lines[i] = lines[i][:m.start(0)] +("{%s %d %d}" % (n, x, y)) +
lines[i][m.end(0):]
+ lines[i] = lines[i][:m.start(0)] +("{%s %d %d}" % (n, x, y)) +
lines[i][m.end(0):]
+ # Fix bare strings containing single quotes; these confuse wesnoth-mode.el
+ for i in range(len(lines)):
+ if "no-syntax-rewrite" in lines[i]:
+ break
+ elif "'" in lines[i]:
+ try:
+ (key, prefix, value, comment) = parse_attribute(lines[i])
+ if "'" in value and value[0].isalpha() and value[-1].isalpha():
+ lines[i] = prefix + '"' + value + '"' + comment + "\n"
+ if verbose:
+ print '"%s", line %d: quote-enclosing attribute
value.'%(filename, i+1)
+ except TypeError:
+ pass
# More syntax transformations would go here.
return lines
@@ -1506,7 +1519,7 @@
sys.stderr.write("wmllint: internal error on %s\n" %
fn)
(exc_type, exc_value, exc_traceback) = sys.exc_info()
raise exc_type, exc_value, exc_traceback
- if not clean and not revert:
+ if not clean and not diffs and not revert:
# Consistency-check everything we got from the file scans
consistency_check()
# Attempt a spell-check
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
