Explorar el Código

Update RegExodus to 0.1.6, fix the few breaks

The latest RegExodus moves from an old iterator-like class to an actual
generic Iterator<MatchResult>, and so some names changed in the API.
This only mattered in StringKit.  The various NOTICE.txt files also got
updated; I can't believe @smelc hadn't been credited in them yet!
Tommy Ettinger hace 7 años
padre
commit
57a45b8676
Se han modificado 6 ficheros con 214 adiciones y 40 borrados
  1. 1 1
      LICENSE.txt
  2. 64 6
      NOTICE.txt
  3. 1 1
      pom.xml
  4. 64 6
      squidlib-util/NOTICE.txt
  5. 20 20
      squidlib-util/src/main/java/squidpony/StringKit.java
  6. 64 6
      squidlib/NOTICE.txt

+ 1 - 1
LICENSE.txt

@@ -189,7 +189,7 @@ sources, "squidlib/src/test/resources/icons-license.txt")
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2016 Eben Howard, Tommy Ettinger, and contributors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

+ 64 - 6
NOTICE.txt

@@ -26,9 +26,9 @@ Portions of some classes are derived from works by Jice originally distributed i
 
 Portions of some classes are derived from works in the rot.js library with the statement provided below in this document.
 
-The @Beta annotation is from Google's Guava library under the Apache 2.0 license.
+The @Beta annotation is from Google's Guava library under the Apache 2.0 license; the @GwtIncompatible annotation is probably from Google's GWT library or its documentation, but may also be from Guava.
 
-The JRotation class is based on code by Savvas Dalkitsis on stackoverflow.com.
+The JRotation class (no longer in SquidLib) was based on code by Savvas Dalkitsis on stackoverflow.com.
 
 The RNG class is based on the Mersenne Twister implementation by Daniel Dyer as part of the Uncommons Maths library, which is in turn based on the original C algorithm by Makoto Matsumoto and Takuji Nishimura.
 
@@ -37,17 +37,27 @@ The squidpony.squidgrid.mapping.styled package and the JSON resources are derive
 The LightRNG class is based on SplitMix64.c by Sebastiano Vigna, released into the public domain and made available on http://xorshift.di.unimi.it/
 
 The XorRNG class is based on the C implementation of XorShift 128+ by Sebastiano Vigna, released into the public domain and made available on http://xorshift.di.unimi.it/
+LongPeriodRNG is based on XorShift 1024* , XoRoRNG is based on XoRoShiRo 64+ , and the other credit for these is the same as XorRNG.
 
 The PermutedRNG class is based on the aforementioned SplitMix64.c by Sebastiano Vigna and on the paper, http://www.pcg-random.org/paper.html , describing PCG-Random and its methodology written by Melissa E. O'Neill.
 
 The SobolQRNG class and the resource in the resources/qrng folder were ported from Apache Commons Math, where Stephen Joe and Frances Kuo are credited for the implementation.
 
-The NeuralParticle and WeightedLetterNamegen classes are based on work by Ebyan Alvarez-Buylla
+The IsaacRNG class is based off a Java implementation given for the Isaac cipher/RNG (usable for either) from http://www.burtleburtle.net/bob/rand/isaacafa.html (public domain); the version uses here is a mix of the C code in isaac64.c and the Java implementation by Bob Jenkins for 32-bit generation, and it produces 64 bits at a time in Java.
+
+The NeuralParticle and WeightedLetterNamegen classes are based on work by Ebyan Alvarez-Buylla .
+
+ShortSet, ShortVLA, and IntVLA are based closely off primitive-backed collections from libGDX, Apache-licensed.
+
+IntDoubleOrderedMap, OrderedMap, and OrderedSet are based on similar code from Sebastiano Vigna's fastutil library, https://github.com/vigna/fastutil .
 
 The DijkstraMap class is original but owes substantial credit to Edsger Dijkstra
 for creating the algorithm that shares his name, Brian Pender and Joshua Day for
 pioneering Progressive Dijkstra Scan, and the IRC user known as kaw for a
-Clojure-language implementation that would help shape this design.
+Clojure-language implementation that would help shape this design, which is, it
+turns out, subtly different from Dijkstra's Pathfinding Algorithm and is closer
+to Breadth-First Search, though it still produces what is usually called a
+Dijkstra Map by roguelike developers.
 
 The Spill class derives much of its implementation from DijkstraMap but also from
 techniques Joshua Day described for using randomized floodfill and a Lua implementation related to his postings on the subject.
@@ -59,14 +69,62 @@ The squidpony.squidai.AOE interface and its implementing classes are essentially
 made possible by the Progressive Dijkstra Scan technique, so more thanks must go
 to Brian Pender and Joshua Day.
 
+The hashing techniques used in CrossHash include FNV-1a, which is public domain
+and is the work of Glenn Fowler, Landon Curt Noll, and Phong Vo, site at
+http://www.isthe.com/chongo/tech/comp/fnv/index.html and SipHash, by Daniel
+Bernstein and Jean-Philippe Aumasson, CC0-licensed (close to public domain),
+site at https://131002.net/siphash/ , though specifically this uses code from
+https://github.com/nahi/siphash-java-inline , which is Apache licensed like
+SquidLib. Lightning hash, also in CrossHash, is not derived (at least not
+intentionally) from any other hashing algorithm.
+
+The phonetic locality-sensitive hashing of word sounds in NaturalLanguageCipher
+owes some credit to eudex, a Rust library for the same type of hashing which can
+be found at https://github.com/ticki/eudex , because eudex showed there was
+(more than one) way to encode a word sound approximately in 64 bits. No code is
+shared between eudex and SquidLib, however.
+
 Small but important bugfixes and additions were contributed by Ivan Polozhēntsev
 ( https://github.com/uzername/ , introduced the concept and some code for
 SquidKeys.ignoreInput), David Becker (found and fixed several GDX-related bugs),
 and Shane Chubb (found and fixed a bug in the LibGDX TextCellFactory).
 This is not a complete list of bugfix contributors.
 
-All of the TrueType and bitmap fonts in src/main/resources were made by Tommy
-Ettinger and released into the public domain.
+MimicFill and DetailedMimic are direct ports of https://github.com/mxgmn/ConvChain and
+https://github.com/mxgmn/SynTex from C# to Java; the former is public domain while the
+latter is MIT-licensed.
+
+A substantial amount of work on SquidLib has been done by smelC, https://github.com/smelc ,
+especially in the areas of color handling, text layout, and shape analysis for dungeons.
+His help has been very welcome in helping to manage the growing codebase and to keep
+complex code clean and robust, as well.
+
+All of the TrueType and bitmap fonts in the assets directory of the source tree were made by Tommy
+Ettinger and released into the public domain, except:
+
+  * Inconsolata and the fonts based on it (all containing Inconsolata in their filename are derived from Raph
+    Levien's work as modified in https://github.com/MihailJP/Inconsolata-LGC , all with SIL OFL as their license
+    and any alterations made here do not change the original work's licensing). Portions of the fonts derived
+    from Inconsolata also incorporate glyphs from DejaVu Sans Mono, http://dejavu-fonts.org/wiki/Main_Page ,
+    which has a different license but our usage seems to be specifically allowed on their license page,
+    http://dejavu-fonts.org/wiki/License :
+    ```
+    The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or
+    characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts,
+    only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera".
+    ```
+  * The fonts containing CM-Custom in their names are modified from Computer Modern Unicode, also SIL OFL, and
+    the originals, plus some related fonts, can be found at https://fontlibrary.org/en/font/cmu-typewriter .
+    They were originally the work of Donald Knuth for the TeX typesetting system.
+  * Gentium is SIL OFL, originally by SIL, and has had minimal modification, if any. The original site is
+    http://software.sil.org/gentium/ .
+  * Noto Sans is SIL OFL, originally by Google, Inc., and has had minimal modification. The original files, as
+    well as Noto Serif and specialized versions, can be obtained from https://www.google.com/get/noto/ .
+  * The .png images containing the name Tentacle are public domain, originally by Henrique Lazarini (also known
+    as 7Soul1, http://7soul1.deviantart.com/ ); some have modifications applied to a vector trace of the
+    original pixel art.
+  * icons.png is derived from the many icons supplied by http://game-icons.net/ ; it has its own license and
+    people to credit in a file distributed with it, icons-license.txt .
 
 libtcod 1.5.2 license text:
 Copyright (c) 2008,2009,2010,2012 Jice & Mingos

+ 1 - 1
pom.xml

@@ -66,7 +66,7 @@
         <jdk.version>1.7</jdk.version>
         <gdx.version>1.9.3</gdx.version>
         <junit.version>4.11</junit.version>
-        <regexodus.version>0.1.5</regexodus.version>
+        <regexodus.version>0.1.6</regexodus.version>
     </properties>
 
     <prerequisites>

+ 64 - 6
squidlib-util/NOTICE.txt

@@ -26,9 +26,9 @@ Portions of some classes are derived from works by Jice originally distributed i
 
 Portions of some classes are derived from works in the rot.js library with the statement provided below in this document.
 
-The @Beta annotation is from Google's Guava library under the Apache 2.0 license.
+The @Beta annotation is from Google's Guava library under the Apache 2.0 license; the @GwtIncompatible annotation is probably from Google's GWT library or its documentation, but may also be from Guava.
 
-The JRotation class is based on code by Savvas Dalkitsis on stackoverflow.com.
+The JRotation class (no longer in SquidLib) was based on code by Savvas Dalkitsis on stackoverflow.com.
 
 The RNG class is based on the Mersenne Twister implementation by Daniel Dyer as part of the Uncommons Maths library, which is in turn based on the original C algorithm by Makoto Matsumoto and Takuji Nishimura.
 
@@ -37,17 +37,27 @@ The squidpony.squidgrid.mapping.styled package and the JSON resources are derive
 The LightRNG class is based on SplitMix64.c by Sebastiano Vigna, released into the public domain and made available on http://xorshift.di.unimi.it/
 
 The XorRNG class is based on the C implementation of XorShift 128+ by Sebastiano Vigna, released into the public domain and made available on http://xorshift.di.unimi.it/
+LongPeriodRNG is based on XorShift 1024* , XoRoRNG is based on XoRoShiRo 64+ , and the other credit for these is the same as XorRNG.
 
 The PermutedRNG class is based on the aforementioned SplitMix64.c by Sebastiano Vigna and on the paper, http://www.pcg-random.org/paper.html , describing PCG-Random and its methodology written by Melissa E. O'Neill.
 
 The SobolQRNG class and the resource in the resources/qrng folder were ported from Apache Commons Math, where Stephen Joe and Frances Kuo are credited for the implementation.
 
-The NeuralParticle and WeightedLetterNamegen classes are based on work by Ebyan Alvarez-Buylla
+The IsaacRNG class is based off a Java implementation given for the Isaac cipher/RNG (usable for either) from http://www.burtleburtle.net/bob/rand/isaacafa.html (public domain); the version uses here is a mix of the C code in isaac64.c and the Java implementation by Bob Jenkins for 32-bit generation, and it produces 64 bits at a time in Java.
+
+The NeuralParticle and WeightedLetterNamegen classes are based on work by Ebyan Alvarez-Buylla .
+
+ShortSet, ShortVLA, and IntVLA are based closely off primitive-backed collections from libGDX, Apache-licensed.
+
+IntDoubleOrderedMap, OrderedMap, and OrderedSet are based on similar code from Sebastiano Vigna's fastutil library, https://github.com/vigna/fastutil .
 
 The DijkstraMap class is original but owes substantial credit to Edsger Dijkstra
 for creating the algorithm that shares his name, Brian Pender and Joshua Day for
 pioneering Progressive Dijkstra Scan, and the IRC user known as kaw for a
-Clojure-language implementation that would help shape this design.
+Clojure-language implementation that would help shape this design, which is, it
+turns out, subtly different from Dijkstra's Pathfinding Algorithm and is closer
+to Breadth-First Search, though it still produces what is usually called a
+Dijkstra Map by roguelike developers.
 
 The Spill class derives much of its implementation from DijkstraMap but also from
 techniques Joshua Day described for using randomized floodfill and a Lua implementation related to his postings on the subject.
@@ -59,14 +69,62 @@ The squidpony.squidai.AOE interface and its implementing classes are essentially
 made possible by the Progressive Dijkstra Scan technique, so more thanks must go
 to Brian Pender and Joshua Day.
 
+The hashing techniques used in CrossHash include FNV-1a, which is public domain
+and is the work of Glenn Fowler, Landon Curt Noll, and Phong Vo, site at
+http://www.isthe.com/chongo/tech/comp/fnv/index.html and SipHash, by Daniel
+Bernstein and Jean-Philippe Aumasson, CC0-licensed (close to public domain),
+site at https://131002.net/siphash/ , though specifically this uses code from
+https://github.com/nahi/siphash-java-inline , which is Apache licensed like
+SquidLib. Lightning hash, also in CrossHash, is not derived (at least not
+intentionally) from any other hashing algorithm.
+
+The phonetic locality-sensitive hashing of word sounds in NaturalLanguageCipher
+owes some credit to eudex, a Rust library for the same type of hashing which can
+be found at https://github.com/ticki/eudex , because eudex showed there was
+(more than one) way to encode a word sound approximately in 64 bits. No code is
+shared between eudex and SquidLib, however.
+
 Small but important bugfixes and additions were contributed by Ivan Polozhēntsev
 ( https://github.com/uzername/ , introduced the concept and some code for
 SquidKeys.ignoreInput), David Becker (found and fixed several GDX-related bugs),
 and Shane Chubb (found and fixed a bug in the LibGDX TextCellFactory).
 This is not a complete list of bugfix contributors.
 
-All of the TrueType and bitmap fonts in src/main/resources were made by Tommy
-Ettinger and released into the public domain.
+MimicFill and DetailedMimic are direct ports of https://github.com/mxgmn/ConvChain and
+https://github.com/mxgmn/SynTex from C# to Java; the former is public domain while the
+latter is MIT-licensed.
+
+A substantial amount of work on SquidLib has been done by smelC, https://github.com/smelc ,
+especially in the areas of color handling, text layout, and shape analysis for dungeons.
+His help has been very welcome in helping to manage the growing codebase and to keep
+complex code clean and robust, as well.
+
+All of the TrueType and bitmap fonts in the assets directory of the source tree were made by Tommy
+Ettinger and released into the public domain, except:
+
+  * Inconsolata and the fonts based on it (all containing Inconsolata in their filename are derived from Raph
+    Levien's work as modified in https://github.com/MihailJP/Inconsolata-LGC , all with SIL OFL as their license
+    and any alterations made here do not change the original work's licensing). Portions of the fonts derived
+    from Inconsolata also incorporate glyphs from DejaVu Sans Mono, http://dejavu-fonts.org/wiki/Main_Page ,
+    which has a different license but our usage seems to be specifically allowed on their license page,
+    http://dejavu-fonts.org/wiki/License :
+    ```
+    The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or
+    characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts,
+    only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera".
+    ```
+  * The fonts containing CM-Custom in their names are modified from Computer Modern Unicode, also SIL OFL, and
+    the originals, plus some related fonts, can be found at https://fontlibrary.org/en/font/cmu-typewriter .
+    They were originally the work of Donald Knuth for the TeX typesetting system.
+  * Gentium is SIL OFL, originally by SIL, and has had minimal modification, if any. The original site is
+    http://software.sil.org/gentium/ .
+  * Noto Sans is SIL OFL, originally by Google, Inc., and has had minimal modification. The original files, as
+    well as Noto Serif and specialized versions, can be obtained from https://www.google.com/get/noto/ .
+  * The .png images containing the name Tentacle are public domain, originally by Henrique Lazarini (also known
+    as 7Soul1, http://7soul1.deviantart.com/ ); some have modifications applied to a vector trace of the
+    original pixel art.
+  * icons.png is derived from the many icons supplied by http://game-icons.net/ ; it has its own license and
+    people to credit in a file distributed with it, icons-license.txt .
 
 libtcod 1.5.2 license text:
 Copyright (c) 2008,2009,2010,2012 Jice & Mingos

+ 20 - 20
squidlib-util/src/main/java/squidpony/StringKit.java

@@ -345,9 +345,9 @@ public class StringKit {
         byte[][] values = new byte[mi.count()][];
         int i = 0;
         matcher.setTarget(data);
-        while (mi.hasMore())
+        while (mi.hasNext())
         {
-            values[i++] = decodeBytes(mi.nextMatch().group(1));
+            values[i++] = decodeBytes(mi.next().group(1));
         }
         return values;
     }
@@ -360,9 +360,9 @@ public class StringKit {
         short[][] values = new short[mi.count()][];
         int i = 0;
         matcher.setTarget(data);
-        while (mi.hasMore())
+        while (mi.hasNext())
         {
-            values[i++] = decodeShorts(mi.nextMatch().group(1));
+            values[i++] = decodeShorts(mi.next().group(1));
         }
         return values;
     }
@@ -375,9 +375,9 @@ public class StringKit {
         int[][] values = new int[mi.count()][];
         int i = 0;
         matcher.setTarget(data);
-        while (mi.hasMore())
+        while (mi.hasNext())
         {
-            values[i++] = decodeInts(mi.nextMatch().group(1));
+            values[i++] = decodeInts(mi.next().group(1));
         }
         return values;
     }
@@ -391,9 +391,9 @@ public class StringKit {
         float[][] values = new float[mi.count()][];
         int i = 0;
         matcher.setTarget(data);
-        while (mi.hasMore())
+        while (mi.hasNext())
         {
-            values[i++] = decodeFloats(mi.nextMatch().group(1));
+            values[i++] = decodeFloats(mi.next().group(1));
         }
         return values;
     }
@@ -406,9 +406,9 @@ public class StringKit {
         long[][] values = new long[mi.count()][];
         int i = 0;
         matcher.setTarget(data);
-        while (mi.hasMore())
+        while (mi.hasNext())
         {
-            values[i++] = decodeLongs(mi.nextMatch().group(1));
+            values[i++] = decodeLongs(mi.next().group(1));
         }
         return values;
     }
@@ -422,9 +422,9 @@ public class StringKit {
         byte[][][] values = new byte[mi.count()][][];
         int i = 0;
         matcher.setTarget(data);
-        while (mi.hasMore())
+        while (mi.hasNext())
         {
-            values[i++] = decodeBytes2D(mi.nextMatch().group(1));
+            values[i++] = decodeBytes2D(mi.next().group(1));
         }
         return values;
     }
@@ -437,9 +437,9 @@ public class StringKit {
         short[][][] values = new short[mi.count()][][];
         int i = 0;
         matcher.setTarget(data);
-        while (mi.hasMore())
+        while (mi.hasNext())
         {
-            values[i++] = decodeShorts2D(mi.nextMatch().group(1));
+            values[i++] = decodeShorts2D(mi.next().group(1));
         }
         return values;
     }
@@ -452,9 +452,9 @@ public class StringKit {
         int[][][] values = new int[mi.count()][][];
         int i = 0;
         matcher.setTarget(data);
-        while (mi.hasMore())
+        while (mi.hasNext())
         {
-            values[i++] = decodeInts2D(mi.nextMatch().group(1));
+            values[i++] = decodeInts2D(mi.next().group(1));
         }
         return values;
     }
@@ -467,9 +467,9 @@ public class StringKit {
         float[][][] values = new float[mi.count()][][];
         int i = 0;
         matcher.setTarget(data);
-        while (mi.hasMore())
+        while (mi.hasNext())
         {
-            values[i++] = decodeFloats2D(mi.nextMatch().group(1));
+            values[i++] = decodeFloats2D(mi.next().group(1));
         }
         return values;
     }
@@ -482,9 +482,9 @@ public class StringKit {
         long[][][] values = new long[mi.count()][][];
         int i = 0;
         matcher.setTarget(data);
-        while (mi.hasMore())
+        while (mi.hasNext())
         {
-            values[i++] = decodeLongs2D(mi.nextMatch().group(1));
+            values[i++] = decodeLongs2D(mi.next().group(1));
         }
         return values;
     }

+ 64 - 6
squidlib/NOTICE.txt

@@ -26,9 +26,9 @@ Portions of some classes are derived from works by Jice originally distributed i
 
 Portions of some classes are derived from works in the rot.js library with the statement provided below in this document.
 
-The @Beta annotation is from Google's Guava library under the Apache 2.0 license.
+The @Beta annotation is from Google's Guava library under the Apache 2.0 license; the @GwtIncompatible annotation is probably from Google's GWT library or its documentation, but may also be from Guava.
 
-The JRotation class is based on code by Savvas Dalkitsis on stackoverflow.com.
+The JRotation class (no longer in SquidLib) was based on code by Savvas Dalkitsis on stackoverflow.com.
 
 The RNG class is based on the Mersenne Twister implementation by Daniel Dyer as part of the Uncommons Maths library, which is in turn based on the original C algorithm by Makoto Matsumoto and Takuji Nishimura.
 
@@ -37,17 +37,27 @@ The squidpony.squidgrid.mapping.styled package and the JSON resources are derive
 The LightRNG class is based on SplitMix64.c by Sebastiano Vigna, released into the public domain and made available on http://xorshift.di.unimi.it/
 
 The XorRNG class is based on the C implementation of XorShift 128+ by Sebastiano Vigna, released into the public domain and made available on http://xorshift.di.unimi.it/
+LongPeriodRNG is based on XorShift 1024* , XoRoRNG is based on XoRoShiRo 64+ , and the other credit for these is the same as XorRNG.
 
 The PermutedRNG class is based on the aforementioned SplitMix64.c by Sebastiano Vigna and on the paper, http://www.pcg-random.org/paper.html , describing PCG-Random and its methodology written by Melissa E. O'Neill.
 
 The SobolQRNG class and the resource in the resources/qrng folder were ported from Apache Commons Math, where Stephen Joe and Frances Kuo are credited for the implementation.
 
-The NeuralParticle and WeightedLetterNamegen classes are based on work by Ebyan Alvarez-Buylla
+The IsaacRNG class is based off a Java implementation given for the Isaac cipher/RNG (usable for either) from http://www.burtleburtle.net/bob/rand/isaacafa.html (public domain); the version uses here is a mix of the C code in isaac64.c and the Java implementation by Bob Jenkins for 32-bit generation, and it produces 64 bits at a time in Java.
+
+The NeuralParticle and WeightedLetterNamegen classes are based on work by Ebyan Alvarez-Buylla .
+
+ShortSet, ShortVLA, and IntVLA are based closely off primitive-backed collections from libGDX, Apache-licensed.
+
+IntDoubleOrderedMap, OrderedMap, and OrderedSet are based on similar code from Sebastiano Vigna's fastutil library, https://github.com/vigna/fastutil .
 
 The DijkstraMap class is original but owes substantial credit to Edsger Dijkstra
 for creating the algorithm that shares his name, Brian Pender and Joshua Day for
 pioneering Progressive Dijkstra Scan, and the IRC user known as kaw for a
-Clojure-language implementation that would help shape this design.
+Clojure-language implementation that would help shape this design, which is, it
+turns out, subtly different from Dijkstra's Pathfinding Algorithm and is closer
+to Breadth-First Search, though it still produces what is usually called a
+Dijkstra Map by roguelike developers.
 
 The Spill class derives much of its implementation from DijkstraMap but also from
 techniques Joshua Day described for using randomized floodfill and a Lua implementation related to his postings on the subject.
@@ -59,14 +69,62 @@ The squidpony.squidai.AOE interface and its implementing classes are essentially
 made possible by the Progressive Dijkstra Scan technique, so more thanks must go
 to Brian Pender and Joshua Day.
 
+The hashing techniques used in CrossHash include FNV-1a, which is public domain
+and is the work of Glenn Fowler, Landon Curt Noll, and Phong Vo, site at
+http://www.isthe.com/chongo/tech/comp/fnv/index.html and SipHash, by Daniel
+Bernstein and Jean-Philippe Aumasson, CC0-licensed (close to public domain),
+site at https://131002.net/siphash/ , though specifically this uses code from
+https://github.com/nahi/siphash-java-inline , which is Apache licensed like
+SquidLib. Lightning hash, also in CrossHash, is not derived (at least not
+intentionally) from any other hashing algorithm.
+
+The phonetic locality-sensitive hashing of word sounds in NaturalLanguageCipher
+owes some credit to eudex, a Rust library for the same type of hashing which can
+be found at https://github.com/ticki/eudex , because eudex showed there was
+(more than one) way to encode a word sound approximately in 64 bits. No code is
+shared between eudex and SquidLib, however.
+
 Small but important bugfixes and additions were contributed by Ivan Polozhēntsev
 ( https://github.com/uzername/ , introduced the concept and some code for
 SquidKeys.ignoreInput), David Becker (found and fixed several GDX-related bugs),
 and Shane Chubb (found and fixed a bug in the LibGDX TextCellFactory).
 This is not a complete list of bugfix contributors.
 
-All of the TrueType and bitmap fonts in src/main/resources were made by Tommy
-Ettinger and released into the public domain.
+MimicFill and DetailedMimic are direct ports of https://github.com/mxgmn/ConvChain and
+https://github.com/mxgmn/SynTex from C# to Java; the former is public domain while the
+latter is MIT-licensed.
+
+A substantial amount of work on SquidLib has been done by smelC, https://github.com/smelc ,
+especially in the areas of color handling, text layout, and shape analysis for dungeons.
+His help has been very welcome in helping to manage the growing codebase and to keep
+complex code clean and robust, as well.
+
+All of the TrueType and bitmap fonts in the assets directory of the source tree were made by Tommy
+Ettinger and released into the public domain, except:
+
+  * Inconsolata and the fonts based on it (all containing Inconsolata in their filename are derived from Raph
+    Levien's work as modified in https://github.com/MihailJP/Inconsolata-LGC , all with SIL OFL as their license
+    and any alterations made here do not change the original work's licensing). Portions of the fonts derived
+    from Inconsolata also incorporate glyphs from DejaVu Sans Mono, http://dejavu-fonts.org/wiki/Main_Page ,
+    which has a different license but our usage seems to be specifically allowed on their license page,
+    http://dejavu-fonts.org/wiki/License :
+    ```
+    The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or
+    characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts,
+    only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera".
+    ```
+  * The fonts containing CM-Custom in their names are modified from Computer Modern Unicode, also SIL OFL, and
+    the originals, plus some related fonts, can be found at https://fontlibrary.org/en/font/cmu-typewriter .
+    They were originally the work of Donald Knuth for the TeX typesetting system.
+  * Gentium is SIL OFL, originally by SIL, and has had minimal modification, if any. The original site is
+    http://software.sil.org/gentium/ .
+  * Noto Sans is SIL OFL, originally by Google, Inc., and has had minimal modification. The original files, as
+    well as Noto Serif and specialized versions, can be obtained from https://www.google.com/get/noto/ .
+  * The .png images containing the name Tentacle are public domain, originally by Henrique Lazarini (also known
+    as 7Soul1, http://7soul1.deviantart.com/ ); some have modifications applied to a vector trace of the
+    original pixel art.
+  * icons.png is derived from the many icons supplied by http://game-icons.net/ ; it has its own license and
+    people to credit in a file distributed with it, icons-license.txt .
 
 libtcod 1.5.2 license text:
 Copyright (c) 2008,2009,2010,2012 Jice & Mingos