diff --git a/mingw-w64-hyphen/0001-Fix_COMPOUNDHYPHENMIN_1.patch b/mingw-w64-hyphen/0001-Fix_COMPOUNDHYPHENMIN_1.patch new file mode 100644 index 0000000000..dfebe07a78 --- /dev/null +++ b/mingw-w64-hyphen/0001-Fix_COMPOUNDHYPHENMIN_1.patch @@ -0,0 +1,117 @@ +From 6df43f8b17ff16e8b6124dee2bd47cbd05a89e30 Mon Sep 17 00:00:00 2001 +From: Anne-Edgar WILKE +Date: Fri, 28 Aug 2015 00:38:22 +0200 +Subject: [PATCH] Fix COMPOUNDHYPHENMIN=1 compound hyphenation + + FIRST BUG + --------- + + Problem + +In a compound word, the word parts of two characters are never +hyphenated. + + Example + +To reproduce the bug, just go to the directory hyphen-2.8.8 and do the +following : + +echo "\ +UTF-8 +LEFTHYPHENMIN 1 +RIGHTHYPHENMIN 1 +COMPOUNDLEFTHYPHENMIN 1 +COMPOUNDRIGHTHYPHENMIN 1 +.post1 +NEXTLEVEL +e1 +a1 +" > hyphen.pat + +./example hyphen.pat <(echo postea) + +The output is post=ea ; but it should be post=e=a. + +If you replace postea with posteaque in the command above, you get +post=e=a=que, which is correct. Indeed, the component "eaque" is now +five characters long, so it is hyphenated. + +If you replace postea with ea, you get e=a, which is also correct ; +this is because ea is not a compound word. + + Solution + +In the file hyphen.c, line 966, "if (i - begin > 1)" must be replaced +with "if (i - begin > 0)". +Indeed, the word part is comprised between begin and i inclusively ; +its length is i - begin + 1. So, if you want to hyphenate the words +parts of length 2 and above, you have to check that i - begin + 1 >= 2, +ie i - begin > 0. + + SECOND BUG + ---------- + + Problem + +In a compound word, the word parts are never hyphenated between their +second to last and their last character. + + Example + +To reproduce the bug, do the following : + +echo "\ +UTF-8 +LEFTHYPHENMIN 1 +RIGHTHYPHENMIN 1 +COMPOUNDLEFTHYPHENMIN 1 +COMPOUNDRIGHTHYPHENMIN 1 +1que. +NEXTLEVEL +e1 +" > hyphen.pat + +./example hyphen.pat <(echo meaque) + +The output is mea=que ; but it should be me=a=que. + +Again, if you replace meaque with mea, you get me=a, which is correct, +because mea is not a compound word. + +If you replace meaque with eamque, you get e=am=que, as expected ; it +shows that there is no similar bug with the first and the second +character of word parts. + + Solution + +In the file hyphen.c, line 983, "for (j = 0; j < i - begin - 1; j++)" +must be replaced with "for (j = 0; j < i - begin; j++)". +Indeed, the word part has length i - begin + 1. So there are i - begin +possible places for a hyphen. Thus j must take i - begin different +values, ie go from 0 to i - begin - 1. +--- + hyphen.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hyphen.c b/hyphen.c +index 79dc072..4954dbd 100644 +--- a/hyphen.c ++++ b/hyphen.c +@@ -963,7 +963,7 @@ int hnj_hyphen_hyph_(HyphenDict *dict, const char *word, int word_size, + for (i = 0; i < word_size; i++) rep2[i] = NULL; + for (i = 0; i < word_size; i++) if + (hyphens[i]&1 || (begin > 0 && i + 1 == word_size)) { +- if (i - begin > 1) { ++ if (i - begin > 0) { + int hyph = 0; + prep_word[i + 2] = '\0'; + /* non-standard hyphenation at compound boundary (Schiffahrt) */ +@@ -980,7 +980,7 @@ int hnj_hyphen_hyph_(HyphenDict *dict, const char *word, int word_size, + hnj_hyphen_hyph_(dict, prep_word + begin + 1, i - begin + 1 + hyph, + hyphens2, &rep2, &pos2, &cut2, clhmin, + crhmin, (begin > 0 ? 0 : lend), (hyphens[i]&1 ? 0 : rend)); +- for (j = 0; j < i - begin - 1; j++) { ++ for (j = 0; j < i - begin; j++) { + hyphens[begin + j] = hyphens2[j]; + if (rep2[j] && rep && pos && cut) { + if (!*rep && !*pos && !*cut) { diff --git a/mingw-w64-hyphen/0002-Tests_COMPOUNDHYPHENMIN_1.patch b/mingw-w64-hyphen/0002-Tests_COMPOUNDHYPHENMIN_1.patch new file mode 100644 index 0000000000..4a55f482f8 --- /dev/null +++ b/mingw-w64-hyphen/0002-Tests_COMPOUNDHYPHENMIN_1.patch @@ -0,0 +1,775 @@ +From 7f28cf7edb54cc1bc4eaa09672e0bc043b1da70b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= + +Date: Fri, 28 Aug 2015 01:01:29 +0200 +Subject: [PATCH] Add tests to the COMPOUNDHYPHENMIN=1 compound hyphenation + fixes + +Test patterns and cases written by Anne-Edgar WILKE +--- + tests/Makefile.am | 8 + + tests/Makefile.in | 560 +++++++++++++++++++++++++++++++++++++++++---------- + tests/compound5.hyph | 1 + + tests/compound5.pat | 9 + + tests/compound5.test | 4 + + tests/compound5.word | 1 + + tests/compound6.hyph | 1 + + tests/compound6.pat | 8 + + tests/compound6.test | 4 + + tests/compound6.word | 1 + + 10 files changed, 487 insertions(+), 110 deletions(-) + create mode 100644 tests/compound5.hyph + create mode 100644 tests/compound5.pat + create mode 100755 tests/compound5.test + create mode 100644 tests/compound5.word + create mode 100644 tests/compound6.hyph + create mode 100644 tests/compound6.pat + create mode 100755 tests/compound6.test + create mode 100644 tests/compound6.word + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 60db16d..37dc74f 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -14,6 +14,8 @@ compound.test \ + compound2.test \ + compound3.test \ + compound4.test \ ++compound5.test \ ++compound6.test \ + settings.test \ + settings2.test \ + settings3.test \ +@@ -75,6 +77,12 @@ compound3.word \ + compound4.hyph \ + compound4.pat \ + compound4.word \ ++compound5.hyph \ ++compound5.pat \ ++compound5.word \ ++compound6.hyph \ ++compound6.pat \ ++compound6.word \ + settings.hyph \ + settings.pat \ + settings.word \ +diff --git a/tests/Makefile.in b/tests/Makefile.in +index 30c7acd..28a71cd 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.3 from Makefile.am. ++# Makefile.in generated by automake 1.14.1 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,6 +14,51 @@ + + @SET_MAKE@ + VPATH = @srcdir@ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ ++ case $$MAKEFLAGS in \ ++ *\\[\ \ ]*) \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -34,7 +78,8 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = tests +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(top_srcdir)/test-driver + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +@@ -42,13 +87,232 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + SOURCES = + DIST_SOURCES = +-am__tty_colors = \ +-red=; grn=; lgn=; blu=; std= ++am__can_run_installinfo = \ ++ case $$AM_UPDATE_INFO_DIR in \ ++ n|no|NO) false;; \ ++ *) (install-info --version) >/dev/null 2>&1;; \ ++ esac ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++am__tty_colors_dummy = \ ++ mgn= red= grn= lgn= blu= brg= std=; \ ++ am__color_tests=no ++am__tty_colors = { \ ++ $(am__tty_colors_dummy); \ ++ if test "X$(AM_COLOR_TESTS)" = Xno; then \ ++ am__color_tests=no; \ ++ elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ ++ am__color_tests=yes; \ ++ elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ ++ am__color_tests=yes; \ ++ fi; \ ++ if test $$am__color_tests = yes; then \ ++ red=''; \ ++ grn=''; \ ++ lgn=''; \ ++ blu=''; \ ++ mgn=''; \ ++ brg=''; \ ++ std=''; \ ++ fi; \ ++} ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__uninstall_files_from_dir = { \ ++ test -z "$$files" \ ++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ ++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ ++ $(am__cd) "$$dir" && rm -f $$files; }; \ ++ } ++am__recheck_rx = ^[ ]*:recheck:[ ]* ++am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* ++am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* ++# A command that, given a newline-separated list of test names on the ++# standard input, print the name of the tests that are to be re-run ++# upon "make recheck". ++am__list_recheck_tests = $(AWK) '{ \ ++ recheck = 1; \ ++ while ((rc = (getline line < ($$0 ".trs"))) != 0) \ ++ { \ ++ if (rc < 0) \ ++ { \ ++ if ((getline line2 < ($$0 ".log")) < 0) \ ++ recheck = 0; \ ++ break; \ ++ } \ ++ else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ ++ { \ ++ recheck = 0; \ ++ break; \ ++ } \ ++ else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ ++ { \ ++ break; \ ++ } \ ++ }; \ ++ if (recheck) \ ++ print $$0; \ ++ close ($$0 ".trs"); \ ++ close ($$0 ".log"); \ ++}' ++# A command that, given a newline-separated list of test names on the ++# standard input, create the global log from their .trs and .log files. ++am__create_global_log = $(AWK) ' \ ++function fatal(msg) \ ++{ \ ++ print "fatal: making $@: " msg | "cat >&2"; \ ++ exit 1; \ ++} \ ++function rst_section(header) \ ++{ \ ++ print header; \ ++ len = length(header); \ ++ for (i = 1; i <= len; i = i + 1) \ ++ printf "="; \ ++ printf "\n\n"; \ ++} \ ++{ \ ++ copy_in_global_log = 1; \ ++ global_test_result = "RUN"; \ ++ while ((rc = (getline line < ($$0 ".trs"))) != 0) \ ++ { \ ++ if (rc < 0) \ ++ fatal("failed to read from " $$0 ".trs"); \ ++ if (line ~ /$(am__global_test_result_rx)/) \ ++ { \ ++ sub("$(am__global_test_result_rx)", "", line); \ ++ sub("[ ]*$$", "", line); \ ++ global_test_result = line; \ ++ } \ ++ else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ ++ copy_in_global_log = 0; \ ++ }; \ ++ if (copy_in_global_log) \ ++ { \ ++ rst_section(global_test_result ": " $$0); \ ++ while ((rc = (getline line < ($$0 ".log"))) != 0) \ ++ { \ ++ if (rc < 0) \ ++ fatal("failed to read from " $$0 ".log"); \ ++ print line; \ ++ }; \ ++ printf "\n"; \ ++ }; \ ++ close ($$0 ".trs"); \ ++ close ($$0 ".log"); \ ++}' ++# Restructured Text title. ++am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } ++# Solaris 10 'make', and several other traditional 'make' implementations, ++# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it ++# by disabling -e (using the XSI extension "set +e") if it's set. ++am__sh_e_setup = case $$- in *e*) set +e;; esac ++# Default flags passed to test drivers. ++am__common_driver_flags = \ ++ --color-tests "$$am__color_tests" \ ++ --enable-hard-errors "$$am__enable_hard_errors" \ ++ --expect-failure "$$am__expect_failure" ++# To be inserted before the command running the test. Creates the ++# directory for the log if needed. Stores in $dir the directory ++# containing $f, in $tst the test, in $log the log. Executes the ++# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and ++# passes TESTS_ENVIRONMENT. Set up options for the wrapper that ++# will run the test scripts (or their associated LOG_COMPILER, if ++# thy have one). ++am__check_pre = \ ++$(am__sh_e_setup); \ ++$(am__vpath_adj_setup) $(am__vpath_adj) \ ++$(am__tty_colors); \ ++srcdir=$(srcdir); export srcdir; \ ++case "$@" in \ ++ */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ ++ *) am__odir=.;; \ ++esac; \ ++test "x$$am__odir" = x"." || test -d "$$am__odir" \ ++ || $(MKDIR_P) "$$am__odir" || exit $$?; \ ++if test -f "./$$f"; then dir=./; \ ++elif test -f "$$f"; then dir=; \ ++else dir="$(srcdir)/"; fi; \ ++tst=$$dir$$f; log='$@'; \ ++if test -n '$(DISABLE_HARD_ERRORS)'; then \ ++ am__enable_hard_errors=no; \ ++else \ ++ am__enable_hard_errors=yes; \ ++fi; \ ++case " $(XFAIL_TESTS) " in \ ++ *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ ++ am__expect_failure=yes;; \ ++ *) \ ++ am__expect_failure=no;; \ ++esac; \ ++$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) ++# A shell command to get the names of the tests scripts with any registered ++# extension removed (i.e., equivalently, the names of the test logs, with ++# the '.log' extension removed). The result is saved in the shell variable ++# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, ++# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", ++# since that might cause problem with VPATH rewrites for suffix-less tests. ++# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. ++am__set_TESTS_bases = \ ++ bases='$(TEST_LOGS)'; \ ++ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ ++ bases=`echo $$bases` ++RECHECK_LOGS = $(TEST_LOGS) ++AM_RECURSIVE_TARGETS = check recheck ++TEST_SUITE_LOG = test-suite.log ++TEST_EXTENSIONS = @EXEEXT@ .test ++am__test_logs1 = $(TESTS:=.log) ++am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) ++TEST_LOGS = $(am__test_logs2:.test.log=.log) ++TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver ++TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ ++ $(TEST_LOG_FLAGS) ++am__set_b = \ ++ case '$@' in \ ++ */*) \ ++ case '$*' in \ ++ */*) b='$*';; \ ++ *) b=`echo '$@' | sed 's/\.log$$//'`; \ ++ esac;; \ ++ *) \ ++ b='$*';; \ ++ esac + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +@@ -176,6 +440,8 @@ compound.test \ + compound2.test \ + compound3.test \ + compound4.test \ ++compound5.test \ ++compound6.test \ + settings.test \ + settings2.test \ + settings3.test \ +@@ -234,6 +500,12 @@ compound3.word \ + compound4.hyph \ + compound4.pat \ + compound4.word \ ++compound5.hyph \ ++compound5.pat \ ++compound5.word \ ++compound6.hyph \ ++compound6.pat \ ++compound6.word \ + settings.hyph \ + settings.pat \ + settings.word \ +@@ -289,6 +561,7 @@ num.word + all: all-am + + .SUFFIXES: ++.SUFFIXES: .log .test .test$(EXEEXT) .trs + $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -325,105 +598,168 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ +- srcdir=$(srcdir); export srcdir; \ +- list=' $(TESTS) '; \ +- $(am__tty_colors); \ +- if test -n "$$list"; then \ +- for tst in $$list; do \ +- if test -f ./$$tst; then dir=./; \ +- elif test -f $$tst; then dir=; \ +- else dir="$(srcdir)/"; fi; \ +- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ +- all=`expr $$all + 1`; \ +- case " $(XFAIL_TESTS) " in \ +- *[\ \ ]$$tst[\ \ ]*) \ +- xpass=`expr $$xpass + 1`; \ +- failed=`expr $$failed + 1`; \ +- col=$$red; res=XPASS; \ +- ;; \ +- *) \ +- col=$$grn; res=PASS; \ +- ;; \ +- esac; \ +- elif test $$? -ne 77; then \ +- all=`expr $$all + 1`; \ +- case " $(XFAIL_TESTS) " in \ +- *[\ \ ]$$tst[\ \ ]*) \ +- xfail=`expr $$xfail + 1`; \ +- col=$$lgn; res=XFAIL; \ +- ;; \ +- *) \ +- failed=`expr $$failed + 1`; \ +- col=$$red; res=FAIL; \ +- ;; \ +- esac; \ +- else \ +- skip=`expr $$skip + 1`; \ +- col=$$blu; res=SKIP; \ +- fi; \ +- echo "$${col}$$res$${std}: $$tst"; \ +- done; \ +- if test "$$all" -eq 1; then \ +- tests="test"; \ +- All=""; \ +- else \ +- tests="tests"; \ +- All="All "; \ ++tags TAGS: ++ ++ctags CTAGS: ++ ++cscope cscopelist: ++ ++ ++# Recover from deleted '.trs' file; this should ensure that ++# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create ++# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells ++# to avoid problems with "make -n". ++.log.trs: ++ rm -f $< $@ ++ $(MAKE) $(AM_MAKEFLAGS) $< ++ ++# Leading 'am--fnord' is there to ensure the list of targets does not ++# expand to empty, as could happen e.g. with make check TESTS=''. ++am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) ++am--force-recheck: ++ @: ++ ++$(TEST_SUITE_LOG): $(TEST_LOGS) ++ @$(am__set_TESTS_bases); \ ++ am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ ++ redo_bases=`for i in $$bases; do \ ++ am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ ++ done`; \ ++ if test -n "$$redo_bases"; then \ ++ redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ ++ redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ ++ if $(am__make_dryrun); then :; else \ ++ rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ + fi; \ +- if test "$$failed" -eq 0; then \ +- if test "$$xfail" -eq 0; then \ +- banner="$$All$$all $$tests passed"; \ +- else \ +- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ +- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ +- fi; \ +- else \ +- if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all $$tests failed"; \ ++ fi; \ ++ if test -n "$$am__remaking_logs"; then \ ++ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ ++ "recursion detected" >&2; \ ++ else \ ++ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ ++ fi; \ ++ if $(am__make_dryrun); then :; else \ ++ st=0; \ ++ errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ ++ for i in $$redo_bases; do \ ++ test -f $$i.trs && test -r $$i.trs \ ++ || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ ++ test -f $$i.log && test -r $$i.log \ ++ || { echo "$$errmsg $$i.log" >&2; st=1; }; \ ++ done; \ ++ test $$st -eq 0 || exit 1; \ ++ fi ++ @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ ++ ws='[ ]'; \ ++ results=`for b in $$bases; do echo $$b.trs; done`; \ ++ test -n "$$results" || results=/dev/null; \ ++ all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ ++ pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ ++ fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ ++ skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ ++ xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ ++ xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ ++ error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ ++ if test `expr $$fail + $$xpass + $$error` -eq 0; then \ ++ success=true; \ ++ else \ ++ success=false; \ ++ fi; \ ++ br='==================='; br=$$br$$br$$br$$br; \ ++ result_count () \ ++ { \ ++ if test x"$$1" = x"--maybe-color"; then \ ++ maybe_colorize=yes; \ ++ elif test x"$$1" = x"--no-color"; then \ ++ maybe_colorize=no; \ + else \ +- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ +- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ ++ echo "$@: invalid 'result_count' usage" >&2; exit 4; \ + fi; \ +- fi; \ +- dashes="$$banner"; \ +- skipped=""; \ +- if test "$$skip" -ne 0; then \ +- if test "$$skip" -eq 1; then \ +- skipped="($$skip test was not run)"; \ ++ shift; \ ++ desc=$$1 count=$$2; \ ++ if test $$maybe_colorize = yes && test $$count -gt 0; then \ ++ color_start=$$3 color_end=$$std; \ + else \ +- skipped="($$skip tests were not run)"; \ ++ color_start= color_end=; \ + fi; \ +- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ +- dashes="$$skipped"; \ +- fi; \ +- report=""; \ +- if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ +- report="Please report to $(PACKAGE_BUGREPORT)"; \ +- test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ +- dashes="$$report"; \ +- fi; \ +- dashes=`echo "$$dashes" | sed s/./=/g`; \ +- if test "$$failed" -eq 0; then \ +- col="$$grn"; \ +- else \ +- col="$$red"; \ +- fi; \ +- echo "$${col}$$dashes$${std}"; \ +- echo "$${col}$$banner$${std}"; \ +- test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ +- test -z "$$report" || echo "$${col}$$report$${std}"; \ +- echo "$${col}$$dashes$${std}"; \ +- test "$$failed" -eq 0; \ +- else :; fi ++ echo "$${color_start}# $$desc $$count$${color_end}"; \ ++ }; \ ++ create_testsuite_report () \ ++ { \ ++ result_count $$1 "TOTAL:" $$all "$$brg"; \ ++ result_count $$1 "PASS: " $$pass "$$grn"; \ ++ result_count $$1 "SKIP: " $$skip "$$blu"; \ ++ result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ ++ result_count $$1 "FAIL: " $$fail "$$red"; \ ++ result_count $$1 "XPASS:" $$xpass "$$red"; \ ++ result_count $$1 "ERROR:" $$error "$$mgn"; \ ++ }; \ ++ { \ ++ echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ ++ $(am__rst_title); \ ++ create_testsuite_report --no-color; \ ++ echo; \ ++ echo ".. contents:: :depth: 2"; \ ++ echo; \ ++ for b in $$bases; do echo $$b; done \ ++ | $(am__create_global_log); \ ++ } >$(TEST_SUITE_LOG).tmp || exit 1; \ ++ mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ ++ if $$success; then \ ++ col="$$grn"; \ ++ else \ ++ col="$$red"; \ ++ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ ++ fi; \ ++ echo "$${col}$$br$${std}"; \ ++ echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ ++ echo "$${col}$$br$${std}"; \ ++ create_testsuite_report --maybe-color; \ ++ echo "$$col$$br$$std"; \ ++ if $$success; then :; else \ ++ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ ++ if test -n "$(PACKAGE_BUGREPORT)"; then \ ++ echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ ++ fi; \ ++ echo "$$col$$br$$std"; \ ++ fi; \ ++ $$success || exit 1 ++ ++check-TESTS: ++ @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list ++ @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list ++ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) ++ @set +e; $(am__set_TESTS_bases); \ ++ log_list=`for i in $$bases; do echo $$i.log; done`; \ ++ trs_list=`for i in $$bases; do echo $$i.trs; done`; \ ++ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ ++ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ ++ exit $$?; ++recheck: all ++ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) ++ @set +e; $(am__set_TESTS_bases); \ ++ bases=`for i in $$bases; do echo $$i; done \ ++ | $(am__list_recheck_tests)` || exit 1; \ ++ log_list=`for i in $$bases; do echo $$i.log; done`; \ ++ log_list=`echo $$log_list`; \ ++ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ ++ am__force_recheck=am--force-recheck \ ++ TEST_LOGS="$$log_list"; \ ++ exit $$? ++.test.log: ++ @p='$<'; \ ++ $(am__set_b); \ ++ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ ++ --log-file $$b.log --trs-file $$b.trs \ ++ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ ++ "$$tst" $(AM_TESTS_FD_REDIRECT) ++@am__EXEEXT_TRUE@.test$(EXEEXT).log: ++@am__EXEEXT_TRUE@ @p='$<'; \ ++@am__EXEEXT_TRUE@ $(am__set_b); \ ++@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ ++@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ ++@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ ++@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + + distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +@@ -480,6 +816,9 @@ install-strip: + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi + mostlyclean-generic: ++ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) ++ -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) ++ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + + clean-generic: + +@@ -559,15 +898,16 @@ uninstall-am: + .MAKE: check-am install-am install-strip + + .PHONY: all all-am check check-TESTS check-am clean clean-generic \ +- clean-libtool distclean distclean-generic distclean-libtool \ +- distclean-local distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ clean-libtool cscopelist-am ctags-am distclean \ ++ distclean-generic distclean-libtool distclean-local distdir \ ++ dvi dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am recheck tags-am \ + uninstall uninstall-am + + +diff --git a/tests/compound5.hyph b/tests/compound5.hyph +new file mode 100644 +index 0000000..95b6b2d +--- /dev/null ++++ b/tests/compound5.hyph +@@ -0,0 +1 @@ ++post=e=a +diff --git a/tests/compound5.pat b/tests/compound5.pat +new file mode 100644 +index 0000000..3ab5421 +--- /dev/null ++++ b/tests/compound5.pat +@@ -0,0 +1,9 @@ ++UTF-8 ++LEFTHYPHENMIN 1 ++RIGHTHYPHENMIN 1 ++COMPOUNDLEFTHYPHENMIN 1 ++COMPOUNDRIGHTHYPHENMIN 1 ++.post1 ++NEXTLEVEL ++e1 ++a1 +diff --git a/tests/compound5.test b/tests/compound5.test +new file mode 100755 +index 0000000..f144145 +--- /dev/null ++++ b/tests/compound5.test +@@ -0,0 +1,4 @@ ++#!/bin/sh ++DIR="`dirname $0`" ++NAME="`basename $0 .test`" ++$DIR/test.sh $NAME.pat $NAME.word $NAME.hyph +diff --git a/tests/compound5.word b/tests/compound5.word +new file mode 100644 +index 0000000..fc95125 +--- /dev/null ++++ b/tests/compound5.word +@@ -0,0 +1 @@ ++postea +diff --git a/tests/compound6.hyph b/tests/compound6.hyph +new file mode 100644 +index 0000000..6b6e0b8 +--- /dev/null ++++ b/tests/compound6.hyph +@@ -0,0 +1 @@ ++me=a=que +diff --git a/tests/compound6.pat b/tests/compound6.pat +new file mode 100644 +index 0000000..7665cb5 +--- /dev/null ++++ b/tests/compound6.pat +@@ -0,0 +1,8 @@ ++UTF-8 ++LEFTHYPHENMIN 1 ++RIGHTHYPHENMIN 1 ++COMPOUNDLEFTHYPHENMIN 1 ++COMPOUNDRIGHTHYPHENMIN 1 ++1que. ++NEXTLEVEL ++e1 +diff --git a/tests/compound6.test b/tests/compound6.test +new file mode 100755 +index 0000000..f144145 +--- /dev/null ++++ b/tests/compound6.test +@@ -0,0 +1,4 @@ ++#!/bin/sh ++DIR="`dirname $0`" ++NAME="`basename $0 .test`" ++$DIR/test.sh $NAME.pat $NAME.word $NAME.hyph +diff --git a/tests/compound6.word b/tests/compound6.word +new file mode 100644 +index 0000000..e90d7ed +--- /dev/null ++++ b/tests/compound6.word +@@ -0,0 +1 @@ ++meaque diff --git a/mingw-w64-hyphen/PKGBUILD b/mingw-w64-hyphen/PKGBUILD new file mode 100644 index 0000000000..08552df6f2 --- /dev/null +++ b/mingw-w64-hyphen/PKGBUILD @@ -0,0 +1,118 @@ +# Maintainer: J. Peter Mugaas + +_realname=hyphen +pkgbase=mingw-w64-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" + "${MINGW_PACKAGE_PREFIX}-${_realname}-en") +pkgver=2.8.8 +pkgrel=1 +pkgdesc="A text hyphenation library (mingw-w64)" +arch=('any') +url='http://hunspell.sourceforge.net/' +license=(GPL-2.0+ or LGPL-2.0+ or MPL-1.1+) +makedepends=('perl') +optdepends=('perl: for substrings.pl script') +source=("http://downloads.sourceforge.net/hunspell/${_realname}-${pkgver}.tar.gz" + "0001-Fix_COMPOUNDHYPHENMIN_1.patch" + "0002-Tests_COMPOUNDHYPHENMIN_1.patch") +sha256sums=('304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705' + 'ea0095c8e9e713fcc99c66582e8ccff478f097c710ba77a1c7e59b7851f686e9' + '497533bf2226c4137e1cedbcfc8dcb560f5a6190752fb72f838176d75269be4a') + +prepare() { + cd "$srcdir"/${_realname}-${pkgver} + #remove files created by patch + rm "tests/compound5.hyph" \ + tests/compound5.pat \ + tests/compound5.test \ + tests/compound5.word \ + tests/compound6.hyph \ + tests/compound6.pat \ + tests/compound6.test \ + tests/compound6.word || true +# Patches 0001 and 0002 are taken from the hyphen github repository +# so they will probably in the next version. + patch -Np1 -i "${srcdir}/0001-Fix_COMPOUNDHYPHENMIN_1.patch" + patch -Np1 -i "${srcdir}/0002-Tests_COMPOUNDHYPHENMIN_1.patch" + autoreconf -fiv +} + +build() { + cd "$srcdir"/${_realname}-${pkgver} + [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} + #Note you have to copy the files for the tests and install to work. + cp -a "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${CARCH}" && \ + cd "${srcdir}"/build-${CARCH} + + ./configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --target=${MINGW_CHOST} \ + --enable-static \ + --enable-shared + + make +} + +check() { + cd "${srcdir}"/build-${CARCH} + make check +} + +package_hyphen() { + pkgdesc="library for high quality hyphenation and justification (mingw-w64)" + optdepends=('perl: for substrings.pl') + + cd "${srcdir}"/build-${CARCH} + make DESTDIR="$pkgdir/" install-libLTLIBRARIES + make DESTDIR="$pkgdir/" install-binSCRIPTS + make DESTDIR="$pkgdir/" install-includeHEADERS + + # license + install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + +} + +package_hyphen-en() { +pkgdesc="English hyphenation rules" +optdepends=('hyphen: offers hyphenation library functions') + + cd "${srcdir}"/build-${CARCH} + make DESTDIR="$pkgdir/" install-hyphDATA + +#The rest of this is done to be consistant with ArchLinux's +#hyphen package. + pushd ${pkgdir}/${MINGW_PREFIX}/share/hyphen/ + en_US_aliases="en_AG en_AU en_BS en_BW en_BZ en_CA en_DK en_GB en_GH en_HK en_IE en_IN en_JM en_NA en_NZ en_PH en_SG en_TT en_ZA en_ZW" + for lang in $en_US_aliases; do + ln -s hyph_en_US.dic hyph_$lang.dic + done + popd + + # the symlinks + install -dm755 ${pkgdir}/${MINGW_PREFIX}/share/myspell/dicts + pushd $pkgdir/${MINGW_PREFIX}/share/myspell/dicts + for file in $pkgdir/${MINGW_PREFIX}/share/hyphen/*; do + ln -sv $pkgdir/${MINGW_PREFIX}/share/hyphen/$(basename $file) . + done + popd + +} + +package_mingw-w64-i686-hyphen() { + package_hyphen +} + +package_mingw-w64-i686-hyphen-en() { + package_hyphen-en +} + +package_mingw-w64-x86_64-hyphen() { + package_hyphen +} + +package_mingw-w64-x86_64-hyphen-en() { + package_hyphen-en +} +