beta 2014.01.25 12:20

7 files changed, 12 insertions, 13 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 11682f175..30476b17f 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{2014.01.25 02:31}
+\newcontextversion{2014.01.25 12:20}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index ce794cc6d..e643cabfc 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index ae6b43418..ca28d483d 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2014.01.25 02:31}
+\edef\contextversion{2014.01.25 12:20}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 888715735..3244dda25 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 31722b134..b157e10b2 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/typo-drp.lua b/tex/context/base/typo-drp.lua
index 57818d62f..34ad00078 100644
--- a/tex/context/base/typo-drp.lua
+++ b/tex/context/base/typo-drp.lua
@@ -205,19 +205,18 @@ actions[v_default] = function(head,setting)
     local done = false
     if getid(head) == whatsit_code and getsubtype(head) == localpar_code then
         -- begin of par
-        local first = getnext(head)
+        local first  = getnext(head)
+        local indent = false
         -- parbox .. needs to be set at 0
         if first and getid(first) == hlist_code then
-            first = getnext(first)
+            first  = getnext(first)
+            indent = true
         end
         -- we need to skip over kerns and glues (signals)
         while first and getid(first) ~= glyph_code do
             first = getnext(first)
         end
         if first and getid(first) == glyph_code then
-
--- show(head,8,"one")
-
             local ma        = setting.ma or 0
             local ca        = setting.ca
             local ta        = setting.ta
@@ -371,7 +370,7 @@ actions[v_default] = function(head,setting)
                 end
             end
             --
-            local hoffset = width + hoffset + distance + parindent
+            local hoffset = width + hoffset + distance + (indent and parindent or 0)
             for current in traverse_id(glyph_code,first) do
                 setfield(current,"xoffset",- hoffset )
                 setfield(current,"yoffset",- voffset) -- no longer - height here
@@ -391,15 +390,15 @@ actions[v_default] = function(head,setting)
                 -- We cannot set parshape yet ... when we can I'll add a slope
                 -- option (positive and negative, in emwidth).
                 local hangafter  = - lines
-                local hangindent = width + distance + parindent
+                local hangindent = width + distance
                 if trace_initials then
                     report_initials("setting hangafter to %i and hangindent to %p",hangafter,hangindent)
                 end
                 tex.hangafter  = hangafter
                 tex.hangindent = hangindent
-                if parindent ~= 0 then
-                    insert_after(first,first,new_kern(-parindent))
-                end
+            end
+            if indent then
+                insert_after(first,first,new_kern(-parindent))
             end
             done = true
         end
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 40e25a6c4..669457de7 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 01/25/14 02:31:45
+-- merge date  : 01/25/14 12:20:02
 
 do -- begin closure to overcome local limits and interference