summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tex/context/base/colo-hex.tex21
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/core-pos.tex9
-rw-r--r--tex/context/base/page-one.tex2
-rw-r--r--tex/context/base/prop-ini.tex10
-rw-r--r--tex/context/base/spec-fdf.tex4
-rw-r--r--tex/context/base/spec-tpd.tex4
-rw-r--r--tex/context/base/xtag-ini.tex20
8 files changed, 48 insertions, 24 deletions
diff --git a/tex/context/base/colo-hex.tex b/tex/context/base/colo-hex.tex
index 0c75d37e0..76423ada0 100644
--- a/tex/context/base/colo-hex.tex
+++ b/tex/context/base/colo-hex.tex
@@ -14,6 +14,7 @@
\writestatus{loading}{Context Color Macros / hexadecimal}
% \edef\testcolor{\string#FFC0C0}
+% \edef\testcolor{\string#55}
%
% \setupcolors[state=start]
%
@@ -37,19 +38,27 @@
\chardef\hexcolorprefix=`#
-\def\hexcolorspec #1{\expandafter\dohexcolorspec #1}
-\def\hexcolorpattern#1{\expandafter\dohexcolorpattern#1}
+\def\hexcolorspec #1{\expandafter\dohexcolorspec #1\empty\empty\empty\empty\relax}
+\def\hexcolorpattern#1{\expandafter\dohexcolorpattern#1\empty\empty\empty\empty\relax}
\def\hexcolorcomponent#1%
{\ifnum"#1=\zerocount0\else\ifnum"#1=\plusone1\else
\expandafter\withoutpt\the\dimexpr("#1\hexcolorfraction)%
\fi\fi}
-\def\dohexcolorspec#1#2#3#4#5#6#7%
- {r=\hexcolorcomponent{#2#3},g=\hexcolorcomponent{#4#5},b=\hexcolorcomponent{#6#7}}
+\def\dohexcolorspec#1#2#3#4#5#6#7#8\relax
+ {\ifx#4\empty
+ s=\hexcolorcomponent{#2#3}%
+ \else
+ r=\hexcolorcomponent{#2#3},g=\hexcolorcomponent{#4#5},b=\hexcolorcomponent{#6#7}%
+ \fi}
-\def\dohexcolorpattern#1#2#3#4#5#6#7%
- {0R:\hexcolorcomponent{#2#3}:\hexcolorcomponent{#4#5}:\hexcolorcomponent{#6#7}:0:0}
+\def\dohexcolorpattern#1#2#3#4#5#6#7#8\relax
+ {0\ifx#4\empty
+ S:\hexcolorcomponent{#2#3}%
+ \else
+ R:\hexcolorcomponent{#2#3}:\hexcolorcomponent{#4#5}:\hexcolorcomponent{#6#7}%
+ \fi:0:0}
\def\doifhexcolorelse#1%
{\expandafter\dodoifhexcolorelse#10\od} % 0 is a dirty trick to catch an empty #1
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index e05411b69..e2a4ff29e 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -15,7 +15,7 @@
\catcode`\{=1 \catcode`\}=2
-\def\contextversion{2004.6.26}
+\def\contextversion{2004.6.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-pos.tex b/tex/context/base/core-pos.tex
index 5297c0a13..c05cb68d9 100644
--- a/tex/context/base/core-pos.tex
+++ b/tex/context/base/core-pos.tex
@@ -1883,6 +1883,7 @@
\fpos\currentparbackground
\fi
\bgroup
+ \endgraf % we need a vertical nobreak - 29/06/2004
\nobreak \vskip-\lineheight \nobreak
\doassignsomeskip\getvalue{\??td\currenttextbackground\c!bovenoffset}\to\scratchskip
\ifgridsnapping \else \ifdim\textbackgroundskip>\zeropoint
@@ -1892,10 +1893,10 @@
\advance\leftskip\leftskipadaption
\dosetleftskipadaption{\getvalue{\??td\currenttextbackground\c!rechteroffset}}%
\advance\rightskip\leftskipadaption
-% new
-\dosetraggedcommand{\getvalue{\??td\currenttextbackground\c!uitlijnen}}%
-\raggedcommand
-%
+ % new
+ \dosetraggedcommand{\getvalue{\??td\currenttextbackground\c!uitlijnen}}%
+ \raggedcommand
+ %
\dostartattributes{\??td\currenttextbackground}\c!letter\c!kleur\empty
\geenwitruimte
\seteffectivehsize
diff --git a/tex/context/base/page-one.tex b/tex/context/base/page-one.tex
index d2f9be044..6be6e515f 100644
--- a/tex/context/base/page-one.tex
+++ b/tex/context/base/page-one.tex
@@ -173,7 +173,7 @@
% #1#2#3%
% \fi}
-\chardef\kindofpagetextareas=2 % whole page
+\chardef\kindofpagetextareas=2 % whole page (public variable! never change)
\def\OTRONEregisteredtextarea#1%
{\ifregistertextareas
diff --git a/tex/context/base/prop-ini.tex b/tex/context/base/prop-ini.tex
index cb7f7aacc..4e846012b 100644
--- a/tex/context/base/prop-ini.tex
+++ b/tex/context/base/prop-ini.tex
@@ -39,10 +39,18 @@
{\csname\s!check\currentpropertytype property\endcsname
\global\expandafter\let\csname\??py\s!check\currentproperty\endcsname\empty}
+% \def\checkproperty[#1]%
+% {\bgroup
+% \def\currentproperty{#1}%
+% \docheckproperty
+% \egroup}
+%
+% oeps, was wrong, no reset
+
\def\checkproperty[#1]%
{\bgroup
\def\currentproperty{#1}%
- \docheckproperty
+ \csname\??py\s!check\currentproperty\endcsname
\egroup}
\unexpanded\def\property[#1]%
diff --git a/tex/context/base/spec-fdf.tex b/tex/context/base/spec-fdf.tex
index 9ba282756..f8d04ed03 100644
--- a/tex/context/base/spec-fdf.tex
+++ b/tex/context/base/spec-fdf.tex
@@ -3018,8 +3018,8 @@
\def\flushPDFtextlayers
{\ifx\PDFtextlayers\empty \else
- \driverreferenced \doPDFarrayobject class PDF name textlayers data {\PDFtextlayers}%
- \doPDFgetobjectreference{PDF}{textlayers}\!!stringa
+ \driverreferenced \doPDFarrayobject class PDF name textlayers data {\PDFtextlayers}%
+ \doPDFgetobjectreference{PDF}{textlayers}\!!stringa
\ifx\PDFvidelayers\empty
\def\!!stringb{[null]}%
\else
diff --git a/tex/context/base/spec-tpd.tex b/tex/context/base/spec-tpd.tex
index 1de624c76..10ab42ed3 100644
--- a/tex/context/base/spec-tpd.tex
+++ b/tex/context/base/spec-tpd.tex
@@ -14,6 +14,8 @@
% todo: nagaan of we met reserveobjnum en useobjnum kunnen werken;
% driver referenced etc
+% layers and links don't work while the spec says they should
+
% method = auto
%
% \definefileinsertion{tpd}{auto}#1#2#3#4#5#6#7#8#9%
@@ -121,7 +123,7 @@
\newcount\pdfoptionpdfminorversion
\fi
-\pdfoptionpdfminorversion=4
+\pdfoptionpdfminorversion=5
% %D Why are the Acrobat viewers so buggy? To prevent font cache
% %D mismatches, we say:
diff --git a/tex/context/base/xtag-ini.tex b/tex/context/base/xtag-ini.tex
index fd545cd78..42168e04b 100644
--- a/tex/context/base/xtag-ini.tex
+++ b/tex/context/base/xtag-ini.tex
@@ -862,6 +862,15 @@
\csname\@@XMLdepth:\the\numexpr(\XMLdepth-#1)\endcsname
\fi}
+% \def\XMLpureancestor#1%
+% {\csname
+% \ifnum\numexpr(\XMLdepth-#1)>\zerocount
+% \@@XMLdepth:\the\numexpr(\XMLdepth-#1)%
+% \else
+% \s!empty
+% \fi
+% \endcsname}
+
\def\XMLpureparent
{\XMLpureancestor\plusone}
@@ -1217,14 +1226,9 @@
\else \@EAEAEA \crapXMLentity
\fi\fi{#1}}
-\def\execXMLentity#1%
- {\csname\@@XMLentity:#1\endcsname}
-
-\def\crapXMLentity#1%
- {\inframed[\c!offset=.1ex]{\tttf#1}}
-
-\def\autoXMLentity#1%
- {\ifcsname#1\endcsname\csname#1\endcsname\fi}
+\def\execXMLentity#1{\csname\@@XMLentity:#1\endcsname}
+\def\crapXMLentity#1{\inframed[\c!offset=.1ex]{\tttf#1}}
+\def\autoXMLentity#1{\ifcsname#1\endcsname\csname#1\endcsname\fi}
\unexpanded\def\getXMLentity{\expandedXMLentity}