diff options
Diffstat (limited to 'tex')
23 files changed, 154 insertions, 4 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 69039bd41..4483e54e5 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{2013.08.26 13:54} +\newcontextversion{2013.08.26 16:41} %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 Binary files differindex 4ec7d204b..142d68af1 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 333343e45..0213ba936 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2013.08.26 13:54} +\edef\contextversion{2013.08.26 16:41} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/m-hemistich.mkiv b/tex/context/base/m-hemistich.mkiv new file mode 100644 index 000000000..70c467c7b --- /dev/null +++ b/tex/context/base/m-hemistich.mkiv @@ -0,0 +1,112 @@ +%D \module +%D [ file=m-hemistich, +%D version=2013.08.26, +%D title=\CONTEXT\ Extra Modules, +%D subtitle=Hemistiches, +%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. + +%D This is an experimental module for Idris. More is possible but not now. + +\unprotect + +\installcorenamespace{hemistich} + +\installcommandhandler \??hemistich {hemistich} \??hemistich + +\setuphemistich + [\c!width=\v!local, + \c!distance=4\emwidth, + \c!separator=\vl\hskip.25em\vl] + +\unexpanded\def\hemistiches + {\dosingleempty\dohemistiches} + +\unexpanded\def\dohemistiches + {\dodohemistiches\empty} + +\unexpanded\def\dodohemistiches#1[#2]#3#4% + {\dontleavehmode + \begingroup + \doifassignmentelse{#2} + {\edef\currenthemistich{#1}% + \setupcurrenthemistich[#2]} + {\def\currenthemistich{#2}}% + \doifelse{\hemistichparameter\c!width}\v!local + {\scratchwidth\availablehsize} + {\scratchwidth\hemistichparameter\c!width\relax}% + \spaceskip\zeropoint\s!plus\plusone\s!fill\relax + \hbox to \scratchwidth\bgroup + \scratchwidth.5\dimexpr\scratchwidth-\hemistichparameter\c!distance\relax + \hbox to \scratchwidth\bgroup + \usehemistichstyleandcolor\c!leftstyle\c!leftcolor#3% + \egroup + \hss + \begingroup + \usehemistichstyleandcolor\c!separatorstyle\c!separatorcolor + \hemistichparameter\c!separator + \endgroup + \hss + \hbox to \scratchwidth\bgroup + \usehemistichstyleandcolor\c!rightstyle\c!rightcolor#4% + \egroup + \egroup + \endgroup} + +\unexpanded\def\hemistichescaesura#1#2#3% + {\dodohemistiches\empty[\c!separator={#2}]{#1}{#3}} + +\appendtoks + \setvalue{\currenthemistich}{\dohemistiches{\currenthemistich}}% +\to \everydefinehemistich + +\protect + +\continueifinputfile{m-hemistich.mkiv} + +\setuphemistich + [leftcolor=darkred, + middlecolor=darkgreen, + rightcolor=darkblue] + +\setupwhitespace + [big] + +\starttext + +% \righttoleft + +\hemistichescaesura{left side of the brain}{equals}{right side of the brain} + +\hemistiches{left side of the brain}{right side of the brain} + +\startitemize + \startitem + \hemistiches{left side of the brain}{right side of the brain} + \startitemize + \startitem + \hemistiches{left side of the brain}{right side of the brain} + \startitemize + \startitem + \hemistiches{left side of the brain}{right side of the brain} + \stopitem + \stopitemize + \stopitem + \stopitemize + \startitem + \hemistiches{left side of the brain}{right side of the brain} + \stopitem + \stopitem +\stopitemize + +\startitemize +\item \hemistiches{left side of the brain}{right side of the brain} +\stopitemize + +\stoptext + diff --git a/tex/context/base/mult-de.mkii b/tex/context/base/mult-de.mkii index 4ac85404b..7e8995bef 100644 --- a/tex/context/base/mult-de.mkii +++ b/tex/context/base/mult-de.mkii @@ -981,6 +981,8 @@ \setinterfaceconstant{sectionstarter}{sectionstarter} \setinterfaceconstant{sectionstopper}{sectionstopper} \setinterfaceconstant{separator}{seperator} +\setinterfaceconstant{separatorcolor}{separatorcolor} +\setinterfaceconstant{separatorstyle}{separatorstyle} \setinterfaceconstant{set}{set} \setinterfaceconstant{setups}{setups} \setinterfaceconstant{shrink}{shrink} diff --git a/tex/context/base/mult-def.lua b/tex/context/base/mult-def.lua index 9398733bc..8fee30242 100644 --- a/tex/context/base/mult-def.lua +++ b/tex/context/base/mult-def.lua @@ -6454,6 +6454,14 @@ return { }, }, ["constants"]={ + ["separatorcolor"]={ + ["en"]="separatorcolor", + ["nl"]="scheiderkleur", + }, + ["separatorstyle"]={ + ["en"]="separatorstyle", + ["nl"]="scheiderletter", + }, ["less"]={ ["en"]="less", ["nl"]="minder", diff --git a/tex/context/base/mult-en.mkii b/tex/context/base/mult-en.mkii index aee58f9b5..0a049f6f0 100644 --- a/tex/context/base/mult-en.mkii +++ b/tex/context/base/mult-en.mkii @@ -981,6 +981,8 @@ \setinterfaceconstant{sectionstarter}{sectionstarter} \setinterfaceconstant{sectionstopper}{sectionstopper} \setinterfaceconstant{separator}{separator} +\setinterfaceconstant{separatorcolor}{separatorcolor} +\setinterfaceconstant{separatorstyle}{separatorstyle} \setinterfaceconstant{set}{set} \setinterfaceconstant{setups}{setups} \setinterfaceconstant{shrink}{shrink} diff --git a/tex/context/base/mult-fr.mkii b/tex/context/base/mult-fr.mkii index fff2def29..61b3b0a0f 100644 --- a/tex/context/base/mult-fr.mkii +++ b/tex/context/base/mult-fr.mkii @@ -981,6 +981,8 @@ \setinterfaceconstant{sectionstarter}{sectionstarter} \setinterfaceconstant{sectionstopper}{sectionstopper} \setinterfaceconstant{separator}{separateur} +\setinterfaceconstant{separatorcolor}{separatorcolor} +\setinterfaceconstant{separatorstyle}{separatorstyle} \setinterfaceconstant{set}{set} \setinterfaceconstant{setups}{reglages} \setinterfaceconstant{shrink}{shrink} diff --git a/tex/context/base/mult-it.mkii b/tex/context/base/mult-it.mkii index 140c12198..e5ebe3b25 100644 --- a/tex/context/base/mult-it.mkii +++ b/tex/context/base/mult-it.mkii @@ -981,6 +981,8 @@ \setinterfaceconstant{sectionstarter}{sectionstarter} \setinterfaceconstant{sectionstopper}{sectionstopper} \setinterfaceconstant{separator}{separatore} +\setinterfaceconstant{separatorcolor}{separatorcolor} +\setinterfaceconstant{separatorstyle}{separatorstyle} \setinterfaceconstant{set}{set} \setinterfaceconstant{setups}{setups} \setinterfaceconstant{shrink}{shrink} diff --git a/tex/context/base/mult-nl.mkii b/tex/context/base/mult-nl.mkii index 0624b01bf..6846a212e 100644 --- a/tex/context/base/mult-nl.mkii +++ b/tex/context/base/mult-nl.mkii @@ -981,6 +981,8 @@ \setinterfaceconstant{sectionstarter}{sectionstarter} \setinterfaceconstant{sectionstopper}{sectionstopper} \setinterfaceconstant{separator}{scheider} +\setinterfaceconstant{separatorcolor}{scheiderkleur} +\setinterfaceconstant{separatorstyle}{scheiderletter} \setinterfaceconstant{set}{set} \setinterfaceconstant{setups}{setups} \setinterfaceconstant{shrink}{krimp} diff --git a/tex/context/base/mult-pe.mkii b/tex/context/base/mult-pe.mkii index 857a46cac..300e07146 100644 --- a/tex/context/base/mult-pe.mkii +++ b/tex/context/base/mult-pe.mkii @@ -981,6 +981,8 @@ \setinterfaceconstant{sectionstarter}{sectionstarter} \setinterfaceconstant{sectionstopper}{sectionstopper} \setinterfaceconstant{separator}{جداکننده} +\setinterfaceconstant{separatorcolor}{separatorcolor} +\setinterfaceconstant{separatorstyle}{separatorstyle} \setinterfaceconstant{set}{قراربده} \setinterfaceconstant{setups}{بارگذاریها} \setinterfaceconstant{shrink}{shrink} diff --git a/tex/context/base/mult-ro.mkii b/tex/context/base/mult-ro.mkii index e73e59962..326a8e905 100644 --- a/tex/context/base/mult-ro.mkii +++ b/tex/context/base/mult-ro.mkii @@ -981,6 +981,8 @@ \setinterfaceconstant{sectionstarter}{sectionstarter} \setinterfaceconstant{sectionstopper}{sectionstopper} \setinterfaceconstant{separator}{separator} +\setinterfaceconstant{separatorcolor}{separatorcolor} +\setinterfaceconstant{separatorstyle}{separatorstyle} \setinterfaceconstant{set}{set} \setinterfaceconstant{setups}{setups} \setinterfaceconstant{shrink}{shrink} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 97d508098..84a07b1c0 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log index 4abf13779..44685e6c7 100644 --- a/tex/context/base/status-lua.log +++ b/tex/context/base/status-lua.log @@ -1,6 +1,6 @@ (cont-yes.mkiv -ConTeXt ver: 2013.08.26 13:54 MKIV beta fmt: 2013.8.26 int: english/english +ConTeXt ver: 2013.08.26 16:41 MKIV beta fmt: 2013.8.26 int: english/english system > 'cont-new.mkiv' loaded (cont-new.mkiv) diff --git a/tex/context/interface/keys-cs.xml b/tex/context/interface/keys-cs.xml index 122bd7a22..899e439da 100644 --- a/tex/context/interface/keys-cs.xml +++ b/tex/context/interface/keys-cs.xml @@ -987,6 +987,8 @@ <cd:constant name='sectionstarter' value='sectionstarter'/> <cd:constant name='sectionstopper' value='sectionstopper'/> <cd:constant name='separator' value='oddelovac'/> + <cd:constant name='separatorcolor' value='separatorcolor'/> + <cd:constant name='separatorstyle' value='separatorstyle'/> <cd:constant name='set' value='set'/> <cd:constant name='setups' value='setups'/> <cd:constant name='shrink' value='shrink'/> diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index a024e918f..ddb3c42d6 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -987,6 +987,8 @@ <cd:constant name='sectionstarter' value='sectionstarter'/> <cd:constant name='sectionstopper' value='sectionstopper'/> <cd:constant name='separator' value='seperator'/> + <cd:constant name='separatorcolor' value='separatorcolor'/> + <cd:constant name='separatorstyle' value='separatorstyle'/> <cd:constant name='set' value='set'/> <cd:constant name='setups' value='setups'/> <cd:constant name='shrink' value='shrink'/> diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index 8e4ef2561..5aea6102f 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -987,6 +987,8 @@ <cd:constant name='sectionstarter' value='sectionstarter'/> <cd:constant name='sectionstopper' value='sectionstopper'/> <cd:constant name='separator' value='separator'/> + <cd:constant name='separatorcolor' value='separatorcolor'/> + <cd:constant name='separatorstyle' value='separatorstyle'/> <cd:constant name='set' value='set'/> <cd:constant name='setups' value='setups'/> <cd:constant name='shrink' value='shrink'/> diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml index db2719fe6..cf366e3bb 100644 --- a/tex/context/interface/keys-fr.xml +++ b/tex/context/interface/keys-fr.xml @@ -987,6 +987,8 @@ <cd:constant name='sectionstarter' value='sectionstarter'/> <cd:constant name='sectionstopper' value='sectionstopper'/> <cd:constant name='separator' value='separateur'/> + <cd:constant name='separatorcolor' value='separatorcolor'/> + <cd:constant name='separatorstyle' value='separatorstyle'/> <cd:constant name='set' value='set'/> <cd:constant name='setups' value='reglages'/> <cd:constant name='shrink' value='shrink'/> diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index eadd1ca4b..19cb86ab1 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -987,6 +987,8 @@ <cd:constant name='sectionstarter' value='sectionstarter'/> <cd:constant name='sectionstopper' value='sectionstopper'/> <cd:constant name='separator' value='separatore'/> + <cd:constant name='separatorcolor' value='separatorcolor'/> + <cd:constant name='separatorstyle' value='separatorstyle'/> <cd:constant name='set' value='set'/> <cd:constant name='setups' value='setups'/> <cd:constant name='shrink' value='shrink'/> diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index 37b7c6213..e1c18eefc 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -987,6 +987,8 @@ <cd:constant name='sectionstarter' value='sectionstarter'/> <cd:constant name='sectionstopper' value='sectionstopper'/> <cd:constant name='separator' value='scheider'/> + <cd:constant name='separatorcolor' value='scheiderkleur'/> + <cd:constant name='separatorstyle' value='scheiderletter'/> <cd:constant name='set' value='set'/> <cd:constant name='setups' value='setups'/> <cd:constant name='shrink' value='krimp'/> diff --git a/tex/context/interface/keys-pe.xml b/tex/context/interface/keys-pe.xml index a517697e3..01b9c64b9 100644 --- a/tex/context/interface/keys-pe.xml +++ b/tex/context/interface/keys-pe.xml @@ -987,6 +987,8 @@ <cd:constant name='sectionstarter' value='sectionstarter'/> <cd:constant name='sectionstopper' value='sectionstopper'/> <cd:constant name='separator' value='جداکننده'/> + <cd:constant name='separatorcolor' value='separatorcolor'/> + <cd:constant name='separatorstyle' value='separatorstyle'/> <cd:constant name='set' value='قراربده'/> <cd:constant name='setups' value='بارگذاریها'/> <cd:constant name='shrink' value='shrink'/> diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index d5935e6e5..8bacf6caa 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -987,6 +987,8 @@ <cd:constant name='sectionstarter' value='sectionstarter'/> <cd:constant name='sectionstopper' value='sectionstopper'/> <cd:constant name='separator' value='separator'/> + <cd:constant name='separatorcolor' value='separatorcolor'/> + <cd:constant name='separatorstyle' value='separatorstyle'/> <cd:constant name='set' value='set'/> <cd:constant name='setups' value='setups'/> <cd:constant name='shrink' value='shrink'/> diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index a8679fcdc..649c5371d 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/26/13 13:54:54 +-- merge date : 08/26/13 16:41:50 do -- begin closure to overcome local limits and interference |