asciidoctor-bibliography 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b44fba0dae7053aca56cd4e438f586de5b53e91559c13109499deaba80af8a4d
-  data.tar.gz: d08a5ff76362ccab31e85e9bf5c49a820d17af670fdd4cfe0e73aa8d7e57a126
+  metadata.gz: d911a6644108601920bb73e4e1e9edcb5e01dfa83c6e1dc76f5677d10f465237
+  data.tar.gz: e58a22d8208586825a66d7edbcbc5d4ca9bbe2dc1fab592c9ffa23bdc27c5917
 SHA512:
-  metadata.gz: f0a07e29c0ebc1388feb61328227e343e610cc6ec78c394c4538f47b115f818d0b4294408df1b5fb2a68334aae80fedb9e4bf4c09ab9e241e05a0d3321d98318
-  data.tar.gz: 2628aef9ba841b076651698f04413bda11ba159e098e3348ee719d552ab09f2b4acad3fb358cb95d9f7fc758f326108fe8959ea3c191c49abc09794e77c335e8
+  metadata.gz: 93f938bfd5d6691ca9d41b3e75802fced6dbe90c5ad47f0228249b011df5bb7164b899a79296717df191a0c975f14a7ed2486be8c8e84288d6bb5ee1101b2f13
+  data.tar.gz: bbf0335799d70508d44702da8608d6134b8ab9414b59dd75775bc5685ddd0436690855bd17fc9adc75283b17f12094eb72dfc2c59e7efdf26eafe957cab463d5

data/lib/asciidoctor-bibliography/citation.rb

@@ -124,7 +124,7 @@ module AsciidoctorBibliography
           # NOTE: this handles custom citation text (slight overkill but easy to extend)
           # NOTE: escaping ] is necessary to safely nest macros (e.g. citing in a footnote)
           (citation_item.text || "{cite}").
-            sub("{cite}", Regexp.last_match[:citation].gsub("]", "]"))
+            sub("{cite}", escape_square_brackets(Regexp.last_match[:citation]))
         end
       end
     end
@@ -170,5 +170,11 @@ module AsciidoctorBibliography
     def xref_id(*fragments)
       fragments.compact.join("-")
     end
+
+    private
+
+    def escape_square_brackets(string)
+      string.gsub("[", "[").gsub("]", "]")
+    end
   end
 end

data/lib/asciidoctor-bibliography/version.rb

@@ -1,3 +1,3 @@
 module AsciidoctorBibliography
-  VERSION = "0.10.1".freeze
+  VERSION = "0.10.2".freeze
 end

data/spec/csl/styles/tex_citet_numeric_spec.rb

@@ -7,36 +7,36 @@ describe "citet macro with numeric style" do
 
   it "formats a single citation" do
     expect(formatted_citation("citet:[Erdos65]", options: options)).
-      to eq "Erdős et al. [1]"
+      to eq "Erdős et al. [1]"
   end
 
   it "formats a grouped citation" do
     expect(formatted_citation("citet:[Erdos65]+[Einstein35]", options: options)).
-      to eq "Erdős et al. [1], Einstein et al. [2]"
+      to eq "Erdős et al. [1], Einstein et al. [2]"
   end
 
   it "formats a single citation with a prefix" do
     expect(formatted_citation("citet:[Erdos65, prefix=see]", options: options)).
-      to eq "Erdős et al. [see 1]"
+      to eq "Erdős et al. [see 1]"
   end
 
   it "formats a single citation with a suffix" do
     expect(formatted_citation("citet:[Erdos65, suffix=new edition]", options: options)).
-      to eq "Erdős et al. [1, new edition]"
+      to eq "Erdős et al. [1, new edition]"
   end
 
   it "formats a single citation with both a prefix and a suffix" do
     expect(formatted_citation("citet:[Erdos65, prefix=see, suffix=new edition]", options: options)).
-      to eq "Erdős et al. [see 1, new edition]"
+      to eq "Erdős et al. [see 1, new edition]"
   end
 
   it "formats a single citation with a standard locator" do
     expect(formatted_citation("citet:[Erdos65, page=41-43]", options: options)).
-      to eq "Erdős et al. [1, pp. 41-43]"
+      to eq "Erdős et al. [1, pp. 41-43]"
   end
 
   it "formats a single citation with a custom locator" do
     expect(formatted_citation("citet:[Erdos65, locator=somewhere]", options: options)).
-      to eq "Erdős et al. [1, somewhere]"
+      to eq "Erdős et al. [1, somewhere]"
   end
 end

data/spec/csl/styles/tex_citets_numeric_spec.rb

@@ -7,36 +7,36 @@ describe "citet* macro with numeric style" do
 
   it "formats a single citation" do
     expect(formatted_citation("citet*:[Erdos65]", options: options)).
-      to eq "Erdős, Heyting, and Brouwer [1]"
+      to eq "Erdős, Heyting, and Brouwer [1]"
   end
 
   it "formats a grouped citation" do
     expect(formatted_citation("citet*:[Erdos65]+[Einstein35]", options: options)).
-      to eq "Erdős, Heyting, and Brouwer [1], Einstein, Podolsky, and Rosen [2]"
+      to eq "Erdős, Heyting, and Brouwer [1], Einstein, Podolsky, and Rosen [2]"
   end
 
   it "formats a single citation with a prefix" do
     expect(formatted_citation("citet*:[Erdos65, prefix=see]", options: options)).
-      to eq "Erdős, Heyting, and Brouwer [see 1]"
+      to eq "Erdős, Heyting, and Brouwer [see 1]"
   end
 
   it "formats a single citation with a suffix" do
     expect(formatted_citation("citet*:[Erdos65, suffix=new edition]", options: options)).
-      to eq "Erdős, Heyting, and Brouwer [1, new edition]"
+      to eq "Erdős, Heyting, and Brouwer [1, new edition]"
   end
 
   it "formats a single citation with both a prefix and a suffix" do
     expect(formatted_citation("citet*:[Erdos65, prefix=see, suffix=new edition]", options: options)).
-      to eq "Erdős, Heyting, and Brouwer [see 1, new edition]"
+      to eq "Erdős, Heyting, and Brouwer [see 1, new edition]"
   end
 
   it "formats a single citation with a standard locator" do
     expect(formatted_citation("citet*:[Erdos65, page=41-43]", options: options)).
-      to eq "Erdős, Heyting, and Brouwer [1, pp. 41-43]"
+      to eq "Erdős, Heyting, and Brouwer [1, pp. 41-43]"
   end
 
   it "formats a single citation with a custom locator" do
     expect(formatted_citation("citet*:[Erdos65, locator=somewhere]", options: options)).
-      to eq "Erdős, Heyting, and Brouwer [1, somewhere]"
+      to eq "Erdős, Heyting, and Brouwer [1, somewhere]"
   end
 end

data/spec/integration_spec.rb

@@ -0,0 +1,32 @@
+# coding: utf-8
+
+require "asciidoctor-bibliography"
+
+describe "rendering citations styles containing square brackets" do
+  let(:parsed_document) do
+    Asciidoctor::Document.new(<<~ADOC_INPUT).tap(&:parse)
+      = Sample document
+      :bibliography-database: spec/fixtures/database.bib
+      :bibliography-hyperlinks: true
+      :bibliography-style: ieee
+      ...
+
+      This paragraph contains a citation: cite:[Lane12a].
+      It also contains [.my-class]#some# inline styling.
+    ADOC_INPUT
+  end
+
+  it "does not confuse rendered brackets with macro brackets in the paragraph" do
+    # I.e. we're trying to avoid results like
+    # ```
+    # <p>This paragraph contains a citation: <a href="#bibliography-default-Lane12a"><span class="1&rsqb;</a>.
+    # It also contains [.my-class">some</span> inline styling.</p>
+    # ```
+    expect(parsed_document.render).to eq(<<~HTML_OUTPUT.strip)
+      <div class="paragraph">
+      <p>This paragraph contains a citation: <a href="#bibliography-default-Lane12a">&lsqb;1&rsqb;</a>.
+      It also contains <span class="my-class">some</span> inline styling.</p>
+      </div>
+    HTML_OUTPUT
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-bibliography
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-16 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -307,6 +307,7 @@ files:
 - spec/fixtures/database.rfc.xml
 - spec/fixtures/database.unk
 - spec/index_spec.rb
+- spec/integration_spec.rb
 - spec/macros_spec.rb
 - spec/nocite_spec.rb
 - spec/options_spec.rb
@@ -332,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Citations and bibliography the "asciidoctor-way"