asciidoctor-bibtex 0.7.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e39be76ce5e649e7075b470a56950f64c91ab7f084b902676356b6672012a9d1
-  data.tar.gz: 467a9b62f3f9c51ec8778d41dd8a29bc3d2f06b7b5b88ff55f41b4fded73b66a
+  metadata.gz: ea06f24608939a234d65f9d138406f453db0839bd70cf334f81def2dd85d52f0
+  data.tar.gz: 322af457bcfa3597a57268b2ea186ed1800bf1138189f0393d379e56dd743f87
 SHA512:
-  metadata.gz: 983ff27cc0f7899411b3bba18f0afa0e54aa9aa4fa8ca82c48e4f61de3cbe4ea4a6e4c0dfc78539b54c8c2ae5ba3b7c5816bac88dc1550905f1356d1e163e69a
-  data.tar.gz: a6bbc812e04a8f59a6f8499cf750bfc938fc73b5675d6b72d6f749f6c29e056dfc5bff83f0002180f9a076225c94972ef8b8f733d762f9c98595595bc67417e3
+  metadata.gz: 57d7f51eaf2b99a100e827e5efb5ce4f6548573dd9eef70aef0347ed687e590c43d51ced0f5f8c3bdbae2681386bfebf827781f2f7d6297a92d9854bc03c2d8b
+  data.tar.gz: f2895e57fe0f6c85b07cf26e53c4011e61a9c613489b0cc755065c04d55daf670665a8a143e60e73d39fa432b64a1f62ad19719065c5415a9cd126b9eee44d82

data/README.adoc

@@ -20,7 +20,7 @@ endif::[]
 :url-gem: https://rubygems.org/gems/asciidoctor-bibtex
 
 ifdef::status[]
-image:https://img.shields.io/travis/asciidoctor/asciidoctor-bibtex/master.svg[Build Status (Travis CI),link=https://travis-ci.org/asciidoctor/asciidoctor-bibtex]
+image:https://github.com/asciidoctor/asciidoctor-bibtex/workflows/CI/badge.svg[GitHub Actions Status,link=https://github.com/asciidoctor/asciidoctor-bibtex/actions]
 image:https://img.shields.io/gem/v/asciidoctor-bibtex.svg[Latest Release, link=https://rubygems.org/gems/asciidoctor-bibtex]
 endif::[]
 
@@ -125,6 +125,11 @@ Configuration is applied in the form of AsciiDoc document attributes, which must
 | `asciidoc`, `bibtex` or `biblatex`
 | `asciidoc`
 
+| bibtex-locale
+| Locale used to render the bibliography
+| strings supported by CSL
+| `en-US`
+
 | bibtex-throw
 | Throw an error on unknown references
 | `true` or `false`

data/lib/asciidoctor-bibtex/extensions.rb

@@ -13,7 +13,7 @@ require_relative 'processor'
 module AsciidoctorBibtex
   module Asciidoctor
     # Placeholder paragraph for the bibliography paragraph. Choose a uuid so
-    # that it is a special word unlikeky to conflict with normal texts.
+    # that it is a special word unlikely to conflict with normal texts.
     BibliographyBlockMacroPlaceholder = %(a5d42deb-3cfc-4293-b96a-fcb47316ce56)
 
     # BibliographyBlockMacro
@@ -32,7 +32,7 @@ module AsciidoctorBibtex
 
       def process(parent, target, attrs)
         # NOTE: bibtex-file and bibtex-style set by this macro shall be
-        # overridable by document attributes and commandline arguments. So we
+        # overridable by document attributes and command line arguments. So we
         # respect the convention here.
         if target && (!parent.document.attr? 'bibtex-file')
           parent.document.set_attribute 'bibtex-file', target
@@ -53,7 +53,7 @@ module AsciidoctorBibtex
     #
     # This processor scans the document, generates a list of citations, replaces
     # each citation with citation text and the reference block macro placeholder
-    # with the final bibliography list. It relys on the block macro processor to
+    # with the final bibliography list. It relies on the block macro processor to
     # generate the place holder.
     #
     # NOTE: According to the asiidoctor extension policy, the tree processor can
@@ -70,6 +70,9 @@ module AsciidoctorBibtex
         bibtex_citation_template = ((document.attr 'bibtex-citation-template') || '[$id]').to_s
 
         # Fild bibtex file automatically if not supplied.
+        if bibtex_file.empty?
+          bibtex_file = AsciidoctorBibtex::PathUtils.find_bibfile document.base_dir
+        end
         if bibtex_file.empty?
           bibtex_file = AsciidoctorBibtex::PathUtils.find_bibfile '.'
         end
@@ -82,7 +85,7 @@ module AsciidoctorBibtex
         end
 
         # Extract all AST nodes that can contain citations.
-        prose_blocks = document.find_by do |b|
+        prose_blocks = document.find_by traverse_documents: true do |b|
           (b.content_model == :simple) ||
             (b.context == :list_item) ||
             (b.context == :table_cell) ||
@@ -97,7 +100,10 @@ module AsciidoctorBibtex
         # First pass: extract all citations.
         prose_blocks.each do |block|
           if block.context == :list_item || block.context == :table_cell
-            line = block.text
+            # NOTE: we access the instance variable @text for raw text.
+            # Otherwise the footnotes in the text will be pre-processed and
+            # ghost footnotes will be inserted (as of asciidoctor 2.0.10).
+            line = block.instance_variable_get(:@text)
             unless line.nil? || line.empty?
               processor.process_citation_macros line
             end
@@ -106,7 +112,7 @@ module AsciidoctorBibtex
               processor.process_citation_macros line
             end
           else
-            line = block.title
+            line = block.instance_variable_get(:@title)
             processor.process_citation_macros line
           end
         end
@@ -119,22 +125,25 @@ module AsciidoctorBibtex
             # NOTE: we access the instance variable @text for raw text.
             line = block.instance_variable_get(:@text)
             unless line.nil? or line.empty?
+              line_orig = line
               line = processor.replace_citation_macros(line)
               line = processor.replace_bibitem_macros(line)
-              block.text = line
+              block.text = line if line != line_orig
             end
           elsif block.content_model == :simple
             block.lines.each_with_index do |line, index|
+              line_orig = line
               line = processor.replace_citation_macros(line)
               line = processor.replace_bibitem_macros(line)
-              block.lines[index] = line
+              block.lines[index] = line if line != line_orig
             end
           else
             # NOTE: we access the instance variable @text for raw text.
             line = block.instance_variable_get(:@title)
+            line_orig = line
             line = processor.replace_citation_macros(line)
-            # line = processor.replace_bibitem_macros(line)
-            block.title = line
+            line = processor.replace_bibitem_macros(line)
+            block.title = line if line != line_orig
           end
         end
 
@@ -150,7 +159,7 @@ module AsciidoctorBibtex
 
         # Third pass: replace the bibliography paragraph with the bibliography
         # list.
-        biblio_blocks = document.find_by do |b|
+        biblio_blocks = document.find_by traverse_documents: true do |b|
           # for fast search (since most searches shall fail)
           (b.content_model == :simple) && (b.lines.size == 1) \
             && (b.lines[0] == BibliographyBlockMacroPlaceholder)

data/lib/asciidoctor-bibtex/processor.rb

@@ -207,7 +207,7 @@ module AsciidoctorBibtex
                                 'textcite'
                               else
                                 'parencite'
-                                                end
+                              end
                             else
                               'cite'
                             end
@@ -260,7 +260,7 @@ module AsciidoctorBibtex
           result = StringUtils.combine_consecutive_numbers(result)
         end
 
-        include_pretext result, macro, ob, cb
+        "[.citation]\##{include_pretext(result, macro, ob, cb)}\#"
       end
     end
 

data/lib/asciidoctor-bibtex/version.rb

@@ -1,3 +1,3 @@
 module AsciidoctorBibtex
-  VERSION = '0.7.1'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-bibtex
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Zhang YANG
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: citeproc-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +135,7 @@ homepage: https://github.com/asciidoctor/asciidoctor-bibtex
 licenses:
 - OWL
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,15 +143,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: An Asciidoctor extension that adds bibtex integration to AsciiDoc
 test_files: []