diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-09-10 09:52:59 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-09-10 09:52:59 +0000 |
commit | 7e17932009a54c6047241ce05f043b51cce32233 (patch) | |
tree | 7b6001c89a8bbf5dee032af1048892cf9ab20373 /Build/source/texk/web2c/luatexdir/tex/texnodes.w | |
parent | 8072d653e5694112aadd35396317648fa019dc6e (diff) |
luatexdir: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@42031 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/tex/texnodes.w')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/tex/texnodes.w | 45 |
1 files changed, 33 insertions, 12 deletions
diff --git a/Build/source/texk/web2c/luatexdir/tex/texnodes.w b/Build/source/texk/web2c/luatexdir/tex/texnodes.w index 50fbe95190f..c242577404f 100644 --- a/Build/source/texk/web2c/luatexdir/tex/texnodes.w +++ b/Build/source/texk/web2c/luatexdir/tex/texnodes.w @@ -2827,9 +2827,21 @@ void show_node_wrapup_pdf(int p) @ Recursive calls on |show_node_list| therefore use the following pattern: @c #define node_list_display(A) do { \ - append_char('.'); \ - show_node_list(A); \ - flush_char(); \ + append_char('.'); \ + show_node_list(A); \ + flush_char(); \ +} while (0) + +#define node_list_display_x(A,B) do { \ + if ((B) != null) { \ + append_char('.'); \ + append_char(A); \ + append_char(' '); \ + show_node_list(B); \ + flush_char(); \ + flush_char(); \ + flush_char(); \ + } \ } while (0) /* prints a node list symbolically */ @@ -3145,17 +3157,26 @@ void show_node_list(int p) /* Display discretionary |p|; */ /* The |post_break| list of a discretionary node is indicated by a prefixed `\.{\char'174}' instead of the `\..' before the |pre_break| list. */ + /* We're not compatible anyway so ... + tprint_esc("discretionary"); + print_int(disc_penalty(p)); + print_char('|'); + if (vlink(no_break(p)) != null) { + tprint(" replacing "); + node_list_display(vlink(no_break(p))); + } + node_list_display(vlink(pre_break(p))); + append_char('|'); + show_node_list(vlink(post_break(p))); + flush_char(); + */ tprint_esc("discretionary"); + tprint(" (penalty "); print_int(disc_penalty(p)); - print_char('|'); - if (vlink(no_break(p)) != null) { - tprint(" replacing "); - node_list_display(vlink(no_break(p))); - } - node_list_display(vlink(pre_break(p))); /* recursive call */ - append_char('|'); - show_node_list(vlink(post_break(p))); - flush_char(); /* recursive call */ + print_char(')'); + node_list_display_x('<',vlink(pre_break(p))); + node_list_display_x('>',vlink(post_break(p))); + node_list_display_x('=',vlink(no_break(p))); break; case mark_node: /* Display mark |p|; */ |