ddf2524 · typeable/pandoc

git.iko.soy/typeable/pandoc

Fix keyval funtion: pandoc did not parse options in braces correctly.… (#3642)

* Fix keyval funtion: pandoc did not parse options in braces correctly. Additionally, dot, dash, and colon were no valid characters * Add | as possible option value * Improved code

commitddf2524477e2a59b36fd37f7e5957ebb3b37c265 authorschrieveslaach <schrieveslaach@online.de> dateSat 6 May 2017, 15:09 (9 years ago) parentf422000

2 files changed+26−1

compare with master

unifiedsplit

src/Text/Pandoc/Readers/LaTeX.hs+1−1 test/command/lstlisting.md+25

src/Text/Pandoc/Readers/LaTeX.hs+1−1

@@ -1095,7 +1095,7 @@ parseListingsOptions options =

10951095keyval :: PandocMonad m => LP m (String, String)

10961096keyval = try $ do

10971097 key <- many1 alphaNum

1098− val <- option "" $ char '=' >> many1 (alphaNum <|> char '.' <|> char '\\')

1098+ val <- option "" $ char '=' >> braced <|> (many1 (alphaNum <|> oneOf ".:-|\\"))

10991099 skipMany spaceChar

11001100 optional (char ',')

11011101 skipMany spaceChar

test/command/lstlisting.mdnew file+25

@@ -0,0 +1,25 @@

1+```

2+% pandoc -f latex -t native

3+\begin{lstlisting}[language=Java, caption={Java Example}, label=lst:Hello-World]

4+public class World {

5+ public static void main(String[] args) {

6+ System.out.println("Hello World");

7+ }

8+}

9+\end{lstlisting}

10+^D

11+[CodeBlock ("lst:Hello-World",["java"],[("language","Java"),("caption","Java Example"),("label","lst:Hello-World")]) "public class World {\n public static void main(String[] args) {\n System.out.println(\"Hello World\");\n }\n}"]

12+```

13+

14+```

15+% pandoc -f latex -t native

16+\begin{lstlisting}[language=Java, escapechar=|, caption={Java Example}, label=lst:Hello-World]

17+public class World {

18+ public static void main(String[] args) {

19+ System.out.println("Hello World");

20+ }

21+}

22+\end{lstlisting}

23+^D

24+[CodeBlock ("lst:Hello-World",["java"],[("language","Java"),("escapechar","|"),("caption","Java Example"),("label","lst:Hello-World")]) "public class World {\n public static void main(String[] args) {\n System.out.println(\"Hello World\");\n }\n}"]

25+```