govspeak 6.5.8 → 6.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26ef4d3bfb3ed9dcf07d44a1428e815928a4fa1ee94f388de829bb999b3cd79c
-  data.tar.gz: c2982f083911dcaf38a0883d48e9ca302a3b514b7bc05b99b827830c02db884d
+  metadata.gz: 948aced50c3d3842255ea4206a651229de59b2beef42e0c50e55e204354d9b5f
+  data.tar.gz: cc55abe4b54b112a3aa1cb350a94270b11b9f0c11a5ca71479f55bb0efbf657d
 SHA512:
-  metadata.gz: f75532f9905ae86df812be38a837d60abe1007cad72e8d886c95019f2563734a9e136368b74c1d1499d41bc8c83b2c3a41f415128c93c7025c4f4aacb9765e6f
-  data.tar.gz: e6ef52ca611f2b3e74e77a3330ddaf602385eb90685b3839c8bd28f4bdf06c21652c50cff4a85fc2b157e8e009e11c5ce9c7c439a92d5abdf78821725fbaba2c
+  metadata.gz: 1e0c1b0d6ca1fe4999e4135536328ecdc60bd34f368d986a808cee6de687f58198a080c19beffd47df6d80130edd2010eb1a09ccd840ea8adb9375c0b747e533
+  data.tar.gz: e47aeeabecc4ffccff7342d1a1ad2e1ddd6cd8aabf5850f740fa3bf5ecdd9395bbded84222d55a5c8998748d7491a649793c550ab49564cd098486623684b275

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.5.9
+
+* Adjust footnote markup to accommodate multiple references (PR#198)
+
 ## 6.5.8
 
 * Customise footnote markup for accessibility (PR#192)

data/lib/govspeak/post_processor.rb

@@ -126,7 +126,8 @@ module Govspeak
         el.content = "[footnote #{footnote_number}]"
       end
       document.css("[role='doc-backlink']").map do |el|
-        el.content = "[go to where this is referenced]"
+        backlink_number = " " + el.css("sup")[0].content if el.css("sup")[0].present?
+        el["aria-label"] = "go to where this is referenced#{backlink_number}"
       end
     end
 

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "6.5.8".freeze
+  VERSION = "6.5.9".freeze
 end

data/test/govspeak_footnote_test.rb

@@ -11,21 +11,36 @@ class GovspeakFootnoteTest < Minitest::Test
 
     Footnotes can be added too[^2].
 
-    [^2]: And then later defined too." do
-    assert_html_output '
+    [^2]: And then later defined too.
+
+    This footnote has a reference number[^3].
+
+    And this footnote has the same reference number[^3].
+
+    [^3]: And then they both point here." do
+    assert_html_output(
+      %(
       <p>Footnotes can be added<sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote">[footnote 1]</a></sup>.</p>
 
       <p>Footnotes can be added too<sup id="fnref:2" role="doc-noteref"><a href="#fn:2" class="footnote">[footnote 2]</a></sup>.</p>
 
+      <p>This footnote has a reference number<sup id="fnref:3" role="doc-noteref"><a href="#fn:3" class="footnote">[footnote 3]</a></sup>.</p>
+
+      <p>And this footnote has the same reference number<sup id="fnref:3:1" role="doc-noteref"><a href="#fn:3" class="footnote">[footnote 3]</a></sup>.</p>
+
       <div class="footnotes" role="doc-endnotes">
         <ol>
           <li id="fn:1" role="doc-endnote">
-            <p>And then later defined. <a href="#fnref:1" class="reversefootnote" role="doc-backlink">[go to where this is referenced]</a></p>
+            <p>And then later defined. <a href="#fnref:1" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a></p>
           </li>
           <li id="fn:2" role="doc-endnote">
-            <p>And then later defined too. <a href="#fnref:2" class="reversefootnote" role="doc-backlink">[go to where this is referenced]</a></p>
+            <p>And then later defined too. <a href="#fnref:2" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a></p>
+          </li>
+          <li id="fn:3" role="doc-endnote">
+            <p>And then they both point here. <a href="#fnref:3" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a> <a href="#fnref:3:1" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced 2">↩<sup>2</sup></a></p>
           </li>
         </ol>
-      </div>'
+      </div>),
+    )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 6.5.8
+  version: 6.5.9
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -378,24 +378,24 @@ signing_key:
 specification_version: 4
 summary: Markup language for single domain
 test_files:
-- test/govspeak_footnote_test.rb
-- test/html_sanitizer_test.rb
-- test/govspeak_test.rb
-- test/test_helper.rb
-- test/blockquote_extra_quote_remover_test.rb
-- test/govspeak_button_test.rb
-- test/html_validator_test.rb
+- test/govspeak_images_bang_test.rb
+- test/govspeak_attachment_test.rb
 - test/govspeak_link_extractor_test.rb
-- test/govspeak_attachment_link_test.rb
-- test/govspeak_link_test.rb
-- test/govspeak_contacts_test.rb
+- test/govspeak_attachments_inline_test.rb
+- test/govspeak_button_test.rb
 - test/govspeak_structured_headers_test.rb
-- test/govspeak_images_test.rb
+- test/govspeak_attachments_image_test.rb
+- test/govspeak_attachment_link_test.rb
 - test/govspeak_extract_contact_content_ids_test.rb
-- test/govspeak_table_with_headers_test.rb
-- test/govspeak_attachment_test.rb
-- test/govspeak_attachments_inline_test.rb
 - test/presenters/h_card_presenter_test.rb
+- test/govspeak_test.rb
+- test/html_sanitizer_test.rb
+- test/govspeak_footnote_test.rb
+- test/blockquote_extra_quote_remover_test.rb
+- test/test_helper.rb
+- test/govspeak_table_with_headers_test.rb
+- test/govspeak_images_test.rb
+- test/govspeak_link_test.rb
+- test/html_validator_test.rb
+- test/govspeak_contacts_test.rb
 - test/govspeak_test_helper.rb
-- test/govspeak_images_bang_test.rb
-- test/govspeak_attachments_image_test.rb