@@ -358,8 +358,6 @@ inlineCommands = M.fromList $
358358 , ("scshape", smallcaps <$> inlines)
359359 , ("bfseries", strong <$> inlines)
360360 , ("/", pure mempty) -- italic correction
361− , ("cc", lit "ç")
362− , ("cC", lit "Ç")
363361 , ("aa", lit "å")
364362 , ("AA", lit "Å")
365363 , ("ss", lit "ß")
@@ -372,13 +370,14 @@ inlineCommands = M.fromList $
372370 , ("pounds", lit "£")
373371 , ("euro", lit "€")
374372 , ("copyright", lit "©")
375− , ("`", option (str "`") $ try $ tok >>= accent grave)
376− , ("'", option (str "'") $ try $ tok >>= accent acute)
377− , ("^", option (str "^") $ try $ tok >>= accent hat)
378− , ("~", option (str "~") $ try $ tok >>= accent circ)
379− , ("\"", option (str "\"") $ try $ tok >>= accent umlaut)
380− , (".", option (str ".") $ try $ tok >>= accent dot)
381− , ("=", option (str "=") $ try $ tok >>= accent macron)
373+ , ("`", tok >>= accent grave)
374+ , ("'", tok >>= accent acute)
375+ , ("^", tok >>= accent circ)
376+ , ("~", tok >>= accent tilde)
377+ , ("\"", tok >>= accent umlaut)
378+ , (".", tok >>= accent dot)
379+ , ("=", tok >>= accent macron)
380+ , ("c", tok >>= accent cedilla)
382381 , ("i", lit "i")
383382 , ("\\", linebreak <$ (optional (bracketed inline) *> optional sp))
384383 , (",", pure mempty)
@@ -502,33 +501,66 @@ acute 'E' = 'É'
502501acute 'I' = 'Í'
503502acute 'O' = 'Ó'
504503acute 'U' = 'Ú'
504+acute 'Y' = 'Ý'
505505acute 'a' = 'á'
506506acute 'e' = 'é'
507507acute 'i' = 'í'
508508acute 'o' = 'ó'
509509acute 'u' = 'ú'
510+acute 'y' = 'ý'
511+acute 'C' = 'Ć'
512+acute 'c' = 'ć'
513+acute 'L' = 'Ĺ'
514+acute 'l' = 'ĺ'
515+acute 'N' = 'Ń'
516+acute 'n' = 'ń'
517+acute 'R' = 'Ŕ'
518+acute 'r' = 'ŕ'
519+acute 'S' = 'Ś'
520+acute 's' = 'ś'
521+acute 'Z' = 'Ź'
522+acute 'z' = 'ź'
510523acute c = c
511524
512−hat :: Char -> Char
513−hat 'A' = 'Â'
514−hat 'E' = 'Ê'
515−hat 'I' = 'Î'
516−hat 'O' = 'Ô'
517−hat 'U' = 'Û'
518−hat 'a' = 'ã'
519−hat 'e' = 'ê'
520−hat 'i' = 'î'
521−hat 'o' = 'ô'
522−hat 'u' = 'û'
523−hat c = c
524−
525525circ :: Char -> Char
526−circ 'A' = 'Ã'
527−circ 'O' = 'Õ'
528−circ 'o' = 'õ'
529−circ 'N' = 'Ñ'
530−circ 'n' = 'ñ'
531−circ c = c
526+circ 'A' = 'Â'
527+circ 'E' = 'Ê'
528+circ 'I' = 'Î'
529+circ 'O' = 'Ô'
530+circ 'U' = 'Û'
531+circ 'a' = 'â'
532+circ 'e' = 'ê'
533+circ 'i' = 'î'
534+circ 'o' = 'ô'
535+circ 'u' = 'û'
536+circ 'C' = 'Ĉ'
537+circ 'c' = 'ĉ'
538+circ 'G' = 'Ĝ'
539+circ 'g' = 'ĝ'
540+circ 'H' = 'Ĥ'
541+circ 'h' = 'ĥ'
542+circ 'J' = 'Ĵ'
543+circ 'j' = 'ĵ'
544+circ 'S' = 'Ŝ'
545+circ 's' = 'ŝ'
546+circ 'W' = 'Ŵ'
547+circ 'w' = 'ŵ'
548+circ 'Y' = 'Ŷ'
549+circ 'y' = 'ŷ'
550+circ c = c
551+
552+tilde :: Char -> Char
553+tilde 'A' = 'Ã'
554+tilde 'a' = 'ã'
555+tilde 'O' = 'Õ'
556+tilde 'o' = 'õ'
557+tilde 'I' = 'Ĩ'
558+tilde 'i' = 'ĩ'
559+tilde 'U' = 'Ũ'
560+tilde 'u' = 'ũ'
561+tilde 'N' = 'Ñ'
562+tilde 'n' = 'ñ'
563+tilde c = c
532564
533565umlaut :: Char -> Char
534566umlaut 'A' = 'Ä'
@@ -568,6 +600,13 @@ macron 'o' = 'ō'
568600macron 'u' = 'ū'
569601macron c = c
570602
603+cedilla :: Char -> Char
604+cedilla 'c' = 'ç'
605+cedilla 'C' = 'Ç'
606+cedilla 's' = 'ş'
607+cedilla 'S' = 'Ş'
608+cedilla c = c
609+
571610tok :: LP Inlines
572611tok = try $ grouped inline <|> inlineCommand <|> str <$> (count 1 $ inlineChar)
573612