@@ -423,24 +423,24 @@ specialAccentedChar = choice [ ccedil, aring, iuml, szlig, aelig,
424ccedil = try (do
424ccedil = try (do
425 char '\\'
425 char '\\'
426− letter <- choice [try (string "cc"), try (string "cC")]
426+ letter <- oneOfStrings ["cc", "cC"]
427 let num = if letter == "cc" then 231 else 199
427 let num = if letter == "cc" then 231 else 199
428 return (Str [chr num]))
428 return (Str [chr num]))
430aring = try (do
430aring = try (do
431 char '\\'
431 char '\\'
432− letter <- choice [try (string "aa"), try (string "AA")]
432+ letter <- oneOfStrings ["aa", "AA"]
433 let num = if letter == "aa" then 229 else 197
433 let num = if letter == "aa" then 229 else 197
434 return (Str [chr num]))
434 return (Str [chr num]))
436iuml = try (do
436iuml = try (do
437 string "\\\""
437 string "\\\""
438− choice [try (string "\\i"), try (string "{\\i}")]
438+ oneOfStrings ["\\i", "{\\i}"]
439 return (Str [chr 239]))
439 return (Str [chr 239]))
441icirc = try (do
441icirc = try (do
442 string "\\^"
442 string "\\^"
443− choice [try (string "\\i"), try (string "{\\i}")]
443+ oneOfStrings ["\\i", "{\\i}"]
444 return (Str [chr 238]))
444 return (Str [chr 238]))
446szlig = try (do
446szlig = try (do
@@ -455,7 +455,7 @@ oslash = try (do
456aelig = try (do
456aelig = try (do
457 char '\\'
457 char '\\'
458− letter <- choice [try (string "ae"), try (string "AE")]
458+ letter <- oneOfStrings ["ae", "AE"]
459 let num = if letter == "ae" then 230 else 198
459 let num = if letter == "ae" then 230 else 198
460 return (Str [chr num]))
460 return (Str [chr num]))