Merge remote branch 'upstream/master' into pegasus

1 files changed, 10 insertions, 45 deletions

diff --git a/devtools/credits.pl b/devtools/credits.pl
index c45f16eec9..f515844e4d 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -5,10 +5,9 @@
 # of the credits in other places from this source. In particular:
 # - The AUTHORS file
 # - The gui/credits.h header file
+# - The Credits.rtf file used by the Mac OS X port
 # - The credits.xml file, part of the DocBook manual
 # - Finally, credits.xml, for use on the website (different format than the DocBook one)
-# And maybe in the future, also "doc/10.tex", the LaTeX version of the README.
-# Although that might soon be obsolete, if the manual evolves enough.
 #
 # Initial version written by Fingolfin in December 2004.
 #
@@ -37,7 +36,6 @@ if ($#ARGV >= 0) {
 	$mode = "CPP" if ($ARGV[0] eq "--cpp");		# credits.h (for use by about.cpp)
 	$mode = "XML-DOC" if ($ARGV[0] eq "--xml-docbook");		# credits.xml (DocBook)
 	$mode = "RTF" if ($ARGV[0] eq "--rtf");		# Credits.rtf (Mac OS X About box)
-	$mode = "TEX" if ($ARGV[0] eq "--tex");		# 10.tex (LaTeX)
 }
 
 if ($mode eq "") {
@@ -184,10 +182,6 @@ sub begin_credits {
 
 	if ($mode eq "TEXT") {
 		#print html_entities_to_ascii($title)."\n";
-	} elsif ($mode eq "TEX") {
-		print "% This file was generated by credits.pl. Do not edit by hand!\n";
-		print '\section{Credits}' . "\n";
-		print '\begin{trivlist}' . "\n";
 	} elsif ($mode eq "RTF") {
 		print '{\rtf1\mac\ansicpg10000' . "\n";
 		print '{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}' . "\n";
@@ -219,9 +213,6 @@ sub begin_credits {
 
 sub end_credits {
 	if ($mode eq "TEXT") {
-	} elsif ($mode eq "TEX") {
-		print '\end{trivlist}' . "\n";
-		print "\n";
 	} elsif ($mode eq "RTF") {
 		print "}\n";
 	} elsif ($mode eq "CPP") {
@@ -252,15 +243,6 @@ sub begin_section {
 		} elsif ($section_level eq 1) {
 			print "  " x $section_level . "-" x (length $title)."\n";
 		}
-	} elsif ($mode eq "TEX") {
-		print '\item \textbf{';
-		if ($section_level eq 0) {
-			print '\LARGE';
-		} elsif ($section_level eq 1) {
-			print '\large';
-		}
-		print " " . html_entities_to_tex($title) . "}\n";
-		print '\begin{list}{}{\setlength{\leftmargin}{0.2cm}}' . "\n";
 	} elsif ($mode eq "RTF") {
 		$title = html_entities_to_rtf($title);
 
@@ -327,8 +309,6 @@ sub end_section {
 
 	if ($mode eq "TEXT") {
 		# nothing
-	} elsif ($mode eq "TEX") {
-		print '\end{list}' . "\n";
 	} elsif ($mode eq "RTF") {
 		# nothing
 	} elsif ($mode eq "CPP") {
@@ -352,16 +332,12 @@ sub begin_persons {
 		print "\t\t\t<group>\n";
 		print "\t\t\t\t<name>" . $title . "</name>\n";
 		#print "\t\t\t\t<persons>\n";
-	} elsif ($mode eq "TEX") {
-		print '\item  \begin{tabular}[h]{p{0.3\linewidth}p{0.6\linewidth}}' . "\n";
 	}
 }
 
 sub end_persons {
 	if ($mode eq "TEXT") {
 		print "\n";
-	} elsif ($mode eq "TEX") {
-		print '  \end{tabular}' . "\n";
 	} elsif ($mode eq "RTF") {
 		# nothing
 	} elsif ($mode eq "XML-WEB") {
@@ -392,12 +368,6 @@ sub add_person {
 		  print " - " . substr(wrap($multitab, $multitab, $desc), $inner_indent);
 		}
 		print "\n";
-	} elsif ($mode eq "TEX") {
-		$name = $nick if $name eq "";
-		$name = html_entities_to_tex($name);
-		$desc = html_entities_to_tex($desc);
-
-		print "    $name & \\textit{$desc}\\\\\n";
 	} elsif ($mode eq "RTF") {
 		$name = $nick if $name eq "";
 		$name = html_entities_to_rtf($name);
@@ -447,11 +417,6 @@ sub add_paragraph {
 		$tab = " " x ($section_level * 2 + 1);
 		print wrap($tab, $tab, html_entities_to_ascii($text))."\n";
 		print "\n";
-	} elsif ($mode eq "TEX") {
-		$text = html_entities_to_tex($text);
-		print '\item' . "\n";
-		print $text;
-		print "\n";
 	} elsif ($mode eq "RTF") {
 		$text = html_entities_to_rtf($text);
 		# Center text
@@ -502,7 +467,7 @@ begin_credits("Credits");
 		  add_person("Jonathan Gray", "khalek", "(retired)");
 		  add_person("Vincent Hamm", "yaz0r", "(retired)");
 		  add_person("Max Horn", "Fingolfin", "");
-		  add_person("Travis Howell", "Kirben", "");
+		  add_person("Travis Howell", "Kirben", "(retired)");
 		  add_person("Pawe&#322; Ko&#322;odziejski", "aquadran", "Codecs, iMUSE, Smush, etc.");
 		  add_person("Gregory Montoir", "cyx", "");
 		  add_person("Eugene Sandulenko", "sev", "FT INSANE, MM NES, MM C64, game detection, Herc/CGA");
@@ -511,7 +476,7 @@ begin_credits("Credits");
 
 	  begin_section("HE");
 		  add_person("Jonathan Gray", "khalek", "(retired)");
-		  add_person("Travis Howell", "Kirben", "");
+		  add_person("Travis Howell", "Kirben", "(retired)");
 		  add_person("Gregory Montoir", "cyx", "");
 		  add_person("Eugene Sandulenko", "sev", "");
 	  end_section();
@@ -530,12 +495,12 @@ begin_credits("Credits");
 	  begin_section("AGOS");
 		  add_person("Torbj&ouml;rn Andersson", "eriktorbjorn", "");
 		  add_person("Paul Gilbert", "dreammaster", "");
-		  add_person("Travis Howell", "Kirben", "");
+		  add_person("Travis Howell", "Kirben", "(retired)");
 		  add_person("Oliver Kiehl", "olki", "(retired)");
 		  add_person("Ludvig Strigeus", "ludde", "(retired)");
 	  end_section();
 
-	  begin_section("BASS");	# Beneath a Steel Sky
+	  begin_section("Beneath a Steel Sky");
 		  add_person("Robert G&ouml;ffringmann", "lavosspawn", "(retired)");
 		  add_person("Oliver Kiehl", "olki", "(retired)");
 		  add_person("Joost Peters", "joostp", "");
@@ -574,7 +539,7 @@ begin_credits("Credits");
 		  add_person("Vincent Hamm", "yaz0r", "(retired)");
 	  end_section();
 
-	  begin_section("Draci");
+	  begin_section("Draci Historie");
 		  add_person("Denis Kasak", "dkasak13", "");
 		  add_person("Robert &Scaron;palek", "spalek", "");
 	  end_section();
@@ -584,7 +549,7 @@ begin_credits("Credits");
 		  add_person("Pawe&#322; Ko&#322;odziejski", "aquadran", "");
 	  end_section();
 
-	  begin_section("FOTAQ");	# Flight of the Amazon Queen
+	  begin_section("Flight of the Amazon Queen");
 		  add_person("David Eriksson", "twogood", "(retired)");
 		  add_person("Gregory Montoir", "cyx", "");
 		  add_person("Joost Peters", "joostp", "");
@@ -623,7 +588,7 @@ begin_credits("Credits");
 			add_person("Julien Templier", "littleboy", "");			
 	end_section();
 
-	  begin_section("Lure");
+	  begin_section("Lure of the Temptress");
 		  add_person("Paul Gilbert", "dreammaster", "");
 	  end_section();
 
@@ -671,7 +636,7 @@ begin_credits("Credits");
 		  add_person("Lars Skovlund", "lskovlun", "");
 	  end_section();
 
-	  begin_section("TeenAgent");
+	  begin_section("Teen Agent");
 		  add_person("Robert Megone", "sanguine", "Help with callback rewriting");
 		  add_person("Vladimir Menshakov", "whoozle", "");
 	  end_section();
@@ -908,7 +873,7 @@ begin_credits("Credits");
 	  end_section();
 
 	  begin_section("Win32");
-		  add_person("Travis Howell", "Kirben", "");
+		  add_person("Travis Howell", "Kirben", "(retired)");
 	  end_section();
 
 	  begin_section("Win64");