Skip to content
This repository has been archived by the owner on Mar 6, 2023. It is now read-only.

Commit

Permalink
record a few more files (in kpse enabled mode) (HH); cleanup linebrea…
Browse files Browse the repository at this point in the history
…k.c; sync with TeX Live revision 52691 -- trunk .

git-svn-id: https://serveur-svn.lri.fr/svn/modhel/luatex/trunk@7226 0b2b3880-5936-4365-a048-eb17d2e5a6bf
  • Loading branch information
luigiScarso committed Nov 8, 2019
1 parent 70748eb commit 9c14ed5
Show file tree
Hide file tree
Showing 98 changed files with 3,961 additions and 1,030 deletions.
6 changes: 6 additions & 0 deletions manual/luatex-fonts.tex
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
complete control to the loader. \NC \NR
\NC \type{fullname} \NC no \NC no \NC yes \NC string \NC output font name, used as a fallback in the \PDF\ output
if the \type {psname} is not set \NC \NR
\NC \type{subfont} \NC no \NC no \NC yes \NC number \NC default: 0, index in (\type {ttc}) font with multiple fonts \NC \NR
\NC \type{header} \NC yes \NC no \NC no \NC string \NC header comments, if any \NC \NR
\NC \type{hyphenchar} \NC no \NC no \NC yes \NC number \NC default: \TEX's \prm {hyphenchar} \NC \NR
\NC \type{parameters} \NC no \NC yes \NC yes \NC hash \NC default: 7 parameters, all zero \NC \NR
Expand Down Expand Up @@ -105,6 +106,11 @@
\type {-shrink} and \type {stretch}, with step \type {step}) of a font that was
automatically generated by the font expansion algorithm.

The \type {subfont} parameter can be used to specify the subfont in a \type {ttc}
font. When given, it is used instead of the \type {psname} and \type {fullname}
combination. The first subfont has number~1. A zero value signals using the names
as lookup.

Because we store the actual state of expansion with each glyph and don't have
special font instances, we can change some font related parameters before lines
are constructed, like:
Expand Down
Binary file modified manual/luatex.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion source/build-aux/compile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

scriptversion=2018-03-07.03; # UTC

# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Copyright (C) 1999-2019 Free Software Foundation, Inc.
# Written by Tom Tromey <[email protected]>.
#
# This program is free software; you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion source/build-aux/depcomp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

scriptversion=2018-03-07.03; # UTC

# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Copyright (C) 1999-2019 Free Software Foundation, Inc.

# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions source/libs/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$Id: README 52233 2019-09-30 22:08:36Z kakuto $
$Id: README 52576 2019-10-29 21:32:18Z kakuto $
Public domain. Originally created by Karl Berry, 2005.

Libraries we compile for TeX Live.
Expand All @@ -25,7 +25,7 @@ graphite2 1.3.13 - checked 21dec18
http://sourceforge.net/projects/silgraphite/files/graphite2/
(requires C++11)

harfbuzz 2.6.2 - checked 01oct19
harfbuzz 2.6.4 - checked 30oct19
http://www.freedesktop.org/software/harfbuzz/release/

icu 63.1 - checked 8jan19
Expand Down
10 changes: 10 additions & 0 deletions source/libs/harfbuzz/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2019-10-30 Akira Kakuto <[email protected]>

Import harfbuzz-2.6.4.
* version.ac: Adjusted.

2019-10-29 Akira Kakuto <[email protected]>

Import harfbuzz-2.6.3.
* Makefile.am, version.ac: Adjusted.

2019-10-01 Akira Kakuto <[email protected]>

Import harfbuzz-2.6.2.
Expand Down
4 changes: 2 additions & 2 deletions source/libs/harfbuzz/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## $Id: Makefile.am 52233 2019-09-30 22:08:36Z kakuto $
## $Id: Makefile.am 52560 2019-10-28 23:44:53Z kakuto $
## Proxy Makefile.am to build harfbuzz for TeX Live.
##
## Copyright 2016-2017 Karl Berry <[email protected]>
Expand Down Expand Up @@ -129,7 +129,6 @@ libharfbuzz_a_SOURCES = \
@HARFBUZZ_TREE@/src/hb-unicode-emoji-table.hh \
@HARFBUZZ_TREE@/src/hb-vector.hh \
@HARFBUZZ_TREE@/src/hb-utf.hh \
@HARFBUZZ_TREE@/src/hb-warning.cc \
@HARFBUZZ_TREE@/src/hb-buffer-deserialize-json.hh \
@HARFBUZZ_TREE@/src/hb-buffer-deserialize-text.hh \
@HARFBUZZ_TREE@/src/hb-fallback-shape.cc \
Expand Down Expand Up @@ -208,6 +207,7 @@ libharfbuzz_a_SOURCES += \
@HARFBUZZ_TREE@/src/hb-ot-var.cc \
@HARFBUZZ_TREE@/src/hb-ot-var-avar-table.hh \
@HARFBUZZ_TREE@/src/hb-ot-var-fvar-table.hh \
@HARFBUZZ_TREE@/src/hb-ot-var-gvar-table.hh \
@HARFBUZZ_TREE@/src/hb-ot-var-hvar-table.hh \
@HARFBUZZ_TREE@/src/hb-ot-var-mvar-table.hh \
@HARFBUZZ_TREE@/src/hb-ot-vorg-table.hh \
Expand Down
12 changes: 2 additions & 10 deletions source/libs/harfbuzz/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ am_libharfbuzz_a_OBJECTS = @HARFBUZZ_TREE@/src/hb-blob.$(OBJEXT) \
@HARFBUZZ_TREE@/src/hb-subset-cff2.$(OBJEXT) \
@HARFBUZZ_TREE@/src/hb-ucd.$(OBJEXT) \
@HARFBUZZ_TREE@/src/hb-unicode.$(OBJEXT) \
@HARFBUZZ_TREE@/src/hb-warning.$(OBJEXT) \
@HARFBUZZ_TREE@/src/hb-fallback-shape.$(OBJEXT) \
@HARFBUZZ_TREE@/src/hb-aat-layout.$(OBJEXT) \
@HARFBUZZ_TREE@/src/hb-aat-map.$(OBJEXT) \
Expand Down Expand Up @@ -243,8 +242,7 @@ am__depfiles_remade = ./$(DEPDIR)/hbtest-dummy.Po \
@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff1.Po \
@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff2.Po \
@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ucd.Po \
@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po \
@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-warning.Po
@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
Expand Down Expand Up @@ -798,7 +796,6 @@ libharfbuzz_a_SOURCES = @HARFBUZZ_TREE@/src/hb-algs.hh \
@HARFBUZZ_TREE@/src/hb-unicode.cc \
@HARFBUZZ_TREE@/src/hb-unicode-emoji-table.hh \
@HARFBUZZ_TREE@/src/hb-vector.hh @HARFBUZZ_TREE@/src/hb-utf.hh \
@HARFBUZZ_TREE@/src/hb-warning.cc \
@HARFBUZZ_TREE@/src/hb-buffer-deserialize-json.hh \
@HARFBUZZ_TREE@/src/hb-buffer-deserialize-text.hh \
@HARFBUZZ_TREE@/src/hb-fallback-shape.cc \
Expand Down Expand Up @@ -874,6 +871,7 @@ libharfbuzz_a_SOURCES = @HARFBUZZ_TREE@/src/hb-algs.hh \
@HARFBUZZ_TREE@/src/hb-ot-var.cc \
@HARFBUZZ_TREE@/src/hb-ot-var-avar-table.hh \
@HARFBUZZ_TREE@/src/hb-ot-var-fvar-table.hh \
@HARFBUZZ_TREE@/src/hb-ot-var-gvar-table.hh \
@HARFBUZZ_TREE@/src/hb-ot-var-hvar-table.hh \
@HARFBUZZ_TREE@/src/hb-ot-var-mvar-table.hh \
@HARFBUZZ_TREE@/src/hb-ot-vorg-table.hh \
Expand Down Expand Up @@ -1036,9 +1034,6 @@ clean-noinstLIBRARIES:
@HARFBUZZ_TREE@/src/hb-unicode.$(OBJEXT): \
@HARFBUZZ_TREE@/src/$(am__dirstamp) \
@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
@HARFBUZZ_TREE@/src/hb-warning.$(OBJEXT): \
@HARFBUZZ_TREE@/src/$(am__dirstamp) \
@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
@HARFBUZZ_TREE@/src/hb-fallback-shape.$(OBJEXT): \
@HARFBUZZ_TREE@/src/$(am__dirstamp) \
@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
Expand Down Expand Up @@ -1189,7 +1184,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff2.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ucd.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-warning.Po@am__quote@ # am--include-marker

$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
Expand Down Expand Up @@ -1833,7 +1827,6 @@ distclean: distclean-recursive
-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff2.Po
-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ucd.Po
-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po
-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-warning.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags
Expand Down Expand Up @@ -1933,7 +1926,6 @@ maintainer-clean: maintainer-clean-recursive
-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-subset-cff2.Po
-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ucd.Po
-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po
-rm -f @HARFBUZZ_TREE@/src/$(DEPDIR)/hb-warning.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic

Expand Down
10 changes: 10 additions & 0 deletions source/libs/harfbuzz/TLpatches/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2019-10-30 Akira Kakuto <[email protected]>

Imported harfbuzz-2.6.4 source tree from:
http://www.freedesktop.org/software/harfbuzz/release/

2019-10-29 Akira Kakuto <[email protected]>

Imported harfbuzz-2.6.3 source tree from:
http://www.freedesktop.org/software/harfbuzz/release/

2019-10-01 Akira Kakuto <[email protected]>

Imported harfbuzz-2.6.2 source tree from:
Expand Down
2 changes: 1 addition & 1 deletion source/libs/harfbuzz/TLpatches/TL-Changes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Changes applied to the harfbuzz-2.6.2/ tree as obtained from:
Changes applied to the harfbuzz-2.6.4/ tree as obtained from:
http://www.freedesktop.org/software/harfbuzz/release/

Removed:
Expand Down
24 changes: 12 additions & 12 deletions source/libs/harfbuzz/configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 2.6.2.
# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 2.6.4.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='harfbuzz (TeX Live)'
PACKAGE_TARNAME='harfbuzz--tex-live-'
PACKAGE_VERSION='2.6.2'
PACKAGE_STRING='harfbuzz (TeX Live) 2.6.2'
PACKAGE_VERSION='2.6.4'
PACKAGE_STRING='harfbuzz (TeX Live) 2.6.4'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1311,7 +1311,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures harfbuzz (TeX Live) 2.6.2 to adapt to many kinds of systems.
\`configure' configures harfbuzz (TeX Live) 2.6.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1382,7 +1382,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of harfbuzz (TeX Live) 2.6.2:";;
short | recursive ) echo "Configuration of harfbuzz (TeX Live) 2.6.4:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1487,7 +1487,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
harfbuzz (TeX Live) configure 2.6.2
harfbuzz (TeX Live) configure 2.6.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2123,7 +2123,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by harfbuzz (TeX Live) $as_me 2.6.2, which was
It was created by harfbuzz (TeX Live) $as_me 2.6.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -4047,7 +4047,7 @@ fi

# Define the identity of the package.
PACKAGE='harfbuzz--tex-live-'
VERSION='2.6.2'
VERSION='2.6.4'


# Some tools Automake needs.
Expand Down Expand Up @@ -4241,8 +4241,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags

HB_VERSION_MAJOR=2
HB_VERSION_MINOR=6
HB_VERSION_MICRO=2
HB_VERSION=2.6.2
HB_VERSION_MICRO=4
HB_VERSION=2.6.4

ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
Expand Down Expand Up @@ -7919,7 +7919,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by harfbuzz (TeX Live) $as_me 2.6.2, which was
This file was extended by harfbuzz (TeX Live) $as_me 2.6.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -7985,7 +7985,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
harfbuzz (TeX Live) config.status 2.6.2
harfbuzz (TeX Live) config.status 2.6.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
Loading

0 comments on commit 9c14ed5

Please sign in to comment.