diff options
author | Karl Berry <karl@freefriends.org> | 2011-11-16 01:18:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-11-16 01:18:09 +0000 |
commit | 89e879044af62c456107c36783b86f7e7acb8cff (patch) | |
tree | cabf834eb7c2eb741e402c5a5e9e4782345a13d5 | |
parent | 00d5437c82b759ac90deb1b089cd99b6afd2de95 (diff) |
chronosys (15nov11)
git-svn-id: svn://tug.org/texlive/trunk@24609 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/generic/chronosys/docchronosys_en.pdf | bin | 93399 -> 96408 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/chronosys/docchronosys_en.tex | 81 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/chronosys/docchronosys_fr.pdf | bin | 96055 -> 98117 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/chronosys/docchronosys_fr.tex | 106 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/chronosys/chronosyschr.tex | 19 |
5 files changed, 140 insertions, 66 deletions
diff --git a/Master/texmf-dist/doc/generic/chronosys/docchronosys_en.pdf b/Master/texmf-dist/doc/generic/chronosys/docchronosys_en.pdf Binary files differindex ace6ffd3b45..f0f62696854 100644 --- a/Master/texmf-dist/doc/generic/chronosys/docchronosys_en.pdf +++ b/Master/texmf-dist/doc/generic/chronosys/docchronosys_en.pdf diff --git a/Master/texmf-dist/doc/generic/chronosys/docchronosys_en.tex b/Master/texmf-dist/doc/generic/chronosys/docchronosys_en.tex index 2d2694f00cf..d4f3bc9e4a7 100644 --- a/Master/texmf-dist/doc/generic/chronosys/docchronosys_en.tex +++ b/Master/texmf-dist/doc/generic/chronosys/docchronosys_en.tex @@ -71,7 +71,7 @@ draw p reflectedabout ((-5cm,-5.25cm),(5cm,-5.25cm)) withcolor black; \usemodule[chronosys] \startstandardmakeup\switchtobodyfont[16pt] \midaligned{Chronosys} -\midaligned{Make chronological friezes !} +\midaligned{Draw time-lines diagrams !} \bigskip \startchronology[width=\hsize,height=7ex,stopyear=2050,startyear=1982,color=darkgreen] \chronoevent{2011}{\type{chronosys}'s creation} @@ -88,7 +88,7 @@ draw p reflectedabout ((-5cm,-5.25cm),(5cm,-5.25cm)) withcolor black; \parskip 1cm \chapter{Introduction} -\type{Chronosys} is distributed under the LaTeX Project Public License. It uses the \type{tikz} package for drawing the friezes. +\type{Chronosys} is distributed under the LaTeX Project Public License. It uses the \type{tikz} package for drawing the time-lines. \blank This package is version {\unprotect\chron@sysversion\protect}, anothers versions might be created later. @@ -109,7 +109,7 @@ You can load \type{chronosys} by~: The control sequence \type{\startchronology}\index{startchronology} is the first one you need to know.\footnote{There are \type{\begin{chronology}} and \type{\end{chronology}} for \LaTeX}~: it starts the chronological frieze. \blank[small] -The next one is \type{\stopchronology}\index{stopchronology}\footnote{or \type{\end{chronology}}}, it ends the frieze. Let's have a look on the result~: +The next one is \type{\stopchronology}\index{stopchronology}\footnote{or \type{\end{chronology}}}, it ends the time-line. Let's have a look on the result~: \starttyping \startchronology \stopchronology\stoptyping @@ -117,8 +117,8 @@ The next one is \type{\stopchronology}\index{stopchronology}\footnote{or \type{\ \startchronology \stopchronology \bigskip -You can see the frieze is on all the page's width, furthermore it starts at {\os0} and ends at the current year {\os\the\year} when this document was compiled. \type{Chronosys} will compare these years with the events and periods you will give him (see \in[event] and \in[period]). -\blank[small]Now let's learn how to add events on the frieze. +You can see the time-line is on all the page's width, furthermore it starts at {\os0} and ends at the current year {\os\the\year} when this document was compiled. \type{Chronosys} will compare these years with the events and periods you will give him (see \in[event] and \in[period]). +\blank[small]Now let's learn how to add events on the time-line. \section[event]{Events: \type{\chronoevent}} @@ -155,7 +155,7 @@ The event appears between {\os 0} et {\os\the\year}, proportionally with his gap \bigskip N.B.: the font size has been reduced to avoid label to overlap; a best way will be given further (see \in[eventoptions]).\blank \type{Chronosys} won't generate any error if the event's date is out of the starting year and ending year, however it will be ignored. The way of customize -the frieze, especially the starting year and ending year, will be seen further(see \in[startchronologyoptions]). +the time-line, especially the starting year and ending year, will be seen further(see \in[startchronologyoptions]). \section[period]{Periods: \type{\chronoperiode}} @@ -176,11 +176,11 @@ You can also add one period (or several\footnote{If two periods are overlapping, \stopchronology \switchtobodyfont[14pt] \blank -N.B.: on the period from {\os1000} to {\os1999}, blue on the frieze, we can now see the vertical straight under the frieze. You can disable it (see \in[eventoptions]), but if you want it you should place the events after the periods. +N.B.: on the period from {\os1000} to {\os1999}, blue on the time-line, we can now see the vertical straight under the frieze. You can disable it (see \in[eventoptions]), but if you want it you should place the events after the periods. The period appears automatically with colour, and the dates are also visible (see \in[periodoptions] to disable them) and the label. The periods can be automatically coloured in 5 colours : blue, red, cyan, purple and yellow, except if the colour is identical to the frieze's one. Of course you can choose the colour of the period (see \in[periodoptions]). -\chapter[Personnalisation]{Friezes' customization} +\chapter[Personnalisation]{Time-lines' customization} \section{\type{\startchronology}} \subsection{Example} @@ -201,21 +201,21 @@ For example: \subsection{Different options} The different options of \type{\startchronology}\index{startchronology} are: \startitemize -\head \type{startyear}\index{startyear} :\par starting year of the frieze. It needs to be a valid \type{number}. It is by default {\os0} -\head \type{stopyear}\index{stopyear} :\par ending year of the frieze. It also needs to be a valid \type{number}. It is the current year by default. +\head \type{startyear}\index{startyear} :\par starting year of the time-line. It needs to be a valid \type{number}. It is by default {\os0} +\head \type{stopyear}\index{stopyear} :\par ending year of the time-line. It also needs to be a valid \type{number}. It is the current year by default. \head \type{color}\index{color} :\par colour of the frieze. It must be a \type{colour} recognized by the \type{tikz} package. It is black by default. \head \type{height}\index{height} :\par height of the frieze. It must be a valid \type{dimen} and it is \type{0.7pc} by default. \head \type{width}\index{width} :\par width of the frieze. It must be a valid \type{dimen} and it is \type{\hsize}\footnote{\type{\textwidth} in \LaTeX} by default. \head \type{datesstyle}\index{datessyle} :\par style to apply to dates. It must be a \type{control sequence} (it can take one argument, which will be the dates), is empty by default. -\head \type{dateselevation}\index{dateselevation} :\par height of the dates from the frieze, it must be a valid \type{dimen} and it is \type{20pt} par by default. +\head \type{dateselevation}\index{dateselevation} :\par height of the dates from the time-line, it must be a valid \type{dimen} and it is \type{20pt} par by default. \head \type{startdate}\index{startdate} :\par boolean which indicate if the starting year has to be placed. It must be either \type{true} or \type{false} and it is \type{true} by default. \head \type{stopdate}\index{stopdate} :\par boolean which indicate if the ending year has to be placed. It must be either \type{true} or \type{false} and it is \type{true} by default. \head \type{dates}\index{dates} :\par boolean which indicate if both dates have to be placed. It must be either \type{true} or \type{false} and it is \type{true} by default. \head\type{arrow}\index{arrow} :boolean which indicate if an arrowhead has to be placed. It must be either \type{true} or \type{false} and it is \type{true} by default. -\head \type{arrowheight}\index{arrowheight} :\par height of the arrowhead. It must be a valid \type{dimen} and it is identical to the height of the frieze by default. -\head \type{arrowwidth}\index{arrowwidth} :\par width of the arrowhead. It encroaches on the entire (\type{height}) width of the frieze It must be a valid \type{dimen} and it is 1/10 of the entire width of the frieze (\type{width}) by default. +\head \type{arrowheight}\index{arrowheight} :\par height of the arrowhead. It must be a valid \type{dimen} and it is identical to the height of the time-line by default. +\head \type{arrowwidth}\index{arrowwidth} :\par width of the arrowhead. It encroaches on the entire (\type{height}) width of the frieze It must be a valid \type{dimen} and it is 1/10 of the entire width of the time-line (\type{width}) by default. \head \type{arrowcolor}\index{arrowcolor} :\par colour of the arrowhead. It must be a \type{colour} recognized by the \type{tikz} package. It is identical to the colour of the frieze by default. -\head \type{box}\index{box} :\par boolean which indicates if the frieze should be passed back with a black line. It must be either \type{true} or \type{false} and it is \type{false} by default. +\head \type{box}\index{box} :\par boolean which indicates if the time-line should be passed back with a black line. It must be either \type{true} or \type{false} and it is \type{false} by default. \stopitemize \subsection[startchronologyoptions]{Summary} @@ -283,14 +283,14 @@ The different options of \type{\chronoperiode}\index{chronoperiode} are: \placetable[here][fig:chronoperiodeoptions]{\type{chronoperiode}'s options} \starttable[|l|c|l|] \HL\VL\use{3}\ReFormat[cB]{\type{\chronoperiode[}\em ...=...\type{]{...}{...}{...}}}\VL\SR -\VL\type{startdate} \NC=\NC\type{<true>} \em or \type{false}\VL\LR -\VL\type{stopdate} \NC=\NC\type{<true>} \em or \type{false}\VL\LR -\VL\type{dates} \NC=\NC\type{<true>} \em or \type{false}\VL\LR -\VL\type{datesstyle} \NC=\NC\type{<control sequence>} \em or \type{<commande#1>}\VL\LR -\VL\type{textstyle} \NC=\NC\type{<control sequence>} \em or \type{<commande#1>}\VL\LR +\VL\type{startdate} \NC=\NC\type{<true>} \em or \type{<false>}\VL\LR +\VL\type{stopdate} \NC=\NC\type{<true>} \em or \type{<false>}\VL\LR +\VL\type{dates} \NC=\NC\type{<true>} \em or \type{<false>}\VL\LR +\VL\type{datesstyle} \NC=\NC\type{<control sequence>} \em or \type{<control sequence#1>}\VL\LR +\VL\type{textstyle} \NC=\NC\type{<control sequence>} \em or \type{<control sequence#1>}\VL\LR \VL\type{color} \NC=\NC\type{<colour>}\VL\LR \VL\type{dateselevation} \NC=\NC\type{<dimen>}\VL\LR -\VL\type{textdeph} \NC=\NC\type{<dimen>}\VL\LR +\VL\type{textdeph} \NC=\NC\type{<dimen>}\VL\LR\HL \stoptable \section{\type{\chronoevent}} @@ -373,11 +373,11 @@ Here are the different possible options\index{chronoevent}. \head \type{barre}\index{barre} :\par boolean which indicate if a vertical straight has to be placed on the frieze at the event position. It must be either \type{true} or \type{false}. It is \type{true} by default. \head \type{date}\index{date} :\par boolean which indicate if the date of the event has to be placed. It must be either \type{true} or \type{false}. It is \type{true} by default. \head \type{conversionmonth}\index{conversionmonth} :\par boolean which indicate if the number of the month has to be converted to the name month. It must be either \type{true} or \type{false}. It is \type{true} by default. -\head \type{mark}\index{mark} :\par boolean which indicate if a vertical straight has to be placed under the frieze at the event position. It must be either \type{true} or \type{false}. It is \type{true} by default. +\head \type{mark}\index{mark} :\par boolean which indicate if a vertical straight has to be placed under the time-line at the event position. It must be either \type{true} or \type{false}. It is \type{true} by default. \head \type{year}\index{year} :\par boolean which indicate if the year of the event has to be placed. It must be either \type{true} or \type{false}. It is \type{true} by default. \head \type{icon}\index{icon} :\par symbol to add on the frieze at the event position. It can be a control sequence or some text, and it is empty by default. \head \type{markdepth}\index{markdepth} : \par depth of the label of the event and of the vertical straight under the frieze. It must be a valid \type{dimen} and it is \type{10pt} by default. -\head \type{iconheight}\index{iconheight} :\par height of the icon on the frieze. It must be a valid \type{dimen} and it is half of the height of the frieze by default. +\head \type{iconheight}\index{iconheight} :\par height of the icon on the time-line. It must be a valid \type{dimen} and it is half of the height of the frieze by default. \head \type{textstyle}\index{textstyle} :\par style to apply to the label. It must be a \type{control sequence} or \type{control sequence#1}. \head \type{datesseparation}\index{datesseparation} : symbol of separation of each element of the date. It can be a control sequence or some text and is a space by default. \head \type{datestyle}\index{datestyle} :\par style to apply to the entire date with the symbols of separation. It must be a \type{control sequence} or \type{control sequence#1}. @@ -397,10 +397,41 @@ Here are the different possible options\index{chronoevent}. \VL\type{datesseparation}\NC=\NC \type{<text>} \em or \type{<control sequence>} \bf\dots\VL\FR \VL\type{markdepth}\NC=\NC \type{<dimen>}\VL\FR \VL\type{iconheight}\NC=\NC \type{<dimen>}\VL\FR -\VL\type{textstyle}\NC=\NC \type{<control sequence>} \em or \type{<control sequence#1}\VL\FR -\VL\type{datestyle}\NC=\NC \type{<control sequence>} \em or \type{<control sequence#1}\VL\FR -\VL\type{datesstyle}\NC=\NC \type{<control sequence>} \em or \type{<control sequence#1}\VL\FR\HL +\VL\type{textstyle}\NC=\NC \type{<control sequence>} \em or \type{<control sequence#1>}\VL\FR +\VL\type{datestyle}\NC=\NC \type{<control sequence>} \em or \type{<control sequence#1>}\VL\FR +\VL\type{datesstyle}\NC=\NC \type{<control sequence>} \em or \type{<control sequence#1>}\VL\FR\HL \stoptable +\page[yes] +\section{Permanent changes} + You can apply changes on default values with using \type{\setupchronology}, \type{\setupchronoevent} and \type{\setupchronoperiode}. +\index{setupchronology}\index{setupchronoevent} \index{setupchronoperiode} +You use the same name for each option you want to change. For example, \starttyping +\setupchronology{startyear=1000,color=darkblue,stopdate=false} +\setupchronoperiode{color=darkgreen} +\setupchronoevent{textstyle=\it} +\startchronology +\chronoperiode{1050}{1450}{Anything you want} +\chronoevent{1600}{Anything else} +\chronoperiode{1800}{1899}{XIX\high{th} century} +\stopchronology +\stoptyping + +\setupchronology{startyear=1000,color=darkblue,stopdate=false} +\setupchronoperiode{color=darkgreen} +\setupchronoevent{textstyle=\it} +\startchronology +\chronoperiode{1050}{1450}{Anything you want} +\chronoevent{1600}{Anything else} +\stopchronology\bigskip +\bigskip N.B.: if you want to reapply the automatic colour's alternation of the periods, use + +\noindent\type{\setupchronoperiode{color=\chron@periodcolor}} +\setupchronoperiode{color=\chron@periodcolor} +\startchronology +\chronoperiode{1050}{1450}{Anything you want} +\chronoperiode{1800}{1899}{XIX\high{th} century} +\chronoevent{1600}{Anything else} +\stopchronology \completeindex \midaligned{\button{Go to table of contents}[content]} diff --git a/Master/texmf-dist/doc/generic/chronosys/docchronosys_fr.pdf b/Master/texmf-dist/doc/generic/chronosys/docchronosys_fr.pdf Binary files differindex fe0d4ca5015..b30bd2bd424 100644 --- a/Master/texmf-dist/doc/generic/chronosys/docchronosys_fr.pdf +++ b/Master/texmf-dist/doc/generic/chronosys/docchronosys_fr.pdf diff --git a/Master/texmf-dist/doc/generic/chronosys/docchronosys_fr.tex b/Master/texmf-dist/doc/generic/chronosys/docchronosys_fr.tex index 2a4ead035eb..8a0a7e87c4e 100644 --- a/Master/texmf-dist/doc/generic/chronosys/docchronosys_fr.tex +++ b/Master/texmf-dist/doc/generic/chronosys/docchronosys_fr.tex @@ -1,3 +1,28 @@ +% This is is the french code for the documentation of the `chronosys' package. +% +% The maintener of this work is Mathieu Long. +% email : mlong.tex@hotmail.fr +% the `chronosys' package consists in the 9 files : +% -- `docchronosys_en.tex' and `docchronosys_en.pdf' (english manual) +% -- `docchronosys_fr.tex' and `docchronosys_fr.pdf' (french manual) +% -- README +% -- `chronosys.tex' (file for plain TeX) +% -- `chronosyschr.tex' (main file of the `chronosys' package) +% -- `chronosys.sty' (file for LaTeX) +% -- `x-chronosys.tex' (file for ConTeXt) +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Mathieu Long. +% \setupinteraction[title=Chronosys - Documentation] \mainlanguage[fr] \setupbodyfont[14pt,regular] @@ -118,7 +143,7 @@ L'événement a été placé entre {\os 0} et {\os\the\year}, proportionnellemen \startchronology \chronoevent{476}{Chute de l'empire romain} \chronoevent{1492}{Découverte de l'Amérique} -\chronoevent{1870}{III\high{è} République} +\chronoevent{1969}{Premiers pas sur la Lune} \stopchronology \stoptyping @@ -126,7 +151,7 @@ L'événement a été placé entre {\os 0} et {\os\the\year}, proportionnellemen \startchronology \chronoevent{476}{Chute de l'empire romain} \chronoevent{1492}{Découverte de l'Amérique\ } -\chronoevent{1870}{\ III\high{è} République} +\chronoevent{1969}{\quad Premiers pas sur la Lune} \stopchronology \switchtobodyfont[14pt] \bigskip Note : la taille d'écriture a été réduite lorq de la création de cette frise afin que les textes ne se chevauchent pas~; une meilleure méthode sera donnée plus loin (voir \in[eventoptions]).\blank @@ -143,14 +168,14 @@ Il est également possible de placer toute une période (ou plusieurs\footnote{S \chronoperiode{1000}{1999}{2\high{è} millénaire} \chronoperiode{192}{476}{Bas-Empire romain} \chronoevent{1492}{Découverte de l'Amérique\ } -\chronoevent{1870}{\ III\high{è} République} +\chronoevent{1969}{Premiers pas sur la Lune} \stopchronology \stoptyping \switchtobodyfont[9pt] \startchronology \chronoperiode{1000}{1999}{2\high{è} millénaire} \chronoperiode{192}{476}{Bas-Empire romain} -\chronoevent{1870}{\ III\high{è} République} +\chronoevent{1969}{\quad Premiers pas sur la Lune} \stopchronology \switchtobodyfont[14pt] \blank @@ -230,31 +255,6 @@ Les différentes options de \type{\startchronology}\index{startchronology} sont \subsection{Exemple} Tout comme \type{\startchronology}, \type{\chronoperiode} admet un argument optionnel contenant les options de personnalisation de la période. \starttyping -% This is is the french code for the documentation of the `chronosys' package. -% -% The maintener of this work is Mathieu Long. -% email : mlong.tex@hotmail.fr -% the `chronosys' package consists in the 9 files : -% -- `docchronosys_en.tex' and `docchronosys_en.pdf' (english manual) -% -- `docchronosys_fr.tex' and `docchronosys_fr.pdf' (french manual) -% -- README -% -- `chronosys.tex' (file for plain TeX) -% -- `chronosyschr.tex' (main file of the `chronosys' package) -% -- `chronosys.sty' (file for LaTeX) -% -- `x-chronosys.tex' (file for ConTeXt) -% -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainer of this work is Mathieu Long. -% \startchronology[startyear=-800,stopyear=500,color=darkgreen] \chronoperiode[color=orange,stopdate=false,textstyle=\it] {-753}{-509}{Période royale romaine} @@ -286,9 +286,9 @@ Les différentes options de \type{\chronoperiode}\index{chronoperiode} sont list \placetable[here][fig:chronoperiodeoptions]{Options de \type{chronoperiode}} \starttable[|l|c|l|] \HL\VL\use{3}\ReFormat[cB]{\type{\chronoperiode[}\em ...=...\type{]{...}{...}{...}}}\VL\SR -\VL\type{startdate} \NC=\NC\type{<true>} \em ou \type{false}\VL\LR -\VL\type{stopdate} \NC=\NC\type{<true>} \em ou \type{false}\VL\LR -\VL\type{dates} \NC=\NC\type{<true>} \em ou \type{false}\VL\LR +\VL\type{startdate} \NC=\NC\type{<true>} \em ou \type{<false>}\VL\LR +\VL\type{stopdate} \NC=\NC\type{<true>} \em ou \type{<false>}\VL\LR +\VL\type{dates} \NC=\NC\type{<true>} \em ou \type{<false>}\VL\LR \VL\type{datesstyle} \NC=\NC\type{<commande>} \em ou \type{<commande#1>}\VL\LR \VL\type{textstyle} \NC=\NC\type{<commande>} \em ou \type{<commande#1>}\VL\LR \VL\type{color} \NC=\NC\type{<couleur>}\VL\LR @@ -376,11 +376,47 @@ Elle est vide par défaut. \VL\type{datesseparation}\NC=\NC \type{<séquence de texte>} \em ou \type{<commande>} \bf\dots\VL\FR \VL\type{markdepth}\NC=\NC \type{<dimension>}\VL\FR \VL\type{iconheight}\NC=\NC \type{<dimension>}\VL\FR -\VL\type{textstyle}\NC=\NC \type{<commande>} \em ou \type{<commande#1}\VL\FR -\VL\type{datestyle}\NC=\NC \type{<commande>} \em ou \type{<commande#1}\VL\FR -\VL\type{datesstyle}\NC=\NC \type{<commande>} \em ou \type{<commande#1}\VL\FR\HL +\VL\type{textstyle}\NC=\NC \type{<commande>} \em ou \type{<commande#1>}\VL\FR +\VL\type{datestyle}\NC=\NC \type{<commande>} \em ou \type{<commande#1>}\VL\FR +\VL\type{datesstyle}\NC=\NC \type{<commande>} \em ou \type{<commande#1>}\VL\FR\HL \stoptable +\page[yes] +\section{Changements permanents} +Il est également possible de changer les valeurs par défaut de chaque option en utilisant \type{\setupchronology}, \type{\setupchronoevent} et \type{\setupchronoperiode}.\index{setupchronology}\index{setupchronoperiode} \index{setupchronoevent} Chacune de ces commandes prennent les mêmes options que nous avons vu auparavant respectivement. + +Ainsi, on peut avoir : +\starttyping +\setupchronology{startyear=1000,color=darkblue,stopdate=false} +\setupchronoperiode{color=darkgreen} +\setupchronoevent{textstyle=\it} +\startchronology +\chronoperiode{1050}{1450}{Quelque chose} +\chronoevent{1600}{autre chose} +\stopchronology +\stoptyping + +\setupchronology{startyear=1000,color=darkblue,stopdate=false} +\setupchronoperiode{color=darkgreen} +\setupchronoevent{textstyle=\it} +\startchronology +\chronoperiode{1050}{1450}{Quelque chose} +\chronoevent{1600}{autre chose} +\chronoperiode{1800}{1899}{XVIII\high{è} siècle} +\stopchronology + +Si vous souhaitez reprendre l'alternance automatique des couleurs des périodes, utilisez + +\noindent\type{\setupchronoperiode{color=\chron@periodcolor}} + +Ainsi, on réobtient +\setupchronoperiode{color=\chron@periodcolor} +\startchronology +\chronoperiode{1050}{1450}{Quelque chose} +\chronoevent{1600}{autre chose} +\chronoperiode{1800}{1899}{XVIII\high{è} siècle} +\stopchronology + \completeindex \midaligned{\button{Aller à la table des matières}[content]} \midaligned{\button{Quitter}[ExitViewer]} diff --git a/Master/texmf-dist/tex/generic/chronosys/chronosyschr.tex b/Master/texmf-dist/tex/generic/chronosys/chronosyschr.tex index 51d49402551..d5ab80b6375 100644 --- a/Master/texmf-dist/tex/generic/chronosys/chronosyschr.tex +++ b/Master/texmf-dist/tex/generic/chronosys/chronosyschr.tex @@ -26,7 +26,7 @@ \expandafter\ifx\csname chronosys @\endcsname\relax\else\immediate\write16{Le fichier a d\'ej`a \'et\'e charg\'e}\endinput\fi \ifx\numexpr\UNDEFINED\immediate\write16{D\'esol\'e, mais ce fichier utilise les primitives E-TeX, vous ne pouvez pas utiliser le moteur TeX.}\endinput\fi \expandafter\edef\csname chronosys @\endcsname{\the\catcode`\@} -\def\chron@sysversion{1.0} +\def\chron@sysversion{1.01} \catcode`\@=11 \catcode`\!=11 @@ -124,18 +124,25 @@ \!chr@verif\newdimen\!chrperioddateselevation \!chrverif\def\!chrperiodedefaultdateselevation{0pt} -\!chrverif\def\!chr!periodec@lor{\ifcase\!chr!periodecolornum blue\or red\or cyan\or purple\or yellow\fi} -\!chrverif\def\!chr!periodecolor{\edef\!chrperiodedefaultcolor{\!chr!periodec@lor}\ifx\!chr!periodec@l@r\!chr@color\!chr!periodecoloradvance\!chr!periodecolor\fi} +%\!chrverif\def\!chr!periodec@lor{\ifcase\!chr!periodecolornum blue\or red\or cyan\or purple\or yellow\fi} +%\!chrverif\def\!chr!periodecolor{\edef\!chrperiodedefaultcolor{\!chr!periodec@lor}\ifx\!chr!periodec@l@r\!chr@color\!chr!periodecoloradvance\!chr!periodecolor %\fi} +%\!chrverif\def\!chr!periodecoloradvance{\global\advance\!chr!periodecolornum\@ne\relax\ifnum\!chr!periodecolornum=5\relax\global\!chr!periodecolornum\z@\fi} +%\!chrverif\def\!chrperiodedefaultdatesstyle{} \!chrverif\def\!chrperiodedefaulttextstyle{} + +\!chrverif\def\!chrperiodedefaultcolor{\chron@periodcolor} +\!chrverif\def\!chrperiodedefa@@ultcolor{\chron@periodcolor} +\!chrverif\def\chron@periodcolor{\ifcase\!chr!periodecolornum blue\or red\or cyan\or purple\or yellow\fi} +\!chrverif\def\!chr!periodecolor{\edef\!chrperiodedef@ultcolor{\!chrperiodedefaultcolor}\ifx\!chrperiodedefaultcolor\!chrperiodedefa@@ultcolor\ifx\!chrperiodedef@ultcolor\!chr@color\!chr!periodecoloradvance\!chr!periodecolor \fi\fi} \!chrverif\def\!chr!periodecoloradvance{\global\advance\!chr!periodecolornum\@ne\relax\ifnum\!chr!periodecolornum=5\relax\global\!chr!periodecolornum\z@\fi} \!chrverif\def\!chrperiodedefaultdatesstyle{} \!chrverif\def\!chrperiodedefaulttextstyle{} - \!chrverif\def\chronoperiode{\traiteoneargument\dochronoperiode} \!chrverif\def\dochronoperiode[#1]#2#3#4{\def\!chr@periodtextdepth{\!chrperiodedefaulttextdepth}\def\!chr@perioddates{\!chrperiodedefaultdates}% -\def\!chr@periodcolor{\!chrperiodedefaultcolor}\def\!chr@perioddatesstyle{\!chrperiodedefaultdatesstyle}% +\def\!chr@periodcolor{\!chrperiodedef@ultcolor}\def\!chr@perioddatesstyle{\!chrperiodedefaultdatesstyle}% \def\!chr@periodstartdate{\!chrperiodedefaultstartdate}\def\!chr@periodstopdate{\!chrperiodedefaultstopdate}% \def\!chr@periodtextstyle{\!chrperiodedefaulttextstyle}\def\!chr@perioddates{\!chrperiodedefaultdates}% \def\!chr@perioddateselevation{\!chrperiodedefaultdateselevation}% +\!chr!periodecolor % \ifonearg \traitingargvirgule[#1]{!chr@period}\fi\!chrperiodtextdepth\!chr@periodtextdepth \csname !chrperioddates\!chr@perioddates\endcsname \csname !chrperiodstartdate\!chr@periodstartdate\endcsname \csname !chrperiodstopdate\!chr@periodstopdate\endcsname @@ -146,7 +153,7 @@ % % \dimen@i\wd\!chrflechebox \setbox\!chrflechebox\hbox{\unhbox\!chrflechebox\kern-\dimen@i\kern\!chr!dimentraitement\lower\!chrperiodtextdepth\hbox to\z@{\hbox to\dimen@{\hss\!chr@periodtextstyle{#4}\hss}\hss}% -\if!chrperioddates\if!chrperiodstartdate\raise\!chrperioddateselevation\hbox to\z@{\hss\!chr@perioddatesstyle{#2}\hss}\fi\fi\!chr!periodecolor \starttikzpicture\filldraw[color=\!chr@periodcolor](0,0)--(\dimen@,0)--(\dimen@,\!chrheight)--(0,\!chrheight)--cycle;\draw[color=\!chr!periodeschwarzodergr@u](0,0)--(0,\!chrheight);\draw [color=\!chr!periodeschwarzodergr@u](\dimen@,0)--(\dimen@,\!chrheight);\if!chrbox\draw[color=black](0,-0.2pt)--(\dimen@,-0.2pt)\fi\stoptikzpicture +\if!chrperioddates\if!chrperiodstartdate\raise\!chrperioddateselevation\hbox to\z@{\hss\!chr@perioddatesstyle{#2}\hss}\fi\fi \starttikzpicture\filldraw[color=\!chr@periodcolor](0,0)--(\dimen@,0)--(\dimen@,\!chrheight)--(0,\!chrheight)--cycle;\draw[color=\!chr!periodeschwarzodergr@u](0,0)--(0,\!chrheight);\draw [color=\!chr!periodeschwarzodergr@u](\dimen@,0)--(\dimen@,\!chrheight);\if!chrbox\draw[color=black](0,-0.2pt)--(\dimen@,-0.2pt)\fi\stoptikzpicture \if!chrperioddates\if!chrperiodstopdate\raise\!chrperioddateselevation \hbox to\z@{\hss\!chr@perioddatesstyle{#3}\hss}\fi\fi}\!chr!periodecoloradvance\fi\fi\fi\fi\fi} \!chrverif\def\setupchronoperiode#1{\traitingargvirgule[#1]{!chrperiodedefault}} |