From 8fe610e311650f7a1333312c9735853005e3afa6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 6 May 2021 20:23:16 +0000 Subject: froufrou (6may21) git-svn-id: svn://tug.org/texlive/trunk@59103 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/froufrou/LICENSE | 2 +- Master/texmf-dist/doc/latex/froufrou/README.md | 2 +- Master/texmf-dist/doc/latex/froufrou/froufrou.pdf | Bin 42957 -> 66866 bytes .../texmf-dist/source/latex/froufrou/froufrou.dtx | 56 +++++++++++++-------- .../texmf-dist/source/latex/froufrou/froufrou.ins | 4 +- Master/texmf-dist/tex/latex/froufrou/froufrou.sty | 21 ++++---- 6 files changed, 51 insertions(+), 34 deletions(-) diff --git a/Master/texmf-dist/doc/latex/froufrou/LICENSE b/Master/texmf-dist/doc/latex/froufrou/LICENSE index efd0bb0166a..a953e0b7097 100644 --- a/Master/texmf-dist/doc/latex/froufrou/LICENSE +++ b/Master/texmf-dist/doc/latex/froufrou/LICENSE @@ -1,4 +1,4 @@ -Copyright 2020 Nelson Lago +Copyright 2020-2021 Nelson Lago This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license or (at diff --git a/Master/texmf-dist/doc/latex/froufrou/README.md b/Master/texmf-dist/doc/latex/froufrou/README.md index 3f5fa673437..66d015391a1 100644 --- a/Master/texmf-dist/doc/latex/froufrou/README.md +++ b/Master/texmf-dist/doc/latex/froufrou/README.md @@ -6,7 +6,7 @@ a new chapter or section. Code etc: -Copyright 2020 Nelson Lago +Copyright 2020-2021 Nelson Lago This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license or (at diff --git a/Master/texmf-dist/doc/latex/froufrou/froufrou.pdf b/Master/texmf-dist/doc/latex/froufrou/froufrou.pdf index c3c107acc56..f941844deab 100644 Binary files a/Master/texmf-dist/doc/latex/froufrou/froufrou.pdf and b/Master/texmf-dist/doc/latex/froufrou/froufrou.pdf differ diff --git a/Master/texmf-dist/source/latex/froufrou/froufrou.dtx b/Master/texmf-dist/source/latex/froufrou/froufrou.dtx index ba136ed6e39..4c027d8acfe 100644 --- a/Master/texmf-dist/source/latex/froufrou/froufrou.dtx +++ b/Master/texmf-dist/source/latex/froufrou/froufrou.dtx @@ -1,5 +1,5 @@ % \iffalse meta-comment -% Copyright 2020 Nelson Lago +% Copyright 2020-2021 Nelson Lago % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3c of this license or (at @@ -15,7 +15,7 @@ % \iffalse % %\NeedsTeXFormat{LaTeX2e}[2015/01/01] -%\ProvidesPackage{froufrou}[2021/04/22 1.3.0 Visual section separator] +%\ProvidesPackage{froufrou}[2021/05/06 1.4.0 Visual section separator] % %<*driver> @@ -35,6 +35,7 @@ } \usepackage{froufrou} +\usepackage{pgfornament} \usepackage{libertinus} \usepackage[scale=.85]{sourcecodepro} @@ -61,6 +62,9 @@ % \changes{v1.3.0}{2021/04/22}{More related packages} % \changes{v1.3.0}{2021/04/22}{Small doc improvements} % \changes{v1.3.0}{2021/04/22}{Add ``closing'' ornament} +% \changes{v1.4.0}{2021/05/06}{Add related package} +% \changes{v1.4.0}{2021/05/06}{Add \texttt{pgfornament} example} +% \changes{v1.4.0}{2021/05/06}{Make nested optional arguments work by using xparse} % % \GetFileInfo{froufrou.sty} % @@ -143,7 +147,19 @@ % Beyond the predefined ornaments, you may also use % \verb|\setfroufrou{SOMETHING}| or \verb|\froufrou[SOMETHING]| % to make \verb|SOMETHING| be the separator. However, please note -% that \verb|\usepackage[SOMETHING]{froufrou}| does \emph{not} work! +% that \verb|\usepackage[SOMETHING]{froufrou}| does \emph{not} +% work! An example using the \mbox{\verb|pgfornament|} package: +% +% \bgroup\footnotesize\vspace{\baselineskip} +% \noindent +% \verb|\froufrou[\pgfornament[height=.1cm]{87}\hspace{-2pt}\pgfornament[width=.5cm,|\\ +% \verb|ydelta=-10pt]{9}\hspace{-2pt}\pgfornament[symmetry=v,height=.1cm]{87}]|\par +% \vspace{\baselineskip}\egroup +% +% \noindent which produces +% +% \froufrou[\pgfornament[height=.1cm]{87}\hspace{-2pt}\pgfornament[width=.5cm, +% ydelta=-10pt]{9}\hspace{-2pt}\pgfornament[symmetry=v,height=.1cm]{87}] % % \section{See also} % @@ -151,15 +167,14 @@ % \item \url{http://tug.org/TUGboat/tb32-2/tb101glister.pdf} ; % % \item The \verb|pgfornament|, \verb|adforn|, \verb|fourier-orns|, -% \verb|marvosym|, \verb|typicons|, \verb|adfsymbols|, -% \verb|pifont|, and \verb|fontawesome| packages, which -% may aid in creating separators; +% \verb|marvosym|, \verb|typicons|, \verb|decorule|, +% \mbox{\verb|pifont|}, \verb|adfsymbols|, \verb|fontawesome|, +% and \verb|fontawesome5| packages, which may aid in creating +% separators; % -% \item The \verb|novel| class, which offers the somewhat similar -% \verb|\ChapterDeco| command; -% -% \item The \verb|memoir| class, which offers the somewhat similar -% \verb|\fancybreak| command; +% \item The \verb|novel| and \verb|memoir| classes, which offer +% the somewhat similar commands \verb|\ChapterDeco| and +% \verb|\fancybreak| respectively; % % \item The \verb|sectionbreak| package, similar to this one. % \end{itemize} @@ -172,6 +187,7 @@ \RequirePackage{etoolbox} \RequirePackage{expl3} +\RequirePackage{xparse} \RequirePackage{tikz} % .1\textwidth works well for one and two-column text. @@ -311,17 +327,12 @@ % The starred form means "indent the first line of the next paragraph" % (\if@afterindent is read by \@afterheading) -\newcommand{\froufrou}{% - \@ifstar{\@afterindenttrue\@realfroufrou}{\@afterindentfalse\@realfroufrou}% -} - -% For compatibility with older versions of this package -\newcommand\frufru{\froufrou} - -\newcommand{\@realfroufrou}[1][]{% +\NewDocumentCommand{\froufrou}{s O{}}{% % Make sure we left horizontal mode. \nopagebreak[4]\par + \IfBooleanTF{#1}{\@afterindenttrue}{\@afterindentfalse} + \nopagebreak[4]\@froufrouspacebefore\nopagebreak[4] % Start a new group to (1) reset \doublespacing, \parskip, and @@ -331,7 +342,7 @@ % for the ornament because font size changes in it should not % affect spacing either. \bgroup - \setfroufrou{#1}% + \setfroufrou{#2}% \normalsize \ifdefvoid{\setstretch}{}{\setstretch{\setspace@singlespace}}% normally 1 \setlength{\parskip}{0pt} @@ -355,6 +366,11 @@ \@afterheading } +% For compatibility with older versions of this package. +\NewDocumentCommand{\frufru}{s O{}}{% + \IfBooleanTF{#1}{\froufrou*[#2]}{\froufrou[#2]}% +} + \newcommand\@froufrouFixSpacingAfter{ % The next \par will add \parskip and \baselineskip. We want to % (1) eliminate \parskip so that spacing does not change if it diff --git a/Master/texmf-dist/source/latex/froufrou/froufrou.ins b/Master/texmf-dist/source/latex/froufrou/froufrou.ins index 8d5b250ad68..d366f1e5f6b 100644 --- a/Master/texmf-dist/source/latex/froufrou/froufrou.ins +++ b/Master/texmf-dist/source/latex/froufrou/froufrou.ins @@ -1,4 +1,4 @@ -%% Copyright 2020 Nelson Lago +%% Copyright 2020-2021 Nelson Lago %% %% This work may be distributed and/or modified under the conditions of the %% LaTeX Project Public License, either version 1.3c of this license or (at @@ -16,7 +16,7 @@ \usedir{tex/latex/froufrou} \preamble -Copyright 2020 Nelson Lago +Copyright 2020-2021 Nelson Lago This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license or (at diff --git a/Master/texmf-dist/tex/latex/froufrou/froufrou.sty b/Master/texmf-dist/tex/latex/froufrou/froufrou.sty index 537e1f0a60f..e5f386e9548 100644 --- a/Master/texmf-dist/tex/latex/froufrou/froufrou.sty +++ b/Master/texmf-dist/tex/latex/froufrou/froufrou.sty @@ -5,7 +5,7 @@ %% The original source files were: %% %% froufrou.dtx (with options: `package') -%% Copyright 2020 Nelson Lago +%% Copyright 2020-2021 Nelson Lago %% %% This work may be distributed and/or modified under the conditions of the %% LaTeX Project Public License, either version 1.3c of this license or (at @@ -18,10 +18,11 @@ %% The Current Maintainer of this work is Nelson Lago . %% \NeedsTeXFormat{LaTeX2e}[2015/01/01] -\ProvidesPackage{froufrou}[2021/04/22 1.3.0 Visual section separator] +\ProvidesPackage{froufrou}[2021/05/06 1.4.0 Visual section separator] \RequirePackage{etoolbox} \RequirePackage{expl3} +\RequirePackage{xparse} \RequirePackage{tikz} \RequirePackage{fourier-orns} @@ -152,16 +153,12 @@ \def\@froufrouspacebefore{\vskip 22pt plus 7pt minus 5pt} \def\@froufrouspaceafter{\@froufrouspacebefore} -\newcommand{\froufrou}{% - \@ifstar{\@afterindenttrue\@realfroufrou}{\@afterindentfalse\@realfroufrou}% -} - -\newcommand\frufru{\froufrou} - -\newcommand{\@realfroufrou}[1][]{% +\NewDocumentCommand{\froufrou}{s O{}}{% % Make sure we left horizontal mode. \nopagebreak[4]\par + \IfBooleanTF{#1}{\@afterindenttrue}{\@afterindentfalse} + \nopagebreak[4]\@froufrouspacebefore\nopagebreak[4] % Start a new group to (1) reset \doublespacing, \parskip, and @@ -171,7 +168,7 @@ % for the ornament because font size changes in it should not % affect spacing either. \bgroup - \setfroufrou{#1}% + \setfroufrou{#2}% \normalsize \ifdefvoid{\setstretch}{}{\setstretch{\setspace@singlespace}}% normally 1 \setlength{\parskip}{0pt} @@ -195,6 +192,10 @@ \@afterheading } +\NewDocumentCommand{\frufru}{s O{}}{% + \IfBooleanTF{#1}{\froufrou*[#2]}{\froufrou[#2]}% +} + \newcommand\@froufrouFixSpacingAfter{ % The next \par will add \parskip and \baselineskip. We want to % (1) eliminate \parskip so that spacing does not change if it -- cgit v1.2.3