From 6e23192a09974741e5cd1f11828fb264657835f9 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sat, 30 Jul 2005 00:00:00 +0200 Subject: stable 2005.07.30 --- tex/context/base/context.tex | 2 +- tex/context/base/core-rul.tex | 6 +++--- tex/context/base/core-tab.tex | 4 ++-- tex/context/base/page-sid.tex | 15 ++++++++++++++- tex/context/interface/keys-cz.xml | 2 +- tex/context/interface/keys-de.xml | 2 +- tex/context/interface/keys-en.xml | 2 +- tex/context/interface/keys-it.xml | 2 +- tex/context/interface/keys-nl.xml | 2 +- tex/context/interface/keys-ro.xml | 2 +- 10 files changed, 26 insertions(+), 13 deletions(-) (limited to 'tex') diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index 355bc7e47..171305424 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -31,7 +31,7 @@ %D 2004.8.30 the low level interface is english. Watch out and adapt %D your styles an modules. -\def\contextversion{2005.07.27} +\def\contextversion{2005.07.30} %D Welcome to the main module. When this module is ran through %D \type{initex} or \type {tex -i} or \type {whatevertex} using diff --git a/tex/context/base/core-rul.tex b/tex/context/base/core-rul.tex index 8ef18ab20..7116d05c4 100644 --- a/tex/context/base/core-rul.tex +++ b/tex/context/base/core-rul.tex @@ -791,7 +791,7 @@ \else \boxhaswidthfalse \fi - \else\ifx\localwidth\v!fixed % equals \v!broad + \else\ifx\localwidth\v!fixed % equals \v!fix but no shapebox \ifboxhasformat \boxhaswidthtrue \!!widtha\hsize @@ -1744,7 +1744,7 @@ \newdimen\framedlastlength \def\resetshapeframebox - {\framednoflines\zerocount + {\framednoflines \zerocount \framedlastlength\zeropoint} % The next implementation is frozen! It preserves the depth, @@ -3300,7 +3300,7 @@ \hskip\getvalue{\??fc#1\c!rightoffset}% \egroup \doifvalue{\??fc#1\c!width}\v!fit - {\letvalue{\??fc#1\c!width}\v!fixed}% + {\letvalue{\??fc#1\c!width}\v!fixed}% no shapebox \ifinsidefloat \donefalse \else diff --git a/tex/context/base/core-tab.tex b/tex/context/base/core-tab.tex index f2c836461..73850e5af 100644 --- a/tex/context/base/core-tab.tex +++ b/tex/context/base/core-tab.tex @@ -2484,8 +2484,8 @@ {\getparameters[\??ti][#1]% \processaction [\@@tialign] - [ \v!right=>\def\TABLEparalignment{\raggedright}, - \v!left=>\def\TABLEparalignment{\raggedleft}, + [ \v!right=>\def\TABLEparalignment{\raggedright}, + \v!left=>\def\TABLEparalignment{\raggedleft}, \v!middle=>\def\TABLEparalignment{\raggedcenter}, \s!default=>\def\TABLEparalignment{\notragged}, \s!unknown=>\def\TABLEparalignment{\notragged}]% diff --git a/tex/context/base/page-sid.tex b/tex/context/base/page-sid.tex index 0ad5c787e..882464fc3 100644 --- a/tex/context/base/page-sid.tex +++ b/tex/context/base/page-sid.tex @@ -309,6 +309,19 @@ \brokenpenalty\the\brokenpenalty \let\poppenalties\relax}} +% shouldn;t that be: +% +% \def\pushpenalties % needed? +% {\let\pushpenalties\relax +% \edef\poppenalties +% {\widowpenalty \the\widowpenalty +% \clubpenalty \the\clubpenalty +% \brokenpenalty\the\brokenpenalty +% \let\poppenalties\relax}% +% \widowpenalty\plusone +% \clubpenalty\plustwo +% \brokenpenalty\plusone} + \let\poppenalties=\relax \def\restorepenalties @@ -767,7 +780,7 @@ \else \scratchcounter\sidefloatlinesdone \advance\scratchcounter-\!!counta - \global\sidefloatsidelines-\scratchcounter + \global\advance\sidefloatsidelines-\scratchcounter \fi \fi \ifnum\sidefloatsidelines>\zerocount diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index c5a57b820..f94c1a0f7 100644 --- a/tex/context/interface/keys-cz.xml +++ b/tex/context/interface/keys-cz.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index ad86466dc..7c1bd3b63 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index 5f8a2554d..b58087107 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index 3998abce9..79b82bba1 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index 8132906fe..32f053d32 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index f8f2a5ca4..7258a1b9a 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -1,6 +1,6 @@ - + -- cgit v1.2.3