--- a/thesis/scripts/improve-index.awk	Sat Feb 07 23:48:48 2009 +0100
+++ b/thesis/scripts/improve-index.awk	Sun Feb 08 22:51:42 2009 +0100
@@ -2,16 +2,50 @@
 #
 # improve the index
 
+
 BEGIN{
-	e["mta"] = "mail transfer agent (\\NAME{MTA})";
-	e["mua"] = "mail user agent (\\NAME{MUA})";
-	e["mda"] = "mail delivery agent (\\NAME{MUA})";
-	e["smtp"] = "simple mail transfer protocol (\\NAME{SMTP})";
-	e["ietf"] = "Internet Engineering Task Force (\\NAME{IETF})";
+
+	# special formating for entries
+	e["mta"] = "Mail Transfer Agent (\\NAME{MTA})";
+	e["mua"] = "Mail User Agent (\\NAME{MUA})";
+	e["mda"] = "Mail Delivery Agent (\\NAME{MDA})";
+	e["smtp"] = "Simple Mail Transfer Protocol (\\NAME{SMTP})";
+	e["ietf"] = "ietf@\\NAME{IETF}";
 	e["debian"] = "Debian";
 	e["ascii"] = "ascii@\\NAME{ASCII}";
 	e["gpl"] = "General Public License (\\NAME{GPL})";
+	e["auth"] = "authentication";
+	e["bsd"] = "Berkeley Software Distribution (\\NAME{BSD})";
+	e["c"] = "C programming language";
+	e["changing ip addresses"] = "changing \\NAME{IP} addresses";
+	e["cyrus sasl"] = "cyrus \\NAME{SASL}";
+	e["dns blacklist"] = "dns blacklist@\\NAME{DNS} blacklist";
+	e["dynamic dns"] = "dynamic \\NAME{DNS}";
+	e["enc"] = "encryption";
+	e["fax"] = "telefax";
+	e["imap"] = "imap@\\NAME{IMAP}";
+	e["ipc"] = "Inter-Process Communication (\\NAME{IPC})";
+	e["isp"] = "Internet Service Provider (\\NAME{ISP})";
+	e["mime"] = "mime@\\NAME{MIME}";
+	e["mmdf"] = "mmdf@\\NAME{MMDF}";
+	e["pam"] = "pam@\\NAME{PAM}";
+	e["pop3"] = "pop3@\\NAME{POP3}";
+	e["relay-only mta"] = "relay-only \\NAME{MTA}";
+	e["rfc"] = "Request for Comments (\\NAME{RFC})";
+	e["sasl"] = "sasl@\\NAME{SASL}";
+	e["smtps"] = "smtps@\\NAME{SMTPS}";
+	e["starttls"] = "starttls@\\NAME{STARTTLS}";
+	e["swot analysis"] = "swot analysis@\\NAME{SWOT} analysis";
+	e["tcp socket"] = "tcp socket@\\NAME{TCP} socket";
+	e["tcp wrapper"] = "tcp wrapper@\\NAME{TCP} Wrapper";
+	e["tls"] = "Transport Layer Security (\\NAME{TLS})";
+	e["uc"] = "Unified Communication";
+	e["um"] = "Unified Messaging";
+	e["uucp"] = "uucp@\\NAME{UUCP}";
+	e["setuid"] = "setuid/setgid";
 
+
+	# persons
 	e["Oliver Kurth"] = e["Kurth"] = "Kurth@\\textsc{Kurth, Oliver}";
 	e["Adam Back"] = e["Back"] = "Back@\\textsc{Back, Adam}";
 	e["Eric Allman"] = e["Allman"] = "Allman@\\textsc{Allman, Eric}";
@@ -49,19 +83,72 @@
 	e["Diomidis Spinellis"] = e["Spinellis"] = "Spinellis@\\textsc{Spinellis, Diomidis}";
 	e["Andrew S. Tanenbaum"] = e["Tanenbaum"] = "Tanenbaum@\\textsc{Tanenbaum, Andrew S.}";
 	e["Kenneth R. van Wyk"] = e["van Wyk"] = "van Wyk@\\textsc{van Wyk, Kenneth R.}";
+	e["Christian Langbein"] = e["Langbein"] = "Langbein@\\textsc{Langbein, Christian}";
+	e["Dad"] = "Schnalke@\\textsc{Schnalke, R\\\"udiger}";
+	e["Hans-J\\\"org Schaaf"] = e["Schaaf"] = "Schaaf@\\textsc{Schaaf, Hans-J\\\"org}";
+	e["Henry Atting"] = e["Atting"] = "Atting@\\textsc{Atting, Henry}";
+	e["Heraclitus"] = "Heraclitus@\\textsc{Heraclitus}";
+	e["James Stenard"] = e["Stenard"] = "Stenard@\\textsc{Stenard, James}";
+	e["Joachim Breitner"] = e["Breitner"] = "Breitner@\\textsc{Breitner, Joachim}";
+	e["Jochen Roth"] = e["Roth"] = "Roth@\\textsc{Roth, Jochen}";
+	e["Julian Forster"] = e["Forster"] = "Forster@\\textsc{Forster, Julian}";
+	e["Lydi"] = "Steffan@\\textsc{Steffan, Lydi}";
+	e["Marc Geis"] = e["Geis"] = "Geis@\\textsc{Geis, Marc}";
+	e["Markus Sch\\\"affter"] = e["Sch\\\"affter"] = "Schaeffter@\\textsc{Sch\\\"affter, Markus}";
+	e["Roger Schietzel"] = e["Schietzel"] = "Schietzel@\\textsc{Schietzel, Roger}";
+	e["Stephen C. Johnson"] = e["Johnson"] = "Johnson@\\textsc{Johnson, Stephen C.}";
 	e["Wietse Venema"] = e["Venema"] = "Venema@\\textsc{Venema, Wietse}";
+	e["Volkmar Kese"] = e["Kese"] = "Kese@\\textsc{Kese, Volkmar}";
+
+
+	# subentries
+	s["sendmailx"] = "sendmail X";
+	s["meta1"] = "MeTA1";
+	s["smtp-after-pop"] = "\\NAME{SMTP}-after-\\NAME{POP}";
+	s["smtp-auth"] = "\\NAME{SMTP-AUTH}";
+
+
+	# aliases
+	a["ifdef"] = "ifdef|see{conditional compilation}";
+	a["envelope"] = "envelope|see{mail message}";
+	a["header"] = "header|see{mail message}";
+	a["body"] = "body|see{mail message}";
+	a["ssl"] = "ssl@\\NAME{SSL}|see{\\NAME{TLS}}";
+	a["forwarder"] = "forwarder|see{relay-only \\NAME{MTA}}";
+	a["junk mail"] = "junk mail|see{spam}";
+	a["fax"] = "fax|see{telefax}";
+
 }
 
 
 
 {
-	cur = $0
-	gsub(/\\nobreakspace  \{\}/, " ", cur);
-	gsub(/\\ /, " ", cur);
-	sub(/[^{]*{/, "", cur);
-	sub(/[}!].*/, "", cur);
-	if (e[cur]) {
-		sub(/{[^}!]*/, "{" e[cur]);
+	gsub(/\\ /, " ");
+	gsub(/\\nobreakspace  \{\}/, " ");
+	gsub(/\\discretionary \{-\}\{\}\{\}/, "");
+
+	entry = $0
+	sub(/[^{]*{/, "", entry);
+	sub(/[}!].*/, "", entry);
+	if (e[entry]) {
+		sub(/{[^}!]*/, "{" e[entry]);
 	}
+
+	subentry = $0
+	sub(/[^!]*!/, "", subentry);
+	sub(/}.*/, "", subentry);
+	if (s[subentry]) {
+		sub(/![^}]*/, "!" s[subentry]);
+	}
+
 	print;
 }
+
+
+
+END {
+	# aliases
+	for (i in a) {
+		print "\\indexentry{" a[i] "}{0}";
+	}
+}