asciidoctor-bibtex 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1c520a15832ff368d7b14a6a8c7d65081dc5f91c
-  data.tar.gz: 9433420aea00d9dfee97101f4fcab7efb87cf25e
+SHA256:
+  metadata.gz: ef28bb04622b1fb0a08734642f086ecbafe496aad434374407cb8bbc4a88adcd
+  data.tar.gz: 80eaab008974ae4b2afbdf5f73229adaf11760954c5153471df5c78c39fb7b19
 SHA512:
-  metadata.gz: d27c4efc1fb2ba1a73ef421070e3bfdc37556b73a529af48334f655c7c2c4f497488c0956b5927475424ccd6fa8849f511ba25b440e55b431b15d5f75a26a5de
-  data.tar.gz: 3765a65c06eb84aa7eb60589beb33df412e4171ea3e322585efeaab8364d29e33689b3616eee969fd2c493516d82506a07d9626abdc9aac8af67985ea4e72048
+  metadata.gz: db5db5a418b582cf9df51a6b7fdf3bc45540e5514abfeb25a187576781442351bc1c9e71e50b977695bd0286a63c6522ca0014def475c1484f42d1840c6127e4
+  data.tar.gz: 86a4f7e498827c8ec94b5432d88d044307432df19d091ff58f209e2daa08d839c9a2108b5f074a73677a60942f2e0f7bbd0a71bb559b5abc09115a5c1dac134f

data/lib/asciidoctor-bibtex/bibextension.rb

@@ -35,9 +35,7 @@ module AsciidoctorBibtex
         LaTeX::Decode::Punctuation.decode!(text)
         LaTeX::Decode::Symbols.decode!(text)
         LaTeX::Decode::Greek.decode!(text)
-        text.gsub!(/\\url\{(.+?)\}/, " \\1 ")
-        text.gsub!(/\\\w+(?=\s+\w)/, "")
-        text.gsub!(/\\\w+(?:\[.+?\])?\s*\{(.+?)\}/, "\\1")
+        text = text.gsub(/\\url\{(.+?)\}/, " \\1 ").gsub(/\\\w+(?=\s+\w)/, "").gsub(/\\\w+(?:\[.+?\])?\s*\{(.+?)\}/, "\\1")
         LaTeX::Decode::Base.strip_braces(text)
         LaTeX.normalize_C(text)
       end
@@ -64,6 +62,9 @@ module AsciidoctorBibtex
         if attrs.key? :style and not parent.document.attr? 'bibtex-style'
           parent.document.set_attribute 'bibtex-style', attrs[:style]
         end
+        if attrs.key? :locale and not parent.document.attr? 'bibtex-locale'
+          parent.document.set_attribute 'bibtex-locale', attrs[:locale]
+        end
         create_paragraph parent, BibliographyBlockMacroPlaceholder, {}
       end
     end
@@ -77,6 +78,7 @@ module AsciidoctorBibtex
       def process document
         bibtex_file = (document.attr 'bibtex-file').to_s
         bibtex_style = ((document.attr 'bibtex-style') || 'ieee').to_s
+        bibtex_locale = ((document.attr 'bibtex-locale') || 'en-US').to_s
         bibtex_order = ((document.attr 'bibtex-order') || 'appearance').to_sym
         bibtex_format = ((document.attr 'bibtex-format') || 'asciidoc').to_sym
 
@@ -92,7 +94,7 @@ module AsciidoctorBibtex
         end
 
         bibtex = BibTeX.open bibtex_file, :filter => [LatexFilter]
-        processor = Processor.new bibtex, true, bibtex_style, bibtex_order == :appearance, bibtex_format
+        processor = Processor.new bibtex, true, bibtex_style, bibtex_locale, bibtex_order == :appearance, bibtex_format
 
         prose_blocks = document.find_by {|b| b.content_model == :simple or b.context == :list_item}
         prose_blocks.each do |block|
@@ -110,13 +112,13 @@ module AsciidoctorBibtex
           if block.context == :list_item
             line = block.instance_variable_get :@text
             processor.citations.retrieve_citations(line).each do |citation|
-              line.gsub!(citation.original, processor.complete_citation(citation))
+              line = line.gsub(citation.original, processor.complete_citation(citation))
             end
             block.instance_variable_set :@text, line
           else
             block.lines.each do |line|
               processor.citations.retrieve_citations(line).each do |citation|
-                line.gsub!(citation.original, processor.complete_citation(citation))
+                line = line.gsub(citation.original, processor.complete_citation(citation))
               end
             end
           end

data/lib/asciidoctor-bibtex/citation.rb

@@ -14,7 +14,7 @@ module AsciidoctorBibtex
       @pages = pages
       # clean up pages
       @pages = '' unless @pages
-      @pages.gsub!("--","-")
+      @pages = @pages.gsub("--","-")
     end
 
     def to_s

data/lib/asciidoctor-bibtex/processor.rb

@@ -13,18 +13,19 @@ module AsciidoctorBibtex
 
     attr_reader :biblio, :links, :style, :citations
 
-    def initialize biblio, links, style, numeric_in_appearance_order = false, output = :asciidoc, bibfile = ""
+    def initialize biblio, links, style, locale, numeric_in_appearance_order = false, output = :asciidoc, bibfile = ""
       @biblio = biblio
       @links = links
       @numeric_in_appearance_order = numeric_in_appearance_order
       @style = style
+      @locale = locale
       @citations = Citations.new
       @filenames = Set.new
       @output = output
       @bibfile = bibfile
 
       if output != :latex and output != :bibtex and output != :biblatex
-        @citeproc = CiteProc::Processor.new style: @style, format: :html
+        @citeproc = CiteProc::Processor.new style: @style, format: :html, locale: @locale
         @citeproc.import @biblio.to_citeproc
       end
     end
@@ -36,9 +37,16 @@ module AsciidoctorBibtex
         result = '+++'
         cite_data.cites.each do |cite|
           # NOTE: xelatex does not support "\citenp", so we output all
-          # references as "cite" here.
-          # result << "\\" << cite_data.type
-          result << "\\" << 'cite'
+          # references as "cite" here unless we're using biblatex.
+          if @output == :biblatex
+            if cite_data.type == "citenp"
+              result << "\\" << 'textcite'
+            else
+              result << "\\" << 'parencite'
+            end
+          else
+            result << "\\" << 'cite'
+          end
           if cite.pages != ''
             result << "[p. " << cite.pages << "]"
           end
@@ -165,22 +173,19 @@ module AsciidoctorBibtex
         lc = ']'
       else
         cite_text = @citeproc.process id: ref, mode: :citation
-
-        fc = cite_text[0,1]
-        lc = cite_text[-1,1]
-        cite_text = cite_text[1..-2]
+        fc = ''
+        lc = ''
       end
 
       if Styles.is_numeric? @style
         cite_text << "#{page_str(cite)}"
       elsif cite_data.type == "citenp"
-        cite_text.gsub!(item.year, "#{fc}#{item.year}#{page_str(cite)}#{lc}")
-        cite_text.gsub!(", #{fc}", " #{fc}")
+        cite_text = cite_text.gsub(item.year, "#{fc}#{item.year}#{page_str(cite)}#{lc}").gsub(", #{fc}", " #{fc}")
       else
         cite_text << page_str(cite)
       end
 
-      cite_text.gsub!(",", "&#44;") if @links # replace comma
+      cite_text = cite_text.gsub(",", "&#44;") if @links # replace comma
 
       return cite_text, fc, lc
     end

data/lib/asciidoctor-bibtex/version.rb

@@ -1,3 +1,3 @@
 module AsciidoctorBibtex
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-bibtex
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Zhang YANG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2019-05-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: asciidoctor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bibtex-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -112,8 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Adding bibtex functionality to asciidoc