hyphenation 0.8 → 0.8.1
raw patch · 16 files changed
+53/−284 lines, 16 filesdep −doctestdep −hyphenationdep ~basedep ~containersdep ~unordered-containerssetup-changedPVP ok
version bump matches the API change (PVP)
Dependencies removed: doctest, hyphenation
Dependency ranges changed: base, containers, unordered-containers
API changes (from Hackage documentation)
Files
- .hlint.yaml +4/−0
- .travis.yml +0/−179
- CHANGELOG.markdown +9/−2
- HLint.hs +0/−2
- LICENSE +1/−1
- README.markdown +1/−1
- Setup.lhs +5/−32
- Warning.hs +0/−5
- hyphenation.cabal +9/−28
- src/Text/Hyphenation.hs +1/−1
- src/Text/Hyphenation/ByteStringLazyCompat.hs +1/−1
- src/Text/Hyphenation/Exception.hs +8/−2
- src/Text/Hyphenation/Hyphenator.hs +1/−1
- src/Text/Hyphenation/Language.hs +4/−1
- src/Text/Hyphenation/Pattern.hs +9/−3
- tests/doctests.hs +0/−25
+ .hlint.yaml view
@@ -0,0 +1,4 @@+- arguments: [--cpp-define=HLINT, --cpp-ansi]++- ignore: {name: Use camelCase}+- ignore: {name: Missing NOINLINE pragma}
− .travis.yml
@@ -1,179 +0,0 @@-# This Travis job script has been generated by a script via-#-# haskell-ci '--output=.travis.yml' '--config=cabal.haskell-ci' 'cabal.project'-#-# For more information, see https://github.com/haskell-CI/haskell-ci-#-# version: 0.3.20190425-#-language: c-dist: xenial-git:- # whether to recursively clone submodules- submodules: false-notifications:- irc:- channels:- - irc.freenode.org#haskell-lens- skip_join: true- template:- - "\"\\x0313hyphenation\\x03/\\x0306%{branch}\\x03 \\x0314%{commit}\\x03 %{build_url} %{message}\""-cache:- directories:- - $HOME/.cabal/packages- - $HOME/.cabal/store-before_cache:- - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log- # remove files that are regenerated by 'cabal update'- - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*- - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json- - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache- - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar- - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx- - rm -rfv $CABALHOME/packages/head.hackage-matrix:- include:- - compiler: ghc-8.8.1- addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}- env: GHCHEAD=true- - compiler: ghc-8.6.5- addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}- - compiler: ghc-8.4.4- addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}- - compiler: ghc-8.2.2- addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}- - compiler: ghc-8.0.2- addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}- - compiler: ghc-7.10.3- addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4"]}}- - compiler: ghc-7.8.4- addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4"]}}- - compiler: ghc-7.6.3- addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.6.3","cabal-install-2.4"]}}- - compiler: ghc-head- addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-head","cabal-install-head"]}}- env: GHCHEAD=true- allow_failures:- - compiler: ghc-head- - compiler: ghc-8.8.1-before_install:- - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')- - HCPKG="$HC-pkg"- - unset CC- - CABAL=/opt/ghc/bin/cabal- - CABALHOME=$HOME/.cabal- - export PATH="$CABALHOME/bin:$PATH"- - TOP=$(pwd)- - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))- - echo $HCNUMVER- - CABAL="$CABAL -vnormal+nowrap+markoutput"- - set -o pipefail- - |- echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk- echo 'BEGIN { state = "output"; }' >> .colorful.awk- echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk- echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk- echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk- echo ' if (state == "cabal") {' >> .colorful.awk- echo ' print blue($0)' >> .colorful.awk- echo ' } else {' >> .colorful.awk- echo ' print $0' >> .colorful.awk- echo ' }' >> .colorful.awk- echo '}' >> .colorful.awk- - cat .colorful.awk- - |- color_cabal_output () {- awk -f $TOP/.colorful.awk- }- - echo text | color_cabal_output-install:- - ${CABAL} --version- - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"- - TEST=--enable-tests- - BENCH=--enable-benchmarks- - GHCHEAD=${GHCHEAD-false}- - rm -f $CABALHOME/config- - |- echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config- echo "remote-build-reporting: anonymous" >> $CABALHOME/config- echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config- echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config- echo "world-file: $CABALHOME/world" >> $CABALHOME/config- echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config- echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config- echo "installdir: $CABALHOME/bin" >> $CABALHOME/config- echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config- echo "store-dir: $CABALHOME/store" >> $CABALHOME/config- echo "install-dirs user" >> $CABALHOME/config- echo " prefix: $CABALHOME" >> $CABALHOME/config- echo "repository hackage.haskell.org" >> $CABALHOME/config- echo " url: http://hackage.haskell.org/" >> $CABALHOME/config- - |- if $GHCHEAD; then- echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config- - echo "repository head.hackage" >> $CABALHOME/config- echo " url: http://head.hackage.haskell.org/" >> $CABALHOME/config- echo " secure: True" >> $CABALHOME/config- echo " root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740" >> $CABALHOME/config- echo " 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb" >> $CABALHOME/config- echo " 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e" >> $CABALHOME/config- echo " key-threshold: 3" >> $CABALHOME/config- fi- - cat $CABALHOME/config- - rm -fv cabal.project cabal.project.local cabal.project.freeze- - travis_retry ${CABAL} v2-update -v- - if [ $HCNUMVER -eq 80801 ] ; then ${CABAL} v2-install -w ${HC} -j2 hlint --constraint='hlint ==2.1.*' | color_cabal_output ; fi- # Generate cabal.project- - rm -rf cabal.project cabal.project.local cabal.project.freeze- - touch cabal.project- - |- echo 'packages: "."' >> cabal.project- - |- echo "write-ghc-environment-files: always" >> cabal.project- - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(hyphenation)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"- - cat cabal.project || true- - cat cabal.project.local || true- - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi- - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output- - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"- - rm cabal.project.freeze- - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output-script:- - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)- # Packaging...- - ${CABAL} v2-sdist all | color_cabal_output- # Unpacking...- - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/- - cd ${DISTDIR} || false- - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;- # Generate cabal.project- - rm -rf cabal.project cabal.project.local cabal.project.freeze- - touch cabal.project- - |- echo 'packages: "hyphenation-*/*.cabal"' >> cabal.project- - |- echo "write-ghc-environment-files: always" >> cabal.project- - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(hyphenation)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"- - cat cabal.project || true- - cat cabal.project.local || true- # Building with tests and benchmarks...- # build & run tests, build benchmarks- - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output- # Testing...- - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output- # HLint..- - if [ $HCNUMVER -eq 80801 ] ; then (cd hyphenation-* && hlint --cpp-ansi --cpp-define=HLINT src) ; fi- # cabal check...- - (cd hyphenation-* && ${CABAL} -vnormal check)- # haddock...- - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output- # Constraint sets- - rm -rf cabal.project.local- # Constraint set embed- - if [ $HCNUMVER -ge 70600 ] ; then ${CABAL} v2-build -w ${HC} --enable-tests --enable-benchmarks --constraint='hyphenation +embed' all | color_cabal_output ; fi- - if [ $HCNUMVER -ge 70600 ] ; then ${CABAL} v2-test -w ${HC} --enable-tests --enable-benchmarks --constraint='hyphenation +embed' all | color_cabal_output ; fi- - if [ $HCNUMVER -ge 70600 ] ; then ${CABAL} v2-haddock -w ${HC} --enable-tests --enable-benchmarks --constraint='hyphenation +embed' all | color_cabal_output ; fi--# REGENDATA ["--output=.travis.yml","--config=cabal.haskell-ci","cabal.project"]-# EOF
CHANGELOG.markdown view
@@ -1,5 +1,12 @@-0.8----+0.8.1 [2021.02.17]+------------------+* The build-type has been changed from `Custom` to `Simple`.+ To achieve this, the `doctests` test suite has been removed in favor of using+ [`cabal-docspec`](https://github.com/phadej/cabal-extras/tree/master/cabal-docspec)+ to run the doctests.++0.8 [2019.05.18]+---------------- * Per-language default hyphenation minimums * Correct handling of UTF-8 language definitions, such as Russian. * `loadHyphenator` now takes a `Language` rather than the string for its affix.
− HLint.hs
@@ -1,2 +0,0 @@-ignore "Use camelCase"-ignore "Missing NOINLINE pragma"
LICENSE view
@@ -1,4 +1,4 @@-Copyright 2012-2016 Edward Kmett+Copyright 2012-2019 Edward Kmett All rights reserved.
README.markdown view
@@ -1,7 +1,7 @@ hyphenation =========== -[](https://hackage.haskell.org/package/hyphenation) [](http://travis-ci.org/ekmett/hyphenation)+[](https://hackage.haskell.org/package/hyphenation) [](https://github.com/ekmett/hyphenation/actions?query=workflow%3AHaskell-CI) Configurable Knuth-Liang hyphenation using the UTF8 encoded hyphenation patterns provided by [hyph-utf8](http://www.ctan.org/tex-archive/language/hyph-utf8)
Setup.lhs view
@@ -1,34 +1,7 @@-\begin{code}-{-# LANGUAGE CPP #-}-{-# OPTIONS_GHC -Wall #-}-module Main (main) where--#ifndef MIN_VERSION_cabal_doctest-#define MIN_VERSION_cabal_doctest(x,y,z) 0-#endif--#if MIN_VERSION_cabal_doctest(1,0,0)--import Distribution.Extra.Doctest ( defaultMainWithDoctests )-main :: IO ()-main = defaultMainWithDoctests "doctests"--#else--#ifdef MIN_VERSION_Cabal--- If the macro is defined, we have new cabal-install,--- but for some reason we don't have cabal-doctest in package-db------ Probably we are running cabal sdist, when otherwise using new-build--- workflow-import Warning ()-#endif--import Distribution.Simple--main :: IO ()-main = defaultMain+#!/usr/bin/runhaskell+> module Main (main) where -#endif+> import Distribution.Simple -\end{code}+> main :: IO ()+> main = defaultMain
− Warning.hs
@@ -1,5 +0,0 @@-module Warning- {-# WARNING ["You are configuring this package without cabal-doctest installed.",- "The doctests test-suite will not work as a result.",- "To fix this, install cabal-doctest before configuring."] #-}- () where
hyphenation.cabal view
@@ -1,15 +1,15 @@ name: hyphenation category: Text-version: 0.8+version: 0.8.1 license: BSD2-cabal-version: >= 1.8+cabal-version: >= 1.10 license-file: LICENSE author: Edward A. Kmett maintainer: Edward A. Kmett <ekmett@gmail.com> stability: provisional homepage: http://github.com/ekmett/hyphenation bug-reports: http://github.com/ekmett/hyphenation/issues-copyright: (C) 2012-2016 Edward A. Kmett+copyright: (C) 2012-2019 Edward A. Kmett synopsis: Configurable Knuth-Liang hyphenation tested-with: GHC == 7.6.3 , GHC == 7.8.4@@ -18,7 +18,8 @@ , GHC == 8.2.2 , GHC == 8.4.4 , GHC == 8.6.5- , GHC == 8.8.1+ , GHC == 8.8.3+ , GHC == 8.10.1 description: Configurable Knuth-Liang hyphenation .@@ -36,23 +37,15 @@ . >>> hyphenate icelandic "va\240lahei\240avegavinnuverkf\230rageymslusk\250r" ["va\240la","hei\240a","vega","vinnu","verk","f\230ra","geymslu","sk\250r"]-build-type: Custom+build-type: Simple data-dir: data data-files: *.hyp.txt.gz, *.pat.txt.gz, *.lic.txt.gz, *.chr.txt.gz extra-source-files:- .travis.yml+ .hlint.yaml CHANGELOG.markdown README.markdown- HLint.hs- Warning.hs -custom-setup- setup-depends:- base >= 4.6.0.1 && <5,- Cabal >= 1.10,- cabal-doctest >= 1 && <1.1- source-repository head type: git location: git://github.com/ekmett/hyphenation.git@@ -67,7 +60,7 @@ library build-depends: base >= 4 && < 5,- bytestring >= 0.9 && < 0.11,+ bytestring >= 0.9 && < 0.12, containers >= 0.3.0.0 && < 0.7, unordered-containers >= 0.2.1 && < 0.3, zlib >= 0.5 && < 0.7,@@ -93,16 +86,4 @@ hs-source-dirs: src ghc-options: -Wall---- Verify the results of the examples-test-suite doctests- type: exitcode-stdio-1.0- main-is: doctests.hs- build-depends:- base,- containers,- doctest >= 0.11.2 && < 0.17,- hyphenation,- unordered-containers- ghc-options: -Wall -threaded- hs-source-dirs: tests+ default-language: Haskell2010
src/Text/Hyphenation.hs view
@@ -1,7 +1,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Hyphenation--- Copyright : (C) 2012-2015 Edward Kmett,+-- Copyright : (C) 2012-2019 Edward Kmett, -- License : BSD-style (see the file LICENSE) -- -- Maintainer : Edward Kmett <ekmett@gmail.com>
src/Text/Hyphenation/ByteStringLazyCompat.hs view
@@ -3,7 +3,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Hyphenation.ByteStringLazyCompat--- Copyright : (C) 2012-2015 Edward Kmett,+-- Copyright : (C) 2012-2019 Edward Kmett, -- (C) 2007 Ned Batchelder -- License : BSD-style (see the languageAffix LICENSE) --
src/Text/Hyphenation/Exception.hs view
@@ -3,7 +3,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Hyphenation.Exception--- Copyright : (C) 2012-2015 Edward Kmett+-- Copyright : (C) 2012-2019 Edward Kmett -- License : BSD-style (see the file LICENSE) -- -- Maintainer : Edward Kmett <ekmett@gmail.com>@@ -22,9 +22,15 @@ ) where import qualified Data.HashMap.Strict as HM+import Prelude hiding (lookup)++#if !(MIN_VERSION_base(4,8,0)) import Data.Monoid (Monoid(..))+#endif++#if !(MIN_VERSION_base(4,11,0)) import Data.Semigroup (Semigroup(..))-import Prelude hiding (lookup)+#endif -- | Hyphenation exceptions are special cases that should use the specified hyphenation points. newtype Exceptions = Exceptions (HM.HashMap String [Int])
src/Text/Hyphenation/Hyphenator.hs view
@@ -1,7 +1,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Hyphenation.Hyphenator--- Copyright : (C) 2012-2015 Edward Kmett+-- Copyright : (C) 2012-2019 Edward Kmett -- License : BSD-style (see the file LICENSE) -- -- Maintainer : Edward Kmett <ekmett@gmail.com>
src/Text/Hyphenation/Language.hs view
@@ -8,7 +8,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Hyphenation.Language--- Copyright : (C) 2012-2015 Edward Kmett,+-- Copyright : (C) 2012-2019 Edward Kmett, -- (C) 2007 Ned Batchelder -- License : BSD-style (see the languageAffix LICENSE) --@@ -59,6 +59,9 @@ hyphenatorFiles :: [(FilePath, Strict.ByteString)] hyphenatorFiles = $(embedDir "data") #endif++-- $setup+-- >>> import Text.Hyphenation.Hyphenator chrLine :: String -> [(Int, Char)] chrLine (x:xs) = fmap (\y -> (fromEnum y, x)) xs
src/Text/Hyphenation/Pattern.hs view
@@ -3,7 +3,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Text.Hyphenation.Pattern--- Copyright : (C) 2012-2015 Edward Kmett+-- Copyright : (C) 2012-2019 Edward Kmett -- License : BSD-style (see the file LICENSE) -- -- Maintainer : Edward Kmett <ekmett@gmail.com>@@ -22,10 +22,16 @@ ) where import qualified Data.IntMap as IM-import Data.Monoid (Monoid(..))-import Data.Semigroup (Semigroup(..)) import Prelude hiding (lookup) import Data.Char (digitToInt, isDigit)++#if !(MIN_VERSION_base(4,8,0))+import Data.Monoid (Monoid(..))+#endif++#if !(MIN_VERSION_base(4,11,0))+import Data.Semigroup (Semigroup(..))+#endif -- | Hyphenation patterns data Patterns = Patterns [Int] (IM.IntMap Patterns)
− tests/doctests.hs
@@ -1,25 +0,0 @@--------------------------------------------------------------------------------- |--- Module : Main (doctests)--- Copyright : (C) 2012-14 Edward Kmett--- License : BSD-style (see the file LICENSE)--- Maintainer : Edward Kmett <ekmett@gmail.com>--- Stability : provisional--- Portability : portable------ This module provides doctests for a project based on the actual versions--- of the packages it was built with. It requires a corresponding Setup.lhs--- to be added to the project-------------------------------------------------------------------------------module Main where--import Build_doctests (flags, pkgs, module_sources)-import Data.Foldable (traverse_)-import Test.DocTest--main :: IO ()-main = do- traverse_ putStrLn args- doctest args- where- args = flags ++ pkgs ++ module_sources