Convert fortunes to UTF-8 from the old "backspace punctuation" method.

suggested by tedu, ok schwarze@ stsp@ tb@

3 files changed, 17 insertions, 18 deletions

diff --git a/games/fortune/Notes b/games/fortune/Notes
index aa889323495..a9cd28f6bff 100644
--- a/games/fortune/Notes
+++ b/games/fortune/Notes
@@ -1,4 +1,4 @@
-#	$OpenBSD: Notes,v 1.3 2004/09/28 20:40:01 jmc Exp $
+#	$OpenBSD: Notes,v 1.4 2017/07/13 02:05:14 bentley Exp $
 #	$NetBSD: Notes,v 1.2 1995/03/23 08:28:26 cgd Exp $
 #	@(#)Notes	8.1 (Berkeley) 5/31/93
 
@@ -107,8 +107,7 @@ Limericks are indented as follows, all lines capitalized:
 		No more than debris,
 	If the input was short of exact.
 
-Accents precede the letter they are over, e.g., "`^He" for e with a grave
-accent.  Underlining is done on a word-by-word basis, with the underlines
+Underlining is done on a word-by-word basis, with the underlines
 preceding the word, e.g., "__^H^Hhi ____^H^H^H^Hthere".
 
 No fortune should run beyond 72 characters on a single line without good
diff --git a/games/fortune/datfiles/fortunes b/games/fortune/datfiles/fortunes
index 584e829abcf..e7d6bb06670 100644
--- a/games/fortune/datfiles/fortunes
+++ b/games/fortune/datfiles/fortunes
@@ -232,7 +232,7 @@ test", said the outsider, "because I want you to be happy."
 	Drescher took the paper that was offered him and put it into
 the toaster -- "I wish the toaster to be happy too."
 %
-A diva who specializes in risqu'e arias is an off-coloratura soprano ...
+A diva who specializes in risqué arias is an off-coloratura soprano ...
 %
 	A doctor, an architect, and a computer scientist were arguing
 about whose profession was the oldest.  In the course of their
@@ -3620,8 +3620,8 @@ Error in operator: add beer
 %
 Es brilig war.  Die schlichte Toven
 	Wirrten und wimmelten in Waben;
-Und aller-m"umsige Burggoven
-	Dir mohmen R"ath ausgraben.
+Und aller-mümsige Burggoven
+	Dir mohmen Räth ausgraben.
 		-- Lewis Carroll, "Through the Looking Glass"
 %
 Eternal nothingness is fine if you happen to be dressed for it.
@@ -4066,7 +4066,7 @@ Five is a sufficiently close approximation to infinity.
 		-- Robert Firth
 %
 Flappity, floppity, flip
-The mouse on the m"obius strip;
+The mouse on the möbius strip;
 	The strip revolved,
 	The mouse dissolved
 In a chronodimensional skip.
@@ -5245,12 +5245,12 @@ I need your help, I say 'tween sobs,
 %
 Here in my heart, I am Helen;
 	I'm Aspasia and Hero, at least.
-I'm Judith, and Jael, and Madame de Sta"el;
+I'm Judith, and Jael, and Madame de Staël;
 	I'm Salome, moon of the East.
 
 Here in my soul I am Sappho;
 	Lady Hamilton am I, as well.
-In me R'ecamier vies with Kitty O'Shea,
+In me Récamier vies with Kitty O'Shea,
 	With Dido, and Eve, and poor nell.
 
 I'm all of the glamorous ladies
@@ -5820,7 +5820,7 @@ streets and frighten the horses.
 %
 "I don't object to sex before marriage, but two minutes before?!?"
 %
-"I don't think so," said Ren'e Descartes.  Just then, he vanished.
+"I don't think so," said René Descartes.  Just then, he vanished.
 %
 I don't think they could put him in a mental hospital.  On the other
 hand, if he were already in, I don't think they'd let him out.
@@ -7056,10 +7056,10 @@ Ignisecond, n.:
 	door even as the brain is saying, "my keys are in there!"
 		-- Rich Hall, "Sniglets"
 %
-Il brilgue: les t^oves libricilleux
+Il brilgue: les tôves libricilleux
 	Se gyrent et frillant dans le guave,
-Enm^im'es sont les gougebosquex,
-	Et le m^omerade horgrave.
+Enmîmés sont les gougebosquex,
+	Et le mômerade horgrave.
 		-- Lewis Carroll, "Through the Looking Glass"
 %
 Iles's Law:
@@ -10423,7 +10423,7 @@ laughter, singing
 The square was finally cleared by armed carabineri with tears of
 laughter streaming down their faces.  The event set a record for
 hilarious civic functions, smashing the previous record set when Baron
-Hans Neizant B"ompzidaize was elected Landburgher of K"oln in 1653.
+Hans Neizant Bömpzidaize was elected Landburgher of Köln in 1653.
 		-- Mike Harding, "The Armchair Anarchist's Almanac"
 %
 Portable, adj.:
@@ -11211,7 +11211,7 @@ pencil.
 Science is facts; just as houses are made of stones, so is science made
 of facts; but a pile of stones is not a house and a collection of facts
 is not necessarily science.
-		-- Henri Poincair'e
+		-- Henri Poincairé
 %
 Science is what happens when preconception meets verification.
 %
@@ -11760,7 +11760,7 @@ Spouse, n.:
 	wouldn't have had if you'd stayed single.
 %
 Star Wars is adolescent nonsense; Close Encounters is obscurantist
-drivel; Star Trek can turn your brains to pur'ee of bat guano; and the
+drivel; Star Trek can turn your brains to purée of bat guano; and the
 greatest science fiction series of all time is Doctor Who!  And I'll
 take you all on, one-by-one or all in a bunch to back it up!
 		-- Harlan Ellison
@@ -14330,7 +14330,7 @@ Today, of course, it is considered very poor taste to use the F-word
 except in major motion pictures.
 		-- Dave Barry, "$#$%#^%!^%&@%@!"
 %
-Toilet Toup'ee, n.:
+Toilet Toupée, n.:
 	Any shag carpet that causes the lid to become top-heavy, thus
 	creating endless annoyance to male users.
 		-- Rich Hall, "Sniglets"
diff --git a/games/fortune/datfiles/fortunes-o.real b/games/fortune/datfiles/fortunes-o.real
index acaa4529e4a..5fcfd8309f0 100644
--- a/games/fortune/datfiles/fortunes-o.real
+++ b/games/fortune/datfiles/fortunes-o.real
@@ -807,7 +807,7 @@ only two went back to women.
 %
 If the American dream is for Americans only, it will remain our dream
 and never be our destiny.
-		-- Ren'e de Visme Williamson
+		-- René de Visme Williamson
 %
 If you can believe ten impossible things before breakfast, then you
 should join