summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2008-03-24 12:30:44 +0000
committerJonathan Kew <jfkthame@googlemail.com>2008-03-24 12:30:44 +0000
commit7b9d9abb23b1362aa8337675cab7be3893145b1c (patch)
treefbe72e0cb35248990dad5e890858229bda7eaa7b /Build/source/texk
parent9b4fd9b4eef2ee05aa73efb0368e36e699e238be (diff)
update xetex to build with 3.1415926
git-svn-id: svn://tug.org/texlive/trunk@7119 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/web2c/synctex/synctex.ch4
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeX_ext.c8
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeX_ext.h1
-rw-r--r--Build/source/texk/web2c/xetexdir/xetex.ch22
-rw-r--r--Build/source/texk/web2c/xetexdir/xetex.defines1
5 files changed, 13 insertions, 23 deletions
diff --git a/Build/source/texk/web2c/synctex/synctex.ch b/Build/source/texk/web2c/synctex/synctex.ch
index cd207ffe55f..835a0ea777a 100644
--- a/Build/source/texk/web2c/synctex/synctex.ch
+++ b/Build/source/texk/web2c/synctex/synctex.ch
@@ -365,13 +365,13 @@ type(page_head):=glue_node; subtype(page_head):=normal;
@x
@<Move the cursor past a pseudo-ligature...@>=
main_p:=lig_ptr(lig_stack);
-if main_p>null then tail_append(main_p);
+if main_p>null then tail_append(main_p); {append a single character}
temp_ptr:=lig_stack; lig_stack:=link(temp_ptr);
free_node(temp_ptr,small_node_size);
@y
@<Move the cursor past a pseudo-ligature...@>=
main_p:=lig_ptr(lig_stack);
-if main_p>null then tail_append(main_p);
+if main_p>null then tail_append(main_p); {append a single character}
temp_ptr:=lig_stack; lig_stack:=link(temp_ptr);
free_node(temp_ptr,small_node_size); {{\sl synctex} node size watch point: proper size!}
@z
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
index ec0f851f543..e49cb8abe06 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
@@ -443,14 +443,6 @@ getencodingmodeandinfo(integer* info)
}
void
-printcstring(const char* str)
-{
- if (str != NULL)
- while (*str)
- printvisiblechar(*(str++));
-}
-
-void
printutf8str(const unsigned char* str, int len)
{
while (len-- > 0)
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
index 843758bf75a..e019569969e 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
@@ -223,7 +223,6 @@ extern "C" {
void linebreakstart(integer localeStrNum, const UniChar* text, integer textLength);
int linebreaknext();
int getencodingmodeandinfo(integer* info);
- void printcstring(const char* str);
void printutf8str(const unsigned char* str, int len);
void printchars(const unsigned short* str, int len);
void* load_mapping_file(const char* s, const char* e);
diff --git a/Build/source/texk/web2c/xetexdir/xetex.ch b/Build/source/texk/web2c/xetexdir/xetex.ch
index 618292f7434..559c9b10c60 100644
--- a/Build/source/texk/web2c/xetexdir/xetex.ch
+++ b/Build/source/texk/web2c/xetexdir/xetex.ch
@@ -69,19 +69,19 @@ authorization from SIL International.
@z
@x
-@d eTeX_banner_k=='This is e-TeXk, Version 3.141592',eTeX_version_string
-@d eTeX_banner=='This is e-TeX, Version 3.141592',eTeX_version_string
+@d eTeX_banner_k=='This is e-TeXk, Version 3.1415926',eTeX_version_string
+@d eTeX_banner=='This is e-TeX, Version 3.1415926',eTeX_version_string
{printed when \eTeX\ starts}
@#
-@d TeX_banner_k=='This is TeXk, Version 3.141592' {printed when \TeX\ starts}
-@d TeX_banner=='This is TeX, Version 3.141592' {printed when \TeX\ starts}
+@d TeX_banner_k=='This is TeXk, Version 3.1415926' {printed when \TeX\ starts}
+@d TeX_banner=='This is TeX, Version 3.1415926' {printed when \TeX\ starts}
@#
@d banner==eTeX_banner
@d banner_k==eTeX_banner_k
@y
-@d XeTeX_banner=='This is XeTeX, Version 3.141592',eTeX_version_string,XeTeX_version_string
+@d XeTeX_banner=='This is XeTeX, Version 3.1415926',eTeX_version_string,XeTeX_version_string
{printed when \XeTeX\ starts}
-@d XeTeX_banner_k=='This is XeTeXk, Version 3.141592',eTeX_version_string,XeTeX_version_string
+@d XeTeX_banner_k=='This is XeTeXk, Version 3.1415926',eTeX_version_string,XeTeX_version_string
@#
@d banner==XeTeX_banner
@d banner_k==XeTeX_banner_k
@@ -2042,9 +2042,9 @@ declared at this point.
@z
@x
-primitive("par",par_end,256); {cf. |scan_file_name|}
+primitive("par",par_end,256); {cf.\ |scan_file_name|}
@y
-primitive("par",par_end,too_big_char); {cf. |scan_file_name|}
+primitive("par",par_end,too_big_char); {cf.\ |scan_file_name|}
@z
@x
@@ -3874,7 +3874,7 @@ if not no_pdf_output then fflush(dvi_file);
end else print(").");
end else begin
print_nl("Error "); print_int(k); print(" (");
- if no_pdf_output then printcstring(strerror(k))
+ if no_pdf_output then print_c_string(strerror(k))
else print("driver return code");
print(") generating output;");
print_nl("file "); print(output_file_name); print(" may not be valid.");
@@ -3919,7 +3919,7 @@ shift_amount(r):=0;
@x
@p procedure append_to_vlist(@!b:pointer);
var d:scaled; {deficiency of space between baselines}
-@!p:pointer; {a new glue specification}
+@!p:pointer; {a new glue node}
begin if prev_depth>ignore_depth then
begin d:=width(baseline_skip)-prev_depth-height(b);
if d<line_skip_limit then p:=new_param_glue(line_skip_code)
@@ -3933,7 +3933,7 @@ end;
@y
@p procedure append_to_vlist(@!b:pointer);
var d:scaled; {deficiency of space between baselines}
-@!p:pointer; {a new glue specification}
+@!p:pointer; {a new glue node}
@!upwards:boolean;
begin upwards:=XeTeX_upwards;
if prev_depth>ignore_depth then
diff --git a/Build/source/texk/web2c/xetexdir/xetex.defines b/Build/source/texk/web2c/xetexdir/xetex.defines
index 4374d18fe5f..51ba19c1353 100644
--- a/Build/source/texk/web2c/xetexdir/xetex.defines
+++ b/Build/source/texk/web2c/xetexdir/xetex.defines
@@ -58,7 +58,6 @@ authorization from SIL International.
@define procedure setdelcode1();
@define function readcint1();
@define procedure setcint1();
-@define procedure printcstring();
@define procedure printutf8str();
@define procedure setinputfileencoding();
@define procedure terminatefontmanager;