From e89e180e2ad7ef8fe883fc6447b6aa4d6093cc43 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 22 Jul 2011 17:23:00 +0200 Subject: beta 2011.07.22 17:23 --- tex/context/base/bibl-tra.mkiv | 6 +++- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/grph-inc.lua | 34 ++++++++++++++++++--- tex/context/base/page-one.mkiv | 18 ++++++++--- tex/context/base/status-files.pdf | Bin 23778 -> 23783 bytes tex/context/base/status-lua.pdf | Bin 162201 -> 162201 bytes tex/context/base/strc-lst.mkiv | 2 +- tex/context/base/strc-not.mkiv | 14 ++++++--- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 12 files changed, 64 insertions(+), 20 deletions(-) diff --git a/tex/context/base/bibl-tra.mkiv b/tex/context/base/bibl-tra.mkiv index 77df70b69..51309327e 100644 --- a/tex/context/base/bibl-tra.mkiv +++ b/tex/context/base/bibl-tra.mkiv @@ -945,7 +945,11 @@ \ifx\LOextras\empty \setupcite[\@@currentalternative][#1]% \else - \expandafter\ifx\csname LOright\endcsname \relax + \expandafter\ifx\csname \??pv \@@currentalternative\c!right\endcsname\relax + % avoids tail recursion + \expandafter\let\csname \??pv \@@currentalternative\c!right\endcsname\empty + \fi + \expandafter\ifx\csname LOright\endcsname \relax \edef\LOextras{{\LOextras\bibalternative\c!right}}% \else \edef\LOextras{{\LOextras\LOright}}% diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index e59582530..121afea11 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.07.21 19:17} +\newcontextversion{2011.07.22 17:23} %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/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 13cc66be2..fd5cf97da 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.07.21 19:17} +\newcontextversion{2011.07.22 17:23} %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.mkii b/tex/context/base/context.mkii index f9e00a44c..9841b0e4a 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.07.21 19:17} +\edef\contextversion{2011.07.22 17:23} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 67aa0fe4e..5030295a2 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.07.22 01:29} +\edef\contextversion{2011.07.22 17:23} %D For those who want to use this: diff --git a/tex/context/base/grph-inc.lua b/tex/context/base/grph-inc.lua index 3fe2270e3..0216c2555 100644 --- a/tex/context/base/grph-inc.lua +++ b/tex/context/base/grph-inc.lua @@ -150,7 +150,7 @@ figures.cachepaths = allocate { figures.paths = allocate(table.copy(figures.localpaths)) figures.order = allocate{ - "pdf", "mps", "jpg", "png", "jp2", "jbig", "svg", "eps", "gif", "mov", "buffer", "tex", "cld", + "pdf", "mps", "jpg", "png", "jp2", "jbig", "svg", "eps", "tif", "gif", "mov", "buffer", "tex", "cld", } figures.formats = allocate{ @@ -163,6 +163,7 @@ figures.formats = allocate{ ["svg"] = { list = { "svg", "svgz" } }, ["eps"] = { list = { "eps", "ai" } }, ["gif"] = { list = { "gif" } }, + ["tif"] = { list = { "tif", "tiff" } }, ["mov"] = { list = { "mov", "flv", "mp4" } }, -- "avi" is not supported ["buffer"] = { list = { "tmp", "buffer", "buf" } }, ["tex"] = { list = { "tex" } }, @@ -1134,12 +1135,12 @@ svgconverter.default = svgconverter.pdf -- -- -- gif -- -- -- -local gifconverter = { } +local gifconverter = { } converters.gif = gifconverter programs.convert = { - command = "convert" -- imagemagick - -- command = "gm convert" -- graphicmagick + -- command = "convert" -- imagemagick + command = "gm convert" -- graphicmagick } function gifconverter.pdf(oldname,newname) @@ -1152,6 +1153,31 @@ end gifconverter.default = gifconverter.pdf +-- -- -- tif -- -- -- + +-- http://sourceforge.net/projects/gnuwin32/files/tiff/3.8.2-1/tiff-3.8.2-1-bin.zip/download + +local tifconverter = { } +converters.tif = tifconverter + +programs.convert = { +--~ command = "convert" -- imagemagick + command = "gm convert" -- graphicmagick +--~ command = "tiff2pdf" +} + +function tifconverter.pdf(oldname,newname) + local convert = programs.convert + runprogram ( + "%s %s %s %s", + convert.command, makeoptions(convert.options), oldname, newname +--~ "%s %s -z -o %s %s", +--~ convert.command, makeoptions(convert.options), newname, oldname + ) +end + +tifconverter.default = tifconverter.pdf + -- todo: lowres -- -- -- bases -- -- -- diff --git a/tex/context/base/page-one.mkiv b/tex/context/base/page-one.mkiv index 224bdcedb..c19b4b970 100644 --- a/tex/context/base/page-one.mkiv +++ b/tex/context/base/page-one.mkiv @@ -106,6 +106,8 @@ \def\OTRONEdopagecontents#1#2% \box \unvbox {\bgroup % niet breedte zetten, kan fractie zijn! + % + \donetrue\processnotes{\dochecknote\ifbottomnotes\else\donefalse\fi}% \ifcase\kindofpagetextareas \or % partial page (experimental) \let\OTRONEregisteredtextareaA\doOTRONEregisteredtextareaA @@ -114,7 +116,8 @@ \or % partial page (only works well with no stretch!) \let\OTRONEregisteredtextareaA\doOTRONEregisteredtextareaB \fi - \setbox0\vbox \ifbottomnotes to \textheight \fi + % + \setbox0\vbox \ifdone to \textheight \fi {\edef\currentpagedepth{\the\dp#2}% still to be derived from #1 \dotopinsertions \ifgridsnapping @@ -138,7 +141,8 @@ \dobotinsertions % added \fi\fi\fi \fakepagenotes}% was \fakenotes, but wrong! (check with \setupalign[height]) - \ifbottomnotes + % we could use the local snapper hier + \ifdone \ifgridsnapping \ifcase\layoutlines % todo: make macro of this \getrawnoflines\textheight @@ -154,16 +158,20 @@ \else \scratchdimen\zeropoint \fi + % \setbox2\hbox {\checksinglecolumnfootnotes - \lower\scratchdimen\vbox{\placebottomnotes}}% + \lower\scratchdimen + \vbox{\placebottomnotes}}% \smashbox2% % needed here - \ifbottomnotes + \ifdone \ht0\zeropoint \fi \OTRONEregisteredtextareaB {\vbox to \textheight - {\box0\box2\ifbottomnotes\else\vfill\fi}}% + {\box0 + \box2 + \ifdone \else\vfill\fi}}% \egroup} \def\OTRONEfinalsidefloatoutput diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index c7141d863..cb85368d5 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index 90891fed7..01099d394 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/strc-lst.mkiv b/tex/context/base/strc-lst.mkiv index bf97333b4..312e9f485 100644 --- a/tex/context/base/strc-lst.mkiv +++ b/tex/context/base/strc-lst.mkiv @@ -547,7 +547,7 @@ \definesymbol[\v!list][\s!default][\listsymbol@default] \definesymbol[\v!list][\s!unknown][\listsymbol@unknown] -\def\currentlistsymbol +\unexpanded\def\currentlistsymbol {\doifinsymbolsetelse\v!list{\listparameter\c!symbol} {\directsymbol\v!list{\listparameter\c!symbol}} {\directsymbol\v!list\s!default}} diff --git a/tex/context/base/strc-not.mkiv b/tex/context/base/strc-not.mkiv index 404299770..a9fbd670b 100644 --- a/tex/context/base/strc-not.mkiv +++ b/tex/context/base/strc-not.mkiv @@ -428,11 +428,11 @@ \def\dochecknote {% node states \setnotelocation\plusone % page - \setnoteposition\plustwo % high + \setnoteposition\plustwo % bottom \normalexpanded{\rawprocesscommalist[\noteparameter\c!location]}\dosetcheckednote % compatibility hack %ifnum\noteparameter\s!noteloc=\plusfive \endnotestrue \else \endnotesfalse \fi - \ifnum\noteparameter\s!notepos=\plustwo \bottomnotestrue \else \bottomnotesfalse \fi + \ifnum\noteparameter\s!notepos=\plustwo \bottomnotestrue \else \bottomnotesfalse \fi % set column multiplier \edef\currentnotenofcolumns{\noteparameter\c!n}% \ifx\currentnotenofcolumns\empty @@ -476,6 +476,8 @@ \global\dimen\currentnoteins\maxdimen \global\count\currentnoteins\zerocount \global\skip \currentnoteins\zeropoint + \else + % nothing ? \fi \the\everychecknote} @@ -997,7 +999,8 @@ \setbox\scratchbox\hbox {\localframed [\??vn\currentnote] - [\c!width=\v!fit, + [\c!location=, + \c!width=\v!fit, \c!height=\v!fit, \c!strut=\v!no, \c!offset=\v!overlay] @@ -1166,7 +1169,7 @@ %D \showsetup{placefootnotes} \unexpanded\def\placebottomnotes - {\processnotes\placenoteinserts} + {\processnotes\doplacenoteinserts} \unexpanded\def\placenotes {\dodoubleempty\doplacenotes} @@ -1230,16 +1233,19 @@ {\snaptogrid\hbox {\localframed [\??vn\currentnote] + [\c!location=] {\flushlocalnotes\currentnote}}} \installnotealternative \v!fixed % test if n > 0 {\localframed [\??vn\currentnote] + [\c!location=] {\flushlocalnotes\currentnote}} \installnotealternative \v!columns % redundant {\localframed [\??vn\currentnote] + [\c!location=] {\edef\currentnotewidth{\noteparameter\c!width}% \doifdimensionelse\currentnotewidth\donothing {\edef\currentnotewidth{\the\hsize}}% diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index b1d46ed0b..f881dcdfd 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 07/21/11 19:17:10 +-- merge date : 07/22/11 17:23:41 do -- begin closure to overcome local limits and interference -- cgit v1.2.3