summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/tex')
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/align.w12
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/arithmetic.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/buildpage.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/commands.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/conditional.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/directions.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/dumpdata.h6
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/dumpdata.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/equivalents.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/errors.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/expand.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/extensions.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/filename.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/inputstack.w6
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/linebreak.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/mainbody.h4
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/mainbody.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/maincontrol.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/mathcodes.w24
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/memoryword.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/mlist.w24
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/nesting.w6
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/packaging.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/postlinebreak.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/primitive.w8
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/printing.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/scanning.w8
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/stringpool.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/texdeffont.w4
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/texfileio.w10
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/texmath.w144
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/texnodes.w18
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/textcodes.w8
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/textoken.w8
34 files changed, 169 insertions, 159 deletions
diff --git a/Build/source/texk/web2c/luatexdir/tex/align.w b/Build/source/texk/web2c/luatexdir/tex/align.w
index fd2d46b8f38..8e21f7ed86a 100644
--- a/Build/source/texk/web2c/luatexdir/tex/align.w
+++ b/Build/source/texk/web2c/luatexdir/tex/align.w
@@ -23,8 +23,8 @@
#include "ptexlib.h"
static const char _svn_version[] =
- "$Id: align.w 3587 2010-04-03 14:32:25Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/align.w $";
+ "$Id: align.w 3612 2010-04-13 09:29:42Z taco $ "
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/align.w $";
@ @c
void fin_align(void);
@@ -223,7 +223,7 @@ pointer cur_pre_head = null, cur_pre_tail = null; /* pre-adjustment list p
called |push_alignment| and |pop_alignment|.
@c
-void push_alignment(void)
+static void push_alignment(void)
{
pointer p; /* the new alignment stack node */
p = new_node(align_stack_node, 0);
@@ -241,7 +241,7 @@ void push_alignment(void)
cur_head = new_node(temp_node, 0);
}
-void pop_alignment(void)
+static void pop_alignment(void)
{
pointer p; /* the top alignment stack node */
flush_node(cur_head);
@@ -282,7 +282,7 @@ token survives in the preamble and the `\.{\\tabskip}' defines new
tabskip glue (locally).
@c
-void get_preamble_token(void)
+static void get_preamble_token(void)
{
RESTART:
get_token();
@@ -488,7 +488,7 @@ next column or group of columns will begin. A new semantic level is
entered, so that the columns will generate a list for subsequent packaging.
@c
-void init_span(pointer p)
+static void init_span(pointer p)
{
push_nest();
if (cur_list.mode_field == -hmode) {
diff --git a/Build/source/texk/web2c/luatexdir/tex/arithmetic.w b/Build/source/texk/web2c/luatexdir/tex/arithmetic.w
index eec0b309b7e..76ccbbf419e 100644
--- a/Build/source/texk/web2c/luatexdir/tex/arithmetic.w
+++ b/Build/source/texk/web2c/luatexdir/tex/arithmetic.w
@@ -24,7 +24,7 @@
static const char _svn_version[] =
"$Id: arithmetic.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/arithmetic.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/arithmetic.w $";
@ The principal computations performed by \TeX\ are done entirely in terms of
diff --git a/Build/source/texk/web2c/luatexdir/tex/buildpage.w b/Build/source/texk/web2c/luatexdir/tex/buildpage.w
index de39703c8ae..2c2c8460464 100644
--- a/Build/source/texk/web2c/luatexdir/tex/buildpage.w
+++ b/Build/source/texk/web2c/luatexdir/tex/buildpage.w
@@ -20,7 +20,7 @@
@ @c
static const char _svn_version[] =
"$Id: buildpage.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/buildpage.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/buildpage.w $";
#include "ptexlib.h"
diff --git a/Build/source/texk/web2c/luatexdir/tex/commands.w b/Build/source/texk/web2c/luatexdir/tex/commands.w
index 343c04fe6b8..83e81602840 100644
--- a/Build/source/texk/web2c/luatexdir/tex/commands.w
+++ b/Build/source/texk/web2c/luatexdir/tex/commands.w
@@ -24,7 +24,7 @@
static const char _svn_version[] =
"$Id: commands.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/commands.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/commands.w $";
@ The symbolic names for glue parameters are put into \TeX's hash table
by using the routine called |primitive|, defined below. Let us enter them
diff --git a/Build/source/texk/web2c/luatexdir/tex/conditional.w b/Build/source/texk/web2c/luatexdir/tex/conditional.w
index dd9349ab5ef..a0df81779d7 100644
--- a/Build/source/texk/web2c/luatexdir/tex/conditional.w
+++ b/Build/source/texk/web2c/luatexdir/tex/conditional.w
@@ -22,7 +22,7 @@
static const char _svn_version[] =
"$Id: conditional.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/conditional.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/conditional.w $";
@ @c
#define box(A) eqtb[box_base+(A)].hh.rh
diff --git a/Build/source/texk/web2c/luatexdir/tex/directions.w b/Build/source/texk/web2c/luatexdir/tex/directions.w
index 4f896b60dbe..d89c407c7a9 100644
--- a/Build/source/texk/web2c/luatexdir/tex/directions.w
+++ b/Build/source/texk/web2c/luatexdir/tex/directions.w
@@ -22,7 +22,7 @@
static const char _svn_version[] =
"$Id: directions.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/directions.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/directions.w $";
@ @c
void scan_direction(void)
diff --git a/Build/source/texk/web2c/luatexdir/tex/dumpdata.h b/Build/source/texk/web2c/luatexdir/tex/dumpdata.h
index 810424b6a40..44f7fabe96d 100644
--- a/Build/source/texk/web2c/luatexdir/tex/dumpdata.h
+++ b/Build/source/texk/web2c/luatexdir/tex/dumpdata.h
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along
with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
-/* $Id: dumpdata.h 3388 2010-01-26 10:59:04Z taco $ */
+/* $Id: dumpdata.h 3612 2010-04-13 09:29:42Z taco $ */
#ifndef DUMPDATA_H
# define DUMPDATA_H
@@ -38,6 +38,10 @@ extern boolean load_fmt_file(const char *);
extern void do_zdump(char *, int, int, FILE *);
extern void do_zundump(char *, int, int, FILE *);
+#if !defined (WORDS_BIGENDIAN) && !defined (NO_DUMP_SHARE) /* this fn */
+extern void swap_items(char *p, int nitems, int size); /* in luatex.c */
+#endif
+
/* Like do_undump, but check each value against LOW and HIGH. The
slowdown isn't significant, and this improves the chances of
detecting incompatible format files. In fact, Knuth himself noted
diff --git a/Build/source/texk/web2c/luatexdir/tex/dumpdata.w b/Build/source/texk/web2c/luatexdir/tex/dumpdata.w
index 8b36e504182..975fbb24c5f 100644
--- a/Build/source/texk/web2c/luatexdir/tex/dumpdata.w
+++ b/Build/source/texk/web2c/luatexdir/tex/dumpdata.w
@@ -22,7 +22,7 @@
static const char _svn_version[] =
"$Id: dumpdata.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/dumpdata.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/dumpdata.w $";
#define font_id_text(A) cs_text(font_id_base+(A))
#define prev_depth cur_list.prev_depth_field
diff --git a/Build/source/texk/web2c/luatexdir/tex/equivalents.w b/Build/source/texk/web2c/luatexdir/tex/equivalents.w
index 02fa1f48578..a7a425376c4 100644
--- a/Build/source/texk/web2c/luatexdir/tex/equivalents.w
+++ b/Build/source/texk/web2c/luatexdir/tex/equivalents.w
@@ -22,7 +22,7 @@
static const char _svn_version[] =
"$Id: equivalents.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/equivalents.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/equivalents.w $";
@ @c
#define par_shape_ptr equiv(par_shape_loc)
diff --git a/Build/source/texk/web2c/luatexdir/tex/errors.w b/Build/source/texk/web2c/luatexdir/tex/errors.w
index 5565605e6a2..1a6ec9a46e0 100644
--- a/Build/source/texk/web2c/luatexdir/tex/errors.w
+++ b/Build/source/texk/web2c/luatexdir/tex/errors.w
@@ -22,7 +22,7 @@
static const char _svn_version[] =
"$Id: errors.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/errors.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/errors.w $";
@ @c
#define new_line_char int_par(new_line_char_code)
diff --git a/Build/source/texk/web2c/luatexdir/tex/expand.w b/Build/source/texk/web2c/luatexdir/tex/expand.w
index 79072f7021e..4f92a2fdd95 100644
--- a/Build/source/texk/web2c/luatexdir/tex/expand.w
+++ b/Build/source/texk/web2c/luatexdir/tex/expand.w
@@ -22,7 +22,7 @@
static const char _svn_version[] =
"$Id: expand.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/expand.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/expand.w $";
@ Only a dozen or so command codes |>max_command| can possibly be returned by
diff --git a/Build/source/texk/web2c/luatexdir/tex/extensions.w b/Build/source/texk/web2c/luatexdir/tex/extensions.w
index b8b89512ba2..62c9e65fa8a 100644
--- a/Build/source/texk/web2c/luatexdir/tex/extensions.w
+++ b/Build/source/texk/web2c/luatexdir/tex/extensions.w
@@ -23,7 +23,7 @@
@ @c
static const char _svn_version[] =
"$Id: extensions.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/extensions.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/extensions.w $";
#include "ptexlib.h"
diff --git a/Build/source/texk/web2c/luatexdir/tex/filename.w b/Build/source/texk/web2c/luatexdir/tex/filename.w
index 239127c5852..4757bfc19cd 100644
--- a/Build/source/texk/web2c/luatexdir/tex/filename.w
+++ b/Build/source/texk/web2c/luatexdir/tex/filename.w
@@ -22,7 +22,7 @@
static const char _svn_version[] =
"$Id: filename.w 3587 2010-04-03 14:32:25Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/filename.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/filename.w $";
@ In order to isolate the system-dependent aspects of file names, the
diff --git a/Build/source/texk/web2c/luatexdir/tex/inputstack.w b/Build/source/texk/web2c/luatexdir/tex/inputstack.w
index ecb620fb185..3e1c33bd9b8 100644
--- a/Build/source/texk/web2c/luatexdir/tex/inputstack.w
+++ b/Build/source/texk/web2c/luatexdir/tex/inputstack.w
@@ -21,8 +21,8 @@
#include "ptexlib.h"
static const char _svn_version[] =
- "$Id: inputstack.w 3587 2010-04-03 14:32:25Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/inputstack.w $";
+ "$Id: inputstack.w 3612 2010-04-13 09:29:42Z taco $ "
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/inputstack.w $";
@ @c
#define end_line_char int_par(end_line_char_code)
@@ -129,7 +129,7 @@ at most |error_line|. Non-current input levels whose |token_type| is
`|backed_up|' are shown only if they have not been fully read.
@c
-void print_token_list_type(int t)
+static void print_token_list_type(int t)
{
switch (t) {
case parameter:
diff --git a/Build/source/texk/web2c/luatexdir/tex/linebreak.w b/Build/source/texk/web2c/luatexdir/tex/linebreak.w
index 7c285f94430..f5b958eb9bd 100644
--- a/Build/source/texk/web2c/luatexdir/tex/linebreak.w
+++ b/Build/source/texk/web2c/luatexdir/tex/linebreak.w
@@ -22,7 +22,7 @@
static const char _svn_version[] =
"$Id: linebreak.w 3587 2010-04-03 14:32:25Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/linebreak.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/linebreak.w $";
@ We come now to what is probably the most interesting algorithm of \TeX:
the mechanism for choosing the ``best possible'' breakpoints that yield
diff --git a/Build/source/texk/web2c/luatexdir/tex/mainbody.h b/Build/source/texk/web2c/luatexdir/tex/mainbody.h
index 0b108ad896f..93794932cc9 100644
--- a/Build/source/texk/web2c/luatexdir/tex/mainbody.h
+++ b/Build/source/texk/web2c/luatexdir/tex/mainbody.h
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License along
with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
-/* $Id: mainbody.h 3436 2010-02-21 15:34:00Z taco $ */
+/* $Id: mainbody.h 3612 2010-04-13 09:29:42Z taco $ */
#ifndef MAINBODY_H
# define MAINBODY_H
@@ -244,6 +244,8 @@ extern void close_files_and_terminate(void);
extern void final_cleanup(void);
extern void debug_help(void); /* routine to display various things */
+extern int main_initialize(void);
+
/* lazy me */
# define get_cur_font() equiv(cur_font_loc)
# define zset_cur_font set_cur_font
diff --git a/Build/source/texk/web2c/luatexdir/tex/mainbody.w b/Build/source/texk/web2c/luatexdir/tex/mainbody.w
index abdf1af920b..fea85fa31be 100644
--- a/Build/source/texk/web2c/luatexdir/tex/mainbody.w
+++ b/Build/source/texk/web2c/luatexdir/tex/mainbody.w
@@ -26,7 +26,7 @@
static const char _svn_version[] =
"$Id: mainbody.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/mainbody.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/mainbody.w $";
@
pdfTeX is copyright (C) 1996-2006 Han The Thanh, <thanh@@pdftex.org>.
diff --git a/Build/source/texk/web2c/luatexdir/tex/maincontrol.w b/Build/source/texk/web2c/luatexdir/tex/maincontrol.w
index 4e49ea88578..f4b3ddddcaa 100644
--- a/Build/source/texk/web2c/luatexdir/tex/maincontrol.w
+++ b/Build/source/texk/web2c/luatexdir/tex/maincontrol.w
@@ -20,7 +20,7 @@
@ @c
static const char _svn_version[] =
"$Id: maincontrol.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/maincontrol.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/maincontrol.w $";
#include "ptexlib.h"
diff --git a/Build/source/texk/web2c/luatexdir/tex/mathcodes.w b/Build/source/texk/web2c/luatexdir/tex/mathcodes.w
index ef5772b6b33..0850cbe2776 100644
--- a/Build/source/texk/web2c/luatexdir/tex/mathcodes.w
+++ b/Build/source/texk/web2c/luatexdir/tex/mathcodes.w
@@ -21,8 +21,8 @@
#include "ptexlib.h"
static const char _svn_version[] =
- "$Id: mathcodes.w 3587 2010-04-03 14:32:25Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/mathcodes.w $";
+ "$Id: mathcodes.w 3612 2010-04-13 09:29:42Z taco $ "
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/mathcodes.w $";
@ math codes
@c
@@ -104,7 +104,7 @@ void show_mathcode_value(mathcodeval c)
}
@ @c
-void show_mathcode(int n)
+static void show_mathcode(int n)
{
mathcodeval c = get_math_code(n);
if (c.origin_value == aleph_mathcode) {
@@ -122,7 +122,7 @@ void show_mathcode(int n)
}
@ @c
-void unsavemathcode(quarterword gl)
+static void unsavemathcode(quarterword gl)
{
sa_stack_item st;
if (mathcode_head->stack == NULL)
@@ -217,14 +217,14 @@ int get_math_code_num(int n)
}
@ @c
-void initializemathcode(void)
+static void initializemathcode(void)
{
mathcode_head = new_sa_tree(MATHCODESTACK, MATHCODEDEFAULT);
mathcode_heap = Mxmalloc_array(mathcodeval, MATHCODEHEAP);
}
@ @c
-void dumpmathcode(void)
+static void dumpmathcode(void)
{
int k;
mathcodeval d;
@@ -240,7 +240,7 @@ void dumpmathcode(void)
}
}
-void undumpmathcode(void)
+static void undumpmathcode(void)
{
int k, x;
mathcodeval d;
@@ -269,7 +269,7 @@ void undumpmathcode(void)
}
@ @c
-void show_delcode(int n)
+static void show_delcode(int n)
{
delcodeval c;
c = get_del_code(n);
@@ -317,7 +317,7 @@ void show_delcode(int n)
@ TODO: clean up the heap
@c
-void unsavedelcode(quarterword gl)
+static void unsavedelcode(quarterword gl)
{
sa_stack_item st;
if (delcode_head->stack == NULL)
@@ -418,14 +418,14 @@ int get_del_code_num(int n)
}
@ @c
-void initializedelcode(void)
+static void initializedelcode(void)
{
delcode_head = new_sa_tree(DELCODESTACK, DELCODEDEFAULT);
delcode_heap = Mxmalloc_array(delcodeval, DELCODEHEAP);
}
@ @c
-void dumpdelcode(void)
+static void dumpdelcode(void)
{
int k;
delcodeval d;
@@ -443,7 +443,7 @@ void dumpdelcode(void)
}
}
-void undumpdelcode(void)
+static void undumpdelcode(void)
{
int k;
delcodeval d;
diff --git a/Build/source/texk/web2c/luatexdir/tex/memoryword.w b/Build/source/texk/web2c/luatexdir/tex/memoryword.w
index a1ede056dc5..5c86ea12e6b 100644
--- a/Build/source/texk/web2c/luatexdir/tex/memoryword.w
+++ b/Build/source/texk/web2c/luatexdir/tex/memoryword.w
@@ -22,7 +22,7 @@
static const char _svn_version[] =
"$Id: memoryword.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/memoryword.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/memoryword.w $";
@ When debugging, we may want to print a |memory_word| without knowing
diff --git a/Build/source/texk/web2c/luatexdir/tex/mlist.w b/Build/source/texk/web2c/luatexdir/tex/mlist.w
index 0b9e80802b1..c41c17392ea 100644
--- a/Build/source/texk/web2c/luatexdir/tex/mlist.w
+++ b/Build/source/texk/web2c/luatexdir/tex/mlist.w
@@ -25,8 +25,8 @@
#include "lua/luatex-api.h"
static const char _svn_version[] =
- "$Id: mlist.w 3587 2010-04-03 14:32:25Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/mlist.w $";
+ "$Id: mlist.w 3612 2010-04-13 09:29:42Z taco $ "
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/mlist.w $";
@ @c
#define delimiter_factor int_par(delimiter_factor_code)
@@ -831,7 +831,7 @@ void fixup_math_parameters(int fam_id, int size_id, int f, int lvl)
backward compatibility with \.{\\scriptspace}.
@c
-void finalize_math_parameters(void)
+static void finalize_math_parameters(void)
{
int saved_trace = int_par(tracing_assigns_code);
int_par(tracing_assigns_code) = 0;
@@ -869,7 +869,7 @@ for each combination of family and size. (Be alert: Size codes get
larger as the type gets smaller.)
@c
-const char *math_size_string(int s)
+static const char *math_size_string(int s)
{
if (s == text_size)
return "textfont";
@@ -896,7 +896,7 @@ information:
@ a simple routine that creates a flat copy of a nucleus
@c
-pointer math_clone(pointer q)
+static pointer math_clone(pointer q)
{
pointer x;
if (q == null)
@@ -920,7 +920,7 @@ pointer math_clone(pointer q)
that eventually contains it.
@c
-pointer do_fraction_rule(scaled t, pointer att)
+static pointer do_fraction_rule(scaled t, pointer att)
{
pointer p; /* the new node */
p = new_rule();
@@ -937,7 +937,7 @@ pointer do_fraction_rule(scaled t, pointer att)
fraction rule of thickness |t| under additional space of height |ht|.
@c
-pointer overbar(pointer b, scaled k, scaled t, scaled ht, pointer att)
+static pointer overbar(pointer b, scaled k, scaled t, scaled ht, pointer att)
{
pointer p, q; /* nodes being constructed */
p = new_kern(k);
@@ -978,7 +978,7 @@ static pointer char_box(internal_font_number f, int c, pointer bb)
a given character:
@c
-scaled height_plus_depth(internal_font_number f, int c)
+static scaled height_plus_depth(internal_font_number f, int c)
{
return (char_height(f, c) + char_depth(f, c));
}
@@ -989,7 +989,7 @@ scaled height_plus_depth(internal_font_number f, int c)
of the characters already in box |b|:
@c
-scaled stack_into_box(pointer b, internal_font_number f, int c)
+static scaled stack_into_box(pointer b, internal_font_number f, int c)
{
pointer p; /* new node placed into |b| */
p = char_box(f, c, node_attr(b));
@@ -1000,7 +1000,7 @@ scaled stack_into_box(pointer b, internal_font_number f, int c)
}
-scaled stack_into_hbox(pointer b, internal_font_number f, int c)
+static scaled stack_into_hbox(pointer b, internal_font_number f, int c)
{
pointer p, q; /* new node placed into |b| */
p = char_box(f, c, node_attr(b));
@@ -1021,7 +1021,7 @@ scaled stack_into_hbox(pointer b, internal_font_number f, int c)
@ @c
-void add_delim_kern(pointer b, scaled s)
+static void add_delim_kern(pointer b, scaled s)
{
pointer p; /* new node placed into |b| */
p = new_kern(s);
@@ -1030,7 +1030,7 @@ void add_delim_kern(pointer b, scaled s)
list_ptr(b) = p;
}
-void add_delim_hkern(pointer b, scaled s)
+static void add_delim_hkern(pointer b, scaled s)
{
pointer p, q; /* new node placed into |b| */
p = new_kern(s);
diff --git a/Build/source/texk/web2c/luatexdir/tex/nesting.w b/Build/source/texk/web2c/luatexdir/tex/nesting.w
index 28ae086d461..332058a9451 100644
--- a/Build/source/texk/web2c/luatexdir/tex/nesting.w
+++ b/Build/source/texk/web2c/luatexdir/tex/nesting.w
@@ -21,8 +21,8 @@
#include "ptexlib.h"
static const char _svn_version[] =
- "$Id: nesting.w 3587 2010-04-03 14:32:25Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/nesting.w $";
+ "$Id: nesting.w 3612 2010-04-13 09:29:42Z taco $ "
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/nesting.w $";
@ these are for |show_activities|
@@ -66,7 +66,7 @@ do by computing the value |abs(mode)+cur_cmd|, where |mode| is the current
mode and |cur_cmd| is the current command code.
@c
-const char *string_mode(int m)
+static const char *string_mode(int m)
{ /* prints the mode represented by |m| */
if (m > 0) {
switch (m / (max_command_cmd + 1)) {
diff --git a/Build/source/texk/web2c/luatexdir/tex/packaging.w b/Build/source/texk/web2c/luatexdir/tex/packaging.w
index 16c030a5944..6813d61e85f 100644
--- a/Build/source/texk/web2c/luatexdir/tex/packaging.w
+++ b/Build/source/texk/web2c/luatexdir/tex/packaging.w
@@ -22,7 +22,7 @@
static const char _svn_version[] =
"$Id: packaging.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/packaging.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/packaging.w $";
@ @c
#define scan_normal_dimen() scan_dimen(false,false,false)
diff --git a/Build/source/texk/web2c/luatexdir/tex/postlinebreak.w b/Build/source/texk/web2c/luatexdir/tex/postlinebreak.w
index 908224f0b47..e9a80961457 100644
--- a/Build/source/texk/web2c/luatexdir/tex/postlinebreak.w
+++ b/Build/source/texk/web2c/luatexdir/tex/postlinebreak.w
@@ -22,7 +22,7 @@
static const char _svn_version[] =
"$Id: postlinebreak.w 3587 2010-04-03 14:32:25Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/postlinebreak.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/postlinebreak.w $";
@ So far we have gotten a little way into the |line_break| routine, having
covered its important |try_break| subroutine. Now let's consider the
diff --git a/Build/source/texk/web2c/luatexdir/tex/primitive.w b/Build/source/texk/web2c/luatexdir/tex/primitive.w
index 89db63fbeaa..e40090dada0 100644
--- a/Build/source/texk/web2c/luatexdir/tex/primitive.w
+++ b/Build/source/texk/web2c/luatexdir/tex/primitive.w
@@ -22,8 +22,8 @@
static const char _svn_version[] =
- "$Id: primitive.w 3587 2010-04-03 14:32:25Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/primitive.w $";
+ "$Id: primitive.w 3612 2010-04-13 09:29:42Z taco $ "
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/primitive.w $";
@ Control sequences are stored and retrieved by means of a fairly standard hash
@@ -301,7 +301,7 @@ void primitive_def(const char *s, size_t l, quarterword c, halfword o)
needed, but it helps catch errors of this kind.
@c
-void
+static void
store_primitive_name(str_number s, quarterword c, halfword o, halfword offset)
{
int idx;
@@ -485,7 +485,7 @@ pointer string_lookup(const char *s, size_t l)
@c
#define chr_cmd(A) do { tprint(A); print(chr_code); } while (0)
-void prim_cmd_chr(quarterword cmd, halfword chr_code)
+static void prim_cmd_chr(quarterword cmd, halfword chr_code)
{
int idx = chr_code - prim_data[cmd].offset;
if (cmd <= last_cmd &&
diff --git a/Build/source/texk/web2c/luatexdir/tex/printing.w b/Build/source/texk/web2c/luatexdir/tex/printing.w
index cb4199841e8..fee354eebec 100644
--- a/Build/source/texk/web2c/luatexdir/tex/printing.w
+++ b/Build/source/texk/web2c/luatexdir/tex/printing.w
@@ -23,7 +23,7 @@
static const char _svn_version[] =
"$Id: printing.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/printing.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/printing.w $";
@ @c
#define font_id_text(A) cs_text(font_id_base+(A))
diff --git a/Build/source/texk/web2c/luatexdir/tex/scanning.w b/Build/source/texk/web2c/luatexdir/tex/scanning.w
index 43466f400d8..a968dae4a4b 100644
--- a/Build/source/texk/web2c/luatexdir/tex/scanning.w
+++ b/Build/source/texk/web2c/luatexdir/tex/scanning.w
@@ -21,8 +21,8 @@
#include "ptexlib.h"
static const char _svn_version[] =
- "$Id: scanning.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/scanning.w $";
+ "$Id: scanning.w 3596 2010-04-05 10:12:46Z taco $"
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/scanning.w $";
@ @c
@@ -1788,7 +1788,7 @@ void set_font_dimen(void)
font_param_error(f);
} else {
if (n > font_params(f)) {
- if (font_touched(f)) {
+ if (font_used(f)) {
font_param_error(f);
} else {
/* Increase the number of parameters in the font */
@@ -1817,7 +1817,7 @@ void get_font_dimen(void)
goto EXIT;
} else {
if (n > font_params(f)) {
- if (font_touched(f)) {
+ if (font_used(f)) {
font_param_error(f);
goto EXIT;
} else {
diff --git a/Build/source/texk/web2c/luatexdir/tex/stringpool.w b/Build/source/texk/web2c/luatexdir/tex/stringpool.w
index dbea33554ac..d41276c819d 100644
--- a/Build/source/texk/web2c/luatexdir/tex/stringpool.w
+++ b/Build/source/texk/web2c/luatexdir/tex/stringpool.w
@@ -22,7 +22,7 @@
static const char _svn_version[] =
"$Id: stringpool.w 3587 2010-04-03 14:32:25Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/stringpool.w $";
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/stringpool.w $";
@ Control sequence names and diagnostic messages are variable-length strings
of eight-bit characters. Since PASCAL did not have a well-developed string
diff --git a/Build/source/texk/web2c/luatexdir/tex/texdeffont.w b/Build/source/texk/web2c/luatexdir/tex/texdeffont.w
index ecb4f9fe29f..993280def9c 100644
--- a/Build/source/texk/web2c/luatexdir/tex/texdeffont.w
+++ b/Build/source/texk/web2c/luatexdir/tex/texdeffont.w
@@ -21,7 +21,7 @@
#include "ptexlib.h"
static const char _svn_version[] =
- "$Id: texdeffont.w 3587 2010-04-03 14:32:25Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/texdeffont.w $";
+ "$Id: texdeffont.w 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/texdeffont.w $";
@@ -40,7 +40,7 @@ void set_cur_font(internal_font_number f)
}
@ @c
-char *scaled_to_string(scaled s)
+static char *scaled_to_string(scaled s)
{ /* prints scaled real, rounded to five digits */
static char result[16];
int n, k;
diff --git a/Build/source/texk/web2c/luatexdir/tex/texfileio.w b/Build/source/texk/web2c/luatexdir/tex/texfileio.w
index c577dbad17a..f19f7873339 100644
--- a/Build/source/texk/web2c/luatexdir/tex/texfileio.w
+++ b/Build/source/texk/web2c/luatexdir/tex/texfileio.w
@@ -23,8 +23,8 @@
#include <kpathsea/absolute.h>
static const char _svn_version[] =
- "$Id: texfileio.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/texfileio.w $";
+ "$Id: texfileio.w 3612 2010-04-13 09:29:42Z taco $"
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/texfileio.w $";
@ @c
#define end_line_char int_par(end_line_char_code)
@@ -920,6 +920,9 @@ void do_zdump(char *p, int item_size, int nitems, FILE * out_file)
(void) out_file;
if (nitems == 0)
return;
+#if !defined (WORDS_BIGENDIAN) && !defined (NO_DUMP_SHARE)
+ swap_items(p, nitems, item_size);
+#endif
if (gzwrite(gz_fmtfile, (void *) p, (unsigned) (item_size * nitems)) !=
item_size * nitems) {
fprintf(stderr, "! Could not write %d %d-byte item(s): %s.\n", nitems,
@@ -940,6 +943,9 @@ void do_zundump(char *p, int item_size, int nitems, FILE * in_file)
nitems, item_size, gzerror(gz_fmtfile, &err));
uexit(1);
}
+#if !defined (WORDS_BIGENDIAN) && !defined (NO_DUMP_SHARE)
+ swap_items(p, nitems, item_size);
+#endif
}
@ @c
diff --git a/Build/source/texk/web2c/luatexdir/tex/texmath.w b/Build/source/texk/web2c/luatexdir/tex/texmath.w
index 2e76aec61dc..f435ddb312f 100644
--- a/Build/source/texk/web2c/luatexdir/tex/texmath.w
+++ b/Build/source/texk/web2c/luatexdir/tex/texmath.w
@@ -21,8 +21,8 @@
#include "ptexlib.h"
static const char _svn_version[] =
- "$Id: texmath.w 3587 2010-04-03 14:32:25Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/texmath.w $";
+ "$Id: texmath.w 3612 2010-04-13 09:29:42Z taco $ "
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/texmath.w $";
@ @c
#define mode cur_list.mode_field
@@ -143,7 +143,7 @@ and `\.{\$P\$}' produce different results (the former will not have the
will be added).
@c
-void unsave_math(void)
+static void unsave_math(void)
{
unsave();
decr(save_ptr);
@@ -200,7 +200,7 @@ void def_fam_fnt(int fam_id, int size_id, int f, int lvl)
}
@ @c
-void unsave_math_fam_data(int gl)
+static void unsave_math_fam_data(int gl)
{
sa_stack_item st;
if (math_fam_head->stack == NULL)
@@ -266,7 +266,7 @@ scaled get_math_param(int param_id, int style_id)
@ @c
-void unsave_math_param_data(int gl)
+static void unsave_math_param_data(int gl)
{
sa_stack_item st;
if (math_param_head->stack == NULL)
@@ -503,7 +503,7 @@ has special subfields |display_mlist|, |text_mlist|, |script_mlist|,
and |script_script_mlist| pointing to the mlists for each style.
@c
-pointer new_choice(void)
+static pointer new_choice(void)
{ /* create a choice node */
return new_node(choice_node, 0); /* the |subtype| is not used */
}
@@ -571,7 +571,7 @@ void show_math_node(pointer p)
@ Here are some simple routines used in the display of noads.
@c
-void print_fam_and_char(pointer p)
+static void print_fam_and_char(pointer p)
{ /* prints family and character */
tprint_esc("fam");
print_int(math_fam(p));
@@ -580,7 +580,7 @@ void print_fam_and_char(pointer p)
}
@ @c
-void print_delimiter(pointer p)
+static void print_delimiter(pointer p)
{
int a;
if (small_fam(p) < 0) {
@@ -614,7 +614,7 @@ distinguished from a missing field, because these are not equivalent
@^recursion@>
@c
-void print_subsidiary_data(pointer p, ASCII_code c)
+static void print_subsidiary_data(pointer p, ASCII_code c)
{ /* display a noad field */
if ((int) cur_length >= depth_threshold) {
if (p != null)
@@ -786,7 +786,7 @@ Here is a little routine that needs to be done whenever a subformula
is about to be processed. The parameter is a code like |math_group|.
@c
-void new_save_level_math(group_code c)
+static void new_save_level_math(group_code c)
{
set_saved_record(0, saved_textdir, 0, text_dir_ptr);
text_dir_ptr = new_dir(math_direction);
@@ -798,7 +798,7 @@ void new_save_level_math(group_code c)
}
@ @c
-void push_math(group_code c, int mstyle)
+static void push_math(group_code c, int mstyle)
{
if (math_direction != text_direction)
dir_math_save = true;
@@ -810,7 +810,7 @@ void push_math(group_code c, int mstyle)
}
@ @c
-void enter_ordinary_math(void)
+static void enter_ordinary_math(void)
{
push_math(math_shift_group, text_style);
eq_word_define(int_base + cur_fam_code, -1);
@@ -889,6 +889,37 @@ void math_left_brace(void)
(void) scan_math(nucleus(tail), m_style);
}
+@ If the inline directions of \.{\\pardir} and \.{\\mathdir} are
+opposite, then this function will return true. Discovering that fact
+is somewhat odd because it needs traversal of the |save_stack|.
+The occurance of displayed equations is weird enough that this is
+probably still better than having yet another field in the |input_stack|
+structures.
+
+None of this makes much sense if the inline direction of either one of
+\.{\\pardir} or \.{\\mathdir} is vertical, but in that case the current
+math machinery is ill suited anyway so I do not bother to test that.
+
+@c
+static boolean math_and_text_reversed_p(void)
+{
+ int i = save_ptr - 1;
+ while (save_type(i) != level_boundary)
+ i--;
+ while (i < save_ptr) {
+ if (save_type(i) == restore_old_value &&
+ save_value(i) == int_base + par_direction_code) {
+ if (textdir_opposite(math_direction, save_value(i - 1)))
+ return true;
+ }
+ i++;
+ }
+ return false;
+}
+
+
+
+
@ When we enter display math mode, we need to call |line_break| to
process the partial paragraph that has just been interrupted by the
@@ -951,6 +982,7 @@ void enter_display_math(void)
eq_word_define(dimen_base + pre_display_size_code, w);
eq_word_define(dimen_base + display_width_code, l);
eq_word_define(dimen_base + display_indent_code, s);
+ eq_word_define(int_base + pre_display_direction_code, (math_and_text_reversed_p() ? -1 : 0));
if (every_display != null)
begin_token_list(every_display, every_display_text);
if (nest_ptr == 1) {
@@ -968,7 +1000,7 @@ void enter_display_math(void)
@c
#define fam_in_range ((cur_fam>=0)&&(cur_fam<256))
-delcodeval do_scan_extdef_del_code(int extcode, boolean doclass)
+static delcodeval do_scan_extdef_del_code(int extcode, boolean doclass)
{
const char *hlp[] = {
"I'm going to use 0 instead of that illegal code value.",
@@ -1399,7 +1431,7 @@ delimiter is to be placed; the second tells if this delimiter follows
\.{\\radical} or not.
@c
-void scan_delimiter(pointer p, int r)
+static void scan_delimiter(pointer p, int r)
{
delcodeval dval = { 0, 0, 0, 0, 0, 0 };
if (r == tex_mathcode) { /* \.{\\radical} */
@@ -1923,7 +1955,7 @@ static void check_inline_math_end(void)
}
@ @c
-void resume_after_display(void)
+static void resume_after_display(void)
{
if (cur_group != math_shift_group)
confusion("display");
@@ -1944,36 +1976,6 @@ void resume_after_display(void)
}
-@ If the inline directions of \.{\\pardir} and \.{\\mathdir} are
-opposite, then this function will return true. Discovering that fact
-is somewhat odd because it needs traversal of the |save_stack|.
-The occurance of displayed equations is weird enough that this is
-probably still better than having yet another field in the |input_stack|
-structures.
-
-None of this makes much sense if the inline direction of either one of
-\.{\\pardir} or \.{\\mathdir} is vertical, but in that case the current
-math machinery is ill suited anyway so I do not bother to test that.
-
-@c
-static boolean math_and_text_reversed_p(void)
-{
- int i = save_ptr - 1;
- while (save_type(i) != level_boundary)
- i--;
- while (i < save_ptr) {
- if (save_type(i) == restore_old_value &&
- save_value(i) == int_base + par_direction_code) {
- if (textdir_opposite(math_direction, save_value(i - 1)))
- return true;
- }
- i++;
- }
- return false;
-}
-
-
-
@ The fussiest part of math mode processing occurs when a displayed formula is
being centered and placed with an optional equation number.
@@ -2000,7 +2002,9 @@ static void finish_displayed_math(boolean l, pointer a, pointer p)
pointer t; /* tail of adjustment list */
pointer pre_t; /* tail of pre-adjustment list */
boolean swap_dir; /* true if the math and surrounding text dirs are opposed */
- swap_dir = math_and_text_reversed_p();
+ swap_dir = (int_par(pre_display_direction_code) < 0 ? true : false );
+ if (a != null && swap_dir)
+ l = !l;
adjust_tail = adjust_head;
pre_adjust_tail = pre_adjust_head;
@@ -2058,12 +2062,6 @@ static void finish_displayed_math(boolean l, pointer a, pointer p)
d = 0;
}
- /* If the equation number is set on a line by itself, either before or
- after the formula, we append an infinite penalty so that no page break will
- separate the display from its number; and we use the same size and
- displacement for all three potential lines of the display, even though
- `\.{\\parshape}' may specify them differently.
- */
tail_append(new_penalty(int_par(pre_display_penalty_code)));
if ((d + line_s <= pre_display_size) || l) { /* not enough clearance */
g1 = above_display_skip_code;
@@ -2073,13 +2071,15 @@ static void finish_displayed_math(boolean l, pointer a, pointer p)
g2 = below_display_short_skip_code;
}
- if (l && (eqno_w == 0)) { /* \.{\\leqno} on a forced single line due to |width=0| */
+ /* If the equation number is set on a line by itself, either before or
+ after the formula, we append an infinite penalty so that no page break will
+ separate the display from its number; and we use the same size and
+ displacement for all three potential lines of the display, even though
+ `\.{\\parshape}' may specify them differently.
+ */
+ if (a && l && (eqno_w == 0)) { /* \.{\\leqno} on a forced single line due to |width=0| */
/* it follows that |type(a)=hlist_node| */
- if (swap_dir) {
- shift_amount(a) = line_w + line_s;
- } else {
- shift_amount(a) = line_s;
- }
+ shift_amount(a) = line_s;
append_to_vlist(a);
tail_append(new_penalty(inf_penalty));
} else {
@@ -2099,27 +2099,21 @@ static void finish_displayed_math(boolean l, pointer a, pointer p)
}
eq_box = hpack(eq_box, 0, additional, -1);
}
- if (swap_dir) {
- /* |d = line_w - d;| */
- if (eqno_w != 0) {
- if (l)
- d = line_w - width(eq_box);
- else
- d = 0;
- } else {
- d = line_w - eq_w - eqno_w - d;
- }
- }
- shift_amount(eq_box) = line_s + d;
+ if (a && math_direction == dir_TRT)
+ if (l) {
+ r = new_kern(line_w - width(eq_box));
+ vlink(eq_box) = r;
+ eq_box = hpack(eq_box, 0, additional, -1);
+ shift_amount(eq_box) = 0;
+ } else
+ shift_amount(eq_box) = 0;
+ else
+ shift_amount(eq_box) = line_s + d;
append_to_vlist(eq_box);
if ((a != null) && (eqno_w == 0) && !l) {
tail_append(new_penalty(inf_penalty));
- if (!swap_dir) {
- shift_amount(a) = line_s + line_w - width(a);
- } else {
- shift_amount(a) = line_s;
- }
+ shift_amount(a) = line_s;
append_to_vlist(a);
g2 = 0;
}
diff --git a/Build/source/texk/web2c/luatexdir/tex/texnodes.w b/Build/source/texk/web2c/luatexdir/tex/texnodes.w
index 45241b0ac29..74ee9c9bc59 100644
--- a/Build/source/texk/web2c/luatexdir/tex/texnodes.w
+++ b/Build/source/texk/web2c/luatexdir/tex/texnodes.w
@@ -19,8 +19,8 @@
@ @c
static const char _svn_version[] =
- "$Id: texnodes.w 3587 2010-04-03 14:32:25Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/texnodes.w $";
+ "$Id: texnodes.w 3612 2010-04-13 09:29:42Z taco $ "
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/texnodes.w $";
#include "ptexlib.h"
#include "lua/luatex-api.h"
@@ -828,7 +828,7 @@ static void do_free_error(halfword p)
#endif
}
-int free_error(halfword p)
+static int free_error(halfword p)
{
assert(p > my_prealloc);
assert(p < var_mem_max);
@@ -1332,7 +1332,7 @@ void check_node(halfword p)
}
@ @c
-void check_static_node_mem(void)
+static void check_static_node_mem(void)
{
dotest(zero_glue, width(zero_glue), 0);
dotest(zero_glue, type(zero_glue), glue_spec_node);
@@ -1437,7 +1437,8 @@ halfword get_node(int s)
}
@ @c
-void print_free_chain(int c)
+#ifdef DEBUG
+static void print_free_chain(int c)
{
halfword p = free_chain[c];
fprintf(stdout, "\nfree chain[%d] =\n ", c);
@@ -1447,6 +1448,7 @@ void print_free_chain(int c)
}
fprintf(stdout, "null;\n");
}
+#endif
@ @c
void free_node(halfword p, int s)
@@ -1476,7 +1478,7 @@ void free_node(halfword p, int s)
}
@ @c
-void free_node_chain(halfword q, int s)
+static void free_node_chain(halfword q, int s)
{
register halfword p = q;
while (vlink(p) != null) {
@@ -2196,7 +2198,7 @@ void print_short_node_contents(halfword p)
@ @c
-void show_pdftex_whatsit_rule_spec(int p)
+static void show_pdftex_whatsit_rule_spec(int p)
{
tprint("(");
print_rule_dimen(height(p));
@@ -2227,7 +2229,7 @@ static void print_write_whatsit(const char *s, pointer p)
@ @c
-void show_whatsit_node(int p)
+static void show_whatsit_node(int p)
{
switch (subtype(p)) {
case open_node:
diff --git a/Build/source/texk/web2c/luatexdir/tex/textcodes.w b/Build/source/texk/web2c/luatexdir/tex/textcodes.w
index ea2f1f73698..5f237c58481 100644
--- a/Build/source/texk/web2c/luatexdir/tex/textcodes.w
+++ b/Build/source/texk/web2c/luatexdir/tex/textcodes.w
@@ -21,8 +21,8 @@
#include "ptexlib.h"
static const char _svn_version[] =
- "$Id: textcodes.w 3587 2010-04-03 14:32:25Z taco $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/textcodes.w $";
+ "$Id: textcodes.w 3612 2010-04-13 09:29:42Z taco $ "
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/textcodes.w $";
@ @c
#define LCCODESTACK 8
@@ -175,10 +175,12 @@ void unsave_cat_codes(int h, quarterword gl)
}
}
-void clearcatcodestack(int h)
+#if 0
+static void clearcatcodestack(int h)
{
clear_sa_stack(catcode_heads[h]);
}
+#endif
static void initializecatcodes(void)
{
diff --git a/Build/source/texk/web2c/luatexdir/tex/textoken.w b/Build/source/texk/web2c/luatexdir/tex/textoken.w
index ac9ad1e1013..501371bc3e1 100644
--- a/Build/source/texk/web2c/luatexdir/tex/textoken.w
+++ b/Build/source/texk/web2c/luatexdir/tex/textoken.w
@@ -19,8 +19,8 @@
@ @c
static const char _svn_version[] =
- "$Id: textoken.w 3587 2010-04-03 14:32:25Z taco $"
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/tex/textoken.w $";
+ "$Id: textoken.w 3612 2010-04-13 09:29:42Z taco $"
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/textoken.w $";
#include "ptexlib.h"
@@ -554,7 +554,7 @@ halfword active_to_cs(int curchr, int force)
@ TODO this function should listen to \.{\\escapechar}
@c
-char *cs_to_string(halfword p)
+static char *cs_to_string(halfword p)
{ /* prints a control sequence */
const char *s;
char *sh;
@@ -598,7 +598,7 @@ char *cs_to_string(halfword p)
@ TODO this is a quick hack, will be solved differently soon
@c
-char *cmd_chr_to_string(int cmd, int chr)
+static char *cmd_chr_to_string(int cmd, int chr)
{
char *s;
str_number str;