diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2017-08-09 09:45:17 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2017-08-09 09:45:17 -0700 |
| commit | ac18ff90b22c2a8f8b829acb9139477ee7b02954 (patch) | |
| tree | 023b67af082d5460e776b8cbd6686383a2e629d1 | |
| parent | 96933c60432276fcbe2e24163868fffb138e6a11 (diff) | |
Org reader: use org-language attribute rather than data-org-language.
| -rw-r--r-- | src/Text/Pandoc/Readers/Org/Shared.hs | 2 | ||||
| -rw-r--r-- | test/Tests/Readers/Org.hs | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/Text/Pandoc/Readers/Org/Shared.hs b/src/Text/Pandoc/Readers/Org/Shared.hs index 952082ec1..580e9194f 100644 --- a/src/Text/Pandoc/Readers/Org/Shared.hs +++ b/src/Text/Pandoc/Readers/Org/Shared.hs @@ -76,7 +76,7 @@ originalLang lang = let transLang = translateLang lang in if transLang == lang then [] - else [("data-org-language", lang)] + else [("org-language", lang)] -- | Translate from Org-mode's programming language identifiers to those used -- by Pandoc. This is useful to allow for proper syntax highlighting in diff --git a/test/Tests/Readers/Org.hs b/test/Tests/Readers/Org.hs index 1db3d2deb..a9097f993 100644 --- a/test/Tests/Readers/Org.hs +++ b/test/Tests/Readers/Org.hs @@ -282,14 +282,14 @@ tests = "src_emacs-lisp{(message \"Hello\")}" =?> (para $ codeWith ( "" , [ "commonlisp" ] - , [ ("data-org-language", "emacs-lisp") ]) + , [ ("org-language", "emacs-lisp") ]) "(message \"Hello\")") , "Inline code block with arguments" =: "src_sh[:export both :results output]{echo 'Hello, World'}" =?> (para $ codeWith ( "" , [ "bash" ] - , [ ("data-org-language", "sh") + , [ ("org-language", "sh") , ("export", "both") , ("results", "output") ] @@ -300,7 +300,7 @@ tests = "src_sh[:toggle]{echo $HOME}" =?> (para $ codeWith ( "" , [ "bash" ] - , [ ("data-org-language", "sh") + , [ ("org-language", "sh") , ("toggle", "yes") ] ) @@ -1556,7 +1556,7 @@ tests = , " (+ 23 42))" , "#+END_SRC" ] =?> let classes = [ "commonlisp" ] -- as kate doesn't know emacs-lisp syntax - params = [ ("data-org-language", "emacs-lisp") + params = [ ("org-language", "emacs-lisp") , ("exports", "both") ] code' = unlines [ "(progn (message \"Hello, World!\")" @@ -1572,7 +1572,7 @@ tests = , "#+RESULTS:" , ": 65"] =?> let classes = [ "commonlisp" ] - params = [ ("data-org-language", "emacs-lisp") + params = [ ("org-language", "emacs-lisp") , ("exports", "both") ] code' = unlines [ "(progn (message \"Hello, World!\")" @@ -1591,7 +1591,7 @@ tests = , "#+RESULTS:" , ": 65" ] =?> let classes = [ "commonlisp" ] - params = [ ("data-org-language", "emacs-lisp") + params = [ ("org-language", "emacs-lisp") , ("exports", "code") ] code' = unlines [ "(progn (message \"Hello, World!\")" @@ -1625,7 +1625,7 @@ tests = , "#+END_SRC" ] =?> let classes = [ "bash" ] - params = [ ("data-org-language", "sh"), ("noeval", "yes") ] + params = [ ("org-language", "sh"), ("noeval", "yes") ] in codeBlockWith ("", classes, params) "echo $HOME\n" , "Source block with line number switch" =: @@ -1634,7 +1634,7 @@ tests = , "#+END_SRC" ] =?> let classes = [ "bash", "numberLines" ] - params = [ ("data-org-language", "sh"), ("startFrom", "10") ] + params = [ ("org-language", "sh"), ("startFrom", "10") ] in codeBlockWith ("", classes, params) ":() { :|:& };:\n" , "Source block with multi-word parameter values" =: @@ -1793,7 +1793,7 @@ tests = , "code body" , "#+END_SRC" ] =?> - let params = [ ("data-org-language", "C") + let params = [ ("org-language", "C") , ("tangle", "xxxx.c") , ("city", "Zürich") ] |