Fixed the scripts to respect the "..." convention.

Whitespace at the beginnings and ends of dialogue lines are
significant; this update should give them the proper semantics.
Also better synchronizes the .txt files with their controlling
strings.h files.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@123 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/content/comm/druuge/druuge.txt

@@ -322,7 +322,7 @@ You will not find better deals anywhere.
 
 #(GEN_INFO_AT_TRADE_WORLD_2)	druug043.wav
 While I am sure, Captain, that you would never make this foolish mistake
-I still feel I should warn you about one of our laws, specifically 
+I still feel I should warn you about one of our laws, specifically
 Druuge Statute 3429 - subsection A86, Definition of Starship Derelicts.
 Simply put, Captain, this statute recognizes that the universe is an inherently hostile place
 and any ship which is unable to defend itself incites violence

sc2/content/comm/ilwrath/ilwrath.txt

@@ -153,12 +153,12 @@ When I Present Them With The Twisted Wreckage Of Your Ship And Your Many Charred
 #(CAME_FROM) ilwra023.wav
 Since You Will Soon Be Dead, I Will Gladly Explain.
 We Have Spent Many Years Gleefully Preying On The Pkunk.
-They Are A Pitiful, Easily-killed Species...
+They Are A Pitiful, Easily-killed Species
-And We Would Have Continued In This Divine Worship Of Dogar And Kazon...
+And We Would Have Continued In This Divine Worship Of Dogar And Kazon
 But We Required Additional Crew Members And Repairs To Our Cloaking Device.
 So We Departed The Giclas Constellation And Set Course For Home.
 But Before We Had Reached Our Region Of Space, We Detected The Passage Of A Nearby Vessel - The Ur-Quan Drone.
-It Informed Us About You... So Here We Are. 
+It Informed Us About You... So Here We Are.
 And Now, YOU DIE!
 
 #(WHO_BLASTS_WHO) ilwra024.wav

sc2/content/comm/melnorm/melnorm.txt

@@ -27,7 +27,7 @@ How did you know about us before meeting us?
 
 #(KNOW_BECAUSE)	melno004.wav
 We gather information from a thousand secret sources in space and time.
-Our charge for revealing even one of these sources would be so high 
+Our charge for revealing even one of these sources would be so high
 that your species would be in debt to us for centuries.
 
 #(what_about_yourselves)
@@ -115,7 +115,7 @@ I had itchy pods this morning, Captain, and here you are!
 #(HELLO_AND_DOWN_TO_BUSINESS_4)	melno015.wav
 What a coincidence! I was just talking about you with a Keel-Verezy captain. 
 He/she/they expressed great interest in your explorations and struggles against the Ur-Quan
-but, like all Verezy, I'm afraid he/she/they were hesitant to introduce themselves for fear of 
+but, like all Verezy, I'm afraid he/she/they were hesitant to introduce themselves for fear of
 well
 frightening you. 
 In any event, it is our pleasure to meet you once again.
@@ -214,7 +214,7 @@ I apologize. I'm sorry. Please forgive me, I beg you.
 #(APOLOGY_ACCEPTED) melno029.wav
 Well
 since you put it so nicely
-you seem so genuinely repentant	
+you seem so genuinely repentant
 we'll give you another chance to become trading partners with us.
 But don't ever attack us again
 Or the next time we won't be such nice guys.
@@ -242,7 +242,7 @@ What do you want from us this time?
 Never mind, we don't want to know.
 
 #(HELLO_HATE_YOU_3) melno034.wav
-We will hate you forever 
+We will hate you forever.
 It is no use coming back here in the hopes that we will ever change our minds.
 We won't!
 
@@ -295,7 +295,7 @@ snicker
 Out of fuel again, eh, Captain?
 
 #(CHANGED_MIND)	melno043.wav
-Have you changed your mind 
+Have you changed your mind
 and decided to accept our offer of assistance?
 
 #(no_changed_mind)

sc2/content/comm/orz/orz.txt

@@ -233,9 +233,9 @@ I am surprised!
 Oh well. Now is for *fun time*, not worrying.
 
 #(NEUTRAL_HOMEWORLD_HELLO_4)	orz028.wav
-Again you have come to my *house*. It is the same time. Why are 
+Again you have come to my *house*. It is the same time.
-you coming? Do you always the *slow time*? I am surprised! Oh 
+Why are you coming? Do you always the *slow time*? I am surprised!
-well. Now is for *fun time*, not worrying.
+Oh well. Now is for *fun time*, not worrying.
 
 #(NEUTRAL_SPACE_HELLO_1)	orz029.wav
 Hello extremely! I hope you like to *Play*.

sc2/content/comm/pkunk/pkunk.txt

@@ -31,14 +31,14 @@ Seekers of the deepest truths, askers of interesting and significant questions.
 Even now a question of great transcendental significance comes unbidden to our minds.
 Who are you and what do you want?'
 
-#(NEUTRAL_SPACE_HELLO_2)	pkunk002.wav
+#(NEUTRAL_SPACE_HELLO_3)	pkunk002.wav
 Greetings and various apropos felicitations!  We are Pkunk.
 Hatchlings of light, spritual soul beings of the vast cosmic oneness
 wayfarers on the river of destiny, students of the mystical dimensions
 purveyors of blissful love, birdlike manifestations of glorious light energies from the astral plane.
 How about yourselves?
 
-#(NEUTRAL_SPACE_HELLO_3)	pkunk003.wav
+#(NEUTRAL_SPACE_HELLO_2)	pkunk003.wav
 Do not be frightened.  We are powerful creatures, yes
 but we could not hurt you anymore than we could squish the helpless Pootworm.
 We love the Pootworm.  We are one with the Pootworm.  We are one with you.
@@ -58,11 +58,11 @@ release yourself to tears of joy!
 Go. Go now, young one. Go quickly!
 
 #(FRIENDLY_SPACE_HELLO_1)	pkunk005.wav
-Whoopdy Dee and Trolly Bazoo!  What a good day I am having.  First 
+Whoopdy Dee and Trolly Bazoo!  What a good day I am having.
-my nest mate surprises me with extra fat and spicy grubs for
+First, my nest mate surprises me with extra fat and spicy grubs for earlymeal
-earlymeal, and then I am complimented on my fine display of
+and then I am complimented on my fine display of ceremonial tongs.
-ceremonial tongs.  To top it off, I encounter the human friend, loved
+To top it off, I encounter the human friend, loved by all Pkunk.
-by all Pkunk.  Can things get any better?
+Can things get any better?
 
 #(FRIENDLY_SPACE_HELLO_2)	pkunk006.wav
 The stars are in auspicious alignment, the various significant moons

sc2/content/comm/spathi/spathi.txt

@@ -672,6 +672,6 @@ and I am compelled to engage you in preemptive-defensive action.
 Now you shall never learn my important secrets
 such as the location of the Orange Giant star around which my home planet orbits
 oops -- dang! -- you made me give that away!
-Captain, if you somehow survive my attack, I have one sincere hope 
+Captain, if you somehow survive my attack, I have one sincere hope
 that you may soon be devoured slowly by an ugly, flat-toothed herbivore!
 

sc2/content/comm/starbas/starbas.txt

@@ -193,7 +193,7 @@ Captain
 #(HEAVY_LOAD_F1) 
 , you are to be commended. Keep up the good work!
 
-#(HEAVY_LOAD_G0 ) starb044.wav
+#(HEAVY_LOAD_G0) starb044.wav
 More fuel for the fire, eh, Captain 
 #(HEAVY_LOAD_G1) 
 ?  That last load should keep it blazing!
@@ -305,7 +305,7 @@ or already-refined metals and other valuable materials from the wreckage of enem
 #(ABOUT_MINERALS) starb056.wav
 The most straightforward way you can accumulate Resource Units
 is to bring mineral ores back to this starbase.
-There are probably enough resources in just the nearby dozen stars	
+There are probably enough resources in just the nearby dozen stars
 to build your ship into a powerful battleship, or
 to create a strong task force of combat vessels.
 I would also recommend that you build several additional Storage Bays.

sc2/doc/devel/script

@@ -47,9 +47,13 @@ When multiple records are used to define a single speech line (as
 often happens when they say your name, for instance), only the first
 line has an audio file associated with it.
 
-Lines that do not end in a punctuation mark have a "..." added to the
+Lines that do not end in a punctuation mark or a space have a "..."
-end of them by the communications code - keep that in mind when
+added to the end of them by the communications code.  If the previous
-debugging the subtitles.
+line had "..." appended to it and this line does not START with a
+space, this line will have "..." prepended to it.  The "scriptcheck"
+tool looks for all cases where "..." does not occur in midsentence.
+When editing the script files, check your intended results against
+this.
 
 The .h files (src/sc2code/comm)
 -------------------------------
@@ -64,6 +68,11 @@ the enum (though it would be reasonably straightforward to generate
 the strings.h files from the .txt files) The values of the enum are
 used in the {racec}.c files in the same directory.
 
+The scriptcheck utility also checks for proper correlation between the
+.h file and the associated .txt file.  It assumes that one enum value
+is listed per line, and that the general format of the file matches
+the current one.
+
 Types of script bugs
 --------------------
 

sc2/src/sc2code/comm/melnorm/strings.h

@@ -274,7 +274,22 @@ enum
 	name_40,
 	name_41,
 	ENUMERATE_ONE,
-	END_LIST_WITH_AND = ENUMERATE_ONE + 16
+	ENUMERATE_TWO,
+	ENUMERATE_THREE,
+	ENUMERATE_FOUR,
+	ENUMERATE_FIVE,
+	ENUMERATE_SIX,
+	ENUMERATE_SEVEN,
+	ENUMERATE_EIGHT,
+	ENUMERATE_NINE,
+	ENUMERATE_TEN,
+	ENUMERATE_ELEVEN,
+	ENUMERATE_TWELVE,
+	ENUMERATE_THIRTEEN,
+	ENUMERATE_FOURTEEN,
+	ENUMERATE_FIFTEEN,
+	ENUMERATE_SIXTEEN,
+	END_LIST_WITH_AND
 };
 
 #endif /* _STRINGS_H */

sc2/src/sc2code/comm/spahome/strings.h

@@ -21,7 +21,7 @@
 
 enum
 {
-	null_phrase,
+	NULL_PHRASE,
 	killed_fwiffo,
 	POOR_FWIFFO,
 	fwiffo_fine,