inukshuk · tmaier · Apr 22, 2022 · Apr 22, 2022 · Apr 22, 2022 · Apr 22, 2022
diff --git a/History.txt b/History.txt
@@ -1,3 +1,4 @@
+* Dual-license bibtex-ruby under GPL-3.0 and BSD-2-Clause
 * Add official support for Ruby 3.1
 * Remove official support for Ruby < 2.7, as they reached their End-of-Life
 

diff --git a/LICENSE b/LICENSE
@@ -1,3 +1,19 @@
+Dual-Licensed under GPL-3.0 and BSD-2-Clause
+
+---
+
+Copyright 2010-2022 The BibTeX-Ruby Contributors
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---
+
 GNU GENERAL PUBLIC LICENSE
 Version 3, 29 June 2007
 

diff --git a/README.md b/README.md
@@ -605,11 +605,8 @@ To execute the test suite continuously while you're working run:
 
 Credits
 -------
-
-Copyright 2011-2015 [Sylvester Keil](http://sylvester.keil.or.at/).
-
 Kudos to all [contributors](https://github.com/inukshuk/bibtex-ruby/contributors)
 who have made BibTeX-Ruby possible.
 
-This software is distributed under the terms and conditions of the GNU GPL.
+This software is dual-licensed under GPL-3.0 and BSD-2-Clause.
 See LICENSE for details.
diff --git a/bibtex-ruby.gemspec b/bibtex-ruby.gemspec
@@ -8,10 +8,9 @@ Gem::Specification.new do |s|
   s.version     = BibTeX::Version::STRING.dup
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.4.0'
-  s.authors     = ['Sylvester Keil']
-  s.email       = ['sylvester@keil.or.at']
-  s.homepage    = 'http://inukshuk.github.com/bibtex-ruby'
-  s.license     = 'GPL-3.0'
+  s.authors     = ['The BibTeX-Ruby Contributors']
+  s.homepage    = 'https://github.com/inukshuk/bibtex-ruby'
+  s.licenses     = ['GPL-3.0', 'BSD-2-Clause']
 
   s.summary     = 'A BibTeX parser, converter and API for Ruby.'
   s.description = <<-END_DESCRIPTION.gsub(/^\s+/, '')

diff --git a/features/entries.feature b/features/entries.feature
@@ -10,7 +10,7 @@ Feature: Parse BibTeX preambles
 		%% http://bibdesk.sourceforge.net/
 
 
-		%% Created for Sylvester Keil at 2010-08-05 10:07:07 +0200 
+		%% Created at 2010-08-05 10:07:07 +0200 
 
 
 		%% Saved with string encoding Unicode (UTF-8) 

diff --git a/lib/bibtex.rb b/lib/bibtex.rb
@@ -1,21 +1,3 @@
-#--
-# BibTeX-Ruby
-# Copyright (C) 2010-2015  Sylvester Keil <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/>.
-#++
-
 require 'digest/md5'
 require 'forwardable'
 require 'logger'
@@ -31,9 +13,8 @@
 # an API to the individual BibTeX objects: +String+,
 # +Preamble+, +Comment+, and +Entry+.
 #
-# Author:: {Sylvester Keil}[http://sylvester.keil.or.at]
-# Copyright:: Copyright (c) 2010-2014 Sylvester Keil
-# License:: GNU GPL 3.0
+# Copyright:: Copyright (c) 2010-2022 The BibTeX-Ruby Contributors
+# License:: GNU GPL 3.0 and BSD-2-Clause
 #
 module BibTeX
   #

diff --git a/lib/bibtex/bibliography.rb b/lib/bibtex/bibliography.rb
@@ -1,21 +1,3 @@
-#--
-# BibTeX-Ruby
-# Copyright (C) 2010-2015  Sylvester Keil <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/>.
-#++
-
 module BibTeX
   #
   # The Bibliography class models a BibTeX bibliography;

diff --git a/lib/bibtex/bibtex.y b/lib/bibtex/bibtex.y
@@ -1,20 +1,3 @@
-#--
-# 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/>.
-#++
 #
 # A BibTeX grammar for the parser generator +racc+
 #

diff --git a/lib/bibtex/elements.rb b/lib/bibtex/elements.rb
@@ -1,21 +1,3 @@
-#--
-# BibTeX-Ruby
-# Copyright (C) 2010-2015 Sylvester Keil <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/>.
-#++
-
 module BibTeX
   #
   # The base class for BibTeX objects.

diff --git a/lib/bibtex/entry.rb b/lib/bibtex/entry.rb
@@ -1,21 +1,3 @@
-#--
-# BibTeX-Ruby
-# Copyright (C) 2010-2015 Sylvester Keil <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/>.
-#++
-
 module BibTeX
   #
   # Represents a regular BibTeX entry.

diff --git a/lib/bibtex/extensions.rb b/lib/bibtex/extensions.rb
@@ -1,21 +1,3 @@
-#--
-# BibTeX-Ruby
-# Copyright (C) 2011  Sylvester Keil <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/>.
-#++
-
 module BibTeX
   module Extensions
   end

diff --git a/lib/bibtex/lexer.rb b/lib/bibtex/lexer.rb
@@ -1,21 +1,3 @@
-#--
-# BibTeX-Ruby
-# Copyright (C) 2010-2015 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/>.
-#++
-
 require 'strscan'
 
 module BibTeX

diff --git a/lib/bibtex/names.rb b/lib/bibtex/names.rb
@@ -1,21 +1,3 @@
-#--
-# BibTeX-Ruby
-# Copyright (C) 2010-2015  Sylvester Keil <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/>.
-#++
-
 require 'forwardable'
 
 module BibTeX

diff --git a/lib/bibtex/names.y b/lib/bibtex/names.y
@@ -1,20 +1,3 @@
-#--
-# 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/>.
-#++
 #
 # A BibTeX Names grammar for the parser generator +racc+
 #

diff --git a/lib/bibtex/replaceable.rb b/lib/bibtex/replaceable.rb
@@ -1,21 +1,3 @@
-#--
-# BibTeX-Ruby
-# Copyright (C) 2010  Sylvester Keil <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/>.
-#++
-
 module BibTeX
   #
   # The Replaceable module provides methods that expose a Value attribute

diff --git a/lib/bibtex/utilities.rb b/lib/bibtex/utilities.rb
@@ -1,21 +1,3 @@
-#--
-# BibTeX-Ruby
-# Copyright (C) 2011  Sylvester Keil <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/>.
-#++
-
 module BibTeX
   class << self
     # Opens a BibTeX file or URI and returns a corresponding +Bibliography+

diff --git a/lib/bibtex/value.rb b/lib/bibtex/value.rb
@@ -1,21 +1,3 @@
-#--
-# BibTeX-Ruby
-# Copyright (C) 2010-2015  Sylvester Keil <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/>.
-#++
-
 require 'forwardable'
 
 module BibTeX

diff --git a/lib/bibtex/version.rb b/lib/bibtex/version.rb
@@ -1,21 +1,3 @@
-#--
-# BibTeX-Ruby
-# Copyright (C) 2010-2015  Sylvester Keil <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/>.
-#++
-
 module BibTeX
   module Version
     MAJOR = 6

diff --git a/test/fixtures/bibdesk.bib b/test/fixtures/bibdesk.bib
@@ -2,7 +2,7 @@
 %% http://bibdesk.sourceforge.net/
 
 
-%% Created for Sylvester Keil at 2010-08-05 10:07:07 +0200 
+%% Created at 2010-08-05 10:07:07 +0200 
 
 
 %% Saved with string encoding Unicode (UTF-8)