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

Fixed the asciimath inline-macro processor #85

Merged
merged 2 commits into from
May 23, 2020
Merged

Fixed the asciimath inline-macro processor #85

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b4dfc3
Fixed the `asciimath` inline-macro processor
GarkGarcia May 22, 2020
20e3ad0
Merge branch 'master' of https://github.com/asciidoctor/asciidoctor-m…
GarkGarcia May 22, 2020
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
49 changes: 30 additions & 19 deletions lib/asciidoctor-mathematical/extension.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,28 +151,39 @@ def handle_inline_stem(node, text, mathematical, image_output_dir, image_target_
end

source_modified = false

# TODO skip passthroughs in the source (e.g., +stem:[x^2]+)
text = text.gsub(stem_rx) {
if (m = $~)[0].start_with? '\\'
next m[0][1..-1]
end
if text != nil && text.include? ':'
text = text.gsub(stem_rx) {
if (m = $~)[0].start_with? '\\'
next m[0][1..-1]
end

if (eq_data = m[2].rstrip).empty?
next
else
source_modified = true
end
if (eq_data = m[2].rstrip).empty?
next
else
source_modified = true
end

eq_data.gsub! '\]', ']'
subs = m[1].nil_or_empty? ? (to_html ? [:specialcharacters] : []) : (node.resolve_pass_subs m[1])
eq_data = node.apply_subs eq_data, subs unless subs.empty?
img_target, img_width, img_height = make_equ_image eq_data, nil, true, mathematical, image_output_dir, image_target_dir, format, inline
if inline
%(pass:[<span class="steminline"> #{img_target} </span>])
else
%(image:#{img_target}[width=#{img_width},height=#{img_height}])
end
} if (text != nil) && (text.include? ':') && ((support_stem_prefix && (text.include? 'stem:')) || (text.include? 'latexmath:') || (text.include? 'asciimath:'))
if text.include? 'asciimath:'
eq_data = AsciiMath.parse(eq_data).to_latex
else if (support_stem_prefix && (text.include? 'stem:')) || (text.include? 'latexmath:')
eq_data.gsub! '\]', ']'
subs = m[1].nil_or_empty? ? (to_html ? [:specialcharacters] : []) : (node.resolve_pass_subs m[1])
eq_data = node.apply_subs eq_data, subs unless subs.empty?
else
source_modified = false
return text
end

img_target, img_width, img_height = make_equ_image eq_data, nil, true, mathematical, image_output_dir, image_target_dir, format, inline
if inline
%(pass:[<span class="steminline"> #{img_target} </span>])
else
%(image:#{img_target}[width=#{img_width},height=#{img_height}])
end
}
end

[text, source_modified]
end
Expand Down