Handle color using attributes

README.adoc

@@ -4,3 +4,5 @@ OpTeX including development versions.
 
 See http://petr.olsak.net/optex/
 
+branch colors
+

optex/base/colors.opm

@@ -2,16 +2,6 @@
 
 \_codedecl \colordef {Colors <2021-05-28>} % preloaded in format
 
-   \_doc -----------------------------
-   We declare internal boolean value \`\_iflocalcolor` ad do
-   \`\localcolor` as default.
-   \_cod -----------------------------
-
-\_newifi \_iflocalcolor \_localcolortrue
-\_protected\_def \_localcolor   {\_localcolortrue}
-\_protected\_def \_nolocalcolor {\_localcolorfalse}
-\_public \localcolor \nolocalcolor ;
-
    \_doc -----------------------------
    The basic colors in CMYK
    \`\Blue` \`\Red` \`\Brown` \`\Green` \`\Yellow` \`\Cyan` \`\Magenta`
@@ -21,103 +11,101 @@
 
 \_def\Blue      {\_setcmykcolor{1 1 0 0}}
 \_def\Red       {\_setcmykcolor{0 1 1 0}}
-\_def\Brown     {\_setcmykcolor{0 0.67 0.67 0.5}}
+\_def\Brown     {\_setcmykcolor{0 .67 .67 .5}}
 \_def\Green     {\_setcmykcolor{1 0 1 0}}
 \_def\Yellow    {\_setcmykcolor{0 0 1 0}}
 \_def\Cyan      {\_setcmykcolor{1 0 0 0}}
 \_def\Magenta   {\_setcmykcolor{0 1 0 0}}
-\_def\Grey      {\_setcmykcolor{0 0 0 0.5}}
-\_def\LightGrey {\_setcmykcolor{0 0 0 0.2}}
+\_def\Grey      {\_setcmykcolor{0 0 0 .5}}
+\_def\LightGrey {\_setcmykcolor{0 0 0 .2}}
 \_def\White     {\_setgreycolor{1}}
 \_def\Black     {\_setgreycolor{0}}
 
    \_doc -----------------------------
    By default, the \`\setcmykcolor` \`\setrgbcolor` and \`\setgreycolor`
    macros with `{<componetns>}` parameter
-   expand to `\_setcolor{<pdf-primitive>}` using \`\_formatcmyk`
-   or \`\_formatrgb` or \`\_formatgrey` expandable macros.
-   For example `\setrgbcolor{1 0 0}` expands to `\_setcolor{1 0 0 rg 1 0 0 RG}`.\nl
-   We set both types of colors (for lines (`K` or `RG` or `G`) and for fills
-   (`r` or `rg` or `g`) together in the <pdf-primitive> command.
-   This is the reason why the \`\_fillstroke` uses both its parameters.
-   If only fills are needed you can do `\def\_fillstroke#1#2{#1}`.
-   If only strokes are needed you can do `\def\_fillstroke#1#2{#2}`.
+   expand to \^`\_setcolor``{<color-data>}{<fill-op>}{<stroke-op>}` where
+   <color-data> is <R> <G> <B> or <C> <M> <Y> <K> or <G> and
+   <fill-op> is color operator for filling, <stroke-op> is color operator
+   for stroking.
    \_cod -----------------------------
 
-\_def\_setcmykcolor#1{\_setcolor{\_formatcmyk{#1}}}
-\_def\_setrgbcolor#1{\_setcolor{\_formatrgb{#1}}}
-\_def\_setgreycolor#1{\_setcolor{\_formatgrey{#1}}}
-\_def\_formatcmyk#1{\_fillstroke{#1 k}{#1 K}}
-\_def\_formatrgb#1{\_fillstroke{#1 rg}{#1 RG}}
-\_def\_formatgrey#1{\_fillstroke{#1 g}{#1 G}}
-\_def\_fillstroke#1#2{#1 #2}
+\_def\_setcmykcolor#1{\_setcolor{#1}kK}
+\_def\_setrgbcolor#1{\_setcolor{#1}{rg}{RG}}
+\_def\_setgreycolor#1{\_setcolor{#1}gG}
 \_public \setcmykcolor \setrgbcolor \setgreycolor ;
 
    \_doc -----------------------------
-   The \`\onlyrgb` declaration redefines \^`\_formatcmyk` in order it expands
-   to its conversion to RGB <pdf-primitive>. This conversion is done by
-   the \^`\_cmyktorgb` macro. Moreover, `\onlyrgb` re-defines three basic RGB
+   The \`\onlyrgb` declaration redefines \^`\setcmykcolor` to do conversion
+   to RGB just before \^`\_setcolor` is used.
+   The \`\onlycmyk` declaration redefines \^`\setrgbcolor` to do conversion
+   to CMYK just before \^`\_setcolor` is used.
+   Moreover, \^`\onlyrgb` re-defines three basic RGB
    colors for RGB color space and re-declares \^`\colordef` as \^`\rgbcolordef`.
-   The \hbox{\`\onlycmyk`} macro does similar work, it re-defines \^`\_formatrgb`
-   macro. The Grey color space is unchanged and works in both main
-   settings (RGB or CMYK) without collisions.
    \_cod -----------------------------
 
 \_def\_onlyrgb{\_def\Red{\_setrgbcolor{1 0 0}}%
    \_def\Green{\_setrgbcolor{0 1 0}}\_def\Blue{\_setrgbcolor{0 0 1}}%
    \_let\_colordef=\_rgbcolordef
-   \_def\_formatrgb##1{\_fillstroke{##1 rg}{##1 RG}}%
-   \_def\_formatcmyk##1{\_fillstroke{\_cmyktorgb ##1 ; rg}{\_cmyktorgb ##1 ; RG}}}
-\_def\_onlycmyk{\_def\_formatcmyk##1{\_fillstroke{##1 k}{##1 K}}%
-   \_def\_formatrgb##1{\_fillstroke{\_rgbtocmyk ##1 ; k}{\_rgbtocmyk ##1 ; K}}}
+   \_def\_setrgbcolor##1{\_setcolor{##1}{rg}{RG}}%
+   \_def\_setcmykcolor##1{\_ea\_setcolor\_ea{\_expanded{\_cmyktorgb ##1 ;}}{rg}{RG}}%
+   \_public \colordef \setrgbcolor \setcmykcolor ;}
+\_def\_onlycmyk{%
+   \_let\_colordef=\_cmykcolordef
+   \_def\_setrgbcolor##1{\_ea\_setcolor\_ea{\_expanded{\_rgbtocmyk ##1 ;}}kK}%
+   \_def\_setcmykcolor##1{\_setcolor{##1}kK}%
+   \_public \colordef \setrgbcolor \setcmykcolor ;}
 \_public \onlyrgb \onlycmyk ;
 
    \_doc -----------------------------
-   The \`\_setcolor` macro redefines empty `\_ensureblack` macro (used in
-   output routine for headers and footers) to `\_ensureblackA` which sets
-   Black at the start of its parameter and returns to the current color at the
-   end of its parameter.
-
-   The current color is saved into `\_currentcolor` macro and colorstack is pushed.
-   Finally, the `\_colorstackpop` is initialized by `\aftergroup` if
-   `\localcolor` is declared.
-
-   You can save the current color to your macro  by `\let\yourmacro=\_currentcolor`
-   and you can return to this color by the command `\_setcolor\yourmacro`.
+   The \`\_colorattr` for coloring is allocated and
+   \`\_setcolor``{<color-data>}{<fill-op>}{<stroke-op>}` is defined here.
+   This macro does `\_colorattr=`\`\_colorcnt` if the <color data> was not used
+   before and prepare mapping from this integer value to the <color data>
+   and increments \^`\_colorcnt`.
+   If the <color data> were used already, then \^`\_setcolor`
+   does `\_colorattr=<stored-value>`.
+   This work is done by the \`\_translatecolor` macro. The following mapping
+   macros are created:
+   \begtt \catcode`<=13
+   \_color:<data> <fill-op>     ... expands to used <attribute-value>
+   \_color:<attribute-value>    ... expands to <data> <fill-op>
+   \_color-s:<attribute-value>  ... expands to <data> <stroke-op>
+   \endtt
+   The \`\_resetcolor` un-sets the color attribute, it means that default
+   color (black) is used.
    \_cod -----------------------------
 
-\_protected\_def \_setcolor #1{\_global\_let\_ensureblack=\_ensureblackA
-   \_iflocalcolor \_edef\_currentcolor{#1}\_colorstackpush\_currentcolor
-                  \_aftergroup\_colorstackpop
-   \_else         \_xdef\_currentcolor{#1}\_colorstackset\_currentcolor \_fi
+\_newattribute \_colorattr
+\_newcount \_colorcnt \_colorcnt=1 % allocations start at 1
+\_protected\_def\_setcolor{\_colorprefix\_colorattr=\_translatecolor}
+\_def\_resetcolor{\_colorprefix\_colorattr=-"7FFFFFFF }
+\_def\_translatecolor#1#2#3{\_ifcsname _color:#1 #2\_endcsname\_lastnamedcs\_relax
+   \_else
+      \_colorcnt
+      \_sxdef{_color:#1 #2}{\_the\_colorcnt}%
+      \_sxdef{_color:\_the\_colorcnt}{#1 #2}%
+      \_sxdef{_color-s:\_the\_colorcnt}{#1 #3}%
+      \_incr \_colorcnt
+   \_fi
 }
-\_def\_pdfblackcolor{0 g 0 G}
-\_edef\_currentcolor{\_pdfblackcolor}
-\_def\_ensureblackA#1{\_global\_let\_openfnotestack=\_openfnotestackA
-   \_colorstackpush\_pdfblackcolor #1\_colorstackpop}
-
-   \_doc -----------------------------
-   The colorstack is initialized here and the basic macros
-   \`\_colorstackpush`, \`\_colorstackpop` and \`\_colorstackset`
-   are defined here.
-   \_cod -----------------------------
-
-\_mathchardef\_colorstackcnt=0 % Implicit stack usage
-\_def\_colorstackpush#1{\_pdfcolorstack\_colorstackcnt push{#1}}
-\_def\_colorstackpop{\_pdfcolorstack\_colorstackcnt pop}
-\_def\_colorstackset#1{\_pdfcolorstack\_colorstackcnt set{#1}}
+% Black is the default color.
+\_sdef{_color:0 g}{0}
+\_sdef{_color:0}{0 g}
+\_sdef{_color-s:0}{0 G}
 
    \_doc -----------------------------
-   We need to open a special color stack for footnotes because footnotes
-   can follow on the next pages and their colors are independent of colors
-   used in the main page-body. The \`\_openfnotestack` is defined as
-   \`\_openfnotestackA` when the \^`\_setcolor` is used first.
-   The \`\_fnotestack` is initialized in in `\everyjob` because the
-   initialization is not saved to the format.
+   We support concept of non-local color, i.e. all changes of the color
+   attribute are global by setting \`\_colorprefix` to `\global`.
+   \`\localcolor` is the default, i.e.\ \^`\_colorprefix` is `\relax`.\nl
+   You can write `\global\Red` if you want to have global setting of the
+   color.
    \_cod -----------------------------
 
-%\_mathchardef\_fnotestack=\_pdfcolorstackinit page {0 g 0 G} % must be in \everyjob
-\_def \_openfnotestackA {\_pdfcolorstack\_fnotestack current}
+\_protected\_def \_localcolor   {\_let\_colorprefix=\_relax}
+\_protected\_def \_nolocalcolor {\_let\_colorprefix=\_global}
+\_public \localcolor \nolocalcolor ;
+\_localcolor
 
    \_doc -----------------------------
    We use Lua codes for RGB to CMYK or CMYK to RGB conversions and for
@@ -319,35 +307,53 @@
 
 \_endcode % -------------------------------------
 
-The colors have different behavior than fonts. Marks (whatsits) with color
-information are stored into PDF output and \TeX/ doesn't interpret them.
-The PDF viewer (or PDF interpreter in a printer) reads these marks
-and switches colors according to them. This
-is independent of \TeX/ group mechanism. You can declare
-`\nolocalcolor` at the beginning of the document, if you want this behavior.
-In this case, if you set a color then you must return to the black color
-using `\Black` manually.
-
-By default, \OpTeX/ sets `\localcolor`. It means that the typesetting
-returns to a previous color at the end of the current group, so you cannot
-write `\Black` explicitly. This is implemented using the `\aftergroup` feature.
-There is a limitation of this feature: when a color selector is used in a
-group of a box, which is saved by `\setbox`, then the activity or
-reconstruction of the previous color is processed at `\setbox` time, no in the
-box itself. You must correct it by double group:
-\begtt
-\setbox0=\hbox{\Red text}   % bad:  \Black is done after \setbox
-\setbox0=\hbox{{\Red text}} % good: \Black is done after group inside the box
-\endtt
-
-The implementation of colors is based on colorstack, so the current color
-can follow across more pages. It is not so obvious because PDF viewer (or PDF
-interpreter) manipulates with colors locally at each PDF page and it
-initializes each PDF page with black on white color.
+\secc Basic concept
+
+Setting of color in PDF is handled by graphics operators which change the
+graphics context. Colors for fills/strokes are distinguished, but apart from
+that, only one color is active at time and is used for all material drawn by
+following graphics operators, until next color is set. Each PDF content (e.g.
+page or form XObject) has its own graphics context, that is initialized from
+zero. Hence we have different concept of selecting fonts in \TeX/ (it
+depends on \TeX/ groups but does not depends on pages) and color handling in
+PDF.
+
+\TeX/ itself has no concept of colors. Colors have always been handled by
+inserting whatsits (either using `\special` for DVI or using
+`\pdfliteral`/`\pdfcolorstack` for PDF). It is very efficient way of doing
+it, \TeX/ doesn't have to know anything about colors, it just inserts the
+relevant literals when doing `\shipout`. However, it is also problematic in
+many ways.
+
+This is reason we decide to change colors handling from `\pdfcolorstack` to
+\LuaTeX/ attributes in version 1.04 of \OpTeX. Using attributes, the color
+setting looks exacly like font selection from \TeX/ point of view: it
+respects \TeX/ groups, colors can span to more pages, independent colors
+can be set for in all `\insert`s. Moreover, once a material is typeset
+(using `\setbox` for example) then it has its fonts and its colors
+definitelly set and you can rely on it when you are using `\unhbox` etc.\
+operations. There are no internal whatsits for colors which can interferre
+with other typesetting material.
+
+The \LuaTeX/ attributes can be set like other register settings and after
+such a setting, their values are bound to essentially everything \TeX/ creates
+(characters, rules, glues, \dots).
+We use one attribute \^`\_colorattr` for information of currently selected
+color. Setting a color means only to set appropriate value to this attribute.
+The value is propagated to each created typesetting element until the attribute
+is unset or set to another value. So, setting the attribute behaves exactly
+like selecting the font. You can use `{\bf text}` to have text in bold and
+`{\Red text}` to have text in red.
 
 Macros \^`\setcmykcolor``{<C> <M> <Y> <K>}` or \^`\setrgbcolor``{<R> <G> <B>}`
-or\nl \^`\setgreycolor``{<Grey>}` should be used in color selectors or user can
-specify these macros explicitly.
+or\nl \^`\setgreycolor``{<Grey>}` are used in color selectors. These
+macros expand to internal \^`\_setcolor` macro which sets the \^`\_colorattr`
+attribute to an integer value and prepares mapping between this value and the real
+color data. This mapping is used just before each `\shipout` in output routine.
+The \^`\_preshipout` pseudo-primitive is used here, it converts attribute
+values to internal PDF commands for selecting colors.
+
+\secc Color mixing
 
 The color mixing processed by the \^`\colordef` is done in the subtractive color
 model CMYK. If the result has a component greater than 1 then all
@@ -405,6 +411,8 @@ and it is used in \^`\colordef` or if it is printed when \^`\onlycmyk` is declar
 The CMYK to RGB conversion is invoked when a color is declared using \^`\setcmykcolor`
 and it is used in \^`\rgbcolordef` or if it is printed when \^`\onlyrgb` is declared.
 
+\secc Implementation
+
 \_endinput
 
 2021-05-28 \rgbcmykmap introduced

optex/base/doc.opm

@@ -127,7 +127,7 @@
    The lines in the listing mode have a yellow background.
    \_cod -----------------------------
 
-\_def\Yellow{\_setcmykcolor{0.0 0.0 0.3 0.03}}
+\_def\Yellow{\_setcmykcolor{0 0 .3 .03}}
 
 \_def\_printcodeline#1{\_advance \_maxlines by-1
    \_ifnum \_maxlines<0 \_ea \_endverbprinting \_fi
@@ -137,7 +137,7 @@
    \_indent \_printverblinenum #1\par}
 
 \_def\_printfilename{\_hbox to0pt{%
-   \_hskip\_hsize\vbox to0pt{\_vss\_llap{\Brown\docfile}\_kern7.5pt}\_hss}%
+   \_hskip\_hsize\_vbox to0pt{\_vss\_llap{\Brown\docfile}\_kern7.5pt}\_hss}%
    \_let\_printfilename=\_relax
 }
 \_everytt={\_let\_printverblinenum=\_relax}
@@ -153,7 +153,7 @@
 \_def\docfile{}
 \_def\_printdoc #1 {\_par \_def\docfile{#1}%
    \_everytt={\_ttshift=-15pt \_let\_printverblinenum=\_relax}%
-   \_ea\_cod \input #1
+   \_ea\_cod \_input #1
    \_everytt={\_let\_printverblinenum=\_relax}%
    \_def\docfile{}%
 }

optex/base/fonts-select.opm

@@ -146,6 +146,7 @@
    \_directlua{%
       require('luaotfload-main')
       luaotfload.main()
+      optex_hook_into_luaotfload()
    }%
    \_gdef\_rfskipatX ##1" ##2\_relax{"##1"}%
    \_global\_let \_doresizefont=\_doresizeunifont

optex/base/graphics.opm

@@ -231,8 +231,8 @@
    are parameters, they can be set by user in optional brackets `[...]`.
    For example `\fcolor=\Red` does `\_let\_fcolorvalue=\Red` and it means
    filling color.\nl
-   The \`\_setflcolor` uses the \^`\_fillstroke` macro to separate filling
-   color and drawing color.
+   The \`\_setflcolors` uses the \^`\_setcolor` macro to separate filling (non-stroking)
+   color and stroking color.
    \_cod -----------------------------
 
 \_newdimen \_lwidth
@@ -245,10 +245,9 @@
 \_def\_touppervalue#1{\_ifx#1n\_let#1=N\_fi}
 
 \_def\_setflcolors#1{% use only in a group
-   \_def\_setcolor##1{##1}%
-   \_def\_fillstroke##1##2{##1}%
+   \_def\_setcolor##1##2##3{##1 ##2}%
    \_edef#1{\_fcolorvalue}%
-   \_def\_fillstroke##1##2{##2}%
+   \_def\_setcolor##1##2##3{##1 ##3}%
    \_edef#1{#1\_space\_lcolorvalue\_space}%
 }
 \_optdef\_inoval[]{\_vbox\_bgroup
@@ -260,9 +259,7 @@
       \_advance\_hsize by-2\_hhkern \_advance\_hsize by-2\_roundness \_fi
    \_setbox0=\_hbox\_bgroup\_bgroup \_aftergroup\_inovalA \_kern\_hhkern \_let\_next=%
 }
-\_def\_inovalA{\_isnextchar\_colorstackpop\_inovalB\_inovalC}
-\_def\_inovalB#1{#1\_isnextchar\_colorstackpop\_inovalB\_inovalC}
-\_def\_inovalC{\_egroup % of \setbox0=\hbox\bgroup
+\_def\_inovalA{\_egroup % of \setbox0=\hbox\bgroup
    \_ifdim\_vvkern=\_zo \_else \_ht0=\_dimexpr\_ht0+\_vvkern \_relax
                                \_dp0=\_dimexpr\_dp0+\_vvkern \_relax \_fi
    \_ifdim\_hhkern=\_zo \_else \_wd0=\_dimexpr\_wd0+\_hhkern \_relax \_fi
@@ -290,9 +287,7 @@
    \_touppervalue\_overlapmarginsvalue \_touppervalue\_shadowvalue
    \_setbox0=\_hbox\_bgroup\_bgroup \_aftergroup\_incircleA \_kern\_hhkern \_let\_next=%
 }
-\_def\_incircleA {\_isnextchar\_colorstackpop\_incircleB\_incircleC}
-\_def\_incircleB #1{#1\_isnextchar\_colorstackpop\_incircleB\_incircleC}
-\_def\_incircleC {\_egroup % of \setbox0=\hbox\bgroup
+\_def\_incircleA {\_egroup % of \setbox0=\hbox\bgroup
    \_wd0=\_dimexpr \_wd0+\_hhkern \_relax
    \_ht0=\_dimexpr \_ht0+\_vvkern \_relax \_dp0=\_dimexpr \_dp0+\_vvkern \_relax
    \_ifdim \_ratiovalue\_dimexpr \_ht0+\_dp0 > \_wd0

optex/base/hisyntax-python.opm

@@ -69,8 +69,8 @@
 }
 \_gdef\_hipystrpre#1\x#2{\x#2{#1}\x#2}
 
-\_ifx\LightBlue\_undefined \_gdef\LightBlue {\_setcmykcolor{1 0.43 0 0}}\_fi 
-\_ifx\Orange\_undefined    \_gdef\Orange    {\_setcmykcolor{0 0.64 1 0}}\_fi 
+\_ifx\LightBlue\_undefined \_gdef\LightBlue {\_setcmykcolor{1 .43 0 0}}\_fi
+\_ifx\Orange\_undefined    \_gdef\Orange    {\_setcmykcolor{0 .64 1 0}}\_fi
 
 \_endcode %------------------------------------------------
 

optex/base/optex.ini

@@ -21,7 +21,7 @@
 
 % OpTeX version
 
-\def\optexversion{1.03+ Jun.2021}
+\def\optexversion{1.03^ Jun.2021}
 \def\fmtname{OpTeX}
 \let\fmtversion=\optexversion
 
@@ -95,7 +95,6 @@
 
 \_everyjob = {%
    \_message{This is OpTeX (Olsak's Plain TeX), version <\optexversion>^^J}%
-   \_mathchardef\_fnotestack=\_pdfcolorstackinit page {0 g 0 G}%
    \_directlua{lua.bytecode[1]()}% load OpTeX's Lua code
    \_mathsbon % replaces \int_a^b to \int _a^b
    \_inputref % inputs \jobname.ref if exists