diff options
author | Taco Hoekwater <taco@elvenkind.com> | 2009-06-08 08:58:07 +0000 |
---|---|---|
committer | Taco Hoekwater <taco@elvenkind.com> | 2009-06-08 08:58:07 +0000 |
commit | 5adefaa278f30813af94c423bed99d1628b23a2c (patch) | |
tree | 76b0edd887559dcea0be9d28a569d8191f3e8307 /Build/source/texk/web2c/luatexdir/tex | |
parent | be2021a8a7f377786a2fba684fd950975c892533 (diff) |
source code for luatex 0.40.3
git-svn-id: svn://tug.org/texlive/trunk@13669 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/tex')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/filename.c | 24 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/linebreak.c | 127 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/math.c | 112 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/mlist.c | 154 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/postlinebreak.c | 18 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/primitive.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/texdeffont.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/texnodes.c | 14 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/texpdf.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/textoken.c | 8 |
10 files changed, 255 insertions, 208 deletions
diff --git a/Build/source/texk/web2c/luatexdir/tex/filename.c b/Build/source/texk/web2c/luatexdir/tex/filename.c index dccf982d899..baf13da133d 100644 --- a/Build/source/texk/web2c/luatexdir/tex/filename.c +++ b/Build/source/texk/web2c/luatexdir/tex/filename.c @@ -22,8 +22,14 @@ #include "tokens.h" #include "commands.h" + static const char _svn_version[] = - "$Id: filename.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/filename.c $"; + "$Id: filename.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/filename.c $"; + +/* for use by |scan_file_name|, it comes from fontforge's Unicode library */ + +extern char *utf8_idpb(char *w, unsigned int i); + #define wake_up_terminal() ; #define clear_terminal() ; @@ -159,8 +165,20 @@ void scan_file_name(void) if ((cur_chr == ' ') && (state != token_list) && (loc > limit) && !quoted_filename) break; - if (!more_name(cur_chr)) - break; + if (cur_chr > 127) { + unsigned char *bytes; + unsigned char thebytes[5] = { 0 }; + utf8_idpb((char *) thebytes, cur_chr); + bytes = thebytes; + while (*bytes) { + if (!more_name(*bytes)) + break; + bytes++; + } + } else { + if (!more_name(cur_chr)) + break; + } get_x_token(); } end_name(); diff --git a/Build/source/texk/web2c/luatexdir/tex/linebreak.c b/Build/source/texk/web2c/luatexdir/tex/linebreak.c index e06bd89456f..cbabc38aed1 100644 --- a/Build/source/texk/web2c/luatexdir/tex/linebreak.c +++ b/Build/source/texk/web2c/luatexdir/tex/linebreak.c @@ -22,7 +22,7 @@ #include "nodes.h" static const char _svn_version[] = - "$Id: linebreak.c 2294 2009-04-15 19:40:11Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/linebreak.c $"; + "$Id: linebreak.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/linebreak.c $"; /* Glue nodes in a horizontal list that is being paragraphed are not supposed to include ``infinite'' shrinkability; that is why the algorithm maintains @@ -606,7 +606,8 @@ static scaled best_pl_glue[4]; /*corresponding glue stretch or shrink */ * only character nodes, kern nodes, and box or rule nodes. */ -void add_to_widths(halfword s,integer line_break_dir,integer pdf_adjust_spacing, scaled *widths) +void add_to_widths(halfword s, integer line_break_dir, + integer pdf_adjust_spacing, scaled * widths) { while (s != null) { if (is_char_node(s)) { @@ -639,7 +640,7 @@ void add_to_widths(halfword s,integer line_break_dir,integer pdf_adjust_spacing, case rule_node: widths[1] += width(s); break; - case disc_node: /* TH temp */ + case disc_node: /* TH temp */ break; default: tconfusion("add_disc_widths"); @@ -655,7 +656,8 @@ void add_to_widths(halfword s,integer line_break_dir,integer pdf_adjust_spacing, * with the |add_to_widths| function. */ -void sub_from_widths(halfword s,integer line_break_dir,integer pdf_adjust_spacing, scaled *widths) +void sub_from_widths(halfword s, integer line_break_dir, + integer pdf_adjust_spacing, scaled * widths) { while (s != null) { /* @<Subtract the width of node |s| from |break_width|@>; */ @@ -689,7 +691,7 @@ void sub_from_widths(halfword s,integer line_break_dir,integer pdf_adjust_spacin case rule_node: widths[1] -= width(s); break; - case disc_node: /* TH temp */ + case disc_node: /* TH temp */ break; default: tconfusion("sub_disc_widths"); @@ -763,8 +765,10 @@ compute_break_width(int break_type, int pdf_adjust_spacing, halfword p path, as we are talking about the breaking on _this_ position. */ - sub_from_widths(vlink_no_break(p), line_break_dir, pdf_adjust_spacing, break_width); - add_to_widths (vlink_post_break(p), line_break_dir, pdf_adjust_spacing, break_width); + sub_from_widths(vlink_no_break(p), line_break_dir, pdf_adjust_spacing, + break_width); + add_to_widths(vlink_post_break(p), line_break_dir, pdf_adjust_spacing, + break_width); do_one_seven_eight(add_disc_width_to_break_width); if (vlink_post_break(p) == null) { s = vlink(p); /* no post_break: 'skip' any 'whitespace' following */ @@ -1737,7 +1741,7 @@ ext_do_line_break(boolean d, case dir_node: /* @<DIR: Adjust the dir stack for the |line_break| routine@>; */ if (dir_dir(cur_p) >= 0) { line_break_dir = dir_dir(cur_p); - push_dir_node(cur_p); /* adds to dir_ptr */ + push_dir_node(cur_p); /* adds to dir_ptr */ } else { pop_dir_node(); if (dir_ptr != null) @@ -1793,7 +1797,8 @@ ext_do_line_break(boolean d, break; case disc_node: /* select_discs are handled by the leading init_disc */ - if (subtype(cur_p)==select_disc) break; + if (subtype(cur_p) == select_disc) + break; /* @<Try to break after a discretionary fragment, then |goto done5|@>; */ /* The following code knows that discretionary texts contain only character nodes, kern nodes, box nodes, and rule @@ -1812,7 +1817,8 @@ ext_do_line_break(boolean d, last_line_fit, double_hyphen_demerits, final_hyphen_demerits, first_p, cur_p); } else { - add_to_widths(s,line_break_dir,pdf_adjust_spacing, disc_width); + add_to_widths(s, line_break_dir, pdf_adjust_spacing, + disc_width); do_one_seven_eight(add_disc_width_to_active_width); ext_try_break(actual_penalty, hyphenated_node, pdf_adjust_spacing, par_shape_ptr, @@ -1820,32 +1826,35 @@ ext_do_line_break(boolean d, pdf_protrude_chars, line_penalty, last_line_fit, double_hyphen_demerits, final_hyphen_demerits, first_p, cur_p); - if (subtype(cur_p)==init_disc) { + if (subtype(cur_p) == init_disc) { /* we should at two break points after the one we * added above: * 1 which does a possible break in INIT's post_break * 2 which means the no_break actually was broken * just a character later */ /* do the select-0 case 'f-f-i' */ - assert(type(vlink(cur_p))==disc_node && - subtype(vlink(cur_p))==select_disc); + assert(type(vlink(cur_p)) == disc_node && + subtype(vlink(cur_p)) == select_disc); s = vlink_pre_break(vlink(cur_p)); - add_to_widths(s,line_break_dir,pdf_adjust_spacing, disc_width); + add_to_widths(s, line_break_dir, pdf_adjust_spacing, + disc_width); ext_try_break(actual_penalty, hyphenated_node, pdf_adjust_spacing, par_shape_ptr, adj_demerits, tracing_paragraphs, pdf_protrude_chars, line_penalty, last_line_fit, double_hyphen_demerits, final_hyphen_demerits, first_p, - vlink(cur_p)); -#if 0 + vlink(cur_p)); +#if 0 /* TODO this does not work */ /* go back to the starting situation */ - do_one_seven_eight(sub_disc_width_from_active_width); + do_one_seven_eight + (sub_disc_width_from_active_width); do_one_seven_eight(reset_disc_width); /* add select no_break to active_width */ s = vlink_no_break(vlink(cur_p)); - add_to_widths(s,line_break_dir,pdf_adjust_spacing, disc_width); + add_to_widths(s, line_break_dir, pdf_adjust_spacing, + disc_width); ext_try_break(actual_penalty, hyphenated_node, pdf_adjust_spacing, par_shape_ptr, adj_demerits, tracing_paragraphs, @@ -1859,16 +1868,18 @@ ext_do_line_break(boolean d, } } s = vlink_no_break(cur_p); - add_to_widths(s,line_break_dir,pdf_adjust_spacing,active_width); - break; + add_to_widths(s, line_break_dir, pdf_adjust_spacing, + active_width); + break; case math_node: auto_breaking = (subtype(cur_p) == after); kern_break(); break; case penalty_node: - ext_try_break(penalty(cur_p), unhyphenated_node, pdf_adjust_spacing, - par_shape_ptr, adj_demerits, tracing_paragraphs, - pdf_protrude_chars, line_penalty, last_line_fit, + ext_try_break(penalty(cur_p), unhyphenated_node, + pdf_adjust_spacing, par_shape_ptr, adj_demerits, + tracing_paragraphs, pdf_protrude_chars, + line_penalty, last_line_fit, double_hyphen_demerits, final_hyphen_demerits, first_p, cur_p); break; @@ -1890,50 +1901,50 @@ ext_do_line_break(boolean d, } } if (cur_p == null) { - /* Try the final line break at the end of the paragraph, - and |goto done| if the desired breakpoints have been found */ - - /* The forced line break at the paragraph's end will reduce the list of - breakpoints so that all active nodes represent breaks at |cur_p=null|. - On the first pass, we insist on finding an active node that has the - correct ``looseness.'' On the final pass, there will be at least one active - node, and we will match the desired looseness as well as we can. - - The global variable |best_bet| will be set to the active node for the best - way to break the paragraph, and a few other variables are used to - help determine what is best. - */ + /* Try the final line break at the end of the paragraph, + and |goto done| if the desired breakpoints have been found */ + + /* The forced line break at the paragraph's end will reduce the list of + breakpoints so that all active nodes represent breaks at |cur_p=null|. + On the first pass, we insist on finding an active node that has the + correct ``looseness.'' On the final pass, there will be at least one active + node, and we will match the desired looseness as well as we can. + + The global variable |best_bet| will be set to the active node for the best + way to break the paragraph, and a few other variables are used to + help determine what is best. + */ ext_try_break(eject_penalty, hyphenated_node, pdf_adjust_spacing, par_shape_ptr, adj_demerits, tracing_paragraphs, pdf_protrude_chars, line_penalty, last_line_fit, - double_hyphen_demerits, final_hyphen_demerits, first_p, - cur_p); + double_hyphen_demerits, final_hyphen_demerits, + first_p, cur_p); if (vlink(active) != active) { - /* @<Find an active node with fewest demerits@>; */ + /* @<Find an active node with fewest demerits@>; */ r = vlink(active); fewest_demerits = awful_bad; do { if (type(r) != delta_node) { if (total_demerits(r) < fewest_demerits) { - fewest_demerits = total_demerits(r); - best_bet = r; + fewest_demerits = total_demerits(r); + best_bet = r; } } r = vlink(r); } while (r != active); best_line = line_number(best_bet); - + /* /Find an active node with fewest demerits; */ if (looseness == 0) goto DONE; /*@<Find the best active node for the desired looseness@>; */ - + /* The adjustment for a desired looseness is a slightly more complicated version of the loop just considered. Note that if a paragraph is broken into segments by displayed equations, each segment will be subject to the looseness calculation, independently of the other segments. - */ + */ r = vlink(active); actual_looseness = 0; do { @@ -1955,40 +1966,40 @@ ext_do_line_break(boolean d, r = vlink(r); } while (r != active); best_line = line_number(best_bet); - + /* /Find the best active node for the desired looseness; */ if ((actual_looseness == looseness) || final_pass) goto DONE; } } - + /* Clean up the memory by removing the break nodes; */ clean_up_the_memory(); /* /Clean up the memory by removing the break nodes; */ - + if (!second_pass) { if (tracing_paragraphs > 0) tprint_nl("@secondpass"); threshold = tolerance; second_pass = true; final_pass = (emergency_stretch <= 0); - } else { /* if at first you do not succeed, \dots */ + } else { /* if at first you do not succeed, \dots */ if (tracing_paragraphs > 0) tprint_nl("@emergencypass"); background[2] += emergency_stretch; final_pass = true; } } - -DONE: + + DONE: if (tracing_paragraphs > 0) { end_diagnostic(true); normalize_selector(); } if (do_last_line_fit) { - /* Adjust \(t)the final line of the paragraph; */ - /* Here we either reset |do_last_line_fit| or adjust the |par_fill_skip| glue. - */ + /* Adjust \(t)the final line of the paragraph; */ + /* Here we either reset |do_last_line_fit| or adjust the |par_fill_skip| glue. + */ if (active_short(best_bet) == 0) { do_last_line_fit = false; } else { @@ -1999,18 +2010,18 @@ DONE: glue_ptr(last_line_fill) = q; } } - + /* @<Break the paragraph at the chosen...@>; */ /* Once the best sequence of breakpoints has been found (hurray), we call on the procedure |post_line_break| to finish the remainder of the work. (By introducing this subprocedure, we are able to keep |line_break| from getting extremely long.) - */ - + */ + /* first thing |ext_post_line_break| does is reset |dir_ptr| */ flush_node_list(dir_ptr); - dir_ptr=null; - + dir_ptr = null; + ext_post_line_break(d, right_skip, left_skip, diff --git a/Build/source/texk/web2c/luatexdir/tex/math.c b/Build/source/texk/web2c/luatexdir/tex/math.c index 8f84383267d..7b74fbbfb5c 100644 --- a/Build/source/texk/web2c/luatexdir/tex/math.c +++ b/Build/source/texk/web2c/luatexdir/tex/math.c @@ -27,8 +27,8 @@ #include "tokens.h" static const char _svn_version[] = - "$Id: math.c 2376 2009-05-08 08:40:13Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/math.c $"; + "$Id: math.c 2448 2009-06-08 07:43:50Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/math.c $"; #define mode cur_list.mode_field #define head cur_list.head_field @@ -211,7 +211,7 @@ void def_fam_fnt(integer fam_id, integer size_id, integer f, integer lvl) begin_diagnostic(); tprint("{assigning"); print_char(' '); - print_cmd_chr(def_family_cmd,size_id); + print_cmd_chr(def_family_cmd, size_id); print_int(fam_id); print_char('='); print_font_identifier(fam_fnt(fam_id, size_id)); @@ -238,7 +238,7 @@ void unsave_math_fam_data(integer gl) begin_diagnostic(); tprint("{restoring"); print_char(' '); - print_cmd_chr(def_family_cmd,size_id); + print_cmd_chr(def_family_cmd, size_id); print_int(fam_id); print_char('='); print_font_identifier(fam_fnt(fam_id, size_id)); @@ -267,8 +267,8 @@ void def_math_param(int param_id, int style_id, scaled value, int lvl) begin_diagnostic(); tprint("{assigning"); print_char(' '); - print_cmd_chr(set_math_param_cmd,param_id); - print_cmd_chr(math_style_cmd,style_id); + print_cmd_chr(set_math_param_cmd, param_id); + print_cmd_chr(math_style_cmd, style_id); print_char('='); print_int(value); print_char('}'); @@ -301,8 +301,8 @@ void unsave_math_param_data(integer gl) begin_diagnostic(); tprint("{restoring"); print_char(' '); - print_cmd_chr(set_math_param_cmd,param_id); - print_cmd_chr(math_style_cmd,style_id); + print_cmd_chr(set_math_param_cmd, param_id); + print_cmd_chr(math_style_cmd, style_id); print_char('='); print_int(get_math_param(param_id, style_id)); print_char('}'); @@ -456,7 +456,7 @@ i.e., a smaller style has a larger numerical value. @:TeXbook}{\sl The \TeX book@> */ -const char *math_style_names[] = { +const char *math_style_names[] = { "display", "crampeddisplay", "text", "crampedtext", "script", "crampedscript", @@ -467,22 +467,22 @@ const char *math_style_names[] = { const char *math_param_names[] = { "quad", "axis", "operatorsize", "overbarkern", "overbarrule", "overbarvgap", - "underbarkern","underbarrule", "underbarvgap", + "underbarkern", "underbarrule", "underbarvgap", "radicalkern", "radicalrule", "radicalvgap", "radicaldegreebefore", "radicaldegreeafter", "radicaldegreeraise", "stackvgap", "stacknumup", "stackdenomdown", "fractionrule", "fractionnumvgap", "fractionnumup", - "fractiondenomvgap","fractiondenomdown", "fractiondelsize", + "fractiondenomvgap", "fractiondenomdown", "fractiondelsize", "limitabovevgap", "limitabovebgap", "limitabovekern", "limitdownvgap", "limitdownbgap", "limitdownkern", "underdelimitervgap", "underdelimiterbgap", "overdelimitervgap", "overdelimiterbgap", "subshiftdrop", "supshiftdrop", "subshiftdown", - "subsupshiftdown","subtopmax", "supshiftup", + "subsupshiftdown", "subtopmax", "supshiftup", "supbottommin", "supsubbottommax", "subsupvgap", "spaceafterscript", "connectoroverlapmin", - "ordordspacing", "ordopspacing","ordbinspacing","ordrelspacing", - "ordopenspacing","ordclosespacing", "ordpunctspacing","ordinnerspacing", + "ordordspacing", "ordopspacing", "ordbinspacing", "ordrelspacing", + "ordopenspacing", "ordclosespacing", "ordpunctspacing", "ordinnerspacing", "opordspacing", "opopspacing", "opbinspacing", "oprelspacing", "opopenspacing", "opclosespacing", "oppunctspacing", "opinnerspacing", "binordspacing", "binopspacing", "binbinspacing", "binrelspacing", @@ -490,14 +490,19 @@ const char *math_param_names[] = { "relordspacing", "relopspacing", "relbinspacing", "relrelspacing", "relopenspacing", "relclosespacing", "relpunctspacing", "relinnerspacing", "openordspacing", "openopspacing", "openbinspacing", "openrelspacing", - "openopenspacing", "openclosespacing", "openpunctspacing", "openinnerspacing", + "openopenspacing", "openclosespacing", "openpunctspacing", + "openinnerspacing", "closeordspacing", "closeopspacing", "closebinspacing", "closerelspacing", - "closeopenspacing", "closeclosespacing", "closepunctspacing", "closeinnerspacing", + "closeopenspacing", "closeclosespacing", "closepunctspacing", + "closeinnerspacing", "punctordspacing", "punctopspacing", "punctbinspacing", "punctrelspacing", - "punctopenspacing", "punctclosespacing", "punctpunctspacing", "punctinnerspacing", + "punctopenspacing", "punctclosespacing", "punctpunctspacing", + "punctinnerspacing", "innerordspacing", "inneropspacing", "innerbinspacing", "innerrelspacing", - "inneropenspacing", "innerclosespacing", "innerpunctspacing", "innerinnerspacing", - NULL }; + "inneropenspacing", "innerclosespacing", "innerpunctspacing", + "innerinnerspacing", + NULL +}; pointer new_style(small_number s) { /* create a style node */ @@ -542,7 +547,7 @@ void show_math_node(pointer p) { switch (type(p)) { case style_node: - print_cmd_chr(math_style_cmd,subtype(p)); + print_cmd_chr(math_style_cmd, subtype(p)); break; case choice_node: tprint_esc("mathchoice"); @@ -659,12 +664,12 @@ void display_normal_noad(pointer p) switch (type(p)) { case simple_noad: switch (subtype(p)) { - case ord_noad_type: - tprint_esc("mathord"); + case ord_noad_type: + tprint_esc("mathord"); break; - case op_noad_type_normal: - case op_noad_type_limits: - case op_noad_type_no_limits: + case op_noad_type_normal: + case op_noad_type_limits: + case op_noad_type_no_limits: tprint_esc("mathop"); if (subtype(p) == op_noad_type_limits) tprint_esc("limits"); @@ -832,20 +837,20 @@ called for. void init_math(void) { - if ( cur_cmd == math_shift_cmd ) { - get_token(); /* |get_x_token| would fail on \.{\\ifmmode}\thinspace! */ + if (cur_cmd == math_shift_cmd) { + get_token(); /* |get_x_token| would fail on \.{\\ifmmode}\thinspace! */ if ((cur_cmd == math_shift_cmd) && (mode > 0)) { enter_display_math(); } else { back_input(); enter_ordinary_math(); } - } else if (cur_cmd==math_shift_cs_cmd && cur_chr == display_style ) { + } else if (cur_cmd == math_shift_cs_cmd && cur_chr == display_style) { enter_display_math(); - } else if (cur_cmd==math_shift_cs_cmd && cur_chr == text_style ) { + } else if (cur_cmd == math_shift_cs_cmd && cur_chr == text_style) { enter_ordinary_math(); } else { - you_cant(); + you_cant(); } } @@ -1313,7 +1318,8 @@ void set_math_char(mathcodeval mval) math_fam(nucleus(p)) = cur_fam; subtype(p) = ord_noad_type; } else { - switch (mval.class_value) { + switch (mval.class_value) { + /* *INDENT-OFF* */ case 0: subtype(p) = ord_noad_type; break; case 1: subtype(p) = op_noad_type_normal; break; case 2: subtype(p) = bin_noad_type; break; @@ -1321,7 +1327,8 @@ void set_math_char(mathcodeval mval) case 4: subtype(p) = open_noad_type; break; case 5: subtype(p) = close_noad_type; break; case 6: subtype(p) = punct_noad_type; break; - } + /* *INDENT-ON* */ + } } vlink(tail) = p; tail = p; @@ -1362,7 +1369,7 @@ void math_math_comp(void) subtype(tail) = cur_chr; q = new_node(math_char_node, 0); nucleus(tail) = q; - if (cur_chr==over_noad_type) + if (cur_chr == over_noad_type) (void) scan_math(nucleus(tail), cramped_style(m_style)); else (void) scan_math(nucleus(tail), m_style); @@ -1478,8 +1485,8 @@ void math_radical(void) else tconfusion("math_radical"); if (chr_code == 3) { - /* the trick with the |vlink(q)| is used by |scan_math| - to decide whether it needs to go on */ + /* the trick with the |vlink(q)| is used by |scan_math| + to decide whether it needs to go on */ q = new_node(math_char_node, 0); vlink(q) = tail; degree(tail) = q; @@ -1598,7 +1605,7 @@ void build_choices(void) break; } /* there are no other cases */ incr(saved(-1)); - push_math(math_choice_group, (prev_style+2)); + push_math(math_choice_group, (prev_style + 2)); scan_left_brace(); } @@ -1615,8 +1622,7 @@ void sub_sup(void) q = new_node(sub_mlist_node, 0); nucleus(tail) = q; } - if (cur_cmd == sup_mark_cmd || - cur_chr == sup_mark_cmd ) { /* super_sub_script */ + if (cur_cmd == sup_mark_cmd || cur_chr == sup_mark_cmd) { /* super_sub_script */ if (supscr(tail) != null) { char *hlp[] = { "I treat `x^1^2' essentially like `x^1{}^2'.", NULL @@ -1629,8 +1635,7 @@ void sub_sup(void) q = new_node(math_char_node, 0); supscr(tail) = q; (void) scan_math(supscr(tail), sup_style(m_style)); - } else if (cur_cmd == sub_mark_cmd || - cur_chr == sub_mark_cmd ) { + } else if (cur_cmd == sub_mark_cmd || cur_chr == sub_mark_cmd) { if (subscr(tail) != null) { char *hlp[] = { "I treat `x_1_2' essentially like `x_1{}_2'.", NULL @@ -1765,7 +1770,7 @@ void close_math_group(pointer p) math_list(saved(0)) = p; if (p != null) { if (vlink(p) == null) { - if (type(p) == simple_noad && subtype(p) == ord_noad_type ) { + if (type(p) == simple_noad && subtype(p) == ord_noad_type) { if (subscr(p) == null && supscr(p) == null) { type(saved(0)) = type(nucleus(p)); if (type(nucleus(p)) == math_char_node) { @@ -1775,14 +1780,15 @@ void close_math_group(pointer p) math_list(saved(0)) = math_list(nucleus(p)); math_list(nucleus(p)) = null; } - delete_attribute_ref(node_attr(saved(0))); + delete_attribute_ref(node_attr(saved(0))); node_attr(saved(0)) = node_attr(nucleus(p)); node_attr(nucleus(p)) = null; flush_node(p); } - } else if (type(p) == accent_noad) { - if (saved(0) == nucleus(tail)) { - if (type(tail) == simple_noad && subtype(tail) == ord_noad_type) { + } else if (type(p) == accent_noad) { + if (saved(0) == nucleus(tail)) { + if (type(tail) == simple_noad + && subtype(tail) == ord_noad_type) { q = head; while (vlink(q) != tail) q = vlink(q); @@ -1790,7 +1796,7 @@ void close_math_group(pointer p) nucleus(tail) = null; subscr(tail) = null; supscr(tail) = null; - delete_attribute_ref(node_attr(p)); + delete_attribute_ref(node_attr(p)); node_attr(p) = node_attr(tail); node_attr(tail) = null; flush_node(tail); @@ -1928,10 +1934,10 @@ void after_math(void) p = fin_mlist(null); /* this pops the nest */ if (cur_cmd == math_shift_cs_cmd && (cur_chr == text_style || cur_chr == display_style)) { - you_cant(); + you_cant(); } if (mode == -m) { /* end of equation number */ - if (cur_cmd == math_shift_cmd ) { + if (cur_cmd == math_shift_cmd) { check_second_math_shift(); } else { check_display_math_end(); @@ -1973,12 +1979,12 @@ void after_math(void) unsave_math(); } else { if (a == null) { - if (cur_cmd == math_shift_cmd) { + if (cur_cmd == math_shift_cmd) { check_second_math_shift(); } else { check_display_math_end(); } - } + } run_mlist_to_hlist(p, display_style, false); finish_displayed_math(l, danger, a); } @@ -2180,7 +2186,7 @@ void finish_display_alignment(pointer p, pointer q, memory_word aux_save) /* Interface to \.{\\Umath} and \.{\\mathstyle} */ -void setup_math_style (void) +void setup_math_style(void) { pointer q; tail_append(new_noad()); @@ -2190,9 +2196,9 @@ void setup_math_style (void) } -void print_math_style (void) +void print_math_style(void) { - if (abs(mode)==mmode) + if (abs(mode) == mmode) print_int(m_style); else print_int(-1); diff --git a/Build/source/texk/web2c/luatexdir/tex/mlist.c b/Build/source/texk/web2c/luatexdir/tex/mlist.c index c6528ddb300..45442af88da 100644 --- a/Build/source/texk/web2c/luatexdir/tex/mlist.c +++ b/Build/source/texk/web2c/luatexdir/tex/mlist.c @@ -24,7 +24,7 @@ #include "commands.h" static const char _svn_version[] = - "$Id: mlist.c 2414 2009-06-03 12:57:01Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/mlist.c $"; + "$Id: mlist.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/mlist.c $"; #define delimiter_factor int_par(param_delimiter_factor_code) #define delimiter_shortfall dimen_par(param_delimiter_shortfall_code) @@ -237,7 +237,7 @@ static scaled get_math_quad_size(int b) else if (b == script_script_size) var = script_script_style; else - var = text_style; + var = text_style; return get_math_param(math_param_quad, var); } @@ -831,11 +831,16 @@ void fixup_math_parameters(integer fam_id, integer size_id, integer f, DEFINE_DMATH_PARAMETERS(math_param_sub_shift_down, size_id, font_MATH_par(f, SubscriptShiftDown), lvl); - if (font_MATH_par(f, SubscriptShiftDownWithSuperscript)!=undefined_math_parameter) { + if (font_MATH_par(f, SubscriptShiftDownWithSuperscript) != + undefined_math_parameter) { DEFINE_MATH_PARAMETERS(math_param_sub_sup_shift_down, size_id, - font_MATH_par(f, SubscriptShiftDownWithSuperscript), lvl); + font_MATH_par(f, + SubscriptShiftDownWithSuperscript), + lvl); DEFINE_DMATH_PARAMETERS(math_param_sub_sup_shift_down, size_id, - font_MATH_par(f, SubscriptShiftDownWithSuperscript), lvl); + font_MATH_par(f, + SubscriptShiftDownWithSuperscript), + lvl); } else { DEFINE_MATH_PARAMETERS(math_param_sub_sup_shift_down, size_id, font_MATH_par(f, SubscriptShiftDown), lvl); @@ -1038,22 +1043,26 @@ void fixup_math_parameters(integer fam_id, integer size_id, integer f, /* The display-size radical_vgap is done twice because it needs values from both the sy and the ex font. */ - DEFINE_DMATH_PARAMETERS(math_param_radical_vgap, size_id, - (default_rule_thickness(size_id) + - (abs(math_x_height(size_id)) / 4)), lvl); - - DEFINE_MATH_PARAMETERS(math_param_radical_degree_raise, size_id, - 60, lvl); - DEFINE_DMATH_PARAMETERS(math_param_radical_degree_raise, size_id, - 60, lvl); + DEFINE_DMATH_PARAMETERS(math_param_radical_vgap, size_id, + (default_rule_thickness(size_id) + + (abs(math_x_height(size_id)) / 4)), lvl); + + DEFINE_MATH_PARAMETERS(math_param_radical_degree_raise, size_id, + 60, lvl); + DEFINE_DMATH_PARAMETERS(math_param_radical_degree_raise, size_id, + 60, lvl); DEFINE_MATH_PARAMETERS(math_param_radical_degree_before, size_id, - xn_over_d(get_math_quad_size(size_id), 5, 18), lvl); + xn_over_d(get_math_quad_size(size_id), 5, 18), + lvl); DEFINE_DMATH_PARAMETERS(math_param_radical_degree_before, size_id, - xn_over_d(get_math_quad_size(size_id), 5, 18), lvl); - DEFINE_MATH_PARAMETERS(math_param_radical_degree_after,size_id, - (-xn_over_d(get_math_quad_size(size_id), 10, 18)), lvl); - DEFINE_DMATH_PARAMETERS(math_param_radical_degree_after,size_id, - (-xn_over_d(get_math_quad_size(size_id), 10, 18)), lvl); + xn_over_d(get_math_quad_size(size_id), 5, 18), + lvl); + DEFINE_MATH_PARAMETERS(math_param_radical_degree_after, size_id, + (-xn_over_d + (get_math_quad_size(size_id), 10, 18)), lvl); + DEFINE_DMATH_PARAMETERS(math_param_radical_degree_after, size_id, + (-xn_over_d + (get_math_quad_size(size_id), 10, 18)), lvl); } else if (fam_id == 3 && is_old_mathfont(f, total_mathex_params)) { /* fix old-style |ex| parameters */ @@ -1162,9 +1171,9 @@ void fixup_math_parameters(integer fam_id, integer size_id, integer f, /* The display-size radical_vgap is done twice because it needs values from both the sy and the ex font. */ - DEFINE_DMATH_PARAMETERS(math_param_radical_vgap, size_id, - (default_rule_thickness(size_id) + - (abs(math_x_height(size_id)) / 4)), lvl); + DEFINE_DMATH_PARAMETERS(math_param_radical_vgap, size_id, + (default_rule_thickness(size_id) + + (abs(math_x_height(size_id)) / 4)), lvl); } } @@ -1178,7 +1187,7 @@ void finalize_math_parameters(void) def_math_param(math_param_space_after_script, display_style, script_space, level_one); def_math_param(math_param_space_after_script, text_style, - script_space, level_one); + script_space, level_one); def_math_param(math_param_space_after_script, script_style, script_space, level_one); def_math_param(math_param_space_after_script, script_script_style, @@ -2095,7 +2104,7 @@ void run_mlist_to_hlist(pointer p, integer mstyle, boolean penalties) int a, sfix; lua_State *L = Luas; if (p == null) { - vlink(temp_head) = null; + vlink(temp_head) = null; return; } finalize_math_parameters(); @@ -2107,7 +2116,7 @@ void run_mlist_to_hlist(pointer p, integer mstyle, boolean penalties) return; } nodelist_to_lua(L, p); /* arg 1 */ - lua_pushstring(L, math_style_names[mstyle]); /* arg 2 */ + lua_pushstring(L, math_style_names[mstyle]); /* arg 2 */ lua_pushboolean(L, penalties); /* arg 3 */ if (lua_pcall(L, 3, 1, 0) != 0) { /* 3 args, 1 result */ fprintf(stdout, "error: %s\n", lua_tostring(L, -1)); @@ -2118,13 +2127,13 @@ void run_mlist_to_hlist(pointer p, integer mstyle, boolean penalties) a = nodelist_from_lua(L); lua_settop(L, sfix); vlink(temp_head) = a; - } else if (callback_id==0) { + } else if (callback_id == 0) { cur_mlist = p; cur_style = mstyle; mlist_penalties = penalties; mlist_to_hlist(); } else { - vlink(temp_head) = null; + vlink(temp_head) = null; } } @@ -2362,10 +2371,10 @@ void make_radical(pointer q) height(x) + depth(x) + clr + theta); } left_delimiter(q) = null; - delta = (depth(y)+height(y)-theta) - (height(x) + depth(x) + clr); + delta = (depth(y) + height(y) - theta) - (height(x) + depth(x) + clr); if (delta > 0) - clr = clr + half(delta); /* increase the actual clearance */ - shift_amount(y) = (height(y)-theta)-(height(x) + clr); + clr = clr + half(delta); /* increase the actual clearance */ + shift_amount(y) = (height(y) - theta) - (height(x) + clr); h = depth(y) + height(y); p = overbar(x, clr, theta, radical_kern(cur_style), node_attr(y)); vlink(y) = p; @@ -2384,16 +2393,16 @@ void make_radical(pointer q) x = new_kern(ar); reset_attributes(x, node_attr(degree(q))); vlink(x) = y; - shift_amount(r) = - - ((xn_over_d(h, radical_degree_raise(cur_style), 100)) - - depth(y) - shift_amount(y)); + shift_amount(r) = + -((xn_over_d(h, radical_degree_raise(cur_style), 100)) - + depth(y) - shift_amount(y)); vlink(r) = x; x = new_kern(br); reset_attributes(x, node_attr(degree(q))); vlink(x) = r; y = x; } - math_list(degree(q)) = null; /* for \Uroot ..{<list>}{} */ + math_list(degree(q)) = null; /* for \Uroot ..{<list>}{} */ flush_node(degree(q)); } p = hpack(y, 0, additional); @@ -2566,8 +2575,8 @@ void do_make_math_accent(pointer q, internal_font_number f, integer c, } } else { /* new skewchar madness for bot accents */ s = char_bot_accent(cur_f, cur_c); - if (s == 0) { /* better than nothing: */ - s = char_top_accent(cur_f, cur_c); + if (s == 0) { /* better than nothing: */ + s = char_top_accent(cur_f, cur_c); } if (s != 0) { s_is_absolute = true; @@ -2814,44 +2823,45 @@ scaled make_op(pointer q) if (type(nucleus(q)) == math_char_node) { fetch(nucleus(q)); if (cur_style < text_style) { /* try to make it larger */ - ok_size = minimum_operator_size(cur_style); + ok_size = minimum_operator_size(cur_style); if (ok_size != undefined_math_parameter) { - /* creating a temporary delimiter is the cleanest way */ - y = new_node(delim_node, 0); - small_fam(y) = math_fam(nucleus(q)); - small_char(y) = math_character(nucleus(q)); - x = var_delimiter (y, text_size, ok_size); - delta = 0; + /* creating a temporary delimiter is the cleanest way */ + y = new_node(delim_node, 0); + small_fam(y) = math_fam(nucleus(q)); + small_char(y) = math_character(nucleus(q)); + x = var_delimiter(y, text_size, ok_size); + delta = 0; } else { ok_size = height_plus_depth(cur_f, cur_c) + 1; while ((char_tag(cur_f, cur_c) == list_tag) && - height_plus_depth(cur_f, cur_c) < ok_size) { - c = char_remainder(cur_f, cur_c); - if (!char_exists(cur_f, c)) + height_plus_depth(cur_f, cur_c) < ok_size) { + c = char_remainder(cur_f, cur_c); + if (!char_exists(cur_f, c)) break; - cur_c = c; - math_character(nucleus(q)) = c; - } - delta = char_italic(cur_f, cur_c); - x = clean_box(nucleus(q), cur_style); - if ((subscr(q) != null) && (subtype(q) != op_noad_type_limits)) - width(x) = width(x) - delta; /* remove italic correction */ - shift_amount(x) = half(height(x) - depth(x)) - math_axis(cur_size); - /* center vertically */ - } - type(nucleus(q)) = sub_box_node; - math_list(nucleus(q)) = x; - - } else { /* normal size */ + cur_c = c; + math_character(nucleus(q)) = c; + } + delta = char_italic(cur_f, cur_c); + x = clean_box(nucleus(q), cur_style); + if ((subscr(q) != null) && (subtype(q) != op_noad_type_limits)) + width(x) = width(x) - delta; /* remove italic correction */ + shift_amount(x) = + half(height(x) - depth(x)) - math_axis(cur_size); + /* center vertically */ + } + type(nucleus(q)) = sub_box_node; + math_list(nucleus(q)) = x; + + } else { /* normal size */ delta = char_italic(cur_f, cur_c); - x = clean_box(nucleus(q), cur_style); - if ((subscr(q) != null) && (subtype(q) != op_noad_type_limits)) - width(x) = width(x) - delta; /* remove italic correction */ - shift_amount(x) = half(height(x) - depth(x)) - math_axis(cur_size); - /* center vertically */ - type(nucleus(q)) = sub_box_node; - math_list(nucleus(q)) = x; - } + x = clean_box(nucleus(q), cur_style); + if ((subscr(q) != null) && (subtype(q) != op_noad_type_limits)) + width(x) = width(x) - delta; /* remove italic correction */ + shift_amount(x) = half(height(x) - depth(x)) - math_axis(cur_size); + /* center vertically */ + type(nucleus(q)) = sub_box_node; + math_list(nucleus(q)) = x; + } } else { delta = 0; } @@ -3079,7 +3089,7 @@ scaled math_kern_at(internal_font_number f, integer c, int side, int v) kerns_heights = co->bottom_right_math_kern_array; } else { tconfusion("math_kern_at"); - kerns_heights = NULL; /* not reached */ + kerns_heights = NULL; /* not reached */ } #ifdef DEBUG fprintf(stderr, " entry 0: %d,%d\n", kerns_heights[0], kerns_heights[1]); @@ -3299,11 +3309,11 @@ void make_scripts(pointer q, pointer p, scaled it) sub_mark_cmd, shift_down); if (delta2 != MATH_KERN_NOT_FOUND && delta2 != 0) { p = attach_hkern_to_new_hlist(q, delta2); - } + } } } /* now the horizontal shift for the superscript. */ - /* the superscript is also to be shifted by |delta1| (the italic correction)*/ + /* the superscript is also to be shifted by |delta1| (the italic correction) */ clr = MATH_KERN_NOT_FOUND; if (is_char_node(p) && supscr(q) != null && type(subscr(q)) == math_char_node) { @@ -3315,7 +3325,7 @@ void make_scripts(pointer q, pointer p, scaled it) } } if (delta2 == MATH_KERN_NOT_FOUND) - delta2=0; + delta2 = 0; if (clr != MATH_KERN_NOT_FOUND) { shift_amount(x) = clr + delta1 - delta2; } else { diff --git a/Build/source/texk/web2c/luatexdir/tex/postlinebreak.c b/Build/source/texk/web2c/luatexdir/tex/postlinebreak.c index 2b238f87cd0..6e10980d374 100644 --- a/Build/source/texk/web2c/luatexdir/tex/postlinebreak.c +++ b/Build/source/texk/web2c/luatexdir/tex/postlinebreak.c @@ -22,7 +22,7 @@ #include "nodes.h" static const char _svn_version[] = - "$Id: postlinebreak.c 2294 2009-04-15 19:40:11Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/postlinebreak.c $"; + "$Id: postlinebreak.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/postlinebreak.c $"; /* 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 @@ -218,7 +218,7 @@ void ext_post_line_break(boolean d, assert(a != null); assert(v != null); switch (subtype(r)) { - case select_disc: + case select_disc: if (vlink_pre_break(r) != null) { flush_node_list(vlink_pre_break(r)); vlink_pre_break(r) = null; @@ -230,8 +230,8 @@ void ext_post_line_break(boolean d, vlink_no_break(r) = null; tlink_no_break(r) = null; } - - assert(type(a)==disc_node && subtype(a)==init_disc); + + assert(type(a) == disc_node && subtype(a) == init_disc); flush_node_list(vlink_no_break(a)); vlink_no_break(a) = null; tlink_no_break(a) = null; @@ -241,17 +241,17 @@ void ext_post_line_break(boolean d, flush_node_list(vlink_post_break(a)); vlink_post_break(a) = null; tlink_post_break(a) = null; - + break; - case init_disc: - assert(type(v)==disc_node && subtype(v)==select_disc); - subtype(v) = syllable_disc; /* not special any more */ + case init_disc: + assert(type(v) == disc_node && subtype(v) == select_disc); + subtype(v) = syllable_disc; /* not special any more */ flush_node_list(vlink_no_break(v)); vlink_no_break(v) = vlink_post_break(r); tlink_no_break(v) = tlink_post_break(r); vlink_post_break(r) = null; tlink_post_break(r) = null; - default: + default: if (vlink_no_break(r) != null) { flush_node_list(vlink_no_break(r)); vlink_no_break(r) = null; diff --git a/Build/source/texk/web2c/luatexdir/tex/primitive.c b/Build/source/texk/web2c/luatexdir/tex/primitive.c index 61422a2058d..8e459bf1750 100644 --- a/Build/source/texk/web2c/luatexdir/tex/primitive.c +++ b/Build/source/texk/web2c/luatexdir/tex/primitive.c @@ -25,7 +25,7 @@ #include "tokens.h" static const char _svn_version[] = - "$Id: primitive.c 2297 2009-04-15 20:16:38Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/primitive.c $"; + "$Id: primitive.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/primitive.c $"; /* as usual, the file starts with a bunch of #defines that mimic pascal @ds */ diff --git a/Build/source/texk/web2c/luatexdir/tex/texdeffont.c b/Build/source/texk/web2c/luatexdir/tex/texdeffont.c index bdd3cfa043e..4e41870d738 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texdeffont.c +++ b/Build/source/texk/web2c/luatexdir/tex/texdeffont.c @@ -25,7 +25,7 @@ #include "commands.h" static const char _svn_version[] = - "$Id: texdeffont.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/texdeffont.c $"; + "$Id: texdeffont.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/texdeffont.c $"; #define text(a) hash[(a)].rh /* string number for control sequence name */ #define null_cs 1 /* equivalent of \.{\\csname\\endcsname} */ diff --git a/Build/source/texk/web2c/luatexdir/tex/texnodes.c b/Build/source/texk/web2c/luatexdir/tex/texnodes.c index 8da9fe3b290..5f425cf2f92 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texnodes.c +++ b/Build/source/texk/web2c/luatexdir/tex/texnodes.c @@ -28,7 +28,7 @@ #define noDEBUG static const char _svn_version[] = - "$Id: texnodes.c 2329 2009-04-18 14:25:30Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/texnodes.c $"; + "$Id: texnodes.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/texnodes.c $"; #define append_char(A) str_pool[pool_ptr++]=(A) #define cur_length (pool_ptr - str_start_macro(str_ptr)) @@ -662,7 +662,7 @@ halfword copy_node(const halfword p) add_token_ref(write_tokens(p)); break; case pdf_literal_node: - copy_pdf_literal(r,p); + copy_pdf_literal(r, p); break; case pdf_colorstack_node: if (pdf_colorstack_cmd(p) <= colorstack_data) @@ -948,7 +948,7 @@ void flush_node(halfword p) delete_token_ref(write_tokens(p)); break; case pdf_literal_node: - free_pdf_literal(p); + free_pdf_literal(p); break; case pdf_colorstack_node: if (pdf_colorstack_cmd(p) <= colorstack_data) @@ -1180,7 +1180,7 @@ void check_node(halfword p) check_token_ref(write_tokens(p)); break; case pdf_literal_node: - if (pdf_literal_type(p)==normal) + if (pdf_literal_type(p) == normal) check_token_ref(pdf_literal_data(p)); break; case pdf_colorstack_node: @@ -1978,7 +1978,8 @@ void build_attribute_list(halfword b) attr_list_ref(attr_list_cache)++; node_attr(b) = attr_list_cache; #ifdef DEBUG - fprintf(stderr, "Added attrlist (%d) to node %d (count=%d)\n", node_attr(b), b, attr_list_ref(attr_list_cache)) ; + fprintf(stderr, "Added attrlist (%d) to node %d (count=%d)\n", + node_attr(b), b, attr_list_ref(attr_list_cache)); #endif } } @@ -1989,7 +1990,8 @@ void delete_attribute_ref(halfword b) assert(type(b) == attribute_list_node); attr_list_ref(b)--; #ifdef DEBUG - fprintf(stderr, "Removed attrlistref (%d) (count=%d)\n", b, attr_list_ref(b)) ; + fprintf(stderr, "Removed attrlistref (%d) (count=%d)\n", b, + attr_list_ref(b)); #endif if (attr_list_ref(b) == 0) { if (b == attr_list_cache) diff --git a/Build/source/texk/web2c/luatexdir/tex/texpdf.c b/Build/source/texk/web2c/luatexdir/tex/texpdf.c index 5c80298e43c..e84a336e46a 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texpdf.c +++ b/Build/source/texk/web2c/luatexdir/tex/texpdf.c @@ -22,7 +22,7 @@ #include <ctype.h> static const char _svn_version[] = - "$Id: texpdf.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/texpdf.c $"; + "$Id: texpdf.c 2271 2009-04-12 23:42:21Z oneiros $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/texpdf.c $"; #define number_chars 1114112 #define string_offset 2097152 diff --git a/Build/source/texk/web2c/luatexdir/tex/textoken.c b/Build/source/texk/web2c/luatexdir/tex/textoken.c index c3d8bae09ee..aa632fe1557 100644 --- a/Build/source/texk/web2c/luatexdir/tex/textoken.c +++ b/Build/source/texk/web2c/luatexdir/tex/textoken.c @@ -24,7 +24,7 @@ #include "commands.h" static const char _svn_version[] = - "$Id: textoken.c 2321 2009-04-18 09:17:13Z hhenkel $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.2/source/texk/web2c/luatexdir/tex/textoken.c $"; + "$Id: textoken.c 2448 2009-06-08 07:43:50Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.40.3/source/texk/web2c/luatexdir/tex/textoken.c $"; #define skipping 1 /* |scanner_status| when passing conditional text */ #define defining 2 /* |scanner_status| when reading a macro definition */ @@ -216,7 +216,7 @@ boolean scan_keyword(char *s) pointer p; /* tail of the backup list */ pointer q; /* new node being added to the token list via |store_new_token| */ char *k; /* index into |str_pool| */ - pointer save_cur_cs = cur_cs; + pointer save_cur_cs = cur_cs; if (strlen(s) == 1) { /* @<Get the next non-blank non-call token@>; */ do { @@ -225,7 +225,7 @@ boolean scan_keyword(char *s) if ((cur_cs == 0) && ((cur_chr == *s) || (cur_chr == *s - 'a' + 'A'))) { return true; } else { - cur_cs = save_cur_cs; + cur_cs = save_cur_cs; back_input(); return false; } @@ -249,7 +249,7 @@ boolean scan_keyword(char *s) } else { back_input(); } - cur_cs = save_cur_cs; + cur_cs = save_cur_cs; return false; } } |