lib/govspeak.rb in govspeak-1.6.0 vs lib/govspeak.rb in govspeak-1.6.1
- old
+ new
@@ -158,11 +158,11 @@
extension('address', surrounded_by("$A")) { |body|
%{<div class="address"><div class="adr org fn"><p>\n#{body.sub("\n", "").gsub("\n", "<br />")}\n</p></div></div>\n}
}
- extension("legislative list", /\$LegislativeList\s*$(.*?)(?:^\s*$|\Z)/m) do |body|
+ extension("legislative list", /(?<=\A|\n{2})^\$LegislativeList\s*$(.*?)(?:^\s*$|\Z)/m) do |body|
Govspeak::KramdownOverrides.with_kramdown_ordered_lists_disabled do
Kramdown::Document.new(body.strip).to_html.tap do |doc|
doc.gsub!('<ul>', '<ol>')
doc.gsub!('</ul>', '</ol>')
doc.sub!('<ol>', '<ol class="legislative-list">')
@@ -194,10 +194,10 @@
<div class="devolved-body">#{Govspeak::Document.new(body.strip).to_html}</div>
</div>\n}
end
end
- extension("Priority list", /\$PriorityList:(\d+)\s*$(.*?)(?:^\s*$|\Z)/m) do |number_to_show, body|
+ extension("Priority list", /(?<=\A|\n{2})^\$PriorityList:(\d+)\s*$(.*?)(?:^\s*$|\Z)/m) do |number_to_show, body|
number_to_show = number_to_show.to_i
tagged = 0
Govspeak::Document.new(body.strip).to_html.gsub(/<li>/) do |match|
if tagged < number_to_show
tagged += 1