beta 2011.02.14 19:48

8 files changed, 16 insertions, 9 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 098a998de..9dcdf261e 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2011.02.14 18:50}
+\newcontextversion{2011.02.14 19:48}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 66d087466..17d3a9959 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2011.02.14 18:50}
+\newcontextversion{2011.02.14 19:48}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 6ce2a0c58..8f888a30c 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.02.14 18:50}
+\edef\contextversion{2011.02.14 19:48}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 1f3c32c13..2791cd0f0 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.02.14 18:50}
+\edef\contextversion{2011.02.14 19:48}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/data-tex.lua b/tex/context/base/data-tex.lua
index d6c375b52..fddd04bcc 100644
--- a/tex/context/base/data-tex.lua
+++ b/tex/context/base/data-tex.lua
@@ -82,10 +82,14 @@ function helpers.textopener(tag,filename,filehandle)
     elseif trace_locating then
         report_tex("%s opener, '%s' opened",tag,filename)
     end
+    local noflines = #lines
+    if lines[noflines] == "" then -- maybe some special check is needed
+        lines[noflines] = nil
+    end
     logs.show_open(filename)
     return {
         filename    = filename,
-        noflines    = #lines,
+        noflines    = noflines,
         currentline = 0,
         close       = function()
             if trace_locating then
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index cedd20dc6..56441cb1e 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/strc-ref.mkiv b/tex/context/base/strc-ref.mkiv
index 281cf838b..ecda0387d 100644
--- a/tex/context/base/strc-ref.mkiv
+++ b/tex/context/base/strc-ref.mkiv
@@ -926,9 +926,9 @@
 \setvalue{\??rf\c!interaction\v!all}%
   {\leftofreference
    \the\leftreferencetoks
-   \leftofreferencecontent
+   \doifsometokselse\leftreferencetoks \leftofreferencecontent \donothing
    \currentreferencecontent
-   \rightofreferencecontent
+   \doifsometokselse\rightreferencetoks\rightofreferencecontent\donothing
    \the\rightreferencetoks
    \rightofreference}
 
@@ -988,7 +988,10 @@
        \defaultrightreferencetoks
        \let\rightofreferencecontent\empty
      \fi
-   \goto{\referencesequence}[#4]%
+   \doifreferencefoundelse{#4} % we need to resolve the text
+     {\goto{\referencesequence}[#4]}
+     {\let\currentreferencecontent\dummyreference
+      \goto{\referencesequence}[#4]}%
    \dostopgotoreference}
 
 \unexpanded\def\dospecialin{\dostartgotoreference\let\currentreferencecontent\currentreferencedefault\dopickupgotoreference}
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 0968ff77e..bc825a306 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 02/14/11 18:50:16
+-- merge date  : 02/14/11 19:48:13
 
 do -- begin closure to overcome local limits and interference