diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/returntogrid/README.md | 24 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/returntogrid/returntogrid.lua | 17 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/returntogrid/returntogrid.pdf | bin | 0 -> 143705 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/returntogrid/returntogrid.tex | 419 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/returntogrid/returntogrid.sty | 428 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 2 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc | 1 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/returntogrid.tlpsrc | 0 |
8 files changed, 890 insertions, 1 deletions
diff --git a/Master/texmf-dist/doc/latex/returntogrid/README.md b/Master/texmf-dist/doc/latex/returntogrid/README.md new file mode 100644 index 00000000000..8b3eb084f7c --- /dev/null +++ b/Master/texmf-dist/doc/latex/returntogrid/README.md @@ -0,0 +1,24 @@ +#returntogrid — A package to return some text to a grid +Packageversion: 0.2 +Packagedate: 2018/08/21 +Author: Ulrike Fischer + +## License +The returntogrid package may be modified and distributed under the terms and conditions of the +[LaTeX Project Public License](https://www.latex-project.org/lppl/), version 1.3c or greater. + + +## Contents + +- Readme (this file) +- returntogrid.sty (the sty) +- returntogrid.tex, returntogrid.pdf(the docu) + +## Installation + +Put the style where it can be found. + + +## Issues, comments, etc + +https://github.com/u-fischer/returntogrid diff --git a/Master/texmf-dist/doc/latex/returntogrid/returntogrid.lua b/Master/texmf-dist/doc/latex/returntogrid/returntogrid.lua new file mode 100644 index 00000000000..264aaec9e2f --- /dev/null +++ b/Master/texmf-dist/doc/latex/returntogrid/returntogrid.lua @@ -0,0 +1,17 @@ +-- Packageversion: 0.2 +-- Packagedate: 2018/08/21 +-- returntogrid.lua +-- Ulrike Fischer + +returntogrid = returntogrid or {} + +function returntogrid.ufgridvskip (diff,vskip,gridstep) + local error= ( diff % gridstep ) -- %=modulo + -- we need to add gridstep-error to the existing vskip + -- modulo gridstep + -- texio.write_nl("XXXXXXXXXXXXXXXXXXX") + vskip = ( vskip + gridstep - error ) %gridstep -- %=modulo! + -- texio.write_nl(" diff ".. diff .. " gridstep "..gridstep.." error "..error.." vskip "..vskip) + -- texio.write_nl("XXXXXXXXXXXXXXXXXXX") + tex.sprint ( vskip ) +end diff --git a/Master/texmf-dist/doc/latex/returntogrid/returntogrid.pdf b/Master/texmf-dist/doc/latex/returntogrid/returntogrid.pdf Binary files differnew file mode 100644 index 00000000000..590629b5587 --- /dev/null +++ b/Master/texmf-dist/doc/latex/returntogrid/returntogrid.pdf diff --git a/Master/texmf-dist/doc/latex/returntogrid/returntogrid.tex b/Master/texmf-dist/doc/latex/returntogrid/returntogrid.tex new file mode 100644 index 00000000000..0c5b0dc05d6 --- /dev/null +++ b/Master/texmf-dist/doc/latex/returntogrid/returntogrid.tex @@ -0,0 +1,419 @@ +% !Mode:: "TeX:UTF-8:Main" +\makeatletter +\def\UlrikeFischer@package@version{0.2} +\def\UlrikeFischer@package@date{2018/08/21} +\makeatother +%\PassOptionsToPackage{enable-debug}{expl3} +\documentclass[twoside,parskip=half-,fontsize=12pt,egregdoesnotlikesansseriftitles,headings=normal]{scrartcl} +\usepackage[english]{babel} +\usepackage[autostyle]{csquotes} +\usepackage{microtype} +%\DisableLigatures{encoding = T1, family = tt* } +\usepackage{fourier} +\renewcommand\ttdefault{lmtt} +\usepackage{ydoc-desc} +\usepackage{needspace} +\usepackage{returntogrid} +\usepackage{geometry} + +\usepackage{tikz} +\usepackage{enumitem} +\raggedbottom + +\title{The returntogrid package, v\csname UlrikeFischer@package@version\endcsname} +\date{\csname UlrikeFischer@package@date\endcsname} +\author{Ulrike Fischer\thanks{fischer@troubleshooting-tex.de}} +\usepackage{listings} +\lstset{basicstyle=\ttfamily, columns=fullflexible,language=[LaTeX]TeX,aboveskip=0pt} + +\makeatletter +\lst@AddToHook{PreInit}{\returntogrid} %works here but should be checked. A local key would be better. + +\begin{document} +\maketitle + + +\section{Introduction} + +This package offers a few commands to get something like an simple, semi-automatic grid typesetting. It does more or less what the existing \texttt{gridset} package does. The main differences to \texttt{gridset} are that \texttt{returntogrid} works also with lualatex, that it has also a command to do some horizontal movements, that it uses internally expl3 and that it does much less \enquote{security} checks: It actually started only as internal code, where I had good control about the use of the commands. Then I thought it would be useful to externalize it in case I needed it for more projects and added a thin wrapper of user commands. + +It probably also has more bugs -- report these at the issue tracker at github \\ \textbf{https://github.com/u-fischer/returntogrid}. + +\section{Vertical grid moves} + +\subsection{Restrictions / Deficiencies: Grid typesetting is not easy} + + +The problem is at first that there are so many things that can destroy the grid: + +\begin{itemize}[nosep] +\item different font sizes with their different leading, +\item all the various skips around and in lists, around math, around floats, +\item pictures and tabulars (e.g. because of lines) often don't fit the grid, +\item the way \TeX\ handles large boxes: People e.\,g. quite often believe that a tabular with three rows of normal height shouldn't disturb the grid but it does: + +\smallskip + +\tikz[overlay]\draw[red,dashed](0,0) --++ (3cm,0) +(0,-\baselineskip) --++ (3cm,0) +(0,-2\baselineskip) --++ (3cm,0) +(0,-3\baselineskip) --++ (3cm,0) +(0,-4\baselineskip) --++ (3cm,0);some text\\* +\begin{tabular}[t]{l} +tabular row 1\\ +tabular row 2\\ +tabular row 3 +\end{tabular}\\* +some text not on the grid + +\smallskip +\item and more +\end{itemize} + + +Getting back to the grid isn't trivial either. In many cases it can be done by inserting a suitable vertical space. But due to the way \TeX\ builds the page the needed amount can normally only be calculated in a second compilation. As the inserted space changes the following text probably new compilations are needed. So it can take a long time until everything is stable -- if a stable solution actually exists: stretchable space, floats that move around and problems at page breaks can actually prevent a stable state. + + +So you want to use this package be aware of the following restrictions: + +\begin{enumerate} +\item It will only work with documents/pages which uses \cs{raggedbottom}. +\item Many \cs{returntogrid} commands means many compilations. So use the command only when really needed. Setup as many spaces of lists and sectioning commands so that \pkg{returntogrid} is not needed to keep the grid. +\item Objects at/after page breaks needs special care, see section \ref{sec:pagebreak}. +\item Top floats could be a real problem. +\item The code uses for comparision the y-coordinate of a point in the text upper corner of the first page. (Such coordinates are measured from the \emph{bottom} of the page.) You will get nonsensical results if you change the geometry in the middle of your document unless you setup a new reference point and tell \cs{returntogrid} to use it. +\item The skips to return to the grid should normally be inserted only on the main vertical list, not in boxes. But the code doesn't check for inner mode as there could be special cases where it works (e.g. in a tcolorbox). If you use \cs{returntogrid} in such a place think carefully if this can lead to a stable state. +\end{enumerate} + +\Needspace{8\baselineskip} +\subsection{The main command} + +The main command is called \cs{returntogrid} and it takes one \emph{optional} argument: + +\DescribeMacro\returntogrid[<key-val-list>] + +The command is used for both type of \enquote{moves}: vertical and horizontal. In this section I'm describing the vertical movements, for horizontal movements see section \ref{sec:nextgridtab}. + +Without the optional argument the command should normally be used only at the begin of paragraphs. It will force a new paragraph by issuing a \cs{par}, start the paragraph with a \cs{leavevmode}, then store the current position of the baseline and at the next compilation insert after the \cs{par} a hopefully suitable vskip to move this position to the grid. + +It will always insert a \emph{positive} vskip, even if the previous grid position is much nearer -- I thought about small negative spaces but I'm not sure that this leads to a stable state. + + +In the optional argument the following keys can be used: + +\begin{description} +\item[\PrintKeyName{save}] Value is a label name. With this option \cs{returntogrid} only issues a \cs{leavevmode} and stores the position but doesn't insert any space and doesn't force a new paragraph. With this option a use inside boxes makes sense (see below). + +\item[\PrintKeyName{use}] Value is a label name. With this option \cs{returntogrid} only inserts the vskip needed to move the position stored with the \PrintKeyName{save} option to the grid. + + This can be e.g. used to move a section title or a line of a tabular to the grid + + \begin{lstlisting} + \returntogrid[use=mysec] + \section[xxxabc]{\returntogrid[save=mysec,strut=1]xxxabc} + + \returntogrid[use=mytab] + \begin{tabular}[t]{l} + \hline + \returntogrid[save=mytab]xxxabc + \end{tabular} + \end{lstlisting} + + +\item[\PrintKeyName{label}] Value is a label name. By default \cs{returntogrid} generates numbered label names. This means that if you insert a new \cs{returntogrid} command at the begin of the document all following label names have to be renumbered and all skip calculated anew. As this can need lots of compilations you can avoid this by giving the label a unique name manually. Internally a package specific prefix is always added to the label. + + +\item[\PrintKeyName{strut}] Value is an integer. This will insert a strut of height $ n \times \cs{baselineskip} + \cs{topskip} $. See section \ref{sec:pagebreak} why this could be needed. + +\item[\PrintKeyName{debug-vgrid}] This adds the command \cs{showdebugpagegrid} to the background of the current page. + +\end{description} + +You should ensure that \cs{returntogrid} isn't use in arguments that wander to the toc or the header as this would give multiply defined labels or insert the vskip in places where you don't want it. + +Also it is up to you to use the save-use system in a sensible way -- if the vskip doesn't move the position or if you use the vskip twice you probably will never get a stable position. + +\subsection{The page break problem}\label{sec:pagebreak} + +The space inserted to force an object onto the grid can push the object to a new page. + +This is a problem if the object doesn't fall naturally on the grid there. In this case one would need a second (non-discardable) space that moves the object further down. + +Currently the code doesn't do this. Instead it expects you to set the height of such problematic objects so that they keep the grid naturally. + + +\subsection{Top floats} + +Floats at the top of the page can disturb the grid too. There is normally no sensible place to insert a vskip in the text running below such a float to return to the grid. This means that you should either avoid top floats, or give them a height that pushes the text below onto the grid without manual adjustments. + +\Needspace{10\baselineskip} +\subsection{Debugging: Showing the grid} + +\DescribeMacro\showdebugpagegrid + +This command requires that you load the package \pkg{tikz}. You can then use it e.g. like this to see the vertical grid lines: + +\begin{lstlisting} +\AddToShipoutPictureBG {\AtTextUpperLeft{\showdebugpagegrid}} +\end{lstlisting} + + +\section{Horizontal grid: going to the next tab position}\label{sec:nextgridtab} + +The \cs{returntogridsetup} command described in the following section has a key to define lists of \enquote{tab positions}. It takes two argument: an (unique) name for the tab list and a list of dimension expressions\footnote{This means that e.\,g. sums of length are allowed.}. + +\PrintKeyName{settabpositions}=\MacroArgs{<name>}\MacroArgs{<dim expression>','<dim expression>,\ldots} + +The tab positions are set from the position you are issuing the command, and the dimensions describe the distance between two tabs. The command doesn't insert spaces but it uses a zero-width box, so use it at a places where a such a box doesn't affect your layout. The tabs must be set before the first use. + + +So + +\begin{lstlisting} +abc% +\returntogridsetup + { + settabpositions={demo}{1cm,2\fboxsep +1cm, 2cm} + }% +text +\end{lstlisting} + +sets the following tab positions for the list \enquote{demo}: + +abc% +\returntogridsetup + { + debug-tab, + settabpositions={demo}{1cm,2\fboxsep +1cm, 2cm} + }% +text + +\subsection{Moving to the next tab position} + +You can move to the next tab position by using the \PrintKeyName{tab} key in the optional argument of \cs{returntogrid}: + + +\Macro\returntogrid[tab=\meta{name}] + + +The name refers to the name of the tab list from which you want to use tab positions. If you don't give a name, whatever is the currently active tab list name will be used e.g. the one set with the \PrintKeyName{tab-list} option described in section \ref{sec:setup}. If no list with the name exists an error will be raised. + +The code is \emph{very} simple: It issues a \cs{leavevmode}, stores the current position in a label and at the next compilation calculates the distance to the next tab position and inserts a suitable \verb+\hspace*+. If there is no next tab position it inserts a \cs{hfill} unless the key \PrintKeyName{hfill} has been set to false. It doesn't try to avoid line breaks or overfull lines. + +The current position is stored with a automatically generated numbered label. Like in the case of the vertical movements you can avoid that this names changes all the time you add a command by setting a manual name with the key \PrintKeyName{label}. + +As with vertical movements \cs{returntogrid} has a number of restrictions: + +\begin{itemize} +\item Pay attention to stretchable space! If you move something to the end of the line, if you have a positive \cs{parfillskip} value, if the movement gives an overfull hbox, \LaTeX\ will perhaps change the word spaces and then no stable hspace value can be found. Use \cs{raggedright} or end the lines with \verb+\\+. + + I advise against setting an explizit tab position at the right margin, it is often unstable (and as the code inserts an \cs{hfill} after the last tab not needed anyway). + + +\item Don't misuse the command! It is not a replacement for a real tabular or a tabbing as many \cs{returntogrid} in one line or one paragraph can mean many compilations. But it is useful if you want to move e.g. graphics in a three column layout. +\end{itemize} + +\subsection{The twoside problem}\label{sec:twoside} + +Like with vertical grid movements changes of the page geometry can lead to nonsensical results: The tab positions are stored in coordinates which are measured from the left side of the page. + +Unlike as the situation with vertical grids geometry changes are actual common: a twoside document has different margins on the odd and even page. Normally you want the tab position to be relative to the text margins, so an offset is needed. + +It \pkg{returntogrid} detects the twoside mode, or you use the \PrintKeyName{twoside} key in the setup command, \pkg{returntogrid} will add the difference between oddsidemargin and evensidemargin as an offset when needed. The code assumes that the page geometry of odd and even pages don't change in the middle of the document! + + + +\section{Setup and configuration}\label{sec:setup} + +\DescribeMacro\returntogridsetup{<key-val-list>} + +With this command you can change some defaults of the package. + +\begin{description} +\item[\PrintKeyName{active}] Boolean, default is true. It deactivates following \cs{returntogrid} commands. + +\item[\PrintKeyName{step}] Value is a length, the default is \cs{baselineskip}. It sets the distance of the vertical grid. + +\item[\PrintKeyName{reference}] The name of the point used as reference for the vertical grid. The default is a point at the text upper corner stored like this: + +\begin{lstlisting} +\AddToShipoutPictureBG*{% + \AtTextUpperLeft{% + \zsaveposy{ufgrid@vpointtextupperleft}}} +\end{lstlisting} + +\item[\PrintKeyName{offset}] Value is a length, the default is \cs{topskip}. The reference point doesn't need to be on the grid, this key sets the offset. + +\item[\PrintKeyName{settabpositions}] This stores tab positions that can be use with the \cs{nextgridtab} command See section \ref{sec:nextgridtab}. + +\item[\PrintKeyName{tab-list}] Value a name. This sets the name of tab-list that will be used if you don't give a name explictely until the enclosing group end. + +\item[\PrintKeyName{hfill}] Boolean. Default is true. When set to false no \cs{\hfill} is inserted after the last tab position. + +\item[\PrintKeyName{twoside}] Boolean. This activates/deactivates the offset described in \ref{sec:twoside} in case the automatic detection doesn't do what you want. + + \item[\PrintKeyName{debug-tab}] This helps to see horizontal tabs when defining them. It should be used before using \PrintKeyName{settabpositions}. It needs the package \pkg{tikz}. +\end{description} + + + + + + +\newpage +\section{Examples} + +\returntogrid In the following text all parts with XXX are forced by the package to return to the grid. + +First some horizontal movements: + +\noindent +\returntogridsetup{ + debug-tab, + settabpositions={main}{0.3\textwidth,0.3\textwidth+0.05\textwidth}, + tab-list={main} + } + + +\noindent abc\returntogrid[tab]X + +\noindent abc\returntogrid[tab,label=mine]X + +\noindent more text more text more text \returntogrid[tab]X + +\noindent more text more text more text more text more text\returntogrid[tab]X + +\noindent more text more text more text more text more text more text more text\returntogrid[tab]X + +\minisec{The code} + +\begin{lstlisting}[breaklines] +\noindent +\returntogridsetup{ + debug-tab, + settabpositions={main}{0.3\textwidth,0.3\textwidth+0.05\textwidth}, + tab-list={main} + } + + +\noindent abc\returntogrid[tab]X + +\noindent abc\returntogrid[tab,label=mine]X + +\noindent more text more text more text \returntogrid[tab]X + +\noindent more text more text more text more text more text\returntogrid[tab]X + +\noindent more text more text more text more text more text more text more text\returntogrid[tab]X +\end{lstlisting} + + +\newpage +\AddToShipoutPictureBG {\AtTextUpperLeft{\showdebugpagegrid}} +moving something to the next page +\vspace*{29,1\baselineskip} +\returntogrid[use=mysec1] +\section[]{\returntogrid[save=mysec1,strut=1]XXX} +\rule{0.4pt}{3cm} + + + +\minisec{The code} + +\begin{lstlisting} +\vspace*{29,1\baselineskip} +\returntogrid[use=mysec1] +\section[]{\returntogrid[save=mysec1,strut=1]XXX} +\rule{0.4pt}{3cm} +\end{lstlisting} + + +\newpage + +\begin{itemize}[itemsep=3pt] +\item abc + +\item \returntogrid abc + +\item \returntogrid abc +\end{itemize} + +\minisec{The code} +\begin{lstlisting} +\begin{itemize}[itemsep=3pt] +\item abc + +\item \returntogrid abc + +\item \returntogrid abc +\end{itemize} +\end{lstlisting} + +\newpage +a + +\vspace{3pt} + +\returntogrid +xxxa + + + +\returntogrid +\LARGE xxxabc +\normalsize + + + +\returntogrid[use=mytab] +\begin{tabular}[t]{l} +\returntogrid[save=mytab]xxxsome text\\ +some text\\ +some text\\ +some text\\ +some text\\ +some text\\ +some text \\some text\\some text +\end{tabular} + +\returntogrid[use=mysec2] +\section[]{\returntogrid[save=mysec2,strut=1]xxxabc} + +abc \\abc + +\newpage +\ClearShipoutPictureBG +\minisec{The code} +\begin{lstlisting} +a + +\vspace{3pt} + +\returntogrid +xxxa + + + +\returntogrid +\LARGE xxxabc +\normalsize + + + +\returntogrid[use=mytab] +\begin{tabular}[t]{l} +\returntogrid[save=mytab]xxxsome text\\ +some text\\ +some text\\ +some text\\ +some text\\ +some text\\ +some text \\some text\\some text +\end{tabular} + +\returntogrid[use=mysec2] +\section[]{\returntogrid[save=mysec2,strut=1]xxxabc} + +abc \\abc +\end{lstlisting} +\end{document} diff --git a/Master/texmf-dist/tex/latex/returntogrid/returntogrid.sty b/Master/texmf-dist/tex/latex/returntogrid/returntogrid.sty new file mode 100644 index 00000000000..64aaa92b493 --- /dev/null +++ b/Master/texmf-dist/tex/latex/returntogrid/returntogrid.sty @@ -0,0 +1,428 @@ +\RequirePackage{xparse} + +\ProvidesExplPackage {returntogrid} {2018/08/21} {0.2} + {return to a grid position} +% \debug_on:n { check-expressions,deprecation } % needs enable-debug +\RequirePackage{eso-pic} +\RequirePackage{zref-savepos,zref-abspage} + +\msg_new:nnn {ufgrid} {tikz-needed} { the~showdebugpagegrid~command~needs~the~tikz~package } +\msg_new:nnn {ufgrid} {tab-list-unknown} { the~tab~list~"#1"~has~not~been~declared} + +\sys_if_engine_luatex:T +{ + \directlua{require ("returntogrid.lua")} +} + +\int_new:N \l__ufgrid_vskip_int %vskip in sp +\int_new:N \g__ufgrid_vpoint_int %for the v-labels +\int_new:N \g__ufgrid_hpoint_int %for the h-labels of tabs +\int_new:N \l__ufgrid_tempa_int +\int_new:N \l__ufgrid_tab_cor_int + +\bool_new:N \g__ufgrid_active_bool +\bool_gset_true:N \g__ufgrid_active_bool +\bool_new:N \l__ufgrid_hmode_bool %hmode (tabs) +\bool_new:N \l__ufgrid_savepos_bool %save position +\bool_new:N \l__ufgrid_insert_vskip_bool %insert vskip +\bool_new:N \l__ufgrid_autolabel_bool %numbered labels +\bool_new:N \l__ufgrid_tabfound_bool +\bool_new:N \l__ufgrid_hfill_bool +\bool_new:N \l__ufgrid_debug_tab_bool +\bool_new:N \g__ufgrid_twoside_bool + +\if@twoside \bool_gset_true:N \g__ufgrid_twoside_bool \fi + +\tl_new:N \l__ufgrid_setup_step_tl %step value (dim in sp) +\tl_new:N \l__ufgrid_setup_reference_tl %name of reference point +\tl_new:N \l__ufgrid_setup_offset_tl %an offset, e.g. topskip +\tl_new:N \l__ufgrid_label_tl %holds the label name +\tl_new:N \l__ufgrid_curpos_tl +\tl_new:N \g__ufgrid_prefix_vpoint_tl %prefix of v-point labels +\tl_new:N \g__ufgrid_prefix_tabpos_tl %prefix for tab positions +\tl_new:N \g__ufgrid_prefix_hpoint_tl %prefix for h-point labels +\tl_new:N \g__ufgrid_prefix_user_tl %prefix for labels provided by the user +\tl_new:N \l__ufgrid_tab_list_tl %holds the name of the current tab list +\tl_new:N \l__ufgrid_debug_tab_draw_tl %hold the draw command to debug tab positions +\tl_new:N \l__ufgrid_tmp_vskip_tl % to pass the vskip to zsavepos + +\dim_new:N \l__ufgrid_debug_tab_dim + +\prop_new:N \g__ufgrid_vskip_prop %will hold the vskips by label name + +\cs_generate_variant:Nn \prop_gput:Nnn {Nxx} +\cs_generate_variant:Nn \prop_get:NnNTF {NxNTF} +\cs_generate_variant:Nn \prop_get:NnNF {NxNF} + +% we need to store the current displacement +\zref@newprop {ufgridvskip}[0]{\int_use:N \l__ufgrid_vskip_int} +\zref@newprop*{pagecnt} [1] {\the\c@page} +\zref@addprop {savepos} {ufgridvskip} +\zref@addprop {savepos} {abspage} +\zref@addprop {savepos} {pagecnt} + + +\keys_define:nn { ufgrid / setup} +{ + activate .bool_gset:N = \g__ufgrid_active_bool, + % step = dimension + step .code:n = { \tl_set:Nx \l__ufgrid_setup_step_tl { \dim_to_decimal_in_sp:n {#1} } }, + % reference = labelname (label should be set with zsavepos) + reference .tl_set:N = \l__ufgrid_setup_reference_tl, + % offset = dimension: move down (example offset= \topskip) + offset .code:n = { \tl_set:Nx \l__ufgrid_setup_offset_tl { \dim_to_decimal_in_sp:n {#1} } }, + tab-list .tl_set:N = \l__ufgrid_tab_list_tl, + settabpositions .code:n = { \__ufgrid_settabpositions:nn #1 }, + prefix-vpoint .tl_gset:N = \g__ufgrid_prefix_vpoint_tl, + prefix-tabpos .tl_gset:N = \g__ufgrid_prefix_tabpos_tl, + prefix-hpoint .tl_gset:N = \g__ufgrid_prefix_hpoint_tl, + prefix-user .tl_gset:N = \g__ufgrid_prefix_user_tl, + debug-tab .bool_set:N= \l__ufgrid_debug_tab_bool, + debug-tab-len .dim_set:N = \l__ufgrid_debug_tab_dim, + debug-tab-draw .tl_set:N = \l__ufgrid_debug_tab_draw_tl, + hmode .bool_set:N= \l__ufgrid_hmode_bool, + hfill .bool_set:N= \l__ufgrid_hfill_bool, + tab .code:n = + { + \tl_if_empty:nF { #1 } + { + \tl_set:Nn \l__ufgrid_tab_list_tl {#1} + } + \bool_set_true:N \l__ufgrid_hmode_bool + }, + twoside .bool_gset:N = \g__ufgrid_twoside_bool +} + +\normalsize %just in case +\keys_set:nn { ufgrid / setup } + { + prefix-vpoint = ufgrid@vpoint, + prefix-tabpos = ufgrid@tabpos, + prefix-hpoint = ufgrid@hpoint, + prefix-user = ufgrid@user, + step = \baselineskip, + reference = \g__ufgrid_prefix_vpoint_tl textupperleft, + offset = \topskip, + debug-tab-len = -4cm, + debug-tab-draw= { \draw[blue,dashed] (0,1em)--++(0,\l__ufgrid_debug_tab_dim) }, + hfill + } + + +\keys_define:nn { ufgrid / use } + { + __savepos .bool_set:N = \l__ufgrid_savepos_bool, + __insert_vskip .bool_set:N = \l__ufgrid_insert_vskip_bool, + __label .tl_set:N = \l__ufgrid_label_tl, + __autolabel .bool_set:N = \l__ufgrid_autolabel_bool, + save .meta:n = { __label=\g__ufgrid_prefix_user_tl#1, __savepos=true, __insert_vskip=false,__autolabel=false }, + save .value_required:n = true, + label .meta:n = { __label=\g__ufgrid_prefix_user_tl#1, __autolabel=false }, + label .value_required:n = true, + use .meta:n = + { + __label=\g__ufgrid_prefix_user_tl#1, __savepos=false, __insert_vskip=true,__autolabel=false + }, + use .value_required:n = true, + strut .code:n = \__ufgrid_insert_ufgridstrut:n { #1 }, + hmode .bool_set:N = \l__ufgrid_hmode_bool, + tab-list .tl_set:N = \l__ufgrid_tab_list_tl, + tab .code:n = + { + \tl_if_empty:nF { #1 } + { + \tl_set:Nn \l__ufgrid_tab_list_tl {#1} + } + \bool_set_true:N \l__ufgrid_hmode_bool + }, + debug-vgrid .code:n = {\AddToShipoutPictureBG*{\AtTextUpperLeft{\showdebugpagegrid}}} + } + + +%%calculate the vskip to insert + %#1 = diff to a point on the grid + %#2 = currently used vskip, + %#3 = step + % all values integers =dim in sp! +\sys_if_engine_luatex:TF + { + \cs_new:Nn \__ufgrid_calculate_vskip:nnn + { \directlua { returntogrid.ufgridvskip (#1,#2,#3) } } + } + { + \cs_new:Nn \__ufgrid_calculate_vskip:nnn + { + \int_eval:n + { + \int_mod:nn + { + #2 + #3 - \int_mod:nn { #1 }{ #3 } + } + {#3} + } + } + } + + +\cs_new:Nn \__ufgrid_calculate_vskip:n %#1 =labelname + { + \__ufgrid_calculate_vskip:nnn + { %diff + \zposy{\l__ufgrid_setup_reference_tl} - \l__ufgrid_setup_offset_tl - \zposy{#1} + } + { %current vskip + \zref@extractdefault{#1-vskip} {ufgridvskip} {0} + } + { + \l__ufgrid_setup_step_tl + } + } + +\cs_new_protected:Nn \__ufgrid_savepos:n %#1 label name + { + \leavevmode\strut + \zsavepos{#1} + } + + +\cs_new_protected:Nn \__ufgrid_insert_vskip:n %#1 label name + { + \par + \int_compare:nT { \zposy{#1} != 0 } + { + %calculate the needed vskip base on the ypos and the old vskip + \int_set:Nn \l__ufgrid_vskip_int + { + \__ufgrid_calculate_vskip:n { #1 } + } + \zref@labelbyprops {#1-vskip}{ufgridvskip} + %insert the vskip + \vspace*{\l__ufgrid_vskip_int sp} + %\vskip \l__ufgrid_vskip_int sp\relax + %\vskip 0pt + } + } + +\cs_new_protected:Nn \__ufgrid_insert_ufgridstrut:n {\rule{0pt}{\dim_eval:n { \l__ufgrid_setup_step_tl sp + \topskip }}} + + +%vertical version +\cs_new_protected:Nn \__ufgrid_returntogrid_v: +{ + \bool_if:NT \l__ufgrid_autolabel_bool + { + \int_gincr:N \g__ufgrid_vpoint_int + \tl_set:Nn \l__ufgrid_label_tl + { + \g__ufgrid_prefix_vpoint_tl \int_use:N\g__ufgrid_vpoint_int + } + } + \bool_if:NT\l__ufgrid_insert_vskip_bool + { + \__ufgrid_insert_vskip:n { \l__ufgrid_label_tl } + } + \bool_if:NT\l__ufgrid_savepos_bool + { + \__ufgrid_savepos:n { \l__ufgrid_label_tl } + } +} + + +\cs_new_protected:Nn \__ufgrid_settabpositions:nn %#1 name #2 list of spaces + { + \seq_set_from_clist:Nn \l_tmpa_seq {#2} + \seq_new:c {g__ufgrid_tabpos_#1_seq} + \int_set:Nn\l__ufgrid_tempa_int {1} + \makebox[0pt][l] + { + \seq_map_inline:Nn \l_tmpa_seq + { + \zsavepos{\g__ufgrid_prefix_tabpos_tl#1\int_use:N\l__ufgrid_tempa_int} + \bool_if:NT \l__ufgrid_debug_tab_bool + { + \__ufgrid_debug_showtabs:n { #1 } + } + \hspace*{\dim_eval:n{##1}} + \int_incr:N\l__ufgrid_tempa_int + } + \zsavepos{\g__ufgrid_prefix_tabpos_tl#1\int_use:N\l__ufgrid_tempa_int} + \bool_if:NT \l__ufgrid_debug_tab_bool + { + \__ufgrid_debug_showtabs:n { #1 } + } + \int_step_inline:nnnn {1}{1}{\l__ufgrid_tempa_int} + { + \seq_gput_right:cx {g__ufgrid_tabpos_#1_seq} {\zposx{\g__ufgrid_prefix_tabpos_tl#1##1}} + } + } + } + + + +\cs_new_protected:Nn \__ufgrid_returntogrid_h:n %#1 name +{ + \seq_if_exist:cF { g__ufgrid_tabpos_#1_seq } + { + \msg_error:nnx { ufgrid } {tab-list-unknown} { #1} + } + \bool_if:NT \l__ufgrid_autolabel_bool + { + \int_gincr:N \g__ufgrid_hpoint_int + \tl_set:Nn \l__ufgrid_label_tl + { + \g__ufgrid_prefix_hpoint_tl \int_use:N\g__ufgrid_hpoint_int + } + } + \leavevmode\zsavepos{\l__ufgrid_label_tl} + \tl_set:Nx \l__ufgrid_curpos_tl + { + \zref@extractdefault {\l__ufgrid_label_tl} {posx} {-1} + } + \bool_if:NT \g__ufgrid_twoside_bool + { + \int_if_odd:nTF + { + \zref@extractdefault {\l__ufgrid_label_tl} {pagecnt} {1} + - + \zref@extractdefault {\g__ufgrid_prefix_tabpos_tl#1 1} {pagecnt} {1} + } + { + % tab setting and current pos are on different page types. + \int_if_even:nTF + { + \zref@extractdefault {\g__ufgrid_prefix_tabpos_tl#1 1} {pagecnt} {1} + } + { + \int_set:Nn \l__ufgrid_tab_cor_int {\dim_to_decimal_in_sp:n {\oddsidemargin-\evensidemargin}} + } + { + \int_set:Nn \l__ufgrid_tab_cor_int {\dim_to_decimal_in_sp:n {\evensidemargin-\oddsidemargin}} + } + } + { + \int_set:Nn \l__ufgrid_tab_cor_int {0} + } + } + \int_compare:nNnF { \l__ufgrid_curpos_tl } {=}{-1} + { + \bool_set_false:N \l__ufgrid_tabfound_bool + \int_step_inline:nn { \seq_count:c { g__ufgrid_tabpos_#1_seq }-1 } + { + \int_compare:nT + { (\seq_item:cn { g__ufgrid_tabpos_#1_seq } { ##1 } + \l__ufgrid_tab_cor_int) + < + \l__ufgrid_curpos_tl + < + (\seq_item:cn { g__ufgrid_tabpos_#1_seq } { ##1 +1 } + \l__ufgrid_tab_cor_int) + } + { + \bool_set_true:N \l__ufgrid_tabfound_bool + \hspace* + { + \int_eval:n + { + \seq_item:cn { g__ufgrid_tabpos_#1_seq } { ##1 +1 } + \l__ufgrid_tab_cor_int + - + \l__ufgrid_curpos_tl + }sp + } + } + } + \bool_if:NT \l__ufgrid_hfill_bool + { + \int_step_inline:nn { \seq_count:c { g__ufgrid_tabpos_#1_seq }} + { + \int_compare:nT + { + \seq_item:cn { g__ufgrid_tabpos_#1_seq } { ##1 } + \l__ufgrid_tab_cor_int + = + \l__ufgrid_curpos_tl + } + { + \bool_set_true:N \l__ufgrid_tabfound_bool + } + } + \bool_if:NF \l__ufgrid_tabfound_bool {\hfill} + } + } +} + + + +\cs_new_protected:Nn \__ufgrid_returntogrid:n +{ + \group_begin: + \bool_if:NT \g__ufgrid_active_bool + { + \keys_set:nn { ufgrid / use } + { + __autolabel,__savepos=true,__insert_vskip=true,hmode=false, + #1 + } + \bool_if:NTF \l__ufgrid_hmode_bool + { + \__ufgrid_returntogrid_h:n { \l__ufgrid_tab_list_tl } + } + { + \__ufgrid_returntogrid_v: + } + } + \group_end: +} + + +\NewDocumentCommand\returntogrid{ O {} } + { + \__ufgrid_returntogrid:n { #1 } + } + + + + +\NewDocumentCommand\returntogridsetup { m } + { + \keys_set:nn { ufgrid / setup } { #1} + } + +\NewDocumentCommand \showdebugpagegrid {} + { + \cs_if_exist:NTF\tikzpicture + { + \begin{tikzpicture}[overlay] + \draw[dotted,red] + (0,0) --++ (\textwidth,0cm); + \tl_set:Nx \l_tmpa_tl {\fp_eval:n { + trunc ( + (\dim_to_decimal_in_sp:n {\textheight} - \l__ufgrid_setup_offset_tl ) + / + \l__ufgrid_setup_step_tl + ) + }} + \foreach\x in {0,1,2,...,\l_tmpa_tl} + { + \draw[red,dashed] + (0,\fp_eval:n {-\l__ufgrid_setup_offset_tl-(\x*\l__ufgrid_setup_step_tl)}sp) --++ (\textwidth,0cm); + } + \end{tikzpicture}% + } + { + \msg_warning:nn {ufgrid} {tikz-needed} + } + } + +\cs_new_protected:Nn \__ufgrid_debug_showtabs:n +{ + \cs_if_exist:NTF\tikzpicture + { + \tikz[overlay] + \l__ufgrid_debug_tab_draw_tl; + } + { + \msg_warning:nn {ufgrid} {tikz-needed} + } + } + + +\AddToShipoutPictureBG*{\AtTextUpperLeft{\zsaveposy{\g__ufgrid_prefix_vpoint_tl textupperleft}}} + + \endinput diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 936391aa2f6..1f5fa1f7465 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -555,7 +555,7 @@ my @TLP_working = qw( refcheck refenums reflectgraphics refman refstyle regcount regexpatch register regstats reledmac relenc relsize reotex repeatindex repere repltext resphilosophica - resumecls resumemac reverxii revquantum revtex + resumecls resumemac returntogrid reverxii revquantum revtex ribbonproofs rjlparshap rlepsf rmathbr rmpage roboto robustcommand robustindex romanbar romanbarpagenumber romande romanneg romannum diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc index 83506c07265..817dc9e6e68 100644 --- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc @@ -921,6 +921,7 @@ depend relenc depend relsize depend repeatindex depend repltext +depend returntogrid depend rjlparshap depend rlepsf depend rmpage diff --git a/Master/tlpkg/tlpsrc/returntogrid.tlpsrc b/Master/tlpkg/tlpsrc/returntogrid.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/Master/tlpkg/tlpsrc/returntogrid.tlpsrc |