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.

Sign up for GitHub

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

Jump to bottom

Header ids #11

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Header ids #11

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d79e832
Moving header tag generation to a single place.
rlipscombe Jan 1, 2014
cbf6afc
Add placeholder id for now.
rlipscombe Jan 1, 2014
7390388
Implement heading ids.
rlipscombe Jan 1, 2014
ed215ca
Merge branch 'header-ids'
rlipscombe Jan 1, 2014
5470143
Merge remote-tracking branch 'upstream/master'
rlipscombe Apr 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 30 additions & 17 deletions src/markdown.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,20 +130,15 @@ p1([{normal, P1}, {normal, P2} | T], R, I, Acc) ->

%% setext h1 is a look behind and it overrides blockquote and code...
p1([{normal, P}, {setext_h1, _} | T], R, I, Acc) ->
p1(T, R, I, [pad(I) ++ "<h1>" ++ make_str(snip(P), R)
++ "</h1>\n\n" | Acc]);
p1(T, R, I, [make_heading("h1", I, P, R) | Acc]);
p1([{blockquote, P}, {setext_h1, _} | T], R, I, Acc) ->
p1(T, R, I, [pad(I) ++ "<h1>" ++ make_str(snip(P), R)
++ "</h1>\n\n" | Acc]);
p1(T, R, I, [make_heading("h1", I, P, R) | Acc]);
p1([{{codeblock, P}, _}, {setext_h1, _} | T], R, I, Acc) ->
p1(T, R, I, [pad(I) ++ "<h1>" ++ make_str(snip(P), R)
++ "</h1>\n\n" | Acc]);
p1(T, R, I, [make_heading("h1", I, P, R) | Acc]);
p1([{blockquote, P}, {h2_or_hr, _} | T], R, I, Acc) ->
p1(T, R, I, [pad(I) ++ "<h2>" ++ make_str(snip(P), R)
++ "</h2>\n\n" | Acc]);
p1(T, R, I, [make_heading("h2", I, P, R) | Acc]);
p1([{{codeblock, P}, _}, {h2_or_hr, _} | T], R, I, Acc) ->
p1(T, R, I, [pad(I) ++ "<h2>" ++ make_str(snip(P), R)
++ "</h2>\n\n" | Acc]);
p1(T, R, I, [make_heading("h2", I, P, R) | Acc]);

%% but a setext with no lookbehind is just rendered as a normal line,
%% so change its type and rethrow it
Expand All @@ -153,7 +148,7 @@ p1([{setext_h1, P} | T], R, I, Acc) ->
%% setext h2 might be a look behind
p1([{normal, P}, {h2_or_hr, _} | T], R, I, Acc) ->
P2 = string:strip(make_str(snip(P), R), both, ?SPACE),
p1(T, R, I, [pad(I) ++ "<h2>" ++ P2 ++ "</h2>\n\n" | Acc]);
p1(T, R, I, [make_heading("h2", I, P2) | Acc]);

%% blockquotes swallow each other
%% replace the first blockquote mark with a space...
Expand All @@ -177,22 +172,22 @@ p1([{normal, P} | T], R, I, Acc) ->
%% atx headings
p1([{{h1, P}, _} | T], R, I, Acc) ->
NewP = string:strip(make_str(snip(P), R), right),
p1(T, R, I, [pad(I) ++ "<h1>" ++ NewP ++ "</h1>\n\n" | Acc]);
p1(T, R, I, [make_heading("h1", I, NewP) | Acc]);
p1([{{h2, P}, _} | T], R, I, Acc) ->
NewP = string:strip(make_str(snip(P), R), right),
p1(T, R, I, [pad(I) ++ "<h2>" ++ NewP ++ "</h2>\n\n" | Acc]);
p1(T, R, I, [make_heading("h2", I, NewP) | Acc]);
p1([{{h3, P}, _} | T], R, I, Acc) ->
NewP = string:strip(make_str(snip(P), R), right),
p1(T, R, I, [pad(I) ++ "<h3>" ++ NewP ++ "</h3>\n\n" | Acc]);
p1(T, R, I, [make_heading("h3", I, NewP) | Acc]);
p1([{{h4, P}, _} | T], R, I, Acc) ->
NewP = string:strip(make_str(snip(P), R), right),
p1(T, R, I, [pad(I) ++ "<h4>" ++ NewP ++ "</h4>\n\n" | Acc]);
p1(T, R, I, [make_heading("h4", I, NewP) | Acc]);
p1([{{h5, P}, _} | T], R, I, Acc) ->
NewP = string:strip(make_str(snip(P), R), right),
p1(T, R, I, [pad(I) ++ "<h5>" ++ NewP ++ "</h5>\n\n" | Acc]);
p1(T, R, I, [make_heading("h5", I, NewP) | Acc]);
p1([{{h6, P}, _} | T], R, I, Acc) ->
NewP = string:strip(make_str(snip(P), R), right),
p1(T, R, I, [pad(I) ++ "<h6>" ++ NewP ++ "</h6>\n\n" | Acc]);
p1(T, R, I, [make_heading("h6", I, NewP) | Acc]);

%% unordered lists swallow normal and codeblock lines
p1([{{ul, P1}, S1}, {{normal, P2}, S2} | T], R, I , Acc) ->
Expand Down Expand Up @@ -243,6 +238,24 @@ p1([{h2_or_hr, _} | T], R, I, Acc) ->
p1([{inlineref, _P} | T], R, I, Acc) ->
p1(T, R, I, Acc).

make_heading(H, I, P) ->
pad(I) ++ "<" ++ H ++ " id=\"" ++ make_heading_id(P) ++ "\">" ++ P ++ "</" ++ H ++ ">\n\n".
make_heading(H, I, P, R) ->
make_heading(H, I, make_str(snip(P), R)).

make_heading_id(P) ->
string:to_lower(sanitize_heading_id(remove_tags(P))).

remove_tags(P) ->
Pattern = "<[^<]*>",
re:replace(P, Pattern, "", [global, {return, list}]).

sanitize_heading_id(Id) ->
sanitize_heading_id(Id, "[^A-Za-z0-9-]").
sanitize_heading_id(Id, Pattern) ->
Id2 = re:replace(Id, Pattern, "-", [global, {return, list}]),
re:replace(Id2, "-{2,}", "-", [global, {return, list}]).

grab_for_blockhtml([], Type, Acc) ->
{lists:reverse(["</" ++ Type ++ ">" | Acc]), []};
grab_for_blockhtml([{blocktag, [{{{tag, close}, Type}, Tg}]}
Expand Down