From 1f00a5395f2c76d94f543775dc945183397a722e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 15 Aug 2015 10:22:47 -0700 Subject: RST reader: better handling of indirect roles. Previously the parser failed on this kind of case .. role:: indirect(code) .. role:: py(indirect) :language: python :py:`hi` Now it currectly recognizes `:py:` as a code role. The previous test for this didn't work, because the name of the indirect role was the same as the language defined its parent, os it didn't really test for this behavior. Updated test. --- tests/rst-reader.native | 2 +- tests/rst-reader.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/rst-reader.native b/tests/rst-reader.native index 1f402f835..c7110eabd 100644 --- a/tests/rst-reader.native +++ b/tests/rst-reader.native @@ -325,7 +325,7 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa ,Para [Str "And",Space,Str "some",Space,Str "inline",Space,Str "haskell",Space,Code ("",["haskell","sourceCode"],[]) "fmap id [1,2..10]",Str "."] ,Null ,Null -,Para [Str "Indirect",Space,Str "python",Space,Str "role",Space,Code ("",["python","indirect","sourceCode"],[]) "[x*x for x in [1,2,3,4,5]]",Str "."] +,Para [Str "Indirect",Space,Str "python",Space,Str "role",Space,Code ("",["py","python","indirect","sourceCode"],[]) "[x*x for x in [1,2,3,4,5]]",Str "."] ,Null ,Null ,Para [Str "Different",Space,Str "indirect",Space,Str "C",Space,Code ("",["c","different-indirect","sourceCode"],[]) "int x = 15;",Str "."] diff --git a/tests/rst-reader.rst b/tests/rst-reader.rst index 930bf2ed2..ff10abe24 100644 --- a/tests/rst-reader.rst +++ b/tests/rst-reader.rst @@ -611,10 +611,10 @@ And some inline haskell :haskell:`fmap id [1,2..10]`. .. role:: indirect(code) -.. role:: python(indirect) +.. role:: py(indirect) :language: python -Indirect python role :python:`[x*x for x in [1,2,3,4,5]]`. +Indirect python role :py:`[x*x for x in [1,2,3,4,5]]`. .. role:: different-indirect(code) :language: c -- cgit v1.2.3