summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tex/context/base/core-con.tex2
-rw-r--r--tex/context/base/core-fig.tex18
-rw-r--r--tex/context/base/core-int.tex21
-rw-r--r--tex/context/base/core-itm.tex6
-rw-r--r--tex/context/base/core-mis.tex55
-rw-r--r--tex/context/base/core-ntb.tex26
-rw-r--r--tex/context/base/core-spa.tex9
-rw-r--r--tex/context/base/enco-agr.tex4
-rw-r--r--tex/context/base/enco-pfr.tex2
-rw-r--r--tex/context/base/lang-ini.tex1
-rw-r--r--tex/context/base/page-flt.tex65
-rw-r--r--tex/context/base/page-lay.tex5
-rw-r--r--tex/context/base/page-mak.tex3
-rw-r--r--tex/context/base/page-str.tex6
-rw-r--r--tex/context/base/regi-iso-8859-15.tex2
-rw-r--r--tex/context/base/spec-fdf.tex3
-rw-r--r--tex/context/base/supp-lan.tex10
-rw-r--r--tex/context/base/symb-ini.tex19
-rw-r--r--tex/context/bib/t-bib.tex12
19 files changed, 212 insertions, 57 deletions
diff --git a/tex/context/base/core-con.tex b/tex/context/base/core-con.tex
index 2d5f57f9c..34592ab20 100644
--- a/tex/context/base/core-con.tex
+++ b/tex/context/base/core-con.tex
@@ -43,6 +43,8 @@
\def\numbers#1{\purenumber{#1}}
\def\Numbers#1{\purenumber{#1}}
+\def\twodigits #1{\ifnum #1<10 0\fi\number#1}
+\def\threedigits#1{\ifnum#1<100 \ifnum#1<10 0\fi0\fi\number#1}
%D \macros
%D {romannumerals,Romannumerals}
diff --git a/tex/context/base/core-fig.tex b/tex/context/base/core-fig.tex
index f9367d735..3edc1413d 100644
--- a/tex/context/base/core-fig.tex
+++ b/tex/context/base/core-fig.tex
@@ -2182,6 +2182,24 @@
\egroup}%
\hbox}
+%D \startbuffer
+%D \startuseMPgraphic{test}
+%D path p ; p := fullcircle scaled 4cm ;
+%D draw p withpen pencircle scaled 1cm ;
+%D setbounds currentpicture to boundingbox p ;
+%D \stopuseMPgraphic
+%D
+%D \hbox to \hsize \bgroup
+%D \hss
+%D \ruledhbox{\useMPgraphic{test}}%
+%D \hss
+%D \ruledhbox{\clip{\useMPgraphic{test}}}%
+%D \hss
+%D \egroup
+%D \stopbuffer
+%D
+%D \typebuffer \getbuffer
+
\def\clip{\dosingleempty\doclip}
\def\setupclipping
diff --git a/tex/context/base/core-int.tex b/tex/context/base/core-int.tex
index 83b65f010..b4bcd4c5f 100644
--- a/tex/context/base/core-int.tex
+++ b/tex/context/base/core-int.tex
@@ -351,17 +351,16 @@
\@EA\processcommalist\@EA[\!!stringa]\doprepareidentity
\global\let\doprepareidentity\relax}
-\def\doinitializeidentity#1%
- {%\iflocation
- \doprepareidentity
- \dosetupidentity % no \expanded{..} will be done in special (else no pdfdoc)
- {\@@iatitle}{\@@iasubtitle}{\@@iaauthor}{#1}%
- {\@@iadate}{\@@iakeyword}%
- \global\let\initializeidentity\relax
- }%\fi}
-
-\def\initializeidentity % not to be changed !
- {\doinitializeidentity{ConTeXt/user/\jobname.tex}}
+%D The Creator field is changed per 12/04/2006 due to user presure. This
+%D means that I need to put my own status info someplace else.
+
+\def\initializeidentity
+ {\doprepareidentity
+ \dosetupidentity % no \expanded{..} will be done in special (else no pdfdoc)
+ {\@@iatitle}{\@@iasubtitle}{\@@iaauthor}%
+ {ConTeXt - \contextversion}%
+ {\@@iadate}{\@@iakeyword}%
+ \global\let\initializeidentity\relax}
\appendtoks \initializeidentity \to \everyshipout
diff --git a/tex/context/base/core-itm.tex b/tex/context/base/core-itm.tex
index 9c4288fcb..f84bd9960 100644
--- a/tex/context/base/core-itm.tex
+++ b/tex/context/base/core-itm.tex
@@ -996,8 +996,8 @@
% \stopitemize
\def\complexitem[#1]#2\par % todo: no two pass data
- {\startitemgroup[#1]
- \complexdoitemgroupitem[]\ignorespaces\begstrut#2\unskip\endstrut\par
+ {\startitemgroup[#1]%
+ \complexdoitemgroupitem[]\begstrut#2\endstrut\par
\stopitemgroup}
\definecomplexorsimpleempty\item
@@ -1005,7 +1005,7 @@
\def\complexhead[#1]#2\par#3\par
{\startitemgroup[#1]%
- \complexdoitemgrouphead[]\ignorespaces#2\par#3\par
+ \complexdoitemgrouphead[]\begstrut#2\endstrut\par\begstrut#3\endstrut\par
\stopitemgroup}
% \def\complexdoitemgrouphead[#1]#2\par% % beter in \complexdosom hangen met een if
diff --git a/tex/context/base/core-mis.tex b/tex/context/base/core-mis.tex
index 0b12bfc0e..cec251e9e 100644
--- a/tex/context/base/core-mis.tex
+++ b/tex/context/base/core-mis.tex
@@ -2087,6 +2087,8 @@
\def\dostartcombination[#1][#2]%
{\global\setsystemmode{combination}%
+ \doifnothing{#1}\firstargumentfalse % to be sure (when called in macros)
+ \doifnothing{#2}\secondargumentfalse % to be sure (when called in macros)
\ifsecondargument
\def\currentcombination{#1}%
\else
@@ -2281,8 +2283,24 @@
\fi
\next}
+% formally ok:
+%
+% \def\stopcombination
+% {\egroup
+% \egroup}
+%
+% more robust:
+%
+% \def\stopcombination
+% {{}{}{}{}{}{}{}{}% catches (at most 4) missing entries
+% \egroup
+% \egroup}
+%
+% even better:
+
\def\stopcombination
- {\egroup
+ {{\scratchtoks{{}{}{}}\dorecurse\totcombination{\appendtoks{}{}{}{}\to\scratchtoks}\expandafter}\the\scratchtoks
+ \egroup
\egroup}
\newbox\combinationstack
@@ -2331,6 +2349,41 @@
\c!after=,
\c!align=\v!middle]
+%D \macros
+%D {startfloatcombination}
+%D
+%D \startbuffer
+%D \placefigure
+%D [left,none]
+%D {}
+%D {\startfloatcombination[2*2]
+%D \placefigure{alpha}{\externalfigure[cow.pdf][width=1cm]}
+%D \placefigure{beta} {\externalfigure[cow.pdf][width=2cm]}
+%D \placefigure{gamma}{\externalfigure[cow.pdf][width=3cm]}
+%D \placefigure{delta}{\externalfigure[cow.pdf][width=4cm]}
+%D \stopfloatcombination}
+%D
+%D \input tufte
+%D \stopbuffer
+%D
+%D \typebuffer \getbuffer
+
+\def\startfloatcombination
+ {\dodoubleempty\dostartfloatcombination}
+
+\def\dostartfloatcombination[#1][#2]%
+ {\vbox\bgroup
+ %\insidecolumnstrue % trick, forces no centering, todo: proper switch/feature
+ \chardef\postcenterfloatmethod\zerocount
+ \forcelocalfloats
+ \def\stopfloatcombination
+ {\scratchtoks\emptytoks
+ \dorecurse\noflocalfloats
+ {\appendetoks{\noexpand\getlocalfloat{\recurselevel}}{}\to\scratchtoks}%
+ \expanded{\startcombination[#1]\the\scratchtoks}\stopcombination
+ \resetlocalfloats
+ \egroup}}
+
% does not work
%
% \def\plaatsondernaastelkaar#1#2%
diff --git a/tex/context/base/core-ntb.tex b/tex/context/base/core-ntb.tex
index cf42272e7..ba861eec2 100644
--- a/tex/context/base/core-ntb.tex
+++ b/tex/context/base/core-ntb.tex
@@ -1511,4 +1511,30 @@
\appendtoks \chardef\recodeverbatimmode\plustwo \to \everytable
+% new (for Olivier Turlier)
+%
+% \defineTABLEsetup [xx] [foregroundcolor=red]
+%
+% \bTABLE
+% \bTR \bTD oeps \eTD \bTD oeps \eTD \eTR
+% \bTR \bTDs[xx] oeps \eTDs \bTD oeps \eTD \eTR
+% \bTRs[xx] \bTD oeps \eTD \bTD oeps \eTD \eTRs
+% \eTABLE
+
+\def\defineTABLEsetup
+ {\dodoubleargument\dodefineTABLEsetup}
+
+\def\dodefineTABLEsetup[#1][#2]%
+ {\setvalue{\@@tbl:set:#1}{#2}}
+
+\long\def\bTDs[#1]#2\eTDs
+ {\doifdefinedelse{\@@tbl:set:#1}
+ {\@EA\@EA\@EA\bTD\@EA\@EA\@EA[\csname\@@tbl:set:#1\endcsname]#2\eTD}
+ {\bTD[]#2\eTD}}
+
+\long\def\bTRs[#1]#2\eTRs
+ {\doifdefinedelse{\@@tbl:set:#1}
+ {\@EA\@EA\@EA\bTR\@EA\@EA\@EA[\csname\@@tbl:set:#1\endcsname]#2\eTR}
+ {\bTR[]#2\eTR}}
+
\protect \endinput
diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex
index f726174cd..9c50ab3bd 100644
--- a/tex/context/base/core-spa.tex
+++ b/tex/context/base/core-spa.tex
@@ -1307,7 +1307,8 @@
\defineindentingmethod [\v!yes] {\parindent\ctxparindent\relax} % no \indent !
\defineindentingmethod [\v!always] {\parindent\ctxparindent\relax} % no \indent !
-\defineindentingmethod [\v!never] {\parindent\zeropoint\relax} % no \indent !
+\defineindentingmethod [\v!never] {\parindent\zeropoint\relax % no \indent !
+ \chardef\indentingtoggle\zerocount}
\defineindentingmethod [\v!odd] {\chardef\indentingtoggle\plusone}
\defineindentingmethod [\v!even] {\chardef\indentingtoggle\plustwo}
@@ -1317,8 +1318,8 @@
\simplesetupindenting
\fi}
-\defineindentingmethod [\v!reset] {\parindent\zeropoint
- \indentfirstparagraphtrue
+\defineindentingmethod [\v!reset] {\indentfirstparagraphtrue
+ \parindent\zerocount
\chardef\indentingtoggle\zerocount}
\def\noindenting{\indenting[\v!no, \v!next ]}
@@ -2428,7 +2429,7 @@
\normalpenalty\plustenthousand
\normalhskip\zeropoint
\fi
- \ignorespaces
+ \expandafter \ignorespaces
\fi}
\def\endstrut
diff --git a/tex/context/base/enco-agr.tex b/tex/context/base/enco-agr.tex
index 513a0465b..c50f97e51 100644
--- a/tex/context/base/enco-agr.tex
+++ b/tex/context/base/enco-agr.tex
@@ -24,8 +24,8 @@
\definecharacter endash 2
\definecharacter emdash 3
\definecharacter apostrophe 4
-\definecharacter epih 5
-\definecharacter greekaltbeta 6
+\definecharacter greekaltbeta 5
+\definecharacter epih 6
\definecharacter textbraceleft 8
\definecharacter textbraceright 9
diff --git a/tex/context/base/enco-pfr.tex b/tex/context/base/enco-pfr.tex
index b64a9b67e..8f3d4cef7 100644
--- a/tex/context/base/enco-pfr.tex
+++ b/tex/context/base/enco-pfr.tex
@@ -137,6 +137,8 @@
% {\doif{#1}\currentencoding
% {\immediate\pdfobj useobjnum \getvalue{\pdffontresource} stream {#2}}}
+% alternatively we can use object references
+
\long\def\startpdffontresource[#1]#2\stoppdffontresource
{\doif{#1}\currentencoding{\doifdefined\pdffontresource
{\immediate\pdfobj useobjnum \getvalue{\pdffontresource} stream {#2}}}}
diff --git a/tex/context/base/lang-ini.tex b/tex/context/base/lang-ini.tex
index 7dc90e5f7..845426691 100644
--- a/tex/context/base/lang-ini.tex
+++ b/tex/context/base/lang-ini.tex
@@ -350,6 +350,7 @@
\let\synchronizepatterns\relax % needed?
\let\enabledmapping \empty % needed?
% old (original) patterns
+\let\dochar\thechr
\doifelsenothing{#3}{\enableencoding[\s!default]}{\enableencoding[#3]}%
\doifelsenothing{#4}{\enablemapping [\s!default]}{\enablemapping [#4]}%
% \iftrue
diff --git a/tex/context/base/page-flt.tex b/tex/context/base/page-flt.tex
index 1e3a8ace9..0c93a13ae 100644
--- a/tex/context/base/page-flt.tex
+++ b/tex/context/base/page-flt.tex
@@ -829,9 +829,9 @@
\setbox\floatbox\box\globalscratchbox % local !
% retain special alignments
\ifinsidecolumns
- \ifdim\wd\floatbox>\makeupwidth
- \wd\floatbox\makeupwidth
- \fi
+ \ifdim\wd\floatbox>\makeupwidth
+ \wd\floatbox\makeupwidth
+ \fi
\fi
\fi
\else
@@ -946,17 +946,36 @@
% brr, wordt deze niet overladen in page-one? weg er mee
-\def\somepagefloat[#1]% links, rechts, midden, hoog, midden, laag
+% \def\somepagefloat[#1]% links, rechts, midden, hoog, midden, laag
+% {%\checkwaitingfloats{#1}%
+% \global\setbox\collectedpagefloats\vbox
+% {\unvbox\collectedpagefloats
+% \vbox to \textheight
+% {\doifnotinset\v!high{#1}\vfill
+% \box\floatbox
+% \doifnotinset\v!low{#1}\vfill}%
+% \goodbreak}%
+% \doinsertfloatinfo}
+
+\def\OTRONEsomepagefloat[#1]%
{%\checkwaitingfloats{#1}%
\global\setbox\collectedpagefloats\vbox
- {\unvbox\collectedpagefloats
- \vbox to \textheight
- {\doifnotinset\v!high{#1}\vfill
- \box\floatbox
- \doifnotinset\v!low{#1}\vfill}%
+ {\ifvoid\collectedpagefloats\else\unvbox\collectedpagefloats\fi
+ \vbox to \textheight % vss and unvbox catch too high and limited floats
+ {\vss
+ \doifnotinset\v!high{#1}\vfill
+ \unvbox\floatbox
+ \doifnotinset\v!low{#1}\vfill
+ \vss}%
\goodbreak}%
\doinsertfloatinfo}
+% test case:
+%
+% \placefigure[page,none]{}{\blackrule[width=\textwidth,height=0.9\textheight,color=green]}
+% \placefigure[page,none]{}{\blackrule[width=\textwidth,height=1.0\textheight,color=green]}
+% \placefigure[page,none]{}{\blackrule[width=\textwidth,height=1.1\textheight,color=green]}
+
\def\sometextfloat[#1]% lang, links, rechts, hoog, midden, laag, offset
{%\checkwaitingfloats{#1}%
\gdef\dostoptextfloat{\dodostoptextfloat[#1]}% brr global
@@ -1593,14 +1612,19 @@
% % {\hfill\box\floatbox\hfill}} % geen \hss, gaat mis in kolommen !
% {\hss \box\floatbox\hss }} % wel \hss, anders mis in colset
+\chardef\postcenterfloatmethod\plusone
+
\def\postcenterfloatbox#1%
- {\scratchdimen \ifinsidecolumns
- \ifpostponecolumnfloats\makeupwidth\else#1\fi
- \else\ifdim#1>\hsize
- \hsize
- \else
- \wd\floatbox
- \fi\fi
+ {\scratchdimen
+ \ifcase\postcenterfloatmethod
+ #1% \wd\floatbox
+ \or\ifinsidecolumns
+ \ifpostponecolumnfloats\makeupwidth\else#1\fi
+ \else\ifdim#1>\hsize
+ \hsize
+ \else
+ \wd\floatbox
+ \fi\fi\fi
\global\setbox\floatbox\hbox to \scratchdimen
% {\hfill\box\floatbox\hfill}} % geen \hss, gaat mis in kolommen !
% {\hss \box\floatbox\hss }} % wel \hss, anders mis in colset
@@ -2152,9 +2176,10 @@
% float strategy, replaces some of the above macros
-\let\floatmethod\empty
-\let\floatcolumn\empty
-\let\floatrow \empty
+\let\floatmethod \empty
+\let\floatcolumn \empty
+\let\floatrow \empty
+\let\forcedfloatmethod\empty
\def\dogetfloatbox#1#2%
{\ifvisible
@@ -2173,6 +2198,8 @@
\edef\floatmethod{#2}}%
\doifundefined{\string\floatmethod\floatmethod}
{\let\floatmethod\v!here}%
+ \doifsomething\forcedfloatmethod
+ {\edef\floatmethod{\forcedfloatmethod}}%
%\getvalue{\string\floatmethod\floatmethod}[#1]%
\getvalue{\string\floatmethod\floatmethod}[\floatmethod,#1]%
\fi}
diff --git a/tex/context/base/page-lay.tex b/tex/context/base/page-lay.tex
index 8a3a785e0..89768922b 100644
--- a/tex/context/base/page-lay.tex
+++ b/tex/context/base/page-lay.tex
@@ -314,7 +314,7 @@
% {\dodosetuppapersize[#1][#2]}}}
%
% The next version is more extensive; here we can
-% associate paper and page with key/value like settinsg,
+% associate paper and page with key/value like settings,
% which is handy in 'example' when we use setups
\def\setuppaper[#1]%
@@ -354,8 +354,7 @@
\fi\fi\fi}
\def\dododosetuppapersize[#1][#2]%
- {\xdef\restorepapersize
- {\noexpand\setuppapersize[#1][#2]}%
+ {\xdef\restorepapersize{\noexpand\setuppapersize[#1][#2]}%
\dosetuppaperorientation{#1}\paperlandscape\paperorientation\paperreverse\papermirror
\dosetuppaperorientation{#2}\printlandscape\printorientation\printreverse\printmirror
\def\docommando##1%
diff --git a/tex/context/base/page-mak.tex b/tex/context/base/page-mak.tex
index 2db3c9b54..70530ba87 100644
--- a/tex/context/base/page-mak.tex
+++ b/tex/context/base/page-mak.tex
@@ -127,9 +127,10 @@
\setupmakeuplayout
\makeupparameter\c!commands % hm, what is this one doing here ?
\startregistercolor[\makeupparameter\c!color]%
+ \forgetall % else indented flush
\global\setbox\makeupbox\vbox to \makeupparameter\c!height
\bgroup
- \forgetall
+% \forgetall
\setups[\makeupparameter\c!setups]%
\hsize\makeupparameter\c!width
\doifsomething{\makeupparameter\c!align}
diff --git a/tex/context/base/page-str.tex b/tex/context/base/page-str.tex
index 74b8a47a4..ca6504598 100644
--- a/tex/context/base/page-str.tex
+++ b/tex/context/base/page-str.tex
@@ -342,7 +342,7 @@
\def\getlocalfloats
{\dorecurse\noflocalfloats
- {\ifnum\recurselevel=1\relax
+ {\ifnum\recurselevel=\plusone % 1\relax
\getvalue{\??lf\c!before}%
\else
\getvalue{\??lf\c!inbetween}%
@@ -356,7 +356,9 @@
{\getlocalfloats
\resetlocalfloats}
-\def\getlocalfloat#1{\foundbox{localfloats}{\number#1}}
+\def\getlocalfloat#1{\expanded{\foundbox{localfloats}{\number#1}}}
+
+\def\forcelocalfloats{\let\forcedfloatmethod\v!local}
%D Because many arrangements are possible, we will implement
%D some examples in a runtime loadable module \type {m-streams}.
diff --git a/tex/context/base/regi-iso-8859-15.tex b/tex/context/base/regi-iso-8859-15.tex
index 3ab142470..ad0c320da 100644
--- a/tex/context/base/regi-iso-8859-15.tex
+++ b/tex/context/base/regi-iso-8859-15.tex
@@ -17,7 +17,7 @@
%D see also cp1252.
%D
%D Usage:
-%D \type{\enableregime[iso-8859-9]} or
+%D \type{\enableregime[iso-8859-15]} or
%D \type{\enableregime[latin9]} or
%D \type{\enableregime[il9]}
diff --git a/tex/context/base/spec-fdf.tex b/tex/context/base/spec-fdf.tex
index 7343b30aa..5f759941b 100644
--- a/tex/context/base/spec-fdf.tex
+++ b/tex/context/base/spec-fdf.tex
@@ -406,6 +406,9 @@
\doPDFaddtocatalog{\currentPDFpagemode\currentPDFviewerprefs}%
\doPDFaddtoinfo{/Trapped /False}%
\doPDFaddtoinfo{/ConTeXt.Version (\contextversion)}%
+ \doPDFaddtoinfo{/ConTeXt.Time (\number\normalyear.\twodigits\normalmonth.\twodigits\normalday\space \twodigits\currenthour:\twodigits\currentminute)}%
+ \doPDFaddtoinfo{/ConTeXt.Jobname (\jobname)}%
+ \doPDFaddtoinfo{/ConTeXt.Url (www.pragma-ade.com)}%
\to \everyfirstshipout
\def\PDFversion{1.5}
diff --git a/tex/context/base/supp-lan.tex b/tex/context/base/supp-lan.tex
index 99ba487c6..cab3f0bec 100644
--- a/tex/context/base/supp-lan.tex
+++ b/tex/context/base/supp-lan.tex
@@ -826,9 +826,6 @@
\definetextmodediscretionary {} % empty case, also handled in parser
{\prewordbreak\compoundhyphen\allowbreak\postwordbreak}
-\definetextmodediscretionary =
- {\prewordbreak\textmodediscretionary}
-
\definetextmodediscretionary ~
{\prewordbreak\discretionary{-}{}{\thinspace}\postwordbreak}
@@ -862,8 +859,11 @@
\definetextmodediscretionary >
{\endofsubsentencespacing\prewordbreak\endofsubsentence}
-\definetextmodediscretionary . % not yet definitive
- {\prewordbreak\midsentence\prewordbreak}
+% \definetextmodediscretionary . % not yet definitive
+% {\prewordbreak\midsentence\prewordbreak}
+
+\definetextmodediscretionary =
+ {\prewordbreak\midsentence\prewordbreak} % {\prewordbreak\compoundhyphen}
\definetextmodediscretionary ^
{\prewordbreak\discretionary{\hbox{$|$}}{}{\hbox{$|$}}%
diff --git a/tex/context/base/symb-ini.tex b/tex/context/base/symb-ini.tex
index 30269b6cc..063d361dd 100644
--- a/tex/context/base/symb-ini.tex
+++ b/tex/context/base/symb-ini.tex
@@ -140,7 +140,24 @@
% \fi
% \fi}
-\def\dosymbol[#1][#2]%
+% We support both:
+%
+% Test test \symbol[whatever]\ test \symbol[whatever].
+% Test test \symbol{whatever} test \symbol{whatever}.
+
+\def\dosymbol % so we also handle \symbol{name}
+ {\iffirstargument % which is nicer with following spaces
+ \expandafter\donormalsymbol
+ \else
+ \expandafter\dospecialsymbol
+ \fi}
+
+\def\dospecialsymbol[#1][#2]#3%
+ {\firstargumenttrue
+ \secondargumentfalse
+ \donormalsymbol[#3][]}
+
+\def\donormalsymbol[#1][#2]%
{\nosymboltrue
\ifsecondargument
\edef\currentsymbol{#2}%
diff --git a/tex/context/bib/t-bib.tex b/tex/context/bib/t-bib.tex
index 5421ff6a2..dbb5df612 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.02.08,
+%D version=2006.04.11,
%D title=\CONTEXT\ Publication Module,
%D subtitle=Publications,
%D author=Taco Hoekwater,
@@ -47,6 +47,8 @@
%D \item French keyword translation, provided by Renaud (08/02/2006)
%D \item fix underscores in undefined keys (22/02/2006)
%D \item Destroy interactivity in labels of the publication list (13/03/2006)
+%D \item fix multi-cite list compression (11/4/2006)
+%D \item fix \type{\getcitedata} (11/4/2006)
%D \stopitemize
%D
%D \subject{WISHLIST}
@@ -184,7 +186,7 @@
%
\fi \fi \fi
-\expanded{\definelist[\biblistname][\biblistname]}
+\expanded{\definelist[\biblistname]}
%D The text string for the publication list header
@@ -936,7 +938,9 @@
{\bgroup
\addthisref{#4}%
\dofetchapublication{#4}%
- \xdef#6{\csname insert#2\endcsname{}{}{}}%
+ \doifdefinedelse{@@pb@bib#2}%
+ {\xdef#6{\getvalue{@@pb@bib#2}}}%
+ {\xdef#6{\getvalue{@@pb@#2}}}%
\egroup }
@@ -1152,7 +1156,7 @@
\ifnum\bibitemwanted = \bibitemcounter\relax
\global\advance\bibitemwanted \plusone
\global\bibitemcounter\bibitemwanted\relax
- \@EA\doglobal\@EA\robustaddtocommalist\@EA{\myauthor}\thebibauthors
+ \@EA\doglobal\@EA\robustaddtocommalist\@EA{{\myauthor}}\thebibauthors
\fi
\fi}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 16:31:58 +0000