diff options
-rw-r--r-- | Master/texmf-dist/doc/lualatex/placeat/README | 18 | ||||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/placeat/placeat.pdf | bin | 0 -> 91309 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/lualatex/placeat/placeat.tex | 17 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/placeat/placeat.lua | 152 | ||||
-rw-r--r-- | Master/texmf-dist/source/lualatex/placeat/placeat.dtx | 766 | ||||
-rw-r--r-- | Master/texmf-dist/tex/lualatex/placeat/placeat.sty | 201 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 2 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 3 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/collection-luatex.tlpsrc | 1 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/placeat.tlpsrc | 0 |
10 files changed, 1159 insertions, 1 deletions
diff --git a/Master/texmf-dist/doc/lualatex/placeat/README b/Master/texmf-dist/doc/lualatex/placeat/README new file mode 100644 index 00000000000..0864d75c2e7 --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/placeat/README @@ -0,0 +1,18 @@ +This is the README file of the placeat package. The package provides several commands to place content at an arbitrary position of the current page in any document. For orientation, a grid is drawn. Simple graphical elements like arrows and circles can be easily drawn and positioned. + +To produce the package files, run lualatex on placeat.dtx, wich should result in the creation of the following files: + placeat.pdf (documentation) + placeat.sty (LaTeX user interface) + placeat.lua (Lua package code) + +You need an up-to-date TeX Live (2013) and compilation with LuaLaTeX to use this package. A full, updated MiKTeX should also work. (Not tested.) + +For any comments or suggestions, contact me: +arno dot trautmann at gmx dot de + +Hope you have fun with this package! + +This package is copyright © 2014 Arno L. Trautmann. It may be distributed and/or +modified under the conditions of the LaTeX Project Public License, either version 1.3c +of this license or (at your option) any later version. This work has the LPPL mainten- +ance status ‘maintained’. diff --git a/Master/texmf-dist/doc/lualatex/placeat/placeat.pdf b/Master/texmf-dist/doc/lualatex/placeat/placeat.pdf Binary files differnew file mode 100644 index 00000000000..ead013b8111 --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/placeat/placeat.pdf diff --git a/Master/texmf-dist/doc/lualatex/placeat/placeat.tex b/Master/texmf-dist/doc/lualatex/placeat/placeat.tex new file mode 100644 index 00000000000..f99abaaf8cc --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/placeat/placeat.tex @@ -0,0 +1,17 @@ +%% +%% This is file `placeat.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% placeat.dtx (with options: `tex') +%% +%% EXPERIMENTAL CODE +%% +%% This package is copyright © 2014 Arno L. Trautmann. It may be distributed and/or +%% modified under the conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. This work has the LPPL mainten- +%% ance status ‘maintained’. +%% +%% +%% End of file `placeat.tex'. diff --git a/Master/texmf-dist/scripts/placeat/placeat.lua b/Master/texmf-dist/scripts/placeat/placeat.lua new file mode 100755 index 00000000000..69db376aa35 --- /dev/null +++ b/Master/texmf-dist/scripts/placeat/placeat.lua @@ -0,0 +1,152 @@ +-- +-- This is file `placeat.lua', +-- generated with the docstrip utility. +-- +-- The original source files were: +-- +-- placeat.dtx (with options: `lua') +-- +-- EXPERIMENTAL CODE +-- +-- This package is copyright © 2014 Arno L. Trautmann. It may be distributed and/or +-- modified under the conditions of the LaTeX Project Public License, either version 1.3c +-- of this license or (at your option) any later version. This work has the LPPL mainten- +-- ance status ‘maintained’. +function pdf_print (...) + for _, str in ipairs({...}) do + pdf.print(str .. " ") + end + pdf.print("\n") +end + +function move (p1,p2) + if (p2) then + pdf_print(p1,p2,"m") + else + pdf_print(p1[1],p1[2],"m") + end +end + +function line (p1,p2) + pdf_print(p1,p2,"l") +end + +function curve(p11,p12,p21,p22,p31,p32) + if (p22) then + p1,p2,p3 = {p11,p12},{p21,p22},{p31,p32} + else + p1,p2,p3 = p11,p12,p21 + end + pdf_print(p1[1], p1[2], + p2[1], p2[2], + p3[1], p3[2], "c") +end + +function linewidth (w) + pdf_print(w,"w") +end + +function stroke () + pdf_print("S") +end + +-- welp, let's have some fun! +-- with the function radd, a random coordinate change is added if used +-- randfact will adjust the amount of randomization +-- everything is relative in the grid size +-- BUT: In fact, do we really want to have wiggly lines? … +local randfact = 100 +local radd = function() + return (math.random()-0.5)*randfact +end + +function placelineat(x1,y1,x2,y2) + xfac = tex.pagewidth/gridnrx/65536 -- factors to convert given number to absolute coordinates + yfac = tex.pageheight/gridnry/65536 -- should both be global! + xar = (x2-x1)*xfac -- end point of the arrow + yar = (y2-y1)*yfac -- + move(0,0) -- start + line(xar,yar) -- draw main line + stroke() +end + +function placearrowat(x1,y1,x2,y2) + xfac = tex.pagewidth/gridnrx/65536 -- factors to convert given number to absolute coordinates + yfac = tex.pageheight/gridnry/65536 -- should both be global! + xar = (x2-x1)*xfac -- end point of the arrow + yar = (y2-y1)*yfac -- + parx = xar/math.sqrt(xar^2+yar^2) -- direction of the arrow + pary = yar/math.sqrt(xar^2+yar^2) -- + perpx = -pary -- perp of the arrow direction + perpy = parx -- + move(0,0) -- start + line(xar,yar) -- draw main line + move(xar,yar) + line(xar-5*parx+5*perpx,yar-5*pary+5*perpy) -- draw arrowhead + move(xar,yar) + line(xar-5*parx-5*perpx,yar-5*pary-5*perpy) + stroke() +end + +-- better circle-approximation by using quarter circles, according to wikipedia article about Bézier curves +function placecircleat(radius) + local k = 0.55228 + local P0,P1,P2,P3 + + P0 = {radius,0} P1 = {radius,radius*k} + P2 = {radius*k,radius} P3 = {0,radius} + + move (P0[1],P0[2]) curve (P1,P2,P3) + + P0 = {-radius,0} P1 = {-radius,radius*k} + P2 = {-radius*k,radius} P3 = {0,radius} + + move (P0[1],P0[2]) curve (P1,P2,P3) + + P0 = {-radius,0} P1 = {-radius,-radius*k} + P2 = {-radius*k,-radius} P3 = {0,-radius} + + move (P0[1],P0[2]) curve (P1,P2,P3) + + P0 = {radius,0} P1 = {radius,-radius*k} + P2 = {radius*k,-radius} P3 = {0,-radius} + + move (P0[1],P0[2]) curve (P1,P2,P3) + stroke() +end + +function placesquareat(length) + move (-length,-length) + line ( length,-length) + line ( length, length) + line (-length, length) + line (-length,-length) + stroke() +end + +function placerectangleat(x1,y1,x2,y2) + xfac = tex.pagewidth/gridnrx/65536 + yfac = tex.pageheight/gridnry/65536 + x2 = (x2-x1)*xfac + y2 = (y2-y1)*yfac + move(0,0) + line(x2,0) + line(x2,y2) + line(0,y2) + line(0,0) + stroke() +end + +function placefilledrectangleat(x1,y1,x2,y2) + xfac = tex.pagewidth/gridnrx/65536 + yfac = tex.pageheight/gridnry/65536/1.0035 -- well, yes. Another random factor. lalala + x2 = (x2-x1)*xfac + y2 = (y2-y1)*yfac + linewidth(y2) + move(0,y2/2) + line(x2,y2/2) + stroke() + linewidth(1) +end +-- +-- End of File `placeat.lua'. diff --git a/Master/texmf-dist/source/lualatex/placeat/placeat.dtx b/Master/texmf-dist/source/lualatex/placeat/placeat.dtx new file mode 100644 index 00000000000..fde1b0808b6 --- /dev/null +++ b/Master/texmf-dist/source/lualatex/placeat/placeat.dtx @@ -0,0 +1,766 @@ +% \iffalse +%<*driver> +%% File: placeat.dtx by Arno Trautmann, mail: arno dot trautmann at gmx dot de +\iffalse +%</driver> +%<*readme> +This is the README file of the placeat package. The package provides several commands to place content at an arbitrary position of the current page in any document. For orientation, a grid is drawn. Simple graphical elements like arrows and circles can be easily drawn and positioned. + +To produce the package files, run lualatex on placeat.dtx, wich should result in the creation of the following files: + placeat.pdf (documentation) + placeat.sty (LaTeX user interface) + placeat.lua (Lua package code) + +You need an up-to-date TeX Live (2013) and compilation with LuaLaTeX to use this package. A full, updated MiKTeX should also work. (Not tested.) + +For any comments or suggestions, contact me: +arno dot trautmann at gmx dot de + +Hope you have fun with this package! + +This package is copyright © 2014 Arno L. Trautmann. It may be distributed and/or +modified under the conditions of the LaTeX Project Public License, either version 1.3c +of this license or (at your option) any later version. This work has the LPPL mainten- +ance status ‘maintained’. +%</readme> +%<*driver> +\fi +\def\nameofplainTeX{plain} +\ifx\fmtname\nameofplainTeX\else + \expandafter\begingroup +\fi +\input docstrip.tex +\keepsilent +\let\MetaPrefix\relax +\preamble + +EXPERIMENTAL CODE + +This package is copyright © 2014 Arno L. Trautmann. It may be distributed and/or +modified under the conditions of the LaTeX Project Public License, either version 1.3c +of this license or (at your option) any later version. This work has the LPPL mainten- +ance status ‘maintained’. +\endpreamble +\let\MetaPrefix\DoubleperCent +\postamble +\endpostamble +\askforoverwritefalse + +\generate{\file{placeat.sty}{\from{placeat.dtx}{package}}} +\generate{\file{placeat.tex}{\from{placeat.dtx}{tex}}} +\def\MetaPrefix{-- } +\def\luapostamble{% + \MetaPrefix^^J% + \MetaPrefix\space End of File `\outFileName'.% +} +\def\currentpostamble{\luapostamble}% + +\generate{\file{placeat.lua}{\from{placeat.dtx}{lua}}} +\nopreamble\nopostamble +\catcode`\@12 + +\generate{\file{README.}{\from{placeat.dtx}{readme}}} +% readme will not be generated until I figured out how to write a file without extension + +\ifx\fmtname\nameofplainTeX + \expandafter\endbatchfile +\else + \expandafter\endgroup +\fi +\documentclass[11pt,english]{ltxdoc} +\usepackage{ + array, + babel, + booktabs, + float, + fontspec, + geometry, + hyperref, + microtype, + scrpage2, + tabu +} +\usepackage[svgnames]{xcolor} +\hypersetup{ + colorlinks = true, + linkcolor = blue, + filecolor = blue, + urlcolor = blue +} + +\cfoot{\pagemark} +\ohead{} +\pagestyle{scrheadings} +\setmainfont{Linux Libertine O} +\setsansfont{Linux Biolinum O} + +\usepackage{placeat} +\placeatsetup{nogrid} + +\begin{document} +\centerline{\fontsize{40}{55}\selectfont placeat} + +\centerline{v0.1} +\centerline{\hspace*{2cm} Arno Trautmann} +\centerline{\href{mailto:arno.trautmann@gmx.de}{arno.trautmann@gmx.de}} + +\kern.5cm +\begin{abstract} +The package \textsf{placeat} offers the command \verb|\placeat(2,5){}| which places arbitrary content freely on any page. It is mainly thought for use with the beamer class but may also be used with any other \LaTeX\ class. This package requires Lua\LaTeX; don't try it with any other \TeX\ flavour, it just won't work. +\end{abstract} + +\begin{figure}[b] +\small\noindent +\fbox{\parbox{.97\textwidth}{ +This package is copyright © 2014 Arno L. Trautmann. It may be distributed and/or +modified under the conditions of the LaTeX Project Public License, either version 1.3c +of this license or (at your option) any later version. This work has the LPPL maintenance status ‘maintained’. Whoever notes the face in the title gets a cookie when we meet.}} +\end{figure} + +\textcolor{red}{\textls{ATTENTION}} This package is in a very preliminary version and released for testing. + +\section*{Introduction} +This is the documentation of the package |placeat|. When you load the package, a grid is drawn on every page of your document to aid you at placing stuff where you want it to be. This mainly makes sense in presentations, but might be used in any document. The main macro of this package \verb|\placeat...{}| offers several ways to use it: +\begin{verbatim} +\placeat<D4>{some content} +\placeat(3,4){some content} +\placeat{3}{4}{some content} +\end{verbatim} + +To deactivate the grid, use the setup command \verb|\placeatsetup{nogrid}|. There are also some other commands that allow you to draw simple sketches which might be useful in presentations, too, like arrows, circles etc., but no fancy stuff. + +\vspace{1cm} + +\textcolor{red}{\emph{Attention}}: This package is under development and everything presented here might and will be subject to incompatible changes. + +If you have any suggestions or comments, just drop me a mail, I’ll be happy to get any response! The latest source code is hosted on github – Feel free to comment or report bugs there, to fork, pull, etc.: +\url{https://github.com/alt/placeat}\\ + +\newpage +\tableofcontents +\newpage +\part{User Documentation} +\section{How do I use it?} +\subsection{Placing – the Main Commands} +The command \verb|\placeat| takes several arguments, the last of which is the content you want to place: +\begin{verbatim} +\placeat(4,5){content} +\end{verbatim} +This may range from single letters to graphic objects or (mostly) any valid \LaTeX\ code. Take note that the content will be placed \emph{above} and \emph{right of}\footnote{See below for placing to the left via an optional argument.} the specified coordinates.\footnote{To be more precise, the ground line of the first line of the content is placed at the specified vertical coordinate. This may result in strange placement of anything that is not pure text.} Exceptions are floating environments – you have to pack them into a minipage or similar construct, see below. + +If you want to place something \emph{left of} the specified coordinates, there is an additional optional argument to \verb|\placeat|: + +\begin{verbatim} +\placeat{4}{5}[left]{right} +\end{verbatim} + +This allows you to center your content (by hand) around the given place. Do not forget to enter an empty \verb|{}| if you use only the optional content. + +Verbatim material does definitely \emph{not} work and makes troubles as always in moving arguments (like footnotes etc.). So far I have no idea how to handle that correctly. Please tell me any further problems, I'll happily tackle them or sadly note them here if I cannot fix it … + +You may use \verb|\placeat| in one of the following variants (feel free to mix them in one document): +\begin{verbatim} +\placeat<D5>{content-right} +\placeat(4,5){content-right} +\placeat{4}{5}{content} +\end{verbatim} +The result will be the same in all three cases, so it's just a matter of taste which one you choose. They all will place the \verb|<content>| at a position that is specified by the grid which is drawn on your document. While the grid is drawn using letters and numbers, you might prefer using two numbers as you then also can use decimals for fine tuning which is not possible with a letter-number combination: +\begin{verbatim} +\placeat{4.3}{5.2}{content} +\placeat(4.3,5.2){content} +\end{verbatim} +Finally, there is one more argument you can give as second-to-last argument: +\begin{verbatim} +\placeat{4.3}{5.2}[content-left]{content} +\placeat(4.3,5.2)[content-left]{content} +\end{verbatim} +This content will be placed to the left of the specified coordinates as opposed to the normal content expanding to the right. + +\subsection{Relative Placing} +It is also possible to place a second element relative to another one. For this, you have to give the first one a name and refer to this name in the second one. Then you can repeat and refer a third one to the second one (or the first one, however you like to). +\begin{verbatim} +\placeat(4,5){content}[first] +\placerelto[first](2,2){content2}[second] +\placerelto[second]{2}{2}{content3}[third] +\end{verbatim} +Although it does not make any sense, you still can use the chess-pattern notation for |\placerelto|. But that's just for raising the obscurity level of this package. + +\subsection{Placing of figures, floats etc.} +Placing figures might be a bit tricky because the placing actually places the \emph{groundline} of any object. You may make your life easier when inserting figures if you use the |[t]| argument: +\begin{verbatim} +\placeat{4}{5}{\includegraphics[t]{bose-gas}} +\end{verbatim} +This way it is easier to fit graphics at the same height. However, you might have to test where it lands in the end. + +For floating environments, even if they don't float (that would be stupid, wouldn't it?), you need to packg them into e.\,g. a minipage. You can do this by hand or just use the command \verb|\placeminipageat|. This command only has one kind of interface, the one with two braces: +\begin{verbatim} +\placeminipageat{4}{5}[4cm]{content} +\end{verbatim} +Here, the third, argument is optional and specifies the width of the minipage. If not given, it will default to 10cm, which should be wide enough to contain anything you ever want to set using \verb|placeat|. + +\subsection{User Options} +Some of this package's features can be adjusted. For this, you can either pass the options to the package at loading time: +\begin{verbatim} +\usepackage[final]{placeat} +\end{verbatim} +Or you use, at any time in the document, the command +\begin{verbatim} +\placeatsetup{} +\end{verbatim} +which takes all of the package options and some more that make no sense at package loading time. +\textcolor{red}{ATTENTION:} Actually, so far the package option interface does not work, but \verb|\placeatsetup| is fine. + +\subsection{The Grid} +If the number of grid lines does not suit you (there are ten horizontally and vertically), you can increase or decrease the number by +\begin{verbatim} +\placeatsetup{gridnumber = 12} +\end{verbatim} +You may change the gridnumber during your document, but don't expect everything to work fine. + +The horizontal and vertical gridnumbers can be adjusted independently: +\begin{verbatim} +\placeatsetup{ + gridnumberx = 12, + gridnumbery = 8, +} +\end{verbatim} + +The grid can be deactivated by the document options \verb|final| or \verb|nogrid| and re-activated by the option \verb|drawgrid| in the setup macro: +\begin{verbatim} +\placeatsetup{nogrid} +\placeatsetup{drawgrid} +\end{verbatim} + +\subsection{Offsetting} +You can choose the zero point of the grid by setting the options +\begin{verbatim} +\placeatsetup{ + offsetx = 2 + offsety = -1 +} +\end{verbatim} +The grid and placement are adapted correspondingly. If you are a C-head thinking that everything should start with 0 instead of 1, you can call +\begin{verbatim} +\placeatsetup{ + startzero +} +\end{verbatim} +which corresponds to |offsetx = 1,offsety = 1| so that the upper right corner has coordinates |(0,0)| instead of |(1,1)|. + + +\section{Drawing simple forms} +This package also allows to draw simple forms like arrows and circles, to support the user e.\,g. when creating presentations. A single line is drawn by calling +\begin{verbatim} +\placelineat(2.5,1.5)(1.5,2.5) +\end{verbatim} +where the first coordinate pair specifies the start of the line and the second one the end. As you typically need fine tuning to place the line exactly where you want it, it is not possible to use another interface, i.\,e. the \verb|<D4>| style. + +By now, the following commands and respective forms are possible: +\begin{table}[H] +\begin{tabu}{>{\ttfamily\textbackslash}lX} +\toprule +placelineat(x1,y1)(x2,y2) & Draws a single line pointing from |(x1,y1)| to |(x2,y2)|\\\midrule +placearrowat(x1,y1)(x2,y2) & As the line, but with an arrowhead at the end.\\\midrule +placecircleat(x,y)\{r\} & Draws a circle at position |(x,y)| with diameter |r|. If omitted, |r| will default to |3|. The diameter is not scaled to the same scale as the coordinates, and most likely you have to test what size fits. Start with~5, it's a nice number. Right now, the circle is not really a circle, but slightly deformed as we only have cubic splines. May change to something better.\\\midrule +placesquareat(x,y)\{r\} & Draws a square with center at |(x,y)| and side lingth |r|. If omitted, |r| will default to |3|.\\\midrule +placerectangleat(x1,y1)(x2,y2) & draws a rectangle from the (upper left) corner |(x1,y1)| to the (lower right) corner |(x2,y2)|.\\\midrule +placefilledrectangleat(x1,y1)(x2,y2) & draws a filled rectangle. +\\\bottomrule +\end{tabu} +\end{table} + +Missing are eliptical shapes, maybe rounded corners for the rectangles and maybe some funny stuff.\footnote{Yes, I \emph{will} add a penis-shape macro, but that will not be documented explicitely.} + +\subsection{Colored forms} +Every command of the ones listed above takes an optional argument that allows the specification of a color. This is based on the \textsc{xcolor}, so all colors known by that package are possible: + +\begin{verbatim} +\placecircleat[blue](5,5) +\placearrowat[green!50!yellow](6,5)(8,5) +\placerectangleat[red!25!black](8,4)(9,6) +\placefilledrectangleat[blue!25!red](8.5,4.5)(8.75,5.6) +\end{verbatim} + +By now, it is not possible to specify an rgb code or similar. If you want a very special color that is not defined in the \textsc{xcolor} package, just define it by yourself. However, as shown above, it is possible to mix colors using the \verb|red!50!green| syntax, which is very flexible and should cover normal every day use. + + +\section{Example} +Now, here are two examples on how to use the package. The first one is a code example only, while the second one shows the effect directly on the page. + +\subsection{Example use with beamer} +As this package makes most sense in combination with beamer, here is a small example about how to use it. +\begin{verbatim} +\documentclass[ngerman]{beamer} +\usepackage{babel,blindtext} +\usepackage{fontspec} +\usepackage{placeat} +\begin{document} +\begin{frame}{Test frame} +Test +\placeat<D5>{Test} +\placeminipageat{4}{5}[3cm]{\includegraphics{fermi_gas_1}} +\end{frame} +\end{document} +\end{verbatim} + +\subsection{Example use inside this document} +The following page is typeset using the features of this package and shows the corresponding code. +\newpage +\placeatsetup{drawgrid, gridnumber=15} +However, this very page is using the \verb|drawgrid| option, with an increased grid number of 15. There are several elements placed with the given code, respectively.\footnote{Don't let me fool you, the code is not printed using \texttt{\textbackslash verb}, but only with a \texttt{\textbackslash texttt}, as verbatim is not possible with \texttt{\textbackslash placeat}.} +\placeat<F5>{\texttt{\textbackslash placeat<F5>{}}} +\placeat(4,7){\texttt{\textbackslash placeat(4.5,7.2){}}} +\placeat{2.3}{4.1}{\texttt{\textbackslash placeat\{2.3\}\{4.1\}{}}} +\placecircleat[blue](6,9) +\placeat(6.2,9){\texttt{\textbackslash placecircleat[blue](6,9)}} +\placearrowat[green](6,9)(8.5,5) +\placeat(7.5,7){\texttt{\textbackslash placearrowat[green](6,9)(8.5,5)}} +\placerectangleat[red](8,4)(9,6) +\placeat(9.2,5){\texttt{\textbackslash placerectangleat[red](8,4)(9,6)}} + +\newpage +\section{How is it done?} +\placeatsetup{nogrid} +The short answer is: Look at the source code. While the coding is quite simple in principle, it might be very confusing when reading it, and I am still surprised it works at all … + +Mainly, everything is based on the \LaTeX\ command \verb|\put(){}|. You could of course just use this, but then it's hard to get an absolute positioning as \verb|\put| only allows relative positions. You could then put your code into, say, a header line, and that is nearly the idea of this package. However, this would require a header and would not let the user freely decide what to put there. Also, users might do strange stuff to that and that could destroy the placing. + +Instead, we use the ability of Heiko Oberdiek's \verb|atbegshi| package which adds content to the to-be-shipped-out-page. I still do not understand how it works, but it is absolutely robust and does just what we need here: It allows to put stuff on the page relative to, say, the upper right corner. Also, it can be put in front of every other thing, so we are sure nothing gets lost. + +The next step is collecting and saving the material you specify to be placed somewhere. Collection is done using the \verb|xparse| package which allows for a very flexible macro definition which makes it possible to enter the different positioning options. Finally, everything is glued together with some Lua magic … + +We save the content to be placed in \TeX\ macros that are numbered using a Lua counter; the final coordinates are also calculated by Lua. The \TeX-Lua interface is heavily used here which is possible due to the \verb|luacode| package. The macros are then executed in the call of \verb|\AtBeginShipout|, again inside a Lua loop, where also the grid is drawn. + +\section{To Do} +A list of things I would like to have solved by some time: +\catcode`\•13 +\let•\item +\begin{itemize} +• allow the |wave| color model as it is very very cool +• placing stuff at every page or reuse stuff at all +• allow course placing (put at upper left corner, put at left side etc.) for presentations +• verbatim in placeat +• drawing maybe based on metapost instead of pdf drawing +\end{itemize} + +\section{How can I help?} +There are several ways how you can help. First, and most important: + +Testing. Try to use this code and tell me what you think about it. + +Bug reporting. Tell me especially what is buggy. I'd like to keep the package rather small and simple, so some bugs might be called features, but we'll see. + +Suggestions. I'm open to extend the functionality. Just tell me what you want and I'll try to implement it as soon as possible. Which might be never. But also maybe the next day. Well, try it! ☺ + +\newpage +That's it for the documentation, have fun, and\vspace{2cm} + +\placeat(5,7){\Huge\rotatebox{45}{Happy \TeX ing!}}[happy] +\placecircleat[red](4,4.5){20} +\placecircleat[green](9,4.5){20} +\placecircleat[blue](4,7.5){20} +\placecircleat[orange](9,7.5){20} + +\begin{luacode} +for i = 1,20 do + tex.print("\\placecircleat[blue](12,6){"..(2*i).."}") +end +\end{luacode} + + +\DocInput{placeat.dtx} +\end{document} +%</driver> +%<*package> +% \fi +% \clearpage +%\part{Implementation} +%\label{sec:implementation} +%\section{The \LaTeX\ package: placeat.sty} +% Everything to get stuff working from the \TeX\ side. Here, only a .sty file is provided and plain/Con\TeX t users have to find their way. I'll happily support them, though! +% \subsection{Loading Files} +% The Lua file is not found by using a simple |dofile("placeat.lua")| call, but we have to use kpse's |find_file|. +% \begin{macrocode} +\ProvidesPackage{placeat}% + [2014/04/15 v0.1 absolute content positioning] +\RequirePackage{luatexbase} +\RequirePackage{luacode} +\RequirePackage{atbegshi} +\RequirePackage{xparse} +\directlua{dofile(kpse.find_file("placeat.lua"))} +% \end{macrocode} +% \subsection{User Commands} +% The main command \verb|\placeat|. There are several ways to use it, so we define a wrapper macro that is only for the user interface. Nice separation of interface and code. But actually, both are quite hard interwoven and it's not really clear at any time what happens. However, it works most of the time. +% +% The macro arguments of placeat at the moment are:\ \ +% |g{}g{}|: two braced arguments for coordinates\\ +% |d()|: one argument for picture-like coordinate pairs\\ +% |d<>|: one argument for alpha-numeric coordinates\\ +% |O{}|: content to be typeset on the left of the point\\ +% |m|: main content to be typeset on the right. +% |o|: optional label for relative placement. This might now be the point to change the internal structure and go to a node mode. +% \begin{macrocode} +\NewDocumentCommand\placeat{ggd()d<>O{}mo}{ + \IfValueT{#1}{ %% two coordinates in { }{ } pair. + \IfValueT{#2}{ %% if second argument is not given, everything breaks. not nice. + \def\cox{#1} + \def\coy{#2} + } + } + \IfValueT{#3}{ %% one argument as ( , ) coordinate pair. + \def\cox{\firstof#3X} + \def\coy{\secondof#3X} + } + \IfValueT{#4}{ + \luadirect{ + y = string.byte('#4',1)-64 + x = string.byte('#4',2)-48 + x2 = string.byte('#4',3) + if x2 then x = x*10 + x2-48 end -- FIXME: what exactly happens here? … + } + \def\cox{\luadirect{tex.print(x)}} + \def\coy{\luadirect{tex.print(y)}} + } + \placeatthreenumbers{\cox}{\coy}{\llap{#5}#6} + + \IfValueT{#7}{ + \expandafter\gdef\csname #7x\endcsname{\firstof#3X} + \expandafter\gdef\csname #7y\endcsname{\secondof#3X} + } +} +% \end{macrocode} +% \subsection{Relative Placement} +% The first stage of this works just the same as normal |\placeat|. However, there is an additional first optional argument that actually is \emph{not} optional! This is the node that is taken as base. So the |\placeatthreenumbers| is just called with the given coordinates added to the base coordinates. +% \begin{macrocode} +\NewDocumentCommand\placerelto{oggd()d<>O{}mo}{ + \IfValueT{#2}{ %% two coordinates in { }{ } pair. + \IfValueT{#3}{ %% if second argument is not given, everything breaks. not nice. + \def\cox{#2} + \def\coy{#3} + } + } + \IfValueT{#4}{ %% one argument as ( , ) coordinate pair. + \def\cox{\firstof#4X} + \def\coy{\secondof#4X} + } + \IfValueT{#5}{ + \luaexec{ + y = string.byte('#5',1)-64 + x = string.byte('#5',2)-48 + x2 = string.byte('#5',3) + if x2 then x = x*10 + x2-48 end -- FIXME: what exactly happens here? … + tex.print("\\def\\cox{"..(x).."}\\def\\coy{"..(y).."}") + } + } + \placeatthreenumbers + {\cox + \csname #1x\endcsname} + {\coy + \csname #1y\endcsname} + {\llap{#6}#7} + \IfValueT{#8}{ + \expandafter\xdef\csname #8x\endcsname{\cox + \csname #1x\endcsname} + \expandafter\xdef\csname #8y\endcsname{\coy + \csname #1y\endcsname} + } +} +% \end{macrocode} +% \subsection{Placing of floats etc.} +% For floats and similar stuff, it might be necessary or useful to pack everything into a minipage. You can do this by yourself, but I thought it might be nice to specify a corresponding user interface. Using \verb|\placeminipageat| is the same as using \verb|\placeat{}{}{content}| where content is packed into a minipage. The first two argument of \verb|\placeminipageat| must be given in braces |{4}{5}| and determine the position of the content. The third argument is optional and specifies the width of the minipage; if not give, it is assumed to be 10cm, wide enough for mostly anything you ever will place at. +% \begin{macrocode} +\NewDocumentCommand\placeminipageat{d()O{10cm}m}{ + \gdef\widthofplaceat{#2} + \placeat(#1) + {\begin{minipage}{\widthofplaceat}{#3}\end{minipage}} +} +% \end{macrocode} +% \subsection{Helper Macros} +% The real stuff is done in the macro \verb|\placeatthreenumbers| which takes exactly three arguments defining the position of the content. The content is stored in a macro that is defined using Lua code, and the position is also calculated by Lua code. Everything is put together into a Lua-\TeX-bastard and surprisingly works stable as far as I can tell. +% +% This place is also where the offset and scaling happens. +% \begin{macrocode} +\def\placeatthreenumbers#1#2#3{ + \luaexec{ + nr = nr+1 + dacoordtmp = ((#1-1+offsetx)*tex.pagewidth/65536/gridnrx*1.005)..","..(-(#2-1+offsety)*tex.pageheight/65536/gridnry) + dacoord[nr] = "\\put("..dacoordtmp..")" + tex.print("\\expandafter\\gdef\\csname command"..(nr).."\\endcsname")}% begin of command definition + {#3} %% this is what \command[nr] will contain +} +% \end{macrocode} +% Two tiny helpers that might be substituted by some standard commands: +% \begin{macrocode} +\def\firstof #1,#2X{#1} +\def\secondof #1,#2X{#2} +% \end{macrocode} +% Setup of variables and macros we need later. +% \begin{macrocode} +\let\ifdrawgrid\iftrue +\luaexec{ + drawgrid = false + nr = 0 + dacoord = {} + gridnr = 10 + gridnrx = 10 + gridnry = 10 + gridlinewidth = 0.01 + offsetx = 0 + offsety = 0 +} +% \end{macrocode} +% Now the code that does the actual work here. We use Heiko Oberdiek's package \textsf{atbegshi} with the very useful macros \verb|\AtBeginShipout| and \verb|\AtBeginShipoutUpperLeftForeground|. Using these, we are free from any context of where the code is written, it is always executed at the shipout and therefore absolute positioning is possible. +% \begin{macrocode} +\AtBeginDocument{ + \AtBeginShipout{% + \AtBeginShipoutUpperLeftForeground{% + \ifdrawgrid\drawgrid\fi + \luaexec{% + for i = 1,nr do + tex.print(dacoord[i].."{\\csname command"..(i).."\\endcsname}") + end + nr=0 + } + } + } +} +% \end{macrocode} +% \section{The Grid} +% The grid is made by drawing directly into the pdf as suggested by Paul Isambert in his TUGboat article “\textit{Drawing tables: Graphic fun with Lua\TeX}”. Labeling is done by simple \verb|\put| commands, controlled via Lua code. +% \begin{macrocode} +\def\drawgrid{ + \luatexlatelua{ + pdf_print("q") + linewidth(gridlinewidth) + for i = 1,math.max(gridnrx,gridnry) do + h = i*tex.pageheight/gridnry/65536 + w = i*tex.pagewidth/gridnrx/65536 + move(0,-h) line(tex.pagewidth,-h) stroke() + move(w,0) line(w,-tex.pageheight) stroke() + end + pdf_print("Q") + } + { %% extra grouping to keep font size change local. Going to normalfont seems to make sense. An explicit font for the grid might also be nice. Implementation only upon request. +%% would also be nice to maybe adapt the fontsize to the grid size + \normalfont\fontsize{8}{10}\selectfont + \luaexec{ + for i=1,math.max(gridnrx+offsetx,gridnry+offsety) do + hfac = tex.pageheight/gridnry/65536 %% another empirical factor + wfac = tex.pagewidth/gridnrx/65536*1.005 %% another empirical factor + h = (i-1)*hfac + w = (i-1)*wfac + tex.print("\\put("..(w)..",-7){\\rlap{"..(i-offsetx).."}}") + if alphanumgrid then + tex.print("\\put(0,"..(-h-0.05*hfac).."){\\char00"..(64+i-offsety).."}") %%-- for alphanumeric grid. + else + tex.print("\\put(0,"..(-h-0.05*hfac).."){"..(i-offsety).."}") + end + end + } + } +} +% \end{macrocode} +% \section{Drawing Stuff} +% Drawing is done in the same way as the grid. While the grid has no interface, the rest of the drawing stuff needs a \TeX\ interface, which is defined here. Every command calls a Lua function that does the actual work, as always. +% +% I try to provide a basic set of stuff that might be useful. The \TeX\ interface implementation might change, but for now it is done with xparse instead of a much more saner simple |\def|. We will see where this will head to. First, there is an arrow, whose head looks very bad. I don't know how to fix this yet. Then there are circle, square and rectangle. +% \begin{macrocode} +\NewDocumentCommand\placelineat{ou{(}u{,}u{)(}u{,}u{)}}{ + \placeat{#3}{#4}{\ignorespaces\IfValueT{#1}{\color{#1}}% + \luatexlatelua{placelineat(#3,-#4,#5,-#6)} + } +} +\NewDocumentCommand\placearrowat{ou{(}u{,}u{)(}u{,}u{)}}{ + \placeat{#3}{#4}{\ignorespaces\IfValueT{#1}{\color{#1}}% + \luatexlatelua{placearrowat(#3,-#4,#5,-#6)} + } +} +\NewDocumentCommand\placecircleat{ou{(}u{,}u{)}G{3}}{ + \placeat{#3}{#4}{\ignorespaces\IfValueT{#1}{\color{#1}}% + \luatexlatelua{placecircleat(#5)} + } +} +\NewDocumentCommand\placesquareat{ou{(}u{,}u{)}G{3}}{ + \placeat{#3}{#4}{\ignorespaces\IfValueT{#1}{\color{#1}}% + \luatexlatelua{placesquareat(#5)} + } +} +\NewDocumentCommand\placerectangleat{ou{(}u{,}u{)(}u{,}u{)}}{ + \placeat{#3}{#4}{\ignorespaces\IfValueT{#1}{\color{#1}}% + \luatexlatelua{placerectangleat(#3,-#4,#5,-#6)} + } +} +\NewDocumentCommand\placefilledrectangleat{ou{(}u{,}u{)(}u{,}u{)}}{ + \placeat{#3}{#4}{\ignorespaces\IfValueT{#1}{\color{#1}}% + \luatexlatelua{placefilledrectangleat(#3,-#4,#5,-#6)} + } +} +% \end{macrocode} +% \section{Key-Value Interface} +% It's a modern package, so we make use of \LaTeX3 once more. Let's see how stable this is. So far, no options can be used as package option, but only inside the \verb|\placeatsetup{}| macro. I'm not much into \LaTeX3 syntax and stuff anymore, so feel free to correct any non-nice coding here! +% +% Especially one thing will be annoying, the space-gobbling. Nice feature on one hand, but annoying inside the |\directlua| on the other hand. Therefore, we need the |~| to separate |gridnr| and |gridnry| below. +% \begin{macrocode} +\ExplSyntaxOn +\keys_define:nn{placeat}{ + alphanumgrid.code:n = \directlua{alphanumgrid = true}, + final.code:n = \luaexec{placeat_final = true} \let\ifdrawgrid\iffalse, + drawgrid.code:n = \global\let\ifdrawgrid\iftrue, + gridnumber.code:n = \directlua{gridnr = #1 gridnrx = gridnr~gridnry = gridnr}, + gridnumberx.code:n = \directlua{gridnrx = #1}, + gridnumbery.code:n = \directlua{gridnry = #1}, + gridlinewidth.code:n = \directlua{gridlinewidth = #1}, + nogrid.code:n = \global\let\ifdrawgrid\iffalse, + numnumgrid.code:n = \directlua{alphanumgrid = false}, + offsetx.code:n = \directlua{offsetx = #1}, + offsety.code:n = \directlua{offsety = #1}, + startzero.code:n = \directlua{offsetx = 1 offsety = 1} +} +\DeclareDocumentCommand\placeatsetup{m}{ + \keys_set:nn{placeat}{#1} +} +\ExplSyntaxOff +% \end{macrocode} +%\iffalse +%</package> +%<*lua> +%\fi +% \section{Lua Module} +% \label{sec:luamodule} +% So far, the only usage of the Lua module is for graphics, based on the article by Paul Isambert about drawing directly to the pdf using Lua. We exploit this here and make use of the basic drawing functions he provided. Maybe this will be outsorced once there is a Lua-to-pdf-based graphics bundle. +% \begin{macrocode} +function pdf_print (...) + for _, str in ipairs({...}) do + pdf.print(str .. " ") + end + pdf.print("\n") +end + +function move (p1,p2) + if (p2) then + pdf_print(p1,p2,"m") + else + pdf_print(p1[1],p1[2],"m") + end +end + +function line (p1,p2) + pdf_print(p1,p2,"l") +end + +function curve(p11,p12,p21,p22,p31,p32) + if (p22) then + p1,p2,p3 = {p11,p12},{p21,p22},{p31,p32} + else + p1,p2,p3 = p11,p12,p21 + end + pdf_print(p1[1], p1[2], + p2[1], p2[2], + p3[1], p3[2], "c") +end + +function linewidth (w) + pdf_print(w,"w") +end + +function stroke () + pdf_print("S") +end + +-- welp, let's have some fun! +-- with the function radd, a random coordinate change is added if used +-- randfact will adjust the amount of randomization +-- everything is relative in the grid size +-- BUT: In fact, do we really want to have wiggly lines? … +local randfact = 100 +local radd = function() + return (math.random()-0.5)*randfact +end + +function placelineat(x1,y1,x2,y2) + xfac = tex.pagewidth/gridnrx/65536 -- factors to convert given number to absolute coordinates + yfac = tex.pageheight/gridnry/65536 -- should both be global! + xar = (x2-x1)*xfac -- end point of the arrow + yar = (y2-y1)*yfac -- + move(0,0) -- start + line(xar,yar) -- draw main line + stroke() +end + +function placearrowat(x1,y1,x2,y2) + xfac = tex.pagewidth/gridnrx/65536 -- factors to convert given number to absolute coordinates + yfac = tex.pageheight/gridnry/65536 -- should both be global! + xar = (x2-x1)*xfac -- end point of the arrow + yar = (y2-y1)*yfac -- + parx = xar/math.sqrt(xar^2+yar^2) -- direction of the arrow + pary = yar/math.sqrt(xar^2+yar^2) -- + perpx = -pary -- perp of the arrow direction + perpy = parx -- + move(0,0) -- start + line(xar,yar) -- draw main line + move(xar,yar) + line(xar-5*parx+5*perpx,yar-5*pary+5*perpy) -- draw arrowhead + move(xar,yar) + line(xar-5*parx-5*perpx,yar-5*pary-5*perpy) + stroke() +end + +-- better circle-approximation by using quarter circles, according to wikipedia article about Bézier curves +function placecircleat(radius) + local k = 0.55228 + local P0,P1,P2,P3 + + P0 = {radius,0} P1 = {radius,radius*k} + P2 = {radius*k,radius} P3 = {0,radius} + + move (P0[1],P0[2]) curve (P1,P2,P3) + + P0 = {-radius,0} P1 = {-radius,radius*k} + P2 = {-radius*k,radius} P3 = {0,radius} + + move (P0[1],P0[2]) curve (P1,P2,P3) + + P0 = {-radius,0} P1 = {-radius,-radius*k} + P2 = {-radius*k,-radius} P3 = {0,-radius} + + move (P0[1],P0[2]) curve (P1,P2,P3) + + P0 = {radius,0} P1 = {radius,-radius*k} + P2 = {radius*k,-radius} P3 = {0,-radius} + + move (P0[1],P0[2]) curve (P1,P2,P3) + stroke() +end + +function placesquareat(length) + move (-length,-length) + line ( length,-length) + line ( length, length) + line (-length, length) + line (-length,-length) + stroke() +end + +function placerectangleat(x1,y1,x2,y2) + xfac = tex.pagewidth/gridnrx/65536 + yfac = tex.pageheight/gridnry/65536 + x2 = (x2-x1)*xfac + y2 = (y2-y1)*yfac + move(0,0) + line(x2,0) + line(x2,y2) + line(0,y2) + line(0,0) + stroke() +end + +function placefilledrectangleat(x1,y1,x2,y2) + xfac = tex.pagewidth/gridnrx/65536 + yfac = tex.pageheight/gridnry/65536/1.0035 -- well, yes. Another random factor. lalala + x2 = (x2-x1)*xfac + y2 = (y2-y1)*yfac + linewidth(y2) + move(0,y2/2) + line(x2,y2/2) + stroke() + linewidth(1) +end +% \end{macrocode} +% \Finale +% \endinput diff --git a/Master/texmf-dist/tex/lualatex/placeat/placeat.sty b/Master/texmf-dist/tex/lualatex/placeat/placeat.sty new file mode 100644 index 00000000000..59ac22fa518 --- /dev/null +++ b/Master/texmf-dist/tex/lualatex/placeat/placeat.sty @@ -0,0 +1,201 @@ +%% +%% This is file `placeat.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% placeat.dtx (with options: `package') +%% +%% EXPERIMENTAL CODE +%% +%% This package is copyright © 2014 Arno L. Trautmann. It may be distributed and/or +%% modified under the conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. This work has the LPPL mainten- +%% ance status ‘maintained’. +\ProvidesPackage{placeat}% + [2014/04/15 v0.1 absolute content positioning] +\RequirePackage{luatexbase} +\RequirePackage{luacode} +\RequirePackage{atbegshi} +\RequirePackage{xparse} +\directlua{dofile(kpse.find_file("placeat.lua"))} +\NewDocumentCommand\placeat{ggd()d<>O{}mo}{ + \IfValueT{#1}{ %% two coordinates in { }{ } pair. + \IfValueT{#2}{ %% if second argument is not given, everything breaks. not nice. + \def\cox{#1} + \def\coy{#2} + } + } + \IfValueT{#3}{ %% one argument as ( , ) coordinate pair. + \def\cox{\firstof#3X} + \def\coy{\secondof#3X} + } + \IfValueT{#4}{ + \luadirect{ + y = string.byte('#4',1)-64 + x = string.byte('#4',2)-48 + x2 = string.byte('#4',3) + if x2 then x = x*10 + x2-48 end -- FIXME: what exactly happens here? … + } + \def\cox{\luadirect{tex.print(x)}} + \def\coy{\luadirect{tex.print(y)}} + } + \placeatthreenumbers{\cox}{\coy}{\llap{#5}#6} + + \IfValueT{#7}{ + \expandafter\gdef\csname #7x\endcsname{\firstof#3X} + \expandafter\gdef\csname #7y\endcsname{\secondof#3X} + } +} +\NewDocumentCommand\placerelto{oggd()d<>O{}mo}{ + \IfValueT{#2}{ %% two coordinates in { }{ } pair. + \IfValueT{#3}{ %% if second argument is not given, everything breaks. not nice. + \def\cox{#2} + \def\coy{#3} + } + } + \IfValueT{#4}{ %% one argument as ( , ) coordinate pair. + \def\cox{\firstof#4X} + \def\coy{\secondof#4X} + } + \IfValueT{#5}{ + \luaexec{ + y = string.byte('#5',1)-64 + x = string.byte('#5',2)-48 + x2 = string.byte('#5',3) + if x2 then x = x*10 + x2-48 end -- FIXME: what exactly happens here? … + tex.print("\\def\\cox{"..(x).."}\\def\\coy{"..(y).."}") + } + } + \placeatthreenumbers + {\cox + \csname #1x\endcsname} + {\coy + \csname #1y\endcsname} + {\llap{#6}#7} + \IfValueT{#8}{ + \expandafter\xdef\csname #8x\endcsname{\cox + \csname #1x\endcsname} + \expandafter\xdef\csname #8y\endcsname{\coy + \csname #1y\endcsname} + } +} +\NewDocumentCommand\placeminipageat{d()O{10cm}m}{ + \gdef\widthofplaceat{#2} + \placeat(#1) + {\begin{minipage}{\widthofplaceat}{#3}\end{minipage}} +} +\def\placeatthreenumbers#1#2#3{ + \luaexec{ + nr = nr+1 + dacoordtmp = ((#1-1+offsetx)*tex.pagewidth/65536/gridnrx*1.005)..","..(-(#2-1+offsety)*tex.pageheight/65536/gridnry) + dacoord[nr] = "\\put("..dacoordtmp..")" + tex.print("\\expandafter\\gdef\\csname command"..(nr).."\\endcsname")}% begin of command definition + {#3} %% this is what \command[nr] will contain +} +\def\firstof #1,#2X{#1} +\def\secondof #1,#2X{#2} +\let\ifdrawgrid\iftrue +\luaexec{ + drawgrid = false + nr = 0 + dacoord = {} + gridnr = 10 + gridnrx = 10 + gridnry = 10 + gridlinewidth = 0.01 + offsetx = 0 + offsety = 0 +} +\AtBeginDocument{ + \AtBeginShipout{% + \AtBeginShipoutUpperLeftForeground{% + \ifdrawgrid\drawgrid\fi + \luaexec{% + for i = 1,nr do + tex.print(dacoord[i].."{\\csname command"..(i).."\\endcsname}") + end + nr=0 + } + } + } +} +\def\drawgrid{ + \luatexlatelua{ + pdf_print("q") + linewidth(gridlinewidth) + for i = 1,math.max(gridnrx,gridnry) do + h = i*tex.pageheight/gridnry/65536 + w = i*tex.pagewidth/gridnrx/65536 + move(0,-h) line(tex.pagewidth,-h) stroke() + move(w,0) line(w,-tex.pageheight) stroke() + end + pdf_print("Q") + } + { %% extra grouping to keep font size change local. Going to normalfont seems to make sense. An explicit font for the grid might also be nice. Implementation only upon request. +%% would also be nice to maybe adapt the fontsize to the grid size + \normalfont\fontsize{8}{10}\selectfont + \luaexec{ + for i=1,math.max(gridnrx+offsetx,gridnry+offsety) do + hfac = tex.pageheight/gridnry/65536 %% another empirical factor + wfac = tex.pagewidth/gridnrx/65536*1.005 %% another empirical factor + h = (i-1)*hfac + w = (i-1)*wfac + tex.print("\\put("..(w)..",-7){\\rlap{"..(i-offsetx).."}}") + if alphanumgrid then + tex.print("\\put(0,"..(-h-0.05*hfac).."){\\char00"..(64+i-offsety).."}") %%-- for alphanumeric grid. + else + tex.print("\\put(0,"..(-h-0.05*hfac).."){"..(i-offsety).."}") + end + end + } + } +} +\NewDocumentCommand\placelineat{ou{(}u{,}u{)(}u{,}u{)}}{ + \placeat{#3}{#4}{\ignorespaces\IfValueT{#1}{\color{#1}}% + \luatexlatelua{placelineat(#3,-#4,#5,-#6)} + } +} +\NewDocumentCommand\placearrowat{ou{(}u{,}u{)(}u{,}u{)}}{ + \placeat{#3}{#4}{\ignorespaces\IfValueT{#1}{\color{#1}}% + \luatexlatelua{placearrowat(#3,-#4,#5,-#6)} + } +} +\NewDocumentCommand\placecircleat{ou{(}u{,}u{)}G{3}}{ + \placeat{#3}{#4}{\ignorespaces\IfValueT{#1}{\color{#1}}% + \luatexlatelua{placecircleat(#5)} + } +} +\NewDocumentCommand\placesquareat{ou{(}u{,}u{)}G{3}}{ + \placeat{#3}{#4}{\ignorespaces\IfValueT{#1}{\color{#1}}% + \luatexlatelua{placesquareat(#5)} + } +} +\NewDocumentCommand\placerectangleat{ou{(}u{,}u{)(}u{,}u{)}}{ + \placeat{#3}{#4}{\ignorespaces\IfValueT{#1}{\color{#1}}% + \luatexlatelua{placerectangleat(#3,-#4,#5,-#6)} + } +} +\NewDocumentCommand\placefilledrectangleat{ou{(}u{,}u{)(}u{,}u{)}}{ + \placeat{#3}{#4}{\ignorespaces\IfValueT{#1}{\color{#1}}% + \luatexlatelua{placefilledrectangleat(#3,-#4,#5,-#6)} + } +} +\ExplSyntaxOn +\keys_define:nn{placeat}{ + alphanumgrid.code:n = \directlua{alphanumgrid = true}, + final.code:n = \luaexec{placeat_final = true} \let\ifdrawgrid\iffalse, + drawgrid.code:n = \global\let\ifdrawgrid\iftrue, + gridnumber.code:n = \directlua{gridnr = #1 gridnrx = gridnr~gridnry = gridnr}, + gridnumberx.code:n = \directlua{gridnrx = #1}, + gridnumbery.code:n = \directlua{gridnry = #1}, + gridlinewidth.code:n = \directlua{gridlinewidth = #1}, + nogrid.code:n = \global\let\ifdrawgrid\iffalse, + numnumgrid.code:n = \directlua{alphanumgrid = false}, + offsetx.code:n = \directlua{offsetx = #1}, + offsety.code:n = \directlua{offsety = #1}, + startzero.code:n = \directlua{offsetx = 1 offsety = 1} +} +\DeclareDocumentCommand\placeatsetup{m}{ + \keys_set:nn{placeat}{#1} +} +\ExplSyntaxOff +%% +%% +%% End of file `placeat.sty'. diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 8c4a2912535..d6d2981f4f5 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -368,7 +368,7 @@ my @TLP_working = qw( phonetic phonrule photo physics physymb piano picinpar pict2e pictex pictex2 pictexsum piechartmp piff pigpen pinlabel pitex pittetd pkfix pkfix-helper pkgloader pkuthss - placeins placeins-plain + placeat placeins placeins-plain plain-doc plainpkg plari plantslabels plates play playfair plipsum plnfss plstmary plweb pmgraph pmx pmxchords pnas2009 poemscol poetrytex polski poltawski diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index aca6979ab1a..5f7dd4d7cce 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2190,6 +2190,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; 'pageslts' => 'tex -translate-file=empty.tcx', # no 8-bit 'papermas', => 'tex', 'pauldoc' => 'latex', # requires interaction + 'placeat' => 'luatex', 'poemscol' => 'latex', # requires interaction 'polski' => 'latex', # requires interaction 'psfragx' => 'latex', # requires interaction @@ -2446,6 +2447,7 @@ $standardxmt='\.xmt'; 'lualatex-math' => '\.lua$', 'luasseq' => '\.lua$', 'mycv' => 'mycv_split_contents\.pl', + 'placeat' => '\.lua$', 'pythontex' => '([23]|_.*)\.py$', 'spelling' => '\.lua$', ); @@ -2601,6 +2603,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot' 'lshort-spanish'=>'lshort-letter.pdf', # a4 is enough 'mathexam' => 'sample.tex~', 'pkfix-helper' => 'pkfix-helper.pdf', + 'placeat' => $standardclean . '|README\.$', 'purifyeps' => 'purifyeps.pdf', 'revtex' => '00readme.tex|DOWNLOAD|README', # already in doc 'suftesi' => 'example/MaterialeInizialeFinale/.DS_Store', diff --git a/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc b/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc index c04add6c1ca..88a92f004a7 100644 --- a/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc @@ -29,6 +29,7 @@ depend luatexko depend luatextra depend luaxml depend odsfile +depend placeat depend selnolig depend showhyphens depend spelling diff --git a/Master/tlpkg/tlpsrc/placeat.tlpsrc b/Master/tlpkg/tlpsrc/placeat.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/Master/tlpkg/tlpsrc/placeat.tlpsrc |