From 7ea6dacf544f9f0ec4f9566681de2434ca5e0e38 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 28 Aug 2023 03:03:09 +0000 Subject: CTAN sync 202308280303 --- macros/latex/contrib/jwjournal/README.md | 12 ++++++++++-- .../latex/contrib/jwjournal/jwjournal-demo-cn.pdf | Bin 46598 -> 46611 bytes .../latex/contrib/jwjournal/jwjournal-demo-cn.tex | 4 ++-- .../latex/contrib/jwjournal/jwjournal-demo-en.pdf | Bin 19484 -> 19506 bytes .../latex/contrib/jwjournal/jwjournal-demo-en.tex | 8 ++++---- .../latex/contrib/jwjournal/jwjournal-demo-fr.pdf | Bin 19833 -> 19847 bytes .../latex/contrib/jwjournal/jwjournal-demo-fr.tex | 6 +++--- macros/latex/contrib/jwjournal/jwjournal.cls | 19 +++++++++++++++++-- .../latex/contrib/proflycee/doc/ProfLycee-doc.pdf | Bin 1074152 -> 1074202 bytes .../latex/contrib/proflycee/doc/ProfLycee-doc.tex | 6 ++++-- .../proflycee/doc/ProfLycee-exemples-pyluatex.pdf | Bin 58292 -> 58395 bytes .../proflycee/doc/ProfLycee-exemples-pyluatex.tex | 2 +- .../proflycee/doc/ProfLycee-exemples-pythontex.pdf | Bin 40961 -> 41126 bytes .../proflycee/doc/ProfLycee-exemples-pythontex.tex | 2 +- macros/latex/contrib/proflycee/tex/ProfLycee.sty | 3 ++- .../proflycee/tex/proflycee-tools-listings.tex | 5 +++-- .../proflycee/tex/proflycee-tools-minted.tex | 5 +++-- .../proflycee/tex/proflycee-tools-piton.tex | 5 +++-- .../proflycee/tex/proflycee-tools-pythontex.tex | 5 +++-- 19 files changed, 56 insertions(+), 26 deletions(-) (limited to 'macros/latex/contrib') diff --git a/macros/latex/contrib/jwjournal/README.md b/macros/latex/contrib/jwjournal/README.md index 6432aebb1e..4dd00cbba4 100644 --- a/macros/latex/contrib/jwjournal/README.md +++ b/macros/latex/contrib/jwjournal/README.md @@ -50,20 +50,27 @@ The options are: And there are only two major syntaxes for the main text: 1) Title - - Any line begins with date like `2023-01-01` would be regard as the Title line. + - Any line begins with date like `2023-01-01` would be regard as the *Title* line. - You may write the weather and/or location after the date. - Example: ``` 2023-01-01 Sunny --- Apartment ``` 2) Note - - Any line begins with something like `[Note]` would be regard as the Note line. + - Any line begins with something like `[Note]` would be regard as the *Note* line. - Example: ``` [Note] In hindsight, it was the right decision. ``` + The space(s) between `[Note]` and the text following it would be ignored. + > You may also use `【` and `】`, which is especially useful when writing Chinese. With a few more for icing on the cake: +- `|`: The first vertical bar would be interpreted as `\hfill`. This allows you to write the title line as + ``` + 2023-01-01 Sunny | Botanical Garden + ``` + and then the address `Botanical Garden` would be printed at the end of the title line. - `+++`: If a single sentence or a few words fall to the next page, you may write a `+++` before that entry to enlarge the current page by one line. - `===`: Three or more equal signs `=` would simply be ignored. This is for improving the readability of the code, allowing you to write your journal like: ``` @@ -124,6 +131,7 @@ The colors from Monday to Sunday have the internal names `jwjournal-color-1`, .. ### Functionality The main features are achieved with the power of LaTeX3's regex functionality. It scans the content paragraph by paragraph and converts recognized patterns into corresponding TeX commands. Thus, `2023-01-01 Weather` becomes `\JWJournalEntry{2023-01-01}{Weather}`, `[Note] ...` becomes `\item[Note] ...` inside a `description` environment, and `+++` is essentially `\enlargethispage*{\baselineskip}`, etc. However, this comes with a price: in order to scan the content, it is firstly stored in a macro `\g_jwjournal_content_tl`, and that means that you cannot use commands like `\verb` in your main text (unless explicitly `\end{jwjournal}`, write your code, and then `\begin{jwjournal}`). +Also, synctex won't work properly. ### Dates The conversion of date string to natural language, and the calculation of the day of the week are accomplished by `projlib-date`, part of the `ProjLib` toolkit, which is still at its early stage, in some aspects not as functional as existing package such as `datenumber`, but should evolve through time. diff --git a/macros/latex/contrib/jwjournal/jwjournal-demo-cn.pdf b/macros/latex/contrib/jwjournal/jwjournal-demo-cn.pdf index 8d393374c8..d4175f7072 100644 Binary files a/macros/latex/contrib/jwjournal/jwjournal-demo-cn.pdf and b/macros/latex/contrib/jwjournal/jwjournal-demo-cn.pdf differ diff --git a/macros/latex/contrib/jwjournal/jwjournal-demo-cn.tex b/macros/latex/contrib/jwjournal/jwjournal-demo-cn.tex index 0fa7c87cb0..92b00e0ddf 100644 --- a/macros/latex/contrib/jwjournal/jwjournal-demo-cn.tex +++ b/macros/latex/contrib/jwjournal/jwjournal-demo-cn.tex @@ -8,13 +8,13 @@ \begin{document} -2023-01-01 晴 —— 公寓 +2023-01-01 晴 | 公寓 在文中出现的日期和标注不会被识别: 2022-12-25、[标注],放心使用 [体育] 一些关于体育赛事的事情 - [学习] 一些关于学习的事情 + 【学习】一些关于学习的事情 % 【...】与 [...] 效果相同 diff --git a/macros/latex/contrib/jwjournal/jwjournal-demo-en.pdf b/macros/latex/contrib/jwjournal/jwjournal-demo-en.pdf index 84fd7596f9..f1da481824 100644 Binary files a/macros/latex/contrib/jwjournal/jwjournal-demo-en.pdf and b/macros/latex/contrib/jwjournal/jwjournal-demo-en.pdf differ diff --git a/macros/latex/contrib/jwjournal/jwjournal-demo-en.tex b/macros/latex/contrib/jwjournal/jwjournal-demo-en.tex index ae95a74d53..500c772c1c 100644 --- a/macros/latex/contrib/jwjournal/jwjournal-demo-en.tex +++ b/macros/latex/contrib/jwjournal/jwjournal-demo-en.tex @@ -6,13 +6,13 @@ \begin{document} -01/01/2023 Sunny --- Apartment +01/01/2023 Sunny | Apartment - Dates and annotations appearing in the text will not be recognized: 12/25/2022, [Note], so feel free to write them + Dates and annotations appearing in the text will not be recognized: 12/25/2022, [Note], so feel free to write these. - [Sports] something about sporting events + [Sports] something about sporting events. - [Learning] something about learning + [Learning] something about learning. diff --git a/macros/latex/contrib/jwjournal/jwjournal-demo-fr.pdf b/macros/latex/contrib/jwjournal/jwjournal-demo-fr.pdf index 6986ffd900..65f7cf45a5 100644 Binary files a/macros/latex/contrib/jwjournal/jwjournal-demo-fr.pdf and b/macros/latex/contrib/jwjournal/jwjournal-demo-fr.pdf differ diff --git a/macros/latex/contrib/jwjournal/jwjournal-demo-fr.tex b/macros/latex/contrib/jwjournal/jwjournal-demo-fr.tex index c5d8d7b821..c7b3e41d25 100644 --- a/macros/latex/contrib/jwjournal/jwjournal-demo-fr.tex +++ b/macros/latex/contrib/jwjournal/jwjournal-demo-fr.tex @@ -8,13 +8,13 @@ \begin{document} -01/01/2023 Ensoleillé --- Appartement +01/01/2023 Ensoleillé | Appartement Les dates et annotations apparaissant dans le texte ne seront pas reconnues : 25/12/2022, [Note], alors n'hésitez pas à les écrire. - [Sports] quelque chose sur les événements sportifs + [Sports] quelque chose sur les événements sportifs. - [Apprendre] quelque chose sur l'apprentissage + [Apprendre] quelque chose sur l'apprentissage. diff --git a/macros/latex/contrib/jwjournal/jwjournal.cls b/macros/latex/contrib/jwjournal/jwjournal.cls index 4d515d580a..fc8b091952 100644 --- a/macros/latex/contrib/jwjournal/jwjournal.cls +++ b/macros/latex/contrib/jwjournal/jwjournal.cls @@ -12,7 +12,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {jwjournal} - {2023/01/07} {} + {2023/08/26} {} {JW's journal class} \keys_define:nn { jwjournal } @@ -68,7 +68,14 @@ { \colorlet { jwjournal-entry-background } { paper } } - \begin{tcolorbox}[enhanced~jigsaw, breakable, enlarge~left~by=-3.5mm, width=\textwidth+3.5mm, colback=jwjournal-entry-background, boxrule=0pt, top=2pt, bottom=2pt, left=2.5mm, borderline~west={1.5mm}{0mm}{jwjournal-entry!90!main-text}, frame~hidden] + \begin{tcolorbox}[enhanced~jigsaw, breakable, + enlarge~left~by=-3.5mm, width=\textwidth+3.5mm, + colback=jwjournal-entry-background, + boxrule=0pt, top=2pt, bottom=2pt, left=2.5mm, right= + \bool_if:NTF \l__jwjournal_color_entry_bool + { 2mm } + { -1mm }, + borderline~west={1.5mm}{0mm}{jwjournal-entry!90!main-text}, frame~hidden] \sffamily \bfseries \bool_if:NT \l__jwjournal_color_entry_bool { @@ -132,6 +139,10 @@ { ={3,} } { } \l_tmpa_tl + \regex_replace_once:nnN + { \| } + { \c{hfill} } + \l_tmpa_tl \regex_match:nVT { ❄️ +++ (.*) } \l_tmpa_tl { \tl_gput_right:Nn \g_jwjournal_content_tl { \g_jwjournal_enlarge_page_by_one_line_tl } @@ -160,6 +171,10 @@ { ❄️ (\[.*\] .*) } { \c{JWJournalItem} {\1} } \l_tmpa_tl + \regex_replace_once:nnN + { ❄️ 【(.*)】(.*) } + { \c{JWJournalItem} { \[\1\] \2 } } + \l_tmpa_tl \regex_replace_once:nnN { ❄️ } { } \l_tmpa_tl \tl_gput_right:NV \g_jwjournal_content_tl \l_tmpa_tl \tl_gput_right:Nn \g_jwjournal_content_tl { \par } diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf index fff8e4d1bf..5913867ba9 100644 Binary files a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf and b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf differ diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex index 8593461484..87fdf3cd19 100644 --- a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex +++ b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex @@ -5,8 +5,8 @@ % arara: lualatex: {shell: yes, synctex: no, interaction: batchmode} if found('log', '(undefined references|Please rerun|Rerun to get)') \documentclass[a4paper,french,11pt]{article} -\def\PLversion{2.7.2} -\def\PLdate{25 août 2023} +\def\PLversion{2.7.3} +\def\PLdate{27 août 2023} \usepackage{amsfonts} \usepackage{ProfLycee} \useproflyclib{piton,minted,pythontex} @@ -7455,6 +7455,8 @@ La grille, créée en \TikZ, est portée par le rectangle de \og coins \fg{} $(0 \part{Historique} +{\small \bverb|v 2.7.3|~:~~~~Correction de la couleur de bordures vertes pour les codes python} + {\small \bverb|v 2.7.2|~:~~~~\textsf{xcolor} n'est plus chargé par défaut (option \textsf{[xcolor]} pour le charger) {\small \bverb|v 2.7.1|~:~~~~Chargement de \textsf{tcolorbox} par librairies (au lieu de \textsf{[most]}) diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pyluatex.pdf b/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pyluatex.pdf index 757a5a5f34..8f81483488 100644 Binary files a/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pyluatex.pdf and b/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pyluatex.pdf differ diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pyluatex.tex b/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pyluatex.tex index adf46e1690..f7c397289d 100644 --- a/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pyluatex.tex +++ b/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pyluatex.tex @@ -2,7 +2,7 @@ % !TeX TXS-program:compile = txs:///lualatex/[--shell-escape] \documentclass[french,a4paper,10pt]{article} -\def\PLver{2.7.1} +\def\PLver{2.7.3} \usepackage[margin=1.5cm]{geometry} \usepackage{ProfLycee} \useproflyclib{piton} diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pythontex.pdf b/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pythontex.pdf index 8c7e855b09..cd5fa5bbd0 100644 Binary files a/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pythontex.pdf and b/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pythontex.pdf differ diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pythontex.tex b/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pythontex.tex index 2ddbf43ff4..8ba49e362a 100644 --- a/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pythontex.tex +++ b/macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pythontex.tex @@ -5,7 +5,7 @@ % arara: lualatex: {shell: no, synctex: yes, interaction: batchmode} if found('log', '(undefined references|Please rerun|Rerun to get)') \documentclass[french,a4paper,10pt]{article} -\def\PLver{2.7.1} +\def\PLver{2.7.3} \usepackage[margin=1.5cm]{geometry} \usepackage{ProfLycee} \useproflyclib{pythontex} diff --git a/macros/latex/contrib/proflycee/tex/ProfLycee.sty b/macros/latex/contrib/proflycee/tex/ProfLycee.sty index f2dc4b4765..98f042395a 100644 --- a/macros/latex/contrib/proflycee/tex/ProfLycee.sty +++ b/macros/latex/contrib/proflycee/tex/ProfLycee.sty @@ -3,7 +3,8 @@ % or later, see http://www.latex-project.org/lppl.txtf \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ProfLycee}[2023/08/25 2.7.2 Aide pour l'utilisation de LaTeX en lycee] +\ProvidesPackage{ProfLycee}[2023/08/27 2.7.3 Aide pour l'utilisation de LaTeX en lycee] +% 2.7.3 Correction de la couleur de bordures vertes pour les codes python % 2.7.2 Modification du chargement de xcolor pour éviter les clash errors (couleurs adaptées du coup), passage en option (test) % 2.7.1 Modification du chargement de tcolorbox % 2.7.0 Ajout de la clé [Frac] pour \AxeyTikz + \FonctionRepartTikz diff --git a/macros/latex/contrib/proflycee/tex/proflycee-tools-listings.tex b/macros/latex/contrib/proflycee/tex/proflycee-tools-listings.tex index 5184ac0eff..83d471a520 100644 --- a/macros/latex/contrib/proflycee/tex/proflycee-tools-listings.tex +++ b/macros/latex/contrib/proflycee/tex/proflycee-tools-listings.tex @@ -8,6 +8,7 @@ % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. +%2.7.3 Correction de la couleur des bordures %2.5.8 Styles alternatifs + Modification marges \RequirePackage{iftex} @@ -74,12 +75,12 @@ attach boxed title to top right={yshift=-\tcboxedtitleheight}, boxed title style={ size=small,colback=CouleurVertForet!25,boxrule=1.25pt, - colframe=green,boxsep=1.25pt, + colframe=CouleurVertForet,boxsep=1.25pt, sharp corners=downhill, arc=12pt, top=2pt,bottom=1pt,left=6pt,right=6pt }, - colframe=green,colback=CouleurVertForet!5,% + colframe=CouleurVertForet,colback=CouleurVertForet!5,% fonttitle=\color{CouleurVertForet}\itshape\ttfamily\footnotesize, title={\scriptsize\faPython}\:Code Python\vphantom{p}, watermark text={\faPython},watermark opacity=0.175,watermark zoom=0.50, diff --git a/macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex b/macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex index 6b880f2d9f..b3c8d288f0 100644 --- a/macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex +++ b/macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex @@ -8,6 +8,7 @@ % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. +%2.7.3 Correction de la couleur des bordures %2.5.8 Style alternatif + Modification marges %%------PYTHONMINTED @@ -30,7 +31,7 @@ \DeclareTCBListing{CodePythonMinted}{ s O{12cm} m }{% étoilée sans numéro, taille puis options... \IfBooleanTF{#1}{pytmintedno}{pytminted}, enhanced,width=#2,#3, - colframe=green,colback=CouleurVertForet!5,% + colframe=CouleurVertForet,colback=CouleurVertForet!5,% boxrule=1.25pt, sharp corners=downhill,arc=12pt, before skip=0.5\baselineskip,after skip=0.5\baselineskip,% @@ -38,7 +39,7 @@ attach boxed title to top right={yshift=-\tcboxedtitleheight}, boxed title style={ size=small,colback=CouleurVertForet!25,boxrule=1.25pt, - colframe=green,boxsep=1.25pt, + colframe=CouleurVertForet,boxsep=1.25pt, sharp corners=downhill, arc=12pt, top=2pt,bottom=1pt,left=6pt,right=6pt diff --git a/macros/latex/contrib/proflycee/tex/proflycee-tools-piton.tex b/macros/latex/contrib/proflycee/tex/proflycee-tools-piton.tex index 0f068ad97b..3433e2b2ad 100644 --- a/macros/latex/contrib/proflycee/tex/proflycee-tools-piton.tex +++ b/macros/latex/contrib/proflycee/tex/proflycee-tools-piton.tex @@ -8,6 +8,7 @@ % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. +%2.7.3 Correction de la couleur des bordures %2.6.9 Amalioration de la gestion des style := intégration directe dans la tcbox ! %2.5.9 Ajout d'une clé pour la couleur des nombres %2.5.8 Modification des marges @@ -52,7 +53,7 @@ attach boxed title to top right={yshift=-\tcboxedtitleheight}, boxed title style={ size=small,colback=CouleurVertForet!25,boxrule=1.25pt, - colframe=green,boxsep=1.25pt, + colframe=CouleurVertForet,boxsep=1.25pt, sharp corners=downhill, arc=12pt, top=2pt,bottom=1pt,left=6pt,right=6pt @@ -103,7 +104,7 @@ {% \tcbset{cadre/.style={}} \tcbset{titre/.style={}} - \tcbset{stylebase/.style={stylepiton,colframe=green,colback=CouleurVertForet!5,width=\CODPITlargeur,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign,leftupper=0.75em}} + \tcbset{stylebase/.style={stylepiton,colframe=CouleurVertForet,colback=CouleurVertForet!5,width=\CODPITlargeur,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign,leftupper=0.75em}} \ifboolKV[envpiton]{Filigrane}%si filigrane {\tcbset{filigrane/.style={watermark text={\faPython},watermark opacity=0.175,watermark zoom=0.50}}}% {\tcbset{filigrane/.style={}}}% diff --git a/macros/latex/contrib/proflycee/tex/proflycee-tools-pythontex.tex b/macros/latex/contrib/proflycee/tex/proflycee-tools-pythontex.tex index a326be2af7..6c367f6c55 100644 --- a/macros/latex/contrib/proflycee/tex/proflycee-tools-pythontex.tex +++ b/macros/latex/contrib/proflycee/tex/proflycee-tools-pythontex.tex @@ -8,6 +8,7 @@ % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. +%2.7.3 Correction de la couleur des bordures %2.5.8 Style alternatif + Modification marges + Modification arguments %%------CONSOLEPYTHON @@ -75,7 +76,7 @@ attach boxed title to top right={yshift=-\tcboxedtitleheight}, boxed title style={ size=small,colback=CouleurVertForet!25,boxrule=1.25pt, - colframe=green,boxsep=1.25pt, + colframe=CouleurVertForet,boxsep=1.25pt, sharp corners=downhill, arc=12pt, top=2pt,bottom=1pt,left=6pt,right=6pt @@ -83,7 +84,7 @@ fonttitle=\color{CouleurVertForet}\itshape\ttfamily\footnotesize, title={\scriptsize\faPython}\:Code Python\vphantom{p}, watermark text={\faPython},watermark opacity=0.175,watermark zoom=0.50, - colframe=green,colback=CouleurVertForet!5,% + colframe=CouleurVertForet,colback=CouleurVertForet!5,% before upper=\renewcommand\theFancyVerbLine{\scriptsize\ttfamily\color{darkgray}\arabic{FancyVerbLine}} } } -- cgit v1.2.3