sharpetronics/jekyll-spaceship
1
0
Fork 0
mirror of https://github.com/SharpeTronics/jekyll-spaceship.git synced 2025-12-21 00:03:17 -05:00
Code Issues Projects Releases Wiki Activity

perf: improve row-span, cell-span and cell-align compatibility

Browse Source
This commit is contained in:
jeffreytse 2020-04-29 01:02:33 +08:00
parent 07fc41e490
commit ca8959d85d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/jekyll-spaceship/processors/table-processor.rb
View File

@ -23,6 +23,9 @@ module Jekyll::Spaceship
end end
end end
# pre-handle row-span
content = content.gsub(/(?<!\\)(\|.*\\\s*)\|\s*\n/, "\\1\n")
# escape | and : # escape | and :
content = content.gsub(/\|(?=\|)/, '\\|') content = content.gsub(/\|(?=\|)/, '\\|')
.gsub(/\\:(?=.*?(?<!\\)\|)/, '\\\\\\\\:') .gsub(/\\:(?=.*?(?<!\\)\|)/, '\\\\\\\\:')
@ -137,9 +140,9 @@ module Jekyll::Spaceship
# handle multi-rows # handle multi-rows
return if cell != cells.last return if cell != cells.last
match = cell.content.match(/\\$/) match = cell.content.match(/(?<!\\)\\\s*$/)
if match if match
cell.content = cell.content.gsub(/\\$/, '') cell.content = cell.content.gsub(/(?<!\\)\\\s*$/, '')
if not scope_table.multi_row_start if not scope_table.multi_row_start
scope_table.multi_row_cells = cells scope_table.multi_row_cells = cells
scope_table.multi_row_start = true scope_table.multi_row_start = true
@ -175,8 +178,8 @@ module Jekyll::Spaceship
# handle rowspan # handle rowspan
span_cell = scope_table.span_row_cells[scope_row.col_index] span_cell = scope_table.span_row_cells[scope_row.col_index]
if span_cell and cell.content.match(/^\^{2}/) if span_cell and cell.content.match(/^\s*\^{2}/)
cell.content = cell.content.gsub(/^\^{2}/, '') cell.content = cell.content.gsub(/^\s*\^{2}/, '')
span_cell.content += " \n#{cell.content}" span_cell.content += " \n#{cell.content}"
rowspan = span_cell.get_attribute('rowspan') || 1 rowspan = span_cell.get_attribute('rowspan') || 1
rowspan = rowspan.to_i + 1 rowspan = rowspan.to_i + 1
@ -194,12 +197,12 @@ module Jekyll::Spaceship
# pre-handle text align # pre-handle text align
align = 0 align = 0
if cell.content.match(/^:(?!:)/) if cell.content.match(/^\s*:(?!:)/)
cell.content = cell.content.gsub(/^:/, '') cell.content = cell.content.gsub(/^\s*:/, '')
align += 1 align += 1
end end
if cell.content.match(/(?<!\\):$/) if cell.content.match(/(?<!\\):\s*$/)
cell.content = cell.content.gsub(/:$/, '') cell.content = cell.content.gsub(/:\s*$/, '')
align += 2 align += 2
end end