bibtex-ruby 4.0.13 → 4.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb05bf37b0f9e4eadc96d0404d5ebf5ca6c46905
-  data.tar.gz: b3812e113a592625e5a64105b3dee8d63edcc69d
+  metadata.gz: 42b1b49cba84e92eadd848953ae3a0ab9a00b560
+  data.tar.gz: 499dd1a7ff7a5802b901c7f7abc1b36f39976160
 SHA512:
-  metadata.gz: 85082f87ba838a46906bfca9dbb7f4bc06ecfa08a7aff0dc892c3da904c7914bf240340ce63bb8b5ecb3758a9affe2c279ce20d352e30a33c233494d25fb7f41
-  data.tar.gz: c9a396ce76e4f039e32e4d1b0c6f5276e3d2d3f3a6e4f01ccf112c4cf16da438f137a25d2c69027d5a569b5f827584c7d452031ed4d8460bc4b8bd0892cc51fb
+  metadata.gz: 8e880db605c9d1911febd478ecc9302c85e3922f251c5dcb3259180964db418012618f5c2f421630e01684017159ddc0a8b92339551b99743266dfba711775a5
+  data.tar.gz: f4f208069de8b1f912239b17f9476a41349b0207fcbfaaad1a1a09f85818dbc8fe9bd788f8ee5bcfc37d0e797c572b68e89e57c86049e9079000b643ae4f19f9

data/lib/bibtex/bibtex.y

@@ -1,17 +1,17 @@
 #--
 # BibTeX-Ruby
 # Copyright (C) 2010-2011  Sylvester Keil <http://sylvester.keil.or.at>
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
@@ -46,10 +46,10 @@ rule
             | entry                                { result = val[0] }
 
   comment : COMMENT LBRACE content RBRACE          { result = BibTeX::Comment.new(val[2]) }
-  
+
   content : /* empty */                            { result = '' }
           | CONTENT                                { result = val[0] }
-  
+
   preamble : PREAMBLE LBRACE string_value RBRACE   { result = BibTeX::Preamble.new(val[2]) }
 
   string : STRING LBRACE string_assignment RBRACE  { result = BibTeX::String.new(val[2][0],val[2][1]); }
@@ -71,7 +71,7 @@ rule
 
   opt_key :                                        { missing_key }
           | KEY
-  
+
   assignments : assignment                         { result = val[0] }
               | assignments COMMA assignment       { result.merge!(val[2]) }
 
@@ -88,48 +88,48 @@ require 'bibtex/lexer'
 ---- inner
 
   attr_reader :lexer, :options
-  
+
   @defaults = {
     :include => [:errors],
     :allow_missing_keys => false,
     :debug => false
   }.freeze
-  
+
   class << self
     attr_reader :defaults
   end
-  
+
   def initialize(options = {})
     @options = Parser.defaults.merge(options)
     @lexer = Lexer.new(@options)
   end
 
   def parse(input)
-    @yydebug = debug?   
+    @yydebug = debug?
 
-    lexer.analyse(input)    
+    lexer.analyse(input)
     do_parse
     #yyparse(@lexer,:each)
   end
-  
+
   def next_token
     lexer.next_token
   end
-  
+
   def debug?
     options[:debug] || ENV['DEBUG']
   end
-  
+
   def allow_missing_keys?
     options[:allow_missing_keys]
   end
-  
+
   def missing_key
     unless allow_missing_keys?
       raise ParseError, "Failed to parse BibTeX entry: cite-key missing"
     end
   end
-  
+
   def on_error(tid, val, vstack)
     message =
       "Failed to parse BibTeX on value #{val.inspect} (#{token_to_str(tid) || '?'}) #{ vstack.inspect}"

data/lib/bibtex/entry/citeproc_converter.rb

@@ -4,6 +4,7 @@ class BibTeX::Entry::CiteProcConverter
     isbn         ISBN
     booktitle    container-title
     journal      container-title
+    journaltitle container-title
     series       collection-title
     address      publisher-place
     pages        page
@@ -92,7 +93,7 @@ class BibTeX::Entry::CiteProcConverter
   end
 
   def techreport
-    return unless bibtex.type == :techreport
+    return unless [:techreport, :report].include?(bibtex.type)
     hash['number'] = bibtex[:number].to_s if bibtex.field? :number
   end
 

data/lib/bibtex/version.rb

@@ -20,7 +20,7 @@ module BibTeX
   module Version
     MAJOR = 4
     MINOR = 0
-    PATCH = 13
+    PATCH = 14
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bibtex-ruby
 version: !ruby/object:Gem::Version
-  version: 4.0.13
+  version: 4.0.14
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: latex-decode
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: A BibTeX parser, converter and API for Ruby.