summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-06-01 03:00:46 +0000
committerNorbert Preining <norbert@preining.info>2022-06-01 03:00:46 +0000
commit395236b957a38aebc12c385c6de965af2b61f034 (patch)
treefb06d1fa23f4356e87974dfd2fccb649a332b1fa /macros
parent3edd04afa0bdf4e328d976fe85603e2421e36d2a (diff)
CTAN sync 202206010300
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/create-theorem/create-theorem-doc.pdfbin119454 -> 126706 bytes
-rw-r--r--macros/latex/contrib/create-theorem/create-theorem-doc.tex30
-rw-r--r--macros/latex/contrib/create-theorem/create-theorem.sty29
-rw-r--r--macros/latex/contrib/multifootnote/LICENSE416
-rw-r--r--macros/latex/contrib/multifootnote/README.md11
-rw-r--r--macros/latex/contrib/multifootnote/multifootnote-doc.pdfbin0 -> 94268 bytes
-rw-r--r--macros/latex/contrib/multifootnote/multifootnote-doc.tex256
-rw-r--r--macros/latex/contrib/multifootnote/multifootnote.sty185
-rw-r--r--macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdfbin8451374 -> 8450619 bytes
-rw-r--r--macros/latex/contrib/profcollege/latex/ProfCollege.sty6
-rw-r--r--macros/latex/contrib/profcollege/metapost/PfCMonde-futurenew.mp (renamed from macros/latex/contrib/profcollege/metapost/PfCMonde.mp)188
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/Cafrique.dat51
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/Cameriquecentrale.dat9
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/Cameriquenord.dat5
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/Cameriquesud.dat17
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/Casia.dat49
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/Casie.dat48
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/Ccaraibes.dat3
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/Ceurope.dat49
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCCafrique.dat51
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCCameriquecentrale.dat9
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCCameriquenord.dat5
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCCameriquesud.dat17
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCCasia.dat49
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCCasie.dat48
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCCcaraibes.dat3
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCCeurope.dat49
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCIle.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/Ile.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCafganistan.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/afganistan.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCafriquesud1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/afriquesud1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCafriquesud2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/afriquesud2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCalbanie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/albanie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCalgerie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/algerie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCallemagne1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/allemagne1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCallemagne2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/allemagne2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCandorre.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/andorre.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCangleterre.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/angleterre.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCangola.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/angola.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCarabiesaoudite.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/arabiesaoudite.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCargentine1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/argentine1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCargentine2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/argentine2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCarmenie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/armenie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCautriche.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/autriche.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCazerbaijan1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/azerbaijan1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCazerbaijan2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/azerbaijan2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbangladesh.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/bangladesh.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbelarussie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/belarussie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbelgique.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/belgique.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbelize.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/belize.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbenin.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/benin.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbhutan.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/bhutan.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbirmanie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/birmanie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbolivie1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/bolivie1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbolivie2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/bolivie2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbosnie1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/bosnie1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbosnie2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/bosnie2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbotswana.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/botswana.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbresil.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/bresil.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbrunei.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/brunei.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCbulgarie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/bulgarie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCburkinafaso.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/burkinafaso.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCburundi.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/burundi.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCcabinda.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/cabinda.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCcambodge.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/cambodge.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCcameroun.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/cameroun.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCcanada.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/canada.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCcapitales.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/capitales.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCchili1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/chili1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCchili2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/chili2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCchine.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/chine.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCcolombie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/colombie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCcongo.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/congo.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCcoreenord.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/coreenord.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCcoreesud.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/coreesud.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCcostarica.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/costarica.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCcoteivoire.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/coteivoire.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCcroatie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/croatie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCdanemark.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/danemark.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCdjibouti.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/djibouti.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCecosse.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/ecosse.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCegypte.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/egypte.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCemirats.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/emirats.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCequateur.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/equateur.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCeritre.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/eritre.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCespagne.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/espagne.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCestonie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/estonie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCethiopie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/ethiopie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCfinlande.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/finlande.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCfleuveseurope.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/fleuveseurope.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCfleuvessup.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/fleuvessup.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCfrance.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/france.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCgabon.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/gabon.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCgambie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/gambie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCgaza.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/gaza.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCgeorgie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/georgie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCghana.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/ghana.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCgibraltar.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/gibraltar.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCgrece.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/grece.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCguatemala.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/guatemala.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCguinee.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/guinee.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCguineebissau.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/guineebissau.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCguineef.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/guineef.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCguyane.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/guyane.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfChaiti.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/haiti.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfChonduras.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/honduras.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfChongrie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/hongrie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCiles.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/iles.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCiles1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/iles1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCinde.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/inde.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCindonesie1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/indonesie1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCindonesie2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/indonesie2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCirak.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/irak.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCiran.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/iran.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCirelande.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/irelande.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCirelandenord.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/irelandenord.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCisrael.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/israel.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCitalie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/italie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCjordanie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/jordanie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCkazakhstan.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/kazakhstan.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCkenya.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/kenya.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCkoweit.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/koweit.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCkyrgyzstan.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/kyrgyzstan.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfClacs.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/lacs.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfClacssup.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/lacssup.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfClaos.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/laos.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfClesotho.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/lesotho.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfClettonie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/lettonie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCliban.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/liban.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCliberia.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/liberia.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfClibye.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/libye.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCliechtenstein.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/liechtenstein.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfClithuanie1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/lithuanie1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfClithuanie2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/lithuanie2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCluxembourg.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/luxembourg.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCmacedoine.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/macedoine.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCmalaisie1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/malaisie1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCmalaisie2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/malaisie2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCmalawi.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/malawi.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCmali.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/mali.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCmaroc.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/maroc.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCmauritanie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/mauritanie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCmexique.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/mexique.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCmoldavie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/moldavie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCmonaco.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/monaco.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCmongolie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/mongolie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCmozambique.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/mozambique.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCnamibie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/namibie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCnepal.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/nepal.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCnicaragua.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/nicaragua.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCniger.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/niger.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCnigeria.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/nigeria.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCnorvege.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/norvege.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCnvelleguinne.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/nvelleguinne.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfComan1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/oman1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfComan2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/oman2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCouganda.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/ouganda.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCouzbekistan.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/ouzbekistan.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCpakistan.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/pakistan.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCpanama1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/panama1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCpanama2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/panama2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCparaguay.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/paraguay.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCpaysbas.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/paysbas.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCpaysdegalles.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/paysdegalles.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCperou.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/perou.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCpolesud.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/polesud.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCpologne.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/pologne.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCportugal.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/portugal.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCquatar.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/quatar.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCrepcentreafrique.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/repcentreafrique.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCrepdominicaine.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/repdominicaine.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCriomuni.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/riomuni.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCrivieres.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/rivieres.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCroumanie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/roumanie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCrussie1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/russie1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCrussie1bis.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/russie1bis.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCrussie2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/russie2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCrussie3.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/russie3.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCrussie3bis.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/russie3bis.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCrwanda.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/rwanda.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCsaharaouest.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/saharaouest.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCsalvador.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/salvador.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCsanmarin.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/sanmarin.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCsenegal.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/senegal.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCsierraleone.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/sierraleone.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCslovaquie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/slovaquie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCslovenie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/slovenie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCsomalie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/somalie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCsoudan.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/soudan.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCsuede.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/suede.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCsuisse.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/suisse.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCsurinam.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/surinam.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCswaziland.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/swaziland.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCsyrie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/syrie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCtajikistan.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/tajikistan.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCtanzanie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/tanzanie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCtchad.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/tchad.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCtcheque.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/tcheque.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCthailande.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/thailande.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCtogo.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/togo.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCtunisie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/tunisie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCturkmenistan.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/turkmenistan.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCturquie1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/turquie1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCturquie2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/turquie2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCukraine.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/ukraine.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCuruguay.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/uruguay.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCusa1.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/usa1.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCusa2.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/usa2.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCvenezuela.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/venezuela.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCvietnam.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/vietnam.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCvillesFrance.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/villesFrance.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCvillesFranceCycle4.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/villesFranceCycle4.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCvillesFranceNord.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/villesFranceNord.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCvillesFrancesimp.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/villesFrancesimp.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCvillesItalie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/villesItalie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCvolcans.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/volcans.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCwestbank.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/westbank.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCyemen.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/yemen.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCyougoslavie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/yougoslavie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCzaire.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/zaire.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCzambie.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/zambie.dat)0
-rw-r--r--macros/latex/contrib/profcollege/metapost/datastest/PfCzimbabwe.dat (renamed from macros/latex/contrib/profcollege/metapost/datastest/zimbabwe.dat)0
-rw-r--r--macros/latex/contrib/schwalbe-chess/README2
-rw-r--r--macros/latex/contrib/schwalbe-chess/schwalbe.dtx402
-rw-r--r--macros/latex/contrib/schwalbe-chess/schwalbe.pdfbin221555 -> 230734 bytes
-rw-r--r--macros/latex/contrib/sidenotesplus/README.txt7
-rw-r--r--macros/latex/contrib/sidenotesplus/sidenotesplus.dtx51
-rw-r--r--macros/latex/contrib/sidenotesplus/sidenotesplus.ins2
-rw-r--r--macros/latex/contrib/sidenotesplus/sidenotesplus.pdfbin212629 -> 213799 bytes
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md9
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin617928 -> 618034 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-number.dtx3
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin663039 -> 663038 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx.tex2
-rw-r--r--macros/xetex/latex/bidi/README4
-rw-r--r--macros/xetex/latex/bidi/bidi-doc-intro.ltx2
-rw-r--r--macros/xetex/latex/bidi/bidi-doc-title.ltx4
-rw-r--r--macros/xetex/latex/bidi/bidi-doc.ltx2
-rw-r--r--macros/xetex/latex/bidi/bidi-doc.pdfbin177956 -> 177945 bytes
-rw-r--r--macros/xetex/latex/bidi/bidi.dtx379
-rw-r--r--macros/xetex/latex/bidi/bidi.pdfbin3230018 -> 3265198 bytes
-rw-r--r--macros/xetex/latex/xepersian/README4
-rw-r--r--macros/xetex/latex/xepersian/xepersian-doc-intro.ltx2
-rw-r--r--macros/xetex/latex/xepersian/xepersian-doc-title.ltx4
-rw-r--r--macros/xetex/latex/xepersian/xepersian-doc.ltx2
-rw-r--r--macros/xetex/latex/xepersian/xepersian-doc.pdfbin243579 -> 243576 bytes
-rw-r--r--macros/xetex/latex/xepersian/xepersian.dtx29
-rw-r--r--macros/xetex/latex/xepersian/xepersian.pdfbin774115 -> 774828 bytes
248 files changed, 1976 insertions, 519 deletions
diff --git a/macros/latex/contrib/create-theorem/create-theorem-doc.pdf b/macros/latex/contrib/create-theorem/create-theorem-doc.pdf
index f6f8fb84d5..c7c8ffa56f 100644
--- a/macros/latex/contrib/create-theorem/create-theorem-doc.pdf
+++ b/macros/latex/contrib/create-theorem/create-theorem-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/create-theorem/create-theorem-doc.tex b/macros/latex/contrib/create-theorem/create-theorem-doc.tex
index 37c4c56edf..706d2e6eac 100644
--- a/macros/latex/contrib/create-theorem/create-theorem-doc.tex
+++ b/macros/latex/contrib/create-theorem/create-theorem-doc.tex
@@ -97,7 +97,7 @@
\begin{document}
-\def\PackageVersion{2022/05/22}
+\def\PackageVersion{2022/05/31}
\title{\createtheorempackage{}\\\smallskip\itshape Initializing theorem-like environments with multilingual support}
\author{Jinwen XU}
@@ -210,7 +210,7 @@ Supported keys are:
\item The style of the \textquote{crefname}, you can specify the font, text style, color, etc.
\item Synonymous names: \commandoption{crefname-style} \,$|$\, \commandoption{crefnamestyle}
\end{itemize}
- \item \commandoption{Crefname}
+ \item \commandoption{Crefname}\lstinline| = |\meta{configuration}
\begin{itemize}
\item The name for \lstinline|\Cref| the environment, its syntax is the same as that of \commandoption{crefname}.
\item Also supports the syntax of \lstinline|\Crefthename|.
@@ -263,6 +263,12 @@ Supported keys are:
\item Specifying the \lstinline|\theoremstyle| for the current environment.
\item Synonymous names: \commandoption{apply style} \,$|$\, \commandoption{apply-style} \,$|$\, \commandoption{applystyle}
\end{itemize}
+ \item \commandoption{qed} or \commandoption{qed}\lstinline| = |\meta{Q.E.D. symbol}
+ \begin{itemize}
+ \item Specifying the Q.E.D. symbol for the current environment.
+ \item Note that the Q.E.D. symbol has already been put in math mode. If you want regular text such as \textquote{Q.E.D.}, you need to write \commandoption{qed}\lstinline| = \mathrm{Q.E.D.}|.
+ \item Synonymous names: \commandoption{qed symbol} \,$|$\, \commandoption{qed-symbol} \,$|$\, \commandoption{qedsymbol}
+ \end{itemize}
\item \commandoption{parent counter}\lstinline| = |\meta{parent counter}
\begin{itemize}
\item Specifying the \meta{parent counter} for the current environment, \emph{i.e.}, numbering will restart whenever that sectional level is encountered.
@@ -325,6 +331,12 @@ Supported keys are:
\item Note that this configuration can overwrite those already specified in \lstinline|\NameTheorem|.
\item Synonymous names: \commandoption{name-style} \,$|$\, \commandoption{namestyle}
\end{itemize}
+ \item \commandoption{qed}\lstinline| = |\meta{Q.E.D. symbol}
+ \begin{itemize}
+ \item Specifying the Q.E.D. symbol for the current environment.
+ \item Note that this configuration only works if you have already enabled the Q.E.D. symbol during the creating phase of the corresponding environment.
+ \item Synonymous names: \commandoption{qed symbol} \,$|$\, \commandoption{qed-symbol} \,$|$\, \commandoption{qedsymbol}
+ \end{itemize}
\item \commandoption{parent counter}\lstinline| = |\meta{parent counter}
\begin{itemize}
\item Specifying the \meta{parent counter} for the current environment, \emph{i.e.}, numbering will restart whenever that sectional level is encountered.
@@ -445,12 +457,26 @@ This is the combination of the first two cases --- we need to create \texttt{ide
\smallskip
In each case, the two environments \texttt{idea} and \texttt{idea*} share the same set of names.
+\subsection{The \emph{proofless} version -- theorems with a Q.E.D. symbol}
+
+Sometimes you may encounter a theorem without a proof, in which case you might want a Q.E.D. symbol when the theorem is finished. This can be easily achieved via:
+\begin{code}
+\CreateTheorem { theorem } { (*\commandoption{create starred version}*) }
+\CreateTheorem { theorem+ } { (*\commandoption{copy existed}*) = theorem, (*\commandoption{qed}*) }
+\CreateTheorem { theorem+* } { (*\commandoption{copy existed}*) = theorem*, (*\commandoption{qed}*) }
+\end{code}
+
+The code above defines two new environments \lstinline|theorem+| and \lstinline|theorem+*| in addition to \lstinline|theorem| and \lstinline|theorem*|. The \lstinline|+| version behaves exactly the same as the usual version, except it has a Q.E.D. symbol.
+
+
+\bigskip
\section{Known issues}
\begin{itemize}
\item The current mechanism does not work well for German, a problem originated in the package \textsf{crefthe}. The author plans to adopt a more refined approach in a later version so as to support the various grammatical situations in German.
\item \createtheorempackage{} modifies some undocumented internal macros of \textsf{cleveref}, so the behaviour might not be stable if \textsf{cleveref} gets updated.
+ \item \createtheorempackage{} is not fully compatible with \textsf{thmtools}, especially its \texttt{autoref} module.
\item There may be inaccuracies in the translation of those preset names.
\end{itemize}
diff --git a/macros/latex/contrib/create-theorem/create-theorem.sty b/macros/latex/contrib/create-theorem/create-theorem.sty
index 8e9ab307ce..c41908646c 100644
--- a/macros/latex/contrib/create-theorem/create-theorem.sty
+++ b/macros/latex/contrib/create-theorem/create-theorem.sty
@@ -13,7 +13,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{create-theorem}
- {2022/05/22} {}
+ {2022/05/31} {}
{Initializing theorem-like environments with multilingual support}
\keys_define:nn { create-theorem }
@@ -39,6 +39,11 @@
}
\ProcessKeysOptions { create-theorem }
+\hook_gput_code:nnn { package/thmtools/after } { crthm }
+ {
+ \let\thmt@autorefsetup\relax
+ }
+
\RequirePackage { aliascnt }
\bool_if:NT \l__crthm_nameinlink_bool
@@ -657,6 +662,7 @@
\keys_set:nn { create-theorem-naming } { #2 }
}
+\cs_set_eq:NN \c_crthm_original_qedsymbol_tl \qedsymbol
\bool_new:N \l__crthm_creating_apply_style_bool
\tl_new:N \l__crthm_creating_apply_style_tl
@@ -691,6 +697,17 @@
, apply-style .value_required:n = true
, apply style .meta:n = { style = { #1 } }
, apply style .value_required:n = true
+ , qed .code:n = {
+ \exp_args:Nx \hook_gput_code:nnn { env/ \l__crthm_current_env_tl /begin } { crthm } { \cs_set:Npn \qedsymbol { \ensuremath { #1 } } \pushQED{\qed} }
+ \exp_args:Nx \hook_gput_code:nnn { env/ \l__crthm_current_env_tl /end } { crthm } { \popQED }
+ }
+ , qed .default:n = \c_crthm_original_qedsymbol_tl
+ , qed~symbol .meta:n = { qed = #1 }
+ , qed~symbol .default:n = \c_crthm_original_qedsymbol_tl
+ , qed-symbol .meta:n = { qed = #1 }
+ , qed-symbol .default:n = \c_crthm_original_qedsymbol_tl
+ , qed symbol .meta:n = { qed = #1 }
+ , qed symbol .default:n = \c_crthm_original_qedsymbol_tl
, numberless .bool_set:N = \l__crthm_creating_numberless_bool
, create~starred~version .bool_set:N = \l__crthm_creating_create_starred_bool
, create-starred-version .meta:n = { create~starred~version }
@@ -866,6 +883,16 @@
, name-style .value_required:n = true
, name style .meta:n = { name~style = { #1 } }
, name style .value_required:n = true
+ , qed .code:n = {
+ \exp_args:Nx \hook_gput_code:nnn { env/ \l__crthm_current_env_tl /begin } { crthm } { \cs_set:Npn \qedsymbol { \ensuremath { #1 } } }
+ }
+ , qed .default:n = \c_crthm_original_qedsymbol_tl
+ , qed~symbol .meta:n = { qed = #1 }
+ , qed~symbol .default:n = \c_crthm_original_qedsymbol_tl
+ , qed-symbol .meta:n = { qed = #1 }
+ , qed-symbol .default:n = \c_crthm_original_qedsymbol_tl
+ , qed symbol .meta:n = { qed = #1 }
+ , qed symbol .default:n = \c_crthm_original_qedsymbol_tl
, parent~counter .code:n = { \crthm_counter_within:en { \l__crthm_current_env_tl } { #1 } }
, parent~counter .value_required:n = true
, parent-counter .meta:n = { parent~counter = { #1 } }
diff --git a/macros/latex/contrib/multifootnote/LICENSE b/macros/latex/contrib/multifootnote/LICENSE
new file mode 100644
index 0000000000..2244313901
--- /dev/null
+++ b/macros/latex/contrib/multifootnote/LICENSE
@@ -0,0 +1,416 @@
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c 2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+ Everyone is allowed to distribute verbatim copies of this
+ license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute. This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work. If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+ `Work'
+ Any work being distributed under this License.
+
+ `Derived Work'
+ Any work that under any applicable law is derived from the Work.
+
+ `Modification'
+ Any procedure that produces a Derived Work under any applicable
+ law -- for example, the production of a file containing an
+ original file associated with the Work or a significant portion of
+ such a file, either verbatim or with modifications and/or
+ translated into another language.
+
+ `Modify'
+ To apply any procedure that produces a Derived Work under any
+ applicable law.
+
+ `Distribution'
+ Making copies of the Work available from one person to another, in
+ whole or in part. Distribution includes (but is not limited to)
+ making any electronic components of the Work accessible by
+ file transfer protocols such as FTP or HTTP or by shared file
+ systems such as Sun's Network File System (NFS).
+
+ `Compiled Work'
+ A version of the Work that has been processed into a form where it
+ is directly usable on a computer system. This processing may
+ include using installation facilities provided by the Work,
+ transformations of the Work, copying of components of the Work, or
+ other activities. Note that modification of any installation
+ facilities provided by the Work constitutes modification of the Work.
+
+ `Current Maintainer'
+ A person or persons nominated as such within the Work. If there is
+ no such explicit nomination then it is the `Copyright Holder' under
+ any applicable law.
+
+ `Base Interpreter'
+ A program or process that is normally needed for running or
+ interpreting a part or the whole of the Work.
+
+ A Base Interpreter may depend on external components but these
+ are not considered part of the Base Interpreter provided that each
+ external component clearly identifies itself whenever it is used
+ interactively. Unless explicitly specified when applying the
+ license to the Work, the only applicable Base Interpreter is a
+ `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1. Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope. In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2. You may distribute a complete, unmodified copy of the Work as you
+received it. Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3. You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4. If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work. You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work. Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5. If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6. If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition. Only
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
+
+ a. If a component of this Derived Work can be a direct replacement
+ for a component of the Work when that component is used with the
+ Base Interpreter, then, wherever this component of the Work
+ identifies itself to the user when used interactively with that
+ Base Interpreter, the replacement component of this Derived Work
+ clearly and unambiguously identifies itself as a modified version
+ of this component to the user when used interactively with that
+ Base Interpreter.
+
+ b. Every component of the Derived Work contains prominent notices
+ detailing the nature of the changes to that component, or a
+ prominent reference to another file that is distributed as part
+ of the Derived Work and that contains a complete and accurate log
+ of the changes.
+
+ c. No information in the Derived Work implies that any persons,
+ including (but not limited to) the authors of the original version
+ of the Work, provide any support, including (but not limited to)
+ the reporting and handling of errors, to recipients of the
+ Derived Work unless those persons have stated explicitly that
+ they do provide such support for the Derived Work.
+
+ d. You distribute at least one of the following with the Derived Work:
+
+ 1. A complete, unmodified copy of the Work;
+ if your distribution of a modified component is made by
+ offering access to copy the modified component from a
+ designated place, then offering equivalent access to copy
+ the Work from the same or some similar place meets this
+ condition, even though third parties are not compelled to
+ copy the Work along with the modified component;
+
+ 2. Information that is sufficient to obtain a complete,
+ unmodified copy of the Work.
+
+7. If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8. The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9. Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+
+10. a. A Derived Work may be distributed under a different license
+ provided that license itself honors the conditions listed in
+ Clause 6 above, in regard to the Work, though it does not have
+ to honor the rest of the conditions in this license.
+
+ b. If a Derived Work is distributed under a different license, that
+ Derived Work must provide sufficient documentation as part of
+ itself to allow each recipient of that Derived Work to honor the
+ restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12. Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work. Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose. The entire risk as to the quality and performance
+of the Work is with you. Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1. Make a reasonable attempt to trace the Current Maintainer (and
+ the Copyright Holder, if the two differ) through the means of
+ an Internet or similar search.
+
+ 2. If this search is successful, then enquire whether the Work
+ is still maintained.
+
+ a. If it is being maintained, then ask the Current Maintainer
+ to update their communication data within one month.
+
+ b. If the search is unsuccessful or no action to resume active
+ maintenance is taken by the Current Maintainer, then announce
+ within the pertinent community your intention to take over
+ maintenance. (If the Work is a LaTeX work, this could be
+ done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+ maintenance of the Work to you, then this takes effect
+ immediately upon announcement.
+
+ b. If the Current Maintainer is not reachable and the Copyright
+ Holder agrees that maintenance of the Work be passed to you,
+ then this takes effect immediately upon announcement.
+
+ 4. If you make an `intention announcement' as described in 2b. above
+ and after three months your intention is challenged neither by
+ the Current Maintainer nor by the Copyright Holder nor by other
+ people, then you may arrange for the Work to be changed so as
+ to name you as the (new) Current Maintainer.
+
+ 5. If the previously unreachable Current Maintainer becomes
+ reachable once more within three months of a change completed
+ under the terms of 3b) or 4), then that Current Maintainer must
+ become or remain the Current Maintainer upon request provided
+ they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer. You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license. These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license. You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license. It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate. Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component. While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community. It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one. Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified. Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+ %% pig.dtx
+ %% Copyright 2005 M. Y. Name
+ %
+ % 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 M. Y. Name.
+ %
+ % This work consists of the files pig.dtx and pig.ins
+ % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+ The LPPL requires that distributions of the Work contain all the
+ files of the Work. It is therefore important that you provide a
+ way for the licensee to determine which files constitute the Work.
+ This could, for example, be achieved by explicitly listing all the
+ files of the Work near the copyright notice of each file or by
+ using a line such as:
+
+ % This work consists of all files listed in manifest.txt.
+
+ in that place. In the absence of an unequivocal list it might be
+ impossible for the licensee to determine what is considered by you
+ to comprise the Work and, in such a case, the licensee would be
+ entitled to make reasonable conjectures as to which files comprise
+ the Work.
+
diff --git a/macros/latex/contrib/multifootnote/README.md b/macros/latex/contrib/multifootnote/README.md
new file mode 100644
index 0000000000..bab1f56b21
--- /dev/null
+++ b/macros/latex/contrib/multifootnote/README.md
@@ -0,0 +1,11 @@
+<!-- Copyright (C) 2022 by Jinwen XU -->
+
+# `multifootnote` - Multiple numbers for the same footnote
+
+The package `multifootnote` provides several commands for generating footnotes with multiple numbers (or marks, if you prefer).
+
+*For more information, please refer to its documentation.*
+
+# License
+
+This work is released under the LaTeX Project Public License, v1.3c or later.
diff --git a/macros/latex/contrib/multifootnote/multifootnote-doc.pdf b/macros/latex/contrib/multifootnote/multifootnote-doc.pdf
new file mode 100644
index 0000000000..0a6410382f
--- /dev/null
+++ b/macros/latex/contrib/multifootnote/multifootnote-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/multifootnote/multifootnote-doc.tex b/macros/latex/contrib/multifootnote/multifootnote-doc.tex
new file mode 100644
index 0000000000..c1c6516a95
--- /dev/null
+++ b/macros/latex/contrib/multifootnote/multifootnote-doc.tex
@@ -0,0 +1,256 @@
+\documentclass[classical]{einfart}
+
+\usepackage{ProjLib}
+
+\usepackage[left indent]{multifootnote}
+
+%%================================
+%% For typesetting code
+%%================================
+\usepackage{listings}
+\usepackage{xcolor}
+\usepackage{setspace}
+\definecolor{code-main}{RGB}{70,130,180}
+\definecolor{code-expl3}{RGB}{240,50,60}
+\definecolor{code-option}{RGB}{40,110,20}
+\definecolor{code-keys}{RGB}{100,130,150}
+\definecolor{code-comment}{RGB}{20,120,80}
+\definecolor{code-background}{gray}{0.99}
+\lstset{
+ language = [LaTeX]TeX,
+ basicstyle = \ttfamily,
+ keywordstyle = \color{code-main},
+ commentstyle = \color{code-comment},
+ showstringspaces = false,
+ breaklines = true,
+ frame = lines,
+ backgroundcolor = \color{code-background},
+ flexiblecolumns = true,
+ escapeinside = {(*}{*)},
+ alsoletter = {_,:},
+ % numbers = left,
+ % firstnumber = last,
+ numberstyle = \scriptsize\ttfamily,
+ stepnumber = 1,
+ numbersep = 5pt,
+}
+\newcommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
+\lstset{% LaTeX2 commands
+ classoffset = 0,
+ texcsstyle =* \color{code-main},
+ moretexcs =
+ {
+ multifootnotetext,
+ multifootnotemark,
+ multifootnotetag,
+ multifootnotetagtext,
+ multifootnote,
+ footnotenumber,
+ footnotetag,
+ }
+}
+\lstset{% LaTeX3 commands
+ classoffset = 1,
+ texcsstyle =* \color{code-expl3},
+ moretexcs =
+ {
+ }
+}
+\lstnewenvironment{code}{\setstretch{1.05}\LocallyStopLineNumbers}{\ResumeLineNumbers\vspace{-.3\baselineskip}\vspace{-.5\parskip}}
+\lstnewenvironment{code*}{\setstretch{1.05}\lstset{numbers=left}\LocallyStopLineNumbers}{\ResumeLineNumbers\vspace{-.3\baselineskip}\vspace{-.5\parskip}}
+
+\newcommand{\packageoption}[1]{\texttt{\textcolor{code-option}{#1}}}
+\newcommand{\commandoption}[1]{\texttt{\textcolor{code-keys}{#1}}}
+
+%%================================
+%% tip
+%%================================
+\usepackage[many]{tcolorbox}
+\newenvironment{tip}[1][Tip]
+ {%
+ \LocallyStopLineNumbers%
+ \begin{tcolorbox}[breakable,
+ enhanced,
+ width = \textwidth,
+ colback = paper, colbacktitle = paper,
+ colframe = gray!50, boxrule=0.2mm,
+ coltitle = black,
+ fonttitle = \sffamily,
+ attach boxed title to top left = {yshift=-\tcboxedtitleheight/2, xshift=.5cm},
+ boxed title style = {boxrule=0pt, colframe=paper},
+ before skip = 3mm,
+ after skip = 3mm,
+ top = 2.5mm,
+ bottom = 1.5mm,
+ title={\scshape\sffamily #1}]%
+ }
+ {%
+ \end{tcolorbox}%
+ \ResumeLineNumbers%
+ }
+
+
+\newcommand{\multifootnotepackage}{{\normalfont\textsf{multifootnote}}}
+
+\begin{document}
+
+\def\PackageVersion{2022/05/31}
+
+\title{\multifootnotepackage{}\\\smallskip\itshape Multiple numbers for the same footnote}
+\author{Jinwen XU}
+\thanks{Corresponding to: \texttt{\multifootnotepackage{} \PackageVersion}}
+\date{\TheDate{\PackageVersion}[only-year-month], in Paris}
+
+\maketitle
+
+\begin{abstract}
+ \raggedleft
+ The package \multifootnotepackage{} provides two groups of commands for \\generating footnotes with multiple numbers (or marks, if you prefer).
+\end{abstract}
+
+
+\vspace*{-.5\baselineskip}
+
+\section{How to load it}
+
+You can simply load the current package with:
+
+\begin{code}
+\usepackage[(*\meta{options}*)]{multifootnote}
+\end{code}
+
+\medskip
+It has the following options:
+\begin{itemize}[label=,leftmargin=1.25em,itemindent=-1.25em]
+ \item \packageoption{left align}
+ \begin{itemize}
+ \item Align the footnotes to the left.
+ \item Alternative names: \packageoption{left-align} \,$|$\, \packageoption{leftalign}
+ \end{itemize}
+ \item \packageoption{left indent} or \packageoption{left indent} \lstinline|=| \meta{length}
+ \begin{itemize}
+ \item Similar to \packageoption{left align}, but with an indentation \meta{length}, default to be \texttt{1.5em}.
+ \item Alternative names: \packageoption{left-indent} \,$|$\, \packageoption{leftindent}
+ \end{itemize}
+\end{itemize}
+
+\section{How to use it}
+
+Here are two approaches for producing a footnote with multiple numbers, and in either of them, there are two commands involved.
+
+\subsection{First approach}
+
+This approach is more or less traditional, with one command to produce the footnote mark and another the text.
+\begin{itemize}
+ \item \lstinline|\multifootnotemark[|\meta{label}\lstinline|]|
+ \begin{itemize}
+ \item This command is for producing the footnote marks.
+ \item \meta{label} cannot contain commas. However, colon \textquote{\texttt{:}} and semicolon \textquote{\texttt{;}} are allowed.
+ \item Alternative name: \lstinline|\footnotenumber[|\meta{label}\lstinline|]|.
+ \end{itemize}
+ \item \lstinline|\multifootnotetext[|\meta{list of labels}\lstinline|]{|\meta{footnote text}\lstinline|}|
+ \begin{itemize}
+ \item This command is for producing the footnote text.
+ \item \meta{list of labels} is a list of labels that you specified with \lstinline|\multifootnotemark[|\meta{label}\lstinline|]|, separated with commas, like this: \commandoption{fn1,fn2,fn3}.
+ \item It should not be too far away from the corresponding marks.
+ \item Alternative name: \lstinline|\multifootnote[|\meta{list of labels}\lstinline|]{|\meta{footnote text}\lstinline|}|.
+ \end{itemize}
+\end{itemize}
+
+\subsection{Second approach}
+
+This approach is considered more convenient, with one command to specify the \meta{tag} while printing the footnote mark, and another to print the footnote text for this group.
+\begin{itemize}
+ \item \lstinline|\multifootnotetag{|\meta{tag}\lstinline|}| or \lstinline|\multifootnotetag{|\meta{list of tags}\lstinline|}|
+ \begin{itemize}
+ \item This command is for producing the footnote marks.
+ \item \meta{tag} cannot contain commas. However, colon \textquote{\texttt{:}} and semicolon \textquote{\texttt{;}} are allowed.
+ \item \meta{list of tags} is a list of tags, separated with commas, like this: \commandoption{fntag1,fntag2,fntag3}.
+ \item Alternative name: \lstinline|\footnotetag{|\meta{tag}\lstinline|}| or \lstinline|\footnotetag{|\meta{list of tags}\lstinline|}|.
+ \end{itemize}
+ \item \lstinline|\multifootnotetagtext[|\meta{tag}\lstinline|]{|\meta{footnote text}\lstinline|}|
+ \begin{itemize}
+ \item This command is for producing the footnote text.
+ \item It should not be too far away from the corresponding marks.
+ \item Alternative name: \lstinline|\multifootnote[|\meta{tag}\lstinline|]{|\meta{footnote text}\lstinline|}|.
+ \end{itemize}
+\end{itemize}
+
+\begin{tip}
+ \lstinline|\multifootnote| appears in both approaches for producing footnote text: it shall be interpreted as \lstinline|\multifootnotetext| if the optional argument is a comma-separated list, and as \lstinline|\multifootnotetagtext| if not. See the examples below.
+\end{tip}
+
+\bigskip
+\begin{center}
+ \itshape
+ If you're feeling confused, don't worry. Let's now take a look at some examples.
+\end{center}
+
+
+\section{Examples}
+
+Here are two examples of usage, with the package option \textquote{\packageoption{left indent}} enabled.
+
+\subsection{The first approach}
+
+\medskip
+\begin{code}
+Lorem ipsum\footnotenumber[(*\commandoption{fn1}*)] dolor\footnotenumber[(*\commandoption{fn2}*)] sit amet\footnotenumber[(*\commandoption{fn3}*)], consectetur\footnotenumber[(*\commandoption{fn4}*)] adipiscing elit\footnotenumber[(*\commandoption{fn5}*)].
+\multifootnote[(*\commandoption{fn1,fn2,fn5}*)]{This is a footnote for demonstration.}
+\multifootnote[(*\commandoption{fn1,fn3,fn4}*)]{This is another footnote for demonstration.}
+\end{code}
+
+Result:
+
+\fbox{Lorem ipsum\footnotenumber[fn1] dolor\footnotenumber[fn2] sit amet\footnotenumber[fn3], consectetur\footnotenumber[fn4] adipiscing elit\footnotenumber[fn5].}
+\multifootnote[fn1,fn2,fn5]{This is a footnote for demonstration.}
+\multifootnote[fn1,fn3,fn4]{This is another footnote for demonstration.}
+
+\subsection{The second approach}
+
+\medskip
+\begin{code}
+Lorem ipsum\footnotetag{(*\commandoption{fntag1,fntag2}*)} dolor\footnotetag{(*\commandoption{fntag1}*)} sit amet\footnotetag{(*\commandoption{fntag2}*)}, consectetur\footnotetag{(*\commandoption{fntag2}*)} adipiscing elit\footnotetag{(*\commandoption{fntag1}*)}.
+\multifootnote[(*\commandoption{fntag1}*)]{This is a footnote for demonstration.}
+\multifootnote[(*\commandoption{fntag2}*)]{This is another footnote for demonstration.}
+\end{code}
+
+Result:
+
+\fbox{Lorem ipsum\footnotetag{fntag1,fntag2} dolor\footnotetag{fntag1} sit amet\footnotetag{fntag2}, consectetur\footnotetag{fntag2} adipiscing elit\footnotetag{fntag1}.}
+\multifootnote[fntag1]{This is a footnote for demonstration.}
+\multifootnote[fntag2]{This is another footnote for demonstration.}
+
+\begin{tip}
+ The second approach is more recommended, as it involves fewer labels, and you shall not need to worry about the order of footnote marks in \lstinline|\multifootnote|.
+\end{tip}
+
+\begin{tip}[Attention]
+ Notice that in the first approach, \meta{label} appears as an optional argument of \lstinline|\footnotenumber[|\meta{label}\lstinline|]| (thus square brackets); while in the second approach, \meta{tag} is a mandatory argument of \lstinline|\footnotetag{|\meta{tag}\lstinline|}| (thus curly brackets).
+\end{tip}
+
+
+\bigskip
+\section{Acknowledgement}
+
+This package arises from a question (\href{https://tex.stackexchange.com/q/645330}{\texttt{645330}}) on \texttt{TeX.StackExchange}. The author thanks user \href{https://tex.stackexchange.com/users/270985}{\textsf{@Bolzano}} for bringing up the question of producing such footnotes.
+
+The author thanks \href{https://tex.stackexchange.com/users/2388}{\textsf{Ulrike Fischer}} for the code for fixing the broken hyperlinks generated by the first approach, and user \href{https://tex.stackexchange.com/users/73317}{\textsf{@frougon}} for his kind and helpful suggestions and comments.
+
+The author also wishes to thank user \href{https://tex.stackexchange.com/users/213149}{\textsf{@antshar}} for proposing the second approach. The code is surprisingly simple but works just as fine as that of the first approach.
+
+\section{Known issues}
+
+\begin{itemize}
+ % \item When package \textsf{hyperref} is loaded, hyperlinks to those footnotes generated by the commands here cannot point to the correct place.
+ \item \multifootnotepackage{} is not compatible with the package \textsf{footnotebackref}.
+\end{itemize}
+
+\medskip
+If you run into any issue or have ideas for improvement, feel free to discuss on:
+\begin{center}
+ \url{https://github.com/Jinwen-XU/multifootnote/issues}
+\end{center}
+or email me via \href{mailto:ProjLib@outlook.com}{\texttt{ProjLib@outlook.com}}.
+
+\end{document}
diff --git a/macros/latex/contrib/multifootnote/multifootnote.sty b/macros/latex/contrib/multifootnote/multifootnote.sty
new file mode 100644
index 0000000000..2c8d5e45ae
--- /dev/null
+++ b/macros/latex/contrib/multifootnote/multifootnote.sty
@@ -0,0 +1,185 @@
+%%
+%% Copyright (C) 2022 by Jinwen XU
+%% ------------------------------------
+%%
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3c 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
+%%
+\NeedsTeXFormat{LaTeX2e}[2020-10-01]
+\RequirePackage{l3keys2e}
+\ProvidesExplPackage
+ {multifootnote}
+ {2022/05/31} {}
+ {Multiple numbers for the same footnote}
+
+\msg_new:nnn { multifootnote }
+ { non-compatible-package }
+ { "multifootnote" ~ is ~ not ~ compatible ~ with ~ the ~ package ~ "#1". }
+
+\hook_gput_code:nnn { begindocument/before } { multifootnote }
+ {
+ \@ifpackageloaded { footnotebackref }
+ {
+ \msg_warning:nnn { multifootnote } { non-compatible-package } { footnotebackref }
+ } {}
+ }
+
+\dim_new:N \l_multifootnote_space_after_comma_dim
+\dim_set:Nn \l_multifootnote_space_after_comma_dim { 0.2ex }
+
+\bool_new:N \l__multifootnote_left_indent_bool
+\bool_set_false:N \l__multifootnote_left_indent_bool
+\dim_new:N \l__multifootnote_left_indent_dim
+
+\keys_define:nn { multifootnote }
+ {
+ , left-align .bool_set:N = \l__multifootnote_left_align_bool
+ , left-align .initial:n = { false }
+ , left~align .bool_set:N = \l__multifootnote_left_align_bool
+ , left align .bool_set:N = \l__multifootnote_left_align_bool
+ , left-indent .code:n = {
+ \bool_set_true:N \l__multifootnote_left_indent_bool
+ \dim_set:Nn \l__multifootnote_left_indent_dim { #1 }
+ }
+ , left-indent .default:n = { 1.5em }
+ , left~indent .code:n = {
+ \bool_set_true:N \l__multifootnote_left_indent_bool
+ \dim_set:Nn \l__multifootnote_left_indent_dim { #1 }
+ }
+ , left~indent .default:n = { 1.5em }
+ , left indent .code:n = {
+ \bool_set_true:N \l__multifootnote_left_indent_bool
+ \dim_set:Nn \l__multifootnote_left_indent_dim { #1 }
+ }
+ , left indent .default:n = { 1.5em }
+ , unknown .code:n = {}
+ }
+\ProcessKeysOptions { multifootnote }
+
+\cs_new_protected:Nn \multifootnote_make_footnote_left_align:n
+ {
+ \renewcommand { \@makefntext } [1]
+ {
+ \skip_horizontal:n { #1 }
+ \tl_if_blank:eF { \text_expand:n { \@thefnmark } }
+ {
+ \@makefnmark
+ \nobreakspace
+ }
+ ##1
+ }
+ }
+
+\bool_if:NT \l__multifootnote_left_align_bool
+ {
+ \multifootnote_make_footnote_left_align:n { 0pt }
+ }
+\bool_if:NT \l__multifootnote_left_indent_bool
+ {
+ \multifootnote_make_footnote_left_align:n { \l__multifootnote_left_indent_dim }
+ }
+
+% First approach
+\NewDocumentCommand \multifootnotemark { O{} }
+ {
+ \footnotemark
+ \group_begin:
+ \tl_if_blank:nF { #1 }
+ {
+ \addtocounter { footnote } { -1 }
+ \refstepcounter { footnote }
+ \@ifpackageloaded { hyperref }
+ {
+ \cs_gset_eq:NN \@currentHref \Hy@footnote@currentHref
+ } {}
+ \label { #1 }
+ }
+ \group_end:
+ }
+\NewCommandCopy \footnotenumber \multifootnotemark
+
+\NewDocumentCommand \multifootnotetext { O{} m }
+ {
+ \group_begin:
+ \clist_clear:N \l_tmpa_clist
+ \clist_clear:N \l_tmpb_clist
+ \tl_if_blank:nF { #1 }
+ {
+ \clist_map_inline:nn { #1 }
+ {
+ \@ifpackageloaded { hyperref }
+ {
+ \clist_put_right:Nn \l_tmpa_clist
+ { \ref*{ ##1 } }
+ \clist_put_right:Nn \l_tmpb_clist
+ { \Hy@raisedlink { \hypertarget { \getrefbykeydefault{##1}{anchor}{Doc-Start} } {} } }
+ }
+ {
+ \clist_put_right:Nn \l_tmpa_clist
+ { \ref { ##1 } }
+ }
+ }
+ \def \thefootnote { \clist_use:Nn \l_tmpa_clist { , \skip_horizontal:n { \l_multifootnote_space_after_comma_dim } } }
+ }
+ \@ifpackageloaded { hyperref }
+ {
+ \xdef \Hy@footnote@currentHref { x\Hy@footnote@currentHref }
+ } {}
+ \footnotetext { \clist_use:Nn \l_tmpb_clist {} \ignorespaces #2 }
+ \group_end:
+ }
+
+% Second approach
+\NewDocumentCommand \multifootnotetag { m }
+ {
+ \footnotemark
+ \group_begin:
+ \def \thefootnote {}
+ \footnotetext { \vspace { -\baselineskip } }
+ \group_end:
+ \clist_map_inline:nn { #1 }
+ {
+ \cs_if_exist:cTF { multifootnote-tag- ##1 }
+ {
+ \tl_gput_right:cx { multifootnote-tag- ##1 } { , \skip_horizontal:n { \l_multifootnote_space_after_comma_dim } \thefootnote }
+ }
+ {
+ \cs_gset:cpx { multifootnote-tag- ##1 } { \thefootnote }
+ }
+ }
+ }
+\NewCommandCopy \footnotetag \multifootnotetag
+
+\NewDocumentCommand \multifootnotetagtext { O{} m }
+ {
+ \group_begin:
+ \tl_if_blank:nTF { #1 }
+ {
+ \def \thefootnote { }
+ }
+ {
+ \def \thefootnote { \use:c { multifootnote-tag- #1 } }
+ }
+ \footnotetext { #2 }
+ \group_end:
+ }
+
+% The combined interface for producing footnote text
+\NewDocumentCommand \multifootnote { O{} m }
+ {
+ \str_if_in:nnTF { #1 } { , }
+ {
+ \multifootnotetext [ #1 ] { #2 }
+ }
+ {
+ \multifootnotetagtext [ #1 ] { #2 }
+ }
+ }
+
+\endinput
+%%
+%% End of file `multifootnote.sty'.
diff --git a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
index 09b8ebd0b5..75069775ec 100644
--- a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+++ b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/profcollege/latex/ProfCollege.sty b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
index ac3760389a..45e407cf36 100644
--- a/macros/latex/contrib/profcollege/latex/ProfCollege.sty
+++ b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
@@ -3,7 +3,7 @@
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ProfCollege}[2022/06/01 v0.99-o Aide pour l'utilisation de LaTeX au college]
+\ProvidesPackage{ProfCollege}[2022/06/01 v0.99-p Aide pour l'utilisation de LaTeX au college]
\RequirePackage{verbatim}
@@ -13295,7 +13295,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false%
\setKV[ClesRatio]{#1}%
\xdef\EcartLargeur{\useKV[ClesRatio]{Largeur}}%
\ifboolKV[ClesRatio]{FigureCours}{%
- \ignoreemptyitems%
+ \setsepchar{,}\ignoreemptyitems%
\readlist*\ListeRatio{#2}%
\toklisteratio{}%
\foreachitem\compteur\in\ListeRatio{\expandafter\UpdateRatio\compteur\nil}%
@@ -13305,7 +13305,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false%
\MPTestCours[#1]{\useKV[ClesRatio]{Longueur}}{\NbUn}{\NbDeux}{\NbTrois}{\the\toklisteratio}{\useKV[ClesRatio]{CouleurUn}}{\useKV[ClesRatio]{CouleurDeux}}{\useKV[ClesRatio]{CouleurTrois}}%
}{%
\ifboolKV[ClesRatio]{Figure}{%
- \ignoreemptyitems%
+ \setsepchar{,}\ignoreemptyitems%
\readlist*\ListeRatio{#2}%
\toklisteratio{}%
\foreachitem\compteur\in\ListeRatio{\expandafter\UpdateRatio\compteur\nil}%
diff --git a/macros/latex/contrib/profcollege/metapost/PfCMonde.mp b/macros/latex/contrib/profcollege/metapost/PfCMonde-futurenew.mp
index c69de29ac0..2e7b5977f8 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCMonde.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCMonde-futurenew.mp
@@ -308,7 +308,7 @@ enddef;
string nomfichiermul,NomFichier;
vardef Lectureiles=
- nomfichiermul:=arborescence&"iles.dat";
+ nomfichiermul:=arborescence&"PfCiles.dat";
nblec:=scantokens readfrom nomfichiermul;
for p=1 upto nblec:
color Coord[],fond,Pays[];
@@ -350,7 +350,7 @@ vardef Lectureiles=
enddef;
vardef Lecturelacs=
- nomfichiermul:=arborescence&"lacs.dat";
+ nomfichiermul:=arborescence&"PfClacs.dat";
nblec:=scantokens readfrom nomfichiermul;
for p=1 upto nblec:
color Coord[],Pays[];
@@ -387,7 +387,7 @@ vardef Lecturelacs=
enddef;
vardef Lecturelacssup=
- nomfichiermul:=arborescence&"lacssup.dat";
+ nomfichiermul:=arborescence&"PfClacssup.dat";
nblec:=scantokens readfrom nomfichiermul;
for p=1 upto nblec:
color Coord[],Pays[];
@@ -425,7 +425,7 @@ enddef;
vardef Lecturevolcans=
drawoptions(withcolor orange);
- nomfichiermul:=arborescence&"volcans.dat";
+ nomfichiermul:=arborescence&"PfCvolcans.dat";
nblec:=scantokens readfrom nomfichiermul;
show nblec;
for p=1 upto nblec:
@@ -449,7 +449,7 @@ drawoptions();
enddef;
vardef Lecturerivieres=
- nomfichiermul:=arborescence&"rivieres.dat";
+ nomfichiermul:=arborescence&"PfCrivieres.dat";
nblec:=scantokens readfrom nomfichiermul;
for p=1 upto nblec:
color Coord[],fond,Pays[];
@@ -485,7 +485,7 @@ vardef Lecturerivieres=
enddef;
vardef Lecturerivieressup=
- nomfichiermul:=arborescence&"fleuveseurope.dat";
+ nomfichiermul:=arborescence&"PfCfleuveseurope.dat";
nblec:=scantokens readfrom nomfichiermul;
for p=1 upto nblec:
color Coord[],fond,Pays[];
@@ -522,7 +522,7 @@ enddef;
vardef Lecturecapitales=
marque_p:="creux";
- nomfichiermul:=arborescence&"capitales.dat";
+ nomfichiermul:=arborescence&"PfCcapitales.dat";
nbcapitales:=scantokens readfrom nomfichiermul;
for p=1 upto nbcapitales:
color Coord[];
@@ -675,9 +675,9 @@ enddef;
vardef Lectureilesp=
if (projection="mercator") or (projection="winkel") or (projection="cylindrique") or (projection="simple") or (projection="bonne"):
- nomfichiermul:=arborescence&"Ile.dat";
+ nomfichiermul:=arborescence&"PfCIle.dat";
else:
- nomfichiermul:=arborescence&"iles.dat";
+ nomfichiermul:=arborescence&"PfCiles.dat";
fi;
nblec:=scantokens readfrom nomfichiermul;
if projection="bonne":
@@ -736,7 +736,7 @@ vardef Lectureilesp=
clip currentpicture to feuillet;
fi;
if projection="bonne":
- lecturep(arborescence&"polesud.dat",blanc);
+ lecturep(arborescence&"PfCpolesud.dat",blanc);
clip currentpicture to (bonnec(-90,-180) for k=-89 upto 90:..bonnec(k,-180) endfor)..reverse(bonnec(-90,180) for k=-89 upto 90:..bonnec(k,180) endfor)..cycle;
fi;
enddef;
@@ -747,7 +747,7 @@ ecriturevilles:=true;
%14/05/2017
vardef Lecturevillesp(expr nompays)=
- nomfichiermul:=arborescence&"villes"&nompays&".dat";
+ nomfichiermul:=arborescence&"PfCvilles"&nompays&".dat";
nblec:=scantokens readfrom nomfichiermul;
drawoptions(withcolor (0.15,0.15,0.15));
for p=1 upto nblec:
@@ -808,7 +808,7 @@ enddef;
vardef Lecturelacsp=
- nomfichiermul:=arborescence&"lacs.dat";
+ nomfichiermul:=arborescence&"PfClacs.dat";
nblec:=scantokens readfrom nomfichiermul;
for p=1 upto nblec:
pair Coord[];
@@ -857,7 +857,7 @@ vardef Lecturelacsp=
enddef;
vardef Lecturelacspsup=
- nomfichiermul:=arborescence&"lacssup.dat";
+ nomfichiermul:=arborescence&"PfClacssup.dat";
nblec:=scantokens readfrom nomfichiermul;
for p=1 upto nblec:
pair Coord[];
@@ -906,7 +906,7 @@ vardef Lecturelacspsup=
enddef;
vardef Lecturerivieresp=
- nomfichiermul:=arborescence&"rivieres.dat";
+ nomfichiermul:=arborescence&"PfCrivieres.dat";
nblec:=scantokens readfrom nomfichiermul;
for p=1 upto nblec:
pair Coord[];
@@ -954,7 +954,7 @@ vardef Lecturerivieresp=
enddef;
vardef Lecturerivierespsup=
- nomfichiermul:=arborescence&"fleuveseurope.dat";
+ nomfichiermul:=arborescence&"PfCfleuveseurope.dat";
nblec:=scantokens readfrom nomfichiermul;
for p=1 upto nblec:
pair Coord[];
@@ -1003,7 +1003,7 @@ enddef;
vardef Lecturecapitalesp=
marque_p:="creux";
- nomfichiermul:=arborescence&"capitales.dat";
+ nomfichiermul:=arborescence&"PfCcapitales.dat";
nbcapitales:=scantokens readfrom nomfichiermul;
for p=1 upto nbcapitales:
pair Coord[],latlon;
@@ -1221,38 +1221,38 @@ vardef Projection(expr TH,PH,Zoom)=
fill (bonnec(-90,-180) for k=-85 step 5 until 90:..bonnec(k,-180) endfor)..reverse(bonnec(-90,180) for k=-85 step 5 until 90:..bonnec(k,180) endfor)..cycle withcolor couleurfond;
fi;
if All=true:
- Lecture("Cameriquesud.dat");
- Lecture("Ccaraibes.dat");
- Lecture("Cameriquecentrale.dat");
- Lecture("Cameriquenord.dat");
- Lecture("Casia.dat");
- Lecture("Ceurope.dat");
- Lecture("Cafrique.dat");
+ Lecture("PfCCameriquesud.dat");
+ Lecture("PfCCcaraibes.dat");
+ Lecture("PfCCameriquecentrale.dat");
+ Lecture("PfCCameriquenord.dat");
+ Lecture("PfCCasia.dat");
+ Lecture("PfCCeurope.dat");
+ Lecture("PfCCafrique.dat");
else:
if Amsud=true:
- Lecture("Cameriquesud.dat");
+ Lecture("PfCCameriquesud.dat");
fi;
if Amnord=true:
- Lecture("Cameriquenord.dat");
+ Lecture("PfCCameriquenord.dat");
fi;
if Amcentrale=true:
- Lecture("Cameriquecentrale.dat");
+ Lecture("PfCCameriquecentrale.dat");
fi;
if Caraibes=true:
- Lecture("Ccaraibes.dat");
+ Lecture("PfCCcaraibes.dat");
fi;
if Asie=true:
if projection="bonne":
- Lecture("Casie.dat");
+ Lecture("PfCCasie.dat");
else:
- Lecture("Casia.dat");
+ Lecture("PfCCasia.dat");
fi;
fi;
if Europe=true:
- Lecture("Ceurope.dat");
+ Lecture("PfCCeurope.dat");
fi;
if Afrique=true:
- Lecture("Cafrique.dat");
+ Lecture("PfCCafrique.dat");
fi;
fi;
if lacs=true:
@@ -1288,13 +1288,13 @@ vardef Simple(expr TH,PH,Zoom)=
theta:=TH;
phi:=PH;
zoom(Zoom);
- Lecture("Cameriquesud.dat");
- Lecture("Ccaraibes.dat");
- Lecture("Cameriquecentrale.dat");
- Lecture("Cameriquenord.dat");
- Lecture("Casia.dat");
- Lecture("Ceurope.dat");
- Lecture("Cafrique.dat");
+ Lecture("PfCCameriquesud.dat");
+ Lecture("PfCCcaraibes.dat");
+ Lecture("PfCCameriquecentrale.dat");
+ Lecture("PfCCameriquenord.dat");
+ Lecture("PfCCasia.dat");
+ Lecture("PfCCeurope.dat");
+ Lecture("PfCCafrique.dat");
if lacs=true:
Lecturelacsp;
Lecturelacspsup;
@@ -1316,13 +1316,13 @@ vardef Mercator(expr TH,PH,Zoom)=
theta:=TH;
phi:=PH;
zoom(Zoom);
- Lecture("Cameriquesud.dat");
- Lecture("Ccaraibes.dat");
- Lecture("Cameriquecentrale.dat");
- Lecture("Cameriquenord.dat");
- Lecture("Casia.dat");
- Lecture("Ceurope.dat");
- Lecture("Cafrique.dat");
+ Lecture("PfCCameriquesud.dat");
+ Lecture("PfCCcaraibes.dat");
+ Lecture("PfCCameriquecentrale.dat");
+ Lecture("PfCCameriquenord.dat");
+ Lecture("PfCCasia.dat");
+ Lecture("PfCCeurope.dat");
+ Lecture("PfCCafrique.dat");
if lacs=true:
Lecturelacsp;
Lecturelacspsup;
@@ -1344,13 +1344,13 @@ vardef Winkel(expr TH,PH,Zoom)=
theta:=TH;
phi:=PH;
zoom(Zoom);
- Lecture("Cameriquesud.dat");
- Lecture("Ccaraibes.dat");
- Lecture("Cameriquecentrale.dat");
- Lecture("Cameriquenord.dat");
- Lecture("Casia.dat");
- Lecture("Ceurope.dat");
- Lecture("Cafrique.dat");
+ Lecture("PfCCameriquesud.dat");
+ Lecture("PfCCcaraibes.dat");
+ Lecture("PfCCameriquecentrale.dat");
+ Lecture("PfCCameriquenord.dat");
+ Lecture("PfCCasia.dat");
+ Lecture("PfCCeurope.dat");
+ Lecture("PfCCafrique.dat");
if lacs=true:
Lecturelacsp;
Lecturelacspsup;
@@ -1372,13 +1372,13 @@ vardef Cylindrique(expr TH,PH,Zoom)=
theta:=TH;
phi:=PH;
zoom(Zoom);
- Lecture("Cameriquesud.dat");
- Lecture("Ccaraibes.dat");
- Lecture("Cameriquecentrale.dat");
- Lecture("Cameriquenord.dat");
- Lecture("Casia.dat");
- Lecture("Ceurope.dat");
- Lecture("Cafrique.dat");
+ Lecture("PfCCameriquesud.dat");
+ Lecture("PfCCcaraibes.dat");
+ Lecture("PfCCameriquecentrale.dat");
+ Lecture("PfCCameriquenord.dat");
+ Lecture("PfCCasia.dat");
+ Lecture("PfCCeurope.dat");
+ Lecture("PfCCafrique.dat");
if lacs=true:
Lecturelacsp;
Lecturelacspsup;
@@ -1401,13 +1401,13 @@ vardef Bonne(expr TH,PH,Zoom)=
phi:=PH;
zoom(Zoom);
fill (bonnec(-90,-180) for k=-85 step 5 until 90:..bonnec(k,-180) endfor)..reverse(bonnec(-90,180) for k=-85 step 5 until 90:..bonnec(k,180) endfor)..cycle withcolor couleurfond;
- Lecture("Cameriquesud.dat");
- Lecture("Ccaraibes.dat");
- Lecture("Cameriquecentrale.dat");
- Lecture("Cameriquenord.dat");
- Lecture("Casie.dat");
- Lecture("Ceurope.dat");
- Lecture("Cafrique.dat");
+ Lecture("PfCCameriquesud.dat");
+ Lecture("PfCCcaraibes.dat");
+ Lecture("PfCCameriquecentrale.dat");
+ Lecture("PfCCameriquenord.dat");
+ Lecture("PfCCasie.dat");
+ Lecture("PfCCeurope.dat");
+ Lecture("PfCCafrique.dat");
if lacs=true:
Lecturelacsp;
Lecturelacspsup;
@@ -1429,13 +1429,13 @@ enddef;
vardef ConiqueH=
projection:="coniqueh";
- Lecture("Cameriquesud.dat");
- Lecture("Ccaraibes.dat");
- Lecture("Cameriquecentrale.dat");
- Lecture("Cameriquenord.dat");
- Lecture("Casie.dat");
- Lecture("Ceurope.dat");
- Lecture("Cafrique.dat");
+ Lecture("PfCCameriquesud.dat");
+ Lecture("PfCCcaraibes.dat");
+ Lecture("PfCCameriquecentrale.dat");
+ Lecture("PfCCameriquenord.dat");
+ Lecture("PfCCasie.dat");
+ Lecture("PfCCeurope.dat");
+ Lecture("PfCCafrique.dat");
if lacs=true:
Lecturelacsp;
Lecturelacspsup;
@@ -1455,13 +1455,13 @@ enddef;
vardef ConiqueB=
projection:="coniqueb";
- Lecture("Cameriquesud.dat");
- Lecture("Ccaraibes.dat");
- Lecture("Cameriquecentrale.dat");
- Lecture("Cameriquenord.dat");
- Lecture("Casie.dat");
- Lecture("Ceurope.dat");
- Lecture("Cafrique.dat");
+ Lecture("PfCCameriquesud.dat");
+ Lecture("PfCCcaraibes.dat");
+ Lecture("PfCCameriquecentrale.dat");
+ Lecture("PfCCameriquenord.dat");
+ Lecture("PfCCasie.dat");
+ Lecture("PfCCeurope.dat");
+ Lecture("PfCCafrique.dat");
if lacs=true:
Lecturelacsp;
Lecturelacspsup;
@@ -1521,13 +1521,13 @@ vardef Mappemonde(expr longobs,latobs)=
phip:=phii;
fi;
fill cercles(pte3,pte1,pte3,pte1,pte4) withcolor couleurfond;
- Lecture("Cameriquesud.dat");
- Lecture("Ccaraibes.dat");
- Lecture("Cameriquecentrale.dat");
- Lecture("Cameriquenord.dat");
- Lecture("Casie.dat");
- Lecture("Ceurope.dat");
- Lecture("Cafrique.dat");
+ Lecture("PfCCameriquesud.dat");
+ Lecture("PfCCcaraibes.dat");
+ Lecture("PfCCameriquecentrale.dat");
+ Lecture("PfCCameriquenord.dat");
+ Lecture("PfCCasie.dat");
+ Lecture("PfCCeurope.dat");
+ Lecture("PfCCafrique.dat");
if volcans=true:
Lecturevolcans;
fi;
@@ -1580,13 +1580,13 @@ vardef mappemonde(expr longobs,latobs)=
phip:=phii;
fi;
fill cercles(pte3,pte1,pte3,pte1,pte4) withcolor couleurfond;
- Lecture("Cameriquesud.dat");
- Lecture("Ccaraibes.dat");
- Lecture("Cameriquecentrale.dat");
- Lecture("Cameriquenord.dat");
- Lecture("Casie.dat");
- Lecture("Ceurope.dat");
- Lecture("Cafrique.dat");
+ Lecture("PfCCameriquesud.dat");
+ Lecture("PfCCcaraibes.dat");
+ Lecture("PfCCameriquecentrale.dat");
+ Lecture("PfCCameriquenord.dat");
+ Lecture("PfCCasie.dat");
+ Lecture("PfCCeurope.dat");
+ Lecture("PfCCafrique.dat");
if volcans=true:
Lecturevolcans;
fi;
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/Cafrique.dat b/macros/latex/contrib/profcollege/metapost/datastest/Cafrique.dat
deleted file mode 100644
index bdd6175c28..0000000000
--- a/macros/latex/contrib/profcollege/metapost/datastest/Cafrique.dat
+++ /dev/null
@@ -1,51 +0,0 @@
-50
-arborescence&"somalie.dat",jaune
-arborescence&"djibouti.dat",vert
-arborescence&"eritre.dat",bleu
-arborescence&"ethiopie.dat",rouge
-arborescence&"soudan.dat",rose
-arborescence&"egypte.dat",violet
-arborescence&"libye.dat",orange
-arborescence&"tchad.dat",jaune
-arborescence&"kenya.dat",violet
-arborescence&"ouganda.dat",vert
-arborescence&"tanzanie.dat",bleu
-arborescence&"rwanda.dat",rouge
-arborescence&"burundi.dat",rose
-arborescence&"mozambique.dat",violet
-arborescence&"malawi.dat",orange
-arborescence&"zimbabwe.dat",gris
-arborescence&"zambie.dat",rose
-arborescence&"zaire.dat",orange
-arborescence&"repcentreafrique.dat",bleu
-arborescence&"afriquesud1.dat",rouge
-arborescence&"afriquesud2.dat",rouge
-arborescence&"lesotho.dat",rose
-arborescence&"swaziland.dat",jaune
-arborescence&"botswana.dat",orange
-arborescence&"angola.dat",gris
-arborescence&"namibie.dat",jaune
-arborescence&"congo.dat",vert
-arborescence&"cabinda.dat",bleu
-arborescence&"cameroun.dat",rouge
-arborescence&"gabon.dat",rose
-arborescence&"riomuni.dat",violet
-arborescence&"nigeria.dat",orange
-arborescence&"niger.dat",gris
-arborescence&"tunisie.dat",jaune
-arborescence&"algerie.dat",vert
-arborescence&"benin.dat",bleu
-arborescence&"togo.dat",rouge
-arborescence&"ghana.dat",rose
-arborescence&"burkinafaso.dat",violet
-arborescence&"coteivoire.dat",orange
-arborescence&"mali.dat",jaune
-arborescence&"maroc.dat",jaune
-arborescence&"mauritanie.dat",rouge
-arborescence&"saharaouest.dat",bleu
-arborescence&"liberia.dat",rouge
-arborescence&"guinee.dat",rose
-arborescence&"sierraleone.dat",violet
-arborescence&"senegal.dat",orange
-arborescence&"gambie.dat",gris
-arborescence&"guineebissau.dat",jaune \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/Cameriquecentrale.dat b/macros/latex/contrib/profcollege/metapost/datastest/Cameriquecentrale.dat
deleted file mode 100644
index 66c8bcc9ab..0000000000
--- a/macros/latex/contrib/profcollege/metapost/datastest/Cameriquecentrale.dat
+++ /dev/null
@@ -1,9 +0,0 @@
-8
-arborescence&"panama1.dat",vert
-arborescence&"panama2.dat",vert
-arborescence&"costarica.dat",jaune
-arborescence&"nicaragua.dat",bleu
-arborescence&"honduras.dat",rouge
-arborescence&"salvador.dat",violet
-arborescence&"belize.dat",jaune
-arborescence&"guatemala.dat",rose \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/Cameriquenord.dat b/macros/latex/contrib/profcollege/metapost/datastest/Cameriquenord.dat
deleted file mode 100644
index f0452eeeee..0000000000
--- a/macros/latex/contrib/profcollege/metapost/datastest/Cameriquenord.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-4
-arborescence&"mexique.dat",violet
-arborescence&"usa1.dat",orange
-arborescence&"usa2.dat",orange
-arborescence&"canada.dat",jaune \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/Cameriquesud.dat b/macros/latex/contrib/profcollege/metapost/datastest/Cameriquesud.dat
deleted file mode 100644
index 1b60bf7c97..0000000000
--- a/macros/latex/contrib/profcollege/metapost/datastest/Cameriquesud.dat
+++ /dev/null
@@ -1,17 +0,0 @@
-16
-arborescence&"bresil.dat",vert
-arborescence&"uruguay.dat",jaune
-arborescence&"paraguay.dat",jaune
-arborescence&"bolivie1.dat",bleu
-arborescence&"bolivie2.dat",bleu
-arborescence&"argentine1.dat",rouge
-arborescence&"argentine2.dat",rouge
-arborescence&"chili1.dat",violet
-arborescence&"chili2.dat",violet
-arborescence&"guineef.dat",jaune
-arborescence&"surinam.dat",rouge
-arborescence&"guyane.dat",orange
-arborescence&"venezuela.dat",bleu
-arborescence&"colombie.dat",rouge
-arborescence&"perou.dat",rose
-arborescence&"equateur.dat",jaune \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/Casia.dat b/macros/latex/contrib/profcollege/metapost/datastest/Casia.dat
deleted file mode 100644
index a74dc0e4a4..0000000000
--- a/macros/latex/contrib/profcollege/metapost/datastest/Casia.dat
+++ /dev/null
@@ -1,49 +0,0 @@
-48
-arborescence&"russie3.dat",rouge
-arborescence&"russie3bis.dat",rouge
-arborescence&"coreesud.dat",jaune
-arborescence&"coreenord.dat",rose
-arborescence&"chine.dat",vert
-arborescence&"mongolie.dat",violet
-arborescence&"kazakhstan.dat",jaune
-arborescence&"nvelleguinne.dat",bleu
-arborescence&"indonesie1.dat",orange
-arborescence&"indonesie2.dat",orange
-arborescence&"malaisie1.dat",rose
-arborescence&"malaisie2.dat",rose
-arborescence&"brunei.dat",bleu
-arborescence&"vietnam.dat",jaune
-arborescence&"cambodge.dat",violet
-arborescence&"laos.dat",rouge
-arborescence&"thailande.dat",bleu
-arborescence&"birmanie.dat",orange
-arborescence&"inde.dat",gris
-arborescence&"bangladesh.dat",jaune
-arborescence&"bhutan.dat",violet
-arborescence&"nepal.dat",rouge
-arborescence&"pakistan.dat",bleu
-arborescence&"kyrgyzstan.dat",blanc
-arborescence&"tajikistan.dat",jaune
-arborescence&"afganistan.dat",violet
-arborescence&"ouzbekistan.dat",rose
-arborescence&"turkmenistan.dat",bleu
-arborescence&"iran.dat",rouge
-arborescence&"azerbaijan1.dat",orange
-arborescence&"azerbaijan2.dat",orange
-arborescence&"georgie.dat",jaune
-arborescence&"armenie.dat",vert
-arborescence&"turquie1.dat",violet
-arborescence&"koweit.dat",jaune
-arborescence&"irak.dat",vert
-arborescence&"syrie.dat",bleu
-arborescence&"liban.dat",rouge
-arborescence&"quatar.dat",violet
-arborescence&"oman1.dat",vert
-arborescence&"oman2.dat",vert
-arborescence&"emirats.dat",rose
-arborescence&"yemen.dat",jaune
-arborescence&"arabiesaoudite.dat",bleu
-arborescence&"jordanie.dat",rouge
-arborescence&"westbank.dat",violet
-arborescence&"israel.dat",vert
-arborescence&"gaza.dat",rose \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/Casie.dat b/macros/latex/contrib/profcollege/metapost/datastest/Casie.dat
deleted file mode 100644
index 39398358b1..0000000000
--- a/macros/latex/contrib/profcollege/metapost/datastest/Casie.dat
+++ /dev/null
@@ -1,48 +0,0 @@
-47
-arborescence&"russie1.dat",rouge
-arborescence&"coreesud.dat",jaune
-arborescence&"coreenord.dat",rose
-arborescence&"chine.dat",vert
-arborescence&"mongolie.dat",violet
-arborescence&"kazakhstan.dat",jaune
-arborescence&"nvelleguinne.dat",bleu
-arborescence&"indonesie1.dat",orange
-arborescence&"indonesie2.dat",orange
-arborescence&"malaisie1.dat",rose
-arborescence&"malaisie2.dat",rose
-arborescence&"brunei.dat",bleu
-arborescence&"vietnam.dat",jaune
-arborescence&"cambodge.dat",violet
-arborescence&"laos.dat",rouge
-arborescence&"thailande.dat",bleu
-arborescence&"birmanie.dat",orange
-arborescence&"inde.dat",gris
-arborescence&"bangladesh.dat",jaune
-arborescence&"bhutan.dat",violet
-arborescence&"nepal.dat",rouge
-arborescence&"pakistan.dat",bleu
-arborescence&"kyrgyzstan.dat",blanc
-arborescence&"tajikistan.dat",jaune
-arborescence&"afganistan.dat",violet
-arborescence&"ouzbekistan.dat",rose
-arborescence&"turkmenistan.dat",bleu
-arborescence&"iran.dat",rouge
-arborescence&"azerbaijan1.dat",orange
-arborescence&"azerbaijan2.dat",orange
-arborescence&"georgie.dat",jaune
-arborescence&"armenie.dat",vert
-arborescence&"turquie1.dat",violet
-arborescence&"koweit.dat",jaune
-arborescence&"irak.dat",vert
-arborescence&"syrie.dat",bleu
-arborescence&"liban.dat",rouge
-arborescence&"quatar.dat",violet
-arborescence&"oman1.dat",vert
-arborescence&"oman2.dat",vert
-arborescence&"emirats.dat",rose
-arborescence&"yemen.dat",jaune
-arborescence&"arabiesaoudite.dat",bleu
-arborescence&"jordanie.dat",rouge
-arborescence&"westbank.dat",violet
-arborescence&"israel.dat",vert
-arborescence&"gaza.dat",rose \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/Ccaraibes.dat b/macros/latex/contrib/profcollege/metapost/datastest/Ccaraibes.dat
deleted file mode 100644
index 13e1f2d9fa..0000000000
--- a/macros/latex/contrib/profcollege/metapost/datastest/Ccaraibes.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-2
-arborescence&"repdominicaine.dat",bleu
-arborescence&"haiti.dat",vert \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/Ceurope.dat b/macros/latex/contrib/profcollege/metapost/datastest/Ceurope.dat
deleted file mode 100644
index dff34394cb..0000000000
--- a/macros/latex/contrib/profcollege/metapost/datastest/Ceurope.dat
+++ /dev/null
@@ -1,49 +0,0 @@
-48
-arborescence&"finlande.dat",jaune
-arborescence&"norvege.dat",bleu
-arborescence&"suede.dat",rouge
-arborescence&"estonie.dat",violet
-arborescence&"belarussie.dat",bleu
-arborescence&"lettonie.dat",rose
-arborescence&"lithuanie1.dat",jaune
-arborescence&"lithuanie2.dat",jaune
-arborescence&"russie2.dat",rouge
-arborescence&"ukraine.dat",orange
-arborescence&"pologne.dat",rose
-arborescence&"slovaquie.dat",bleu
-arborescence&"tcheque.dat",gris
-arborescence&"moldavie.dat",jaune
-arborescence&"roumanie.dat",rouge
-arborescence&"bulgarie.dat",orange
-arborescence&"turquie2.dat",violet
-arborescence&"grece.dat",jaune
-arborescence&"macedoine.dat",vert
-arborescence&"yougoslavie.dat",bleu
-arborescence&"albanie.dat",rouge
-arborescence&"bosnie1.dat",orange
-arborescence&"bosnie2.dat",gris
-arborescence&"croatie.dat",rose
-arborescence&"hongrie.dat",vert
-arborescence&"autriche.dat",jaune
-arborescence&"slovenie.dat",orange
-arborescence&"italie.dat",vert
-arborescence&"sanmarin.dat",bleu
-arborescence&"allemagne1.dat",vert
-arborescence&"allemagne2.dat",vert
-arborescence&"danemark.dat",violet
-arborescence&"liechtenstein.dat",jaune
-arborescence&"suisse.dat",rouge
-arborescence&"paysbas.dat",jaune
-arborescence&"luxembourg.dat",violet
-arborescence&"belgique.dat",orange
-arborescence&"france.dat",jaune
-arborescence&"andorre.dat",gris
-arborescence&"monaco.dat",gris
-arborescence&"espagne.dat",rouge
-arborescence&"portugal.dat",jaune
-arborescence&"gibraltar.dat",gris
-arborescence&"angleterre.dat",gris
-arborescence&"ecosse.dat",jaune
-arborescence&"paysdegalles.dat",rouge
-arborescence&"irelandenord.dat",bleu
-arborescence&"irelande.dat",vert \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/PfCCafrique.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCCafrique.dat
new file mode 100644
index 0000000000..558854c216
--- /dev/null
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCCafrique.dat
@@ -0,0 +1,51 @@
+50
+arborescence&"PfCsomalie.dat",jaune
+arborescence&"PfCdjibouti.dat",vert
+arborescence&"PfCeritre.dat",bleu
+arborescence&"PfCethiopie.dat",rouge
+arborescence&"PfCsoudan.dat",rose
+arborescence&"PfCegypte.dat",violet
+arborescence&"PfClibye.dat",orange
+arborescence&"PfCtchad.dat",jaune
+arborescence&"PfCkenya.dat",violet
+arborescence&"PfCouganda.dat",vert
+arborescence&"PfCtanzanie.dat",bleu
+arborescence&"PfCrwanda.dat",rouge
+arborescence&"PfCburundi.dat",rose
+arborescence&"PfCmozambique.dat",violet
+arborescence&"PfCmalawi.dat",orange
+arborescence&"PfCzimbabwe.dat",gris
+arborescence&"PfCzambie.dat",rose
+arborescence&"PfCzaire.dat",orange
+arborescence&"PfCrepcentreafrique.dat",bleu
+arborescence&"PfCafriquesud1.dat",rouge
+arborescence&"PfCafriquesud2.dat",rouge
+arborescence&"PfClesotho.dat",rose
+arborescence&"PfCswaziland.dat",jaune
+arborescence&"PfCbotswana.dat",orange
+arborescence&"PfCangola.dat",gris
+arborescence&"PfCnamibie.dat",jaune
+arborescence&"PfCcongo.dat",vert
+arborescence&"PfCcabinda.dat",bleu
+arborescence&"PfCcameroun.dat",rouge
+arborescence&"PfCgabon.dat",rose
+arborescence&"PfCriomuni.dat",violet
+arborescence&"PfCnigeria.dat",orange
+arborescence&"PfCniger.dat",gris
+arborescence&"PfCtunisie.dat",jaune
+arborescence&"PfCalgerie.dat",vert
+arborescence&"PfCbenin.dat",bleu
+arborescence&"PfCtogo.dat",rouge
+arborescence&"PfCghana.dat",rose
+arborescence&"PfCburkinafaso.dat",violet
+arborescence&"PfCcoteivoire.dat",orange
+arborescence&"PfCmali.dat",jaune
+arborescence&"PfCmaroc.dat",jaune
+arborescence&"PfCmauritanie.dat",rouge
+arborescence&"PfCsaharaouest.dat",bleu
+arborescence&"PfCliberia.dat",rouge
+arborescence&"PfCguinee.dat",rose
+arborescence&"PfCsierraleone.dat",violet
+arborescence&"PfCsenegal.dat",orange
+arborescence&"PfCgambie.dat",gris
+arborescence&"PfCguineebissau.dat",jaune \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/PfCCameriquecentrale.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCCameriquecentrale.dat
new file mode 100644
index 0000000000..f25ed3a1e7
--- /dev/null
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCCameriquecentrale.dat
@@ -0,0 +1,9 @@
+8
+arborescence&"PfCpanama1.dat",vert
+arborescence&"PfCpanama2.dat",vert
+arborescence&"PfCcostarica.dat",jaune
+arborescence&"PfCnicaragua.dat",bleu
+arborescence&"PfChonduras.dat",rouge
+arborescence&"PfCsalvador.dat",violet
+arborescence&"PfCbelize.dat",jaune
+arborescence&"PfCguatemala.dat",rose \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/PfCCameriquenord.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCCameriquenord.dat
new file mode 100644
index 0000000000..3fbd9bfe5d
--- /dev/null
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCCameriquenord.dat
@@ -0,0 +1,5 @@
+4
+arborescence&"PfCmexique.dat",violet
+arborescence&"PfCusa1.dat",orange
+arborescence&"PfCusa2.dat",orange
+arborescence&"PfCcanada.dat",jaune \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/PfCCameriquesud.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCCameriquesud.dat
new file mode 100644
index 0000000000..f97acdd67f
--- /dev/null
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCCameriquesud.dat
@@ -0,0 +1,17 @@
+16
+arborescence&"PfCbresil.dat",vert
+arborescence&"PfCuruguay.dat",jaune
+arborescence&"PfCparaguay.dat",jaune
+arborescence&"PfCbolivie1.dat",bleu
+arborescence&"PfCbolivie2.dat",bleu
+arborescence&"PfCargentine1.dat",rouge
+arborescence&"PfCargentine2.dat",rouge
+arborescence&"PfCchili1.dat",violet
+arborescence&"PfCchili2.dat",violet
+arborescence&"PfCguineef.dat",jaune
+arborescence&"PfCsurinam.dat",rouge
+arborescence&"PfCguyane.dat",orange
+arborescence&"PfCvenezuela.dat",bleu
+arborescence&"PfCcolombie.dat",rouge
+arborescence&"PfCperou.dat",rose
+arborescence&"PfCequateur.dat",jaune \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/PfCCasia.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCCasia.dat
new file mode 100644
index 0000000000..770d19c63a
--- /dev/null
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCCasia.dat
@@ -0,0 +1,49 @@
+48
+arborescence&"PfCrussie3.dat",rouge
+arborescence&"PfCrussie3bis.dat",rouge
+arborescence&"PfCcoreesud.dat",jaune
+arborescence&"PfCcoreenord.dat",rose
+arborescence&"PfCchine.dat",vert
+arborescence&"PfCmongolie.dat",violet
+arborescence&"PfCkazakhstan.dat",jaune
+arborescence&"PfCnvelleguinne.dat",bleu
+arborescence&"PfCindonesie1.dat",orange
+arborescence&"PfCindonesie2.dat",orange
+arborescence&"PfCmalaisie1.dat",rose
+arborescence&"PfCmalaisie2.dat",rose
+arborescence&"PfCbrunei.dat",bleu
+arborescence&"PfCvietnam.dat",jaune
+arborescence&"PfCcambodge.dat",violet
+arborescence&"PfClaos.dat",rouge
+arborescence&"PfCthailande.dat",bleu
+arborescence&"PfCbirmanie.dat",orange
+arborescence&"PfCinde.dat",gris
+arborescence&"PfCbangladesh.dat",jaune
+arborescence&"PfCbhutan.dat",violet
+arborescence&"PfCnepal.dat",rouge
+arborescence&"PfCpakistan.dat",bleu
+arborescence&"PfCkyrgyzstan.dat",blanc
+arborescence&"PfCtajikistan.dat",jaune
+arborescence&"PfCafganistan.dat",violet
+arborescence&"PfCouzbekistan.dat",rose
+arborescence&"PfCturkmenistan.dat",bleu
+arborescence&"PfCiran.dat",rouge
+arborescence&"PfCazerbaijan1.dat",orange
+arborescence&"PfCazerbaijan2.dat",orange
+arborescence&"PfCgeorgie.dat",jaune
+arborescence&"PfCarmenie.dat",vert
+arborescence&"PfCturquie1.dat",violet
+arborescence&"PfCkoweit.dat",jaune
+arborescence&"PfCirak.dat",vert
+arborescence&"PfCsyrie.dat",bleu
+arborescence&"PfCliban.dat",rouge
+arborescence&"PfCquatar.dat",violet
+arborescence&"PfComan1.dat",vert
+arborescence&"PfComan2.dat",vert
+arborescence&"PfCemirats.dat",rose
+arborescence&"PfCyemen.dat",jaune
+arborescence&"PfCarabiesaoudite.dat",bleu
+arborescence&"PfCjordanie.dat",rouge
+arborescence&"PfCwestbank.dat",violet
+arborescence&"PfCisrael.dat",vert
+arborescence&"PfCgaza.dat",rose \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/PfCCasie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCCasie.dat
new file mode 100644
index 0000000000..941b3e6889
--- /dev/null
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCCasie.dat
@@ -0,0 +1,48 @@
+47
+arborescence&"PfCrussie1.dat",rouge
+arborescence&"PfCcoreesud.dat",jaune
+arborescence&"PfCcoreenord.dat",rose
+arborescence&"PfCchine.dat",vert
+arborescence&"PfCmongolie.dat",violet
+arborescence&"PfCkazakhstan.dat",jaune
+arborescence&"PfCnvelleguinne.dat",bleu
+arborescence&"PfCindonesie1.dat",orange
+arborescence&"PfCindonesie2.dat",orange
+arborescence&"PfCmalaisie1.dat",rose
+arborescence&"PfCmalaisie2.dat",rose
+arborescence&"PfCbrunei.dat",bleu
+arborescence&"PfCvietnam.dat",jaune
+arborescence&"PfCcambodge.dat",violet
+arborescence&"PfClaos.dat",rouge
+arborescence&"PfCthailande.dat",bleu
+arborescence&"PfCbirmanie.dat",orange
+arborescence&"PfCinde.dat",gris
+arborescence&"PfCbangladesh.dat",jaune
+arborescence&"PfCbhutan.dat",violet
+arborescence&"PfCnepal.dat",rouge
+arborescence&"PfCpakistan.dat",bleu
+arborescence&"PfCkyrgyzstan.dat",blanc
+arborescence&"PfCtajikistan.dat",jaune
+arborescence&"PfCafganistan.dat",violet
+arborescence&"PfCouzbekistan.dat",rose
+arborescence&"PfCturkmenistan.dat",bleu
+arborescence&"PfCiran.dat",rouge
+arborescence&"PfCazerbaijan1.dat",orange
+arborescence&"PfCazerbaijan2.dat",orange
+arborescence&"PfCgeorgie.dat",jaune
+arborescence&"PfCarmenie.dat",vert
+arborescence&"PfCturquie1.dat",violet
+arborescence&"PfCkoweit.dat",jaune
+arborescence&"PfCirak.dat",vert
+arborescence&"PfCsyrie.dat",bleu
+arborescence&"PfCliban.dat",rouge
+arborescence&"PfCquatar.dat",violet
+arborescence&"PfComan1.dat",vert
+arborescence&"PfComan2.dat",vert
+arborescence&"PfCemirats.dat",rose
+arborescence&"PfCyemen.dat",jaune
+arborescence&"PfCarabiesaoudite.dat",bleu
+arborescence&"PfCjordanie.dat",rouge
+arborescence&"PfCwestbank.dat",violet
+arborescence&"PfCisrael.dat",vert
+arborescence&"PfCgaza.dat",rose \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/PfCCcaraibes.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCCcaraibes.dat
new file mode 100644
index 0000000000..664a753d66
--- /dev/null
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCCcaraibes.dat
@@ -0,0 +1,3 @@
+2
+arborescence&"PfCrepdominicaine.dat",bleu
+arborescence&"PfChaiti.dat",vert \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/PfCCeurope.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCCeurope.dat
new file mode 100644
index 0000000000..6f09c20631
--- /dev/null
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCCeurope.dat
@@ -0,0 +1,49 @@
+48
+arborescence&"PfCfinlande.dat",jaune
+arborescence&"PfCnorvege.dat",bleu
+arborescence&"PfCsuede.dat",rouge
+arborescence&"PfCestonie.dat",violet
+arborescence&"PfCbelarussie.dat",bleu
+arborescence&"PfClettonie.dat",rose
+arborescence&"PfClithuanie1.dat",jaune
+arborescence&"PfClithuanie2.dat",jaune
+arborescence&"PfCrussie2.dat",rouge
+arborescence&"PfCukraine.dat",orange
+arborescence&"PfCpologne.dat",rose
+arborescence&"PfCslovaquie.dat",bleu
+arborescence&"PfCtcheque.dat",gris
+arborescence&"PfCmoldavie.dat",jaune
+arborescence&"PfCroumanie.dat",rouge
+arborescence&"PfCbulgarie.dat",orange
+arborescence&"PfCturquie2.dat",violet
+arborescence&"PfCgrece.dat",jaune
+arborescence&"PfCmacedoine.dat",vert
+arborescence&"PfCyougoslavie.dat",bleu
+arborescence&"PfCalbanie.dat",rouge
+arborescence&"PfCbosnie1.dat",orange
+arborescence&"PfCbosnie2.dat",gris
+arborescence&"PfCcroatie.dat",rose
+arborescence&"PfChongrie.dat",vert
+arborescence&"PfCautriche.dat",jaune
+arborescence&"PfCslovenie.dat",orange
+arborescence&"PfCitalie.dat",vert
+arborescence&"PfCsanmarin.dat",bleu
+arborescence&"PfCallemagne1.dat",vert
+arborescence&"PfCallemagne2.dat",vert
+arborescence&"PfCdanemark.dat",violet
+arborescence&"PfCliechtenstein.dat",jaune
+arborescence&"PfCsuisse.dat",rouge
+arborescence&"PfCpaysbas.dat",jaune
+arborescence&"PfCluxembourg.dat",violet
+arborescence&"PfCbelgique.dat",orange
+arborescence&"PfCfrance.dat",jaune
+arborescence&"PfCandorre.dat",gris
+arborescence&"PfCmonaco.dat",gris
+arborescence&"PfCespagne.dat",rouge
+arborescence&"PfCportugal.dat",jaune
+arborescence&"PfCgibraltar.dat",gris
+arborescence&"PfCangleterre.dat",gris
+arborescence&"PfCecosse.dat",jaune
+arborescence&"PfCpaysdegalles.dat",rouge
+arborescence&"PfCirelandenord.dat",bleu
+arborescence&"PfCirelande.dat",vert \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/Ile.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCIle.dat
index 0903c932f1..0903c932f1 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/Ile.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCIle.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/afganistan.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCafganistan.dat
index 9f64c71a0f..9f64c71a0f 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/afganistan.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCafganistan.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/afriquesud1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCafriquesud1.dat
index 832070115a..832070115a 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/afriquesud1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCafriquesud1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/afriquesud2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCafriquesud2.dat
index 7f25e66128..7f25e66128 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/afriquesud2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCafriquesud2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/albanie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCalbanie.dat
index c39ed887ad..c39ed887ad 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/albanie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCalbanie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/algerie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCalgerie.dat
index 4c0053e1cf..4c0053e1cf 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/algerie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCalgerie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/allemagne1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCallemagne1.dat
index c7064f29e0..c7064f29e0 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/allemagne1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCallemagne1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/allemagne2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCallemagne2.dat
index 08639055f8..08639055f8 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/allemagne2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCallemagne2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/andorre.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCandorre.dat
index 6e0ae25fae..6e0ae25fae 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/andorre.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCandorre.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/angleterre.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCangleterre.dat
index ef670d5562..ef670d5562 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/angleterre.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCangleterre.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/angola.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCangola.dat
index db8dddb111..db8dddb111 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/angola.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCangola.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/arabiesaoudite.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCarabiesaoudite.dat
index 0712cb3a8c..0712cb3a8c 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/arabiesaoudite.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCarabiesaoudite.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/argentine1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCargentine1.dat
index d966ade46f..d966ade46f 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/argentine1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCargentine1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/argentine2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCargentine2.dat
index 8a70fa478a..8a70fa478a 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/argentine2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCargentine2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/armenie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCarmenie.dat
index a07e7937c6..a07e7937c6 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/armenie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCarmenie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/autriche.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCautriche.dat
index 9c13489d51..9c13489d51 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/autriche.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCautriche.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/azerbaijan1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCazerbaijan1.dat
index e4cba9e702..e4cba9e702 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/azerbaijan1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCazerbaijan1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/azerbaijan2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCazerbaijan2.dat
index 08bb077e98..08bb077e98 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/azerbaijan2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCazerbaijan2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/bangladesh.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbangladesh.dat
index b09ac15119..b09ac15119 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/bangladesh.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbangladesh.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/belarussie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbelarussie.dat
index 3fea01113e..3fea01113e 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/belarussie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbelarussie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/belgique.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbelgique.dat
index b56cdce01e..b56cdce01e 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/belgique.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbelgique.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/belize.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbelize.dat
index dc5a69d267..dc5a69d267 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/belize.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbelize.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/benin.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbenin.dat
index 20faa7e666..20faa7e666 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/benin.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbenin.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/bhutan.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbhutan.dat
index 6493369c04..6493369c04 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/bhutan.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbhutan.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/birmanie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbirmanie.dat
index 51e97aef57..51e97aef57 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/birmanie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbirmanie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/bolivie1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbolivie1.dat
index 5e2f38b0ae..5e2f38b0ae 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/bolivie1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbolivie1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/bolivie2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbolivie2.dat
index 7ad1b8699f..7ad1b8699f 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/bolivie2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbolivie2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/bosnie1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbosnie1.dat
index 4e8ddadc4f..4e8ddadc4f 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/bosnie1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbosnie1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/bosnie2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbosnie2.dat
index cc9ce989e6..cc9ce989e6 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/bosnie2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbosnie2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/botswana.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbotswana.dat
index d2488a9a43..d2488a9a43 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/botswana.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbotswana.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/bresil.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbresil.dat
index 0a0ed260ff..0a0ed260ff 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/bresil.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbresil.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/brunei.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbrunei.dat
index 4f4f4278e2..4f4f4278e2 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/brunei.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbrunei.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/bulgarie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCbulgarie.dat
index 738de434bd..738de434bd 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/bulgarie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCbulgarie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/burkinafaso.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCburkinafaso.dat
index f8d5f32f13..f8d5f32f13 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/burkinafaso.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCburkinafaso.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/burundi.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCburundi.dat
index 8747851b04..8747851b04 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/burundi.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCburundi.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/cabinda.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCcabinda.dat
index 5c511a9495..5c511a9495 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/cabinda.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCcabinda.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/cambodge.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCcambodge.dat
index 999d7b8fb5..999d7b8fb5 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/cambodge.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCcambodge.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/cameroun.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCcameroun.dat
index a8e3d4ae94..a8e3d4ae94 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/cameroun.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCcameroun.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/canada.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCcanada.dat
index f9efd8f66f..f9efd8f66f 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/canada.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCcanada.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/capitales.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCcapitales.dat
index 7df00c4e68..7df00c4e68 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/capitales.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCcapitales.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/chili1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCchili1.dat
index e371c2588d..e371c2588d 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/chili1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCchili1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/chili2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCchili2.dat
index c37cccc01d..c37cccc01d 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/chili2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCchili2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/chine.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCchine.dat
index 5b82688c13..5b82688c13 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/chine.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCchine.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/colombie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCcolombie.dat
index 59b745872b..59b745872b 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/colombie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCcolombie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/congo.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCcongo.dat
index 4a659738af..4a659738af 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/congo.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCcongo.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/coreenord.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCcoreenord.dat
index 5575b43cbf..5575b43cbf 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/coreenord.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCcoreenord.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/coreesud.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCcoreesud.dat
index 255c48ef92..255c48ef92 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/coreesud.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCcoreesud.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/costarica.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCcostarica.dat
index a681e3b022..a681e3b022 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/costarica.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCcostarica.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/coteivoire.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCcoteivoire.dat
index 3de4aeab16..3de4aeab16 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/coteivoire.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCcoteivoire.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/croatie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCcroatie.dat
index 4038ef152a..4038ef152a 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/croatie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCcroatie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/danemark.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCdanemark.dat
index a7328ca833..a7328ca833 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/danemark.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCdanemark.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/djibouti.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCdjibouti.dat
index aa9c4bb376..aa9c4bb376 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/djibouti.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCdjibouti.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/ecosse.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCecosse.dat
index 0748d5f67d..0748d5f67d 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/ecosse.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCecosse.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/egypte.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCegypte.dat
index ff64e7bcb6..ff64e7bcb6 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/egypte.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCegypte.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/emirats.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCemirats.dat
index 659168af12..659168af12 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/emirats.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCemirats.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/equateur.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCequateur.dat
index 076a04c86f..076a04c86f 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/equateur.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCequateur.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/eritre.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCeritre.dat
index 5b9127842b..5b9127842b 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/eritre.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCeritre.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/espagne.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCespagne.dat
index a430274fb3..a430274fb3 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/espagne.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCespagne.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/estonie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCestonie.dat
index 2b5ec8097f..2b5ec8097f 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/estonie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCestonie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/ethiopie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCethiopie.dat
index 8166762f6c..8166762f6c 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/ethiopie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCethiopie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/finlande.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCfinlande.dat
index ba5ce6a005..ba5ce6a005 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/finlande.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCfinlande.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/fleuveseurope.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCfleuveseurope.dat
index f27eb66c24..f27eb66c24 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/fleuveseurope.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCfleuveseurope.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/fleuvessup.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCfleuvessup.dat
index 2f7d4b3579..2f7d4b3579 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/fleuvessup.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCfleuvessup.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/france.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCfrance.dat
index 5eba83b4bb..5eba83b4bb 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/france.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCfrance.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/gabon.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCgabon.dat
index a5dae2c062..a5dae2c062 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/gabon.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCgabon.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/gambie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCgambie.dat
index 5de21a9d98..5de21a9d98 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/gambie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCgambie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/gaza.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCgaza.dat
index cb78c51d5a..cb78c51d5a 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/gaza.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCgaza.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/georgie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCgeorgie.dat
index a79d627db4..a79d627db4 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/georgie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCgeorgie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/ghana.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCghana.dat
index a2f5eee9c4..a2f5eee9c4 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/ghana.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCghana.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/gibraltar.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCgibraltar.dat
index 056650c095..056650c095 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/gibraltar.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCgibraltar.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/grece.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCgrece.dat
index a341428536..a341428536 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/grece.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCgrece.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/guatemala.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCguatemala.dat
index dd1ee043a2..dd1ee043a2 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/guatemala.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCguatemala.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/guinee.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCguinee.dat
index 6c3113fbaf..6c3113fbaf 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/guinee.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCguinee.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/guineebissau.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCguineebissau.dat
index 4384f0c090..4384f0c090 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/guineebissau.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCguineebissau.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/guineef.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCguineef.dat
index bc87db967d..bc87db967d 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/guineef.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCguineef.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/guyane.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCguyane.dat
index 88b7d41b79..88b7d41b79 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/guyane.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCguyane.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/haiti.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfChaiti.dat
index 6463e79972..6463e79972 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/haiti.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfChaiti.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/honduras.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfChonduras.dat
index 7e478a1662..7e478a1662 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/honduras.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfChonduras.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/hongrie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfChongrie.dat
index 8d7d528262..8d7d528262 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/hongrie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfChongrie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/iles.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCiles.dat
index 35c5fd37c0..35c5fd37c0 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/iles.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCiles.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/iles1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCiles1.dat
index f94aada911..f94aada911 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/iles1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCiles1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/inde.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCinde.dat
index b670bb77ea..b670bb77ea 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/inde.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCinde.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/indonesie1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCindonesie1.dat
index e27f607de6..e27f607de6 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/indonesie1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCindonesie1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/indonesie2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCindonesie2.dat
index b49e9072da..b49e9072da 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/indonesie2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCindonesie2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/irak.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCirak.dat
index b01144700b..b01144700b 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/irak.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCirak.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/iran.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCiran.dat
index 8191e91fb7..8191e91fb7 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/iran.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCiran.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/irelande.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCirelande.dat
index bb6b51ff7a..bb6b51ff7a 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/irelande.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCirelande.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/irelandenord.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCirelandenord.dat
index 5577a071eb..5577a071eb 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/irelandenord.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCirelandenord.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/israel.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCisrael.dat
index 36f11ee673..36f11ee673 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/israel.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCisrael.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/italie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCitalie.dat
index 8a39e06e28..8a39e06e28 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/italie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCitalie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/jordanie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCjordanie.dat
index ec7f5b9377..ec7f5b9377 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/jordanie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCjordanie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/kazakhstan.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCkazakhstan.dat
index 07e0cf1fd1..07e0cf1fd1 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/kazakhstan.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCkazakhstan.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/kenya.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCkenya.dat
index 623ccc7dd7..623ccc7dd7 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/kenya.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCkenya.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/koweit.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCkoweit.dat
index 1b8b02fa76..1b8b02fa76 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/koweit.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCkoweit.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/kyrgyzstan.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCkyrgyzstan.dat
index 882b63500f..882b63500f 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/kyrgyzstan.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCkyrgyzstan.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/lacs.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfClacs.dat
index 060f252ad1..060f252ad1 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/lacs.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfClacs.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/lacssup.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfClacssup.dat
index 720acaaa78..720acaaa78 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/lacssup.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfClacssup.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/laos.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfClaos.dat
index 22c7ffc2ce..22c7ffc2ce 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/laos.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfClaos.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/lesotho.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfClesotho.dat
index 63ebbac4e1..63ebbac4e1 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/lesotho.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfClesotho.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/lettonie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfClettonie.dat
index 4c1f88de93..4c1f88de93 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/lettonie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfClettonie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/liban.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCliban.dat
index 4e3af9ffea..4e3af9ffea 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/liban.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCliban.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/liberia.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCliberia.dat
index 1230846aef..1230846aef 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/liberia.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCliberia.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/libye.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfClibye.dat
index 8aff61c720..8aff61c720 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/libye.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfClibye.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/liechtenstein.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCliechtenstein.dat
index e512cc7436..e512cc7436 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/liechtenstein.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCliechtenstein.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/lithuanie1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfClithuanie1.dat
index f71ee84ab8..f71ee84ab8 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/lithuanie1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfClithuanie1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/lithuanie2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfClithuanie2.dat
index 8eaa7cbfcf..8eaa7cbfcf 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/lithuanie2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfClithuanie2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/luxembourg.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCluxembourg.dat
index 6e6c37e4ea..6e6c37e4ea 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/luxembourg.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCluxembourg.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/macedoine.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCmacedoine.dat
index 4f67c43b4a..4f67c43b4a 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/macedoine.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCmacedoine.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/malaisie1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCmalaisie1.dat
index 96fd3fed6b..96fd3fed6b 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/malaisie1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCmalaisie1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/malaisie2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCmalaisie2.dat
index 14fa3f7bcc..14fa3f7bcc 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/malaisie2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCmalaisie2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/malawi.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCmalawi.dat
index 457145122e..457145122e 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/malawi.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCmalawi.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/mali.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCmali.dat
index d625e525b5..d625e525b5 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/mali.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCmali.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/maroc.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCmaroc.dat
index e46ba6c84f..e46ba6c84f 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/maroc.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCmaroc.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/mauritanie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCmauritanie.dat
index 76f5c50814..76f5c50814 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/mauritanie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCmauritanie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/mexique.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCmexique.dat
index b641c2fb3c..b641c2fb3c 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/mexique.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCmexique.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/moldavie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCmoldavie.dat
index cd4653985a..cd4653985a 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/moldavie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCmoldavie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/monaco.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCmonaco.dat
index 374fd20477..374fd20477 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/monaco.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCmonaco.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/mongolie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCmongolie.dat
index 99d7c1607d..99d7c1607d 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/mongolie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCmongolie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/mozambique.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCmozambique.dat
index ae88a59390..ae88a59390 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/mozambique.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCmozambique.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/namibie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCnamibie.dat
index 1a6d741489..1a6d741489 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/namibie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCnamibie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/nepal.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCnepal.dat
index 8644310a97..8644310a97 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/nepal.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCnepal.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/nicaragua.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCnicaragua.dat
index b03f08ff81..b03f08ff81 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/nicaragua.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCnicaragua.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/niger.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCniger.dat
index 4e8c5c36ec..4e8c5c36ec 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/niger.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCniger.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/nigeria.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCnigeria.dat
index c9a5ffe0be..c9a5ffe0be 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/nigeria.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCnigeria.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/norvege.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCnorvege.dat
index e91ccb3eeb..e91ccb3eeb 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/norvege.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCnorvege.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/nvelleguinne.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCnvelleguinne.dat
index 785e3869b0..785e3869b0 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/nvelleguinne.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCnvelleguinne.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/oman1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfComan1.dat
index 4e3ea0957e..4e3ea0957e 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/oman1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfComan1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/oman2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfComan2.dat
index 33f4e06b22..33f4e06b22 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/oman2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfComan2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/ouganda.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCouganda.dat
index 849fc9d343..849fc9d343 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/ouganda.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCouganda.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/ouzbekistan.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCouzbekistan.dat
index d8cb91940e..d8cb91940e 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/ouzbekistan.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCouzbekistan.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/pakistan.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCpakistan.dat
index 278f6fbce7..278f6fbce7 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/pakistan.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCpakistan.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/panama1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCpanama1.dat
index a9914332c3..a9914332c3 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/panama1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCpanama1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/panama2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCpanama2.dat
index 8effe607c1..8effe607c1 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/panama2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCpanama2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/paraguay.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCparaguay.dat
index 681cddcf49..681cddcf49 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/paraguay.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCparaguay.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/paysbas.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCpaysbas.dat
index defd9264c7..defd9264c7 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/paysbas.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCpaysbas.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/paysdegalles.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCpaysdegalles.dat
index 61693859cf..61693859cf 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/paysdegalles.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCpaysdegalles.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/perou.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCperou.dat
index cef17082ff..cef17082ff 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/perou.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCperou.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/polesud.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCpolesud.dat
index 68f718a0bd..68f718a0bd 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/polesud.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCpolesud.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/pologne.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCpologne.dat
index ac1b9c5819..ac1b9c5819 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/pologne.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCpologne.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/portugal.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCportugal.dat
index fdcfb2a15c..fdcfb2a15c 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/portugal.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCportugal.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/quatar.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCquatar.dat
index 15b779a35b..15b779a35b 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/quatar.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCquatar.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/repcentreafrique.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCrepcentreafrique.dat
index c9509cc6e1..c9509cc6e1 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/repcentreafrique.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCrepcentreafrique.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/repdominicaine.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCrepdominicaine.dat
index 04fb1e4bd2..04fb1e4bd2 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/repdominicaine.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCrepdominicaine.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/riomuni.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCriomuni.dat
index 1ea05bc8c9..1ea05bc8c9 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/riomuni.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCriomuni.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/rivieres.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCrivieres.dat
index e84410790f..e84410790f 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/rivieres.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCrivieres.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/roumanie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCroumanie.dat
index fa4bd3d886..fa4bd3d886 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/roumanie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCroumanie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/russie1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCrussie1.dat
index 856dfd585a..856dfd585a 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/russie1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCrussie1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/russie1bis.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCrussie1bis.dat
index 69858c1402..69858c1402 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/russie1bis.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCrussie1bis.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/russie2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCrussie2.dat
index 21d41ae1a2..21d41ae1a2 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/russie2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCrussie2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/russie3.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCrussie3.dat
index ffdeb3882a..ffdeb3882a 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/russie3.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCrussie3.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/russie3bis.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCrussie3bis.dat
index 0d7eb74191..0d7eb74191 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/russie3bis.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCrussie3bis.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/rwanda.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCrwanda.dat
index 6818f30de0..6818f30de0 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/rwanda.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCrwanda.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/saharaouest.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCsaharaouest.dat
index a4690ee6ff..a4690ee6ff 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/saharaouest.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCsaharaouest.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/salvador.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCsalvador.dat
index fea58374db..fea58374db 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/salvador.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCsalvador.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/sanmarin.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCsanmarin.dat
index e1d4555c06..e1d4555c06 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/sanmarin.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCsanmarin.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/senegal.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCsenegal.dat
index 88e3f02b77..88e3f02b77 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/senegal.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCsenegal.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/sierraleone.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCsierraleone.dat
index 24a495bfb4..24a495bfb4 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/sierraleone.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCsierraleone.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/slovaquie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCslovaquie.dat
index 797e614590..797e614590 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/slovaquie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCslovaquie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/slovenie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCslovenie.dat
index 20e96b52e3..20e96b52e3 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/slovenie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCslovenie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/somalie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCsomalie.dat
index aab0b07322..aab0b07322 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/somalie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCsomalie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/soudan.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCsoudan.dat
index 0dcebe7b0a..0dcebe7b0a 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/soudan.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCsoudan.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/suede.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCsuede.dat
index 039426bad3..039426bad3 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/suede.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCsuede.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/suisse.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCsuisse.dat
index 833bb1a384..833bb1a384 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/suisse.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCsuisse.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/surinam.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCsurinam.dat
index 5688f2512e..5688f2512e 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/surinam.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCsurinam.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/swaziland.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCswaziland.dat
index c0f731377c..c0f731377c 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/swaziland.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCswaziland.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/syrie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCsyrie.dat
index eac9cae9f1..eac9cae9f1 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/syrie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCsyrie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/tajikistan.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCtajikistan.dat
index 2cc1aea2b0..2cc1aea2b0 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/tajikistan.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCtajikistan.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/tanzanie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCtanzanie.dat
index 2adbd9670e..2adbd9670e 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/tanzanie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCtanzanie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/tchad.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCtchad.dat
index 7ab7939123..7ab7939123 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/tchad.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCtchad.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/tcheque.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCtcheque.dat
index 79fdd4755b..79fdd4755b 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/tcheque.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCtcheque.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/thailande.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCthailande.dat
index dfd39ed64a..dfd39ed64a 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/thailande.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCthailande.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/togo.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCtogo.dat
index c5a3f72a15..c5a3f72a15 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/togo.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCtogo.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/tunisie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCtunisie.dat
index fa673e0aef..fa673e0aef 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/tunisie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCtunisie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/turkmenistan.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCturkmenistan.dat
index f81477c072..f81477c072 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/turkmenistan.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCturkmenistan.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/turquie1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCturquie1.dat
index b1ae0c0af9..b1ae0c0af9 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/turquie1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCturquie1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/turquie2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCturquie2.dat
index 675fc9695f..675fc9695f 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/turquie2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCturquie2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/ukraine.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCukraine.dat
index ac9bc2599b..ac9bc2599b 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/ukraine.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCukraine.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/uruguay.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCuruguay.dat
index 22b3a0693c..22b3a0693c 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/uruguay.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCuruguay.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/usa1.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCusa1.dat
index 2c2f4d9f81..2c2f4d9f81 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/usa1.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCusa1.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/usa2.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCusa2.dat
index 35ae56369d..35ae56369d 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/usa2.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCusa2.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/venezuela.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCvenezuela.dat
index 1f1ed2e2ff..1f1ed2e2ff 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/venezuela.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCvenezuela.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/vietnam.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCvietnam.dat
index 73a8786994..73a8786994 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/vietnam.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCvietnam.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/villesFrance.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCvillesFrance.dat
index a9ff8bc279..a9ff8bc279 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/villesFrance.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCvillesFrance.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/villesFranceCycle4.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCvillesFranceCycle4.dat
index 39545271ee..39545271ee 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/villesFranceCycle4.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCvillesFranceCycle4.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/villesFranceNord.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCvillesFranceNord.dat
index 405df009a0..405df009a0 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/villesFranceNord.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCvillesFranceNord.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/villesFrancesimp.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCvillesFrancesimp.dat
index 46f5b6c9bf..46f5b6c9bf 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/villesFrancesimp.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCvillesFrancesimp.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/villesItalie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCvillesItalie.dat
index 44b2a692fa..44b2a692fa 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/villesItalie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCvillesItalie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/volcans.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCvolcans.dat
index 7fa01e952c..7fa01e952c 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/volcans.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCvolcans.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/westbank.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCwestbank.dat
index f684e5d05a..f684e5d05a 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/westbank.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCwestbank.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/yemen.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCyemen.dat
index 300881c6b9..300881c6b9 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/yemen.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCyemen.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/yougoslavie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCyougoslavie.dat
index adcf8e8bd4..adcf8e8bd4 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/yougoslavie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCyougoslavie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/zaire.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCzaire.dat
index e85cf4ecd6..e85cf4ecd6 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/zaire.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCzaire.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/zambie.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCzambie.dat
index d7f72af84d..d7f72af84d 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/zambie.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCzambie.dat
diff --git a/macros/latex/contrib/profcollege/metapost/datastest/zimbabwe.dat b/macros/latex/contrib/profcollege/metapost/datastest/PfCzimbabwe.dat
index 69f7e9b004..69f7e9b004 100644
--- a/macros/latex/contrib/profcollege/metapost/datastest/zimbabwe.dat
+++ b/macros/latex/contrib/profcollege/metapost/datastest/PfCzimbabwe.dat
diff --git a/macros/latex/contrib/schwalbe-chess/README b/macros/latex/contrib/schwalbe-chess/README
index e4bd960505..34562fb943 100644
--- a/macros/latex/contrib/schwalbe-chess/README
+++ b/macros/latex/contrib/schwalbe-chess/README
@@ -1,5 +1,5 @@
schwalbe --- A package for typesetting chessproblems
-Version v2.7 / Stefan Hoening 2012-2018
+Version v2.9 / Stefan Hoening 2012-2020
CONTENTS
diff --git a/macros/latex/contrib/schwalbe-chess/schwalbe.dtx b/macros/latex/contrib/schwalbe-chess/schwalbe.dtx
index 0850bb8e04..62dbe69dcc 100644
--- a/macros/latex/contrib/schwalbe-chess/schwalbe.dtx
+++ b/macros/latex/contrib/schwalbe-chess/schwalbe.dtx
@@ -13,9 +13,9 @@
%%
%%
% \fi
-% \def\fileversion{v2.7}
-% \def\docdate{2019/12/28}
-% \CheckSum{2122}
+% \def\fileversion{v2.9}
+% \def\docdate{2022/05/28}
+% \CheckSum{2247}
% \changes{v1.1}{03 June 2011}{Reflecting change in command
% @writename inside diagram.sty}
% \changes{v1.2}{01 July 2011}{Added parameter for Band to Heft
@@ -52,6 +52,13 @@
% values given in Heft command.}
% \changes{v2.6}{16 October 2019}{Moved do@dia@job redefinition to schwalbe.cls.}
% \changes{v2.7}{28 December 2019}{Used new begin/end diagram hook command to deactivate/activate solslash before/after diagrams.}
+% \changes{v2.8}{27 December 2020}{Added code to generate file
+% containing Loesung comands while generating diagrams within Urdrucke
+% environment.\\
+% Added Loesung command to generate intro of a single problem within
+% Loesungen environment.}
+% \changes{v2.9}{28 May 2022}{Added code to simplify measuring size of
+% articles.}
%
% \DoNotIndex{\@arabic,\def,\@idxitem,\@ifnextchar,\@ifstar,
% \@ne,\@ptsize,\ ,\advance,\AtEndOfPackage,\begin,\begingroup,
@@ -74,9 +81,9 @@
% \newcommand*{\Schwalbe}{\textbf{\textit{Schwalbe}}}
% \newcommand*{\DieSchwalbe}{\hbox{\textbf{\textit{Die Schwalbe}}}}
%
-% \title{Der \LaTeX-Style f"ur die Problemschach-Zeitschrift
+% \title{Der \LaTeX-Style für die Problemschach-Zeitschrift
% \DieSchwalbe{}\\{\large Version~\fileversion}}
-% \author{Stefan H\"oning\\Neuss}
+% \author{Stefan Höning\\Neuss}
% \date{\docdate}
%
% \maketitle
@@ -84,11 +91,11 @@
% \begin{abstract}
% Diese Dokumentation beschreibt die \LaTeX-Class und \LaTeX-Style, die zum
% Setzen der Zeitschrift \DieSchwalbe{} benutzt wird --- die
-% Mitgliederzeitschrift der deutschen Vereinigung f"ur Problemschach.
+% Mitgliederzeitschrift der deutschen Vereinigung für Problemschach.
%
% Die Schwalbe-Class hat die Aufgabe, die Seiteneinstellungen und Umgebungen
-% f"ur die Schwalbe zu definieren. Der Schwalbe-Style hat die Aufgaben,
-% Layoutanpassungen bzgl.\ des \verb+diagram.sty+ vorzunhmen, mit dem die
+% für die Schwalbe zu definieren. Der Schwalbe-Style hat die Aufgaben,
+% Layoutanpassungen bzgl.\ des \verb+diagram.sty+ vorzunehmen, mit dem die
% Problemschach-Diagramme erzeugt werden.
% \end{abstract}
%
@@ -101,7 +108,7 @@
% Parameter in der angegebenen Reihenfolge:
%
% \begin{enumerate}
-% \item der Band, zu dem das Heft geh"ort
+% \item der Band, zu dem das Heft gehört
% \item die Nummer des Heftes
% \item der Monat des Erscheinens als Zahl
% \item das Jahr des Erscheinens
@@ -115,14 +122,14 @@
% \verb+\Heft{XXXIV}{299}{12}{2019}{361}+
%
% \DescribeEnv{Editorial}
-% Die \verb+Editorial+ Umgebung ben"otigt einen Parameter, der
-% die "Uberschrift definiert. Als optionaler Parameter kann noch
-% der Eintrag im Inhaltsverzeichnis festgelegt werden. L"asst man
+% Die \verb+Editorial+ Umgebung benötigt einen Parameter, der
+% die Ãœberschrift definiert. Als optionaler Parameter kann noch
+% der Eintrag im Inhaltsverzeichnis festgelegt werden. Lässt man
% diesen weg, erscheint dort der Begriff {\bfseries Editorial}.
%
% \DescribeEnv{aktuell}
-% Die \verb+aktuell+ Umgebung f"ur die {\bfseries Aktuellen Meldungen} kommt
-% ohne parameter aus. Neben der "Uberschrift wird ein Eintrag im
+% Die \verb+aktuell+ Umgebung für die {\bfseries Aktuellen Meldungen} kommt
+% ohne parameter aus. Neben der Ãœberschrift wird ein Eintrag im
% Inhaltsverzeichnis erzeugt.
%
% \DescribeEnv{InformalEntscheid}
@@ -135,7 +142,7 @@
% \item das Jahr, auf das sich der Entscheid bezieht
% \item der Name des Preisrichters
% \end{enumerate}
-% Die Umgebung setzt automatisch die "Uberschrift und erzeugt
+% Die Umgebung setzt automatisch die Ãœberschrift und erzeugt
% einen Eintrag im Inhaltsverzeichnis.
%
% Außerdem wird der Kopf bei Diagrammen anders ausgegeben: In der 1.~Zeile
@@ -161,19 +168,19 @@
% dieser wird in der Form \verb+<Name>, <Vorname>/<Wohnort>+
% angegeben.
% \end{enumerate}
-% Um die "Uberschrift des Aufsatzes zu setzen, gibt es die
+% Um die Ãœberschrift des Aufsatzes zu setzen, gibt es die
% Umgebung \verb+Titel+. Die wesentliche Aufgabe dieser Umgebung
-% ist es, passende Abst"ande zum vorherigen sowie zum
+% ist es, passende Abstände zum vorherigen sowie zum
% nachfolgenden Text zu erzeugen.
%
% \DescribeEnv{Urdrucke}
-% Die Umgebung \verb+Urdrucke+ ben"otigt als Parameter die Nummer
+% Die Umgebung \verb+Urdrucke+ benötigt als Parameter die Nummer
% des ersten Urdrucks.
%
% \DescribeMacro{\Abteilung}
% Innerhalb der Urdrucke gibt es den Befehl \verb+\Abteilung+, mit dem die
% einzelnen Abteilungen innerhalb der Urdrucke eingeleitet werden.
-% Der Befehl benötigt im Normalfall 5 Parameter:
+% Der Befehl benötigt im 5 Parameter:
% \begin{enumerate}
% \item Name der Abteilung
% \item Name der Referenz der ersten Problem der Abteilung
@@ -184,17 +191,17 @@
%
%
% \DescribeMacro{\Abteilung*}
-% Sollte in der Abteilung nur ein Urdruck erscheinen, muss man
+% Sollte in einer Abteilung einma nur ein Urdruck erscheinen, muss man
% \verb+\Abteilung*+ benutzen und die Referenz auf das letzte Problem
% weglassen.
%
% \DescribeEnv{maerchenlexikon}
% \DescribeMacro{\maerchenart}
-% Im Vorspann der M"archenschachabteilung der Urdrucke werden die
-% benutzten M"archenschachregeln erl"autert. Dies geschieht
+% Im Vorspann der Märchenschachabteilung der Urdrucke werden die
+% benutzten Märchenschachregeln erläutert. Dies geschieht
% innerhalb der Umgebung \verb+maechenlexion+. Innerhalb dieser
-% Umgebung werden alle M"archenarten mittels \verb+\maerchenart+
-% eingef"uhrt, die einen Parameter hat, mit dem die M"archenart
+% Umgebung werden alle Märchenarten mittels \verb+\maerchenart+
+% eingeführt, die einen Parameter hat, mit dem die Märchenart
% angegeben wird.
%
% \DescribeEnv{retrolexikon}
@@ -214,7 +221,7 @@
% \end{enumerate}
%
% \DescribeMacro{\Abteilung}
-% Innerhalb der L"osungen gibt es auch einen Befehl \verb+\Abteilung+ um die einzelnen Abteilungen einzuleiten.
+% Innerhalb der Lösungen gibt es auch einen Befehl \verb+\Abteilung+ um die einzelnen Abteilungen einzuleiten.
% Die Parameter für diesen Befehl lauten:
% \begin{enumerate}
% \item{Name der Abteilung}
@@ -223,7 +230,7 @@
% \item{Name des Sachbearbeiters}
% \end{enumerate}
%
-% \DescribeMacro{\Abteilung}
+% \DescribeMacro{\Abteilung*}
% Sollte einmal nur eine Aufgabe in der Abteilung vorhanden sein, benutzt man
% \verb+\Abteilung*+, die die dann nur 3 Parameter erwartet.
%
@@ -240,14 +247,39 @@
% Bei der \verb+\Loeser*+ Form erscheint der Name auch an der Stelle im Text.
%
% \DescribeMacro{\ListeLoeserKuerzel}
-% Gibt die aufgesammelten L"oserk"urzel und -namen aus.
+% Gibt die aufgesammelten Löserkürzel und -namen aus.
+%
+% \DescribeMacro{\Loesung}
+% \DescribeMacro{\Loesung*}
+% Die Lösungsbesprechung zu einer Aufgabe wird mit dem Befehl
+% \verb+\Loesung+ eingeleitet, der 3 Parameter benötigt:
+% \begin{enumerate}
+% \item{Nummer der Aufgabe}
+% \item{Liste der Autoren}
+% \item{Lösung der Aufgabe}
+% \end{enumerate}
+% Wird die Form ohne * verwendet, wird von der Aufgabe nur
+% die Aufgabennummer und - in runden Klammern - die Liste der Autoren
+% gesetzt. Der Punkt hinter der Klammer entfällt. Der Lösungstext
+% aus dem 3. Parameter kann % dann allerding mittels \verb+\showsol+
+% ausgegeben werden.
+%
+% Bei der *-Form wird ein Punkt hinter die schließende Runde Klammer
+% bei den Autoren gesetzt, und dann die Lösung ausgegeben.
+%
+% Diese \verb+\Loesung+ Kommandos für den Lösungsteil werden beim
+% Kompilieren des Urdruckteils des entsprechenden Hefts automatisch in
+% eine Datei geschrieben. Diese Datei wird den Sachbearbeitern für die
+% Erstellung der Lösungsbesprechungen zur Verfügung gestellt. In der
+% Regel müssen hier dann nur die Lösungen ergänzt werden - wenn diese
+% nicht bereits bei den Urdrucken mit erfasst worden sind.
%
% \DescribeEnv{BuB}
% Die \verb+BuB+ Umgebung setzt die {\bfseries Bemerkungen und
% Berichtigungen}
%
% \DescribeEnv{turnierberichte}
-% Innerhalb der Umgebung \verb+turnierberichte+ wird "uber
+% Innerhalb der Umgebung \verb+turnierberichte+ wird über
% Turniere z.\,B.\ aus anderen Zeitschriften berichtet.
%
% \DescribeEnv{Buecher}
@@ -282,24 +314,24 @@
% Einleitende \verb+\begin{Turnierbericht}+ besitzt als Parameter
% den Namen des Turniers und den Namen des Autors in der Form:
% \verb+<Nachname>, <Vorname>+. Diese beiden Angaben werden
-% automatisch ins Inhaltsverzeichnis "ubernommen.
-% Der Titel des Turnierberichts ist wie bei Aufs"atzen in die
+% automatisch ins Inhaltsverzeichnis übernommen.
+% Der Titel des Turnierberichts ist wie bei Aufsätzen in die
% Umgebung \verb+Titel+ einzubauen.
%
% \DescribeEnv{Entscheid}
% Die \verb+Entscheid+ Umgebung wird genutzt, um
% Turnierentscheide zu allgemeinen Turnieren der \Schwalbe{}, oder
-% aber auch Nachtr"age oder entg"ultige Entscheide zu setzen.
+% aber auch Nachträge oder entgültige Entscheide zu setzen.
% Als Parameter wird an das einleitende \verb+\begin{Entscheid}+
% der Titel des Entscheids angegeben, der ins Inhaltsverzeichnis
-% "ubernommen werden soll. Der eigentliche Titel muss --- wie bei
+% übernommen werden soll. Der eigentliche Titel muss --- wie bei
% verschiedenen anderen Umgebungen auch --- mittels der
% \verb+Titel+ Umgebung gesetzt werden.
%
%
% \DescribeEnv{Loeserliste}
% Nach dem einleitenden \verb+\begin{Loeserliste}+ ist als
-% Parameter das Jahr anzugeben, auf dass sich die L"oeserliste
+% Parameter das Jahr anzugeben, auf dass sich die Löserliste
% bezieht.
%
% \DescribeEnv{Turnierausschreibung}
@@ -312,18 +344,18 @@
%
% \section{Kleine Helferlein}
%
-% \subsection{Diagrammgr"ossen}
+% \subsection{Diagrammgrössen}
% \DescribeMacro{\smalldia}
% \DescribeMacro{\normaldia}
% In der \Schwalbe{} werden normalerweise zwei verschiedene
-% Diagrammgr"ossen verwendet. Mittels \verb+\normaldia+ wird die
-% Normalgr"osse eingestellt. Mittels \verb+\smalldia+ kann auf
+% Diagrammgrössen verwendet. Mittels \verb+\normaldia+ wird die
+% Normalgrösse eingestellt. Mittels \verb+\smalldia+ kann auf
% kleinere Diagramme umgeschaltet werden --- von denen dann 4
-% St"uck in eine Zeile passen. Da die kleineren Diagramme
+% Stück in eine Zeile passen. Da die kleineren Diagramme
% normalerweise zu mehreren benutzt werden, kann dieser
-% Befehl nat"urlich auch als Umgebung benutzt werden.
+% Befehl natürlich auch als Umgebung benutzt werden.
%
-% \subsection{H"aufige Abk"urzungen}
+% \subsection{Häufige Abkürzungen}
% \DescribeMacro{\dh}
% \DescribeMacro{\ua}
% \DescribeMacro{\zB}
@@ -332,20 +364,20 @@
% \DescribeMacro{\seedia}
% \LaTeX\ intepretiert einen Punkt nach einem Kleinbuchstaben
% normalerweise als Satzende. Als Folge davon ist der Abstand
-% hinter diesem Punkt gr"osser als der normale Wortabstand.
-% Insbesondere bei Abk"urzungen ist dies aber nicht
-% gew"unscht. Besonders bei mehrgliedrigen Abk"urzungen sollte
+% hinter diesem Punkt grösser als der normale Wortabstand.
+% Insbesondere bei Abkürzungen ist dies aber nicht
+% gewünscht. Besonders bei mehrgliedrigen Abkürzungen sollte
% man sogar einen kleineren Abstand als den normalen Wortabstand
-% zwischen den Gliedern der Abk"urzung w"ahlen. Daher definiert
-% der Style Befehle f"ur einige H"aufig vorkommende Abk"urzungen:
+% zwischen den Gliedern der Abkürzung wählen. Daher definiert
+% der Style Befehle für einige Häufig vorkommende Abkürzungen:
%
% \medskip
% \begin{tabular}{|l|l|l|}
% \hline
-% {\bfseries Befehl}&{\bfseries f"ur}&{\bfseries Bemerkungen}\\
+% {\bfseries Befehl}&{\bfseries für}&{\bfseries Bemerkungen}\\
% \hline
-% \verb+\dh+&d.\,h.&enth"alt ein Leerzeichen am Ende\\
-% \verb+\ua+&u.\,a.&enth"alt ein Leerzeichen am Ende\\
+% \verb+\dh+&d.\,h.&enthält ein Leerzeichen am Ende\\
+% \verb+\ua+&u.\,a.&enthält ein Leerzeichen am Ende\\
% \verb+\zB+&z.\,B.&\\
% \verb+\su+&s.\,u.&\\
% \verb+\ep+&e.\,p.&\\
@@ -381,10 +413,10 @@
%
% \subsection{Verschiedenes}
% \DescribeMacro{\figline}
-% Mittels \verb+\figline+ kann eine Zeile mit K"onigen ausgegeben
+% Mittels \verb+\figline+ kann eine Zeile mit Königen ausgegeben
% werden, die als Trenner zwischen 2 Abschnitten dient.
% \DescribeMacro{\foto}
-% Um Freiraum f"ur ein Foto zu lassen kann der Befehl\newline
+% Um Freiraum für ein Foto zu lassen kann der Befehl\newline
% \verb+\foto{<Breite>}{<Hoehe>}{<Bildunterschrift>}+\newline
% benutzt werden.
%
@@ -397,18 +429,25 @@
% \DescribeMacro{\mal}
% Als Kurzschreibweise für das $\times$ Symbol ist der Befehl \verb+\mal+ definiert.
%
+% \DescribeEnv{MeasureMode}
+% \DescribeMacro{\MeasureNewpage}
+% Um den Umfang der einzelnen Artikel einfacher Abschätzen zu können,
+% füge ich vor jedem Artikel den Befehl \verb+\MeasureNewpage+ ein,
+% der ein \verb+\newpage+ durchführt, wenn der Boolean
+% \verb+MeasureMode+ gleich \verb+true+ ist.
+%
% \StopEventually{\PrintIndex\PrintChanges}
%
-% \section{Die Treiberdatei f"ur die Dokumentation}
+% \section{Die Treiberdatei für die Dokumentation}
% Der folgende Code erzeugt die Dokumentation. Da dies der erste
% nicht auskommentierte Code in der Datei ist, kann die
% Dokumentation einfach erzeugt werden, indem man diese Datei mit
-% \LaTeXe\ "ubersetzt.
+% \LaTeXe\ übersetzt.
% \begin{macrocode}
%<*driver>
\documentclass[a4paper]{article}
\usepackage{doc}
-\RequirePackage{schwalbe}
+% \LoadClass{schwalbe}
\RequirePackage[utf8]{inputenc}% fsRUS 140121
\RequirePackage[ngerman]{babel}
\setlength{\hoffset}{-1in}
@@ -431,9 +470,10 @@
% \begin{macrocode}
%<*class>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{schwalbe}[2019/12/28]
+\ProvidesClass{schwalbe}[2022/05/28]
\LoadClass[11pt,a4paper]{article}
\RequirePackage[12pt]{schwalbe}[2019/12/28]
+\RequirePackage{cpdparse}[2020/12/27]
\RequirePackage[T2A,T1]{fontenc}% fsRUS 140121
\RequirePackage[koi8-r,utf8]{inputenc}% fsRUS 140121
\RequirePackage[russian,german,english,ngerman]{babel}
@@ -445,7 +485,6 @@
\RequirePackage{paralist}
\RequirePackage{afterpage}
\InputIfFileExists{schwalbe.ext}{}{}%
-\RequirePackage{picinpar}
% \end{macrocode}
%
% Ein paar Trennhilfen und Einstellungen zum Trennverhalten.
@@ -487,7 +526,7 @@
\fi%
}
%-----------------------------------------------------------
-% Ein paar Abk"urzungen:
+% Ein paar Abkürzungen:
%
\def\dh{d.\,h.\ \ignorespaces}
\def\ua{u.\,a.\ \ignorespaces}
@@ -508,7 +547,7 @@
}}
%
%-----------------------------------------------------------
-% Freiraum f"ur Fotos
+% Freiraum für Fotos
\def\foto#1#2#3{%
\begin{minipage}[t]{#1}
\hbox to #1{\hsize#1%
@@ -538,12 +577,12 @@
}
% \end{macrocode}
%
-% Im Titel sowie bei den Urdrucken und L"osungen werden die Namen der Monate benötigt.
+% Im Titel sowie bei den Urdrucken und Lösungen werden die Namen der Monate benötigt.
%
% \begin{macrocode}
\newcommand{\sw@monat}[1]{%
\ifcase#1\relax%
-\or Januar\or Februar\or M\"arz\or April\or Mai\or Juni\or Juli\or August\or September\or Oktober\or November\or Dezember\fi%
+\or Januar\or Februar\or März\or April\or Mai\or Juni\or Juli\or August\or September\or Oktober\or November\or Dezember\fi%
}%
% \end{macrocode}
%
@@ -575,12 +614,12 @@
%\input{intro}%
\vskip5mm%
\newcommand{\SchwalbeCopyright}%
- {\textcopyright{} Schwalbe, deutsche Vereinigung für Problemschach #4}%
+ {\textcopyright{} #4 Schwalbe, deutsche Vereinigung für Problemschach e.\,V.}%
}
% \end{macrocode}
%
-% Eine Umgebung f"ur ein Editorial. Als optionaler Parameter kann die
-% "Uberschrift im Text angegeben werden. Der andere Parameter wird f"ur den
+% Eine Umgebung für ein Editorial. Als optionaler Parameter kann die
+% Überschrift im Text angegeben werden. Der andere Parameter wird für den
% Eintrag im Inhaltsverzeichnis benutzt.
% \begin{macrocode}
\newenvironment{Editorial}[2][Editorial]{%
@@ -604,7 +643,7 @@
}{}
% \end{macrocode}
%
-% Eine Umgebung f"ur {\itshape AKTUELLE MELDUNGEN}, die die "Uberschrift und
+% Eine Umgebung für {\itshape AKTUELLE MELDUNGEN}, die die Überschrift und
% den Eintrags ins Inhaltsverzeichnis erzeugt.
% \begin{macrocode}
\newenvironment{aktuell}{%
@@ -627,10 +666,10 @@
}{}
% \end{macrocode}
%
-% F"ur Informalturniere der \Schwalbe{} gibt es eine besondere Umgebung, die die 3
+% Für Informalturniere der \Schwalbe{} gibt es eine besondere Umgebung, die die 3
% Parameter {\itshape Abteilung}, {\itshape Jahr} und {\itshape Preisrichter}
-% ben"otigt. Die normale Form der Umgebung erzeugt auch die "Uberschrift.
-% Falls dies unterdr"uckt werden mu"s -- um z.\,B. die "Uberschrift speziell zu
+% benötigt. Die normale Form der Umgebung erzeugt auch die Überschrift.
+% Falls dies unterdrückt werden mu"s -- um z.\,B. die Überschrift speziell zu
% formatieren, kann die {\bfseries Stern-Form} der Umgebung genutzt werden.
% Daher findet die Auswertung der Parameter in den Kommandos
% \verb+\x@InformalEntscheid+ und \verb+\y@InformalEntscheid+ statt.
@@ -696,7 +735,7 @@
\let\orig@dia@above=\dia@above%
\let\dia@above=\dia@above@InformalEntscheid%
\setboolean{normaldiaabove}{false}%
- % Erzeuge den Eintrag f\"ur das Inhaltsverzeichnis
+ % Erzeuge den Eintrag für das Inhaltsverzeichnis
\bgroup%
\def\@tempb{\InformalEntscheid}%
\def\@tempc{#1}%
@@ -725,14 +764,15 @@
}
% \end{macrocode}
%
-% Die Umgebung f"ur Aufs"atze. Die Parameter ({\itshape Titel} und {\itshape
-% Autoren (mit Wohnorten)}) werden f"ur das Inhaltsverzeichnis verwendet.
+% Die Umgebung für Aufsätze. Die Parameter ({\itshape Titel} und {\itshape
+% Autoren (mit Wohnorten)}) werden für das Inhaltsverzeichnis verwendet.
% \begin{macrocode}
\newenvironment{Aufsatz}[2]{%
+ \diagnum{1}%
\stepcounter{@inhalt}%
\let\titel@ext\inhalt@label\relax%
+ \setcounter{footnote}{0}%
\begingroup%
- \setcounter{footnote}{0}%
\def\@tempa{#1}%
\def\@tempc{\aufsatz}%
\def\@tempb{#2}%
@@ -773,13 +813,38 @@
%
% Innerhalb der Umgebung \verb+Urdrucke+ werden
% die Diagramme immer zu dritt nebeneinander gesetzt -
-% sofern dies pa"st. Au"serdem werden von jedem Diagramm
+% sofern dies passt. Außerdem werden von jedem Diagramm
% die Autoren sowie Diagramm und Seitennummern in die
% Datei \jobname.inhalt geschrieben.
% Zur Einleitung der einzelnen Abteilungen gibt es einen speziellen Befehl
% \verb+\Abteilung+.
%
% \begin{macrocode}
+\newwrite\@swfile@lsghead
+\newcommand{\sw@openlsghead}{%
+ \immediate\openout\@swfile@lsghead=\jobname.lsgh\relax%
+}
+\newcommand{\sw@closelsghead}{%
+ \immediate\closeout\@swfile@lsghead%
+}
+
+\AtBeginDocument{\sw@openlsghead}
+\AtEndDocument{\sw@closelsghead}
+
+\newcommand{\sw@write@abteilung}[2]{%
+ \esol%
+ \bgroup%
+ \edef\@tempd{#1}%
+ \edef\@tempe{#2}%
+ \edef\@tempa{%
+ \immediate\write\@swfile@lsghead{%
+ \@nearverbatim\@tempd|%
+ \@nearverbatim\@tempe%
+ }%
+ }%
+ \expandafter\egroup\@tempa%
+ \bsol%
+}
\newcommand{\sw@urd@abteilung}{%
\@ifstar%
\@sw@urd@abteilung@one%
@@ -789,11 +854,13 @@
\textbf{#1 (\ref{#2}): %
Bearbeiter = #3%
\url{#4}}
+ \sw@write@abteilung{*}{#2}%
}
\newcommand{\@sw@urd@abteilung}[5]{%
\textbf{#1 (\ref{#2}-\ref{#3}): %
Bearbeiter = #4%
\url{#5}}
+ \sw@write@abteilung{#2}{#3}%
}
\newenvironment{Urdrucke}[1]{%
\setboolean{showcity}{true}%
@@ -804,7 +871,7 @@
\def\do@dia@job{%
% Gebe das Diagramm aus
\unhbox\dia@box%
- % Erzeuge die Eintr"age f"ur das Inhaltsverzeichnis
+ % Erzeuge die Einträge für das Inhaltsverzeichnis
\sw@problem%
}%
\ttitel@skip%
@@ -854,7 +921,7 @@
\newcommand{\sw@loesungen}[2]{%
\begingroup%
\ttitel@skip%
- \centerline{\Large\bfseries L\"osungen der Urdrucke aus Heft #1, #2}%
+ \centerline{\Large\bfseries Lösungen der Urdrucke aus Heft #1, #2}%
\titel@skip%
\stepcounter{@inhalt}%
\inhalt@label\relax%
@@ -903,8 +970,9 @@
}
% \end{macrocode}
%
-% Innerhalb der einzelnen Abteilungen in den L"osungen werden die Namen und K"urzel der L"oser aufgesammelt, damit
-% die Liste der L"oserk"urzel am Beginn der Lösungsbesprechungen angegeben werden kann.
+% Innerhalb der einzelnen Abteilungen in den Lösungen werden die Namen
+% und Kürzel der Löser aufgesammelt, damit die Liste der Löserkürzel
+% am Beginn der Lösungsbesprechungen angegeben werden kann.
%
% \begin{macrocode}
\newwrite\@cpdfile@loeserkuerzel
@@ -938,12 +1006,59 @@
}
% \end{macrocode}
%
+% Einzelne Lösungen innerhalb der Lösungsbesprechung sollen mit dem
+% Befehl \verb+\Loesung+ eingeleitet werden.
+%
+% \begin{macrocode}
+\newcounter{sw@loesung@author@count}
+\newcounter{sw@loesung@author@index}
+\def\sw@count@authors#1; {%
+ \stepcounter{sw@loesung@author@count}%
+ \cpd@parse@list%
+}
+\def\sw@display@author#1, #2; {%
+ \stepcounter{sw@loesung@author@index}%
+ \ifthenelse{\value{sw@loesung@author@index}=1}{%
+ % No separator before 1st author
+ }{%
+ \ifthenelse{\value{sw@loesung@author@index}=\value{sw@loesung@author@count}}{%
+ \ \& %
+ }{%
+ , %
+ }%
+ }%
+ #2 #1%
+ \cpd@parse@list%
+}
+\newcommand{\sw@loesung@authors}[1]{%
+\setcounter{sw@loesung@author@count}{0}%
+\let\cpd@parse@action=\sw@count@authors%
+\cpd@parse@list#1; \relax%
+\setcounter{sw@loesung@author@index}{0}%
+\let\cpd@parse@action=\sw@display@author%
+(\cpd@parse@list#1; \relax)%
+}
+\newcommand{\showsol}{}
+\newcommand{\cpd@Loesung}[3]{%
+ \textbf{#1}\ \sw@loesung@authors{#2}%
+ \renewcommand{\showsol}{#3}%
+}
+\newcommand{\cpd@Loesung@star}[3]{%
+ \textbf{#1}\ \sw@loesung@authors{#2}\ #3%
+ \renewcommand{\showsol}{}%
+}
+\newcommand{\Loesung}{%
+ \@ifstar{\cpd@Loesung@star}{\cpd@Loesung}%
+}
+
+% \end{macrocode}
+%
%
-% Eine Umbegung f"ur die L"oserliste.
+% Eine Umbegung für die Löserliste.
% \begin{macrocode}
\newenvironment{Loeserliste}[1]{%
\ttitel@skip%
- \centerline{\Large\bfseries L\"oserliste #1}%
+ \centerline{\Large\bfseries Löserliste #1}%
\titel@skip%
\stepcounter{@inhalt}%
\inhalt@label\relax%
@@ -961,26 +1076,26 @@
}{}
% \end{macrocode}
%
-% Eine Zwischen"uberschrift f"ur {\itshape Sonderpunkte \& Dauerkonto}.
+% Eine Zwischenüberschrift für {\itshape Sonderpunkte \& Dauerkonto}.
% \begin{macrocode}
\newcommand{\dauerkonto}[1]{%
\ttitel@skip%
- \centerline{\large\bfseries L\"oserliste: Sonderpunkte \& Dauerkonto #1}%
+ \centerline{\large\bfseries Löserliste: Sonderpunkte \& Dauerkonto #1}%
\titel@skip%
}
% \end{macrocode}
%
-% Eine Zwischen"uberschrift f"ur den Preisbericht zum L\"osungswettbewerb.
+% Eine Zwischenüberschrift für den Preisbericht zum Lösungswettbewerb.
% \begin{macrocode}
\newcommand{\loesungswettbewerb}[1]{
\ttitel@skip%
- \centerline{\Large\bfseries Preisbericht zum L\"osungswettbewerb #1}%
+ \centerline{\Large\bfseries Preisbericht zum Lösungswettbewerb #1}%
\titel@skip%
}
% \end{macrocode}
%
-% Die Umgebung f"ur {\bfseries Bemerkungen und Berichtigungen} erzeugt die
-% "Uberschrift und den Eintrag ins Inhaltsverzeichnis.
+% Die Umgebung für {\bfseries Bemerkungen und Berichtigungen} erzeugt die
+% Ãœberschrift und den Eintrag ins Inhaltsverzeichnis.
% \begin{macrocode}
\newenvironment{BuB}{%
\ttitel@skip%
@@ -1023,11 +1138,11 @@
\def\endUntertitel{\subtitel@subskip}
% \end{macrocode}
%
-% Eine Umgebung f"ur Berichte ohne automatisch erstellte "Uberschrift.
-% Der "ubergebene Wert wird in das Inhaltsverzeichnis "ubernommen.
+% Eine Umgebung für Berichte ohne automatisch erstellte Überschrift.
+% Der übergebene Wert wird in das Inhaltsverzeichnis übernommen.
% \begin{macrocode}
\newenvironment{Bericht}[1]{%
- % Erzeuge den Eintrag f\"ur das Inhaltsverzeichnis
+ % Erzeuge den Eintrag für das Inhaltsverzeichnis
\stepcounter{@inhalt}%
\let\titel@ext\inhalt@label\relax%
\bgroup%
@@ -1045,8 +1160,8 @@
}{}
% \end{macrocode}
%
-% Eine Umgebung f"ur Gr"usse ohne automatisch erstellte "Uberschrift.
-% Der "ubergebene Wert wird in das Inhaltsverzeichnis "ubernommen.
+% Eine Umgebung für Grüsse ohne automatisch erstellte Überschrift.
+% Der übergebene Wert wird in das Inhaltsverzeichnis übernommen.
% \begin{macrocode}
\newenvironment{Gruss}[1]{%
% Eintrag im Inhaltsverzeichnis
@@ -1067,8 +1182,8 @@
}{}
% \end{macrocode}
%
-% Eine Umgebung f"ur Tagungsberichte ohne automatisch erstellte "Uberschrift.
-% Der "ubergebene Wert wird in das Inhaltsverzeichnis "ubernommen.
+% Eine Umgebung für Tagungsberichte ohne automatisch erstellte Überschrift.
+% Der übergebene Wert wird in das Inhaltsverzeichnis übernommen.
% \begin{macrocode}
\newenvironment{Tagung}[1]{%
% Eintrag im Inhaltsverzeichnis
@@ -1090,12 +1205,12 @@
% \end{macrocode}
%
% Bei Turnierberichten wird nur ein Eintrag ins Inhaltsverzeichnis erzeugt.
-% Die "Uberschrift muss in der Umgebung \verb+Titel+ gesetzt werden.
+% Die Ãœberschrift muss in der Umgebung \verb+Titel+ gesetzt werden.
% \begin{macrocode}
\newenvironment{Turnierbericht}[2]{%
\stepcounter{@inhalt}%
\let\titel@ext\inhalt@label\relax%
- % Erzeuge den Eintrag f\"ur das Inhaltsverzeichnis
+ % Erzeuge den Eintrag für das Inhaltsverzeichnis
\bgroup%
\def\@tempb{\Turnierbericht}%
\def\@tempc{#1}%
@@ -1113,7 +1228,7 @@
}{}
% \end{macrocode}
%
-% Die Umbegung f"ur Berichte von Turnieren aus anderen Zeitschriften.
+% Die Umbegung für Berichte von Turnieren aus anderen Zeitschriften.
% \begin{macrocode}
% Turnierberichte aus anderen Zeitschriften
\newenvironment{turnierberichte}{%
@@ -1143,10 +1258,10 @@
}
% \end{macrocode}
%
-% Das {\itshape kleine M"archenschach-Lexikon} im Urdruckteil kann in mehrere
+% Das {\itshape kleine Märchenschach-Lexikon} im Urdruckteil kann in mehrere
% Abschnitte zerlegt werden, damit es besser auf die Seiten passt. Bei der
% ersten \verb+maerchenlexikon+ Umgebung steht die Einleitung. Zwei
-% M"archenarten werden mittels \verb+---+ voneinander getrennt.
+% Märchenarten werden mittels \verb+---+ voneinander getrennt.
% \begin{macrocode}
\newcounter{@maerchenlexikon}
\setcounter{@maerchenlexikon}{0}
@@ -1162,7 +1277,7 @@
\newenvironment{maerchenlexikon}%
{%
\ifthenelse{\value{@maerchenlexikon}=0}{%
- {\itshape Kleines M\"archenschach-Lexikon:} %
+ {\itshape Kleines Märchenschach-Lexikon:} %
}{}%
\setboolean{@first@lexikon@entry}{true}%
\stepcounter{@maerchenlexikon}%
@@ -1195,12 +1310,16 @@
%
% Die Umbegung \verb+Entscheid+ erzeugt einen Eintrag ins Inhaltsverzeichnis.
% Als Parameter ist der Name des Turnier anzugeben.
-% Die "Uberschrift muss mittels der Umbebung \verb+Titel+ gesetzt werden.
+% Die Ãœberschrift muss mittels der Umbebung \verb+Titel+ gesetzt werden.
% \begin{macrocode}
\newenvironment{Entscheid}[1]{%
- % Erzeuge den Eintrag f\"ur das Inhaltsverzeichnis
+ % Erzeuge den Eintrag für das Inhaltsverzeichnis
\stepcounter{@inhalt}%
\let\titel@ext\inhalt@label\relax%
+ % Weitere Einstellungen
+ \let\orig@dia@above=\dia@above%
+ \let\dia@above=\dia@above@InformalEntscheid%
+ \setboolean{normaldiaabove}{false}%
\bgroup%
\def\@tempb{\Entscheid}%
\def\@tempc{#1}%
@@ -1251,7 +1370,7 @@
% 1. Autor(en) und
% 2. Titel des Buches
% anzugeben. Beide Angaben erscheinen Fettgedruckt am Beginn der
-% Buchbesprechung und werden f"ur das Register "ubernommen.
+% Buchbesprechung und werden für das Register übernommen.
%
% Schreiben der Autoren
%
@@ -1452,7 +1571,7 @@
\titel@skip%
}
%-----------------------------------------------------------
-% 7) Personalia: Geburtstage und Sterbef"alle
+% 7) Personalia: Geburtstage und Sterbefälle
% Parameter: (Geburt)
% 1. Name
% 2. Alter
@@ -1474,7 +1593,7 @@
\centerline{\Large\bfseries#1\ \ #2}
\titel@skip%
\fi%
- % Erzeuge den Eintrag f\"ur das Inhaltsverzeichnis
+ % Erzeuge den Eintrag für das Inhaltsverzeichnis
\stepcounter{@inhalt}%
\inhalt@label\relax%
\bgroup%
@@ -1498,7 +1617,7 @@
\centerline{#1}
\titel@skip%
\fi%
- % Erzeuge den Eintrag f\"ur das Inhaltsverzeichnis
+ % Erzeuge den Eintrag für das Inhaltsverzeichnis
\stepcounter{@inhalt}%
\inhalt@label\relax%
\bgroup%
@@ -1522,7 +1641,7 @@
\ttitel@skip%
\hbox to \textwidth{\large\bfseries\uppercase{#1}\hfill#2}%
\titel@skip%
- % Erzeuge den Eintrag f\"ur das Inhaltsverzeichnis
+ % Erzeuge den Eintrag für das Inhaltsverzeichnis
\stepcounter{@inhalt}%
\inhalt@label\relax%
\bgroup%
@@ -1542,7 +1661,7 @@
}
%
\def\y@Verstorben#1{%
- % Erzeuge den Eintrag f\"ur das Inhaltsverzeichnis
+ % Erzeuge den Eintrag für das Inhaltsverzeichnis
\stepcounter{@inhalt}%
\inhalt@label\relax%
\bgroup%
@@ -1560,7 +1679,7 @@
}
%
\def\Nachruf#1{%
- % Erzeuge den Eintrag f\"ur das Inhaltsverzeichnis
+ % Erzeuge den Eintrag für das Inhaltsverzeichnis
\stepcounter{@inhalt}%
\inhalt@label\relax%
\bgroup%
@@ -1613,16 +1732,16 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Es folgen ein paar Hilfskommandos und Initialsierungen
%-----------------------------------------------------------
-% 1. "Offnen der datei, die alle Eintr"age f"ur das
-% Inhaltsverzeichnis enth"alt.
+% 1. "Offnen der datei, die alle Einträge für das
+% Inhaltsverzeichnis enthält.
%
\newwrite\sw@contents
\immediate\openout\sw@contents=\jobname.inhalt\relax
\newwrite\sw@problems
\immediate\openout\sw@problems=\jobname.problems\relax
%-----------------------------------------------------------
-% 2. Abstand zu einer "Uberschrift und
-% von einer "Uberschrift zum folgenden Text
+% 2. Abstand zu einer Ãœberschrift und
+% von einer Ãœberschrift zum folgenden Text
%
% \def\ttitel@skip{\vskip30\p@ plus \f@ur\p@\penalty-100}
\def\ttitel@skip{\vskip24\p@ plus \f@ur\p@\goodbreak}
@@ -1652,7 +1771,7 @@
%
\newif\if@gemeinschaft
\def\sw@problem{%
- % Z"ahle die Autoren
+ % Zähle die Autoren
\sw@count\z@%
\let\@action=\sw@authorCount%
\expandafter\l@@klist\the\aut@tk; \e@list%
@@ -1695,7 +1814,7 @@
\l@@klist%
}
%-----------------------------------------------------------
-% 5. Z"ahlen von Autoren
+% 5. Zählen von Autoren
%
\newcount\sw@count
\def\sw@authorCount#1; {%
@@ -1703,7 +1822,7 @@
\l@@klist%
}
%-----------------------------------------------------------
-% 6. F"ur das Schreiben in die inhaltsdatei ohne
+% 6. Für das Schreiben in die inhaltsdatei ohne
% Kommandos zu expandieren.
\def\@meaning#1>{}
\def\@nearverbatim{\expandafter\@meaning\meaning}
@@ -1736,7 +1855,7 @@
:\/} #2}{#1}%
}
\def\ix@InformalEntscheid#1#2#3#4{\i@line{Entscheid im Informalturnier #2, Abteilung #1}{#4}}
-\def\ix@Loesungen#1#2#3{\i@line{L\"osungen der Urdrucke aus Heft #1, #2}{#3}}
+\def\ix@Loesungen#1#2#3{\i@line{Lösungen der Urdrucke aus Heft #1, #2}{#3}}
\def\ix@turnierbericht#1#2#3{%
\i@line{Entscheid im #1}{#3}%
}
@@ -1753,7 +1872,7 @@
\def\i@InformalEntscheid#1{\ix@InformalEntscheid#1}
\def\i@urdrucke#1{\i@line{Urdrucke}{#1}}
\def\i@Loesungen#1{\ix@Loesungen#1}
-\def\i@Loeserliste#1{\i@line{L\"oserliste}{#1}}
+\def\i@Loeserliste#1{\i@line{Löserliste}{#1}}
\def\i@bub#1{\i@line{Bemerkungen und Berichtigungen}{#1}}
\def\i@turniere#1{\i@line{Turnierberichte}{#1}}
\def\i@buecher#1{\i@line{Buchbesprechungen}{#1}}
@@ -1822,7 +1941,7 @@
\catcode`/=\active\relax\let/\sol@slash\relax\catcode`/=12%
\def\bsol{\catcode`/=\active\relax}
\def\esol{\catcode`/=12\relax}
-\bsol
+\AtBeginDocument{\bsol}
\renewcommand{\cpd@begindiagram@hook}{\esol}
\renewcommand{\cpd@enddiagram@hook}{\bsol}
@@ -1833,6 +1952,57 @@
\renewcommand{\x}{:}
\newcommand{\mal}{\mbox{\ifmmode\times\else$\times$\fi}}
+% \end{macrocode}
+%
+% Das Makro \verb+\Ruler+ erzeugt ein Lineal mit einer $1/20$
+% Einteilung der Seitenhöhe.
+%
+% \begin{macrocode}
+\newcommand{\Ruler}{%
+\makebox{%
+\setlength{\unitlength}{13mm}
+\begin{picture}(1,20)
+\put(0.4,-20){\line(0,1){20}}
+
+\multiput(0.4,-20)(0,2){11}{\line(1,0){0.4}}
+\multiput(0.4,-19)(0,2){10}{\line(1,0){0.2}}
+\put(0,-20){10}
+\put(0,-18){9}
+\put(0,-16){8}
+\put(0,-14){7}
+\put(0,-12){6}
+\put(0,-10){5}
+\put(0,-8){4}
+\put(0,-6){3}
+\put(0,-4){2}
+\put(0,-2){1}
+\end{picture}
+}}% Ruler
+% \end{macrocode}
+%
+% Das Makro \verb+\ShowRuler+ sorgt dafür, dass das mittels
+% \verb+\Ruler+ erzeugte Lineal auf jeder Seite angezeigt wird.
+%
+% \begin{macrocode}
+\newcommand{\ShowRuler}{%
+\AddToHook{shipout/background}{\put(32mm,-46mm){\Ruler}}%
+}%
+% \end{macrocode}
+%
+% Wenn beim Ãœbersetzen der \LaTeX-Datei in aktuellen Verzeichnis keine
+% \verb+__finalpdf__.tex+ existiert, wird die Anzeige des
+% Lineals mittels \verb+\ShowRuler+ aktiviert. Durch Anlegen der Datei
+% kann das Einblenden des Lineals deaktiviert werden.
+%
+% \begin{macrocode}
+\AtBeginDocument{\IfFileExists{__finalpdf__.tex}{}{\ShowRuler}}
+
+\newboolean{MeasureMode}
+\setboolean{MeasureMode}{false}
+\newcommand{\MeasureNewpage}{%
+ \ifthenelse{\boolean{MeasureMode}}{\newpage}{}%
+}
+
%
%
%</class>
@@ -1857,7 +2027,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\RequirePackage{diagram}[2019/12/28]
+\RequirePackage{diagram}[2020/02/09]
%
%
% Wir definieren das Diagrammlayout ein wenig um.
@@ -1919,7 +2089,7 @@
PLEASE~REPRINT\hfill BITTE~NACHDRUCKEN\hfill PRIERE~DE~REIMPRIMER%
}%
}
-% Definiere ein anderes Layout f"ur den Kopf eines Diagramms
+% Definiere ein anderes Layout für den Kopf eines Diagramms
%
%
\def\@dia@number{}% Die Diagrammnummer wird bei den Autoren gesetzt!
diff --git a/macros/latex/contrib/schwalbe-chess/schwalbe.pdf b/macros/latex/contrib/schwalbe-chess/schwalbe.pdf
index 35cf6524fa..bc3f10ddba 100644
--- a/macros/latex/contrib/schwalbe-chess/schwalbe.pdf
+++ b/macros/latex/contrib/schwalbe-chess/schwalbe.pdf
Binary files differ
diff --git a/macros/latex/contrib/sidenotesplus/README.txt b/macros/latex/contrib/sidenotesplus/README.txt
index da9f6a4532..e602b7cd34 100644
--- a/macros/latex/contrib/sidenotesplus/README.txt
+++ b/macros/latex/contrib/sidenotesplus/README.txt
@@ -2,7 +2,7 @@ LaTeX package sidenotesplus
Copyright (c) Anton Vrba, 2022
-------------------------------------------------------------------
Version:
- 2022/05/20 1.00 Initial release
+ 2022/05/31 1.01
Licence:
This work may be distributed and/or modified under the conditions
of the LaTeX Project Public License, version 1.3c of the license.
@@ -15,4 +15,7 @@ Abstract:
Also body text can be extended into the margin for wide figures,
tables and equation. Twoside symmetry is preserved.
For biblatex users, routines for side references are provided.
-------------------------------------------------------------------- \ No newline at end of file
+-------------------------------------------------------------------
+
+Previous Versions:
+ 2022/05/15 1.00 Initial release
diff --git a/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx b/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
index bc84aa424f..b6c51d20d2 100644
--- a/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
+++ b/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
@@ -36,7 +36,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
%<package>\ProvidesPackage{sidenotesplus}
%<*package>
- [2022/05/20 1.00 rich text marginal notes, tables and figures ]
+ [2022/05/31 v1.01 rich text marginal notes, tables and figures ]
%</package>
%<package>\RequirePackage{marginnote} % provides an offset option for the marginals instead of a float
%<package>\RequirePackage{caption} % handles the captions (in the margin)
@@ -94,7 +94,8 @@
%
% \maketitle
%
-% \changes{1.0}{2022/05/15}{Initial Release}
+% \changes{v1.0}{2022/05/15}{Initial Release}
+% \changes{v1.01}{2022/05/31}{Environment text* improved}
%
% \begin{abstract}
% \noindent A package to manage the margin notes, figures, tables and captions.
@@ -1146,10 +1147,15 @@
}
% \end{macrocode}
%
+%
+%
% \begin{environment}{text*}
% --
%
+% \changes{v1.01}{2022/5/31}{added newsavebox and minipage}
+%
% \begin{macrocode}
+\newsavebox{\b@snp@textbox}
\NewDocumentEnvironment{text*}{ o }%
{ % begin part
\begin{adjustwidth}{0pt}{0pt}
@@ -1157,25 +1163,30 @@
{
\if@twoside
\snp@isoddpage{\begin{adjustwidth}{0pt}{-\d@snp@extrawidth}}%
- {\begin{adjustwidth}{-\d@snp@extrawidth*}{0pt}}
+ {\begin{adjustwidth}{-\d@snp@extrawidth}{0pt}}
\else
- \begin{adjustwidth}{0pt}{-\d@snp@extrawidth*}
+ \begin{adjustwidth}{0pt}{-\d@snp@extrawidth}
\fi
}
{
\if@twoside
- \snp@isoddpage{\begin{adjustwidth}{0pt}{-\d@snp@extrawidth*#1}}%
- {\begin{adjustwidth}{-\d@snp@extrawidth*#1}{0pt}}
+ \snp@isoddpage{\begin{adjustwidth}{0pt}{-#1\d@snp@extrawidth}}%
+ {\begin{adjustwidth}{-#1\d@snp@extrawidth}{0pt}}
\else
- \begin{adjustwidth}{0pt}{-\d@snp@extrawidth*#1}
+ \begin{adjustwidth}{0pt}{-#1\d@snp@extrawidth}
\fi
}
+ \begin{lrbox}{\b@snp@textbox}
+ \begin{minipage}[]{\linewidth+1ex}
}
% \end{macrocode}
% \end{environment}
%
% \begin{macrocode}
{ % end part
+\end{minipage}
+\end{lrbox}
+\usebox{\b@snp@textbox}
\end{adjustwidth}\end{adjustwidth} \snp@placemarginal{}{}
}
% \end{macrocode}
@@ -1269,31 +1280,29 @@
%
%%
% \begin{macrocode}
-\newlength\marginparsepodd
-\newlength\marginparsepeven
+\newlength\snp@marginparsepodd
+\newlength\snp@marginparsepeven
-\setlength{\marginparsepodd}{\marginparsep}
-\setlength{\marginparsepeven}{\marginparsep-\snp@marginsepdiff}
+
+\setlength{\snp@marginparsepodd}{\marginparsep}
+\setlength{\snp@marginparsepeven}{\marginparsep-\snp@marginsepdiff}
\makeatletter
-% First we patch \@addmarginpar
-% The \patchcmd command does a search and replace.
\patchcmd{\@addmarginpar} % In this command
{\mph@orig@addmarginpar} % ... replace this...
{\if@twoside\ifodd\c@page\relax % ... with this
- \marginparsep=\marginparsepodd % Page is odd
+ \marginparsep=\snp@marginparsepodd % Page is odd
\else
- \marginparsep=\marginparsepeven % Page is even
+ \marginparsep=\snp@marginparsepeven % Page is even
\fi
\else
- \marginparsep=\marginparsepodd
+ \marginparsep=\snp@marginparsepodd
\fi
\mph@orig@addmarginpar}
{} % success
{\message{Error! Couldn't hook into command % failure
`\string\@addmarginpar'}}
-% Now we patch \@mn@@@marginnote
{%% Group to keep patching commands local
%
% Here we use a little trick to repeatedly patch the \@mn@@@marginnote
@@ -1312,12 +1321,12 @@
{\kern\marginparsep} % ... replace this...
{\ifx\@mn@currpage\relax\else % ... with this
\if@twoside\ifodd\@mn@currpage\relax
- \kern\marginparsepodd
+ \kern\snp@marginparsepodd
\else
- \kern\marginparsepeven
+ \kern\snp@marginparsepeven
\fi
\else
- \kern\marginparsepodd
+ \kern\snp@marginparsepodd
\fi
\fi}
{\message{Patched!}\patchok} % success (recurse)
@@ -1330,8 +1339,6 @@
\makeatother
\endinput
% \end{macrocode}
-
-
%
% \iffalse
%</package>
diff --git a/macros/latex/contrib/sidenotesplus/sidenotesplus.ins b/macros/latex/contrib/sidenotesplus/sidenotesplus.ins
index 33697cfce2..dbcf54724f 100644
--- a/macros/latex/contrib/sidenotesplus/sidenotesplus.ins
+++ b/macros/latex/contrib/sidenotesplus/sidenotesplus.ins
@@ -21,7 +21,7 @@
\input docstrip.tex
\keepsilent
-
+\askforoverwritefalse
\preamble
diff --git a/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf b/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
index b51643d66e..5237810fea 100644
--- a/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
+++ b/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index 28789f440f..810f2805ae 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,6 +7,12 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.1.2] - 2022-05-31
+
+### Fixed
+- Correct sign when fixing a negative exponent (see issue
+ [\#602](https://github.com/josephwright/siunitx/issues/602))
+
## [v3.1.1] - 2022-05-03
### Changed
@@ -1774,7 +1780,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.1.1...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.1.2...HEAD
+[v3.1.2]: https://github.com/josephwright/siunitx/compare/v3.1.1...v3.1.2
[v3.1.1]: https://github.com/josephwright/siunitx/compare/v3.1.0...v3.1.1
[v3.1.0]: https://github.com/josephwright/siunitx/compare/v3.0.50...v3.1.0
[v3.0.50]: https://github.com/josephwright/siunitx/compare/v3.0.49...v3.0.50
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 41fb8e8464..94538d4f93 100644
--- a/macros/latex/contrib/siunitx/siunitx-code.pdf
+++ b/macros/latex/contrib/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx
index f64fb85192..2f153d4686 100644
--- a/macros/latex/contrib/siunitx/siunitx-number.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-number.dtx
@@ -2042,7 +2042,8 @@
\exp_not:n { {#2} {#3} }
\@@_exponent_shift:nnn {#1} {#4} {#5}
\@@_exponent_uncert:n {#6}
- \exp_not:n { {#7} } { \int_use:N \l_@@_exponent_fixed_int }
+ { \int_compare:nNnT \l_@@_exponent_fixed_int < 0 { - } }
+ { \int_abs:n \l_@@_exponent_fixed_int }
}
\cs_new:Npn \@@_exponent_input:nnnnnnn #1#2#3#4#5#6#7
{ \exp_not:n { {#1} {#2} {#3} {#4} {#5} {#6} {#7} } }
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index 49446acfa5..9e03d6c4bf 100644
--- a/macros/latex/contrib/siunitx/siunitx.dtx
+++ b/macros/latex/contrib/siunitx/siunitx.dtx
@@ -121,7 +121,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2022-05-03} {3.1.1}
+\ProvidesExplPackage {siunitx} {2022-05-31} {3.1.2}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 126c670133..df22c1b862 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx.tex b/macros/latex/contrib/siunitx/siunitx.tex
index b10016c3b4..05c3e70ffa 100644
--- a/macros/latex/contrib/siunitx/siunitx.tex
+++ b/macros/latex/contrib/siunitx/siunitx.tex
@@ -1656,7 +1656,7 @@ conveys. The options are summarised in Table~\ref{tab:opt:num:out}.
print-implicit-plus & Switch & false \\
print-unity-mantissa & Switch & true \\
print-zero-exponent & Switch & false \\
- print-zero-integer & Switch & false \\
+ print-zero-integer & Switch & true \\
tight-spacing & Switch & false \\
uncertainty-descriptor-mode & Choice & bracket-separator \\
uncertainty-descriptor-separator & Literal & \cs{ } \\
diff --git a/macros/xetex/latex/bidi/README b/macros/xetex/latex/bidi/README
index 955449d560..23eb0d8c1a 100644
--- a/macros/xetex/latex/bidi/README
+++ b/macros/xetex/latex/bidi/README
@@ -1,6 +1,6 @@
___________________
The bidi package
-v37.1
+v37.2
This package provides a convenient interface for typesetting
bidirectional texts in Plain TeX and LaTeX, using XeTeX engine.
@@ -25,7 +25,7 @@ The announcements for the new releases of the package will
also appear in the Discussions space under the Announcements
category.
-Current version release date: 2022/05/27
+Current version release date: 2022/06/01
___________________________________________
Vafa Khalighi
diff --git a/macros/xetex/latex/bidi/bidi-doc-intro.ltx b/macros/xetex/latex/bidi/bidi-doc-intro.ltx
index fb1f37974a..b545f75846 100644
--- a/macros/xetex/latex/bidi/bidi-doc-intro.ltx
+++ b/macros/xetex/latex/bidi/bidi-doc-intro.ltx
@@ -20,7 +20,7 @@ If you use \textsf{bidi} package to write any input \TeX\ document, and then run
* Copyright (c) 2007--2022 Vafa Khalighi
* Copyright (c) 2018--2020 bidi-tex GitHub Organization
*
-* v37.1, 2022/05/27
+* v37.2, 2022/06/01
*
* License: LaTeX Project Public License, version
* 1.3c or higher (your choice)
diff --git a/macros/xetex/latex/bidi/bidi-doc-title.ltx b/macros/xetex/latex/bidi/bidi-doc-title.ltx
index 254c51d806..46977eaa4a 100644
--- a/macros/xetex/latex/bidi/bidi-doc-title.ltx
+++ b/macros/xetex/latex/bidi/bidi-doc-title.ltx
@@ -3,7 +3,7 @@
\begin{document}
\title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\
\LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt]
-\large User documentation for \textcolor{blue!65!black}{version 37.1}}
+\large User documentation for \textcolor{blue!65!black}{version 37.2}}
\author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the {\LaTeX} team to maintain the package in the period 2018--2020.}}
\setcounter{page}{0}
\thispagestyle{empty}
@@ -13,7 +13,7 @@
\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}
\Large
-User documentation for \textcolor{blue!65!black}{version 37.1}}
+User documentation for \textcolor{blue!65!black}{version 37.2}}
\vskip 0pt plus 3fill
\textit{\large to my Master, \textbf{Ferdowsi The Great}}
diff --git a/macros/xetex/latex/bidi/bidi-doc.ltx b/macros/xetex/latex/bidi/bidi-doc.ltx
index 2fa0627548..80d8f0c431 100644
--- a/macros/xetex/latex/bidi/bidi-doc.ltx
+++ b/macros/xetex/latex/bidi/bidi-doc.ltx
@@ -1,7 +1,7 @@
\documentclass{ltxdoc}
\input{bidi-doc-preamble.ltx}
\hypersetup{%
- pdftitle={User documentation for version 37.1 of the bidi
+ pdftitle={User documentation for version 37.2 of the bidi
package}%
}
\begin{document}
diff --git a/macros/xetex/latex/bidi/bidi-doc.pdf b/macros/xetex/latex/bidi/bidi-doc.pdf
index 178336960c..48440e7a0f 100644
--- a/macros/xetex/latex/bidi/bidi-doc.pdf
+++ b/macros/xetex/latex/bidi/bidi-doc.pdf
Binary files differ
diff --git a/macros/xetex/latex/bidi/bidi.dtx b/macros/xetex/latex/bidi/bidi.dtx
index 7cb0111153..8ca3b27d8b 100644
--- a/macros/xetex/latex/bidi/bidi.dtx
+++ b/macros/xetex/latex/bidi/bidi.dtx
@@ -5,7 +5,7 @@
%<*readme>
___________________
The bidi package
-v37.1
+v37.2
This package provides a convenient interface for typesetting
bidirectional texts in Plain TeX and LaTeX, using XeTeX engine.
@@ -30,7 +30,7 @@ The announcements for the new releases of the package will
also appear in the Discussions space under the Announcements
category.
-Current version release date: 2022/05/27
+Current version release date: 2022/06/01
___________________________________________
Vafa Khalighi
@@ -84,10 +84,16 @@ by Vafa Khalighi.
\generate{\file{artikel3-xetex-bidi.def}{\from{\jobname.dtx}{table,artikel3-xetex-bidi.def}}}
\generate{\file{arydshln-xetex-bidi.def}{\from{\jobname.dtx}{table,arydshln-xetex-bidi.def}}}
\generate{\file{beamer-xetex-bidi.def}{\from{\jobname.dtx}{table,beamer-xetex-bidi.def}}}
+\generate{\file{beamerbaseauxtemplates-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbaseauxtemplates-xetex-bidi.def}}}
+\generate{\file{beamerbaseboxes-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbaseboxes-xetex-bidi.def}}}
\generate{\file{beamerbasecolor-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbasecolor-xetex-bidi.def}}}
\generate{\file{beamerbaseframecomponents-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbaseframecomponents-xetex-bidi.def}}}
\generate{\file{beamerbaselocalstructure-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerbaselocalstructure-xetex-bidi.def}}}
\generate{\file{beamerinnerthemedefault-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerinnerthemedefault-xetex-bidi.def}}}
+\generate{\file{beamerinnerthemerounded-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerinnerthemerounded-xetex-bidi.def}}}
+\generate{\file{beamerouterthemeinfolines-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerouterthemeinfolines-xetex-bidi.def}}}
+\generate{\file{beamerouterthemesplit-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerouterthemesplit-xetex-bidi.def}}}
+\generate{\file{beamerouterthemeshadow-xetex-bidi.def}{\from{\jobname.dtx}{table,beamerouterthemeshadow-xetex-bidi.def}}}
\generate{\file{bidi.sty}{\from{\jobname.dtx}{table,bidi.sty}}}
\generate{\file{bidi.tex}{\from{\jobname.dtx}{table,bidi.tex}}}
\generate{\file{bidi2in1.sty}{\from{\jobname.dtx}{table,bidi2in1.sty}}}
@@ -172,6 +178,7 @@ by Vafa Khalighi.
\generate{\file{pdflscape-xetex-bidi.def}{\from{\jobname.dtx}{table,pdflscape-xetex-bidi.def}}}
\generate{\file{pdfpages-xetex-bidi.def}{\from{\jobname.dtx}{table,pdfpages-xetex-bidi.def}}}
\generate{\file{pgfcorescopes.code-xetex-bidi.def}{\from{\jobname.dtx}{table,pgfcorescopes.code-xetex-bidi.def}}}
+\generate{\file{pgfsys.code-xetex-bidi.def}{\from{\jobname.dtx}{table,pgfsys.code-xetex-bidi.def}}}
\generate{\file{picinpar-xetex-bidi.def}{\from{\jobname.dtx}{table,picinpar-xetex-bidi.def}}}
\generate{\file{plain-xetex-bidi.def}{\from{\jobname.dtx}{table,plain-xetex-bidi.def}}}
\generate{\file{pstricks-xetex-bidi.def}{\from{\jobname.dtx}{table,pstricks-xetex-bidi.def}}}
@@ -239,7 +246,7 @@ by Vafa Khalighi.
\documentclass{ltxdoc}
\input{bidi-doc-preamble.ltx}
\hypersetup{%
- pdftitle={Source documentation for version 37.1 of the bidi
+ pdftitle={Source documentation for version 37.2 of the bidi
package}%
}
\EnableCrossrefs
@@ -258,7 +265,7 @@ by Vafa Khalighi.
% \GetFileInfo{\jobname.dtx}
% \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\
%\LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt]
-%\large Source documentation for \textcolor{blue!65!black}{version 37.1}}
+%\large Source documentation for \textcolor{blue!65!black}{version 37.2}}
% \author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the {\LaTeX} team to maintain the package in the period 2018--2020.}}
%\setcounter{page}{0}
%\thispagestyle{empty}
@@ -268,7 +275,7 @@ by Vafa Khalighi.
%\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}
%
%\Large
-%Source documentation for \textcolor{blue!65!black}{version 37.1}}
+%Source documentation for \textcolor{blue!65!black}{version 37.2}}
%
%\vskip 0pt plus 3fill
%\textit{\large to my Master, \textbf{Ferdowsi The Great}}
@@ -317,7 +324,7 @@ by Vafa Khalighi.
%\iffalse
%<*table>
%\fi
-%% \CheckSum{52030}
+%% \CheckSum{52449}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -1954,6 +1961,187 @@ by Vafa Khalighi.
% \end{macrocode}
% \iffalse
%</beamer-xetex-bidi.def>
+%<*beamerbaseauxtemplates-xetex-bidi.def>
+%\fi
+% \section{File \texttt{beamerbaseauxtemplates-xetex-bidi.def}}
+% \begin{macrocode}
+\ProvidesFile{beamerbaseauxtemplates-xetex-bidi.def}[2022/06/01 v0.1 bidi adaptations for beamerbaseauxtemplates package for XeTeX engine]
+\bidi@csundef{beamer@@tmpop@section in toc@ball}
+
+\bidi@csundef{beamer@@tmpop@subsection in toc@ball}
+
+\bidi@csundef{beamer@@tmpop@subsubsection in toc@ball}
+
+\defbeamertemplate{section in toc}{ball}
+{\leavevmode\bidi@beamer@leftskip=2.75ex%
+ \llap{%
+ \normalsize%
+ \begin{pgfpicture}{-1ex}{-0.7ex}{1ex}{1ex}
+ \pgftext{\beamer@usesphere{section number projected}{tocsphere}}
+ \pgftext{%
+ \usebeamerfont*{section number projected}%
+ \usebeamercolor{section number projected}%
+ \color{fg!90!bg}%
+ \inserttocsectionnumber}
+ \end{pgfpicture}%
+ \kern1.25ex}%
+ \inserttocsection\par
+}
+[action]
+{\setbeamerfont{section number projected}{size=\scriptsize}}
+
+\defbeamertemplate{subsection in toc}{ball}
+{\leavevmode\bidi@beamer@leftskip=5ex%
+ \llap{\raise0.1ex\beamer@usesphere{subsection number projected}{bigsphere}\kern1ex}%
+ \inserttocsubsection\par%
+}
+
+\defbeamertemplate{subsubsection in toc}{ball}
+{\leavevmode\normalsize\usebeamerfont{subsection in
+ toc}\bidi@beamer@leftskip=7ex\usebeamerfont{subsubsection in toc}%
+ \llap{\beamer@usesphere{subsubsection number projected}{bigsphere}\kern0.75ex}%
+ \inserttocsubsubsection\par%
+}
+
+\bidi@csundef{beamer@@tmpop@block begin@rounded}
+
+\bidi@csundef{beamer@@tmpop@block alerted begin@rounded}
+
+\bidi@csundef{beamer@@tmpop@block example begin@rounded}
+
+\defbeamertemplate{block begin}{rounded}[1][shadow=false]
+{%
+ \par\vskip\medskipamount%
+ \begin{beamerboxesrounded}[upper=block title,lower=block body,#1]%
+ {\raggedright\usebeamerfont*{block title}\insertblocktitle}%
+ \bidi@beamer@ragged%
+ \usebeamerfont{block body}%
+}
+
+\defbeamertemplate{block alerted begin}{rounded}[1][shadow=false]
+{%
+ \par\vskip\medskipamount%
+ \begin{beamerboxesrounded}[upper=block title alerted,lower=block body alerted,#1]%
+ {\raggedright\usebeamerfont*{block title alerted}\insertblocktitle}%
+ \bidi@beamer@ragged%
+ \usebeamerfont{block body alerted}%
+}%
+
+\defbeamertemplate{block example begin}{rounded}[1][shadow=false]
+{%
+ \par\vskip\medskipamount%
+ \begin{beamerboxesrounded}[upper=block title example,lower=block body example,#1]
+ {\raggedright\usebeamerfont*{block title example}\insertblocktitle}%
+ \bidi@beamer@ragged%
+ \usebeamerfont{block body example}%
+}%
+
+% \end{macrocode}
+% \iffalse
+%</beamerbaseauxtemplates-xetex-bidi.def>
+%<*beamerbaseboxes-xetex-bidi.def>
+%\fi
+% \section{File \texttt{beamerbaseboxes-xetex-bidi.def}}
+% \begin{macrocode}
+\ProvidesFile{beamerbaseboxes-xetex-bidi.def}[2022/06/01 v0.1 bidi adaptations for beamerbaseboxes package for XeTeX engine]
+\renewcommand\beamerboxesrounded[2][]{%
+ \global\let\beamer@firstlineitemizeunskip=\relax%
+ \vbox\bgroup%
+ \setkeys{beamerboxes}{upper=block title,lower=block body,width=\textwidth,shadow=false}%
+ \setkeys{beamerboxes}{#1}%
+ {%
+ \usebeamercolor{\bmb@lower}%
+ \globalcolorstrue%
+ \colorlet{lower.bg}{bg}%
+ }%
+ {%
+ \usebeamercolor{\bmb@upper}%
+ \globalcolorstrue%
+ \colorlet{upper.bg}{bg}%
+ }%
+ %
+ % Typeset head
+ %
+ \vskip4bp
+ \setbox\bmb@box=\hbox{%
+ \begin{minipage}[b]{\bmb@width}%
+ \usebeamercolor[fg]{\bmb@upper}%
+ #2%
+ \end{minipage}}%
+ \ifdim\wd\bmb@box=0pt%
+ \setbox\bmb@box=\hbox{}%
+ \ht\bmb@box=1.5pt%
+ \bmb@prevheight=-4.5pt%
+ \else%
+ \wd\bmb@box=\bmb@width%
+ \bmb@temp=\dp\bmb@box%
+ \ifdim\bmb@temp<1.5pt%
+ \bmb@temp=1.5pt%
+ \fi%
+ \setbox\bmb@box=\hbox{\raise\bmb@temp\hbox{\box\bmb@box}}%
+ \dp\bmb@box=0pt%
+ \bmb@prevheight=\ht\bmb@box%
+ \fi%
+ \bmb@temp=\bmb@width%
+ \bmb@dima=\bmb@temp\advance\bmb@dima by2.2bp%
+ \bmb@dimb=\bmb@temp\advance\bmb@dimb by4bp%
+ \hbox{%
+ \begin{pgfpicture}{0bp}{+-\ht\bmb@box}{0bp}{+-\ht\bmb@box}
+ \ifdim\wd\bmb@box=0pt%
+ \color{lower.bg}%
+ \else%
+ \color{upper.bg}%
+ \fi%
+ \pgfpathqmoveto{-4bp}{-1bp}
+ \pgfpathqcurveto{-4bp}{1.2bp}{-2.2bp}{3bp}{0bp}{3bp}
+ \pgfpathlineto{\pgfpoint{\bmb@temp}{3bp}}
+ \pgfpathcurveto%
+ {\pgfpoint{\bmb@dima}{3bp}}%
+ {\pgfpoint{\bmb@dimb}{1.2bp}}%
+ {\pgfpoint{\bmb@dimb}{-1bp}}%
+ \bmb@dima=-\ht\bmb@box%
+ \advance\bmb@dima by-2pt%
+ \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+ \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}}
+ \pgfusepath{fill}
+ \end{pgfpicture}%
+ \copy\bmb@box%
+ }%
+ \nointerlineskip%
+ \vskip-1pt%
+ \ifdim\wd\bmb@box=0pt%
+ \else%
+ \hbox{%
+ \begin{pgfpicture}{0pt}{0pt}{\bmb@width}{6pt}
+ \bmb@dima=\bmb@width%
+ \advance\bmb@dima by8bp%
+ \pgfpathrectangle{\pgfpoint{-4bp}{-1bp}}{\pgfpoint{\bmb@dima}{8bp}}
+ \pgfusepath{clip}
+ {\pgftransformshift{\pgfpoint{-4bp}{0bp}}\pgftext[left,base]{\pgfuseshading{bmb@transition}}}%
+ \end{pgfpicture}%
+ }%
+ \nointerlineskip%
+ \vskip-0.5pt%
+ \fi%
+ \setbox\bmb@colorbox=\hbox{{\pgfpicturetrue\pgfsetcolor{lower.bg}}}%
+ \setbox\bmb@box=\hbox\bgroup\begin{minipage}[b]{\bmb@width}%
+ \vskip2pt%
+ \usebeamercolor[fg]{\bmb@lower}%
+ \colorlet{beamerstructure}{upper.bg}%
+ \colorlet{structure}{upper.bg}%
+ %\color{.}%
+ \@bidi@list@minipage@parboxfalse
+ }
+
+\bidi@patchcmd{\endbeamerboxesrounded}{\begingroup}{%
+ \begingroup
+ \@RTLfalse
+}{}{}
+
+
+% \end{macrocode}
+% \iffalse
+%</beamerbaseboxes-xetex-bidi.def>
%<*beamerbasecolor-xetex-bidi.def>
%\fi
% \section{File \texttt{beamerbasecolor-xetex-bidi.def}}
@@ -2379,7 +2567,7 @@ by Vafa Khalighi.
%\fi
% \section{File \texttt{beamerinnerthemedefault-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{beamerinnerthemedefault-xetex-bidi.def}[2022/05/24 v0.1 bidi adaptations for beamerinnerthemedefault package for XeTeX engine]
+\ProvidesFile{beamerinnerthemedefault-xetex-bidi.def}[2022/06/01 v0.2 bidi adaptations for beamerinnerthemedefault package for XeTeX engine]
\newcommand*{\bidi@beamer@leftskip}{%
\if@RTL
\rightskip
@@ -2388,6 +2576,14 @@ by Vafa Khalighi.
\fi
}
+\newcommand*{\bidi@beamer@rightskip}{%
+ \if@RTL
+ \leftskip
+ \else
+ \rightskip
+ \fi
+}
+
\bidi@csundef{beamer@@tmpop@subsection in toc@default}
\bidi@csundef{beamer@@tmpop@subsubsection in toc@default}
@@ -2459,13 +2655,140 @@ by Vafa Khalighi.
% \end{macrocode}
% \iffalse
%</beamerinnerthemedefault-xetex-bidi.def>
+%<*beamerinnerthemerounded-xetex-bidi.def>
+%\fi
+% \section{File \texttt{beamerinnerthemerounded-xetex-bidi.def}}
+% \begin{macrocode}
+\ProvidesFile{beamerinnerthemerounded-xetex-bidi.def}[2022/06/01 v0.1 bidi adaptations for beamerinnerthemerounded package for XeTeX engine]
+\setbeamertemplate{blocks}[rounded][shadow=\beamer@themerounded@shadow]
+\setbeamertemplate{items}[ball]
+\setbeamertemplate{sections/subsections in toc}[ball]
+
+% \end{macrocode}
+% \iffalse
+%</beamerinnerthemerounded-xetex-bidi.def>
+%<*beamerouterthemeinfolines-xetex-bidi.def>
+%\fi
+% \section{File \texttt{beamerouterthemeinfolines-xetex-bidi.def}}
+% \begin{macrocode}
+\ProvidesFile{beamerouterthemeinfolines-xetex-bidi.def}[2022/06/01 v0.1 bidi adaptations for beamerouterthemeinfolines package for XeTeX engine]
+\bidi@csundef{beamer@@tmpop@footline@infolines theme}
+
+\defbeamertemplate*{footline}{infolines theme}
+{%
+ \leavevmode%
+ \hbox{%
+ \begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,center]{author in head/foot}%
+ \usebeamerfont{author in head/foot}\insertshortauthor\expandafter\ifblank\expandafter{\beamer@shortinstitute}{}{~~(\insertshortinstitute)}
+ \end{beamercolorbox}%
+ \begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,center]{title in head/foot}%
+ \usebeamerfont{title in head/foot}\insertshorttitle
+ \end{beamercolorbox}%
+ \begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,leftskip=2ex,rightskip=2ex,sep=0pt]{date in head/foot}%
+ \hfill%
+ \usebeamerfont{date in head/foot}%
+ \insertshortdate{}%
+ \hfill%
+ \bgroup
+ \usebeamercolor[fg]{page number in head/foot}%
+ \usebeamerfont{page number in head/foot}%
+ \usebeamertemplate{page number in head/foot}%
+ \egroup
+ \end{beamercolorbox}}%
+ \vskip0pt%
+}
+
+
+% \end{macrocode}
+% \iffalse
+%</beamerouterthemeinfolines-xetex-bidi.def>
+%<*beamerouterthemesplit-xetex-bidi.def>
+%\fi
+% \section{File \texttt{beamerouterthemesplit-xetex-bidi.def}}
+% \begin{macrocode}
+\ProvidesFile{beamerouterthemesplit-xetex-bidi.def}[2022/06/01 v0.1 bidi adaptations for beamerouterthemesplit package for XeTeX engine]
+\bidi@csundef{beamer@@tmpop@footline@split theme}
+
+\defbeamertemplate*{footline}{split theme}
+{%
+ \leavevmode%
+ \hbox{\begin{beamercolorbox}[wd=.5\paperwidth,ht=2.5ex,dp=1.125ex,leftskip=.3cm plus1fill,rightskip=.3cm]{author in head/foot}%
+ \usebeamerfont{author in head/foot}\insertshortauthor
+ \end{beamercolorbox}%
+ \begin{beamercolorbox}[wd=.5\paperwidth,ht=2.5ex,dp=1.125ex,leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}%
+ \usebeamerfont{title in head/foot}\insertshorttitle\nobreak\hfill\bgroup\usebeamercolor[fg]{page number in head/foot}\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}\egroup
+ \end{beamercolorbox}}%
+ \vskip0pt%
+}
+
+
+% \end{macrocode}
+% \iffalse
+%</beamerouterthemesplit-xetex-bidi.def>
+%<*beamerouterthemeshadow-xetex-bidi.def>
+%\fi
+% \section{File \texttt{beamerouterthemeshadow-xetex-bidi.def}}
+% \begin{macrocode}
+\ProvidesFile{beamerouterthemeshadow-xetex-bidi.def}[2022/06/01 v0.1 bidi adaptations for beamerouterthemeshadow package for XeTeX engine]
+\bidi@csundef{beamer@@tmpop@frametitle@shadow theme}
+
+\defbeamertemplate*{frametitle}{shadow theme}
+{%
+ \nointerlineskip%
+ \vskip-2pt%
+ \hbox{\leavevmode
+ \advance\beamer@leftmargin by -12bp%
+ \advance\beamer@rightmargin by -12bp%
+ \beamer@tempdim=\textwidth%
+ \advance\beamer@tempdim by \beamer@leftmargin%
+ \advance\beamer@tempdim by \beamer@rightmargin%
+ \hskip-\Gm@lmargin\hbox{%
+ \setbox\beamer@tempbox=\hbox{\begin{minipage}[b]{\paperwidth}%
+ \vbox{}\vskip-.75ex%
+ \bidi@beamer@leftskip0.3cm%
+ \bidi@beamer@rightskip0.3cm plus1fil\leavevmode
+ \bgroup\usebeamercolor[fg]{frametitle}\usebeamerfont{frametitle}\strut\insertframetitle\strut\egroup\par%
+ \ifx\insertframesubtitle\@empty\else%
+ {\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\insertframesubtitle}\strut\par}%
+ \fi%
+ \nointerlineskip
+ \vbox{}%
+ \end{minipage}}%
+ \beamer@tempdim=\ht\beamer@tempbox%
+ \advance\beamer@tempdim by 2pt%
+ \begin{pgfpicture}{0pt}{0pt}{\paperwidth}{\beamer@tempdim}
+ \begin{pgfscope}
+ \pgfsetfillcolor{black}%
+ \pgfpathrectangle{\pgfpoint{0pt}{-4pt}}{\pgfpoint{\paperwidth}{8pt}}%
+ \pgfsetfading{beamer@topshadowmask}{}%
+ \pgfusepath{fill}%
+ \end{pgfscope}
+ \begin{pgfscope}
+ \usebeamercolor{frametitle right}%
+ \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\paperwidth}{\beamer@tempdim}}%
+ \pgfusepath{clip}%
+ \pgftext[left,base]{\pgfuseshading{beamer@frametitleshade}}%
+ \end{pgfscope}
+ \end{pgfpicture}
+ \hskip-\paperwidth%
+ \box\beamer@tempbox%
+ }%
+ \hskip-\Gm@rmargin%
+ }%
+ \vskip-2pt
+}
+
+
+% \end{macrocode}
+% \iffalse
+%</beamerouterthemeshadow-xetex-bidi.def>
%<*bidi.sty>
%\fi
% \section{File \texttt{bidi.sty}}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\def\bididate{2022/05/27}
-\def\bidi@version{37.1}
+\def\bididate{2022/06/01}
+\def\bidi@version{37.2}
\ProvidesPackage{bidi}[\bididate\space v\bidi@version\space
Bidirectional typesetting in plain TeX and LaTeX]
\edef\@bidi@info{****************************************************^^J%
@@ -2553,7 +2876,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
}
\newcommand*{\@bidi@pdfcustomproperties}{%
This is the bidi package, Version \bidi@version,
- Released May 27, 2022.
+ Released June 1, 2022.
}
\newcommand*{\bidi@beamer@ragged}{}
\@RTLmainfalse
@@ -2797,9 +3120,9 @@ Bidirectional typesetting in plain TeX and LaTeX]
%\fi
% \section{File \texttt{bidi.tex}}
% \begin{macrocode}
-\def\bididate{2022/05/27}
+\def\bididate{2022/06/01}
\catcode`@=11
-\def\bidi@version{37.1}
+\def\bidi@version{37.2}
\let \protect \relax
\newlinechar`\^^J
\edef\@bidi@info{****************************************************^^J%
@@ -2901,7 +3224,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
}
\def\@bidi@pdfcustomproperties{%
This is the bidi package, Version \bidi@version,
- Released May 27, 2022.
+ Released June 1, 2022.
}
\def\bidi@pdfm@mark{%
\special{pdf:%
@@ -17316,6 +17639,19 @@ bidi implementation of tufte title]
% \end{macrocode}
% \iffalse
%</pgfcorescopes.code-xetex-bidi.def>
+%<*pgfsys.code-xetex-bidi.def>
+%\fi
+% \section{File \texttt{pgfsys.code-xetex-bidi.def}}
+% \begin{macrocode}
+\ProvidesFile{pgfsys.code-xetex-bidi.def}[2022/06/01 v0.1 bidi adaptations for pgfsys.code.tex file for XeTeX engine]
+\def\pgfsys@shadingoutsidepgfpicture#1{%
+ \beginL#1\endL%
+}
+
+
+% \end{macrocode}
+% \iffalse
+%</pgfsys.code-xetex-bidi.def>
%<*picinpar-xetex-bidi.def>
%\fi
% \section{File \texttt{picinpar-xetex-bidi.def}}
@@ -23313,7 +23649,7 @@ to\rtside{\box\bslice\hfil}}
%\fi
% \section{File \texttt{latex-xetex-bidi.def}}
% \begin{macrocode}
-\ProvidesFile{latex-xetex-bidi.def}[2022/05/27 v1.4.1 bidi adaptations for `latex.ltx' for XeTeX engine]
+\ProvidesFile{latex-xetex-bidi.def}[2022/06/01 v1.4.2 bidi adaptations for `latex.ltx' for XeTeX engine]
\newcommand{\TeXXeTOn}{\TeXXeTstate\@ne}
\newcommand{\TeXXeTOff}{\TeXXeTstate\z@}
\TeXXeTOn
@@ -23534,7 +23870,7 @@ to\rtside{\box\bslice\hfil}}
\if@pboxsw \m@th$\fi
\@end@tempboxa}
\newenvironment{LTRitems}
- {\par\@RTLfalse\@RTLtabfalse
+ {\par\@RTLfalse\@RTLtabfalse\bidi@beamer@ragged
\if@bidi@list@minipage@parbox
\parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth
\else \if@hboxRconstruct\if@bidi@list@minipage@parbox@not@nob
@@ -23543,7 +23879,7 @@ to\rtside{\box\bslice\hfil}}
\else \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth\fi\fi
\ignorespaces}{\vskip\z@}
\newenvironment{RTLitems}
- {\par\@RTLtrue\@RTLtabtrue
+ {\par\@RTLtrue\@RTLtabtrue\bidi@beamer@ragged
\if@bidi@list@minipage@parbox
\parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth
\else \if@hboxRconstruct\if@bidi@list@minipage@parbox@not@nob
@@ -23552,7 +23888,7 @@ to\rtside{\box\bslice\hfil}}
\else \parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth\fi\fi
\ignorespaces}{\vskip\z@}
\newenvironment{LTRbibitems}
- {\par\@RTLfalse\@RTLtabfalse
+ {\par\@RTLfalse\@RTLtabfalse\bidi@beamer@ragged
\if@bidi@list@minipage@parbox
\parshape \@ne \dimexpr(\@totalleftmargin-\leftmargin) \linewidth
\else \if@hboxRconstruct\if@bidi@list@minipage@parbox@not@nob
@@ -23561,7 +23897,7 @@ to\rtside{\box\bslice\hfil}}
\else \parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth\fi\fi
\ignorespaces}{\vskip\z@}
\newenvironment{RTLbibitems}
- {\par\@RTLtrue\@RTLtabtrue
+ {\par\@RTLtrue\@RTLtabtrue\bidi@beamer@ragged
\if@bidi@list@minipage@parbox
\parshape \@ne \dimexpr(\@totalleftmargin+\leftmargin) \linewidth
\else \if@hboxRconstruct\if@bidi@list@minipage@parbox@not@nob
@@ -24253,6 +24589,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
\@ifpackageloaded{natbib}{\input{natbib-xetex-bidi.def}}{}
\@ifpackageloaded{newfloat}{\input{newfloat-xetex-bidi.def}}{}
\@ifpackageloaded{minitoc}{\input{minitoc-xetex-bidi.def}}{}
+\@ifpackageloaded{pgfsys}{\input{pgfsys.code-xetex-bidi.def}}{}
\@ifpackageloaded{picinpar}{\input{picinpar-xetex-bidi.def}}{}
\@ifpackageloaded{quotchap}{\input{quotchap-xetex-bidi.def}}{}
\@ifpackageloaded{ragged2e}{\input{ragged2e-xetex-bidi.def}}{}
@@ -24265,10 +24602,16 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
\@ifpackageloaded{tocloft}{\@ifclassloaded{memoir}{}{\input{tocloft-xetex-bidi.def}}}{}
\@ifdefinitionfileloaded{tc-xetex}{\input{tc-xetex-bidi.def}}{}
\@ifpackageloaded{todonotes}{\input{todonotes-xetex-bidi.def}}{}
+\@ifpackageloaded{beamerbaseauxtemplates}{\input{beamerbaseauxtemplates-xetex-bidi.def}}{}
+\@ifpackageloaded{beamerbaseboxes}{\input{beamerbaseboxes-xetex-bidi.def}}{}
\@ifpackageloaded{beamerbasecolor}{\input{beamerbasecolor-xetex-bidi.def}}{}
\@ifpackageloaded{beamerbaseframecomponents}{\input{beamerbaseframecomponents-xetex-bidi.def}}{}
\@ifpackageloaded{beamerbaselocalstructure}{\input{beamerbaselocalstructure-xetex-bidi.def}}{}
\@ifpackageloaded{beamerinnerthemedefault}{\input{beamerinnerthemedefault-xetex-bidi.def}}{}
+\@ifpackageloaded{beamerinnerthemerounded}{\input{beamerinnerthemerounded-xetex-bidi.def}}{}
+\@ifpackageloaded{beamerouterthemeinfolines}{\input{beamerouterthemeinfolines-xetex-bidi.def}}{}
+\@ifpackageloaded{beamerouterthemesplit}{\input{beamerouterthemesplit-xetex-bidi.def}}{}
+\@ifpackageloaded{beamerouterthemeshadow}{\input{beamerouterthemeshadow-xetex-bidi.def}}{}
% \end{macrocode}
% \iffalse
%</latex-xetex-bidi.def>
diff --git a/macros/xetex/latex/bidi/bidi.pdf b/macros/xetex/latex/bidi/bidi.pdf
index 51cf1a35c7..851dda312d 100644
--- a/macros/xetex/latex/bidi/bidi.pdf
+++ b/macros/xetex/latex/bidi/bidi.pdf
Binary files differ
diff --git a/macros/xetex/latex/xepersian/README b/macros/xetex/latex/xepersian/README
index 42c652930b..48af3fd968 100644
--- a/macros/xetex/latex/xepersian/README
+++ b/macros/xetex/latex/xepersian/README
@@ -1,6 +1,6 @@
____________________
The XePersian package
-v24.1
+v24.2
The xepersian package provides a convenient interface for
typesetting Persian and English texts in LaTeX, using XeTeX
@@ -25,7 +25,7 @@ The announcements for the new releases of the package will
also appear in the Discussions space under the Announcements
category.
-Current version release date: 2022/05/24
+Current version release date: 2022/06/01
___________________________________________
Vafa Khalighi
diff --git a/macros/xetex/latex/xepersian/xepersian-doc-intro.ltx b/macros/xetex/latex/xepersian/xepersian-doc-intro.ltx
index 745f9bc598..5a75f3460b 100644
--- a/macros/xetex/latex/xepersian/xepersian-doc-intro.ltx
+++ b/macros/xetex/latex/xepersian/xepersian-doc-intro.ltx
@@ -25,7 +25,7 @@ If you use \textsf{\XePersian} package to write any input \TeX\ document, and th
* Copyright (c) 2008--2022 Vafa Khalighi
* Copyright (c) 2018--2020 bidi-tex GitHub Organization
*
-* v24.1, 2022/05/24
+* v24.2, 2022/06/01
*
* License: LaTeX Project Public License, version
* 1.3c or higher (your choice)
diff --git a/macros/xetex/latex/xepersian/xepersian-doc-title.ltx b/macros/xetex/latex/xepersian/xepersian-doc-title.ltx
index 9e99caadf3..32d3c9d077 100644
--- a/macros/xetex/latex/xepersian/xepersian-doc-title.ltx
+++ b/macros/xetex/latex/xepersian/xepersian-doc-title.ltx
@@ -3,7 +3,7 @@
\begin{document}
\title{\textcolor{blue!65!black}{\Huge The \textsf{\XePersian} \textit{Package}}\\
\LARGE Persian for \LaTeXe, using {\XeTeX} engine\\[5pt]
-\large User documentation for \textcolor{blue!65!black}{version 24.1}}
+\large User documentation for \textcolor{blue!65!black}{version 24.2}}
\author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the {\LaTeX} team to maintain the package in the period 2018--2020.}}
\setcounter{page}{0}
\thispagestyle{empty}
@@ -13,7 +13,7 @@
\textcolor{blue!65!black}{\Huge The \textsf{\XePersian} \textit{Package}}
\Large
-User documentation for \textcolor{blue!65!black}{version 24.1}}
+User documentation for \textcolor{blue!65!black}{version 24.2}}
\vskip 0pt plus 3fill
\textit{\large to my Master, \textbf{Ferdowsi The Great}}
diff --git a/macros/xetex/latex/xepersian/xepersian-doc.ltx b/macros/xetex/latex/xepersian/xepersian-doc.ltx
index 49323dea7f..f827e4ed84 100644
--- a/macros/xetex/latex/xepersian/xepersian-doc.ltx
+++ b/macros/xetex/latex/xepersian/xepersian-doc.ltx
@@ -1,7 +1,7 @@
\documentclass{ltxdoc}
\input{xepersian-doc-preamble.ltx}
\hypersetup{%
- pdftitle={User documentation for version 24.1 of the XePersian
+ pdftitle={User documentation for version 24.2 of the XePersian
package}%
}
\begin{document}
diff --git a/macros/xetex/latex/xepersian/xepersian-doc.pdf b/macros/xetex/latex/xepersian/xepersian-doc.pdf
index 38b07e642b..9745f0606a 100644
--- a/macros/xetex/latex/xepersian/xepersian-doc.pdf
+++ b/macros/xetex/latex/xepersian/xepersian-doc.pdf
Binary files differ
diff --git a/macros/xetex/latex/xepersian/xepersian.dtx b/macros/xetex/latex/xepersian/xepersian.dtx
index 4bfd827b3b..ee9d4aa351 100644
--- a/macros/xetex/latex/xepersian/xepersian.dtx
+++ b/macros/xetex/latex/xepersian/xepersian.dtx
@@ -5,7 +5,7 @@
%<*readme>
____________________
The XePersian package
-v24.1
+v24.2
The xepersian package provides a convenient interface for
typesetting Persian and English texts in LaTeX, using XeTeX
@@ -31,7 +31,7 @@ also appear in the Discussions space under the Announcements
category.
-Current version release date: 2022/05/24
+Current version release date: 2022/06/01
___________________________________________
Vafa Khalighi
@@ -168,7 +168,7 @@ by Vafa Khalighi.
\documentclass{ltxdoc}
\input{xepersian-doc-preamble.ltx}
\hypersetup{%
- pdftitle={Source documentation for version 24.1 of the XePersian
+ pdftitle={Source documentation for version 24.2 of the XePersian
package}%
}
\EnableCrossrefs
@@ -187,7 +187,7 @@ by Vafa Khalighi.
% \GetFileInfo{\jobname.dtx}
% \title{\textcolor{blue!65!black}{\Huge The \textsf{\XePersian} \textit{Package}}\\
%\LARGE Persian for \LaTeXe, using {\XeTeX} engine\\[5pt]
-%\large Source documentation for \textcolor{blue!65!black}{version 24.1}}
+%\large Source documentation for \textcolor{blue!65!black}{version 24.2}}
% \author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the {\LaTeX} team to maintain the package in the period 2018--2020.}}
%\setcounter{page}{0}
%\thispagestyle{empty}
@@ -197,7 +197,7 @@ by Vafa Khalighi.
%\textcolor{blue!65!black}{\Huge The \textsf{\XePersian} \textit{Package}}
%
%\Large
-%Source documentation for \textcolor{blue!65!black}{version 24.1}}
+%Source documentation for \textcolor{blue!65!black}{version 24.2}}
%
%\vskip 0pt plus 3fill
%\textit{\large to my Master, \textbf{Ferdowsi The Great}}
@@ -245,7 +245,7 @@ by Vafa Khalighi.
%\iffalse
%<*table>
%\fi
-%% \CheckSum{11118}
+%% \CheckSum{11130}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -3575,8 +3575,8 @@ U+003E U+003E <> U+00BB ; >> -> RIGHT POINTING GUILLEMET
% \section{File \texttt{xepersian.sty}}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\def\xepersian@version{24.1}
-\def\xepersiandate{2022/05/24}
+\def\xepersian@version{24.2}
+\def\xepersiandate{2022/06/01}
\ProvidesPackage{xepersian}[\xepersiandate\space v\xepersian@version\space
Persian typesetting in XeLaTeX]
\RequirePackage{fontspec}
@@ -4425,7 +4425,7 @@ Persian typesetting in XeLaTeX]
\newcommand*{\@xepersian@pdfcustomproperties}{%
This is the xepersian package, Version \xepersian@version,
- Released May 24, 2022.
+ Released June 1, 2022.
}
\newcommand\twocolumnstableofcontents{%
@@ -6244,9 +6244,14 @@ indexblock environment may only appear inside frontpage environment.
\ExplSyntaxOff
\mathchardef\decimalseparator@point="013A
-{%
- \catcode`\.=\active
- \gdef.{\begingroup\obeyspaces\futurelet\@let@token\decimalseparator@pointcheck}}
+%{%
+% \catcode`\.=\active
+% \gdef.{\begingroup\obeyspaces\futurelet\@let@token\decimalseparator@pointcheck}}
+\bgroup
+ \uccode`\~`\.%
+ \uppercase{%
+\egroup
+ \def~}{\begingroup\obeyspaces\futurelet\@let@token\decimalseparator@pointcheck}
\def\decimalseparator@pointcheck{\decimalseparator@check\MathDecimalSeparator\decimalseparator@point}
\def\decimalseparator@check#1#2{%
\ifx\@let@token1\endgroup#1\else
diff --git a/macros/xetex/latex/xepersian/xepersian.pdf b/macros/xetex/latex/xepersian/xepersian.pdf
index b53d9d6fcc..5d376bd2cc 100644
--- a/macros/xetex/latex/xepersian/xepersian.pdf
+++ b/macros/xetex/latex/xepersian/xepersian.pdf
Binary files differ