asciidoctor-bibtex 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6579c1fb777b43c77a5775daecbe08f124569428
-  data.tar.gz: ef2332508bbc439949a2e8249e6b2be2bfac73ce
+  metadata.gz: 1c520a15832ff368d7b14a6a8c7d65081dc5f91c
+  data.tar.gz: 9433420aea00d9dfee97101f4fcab7efb87cf25e
 SHA512:
-  metadata.gz: c18f02a2bd15df1c55893619e7c2638c81d04838a582584f52425b8d321fd315e3920054cefaf9de942e5e7ea95d0cdf97211755731823023dc098ea0e00f0ba
-  data.tar.gz: 339b8c609873013971dbe03d7fb93d8cb729bb4a753f632f53172b9e2ca7a656bbac684cdefd774f4d47cf5f34f52dd14239a472f8f01ee6f894c7841ea2ffac
+  metadata.gz: d27c4efc1fb2ba1a73ef421070e3bfdc37556b73a529af48334f655c7c2c4f497488c0956b5927475424ccd6fa8849f511ba25b440e55b431b15d5f75a26a5de
+  data.tar.gz: 3765a65c06eb84aa7eb60589beb33df412e4171ea3e322585efeaab8364d29e33689b3616eee969fd2c493516d82506a07d9626abdc9aac8af67985ea4e72048

data/README.md

@@ -79,12 +79,12 @@ To add a list of formatted references, place `bibliography::[]` on a line by its
 
 ### Document Attributes
 
-| Attribute Name | Description                              | Valid Values                      | Default Value       |
-| -------------- | ---------------                          | ----------                        | --------------      |
-| bibtex-file    | Bibtex database file                     | any string, or empty              | Automatic searching |
-| bibtex-style   | Reference formatting style               | any style supported by csl-styles | ieee                |
-| bibtex-order   | Order of citations                       | `appearance` or `alphabetical`    | `appearance`        |
-| bibtex-format  | Formatting of citations and bibliography | `asciidoc` or `latex`             | `asciidoc`          |
+| Attribute Name | Description                              | Valid Values                         | Default Value       |
+| -------------- | ---------------                          | ----------                           | --------------      |
+| bibtex-file    | Bibtex database file                     | any string, or empty                 | Automatic searching |
+| bibtex-style   | Reference formatting style               | any style supported by csl-styles    | ieee                |
+| bibtex-order   | Order of citations                       | `appearance` or `alphabetical`       | `appearance`        |
+| bibtex-format  | Formatting of citations and bibliography | `asciidoc` or `bibtex` or `biblatex` | `asciidoc`          |
 
 ### Commandline
 

data/lib/asciidoctor-bibtex/bibextension.rb

@@ -52,7 +52,7 @@ module AsciidoctorBibtex
     class BibliographyBlockMacro < ::Asciidoctor::Extensions::BlockMacroProcessor
       use_dsl
       named :bibliography
-      positional_attributes :style
+      name_positional_attributes :style
 
       def process parent, target, attrs
         # NOTE: bibtex-file and bibtex-style set by this macro shall be
@@ -123,9 +123,11 @@ module AsciidoctorBibtex
         end
 
         references_asciidoc = []
-        if bibtex_format == :latex
+        if bibtex_format == :latex or bibtex_format == :bibtex
           references_asciidoc << %(+++\\bibliography{#{bibtex_file}}{}+++)
           references_asciidoc << %(+++\\bibliographystyle{#{bibtex_style}}+++)
+        elsif bibtex_format == :biblatex
+          references_asciidoc << %(+++\\printbibliography+++)
         else
           processor.cites.each do |ref|
             references_asciidoc << processor.get_reference(ref)

data/lib/asciidoctor-bibtex/processor.rb

@@ -23,7 +23,7 @@ module AsciidoctorBibtex
       @output = output
       @bibfile = bibfile
 
-      if output != :latex
+      if output != :latex and output != :bibtex and output != :biblatex
         @citeproc = CiteProc::Processor.new style: @style, format: :html
         @citeproc.import @biblio.to_citeproc
       end
@@ -32,7 +32,7 @@ module AsciidoctorBibtex
     # Return the complete citation text for given cite_data
     def complete_citation cite_data
 
-      if @output == :latex
+      if @output == :latex or @output == :bibtex or @output == :biblatex
         result = '+++'
         cite_data.cites.each do |cite|
           # NOTE: xelatex does not support "\citenp", so we output all

data/lib/asciidoctor-bibtex/version.rb

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

data/lib/utils.rb

@@ -0,0 +1,111 @@
+# Some extension and helper methods. 
+#
+# Copyright (c) Peter Lane, 2012-13.
+# Copyright (c) Zhang YANG, 2016-09.
+# Released under Open Works License, 0.9.2
+
+module AsciidoctorBibtex
+  module Utils
+
+    def find_bibtex_database dir
+      begin
+        candidates = Dir.glob("#{dir}/*.bib")
+        if candidates.empty?
+          return ""
+        else
+          return candidates.first
+        end
+      rescue # catch all errors, and return empty string
+        return ""
+      end
+    end
+
+    # Used with numeric styles to combine consecutive numbers into ranges
+    # e.g. 1,2,3 -> 1-3, or 1,2,3,6,7,8,9,12 -> 1-3,6-9,12
+    # leave references with page numbers alone
+    def combine_consecutive_numbers str
+      nums = str.split(",").collect(&:strip)
+      res = ""
+      # Loop through ranges
+      start_range = 0
+      while start_range < nums.length do
+        end_range = start_range
+        while (end_range < nums.length-1 and
+               nums[end_range].is_i? and
+               nums[end_range+1].is_i? and
+               nums[end_range+1].to_i == nums[end_range].to_i + 1) do
+          end_range += 1
+        end
+        if end_range - start_range >= 2
+          res += "#{nums[start_range]}-#{nums[end_range]}, "
+        else
+          start_range.upto(end_range) do |i|
+            res += "#{nums[i]}, "
+          end
+        end
+        start_range = end_range + 1
+      end
+      # finish by removing last comma
+      res.gsub(/, $/, '')
+    end
+  end
+end
+
+module AsciidoctorBibtexArrayExtensions
+
+  # Retrieve the third item of an array
+  # Note: no checks for validity
+  def third
+    self[2]
+  end
+
+  # Join items in array using commas and 'and' on last item
+  def semantic_join
+    if size < 2
+      return self.join("")
+    end
+    result = ""
+    self.each_with_index do |item, index|
+      if index.zero?
+        result << item
+      elsif index == size-1
+        result << " and #{item}"
+      else
+        result << ", #{item}"
+      end
+    end
+
+    return result
+  end
+end
+
+# monkey patch the extension methods to Array
+class Array
+  include AsciidoctorBibtexArrayExtensions
+end
+
+# Converts html output produced by citeproc to asciidoc markup
+module StringHtmlToAsciiDoc
+  def html_to_asciidoc
+    r = self.gsub(/<\/?i>/, '_')
+    r = r.gsub(/<\/?b>/, '*')
+    r = r.gsub(/<\/?span.*?>/, '')
+    r = r.gsub(/\{|\}/, '')
+    r
+  end
+end
+
+# Provides a check that a string is in integer
+# Taken from:
+# http://stackoverflow.com/questions/1235863/test-if-a-string-is-basically-an-integer-in-quotes-using-ruby
+module IntegerCheck
+  def is_i?
+    !!(self =~ /^[-+]?[0-9]+$/)
+  end
+end
+
+# monkey patch the extension methods into String
+class String
+  include StringHtmlToAsciiDoc
+  include IntegerCheck
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-bibtex
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Zhang YANG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-08 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bibtex-ruby
@@ -92,6 +92,7 @@ files:
 - lib/asciidoctor-bibtex/processorutils.rb
 - lib/asciidoctor-bibtex/styles.rb
 - lib/asciidoctor-bibtex/version.rb
+- lib/utils.rb
 homepage: https://github.com/asciidoctor/asciidoctor-bibtex
 licenses:
 - OWL