Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Muse writer #3489

Merged
merged 3 commits into from
Mar 10, 2017
Merged

Add Muse writer #3489

merged 3 commits into from
Mar 10, 2017

Conversation

link2xt
Copy link
Collaborator

@link2xt link2xt commented Mar 5, 2017

Closes #3405

pandoc.cabal Outdated
@@ -180,6 +181,7 @@ Extra-Source-Files:
test/writer.markdown
test/writer.plain
test/writer.mediawiki
test/writer.muse
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you need to add test/writer.muse to the repository -- I don't see it here in this PR.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have it actually. I added it when I began development, but removed it then as I thought it was deprecated as it was referred from test/Tests/Old.hs. Instead I made a comprehensive unit test suite.

Should I add it or are we moving towards unit tests?

README.md Outdated
@@ -26,7 +26,7 @@ write plain text, [Markdown], [CommonMark], [PHP Markdown Extra],
[DocBook], [OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki
markup], [DokuWiki markup], [ZimWiki markup], [Haddock markup],
[EPUB] \(v2 or v3\), [FictionBook2], [Textile], [groff man] pages,
[Emacs Org mode], [AsciiDoc], [InDesign ICML], [TEI Simple], and [Slidy],
[Emacs Org mode], [AsciiDoc], [InDesign ICML], [TEI Simple], [Muse] and [Slidy],
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's put a comma after [Muse] here; it makes it clearer that it's not one of the slide show formats.

pandoc.cabal Outdated
@@ -24,7 +24,7 @@ Description: Pandoc is a Haskell library for converting from one markup
Word docx, RTF, MediaWiki, DokuWiki, ZimWiki, Textile,
groff man pages, plain text, Emacs Org-Mode, AsciiDoc,
Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML,
and several kinds of HTML/javascript slide shows (S5, Slidy,
Muse and several kinds of HTML/javascript slide shows (S5, Slidy,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comma after Muse please.

deb/control.in Outdated
@@ -16,5 +16,5 @@ Description: general markup converter
Docbook, OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki,
DokuWiki, Textile, groff man pages, plain text, Emacs Org-Mode,
AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2,
InDesign ICML, and several kinds of HTML/javascript
InDesign ICML, Muse and several kinds of HTML/javascript
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comma after Muse

@@ -0,0 +1,329 @@
{-# LANGUAGE OverloadedStrings #-}
{-
Copyright (C) 2010-2017 John MacFarlane <[email protected]>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should put your own name and 2017 here.

@jgm
Copy link
Owner

jgm commented Mar 6, 2017

This basically looks great. I've made a couple of minor comments.
The biggest problem is the missing test/writer.muse.

@link2xt link2xt force-pushed the muse branch 2 times, most recently from 9b56694 to 197b885 Compare March 6, 2017 19:35
@link2xt
Copy link
Collaborator Author

link2xt commented Mar 6, 2017

@jgm I have fixed what you proposed.

As for test/writer.muse, I have just removed it as I suggested in the comment above.

Also, just in case you have not noticed, I have not added Muse into the list of formats in man/pandoc.1 because I think it is regenerated anyway when release is made.

@jgm
Copy link
Owner

jgm commented Mar 7, 2017 via email

@jgm
Copy link
Owner

jgm commented Mar 7, 2017 via email

@link2xt link2xt force-pushed the muse branch 4 times, most recently from cbed8d4 to eb37daf Compare March 7, 2017 18:22
@link2xt
Copy link
Collaborator Author

link2xt commented Mar 7, 2017

Found some bugs to fix:

Non-critical, might just document them:

  • Loose lists become tight lists.
    Text::Amuse will put <p> into HTML output in any case, so it does not matter as much as for Markdown.
  • Table cells are not aligned

@link2xt link2xt force-pushed the muse branch 2 times, most recently from 27f70c5 to b9d82f5 Compare March 8, 2017 22:17
@jgm
Copy link
Owner

jgm commented Mar 9, 2017

Let me know when you're ready to merge. I wasn't sure if you were planning to do something about the accidental lists issue.

@link2xt
Copy link
Collaborator Author

link2xt commented Mar 9, 2017

@jgm
Ok, lets merge it as is. These issues are indeed minor, especially because Muse requires whitespace before list markers.

I will not change this branch anymore and push all new changes into another branch, like muse-next.

@jgm jgm merged commit d037c50 into jgm:master Mar 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants