diff options
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4086 -> 4088 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24867 -> 24851 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 233980 -> 233980 bytes | |||
| -rw-r--r-- | tex/context/base/typo-drp.lua | 11 | ||||
| -rw-r--r-- | tex/context/base/typo-drp.mkiv | 33 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
8 files changed, 33 insertions, 17 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 30476b17f..9c0dec7f5 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{2014.01.25 12:20} +\newcontextversion{2014.01.27 11:35} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex 698e5d4eb..169b231c0 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index ca28d483d..34150d388 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -28,7 +28,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2014.01.25 12:20} +\edef\contextversion{2014.01.27 11:35} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex a0a749cf8..f6101779a 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex d3deb278c..04f7dc5d5 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/typo-drp.lua b/tex/context/base/typo-drp.lua index 34ad00078..3a87d94b3 100644 --- a/tex/context/base/typo-drp.lua +++ b/tex/context/base/typo-drp.lua @@ -234,7 +234,15 @@ actions[v_default] = function(head,setting) -- -- 1 char | n chars | skip first quote | ignore punct | keep punct -- - if method[v_auto] then + if getattr(first,a_initial) then + for current in traverse(getnext(first)) do + if getattr(current,a_initial) then + last = current + else + break + end + end + elseif method[v_auto] then local char = getchar(first) local kind = category(char) if kind == "po" or kind == "pi" then @@ -276,6 +284,7 @@ actions[v_default] = function(head,setting) else -- okay end + -- maybe also: get all A. B. etc local next = getnext(first) if next then for current in traverse_id(glyph_code,next) do diff --git a/tex/context/base/typo-drp.mkiv b/tex/context/base/typo-drp.mkiv index a266bfdbe..3ac47466f 100644 --- a/tex/context/base/typo-drp.mkiv +++ b/tex/context/base/typo-drp.mkiv @@ -75,18 +75,19 @@ \def\typo_initials_place[#1]% old command {\par \namedinitialparameter{#1}\c!before - \setinitial[#1]} + \setinitial[#1]\relax} \unexpanded\def\setinitial - {\dosingleempty\typo_initials_set} + {\dodoubleempty\typo_initials_set} -\unexpanded\def\typo_initials_set[#1]% - {\edef\typo_initial_handle{\typo_initial_handle_indeed{#1}}} +\unexpanded\def\typo_initials_set[#1][#2]% + {\edef\typo_initial_handle{\typo_initial_handle_indeed{#1}{#2}}} -\unexpanded\def\typo_initial_handle_indeed#1% +\unexpanded\def\typo_initial_handle_indeed#1#2% {\dontleavehmode \begingroup \edef\currentinitial{#1}% + \setupcurrentinitial[#2]% \scratchcounter \initialparameter\c!n\relax \scratchdistance\initialparameter\c!distance\relax \scratchhoffset \initialparameter\c!hoffset \relax @@ -97,6 +98,7 @@ {\definedfont[\initialparameter\s!font]} {\useinitialstyleparameter\c!style}% \useinitialcolorparameter\c!color + \edef\p_text{\initialparameter\c!text}% optional \ctxcommand{setinitial{ location = "\initialparameter\c!location", enabled = true, @@ -114,20 +116,25 @@ }}% \stopluacode \kern\zeropoint % we need a node + \p_text \endgroup \globallet\typo_initial_handle\relax} \let\typo_initial_handle\relax +% \setupbodyfont[dejavu,9pt] +% % \startbuffer -% \placeinitial[two] D. E. Knuth \ignorespaces\input knuth \par -% \placeinitial[two] Knuth \ignorespaces\input knuth \par -% \placeinitial[two] \quotation{D. E. Knuth} \ignorespaces\input knuth \par -% \placeinitial[two] \quotation {Knuth} \ignorespaces\input knuth \par +% \setinitial[two] D. E. Knuth \ignorespaces\input knuth \par +% \setinitial[two] Knuth \ignorespaces\input knuth \par +% \setinitial[two] \quotation{D. E. Knuth} \ignorespaces\input knuth \par +% \setinitial[two] \quotation {Knuth} \ignorespaces\input knuth \par +% \setinitial[two] [text={D.E. Knuth}] \ignorespaces\input knuth \par +% \setinitial[two] [m=4] D. E. Knuth \ignorespaces\input knuth \par % \stopbuffer - -% \type{m=2} \defineinitial[two][m=2] \getbuffer \page -% \type{m=1,method=auto} \defineinitial[two][m=1,method=auto] \getbuffer \page -% \type{m=1,method={auto,first,last}} \defineinitial[two][m=1,method={first,auto,last}] \getbuffer \page +% +% \type{m=2} \start \defineinitial[two][m=2,method=none] \getbuffer \page \stop +% \type{m=1,method=auto} \start \defineinitial[two][m=1,method=auto] \getbuffer \page \stop +% \type{m=1,method={auto,first,last}} \start \defineinitial[two][m=1,method={first,auto,last}] \getbuffer \page \stop \protect \endinput diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 669457de7..5e8032bce 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 : 01/25/14 12:20:02 +-- merge date : 01/27/14 11:35:33 do -- begin closure to overcome local limits and interference |