From 6adddf02dae34e844d24fd9aeb36946e35f9b353 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Oct 2020 21:45:46 +0000 Subject: denisbdoc (14oct20) git-svn-id: svn://tug.org/texlive/trunk@56664 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/denisbdoc/README.md | 6 +- .../source/latex/denisbdoc/denisbdoc.dtx | 425 ++++++++++++--------- .../texmf-dist/tex/latex/denisbdoc/denisbdoc.sty | 363 ++++++++++-------- 3 files changed, 435 insertions(+), 359 deletions(-) diff --git a/Master/texmf-dist/doc/latex/denisbdoc/README.md b/Master/texmf-dist/doc/latex/denisbdoc/README.md index 7eb3cbb01a0..4c41602027a 100644 --- a/Master/texmf-dist/doc/latex/denisbdoc/README.md +++ b/Master/texmf-dist/doc/latex/denisbdoc/README.md @@ -1,8 +1,8 @@ -denisbdoc - A personal package for documenting classes and packages, v. 0.9 -=========================================================================== +denisbdoc - A personal package for documenting classes and packages, v. 0.9.1 +============================================================================= **The sole purpose of this (quick 'n dirty) `denisbdoc` package is for -documenting the classes written by its author (Denis Bitouzé).** +documenting the classes written by their author (Denis Bitouzé).** The class is supplied in `.dtx` format. If you want to unpack the `.dtx` yourself, running: diff --git a/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx b/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx index a1f0bf4b18c..af502881fe8 100644 --- a/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx +++ b/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx @@ -3,11 +3,11 @@ \iffalse % %<*readme> -denisbdoc - A personal package for documenting classes and packages, v. 0.9 -=========================================================================== +denisbdoc - A personal package for documenting classes and packages, v. 0.9.1 +============================================================================= **The sole purpose of this (quick 'n dirty) `denisbdoc` package is for -documenting the classes written by its author (Denis Bitouzé).** +documenting the classes written by their author (Denis Bitouzé).** The class is supplied in `.dtx` format. If you want to unpack the `.dtx` yourself, running: @@ -31,7 +31,7 @@ This package is currently not documented. \preamble ----------------------------------------------------------------------------- denisbdoc --- A personal dirty package for documenting personal classes, - version 0.9 + version 0.9.1 Maintained by Denis Bitouzé E-mail: denis.bitouze@univ-littoral.fr @@ -125,6 +125,7 @@ This work consists of the file denisbdoc.dtx %\changes{v0.7}{2017/01/01}{Seventh CTAN version} %\changes{v0.8}{2020/03/27}{Eighth CTAN version} %\changes{v0.9}{2020/05/31}{Nineth CTAN version} +%\changes{v0.9.1}{2020/10/14}{Further CTAN version} % %\begin{abstract} % ... @@ -195,7 +196,7 @@ This work consists of the file denisbdoc.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {denisbdoc} {2020/05/31} {0.9} +\ProvidesExplPackage {denisbdoc} {2020/10/14} {0.9.1} {A personal package for documenting packages} % \end{macrocode} % @@ -242,9 +243,16 @@ This work consists of the file denisbdoc.dtx % \begin{macrocode} \sys_if_engine_pdftex:TF { - \RequirePackage{cmap} + % \RequirePackage{cmap} \RequirePackage[T1]{fontenc} \RequirePackage[utf8]{inputenc} +% \end{macrocode} +% +% In order to get rid of the warning "PDF inclusion: multiple pdfs with page +% group included in a single page" (see +% \url{http://tex.stackexchange.com/q/183149/18401}). +% \begin{macrocode} + \pdfsuppresswarningpagegroup=1 }{ \RequirePackage{fontspec} } @@ -409,7 +417,6 @@ This work consists of the file denisbdoc.dtx }% \@ifpackageloaded{glossaries}{% }{% - % \RequirePackage{glossaries}% \RequirePackage[xindy,hyperfirst=false,toc=false]{glossaries-extra}% \makeglossaries% \newglossaryentry{zip}{% @@ -422,7 +429,7 @@ This work consists of the file denisbdoc.dtx text={zip}% }% \setglossarystyle{indexhypergroup}% - \setabbreviationstyle[acronym]{long-short-sc}% + \setabbreviationstyle{long-short-sc}% \newcommand*{\formatfont}[1]{\textsc{#1}}% \glssetcategoryattribute{format}{glossnamefont}{formatfont}% \glssetcategoryattribute{format}{font}{formatfont}% @@ -460,7 +467,10 @@ This work consists of the file denisbdoc.dtx % \end{macrocode} % % \begin{macrocode} -\renewcommand{\acrpluralsuffix}{} +\@ifpackageloaded{glossaries-extra}{% + \renewcommand*{\glsxtrabbrvpluralsuffix}{} +}{% +} % \end{macrocode} % % % Some hacks to avoid issues of \pkg{hypdoc} reported by me at @@ -718,30 +728,30 @@ This work consists of the file denisbdoc.dtx }{}{\aaa}% % \end{macrocode} % -% We create a boolean which tests if the letter in the navigation bar is the 1st -% one or not (in the latter case, a newline is added). -% \begin{macrocode} - \newif\if@DBD@no@first@letter@ - \@DBD@no@first@letter@false -% \end{macrocode} -% % \begin{macrocode} \newcommand*{\indexheading}[2]{% \hypertarget{#2:#1}{\textbf{#1}}% \protected@write\@auxout{}{\string\DBD@indexgroup{#1}{#2}}% } +% \end{macrocode} +% +% We create a boolean which tests whether the letter in the navigation bar is +% the 1st one or not (in the latter case, a newline is added). +% \begin{macrocode} +\newtoggle{@DBD@no@first@letter} \newcommand*{\DBD@indexgroup}[2]{% \csgappto{DBD@indexnavigation@#2}{% - \if@DBD@no@first@letter@ - \,\textbar\,% - % \\ - \else - \noindent - \@DBD@no@first@letter@true - \fi + \iftoggle{@DBD@no@first@letter}{% + \,\textbar\,% + % \\ + }{% + \toggletrue{@DBD@no@first@letter}% + \noindent% + }% \hyperlink{#2:#1}{\textbf{#1}}% }% }% +\fi % \end{macrocode} % % \begin{macrocode} @@ -1072,7 +1082,7 @@ This work consists of the file denisbdoc.dtx {% % Séquences de contrôles (communément appelées commandes ou macros) moretexcs={% - tcbset,tcbuselibrary% + tcbset,tcbuselibrary,tcbsetforeverylayer% },% % Mots-clés de niveau 1 : arguments optionnels morekeywords={% @@ -1083,8 +1093,9 @@ This work consists of the file denisbdoc.dtx },% % Mots-clés de niveau 3 : arguments optionnels clés dans clé=valeur morekeywords=[3]{% - lightgray,red!50!white% + lightgray,red!50!white,autoparskip,beforeafter,skip,balanced% },% + alsoletter={ \ },% sensitive,% }[keywords,tex,comments]% % @@ -1311,7 +1322,7 @@ This work consists of the file denisbdoc.dtx % \begin{macrocode} \lstdefinelanguage[studentreport]{TeX}[LaTeX]{TeX}{% moretexcs={% Control sequences' names - reportsetup,daterange,professionaladvisor,academicadvisor,companylogo% + reportsetup,daterange,companytutor,academictutor,companylogo% },% % Mandatory arguments (other than environments' names) morekeywords={% @@ -1320,11 +1331,11 @@ This work consists of the file denisbdoc.dtx },% morekeywords=[2]{% Keys of key-value lists institute,subinstitute,subsubinstitute,year,10pt,11pt,12pt,internship,project,layout,% - strings,pretitle,company,advisor,advisors,before~start~date,before~end~date,date,% - logos,logosheights,,% + strings,pretitle,company,tutor,tutors,before~start~date,before~end~date,date,% + logos,logosheights,keywords,subject,% },% morekeywords=[3]{% Values of key-value lists - ulco,iutlco,gte,gim,% + ulco,iutlco,gtelco,gimlco,% },% alsoletter={!-*1234560}% }% @@ -1410,154 +1421,6 @@ This work consists of the file denisbdoc.dtx % % prebreak={\c_space_tl\Righttorque}, % % postbreak={\c_space_tl\Lefttorque} % }% -\lstdefinestyle{pre-dbtex}{% - escapechar=", - language=[LaTeX]TeX, - alsolanguage=[extLaTeX]TeX, - % alsolanguage=[glossaries]TeX, - % alsolanguage=[biblatex]TeX, - alsolanguage=[csquotes]TeX, - % alsolanguage=[tcolorbox]TeX, - % alsolanguage=[listings]TeX, - % alsolanguage=[xcolor]TeX, - % alsolanguage=[hyperref]TeX, - texcsstyle=*\color{texcs}, - breaklines=true, - basicstyle=\normalfont\ttfamily, - commentstyle=\color{comment}\itshape, - directivestyle={\color{directive}}, - keywordstyle={\color{red}}, - keywordstyle={[1]\color{environment}}, - keywordstyle={[2]\color{key}}, - keywordstyle={[3]\color{value}}, - keywordstyle={[4]\color{keyword4}}, - keywordstyle={[5]\color{keyword5}}, - moredelim=*[s][\color{math}\ttfamily]{\\[}{\\]}, - moredelim=*[s][\color{math}\ttfamily]{$}{$}, - stringstyle=\color{string}, - columns=flexible, - keepspaces, - numberstyle=\small, - inputencoding=utf8/latin1, - aboveskip=\c_@@_listings_aboveskip_skip, - belowskip=\c_@@_listings_belowskip_skip -}% -\bool_if:nT {\g_@@_yad_bool} {% - \lstdefinestyle{dbtex}{% - style=pre-dbtex,% - alsolanguage=[yad]TeX,% - alsolanguage=[colophon]TeX,% - moretexcs={printbibliography,autocite},% - morekeywords=[2]{% - colback,refsegment% - },% - morekeywords=[2]{% - red,white% - },% - }% -} -\bool_if:nT {\g_@@_gzt_bool} {% - \lstdefinestyle{dbtex}{% - style=pre-dbtex,% - alsolanguage=[gzt]TeX,% - }% -} -\bool_if:nT {\g_@@_nwejm_bool} {% - \lstdefinestyle{dbtex}{% - style=pre-dbtex,% - alsolanguage=[nwejm]TeX,% - }% -} -\bool_if:nT {\g_@@_studentreport_bool} {% - \lstdefinestyle{dbtex}{% - style=pre-dbtex,% - alsolanguage=[studentreport]TeX,% - }% -} -\lstset{style=dbtex} -\sys_if_engine_pdftex:TF -{ - \ExplSyntaxOff - \lstMakeShortInline[style=dbtex]| - \ExplSyntaxOn -}{ - \lstMakeShortInline[style=dbtex]× -} -% \end{macrocode} -% -% \begin{macrocode} -\tcbset{dbtcb/.style={% - breakable, - fonttitle=\bfseries, - enlarge~top~by=1mm, - separator~sign~dash, - label~separator=-, - before~title={% - \hypersetup{hidelinks}% - \tcbset{% - color~definition=white, - color~hyperlink=white, - }% - }% - }% -}% -% -\tcbset{% - doc~head={% - % boxsep=4pt,arc=4pt,boxrule=0.6pt,% - % frame~style=fill,% - % colframe=red!50!black,% - interior~style={% - fill,% - color=yellow!10!white,% - }% - }% -} -\tcbset{% - /tcb/doclang/environment~content=contenu~de~l'environnement, - /tcb/doclang/color=~(couleur), - /tcb/doclang/colors=Couleurs, - /tcb/doclang/environments=Environnements, - /tcb/doclang/keys=Clés, - /tcb/doclang/values=Valeurs, - /tcb/doclang/pageshort=p., - /tcb/documentation~listing~style=dbtex, - /tcb/color~command=texcs, - /tcb/color~environment=environment, - /tcb/color~key=key, - /tcb/color~value=value, - % index~format=pgfchapter, - index~format=off, - index~colorize, - index~annotate=false, - enhanced, - listing~style=dbtex, - every~box/.style={documentation~listing~style=dbtex}, -% index~actual={}, -% doc~left~indent=-15mm, -% doc~right~indent=-15mm+2em - codes/.style={% - listing~only, - enlarge~top~by=\medskipamount, - colframe=ExampleFrame, - colback=ExampleBack, - fonttitle=\bfseries, - fontupper=\small, - split=0.5, - enhanced, - breakable, - listing~style=dbtex, - }% -}% -\tcbset{samples/.style={% - codes, - % listing~options={rangebeginprefix=\\,rangeendsuffix=\}} - }% -}% -\renewcommand*{\tcbdocnew}[1]{\scriptsize\sffamily\textcolor{green!50!black}{\bfseries -Nouv.~:}~#1} -\renewcommand*{\tcbdocupdated}[1]{\scriptsize\sffamily\textcolor{blue!75!black}{\bfseries -\textsc{m.-à-j.}~:}~#1} % \end{macrocode} % % Suppression du gras dans la commande ×\docAuxCommand× : @@ -1743,7 +1606,7 @@ Nouv.~:}~#1} % % This saves the url with all characters catcode other: % \begin{macrocode} -\tl_const:Nx \c_@@_standard_url_tl { \tl_to_str:n { http://ctan.org/pkg/ } } +\tl_const:Nx \c_@@_standard_url_tl { \tl_to_str:n { https://ctan.org/pkg/ } } % \end{macrocode} % Separate formatting: % #1: package or class name @@ -2189,13 +2052,6 @@ Nouv.~:}~#1} } % \end{macrocode} % -% In order to get rid of the warning "PDF inclusion: multiple pdfs with page -% group included in a single page" (see -% \url{http://tex.stackexchange.com/q/183149/18401}). -% \begin{macrocode} -\pdfsuppresswarningpagegroup=1 -% \end{macrocode} -% % We want to make the angle brackets generated by ×\meta× to be copied and % pasted as they are, and not replaced by "h" and "i" % (cf. \url{https://tex.stackexchange.com/q/18146/18401}). @@ -2229,6 +2085,12 @@ Nouv.~:}~#1} drop~lifted~shadow, #1% } +\NewTCBListing{preamblecode*}{ !O{} }{% + codes,% + enlarge~top~by=\c_zero_dim, + drop~lifted~shadow, + #1% +} \NewTCBListing{bodycode}{ !O{} }{% codes,% #1% @@ -2294,13 +2156,11 @@ Nouv.~:}~#1} colframe=red!75!black, dbtcb }{wa} -% \newtcbtheorem[list~inside=dbexamplelist,number~within=\g_@@_number_within_tl,crefname={exemple}{exemples}]{dbexample}{Exemple}{% colback=lime!5!white, colframe=lime!75!black, - dbtcb + dbtcb, }{ex} -% \newtcbtheorem[list~inside=dbremarklist,number~within=\g_@@_number_within_tl,crefname={remarque}{remarques}]{dbremark}{Remarque}{% colback=cyan!5!white, colframe=cyan!75!black, @@ -2309,7 +2169,7 @@ Nouv.~:}~#1} \newtcbtheorem[list~inside=dbfaqlist,number~within=\g_@@_number_within_tl,crefname={question}{questions}]{dbfaq}{Question}{% colback=lightgray!5!white, colframe=lightgray!75!black, - fontupper=\itshape, + % fontupper=\itshape, dbtcb }{faq} \newtcbtheorem[list~inside=dbtabularlist,number~within=\g_@@_number_within_tl,crefname={tableau}{tableaux}]{dbtab}{Tableau}{% @@ -2488,7 +2348,6 @@ Nouv.~:}~#1} % \end{macrocode} % \end{macro} % \end{macro} -% \end{macro} % % \subsection{\Class{nwejm}} % @@ -2524,8 +2383,194 @@ Nouv.~:}~#1} % \end{macrocode} % \end{macro} % \end{macro} +% +% \subsection{\Class{studentreport}} +% +% \begin{macrocode} +\tl_const:Nn \c_@@_studentreport_class_name_tl {studentreport} +% \end{macrocode} +% +% \begin{macro}{\studentreportcl} +% \begin{macrocode} +\ProvideDocumentCommand \studentreportcl { } +{% + \Class{\c_@@_studentreport_class_name_tl} +} +\NewDocumentCommand \studentreportauthor { } +{% + \class[\c_@@_standard_url_tl\c_@@_studentreport_class_name_tl]{\c_@@_studentreportauthor_class_name_tl} +} +\NewDocumentCommand \studentreportauthorcl { } +{% + \Class[\c_@@_standard_url_tl\c_@@_studentreport_class_name_tl]{\c_@@_studentreportauthor_class_name_tl} +} +% \end{macrocode} % \end{macro} % +% \begin{macrocode} +\lstdefinestyle{pre-dbtex}{% + escapechar=",%" + language=[LaTeX]TeX, + alsolanguage=[extLaTeX]TeX, + % alsolanguage=[glossaries]TeX, + % alsolanguage=[biblatex]TeX, + alsolanguage=[csquotes]TeX, + % alsolanguage=[tcolorbox]TeX, + % alsolanguage=[listings]TeX, + % alsolanguage=[xcolor]TeX, + % alsolanguage=[hyperref]TeX, + texcsstyle=*\color{texcs}, + breaklines=true, + basicstyle=\normalfont\ttfamily, + commentstyle=\color{comment}\itshape, + directivestyle={\color{directive}}, + keywordstyle={\color{red}}, + keywordstyle={[1]\color{environment}}, + keywordstyle={[2]\color{key}}, + keywordstyle={[3]\color{value}}, + keywordstyle={[4]\color{keyword4}}, + keywordstyle={[5]\color{keyword5}}, + moredelim=*[s][\color{math}\ttfamily]{\\[}{\\]}, + moredelim=*[s][\color{math}\ttfamily]{$}{$}, + stringstyle=\color{string}, + columns=flexible, + keepspaces, + numberstyle=\small, + inputencoding=utf8/latin1, + aboveskip=\c_@@_listings_aboveskip_skip, + belowskip=\c_@@_listings_belowskip_skip +}% +% \end{macrocode} +% +% \begin{macrocode} +\tl_gclear:N \g_tmpa_tl +\bool_if:nT {\g_@@_yad_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[yad]TeX,% + alsolanguage=[colophon]TeX,% + moretexcs={printbibliography,autocite},% + morekeywords=[2]{% + colback,refsegment% + },% + morekeywords=[2]{% + red,white% + },% + }% + \tl_gset:Nx \g_tmpa_tl {\c_@@_yat_class_name_tl} +} +\bool_if:nT {\g_@@_gzt_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[gzt]TeX,% + }% + \tl_gset:Nx \g_tmpa_tl {\c_@@_gzt_class_name_tl} +} +\bool_if:nT {\g_@@_nwejm_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[nwejm]TeX,% + }% + \tl_gset:Nx \g_tmpa_tl {\c_@@_nwejm_class_name_tl} +} +\bool_if:nT {\g_@@_studentreport_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[studentreport]TeX,% + }% + \tl_gset:Nx \g_tmpa_tl {\c_@@_studentreport_class_name_tl} +} +\NewDocumentCommand{\currentclass}{}{\g_tmpa_tl} +\NewExpandableDocumentCommand{\currenturl}{}{\c_@@_standard_url_tl\g_tmpa_tl} +\NewDocumentCommand{\thisclass}{}{\class{\g_tmpa_tl}} +\NewDocumentCommand{\Thisclass}{}{\Class{\g_tmpa_tl}} +% \end{macrocode} +% +% \begin{macrocode} +\tcbset{dbtcb/.style={% + breakable, + fonttitle=\bfseries, + enlarge~top~by=1mm, + separator~sign~dash, + label~separator=-, + before~title={% + \hypersetup{hidelinks}% + \tcbset{% + color~definition=white, + color~hyperlink=white, + }% + }% + }% +}% +% +\tcbset{% + doc~head={% + % boxsep=4pt,arc=4pt,boxrule=0.6pt,% + % frame~style=fill,% + % colframe=red!50!black,% + interior~style={% + fill,% + color=yellow!10!white,% + }% + }% +} +\tcbset{% + /tcb/doclang/environment~content=contenu~de~l'environnement, + /tcb/doclang/color=~(couleur), + /tcb/doclang/colors=Couleurs, + /tcb/doclang/environments=Environnements, + /tcb/doclang/keys=Clés, + /tcb/doclang/values=Valeurs, + /tcb/doclang/pageshort=p., + /tcb/documentation~listing~style=dbtex, + /tcb/color~command=texcs, + /tcb/color~environment=environment, + /tcb/color~key=key, + /tcb/color~value=value, + % index~format=pgfchapter, + index~format=off, + index~colorize, + index~annotate=false, + enhanced, + listing~style=dbtex, + every~box/.style={documentation~listing~style=dbtex}, +% index~actual={}, +% doc~left~indent=-15mm, +% doc~right~indent=-15mm+2em + codes/.style={% + listing~only, + enlarge~top~by=\medskipamount, + colframe=ExampleFrame, + colback=ExampleBack, + fonttitle=\bfseries, + fontupper=\small, + split=0.5, + enhanced, + breakable, + listing~style=dbtex, + }% +}% +\tcbset{samples/.style={% + codes, + % listing~options={rangebeginprefix=\\,rangeendsuffix=\}} + }% +}% +\renewcommand*{\tcbdocnew}[1]{\scriptsize\sffamily\textcolor{green!50!black}{\bfseries +Nouv.~:}~#1} +\renewcommand*{\tcbdocupdated}[1]{\scriptsize\sffamily\textcolor{blue!75!black}{\bfseries +\textsc{m.-à-j.}~:}~#1} +% +\lstset{style=dbtex} +\sys_if_engine_pdftex:TF +{ + \ExplSyntaxOff + \lstMakeShortInline[style=dbtex]| + \ExplSyntaxOn +}{ + \lstMakeShortInline[style=dbtex]× +} +% \end{macrocode} +% % We PDFdisable some commands in order to avoid troubles in bookmarks. % \begin{macrocode} \pdfstringdefDisableCommands{% diff --git a/Master/texmf-dist/tex/latex/denisbdoc/denisbdoc.sty b/Master/texmf-dist/tex/latex/denisbdoc/denisbdoc.sty index aa81a07ecbb..6236344c85d 100644 --- a/Master/texmf-dist/tex/latex/denisbdoc/denisbdoc.sty +++ b/Master/texmf-dist/tex/latex/denisbdoc/denisbdoc.sty @@ -7,7 +7,7 @@ %% denisbdoc.dtx (with options: `package') %% ----------------------------------------------------------------------------- %% denisbdoc --- A personal dirty package for documenting personal classes, -%% version 0.9 +%% version 0.9.1 %% %% Maintained by Denis Bitouzé %% E-mail: denis.bitouze@univ-littoral.fr @@ -16,7 +16,7 @@ %% ----------------------------------------------------------------------------- %% \RequirePackage{expl3,l3keys2e,xparse} -\ProvidesExplPackage {denisbdoc} {2020/05/31} {0.9} +\ProvidesExplPackage {denisbdoc} {2020/10/14} {0.9.1} {A personal package for documenting packages} \@ifpackagelater { expl3 } { 2012/11/21 } { } @@ -41,9 +41,10 @@ \PassOptionsToPackage{obeyspaces}{url} \sys_if_engine_pdftex:TF { - \RequirePackage{cmap} + % \RequirePackage{cmap} \RequirePackage[T1]{fontenc} \RequirePackage[utf8]{inputenc} + \pdfsuppresswarningpagegroup=1 }{ \RequirePackage{fontspec} } @@ -158,7 +159,6 @@ }% \@ifpackageloaded{glossaries}{% }{% - % \RequirePackage{glossaries}% \RequirePackage[xindy,hyperfirst=false,toc=false]{glossaries-extra}% \makeglossaries% \newglossaryentry{zip}{% @@ -171,7 +171,7 @@ text={zip}% }% \setglossarystyle{indexhypergroup}% - \setabbreviationstyle[acronym]{long-short-sc}% + \setabbreviationstyle{long-short-sc}% \newcommand*{\formatfont}[1]{\textsc{#1}}% \glssetcategoryattribute{format}{glossnamefont}{formatfont}% \glssetcategoryattribute{format}{font}{formatfont}% @@ -201,7 +201,10 @@ \HDorg@wrglossary{#1\encapchar\encapchar\@nil}% } \fi% -\renewcommand{\acrpluralsuffix}{} +\@ifpackageloaded{glossaries-extra}{% + \renewcommand*{\glsxtrabbrvpluralsuffix}{} +}{% +} \ltx@iffilelater{french.ldf}{2016/03/20}{% }{% \DeclareRobustCommand*{\NoAutoSpacing}{\FBAutoSpaceGuillfalse% @@ -296,24 +299,24 @@ \par\bigskip \csuse{DBD@indexnavigation@\csuse{DBD@index@symbolic@name}}% }{}{\aaa}% - \newif\if@DBD@no@first@letter@ - \@DBD@no@first@letter@false \newcommand*{\indexheading}[2]{% \hypertarget{#2:#1}{\textbf{#1}}% \protected@write\@auxout{}{\string\DBD@indexgroup{#1}{#2}}% } +\newtoggle{@DBD@no@first@letter} \newcommand*{\DBD@indexgroup}[2]{% \csgappto{DBD@indexnavigation@#2}{% - \if@DBD@no@first@letter@ - \,\textbar\,% - % \\ - \else - \noindent - \@DBD@no@first@letter@true - \fi + \iftoggle{@DBD@no@first@letter}{% + \,\textbar\,% + % \\ + }{% + \toggletrue{@DBD@no@first@letter}% + \noindent% + }% \hyperlink{#2:#1}{\textbf{#1}}% }% }% +\fi \DeclareUrlCommand\urldirectory{\urlstyle{tt}} \ExplSyntaxOn \tl_const:Nn \c__denisbdoc_examples_path_tl {../exemples} @@ -568,7 +571,7 @@ {% % Séquences de contrôles (communément appelées commandes ou macros) moretexcs={% - tcbset,tcbuselibrary% + tcbset,tcbuselibrary,tcbsetforeverylayer% },% % Mots-clés de niveau 1 : arguments optionnels morekeywords={% @@ -579,8 +582,9 @@ },% % Mots-clés de niveau 3 : arguments optionnels clés dans clé=valeur morekeywords=[3]{% - lightgray,red!50!white% + lightgray,red!50!white,autoparskip,beforeafter,skip,balanced% },% + alsoletter={ \ },% sensitive,% }[keywords,tex,comments]% \lstdefinelanguage[listings]{TeX}[LaTeX]{TeX}% @@ -788,7 +792,7 @@ }% \lstdefinelanguage[studentreport]{TeX}[LaTeX]{TeX}{% moretexcs={% Control sequences' names - reportsetup,daterange,professionaladvisor,academicadvisor,companylogo% + reportsetup,daterange,companytutor,academictutor,companylogo% },% % Mandatory arguments (other than environments' names) morekeywords={% @@ -797,11 +801,11 @@ },% morekeywords=[2]{% Keys of key-value lists institute,subinstitute,subsubinstitute,year,10pt,11pt,12pt,internship,project,layout,% - strings,pretitle,company,advisor,advisors,before~start~date,before~end~date,date,% - logos,logosheights,,% + strings,pretitle,company,tutor,tutors,before~start~date,before~end~date,date,% + logos,logosheights,keywords,subject,% },% morekeywords=[3]{% Values of key-value lists - ulco,iutlco,gte,gim,% + ulco,iutlco,gtelco,gimlco,% },% alsoletter={!-*1234560}% }% @@ -834,147 +838,6 @@ }{} \fi% \sisetup{locale=FR,detect-all} -\lstdefinestyle{pre-dbtex}{% - escapechar=", - language=[LaTeX]TeX, - alsolanguage=[extLaTeX]TeX, - % alsolanguage=[glossaries]TeX, - % alsolanguage=[biblatex]TeX, - alsolanguage=[csquotes]TeX, - % alsolanguage=[tcolorbox]TeX, - % alsolanguage=[listings]TeX, - % alsolanguage=[xcolor]TeX, - % alsolanguage=[hyperref]TeX, - texcsstyle=*\color{texcs}, - breaklines=true, - basicstyle=\normalfont\ttfamily, - commentstyle=\color{comment}\itshape, - directivestyle={\color{directive}}, - keywordstyle={\color{red}}, - keywordstyle={[1]\color{environment}}, - keywordstyle={[2]\color{key}}, - keywordstyle={[3]\color{value}}, - keywordstyle={[4]\color{keyword4}}, - keywordstyle={[5]\color{keyword5}}, - moredelim=*[s][\color{math}\ttfamily]{\\[}{\\]}, - moredelim=*[s][\color{math}\ttfamily]{$}{$}, - stringstyle=\color{string}, - columns=flexible, - keepspaces, - numberstyle=\small, - inputencoding=utf8/latin1, - aboveskip=\c__denisbdoc_listings_aboveskip_skip, - belowskip=\c__denisbdoc_listings_belowskip_skip -}% -\bool_if:nT {\g__denisbdoc_yad_bool} {% - \lstdefinestyle{dbtex}{% - style=pre-dbtex,% - alsolanguage=[yad]TeX,% - alsolanguage=[colophon]TeX,% - moretexcs={printbibliography,autocite},% - morekeywords=[2]{% - colback,refsegment% - },% - morekeywords=[2]{% - red,white% - },% - }% -} -\bool_if:nT {\g__denisbdoc_gzt_bool} {% - \lstdefinestyle{dbtex}{% - style=pre-dbtex,% - alsolanguage=[gzt]TeX,% - }% -} -\bool_if:nT {\g__denisbdoc_nwejm_bool} {% - \lstdefinestyle{dbtex}{% - style=pre-dbtex,% - alsolanguage=[nwejm]TeX,% - }% -} -\bool_if:nT {\g__denisbdoc_studentreport_bool} {% - \lstdefinestyle{dbtex}{% - style=pre-dbtex,% - alsolanguage=[studentreport]TeX,% - }% -} -\lstset{style=dbtex} -\sys_if_engine_pdftex:TF -{ - \ExplSyntaxOff - \lstMakeShortInline[style=dbtex]| - \ExplSyntaxOn -}{ - \lstMakeShortInline[style=dbtex]× -} -\tcbset{dbtcb/.style={% - breakable, - fonttitle=\bfseries, - enlarge~top~by=1mm, - separator~sign~dash, - label~separator=-, - before~title={% - \hypersetup{hidelinks}% - \tcbset{% - color~definition=white, - color~hyperlink=white, - }% - }% - }% -}% -\tcbset{% - doc~head={% - % boxsep=4pt,arc=4pt,boxrule=0.6pt,% - % frame~style=fill,% - % colframe=red!50!black,% - interior~style={% - fill,% - color=yellow!10!white,% - }% - }% -} -\tcbset{% - /tcb/doclang/environment~content=contenu~de~l'environnement, - /tcb/doclang/color=~(couleur), - /tcb/doclang/colors=Couleurs, - /tcb/doclang/environments=Environnements, - /tcb/doclang/keys=Clés, - /tcb/doclang/values=Valeurs, - /tcb/doclang/pageshort=p., - /tcb/documentation~listing~style=dbtex, - /tcb/color~command=texcs, - /tcb/color~environment=environment, - /tcb/color~key=key, - /tcb/color~value=value, - % index~format=pgfchapter, - index~format=off, - index~colorize, - index~annotate=false, - enhanced, - listing~style=dbtex, - every~box/.style={documentation~listing~style=dbtex}, - codes/.style={% - listing~only, - enlarge~top~by=\medskipamount, - colframe=ExampleFrame, - colback=ExampleBack, - fonttitle=\bfseries, - fontupper=\small, - split=0.5, - enhanced, - breakable, - listing~style=dbtex, - }% -}% -\tcbset{samples/.style={% - codes, - % listing~options={rangebeginprefix=\\,rangeendsuffix=\}} - }% -}% -\renewcommand*{\tcbdocnew}[1]{\scriptsize\sffamily\textcolor{green!50!black}{\bfseries -Nouv.~:}~#1} -\renewcommand*{\tcbdocupdated}[1]{\scriptsize\sffamily\textcolor{blue!75!black}{\bfseries -\textsc{m.-à-j.}~:}~#1} \def\disp@com#1{\colDef{\ttfamily#1}} \define@key{Gin}{bylabel}{% \edef\@tempa{{Gin}{page=\zref@extract{#1}{abspage}}}% @@ -1074,7 +937,7 @@ Nouv.~:}~#1} \DeclarePlainStyle{«~}{~»}% {“}{”} }{}% -\tl_const:Nx \c__denisbdoc_standard_url_tl { \tl_to_str:n { http://ctan.org/pkg/ } } +\tl_const:Nx \c__denisbdoc_standard_url_tl { \tl_to_str:n { https://ctan.org/pkg/ } } \cs_new_protected:Npn \__denisbdoc_package_format:nn #1#2 { #2{\sffamily#1} @@ -1441,7 +1304,6 @@ Nouv.~:}~#1} \__denisbdoc_screenshot:nn {#1}{#2} } } -\pdfsuppresswarningpagegroup=1 \newunicodechar{〈}{$\langle$} \newunicodechar{〉}{$\rangle$} \cs_new_protected:Nn \__denisbdoc_meta:nn @@ -1463,6 +1325,12 @@ Nouv.~:}~#1} drop~lifted~shadow, #1% } +\NewTCBListing{preamblecode*}{ !O{} }{% + codes,% + enlarge~top~by=\c_zero_dim, + drop~lifted~shadow, + #1% +} \NewTCBListing{bodycode}{ !O{} }{% codes,% #1% @@ -1510,7 +1378,7 @@ Nouv.~:}~#1} \newtcbtheorem[list~inside=dbexamplelist,number~within=\g__denisbdoc_number_within_tl,crefname={exemple}{exemples}]{dbexample}{Exemple}{% colback=lime!5!white, colframe=lime!75!black, - dbtcb + dbtcb, }{ex} \newtcbtheorem[list~inside=dbremarklist,number~within=\g__denisbdoc_number_within_tl,crefname={remarque}{remarques}]{dbremark}{Remarque}{% colback=cyan!5!white, @@ -1520,7 +1388,7 @@ Nouv.~:}~#1} \newtcbtheorem[list~inside=dbfaqlist,number~within=\g__denisbdoc_number_within_tl,crefname={question}{questions}]{dbfaq}{Question}{% colback=lightgray!5!white, colframe=lightgray!75!black, - fontupper=\itshape, + % fontupper=\itshape, dbtcb }{faq} \newtcbtheorem[list~inside=dbtabularlist,number~within=\g__denisbdoc_number_within_tl,crefname={tableau}{tableaux}]{dbtab}{Tableau}{% @@ -1670,6 +1538,169 @@ Nouv.~:}~#1} {% \Class[\c__denisbdoc_standard_url_tl\c__denisbdoc_nwejm_class_name_tl]{\c__denisbdoc_nwejmauthor_class_name_tl} } +\tl_const:Nn \c__denisbdoc_studentreport_class_name_tl {studentreport} +\ProvideDocumentCommand \studentreportcl { } +{% + \Class{\c__denisbdoc_studentreport_class_name_tl} +} +\NewDocumentCommand \studentreportauthor { } +{% + \class[\c__denisbdoc_standard_url_tl\c__denisbdoc_studentreport_class_name_tl]{\c__denisbdoc_studentreportauthor_class_name_tl} +} +\NewDocumentCommand \studentreportauthorcl { } +{% + \Class[\c__denisbdoc_standard_url_tl\c__denisbdoc_studentreport_class_name_tl]{\c__denisbdoc_studentreportauthor_class_name_tl} +} +\lstdefinestyle{pre-dbtex}{% + escapechar=",%" + language=[LaTeX]TeX, + alsolanguage=[extLaTeX]TeX, + % alsolanguage=[glossaries]TeX, + % alsolanguage=[biblatex]TeX, + alsolanguage=[csquotes]TeX, + % alsolanguage=[tcolorbox]TeX, + % alsolanguage=[listings]TeX, + % alsolanguage=[xcolor]TeX, + % alsolanguage=[hyperref]TeX, + texcsstyle=*\color{texcs}, + breaklines=true, + basicstyle=\normalfont\ttfamily, + commentstyle=\color{comment}\itshape, + directivestyle={\color{directive}}, + keywordstyle={\color{red}}, + keywordstyle={[1]\color{environment}}, + keywordstyle={[2]\color{key}}, + keywordstyle={[3]\color{value}}, + keywordstyle={[4]\color{keyword4}}, + keywordstyle={[5]\color{keyword5}}, + moredelim=*[s][\color{math}\ttfamily]{\\[}{\\]}, + moredelim=*[s][\color{math}\ttfamily]{$}{$}, + stringstyle=\color{string}, + columns=flexible, + keepspaces, + numberstyle=\small, + inputencoding=utf8/latin1, + aboveskip=\c__denisbdoc_listings_aboveskip_skip, + belowskip=\c__denisbdoc_listings_belowskip_skip +}% +\tl_gclear:N \g_tmpa_tl +\bool_if:nT {\g__denisbdoc_yad_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[yad]TeX,% + alsolanguage=[colophon]TeX,% + moretexcs={printbibliography,autocite},% + morekeywords=[2]{% + colback,refsegment% + },% + morekeywords=[2]{% + red,white% + },% + }% + \tl_gset:Nx \g_tmpa_tl {\c__denisbdoc_yat_class_name_tl} +} +\bool_if:nT {\g__denisbdoc_gzt_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[gzt]TeX,% + }% + \tl_gset:Nx \g_tmpa_tl {\c__denisbdoc_gzt_class_name_tl} +} +\bool_if:nT {\g__denisbdoc_nwejm_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[nwejm]TeX,% + }% + \tl_gset:Nx \g_tmpa_tl {\c__denisbdoc_nwejm_class_name_tl} +} +\bool_if:nT {\g__denisbdoc_studentreport_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[studentreport]TeX,% + }% + \tl_gset:Nx \g_tmpa_tl {\c__denisbdoc_studentreport_class_name_tl} +} +\NewDocumentCommand{\currentclass}{}{\g_tmpa_tl} +\NewExpandableDocumentCommand{\currenturl}{}{\c__denisbdoc_standard_url_tl\g_tmpa_tl} +\NewDocumentCommand{\thisclass}{}{\class{\g_tmpa_tl}} +\NewDocumentCommand{\Thisclass}{}{\Class{\g_tmpa_tl}} +\tcbset{dbtcb/.style={% + breakable, + fonttitle=\bfseries, + enlarge~top~by=1mm, + separator~sign~dash, + label~separator=-, + before~title={% + \hypersetup{hidelinks}% + \tcbset{% + color~definition=white, + color~hyperlink=white, + }% + }% + }% +}% +\tcbset{% + doc~head={% + % boxsep=4pt,arc=4pt,boxrule=0.6pt,% + % frame~style=fill,% + % colframe=red!50!black,% + interior~style={% + fill,% + color=yellow!10!white,% + }% + }% +} +\tcbset{% + /tcb/doclang/environment~content=contenu~de~l'environnement, + /tcb/doclang/color=~(couleur), + /tcb/doclang/colors=Couleurs, + /tcb/doclang/environments=Environnements, + /tcb/doclang/keys=Clés, + /tcb/doclang/values=Valeurs, + /tcb/doclang/pageshort=p., + /tcb/documentation~listing~style=dbtex, + /tcb/color~command=texcs, + /tcb/color~environment=environment, + /tcb/color~key=key, + /tcb/color~value=value, + % index~format=pgfchapter, + index~format=off, + index~colorize, + index~annotate=false, + enhanced, + listing~style=dbtex, + every~box/.style={documentation~listing~style=dbtex}, + codes/.style={% + listing~only, + enlarge~top~by=\medskipamount, + colframe=ExampleFrame, + colback=ExampleBack, + fonttitle=\bfseries, + fontupper=\small, + split=0.5, + enhanced, + breakable, + listing~style=dbtex, + }% +}% +\tcbset{samples/.style={% + codes, + % listing~options={rangebeginprefix=\\,rangeendsuffix=\}} + }% +}% +\renewcommand*{\tcbdocnew}[1]{\scriptsize\sffamily\textcolor{green!50!black}{\bfseries +Nouv.~:}~#1} +\renewcommand*{\tcbdocupdated}[1]{\scriptsize\sffamily\textcolor{blue!75!black}{\bfseries +\textsc{m.-à-j.}~:}~#1} +\lstset{style=dbtex} +\sys_if_engine_pdftex:TF +{ + \ExplSyntaxOff + \lstMakeShortInline[style=dbtex]| + \ExplSyntaxOn +}{ + \lstMakeShortInline[style=dbtex]× +} \pdfstringdefDisableCommands{% \let\textcolor\@gobble \def\yatcl{yathesis} -- cgit v1.2.3