html2index 1.2.1 → 1.31

data/doc/rst/html2index.rst

@@ -7,11 +7,11 @@ HTML2Index
 
 SYNOPSIS
 =========
-   **html2index -s input.html [-o output.html] [-t template.html] [-c config] [-d]**
+**html2index -s input.html [-o output.html] [-t template.html] [-c config] [-d]**
 
-   **html2index -v**
+**html2index -v**
    
-   **html2index -h**
+**html2index -h**
 
 DESCRIPTION
 ============
@@ -86,7 +86,7 @@ the French language :
     déglingué ou allégé) il a de fortes chances de fonctionner encore
     correctement.
     La version la plus répandue est vim.
-
+ 
     2.   [nom de domaine]. Nom de domaine de premier niveau des îles Vierges étasuniennes.
   ------------------------------------------------------------
   xinput
@@ -163,7 +163,8 @@ However, an explanation of each one of the available variables follows:
                   Each dictionary-definition must start with a dash, followed by a white-space, then the
                   first variable. Each variable-name must be enclosed by colons (see comments in the config-file).
 
-                  :name:  The name of the dictionary, how it will be referred to in the Glossary. An example could be 'Meriam-Webster'
+                  :name:  The name of the dictionary, how it will be referred
+                          to in the Glossary. An example could be 'Merriam-Webster'
 
                   :url:   Note here the part from the url to a search-result in
                           the chosen dictionary, which precedes the searched
@@ -175,6 +176,9 @@ However, an explanation of each one of the available variables follows:
                           item in the url.  Remove only the searched expression
                           and note the remainder as the value to the variable
                           *url*.
+                          For Merriam-Webster, this url fragment would be (in
+                          January 2026):
+                          "https://www.merriam-webster.com/dictionary/"
 
                   :xpath: This is the xpath which identifies the HTML-element
                           in a search-result which contains the explanation of
@@ -224,8 +228,8 @@ However, an explanation of each one of the available variables follows:
 
 EXAMPLE-Template             
 ============================
-  Assuming that the defaults are used, the following could be a working
-  HTML-template to use with HTML2Index:
+Assuming that the defaults are used, the following could be a working
+HTML-template to use with HTML2Index:
 
 ::
 
@@ -245,15 +249,15 @@ EXAMPLE-Template
 ERRORS and WARNINGS
 ============================
 
-  html2index warns you if the output-file exists and asks you if you want
-  to replace it with a new version.
+html2index warns you if the output-file exists and asks you if you want to
+replace it with a new version.
 
-  The program also tries to determine the file-type of the input (HTML) file and
-  gives out a warning if the file is considered unsuitable. 
+The program also tries to determine the file-type of the input (HTML) file and
+gives out a warning if the file is considered unsuitable. 
 
-  Each time, that an expression cannot be found in one of the targeted dictionaries,
-  a warning is given. All these problematic expressions will be listed in a
-  temporary file, which is named after html2index has terminated.
+Each time, that an expression cannot be found in one of the targeted
+dictionaries, a warning is given. All these problematic expressions will be
+listed in a temporary file, which is named after html2index has terminated.
 
 SOURCE CODE and DEVELOPMENT
 ============================

data/html2index.gemspec

@@ -6,16 +6,20 @@ Gem::Specification.new do |s|
   s.version     = VERSION
   s.name        = File.basename(__FILE__, '.gemspec')
   s.date        = Date.today.strftime('%F')
-  s.summary     = "updated dependencies, updated use of the URI module."
+  s.summary     = SUMMARY
   s.description = "creates a glossary from HTML"
   s.authors     = ["Michael Uplawski"]
   s.email       = 'michael.uplawski@uplawski.eu'
-  s.files  	=  %w~html2index~.collect{|f| 'bin/' << f} + %w~version.rb argparser.rb configuration.rb constants.rb dictionary.rb html2index.rb logging.rb translating.rb user_input.rb definition.rb file_checking.rb log.conf template.rb translations~.collect{|f| 'lib/' << f} + %w~html2index.gemspec~.collect{|f|f} + %w~html/html2index.html man/html2index.1.gz pdf/html2index.pdf rst/html2index.rst~.collect{|f| 'doc/' << f}
-  s.homepage    = 'http://www.souris-libre.fr'
+  s.files  	=  %w~html2index~.collect{|f| 'bin/' << f} + %w~version.rb argparser.rb configuration.rb constants.rb dictionary.rb html2index.rb basic_logging.rb translating.rb user_input.rb definition.rb file_checking.rb log.conf template.rb translations~.collect{|f| 'lib/' << f} + %w~html2index.gemspec~.collect{|f|f} + %w~html/html2index.html man/html2index.1.gz pdf/html2index.pdf rst/html2index.rst~.collect{|f| 'doc/' << f}
   s.requirements = 'nokogiri, ruby-filemagic'
-  s.add_runtime_dependency 'nokogiri', '~> 1.10', '>= 1.10.9'
-  s.add_runtime_dependency 'ruby-filemagic', '~> 0.7', '>= 0.7.2'
+  s.add_runtime_dependency 'nokogiri', '~> 1.18', '>= 1.18.10'
+  s.add_runtime_dependency 'ruby-filemagic', '~> 0.7', '>= 0.7.3'
   s.executables = 'html2index'
-  s.license     = 'GPL-3.0'
-  s.required_ruby_version = '>= 2.7.1'
+  s.metadata = {
+    "homepage_uri" => 'https://www.uplawski.eu/software/',
+    "documentation_uri" => 'https://www.uplawski.eu/software/html2index/html2index.html',
+    "license_uri" => 'https://www.wtfpl.net/about/'
+  }
+  s.license     = 'Nonstandard'
+  s.required_ruby_version = '>= 3.0'
 end

data/lib/argparser.rb

@@ -1,39 +1,30 @@
 #encoding: UTF-8 
 =begin
 /***************************************************************************
- *   ©2016-2017 Michael Uplawski <michael.uplawski@uplawski.eu>            *
+ *   ©2011-2026, Michael Uplawski <michael.uplawski@uplawski.eu>           *
  *                                                                         *
  *   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.                                   *
+ *   it under the terms of the WTFPL, version 2 or later, as published on  *
+ *   https://www.wtfpl.net/about/.                                         *
  *                                                                         *
  *   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.                          *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
  *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 =end
 
-
 require 'optparse'
 require 'optparse/time'
 require 'ostruct'
-require_relative 'logging'
+require_relative 'basic_logging'
 require_relative 'version'
 # require_relative 'translating'
 require_relative 'constants'
 
 class ArgParser 
-  # Class level logger. This is a static class. 
-  self.extend(Logging)
+  include BasicLogging
   # self.extend(Translating)
-  @@log = init_logger()
 
   # Returns a structure describing the options.
   #
@@ -55,7 +46,7 @@ class ArgParser
 
       opts.on("-d", "--debug", 'Be verbose') do  
         $log_level = Logger::DEBUG
-        @@log.level = $log_level
+        set_level $log_level
       end
 
       opts.on("-sOURCE", "--source=SOURCE", 'Source document (html)') do |so|
@@ -92,7 +83,7 @@ class ArgParser
       puts "Start this program with parameter -h or --help to see the usage-message."
       exit false
     end
-    @@log.debug('options are ' << options.to_s)
+    debug('options are ' << options.to_s)
 
     options
   end  # parse()
@@ -101,7 +92,7 @@ class ArgParser
         Shows the usage-message
 =end
   def self::usage
-    msg = "\n\tUsage: html2index -s input.html [-o output.html] [-c config-file] [-t template.html] [-d]"
+    msg = "\n\tUsage: html2index -s input.html \n\t\t[-o output.html] \n\t\t[-c config-file] \n\t\t[-t template.html] \n\t\t[-d]"
     msg << "\n\n\t* Will print to stdout, if the output-file is not provided."
     msg << "\n\t* Adapt ~/.config/HTML2Index/config to your needs.\n\n"
   end

data/lib/basic_logging.rb

@@ -0,0 +1,202 @@
+#!/bin/env ruby
+#encoding: UTF-8
+=begin
+/***************************************************************************
+ *   ©2023-2026, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the WTFPL, version 2 or later, as published on  *
+ *   https://www.wtfpl.net/about/.                                         *
+ *                                                                         *
+ *   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.                  *
+ *                                                                         *
+ ***************************************************************************/
+=end
+
+#
+# Simplified logging. 
+# See example code at the bottom of this file.
+# Execute this file to see the output.
+module BasicLogging
+
+  DEBUG = 0
+  INFO =  1
+  WARN =  2
+  ERROR = 3
+  FATAL = 4
+  UNKNOWN = nil
+  
+  # this is mainly for the translation of method calls into log levels
+  Levels = {:debug => DEBUG, :info => INFO, :warn => WARN, :error => ERROR,
+            :fatal => FATAL, :unknown => UNKNOWN}
+
+  @@log_level = UNKNOWN
+  @@target = STDOUT
+  @@muted = []
+
+  # do not log, if caller is obj (class or instance)
+  def self.mute(obj)
+    name = obj.class == Class ? obj.name.dup : obj.class.name
+    @@muted << name
+  end
+
+  def self.is_muted?(obj)
+    name = obj.class == Class ? obj.name.dup : obj.class.name
+    @@muted.include?(name)  
+  end
+
+  # set the log level 
+  def set_level(lv)
+    if lv.respond_to?(:to_str) && Levels.keys.include?(lv.strip.to_sym)
+      lv = Levels[lv.to_sym]
+    elsif lv.respond_to?(:to_sym) && Levels.keys.include?(lv)
+      lv = Levels[lv]
+    end
+
+    if(!lv || (lv.respond_to?(:to_int) && lv >= DEBUG && lv <= FATAL) )
+      @@log_level = lv
+    else
+      msg = __FILE__.dup << ": ERROR : invalid log level \"" << lv.to_s << "\""
+      msg << "\n" << "Keepinng old log level " << Levels.keys.detect {| k| Levels[k] == @@log_level}.to_s
+      STDERR.puts msg
+      puts msg
+    end
+  end
+
+  # set the log target 
+  def set_target(tg)
+    if tg.respond_to?(:to_io) 
+      @@target = tg
+    elsif(!File::exist?(tg) || ( File.file?(tg) && File.writable?(tg) ) )
+      @@target = File.open(tg, 'w+')  
+    elsif !tg || tg.respond_to?(:to_str) && tg.strip.empty?
+      @@target = nil
+    else
+      STDERR.puts __FILE__.dup << ': ERROR : target ' << tg << ' cannot be set'
+      STDERR.puts "Keeping old target " << @@target.inspect
+      return
+    end
+  end
+
+  # Output of log messages, depending on the log level set for the calling class
+  # and the name of the alias method which is actually called.
+  def log(message)
+    if !BasicLogging.is_muted?(self)
+      # how has this method been called?
+      mlevel = __callee__
+      if Levels.has_key?(mlevel) && Levels[mlevel] <=  FATAL
+        # output only for levels equal or above the value that corresponds to
+        # the calling alias.
+        format_log( message, mlevel) if @@log_level && Levels[mlevel] >= @@log_level 
+      else
+        STDERR.puts __FILE__.dup << ": ERROR : invalid log level \"" << mlevel.to_s << "\""
+      end
+    end
+  end
+
+  def target
+    @@target.path if @@target
+  end
+
+  def level
+    @@level.to_s if @@level
+  end
+
+  # Clear the log (-file)
+  def clear_log
+    if @@target && @@target.respond_to?(:truncate)
+      lock_target{ @@target.truncate(0) }
+    end
+  end
+
+  alias :debug :log
+  alias :info :log
+  alias :warn :log
+  alias :error :log
+  alias :fatal :log
+
+  private 
+
+  def lock_target(&block)
+    begin
+      if @@target.respond_to?(:flock) 
+        @@target.flock(File::LOCK_EX)
+        block.call
+        @@target.flock(File::LOCK_UN)
+      elsif @@target.respond_to?(:to_io)
+        block.call
+      end
+    rescue => ex
+      STDERR.puts __FILE__.dup  << ": ERROR : cannot lock target (" << ex.message << ")"
+    end
+  end
+
+  # 1 format_log for all loggers.
+  def format_log(message, mlevel)
+    if @@target
+      # indicate if a registered class or the registered object of a class is calling.
+      name = self.class == Class ? self.name.dup << ' [class]' : self.class.name
+      lock_target{@@target.puts '' << name << ' ' << mlevel.to_s << ' ' << Time.now.strftime("%H:%M:%S:%6N")  << ': ' << message.gsub("\n", "\n |")}
+    end
+  end
+end
+#---------test: execute file----------
+if $0 == __FILE__
+  Array.extend(BasicLogging)
+  Array.set_level(BasicLogging::INFO)
+  Array.info('TEST')
+  ar = Array.new
+  ar.extend(BasicLogging)
+  # --- no output : 
+  l = __LINE__
+  ar.debug(l.next.to_s << ': debug-test 0')
+  # output
+  ar.set_level(BasicLogging::DEBUG)
+  l = __LINE__
+  ar.debug(l.next.to_s << ': debug-test 1')
+
+  obj = Object.new
+  obj.extend(BasicLogging)
+  obj.set_level(BasicLogging::DEBUG)
+  puts "--------debug-----------"
+  obj.debug('debug')
+  obj.info('info')
+  obj.warn('warn')
+  obj.error('error')
+  obj.fatal('fatal')
+  puts "--------info-----------"
+  obj.set_level("info")
+  obj.debug('debug')
+  obj.info('info')
+  obj.warn('warn')
+  obj.error('error')
+  obj.fatal('fatal')
+  puts "--------fatal-----------"
+  obj.set_level("fatal")
+  obj.debug('debug')
+  obj.info('info')
+  obj.warn('warn')
+  obj.error('error')
+  obj.fatal('fatal')
+  puts "--------UNKNOWN-----------"
+  obj.set_level(nil)
+  obj.debug('debug')
+  obj.info('info')
+  obj.warn('warn')
+  obj.error('error')
+  obj.fatal('fatal')
+  puts " ------ Output into file ----"
+  obj.set_target "/tmp/test_log.log"
+  puts " ------ INFO -----------"
+  obj.set_level BasicLogging::INFO
+  obj.info('info output')
+
+  obj.info('info output 2') 
+  puts "---------- invalid -------"
+  obj.set_target "/dev/sr0"
+  obj.set_level "power"
+end
+
+# EOF 

data/lib/configuration.rb

@@ -1,22 +1,16 @@
 #encoding: UTF-8 
 =begin
 /***************************************************************************
- *   ©2016-2017 Michael Uplawski <michael.uplawski@uplawski.eu>            *
+ *   ©2023-2026, Michael Uplawski <michael.uplawski@uplawski.eu>           *
  *                                                                         *
  *   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.                                   *
+ *   it under the terms of the WTFPL, version 2 or later, as published on  *
+ *   https://www.wtfpl.net/about/.                                         *
  *                                                                         *
  *   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.                          *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
  *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 =end
 require 'yaml'
@@ -24,23 +18,22 @@ require 'singleton'
 require 'ostruct'
 require_relative 'constants'
 require_relative 'file_checking'
-require_relative 'logging'
+require_relative 'basic_logging'
 require_relative 'translating'
 
 class Configuration
   include File_Checking
   include Translating
-  include Logging
+  include BasicLogging
 
   # default configuration file
   @@config_file = File::dirname(__FILE__) << File::Separator << 'config'
 
   # do initializations
   def initialize(options)
-    init_logger(STDOUT)
-    @log.level = $log_level
+    set_level $log_level
     set(options)
-    @log.debug('config-file is ' << @@config_file)
+    debug('config-file is ' << @@config_file)
   end
 
   def user_conf
@@ -52,9 +45,9 @@ class Configuration
     if(!File.exist?(config ) )
       begin
         File.open(config, 'w') {|co| co.write(File.read(@@config_file))}
-        @log.info("Created user-version of the configuration-file in\n\t" << config)
+        info("Created user-version of the configuration-file in\n\t" << config)
       rescue Exception => ex
-        @log.error('Cannot create the configuration: ' << ex.message)
+        error('Cannot create the configuration: ' << ex.message)
         give_up
       end
     end
@@ -79,24 +72,24 @@ class Configuration
 
   # Configure with the command-line arguments.
   def set(options)
-    @log.debug('merging options ' << options.to_s)
+    debug('merging options ' << options.to_s)
     # User-provided configuration-file?
     if(options['config'])
       cf = options['config'] 
-      @log.debug('config should be ' << cf.to_s)
+      debug('config should be ' << cf.to_s)
       msg = file_check(cf, :file, :readable)
       if(!msg) 
         @@config_file = cf
       else
         msg = ("The file %s " << msg.split[1,100].join(' ')) %msg.split[0]
-        @log.error(("ERROR! Unsuitable file") << ' ' << msg)
+        error(("ERROR! Unsuitable file") << ' ' << msg)
         give_up
       end
     else
       @@config_file = user_conf
     end
 
-    @log.debug('config-file is ' << @@config_file)
+    debug('config-file is ' << @@config_file)
 
     # read defaults from configuration-file
     co = OpenStruct.new(YAML::load_file(@@config_file))
@@ -105,8 +98,8 @@ class Configuration
     @config = co.to_h.update(options.to_h)
     if(! @config[:source] )
       msg = ('missing argument %s') %'source' 
-      @log.error msg
-      @log.error(("Start this program with parameter -h or --help to see the usage-message.") )
+      error msg
+      error(("Start this program with parameter -h or --help to see the usage-message.") )
       give_up
     end
 
@@ -116,21 +109,21 @@ class Configuration
     if @config[:template]
       @template = @config[:template] 
     else
-      @log.warn 'Using default-template!'
+      warn 'Using default-template!'
       warn ||= true
     end
     # fields in the template file 
     if @config[:placeholders] && @config[:template]
       @placeholders = @config[:placeholders]
-      @log.debug('placeholders from config: ' << @placeholders.to_s)
+      debug('placeholders from config: ' << @placeholders.to_s)
     else
       @placeholders = Template.default(:placeholders)
       if @config[:placeholders]
-        @log.warn 'Placeholders are defined, but no template-file is given.'
+        warn 'Placeholders are defined, but no template-file is given.'
       else
-        @log.warn 'Template is given, but placeholders are not defined.'
+        warn 'Template is given, but placeholders are not defined.'
       end
-      @log.warn 'Using default placeholders ' << @placeholders.to_a.collect{|p|p.join(': ')}.join(', ') 
+      warn 'Using default placeholders ' << @placeholders.to_a.collect{|p|p.join(': ')}.join(', ') 
       warn = true
     end
     @fields = [@placeholders[:dict_list], @placeholders[:glossary]]
@@ -140,11 +133,11 @@ class Configuration
     else
       @fdelim = Template.default(:fdelim)
       if @config[:template]
-        @log.warn 'Template is given, but field delimiters are not defined.'
+        warn 'Template is given, but field delimiters are not defined.'
       else
-        @log.warn 'Field delimiters are defined but no template is given.'
+        warn 'Field delimiters are defined but no template is given.'
       end
-      @log.warn 'Using default delimiters ' << @fdelim << ', ' << @fdelim.reverse 
+      warn 'Using default delimiters ' << @fdelim << ', ' << @fdelim.reverse 
       warn ||= true
     end
  
@@ -155,22 +148,22 @@ class Configuration
       dictionaries.each do |d| 
         @dicts << Dictionary.new(d[:name], d[:url], d[:xpath], d[:color]) 
       end
-      @log.debug('dicts are from config' << @dicts.to_s)
+      debug('dicts are from config' << @dicts.to_s)
     else
-      @log.warn( %~NO DICTIONARIES have been set in the configuration!
+      warn( %~NO DICTIONARIES have been set in the configuration!
 Will use the defaults, which is probably NOT what you want!                
 Defaults are: %s~ %[URL_DICT1.dup << ', ' << URL_DICT2.dup])
       warn ||= true
       @dicts << Dictionary.new(NAME_DICT1, URL_DICT1,XPATH_DICT1, DICT_COLORS[0])
       @dicts << Dictionary.new(NAME_DICT2, URL_DICT2, XPATH_DICT2, DICT_COLORS[1])
-      @log.debug('dicts are from constants' << @dicts.to_s)
+      debug('dicts are from constants' << @dicts.to_s)
     end
-    @log.warn "HINT: Adapt #{@@config_file} to avoid warnings in the future." if warn
+    warn "HINT: Adapt #{@@config_file} to avoid warnings in the future." if warn
   end
 
   # exit on error
   def give_up
-    @log.error("\t" << ("Aborting. Bye!"))
+    error("\t" << ("Aborting. Bye!"))
     exit false
   end
 end

data/lib/constants.rb

@@ -1,26 +1,20 @@
 #encoding: UTF-8 
 =begin
 /***************************************************************************
- *   ©2015-2017 Michael Uplawski <michael.uplawski@uplawski.eu>            *
+ *   ©2015-2026, Michael Uplawski <michael.uplawski@uplawski.eu>           *
  *                                                                         *
  *   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.                                   *
+ *   it under the terms of the WTFPL, version 2 or later, as published on  *
+ *   https://www.wtfpl.net/about/.                                         *
  *                                                                         *
  *   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.                          *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
  *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 =end
 require_relative 'dictionary'
-require 'logger'
+require_relative 'basic_logging'
 require 'date'
 
 APPNAME = 'HTML2Index'
@@ -49,7 +43,7 @@ DICT_COLORS ||= ['a000a0', '00a000']
 
 # definitions which cause problems are logged.
 PROBLEM_LOG ||= 'html2index_problems.txt'
-$log_level = Logger::INFO
+$log_level = BasicLogging::INFO
 
 # meta-tag for the html-output
 GeneratorMeta = "<meta name=\"generator\" content=\"HTML2Index ©2015-#{Date.today.strftime('%Y')} michael.uplawski@uplawski.eu\" />"

data/lib/definition.rb

@@ -1,24 +1,19 @@
 #encoding: UTF-8 
 =begin
 /***************************************************************************
- *   ©2015-2017 Michael Uplawski <michael.uplawski@uplawski.eu>            *
+ *   ©2015-2026, Michael Uplawski <michael.uplawski@uplawski.eu>           *
  *                                                                         *
  *   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.                                   *
+ *   it under the terms of the WTFPL, version 2 or later, as published on  *
+ *   https://www.wtfpl.net/about/.                                         *
  *                                                                         *
  *   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.                          *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
  *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 =end
+
 require 'constants'
 require_relative 'translating'
 

data/lib/dictionary.rb

@@ -1,24 +1,19 @@
 #encoding: UTF-8 
 =begin
 /***************************************************************************
- *   ©2015-2017 Michael Uplawski <michael.uplawski@uplawski.eu>            *
+ *   ©2015-2026, Michael Uplawski <michael.uplawski@uplawski.eu>           *
  *                                                                         *
  *   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.                                   *
+ *   it under the terms of the WTFPL, version 2 or later, as published on  *
+ *   https://www.wtfpl.net/about/.                                         *
  *                                                                         *
  *   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.                          *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
  *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 =end
+
 require 'constants'
 require_relative 'translating'