Change treatment of number-lines directives.
#5207
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
leungbk
force-pushed
the
rst-whitespace
branch
3 times, most recently
from
c36dd4e
to
df873ce
Compare
|
Hmm, I'm not sure why the CI can't load my file. I'm following the example of |
You probably need to add it expliclitly to extra-source-files in pandoc.cabal. |
leungbk
force-pushed
the
rst-whitespace
branch
from
df873ce
to
954434a
Compare
jgm
reviewed
Jan 9, 2019
src/Text/Pandoc/Readers/RST.hs
Outdated
| @@ -505,7 +505,11 @@ includeDirective top fields body = do | |||
| let numberLines = lookup "number-lines" fields | |||
| let classes = trimr lang : ["numberLines" | isJust numberLines] ++ | |||
| maybe [] words (lookup "class" fields) | |||
| let kvs = maybe [] (\n -> [("startFrom", trimr n)]) numberLines | |||
| let kvs = maybe [] (\n -> let tn = trimr n | |||
There was a problem hiding this comment.
null tn would be better than tn == "". But as a matter of style, I think this is cleaner:
case trimr n of
[] -> []
xs -> [("startFrom", xs)]Indeed, you could use a list comprehension:
let kvs = [("startFrom", xs) | x <- maybeToList (trimr <$> tn)]but this probably isn't as clear to the reader.
jgm
reviewed
Jan 9, 2019
src/Text/Pandoc/Readers/RST.hs
Outdated
| Nothing -> [] | ||
| Just n -> [("startFrom",trim n)] | ||
| Just n |
Directives of this type without numeric inputs should not have a `startFrom` attribute; with a blank value, the writers can produce extra whitespace.
leungbk
force-pushed
the
rst-whitespace
branch
from
954434a
to
ff3822c
Compare
|
Done. I also tried to dedupe the code a bit. |
|
Looks good, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Directives of this type without numeric inputs should not have a
startFromattribute; with a blank value, the writers can produceextra whitespace.
Also, the stuff around line 1000 is modified because previously, it failed to catch newlines.
Closes #5182.