summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2006-03-23 09:57:00 +0100
committerHans Hagen <pragma@wxs.nl>2006-03-23 09:57:00 +0100
commit6b47077fbad4359983a9b20f06f28c49cb82a98b (patch)
tree32d45f7b32e202ff08b378fac9b93f4898b9ad68
parentd01cba51426fd903b433968fd88d23cefe72a109 (diff)
downloadcontext-6b47077fbad4359983a9b20f06f28c49cb82a98b.tar.gz
stable 2006.03.23 09:57
-rw-r--r--tex/context/base/cont-new.tex4
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/core-ver.tex22
-rw-r--r--tex/context/base/page-flt.tex29
-rw-r--r--tex/context/interface/keys-cz.xml2
-rw-r--r--tex/context/interface/keys-de.xml2
-rw-r--r--tex/context/interface/keys-en.xml2
-rw-r--r--tex/context/interface/keys-fr.xml2
-rw-r--r--tex/context/interface/keys-it.xml2
-rw-r--r--tex/context/interface/keys-nl.xml2
-rw-r--r--tex/context/interface/keys-ro.xml2
11 files changed, 33 insertions, 38 deletions
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 2286b1042..8900aa624 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -24,7 +24,7 @@
\normalend}}
\fi
-\newcontextversion{2006.03.22 10:51}
+\newcontextversion{2006.03.23 09:57}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
@@ -665,7 +665,7 @@
\installoutput\synchronizeoutput % maybe add pagediscards
{\ifvoid\normalpagebox\else
\unvbox\normalpagebox
- \pagediscards
+ \pagediscards % maybe not needed ?
\fi}
% temp hack, else no proper default fall back (like \textmultiply); todo: sync encoding
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index c0323d4a1..e229669ba 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{2006.03.22 10:51}
+\def\contextversion{2006.03.23 09:57}
%D For those who want to use this:
diff --git a/tex/context/base/core-ver.tex b/tex/context/base/core-ver.tex
index 08ceb56e2..cf2a8f4d8 100644
--- a/tex/context/base/core-ver.tex
+++ b/tex/context/base/core-ver.tex
@@ -913,22 +913,18 @@
%D
%D The definitions default to the standard typing values.
-% \def\presettyping[#1][#2]%
-% {%\copyparameters
-% % [\??tp#1][\??tp]
-% % [\c!before,\c!after,\c!space,\c!page,\c!tab,\c!color,\c!style,
-% % \c!text,\c!icommand,\c!vcommand,\c!ccommand,\c!bodyfont,\c!empty,
-% % \c!option,\c!palet,\c!margin,\c!evenmargin,\c!oddmargin,
-% % \c!indentnext,\c!blank,\c!escape,\c!lines,\c!numbering]%
-% \getparameters
-% [\??tp#1]
-% [#2]}
+\def\presettyping[#1][#2]%
+ {\copyparameters
+ [\??tp#1][\??tp]
+ [\c!color,\c!style]%
+ \getparameters
+ [\??tp#1]
+ [#2]}
\def\dodefinetyping[#1][#2]%
{\setvalue{\e!start#1}{\dostarttyping{#1}}%
\setvalue{\e!stop #1}{\dostoptyping {#1}}%
-% \presettyping[#1][#2]}
- \getparameters[\??tp#1][#2]}
+ \presettyping[#1][#2]}
\def\definetyping
{\dodoubleempty\dodefinetyping}
@@ -1160,7 +1156,7 @@
% \typefile[start=4,step=3]{zapf}
% \typefile{zapf}
-% \presettyping[\v!file][]
+\presettyping[\v!file][]
\def\typefile
{\dodoubleempty\dotypefile}
diff --git a/tex/context/base/page-flt.tex b/tex/context/base/page-flt.tex
index 8e4c16e36..3767a9531 100644
--- a/tex/context/base/page-flt.tex
+++ b/tex/context/base/page-flt.tex
@@ -217,23 +217,22 @@
{\edef\floatlocation{#2}}%
\expanded{\dodocomplexplacefloat[\floattype][\floatlocation]}}
+\def\flushfloatslist
+ {\v!left,\v!right,\v!inner,\v!outer,%
+ \v!backspace,\v!cutspace,%
+ \v!inleft,\v!inright,\v!inmargin,%
+ \v!leftmargin,\v!rightmargin,\v!leftedge,\v!rightedge,%
+ \v!innermargin,\v!outermargin,\v!inneredge,\v!outeredge,%
+ \v!text,\v!opposite}% \v!page
+
\def\dodocomplexplacefloat[#1][#2][#3]#4%
{\flushnotes
-\flushsidefloats % here !
+ \flushsidefloats % here !
\ifsomefloatwaiting
% this was \checkwaitingfloats spread all over
\doifinsetelse\v!always{#2}
{\showmessage\m!floatblocks5\empty}
- {\doifcommonelse
- {#2}
- {\v!left,\v!right,\v!inner,\v!outer,%
- \v!backspace,\v!cutspace,%
- \v!inleft,\v!inright,\v!inmargin,%
- \v!leftmargin,\v!rightmargin,\v!leftedge,\v!rightedge,%
- \v!innermargin,\v!outermargin,\v!inneredge,\v!outeredge,%
- \v!text,\v!opposite}% \v!page
- {\doflushfloats}
- {}}%
+ {\expanded{\doifcommonelse{#2}{\flushfloatslist}}\doflushfloats\donothing}%
% but which should be done before using box \floatbox
\fi
\ifmargeblokken % waarschijnlijk gebroken ! ! ! !
@@ -471,10 +470,10 @@
\v!outer=>\xxdocompletefloat\v!right \v!left,
\v!innermargin=>\xxdocompletefloat\v!leftmargin \v!rightmargin,
\v!outermargin=>\xxdocompletefloat\v!rightmargin\v!leftmargin,
- \v!inneredge=>\xxdocompletefloat\v!leftedge \v!rightedge,
- \v!outeredge=>\xxdocompletefloat\v!rightedge \v!leftedge,
- \v!backspace=>\xxdocompletefloat\v!backspace \v!cutspace,
- \v!cutspace=>\xxdocompletefloat\v!cutspace \v!backspace,
+ \v!inneredge=>\xxdocompletefloat\v!leftedge \v!rightedge,
+ \v!outeredge=>\xxdocompletefloat\v!rightedge \v!leftedge,
+ \v!backspace=>\xxdocompletefloat\v!backspace \v!cutspace,
+ \v!cutspace=>\xxdocompletefloat\v!cutspace \v!backspace,
\v!left=>\xxdocompletefloat\v!left \v!left,
\v!right=>\xxdocompletefloat\v!right \v!right,
\v!line=>, % only -n*line is handled (see ***)
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index e4fc7e9d5..c728aa677 100644
--- a/tex/context/interface/keys-cz.xml
+++ b/tex/context/interface/keys-cz.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.03.22 10:51">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.03.23 09:57">
<cd:variables>
<cd:variable name="one" value="jedna"/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index abeec76cd..61c97c2bf 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.03.22 10:51">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.03.23 09:57">
<cd:variables>
<cd:variable name="one" value="eins"/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index ae9f41eb6..cc667b859 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.03.22 10:51">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.03.23 09:57">
<cd:variables>
<cd:variable name="one" value="one"/>
diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml
index f5fddb871..016c8f0d8 100644
--- a/tex/context/interface/keys-fr.xml
+++ b/tex/context/interface/keys-fr.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.03.22 10:51">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.03.23 09:57">
<cd:variables>
<cd:variable name="one" value="un"/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index 96c13688f..d9ba609a7 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.03.22 10:51">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.03.23 09:57">
<cd:variables>
<cd:variable name="one" value="uno"/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index 8b2a3e08f..8a13deae5 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.03.22 10:51">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.03.23 09:57">
<cd:variables>
<cd:variable name="one" value="een"/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index c449eafef..090826724 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.03.22 10:51">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.03.23 09:57">
<cd:variables>
<cd:variable name="one" value="unu"/>