Skip to content

隣り合った code を結合するようにした #7

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

Merged
melpon merged 1 commit into from
Nov 1, 2015
Merged

隣り合った code を結合するようにした #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ def make_html_path(path):
return os.path.join(settings.OUTPUT_DIR, path + '.html')


_SWAP_A_AND_CODE_RE = re.compile(r'<(a|span)\b([^>]*)><code>([^<]*)</code>(</\1>)')
_MERGE_ADJACENT_CODE_RE = re.compile(r'</code>( ?)<code>')


def md_to_html(md_data, path, hrefs=None):
paths = path.split('/')

Expand All @@ -61,6 +65,8 @@ def md_to_html(md_data, path, hrefs=None):
md._html_attribute_hrefs = hrefs

html = md.convert(md_data)
html = _SWAP_A_AND_CODE_RE.sub(r'<code><\1\2>\3</\1></code>', html)
html = _MERGE_ADJACENT_CODE_RE.sub(r'\1', html)
return html, {
'meta_result': md._meta_result,
'mathjax_enabled': md._mathjax_enabled
Expand Down