From ae666f8146ba2e76dd6701d9bf5dddb72ffb32b0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 25 Feb 2021 22:06:49 +0000 Subject: skeldoc (25feb21) git-svn-id: svn://tug.org/texlive/trunk@57922 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/skeldoc/LICENSE | 2 +- Master/texmf-dist/doc/latex/skeldoc/skeldoc.pdf | Bin 217555 -> 219556 bytes Master/texmf-dist/doc/latex/skeldoc/skeldoc.tex | 19 ++++-- Master/texmf-dist/tex/latex/skeldoc/skeldoc.sty | 74 +++++++++++++++++++++++- 4 files changed, 86 insertions(+), 9 deletions(-) diff --git a/Master/texmf-dist/doc/latex/skeldoc/LICENSE b/Master/texmf-dist/doc/latex/skeldoc/LICENSE index eb75fde0e7d..23dcd5c2ee8 100644 --- a/Master/texmf-dist/doc/latex/skeldoc/LICENSE +++ b/Master/texmf-dist/doc/latex/skeldoc/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Magnus Lie Hetland +Copyright (c) 2021 Magnus Lie Hetland Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Master/texmf-dist/doc/latex/skeldoc/skeldoc.pdf b/Master/texmf-dist/doc/latex/skeldoc/skeldoc.pdf index 102bda1f88c..163d053f1e6 100644 Binary files a/Master/texmf-dist/doc/latex/skeldoc/skeldoc.pdf and b/Master/texmf-dist/doc/latex/skeldoc/skeldoc.pdf differ diff --git a/Master/texmf-dist/doc/latex/skeldoc/skeldoc.tex b/Master/texmf-dist/doc/latex/skeldoc/skeldoc.tex index ec9ad5c435d..196627486c4 100644 --- a/Master/texmf-dist/doc/latex/skeldoc/skeldoc.tex +++ b/Master/texmf-dist/doc/latex/skeldoc/skeldoc.tex @@ -1,4 +1,4 @@ -% Copyright (c) 2020 Magnus Lie Hetland +% Copyright (c) 2021 Magnus Lie Hetland % % Permission is hereby granted, free of charge, to any person obtaining a copy % of this software and associated documentation files (the "Software"), to deal @@ -124,13 +124,22 @@ configuration keys, please consult the source file, \texttt{skeldoc.sty}.} \skelnote{It is possible to add notes in arbitrary parts of a document with the \cs{skelnote} command. This could also be used as a simple to-do or -annotation mechanism.} +annotation mechanism. Note that \cs{skelnote} is designed so you can place it +before a paragraph or the like, and get the number positioned correctly. This +means it gobbles up any space that follows it. To avoid this, simply follow it +by an escaped space, for example, as in \texttt{\cs{skelnote}\braces{My +note}\cs{\char32}}.} Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy -eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam -voluptua. +eirmod tempor invidunt ut labore et dolore magna aliquyam erat~\skelref{Here I'm +referring to something non-existent, with \cs{skelref}, whose implicit key is +\texttt{width}.}, sed diam voluptua. \skelpar[2] At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd -gubergren, no sea takimata sanctus est. +gubergren, no sea takimata sanctus est~\skelcite{And here is a missing +bibliographic reference, with \cs{skelcite}, whose implicit key is +\texttt{width}. You can also control the left and right braces (or whatever text +you wish to surround the citation with) using the \texttt{left} and +\texttt{right} keys.}. \skelpar \skelitems{The \cs{skelenum} and \cs{skelitems} commands produce skeleton diff --git a/Master/texmf-dist/tex/latex/skeldoc/skeldoc.sty b/Master/texmf-dist/tex/latex/skeldoc/skeldoc.sty index 2938b545b79..4754716d028 100644 --- a/Master/texmf-dist/tex/latex/skeldoc/skeldoc.sty +++ b/Master/texmf-dist/tex/latex/skeldoc/skeldoc.sty @@ -1,4 +1,4 @@ -% Copyright (c) 2020 Magnus Lie Hetland +% Copyright (c) 2021 Magnus Lie Hetland % % Permission is hereby granted, free of charge, to any person obtaining a copy % of this software and associated documentation files (the "Software"), to deal @@ -18,8 +18,8 @@ % OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE % SOFTWARE. -\def \skelversion {0.1.1} -\def \skeldate {2021-01-03} +\def \skelversion {0.1.2} +\def \skeldate {2021-02-25} \RequirePackage{expl3} @@ -131,6 +131,22 @@ line-width .tl_set:N = \l_skel_line_width_default_tl , line-width .initial:n = \l_skel_short_width_tl , + %% Defaults for \skelref + + ref-width .tl_set:N = \l_skel_ref_width_default_tl , + ref-width .initial:n = 1em , + + %% Defaults for \skelcite + + cite-width .tl_set:N = \l_skel_cite_width_default_tl , + cite-width .initial:n = .75em , + + cite-left .tl_set:N = \l_skel_cite_left_default_tl , + cite-left .initial:n = [\kern1pt, + + cite-right .tl_set:N = \l_skel_cite_right_default_tl , + cite-right .initial:n = \kern1pt], + %% Defaults for \skelpar par-lines .int_set:N = \l_skel_par_lines_default_int , @@ -277,6 +293,58 @@ } +%% skelref %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\skel_defaults:nnn { skelref } { \l_skel_ref_width_tl } { + + width .tl_set:N = \l_skel_ref_width_tl , + width .initial:n = \l_skel_ref_width_default_tl , + +} +\NewDocumentCommand \skelref { +O{} +g } { + + \group_begin: + + \skel_args:nn { skelref } { #1 } + + \IfValueT { #2 } { \skelnote { #2 } } + + \skel_line:n { \l_skel_ref_width_tl } + + \group_end: + +} + +%% skelcite %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\skel_defaults:nnn { skelcite } { \l_skel_cite_width_tl } { + + width .tl_set:N = \l_skel_cite_width_tl , + width .initial:n = \l_skel_cite_width_default_tl , + + left .tl_set:N = \l_skel_cite_left_tl , + left .initial:n = \l_skel_cite_left_default_tl , + + right .tl_set:N = \l_skel_cite_right_tl , + right .initial:n = \l_skel_cite_right_default_tl , + +} +\NewDocumentCommand \skelcite { +O{} +g } { + + \group_begin: + + \skel_args:nn { skelcite } { #1 } + + \IfValueT { #2 } { \skelnote { #2 } } + + \l_skel_cite_left_tl + \skel_line:n { \l_skel_cite_width_tl } + \l_skel_cite_right_tl + + \group_end: + +} + %% skelpar %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \int_new:N \l_skel_par_lines_int -- cgit v1.2.3