diff options
author | Hans Hagen <pragma@wxs.nl> | 2012-01-05 19:27:20 +0100 |
---|---|---|
committer | Hans Hagen <pragma@wxs.nl> | 2012-01-05 19:27:20 +0100 |
commit | 097e1f68bc15db06fd3a6e2c46d304620655d8cb (patch) | |
tree | 1e49494343010007bd94e3677be8990f6c40a32f /tex/context/base/spac-par.mkiv | |
parent | 9a299c9ae21ca06170dda2ed6f079bd703216c5a (diff) | |
download | context-097e1f68bc15db06fd3a6e2c46d304620655d8cb.tar.gz |
beta 2011.11.08 15:20
Diffstat (limited to 'tex/context/base/spac-par.mkiv')
-rw-r--r-- | tex/context/base/spac-par.mkiv | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/tex/context/base/spac-par.mkiv b/tex/context/base/spac-par.mkiv index 433ea85c8..711a2525d 100644 --- a/tex/context/base/spac-par.mkiv +++ b/tex/context/base/spac-par.mkiv @@ -23,28 +23,25 @@ %D inside the group are forgotten afterwards. (I must %D not forget its existence). -\global\let\carriedoverpar\relax - -\def\carryoverpar#1% - {\normalexpanded % \scratchtoks{#1}% - {\noexpand#1% \the\scratchtoks +\def\carryoverpar#1% #1 can be \endgroup or \egroup or ... + {\normalexpanded + {\noexpand#1% \hangindent\the\hangindent \hangafter \the\hangafter \parskip \the\parskip \leftskip \the\leftskip \rightskip \the\rightskip}} -\newconditional \parbasedattributes +\unexpanded\def\pushparagraphproperties + {\edef\currentparagraphproperties{\carryoverpar\relax}% + \pushmacro\currentparagraphproperties} -\def\finishparbasedattributes - {\ifconditional\parbasedattributes - \setfalse\parbasedattributes - \par - \fi} +\unexpanded\def\popparagraphproperties + {\popmacro\currentparagraphproperties + \currentparagraphproperties} -\def\dostopparbasedattributes - {\settrue\parbasedattributes - \dostopattributes} +\unexpanded\def\flushparagraphproperties + {\popmacro\currentparagraphproperties} % beware, changing this will break some code (like pos/backgrounds) |