summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2007-01-02 10:34:00 +0100
committerHans Hagen <pragma@wxs.nl>2007-01-02 10:34:00 +0100
commitdf357eceacf49ab989db1882e5b788a51c6039e1 (patch)
tree750512346b4c428758bc361b5c116a70441853b3 /tex
parentfd24aade07671dbdb72b393d6bd570a62eeab39f (diff)
downloadcontext-df357eceacf49ab989db1882e5b788a51c6039e1.tar.gz
stable 2007.01.02 10:34
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.tex2
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/core-not.tex15
-rw-r--r--tex/context/base/core-var.tex3
-rw-r--r--tex/context/base/syst-ext.tex6
5 files changed, 19 insertions, 9 deletions
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index a730ab928..638fb28ed 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -13,7 +13,7 @@
% it's about time to clean up this file ...
-\newcontextversion{2006.12.20 23:52}
+\newcontextversion{2007.01.02 10:34}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 76e3c7a54..ae1c3a151 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -42,7 +42,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2006.12.27 11:34}
+\edef\contextversion{2007.01.02 10:34}
%D For those who want to use this:
diff --git a/tex/context/base/core-not.tex b/tex/context/base/core-not.tex
index 1d764e412..c013dba40 100644
--- a/tex/context/base/core-not.tex
+++ b/tex/context/base/core-not.tex
@@ -673,6 +673,13 @@
\newconditional\processingnote
+\def\footnotereferencefrom
+ {\rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}}
+
+\def\footnotereferenceto
+ {\global\advance\crossreferencenumber\minusone\relax % else problem, needs further testing
+ \rawreference\s!fnt{\s!fnt:t:\internalfootreference}{}}
+
\def\dostartnote% nog gobble als in pagebody
{\bgroup
\settrue\processingnote
@@ -711,9 +718,9 @@
\fi
\doifelse{\noteparameter\c!interaction}\v!no
{\ifconditional\pagewisenotes
- \rawreference\s!fnt{\s!fnt:t:\internalfootreference}{}%
+ \footnotereferenceto
\fi}%
- {\rawreference\s!fnt{\s!fnt:t:\internalfootreference}{}}}%
+ {\footnotereferenceto}}%
\bgroup
\postponenotes
\aftergroup\dostopnote
@@ -737,12 +744,12 @@
\doifelse{\noteparameter\c!interaction}\v!no
{\dodonotesymbol{\lastnotenumber\domovednote\v!previouspage\v!nextpage}%
\ifconditional\pagewisenotes
- \rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}%
+ \footnotereferencefrom
\fi}
{\gotobox
{\dodonotesymbol{\lastnotenumber\domovednote\v!previouspage\v!nextpage}}%
[\s!fnt:t:\internalfootreference]%
- \rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}}%
+ \footnotereferencefrom}%
\globallet\lastnotesymbol\relax}
\let\lastnotesymbol\relax
diff --git a/tex/context/base/core-var.tex b/tex/context/base/core-var.tex
index 6b019d658..2317d7bf7 100644
--- a/tex/context/base/core-var.tex
+++ b/tex/context/base/core-var.tex
@@ -626,9 +626,6 @@
% \def\blabelgroup {\begingroup} % why no \let ?
% \let\elabelgroup \endgroup
-
-
-
%D Concepts:
\chardef\conceptmode\zerocount
diff --git a/tex/context/base/syst-ext.tex b/tex/context/base/syst-ext.tex
index 262d5f0b0..bee6049bf 100644
--- a/tex/context/base/syst-ext.tex
+++ b/tex/context/base/syst-ext.tex
@@ -2521,6 +2521,12 @@
{\scratchcounter#2%
\setxvalue{#1}{\the\scratchcounter}}
+\def\incrementcounter#1#2% #1 name #2 value
+ {\setxvalue{#1}{\the\numexpr\csname#1\endcsname+#2\relax}}
+
+\def\decrementcounter#1#2% #1 name #2 value
+ {\setxvalue{#1}{\the\numexpr\csname#1\endcsname-#2\relax}}
+
%D \macros
%D {savecounter,restorecounter}
%D