From 1eb99bf05849e3108129d32eaacaa40c9e266c4b Mon Sep 17 00:00:00 2001
From: Luigi Scarso
Date: Sat, 15 Feb 2020 12:45:08 +0000
Subject: sync with luatex rev. 7287
git-svn-id: svn://tug.org/texlive/trunk@53789 c570f23f-e606-0410-a88d-b1316a301751
---
.../texk/web2c/luatexdir/luaharfbuzz/README-win.md | 53 -----
.../texk/web2c/luatexdir/luaharfbuzz/README.md | 19 +-
.../texk/web2c/luatexdir/luaharfbuzz/config.ld | 2 +-
.../luaharfbuzz/docs/examples/core_types.lua.html | 2 +-
.../docs/examples/custom_callbacks.lua.html | 85 --------
.../docs/examples/harfbuzz_setup.lua.html | 231 ---------------------
.../docs/examples/ot_font_loader.lua.html | 139 -------------
.../docs/examples/package_path_searcher.lua.html | 104 ----------
.../web2c/luatexdir/luaharfbuzz/docs/index.html | 12 +-
.../fonts/TwitterColorEmoji-SVGinOT.ttf | Bin 0 -> 4232 bytes
.../luaharfbuzz/luaharfbuzz-1.0.0-1.rockspec | 51 -----
.../luaharfbuzz/luaharfbuzz-1.1.0-1.rockspec | 46 ++++
.../luaharfbuzz/luaharfbuzz-scm-1.rockspec | 5 +-
.../luatexdir/luaharfbuzz/spec/buffer_spec.lua | 55 +++++
.../luatexdir/luaharfbuzz/spec/harfbuzz_spec.lua | 42 +++-
.../luatexdir/luaharfbuzz/src/harfbuzz.luadoc | 10 +-
.../luatexdir/luaharfbuzz/src/luaharfbuzz/buffer.c | 116 ++++++++---
.../luatexdir/luaharfbuzz/src/luaharfbuzz/face.c | 27 +++
.../luaharfbuzz/src/luaharfbuzz/feature.c | 69 ++++++
.../luatexdir/luaharfbuzz/src/luaharfbuzz/font.c | 2 +-
.../luaharfbuzz/src/luaharfbuzz/luaharfbuzz.c | 28 ++-
.../luatexdir/luaharfbuzz/status/full_api.txt | 142 ++++++++++++-
22 files changed, 517 insertions(+), 723 deletions(-)
delete mode 100644 Build/source/texk/web2c/luatexdir/luaharfbuzz/README-win.md
delete mode 100644 Build/source/texk/web2c/luatexdir/luaharfbuzz/docs/examples/custom_callbacks.lua.html
delete mode 100644 Build/source/texk/web2c/luatexdir/luaharfbuzz/docs/examples/harfbuzz_setup.lua.html
delete mode 100644 Build/source/texk/web2c/luatexdir/luaharfbuzz/docs/examples/ot_font_loader.lua.html
delete mode 100644 Build/source/texk/web2c/luatexdir/luaharfbuzz/docs/examples/package_path_searcher.lua.html
create mode 100644 Build/source/texk/web2c/luatexdir/luaharfbuzz/fonts/TwitterColorEmoji-SVGinOT.ttf
delete mode 100644 Build/source/texk/web2c/luatexdir/luaharfbuzz/luaharfbuzz-1.0.0-1.rockspec
create mode 100644 Build/source/texk/web2c/luatexdir/luaharfbuzz/luaharfbuzz-1.1.0-1.rockspec
(limited to 'Build/source/texk/web2c/luatexdir/luaharfbuzz')
diff --git a/Build/source/texk/web2c/luatexdir/luaharfbuzz/README-win.md b/Build/source/texk/web2c/luatexdir/luaharfbuzz/README-win.md
deleted file mode 100644
index d7a769ffa4b..00000000000
--- a/Build/source/texk/web2c/luatexdir/luaharfbuzz/README-win.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Building Harfbuzz and _luaharfbuzz_ on Windows
-
-## Building Harfbuzz
-
-### Prerequisites
-* [Visual Studio Community Edition](https://www.visualstudio.com/vs/community/)
-* C++ Support for Visual Studio (See [here](http://stackoverflow.com/questions/31953769/visual-studio-doesnt-have-cl-exe))
-
-### Building
-* Download the Harfbuzz source for win32 from the [releases pages](https://github.com/behdad/harfbuzz/releases) (look for a zip file that ends with _-win32_, for e.g. _harfbuzz-1.4.2-win32.zip_), and unzip it.
-* Launch the Visual Studio developer prompt for the platform you want to target. This is very important. For e.g, on my 64-bit system, I am using _VS2015 x64 Native Tools Command Prompt_
-* Navigate to the _win32_ folder in the Harfbuzz source tree and do `nmake /f Makefile.vc CFG=release`
-* This should generate _harfbuzz.lib_ and _harfbuzz-vs14.dll_.
-
-## Copying Harfbuzz headers and DLL to the right locations
-The Harfbuzz headers and DLLs must be copied to the right locations, for Lua and LuaRocks to be able to find them during installation and running:
-
-* Copy all the Harfbuzz header (_src/*.h_) files to _C:\external\include\harfbuzz_. This is where LuaRocks will look for them by default. Make sure the header files are in the _harfbuzz_ sub-directory under _C:\external\include_, otherwise it will not work.
-* Copy _harfbuzz.lib_ and _harfbuzz-vs14.dll_ to the folder _C:\external\lib_. This is where LuaRocks will look for them by default.
-* Copy _harfbuzz-vs14.dll_ to _C:\Windows\System32_. This is where running programs can locate the Harfbuzz DLL.
-
-## Installing Lua and LuaRocks
-It is highly recommended that you install Lua 5.2 and LuaRocks in a sandboxed environment on your machine. [Hererocks] makes it dead simple to do on Windows. Make sure you have installed Python first. On my system, I just did `chocolatey install python`, but you can use an alternate method and skip running that command below.
-
-[Hererocks]:https://github.com/mpeterv/hererocks
-
-```
-chocolatey install python
-wget https://raw.githubusercontent.com/mpeterv/hererocks/latest/hererocks.py
-python hererocks.py lua52 -l5.2 -rlatest
-source lua52/bin/activate
-```
-## Install _luaharfbuzz_
-If you followed the steps in the previous sections, and have a sandboxed Lua installation, which the Lua program on %PATH%, then doing the following should just work:
-
-```
-C:\> luarocks install luaharfbuzz
-```
-
-This will download the _luaharfbuzz_ source, compile the C modules, link them against Lua and Harfbuzz, and install it in the right location.
-
-## Test
-Test whether the installation was successful by loading _luaharfbuzz_ in the Lua REPL
-
-```
-C:\> lua
-Lua 5.2.4 Copyright (C) 1994-2015 Lua.org, PUC-Rio
-> hb = require("harfbuzz")
-> print(hb.version())
-1.4.1
->
-```
-
diff --git a/Build/source/texk/web2c/luatexdir/luaharfbuzz/README.md b/Build/source/texk/web2c/luatexdir/luaharfbuzz/README.md
index f5a900c65b1..c5cee58f869 100644
--- a/Build/source/texk/web2c/luatexdir/luaharfbuzz/README.md
+++ b/Build/source/texk/web2c/luatexdir/luaharfbuzz/README.md
@@ -19,10 +19,17 @@ HarfBuzz is an OpenType text shaping engine. It is used in software like Qt,
Pango, Firefox, Chromium, XeTeX and LibreOffice.
_luaharfbuzz_ provides bindings for the most common types in Harfbuzz. The
-initial motivation for building it is to use Harfbuzz with the [LuaTeX]
+initial motivation for building it was to use Harfbuzz with the [LuaTeX]
typesetting system. However, the module isn’t tied to LuaTeX in any way. It
can be used with any Lua codebase.
+luaharfbuzz is currently being used inside [HarfTeX], a TeX engine built
+on top of LuaTeX and designed to use Harfbuzz for shaping text. For more
+details read this TUGboat journal article titled [Bringing world scripts to LuaTeX: The
+HarfBuzz experiment][tugboat-article]
+
+[HarfTeX]: https://github.com/khaledhosny/harftex
+[tugboat-article]: https://tug.org/TUGboat/tb40-1/tb124hosny-harfbuzz.pdf
[LuaTeX]:luatex.org
## Installing Harfbuzz
@@ -43,9 +50,6 @@ brew install harfbuzz
apt-get install libharfbuzz0b libharfbuzz-dev
```
-#### Windows
-Getting the whole setup running on Windows is very tedious, so all instructions are in their own file [README-win.md](https://github.com/deepakjois/luaharfbuzz/blob/master/README-win.md).
-
#### Other Platforms
_Send a pull request if you want to include specific instructions to install
Harfbuzz on your preferred platform._
@@ -139,6 +143,8 @@ In order to make changes to the code and run the tests, the following dependenci
* [Busted](http://olivinelabs.com/busted/) – `luarocks install busted`
* [luacheck](luacheck.readthedocs.org) – `luarocks install luacheck`
+* [luacov](https://keplerproject.github.io/luacov/) – `luarocks install luacov`
+* [ldoc](https://stevedonovan.github.io/ldoc/) – `luarocks install ldoc`
Run the test suite:
```
@@ -150,5 +156,10 @@ Lint the codebase:
make lint
```
+Generate documentation from sources:
+```
+make doc
+```
+
## Contact
Open a Github issue, or email me at .
diff --git a/Build/source/texk/web2c/luatexdir/luaharfbuzz/config.ld b/Build/source/texk/web2c/luatexdir/luaharfbuzz/config.ld
index 95d27f9a39f..d37be652ca9 100644
--- a/Build/source/texk/web2c/luatexdir/luaharfbuzz/config.ld
+++ b/Build/source/texk/web2c/luatexdir/luaharfbuzz/config.ld
@@ -1,6 +1,6 @@
project = 'luaharfbuzz'
description = 'Lua bindings to Harfbuzz'
-full_description = 'The documentation is available on the @{https://github.com/deepakjois/luaharfbuzz/wiki|wiki}'
+full_description = 'The documentation is available on the @{https://github.com/ufytex/luaharfbuzz/wiki|wiki}'
use_markdown_titles = true
backtick_references = false
title = 'luaharfbuzz Documentation'
diff --git a/Build/source/texk/web2c/luatexdir/luaharfbuzz/docs/examples/core_types.lua.html b/Build/source/texk/web2c/luatexdir/luaharfbuzz/docs/examples/core_types.lua.html
index fe9e5c39c9b..6345ea3c6fa 100644
--- a/Build/source/texk/web2c/luatexdir/luaharfbuzz/docs/examples/core_types.lua.html
+++ b/Build/source/texk/web2c/luatexdir/luaharfbuzz/docs/examples/core_types.lua.html
@@ -101,7 +101,7 @@ glyphs = buf:get_glyphs()
generated by LDoc 1.4.6
-
Last updated 2019-04-13 17:03:03
+
Last updated 2019-07-31 18:39:39
-
-
-
-
-
-
-
-
-
-
-
-
-
-
luaharfbuzz
-
-
-
-
-
Examples
-
-
Modules
-
-
-
-
-
-
-
custom_callbacks.lua
-
-callback.register("hyphenate", false)
-callback.register("ligaturing", false)
-callback.register("kerning", false)
-
-callback.register("post_linebreak_filter", function()
- texio.write_nl("POST_LINEBREAK")
- return true
-end)
-
-callback.register("hpack_filter", function()
- texio.write_nl("HPACK")
- return true
-end)
-
-callback.register("vpack_filter", function()
- texio.write_nl("VPACK")
- return true
-end)
-
-callback.register("buildpage_filter", function(extrainfo)
- texio.write_nl("BUILDPAGE_FILTER "..extrainfo)
-end)
-
-
-
-
-
-
generated by LDoc 1.4.5
-
Last updated 2016-08-31 21:59:58
-
-
-
diff --git a/Build/source/texk/web2c/luatexdir/luaharfbuzz/docs/examples/custom_callbacks.lua.html b/Build/source/texk/web2c/luatexdir/luaharfbuzz/docs/examples/custom_callbacks.lua.html
deleted file mode 100644
index eff09e27b8d..00000000000
--- a/Build/source/texk/web2c/luatexdir/luaharfbuzz/docs/examples/custom_callbacks.lua.html
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-