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

Fix invalid syntax #35

Merged
merged 6 commits into from
Jun 6, 2018
Merged

Fix invalid syntax #35

merged 6 commits into from
Jun 6, 2018

Conversation

micgro42
Copy link
Contributor

@micgro42 micgro42 commented Jun 6, 2018

This adjusts schema to disallow some syntax that is illegal in DokuWiki. It also gives the node-types in script/schema.js groups that are closer to DokuWiki's PARSER_MODES.

Fixes #28

We have a 'preformatted-node
This fixes the problem that headlines and quoting was possible in list
nodes. To achieve this we build list nodes closer to how they are in
dokuwiki. They must now contain one list_content node and may contain
one bullet_list or ordered_list node. The list_content node may contain
a list_paragraph (it's just like an ordinary paragraph, except that it
is rendered in `<div>` instead of `<p>` tags to prevent extra styling)
or nodes from the group protected_block or substitution_block. The
groups are created analogous to the PARSER_MODES in DokuWiki, except
that we have to differentiate between block and inline nodes.

This should fix two more items mentioned in #28
@micgro42 micgro42 requested a review from splitbrain June 6, 2018 11:27
@splitbrain splitbrain merged commit 8fbb175 into master Jun 6, 2018
@splitbrain splitbrain deleted the fixInvalidSyntax branch June 6, 2018 11:50
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.

Invalid Syntax
2 participants