2014-08-29 13:39:00

7 files changed, 13 insertions, 20 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 3a24852c4..50bf74de1 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.08.29 12:05}
+\newcontextversion{2014.08.29 13:37}
 
 %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 d38a9ba65..dafe0e619 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 65433249e..9b6fbf145 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.08.29 12:05}
+\edef\contextversion{2014.08.29 13:37}
 \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 27464faf6..eace6b775 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 3c077ae91..16c917f72 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-tag.mkiv b/tex/context/base/strc-tag.mkiv
index f758d7df3..39dba8259 100644
--- a/tex/context/base/strc-tag.mkiv
+++ b/tex/context/base/strc-tag.mkiv
@@ -328,7 +328,9 @@
    {\dodoubleempty\paragraph_start}
 
 \def\paragraph_start
-   {\iffirstargument
+   {\endgraf % we end before the group
+    \begingroup
+    \iffirstargument
       \ifsecondargument
         \doubleexpandafter\paragraph_start_two
       \else
@@ -339,41 +341,32 @@
     \fi}
 
 \def\paragraph_start_two[#1][#2]%
-   {\endgraf % we end before the group
-    \begingroup
-    \let\stopparagraph\paragraph_stop_indeed
-    \edef\currentparagraph{#1}%
+   {\edef\currentparagraph{#1}%
     \setupcurrentparagraph[#2]%
     \paragraph_start_indeed}
 
 \def\paragraph_start_one[#1][#2]%
-   {\endgraf % we end before the group
-    \begingroup
-    \let\stopparagraph\paragraph_stop_indeed
-    \doifassignmentelse{#1}
+   {\doifassignmentelse{#1}
       {\let\currentparagraph\empty
        \setupcurrentparagraph[#1]}
       {\edef\currentparagraph{#1}}%
     \paragraph_start_indeed}
 
+\def\paragraph_start_zero[#1][#2]%
+   {\let\currentparagraph\empty
+    \paragraph_start_indeed}
+
 \def\paragraph_start_indeed
   {\useparagraphstyleandcolor\c!style\c!color
    \usealignparameter\paragraphparameter
    \usesetupsparameter\paragraphparameter
    \dostarttagged\t!paragraph\currentparagraph}
 
-\def\paragraph_start_zero[#1][#2]%
-   {\let\currentparagraph\empty
-    \paragraph_start_indeed}
-
-\unexpanded\def\paragraph_stop_indeed
+\unexpanded\def\stopparagraph
    {\dostoptagged
     \endgraf % we end inside the group
     \endgroup}
 
-\unexpanded\def\stopparagraph
-   {\dostoptagged}
-
 \let\startpar\startparagraph
 \let\stoppar \stopparagraph
 
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 61356eb98..a02e2504a 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  : 08/29/14 12:05:51
+-- merge date  : 08/29/14 13:37:42
 
 do -- begin closure to overcome local limits and interference