Commit Graph

984 Commits

Author SHA1 Message Date
Miek Gieben a5e61bddcd
Merge pull request #83 from mmarkdown/idtag
html: allow setting the tag for IDs
2018-08-23 09:39:10 +02:00
Miek Gieben d09ef679e5 typo
Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-23 09:36:49 +02:00
Miek Gieben 7898e033b3 html: allow setting the tag for IDs
For the blockattributes it is nice to be able to switch this to
something else.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-23 07:47:27 +02:00
Miek Gieben f84f123c4f
Merge pull request #81 from mmarkdown/data
matter: use data-matter
2018-08-20 16:48:34 +02:00
Miek Gieben d69570cae4 .... and the test
Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-20 16:41:42 +02:00
Miek Gieben 9f8ffcf487 matter: use data-matter
Just using matter is not legal in html5, `data-` is.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-20 16:22:20 +02:00
Miek Gieben c60cb09e52
Merge pull request #79 from mmarkdown/html-exports
Export some html construct
2018-08-18 15:26:30 +02:00
Miek Gieben 2d3f8fad1c Export some html construct
Export these so they can be used externally.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-18 15:17:03 +02:00
Miek Gieben eaf5f77286
Merge pull request #78 from mmarkdown/fixes2
Update readme and other fixes
2018-08-18 13:25:56 +02:00
Miek Gieben 0c349349de Reuse Literal for this data
Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-18 13:20:07 +02:00
Miek Gieben f5d29afaf9 Update readme and other fixes
Update the README with table footer syntax: fixes #77
Update the README and just point to mmark.nl instead of listing
all mmark syntax elements (again).
Fix multiple classes in headers.
Make header.Special a bool and rename it it IsSpecial.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-18 13:05:53 +02:00
Miek Gieben 026a971788
Merge pull request #75 from mmarkdown/blockattr-fixes
Fix special section
2018-08-18 11:42:22 +02:00
Miek Gieben 97c5a393c5
Merge pull request #72 from mmarkdown/table-footer
Table: parse table footers
2018-08-18 11:40:19 +02:00
Miek Gieben 7dc13c48d0 Fix merge conflict
Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-18 11:34:11 +02:00
Miek Gieben a98b0dbeb9 Table: parse table footers
This takes the syntax from kramdown: https://kramdown.gettalong.org/syntax.html#tables
Rename tableHead to tableHeader, and use tableFooter for consistency.

It's not guarded by any parser extension, except parser.Tables

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-18 11:33:30 +02:00
Miek Gieben 34e94474d8 Fix special section
You can't make up you're own attributes, give special header the class
"special". Adjust all testcases.

<hr>: support block level attributes.

Add more tests for block level attributes.

Fix figure attributes, by re-adding the attribute to the inner block
(table, quote or code block).

Fixes #7

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-18 11:27:17 +02:00
Miek Gieben a7d8778cf0
Merge pull request #74 from mmarkdown/multiple-fixes
Multiple fixes
2018-08-18 09:34:39 +02:00
Miek Gieben ca40bfdc13 Actually add test case
Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-18 09:28:25 +02:00
Miek Gieben 2ba4a94330 Multiple fixes
Caption: fix Table caption, fix testdata as well.
Asides: allow them to have content. Add test for it.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-18 09:08:06 +02:00
Miek Gieben b916554e15
Merge pull request #69 from mmarkdown/table-caption
Table caption
2018-08-18 08:38:50 +02:00
Miek Gieben b16b8aba0b
Merge branch 'master' into table-caption 2018-08-18 08:38:38 +02:00
Miek Gieben 8d1c9c05f7
Merge pull request #73 from mmarkdown/captions-original
Drop "Caption: " in favor of specific caption triggers
2018-08-17 19:01:05 +02:00
Miek Gieben 194620086f Drop "Caption: " in favor of specific caption triggers
This syntax was actually stolen from Pandoc, where it is used for
Tables (will update that, once those PRs are in). So leave the original
(from mmark1) syntax makes sense.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-17 18:48:55 +02:00
Miek Gieben 5108420830
Merge pull request #70 from mmarkdown/short-ref-href-fix
Cross reference: prepend '#'
2018-08-17 15:48:37 +01:00
Miek Gieben 665d356b2f Cross reference: prepend '#'
The link is local (by definition) add '#' to mark it as such.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-17 16:41:25 +02:00
Miek Gieben fed8f8c5e3
Merge pull request #68 from mmarkdown/normalize-cite-idx
Normalize cite idx
2018-08-17 15:27:40 +01:00
Miek Gieben c959a8b9ce
Merge pull request #67 from mmarkdown/include-allow-spaces
Include allow spaces
2018-08-17 15:26:57 +01:00
Miek Gieben ad60f85428 caption: add table captions
Some "advanced" switching to get the table to be the child of the
figurecaption.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-17 09:44:06 +02:00
Miek Gieben c24e7a88c8 Allow spaces before includes
This aids in formatting (code)includes in lists, so you can just
indent them with 3 spaces. Adjust tests to account for this as well.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-17 09:39:36 +02:00
Miek Gieben 079fa8b67b Make index ref look like footnote ref
Make these look like each other for consistency.
Citation can contain links use them to link to the bibliography.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-17 08:57:17 +02:00
Miek Gieben 769a74ba48 Merge branch 'master' of github.com:mmarkdown/markdown 2018-08-16 18:30:05 +02:00
Miek Gieben f837cec53b
Merge pull request #66 from mmarkdown/fix-test-code
mmark test: change test code
2018-08-16 17:28:50 +01:00
Miek Gieben 457cc580b9 mmark test: change test code
Of course forgot to change the test code itself.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-16 18:27:37 +02:00
Miek Gieben d492e48dd2 mmark test: change marker
and ofcourse forgot to amend the test code.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-16 18:26:21 +02:00
Miek Gieben bef7437881
Merge pull request #65 from mmarkdown/change-markers
Change markers
2018-08-16 17:22:00 +01:00
Miek Gieben 05727bd972 Change markers
The current markers clash with the table syntax.
Change to '+++'

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-16 18:19:28 +02:00
Miek Gieben 3e30f72fc0
Merge pull request #64 from mmarkdown/index-idx
index: use idx-N for the ID
2018-08-16 16:53:32 +01:00
Miek Gieben 26c06b95cd index: use idx-N for the ID
Make the ID generation more specific to the index.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-16 17:45:43 +02:00
Miek Gieben 1ee0b6780e
Merge pull request #58 from mmarkdown/include-take2
Include: take2
2018-08-15 19:08:26 +01:00
Miek Gieben 5bcf8f8e5a
Merge pull request #63 from mmarkdown/fix-comments
Fix code comment: new flags are named differently.
2018-08-15 17:24:50 +01:00
Miek Gieben d43e795e3e
Merge pull request #62 from mmarkdown/attributes
Set attributes for block element captionFigure
2018-08-15 17:21:24 +01:00
Miek Gieben 0cbe961e3a and fix typo
Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-15 17:19:10 +01:00
Miek Gieben 9630e6c87e
Merge pull request #61 from mmarkdown/index-tracking
Add uniq ID to indices
2018-08-15 18:17:49 +02:00
Miek Gieben 0d24865f76 Set attributes for block element captionFigure
Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-15 17:09:35 +01:00
Miek Gieben f70d5ac2bd Fix code comment: new flags are named differently.
Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-15 17:59:07 +02:00
Miek Gieben 744eed10c1 just make it an int
Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-15 16:48:04 +02:00
Miek Gieben a4a196b482 Add uniq ID to indices
To allow linking to indices by giving them an ID; without it an index
can not refer back to the actual index item from main index at the end
of the document.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-15 16:32:06 +02:00
Miek Gieben 55ca3c7e06
Merge pull request #60 from mmarkdown/whitespacehack
Mark tests: remove whitespace hack
2018-08-15 15:21:49 +01:00
Miek Gieben 7649852468
Merge pull request #59 from mmarkdown/cross-ref
parser: cross ref: fix
2018-08-15 15:21:16 +01:00
Miek Gieben cb658cd24f Mark tests: remove whitespace hack
Doesn't add anything and actually created testcases that were wrong.

Signed-off-by: Miek Gieben <miek@miek.nl>
2018-08-15 16:06:25 +02:00