lua-check-hyphen (1aug17)

git-svn-id: svn://tug.org/texlive/trunk@44936 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 19 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/README.md b/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/README.md
index de4d6aae600..45d8bb16bb2 100644
--- a/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/README.md
+++ b/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/README.md
@@ -20,8 +20,8 @@ A typical workflow is:
 * optionally use the option `mark` to make the unknown hyphenated words visible in the PDF file
 
 
-Copyright 2012–2016 Patrick Gundlach (patrick@gundla.ch)<br>
-Package version: 0.4
+Copyright 2012–2017 Patrick Gundlach (patrick@gundla.ch)<br>
+Package version: 0.5
 Public repository: https://github.com/pgundlach/lua-check-hyphen<br>
 Licensed under the MIT license. See the file 'mit-license.txt' for exact terms.<br>
 Status: works fine, slightly unmaintained.<br>
diff --git a/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/luacheckhyphenmanual.pdf b/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/luacheckhyphenmanual.pdf
index 73038da7165..90e20be8542 100644
--- a/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/luacheckhyphenmanual.pdf
+++ b/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/luacheckhyphenmanual.pdf
diff --git a/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/luacheckhyphenmanual.tex b/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/luacheckhyphenmanual.tex
index 78f34fc6cdc..d0af16269cf 100644
--- a/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/luacheckhyphenmanual.tex
+++ b/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/luacheckhyphenmanual.tex
@@ -1,6 +1,6 @@
 \documentclass{ltxdockit}
-\usepackage{dtklogos,csquotes,graphicx}
-\newcommand\pkgversion{0.4}
+\usepackage{csquotes,graphicx}
+\newcommand\pkgversion{0.5}
 
 \titlepage{%
   title={The lua-check-hyphen package},
@@ -115,6 +115,9 @@ When you pass the Option \opt{final} to the \cmd{documentclass}, the \cmd{usepac
 
 \section{Changes}
 \begin{changelog}
+\begin{release}{0.5}{2017-07-31}
+  \item Fix error where I can't find a whitelist file, but the io.open() call does not return an error message.
+\end{release}
 \begin{release}{0.4}{2016-04-01}
   \item Compact representation of hyphenated words that occur more than once with different hyphenation positions (option copmact=true).
   \item Sort uhy entries alphabetically and only use lowercase words in the file.
diff --git a/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/sample.pdf b/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/sample.pdf
index 25e730c110a..92eeeab1007 100644
--- a/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/sample.pdf
+++ b/Master/texmf-dist/doc/lualatex/lua-check-hyphen/doc/sample.pdf
diff --git a/Master/texmf-dist/tex/lualatex/lua-check-hyphen/lua-check-hyphen.lua b/Master/texmf-dist/tex/lualatex/lua-check-hyphen/lua-check-hyphen.lua
index 148699382d3..ee8cf4b43ec 100644
--- a/Master/texmf-dist/tex/lualatex/lua-check-hyphen/lua-check-hyphen.lua
+++ b/Master/texmf-dist/tex/lualatex/lua-check-hyphen/lua-check-hyphen.lua
@@ -1,8 +1,8 @@
--- Copyright 2012-2016 Patrick Gundlach (patrick@gundla.ch)
+-- Copyright 2012-2017 Patrick Gundlach (patrick@gundla.ch)
 -- Public repository: https://github.com/pgundlach/lua-check-hyphen
 -- Licensed under the MIT license. See the file 'mit-license.txt' for exact terms.
 
--- Version: 0.4
+-- Version: 0.5
 
 
 -- for debugging purpuse:
@@ -129,12 +129,12 @@ luacheckhyphen.check_discs = function (head,parent)
 	elseif  head.id == a_disc_node and head.next and head.next.id == a_glue_node and head.next.subtype == subtype_rightskip or
 			head.id == a_disc_node and head.next and head.next.next and head.next.id == a_whatsit_node and head.next.next.id == a_glue_node and head.next.next.subtype == subtype_rightskip then
 		c = node.has_attribute(head,hyphenattr)
-		word = luacheckhyphen.hyphenwords[c]
+		word = sln.lower(luacheckhyphen.hyphenwords[c])
 		if luacheckhyphen.word_whitelist[word] then
 			-- word found, but OK (whitelisted)
 		else
 			if luachekchyphen.compact == nil or luachekchyphen.compact == "true" then
-				local word_without_hyphen = sln.lower(removedash(word))
+				local word_without_hyphen = removedash(word)
 				local tmp = luacheckhyphen.all_hyphenatedwords[word_without_hyphen] or {}
 				tmp[word] = true
 				luacheckhyphen.all_hyphenatedwords[word_without_hyphen] = tmp
@@ -220,7 +220,11 @@ luacheckhyphen.enable = function()
 		for i,v in ipairs(string.explode(luacheckhyphen.whitelist,",")) do
 			whitelistfile,err = io.open(v)
 			if not whitelistfile then
-				texio.write_nl(err)
+				if err then
+					texio.write_nl(err)
+				else
+					texio.write_nl(string.format("White list %q not found, ignored.",tostring(v)))
+				end
 			else
 				filecontents = whitelistfile:read("*a")
 				for _,entry in ipairs(explode(filecontents,"[^%s]+")) do
diff --git a/Master/texmf-dist/tex/lualatex/lua-check-hyphen/lua-check-hyphen.sty b/Master/texmf-dist/tex/lualatex/lua-check-hyphen/lua-check-hyphen.sty
index d38ebeab8cb..2cad15bb7d2 100644
--- a/Master/texmf-dist/tex/lualatex/lua-check-hyphen/lua-check-hyphen.sty
+++ b/Master/texmf-dist/tex/lualatex/lua-check-hyphen/lua-check-hyphen.sty
@@ -1,9 +1,9 @@
-% Copyright 2012 Patrick Gundlach (patrick@gundla.ch)
+% Copyright 2012–2017 Patrick Gundlach (patrick@gundla.ch)
 % Public repository: https://github.com/pgundlach/lua-check-hyphen
 % Licensed under the MIT license. See the file 'mit-license.txt' for exact terms.
 
-\def\luachekchyphenpkgdate{2016/04/02}
-\def\luachekchyphenversion{0.4}
+\def\luachekchyphenpkgdate{2017/07/31}
+\def\luachekchyphenversion{0.5}
 
 
 \RequirePackage{ifluatex}