summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/froufrou/froufrou.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/froufrou/froufrou.sty')
-rw-r--r--Master/texmf-dist/tex/latex/froufrou/froufrou.sty21
1 files changed, 11 insertions, 10 deletions
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 <lago@ime.usp.br>
+%% Copyright 2020-2021 Nelson Lago <lago@ime.usp.br>
%%
%% 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 <lago@ime.usp.br>.
%%
\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