Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
base repository: latex3/latex3
base: 2019-05-09
head repository: latex3/latex3
compare: 2019-05-28
3 contributors
Commits on May 14, 2019
@josephwright
Document oddities of \driver_pdf_link_margin:n
fa74b5a 
Quite possibly this should be done in a first-shipout
hook, so all engines give the same result.
@josephwright
More docs
6d2ccfe
@josephwright
A better name
6ec4023 
Based on discussion with BLF.
@josephwright
Ensure color values are well-formed
d2cb4da 
Leading zeros should be present.
@josephwright
s/tmp/internal/
4700115
@josephwright
The "&" is needed for color spaces
33c5354
@josephwright
Revert "The "&" is needed for color spaces"
77eabd2 
This reverts commit 33c5354.
@josephwright
Update test files
7535faa 
Due to d2cb4da.
Commits on May 15, 2019
@josephwright
Color expressions are strings
a025172 
Save a lot of expansion.
@josephwright
Track pgf changes
920481f
Commits on May 18, 2019
@josephwright
Tidy a copyright line [ci skip]
a202971
Commits on May 22, 2019
Bruno Le Floch
Trim space around xparse processors (fixes #578)
841c0cd
Bruno Le Floch
Simplify \sys_timer: in l3benchmark (see #577)
ffa0206 
Contrarily to Heiko Oberdiek's pdftexcmds where he made the LuaTeX
emulation look like an internal integer using \numexpr...\relax,
here we want an integer denotation (simply decimal digits), which is
precisely what l3kernel.elapsedtime() provides.
Bruno Le Floch
Correct resettimer in LuaTeX
61db4c6
Bruno Le Floch
Document that LuaTeX's clock only measures CPU time and not real time
1daf93d
Commits on May 25, 2019
@frougon @josephwright
Fix documentation of 'f' specifier (#579)
0ce1a31 
Mention the fact that if the first non-expandable token found during the
expansion is a <space token>, it is gobbled.
Commits on May 26, 2019
@josephwright
Stray line [ci skip]
1739f88
Commits on May 27, 2019
@josephwright
Remove an annotation
3d9facc 
Part of the 'AR fix' which was not stripped out.
@josephwright
Object refs for breakable links in dvips
ece9969 
Approach from Raimund Niedrist, author of hypdvips.
Commits on May 28, 2019
Bruno Le Floch
Make juxtaposition with parentheses bind looser than without in l3fp
23c94a4 
This follows a long internal discussion.  This implements "option B1"
in that discussion.
@josephwright
Step release tag
535b7d2
Unified Split
Showing with 886 additions and 329 deletions.
  1. +18 −6 contrib/testfiles/chemformula001.ptex.tlg
  2. +18 −6 contrib/testfiles/chemformula001.uptex.tlg
  3. +8 −1 l3experimental/CHANGELOG.md
  4. +1 −1 l3experimental/README.md
  5. +8 −6 l3experimental/l3benchmark/l3benchmark.dtx
  6. +2 −2 l3experimental/l3cctab/l3cctab.dtx
  7. +37 −24 l3experimental/l3color/l3color.dtx
  8. +4 −4 l3experimental/l3color/testfiles/m3color001.ptex.tlg
  9. +4 −4 l3experimental/l3color/testfiles/m3color001.tlg
  10. +4 −4 l3experimental/l3color/testfiles/m3color001.uptex.tlg
  11. +4 −4 l3experimental/l3color/testfiles/m3color001.xetex.tlg
  12. +1 −1 l3experimental/l3draw/l3draw-boxes.dtx
  13. +1 −1 l3experimental/l3draw/l3draw-layers.dtx
  14. +1 −1 l3experimental/l3draw/l3draw-paths.dtx
  15. +1 −1 l3experimental/l3draw/l3draw-points.dtx
  16. +1 −1 l3experimental/l3draw/l3draw-scopes.dtx
  17. +1 −1 l3experimental/l3draw/l3draw-softpath.dtx
  18. +1 −1 l3experimental/l3draw/l3draw-state.dtx
  19. +1 −1 l3experimental/l3draw/l3draw-transforms.dtx
  20. +2 −2 l3experimental/l3draw/l3draw.dtx
  21. +1 −1 l3experimental/l3draw/testfiles/m3draw001.tlg
  22. +162 −75 l3experimental/l3graphics/l3graphics.dtx
  23. +3 −3 l3experimental/l3graphics/l3graphics.ins
  24. +2 −2 l3experimental/l3graphics/testfiles/m3graphics000.tlg
  25. +5 −3 l3experimental/l3str/l3str-convert.dtx
  26. +2 −2 l3experimental/l3str/l3str-format.dtx
  27. +2 −2 l3experimental/l3sys-shell/l3sys-shell.dtx
  28. +2 −2 l3experimental/xcoffins/xcoffins.dtx
  29. +2 −2 l3experimental/xgalley/l3galley.dtx
  30. +2 −2 l3experimental/xgalley/xgalley.dtx
  31. +14 −2 l3kernel/CHANGELOG.md
  32. +1 −1 l3kernel/README.md
  33. +2 −2 l3kernel/expl3.dtx
  34. +1 −1 l3kernel/interface3.tex
  35. +1 −1 l3kernel/l3alloc.dtx
  36. +1 −1 l3kernel/l3basics.dtx
  37. +1 −1 l3kernel/l3bootstrap.dtx
  38. +1 −1 l3kernel/l3box.dtx
  39. +118 −1 l3kernel/l3candidates.dtx
  40. +1 −1 l3kernel/l3clist.dtx
  41. +1 −1 l3kernel/l3coffins.dtx
  42. +1 −1 l3kernel/l3color-base.dtx
  43. +1 −1 l3kernel/l3deprecation.dtx
  44. +1 −1 l3kernel/l3doc.dtx
  45. +1 −1 l3kernel/l3docstrip.dtx
  46. +1 −1 l3kernel/l3drivers-basics.dtx
  47. +1 −1 l3kernel/l3drivers-box.dtx
  48. +1 −1 l3kernel/l3drivers-color.dtx
  49. +1 −1 l3kernel/l3drivers-draw.dtx
  50. +71 −17 l3kernel/l3drivers-graphics.dtx
  51. +23 −29 l3kernel/l3drivers-pdf.dtx
  52. +11 −8 l3kernel/l3drivers.dtx
  53. +1 −1 l3kernel/l3expan.dtx
  54. +1 −1 l3kernel/l3file.dtx
  55. +1 −1 l3kernel/l3final.dtx
  56. +1 −1 l3kernel/l3flag.dtx
  57. +1 −1 l3kernel/l3fp-assign.dtx
  58. +1 −1 l3kernel/l3fp-aux.dtx
  59. +1 −1 l3kernel/l3fp-basics.dtx
  60. +1 −1 l3kernel/l3fp-convert.dtx
  61. +1 −1 l3kernel/l3fp-expo.dtx
  62. +1 −1 l3kernel/l3fp-extended.dtx
  63. +1 −1 l3kernel/l3fp-logic.dtx
  64. +61 −20 l3kernel/l3fp-parse.dtx
  65. +1 −1 l3kernel/l3fp-random.dtx
  66. +1 −1 l3kernel/l3fp-round.dtx
  67. +1 −1 l3kernel/l3fp-traps.dtx
  68. +1 −1 l3kernel/l3fp-trig.dtx
  69. +10 −6 l3kernel/l3fp.dtx
  70. +1 −1 l3kernel/l3fparray.dtx
  71. +1 −1 l3kernel/l3int.dtx
  72. +1 −1 l3kernel/l3intarray.dtx
  73. +1 −1 l3kernel/l3kernel-functions.dtx
  74. +1 −1 l3kernel/l3keys.dtx
  75. +1 −1 l3kernel/l3legacy.dtx
  76. +6 −4 l3kernel/l3luatex.dtx
  77. +1 −1 l3kernel/l3msg.dtx
  78. +1 −1 l3kernel/l3names.dtx
  79. +1 −1 l3kernel/l3prg.dtx
  80. +1 −1 l3kernel/l3prop.dtx
  81. +1 −1 l3kernel/l3quark.dtx
  82. +1 −1 l3kernel/l3regex.dtx
  83. +1 −1 l3kernel/l3seq.dtx
  84. +1 −1 l3kernel/l3skip.dtx
  85. +1 −1 l3kernel/l3sort.dtx
  86. +1 −1 l3kernel/l3str.dtx
  87. +1 −1 l3kernel/l3styleguide.tex
  88. +1 −1 l3kernel/l3syntax-changes.tex
  89. +1 −1 l3kernel/l3sys.dtx
  90. +1 −1 l3kernel/l3term-glossary.tex
  91. +1 −1 l3kernel/l3tl-analysis.dtx
  92. +1 −1 l3kernel/l3tl.dtx
  93. +1 −1 l3kernel/l3token.dtx
  94. +1 −1 l3kernel/l3unicode.dtx
  95. +1 −1 l3kernel/source3.tex
  96. +4 −3 l3kernel/source3body.tex
  97. +17 −0 l3kernel/testfiles/m3expl001.luatex.tlg
  98. +10 −0 l3kernel/testfiles/m3expl001.ptex.tlg
  99. +16 −0 l3kernel/testfiles/m3expl001.tlg
  100. +10 −0 l3kernel/testfiles/m3expl001.uptex.tlg
  101. +10 −0 l3kernel/testfiles/m3expl001.xetex.tlg
  102. +17 −0 l3kernel/testfiles/m3expl003.luatex.tlg
  103. +10 −0 l3kernel/testfiles/m3expl003.ptex.tlg
  104. +16 −0 l3kernel/testfiles/m3expl003.tlg
  105. +10 −0 l3kernel/testfiles/m3expl003.uptex.tlg
  106. +10 −0 l3kernel/testfiles/m3expl003.xetex.tlg
  107. +14 −1 l3kernel/testfiles/m3fp-parse001.lvt
  108. +30 −0 l3kernel/testfiles/m3fp-parse001.tlg
  109. +4 −1 l3packages/CHANGELOG.md
  110. +1 −1 l3packages/README.md
  111. +2 −2 l3packages/l3keys2e/l3keys2e.dtx
  112. +2 −2 l3packages/xfp/xfp.dtx
  113. +2 −2 l3packages/xfrac/xfrac.dtx
  114. +6 −0 l3packages/xparse/testfiles/xparse004.luatex.tlg
  115. +11 −1 l3packages/xparse/testfiles/xparse004.lvt
  116. +6 −0 l3packages/xparse/testfiles/xparse004.tlg
  117. +3 −3 l3packages/xparse/xparse.dtx
  118. +2 −2 l3packages/xtemplate/xtemplate.dtx
24 contrib/testfiles/chemformula001.ptex.tlg
View file
@@ -3,12 +3,24 @@ Don't change this file in any respect.
Completed box being shipped out [1]
\vbox(633.0+0.0)x407.0
.\hbox(0.0+0.0)x0.0
..\special{! /pgfH{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade \ETC.}
..\special{! /pgfV{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade \ETC.}
..\special{! /pgfA{ /pgfdiff 8 index round cvi 8 index round cvi sub 2 mul 1 add\ETC.}
..\special{! /pgfR1{ newpath dup dup dup 0 360 arc clip newpath dup /pgfendx exc\ETC.}
..\special{! /pgfR2{ newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc setrgb\ETC.}
..\special{! /pgfR{ /pgfdiff 8 index round cvi 8 index round cvi sub 4 mul 1 add\ETC.}
..\special{! /pgfHrgb{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfsha\ETC.}
..\special{! /pgfVrgb{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfsha\ETC.}
..\special{! /pgfArgb{ /pgfdiff 8 index round cvi 8 index round cvi sub 2 mul 1 \ETC.}
..\special{! /pgfR1rgb{ newpath dup dup dup 0 360 arc clip newpath dup /pgfendx \ETC.}
..\special{! /pgfR2rgb{ newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc set\ETC.}
..\special{! /pgfRrgb{ /pgfdiff 8 index round cvi 8 index round cvi sub 4 mul 1 \ETC.}
..\special{! /pgfHcmyk{ /pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfs\ETC.}
..\special{! /pgfVcmyk{ /pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfs\ETC.}
..\special{! /pgfAcmyk{ /pgfdiff 10 index round cvi 10 index round cvi sub 2 mul\ETC.}
..\special{! /pgfR1cmyk{ newpath dup dup dup 0 360 arc clip newpath dup /pgfendx\ETC.}
..\special{! /pgfR2cmyk{ newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc se\ETC.}
..\special{! /pgfRcmyk{ /pgfdiff 10 index round cvi 10 index round cvi sub 4 mul\ETC.}
..\special{! /pgfHgray{ /pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfs\ETC.}
..\special{! /pgfVgray{ /pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfs\ETC.}
..\special{! /pgfAgray{ /pgfdiff 4 index round cvi 4 index round cvi sub 2 mul 1\ETC.}
..\special{! /pgfR1gray{ newpath dup dup dup 0 360 arc clip newpath dup /pgfendx\ETC.}
..\special{! /pgfR2gray{ newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc se\ETC.}
..\special{! /pgfRgray{ /pgfdiff 4 index round cvi 4 index round cvi sub 4 mul 1\ETC.}
..\special{! /pgfsc{}bind def/pgffc{}bind def/pgfstr{stroke}bind def/pgffill{fi\ETC.}
.\glue 16.0
.\vbox(617.0+0.0)x345.0, shifted 62.0
24 contrib/testfiles/chemformula001.uptex.tlg
View file
@@ -3,12 +3,24 @@ Don't change this file in any respect.
Completed box being shipped out [1]
\vbox(633.0+0.0)x407.0
.\hbox(0.0+0.0)x0.0
..\special{! /pgfH{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade \ETC.}
..\special{! /pgfV{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade \ETC.}
..\special{! /pgfA{ /pgfdiff 8 index round cvi 8 index round cvi sub 2 mul 1 add\ETC.}
..\special{! /pgfR1{ newpath dup dup dup 0 360 arc clip newpath dup /pgfendx exc\ETC.}
..\special{! /pgfR2{ newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc setrgb\ETC.}
..\special{! /pgfR{ /pgfdiff 8 index round cvi 8 index round cvi sub 4 mul 1 add\ETC.}
..\special{! /pgfHrgb{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfsha\ETC.}
..\special{! /pgfVrgb{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfsha\ETC.}
..\special{! /pgfArgb{ /pgfdiff 8 index round cvi 8 index round cvi sub 2 mul 1 \ETC.}
..\special{! /pgfR1rgb{ newpath dup dup dup 0 360 arc clip newpath dup /pgfendx \ETC.}
..\special{! /pgfR2rgb{ newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc set\ETC.}
..\special{! /pgfRrgb{ /pgfdiff 8 index round cvi 8 index round cvi sub 4 mul 1 \ETC.}
..\special{! /pgfHcmyk{ /pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfs\ETC.}
..\special{! /pgfVcmyk{ /pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfs\ETC.}
..\special{! /pgfAcmyk{ /pgfdiff 10 index round cvi 10 index round cvi sub 2 mul\ETC.}
..\special{! /pgfR1cmyk{ newpath dup dup dup 0 360 arc clip newpath dup /pgfendx\ETC.}
..\special{! /pgfR2cmyk{ newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc se\ETC.}
..\special{! /pgfRcmyk{ /pgfdiff 10 index round cvi 10 index round cvi sub 4 mul\ETC.}
..\special{! /pgfHgray{ /pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfs\ETC.}
..\special{! /pgfVgray{ /pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfs\ETC.}
..\special{! /pgfAgray{ /pgfdiff 4 index round cvi 4 index round cvi sub 2 mul 1\ETC.}
..\special{! /pgfR1gray{ newpath dup dup dup 0 360 arc clip newpath dup /pgfendx\ETC.}
..\special{! /pgfR2gray{ newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc se\ETC.}
..\special{! /pgfRgray{ /pgfdiff 4 index round cvi 4 index round cvi sub 4 mul 1\ETC.}
..\special{! /pgfsc{}bind def/pgffc{}bind def/pgfstr{stroke}bind def/pgffill{fi\ETC.}
.\glue 16.0
.\vbox(617.0+0.0)x345.0, shifted 62.0
9 l3experimental/CHANGELOG.md
View file
@@ -7,10 +7,16 @@ this project uses date-based 'snapshot' version identifiers.

## [Unreleased]

## [2019-05-28]

### Added

- New `l3graphics` module

### Fixed

- Missing `\scan_stop:` in benchmark code (fixes #577)

## [2019-05-03]

## Fixed
@@ -79,7 +85,8 @@ this project uses date-based 'snapshot' version identifiers.
- New `l3color` module using `xcolor`-like expression syntax
- New `l3draw` module, based on `pgf` layer of the TikZ system

[Unreleased]: https://github.com/latex3/latex3/compare/2019-05-03...HEAD
[Unreleased]: https://github.com/latex3/latex3/compare/2019-05-28...HEAD
[2019-05-28]: https://github.com/latex3/latex3/compare/2019-05-03...2019-05-28
[2019-05-03]: https://github.com/latex3/latex3/compare/2019-03-05...2019-05-03
[2019-03-05]: https://github.com/latex3/latex3/compare/2019-01-28...2019-03-05
[2019-01-28]: https://github.com/latex3/latex3/compare/2018-10-31...2019-01-28
2 l3experimental/README.md
View file
@@ -1,7 +1,7 @@
Experimental LaTeX3 Concepts
============================

Release 2019-05-03
Release 2019-05-28

Overview
--------
14 l3experimental/l3benchmark/l3benchmark.dtx
View file
@@ -46,7 +46,7 @@
% }^^A
% }
%
% \date{Released 2019-05-03}
% \date{Released 2019-05-28}
%
% \maketitle
%
@@ -66,8 +66,10 @@
% \cs{sys_timer:}
% \end{syntax}
% Expands to the current value of the engine's timer clock, a
% non-negative integer. In engines without clock support this
% expands to $0$.
% non-negative integer. In engines without clock support this expands
% to $0$ after an error. In \LuaTeX{} only the CPU time is measured,
% while in other engines real time is measured (including time waiting
% for user input).
% \end{function}
%
% \section{Benchmark}
@@ -128,7 +130,7 @@
%
% \begin{macrocode}
%<*package>
\ProvidesExplPackage{l3benchmark}{2019-05-03}{}
\ProvidesExplPackage{l3benchmark}{2019-05-28}{}
{L3 Experimental benchmarking}
%</package>
% \end{macrocode}
@@ -148,13 +150,13 @@
\sys_if_engine_luatex:TF
{
\cs_new:Npn \sys_timer:
{ \int_eval:w \lua_now:n { l3kernel.elapsedtime() } \scan_stop: }
{ \lua_now:n { l3kernel.elapsedtime() } }
}
{
\cs_if_exist:NT \tex_elapsedtime:D
{
\cs_new:Npn \sys_timer:
{ \int_eval:w \tex_elapsedtime:D }
{ \int_value:w \tex_elapsedtime:D }
}
}
\@@_const:nn { sys_if_timer_exist }
4 l3experimental/l3cctab/l3cctab.dtx
View file
@@ -46,7 +46,7 @@
% }^^A
% }
%
% \date{Released 2019-05-03}
% \date{Released 2019-05-28}
%
% \maketitle
%
@@ -150,7 +150,7 @@
%
% \begin{macrocode}
%<*package>
\ProvidesExplPackage{l3cctab}{2019-05-03}{}
\ProvidesExplPackage{l3cctab}{2019-05-28}{}
{L3 Experimental category code tables}
%</package>
% \end{macrocode}
61 l3experimental/l3color/l3color.dtx
View file
@@ -46,7 +46,7 @@
% }^^A
% }
%
% \date{Released 2019-05-03}
% \date{Released 2019-05-28}
%
% \maketitle
%
@@ -265,7 +265,7 @@
%
% \begin{macrocode}
%<*package>
\ProvidesExplPackage{l3color}{2019-05-03}{}
\ProvidesExplPackage{l3color}{2019-05-28}{}
{L3 Experimental color support}
%</package>
% \end{macrocode}
@@ -292,9 +292,9 @@
%
% \subsection{Setup}
%
% \begin{variable}{\l_@@_tmp_tl}
% \begin{variable}{\l_@@_internal_tl}
% \begin{macrocode}
\tl_new:N \l_@@_tmp_tl
\tl_new:N \l_@@_internal_tl
% \end{macrocode}
% \end{variable}
%
@@ -451,15 +451,7 @@
\driver_color_pickup:N \l_@@_current_tl
\tl_set_eq:cN { l_@@_named_ . _tl } \l_@@_current_tl
%</package>
\group_begin:
\seq_map_inline:Nn \l_char_active_seq
{
\tl_set:Nx \l_@@_tmp_tl { \cs_to_str:N ##1 }
\char_set_active_eq:NN ##1 \l_@@_tmp_tl
}
\tl_set:Nx \l_@@_tmp_tl {#1}
\exp_args:NNV \group_end:
\@@_parse:nN \l_@@_tmp_tl #2
\exp_args:Ne \@@_parse:nN { \tl_to_str:n {#1} } #2
}
% \end{macrocode}
% Before going to all of the effort of parsing an expression, these two
@@ -496,10 +488,10 @@
\group_begin:
\@@_extract:nNN {#2} \l_@@_model_tl \l_@@_value_tl
\@@_parse_loop:w #3 ! ! ! ! \q_stop
\tl_set:Nx \l_@@_tmp_tl
\tl_set:Nx \l_@@_internal_tl
{ \l_@@_model_tl \c_space_tl \l_@@_value_tl }
\exp_args:NNNV \group_end:
\tl_set:Nn #1 \l_@@_tmp_tl
\tl_set:Nn #1 \l_@@_internal_tl
}
% \end{macrocode}
% This is the loop proper: there can be an open-ended set of colors to parse,
@@ -633,21 +625,42 @@
% \end{macro}
%
% \begin{macro}[EXP]
% {\@@_parse_gray:w, \@@_parse_rgb:w, \@@_parse_cmyk:w, \@@_parse_spot:w}
% {
% \@@_parse_model_gray:w, \@@_parse_model_rgb:w,
% \@@_parse_model_cmyk:w, \@@_parse_model_spot:w
% }
% \begin{macro}[EXP]{\@@_parse_number:n}
% \begin{macro}[EXP]{\@@_parse_number:w}
% \begin{macro}[EXP]{\@@_parse_spot_aux:w}
% Turn the input into internal form.
% Turn the input into internal form, also tidying up the number quickly.
% \begin{macrocode}
\cs_new:Npn \@@_parse_gray:w #1 , #2 \q_stop {#1}
\cs_new:Npn \@@_parse_rgb:w #1 , #2 , #3 , #4 \q_stop { #1 ~ #2 ~ #3 }
\cs_new:Npn \@@_parse_cmyk:w #1 , #2 , #3 , #4 , #5 \q_stop
{ #1 ~ #2 ~ #3 ~ #4 }
\cs_new:Npn \@@_parse_spot:w #1 , #2 \q_stop
\cs_new:Npn \@@_parse_model_gray:w #1 , #2 \q_stop { \@@_parse_number:n {#1} }
\cs_new:Npn \@@_parse_model_rgb:w #1 , #2 , #3 , #4 \q_stop
{
\@@_parse_number:n {#1} ~
\@@_parse_number:n {#2} ~
\@@_parse_number:n {#3}
}
\cs_new:Npn \@@_parse_model_cmyk:w #1 , #2 , #3 , #4 , #5 \q_stop
{
\@@_parse_number:n {#1} ~
\@@_parse_number:n {#2} ~
\@@_parse_number:n {#3} ~
\@@_parse_number:n {#4}
}
\cs_new:Npn \@@_parse_model_spot:w #1 , #2 \q_stop
{ \@@_parse_spot_aux:w #1 ! 100 ! \q_stop }
\cs_new:Npn \@@_parse_spot_aux:w #1 ! #2 ! #3 \q_stop
{ #1 ~ \fp_eval:n { #2 / 100 } }
\cs_new:Npn \@@_parse_number:n #1
{ \@@_parse_number:w #1 . 0 . \q_stop }
\cs_new:Npn \@@_parse_number:w #1 . #2 . #3 \q_stop
{ \tl_if_blank:nTF {#1} { 0 } {#1} . #2 }
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
%
% \subsection{Selecting colors (and color models)}
%
@@ -725,10 +738,10 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_direct:nnN #1#2#3
{
\cs_if_exist:cTF { @@_parse_ #1 :w }
\cs_if_exist:cTF { @@_parse_model_ #1 :w }
{
\tl_set:Nx #3
{ #1 ~ \use:c { @@_parse_ #1 :w } #2 , 0 , 0 , 0 , 0 \q_stop }
{ #1 ~ \use:c { @@_parse_model_ #1 :w } #2 , 0 , 0 , 0 , 0 \q_stop }
\@@_check_model:N #3
}
{
8 l3experimental/l3color/testfiles/m3color001.ptex.tlg
View file
@@ -47,7 +47,7 @@ TEST 3: Naming colors by expression
============================================================
The color foo1 has the properties:
> model => gray
> value => 0.
> value => 0.0.
<recently read> }
l. ... }
The color foo2 has the properties:
@@ -229,17 +229,17 @@ The color unknown is undefined.
l. ... }
The color black has the properties:
> model => gray
> value => 0.
> value => 0.0.
<recently read> }
l. ... }
The color red has the properties:
> model => rgb
> value => 1, 0, 0.
> value => 1.0, 0.0, 0.0.
<recently read> }
l. ... }
The color cyan has the properties:
> model => cmyk
> value => 1, 0, 0, 0.
> value => 1.0, 0.0, 0.0, 0.0.
<recently read> }
l. ... }
============================================================
8 l3experimental/l3color/testfiles/m3color001.tlg
View file
@@ -47,7 +47,7 @@ TEST 3: Naming colors by expression
============================================================
The color foo1 has the properties:
> model => gray
> value => 0.
> value => 0.0.
<recently read> }
l. ... }
The color foo2 has the properties:
@@ -229,17 +229,17 @@ The color unknown is undefined.
l. ... }
The color black has the properties:
> model => gray
> value => 0.
> value => 0.0.
<recently read> }
l. ... }
The color red has the properties:
> model => rgb
> value => 1, 0, 0.
> value => 1.0, 0.0, 0.0.
<recently read> }
l. ... }
The color cyan has the properties:
> model => cmyk
> value => 1, 0, 0, 0.
> value => 1.0, 0.0, 0.0, 0.0.
<recently read> }
l. ... }
============================================================
8 l3experimental/l3color/testfiles/m3color001.uptex.tlg
View file
@@ -47,7 +47,7 @@ TEST 3: Naming colors by expression
============================================================
The color foo1 has the properties:
> model => gray
> value => 0.
> value => 0.0.
<recently read> }
l. ... }
The color foo2 has the properties:
@@ -229,17 +229,17 @@ The color unknown is undefined.
l. ... }
The color black has the properties:
> model => gray
> value => 0.
> value => 0.0.
<recently read> }
l. ... }
The color red has the properties:
> model => rgb
> value => 1, 0, 0.
> value => 1.0, 0.0, 0.0.
<recently read> }
l. ... }
The color cyan has the properties:
> model => cmyk
> value => 1, 0, 0, 0.
> value => 1.0, 0.0, 0.0, 0.0.
<recently read> }
l. ... }
============================================================

No commit comments for this range