Skip to content

Commit

Permalink
Fix multiline comments with rn line endings, fixes #171. (#172)
Browse files Browse the repository at this point in the history
  • Loading branch information
fredrikekre authored Oct 18, 2021
1 parent eb3d236 commit fbd39a3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Fixed
- Fix multiline comment support for `\r\n` line endings. ([#171][github-171], [#172][github-172])

## [2.9.3] - 2021-09-01
### Fixed
Expand Down Expand Up @@ -149,6 +151,8 @@ https://discourse.julialang.org/t/ann-literate-jl/10651 for release announcement
[github-167]: https://github.com/fredrikekre/Literate.jl/pull/167
[github-168]: https://github.com/fredrikekre/Literate.jl/issues/168
[github-169]: https://github.com/fredrikekre/Literate.jl/pull/169
[github-171]: https://github.com/fredrikekre/Literate.jl/issues/171
[github-172]: https://github.com/fredrikekre/Literate.jl/pull/172

[Unreleased]: https://github.com/fredrikekre/Literate.jl/compare/v2.9.3...HEAD
[2.9.3]: https://github.com/fredrikekre/Literate.jl/compare/v2.9.2...v2.9.3
Expand Down
4 changes: 2 additions & 2 deletions src/Literate.jl
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,9 @@ function replace_default(content, sym;
end
return str
end
content = replace_multiline(r"^#=+\R^(\X*?)\R=+#$"m, content)
content = replace_multiline(r"(*ANYCRLF)^#=+$\R^(\X*?)\R^=+#$"m, content)
if config["mdstrings"]::Bool
content = replace_multiline(r"^md\"\"\"\R^(\X*?)\R\"\"\"$"m, content)
content = replace_multiline(r"(*ANYCRLF)^md\"\"\"$\R^(\X*?)\R^\"\"\"$"m, content)
end


Expand Down
4 changes: 2 additions & 2 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -827,10 +827,10 @@ end end
@test isfile("inputfile.md")

# fredrikekre/Literate.jl#165: \r\n line endings with multiline comments/mdstrings
write(inputfile, "#=\r\nhello world\r\nhej världen\r\n=#")
write(inputfile, "#=\r\nhello world\r\nhej världen\r\n=#\r\n")
chunks, _ = Literate.preprocessor(inputfile, outdir; user_kwargs=(), user_config=(), type=:md)
@test chunks[2].lines == ["" => "hello world", "" => "hej världen"]
write(inputfile, "md\"\"\"\r\nhello world\r\nhej världen\r\n\"\"\"")
write(inputfile, "md\"\"\"\r\nhello world\r\nhej världen\r\n\"\"\"\r\n")
chunks, _ = Literate.preprocessor(inputfile, outdir; user_kwargs=pairs((; mdstrings=true)),
user_config=(), type=:md)
@test chunks[2].lines == ["" => "hello world", "" => "hej världen"]
Expand Down

0 comments on commit fbd39a3

Please sign in to comment.