14984a7 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

LaTeX reader: Fixed accents.

14984a7John MacFarlane15 years ago

src/Text/Pandoc/Readers/LaTeX.hs+67−28

compare with master

unifiedsplit

@@ -358,8 +358,6 @@ inlineCommands = M.fromList $

358 , ("scshape", smallcaps <$> inlines)

359 , ("bfseries", strong <$> inlines)

360 , ("/", pure mempty) -- italic correction

361− , ("cc", lit "ç")

362− , ("cC", lit "Ç")

363 , ("aa", lit "å")

361 , ("aa", lit "å")

364 , ("AA", lit "Å")

362 , ("AA", lit "Å")

365 , ("ss", lit "ß")

363 , ("ss", lit "ß")

@@ -372,13 +370,14 @@ inlineCommands = M.fromList $

372 , ("pounds", lit "£")

370 , ("pounds", lit "£")

373 , ("euro", lit "€")

371 , ("euro", lit "€")

374 , ("copyright", lit "©")

372 , ("copyright", lit "©")

375− , ("`", option (str "`") $ try $ tok >>= accent grave)

373+ , ("`", tok >>= accent grave)

376− , ("'", option (str "'") $ try $ tok >>= accent acute)

374+ , ("'", tok >>= accent acute)

377− , ("^", option (str "^") $ try $ tok >>= accent hat)

378− , ("~", option (str "~") $ try $ tok >>= accent circ)

375+ , ("^", tok >>= accent circ)

376+ , ("~", tok >>= accent tilde)

379− , ("\"", option (str "\"") $ try $ tok >>= accent umlaut)

377+ , ("\"", tok >>= accent umlaut)

380− , (".", option (str ".") $ try $ tok >>= accent dot)

378+ , (".", tok >>= accent dot)

381− , ("=", option (str "=") $ try $ tok >>= accent macron)

379+ , ("=", tok >>= accent macron)

380+ , ("c", tok >>= accent cedilla)

382 , ("i", lit "i")

381 , ("i", lit "i")

383 , ("\\", linebreak <$ (optional (bracketed inline) *> optional sp))

382 , ("\\", linebreak <$ (optional (bracketed inline) *> optional sp))

384 , (",", pure mempty)

383 , (",", pure mempty)

@@ -502,33 +501,66 @@ acute 'E' = 'É'

502acute 'I' = 'Í'

501acute 'I' = 'Í'

503acute 'O' = 'Ó'

502acute 'O' = 'Ó'

504acute 'U' = 'Ú'

503acute 'U' = 'Ú'

504+acute 'Y' = 'Ý'

505acute 'a' = 'á'

506acute 'e' = 'é'

507acute 'i' = 'í'

508acute 'o' = 'ó'

509acute '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' = 'ź'

510acute c = c

523acute c = c

511

524

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−

525circ :: Char -> Char

526−circ 'A' = 'Ã'

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' = 'ã'

527−circ 'O' = 'Õ'

555+tilde 'O' = 'Õ'

528−circ 'o' = 'õ'

556+tilde 'o' = 'õ'

557+tilde 'I' = 'Ĩ'

558+tilde 'i' = 'ĩ'

559+tilde 'U' = 'Ũ'

560+tilde 'u' = 'ũ'

529−circ 'N' = 'Ñ'

561+tilde 'N' = 'Ñ'

530−circ 'n' = 'ñ'

562+tilde 'n' = 'ñ'

531−circ c = c

563+tilde c = c

532

564

533umlaut :: Char -> Char

565umlaut :: Char -> Char

534umlaut 'A' = 'Ä'

566umlaut 'A' = 'Ä'

@@ -568,6 +600,13 @@ macron 'o' = 'ō'

568macron 'u' = 'ū'

600macron 'u' = 'ū'

569macron c = c

601macron c = c

570

602

603+cedilla :: Char -> Char

604+cedilla 'c' = 'ç'

605+cedilla 'C' = 'Ç'

606+cedilla 's' = 'ş'

607+cedilla 'S' = 'Ş'

608+cedilla c = c

609+

571tok :: LP Inlines

610tok :: LP Inlines

572tok = try $ grouped inline <|> inlineCommand <|> str <$> (count 1 $ inlineChar)

611tok = try $ grouped inline <|> inlineCommand <|> str <$> (count 1 $ inlineChar)

573

612