From 0f0d64a55eba3def343d043b6d6c60158e6362c1 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 24 Jul 2022 03:01:20 +0000 Subject: CTAN sync 202207240301 --- macros/latex/contrib/projlib/ProjLib.dtx | 213 ++++++++++++++------- macros/latex/contrib/projlib/README.md | 2 +- macros/latex/contrib/runcode/README | 2 +- macros/latex/contrib/runcode/runcode.pdf | Bin 55816 -> 188821 bytes macros/latex/contrib/runcode/runcode.sty | 12 +- macros/latex/contrib/runcode/runcode.tex | 7 +- macros/latex/contrib/siunitx/CHANGELOG.md | 12 +- macros/latex/contrib/siunitx/siunitx-code.pdf | Bin 617746 -> 617930 bytes macros/latex/contrib/siunitx/siunitx-number.dtx | 13 +- macros/latex/contrib/siunitx/siunitx.dtx | 2 +- macros/latex/contrib/siunitx/siunitx.pdf | Bin 665420 -> 665420 bytes macros/latex/contrib/textpos/LICENCE | 51 +++-- macros/latex/contrib/textpos/README | 10 +- macros/latex/contrib/textpos/VERSION- | 1 + macros/latex/contrib/textpos/VERSION-1.10 | 1 - .../latex/contrib/textpos/examples/README.examples | 8 +- macros/latex/contrib/textpos/examples/t3.tex | 1 + macros/latex/contrib/textpos/examples/t7.tex | 1 + macros/latex/contrib/textpos/examples/t9.tex | 16 +- .../latex/contrib/textpos/niepraschk-eso-pic.pdf | Bin 37246 -> 40591 bytes macros/latex/contrib/textpos/textpos.dtx | 152 +++++++++------ macros/latex/contrib/textpos/textpos.html | 37 ++-- macros/latex/contrib/textpos/textpos.pdf | Bin 278433 -> 305016 bytes 23 files changed, 350 insertions(+), 191 deletions(-) create mode 100644 macros/latex/contrib/textpos/VERSION- delete mode 100644 macros/latex/contrib/textpos/VERSION-1.10 (limited to 'macros/latex/contrib') diff --git a/macros/latex/contrib/projlib/ProjLib.dtx b/macros/latex/contrib/projlib/ProjLib.dtx index 1b1be1cf73..c6615ebcd9 100644 --- a/macros/latex/contrib/projlib/ProjLib.dtx +++ b/macros/latex/contrib/projlib/ProjLib.dtx @@ -19,84 +19,84 @@ %<*ProjLib> \ProvidesExplPackage {ProjLib} - {2022/07/03} {} + {2022/07/23} {} {Collective interface of the ProjLib toolkit} % % %<*projlib-author> \ProvidesExplPackage {projlib-author} - {2022/07/03} {} + {2022/07/23} {} {Enhanced author information block} % % %<*projlib-datetime> \ProvidesExplPackage {projlib-datetime} - {2022/07/03} {} + {2022/07/23} {} {Convert numeric date-time string to natural language} % % %<*projlib-draft> \ProvidesExplPackage {projlib-draft} - {2022/07/03} {} + {2022/07/23} {} {Useful commands during draft stage} % % %<*projlib-font> \ProvidesExplPackage {projlib-font} - {2022/07/03} {} + {2022/07/23} {} {Font selection and configuration} % % %<*projlib-language> \ProvidesExplPackage {projlib-language} - {2022/07/03} {} + {2022/07/23} {} {Multi-language configuration} % % %<*projlib-logo> \ProvidesExplPackage {projlib-logo} - {2022/07/03} {} + {2022/07/23} {} {The ProjLib logo} % % %<*projlib-math> \ProvidesExplPackage {projlib-math} - {2022/07/03} {} + {2022/07/23} {} {Efficient math setup} % % %<*projlib-paper> \ProvidesExplPackage {projlib-paper} - {2022/07/03} {} + {2022/07/23} {} {Configuration of the paper style} % % %<*projlib-text> \ProvidesExplPackage {projlib-text} - {2022/07/03} {} + {2022/07/23} {} {Text-related commands} % % %<*projlib-theorem> \ProvidesExplPackage {projlib-theorem} - {2022/07/03} {} + {2022/07/23} {} {Configuration of theorem-like environments} % % %<*projlib-titlepage> \ProvidesExplPackage {projlib-titlepage} - {2022/07/03} {} + {2022/07/23} {} {Commands for rendering the title page} % @@ -2641,6 +2641,7 @@ \projlib_language_set_option:n { spanish } } , Spanish .meta:n = { spanish } , CN .meta:n = { schinese } + , SC .meta:n = { schinese } , chinese .meta:n = { schinese } , schinese .code:n = { \projlib_language_set_option_no_babel:n { schinese } } , simplified-chinese .meta:n = { schinese } @@ -2701,6 +2702,7 @@ { all } { common } { common } { common } { cn } { schinese } + { sc } { schinese } { chinese } { schinese } { schinese } { schinese } { simplifiedchinese } { schinese } @@ -2737,6 +2739,7 @@ \str_case_e:nnF { \exp_args:Ne \str_foldcase:n { \tl_trim_spaces:n { #1 } } } { { cn } { cjk } + { sc } { cjk } { chinese } { cjk } { schinese } { cjk } { simplifiedchinese } { cjk } @@ -2838,7 +2841,7 @@ \tl_gput_right:Nn \g_projlib_language_settings_schinese_tl { - \tl_set:Nn \languagename { schinese } + \tl_set:Nn \languagename { schinese } \tl_set:cn { abstractname } { 摘要 } \tl_set:cn { proofname } { 证明 } \tl_set:cn { contentsname } { 目录 } @@ -2867,7 +2870,7 @@ \tl_gput_right:Nn \g_projlib_language_settings_tchinese_tl { - \tl_set:Nn \languagename { tchinese } + \tl_set:Nn \languagename { tchinese } \tl_set:cn { abstractname } { 摘要 } \tl_set:cn { proofname } { 證明 } \tl_set:cn { contentsname } { 目錄 } @@ -3509,37 +3512,42 @@ %<*projlib-paper> \keys_define:nn { projlib-paper } { - , preview-mode .bool_set:N = \l__projlib_paper_preview_bool - , preview-mode .initial:n = { false } - , paper-style .tl_set:N = \l__projlib_paper_paperstyle_tl - , paper-style .initial:n = { normal } - , paper-style .value_required:n = true - , paper~style .tl_set:N = \l__projlib_paper_paperstyle_tl - , paper style .tl_set:N = \l__projlib_paper_paperstyle_tl - , yellow-paper .meta:n = { paperstyle = yellow } - , yellow~paper .meta:n = { paperstyle = yellow } - , yellow paper .meta:n = { paperstyle = yellow } - , parchment-paper .meta:n = { paperstyle = parchment } - , parchment~paper .meta:n = { paperstyle = parchment } - , parchment paper .meta:n = { paperstyle = parchment } - , green-paper .meta:n = { paperstyle = green } - , green~paper .meta:n = { paperstyle = green } - , green paper .meta:n = { paperstyle = green } - , light-gray-paper .meta:n = { paperstyle = lightgray } - , light~gray~paper .meta:n = { paperstyle = lightgray } - , light gray-paper .meta:n = { paperstyle = lightgray } - , light gray~paper .meta:n = { paperstyle = lightgray } - , light gray paper .meta:n = { paperstyle = lightgray } - , gray-paper .meta:n = { paperstyle = gray } - , gray~paper .meta:n = { paperstyle = gray } - , gray paper .meta:n = { paperstyle = gray } - , nord-paper .meta:n = { paperstyle = nord } - , nord~paper .meta:n = { paperstyle = nord } - , nord paper .meta:n = { paperstyle = nord } - , dark-paper .meta:n = { paperstyle = dark } - , dark~paper .meta:n = { paperstyle = dark } - , dark paper .meta:n = { paperstyle = dark } - , unknown .code:n = {} + , preview-mode .bool_set:N = \l__projlib_paper_preview_bool + , preview-mode .initial:n = { false } + , paper-style .tl_set:N = \l__projlib_paper_paperstyle_tl + , paper-style .initial:n = { normal } + , paper-style .value_required:n = true + , paper~style .tl_set:N = \l__projlib_paper_paperstyle_tl + , paper style .tl_set:N = \l__projlib_paper_paperstyle_tl + , light-yellow-paper .meta:n = { paperstyle = lightyellow } + , light~yellow~paper .meta:n = { paperstyle = lightyellow } + , light yellow-paper .meta:n = { paperstyle = lightyellow } + , light yellow~paper .meta:n = { paperstyle = lightyellow } + , light yellow paper .meta:n = { paperstyle = lightyellow } + , yellow-paper .meta:n = { paperstyle = yellow } + , yellow~paper .meta:n = { paperstyle = yellow } + , yellow paper .meta:n = { paperstyle = yellow } + , parchment-paper .meta:n = { paperstyle = parchment } + , parchment~paper .meta:n = { paperstyle = parchment } + , parchment paper .meta:n = { paperstyle = parchment } + , green-paper .meta:n = { paperstyle = green } + , green~paper .meta:n = { paperstyle = green } + , green paper .meta:n = { paperstyle = green } + , light-gray-paper .meta:n = { paperstyle = lightgray } + , light~gray~paper .meta:n = { paperstyle = lightgray } + , light gray-paper .meta:n = { paperstyle = lightgray } + , light gray~paper .meta:n = { paperstyle = lightgray } + , light gray paper .meta:n = { paperstyle = lightgray } + , gray-paper .meta:n = { paperstyle = gray } + , gray~paper .meta:n = { paperstyle = gray } + , gray paper .meta:n = { paperstyle = gray } + , nord-paper .meta:n = { paperstyle = nord } + , nord~paper .meta:n = { paperstyle = nord } + , nord paper .meta:n = { paperstyle = nord } + , dark-paper .meta:n = { paperstyle = dark } + , dark~paper .meta:n = { paperstyle = dark } + , dark paper .meta:n = { paperstyle = dark } + , unknown .code:n = {} } \ProcessKeyOptions [ projlib-paper ] @@ -3582,19 +3590,28 @@ \str_case_e:nn { \l__projlib_paper_paperstyle_tl } { - { yellow } { \definecolor { paper } { RGB } { 247, 246, 233 } } - { parchment } { \definecolor { paper } { RGB } { 224, 204, 160 } } - { green } { \definecolor { paper } { RGB } { 207, 231, 207 } } - { lightgray } { \definecolor { paper } { RGB } { 236, 239, 244 } - \definecolor { main-text } { RGB } { 37, 41, 46 } } - { light-gray } { \definecolor { paper } { RGB } { 236, 239, 244 } - \definecolor { main-text } { RGB } { 37, 41, 46 } } - { gray } { \definecolor { paper } { RGB } { 127, 130, 136 } - \definecolor { main-text } { RGB } { 236, 239, 244 } } - { nord } { \definecolor { paper } { RGB } { 46, 52, 64 } - \definecolor { main-text } { RGB } { 214, 220, 230 } } - { dark } { \definecolor { paper } { RGB } { 28, 29, 33 } - \definecolor { main-text } { RGB } { 210, 213, 217 } } + { light yellow } { \definecolor { paper } { RGB } { 255, 254, 245 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { light-yellow } { \definecolor { paper } { RGB } { 255, 254, 245 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { light~yellow } { \definecolor { paper } { RGB } { 255, 254, 245 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { yellow } { \definecolor { paper } { RGB } { 247, 246, 233 } } + { parchment } { \definecolor { paper } { RGB } { 232, 225, 204 } + \definecolor { main-text } { RGB } { 94, 78, 62 } } + { green } { \definecolor { paper } { RGB } { 207, 231, 207 } } + { light gray } { \definecolor { paper } { RGB } { 236, 239, 244 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { light-gray } { \definecolor { paper } { RGB } { 236, 239, 244 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { light~gray } { \definecolor { paper } { RGB } { 236, 239, 244 } + \definecolor { main-text } { RGB } { 37, 41, 46 } } + { gray } { \definecolor { paper } { RGB } { 127, 130, 136 } + \definecolor { main-text } { RGB } { 236, 239, 244 } } + { nord } { \definecolor { paper } { RGB } { 46, 52, 64 } + \definecolor { main-text } { RGB } { 214, 220, 230 } } + { dark } { \definecolor { paper } { RGB } { 28, 29, 33 } + \definecolor { main-text } { RGB } { 210, 213, 217 } } } \cs_new:Nn \projlib_paper_set_page_color:n @@ -3854,7 +3871,16 @@ % \crthm_counter_alias:nn { proof } { theorem } \tl_new:N \l_projlib_theorem_name_of_theorem_with_name_tl -\CreateTheorem { theorem-with-name_inner } { name = { heading = { \l_projlib_theorem_name_of_theorem_with_name_tl } }, create-starred-version, shared-counter=theorem-with-name } +\CreateTheorem { theorem-with-name_inner } + { + , name = { + , heading = { \l_projlib_theorem_name_of_theorem_with_name_tl } + , crefname = {}{} + , Crefname = {}{} + } + , create-starred-version + , shared-counter = theorem-with-name + } \NewDocumentEnvironment { theorem-with-name } { m O{} } { @@ -5175,6 +5201,7 @@ } \ProcessKeyOptions [ projlib-titlepage ] +\RequirePackage { projlib-logo } \RequirePackage { projlib-paper } \RequirePackage { tikz } @@ -5206,12 +5233,12 @@ \keys_define:nn { projlib-titlepage-config } { - , logo .tl_set:N = \l_projlib_titlepage_logo_tl + , logo .code:n = { \tl_set:Nn \l_projlib_titlepage_logo_tl { \tl_trim_spaces:n { #1 } } } , logo .initial:n = { \scalebox { 2 } { \ProjLib } } - , title .tl_set:N = \l_projlib_titlepage_title_tl - , subtitle .tl_set:N = \l_projlib_titlepage_subtitle_tl - , author .tl_set:N = \l_projlib_titlepage_author_tl - , date .tl_set:N = \l_projlib_titlepage_date_tl + , title .code:n = { \tl_set:Nn \l_projlib_titlepage_title_tl { \tl_trim_spaces:n { #1 } } } + , subtitle .code:n = { \tl_set:Nn \l_projlib_titlepage_subtitle_tl { \tl_trim_spaces:n { #1 } } } + , author .code:n = { \tl_set:Nn \l_projlib_titlepage_author_tl { \tl_trim_spaces:n { #1 } } } + , date .code:n = { \tl_set:Nn \l_projlib_titlepage_date_tl { \tl_trim_spaces:n { #1 } } } , style .tl_set:N = \l_projlib_titlepage_style_tl , style .initial:n = { default } , color .code:n = { @@ -5242,9 +5269,32 @@ \fill [color=titlepage-back] ($(current~page.south~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$); \fill [color=titlepage-main] ($(current~page.north~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$); \fill [color=titlepage-back] ($(current~page.north~east)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$); - \node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.32\paperwidth,-.17\paperheight)$) { \l_projlib_titlepage_logo_tl }; - \node[text~width=.8\paperwidth,text~height=.4\paperheight] at ($(current~page.north~west)+(.57\paperwidth,-.33\paperheight)$) {\textcolor{titlepage-back}{\fontsize{24pt}{28pt}\selectfont\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[1.5em]\fontsize{18pt}{22pt}\selectfont{ \l_projlib_titlepage_subtitle_tl }}}; - \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{titlepage-back}\begin{flushright}\fontsize{16pt}{18pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{14pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} }; + \node[text~width=.3\paperwidth, text~height=.2\paperheight, align=flush~left] + at ($(current~page.north~west)+(.32\paperwidth,-.17\paperheight)$) + { + \l_projlib_titlepage_logo_tl + }; + \node[text~width=.8\paperwidth, text~height=.5\paperheight, align=flush~left] + at ($(current~page.north~west)+(.52\paperwidth,-.28\paperheight)$) + { + \color{titlepage-back} + \sffamily + \fontsize{24pt}{36pt}\selectfont + \textsc{ \l_projlib_titlepage_title_tl }\\[1.5em] + \fontsize{18pt}{27pt}\selectfont + \l_projlib_titlepage_subtitle_tl + }; + \node[text~width=.3\paperwidth, text~height=.3\paperheight, align=flush~left] + at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) + { + \color{titlepage-back} + \begin{flushright} + \fontsize{16pt}{24pt}\selectfont + \textsc{ \l_projlib_titlepage_author_tl }\\[1em] + \fontsize{12pt}{18pt}\selectfont + \l_projlib_titlepage_date_tl + \end{flushright} + }; \end{tikzpicture} } @@ -5253,9 +5303,32 @@ \begin{tikzpicture}[overlay,remember~picture] \fill[color=white] ($(current~page.south~west)$) rectangle ($(current~page.north~east)$); \fill[color=titlepage-main] ($(current~page.south~west)$) rectangle ($(current~page.north~east)+(0,-.3\paperheight)$); - \node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.27\paperwidth,-.15\paperheight)$) { \l_projlib_titlepage_logo_tl }; - \node[text~width=.8\paperwidth,text~height=.4\paperheight] at ($(current~page.north~west)+(.52\paperwidth,-.33\paperheight)$) {\textcolor{white}{\fontsize{24pt}{28pt}\selectfont\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[1.5em]\fontsize{18pt}{22pt}\selectfont{ \l_projlib_titlepage_subtitle_tl }}}; - \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{white}\begin{flushright}\fontsize{16pt}{18pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{14pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} }; + \node[text~width=.3\paperwidth, text~height=.2\paperheight, align=flush~left] + at ($(current~page.north~west)+(.27\paperwidth,-.15\paperheight)$) + { + \l_projlib_titlepage_logo_tl + }; + \node[text~width=.8\paperwidth, text~height=.5\paperheight, align=flush~left] + at ($(current~page.north~west)+(.52\paperwidth,-.28\paperheight)$) + { + \color{white} + \sffamily + \fontsize{24pt}{36pt}\selectfont + \textsc{ \l_projlib_titlepage_title_tl }\\[1.5em] + \fontsize{18pt}{27pt}\selectfont + \l_projlib_titlepage_subtitle_tl + }; + \node[text~width=.3\paperwidth, text~height=.3\paperheight, align=flush~left] + at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) + { + \color{white} + \begin{flushright} + \fontsize{16pt}{24pt}\selectfont + \textsc{ \l_projlib_titlepage_author_tl }\\[1em] + \fontsize{12pt}{18pt}\selectfont + \l_projlib_titlepage_date_tl + \end{flushright} + }; \end{tikzpicture} } % diff --git a/macros/latex/contrib/projlib/README.md b/macros/latex/contrib/projlib/README.md index ee8924ccc6..3285bbd410 100644 --- a/macros/latex/contrib/projlib/README.md +++ b/macros/latex/contrib/projlib/README.md @@ -6,7 +6,7 @@ > **ProjLib** can be interpreted as "***Proj**ect **Lib**rary*" (in English), or as "***Proj**et **Lib**re*" (in French, meaning "*Free Project*"). -> **This bundle is dated 2022/07/03. Please note that the documentations are not yet up-to-date.** +> **This bundle is dated 2022/07/23. Please note that the documentations are not yet up-to-date.** ## Introduction diff --git a/macros/latex/contrib/runcode/README b/macros/latex/contrib/runcode/README index 8df8d236f2..4d3e095094 100644 --- a/macros/latex/contrib/runcode/README +++ b/macros/latex/contrib/runcode/README @@ -1,4 +1,4 @@ -LaTeX Package: runcode 2022/07/13 v1.4 +LaTeX Package: runcode 2022/07/23 v1.5 ---------------------------------------- The runcode package enables the execution of source code (e.g., R, Julia, Matlab, shell, Python, etc.) and embed the results in the pdf file diff --git a/macros/latex/contrib/runcode/runcode.pdf b/macros/latex/contrib/runcode/runcode.pdf index a13ff9b018..045989d6b5 100644 Binary files a/macros/latex/contrib/runcode/runcode.pdf and b/macros/latex/contrib/runcode/runcode.pdf differ diff --git a/macros/latex/contrib/runcode/runcode.sty b/macros/latex/contrib/runcode/runcode.sty index 626dc05aaa..1a44d5a5ea 100644 --- a/macros/latex/contrib/runcode/runcode.sty +++ b/macros/latex/contrib/runcode/runcode.sty @@ -112,8 +112,9 @@ \usepackage{morewrites} % allow more than 16 \write \usepackage[many]{tcolorbox} % to put boxes around text +\tcbset{colframe=blue!25,colback=blue!10} % default colors for box output \usepackage{xcolor} % for highlighting -\usepackage[utf8x]{inputenc} +\usepackage{inputenc} \usepackage{textgreek} \usepackage{filecontents} \usepackage{xifthen} @@ -123,6 +124,7 @@ % Use minted if it is loaded; otherwise use fvextra \ifminted \usepackage[cache=false]{minted} +\setminted{fontsize=\footnotesize,breaklines=true} % minted default \else \usepackage{fvextra} \fi @@ -236,9 +238,9 @@ \IfFileExists{\tmpname} { \ifstrequal{#2}{vbox} - {\begin{tcolorbox}[colframe=blue!25,colback=blue!10] + {\begin{tcolorbox} \ifminted\unskip - \inputminted[fontsize=\footnotesize,breaklines=true]{text}{\tmpname}\unskip + \inputminted{text}{\tmpname}\unskip \else\unskip \VerbatimInput[fontsize=\footnotesize,breaklines]{\tmpname}\unskip \fi @@ -281,9 +283,9 @@ \IfFileExists{\tmpname.tex} {\checkZeroBytes{\tmpname.tex}\unskip \ifstrequal{#3}{vbox} - {\begin{tcolorbox}[colframe=blue!25,colback=blue!10] + {\begin{tcolorbox} \ifminted\unskip - \inputminted[fontsize=\footnotesize,breaklines=true]{text}{\tmpname.tex}\unskip + \inputminted{text}{\tmpname.tex}\unskip \else\unskip \VerbatimInput[fontsize=\footnotesize,breaklines]{\tmpname.tex}\unskip \fi diff --git a/macros/latex/contrib/runcode/runcode.tex b/macros/latex/contrib/runcode/runcode.tex index cb9edfea0f..8c2892eb95 100644 --- a/macros/latex/contrib/runcode/runcode.tex +++ b/macros/latex/contrib/runcode/runcode.tex @@ -1,4 +1,4 @@ - % LaTeX Package: runcode v1.1 2021/04/17 + % LaTeX Package: runcode v1.5 2022/07/23 % % Copyright (C) 2021 by Haim Bar and HaiYing Wang % @@ -15,9 +15,9 @@ \documentclass{ltxdoc} \usepackage[hyphens]{url} %\usepackage{runcode} -\ProvidesPackage{runcode}[2022/07/18 runcode v1.4] +\ProvidesPackage{runcode}[2022/07/23 runcode v1.5] \begin{document} - \title{The \textsf{runcode} package\thanks{This document corresponds to \textsf{runcode}~v1.4, dated~2022/07/18.}} + \title{The \textsf{runcode} package\thanks{This document corresponds to \textsf{runcode}~v1.5, dated~2022/07/23.}} \author{Haim Bar and HaiYing Wang \\ \texttt{haim.bar@uconn.edu}, \texttt{haiying.wang@uconn.edu}} \maketitle @@ -166,6 +166,7 @@ Available options are: \section{Revisions} \begin{itemize} +\item v1.5, July 23, 2022: Removed the utf8x option when loading inputenc due to a conflict with hyperref. \item v1.4, July 18, 2022: Fixed a bug in the cache mode. \item v1.3, May 14, 2022: Removed the hard-coded minted options. \item v1.2, May 3, 2022: Added python options (server and batch). diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md index 60d0b4c460..127e8015f1 100644 --- a/macros/latex/contrib/siunitx/CHANGELOG.md +++ b/macros/latex/contrib/siunitx/CHANGELOG.md @@ -7,12 +7,17 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] -## [v3.1.4] - 2022-06-22 +## [v3.1.5] - 2022-07-23 + +### Fixed +- Rounding to figures with a trailing zero and non-zero integer part (see issue + [\#615](https://github.com/josephwright/siunitx/issues/615)) +## [v3.1.4] - 2022-06-22 ### Fixed - Spacing of `\arcminute` and `\arcsecond` in quantities (see issue - [\#6048(https://github.com/josephwright/siunitx/issues/608)) + [\#608](https://github.com/josephwright/siunitx/issues/608)) ## [v3.1.3] - 2022-06-07 @@ -1793,7 +1798,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ### Added - First public testing release (as `si`) -[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.1.4...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.1.5...HEAD +[v3.1.5]: https://github.com/josephwright/siunitx/compare/v3.1.4...v3.1.5 [v3.1.4]: https://github.com/josephwright/siunitx/compare/v3.1.3...v3.1.4 [v3.1.3]: https://github.com/josephwright/siunitx/compare/v3.1.2...v3.1.3 [v3.1.2]: https://github.com/josephwright/siunitx/compare/v3.1.1...v3.1.2 diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf index 533f78d1d2..91872b21de 100644 Binary files a/macros/latex/contrib/siunitx/siunitx-code.pdf and b/macros/latex/contrib/siunitx/siunitx-code.pdf differ diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx index 2f153d4686..ff97058d20 100644 --- a/macros/latex/contrib/siunitx/siunitx-number.dtx +++ b/macros/latex/contrib/siunitx/siunitx-number.dtx @@ -2660,8 +2660,17 @@ { \int_compare:nNnTF {#3} = 0 { - \@@_round_final_decimal:nnw - {#1} { 1 \@@_round_truncate:n {#2} } + \bool_lazy_or:nnTF + { \tl_if_blank_p:n {#1} } + { \int_compare_p:nNn {#1} = { 0 } } + { + \@@_round_final_decimal:nnw + {#1} { 1 \@@_round_truncate:n {#2} } + } + { + \@@_round_final_decimal:nnw + {#1} { 1 #2 } + } } { \@@_round_final:fn diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index 4217ff662f..2766ca5ca3 100644 --- a/macros/latex/contrib/siunitx/siunitx.dtx +++ b/macros/latex/contrib/siunitx/siunitx.dtx @@ -121,7 +121,7 @@ % % Identify the package and give the over all version information. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2022-06-22} {3.1.4} +\ProvidesExplPackage {siunitx} {2022-07-23} {3.1.5} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf index e6e98188c9..da03e0fdb8 100644 Binary files a/macros/latex/contrib/siunitx/siunitx.pdf and b/macros/latex/contrib/siunitx/siunitx.pdf differ diff --git a/macros/latex/contrib/textpos/LICENCE b/macros/latex/contrib/textpos/LICENCE index 2244313901..cd58edfc22 100644 --- a/macros/latex/contrib/textpos/LICENCE +++ b/macros/latex/contrib/textpos/LICENCE @@ -16,8 +16,8 @@ which the LaTeX kernel and the base LaTeX packages are distributed. You may use this license for any work of which you hold the copyright and which you wish to distribute. This license may be particularly -suitable if your work is TeX-related (such as a LaTeX package), but -it is written in such a way that you can use it even if your work is +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is unrelated to TeX. The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', @@ -44,11 +44,11 @@ In this license document the following terms are used: `Work' Any work being distributed under this License. - + `Derived Work' Any work that under any applicable law is derived from the Work. - `Modification' + `Modification' Any procedure that produces a Derived Work under any applicable law -- for example, the production of a file containing an original file associated with the Work or a significant portion of @@ -58,7 +58,7 @@ In this license document the following terms are used: `Modify' To apply any procedure that produces a Derived Work under any applicable law. - + `Distribution' Making copies of the Work available from one person to another, in whole or in part. Distribution includes (but is not limited to) @@ -79,16 +79,16 @@ In this license document the following terms are used: no such explicit nomination then it is the `Copyright Holder' under any applicable law. - `Base Interpreter' + `Base Interpreter' A program or process that is normally needed for running or - interpreting a part or the whole of the Work. + interpreting a part or the whole of the Work. A Base Interpreter may depend on external components but these are not considered part of the Base Interpreter provided that each external component clearly identifies itself whenever it is used interactively. Unless explicitly specified when applying the license to the Work, the only applicable Base Interpreter is a - `LaTeX-Format' or in the case of files belonging to the + `LaTeX-Format' or in the case of files belonging to the `LaTeX-format' a program implementing the `TeX language'. @@ -129,8 +129,8 @@ the Derived Work. distribute a Derived Work provided the following conditions are met for every component of the Work unless that component clearly states in the copyright notice that it is exempt from that condition. Only -the Current Maintainer is allowed to add such statements of exemption -to a component of the Work. +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. a. If a component of this Derived Work can be a direct replacement for a component of the Work when that component is used with the @@ -140,13 +140,13 @@ to a component of the Work. clearly and unambiguously identifies itself as a modified version of this component to the user when used interactively with that Base Interpreter. - + b. Every component of the Derived Work contains prominent notices detailing the nature of the changes to that component, or a prominent reference to another file that is distributed as part of the Derived Work and that contains a complete and accurate log of the changes. - + c. No information in the Derived Work implies that any persons, including (but not limited to) the authors of the original version of the Work, provide any support, including (but not limited to) @@ -156,7 +156,7 @@ to a component of the Work. d. You distribute at least one of the following with the Derived Work: - 1. A complete, unmodified copy of the Work; + 1. A complete, unmodified copy of the Work; if your distribution of a modified component is made by offering access to copy the modified component from a designated place, then offering equivalent access to copy @@ -183,15 +183,15 @@ format, where the Work or that Derived Work (in whole or in part) is then produced by applying some process to that format, does not relax or nullify any sections of this license as they pertain to the results of applying that process. - + 10. a. A Derived Work may be distributed under a different license provided that license itself honors the conditions listed in Clause 6 above, in regard to the Work, though it does not have to honor the rest of the conditions in this license. - + b. If a Derived Work is distributed under a different license, that Derived Work must provide sufficient documentation as part of - itself to allow each recipient of that Derived Work to honor the + itself to allow each recipient of that Derived Work to honor the restrictions in Clause 6 above, concerning changes from the Work. 11. This license places no restrictions on works that are unrelated to @@ -260,7 +260,7 @@ the Work through the following steps: a. If it is being maintained, then ask the Current Maintainer to update their communication data within one month. - + b. If the search is unsuccessful or no action to resume active maintenance is taken by the Current Maintainer, then announce within the pertinent community your intention to take over @@ -270,17 +270,17 @@ the Work through the following steps: 3a. If the Current Maintainer is reachable and agrees to pass maintenance of the Work to you, then this takes effect immediately upon announcement. - + b. If the Current Maintainer is not reachable and the Copyright Holder agrees that maintenance of the Work be passed to you, - then this takes effect immediately upon announcement. - + then this takes effect immediately upon announcement. + 4. If you make an `intention announcement' as described in 2b. above and after three months your intention is challenged neither by the Current Maintainer nor by the Copyright Holder nor by other people, then you may arrange for the Work to be changed so as to name you as the (new) Current Maintainer. - + 5. If the previously unreachable Current Maintainer becomes reachable once more within three months of a change completed under the terms of 3b) or 4), then that Current Maintainer must @@ -358,12 +358,12 @@ Here is an example of such a notice and statement: % conditions of the LaTeX Project Public License, either version 1.3 % of this license or (at your option) any later version. % The latest version of this license is in - % http://www.latex-project.org/lppl.txt + % https://www.latex-project.org/lppl.txt % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. - % + % % The Current Maintainer of this work is M. Y. Name. % % This work consists of the files pig.dtx and pig.ins @@ -377,7 +377,7 @@ referring to any `LaTeX-Format', and both `Copyright Holder' and `Current Maintainer' referring to the person `M. Y. Name'. If you do not want the Maintenance section of LPPL to apply to your -Work, change `maintained' above into `author-maintained'. +Work, change `maintained' above into `author-maintained'. However, we recommend that you use `maintained', as the Maintenance section was added in order to ensure that your Work remains useful to the community even when you can no longer maintain and support it @@ -407,10 +407,9 @@ Important Recommendations using a line such as: % This work consists of all files listed in manifest.txt. - + in that place. In the absence of an unequivocal list it might be impossible for the licensee to determine what is considered by you to comprise the Work and, in such a case, the licensee would be entitled to make reasonable conjectures as to which files comprise the Work. - diff --git a/macros/latex/contrib/textpos/README b/macros/latex/contrib/textpos/README index c5a09cef8a..ccaf7d223e 100644 --- a/macros/latex/contrib/textpos/README +++ b/macros/latex/contrib/textpos/README @@ -1,7 +1,7 @@ Textpos: absolute positioning of text on the LaTeX page ======================================================= -Version 1.10, 2020 September 26 +Version 1.10.1, 2022 July 23 This package facilitates placing boxes at absolute positions on the LaTeX page. There are several reasons why this might be useful, but @@ -14,9 +14,9 @@ to be placed on the page, and which specifies where it is to be placed. The environment is accompanied by various configuration commands. -Textpos has a canonical home page at . +Textpos has a canonical home page at . The CTAN URL for Textpos is . -The source is hosted at [code.nxg.name](https://code.nxg.name/nxg/tex/textpos). +The source is hosted [online](https://heptapod.host/nxg/textpos). For the change history, see textpos.html. @@ -25,7 +25,7 @@ Installation ------------ Download or find the file `textpos.sty`. Install `textpos.sty` somewhere -LaTeX will find it (see [the TeX FAQ](http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf)). +LaTeX will find it (see [the TeX FAQ](https://texfaq.org/FAQ-inst-wlcf)). This package requires the services of Martin Schroeder's package [everyshi][everyshi]. You will need to download this package from CTAN first. @@ -42,5 +42,5 @@ which is included in the file LICENCE. Norman Gray -[lppl]: http://www.latex-project.org/lppl.txt +[lppl]: https://www.latex-project.org/lppl.txt [everyshi]: https://www.ctan.org/pkg/everyshi diff --git a/macros/latex/contrib/textpos/VERSION- b/macros/latex/contrib/textpos/VERSION- new file mode 100644 index 0000000000..4dae2985b5 --- /dev/null +++ b/macros/latex/contrib/textpos/VERSION- @@ -0,0 +1 @@ +1.10.1 diff --git a/macros/latex/contrib/textpos/VERSION-1.10 b/macros/latex/contrib/textpos/VERSION-1.10 deleted file mode 100644 index 8414910cfa..0000000000 --- a/macros/latex/contrib/textpos/VERSION-1.10 +++ /dev/null @@ -1 +0,0 @@ -textpos-1.10, released 2020 September 26 diff --git a/macros/latex/contrib/textpos/examples/README.examples b/macros/latex/contrib/textpos/examples/README.examples index 16b23fb697..a08234e645 100644 --- a/macros/latex/contrib/textpos/examples/README.examples +++ b/macros/latex/contrib/textpos/examples/README.examples @@ -2,10 +2,12 @@ The t?.tex files in this directory are intended as regression tests, rather than strictly as examples. They nonetheless serve to illustrate some of what textpos can do. -Not all of them actually work, as regression tests, right now, but -this is because when comparing binary formats such as .dvi files, +The later test files explain within the file what they are supposed to +look like. The t*-correct.pdf are visually correct versions. + +These don't really work as regression tests right now. +This is because when comparing binary formats such as .dvi files, it's not always completely obvious what counts as a significant change. Any comments and suggestions would be welcome. Norman -2006 September 2 diff --git a/macros/latex/contrib/textpos/examples/t3.tex b/macros/latex/contrib/textpos/examples/t3.tex index 1768033b74..3ce54e2e39 100644 --- a/macros/latex/contrib/textpos/examples/t3.tex +++ b/macros/latex/contrib/textpos/examples/t3.tex @@ -1,3 +1,4 @@ +%%% Testing:interaction with fancybox %From Wybo@Servalys.Nl Fri Jun 28 14:28:41 2002 %From: Wybo Dekker %To: Norman@Astro.Gla.Ac.Uk diff --git a/macros/latex/contrib/textpos/examples/t7.tex b/macros/latex/contrib/textpos/examples/t7.tex index 6deceeff77..b6f89056d6 100644 --- a/macros/latex/contrib/textpos/examples/t7.tex +++ b/macros/latex/contrib/textpos/examples/t7.tex @@ -1,3 +1,4 @@ +%%% Testing:interaction with \newpage \documentclass{article} %\usepackage[showboxes]{textpos} diff --git a/macros/latex/contrib/textpos/examples/t9.tex b/macros/latex/contrib/textpos/examples/t9.tex index b86cf38892..fec9ccbce7 100644 --- a/macros/latex/contrib/textpos/examples/t9.tex +++ b/macros/latex/contrib/textpos/examples/t9.tex @@ -7,6 +7,8 @@ \TPHorizModule=1cm \TPVertModule=1cm +\usepackage{color} + \begin{document} Here is some text, which appears in the body of the page. @@ -57,11 +59,21 @@ This text should appear surrounded by a box, level with, but along from, `Text 2 \end{textblock} \newpage -\TPoptions{absolute=true} +\TPoptions{absolute=true,overlay=true} % the overlay option is ignored + +Page 3. Page 3. Page 3. Page 3. Page 3. Page 3. Page 3. Page 3. +Page 3. Page 3. Page 3. Page 3. Page 3. Page 3. Page 3. Page 3. -Page 3. \begin{textblock}{5}(0,0) This text appears at the extreme top-left of page three. \end{textblock} +\textblockcolour{yellow} +\begin{textblock}{5}(4,4.5) + This text appears at (4,5). It appears \emph{below} the text: that + is, the \texttt{overlay=true} option is currently ignored (this + might potentially change in future, but I've no current plans to + implement that). +\end{textblock} + \end{document} diff --git a/macros/latex/contrib/textpos/niepraschk-eso-pic.pdf b/macros/latex/contrib/textpos/niepraschk-eso-pic.pdf index 64b976a71d..f3817bb3d6 100644 Binary files a/macros/latex/contrib/textpos/niepraschk-eso-pic.pdf and b/macros/latex/contrib/textpos/niepraschk-eso-pic.pdf differ diff --git a/macros/latex/contrib/textpos/textpos.dtx b/macros/latex/contrib/textpos/textpos.dtx index 7b43236da4..b8a4fd10cf 100644 --- a/macros/latex/contrib/textpos/textpos.dtx +++ b/macros/latex/contrib/textpos/textpos.dtx @@ -9,7 +9,7 @@ %% conditions of the LaTeX Project Public License, either version 1.3 %% of this license or (at your option) any later version. %% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt +%% https://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. %% @@ -25,21 +25,19 @@ %% %% See the file LICENCE for a copy of the LPPL. %% -%% Mercurial ident: c834991c867a (1.10+1), 2020-09-26 17:44 +0100 +%% Mercurial ident: 1.10.1 (@VCSINFO) %% %<+package>\NeedsTeXFormat{LaTeX2e} -%<+package>\ProvidesPackage{textpos}[2020/09/26 v1.10] -%<+package>\typeout{Package: textpos 2020/09/26 1.10, absolute positioning of text on the page} +%<+package>\ProvidesPackage{textpos}[2022/07/23 v1.10.1] % %<*driver> \documentclass{ltxdoc} \title{Textpos: absolute positioning of text on the page} \author{Norman Gray\\(\texttt{https://nxg.me.uk})} -\date{Version 1.10, 2020 September 26\footnote{Mercurial ident: c834991c867a (1.10+1), 2020-09-26 17:44 +0100. -This software is copyright, 1999-2020 Norman Gray. +\date{Version 1.10.1, 2022 July 23\footnote{This software is copyright, 1999-2020 Norman Gray. It is released under the terms of the LaTeX Project Public License, either version 1.3 of this licence or (at your option) any later version. -The latest version of this license is at \texttt{http://www.latex-project.org/lppl.txt}.}} +The latest version of this license is at \texttt{https://www.latex-project.org/lppl.txt}.}} \newcommand\Lopt[1]{\textsf {\small [#1]}} \newcommand\file[1]{\texttt {#1}} \newcommand\Lcount[1]{\textsl{\small#1}} @@ -122,8 +120,8 @@ The latest version of this license is at \texttt{http://www.latex-project.org/lp % \url{https://www.ctan.org/pkg/everyshi}. % % The canonical CTAN URL for Textpos is \url{https://ctan.org/pkg/textpos}. -% Textpos has a home page at \url{http://purl.org/nxg/dist/textpos}. -% The source is held at \url{https://code.nxg.name/nxg/tex/textpos}. +% Textpos has a home page at \url{https://purl.org/nxg/dist/textpos}. +% The source is held at \url{https://heptapod.host/nxg/textpos}. % \iffalse and there is an issues list there, for bug reports.\fi % Code % contributions or fixes are welcome, but note that I feel that @@ -135,7 +133,7 @@ The latest version of this license is at \texttt{http://www.latex-project.org/lp % An article describing Textpos appeared in TUGboat in 2002: % Norman Gray, `Absolute Positioning with % Textpos', TUGboat \textbf{23} (3/4), pp341--4, 2002, available at -% \url{http://www.tug.org/TUGboat/tb23-3-4/tb75gray.pdf}. +% \url{https://www.tug.org/TUGboat/tb23-3-4/tb75gray.pdf}. % % \section{Description} % @@ -276,19 +274,24 @@ The latest version of this license is at \texttt{http://www.latex-project.org/lp % irritating, so you can turn them off with the \Lopt{quiet} option or % on with the \Lopt{verbose} option. The default is currently % \Lopt{verbose}, but this might change in future. +% \item[\Lopt{discardcontent}] This discards box content in a way +% which might make the |{textblock}| content compatible with TikZ. +% This behaviour is still somewhat experimental (since v1.9), should +% probably be used only rarely, and is more fully discussed in Sect.~\ref{s:absrelmode}. % \end{description} % % \subsection{Changing options on the fly} % \label{s:changing-options} % % \begin{macro}{\TPoptions} -% Each of the options mentioned in the previous section can be changed within the body of the text, +% Each of the options mentioned in the previous section can be changed +% within the body of the text\footnote{Available since v1.8}, % using the command |\TPoptions| with a comma-separated list of % keywords % \textit{$\langle$keyword$\rangle$}\texttt{=true} or % \textit{$\langle$keyword$\rangle$}\texttt{=false}. -% The recognised keywords are `absolute', `overlay', `verbose', -% `showboxes' and `showtext'. Thus the command +% The recognised keywords are `absolute', `verbose', +% `showboxes', `showtext', and `discardcontent'. Thus the command % \begin{quote} % |\TPoptions{absolute=false , showboxes = true }| % \end{quote} @@ -301,6 +304,12 @@ The latest version of this license is at \texttt{http://www.latex-project.org/lp % a document is to use absolute mode \emph{anywhere} within it, % however, it must be \emph{started} in absolute mode, with the % \Lopt{absolute} option to the |\usepackage| command. +% +% Note that (at least in v1.10), the presence or absence of the \texttt{overlay} +% package option takes effect at the time the package is loaded, and +% it cannot be changed thereafter. It's not impossible that this would +% change in future, but I have no current plans to implement that. +% % \end{macro} % % \subsection{Configuration commands, and variants} @@ -639,7 +648,7 @@ The latest version of this license is at \texttt{http://www.latex-project.org/lp % printing to a large-format postscript printer. % % I have a collection of suggestions for producing such posters at -% \url{http://purl.org/nxg/note/posters}. +% \url{https://purl.org/nxg/note/posters}. % % The text on a large poster will typically use a very large font. It % can be a hassle to create (or have dvips create) these fonts, and @@ -667,7 +676,7 @@ The latest version of this license is at \texttt{http://www.latex-project.org/lp % \TeX\ to respect the page-break. % % This happens for the same reason that, also quite surprisingly, two -% |\newline| commands in a row do not produce a blank page. +% |\newpage| commands in a row do not produce a blank page. % % \subsection{Absolute or relative mode?} % \label{s:absrelmode} @@ -698,9 +707,9 @@ The latest version of this license is at \texttt{http://www.latex-project.org/lp % |{textblock}| boxes, in a way which should make it compatible with % TikZ. This option is \emph{experimental} in Textpos v1.9, and may % change or disappear in future versions -- the author would be -% particular interested to get feedback regarding this +% particular interested in feedback regarding this % option.\footnote{My understanding of the problem here is derived from an excellent Stackoverflow answer -% by `JLDiaz' \url{http://tex.stackexchange.com/a/66853}, a Textpos +% by `JLDiaz' \url{https://tex.stackexchange.com/a/66853}, a Textpos % bugreport by Michael H\"upkes, and a discussion on the PGF bugparade % \url{https://github.com/pgf-tikz/pgf/issues/393}.} % @@ -740,16 +749,18 @@ The latest version of this license is at \texttt{http://www.latex-project.org/lp % for the initial report, and to Heiko Oberdiek for one of the % workarounds}. % +% In older versions of the beamer package,\marginpar{textpos \& +% beamer} there were at least some cases where beamer's background +% frame would overlay textpos material. It appears this is no longer +% the case (at least with beamer 3.59), and the packages are fully +% compatible. But if you see a problem here you should use the +% \Lopt{overlay} option to tell textpos to delay its +% work.\footnote{Thanks to Marius Arenz for the explanation here, and +% to Matthias Braun for reporting that the problem has gone away.} +% % \subsection{Other interactions} % \label{s:interactions} % -% The Beamer package's\marginpar{textpos \& beamer} -% background frame overlays the textpos material, unless the -% \Lopt{overlay} option is used to tell textpos to delay it. -% Therefore, you should use the \Lopt{overlay,absolute} -% options with Beamer.\footnote{Thanks to Marius Arenz for -% the explanation here.} -% % Gabriel Zachmann suggested having Textpos put a grid on the % page\marginpar{page grid}, so % that it is easier to work out \Lenv{textblock} coordinates. I have @@ -759,8 +770,8 @@ The latest version of this license is at \texttt{http://www.latex-project.org/lp % \texttt{eso-pic} package. There is a vivid example of using Textpos along with Rolf's % \texttt{eso-pic} package and the \texttt{calc} package on the % Textpos web pages, at -% \url{http://purl.org/nxg/dist/textpos}, and an example of how to -% create a grid with TikZ at \url{http://tex.stackexchange.com/a/85088/96}. +% \url{https://heptapod.host/nxg/textpos}, and an example of how to +% create a grid with TikZ at \url{https://tex.stackexchange.com/a/85088/96}. % % Finally, Robert Wenner reported a problem when using Textpos along % with the \texttt{texdraw} package\marginpar{textpos \& texdraw}, with @@ -791,6 +802,19 @@ The latest version of this license is at \texttt{http://www.latex-project.org/lp % \section{History} % \iffalse @RELEASENOTES@ \fi % \begin{description} +% \item[\textbf{Release 1.10.1, 2022 July 23}]\relax +% +% \begin{itemize} +% \item Mildly improve the handling of a missing |{color}| package. +% \item The |overlay| option isn't changeable in +% |\TPoptions|; attempting to do so now produces a +% warning. +% \item Various mild documentation improvements. +% \item The code repository has moved again, to +% heptapod\footnote{\url{https://heptapod.host/nxg/textpos}}. +% \end{itemize} +% +% % \item[\textbf{1.10, 2020 September 26}]\relax % % \begin{itemize} @@ -986,8 +1010,7 @@ The latest version of this license is at \texttt{http://www.latex-project.org/lp % \item[Version 1.1]\relax % Released in 1999 % -% \end{description} -% +% \end{description}% % \section{Credits} % % Olaf Maibaum, \texttt{Olaf.Maibaum@informatik.uni-oldenburg.de}, @@ -1158,11 +1181,17 @@ located at that point, rather than the top-left corner. % % This code aims to be compatible with both \LaTeXiie\ and \LaTeX3. This % means that it must use the \pstyle{everyshi} package in the \LaTeXiie\ -% case, and can use the corresponding built-in \LaTeX3 mechanism otherwise. -% For documentation on the latter, see the `ltshipout' package documentation. +% case, and must use the corresponding built-in \LaTeX3 mechanism otherwise. +% For documentation on the latter, see the `ltshipout' package +% documentation.\footnote{Thanks to Ulrike Fischer for detailed advice +% on the steps to take here} % % There are a couple of places in where we must switch behaviour. % Conditionalise them with a single switch. +% Note that we can't use the (apparently preferable) +% |\IfFormatAtLeastTF| command to do this test: we want to continue to +% work even when we're using a \LaTeX\ which is too old for this +% command to be defined. % \begin{macrocode} \newif\ifTP@Liii \@ifl@t@r\fmtversion{2020/10/01}\TP@Liiitrue\TP@Liiifalse @@ -1171,13 +1200,11 @@ located at that point, rather than the top-left corner. % % \subsection{Required Packages} % -% To manipulate |\box255| when using \LaTeXiie, -% this package needs the package -% \pstyle{everyshi}, which provides the command |\EveryShipout|. +% To manipulate |\box255| when using \LaTeXiie (and only in that case), +% this package needs the package \pstyle{everyshi}, +% which provides the command |\EveryShipout|. % \begin{macrocode} -\ifTP@Liii - % avoid everyshi package -\else +\ifTP@Liii\else \ifTP@abspos \RequirePackage{everyshi} \fi @@ -1188,14 +1215,21 @@ located at that point, rather than the top-left corner. % \subsection{Changing options within the text} % % Define a |\TPoptions| macro which supports constructions like |\TPoptions{verbose=true}|. +% \iffalse This was I think prompted by the SE question https://tex.stackexchange.com/questions/172902/ +% It was a comment to question +% https://tex.stackexchange.com/questions/248504/ that made me realise +% the overlay option wasn't changeable here. +% \fi % \begin{macrocode} \define@key{tp}{absolute}{\csname TP@abspos#1\endcsname} -\define@key{tp}{overlay}{\csname TP@overlay#1\endcsname} +\define@key{tp}{overlay}{\PackageWarning{textpos}{The overlay option + to TPoptions is not implemented and has been ignored}} \define@key{tp}{verbose}{\csname TP@chatter#1\endcsname} \define@key{tp}{showboxes}{\csname TPshowboxes#1\endcsname} \define@key{tp}{showtext}{\csname TP@showtext#1\endcsname} -\define@key{tp}{discardcontent}{\csname @tempswa#1\endcsname - \if@tempswa\TP@displayholdboxfalse\else\TP@displayholdboxtrue\fi} +\define@key{tp}{discardcontent}{% + \csname @tempswa#1\endcsname + \if@tempswa\TP@displayholdboxfalse\else\TP@displayholdboxtrue\fi} \def\TPoptions{\setkeys{tp}} % \end{macrocode} % @@ -1507,18 +1541,26 @@ located at that point, rather than the top-left corner. % here, since the document, or another package, may load the color % package later. Instead, define a command which will create dummy % no-op definitions for the package commands we use, and invoke this -% just before we invoke any of the color package's commands (see above -% for usage). +% at the beginning of the document, unless the color package is in +% fact loaded. +% Note that the |\@ifundefined{color}| test is redundant in the +% \LaTeX3 case; we retain it for the \LaTeXiie\ case. % \begin{macrocode} \gdef\TP@color[#1]#2{} -\def\TP@checkdummycolorpackage{% - \@ifundefined{color}% +\def\TP@dummycolorpackage{ + \@ifundefined{color} {\globaldefs=1 - \DeclareRobustCommand\color[2][]{}% - \def\color@block##1##2##3{}% - \globaldefs=0 }{}% - \global\let\TP@checkdummycolorpackage\relax % don't come here again + \DeclareRobustCommand\color[2][]{} + \def\color@block##1##2##3{} + \globaldefs=0 } + {} } +\ifTP@Liii + \AddToHook{env/document/before}{\TP@dummycolorpackage} + \AddToHook{file/color.sty/after}{\let\TP@dummycolorpackage\relax} +\else + \AtBeginDocument{\TP@dummycolorpackage} +\fi % \end{macrocode} % % Default the reference position, and support the command to override it. @@ -1611,7 +1653,6 @@ located at that point, rather than the top-left corner. % If we're showing boxes, then draw a rule here % \begin{macrocode} \ifTPshowboxes - \TP@checkdummycolorpackage {\color{\TP@rulecolour}\hrule height0pt depth \TPboxrulesize }% \vskip-\TPboxrulesize \fi @@ -1785,8 +1826,7 @@ located at that point, rather than the top-left corner. \setbox0=\vbox to 0pt{\vskip\@tempdimb \hbox to 0pt{\hskip\@tempdima \ifx\TP@blockcolour\@empty \else - {\TP@checkdummycolorpackage - \color{\TP@blockcolour}% + {\color{\TP@blockcolour}% \color@block{\wd\TP@textbox}{\ht\TP@textbox}{\dp\TP@textbox}% }% \fi @@ -1899,8 +1939,9 @@ located at that point, rather than the top-left corner. % \end{macrocode} % % Second, the \LaTeXiie\ case: use the macros provided by the \pstyle{everyshi} package. -% We set up the output routine with |\EveryShipout|, and . Respect the -% \Lopt{overlay} option by putting the |\TP@holdbox| contents +% We set up the output routine with |\EveryShipout|. +% +% Respect the \Lopt{overlay} option by putting the |\TP@holdbox| contents % \emph{after} the |\@cclv| contents, putting the latter into a size-0 % box (could this cause a problem with spacing? I don't think so, at % this stage). @@ -1928,9 +1969,12 @@ located at that point, rather than the top-left corner. }% \fi}% \fi - \fi + \fi % ifTP@Liii +% \end{macrocode} +% Finally, set the textblockorigin to the (default) upper-left corner of the paper. +% \begin{macrocode} \textblockorigin{0pt}{0pt}% -\fi +\fi % ifTP@abspos % \end{macrocode} % Done! % \begin{macrocode} diff --git a/macros/latex/contrib/textpos/textpos.html b/macros/latex/contrib/textpos/textpos.html index 9688d6417e..da123a2be6 100644 --- a/macros/latex/contrib/textpos/textpos.html +++ b/macros/latex/contrib/textpos/textpos.html @@ -5,7 +5,7 @@ Textpos - + @@ -17,16 +17,16 @@

The textpos home page is at -https://purl.org/nxg/dist/textpos; +https://purl.org/nxg/dist/textpos; please quote this URL rather than the URL it resolves to.

-

Version 1.10, 2020 September 26.

+

Version 1.10.1, 2022 July 23.

This package facilitates placing boxes at absolute positions on the LaTeX page. There are several reasons why this might be useful, but the main one (or at least my motivating one) is to help produce a large-format conference poster. Other applications include placing -material within, say, figures. Textpos is also discussed in the TeX FAQ +material within, say, figures. Textpos is also discussed in the TeX FAQ entry on absolute positioning.

This package provides a single environment, which contains the text @@ -35,10 +35,10 @@ page, and which specifies where it is to be placed. The environment is accompanied by various configuration commands. See the manual (pdf).

An article describing Textpos appeared in TUGboat in 2002: -Norman Gray, Absolute Positioning with Textpos, +Norman Gray, Absolute Positioning with Textpos, TUGboat 23 (3/4), pp341–4, 2002.

-

I have a collection of general advice about creating +

I have a collection of general advice about creating conference posters with LaTeX.

Rolf Niepraschk provided me with a wonderful demo @@ -48,12 +48,8 @@ of using Textpos along with his eso-pic package, and the calc package, to produce a grid which can help lay out material on the page.

-

The source is held -online

- - - - +

The source is held online, +where you can find an issues list

Installation and further information

@@ -70,7 +66,7 @@ Place this somewhere where TeX can find it. documentation. -

The textpos home page is at http://purl.org/nxg/dist/textpos, and there may be more up-to-date versions available there.

+

The textpos home page is at https://purl.org/nxg/dist/textpos, and there may be more up-to-date versions available there.

Textpos is also available on CTAN: macros/latex/contrib/textpos/

@@ -80,6 +76,19 @@ documentation.

History

+
Release 1.10.1, 2022 July 23
+
+
    +
  • Mildly improve the handling of a missing {color} package.
  • +
  • The overlay option isn't changeable in + \TPoptions; attempting to do so now produces a + warning.
  • +
  • Various mild documentation improvements.
  • +
  • The code repository has moved again, to + heptapod.
  • +
+
+
1.10, 2020 September 26
    @@ -280,7 +289,7 @@ make textpos compatible with the calc package
Norman Gray
-2020 September 26 +@REPODATE@
diff --git a/macros/latex/contrib/textpos/textpos.pdf b/macros/latex/contrib/textpos/textpos.pdf index ea21daab34..ee3f2469da 100644 Binary files a/macros/latex/contrib/textpos/textpos.pdf and b/macros/latex/contrib/textpos/textpos.pdf differ -- cgit v1.2.3