From 4bcfa86615a3095169831cf25639faa89b34468f Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Fri, 14 Jul 2006 12:08:00 +0200
Subject: stable 2006.07.14 12:08

---
 tex/context/base/cont-new.tex     |  2 +-
 tex/context/base/context.tex      |  2 +-
 tex/context/bib/t-bib.tex         | 29 ++++++++++++++++++++++-------
 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-fr.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, 31 insertions(+), 16 deletions(-)

(limited to 'tex')

diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index c41d99953..95251fcc8 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2006.07.13 22:26}
+\newcontextversion{2006.07.14 12:08}
 
 %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 2780c21b8..c7730f4f0 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.07.13 22:26}
+\def\contextversion{2006.07.14 12:08}
 
 %D For those who want to use this:
 
diff --git a/tex/context/bib/t-bib.tex b/tex/context/bib/t-bib.tex
index 719991255..f75faa629 100644
--- a/tex/context/bib/t-bib.tex
+++ b/tex/context/bib/t-bib.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=t-bib,
-%D        version=2006.07.12,
+%D        version=2006.07.14,
 %D          title=\CONTEXT\ Publication Module,
 %D       subtitle=Publications,
 %D         author=Taco Hoekwater,
@@ -76,6 +76,7 @@
 %D \item reset font styles within \type{\cite}, so that font switches
 %D       in \type{left} stay in effect (12/7/2006)
 %D \item guard added against loading bbl files multiple times (13/7/2006)
+%D \item fix \type{\cite[num]} with compression is on. (14/7/2006)
 %D \stopitemize
 %D
 %D \subject{WISHLIST}
@@ -1584,10 +1585,22 @@
 %D so that the macro \type{\expandrefs} is needed.
 
 \def\expandrefs#1%
-  {\doifreferencefoundelse{#1}
-     {\@EA\doglobal\@EA\addtocommalist\@EA{\reftypet}\therefs }
-     {\showmessage\m!bib{5}{#1 unknown}%
-      \doglobal\addtocommalist{0}\therefs}}
+   {\bgroup
+    \preparebibrefprefix
+    \preparebibreflist{#1}%
+    \global\bibreffoundfalse
+    \def\setuplink##1%
+          {\ifbibreffound\else
+           \doifreferencefoundelse
+               {##1}
+               {\global\bibreffoundtrue 
+                \@EA\doglobal\@EA\addtocommalist\@EA{\reftypet}\therefs }%
+               {}\fi}%
+    \processcommacommand[\bibreflist]\setuplink
+    \ifbibreffound \else \showmessage\m!bib{5}{#1 unknown}%
+       \doglobal\addtocommalist{0}\therefs\fi
+    \egroup }
+
 
 %D But at least the actual sorting code is simple (note that sorting
 %D a list with exactly one entry fails to return anything, which
@@ -1613,7 +1626,8 @@
    \bibalternative\v!right}
 
 \def\dosimplebibnumref  #1%
-  {\refsep\ifbibinteractionelse{\inbiblink[#1]}{{\referencingfalse\in[#1]}}}
+  {\refsep\ifbibinteractionelse
+     {\inbiblink[#1]}{{\referencingfalse\inbiblink[#1]}}}
 
 \def\verysimplebibnumref#1{\doverysimplebibnumref#1}
 
@@ -1638,7 +1652,8 @@
       {\getvalue{pbda-#1}%
        \bibalternative\c!inbetween
        \bibalternative\v!left
-       \ifbibinteractionelse{\inbiblink[#1]}{{\referencingfalse\in[#1]}}%
+       \ifbibinteractionelse{\inbiblink[#1]}
+            {{\referencingfalse\inbiblink[#1]}}%
        \bibalternative\v!right}
       {\unknownreference{#1}}}
 
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index 5f31bdce3..b8e5b5fd7 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.07.13 22:26">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.07.14 12:08">
 
   <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 0c2b50ec2..840cbf373 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.07.13 22:26">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.07.14 12:08">
 
   <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 155e84be6..a4f663241 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.07.13 22:26">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.07.14 12:08">
 
   <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 5c590c261..e1a243823 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.07.13 22:26">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.07.14 12:08">
 
   <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 0c1c4c367..96f8d16fc 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.07.13 22:26">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.07.14 12:08">
 
   <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 9a119e474..cc9adb7a6 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.07.13 22:26">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.07.14 12:08">
 
   <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 98f5bc8ac..1a8ba6b50 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.07.13 22:26">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.07.14 12:08">
 
   <cd:variables>
     <cd:variable name="one" value="unu"/>
-- 
cgit v1.2.3