diff options
author | Norbert Preining <norbert@preining.info> | 2020-07-30 03:01:28 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-07-30 03:01:28 +0000 |
commit | d2d95b04c14dc91a6976651379d33b2b472e6cb8 (patch) | |
tree | 4cb031e392017cff2b8a920e9817e4f39968b939 /macros/latex/contrib/annee-scolaire | |
parent | 71c876217b8d8b05eef7acf91b1a13d2e5262091 (diff) |
CTAN sync 202007300301
Diffstat (limited to 'macros/latex/contrib/annee-scolaire')
-rw-r--r-- | macros/latex/contrib/annee-scolaire/LISEZMOI.md | 13 | ||||
-rw-r--r-- | macros/latex/contrib/annee-scolaire/MANIFEST.md | 101 | ||||
-rw-r--r-- | macros/latex/contrib/annee-scolaire/README.md | 14 | ||||
-rw-r--r-- | macros/latex/contrib/annee-scolaire/annee-scolaire-eng.pdf | bin | 466896 -> 467107 bytes | |||
-rw-r--r-- | macros/latex/contrib/annee-scolaire/annee-scolaire-fra.pdf | bin | 489796 -> 489195 bytes | |||
-rw-r--r-- | macros/latex/contrib/annee-scolaire/annee-scolaire.dtx | 25 | ||||
-rw-r--r-- | macros/latex/contrib/annee-scolaire/annee-scolaire.ins | 15 | ||||
-rw-r--r-- | macros/latex/contrib/annee-scolaire/annee-scolaire.pdf | bin | 396286 -> 413456 bytes |
8 files changed, 137 insertions, 31 deletions
diff --git a/macros/latex/contrib/annee-scolaire/LISEZMOI.md b/macros/latex/contrib/annee-scolaire/LISEZMOI.md index 3701237ba9..9b03ccca22 100644 --- a/macros/latex/contrib/annee-scolaire/LISEZMOI.md +++ b/macros/latex/contrib/annee-scolaire/LISEZMOI.md @@ -1,4 +1,4 @@ -<!-- Time-stamp: <2020-04-05 11:51:09 administrateur> --> +<!-- Time-stamp: <2020-07-29 19:14:43 administrateur> --> <!-- Création : 2020-04-05T11:48:13+0200 --> # annee-scolaire @@ -9,14 +9,14 @@ Auteur: Yvon Henel, alias _Le TeXnicien de surface_ ## LICENCE Le contenu de cette archive est placé sous la « LaTeX Project Public License ». -Voir http://www.ctan.org/license/lppl1.3 +Voir http://www.ctan.org/license/lppl1.3c pour la licence. © 2020 Yvon Henel (Le TeXnicien de surface) ## Description de l’extension -Une macro \anneescolaire pour écrire automatiquement l’année scolaire +Une macro `\anneescolaire` pour écrire automatiquement l’année scolaire en fonction de la date de compilation. Deux autres macros pour obtenir l’année civile de début et celle de @@ -26,4 +26,9 @@ Une macro à redéfinir pour changer l’aspect des numéros d’années. ## Historique -Version 1.5 — 2020-04-05 — Première version publique +* Version 1.6 — 2020-07-29 + * Correction de la documentation française ; + * Remplacement de la macro `\c_one` — obsolète — par 1 ; + * Nettoyage du fichier <kbd>ins</kbd>. + +* Version 1.5 — 2020-04-05 — Première version publique diff --git a/macros/latex/contrib/annee-scolaire/MANIFEST.md b/macros/latex/contrib/annee-scolaire/MANIFEST.md new file mode 100644 index 0000000000..807075b9c2 --- /dev/null +++ b/macros/latex/contrib/annee-scolaire/MANIFEST.md @@ -0,0 +1,101 @@ +# Manifest for annee-scolaire + +This file is a listing of all files considered to be part of this package. +It is automatically generated with `texlua build.lua manifest`. + + +## Repository manifest + +The following groups list the files included in the development repository of the package. +Files listed with a ‘†’ marker are included in the TDS but not CTAN files, and files listed +with ‘‡’ are included in both. + +### Source files + +These are source files for a number of purposes, including the `unpack` process which +generates the installation files of the package. Additional files included here will also +be installed for processing such as testing. + +* annee-scolaire.dtx ‡ +* annee-scolaire.ins ‡ + +### Typeset documentation source files + +These files are typeset using LaTeX to produce the PDF documentation for the package. + +* annee-scolaire.dtx ‡ + +### Documentation files + +These files form part of the documentation but are not typeset. Generally they will be +additional input files for the typeset documentation files listed above. + +* LISEZMOI.md ‡ +* README.md ‡ +* MANIFEST.md + +### Text files + +Plain text files included as documentation or metadata. + +* LISEZMOI.md ‡ +* MANIFEST.md +* README.md ‡ + +### Derived files + +The files created by ‘unpacking’ the package sources. This typically includes +`.sty` and `.cls` files created from DocStrip `.dtx` files. + +* annee-scolaire.sty †+ +### Typeset documents + +The output files (PDF, essentially) from typesetting the various source, demo, +etc., package files. + +* annee-scolaire.pdf ‡ + + +## TDS manifest + +The following groups list the files included in the TeX Directory Structure used to install +the package into a TeX distribution. + +### Source files (TDS) + +All files included in the `annee-scolaire/source` directory. + +* annee-scolaire.dtx +* annee-scolaire.ins + +### TeX files (TDS) + +All files included in the `annee-scolaire/tex` directory. + +* annee-scolaire.sty + +### Doc files (TDS) + +All files included in the `annee-scolaire/doc` directory. + +* LISEZMOI.md +* README.md +* annee-scolaire-eng.pdf +* annee-scolaire-fra.pdf +* annee-scolaire.pdf + + +## CTAN manifest + +The following group lists the files included in the CTAN package. + +### CTAN files + +* LISEZMOI.md +* README.md +* annee-scolaire-eng.pdf +* annee-scolaire-fra.pdf +* annee-scolaire.dtx +* annee-scolaire.ins +* annee-scolaire.pdf diff --git a/macros/latex/contrib/annee-scolaire/README.md b/macros/latex/contrib/annee-scolaire/README.md index c53af88c6c..8c58c40c0d 100644 --- a/macros/latex/contrib/annee-scolaire/README.md +++ b/macros/latex/contrib/annee-scolaire/README.md @@ -1,4 +1,4 @@ -<!-- Time-stamp: <2020-04-05 11:47:51 administrateur> --> +<!-- Time-stamp: <2020-07-29 19:13:24 administrateur> --> <!-- Création : 2020-04-05T11:47:41+0200 --> # annee-scolaire @@ -9,14 +9,14 @@ Author: Yvon Henel, aka Le TeXnicien de surface ## LICENCE This material is subject to the LaTeX Project Public License. -See http://www.ctan.org/license/lppl1.3 +See http://www.ctan.org/license/lppl1.3c for the details of that license. © 2020 Yvon Henel (Le TeXnicien de surface) ## Description of the Package -A macro \anneescolaire to automatically write academic year (French way) +A macro `\anneescolaire` to automatically write academic year (French way) according to the date of compilation day. Two other macros to obtain the beginning calendar year and the ending @@ -27,5 +27,11 @@ A macros to be redefined to change the presentation of the years. ## History -Version 1.5 — 2020-04-05 — First public version +* Version 1.6 — 2020-07-29 + + Correction of some typos in French documentation + + Replacement of obsolete macro `\c_one` + + Cleaning of the <kbd>ins</kbd> file + +* Version 1.5 — 2020-04-05 — First public version + diff --git a/macros/latex/contrib/annee-scolaire/annee-scolaire-eng.pdf b/macros/latex/contrib/annee-scolaire/annee-scolaire-eng.pdf Binary files differindex 232dd8e338..e49af7a772 100644 --- a/macros/latex/contrib/annee-scolaire/annee-scolaire-eng.pdf +++ b/macros/latex/contrib/annee-scolaire/annee-scolaire-eng.pdf diff --git a/macros/latex/contrib/annee-scolaire/annee-scolaire-fra.pdf b/macros/latex/contrib/annee-scolaire/annee-scolaire-fra.pdf Binary files differindex 128e872f5a..8889124cf3 100644 --- a/macros/latex/contrib/annee-scolaire/annee-scolaire-fra.pdf +++ b/macros/latex/contrib/annee-scolaire/annee-scolaire-fra.pdf diff --git a/macros/latex/contrib/annee-scolaire/annee-scolaire.dtx b/macros/latex/contrib/annee-scolaire/annee-scolaire.dtx index 6a8d5ebf48..80a7500927 100644 --- a/macros/latex/contrib/annee-scolaire/annee-scolaire.dtx +++ b/macros/latex/contrib/annee-scolaire/annee-scolaire.dtx @@ -13,7 +13,7 @@ % %<*driver|package|doc> \RequirePackage{expl3}[2013/03/12] -\GetIdInfo$Id: annee-scolaire.dtx 1.5 2020-04-05 TdS $ +\GetIdInfo$Id: annee-scolaire.dtx 1.6 2020-07-29 TdS $ {} %</driver|package|doc> %<*driver> @@ -52,7 +52,14 @@ % \maketitle % % \changes{v1.5}{2020/04/05}{First public -% version.\foreignlanguage{french}{Première version publique.}} +% version.\foreignlanguage{french}{\emph{Première version publique.}}} +% \changes{v1.6}{2020/04/13}{Correction of typos in documentation. +% \foreignlanguage{french}{\emph{Correction d'erreurs dans la documentation.}}} +% \changes{v1.6}{2020/04/13}{Unification of lppl version in documentation. +% \foreignlanguage{french}{\emph{Unification de la version de la LPPL dans la +% documentation.}}} +% \changes{v1.6}{2020/07/29}{Replacement of obsolete macro \cs{c_one}. +% \foreignlanguage{french}{\emph{Remplacement de la macro obsolète \cs{c_one}.}}} % % \thispagestyle{empty} % @@ -167,9 +174,9 @@ La documentation française pour l'utilisateur de l'extension \section{The Macros} \label{sec:macros} -The \pkg{annee-scolaire} offers three main document macros which produce text in -the final document and one macro which is used to determine the presentation of -the said text. +\pkg{annee-scolaire} offers three main document macros which produce +text in the final document and one macro which is used to determine the +presentation of the said text. \subsection{Main Macros} \label{sec:main} @@ -243,7 +250,7 @@ See examples on page \pageref{sec:changelook}. \section{Les macros} \label{sec:macros} -L'extension \pkg{annee-scolaire} offrent quatre macros de document: trois macros +L'extension \pkg{annee-scolaire} offre quatre macros de document: trois macros principales produisant du texte et une macro, qui ne devrait être utilisée que rarement et peut-être même jamais, qui permet de changer la présentation du texte écrit. @@ -272,7 +279,7 @@ Comme son nom l'indique, cette macro donne l'année de début de l'année scolai \begin{function}{\finanneescolaire} \begin{syntax} - \cs{finanneescolaire}\oarg{shift} + \cs{finanneescolaire}\oarg{décalage} \end{syntax} \end{function} @@ -578,7 +585,7 @@ qui précède. Il ne viendra à l'esprit de personne d'y voir un encouragement à \int_const:Nn \c_@@_Annee_Deb_int { \int_compare:nNnTF { 100*\the\month + \the\day } < { 100*\c_@@_Premier_Mois_int + \c_@@_Premier_Jour_int} - {\year - \c_one + \c_@@_Decalage_int} + {\year - 1 + \c_@@_Decalage_int} {\year + \c_@@_Decalage_int} } % \end{macrocode} @@ -587,7 +594,7 @@ qui précède. Il ne viendra à l'esprit de personne d'y voir un encouragement à % \begin{variable}{\c_@@_Annee_Fin_int} % \begin{macrocode} \int_const:Nn \c_@@_Annee_Fin_int { - \c_@@_Annee_Deb_int + \c_one + \c_@@_Annee_Deb_int + 1 } % \end{macrocode} % \end{variable} diff --git a/macros/latex/contrib/annee-scolaire/annee-scolaire.ins b/macros/latex/contrib/annee-scolaire/annee-scolaire.ins index 88230a8ee8..de8c6d5e35 100644 --- a/macros/latex/contrib/annee-scolaire/annee-scolaire.ins +++ b/macros/latex/contrib/annee-scolaire/annee-scolaire.ins @@ -1,6 +1,6 @@ \iffalse meta-comment -File annee-scolaire.ins Copyright (C) 2019 Yvon Henel +File annee-scolaire.ins Copyright (C) 2019, 2020 Yvon Henel It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -9,10 +9,6 @@ of this license is in the file http://www.latex-project.org/lppl.txt -This file is part of the "l3trial bundle" (The Work in LPPL) -and all files in that bundle must be distributed together. - -The released version of this bundle is available from CTAN. \fi \input l3docstrip.tex @@ -33,15 +29,6 @@ Do not distribute a modified version of this file. \file{annee-scolaire.sty}{\from{annee-scolaire.dtx}{package}} \file{annee-scolaire-fra.tex}{\from{annee-scolaire.dtx}{doc,FRA}} \file{annee-scolaire-eng.tex}{\from{annee-scolaire.dtx}{doc,ENG}} - % % examples - % \file{annee-scolaire-test-fra.tex}{\from{annee-scolaire.dtx}{test,FRA}} - % \file{annee-scolaire-test-eng.tex}{\from{annee-scolaire.dtx}{test,ENG}} } -% \usedir{./testfiles} % ne marche pas comme attendu :( -% \generate{ -% \file{annee-scolaire-test.lvt}{\from{annee-scolaire.dtx}{lvt}} -% } - - \endbatchfile diff --git a/macros/latex/contrib/annee-scolaire/annee-scolaire.pdf b/macros/latex/contrib/annee-scolaire/annee-scolaire.pdf Binary files differindex 937f688ca2..1e6be40cd3 100644 --- a/macros/latex/contrib/annee-scolaire/annee-scolaire.pdf +++ b/macros/latex/contrib/annee-scolaire/annee-scolaire.pdf |