Fixes for zimwiki writer #3403

alexivkin · 2017-01-31T23:43:29Z

Improvements for ZimWiki's source view and table markup.

tarleb · 2017-02-01T07:45:00Z

src/Text/Pandoc/Writers/ZimWiki.hs


 -- | Convert Pandoc to ZimWiki.
 writeZimWiki :: PandocMonad m => WriterOptions -> Pandoc -> m String
-writeZimWiki opts document = return $ evalState (pandocToZimWiki opts document) (WriterState 1 "")
+writeZimWiki opts document = return $ evalState (pandocToZimWiki opts document) (WriterState 1 "" False)


The WriterState seems to be def, maybe it would make sense to use that instead?

The def value from the Default type class.

I have no idea how to do that. Are there any existing examples in the code?

I think what @tarleb is proposing is simply: evalState (pandocToZimWiki opts document) def

alexivkin · 2017-02-14T00:10:01Z

Fixed to def and added 2 more fixes. Not sure why travis checks never complete.

mb21 · 2017-02-14T08:40:01Z

@alexivkin e.g. this travis job is failing because of the zimwiki test. Try stack test to run the tests on your local system... and update the /test/writer.zimwiki file if necessary...

alexivkin · 2017-02-14T19:06:36Z

updated the tests

Add a -MacOS suffix to mac package rather than -OSX. CHanged local names from osx to macos.

See #3289 and #3288.

This comment is likely copied from RST.hs where 'refs' variable indeed exists, but makes no sense here.

…fix opt (#3398) closes #3397

@jkr

This just parses inside smartTags and yields their contents, ignoring the attributes of the smartTag. @jkr, you may want to adjust this, but I wanted to get a fix in as fast as possible for the dropped content. Closes #2242; see also #3412.

This fixes #3410.

Previously we didn't recognize math, for example, when the xmlns declaration occured on the element and not the root. Now we recognize either. Closes #3365. This patch defines findChildByName, findChildrenByName, and findAttrByName in Util, and uses these in Parse.

See #3416.

We should make this closer to the actual options, and do processing outside.

Moved unsmartify to Writers.Shared.

Verbosity level only affects which are printed to stdout. (Exception: DEBUG messages are only printed, never saved to state.)

See #3392.

Use a deterministic order for fields.

See #3432. Previously the parser didn't handle properly this case: * - a - b * - c - d

This allows adding captions to tables.

Currently the support for the `.. table` directive is a bit limited; we don't yet support the `widths` field. But at least you can have a proper captioned table.

This is deprecated but may still be in older documents.

Links with # are perfectly valid according to http://orgmode.org/manual/Internal-links.html#Internal-links

I don't think this is still needed. If the Travis build fails, we can try adjusting the CPP to make it more compatible.

The bug: https://ghc.haskell.org/trac/ghc/ticket/13194 See https://ci.appveyor.com/api/buildjobs/02l7v73n5hjs2t5u/log for its occurrence in previous appveyor builds of pandoc.

For example, in \begin{tabular}{>{$}l<{$}>{$}l<{$} >{$}l<{$}} each cell will be interpreted as if it has a `$` before its content and a `$` after (math mode).

alexivkin · 2017-02-14T20:16:06Z

The tests work for zim, but fail on Latex - completely unrelated to my code. It's something in the previous main branch commits that triggered it.

jgm · 2017-02-14T22:50:33Z

The rebase has gotten pretty hairy. You added this at a bad time, with lots of churn in the code base. Sorry this has been difficult.

Suggestion:

remove this PR
copy your src/Text/Pandoc/Writers/ZimWiki.hs, test/writer.zimwiki, and test/table.zimwiki to a safe place.
check out current pandoc master
copy the three files backed up above to their appropriate places in master
git add and commit them. Be sure to include a full commit message, describing the changes you've made..."fixed the writer" is not enough. I'll need this for the changelog.
stack test
assuming all goes well, create a new PR. This will be a single clean commit on top of master, with a good description of the changes, and should be mergeable.

alexivkin · 2017-02-15T01:01:49Z

Done. #3446
Should have I committed to a branch, instead of master, to avoid trying to catch up with the head?

mb21 · 2017-02-15T08:50:35Z

great!

Should have I committed to a branch, instead of master, to avoid trying to catch up with the head?

commiting to a branch frees the master branch of your own repo to work on other features while you wait for jgm to merge your pull request into the official master. you always have to catch up with master (best to rebase, not merge), but this time you were just unlucky that there were a lot of changes in the meantime.

jgm · 2017-02-15T10:29:03Z

I don't know, perhaps that would have made things easier, but I think the main problem is the large number of changes to HEAD in this period. +++ Alex Ivkin [Feb 14 17 17:01 ]:

…

Done. [1]#3446 Should have I committed to a branch, instead of master, to avoid trying to catch up with the head? — You are receiving this because you commented. Reply to this email directly, [2]view it on GitHub, or [3]mute the thread. References 1. #3446 2. #3403 (comment) 3. https://github.com/notifications/unsubscribe-auth/AAAL5FK4bbvlB4vZAHD0ojR-Gjt2PjyBks5rck59gaJpZM4LzUcw

Fixes for sourceview and table plugins

eade47b

tarleb reviewed Feb 1, 2017

View reviewed changes

Init, link text and note fixes

dde9370

alexivkin changed the title ~~Fixes for sourceview and table plugins~~ Fixes for zimwiki writer Feb 14, 2017

Test fixes to reflect zimwiki bugfixes

eae03db

jgm and others added 22 commits February 14, 2017 11:11

Update test output for skylighting >= 0.1.1.3.

1945dd1

Version bounds: require skylighting 0.1.1.4, bump bounds for blaze-*.

e74b089

Name change OSX -> MacOS.

ed0e55c

Add a -MacOS suffix to mac package rather than -OSX. CHanged local names from osx to macos.

stack.yaml - use latest skylighting.

d9cb41f

make_macos_package.sh - install cpphs if not present.

9bff0bb

Reduce state in Org writer (#3404)

dc9a81e

Added deb/.vagrant to gitignore

6f84dda

Added skeletons for docs on customizing pandoc and using pandoc API.

1f446a6

See #3289 and #3288.

Org.hs: remove misleading comment

5869da7

This comment is likely copied from RST.hs where 'refs' variable indeed exists, but makes no sense here.

HTML and DocBook writers: fix internal links with writerIdentifierPre…

f4e5add

…fix opt (#3398) closes #3397

Docx reader: Don't drop smartTag contents.

ca87b34

This just parses inside smartTags and yields their contents, ignoring the attributes of the smartTag. @jkr, you may want to adjust this, but I wanted to get a fix in as fast as possible for the dropped content. Closes #2242; see also #3412.

Manual: Mention limitations of Literate Haskell Support (#3413)

bc7443d

This fixes #3410.

Added TODO comment.

c6627b4

Better error messages for removed options.

5f3f8c8

See #3416.

Simplified Opt structure in cli option parsing.

4dbcb44

We should make this closer to the actual options, and do processing outside.

Small revision to deprecation message for --old-dashes.

dc9633f

Implemented +/-smart in rst writer.

0da8209

Moved unsmartify to Writers.Shared.

Moved tests/ -> test/.

ac54fe9

Added skeleton for Tests.Command.

7715866

Expose setVerbosity in Text.Pandoc

b7ade9e

Markdown writer: Better escaping when +smart.

e6ff5f3

jgm and others added 24 commits February 14, 2017 11:11

Class.report: Save all log messages in state.

37e2ed7

Verbosity level only affects which are printed to stdout. (Exception: DEBUG messages are only printed, never saved to state.)

Added --log option to save log messages in JSON format to a file.

b5d65a7

See #3392.

Logging: export logMessagesToJSON.

a652398

Use a deterministic order for fields.

Fixed small bug in RST list parsing.

cb56fde

See #3432. Previously the parser didn't handle properly this case: * - a - b * - c - d

RST reader: Initial support of .. table directive.

cc2471d

This allows adding captions to tables.

RST reader/writer: properly handle table captions.

db35546

Currently the support for the `.. table` directive is a bit limited; we don't yet support the `widths` field. But at least you can have a proper captioned table.

RST reader: Support .. line-block directive.

2bedd3f

This is deprecated but may still be in older documents.

Rename logMessagesToJSON -> encodeLogMessages.

7e35ba4

Add Org writer unit tests

855e8a2

Do not strip # from Org anchor links

3979c95

Links with # are perfectly valid according to http://orgmode.org/manual/Internal-links.html#Internal-links

Comment out instruction to use cpphs in macos stack.yaml.

ff5fc7c

I don't think this is still needed. If the Travis build fails, we can try adjusting the CPP to make it more compatible.

stack.yamls: Use lts-8.0.

6202488

pandoc.cabal: use cpphs if embed_data_files and darwin.

6da044b

More updates to macos/stack.yaml.

193dcce

Replaced {deb,macos,windows}/stack.yaml with stack.pkg.yaml.

30afa9a

Windows packaging fixes to use new stack.pkg.yaml.

80ab982

appveyor.yml: use -j1, in hopes that this will help with a GHC bug.

850300f

The bug: https://ghc.haskell.org/trac/ghc/ticket/13194 See https://ci.appveyor.com/api/buildjobs/02l7v73n5hjs2t5u/log for its occurrence in previous appveyor builds of pandoc.

deb/make_deb.sh fixes.

471c606

appveyor.yml: Fixed some paths.

f96ac49

LaTeX reader: properly handle column prefixes/suffixes.

4ba52ea

For example, in \begin{tabular}{>{$}l<{$}>{$}l<{$} >{$}l<{$}} each cell will be interpreted as if it has a `$` before its content and a `$` after (math mode).

Removed unnecessary import.

abf3887

Catching up with upstream

8d912d8

Catching

78d6603

Resolved conflicts

6284872

alexivkin closed this Feb 15, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes for zimwiki writer #3403

Fixes for zimwiki writer #3403

alexivkin commented Jan 31, 2017

tarleb Feb 1, 2017

alexivkin Feb 2, 2017

tarleb Feb 2, 2017

alexivkin Feb 9, 2017

mb21 Feb 9, 2017

alexivkin commented Feb 14, 2017 •

edited

Loading

mb21 commented Feb 14, 2017

alexivkin commented Feb 14, 2017

alexivkin commented Feb 14, 2017

jgm commented Feb 14, 2017

alexivkin commented Feb 15, 2017

mb21 commented Feb 15, 2017

jgm commented Feb 15, 2017 via email

Fixes for zimwiki writer #3403

Fixes for zimwiki writer #3403

Conversation

alexivkin commented Jan 31, 2017

tarleb Feb 1, 2017

Choose a reason for hiding this comment

alexivkin Feb 2, 2017

Choose a reason for hiding this comment

tarleb Feb 2, 2017

Choose a reason for hiding this comment

alexivkin Feb 9, 2017

Choose a reason for hiding this comment

mb21 Feb 9, 2017

Choose a reason for hiding this comment

alexivkin commented Feb 14, 2017 • edited Loading

mb21 commented Feb 14, 2017

alexivkin commented Feb 14, 2017

alexivkin commented Feb 14, 2017

jgm commented Feb 14, 2017

alexivkin commented Feb 15, 2017

mb21 commented Feb 15, 2017

jgm commented Feb 15, 2017 via email

alexivkin commented Feb 14, 2017 •

edited

Loading