Skip to content

Commit

Permalink
Merge branch 'master-v3.0008-201910290'
Browse files Browse the repository at this point in the history
  • Loading branch information
u-fischer committed Nov 5, 2019
2 parents d08c120 + 56d7af7 commit 9b3e6dd
Show file tree
Hide file tree
Showing 196 changed files with 42,451 additions and 2,292 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ doc/*.tmp
doc/*.toc
doc/*.tuc
doc/*.vimout
doc/*.1
doc/*.5

*.synctex
*.synctex.gz
Expand Down
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ deploy:
tags: true
condition: $TRAVIS_TAG == *-dev
prerelease: true
draft: true
- provider: releases
api_key:
secure: WWrChLn5LAThh6ay2sZcNkmzyWlV9uvjfGOCg0t/VA/AjEifwIaKN3qFOF55aILUSZ81SDbMtPZXTCywIVjjZY6Pc1I3c9mViWnBSbKLrQe4Z03RdxUosn3K3fPnDZB+8lxs9r02jW8T9bCIwTNe1Bi3Sf4PqoHRpslrqDemxC6lqDn/RHWZYg5ZKL5Md9P8qHQ2Jq9Cil5RRNHgy+jleeko47JrTxWjdi+ULM1SRNZm7mJqUVI3Ko7JvaUOcWsPB4eyTVpR7hONe3/RNnd4ToO7Sh1N3/Ynz2+o+1rBJWfcxR3A8E4wcZgWsTozfCF3Mu7HU9nwdjjmxWDYx5opru1wORmeLyof61B8HOmJVdLikHKGKcwFCz7cBXwcHIhdzVYT7I772JZJfioPQFSuDDljomByaY9r3ubKsHKcvex60bNXwnmk9yHRaNDLB/9ozV8io+LVrZVYZCQHc15jxlmQIElmrhrv1SgPwiabJnESsoHsEPkI0w4zd8Hx7ngk2r79UR3pAqFHEVG1i6y/8TlFRxxOLmVaUBab3gl1QGKnzl4pNVhQwUWXV/1n1fdgl4t4eHBnNY2wc+MYp4eRThnRuo73hQt8wBEYEh8N7uAkP6p6q2xr7pAuGWALRQ5HLIgKlQZA4qyoWaNDa+ZX2AsvbVtzv06BN0GcYIhFoRY=
Expand All @@ -43,4 +42,3 @@ deploy:
tags: true
condition: $TRAVIS_TAG != *-dev
prerelease: false
draft: true
7 changes: 7 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
Change History
--------------
2019-11-04 luaotfload v3.1
* added code to use the harfbuzz library of luahbtex ("mode=harf")
* fonts in ttc can now be indexed by name
* remove a number of lua tables from the global enviroment (_G) to reduce the polution.
Kept there are only the tables luaotfload, fonts and nodes.
* sync with context files from 2019-10-29

2019-09-13 luaotfload v3.0
* invisible option to avoid that some glyph are shown (issue #63)
* correct small bug in xheight calculation
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The Luaotfload Package

![Version: 3.002](https://img.shields.io/badge/current_version-3.002-blue.svg?style=flat-square)
![Version: 3.005](https://img.shields.io/badge/current_version-3.005-blue.svg?style=flat-square)
![Date: 2019-08-11](https://img.shields.io/badge/date-2019--08--11-blue.svg?style=flat-square)
[![License: GNU GPLv2](https://img.shields.io/badge/license-GNU_GPLv2-blue.svg?style=flat-square)](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)

Expand Down
31 changes: 31 additions & 0 deletions bugs/issue109-tounicode.pvt
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
\input{regression-test}
\documentclass{article}
\START
\begin{document}
\font\test={name:CMU Serif:mode=node;script=latn;language=DFLT;+tlig;+onum;}
\test
abc123
\end{document}

%% should give better to unicode values
currently

6 beginbfchar
<0042> <0061>
<0043> <0062>
<0044> <0063>
<0874> <FFFD>
<0875> <FFFD>
<0876> <FFFD>
endbfchar

Wanted

6 beginbfchar
<0042> <0061>
<0043> <0062>
<0044> <0063>
<0874> <0031>
<0875> <0032>
<0876> <0033>
endbfchar
40 changes: 23 additions & 17 deletions build.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

packageversion= "3.00"
packagedate = "2019-09-13"
fontloaderdate= "2019-08-11"
packagedesc = "ctan"
packageversion= "3.1"
packagedate = "2019-11-04"
fontloaderdate= "2019-10-29"
packagedesc = "harf"
checkformat = "latex"

module = "luaotfload"
Expand All @@ -22,7 +22,7 @@ print(mydata.email)
-- See stackoverflow.com/a/12142066/212001 / build-config from latex2e
local master_branch do
local tag = os.getenv'TRAVIS_TAG'
if tag then
if tag and tag ~= "" then
master_branch = not string.match(tag, '-dev$')
else
local branch = os.getenv'TRAVIS_BRANCH'
Expand Down Expand Up @@ -71,13 +71,11 @@ local ismiktex = string.match (luatexstatus.banner,"MiKTeX")

-- l3build check settings

local has_hbengine = os.execute(os.type == "unix"
and "command -v luahbtex > /dev/null"
or "where /q luahbtex") == 0 or nil
stdengine = "luatex"
checkengines = {"luatex"}

-- local errorlevel = os.execute("harftex --version")
-- if not os.getenv('TRAVIS') and errorlevel==0 then
-- checkengines = {"luatex","harftex"}
-- end
checkengines = {"luatex", has_hbengine and "luahbtex"}

-- temporary for test dev branch
if master_branch then
Expand All @@ -88,17 +86,22 @@ checkconfigs = {
"config-latex-TU",
"config-unicode-math",
"config-plain",
"config-fontspec"
"config-fontspec",
has_hbengine and "config-harf",
}
else
checkconfigs={}
checkconfigs = {
"build",
has_hbengine and "config-harf",
}
end
checkruns = 3
checksuppfiles = {"LuaotfloadDummyFont.otf"}
checksuppfiles = {"texmf.cnf"}

-- exclude some text temporarly or in certain systems ...
if os.env["CONTEXTPATH"] then
-- local system
excludetests = {"math"} -- because of adjdemerits bug
if ismiktex then
excludetests = {"arabkernsfs","fontload-ttc-fontindex"}
else
Expand All @@ -121,7 +124,7 @@ docfiledir = "./doc"
-- documentation
-------------------

typesetexe = "lualatex --fmt=lua"..checkformat
typesetexe = "luahblatex --fmt=luahb"..checkformat

-- main docu
typesetfiles = {"luaotfload-latex.tex"}
Expand All @@ -134,7 +137,7 @@ docfiles =
"luaotfload.conf.example",
"luaotfload-main.tex",
"luaotfload.conf.rst",
"luaotfload-tool.rst"
"luaotfload-tool.rst",
}

textfiles =
Expand All @@ -148,7 +151,10 @@ typesetdemofiles =
{
"filegraph.tex",
"luaotfload-conf.tex",
"luaotfload-tool.tex"
"luaotfload-tool.tex",
"shaper-demo-graphite.tex",
"shaper-demo.tex",
"scripts-demo.tex"
}

---------------------
Expand Down
2 changes: 1 addition & 1 deletion buildinfo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ The name contains the current date.

!!! date must be naturally correct

--> texlua scripts/mkstatus --fontloader=./src/auto/fontloader-2019-08-11.lua
--> texlua scripts/mkstatus --fontloader=./src/auto/fontloader-2019-10-29.lua

8. Check lualibs status -- perhaps it needs update too

Expand Down
6 changes: 6 additions & 0 deletions config-harf.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
stdengine = "luahbtex"
checkengines = {"luahbtex"}
testfiledir = "testfiles-harf"
supportdir = "support-harf"
checksuppfiles = {"texmf.cnf", "init.lua"}
checkopts = "--lua=init.lua"
2 changes: 0 additions & 2 deletions config-harftex.lua

This file was deleted.

7 changes: 5 additions & 2 deletions ctan.ann
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
- invisible option to avoid that some glyph are shown (issue #63)
- correct a small bug in xheight calculation
- NEW: harf mode: added code to use the harfbuzz library of luahbtex
- fonts in ttc-collections can be indexed by name
- removed a number of lua tables from the global enviroment (_G) to reduce the polution.
Kept there are only the tables luaotfload, fonts and nodes.
- sync with context files from 2019-10-29
4 changes: 2 additions & 2 deletions doc/CTANREADME.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# The Luaotfload Package

VERSION: 3.00
VERSION: 3.1

DATE: 2019-09-13
DATE: 2019-11-04


## Description
Expand Down
Loading

0 comments on commit 9b3e6dd

Please sign in to comment.