summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2015-04-16 02:54:28 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2015-04-16 02:54:28 +0000
commitbdb6021c540372d79e524a76cc19b20f7daf7f0b (patch)
treea33436955b00bccb8c586e5f61a02a3597914b56 /Build
parent46400fe1b6a6f6a51504f1965bcb3ce1e3c453e0 (diff)
luatexdir: Sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@36873 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/luatexdir/font/luafont.w4
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/luatexdir/font/luafont.w b/Build/source/texk/web2c/luatexdir/font/luafont.w
index d45ea7aa0d4..9d4ebc9ed98 100644
--- a/Build/source/texk/web2c/luatexdir/font/luafont.w
+++ b/Build/source/texk/web2c/luatexdir/font/luafont.w
@@ -2018,7 +2018,8 @@ static halfword handle_lig_word(halfword cur)
/* Building an |init_disc| followed by a |select_disc|
\.{{a-}{b}{AB} {-}{}{}} 'c'
*/
- halfword last1 = vlink(next), tail;
+ /* is it tail necessary ? */
+ halfword last1 = vlink(next), tail ;
uncouple_node(next);
try_couple_nodes(fwd, last1);
/* \.{{a-}{b}{AB} {-}{c}{}} */
@@ -2050,6 +2051,7 @@ static halfword handle_lig_word(halfword cur)
/* and set the subtypes */
subtype(cur) = init_disc;
subtype(fwd) = select_disc;
+ return cur ;
}
}
}
diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c
index ce152e5ad8e..0e24aa9fd06 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.c
+++ b/Build/source/texk/web2c/luatexdir/luatex.c
@@ -26,7 +26,7 @@
#define TeX
-int luatex_svn = 5209;
+int luatex_svn = 5225;
int luatex_version = 80; /* \.{\\luatexversion} */
int luatex_revision = '0'; /* \.{\\luatexrevision} */
int luatex_date_info = 2015031900; /* the compile date is now hardwired */