[latex3-commits] [git/LaTeX3-latex3-latex3] master: Initialise l3draw work (6e68728)
Joseph Wright
joseph.wright at morningstar2.co.uk
Tue Feb 6 23:31:55 CET 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/6e68728f7822c05c7f94de5e5b2000f3c7eb130e
>---------------------------------------------------------------
commit 6e68728f7822c05c7f94de5e5b2000f3c7eb130e
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Feb 6 20:56:40 2018 +0000
Initialise l3draw work
This is a stub at present, with the idea being to implement something
more-or-less the same as pgf (the base layer of TikZ). The key
difference between the pgf code and the plan here is that we have the
FPU to build on, which should provide much more even handling of e.g.
small numbers.
The plan is to stay interface-compatible with pgf if possible: it's well
thought-out but also that may allow 'drop in' TikZ compatiblity level.
(There are a few places some patching might be required.)
As pgf is a mature and complex system, the aim is to build up part by
part. In particular, some more tricky features will likely be missing
for some time. This is already evident in the driver-level code added to
l3kernel: at present, this doesn't have pgf's 'protocol' (buffering)
approach to paths.
The initial files follow the structure of pgfcore, though the plan at
present is to combine all of the path functions into a single (slightly
long) source.
Getting to a working set up will require work in various places: there
will be a number of commits to get anywhere near that. See also above
concerning the fact that some code will be simplified, particularly in a
first pass.
>---------------------------------------------------------------
6e68728f7822c05c7f94de5e5b2000f3c7eb130e
l3trial/{l3tree => l3draw}/build.lua | 4 +-
l3trial/l3draw/l3draw-paths.dtx | 69 ++++++++++++++++
l3trial/l3draw/l3draw-points.dtx | 69 ++++++++++++++++
l3trial/l3draw/l3draw-scopes.dtx | 69 ++++++++++++++++
l3trial/l3draw/l3draw-state.dtx | 69 ++++++++++++++++
l3trial/l3draw/l3draw.dtx | 84 ++++++++++++++++++++
l3trial/{l3image/l3image.ins => l3draw/l3draw.ins} | 14 +++-
.../l3draw/testfiles/m3draw000.lvt | 7 +-
.../l3draw/testfiles/m3draw000.tlg | 4 +-
9 files changed, 380 insertions(+), 9 deletions(-)
diff --git a/l3trial/l3tree/build.lua b/l3trial/l3draw/build.lua
similarity index 87%
copy from l3trial/l3tree/build.lua
copy to l3trial/l3draw/build.lua
index df7d3aa..202bcb8 100644
--- a/l3trial/l3tree/build.lua
+++ b/l3trial/l3draw/build.lua
@@ -1,11 +1,11 @@
#!/usr/bin/env texlua
--- Build script for LaTeX3 "l3tree" files
+-- Build script for LaTeX3 "l3draw" files
-- Identify the bundle and module: the module may be empty in the case where
-- there is no subdivision
bundle = "l3trial"
-module = "l3tree"
+module = "l3draw"
-- Location of main directory: use Unix-style path separators
maindir = "../.."
diff --git a/l3trial/l3draw/l3draw-paths.dtx b/l3trial/l3draw/l3draw-paths.dtx
new file mode 100644
index 0000000..c1f4143
--- /dev/null
+++ b/l3trial/l3draw/l3draw-paths.dtx
@@ -0,0 +1,69 @@
+% \iffalse meta-comment
+%
+%% File: l3draw-paths.dtx Copyright(C) 2018 The LaTeX3 Project
+%
+% It may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License (LPPL), either version 1.3c of this
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% http://www.latex-project.org/lppl.txt
+%
+% This file is part of the "l3trial bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/latex3/latex3
+%
+% for those people who are interested.
+%
+%<*driver|package>
+\RequirePackage{expl3}
+%</driver|package>
+%<*driver>
+\documentclass[full]{l3doc}
+\begin{document}
+ \DocInput{\jobname.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \title{^^A
+% The \pkg{l3draw-paths} package\\ Drawing paths^^A
+% }
+%
+% \author{^^A
+% The \LaTeX3 Project\thanks
+% {^^A
+% E-mail:
+% \href{mailto:latex-team at latex-project.org}
+% {latex-team at latex-project.org}^^A
+% }^^A
+% }
+%
+% \date{Released 2018/02/05}
+%
+% \maketitle
+%
+% \begin{implementation}
+%
+% \section{\pkg{l3draw-paths} implementation}
+%
+% \begin{macrocode}
+%<*initex|package>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<@@=draw>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%</initex|package>
+% \end{macrocode}
+%
+% \end{implementation}
+%
+% \PrintIndex
diff --git a/l3trial/l3draw/l3draw-points.dtx b/l3trial/l3draw/l3draw-points.dtx
new file mode 100644
index 0000000..c3de978
--- /dev/null
+++ b/l3trial/l3draw/l3draw-points.dtx
@@ -0,0 +1,69 @@
+% \iffalse meta-comment
+%
+%% File: l3draw-points.dtx Copyright(C) 2018 The LaTeX3 Project
+%
+% It may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License (LPPL), either version 1.3c of this
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% http://www.latex-project.org/lppl.txt
+%
+% This file is part of the "l3trial bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/latex3/latex3
+%
+% for those people who are interested.
+%
+%<*driver|package>
+\RequirePackage{expl3}
+%</driver|package>
+%<*driver>
+\documentclass[full]{l3doc}
+\begin{document}
+ \DocInput{\jobname.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \title{^^A
+% The \pkg{l3draw-points} package\\ Calculating points^^A
+% }
+%
+% \author{^^A
+% The \LaTeX3 Project\thanks
+% {^^A
+% E-mail:
+% \href{mailto:latex-team at latex-project.org}
+% {latex-team at latex-project.org}^^A
+% }^^A
+% }
+%
+% \date{Released 2018/02/05}
+%
+% \maketitle
+%
+% \begin{implementation}
+%
+% \section{\pkg{l3draw-points} implementation}
+%
+% \begin{macrocode}
+%<*initex|package>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<@@=draw>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%</initex|package>
+% \end{macrocode}
+%
+% \end{implementation}
+%
+% \PrintIndex
diff --git a/l3trial/l3draw/l3draw-scopes.dtx b/l3trial/l3draw/l3draw-scopes.dtx
new file mode 100644
index 0000000..fd13fc4
--- /dev/null
+++ b/l3trial/l3draw/l3draw-scopes.dtx
@@ -0,0 +1,69 @@
+% \iffalse meta-comment
+%
+%% File: l3draw-scopes.dtx Copyright(C) 2018 The LaTeX3 Project
+%
+% It may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License (LPPL), either version 1.3c of this
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% http://www.latex-project.org/lppl.txt
+%
+% This file is part of the "l3trial bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/latex3/latex3
+%
+% for those people who are interested.
+%
+%<*driver|package>
+\RequirePackage{expl3}
+%</driver|package>
+%<*driver>
+\documentclass[full]{l3doc}
+\begin{document}
+ \DocInput{\jobname.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \title{^^A
+% The \pkg{l3draw} package\\ Drawing scopes^^A
+% }
+%
+% \author{^^A
+% The \LaTeX3 Project\thanks
+% {^^A
+% E-mail:
+% \href{mailto:latex-team at latex-project.org}
+% {latex-team at latex-project.org}^^A
+% }^^A
+% }
+%
+% \date{Released 2018/02/05}
+%
+% \maketitle
+%
+% \begin{implementation}
+%
+% \section{\pkg{l3draw-scopes} implementation}
+%
+% \begin{macrocode}
+%<*initex|package>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<@@=draw>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%</initex|package>
+% \end{macrocode}
+%
+% \end{implementation}
+%
+% \PrintIndex
diff --git a/l3trial/l3draw/l3draw-state.dtx b/l3trial/l3draw/l3draw-state.dtx
new file mode 100644
index 0000000..b221cb6
--- /dev/null
+++ b/l3trial/l3draw/l3draw-state.dtx
@@ -0,0 +1,69 @@
+% \iffalse meta-comment
+%
+%% File: l3draw-state.dtx Copyright(C) 2018 The LaTeX3 Project
+%
+% It may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License (LPPL), either version 1.3c of this
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% http://www.latex-project.org/lppl.txt
+%
+% This file is part of the "l3trial bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/latex3/latex3
+%
+% for those people who are interested.
+%
+%<*driver|package>
+\RequirePackage{expl3}
+%</driver|package>
+%<*driver>
+\documentclass[full]{l3doc}
+\begin{document}
+ \DocInput{\jobname.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \title{^^A
+% The \pkg{l3draw-state} package\\ Drawing graphics state^^A
+% }
+%
+% \author{^^A
+% The \LaTeX3 Project\thanks
+% {^^A
+% E-mail:
+% \href{mailto:latex-team at latex-project.org}
+% {latex-team at latex-project.org}^^A
+% }^^A
+% }
+%
+% \date{Released 2018/02/05}
+%
+% \maketitle
+%
+% \begin{implementation}
+%
+% \section{\pkg{l3draw-state} implementation}
+%
+% \begin{macrocode}
+%<*initex|package>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<@@=draw>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%</initex|package>
+% \end{macrocode}
+%
+% \end{implementation}
+%
+% \PrintIndex
diff --git a/l3trial/l3draw/l3draw.dtx b/l3trial/l3draw/l3draw.dtx
new file mode 100644
index 0000000..09866a8
--- /dev/null
+++ b/l3trial/l3draw/l3draw.dtx
@@ -0,0 +1,84 @@
+% \iffalse meta-comment
+%
+%% File: l3draw.dtx Copyright(C) 2018 The LaTeX3 Project
+%
+% It may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License (LPPL), either version 1.3c of this
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% http://www.latex-project.org/lppl.txt
+%
+% This file is part of the "l3trial bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/latex3/latex3
+%
+% for those people who are interested.
+%
+%<*driver|package>
+\RequirePackage{expl3}
+%</driver|package>
+%<*driver>
+\documentclass[full]{l3doc}
+\begin{document}
+ \DocInput{\jobname.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \title{^^A
+% The \pkg{l3draw} package\\ Core drawing support^^A
+% }
+%
+% \author{^^A
+% The \LaTeX3 Project\thanks
+% {^^A
+% E-mail:
+% \href{mailto:latex-team at latex-project.org}
+% {latex-team at latex-project.org}^^A
+% }^^A
+% }
+%
+% \date{Released 2017/12/16}
+%
+% \maketitle
+%
+% \begin{documentation}
+%
+% \section{\pkg{l3draw} documentation}
+%
+% \end{documentation}
+%
+% \begin{implementation}
+%
+% \section{\pkg{l3draw} implementation}
+%
+% \begin{macrocode}
+%<*initex|package>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<@@=draw>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<*package>
+\ProvidesExplPackage{l3draw}{2018/02/06}{}
+ {L3 Experimental core drawing support}
+%</package>
+% \end{macrocode}
+%
+% Everything else is in the sub-files!
+%
+% \begin{macrocode}
+%</initex|package>
+% \end{macrocode}
+%
+% \end{implementation}
+%
+% \PrintIndex
diff --git a/l3trial/l3image/l3image.ins b/l3trial/l3draw/l3draw.ins
similarity index 81%
copy from l3trial/l3image/l3image.ins
copy to l3trial/l3draw/l3draw.ins
index 5fc8561..48758c8 100644
--- a/l3trial/l3image/l3image.ins
+++ b/l3trial/l3draw/l3draw.ins
@@ -1,6 +1,6 @@
\iffalse meta-comment
-File l3image.ins Copyright (C) 2017 The LaTeX3 Project
+File l3draw.ins Copyright (C) 2018 The LaTeX3 Project
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -32,7 +32,7 @@ license information is placed in the derived files.
\preamble
-Copyright (C) 2017 The LaTeX3 Project
+Copyright (C) 2018 The LaTeX3 Project
It may be distributed and/or modified under the conditions of
the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -51,6 +51,14 @@ and all files in that bundle must be distributed together.
\keepsilent
-\generate{\file{l3image.sty}{\from{l3image.dtx}{package}}}
+\generate{\file{l3draw.sty}
+ {
+ \from{l3draw.dtx} {package}
+ \from{l3draw-paths.dtx} {package}
+ \from{l3draw-points.dtx}{package}
+ \from{l3draw-scopes.dtx}{package}
+ \from{l3draw-state.dtx} {package}
+ }
+}
\endbatchfile
diff --git a/l3packages/xfp/testfiles/xfp000.lvt b/l3trial/l3draw/testfiles/m3draw000.lvt
similarity index 65%
copy from l3packages/xfp/testfiles/xfp000.lvt
copy to l3trial/l3draw/testfiles/m3draw000.lvt
index fc6ef6e..335ae7e 100644
--- a/l3packages/xfp/testfiles/xfp000.lvt
+++ b/l3trial/l3draw/testfiles/m3draw000.lvt
@@ -1,15 +1,16 @@
%
-% Copyright (C) 2017 LaTeX3 Project
+% Copyright (C) 2018 The LaTeX3 Project
%
\documentclass{minimal}
\input{regression-test}
+
\RequirePackage[check-declarations]{expl3}
\ExplSyntaxOn
\debug_on:n { deprecation }
\ExplSyntaxOff
\START
-\AUTHOR{Bruno Le Floch}
-\RequirePackage{xfp}
+\AUTHOR{Joseph Wright}
+\RequirePackage{l3draw}
\END
diff --git a/l3experimental/l3str/testfiles/m3str-convert002.ptex.tlg b/l3trial/l3draw/testfiles/m3draw000.tlg
similarity index 75%
copy from l3experimental/l3str/testfiles/m3str-convert002.ptex.tlg
copy to l3trial/l3draw/testfiles/m3draw000.tlg
index d749784..8b21f53 100644
--- a/l3experimental/l3str/testfiles/m3str-convert002.ptex.tlg
+++ b/l3trial/l3draw/testfiles/m3draw000.tlg
@@ -1,3 +1,5 @@
This is a generated file for the LaTeX (2e + expl3) validation system.
Don't change this file in any respect.
-Author: Bruno Le Floch
+Author: Joseph Wright
+(l3draw.sty
+)
More information about the latex3-commits
mailing list