2016-01-12 16:26:00

1 files changed, 804 insertions, 0 deletions

diff --git a/tex/context/base/mkiv/typo-del.mkiv b/tex/context/base/mkiv/typo-del.mkiv
new file mode 100644
index 000000000..ebba94428
--- /dev/null
+++ b/tex/context/base/mkiv/typo-del.mkiv
@@ -0,0 +1,804 @@
+%D \module
+%D   [       file=typo-del, % moved from core-mis,
+%D        version=20110112,
+%D          title=\CONTEXT\ Typesetting Macros,
+%D       subtitle=Delimited Content,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% todo: textstyle|color for inline \quotation etc
+
+\writestatus{loading}{ConTeXt Typesetting Macros / Delimited Content}
+
+\unprotect
+
+\ifdefined\dotagsetdelimitedsymbol   \else \let\dotagsetdelimitedsymbol  \gobbleoneargument \fi
+\ifdefined\dotagsetsubsentencesymbol \else \let\dotagsetsubsentencesymbol\gobbleoneargument \fi
+
+% THIS IS OBSOLETE:
+
+\installcorenamespace{hyphenmarksign} % let's not waste a setuphandler (yet)
+
+\unexpanded\def\setuphyphenmark[#1]% sign=normal|wide
+  {\getdummyparameters[#1]%
+   \expandnamespaceparameter\??hyphenmarksign\dummyparameter\c!sign\v!normal}
+
+\setvalue{\??hyphenmarksign\v!normal}%
+  {\let\textmodehyphen\normalhyphen
+   \let\textmodehyphendiscretionary\normalhyphendiscretionary}
+
+\setvalue{\??hyphenmarksign\v!wide}%
+  {\let\textmodehyphen\composedhyphen
+   \let\textmodehyphendiscretionary\composedhyphendiscretionary}
+
+\setuphyphenmark[\c!sign=\v!wide]
+
+\definesymbol[\c!lefthyphen]  [\languageparameter\c!lefthyphen]
+\definesymbol[\c!righthyphen] [\languageparameter\c!righthyphen]
+\definesymbol[\c!hyphen]      [\languageparameter\c!hyphen]
+
+\unexpanded\def\normalhyphen
+  {\hbox{\directsymbol\empty\c!hyphen}}
+
+\unexpanded\def\composedhyphen
+  {\hbox{\directsymbol\empty\c!compoundhyphen}}
+
+\unexpanded\def\normalhyphendiscretionary
+  {\discretionary
+     {\hbox{\directsymbol\empty\c!righthyphen}}
+     {\hbox{\directsymbol\empty\c!lefthyphen}}
+     {\hbox{\directsymbol\empty\c!hyphen}}}
+
+\unexpanded\def\composedhyphendiscretionary
+  {\discretionary
+     {\hbox{\directsymbol\empty\c!rightcompoundhyphen}}
+     {\hbox{\directsymbol\empty\c!leftcompoundhyphen}}
+     {\hbox{\directsymbol\empty\c!compoundhyphen}}}
+
+\let\textmodehyphen             \composedhyphen
+\let\textmodehyphendiscretionary\composedhyphendiscretionary
+
+\definesymbol[\c!leftcompoundhyphen]  [\languageparameter\c!leftcompoundhyphen]
+\definesymbol[\c!rightcompoundhyphen] [\languageparameter\c!rightcompoundhyphen]
+\definesymbol[\c!compoundhyphen]      [\languageparameter\c!compoundhyphen]
+
+% TILL HERE
+
+\setnewconstant\boundarycharactermode\plusone
+
+\unexpanded\def\midboundarycharacter#1#2%
+  {\ifcase\boundarycharactermode
+   \or
+     %\nobreak
+     \hskip\hspaceamount\currentusedlanguage{#2}%
+     \usedlanguageparameter#1%
+     %\nobreak
+     \hskip\hspaceamount\currentusedlanguage{#2}%
+   \or
+     \usedlanguageparameter#1%
+   \fi
+   \boundarycharactermode\plusone}
+
+\unexpanded\def\leftboundarycharacter#1#2%
+  {\ifcase\boundarycharactermode
+   \or
+     \usedlanguageparameter#1%
+     \nobreak
+     \hskip\hspaceamount\currentusedlanguage{#2}%
+   \or
+     \usedlanguageparameter#1%
+   \fi
+   \boundarycharactermode\plusone}
+
+\unexpanded\def\rightboundarycharacter#1#2%
+  {\ifcase\boundarycharactermode
+   \or
+     \prewordbreak %\nobreak
+     \hskip\hspaceamount\currentusedlanguage{#2}%
+     \usedlanguageparameter#1%
+   \or
+     \usedlanguageparameter#1%
+   \fi
+   \boundarycharactermode\plusone}
+
+\definehspace [sentence]      [\zeropoint]
+\definehspace [intersentence] [.250\emwidth]
+
+\definesymbol
+  [\c!midsentence]
+  [\midboundarycharacter\c!midsentence{sentence}]
+
+\definesymbol
+  [\c!leftsentence]
+  [\leftboundarycharacter\c!leftsentence{sentence}]
+
+\definesymbol
+  [\c!rightsentence]
+  [\rightboundarycharacter\c!rightsentence{sentence}]
+
+\definesymbol
+  [\c!leftsubsentence]
+  [\leftboundarycharacter\c!leftsubsentence{sentence}]
+
+\definesymbol
+  [\c!rightsubsentence]
+  [\rightboundarycharacter\c!rightsubsentence{sentence}]
+
+\newsignal \d_typo_subsentence_signal
+\newcount  \c_typo_subsentence_nesting
+
+\let\beforesubsentence\donothing
+\let\aftersubsentence \donothing
+
+% todo: make this language option
+%
+% \def\beforesubsentence{\removeunwantedspaces}
+% \def\aftersubsentence {\ignorespaces}
+
+\unexpanded\def\midsentence
+  {\dostarttagged\t!subsentencesymbol\empty
+   \dotagsetsubsentencesymbol\s!middle
+   \symbol[\c!midsentence]%
+   \dostoptagged}
+
+\unexpanded\def\beginofsubsentence
+  {\beforesubsentence
+   \ifdim\lastkern=\d_typo_subsentence_signal
+     \unskip
+     \kern\hspaceamount\currentusedlanguage{intersentence}%
+   \fi
+   \global\advance\c_typo_subsentence_nesting\plusone
+   \ifnum\c_typo_subsentence_nesting=\plusone
+     \dontleavehmode % was \leaveoutervmode
+   \fi
+   \dostarttagged\t!subsentence\empty % no chain
+   \dostarttagged\t!subsentencesymbol\empty
+   \dotagsetsubsentencesymbol\s!left
+   \symbol[\ifodd\c_typo_subsentence_nesting\c!leftsentence\else\c!leftsubsentence\fi]%
+   \dostoptagged
+   \dostarttagged\t!subsentencecontent\empty
+  }%  \ignorespaces}
+
+\unexpanded\def\endofsubsentence % relax prevents space gobbling
+  {\dostoptagged
+   \dostarttagged\t!subsentencesymbol\empty
+   \dotagsetsubsentencesymbol\s!right
+   \symbol[\ifodd\c_typo_subsentence_nesting\c!rightsentence\else\c!rightsubsentence\fi]%
+   \dostoptagged
+   \dostoptagged
+   \global\advance\c_typo_subsentence_nesting\minusone
+   \unskip
+   \kern\d_typo_subsentence_signal\relax
+   \aftersubsentence}
+
+\unexpanded\def\beginofsubsentencespacing % relax prevents space gobbling
+  {\kern\d_typo_subsentence_signal\relax}% \ignorespaces}
+
+\unexpanded\def\endofsubsentencespacing
+  {\ifdim\lastkern=\d_typo_subsentence_signal
+     \unskip
+     \hskip\hspaceamount\currentusedlanguage{intersentence}%
+     % no good, actually language dependent:
+%     \ignorespaces
+   \else
+     \unskip
+   \fi}
+
+%D \startbuffer
+%D test |<|test |<|test|>| test|>| test \par
+%D test|<|test|<|test|>|test|>|test \par
+%D test |<||<|test|>||>| test \par
+%D test \directdiscretionary{<}test\directdiscretionary{>} test \par
+%D \stopbuffer
+%D
+%D \typebuffer
+%D \getbuffer
+
+\unexpanded\def\startsubsentence{\beginofsubsentence     \prewordbreak\beginofsubsentencespacing}
+\unexpanded\def\stopsubsentence {\endofsubsentencespacing\prewordbreak\endofsubsentence}
+\unexpanded\def\subsentence     {\groupedcommand\startsubsentence\stopsubsentence}
+
+\definehspace [quotation]      [\zeropoint]
+\definehspace [interquotation] [.125em]
+
+%definehspace [quote]  [\zeropoint]
+%definehspace [speech] [\zeropoint]
+
+\definehspace [quote]  [\hspaceamount\currentusedlanguage{quotation}]
+\definehspace [speech] [\hspaceamount\currentusedlanguage{quotation}]
+
+\definesymbol
+  [\c!leftquotation]
+  [\leftboundarycharacter\c!leftquotation{quotation}]
+
+\definesymbol
+  [\c!rightquotation]
+  [\rightboundarycharacter\c!rightquotation{quotation}]
+
+\definesymbol
+  [\c!nextleftquotation]
+  [\rightboundarycharacter\c!leftquotation{quotation}]
+
+\definesymbol
+  [\c!nextrightquotation]
+  [\leftboundarycharacter\c!rightquotation{quotation}]
+
+\definesymbol
+  [\c!leftquote]
+  [\leftboundarycharacter\c!leftquote{quote}]
+
+\definesymbol
+  [\c!rightquote]
+  [\rightboundarycharacter\c!rightquote{quote}]
+
+\definesymbol
+  [\c!leftspeech]
+  [\leftboundarycharacter\c!leftspeech{speech}]
+
+\definesymbol
+  [\c!rightspeech]
+  [\rightboundarycharacter\c!rightspeech{speech}]
+
+\definesymbol
+  [\c!middlespeech]
+  [\leftboundarycharacter\c!middlespeech{speech}]
+
+\appendtoks
+    \def\quotation#1{"#1"}%
+    \def\quote    #1{'#1'}%
+\to \everysimplifycommands
+
+%D The next features was so desperately needed by Giuseppe Bilotta that he made a
+%D module for it. Since this is a typical example of core functionality, I decided
+%D to extend the low level quotation macros in such a way that a speech feature
+%D could be build on top of it. The speech opening and closing symbols are defined
+%D per language. Italian is an example of a language that has them set.
+
+\newsignal\d_typo_delimited_signal
+
+\let\currentdelimitedtext\s!unknown
+
+\let\delimitedtextlevel\!!zerocount
+
+\def\c_typo_delimited_nesting{\csname\??delimitedtextlevel\currentparentdelimitedtext\endcsname}
+
+\def\typo_delimited_push#1%
+  {\globalpushmacro\currentdelimitedtext
+   \def\currentdelimitedtext{#1}%
+   \setlanguageparameter\delimitedtextparameter
+   \let\currentparentdelimitedtext\currentdelimitedtext
+   \global\advance\c_typo_delimited_nesting\plusone
+   \edef\delimitedtextlevel{\number\c_typo_delimited_nesting}%
+   \normalexpanded{\chaintocurrentdelimitedtext{\currentparentdelimitedtext:\delimitedtextlevel}}%
+   \edef\currentdelimitedtext{\currentparentdelimitedtext:\delimitedtextlevel}}
+
+\def\typo_delimited_pop
+  {\global\advance\c_typo_delimited_nesting\minusone
+   \globalpopmacro\currentdelimitedtext}
+
+\installcorenamespace{delimitedtext}
+\installcorenamespace{delimitedtextlevel}
+
+\installcommandhandler \??delimitedtext {delimitedtext} \??delimitedtext
+
+\appendtoks
+    \expandafter\newcount\csname\??delimitedtextlevel\currentdelimitedtext\endcsname
+    \setuevalue{\currentdelimitedtext        }{\delimitedtext[\currentdelimitedtext]}%
+    \setuevalue{\e!start\currentdelimitedtext}{\startdelimitedtext[\currentdelimitedtext]}%
+    \setuevalue{\e!stop \currentdelimitedtext}{\stopdelimitedtext}%
+\to \everydefinedelimitedtext
+
+\setupdelimitedtext
+  [\c!location=\v!margin, % \v!text \v!paragraph
+   \c!spacebefore=,
+   \c!spaceafter=\delimitedtextparameter\c!spacebefore,
+   \c!style=\v!normal,
+   \c!color=,
+   \c!leftmargin=\zeropoint,
+   \c!rightmargin=\delimitedtextparameter\c!leftmargin,
+   \c!indentnext=\v!yes,
+   \c!before=,
+   \c!after=,
+   \c!left=,
+   \c!right=,
+  %\c!level=0,
+   \c!method=,
+   \c!repeat=\v!no]
+
+\def\typo_delimited_repeat_ideed
+  {\relax\ifcase\delimitedtextlevel\else
+     \typo_delimited_handle_middle\c!middle
+   \fi}
+
+\let\typo_delimited_repeat\relax
+
+\unexpanded\def\startdelimitedtext[#1]%
+  {\begingroup
+   \typo_delimited_push{#1}%
+   \dostarttaggedchained\t!delimitedblock\currentdelimitedtext\??delimitedtext
+   \edef\p_delimited_method{\delimitedtextparameter\c!method}%
+   \ifx\p_delimited_method\s!font
+     \expandafter\typo_delimited_start_font
+   \else
+     \expandafter\typo_delimited_start_other
+   \fi}
+
+\let\typo_delimited_stop\relax % hooks into \everypar
+
+\def\typo_delimited_start_font
+  {\let\typo_delimited_stop\typo_delimitedtexts_finish_font
+   \dostarttagged\t!delimitedsymbol\empty
+   \dotagsetdelimitedsymbol\s!left
+   \delimitedtextparameter\c!left
+   \dostoptagged
+   \ignorespaces}
+
+\def\typo_delimited_start_other
+  {\edef\p_delimited_repeat{\delimitedtextparameter\c!repeat}%
+   \ifx\p_delimited_repeat\v!yes
+     \let\typo_delimited_repeat\typo_delimited_repeat_ideed
+   \else
+     \let\typo_delimited_repeat\relax
+   \fi
+   \edef\p_delimited_location{\delimitedtextparameter\c!location}%
+   \ifx\p_delimited_location\v!paragraph
+     \singleexpandafter\typo_delimited_start_par
+   \else\ifx\p_delimited_location\v!margin
+     \doubleexpandafter\typo_delimited_start_par
+   \else
+     \doubleexpandafter\typo_delimited_start_txt
+   \fi\fi}
+
+\def\typo_delimitedtexts_finish_font
+  {\removeunwantedspaces
+   \dostarttagged\t!delimitedsymbol\empty
+   \dotagsetdelimitedsymbol\s!right
+   \delimitedtextparameter\c!right
+   \dostoptagged}
+
+\def\typo_delimited_start_par
+  {\dosingleempty\typo_delimited_start_par_indeed}
+
+\let\typo_delimited_stop_par_indeed\endgraf
+
+\def\typo_delimited_start_par_indeed[#1]%
+  {\let\typo_delimited_stop\typo_delimited_stop_par
+   \edef\p_delimited_spacebefore{\delimitedtextparameter\c!spacebefore}%
+   \ifx\p_delimited_spacebefore\empty \else
+     \blank[\p_delimited_spacebefore]%
+   \fi
+   \delimitedtextparameter\c!before
+   \edef\m_typo_delimited_narrower{#1}%
+   \ifx\m_typo_delimited_narrower\empty
+     \endgraf
+     \doadaptleftskip {\delimitedtextparameter\c!leftmargin}%
+     \doadaptrightskip{\delimitedtextparameter\c!rightmargin}%
+     \let\typo_delimited_stop_par_indeed\endgraf
+   \else % backward compatible direct directive
+     \startnarrower[#1]%
+     \let\typo_delimited_stop_par_indeed\stopnarrower
+   \fi
+   % so far
+   \pushmacro\checkindentation
+   \useindentingparameter\delimitedtextparameter
+   %
+   \begingroup
+   \usedelimitedtextstyleandcolor\c!style\c!color
+   %
+   \edef\p_delimited_left     {\delimitedtextparameter{\c!left}}%
+   \edef\p_delimited_right    {\delimitedtextparameter{\c!right}}%
+   \edef\p_delimited_nextleft {\delimitedtextparameter{\c!nextleft}}%
+   \edef\p_delimited_nextright{\delimitedtextparameter{\c!nextright}}%
+   %
+   \leftdelimitedtextmark
+   %
+   \setnextleftdelimitedtextmark
+   \setnextrightdelimitedtextmark
+   %
+   \ignorespaces
+   \dostarttagged\t!delimitedcontent\empty}
+
+\def\typo_delimited_stop_par
+  {\removeunwantedspaces
+   \removelastskip
+   \dostoptagged
+   \rightdelimitedtextmark
+   \carryoverpar\endgroup % new per 2013-01-21 ... please left floats
+   \popmacro\checkindentation
+   \typo_delimited_stop_par_indeed
+   \delimitedtextparameter\c!after
+   \edef\p_delimited_spaceafter{\delimitedtextparameter\c!spaceafter}%
+   \ifx\p_delimited_spaceafter\empty \else
+     \blank[\p_delimited_spaceafter]%
+   \fi
+   \useindentnextparameter\delimitedtextparameter
+   \aftergroup\dorechecknextindentation}% AM: This was missing!
+
+\def\typo_delimited_start_txt
+  {\let\typo_delimited_stop\typo_delimited_stop_txt
+   \begingroup
+   \usedelimitedtextstyleandcolor\c!style\c!color
+   \typo_delimited_handle_left\c!left
+   \ignorespaces
+   \dostarttagged\t!delimitedcontent\empty}
+
+\def\typo_delimited_stop_txt
+  {\removeunwantedspaces
+   \dostoptagged
+   \typo_delimited_handle_right\c!right
+   \endgroup}
+
+\unexpanded\def\stopdelimitedtext
+  {\typo_delimited_stop
+   \dostoptagged
+   \typo_delimited_pop
+   \endgroup}
+
+\unexpanded\def\delimitedtext[#1]%
+  {\dontleavehmode % following ones can be omited
+   \typo_delimited_push{#1}%
+   \edef\p_delimited_method{\delimitedtextparameter\c!method}%
+   \ifx\p_delimited_method\s!font
+     \expandafter\typo_delimited_fontdriven
+   \else
+     \expandafter\typo_delimited_other
+   \fi}
+
+\def\typo_delimited_other
+  {\edef\p_delimited_location{\delimitedtextparameter\c!location}%
+   \ifx\p_delimited_location\v!paragraph
+     \singleexpandafter\typo_delimited_par
+   \else\ifx\p_delimited_location\v!margin
+     \doubleexpandafter\typo_delimited_par
+   \else
+     \doubleexpandafter\typo_delimited_txt
+   \fi\fi}
+
+% shortcuts
+
+\unexpanded\def\startdelimited{\startdelimitedtext}
+\unexpanded\def\stopdelimited {\stopdelimitedtext}  % no let, dynamically assigned
+           \def\delimited     {\delimitedtext}
+
+% todo: \dostarttagged\t!nothing\empty % for left/right boxes
+
+%D We have 4 different location and symbol handlers (two pairs):
+%D
+%D \starttyping
+%D \input tufte \startquotation \input tufte \stopquotation
+%D
+%D \setupdelimitedtext
+%D   [quotation]
+%D   [nextleft=right,
+%D    nextright=left]
+%D
+%D \input tufte \startquotation \input tufte \stopquotation
+%D
+%D \setupdelimitedtext
+%D   [quotation]
+%D   [nextleft={\symbol[nextleftquotation]},
+%D    nextright={\symbol[nextrightquotation]}]
+%D
+%D \input tufte \startquotation \input tufte \stopquotation
+%D \stoptyping
+
+\unexpanded\def\setnextleftdelimitedtextmark
+  {\ifx\p_delimited_nextleft\empty
+      % nothing
+   \else\ifx\p_delimited_nextleft\v!left
+     \typo_delimited_nextleft_symbol\p_delimited_left
+   \else\ifx\p_delimited_nextleft\v!right
+     \typo_delimited_nextleft_symbol\p_delimited_right
+   \else
+     \typo_delimited_nextleft_symbol\p_delimited_nextleft
+   \fi\fi\fi}
+
+\unexpanded\def\setnextrightdelimitedtextmark
+  {\ifx\p_delimited_nextright\empty
+      % nothing
+   \else\ifx\p_delimited_nextright\v!right
+     \typo_delimited_nextright_symbol\p_delimited_right
+   \else\ifx\p_delimited_nextright\v!left
+     \typo_delimited_nextright_symbol\p_delimited_left
+   \else
+     \typo_delimited_nextright_symbol\p_delimited_nextright
+   \fi\fi\fi}
+
+\unexpanded\def\leftdelimitedtextmark
+  {\ifx\p_delimited_left\empty
+      % nothing
+   \else
+     \typo_delimited_left_symbol\p_delimited_left
+   \fi}
+
+\unexpanded\def\rightdelimitedtextmark
+  {\ifx\p_delimited_right\empty
+      % nothing
+   \else
+      \typo_delimited_right_symbol\p_delimited_right
+   \fi}
+
+\def\typo_delimited_left_symbol#1%
+  {\dostarttagged\t!delimitedsymbol\empty
+   \dotagsetdelimitedsymbol\s!left
+   \setbox\scratchbox\hbox{\usedelimitedtextstyleandcolor\c!symstyle\c!symcolor#1}%
+   \dontleavehmode
+   \edef\p_delimited_margin{\delimitedtextparameter\c!location}%
+   \ifx\p_delimited_margin\v!margin
+      \hskip-\wd\scratchbox
+   \fi
+   \box\scratchbox
+   \dostoptagged}
+
+\def\typo_delimited_right_symbol#1%
+  {\dostarttagged\t!delimitedsymbol\empty
+   \dotagsetdelimitedsymbol\s!right
+   \hsmash{\usedelimitedtextstyleandcolor\c!symstyle\c!symcolor#1}%
+   \dostoptagged}
+
+\def\typo_delimited_nextleft_symbol#1%
+  {\localleftbox\bgroup
+     \swapmacros\leftboundarycharacter\rightboundarycharacter
+     \boundarycharactermode\plusone
+     \typo_delimited_left_symbol#1%
+   \egroup}
+
+\def\typo_delimited_nextright_symbol#1%
+  {\localrightbox\bgroup
+     \swapmacros\leftboundarycharacter\rightboundarycharacter
+     \boundarycharactermode\plusone
+     \typo_delimited_right_symbol#1%
+   \egroup}
+
+% \starttext
+%    \hyphenatedword{groepsvrijstellingsverordeningen}\par
+%    \hyphenatedword{\quote{groepsvrijstellingsverordeningen}}\par
+%     \dorecurse{100}{\hskip300pt\hskip\recurselevel pt test \quote{xxx xxxx}.\par}
+%     \page \setuppapersize[A5][A4]
+%     \quotation {overly beautiful pusillanimous sesquipedalian
+%     longwinded} test test test test test test test test test test test
+%     test test test test test test test test test test test test test
+%     test test test test test test test test test test test test test
+%     test test test test test test test test test test test test test
+%     test test test
+% \stoptext
+
+\def\typo_delimited_handle_middle#1%
+  {\dostoptagged
+   \begingroup
+   \usedelimitedtextstyleandcolor\c!symstyle\c!symcolor
+   \setbox\scratchbox\hbox{\delimitedtextparameter#1}%
+   \ifdim\wd\scratchbox>\zeropoint
+     \ifdim\lastkern=\d_typo_delimited_signal
+       \unkern
+       \hskip\hspaceamount\currentusedlanguage{interquotation}%
+     \fi
+     \ifhmode % else funny pagebeaks
+       \penalty\plustenthousand
+       \hskip\zeropoint % == \prewordbreak
+     \fi
+     \strut % new, needed below
+     \dostarttagged\t!delimitedsymbol\empty
+     \dotagsetdelimitedsymbol\s!middle
+     \delimitedtextparameter#1% unhbox\scratchbox
+     \dostoptagged
+   % \penalty\plustenthousand % else overfull boxes, but that's better than dangling periods
+     \kern\d_typo_delimited_signal % +- \prewordbreak
+   \fi
+   \endgroup
+   \dostarttagged\t!delimitedcontent\empty}
+
+\def\typo_delimited_handle_left#1%
+  {\begingroup
+   \usedelimitedtextstyleandcolor\c!symstyle\c!symcolor
+   \setbox\scratchbox\hbox{\delimitedtextparameter#1}%
+   \ifdim\wd\scratchbox>\zeropoint
+     \ifdim\lastkern=\d_typo_delimited_signal
+       \unkern
+       \hskip\hspaceamount\currentusedlanguage{interquotation}%
+     \else\ifdim\lastskip=\d_typo_delimited_signal
+       \unskip
+       \hskip\hspaceamount\currentusedlanguage{interquotation}%
+     \fi\fi
+     \strut % new, needed below
+     \ifhmode % else funny pagebeaks
+       \penalty\plustenthousand
+       \hskip\zeropoint % == \prewordbreak
+     \fi
+     \strut % new, needed below
+     \dostarttagged\t!delimitedsymbol\empty
+     \dotagsetdelimitedsymbol\s!left
+     \delimitedtextparameter#1% unhbox\scratchbox
+     \dostoptagged
+     \penalty\plustenthousand % new per 2013-03-09 WS mailing list
+     \hskip\d_typo_delimited_signal % +- \prewordbreak
+   \fi
+   \endgroup}
+
+\def\typo_delimited_handle_right#1%
+  {\begingroup
+   \usedelimitedtextstyleandcolor\c!symstyle\c!symcolor
+   \setbox\scratchbox\hbox{\delimitedtextparameter#1}%
+   \ifdim\wd\scratchbox>\zeropoint
+     \ifdim\lastkern=\d_typo_delimited_signal
+       \unkern
+       \penalty\plustenthousand
+       \hskip\hspaceamount\currentusedlanguage{interquotation}%
+     \else\ifdim\lastskip=\d_typo_delimited_signal
+       \unskip
+       \penalty\plustenthousand
+       \hskip\hspaceamount\currentusedlanguage{interquotation}%
+     \fi\fi
+     \ifhmode % else funny pagebeaks
+       \penalty\plustenthousand
+       \hskip\zeropoint % == \prewordbreak
+     \fi
+     \strut % new, needed below
+     \dostarttagged\t!delimitedsymbol\empty
+     \dotagsetdelimitedsymbol\s!right
+     \delimitedtextparameter#1% unhbox\scratchbox
+     \dostoptagged
+     \kern\d_typo_delimited_signal % +- \prewordbreak
+   \fi
+   \endgroup}
+
+\unexpanded\def\typo_delimited_par
+  {\groupedcommand
+     {\dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext % block?
+      \typo_delimited_handle_left\c!left
+      \dostarttagged\t!delimitedcontent\empty}
+     {\dostoptagged
+      \typo_delimited_handle_right\c!right
+      \removelastskip
+      \dostoptagged
+      \typo_delimited_pop}}
+
+% \unexpanded\def\typo_delimited_txt
+%   {\doifelse{\delimitedtextparameter\c!style}\v!normal
+%      \typo_delimited_quoted
+%      \typo_delimited_attributed}
+%
+% \def\typo_delimited_quoted_b
+%   {\dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext
+%    \typo_delimited_handle_left\c!left}
+%
+% \def\typo_delimited_quoted_e
+%   {\typo_delimited_handle_right\c!right
+%    \removelastskip
+%    \dostoptagged
+%    \typo_delimited_pop}
+%
+% \def\typo_delimited_attributed_b
+%   {\dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext
+%    \usedelimitedtextstyleandcolor\c!style\c!color}
+%
+% \def\typo_delimited_attributed_e
+%   {\dostoptagged
+%    \typo_delimited_pop}
+%
+% \def\typo_delimited_fontdriven_b
+%   {\dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext
+%    \languageparameter{\c!left\currentparentdelimitedtext}}% was: \currentdelimitedtext
+%
+% \def\typo_delimited_fontdriven_e
+%   {\languageparameter{\c!right\currentparentdelimitedtext}% was: \currentdelimitedtext
+%    \dostoptagged
+%    \typo_delimited_pop}
+
+\unexpanded\def\typo_delimited_txt
+  {\edef\p_left_right{\delimitedtextparameter\c!left\delimitedtextparameter\c!right}%
+   \ifx\p_left_right\empty
+     \expandafter\typo_delimited_attributed
+   \else
+     \expandafter\typo_delimited_quoted
+   \fi}
+
+\def\typo_delimited_quoted_b
+  {\dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext
+   \typo_delimited_handle_left\c!left
+   \usedelimitedtextstyleandcolor\c!style\c!color
+   \dostarttagged\t!delimitedcontent\empty}
+
+\def\typo_delimited_quoted_e
+  {\dostoptagged
+   \typo_delimited_handle_right\c!right
+   \removelastskip % ?
+   \dostoptagged
+   \typo_delimited_pop}
+
+\def\typo_delimited_attributed_b
+  {\dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext
+   \usedelimitedtextstyleandcolor\c!style\c!color
+   \dostarttagged\t!delimitedcontent\empty
+   \ignorespaces}
+
+\def\typo_delimited_attributed_e
+  {\dostoptagged
+   \dostoptagged
+   \typo_delimited_pop}
+
+\def\typo_delimited_fontdriven_b
+  {\dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext
+   \usedlanguageparameter{\c!left\currentparentdelimitedtext}% was: \currentdelimitedtext
+   \usedelimitedtextstyleandcolor\c!style\c!color
+   \dostarttagged\t!delimitedcontent\empty}
+
+\def\typo_delimited_fontdriven_e
+  {\dostoptagged
+   \usedlanguageparameter{\c!right\currentparentdelimitedtext}% was: \currentdelimitedtext
+   \dostoptagged
+   \typo_delimited_pop}
+
+% We now assume proper argument usage (so no longer grouped
+% command).
+
+% \def\typo_delimited_quoted    {\groupedcommand      \typo_delimited_quoted_b    \typo_delimited_quoted_e    }
+% \def\typo_delimited_attributed{\groupedcommand      \typo_delimited_attributed_b\typo_delimited_attributed_e}
+% \def\typo_delimited_fontdriven{\simplegroupedcommand\typo_delimited_fontdriven_b\typo_delimited_fontdriven_e}
+
+\def\typo_delimited_quoted    {\bgroup\typo_delimited_quoted_b    \aftergroup\typo_delimited_quoted_e    \let\next=}
+\def\typo_delimited_attributed{\bgroup\typo_delimited_attributed_b\aftergroup\typo_delimited_attributed_e\let\next=}
+\def\typo_delimited_fontdriven{\bgroup\typo_delimited_fontdriven_b\aftergroup\typo_delimited_fontdriven_e\let\next=}
+
+% testcase for nesting:
+%
+% \quotation{... \quotation{...} ...}
+% \startquotation ... \startquotation... \quotation{...} \stopquotation\space ...\stopquotation
+% \setupdelimitedtext[quotation][1][left=(,right=)]
+% \setupdelimitedtext[quotation][2][left={[},right={]}]
+% \setupdelimitedtext[quotation][3][left=\{,right=\}]
+% \quotation{... \quotation{...} ...}
+% \startquotation ... \startquotation... \quotation{...} \stopquotation\space ...\stopquotation
+
+\definedelimitedtext
+  [\v!quotation]
+  [\c!left={\symbol[\c!leftquotation]},
+   \c!right={\symbol[\c!rightquotation]},
+   \c!leftmargin=\v!standard]
+
+\definedelimitedtext
+  [\v!quote][\v!quotation]
+
+\setupdelimitedtext
+  [\v!quote]
+  [\c!location=\v!text,
+   \c!left={\symbol[\c!leftquote]},
+   \c!right={\symbol[\c!rightquote]}]
+
+\definedelimitedtext
+   [\v!blockquote][\v!quotation]
+
+\setupdelimitedtext
+  [\v!blockquote]
+  [\c!left=,
+   \c!right=]
+
+\definedelimitedtext
+  [\v!speech][\v!quotation]
+
+\setupdelimitedtext
+  [\v!speech]
+  [\c!repeat=\v!yes,
+   \c!left={\symbol[\c!leftspeech]},
+   \c!middle={\symbol[\c!middlespeech]},
+   \c!right={\symbol[\c!rightspeech]}]
+
+% how do we call an tight quote
+%
+% \definedelimitedtext
+%    [\v!quotation][\v!quotation]
+%
+% \setupdelimitedtext
+%   [\v!quotation]
+%   [\c!indentnext=\v!no,
+%    \c!spacebefore=\v!nowhite]
+
+\unexpanded\def\setupquotation{\setupdelimitedtext[\v!quotation]}
+\unexpanded\def\setupquote    {\setupdelimitedtext[\v!quote]}
+
+\protect \endinput