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

Jump to bottom

Multiline table functionality #93

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

Multiline table functionality #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfacbe1
Added multiline table capability.
cleverdripper Jul 5, 2013
c00d745
Fixed a dumb mistake in the multiline table reader.
cleverdripper Jul 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/maruku/input/mdline.rb
View file
Open in desktop
Expand Up @@ -130,7 +130,10 @@ def line_md_type
Sep = /\s*(\:)?\s*-+\s*(\:)?\s*/
# | -------------:| ------------------------------ |
TableSeparator = /^(\|?#{Sep}\|?)+?\s*$/

# + -------------:+ ------------------------------ +
MultilineTableSeparator = /^(\+?#{Sep}\+?)+?\s*$/
# + ------------- + ------------------------------ +
MultilineTableSeparatorNoAlignment = /^\s*\+?(\s*-+\s*\+?)+?\s*$/

EMailAddress = /<([^:@>]+?@[^:@>]+?)>/
end
46 changes: 38 additions & 8 deletions lib/maruku/input/parse_block.rb
View file
Open in desktop
Expand Up @@ -136,10 +136,16 @@ def parse_blocks(src)
end

def read_text_material(src, output)
if src.cur_line =~ MightBeTableHeader &&
maybeTableHeader = src.cur_line =~ MightBeTableHeader

if maybeTableHeader &&
src.next_line &&
src.next_line =~ TableSeparator
output << read_table(src)
output << read_table(src, false)
elsif maybeTableHeader &&
src.next_line &&
src.next_line =~ MultilineTableSeparator
output << read_table(src, true)
elsif src.next_line && [:header1, :header2].include?(src.next_line.md_type)
output << read_header12(src)
elsif eventually_comes_a_def_list(src)
Expand Down Expand Up @@ -520,16 +526,40 @@ def read_ref_definition(src, out)
out << md_ref_def(id, url, :title => title)
end

def split_cells(s)
s.split('|').reject(&:empty?).map(&:strip)
def distribute!(a, b)
diff = [0, b.size - a.size].max
a.concat(Array.new(diff) { Array.new })
0.upto a.size - 1 do |i|
a[i] << b[i]
end
a
end

def split_cells(src, isMultiline)
if isMultiline
cells = []

while src.cur_line && src.cur_line =~ /\|/ && src.cur_line !~ MultilineTableSeparatorNoAlignment
l = src.shift_line.split('|').reject(&:empty?).map(&:strip)
cells = distribute!(cells, l)
end

# If we stopped on a --+--+-- line, discard it
src.shift_line if src.cur_line && src.cur_line =~ MultilineTableSeparatorNoAlignment

cells.map { |a| a.join(' ') }
else
sep = src.cur_line =~ /\|/ ? '|' : '+'
src.shift_line.split(sep).reject(&:empty?).map(&:strip)
end
end

def read_table(src)
head = split_cells(src.shift_line).map do |s|
def read_table(src, isMultiline)
head = split_cells(src, false).map do |s|
md_el(:head_cell, parse_span(s))
end

separator = split_cells(src.shift_line)
separator = split_cells(src, false)

align = separator.map do |s|
s =~ Sep
Expand All @@ -554,7 +584,7 @@ def read_table(src)
rows = []

while src.cur_line && src.cur_line =~ /\|/
row = split_cells(src.shift_line).map do |s|
row = split_cells(src, isMultiline).map do |s|
md_el(:cell, parse_span(s))
end

Expand Down