diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,18 @@ Changelog ========= +Version 0.1.2.0 +--------------- + +*December 4, 2020* + + + +* Added S letterforms for small font (`rawLetterforms1`), thanks to @gilgamec + on github! +* Filter for spaces in heredoc output, which may be interfering some + locale-based issues. + Version 0.1.1.0 --------------- diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -49,3 +49,15 @@ And it is possible I have missed some. If you notice any I am missing, please let me know! + +## Credit + +Much of the content for the letterforms was gathered on freenode ##adventofcode +and solutions threads on reddit; the large font for the most part has been +gathered by [u/usbpc102][] on reddit. `O` and `I` letterforms for the small +font contributed by [u/TheShallowOne][] on reddit for version 1.1.10, and the S +small font letterform contributed by [@gilgamec][]. + +[u/usbpc102]: https://gist.github.com/usbpc/5fa0be48ad7b4b0594b3b8b029bc47b4 +[u/TheShallowOne]: https://www.reddit.com/r/adventofcode/comments/k0lzz6/adventofcodeocr_command_line_utilityhaskell/gdwwu39 +[@gilgamec]: https://github.com/gilgamec diff --git a/advent-of-code-ocr.cabal b/advent-of-code-ocr.cabal --- a/advent-of-code-ocr.cabal +++ b/advent-of-code-ocr.cabal @@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: c9fca577a0ca10ba5ac99d9aec0bea19ffae6b6eb6dea3a2be3d569991f6cfbe +-- hash: 4eeb46332868b43860577b7f5d67c0b243c4bfed76ed462fc184d5da99771956 name: advent-of-code-ocr -version: 0.1.1.0 +version: 0.1.2.0 synopsis: Parse Advent of Code ASCII art letters description: "OCR" letter recognition for puzzles, compatible with all puzzles from 2015 to 2019. Also comes with a diff --git a/src/Advent/OCR/LetterMap.hs b/src/Advent/OCR/LetterMap.hs --- a/src/Advent/OCR/LetterMap.hs +++ b/src/Advent/OCR/LetterMap.hs @@ -207,13 +207,13 @@ -- -- Load using @uncurry 'parseLetterMap'@. rawLetterforms1 :: (String, String) -rawLetterforms1 = ("ABCEFGHIJKLOPRUYZ", drop 1 [here| -.##..###...##..####.####..##..#..#.###...##.#..#.#.....##..###..###..#..#.#...#.#### -#..#.#..#.#..#.#....#....#..#.#..#..#.....#.#.#..#....#..#.#..#.#..#.#..#.#...#....# -#..#.###..#....###..###..#....####..#.....#.##...#....#..#.#..#.#..#.#..#..#.#....#. -####.#..#.#....#....#....#.##.#..#..#.....#.#.#..#....#..#.###..###..#..#...#....#.. -#..#.#..#.#..#.#....#....#..#.#..#..#..#..#.#.#..#....#..#.#....#.#..#..#...#...#... -#..#.###...##..####.#.....###.#..#.###..##..#..#.####..##..#....#..#..##....#...#### +rawLetterforms1 = ("ABCEFGHIJKLOPRSUYZ", filter (/= ' ') $ drop 1 [here| +.##..###...##..####.####..##..#..#.###...##.#..#.#.....##..###..###...###.#..#.#...#.#### +#..#.#..#.#..#.#....#....#..#.#..#..#.....#.#.#..#....#..#.#..#.#..#.#....#..#.#...#....# +#..#.###..#....###..###..#....####..#.....#.##...#....#..#.#..#.#..#.#....#..#..#.#....#. +####.#..#.#....#....#....#.##.#..#..#.....#.#.#..#....#..#.###..###...##..#..#...#....#.. +#..#.#..#.#..#.#....#....#..#.#..#..#..#..#.#.#..#....#..#.#....#.#.....#.#..#...#...#... +#..#.###...##..####.#.....###.#..#.###..##..#..#.####..##..#....#..#.###...##....#...#### |]) -- | Based on @@ -224,7 +224,7 @@ -- -- Load using @uncurry 'parseLetterMap'@. rawLetterforms2 :: (String, String) -rawLetterforms2 = ("ABCEFGHJKLNPRXZ", drop 1 [here| +rawLetterforms2 = ("ABCEFGHJKLNPRXZ", filter (/= ' ') $ drop 1 [here| ..##...#####...####..######.######..####..#....#....###.#....#.#......#....#.#####..#####..#....#.###### .#..#..#....#.#....#.#......#......#....#.#....#.....#..#...#..#......##...#.#....#.#....#.#....#......# #....#.#....#.#......#......#......#......#....#.....#..#..#...#......##...#.#....#.#....#..#..#.......#