diff --git a/History.txt b/History.txt index 59a1366..613d5fc 100644 --- a/History.txt +++ b/History.txt @@ -1,6 +1,7 @@ Unreleased ========== +* Dual-license bibtex-ruby under GPL-3.0-or-later and BSD-2-Clause (see #154) * Make test suite compatible with minitest 6 * Add official support for Ruby 4.0 * Remove official support for Ruby < 3.3, as they reached their End-of-Life diff --git a/LICENSE b/LICENSE index ce67fea..a3c57ab 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,30 @@ +SPDX-License-Identifier: GPL-3.0-or-later OR BSD-2-Clause + +Copyright (c) 2010-2026 The BibTeX-Ruby Contributors + +BibTeX-Ruby is dual-licensed. You may use, modify and redistribute it under +the terms of either of the following licenses, at your option: + + * the BSD 2-Clause License (reproduced below), or + * the GNU General Public License, version 3 or (at your option) any later + version (reproduced below). + +--- + +BSD 2-Clause License + +Copyright (c) 2010-2026 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 index 6da5c36..8068a9f 100644 --- a/README.md +++ b/README.md @@ -735,10 +735,12 @@ non-zero status if a workload fails. Credits ------- -Copyright 2011-2015 [Sylvester Keil](https://github.com/inukshuk). +Copyright (c) 2010-2026 The BibTeX-Ruby Contributors. Kudos to all [contributors](https://github.com/inukshuk/bibtex-ruby/graphs/contributors) who have made BibTeX-Ruby possible. -This software is distributed under the terms and conditions of the GNU GPL, -version 3 or later. See LICENSE for details. +This software is dual-licensed under the +[BSD 2-Clause License](https://opensource.org/license/bsd-2-clause) or the +[GNU GPL v3.0 or later](https://www.gnu.org/licenses/gpl-3.0.html), at your option +(SPDX: `GPL-3.0-or-later OR BSD-2-Clause`). See LICENSE for details. diff --git a/bibtex-ruby.gemspec b/bibtex-ruby.gemspec index 4520e1a..0325545 100644 --- a/bibtex-ruby.gemspec +++ b/bibtex-ruby.gemspec @@ -10,10 +10,9 @@ Gem::Specification.new do |s| s.version = BibTeX::Version::STRING.dup s.platform = Gem::Platform::RUBY s.required_ruby_version = '>= 3.3' - s.authors = ['Sylvester Keil'] - s.email = ['sylvester@keil.or.at'] - s.homepage = 'http://inukshuk.github.com/bibtex-ruby' - s.license = 'GPL-3.0-or-later' + s.authors = ['The BibTeX-Ruby Contributors'] + s.homepage = 'https://github.com/inukshuk/bibtex-ruby' + s.licenses = ['GPL-3.0-or-later', '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 index d0c099a..c587632 100644 --- 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 index 61e0849..5ab3ce2 100644 --- a/lib/bibtex.rb +++ b/lib/bibtex.rb @@ -1,23 +1,5 @@ # frozen_string_literal: true -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# 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 . -#++ - require 'digest/md5' require 'forwardable' require 'logger' @@ -33,9 +15,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-2026 The BibTeX-Ruby Contributors +# License:: GPL-3.0-or-later OR BSD-2-Clause # module BibTeX # diff --git a/lib/bibtex/bibliography.rb b/lib/bibtex/bibliography.rb index ff2353b..bbf6860 100644 --- a/lib/bibtex/bibliography.rb +++ b/lib/bibtex/bibliography.rb @@ -1,23 +1,5 @@ # frozen_string_literal: true -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# 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 . -#++ - require 'fileutils' require 'tempfile' diff --git a/lib/bibtex/bibtex.y b/lib/bibtex/bibtex.y index 3d1ee44..ee7560f 100644 --- a/lib/bibtex/bibtex.y +++ b/lib/bibtex/bibtex.y @@ -1,20 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2011 Sylvester Keil -# -# 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 . -#++ # # A BibTeX grammar for the parser generator +racc+ # diff --git a/lib/bibtex/elements.rb b/lib/bibtex/elements.rb index 5cfc729..db61928 100644 --- a/lib/bibtex/elements.rb +++ b/lib/bibtex/elements.rb @@ -1,23 +1,5 @@ # frozen_string_literal: true -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# 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 . -#++ - module BibTeX # # The base class for BibTeX objects. diff --git a/lib/bibtex/entry.rb b/lib/bibtex/entry.rb index f0fe30b..76f5185 100644 --- a/lib/bibtex/entry.rb +++ b/lib/bibtex/entry.rb @@ -1,23 +1,5 @@ # frozen_string_literal: true -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# 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 . -#++ - module BibTeX # # Represents a regular BibTeX entry. diff --git a/lib/bibtex/extensions.rb b/lib/bibtex/extensions.rb index 7a414d8..810335e 100644 --- a/lib/bibtex/extensions.rb +++ b/lib/bibtex/extensions.rb @@ -1,23 +1,5 @@ # frozen_string_literal: true -#-- -# BibTeX-Ruby -# Copyright (C) 2011 Sylvester Keil -# -# 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 . -#++ - module BibTeX # Namespace for optional extensions to BibTeX-Ruby. module Extensions diff --git a/lib/bibtex/lexer.rb b/lib/bibtex/lexer.rb index ac1fa0d..6eb5083 100644 --- a/lib/bibtex/lexer.rb +++ b/lib/bibtex/lexer.rb @@ -1,23 +1,5 @@ # frozen_string_literal: true -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# 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 . -#++ - require 'strscan' module BibTeX diff --git a/lib/bibtex/names.rb b/lib/bibtex/names.rb index af9bf39..3d7522c 100644 --- a/lib/bibtex/names.rb +++ b/lib/bibtex/names.rb @@ -1,23 +1,5 @@ # frozen_string_literal: true -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# 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 . -#++ - require 'forwardable' module BibTeX diff --git a/lib/bibtex/names.y b/lib/bibtex/names.y index 18fc9d5..4d6fe03 100644 --- a/lib/bibtex/names.y +++ b/lib/bibtex/names.y @@ -1,20 +1,3 @@ -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2011 Sylvester Keil -# -# 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 . -#++ # # A BibTeX Names grammar for the parser generator +racc+ # diff --git a/lib/bibtex/replaceable.rb b/lib/bibtex/replaceable.rb index 800976b..a4a458b 100644 --- a/lib/bibtex/replaceable.rb +++ b/lib/bibtex/replaceable.rb @@ -1,23 +1,5 @@ # frozen_string_literal: true -#-- -# BibTeX-Ruby -# Copyright (C) 2010 Sylvester Keil -# -# 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 . -#++ - module BibTeX # # The Replaceable module provides methods that expose a Value attribute diff --git a/lib/bibtex/utilities.rb b/lib/bibtex/utilities.rb index 373f334..bab7627 100644 --- a/lib/bibtex/utilities.rb +++ b/lib/bibtex/utilities.rb @@ -1,23 +1,5 @@ # frozen_string_literal: true -#-- -# BibTeX-Ruby -# Copyright (C) 2011 Sylvester Keil -# -# 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 . -#++ - # Top-level convenience methods for opening and parsing bibliographies # and names. module BibTeX diff --git a/lib/bibtex/value.rb b/lib/bibtex/value.rb index 0959842..a310418 100644 --- a/lib/bibtex/value.rb +++ b/lib/bibtex/value.rb @@ -1,23 +1,5 @@ # frozen_string_literal: true -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# 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 . -#++ - require 'forwardable' module BibTeX diff --git a/lib/bibtex/version.rb b/lib/bibtex/version.rb index e71bdef..9223bbf 100644 --- a/lib/bibtex/version.rb +++ b/lib/bibtex/version.rb @@ -1,23 +1,5 @@ # frozen_string_literal: true -#-- -# BibTeX-Ruby -# Copyright (C) 2010-2015 Sylvester Keil -# -# 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 . -#++ - module BibTeX module Version MAJOR = 6 diff --git a/test/fixtures/bibdesk.bib b/test/fixtures/bibdesk.bib index fe66180..6ee974b 100644 --- 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)