From 7da4243862494d1fc7478956362f4da6d80f4f7e Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 21 Oct 2019 03:00:45 +0000 Subject: CTAN sync 201910210300 --- macros/latex/contrib/xkcdcolors/README.md | 9 + .../latex/contrib/xkcdcolors/xkcdcolors-manual.pdf | Bin 0 -> 208855 bytes .../latex/contrib/xkcdcolors/xkcdcolors-manual.tex | 1006 ++++++++++++++++++++ macros/latex/contrib/xkcdcolors/xkcdcolors.sty | 964 +++++++++++++++++++ macros/latex/contrib/xsim/README | 2 +- .../contrib/xsim/code/xsim.collections.code.tex | 18 +- .../contrib/xsim/code/xsim.environments.code.tex | 4 +- .../contrib/xsim/code/xsim.exercises.code.tex | 7 +- macros/latex/contrib/xsim/code/xsim.goals.code.tex | 8 +- .../latex/contrib/xsim/code/xsim.grades.code.tex | 2 +- .../contrib/xsim/code/xsim.interface.code.tex | 4 +- .../latex/contrib/xsim/code/xsim.random.code.tex | 6 +- .../contrib/xsim/code/xsim.solutions.code.tex | 12 +- macros/latex/contrib/xsim/code/xsim.sty | 4 +- macros/latex/contrib/xsim/code/xsim.tags.code.tex | 2 +- .../contrib/xsim/code/xsim.templates.code.tex | 4 +- macros/latex/contrib/xsim/doc/xsim.history | 16 +- macros/latex/contrib/xsim/doc/xsim_manual.pdf | Bin 1229192 -> 1229199 bytes 18 files changed, 2024 insertions(+), 44 deletions(-) create mode 100644 macros/latex/contrib/xkcdcolors/README.md create mode 100644 macros/latex/contrib/xkcdcolors/xkcdcolors-manual.pdf create mode 100644 macros/latex/contrib/xkcdcolors/xkcdcolors-manual.tex create mode 100644 macros/latex/contrib/xkcdcolors/xkcdcolors.sty (limited to 'macros/latex') diff --git a/macros/latex/contrib/xkcdcolors/README.md b/macros/latex/contrib/xkcdcolors/README.md new file mode 100644 index 0000000000..2cd3f17100 --- /dev/null +++ b/macros/latex/contrib/xkcdcolors/README.md @@ -0,0 +1,9 @@ +## Package `xkcdcolors` for LaTeX + +In the year 2010, Randall Munroe on [posted a really fun and nice article](https://blog.xkcd.com/2010/05/03/color-survey-results/) on the iconic web of [xkcd](https://xkcd.com/). +He did a very curious experiment: showing colors to a lot of people and asking to name each one. + +Afterward, he processed the data and sorted the names for each color by popularity --- that means, how many people gave the same name to the same color (no guidance here! Read the post linked above for details). + +He obtained a nice list of around 950 color names. It's not at all surprising that a lot of people forged `CloudyBlue`, but some color is really surprising, like for example `BabyPoopGreen` or `DullPink`... + diff --git a/macros/latex/contrib/xkcdcolors/xkcdcolors-manual.pdf b/macros/latex/contrib/xkcdcolors/xkcdcolors-manual.pdf new file mode 100644 index 0000000000..f1574d99f7 Binary files /dev/null and b/macros/latex/contrib/xkcdcolors/xkcdcolors-manual.pdf differ diff --git a/macros/latex/contrib/xkcdcolors/xkcdcolors-manual.tex b/macros/latex/contrib/xkcdcolors/xkcdcolors-manual.tex new file mode 100644 index 0000000000..f0f3d57fa8 --- /dev/null +++ b/macros/latex/contrib/xkcdcolors/xkcdcolors-manual.tex @@ -0,0 +1,1006 @@ +\documentclass[12pt]{article} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{doc} +\usepackage{tikz} +\usepackage{xkcdcolors} +\usepackage{a4wide} +\usepackage{hyperref} +\newcommand\colorblock[1]{% + \begin{tikzpicture}[baseline=(top)] + \def\ancho{3.5cm} + \coordinate (top) at (\ancho,1); + \draw[thick, draw=black, fill=#1] (0,0) rectangle (top); + \node[align=center, anchor=north west, text width=\ancho] at (0,0) {\strut\hspace{0pt} #1}; + \end{tikzpicture} +} +\title{\texttt{xkcdcolors} package} +\author{Romano Giannetti \texttt{}} +\begin{document} +\maketitle +\section{Introduction} + +In the year 2010, Randall Munroe, in \href{https://blog.xkcd.com/2010/05/03/color-survey-results/}{a really fun post} on the iconic web of \href{https://xkcd.com/}{\texttt{xkcd}} did a very curious experiment: showing colors to a lot of people and asking them to name each one of it. + +Afterward, he processed the data and sorted the names for each color by popularity --- that means, how many people gave the same name to the same color (no guidance here! Read the post linked above for details). + +He obtained a nice list of around 950 color names. It's not at all surprising that a lot of people forged \texttt{CloudyBlue}, but some color is really surprising, like for example \texttt{BabyPoopGreen} or \texttt{DullPink}... + +\section{Usage} +To use the package, just load the package with: + +\begin{verbatim} + \usepackage{xkcdcolors} +\end{verbatim} + +\noindent and enjoy all your new colors --- with a prepended \texttt{xkcd} to avoid clash with standard colors. For example: + +\begin{verbatim} + \textcolor{xkcdPinyPurple}{this is Pinky Purple} +\end{verbatim} + +\noindent will render as \textcolor{xkcdPinkyPurple}{this is Pinky Purple}. + +\bigskip + +\noindent Enjoy! + +\section{List of colors} +The colors here are listed in order of popularity (At least, I think). + +{\noindent\sloppy +\foreach \xkcdcol in {% +xkcdPurple, +xkcdGreen, +xkcdBlue, +xkcdPink, +xkcdBrown, +xkcdRed, +xkcdLightBlue, +xkcdTeal, +xkcdOrange, +xkcdLightGreen, +xkcdMagenta, +xkcdYellow, +xkcdSkyBlue, +xkcdGrey, +xkcdLimeGreen, +xkcdLightPurple, +xkcdViolet, +xkcdDarkGreen, +xkcdTurquoise, +xkcdLavender, +xkcdDarkBlue, +xkcdTan, +xkcdCyan, +xkcdAqua, +xkcdForestGreen, +xkcdMauve, +xkcdDarkPurple, +xkcdBrightGreen, +xkcdMaroon, +xkcdOlive, +xkcdSalmon, +xkcdBeige, +xkcdRoyalBlue, +xkcdNavyBlue, +xkcdLilac, +xkcdBlack, +xkcdHotPink, +xkcdLightBrown, +xkcdPaleGreen, +xkcdPeach, +xkcdOliveGreen, +xkcdDarkPink, +xkcdPeriwinkle, +xkcdSeaGreen, +xkcdLime, +xkcdIndigo, +xkcdMustard, +xkcdLightPink, +xkcdRose, +xkcdBrightBlue, +xkcdNeonGreen, +xkcdBurntOrange, +xkcdAquamarine, +xkcdNavy, +xkcdGrassGreen, +xkcdPaleBlue, +xkcdDarkRed, +xkcdBrightPurple, +xkcdYellowGreen, +xkcdBabyBlue, +xkcdGold, +xkcdMintGreen, +xkcdPlum, +xkcdRoyalPurple, +xkcdBrickRed, +xkcdDarkTeal, +xkcdBurgundy, +xkcdKhaki, +xkcdBlueGreen, +xkcdSeafoamGreen, +xkcdKellyGreen, +xkcdPukeGreen, +xkcdPeaGreen, +xkcdTaupe, +xkcdDarkBrown, +xkcdDeepPurple, +xkcdChartreuse, +xkcdBrightPink, +xkcdLightOrange, +xkcdMint, +xkcdPastelGreen, +xkcdSand, +xkcdDarkOrange, +xkcdSpringGreen, +xkcdPuce, +xkcdSeafoam, +xkcdGreyBlue, +xkcdArmyGreen, +xkcdDarkGrey, +xkcdDarkYellow, +xkcdGoldenrod, +xkcdSlate, +xkcdLightTeal, +xkcdRust, +xkcdDeepBlue, +xkcdPalePink, +xkcdCerulean, +xkcdLightRed, +xkcdMustardYellow, +xkcdOchre, +xkcdPaleYellow, +xkcdCrimson, +xkcdFuchsia, +xkcdHunterGreen, +xkcdBlueGrey, +xkcdSlateBlue, +xkcdPalePurple, +xkcdSeaBlue, +xkcdPinkishPurple, +xkcdPuke, +xkcdLightGrey, +xkcdLeafGreen, +xkcdLightYellow, +xkcdEggplant, +xkcdSteelBlue, +xkcdMossGreen, +xkcdRobin'sEggBlue, +xkcdWhite, +xkcdGreyGreen, +xkcdSage, +xkcdBrick, +xkcdBurntSienna, +xkcdReddishBrown, +xkcdCream, +xkcdCoral, +xkcdOceanBlue, +xkcdGreenish, +xkcdDarkMagenta, +xkcdRedOrange, +xkcdBluishPurple, +xkcdMidnightBlue, +xkcdLightViolet, +xkcdDustyRose, +xkcdMediumBlue, +xkcdGreenishYellow, +xkcdYellowishGreen, +xkcdPurplishBlue, +xkcdGreyishBlue, +xkcdGrape, +xkcdLightOlive, +xkcdCornflowerBlue, +xkcdPinkishRed, +xkcdBrightRed, +xkcdAzure, +xkcdBluePurple, +xkcdDarkTurquoise, +xkcdElectricBlue, +xkcdOffWhite, +xkcdPowderBlue, +xkcdWine, +xkcdDullGreen, +xkcdAppleGreen, +xkcdLightTurquoise, +xkcdNeonPurple, +xkcdCobalt, +xkcdPinkish, +xkcdOliveDrab, +xkcdDarkCyan, +xkcdPurpleBlue, +xkcdDarkViolet, +xkcdDarkLavender, +xkcdForrestGreen, +xkcdVomit, +xkcdPaleOrange, +xkcdGreenishBlue, +xkcdDarkTan, +xkcdGreenBlue, +xkcdBluishGreen, +xkcdPastelBlue, +xkcdMoss, +xkcdGrass, +xkcdDeepPink, +xkcdBloodRed, +xkcdSageGreen, +xkcdAquaBlue, +xkcdTerracotta, +xkcdPastelPurple, +xkcdSienna, +xkcdDarkOlive, +xkcdGreenYellow, +xkcdScarlet, +xkcdGreyishGreen, +xkcdChocolate, +xkcdBlueViolet, +xkcdCornflower, +xkcdBabyPink, +xkcdCharcoal, +xkcdPineGreen, +xkcdPumpkin, +xkcdGreenishBrown, +xkcdRedBrown, +xkcdBrownishGreen, +xkcdTangerine, +xkcdSalmonPink, +xkcdAquaGreen, +xkcdRaspberry, +xkcdGreyishPurple, +xkcdRosePink, +xkcdNeonPink, +xkcdCobaltBlue, +xkcdOrangeBrown, +xkcdDeepRed, +xkcdOrangeRed, +xkcdDirtyYellow, +xkcdOrchid, +xkcdReddishPink, +xkcdReddishPurple, +xkcdYellowOrange, +xkcdLightCyan, +xkcdSky, +xkcdLightMagenta, +xkcdPaleRed, +xkcdEmerald, +xkcdDarkBeige, +xkcdUglyGreen, +xkcdJade, +xkcdGreenishGrey, +xkcdDarkSalmon, +xkcdPurplishPink, +xkcdDarkAqua, +xkcdBrownishOrange, +xkcdLightOliveGreen, +xkcdLightAqua, +xkcdClay, +xkcdMediumGreen, +xkcdBurntUmber, +xkcdDullBlue, +xkcdPaleBrown, +xkcdEmeraldGreen, +xkcdBrownish, +xkcdMud, +xkcdDarkRose, +xkcdBrownishRed, +xkcdPinkPurple, +xkcdPinkyPurple, +xkcdCamoGreen, +xkcdFadedGreen, +xkcdDustyPink, +xkcdPurplePink, +xkcdVomitGreen, +xkcdDeepGreen, +xkcdReddishOrange, +xkcdMahogany, +xkcdAubergine, +xkcdDullPink, +xkcdEvergreen, +xkcdDarkSkyBlue, +xkcdVeryLightGreen, +xkcdPastelPink, +xkcdGreyPurple, +xkcdVeryLightBlue, +xkcdDarkMauve, +xkcdCadetBlue, +xkcdIceBlue, +xkcdLightTan, +xkcdDirtyGreen, +xkcdNeonBlue, +xkcdWineRed, +xkcdChocolateBrown, +xkcdDullPurple, +xkcdYellowBrown, +xkcdDenim, +xkcdEggshell, +xkcdJungleGreen, +xkcdDarkPeach, +xkcdPoop, +xkcdUmber, +xkcdLightLavender, +xkcdBrightYellow, +xkcdGoldenYellow, +xkcdDustyBlue, +xkcdElectricGreen, +xkcdLighterGreen, +xkcdSlateGrey, +xkcdTealGreen, +xkcdMarineBlue, +xkcdAvocado, +xkcdTerraCotta, +xkcdDustyPurple, +xkcdLightMaroon, +xkcdReddish, +xkcdDarkLilac, +xkcdDarkPeriwinkle, +xkcdBluishGrey, +xkcdPukeYellow, +xkcdPurplish, +xkcdUltramarine, +xkcdBarneyPurple, +xkcdForest, +xkcdPeaSoup, +xkcdBrownishYellow, +xkcdBrightTeal, +xkcdBluegreen, +xkcdGreenBrown, +xkcdBlurple, +xkcdLightSkyBlue, +xkcdPeriwinkleBlue, +xkcdPaleViolet, +xkcdTrueBlue, +xkcdGreenGrey, +xkcdGreyBrown, +xkcdDarkOliveGreen, +xkcdApricot, +xkcdFadedPurple, +xkcdCerise, +xkcdKhakiGreen, +xkcdBurntRed, +xkcdLightForestGreen, +xkcdVioletBlue, +xkcdPaleLavender, +xkcdAcidGreen, +xkcdPurpleGrey, +xkcdLemon, +xkcdBrightOrange, +xkcdSoftGreen, +xkcdBlush, +xkcdYellowishBrown, +xkcdFluorescentGreen, +xkcdElectricPurple, +xkcdSteel, +xkcdDullOrange, +xkcdMuddyGreen, +xkcdMarigold, +xkcdOcean, +xkcdLightMauve, +xkcdBordeaux, +xkcdLightBlueGreen, +xkcdYellowish, +xkcdSnotGreen, +xkcdLightLimeGreen, +xkcdDrabGreen, +xkcdFadedBlue, +xkcdDarkForestGreen, +xkcdHotPurple, +xkcdDarkMaroon, +xkcdBrownGreen, +xkcdSwampGreen, +xkcdLightIndigo, +xkcdPurpleyBlue, +xkcdLightishBlue, +xkcdTealBlue, +xkcdDenimBlue, +xkcdDarkLimeGreen, +xkcdDullYellow, +xkcdPistachio, +xkcdLemonYellow, +xkcdRedViolet, +xkcdDuskyPink, +xkcdDirt, +xkcdVeryDarkGreen, +xkcdMediumPurple, +xkcdShit, +xkcdDarkMustard, +xkcdPeaSoupGreen, +xkcdBubblegumPink, +xkcdBarbiePink, +xkcdMilitaryGreen, +xkcdPaleTeal, +xkcdBronze, +xkcdPinkyRed, +xkcdDullRed, +xkcdDarkishBlue, +xkcdBluish, +xkcdDarkGold, +xkcdYellowyGreen, +xkcdPine, +xkcdDarkBlueGreen, +xkcdDirtyPink, +xkcdSlateGreen, +xkcdPrussianBlue, +xkcdBrightViolet, +xkcdLighterPurple, +xkcdSteelGrey, +xkcdRusset, +xkcdVermillion, +xkcdGreyishBrown, +xkcdRedPurple, +xkcdRedPink, +xkcdBrightTurquoise, +xkcdGoldenBrown, +xkcdCeruleanBlue, +xkcdSoftBlue, +xkcdEasterGreen, +xkcdAmber, +xkcdMidBlue, +xkcdShitBrown, +xkcdHospitalGreen, +xkcdPurpleishBlue, +xkcdPurplyBlue, +xkcdSilver, +xkcdSicklyGreen, +xkcdMelon, +xkcdDuskyRose, +xkcdBrownOrange, +xkcdDarkishGreen, +xkcdCranberry, +xkcdPurpleish, +xkcdEcru, +xkcdMocha, +xkcdBrightMagenta, +xkcdCoffee, +xkcdSepia, +xkcdFadedRed, +xkcdCanaryYellow, +xkcdBlueyPurple, +xkcdPastelYellow, +xkcdPaleTurquoise, +xkcdGreyishPink, +xkcdMarine, +xkcdPurplishGrey, +xkcdCamel, +xkcdBrownishGrey, +xkcdBurntYellow, +xkcdCherryRed, +xkcdOrangeyBrown, +xkcdSoftPink, +xkcdDarkSeaGreen, +xkcdAquaMarine, +xkcdRobinEggBlue, +xkcdLightSeaGreen, +xkcdMudBrown, +xkcdSandstone, +xkcdBritishRacingGreen, +xkcdFadedPink, +xkcdMaize, +xkcdOcre, +xkcdOrangeYellow, +xkcdDarkKhaki, +xkcdLightLime, +xkcdBrightLightBlue, +xkcdJadeGreen, +xkcdBarney, +xkcdAdobe, +xkcdMintyGreen, +xkcdLightNavyBlue, +xkcdDustyGreen, +xkcdVeryDarkBlue, +xkcdOceanGreen, +xkcdMustardGreen, +xkcdPoopBrown, +xkcdOliveBrown, +xkcdPinkRed, +xkcdLightNavy, +xkcdVeryLightPurple, +xkcdIvory, +xkcdBrightLavender, +xkcdBrightAqua, +xkcdRobin'sEgg, +xkcdMutedGreen, +xkcdMediumBrown, +xkcdCopper, +xkcdDarkLime, +xkcdStrawberry, +xkcdDirtBrown, +xkcdCelery, +xkcdBrightSkyBlue, +xkcdPooBrown, +xkcdPinkishBrown, +xkcdCeladon, +xkcdBrightLimeGreen, +xkcdAuburn, +xkcdShockingPink, +xkcdMulberry, +xkcdCarolinaBlue, +xkcdLightishGreen, +xkcdLightLilac, +xkcdPaleOlive, +xkcdPumpkinOrange, +xkcdYellowOchre, +xkcdFireEngineRed, +xkcdDeepSkyBlue, +xkcdWatermelon, +xkcdBottleGreen, +xkcdVeryDarkPurple, +xkcdWheat, +xkcdMurkyGreen, +xkcdBrownishPurple, +xkcdKermitGreen, +xkcdPrimaryBlue, +xkcdOrangeyRed, +xkcdPaleLilac, +xkcdRustRed, +xkcdDirtyOrange, +xkcdPinkishGrey, +xkcdLightPlum, +xkcdGreenyBlue, +xkcdDarkNavy, +xkcdPinkPurple, +xkcdIrishGreen, +xkcdBabyPoop, +xkcdSlimeGreen, +xkcdPurplishRed, +xkcdRouge, +xkcdLightRose, +xkcdDrab, +xkcdDarkNavyBlue, +xkcdLightYellowGreen, +xkcdEasterPurple, +xkcdSnot, +xkcdLightSalmon, +xkcdPurpleyPink, +xkcdPoo, +xkcdBerry, +xkcdMediumGrey, +xkcdBrownRed, +xkcdBlood, +xkcdSoftPurple, +xkcdGreyPink, +xkcdBlueyGreen, +xkcdMidnight, +xkcdDarkIndigo, +xkcdWarmGrey, +xkcdSandyBrown, +xkcdCherry, +xkcdBluePurple, +xkcdGunmetal, +xkcdDeepViolet, +xkcdTreeGreen, +xkcdOrangishBrown, +xkcdShamrockGreen, +xkcdOrangishRed, +xkcdGreenyYellow, +xkcdUglyYellow, +xkcdFrenchBlue, +xkcdDuskyPurple, +xkcdButterYellow, +xkcdLightBeige, +xkcdGolden, +xkcdDuskyBlue, +xkcdLightblue, +xkcdPurplyPink, +xkcdOffGreen, +xkcdOcher, +xkcdMilkChocolate, +xkcdLightPeach, +xkcdDeepMagenta, +xkcdCaramel, +xkcdGreenishTeal, +xkcdPaleLime, +xkcdPurpleRed, +xkcdBlueberry, +xkcdAsparagus, +xkcdPaleGrey, +xkcdLightGreyBlue, +xkcdPaleLimeGreen, +xkcdGrassyGreen, +xkcdMossyGreen, +xkcdEarth, +xkcdDeepOrange, +xkcdPaleAqua, +xkcdRoseRed, +xkcdStone, +xkcdRustyOrange, +xkcdPea, +xkcdSickGreen, +xkcdChestnut, +xkcdBlueGreen, +xkcdAmethyst, +xkcdDarkMintGreen, +xkcdPaleRose, +xkcdMutedBlue, +xkcdFawn, +xkcdBuff, +xkcdTurquoiseGreen, +xkcdMuddyBrown, +xkcdSea, +xkcdTomato, +xkcdCarnationPink, +xkcdBanana, +xkcdNeonYellow, +xkcdGreyish, +xkcdMidGreen, +xkcdMutedPurple, +xkcdElectricPink, +xkcdSandy, +xkcdUglyPink, +xkcdTurquoiseBlue, +xkcdLightBurgundy, +xkcdGreenishTan, +xkcdDarkMint, +xkcdLightPurple, +xkcdMidnightPurple, +xkcdPinkishOrange, +xkcdPear, +xkcdDarkPlum, +xkcdTealish, +xkcdPerrywinkle, +xkcdYellowishOrange, +xkcdPastelOrange, +xkcdIris, +xkcdUltramarineBlue, +xkcdNavyGreen, +xkcdSeaweed, +xkcdKiwi, +xkcdFluroGreen, +xkcdBrightLightGreen, +xkcdVividGreen, +xkcdFrogGreen, +xkcdDullBrown, +xkcdDusk, +xkcdMustardBrown, +xkcdLeafyGreen, +xkcdCoolBlue, +xkcdAlmostBlack, +xkcdYellowGreen, +xkcdHeliotrope, +xkcdGreenApple, +xkcdBabyPoopGreen, +xkcdApple, +xkcdPurpleishPink, +xkcdNightBlue, +xkcdMerlot, +xkcdLightgreen, +xkcdTomatoRed, +xkcdKeyLime, +xkcdPaleCyan, +xkcdVomitYellow, +xkcdPurplishBrown, +xkcdBubblegum, +xkcdShamrock, +xkcdMango, +xkcdLimeYellow, +xkcdHotGreen, +xkcdGrapePurple, +xkcdFadedOrange, +xkcdAvocadoGreen, +xkcdPeacockBlue, +xkcdWeirdGreen, +xkcdBrightLilac, +xkcdFernGreen, +xkcdDirtyBlue, +xkcdRustOrange, +xkcdHeather, +xkcdDeepTeal, +xkcdDarkSeafoam, +xkcdBabyPoo, +xkcdYellowgreen, +xkcdLightSage, +xkcdLightAquamarine, +xkcdSpearmint, +xkcdBrightLime, +xkcdVibrantGreen, +xkcdVeryPaleGreen, +xkcdFadedYellow, +xkcdBile, +xkcdViridian, +xkcdVeryLightPink, +xkcdPukeBrown, +xkcdMediumPink, +xkcdUglyPurple, +xkcdSunshineYellow, +xkcdSeaweedGreen, +xkcdLightPeriwinkle, +xkcdLemonGreen, +xkcdGreenyBrown, +xkcdDarkGreyBlue, +xkcdBrightOlive, +xkcdTurtleGreen, +xkcdPaleSkyBlue, +xkcdLightMustard, +xkcdDiarrhea, +xkcdDarkAquamarine, +xkcdBrownishPink, +xkcdBabyShitGreen, +xkcdPurpley, +xkcdGreyblue, +xkcdHotMagenta, +xkcdBlueGrey, +xkcdPale, +xkcdCoolGreen, +xkcdSandyYellow, +xkcdEggshellBlue, +xkcdBarfGreen, +xkcdBabyGreen, +xkcdVibrantPurple, +xkcdBrownGrey, +xkcdWaterBlue, +xkcdLipstickRed, +xkcdBananaYellow, +xkcdWisteria, +xkcdPurpleBrown, +xkcdBrownYellow, +xkcdPurplePink, +xkcdLemonLime, +xkcdGreyBlue, +xkcdDustyRed, +xkcdDeepRose, +xkcdDarkSeafoamGreen, +xkcdMuddyYellow, +xkcdCarnation, +xkcdYellowyBrown, +xkcdVioletRed, +xkcdTwilightBlue, +xkcdPureBlue, +xkcdLightishRed, +xkcdBrickOrange, +xkcdVelvet, +xkcdSunflower, +xkcdLightMintGreen, +xkcdLightGrassGreen, +xkcdLavenderBlue, +xkcdRustyRed, +xkcdLightishPurple, +xkcdDriedBlood, +xkcdLightBlueGrey, +xkcdLeaf, +xkcdOrangish, +xkcdPaleOliveGreen, +xkcdOffYellow, +xkcdDustyOrange, +xkcdButter, +xkcdRoyal, +xkcdPetrol, +xkcdGreenishCyan, +xkcdDuckEggBlue, +xkcdBubbleGumPink, +xkcdBluegrey, +xkcdWarmBrown, +xkcdTwilight, +xkcdSaffron, +xkcdPurpleBlue, +xkcdDarkSand, +xkcdVibrantBlue, +xkcdPutty, +xkcdLawnGreen, +xkcdCamouflageGreen, +xkcdBlushPink, +xkcdReddyBrown, +xkcdDarkishRed, +xkcdAlgaeGreen, +xkcdDarkCoral, +xkcdBrightCyan, +xkcdPissYellow, +xkcdPastelRed, +xkcdGreenishTurquoise, +xkcdDark, +xkcdRuby, +xkcdPoopGreen, +xkcdOrangered, +xkcdDandelion, +xkcdClaret, +xkcdPaleMauve, +xkcdLipstick, +xkcdRosa, +xkcdDarkblue, +xkcdTanBrown, +xkcdShitGreen, +xkcdRedWine, +xkcdPinky, +xkcdMudGreen, +xkcdLightGreenishBlue, +xkcdDullTeal, +xkcdDeepLavender, +xkcdVividBlue, +xkcdRawUmber, +xkcdLightMint, +xkcdLightLightBlue, +xkcdHighlighterGreen, +xkcdGreenyGrey, +xkcdBlueyGrey, +xkcdAlgae, +xkcdSapGreen, +xkcdPaleSalmon, +xkcdMetallicBlue, +xkcdIce, +xkcdGrossGreen, +xkcdDodgerBlue, +xkcdWarmPink, +xkcdLightGreenBlue, +xkcdFlatGreen, +xkcdDarkBlueGrey, +xkcdClayBrown, +xkcdSandYellow, +xkcdGrapefruit, +xkcdBloodOrange, +xkcdVeryPaleBlue, +xkcdOldPink, +xkcdNeonRed, +xkcdGoldenRod, +xkcdPlumPurple, +xkcdPalePeach, +xkcdDarkYellowGreen, +xkcdCarmine, +xkcdDeepSeaBlue, +xkcdDarkHotPink, +xkcdWarmBlue, +xkcdLightKhaki, +xkcdIckyGreen, +xkcdGreenblue, +xkcdDirtyPurple, +xkcdRichBlue, +xkcdMushroom, +xkcdFlatBlue, +xkcdDarkSlateBlue, +xkcdDarkSage, +xkcdCoralPink, +xkcdTrueGreen, +xkcdDarkishPurple, +xkcdDarkTaupe, +xkcdCoolGrey, +xkcdCanary, +xkcdBoogerGreen, +xkcdMutedPink, +xkcdHazel, +xkcdDarkRoyalBlue, +xkcdVividPurple, +xkcdRacingGreen, +xkcdLeather, +xkcdGreenBlue, +xkcdSunflowerYellow, +xkcdRichPurple, +xkcdPaleMagenta, +xkcdLightYellowishGreen, +xkcdIndigoBlue, +xkcdDarkFuchsia, +xkcdYellowTan, +xkcdWintergreen, +xkcdVioletPink, +xkcdTopaz, +xkcdSeafoamBlue, +xkcdLightGold, +xkcdGreyGreen, +xkcdFoamGreen, +xkcdCreme, +xkcdClearBlue, +xkcdUglyBlue, +xkcdTerracota, +xkcdVeryDarkBrown, +xkcdStraw, +xkcdParchment, +xkcdOrangeyYellow, +xkcdGreyishTeal, +xkcdSapphire, +xkcdNiceBlue, +xkcdBrownyOrange, +xkcdWashedOutGreen, +xkcdTiffanyBlue, +xkcdLightSeafoam, +xkcdLightNeonGreen, +xkcdLightBrightGreen, +xkcdLightBluishGreen, +xkcdRosyPink, +xkcdPeachyPink, +xkcdPaleLightGreen, +xkcdOldRose, +xkcdFern, +xkcdDuskBlue, +xkcdCamo, +xkcdBurntSiena, +xkcdTealishGreen, +xkcdSwamp, +xkcdSandBrown, +xkcdRustBrown, +xkcdOrangeish, +xkcdLightRoyalBlue, +xkcdCocoa, +xkcdBabyPurple, +xkcdRawSienna, +xkcdRadioactiveGreen, +xkcdLightPeaGreen, +xkcdCinnamon, +xkcdSquash, +xkcdCharcoalGrey, +xkcdBrightYellowGreen, +xkcdBabyPukeGreen, +xkcdPoisonGreen, +xkcdLightLavendar, +xkcdIndianRed, +xkcdDarkCream, +xkcdToupe, +xkcdButterscotch, +xkcdBurple, +xkcdTanGreen, +xkcdSunYellow, +xkcdPaleGold, +xkcdLightLightGreen, +xkcdLichen, +xkcdGreenYellow, +xkcdDarkgreen, +xkcdAzul, +xkcdSunnyYellow, +xkcdSicklyYellow, +xkcdKelleyGreen, +xkcdBruise, +xkcdBrownyGreen, +xkcdBattleshipGrey, +xkcdOffBlue, +xkcdManilla, +xkcdGreenishBeige, +xkcdDeepBrown, +xkcdDarkishPink, +xkcdCustard, +xkcdUglyBrown, +xkcdStormyBlue, +xkcdLiliac, +xkcdBabyShitBrown, +xkcdReddishGrey, +xkcdPowderPink, +xkcdEggplantPurple, +xkcdEggShell, +xkcdVeryLightBrown, +xkcdTeaGreen, +xkcdOrangePink, +xkcdLightGreyGreen, +xkcdKiwiGreen, +xkcdBoringGreen, +xkcdLightPastelGreen, +xkcdCandyPink, +xkcdPurply, +xkcdPurpleyGrey, +xkcdDustyLavender, +xkcdDesert, +xkcdDeepLilac, +xkcdPigPink, +xkcdOliveYellow, +xkcdLightSeafoamGreen, +xkcdLightMossGreen, +xkcdLavenderPink, +xkcdDeepAqua, +xkcdBland, +xkcdStrongPink, +xkcdGreenTeal, +xkcdDeepTurquoise, +xkcdDarkGreenBlue, +xkcdBrightSeaGreen, +xkcdBooger, +xkcdBlueWithAHintOfPurple, +xkcdBlueBlue, +xkcdWindowsBlue, +xkcdToxicGreen, +xkcdStrongBlue, +xkcdSpruce, +xkcdPinkishTan, +xkcdMacaroniAndCheese, +xkcdGreyTeal, +xkcdDustyTeal, +xkcdDarkGrassGreen, +xkcdCement, +xkcdYellowishTan, +xkcdWarmPurple, +xkcdTea, +xkcdReallyLightBlue, +xkcdNastyGreen, +xkcdLightEggplant, +xkcdFreshGreen, +xkcdElectricLime, +xkcdDust, +xkcdDarkPastelGreen, +xkcdCloudyBlue} +{\colorblock{\xkcdcol}\ } +} + +\end{document} + diff --git a/macros/latex/contrib/xkcdcolors/xkcdcolors.sty b/macros/latex/contrib/xkcdcolors/xkcdcolors.sty new file mode 100644 index 0000000000..7cac7e4037 --- /dev/null +++ b/macros/latex/contrib/xkcdcolors/xkcdcolors.sty @@ -0,0 +1,964 @@ +\NeedsTeXFormat{LaTeX2e}[1996/06/01] +\ProvidesPackage{xkcdcolors}[2019/10/20 v1.0 Provide names for xkcd colors] +\RequirePackage{xcolor} +% +% Created by Romano Giannetti . Same license of +% the original txt file: http://creativecommons.org/publicdomain/zero/1.0/ +% you can also distribute it under LPPL (LaTeX) license +% +% Original color set by Randall Munroe +% See http://xkcd.com/color/rgb/ +% + +\definecolorset{HTML}{xkcd}{}{% + CloudyBlue,ACC2D9;% + DarkPastelGreen,56AE57;% + Dust,B2996E;% + ElectricLime,A8FF04;% + FreshGreen,69D84F;% + LightEggplant,894585;% + NastyGreen,70B23F;% + ReallyLightBlue,D4FFFF;% + Tea,65AB7C;% + WarmPurple,952E8F;% + YellowishTan,FCFC81;% + Cement,A5A391;% + DarkGrassGreen,388004;% + DustyTeal,4C9085;% + GreyTeal,5E9B8A;% + MacaroniAndCheese,EFB435;% + PinkishTan,D99B82;% + Spruce,0A5F38;% + StrongBlue,0C06F7;% + ToxicGreen,61DE2A;% + WindowsBlue,3778BF;% + BlueBlue,2242C7;% + BlueWithAHintOfPurple,533CC6;% + Booger,9BB53C;% + BrightSeaGreen,05FFA6;% + DarkGreenBlue,1F6357;% + DeepTurquoise,017374;% + GreenTeal,0CB577;% + StrongPink,FF0789;% + Bland,AFA88B;% + DeepAqua,08787F;% + LavenderPink,DD85D7;% + LightMossGreen,A6C875;% + LightSeafoamGreen,A7FFB5;% + OliveYellow,C2B709;% + PigPink,E78EA5;% + DeepLilac,966EBD;% + Desert,CCAD60;% + DustyLavender,AC86A8;% + PurpleyGrey,947E94;% + Purply,983FB2;% + CandyPink,FF63E9;% + LightPastelGreen,B2FBA5;% + BoringGreen,63B365;% + KiwiGreen,8EE53F;% + LightGreyGreen,B7E1A1;% + OrangePink,FF6F52;% + TeaGreen,BDF8A3;% + VeryLightBrown,D3B683;% + EggShell,FFFCC4;% + EggplantPurple,430541;% + PowderPink,FFB2D0;% + ReddishGrey,997570;% + BabyShitBrown,AD900D;% + Liliac,C48EFD;% + StormyBlue,507B9C;% + UglyBrown,7D7103;% + Custard,FFFD78;% + DarkishPink,DA467D;% + DeepBrown,410200;% + GreenishBeige,C9D179;% + Manilla,FFFA86;% + OffBlue,5684AE;% + BattleshipGrey,6B7C85;% + BrownyGreen,6F6C0A;% + Bruise,7E4071;% + KelleyGreen,009337;% + SicklyYellow,D0E429;% + SunnyYellow,FFF917;% + Azul,1D5DEC;% + Darkgreen,054907;% + GreenYellow,B5CE08;% + Lichen,8FB67B;% + LightLightGreen,C8FFB0;% + PaleGold,FDDE6C;% + SunYellow,FFDF22;% + TanGreen,A9BE70;% + Burple,6832E3;% + Butterscotch,FDB147;% + Toupe,C7AC7D;% + DarkCream,FFF39A;% + IndianRed,850E04;% + LightLavendar,EFC0FE;% + PoisonGreen,40FD14;% + BabyPukeGreen,B6C406;% + BrightYellowGreen,9DFF00;% + CharcoalGrey,3C4142;% + Squash,F2AB15;% + Cinnamon,AC4F06;% + LightPeaGreen,C4FE82;% + RadioactiveGreen,2CFA1F;% + RawSienna,9A6200;% + BabyPurple,CA9BF7;% + Cocoa,875F42;% + LightRoyalBlue,3A2EFE;% + Orangeish,FD8D49;% + RustBrown,8B3103;% + SandBrown,CBA560;% + Swamp,698339;% + TealishGreen,0CDC73;% + BurntSiena,B75203;% + Camo,7F8F4E;% + DuskBlue,26538D;% + Fern,63A950;% + OldRose,C87F89;% + PaleLightGreen,B1FC99;% + PeachyPink,FF9A8A;% + RosyPink,F6688E;% + LightBluishGreen,76FDA8;% + LightBrightGreen,53FE5C;% + LightNeonGreen,4EFD54;% + LightSeafoam,A0FEBF;% + TiffanyBlue,7BF2DA;% + WashedOutGreen,BCF5A6;% + BrownyOrange,CA6B02;% + NiceBlue,107AB0;% + Sapphire,2138AB;% + GreyishTeal,719F91;% + OrangeyYellow,FDB915;% + Parchment,FEFCAF;% + Straw,FCF679;% + VeryDarkBrown,1D0200;% + Terracota,CB6843;% + UglyBlue,31668A;% + ClearBlue,247AFD;% + Creme,FFFFB6;% + FoamGreen,90FDA9;% + GreyGreen,86A17D;% + LightGold,FDDC5C;% + SeafoamBlue,78D1B6;% + Topaz,13BBAF;% + VioletPink,FB5FFC;% + Wintergreen,20F986;% + YellowTan,FFE36E;% + DarkFuchsia,9D0759;% + IndigoBlue,3A18B1;% + LightYellowishGreen,C2FF89;% + PaleMagenta,D767AD;% + RichPurple,720058;% + SunflowerYellow,FFDA03;% + GreenBlue,01C08D;% + Leather,AC7434;% + RacingGreen,014600;% + VividPurple,9900FA;% + DarkRoyalBlue,02066F;% + Hazel,8E7618;% + MutedPink,D1768F;% + BoogerGreen,96B403;% + Canary,FDFF63;% + CoolGrey,95A3A6;% + DarkTaupe,7F684E;% + DarkishPurple,751973;% + TrueGreen,089404;% + CoralPink,FF6163;% + DarkSage,598556;% + DarkSlateBlue,214761;% + FlatBlue,3C73A8;% + Mushroom,BA9E88;% + RichBlue,021BF9;% + DirtyPurple,734A65;% + Greenblue,23C48B;% + IckyGreen,8FAE22;% + LightKhaki,E6F2A2;% + WarmBlue,4B57DB;% + DarkHotPink,D90166;% + DeepSeaBlue,015482;% + Carmine,9D0216;% + DarkYellowGreen,728F02;% + PalePeach,FFE5AD;% + PlumPurple,4E0550;% + GoldenRod,F9BC08;% + NeonRed,FF073A;% + OldPink,C77986;% + VeryPaleBlue,D6FFFE;% + BloodOrange,FE4B03;% + Grapefruit,FD5956;% + SandYellow,FCE166;% + ClayBrown,B2713D;% + DarkBlueGrey,1F3B4D;% + FlatGreen,699D4C;% + LightGreenBlue,56FCA2;% + WarmPink,FB5581;% + DodgerBlue,3E82FC;% + GrossGreen,A0BF16;% + Ice,D6FFFA;% + MetallicBlue,4F738E;% + PaleSalmon,FFB19A;% + SapGreen,5C8B15;% + Algae,54AC68;% + BlueyGrey,89A0B0;% + GreenyGrey,7EA07A;% + HighlighterGreen,1BFC06;% + LightLightBlue,CAFFFB;% + LightMint,B6FFBB;% + RawUmber,A75E09;% + VividBlue,152EFF;% + DeepLavender,8D5EB7;% + DullTeal,5F9E8F;% + LightGreenishBlue,63F7B4;% + MudGreen,606602;% + Pinky,FC86AA;% + RedWine,8C0034;% + ShitGreen,758000;% + TanBrown,AB7E4C;% + Darkblue,030764;% + Rosa,FE86A4;% + Lipstick,D5174E;% + PaleMauve,FED0FC;% + Claret,680018;% + Dandelion,FEDF08;% + Orangered,FE420F;% + PoopGreen,6F7C00;% + Ruby,CA0147;% + Dark,1B2431;% + GreenishTurquoise,00FBB0;% + PastelRed,DB5856;% + PissYellow,DDD618;% + BrightCyan,41FDFE;% + DarkCoral,CF524E;% + AlgaeGreen,21C36F;% + DarkishRed,A90308;% + ReddyBrown,6E1005;% + BlushPink,FE828C;% + CamouflageGreen,4B6113;% + LawnGreen,4DA409;% + Putty,BEAE8A;% + VibrantBlue,0339F8;% + DarkSand,A88F59;% + PurpleBlue,5D21D0;% + Saffron,FEB209;% + Twilight,4E518B;% + WarmBrown,964E02;% + Bluegrey,85A3B2;% + BubbleGumPink,FF69AF;% + DuckEggBlue,C3FBF4;% + GreenishCyan,2AFEB7;% + Petrol,005F6A;% + Royal,0C1793;% + Butter,FFFF81;% + DustyOrange,F0833A;% + OffYellow,F1F33F;% + PaleOliveGreen,B1D27B;% + Orangish,FC824A;% + Leaf,71AA34;% + LightBlueGrey,B7C9E2;% + DriedBlood,4B0101;% + LightishPurple,A552E6;% + RustyRed,AF2F0D;% + LavenderBlue,8B88F8;% + LightGrassGreen,9AF764;% + LightMintGreen,A6FBB2;% + Sunflower,FFC512;% + Velvet,750851;% + BrickOrange,C14A09;% + LightishRed,FE2F4A;% + PureBlue,0203E2;% + TwilightBlue,0A437A;% + VioletRed,A50055;% + YellowyBrown,AE8B0C;% + Carnation,FD798F;% + MuddyYellow,BFAC05;% + DarkSeafoamGreen,3EAF76;% + DeepRose,C74767;% + DustyRed,B9484E;% + GreyBlue,647D8E;% + LemonLime,BFFE28;% + PurplePink,D725DE;% + BrownYellow,B29705;% + PurpleBrown,673A3F;% + Wisteria,A87DC2;% + BananaYellow,FAFE4B;% + LipstickRed,C0022F;% + WaterBlue,0E87CC;% + BrownGrey,8D8468;% + VibrantPurple,AD03DE;% + BabyGreen,8CFF9E;% + BarfGreen,94AC02;% + EggshellBlue,C4FFF7;% + SandyYellow,FDEE73;% + CoolGreen,33B864;% + Pale,FFF9D0;% + BlueGrey,758DA3;% + HotMagenta,F504C9;% + Greyblue,77A1B5;% + Purpley,8756E4;% + BabyShitGreen,889717;% + BrownishPink,C27E79;% + DarkAquamarine,017371;% + Diarrhea,9F8303;% + LightMustard,F7D560;% + PaleSkyBlue,BDF6FE;% + TurtleGreen,75B84F;% + BrightOlive,9CBB04;% + DarkGreyBlue,29465B;% + GreenyBrown,696006;% + LemonGreen,ADF802;% + LightPeriwinkle,C1C6FC;% + SeaweedGreen,35AD6B;% + SunshineYellow,FFFD37;% + UglyPurple,A442A0;% + MediumPink,F36196;% + PukeBrown,947706;% + VeryLightPink,FFF4F2;% + Viridian,1E9167;% + Bile,B5C306;% + FadedYellow,FEFF7F;% + VeryPaleGreen,CFFDBC;% + VibrantGreen,0ADD08;% + BrightLime,87FD05;% + Spearmint,1EF876;% + LightAquamarine,7BFDC7;% + LightSage,BCECAC;% + Yellowgreen,BBF90F;% + BabyPoo,AB9004;% + DarkSeafoam,1FB57A;% + DeepTeal,00555A;% + Heather,A484AC;% + RustOrange,C45508;% + DirtyBlue,3F829D;% + FernGreen,548D44;% + BrightLilac,C95EFB;% + WeirdGreen,3AE57F;% + PeacockBlue,016795;% + AvocadoGreen,87A922;% + FadedOrange,F0944D;% + GrapePurple,5D1451;% + HotGreen,25FF29;% + LimeYellow,D0FE1D;% + Mango,FFA62B;% + Shamrock,01B44C;% + Bubblegum,FF6CB5;% + PurplishBrown,6B4247;% + VomitYellow,C7C10C;% + PaleCyan,B7FFFA;% + KeyLime,AEFF6E;% + TomatoRed,EC2D01;% + Lightgreen,76FF7B;% + Merlot,730039;% + NightBlue,040348;% + PurpleishPink,DF4EC8;% + Apple,6ECB3C;% + BabyPoopGreen,8F9805;% + GreenApple,5EDC1F;% + Heliotrope,D94FF5;% + YellowGreen,C8FD3D;% + AlmostBlack,070D0D;% + CoolBlue,4984B8;% + LeafyGreen,51B73B;% + MustardBrown,AC7E04;% + Dusk,4E5481;% + DullBrown,876E4B;% + FrogGreen,58BC08;% + VividGreen,2FEF10;% + BrightLightGreen,2DFE54;% + FluroGreen,0AFF02;% + Kiwi,9CEF43;% + Seaweed,18D17B;% + NavyGreen,35530A;% + UltramarineBlue,1805DB;% + Iris,6258C4;% + PastelOrange,FF964F;% + YellowishOrange,FFAB0F;% + Perrywinkle,8F8CE7;% + Tealish,24BCA8;% + DarkPlum,3F012C;% + Pear,CBF85F;% + PinkishOrange,FF724C;% + MidnightPurple,280137;% + LightPurple,B36FF6;% + DarkMint,48C072;% + GreenishTan,BCCB7A;% + LightBurgundy,A8415B;% + TurquoiseBlue,06B1C4;% + UglyPink,CD7584;% + Sandy,F1DA7A;% + ElectricPink,FF0490;% + MutedPurple,805B87;% + MidGreen,50A747;% + Greyish,A8A495;% + NeonYellow,CFFF04;% + Banana,FFFF7E;% + CarnationPink,FF7FA7;% + Tomato,EF4026;% + Sea,3C9992;% + MuddyBrown,886806;% + TurquoiseGreen,04F489;% + Buff,FEF69E;% + Fawn,CFAF7B;% + MutedBlue,3B719F;% + PaleRose,FDC1C5;% + DarkMintGreen,20C073;% + Amethyst,9B5FC0;% + BlueGreen,0F9B8E;% + Chestnut,742802;% + SickGreen,9DB92C;% + Pea,A4BF20;% + RustyOrange,CD5909;% + Stone,ADA587;% + RoseRed,BE013C;% + PaleAqua,B8FFEB;% + DeepOrange,DC4D01;% + Earth,A2653E;% + MossyGreen,638B27;% + GrassyGreen,419C03;% + PaleLimeGreen,B1FF65;% + LightGreyBlue,9DBCD4;% + PaleGrey,FDFDFE;% + Asparagus,77AB56;% + Blueberry,464196;% + PurpleRed,990147;% + PaleLime,BEFD73;% + GreenishTeal,32BF84;% + Caramel,AF6F09;% + DeepMagenta,A0025C;% + LightPeach,FFD8B1;% + MilkChocolate,7F4E1E;% + Ocher,BF9B0C;% + OffGreen,6BA353;% + PurplyPink,F075E6;% + Lightblue,7BC8F6;% + DuskyBlue,475F94;% + Golden,F5BF03;% + LightBeige,FFFEB6;% + ButterYellow,FFFD74;% + DuskyPurple,895B7B;% + FrenchBlue,436BAD;% + UglyYellow,D0C101;% + GreenyYellow,C6F808;% + OrangishRed,F43605;% + ShamrockGreen,02C14D;% + OrangishBrown,B25F03;% + TreeGreen,2A7E19;% + DeepViolet,490648;% + Gunmetal,536267;% + BluePurple,5A06EF;% + Cherry,CF0234;% + SandyBrown,C4A661;% + WarmGrey,978A84;% + DarkIndigo,1F0954;% + Midnight,03012D;% + BlueyGreen,2BB179;% + GreyPink,C3909B;% + SoftPurple,A66FB5;% + Blood,770001;% + BrownRed,922B05;% + MediumGrey,7D7F7C;% + Berry,990F4B;% + Poo,8F7303;% + PurpleyPink,C83CB9;% + LightSalmon,FEA993;% + Snot,ACBB0D;% + EasterPurple,C071FE;% + LightYellowGreen,CCFD7F;% + DarkNavyBlue,00022E;% + Drab,828344;% + LightRose,FFC5CB;% + Rouge,AB1239;% + PurplishRed,B0054B;% + SlimeGreen,99CC04;% + BabyPoop,937C00;% + IrishGreen,019529;% + PinkPurple,EF1DE7;% + DarkNavy,000435;% + GreenyBlue,42B395;% + LightPlum,9D5783;% + PinkishGrey,C8ACA9;% + DirtyOrange,C87606;% + RustRed,AA2704;% + PaleLilac,E4CBFF;% + OrangeyRed,FA4224;% + PrimaryBlue,0804F9;% + KermitGreen,5CB200;% + BrownishPurple,76424E;% + MurkyGreen,6C7A0E;% + Wheat,FBDD7E;% + VeryDarkPurple,2A0134;% + BottleGreen,044A05;% + Watermelon,FD4659;% + DeepSkyBlue,0D75F8;% + FireEngineRed,FE0002;% + YellowOchre,CB9D06;% + PumpkinOrange,FB7D07;% + PaleOlive,B9CC81;% + LightLilac,EDC8FF;% + LightishGreen,61E160;% + CarolinaBlue,8AB8FE;% + Mulberry,920A4E;% + ShockingPink,FE02A2;% + Auburn,9A3001;% + BrightLimeGreen,65FE08;% + Celadon,BEFDB7;% + PinkishBrown,B17261;% + PooBrown,885F01;% + BrightSkyBlue,02CCFE;% + Celery,C1FD95;% + DirtBrown,836539;% + Strawberry,FB2943;% + DarkLime,84B701;% + Copper,B66325;% + MediumBrown,7F5112;% + MutedGreen,5FA052;% + Robin'sEgg,6DEDFD;% + BrightAqua,0BF9EA;% + BrightLavender,C760FF;% + Ivory,FFFFCB;% + VeryLightPurple,F6CEFC;% + LightNavy,155084;% + PinkRed,F5054F;% + OliveBrown,645403;% + PoopBrown,7A5901;% + MustardGreen,A8B504;% + OceanGreen,3D9973;% + VeryDarkBlue,000133;% + DustyGreen,76A973;% + LightNavyBlue,2E5A88;% + MintyGreen,0BF77D;% + Adobe,BD6C48;% + Barney,AC1DB8;% + JadeGreen,2BAF6A;% + BrightLightBlue,26F7FD;% + LightLime,AEFD6C;% + DarkKhaki,9B8F55;% + OrangeYellow,FFAD01;% + Ocre,C69C04;% + Maize,F4D054;% + FadedPink,DE9DAC;% + BritishRacingGreen,05480D;% + Sandstone,C9AE74;% + MudBrown,60460F;% + LightSeaGreen,98F6B0;% + RobinEggBlue,8AF1FE;% + AquaMarine,2EE8BB;% + DarkSeaGreen,11875D;% + SoftPink,FDB0C0;% + OrangeyBrown,B16002;% + CherryRed,F7022A;% + BurntYellow,D5AB09;% + BrownishGrey,86775F;% + Camel,C69F59;% + PurplishGrey,7A687F;% + Marine,042E60;% + GreyishPink,C88D94;% + PaleTurquoise,A5FBD5;% + PastelYellow,FFFE71;% + BlueyPurple,6241C7;% + CanaryYellow,FFFE40;% + FadedRed,D3494E;% + Sepia,985E2B;% + Coffee,A6814C;% + BrightMagenta,FF08E8;% + Mocha,9D7651;% + Ecru,FEFFCA;% + Purpleish,98568D;% + Cranberry,9E003A;% + DarkishGreen,287C37;% + BrownOrange,B96902;% + DuskyRose,BA6873;% + Melon,FF7855;% + SicklyGreen,94B21C;% + Silver,C5C9C7;% + PurplyBlue,661AEE;% + PurpleishBlue,6140EF;% + HospitalGreen,9BE5AA;% + ShitBrown,7B5804;% + MidBlue,276AB3;% + Amber,FEB308;% + EasterGreen,8CFD7E;% + SoftBlue,6488EA;% + CeruleanBlue,056EEE;% + GoldenBrown,B27A01;% + BrightTurquoise,0FFEF9;% + RedPink,FA2A55;% + RedPurple,820747;% + GreyishBrown,7A6A4F;% + Vermillion,F4320C;% + Russet,A13905;% + SteelGrey,6F828A;% + LighterPurple,A55AF4;% + BrightViolet,AD0AFD;% + PrussianBlue,004577;% + SlateGreen,658D6D;% + DirtyPink,CA7B80;% + DarkBlueGreen,005249;% + Pine,2B5D34;% + YellowyGreen,BFF128;% + DarkGold,B59410;% + Bluish,2976BB;% + DarkishBlue,014182;% + DullRed,BB3F3F;% + PinkyRed,FC2647;% + Bronze,A87900;% + PaleTeal,82CBB2;% + MilitaryGreen,667C3E;% + BarbiePink,FE46A5;% + BubblegumPink,FE83CC;% + PeaSoupGreen,94A617;% + DarkMustard,A88905;% + Shit,7F5F00;% + MediumPurple,9E43A2;% + VeryDarkGreen,062E03;% + Dirt,8A6E45;% + DuskyPink,CC7A8B;% + RedViolet,9E0168;% + LemonYellow,FDFF38;% + Pistachio,C0FA8B;% + DullYellow,EEDC5B;% + DarkLimeGreen,7EBD01;% + DenimBlue,3B5B92;% + TealBlue,01889F;% + LightishBlue,3D7AFD;% + PurpleyBlue,5F34E7;% + LightIndigo,6D5ACF;% + SwampGreen,748500;% + BrownGreen,706C11;% + DarkMaroon,3C0008;% + HotPurple,CB00F5;% + DarkForestGreen,002D04;% + FadedBlue,658CBB;% + DrabGreen,749551;% + LightLimeGreen,B9FF66;% + SnotGreen,9DC100;% + Yellowish,FAEE66;% + LightBlueGreen,7EFBB3;% + Bordeaux,7B002C;% + LightMauve,C292A1;% + Ocean,017B92;% + Marigold,FCC006;% + MuddyGreen,657432;% + DullOrange,D8863B;% + Steel,738595;% + ElectricPurple,AA23FF;% + FluorescentGreen,08FF08;% + YellowishBrown,9B7A01;% + Blush,F29E8E;% + SoftGreen,6FC276;% + BrightOrange,FF5B00;% + Lemon,FDFF52;% + PurpleGrey,866F85;% + AcidGreen,8FFE09;% + PaleLavender,EECFFE;% + VioletBlue,510AC9;% + LightForestGreen,4F9153;% + BurntRed,9F2305;% + KhakiGreen,728639;% + Cerise,DE0C62;% + FadedPurple,916E99;% + Apricot,FFB16D;% + DarkOliveGreen,3C4D03;% + GreyBrown,7F7053;% + GreenGrey,77926F;% + TrueBlue,010FCC;% + PaleViolet,CEAEFA;% + PeriwinkleBlue,8F99FB;% + LightSkyBlue,C6FCFF;% + Blurple,5539CC;% + GreenBrown,544E03;% + Bluegreen,017A79;% + BrightTeal,01F9C6;% + BrownishYellow,C9B003;% + PeaSoup,929901;% + Forest,0B5509;% + BarneyPurple,A00498;% + Ultramarine,2000B1;% + Purplish,94568C;% + PukeYellow,C2BE0E;% + BluishGrey,748B97;% + DarkPeriwinkle,665FD1;% + DarkLilac,9C6DA5;% + Reddish,C44240;% + LightMaroon,A24857;% + DustyPurple,825F87;% + TerraCotta,C9643B;% + Avocado,90B134;% + MarineBlue,01386A;% + TealGreen,25A36F;% + SlateGrey,59656D;% + LighterGreen,75FD63;% + ElectricGreen,21FC0D;% + DustyBlue,5A86AD;% + GoldenYellow,FEC615;% + BrightYellow,FFFD01;% + LightLavender,DFC5FE;% + Umber,B26400;% + Poop,7F5E00;% + DarkPeach,DE7E5D;% + JungleGreen,048243;% + Eggshell,FFFFD4;% + Denim,3B638C;% + YellowBrown,B79400;% + DullPurple,84597E;% + ChocolateBrown,411900;% + WineRed,7B0323;% + NeonBlue,04D9FF;% + DirtyGreen,667E2C;% + LightTan,FBEEAC;% + IceBlue,D7FFFE;% + CadetBlue,4E7496;% + DarkMauve,874C62;% + VeryLightBlue,D5FFFF;% + GreyPurple,826D8C;% + PastelPink,FFBACD;% + VeryLightGreen,D1FFBD;% + DarkSkyBlue,448EE4;% + Evergreen,05472A;% + DullPink,D5869D;% + Aubergine,3D0734;% + Mahogany,4A0100;% + ReddishOrange,F8481C;% + DeepGreen,02590F;% + VomitGreen,89A203;% + PurplePink,E03FD8;% + DustyPink,D58A94;% + FadedGreen,7BB274;% + CamoGreen,526525;% + PinkyPurple,C94CBE;% + PinkPurple,DB4BDA;% + BrownishRed,9E3623;% + DarkRose,B5485D;% + Mud,735C12;% + Brownish,9C6D57;% + EmeraldGreen,028F1E;% + PaleBrown,B1916E;% + DullBlue,49759C;% + BurntUmber,A0450E;% + MediumGreen,39AD48;% + Clay,B66A50;% + LightAqua,8CFFDB;% + LightOliveGreen,A4BE5C;% + BrownishOrange,CB7723;% + DarkAqua,05696B;% + PurplishPink,CE5DAE;% + DarkSalmon,C85A53;% + GreenishGrey,96AE8D;% + Jade,1FA774;% + UglyGreen,7A9703;% + DarkBeige,AC9362;% + Emerald,01A049;% + PaleRed,D9544D;% + LightMagenta,FA5FF7;% + Sky,82CAFC;% + LightCyan,ACFFFC;% + YellowOrange,FCB001;% + ReddishPurple,910951;% + ReddishPink,FE2C54;% + Orchid,C875C4;% + DirtyYellow,CDC50A;% + OrangeRed,FD411E;% + DeepRed,9A0200;% + OrangeBrown,BE6400;% + CobaltBlue,030AA7;% + NeonPink,FE019A;% + RosePink,F7879A;% + GreyishPurple,887191;% + Raspberry,B00149;% + AquaGreen,12E193;% + SalmonPink,FE7B7C;% + Tangerine,FF9408;% + BrownishGreen,6A6E09;% + RedBrown,8B2E16;% + GreenishBrown,696112;% + Pumpkin,E17701;% + PineGreen,0A481E;% + Charcoal,343837;% + BabyPink,FFB7CE;% + Cornflower,6A79F7;% + BlueViolet,5D06E9;% + Chocolate,3D1C02;% + GreyishGreen,82A67D;% + Scarlet,BE0119;% + GreenYellow,C9FF27;% + DarkOlive,373E02;% + Sienna,A9561E;% + PastelPurple,CAA0FF;% + Terracotta,CA6641;% + AquaBlue,02D8E9;% + SageGreen,88B378;% + BloodRed,980002;% + DeepPink,CB0162;% + Grass,5CAC2D;% + Moss,769958;% + PastelBlue,A2BFFE;% + BluishGreen,10A674;% + GreenBlue,06B48B;% + DarkTan,AF884A;% + GreenishBlue,0B8B87;% + PaleOrange,FFA756;% + Vomit,A2A415;% + ForrestGreen,154406;% + DarkLavender,856798;% + DarkViolet,34013F;% + PurpleBlue,632DE9;% + DarkCyan,0A888A;% + OliveDrab,6F7632;% + Pinkish,D46A7E;% + Cobalt,1E488F;% + NeonPurple,BC13FE;% + LightTurquoise,7EF4CC;% + AppleGreen,76CD26;% + DullGreen,74A662;% + Wine,80013F;% + PowderBlue,B1D1FC;% + OffWhite,FFFFE4;% + ElectricBlue,0652FF;% + DarkTurquoise,045C5A;% + BluePurple,5729CE;% + Azure,069AF3;% + BrightRed,FF000D;% + PinkishRed,F10C45;% + CornflowerBlue,5170D7;% + LightOlive,ACBF69;% + Grape,6C3461;% + GreyishBlue,5E819D;% + PurplishBlue,601EF9;% + YellowishGreen,B0DD16;% + GreenishYellow,CDFD02;% + MediumBlue,2C6FBB;% + DustyRose,C0737A;% + LightViolet,D6B4FC;% + MidnightBlue,020035;% + BluishPurple,703BE7;% + RedOrange,FD3C06;% + DarkMagenta,960056;% + Greenish,40A368;% + OceanBlue,03719C;% + Coral,FC5A50;% + Cream,FFFFC2;% + ReddishBrown,7F2B0A;% + BurntSienna,B04E0F;% + Brick,A03623;% + Sage,87AE73;% + GreyGreen,789B73;% + White,FFFFFF;% + Robin'sEggBlue,98EFF9;% + MossGreen,658B38;% + SteelBlue,5A7D9A;% + Eggplant,380835;% + LightYellow,FFFE7A;% + LeafGreen,5CA904;% + LightGrey,D8DCD6;% + Puke,A5A502;% + PinkishPurple,D648D7;% + SeaBlue,047495;% + PalePurple,B790D4;% + SlateBlue,5B7C99;% + BlueGrey,607C8E;% + HunterGreen,0B4008;% + Fuchsia,ED0DD9;% + Crimson,8C000F;% + PaleYellow,FFFF84;% + Ochre,BF9005;% + MustardYellow,D2BD0A;% + LightRed,FF474C;% + Cerulean,0485D1;% + PalePink,FFCFDC;% + DeepBlue,040273;% + Rust,A83C09;% + LightTeal,90E4C1;% + Slate,516572;% + Goldenrod,FAC205;% + DarkYellow,D5B60A;% + DarkGrey,363737;% + ArmyGreen,4B5D16;% + GreyBlue,6B8BA4;% + Seafoam,80F9AD;% + Puce,A57E52;% + SpringGreen,A9F971;% + DarkOrange,C65102;% + Sand,E2CA76;% + PastelGreen,B0FF9D;% + Mint,9FFEB0;% + LightOrange,FDAA48;% + BrightPink,FE01B1;% + Chartreuse,C1F80A;% + DeepPurple,36013F;% + DarkBrown,341C02;% + Taupe,B9A281;% + PeaGreen,8EAB12;% + PukeGreen,9AAE07;% + KellyGreen,02AB2E;% + SeafoamGreen,7AF9AB;% + BlueGreen,137E6D;% + Khaki,AAA662;% + Burgundy,610023;% + DarkTeal,014D4E;% + BrickRed,8F1402;% + RoyalPurple,4B006E;% + Plum,580F41;% + MintGreen,8FFF9F;% + Gold,DBB40C;% + BabyBlue,A2CFFE;% + YellowGreen,C0FB2D;% + BrightPurple,BE03FD;% + DarkRed,840000;% + PaleBlue,D0FEFE;% + GrassGreen,3F9B0B;% + Navy,01153E;% + Aquamarine,04D8B2;% + BurntOrange,C04E01;% + NeonGreen,0CFF0C;% + BrightBlue,0165FC;% + Rose,CF6275;% + LightPink,FFD1DF;% + Mustard,CEB301;% + Indigo,380282;% + Lime,AAFF32;% + SeaGreen,53FCA1;% + Periwinkle,8E82FE;% + DarkPink,CB416B;% + OliveGreen,677A04;% + Peach,FFB07C;% + PaleGreen,C7FDB5;% + LightBrown,AD8150;% + HotPink,FF028D;% + Black,000000;% + Lilac,CEA2FD;% + NavyBlue,001146;% + RoyalBlue,0504AA;% + Beige,E6DAA6;% + Salmon,FF796C;% + Olive,6E750E;% + Maroon,650021;% + BrightGreen,01FF07;% + DarkPurple,35063E;% + Mauve,AE7181;% + ForestGreen,06470C;% + Aqua,13EAC9;% + Cyan,00FFFF;% + Tan,D1B26F;% + DarkBlue,00035B;% + Lavender,C79FEF;% + Turquoise,06C2AC;% + DarkGreen,033500;% + Violet,9A0EEA;% + LightPurple,BF77F6;% + LimeGreen,89FE05;% + Grey,929591;% + SkyBlue,75BBFD;% + Yellow,FFFF14;% + Magenta,C20078;% + LightGreen,96F97B;% + Orange,F97306;% + Teal,029386;% + LightBlue,95D0FC;% + Red,E50000;% + Brown,653700;% + Pink,FF81C0;% + Blue,0343DF;% + Green,15B01A;% + Purple,7E1E9C} +\endinput + diff --git a/macros/latex/contrib/xsim/README b/macros/latex/contrib/xsim/README index 5cdaaaffdb..da372c2449 100644 --- a/macros/latex/contrib/xsim/README +++ b/macros/latex/contrib/xsim/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -XSIM 2019/10/13 v0.14 +XSIM 2019/10/19 v0.14a eXercise Sheets IMproved diff --git a/macros/latex/contrib/xsim/code/xsim.collections.code.tex b/macros/latex/contrib/xsim/code/xsim.collections.code.tex index b7d348e0d5..3f5d2a1b86 100644 --- a/macros/latex/contrib/xsim/code/xsim.collections.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.collections.code.tex @@ -62,7 +62,7 @@ % #1: collection name \cs_new_protected:Npn \xsim_new_collection:n #1 { - \xsim_if_collection_exists:nTF {#1} + \xsim_if_collection_exist:nTF {#1} { \msg_error:nnn {xsim} {collection-exists} {#1} } { \xsim_verbose:n { Declaring~ new~ collection~ `#1'. } @@ -73,7 +73,7 @@ } % #1: collection name -\prg_new_conditional:Npnn \xsim_if_collection_exists:n #1 {T,F,TF} +\prg_new_conditional:Npnn \xsim_if_collection_exist:n #1 {T,F,TF} { \prop_if_in:NnTF \g__xsim_collections_prop {#1} { \prg_return_true: } @@ -124,7 +124,7 @@ \cs_new_protected:Npn \xsim_start_collection:nn #1#2 { \group_begin: - \xsim_if_collection_exists:nF {#1} + \xsim_if_collection_exist:nF {#1} { \msg_error:nnn {xsim} {unknown-collection} {#1} } \xsim_activate_collection:nn {#1} {#2} \xsim_setup:x { \xsim_get_parameter:nn {#2} {exercise-env} /print = false } @@ -136,7 +136,7 @@ \cs_new_protected:Npn \xsim_start_collection:n #1 { \group_begin: - \xsim_if_collection_exists:nF {#1} + \xsim_if_collection_exist:nF {#1} { \msg_error:nnn {xsim} {unknown-collection} {#1} } \xsim_activate_collection:n {#1} \xsim_foreach_exercise_type:n @@ -284,7 +284,7 @@ \l__xsim_print_collection_choice_tl {both} { - \xsim_if_exercise_exists:nnT {##1} {####1} + \xsim_if_exercise_exist:nnT {##1} {####1} { \bool_set_true:N \l__xsim_tmpa_bool } } { @@ -292,7 +292,7 @@ { xsim_if_ \l__xsim_print_collection_choice_tl - _exists:nnT + _exist:nnT } {##1} {####1} @@ -315,9 +315,9 @@ \l__xsim_print_collection_choice_tl {both} { - \xsim_if_exercise_exists:nnT {##1} {####1} + \xsim_if_exercise_exist:nnT {##1} {####1} { \xsim_insert:nnnn {##1} {####1} {} {exercise} } - \xsim_if_solution_exists:nnT {##1} {####1} + \xsim_if_solution_exist:nnT {##1} {####1} { \xsim_insert:nnnn {##1} {####1} {} {solution} } } { @@ -325,7 +325,7 @@ { xsim_if_ \l__xsim_print_collection_choice_tl - _exists:nnT + _exist:nnT } {##1} {####1} diff --git a/macros/latex/contrib/xsim/code/xsim.environments.code.tex b/macros/latex/contrib/xsim/code/xsim.environments.code.tex index 2aacf63f51..daaae03211 100644 --- a/macros/latex/contrib/xsim/code/xsim.environments.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.environments.code.tex @@ -308,7 +308,7 @@ % #1: type % #2: id % #3: exercise|solution -\prg_new_protected_conditional:Npnn \xsim_if_exists:nnn #1#2#3 {T,F,TF} +\prg_new_protected_conditional:Npnn \xsim_if_exist:nnn #1#2#3 {T,F,TF} { \xsim_if_write_to_files:TF { @@ -334,7 +334,7 @@ % #4: exercise|solution \cs_new_protected:Npn \xsim_insert:nnnn #1#2#3#4 { - \xsim_if_exists:nnnTF {#1} {#2} {#4} + \xsim_if_exist:nnnTF {#1} {#2} {#4} { \xsim_verbose:n { Inserting~ #4~ type~ `#1'~ id~ `#2'. } diff --git a/macros/latex/contrib/xsim/code/xsim.exercises.code.tex b/macros/latex/contrib/xsim/code/xsim.exercises.code.tex index 0de63e0460..9eb469fee4 100644 --- a/macros/latex/contrib/xsim/code/xsim.exercises.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.exercises.code.tex @@ -377,14 +377,13 @@ % #1: type % #2: id -\prg_new_conditional:Npnn \xsim_if_exercise_exists:nn #1#2 {T,F,TF} +\prg_new_conditional:Npnn \xsim_if_exercise_exist:nn #1#2 {T,F,TF} { - \__xsim_set_file_signature:nnn {#1} {#2} {exercise} - \file_if_exist:VTF \l__xsim_file_path_and_name_tl + \xsim_if_exist:nnnTF {#1} {#2} {exercise} { \prg_return_true: } { \prg_return_false: } } -\cs_generate_variant:Nn \xsim_if_exercise_exists:nnT {VV} +\cs_generate_variant:Nn \xsim_if_exercise_exist:nnT {VV} % #1: type % #2: options diff --git a/macros/latex/contrib/xsim/code/xsim.goals.code.tex b/macros/latex/contrib/xsim/code/xsim.goals.code.tex index 98847ae129..c03fe14483 100644 --- a/macros/latex/contrib/xsim/code/xsim.goals.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.goals.code.tex @@ -39,7 +39,7 @@ % #1: name \cs_new_protected:Npn \xsim_declare_exercise_goal:n #1 { - \xsim_if_goal_exists:nF {#1} + \xsim_if_goal_exist:nF {#1} { \xsim_verbose:n { Declaring~ new~ goal~ `#1'. } \xsim_declare_property:nnnn @@ -66,7 +66,7 @@ } } -\prg_new_conditional:Npnn \xsim_if_goal_exists:n #1 {p,T,F,TF} +\prg_new_conditional:Npnn \xsim_if_goal_exist:n #1 {p,T,F,TF} { \seq_if_in:NnTF \l__xsim_goals_seq {#1} { \prg_return_true: } @@ -78,7 +78,7 @@ % #3: goal \cs_new_protected:Npn \xsim_update_goal:nnn #1#2#3 { - \xsim_if_goal_exists:nT {#3} + \xsim_if_goal_exist:nT {#3} { \fp_gadd:cn {g__xsim_goal_#3_fp} { \xsim_get_property:nnn {#1} {#2} {#3} + 0 } @@ -105,7 +105,7 @@ % #4: value \cs_new_protected:Npn \xsim_addto_goal:nnnn #1#2#3#4 { - \xsim_if_goal_exists:nT {#3} + \xsim_if_goal_exist:nT {#3} { \xsim_verbose:n { Adding~ `#4'~ to~ `#3'~ goal~ of~ #1~ #2 } \fp_gadd:cn {g__xsim_goal_#3_fp} {#4} diff --git a/macros/latex/contrib/xsim/code/xsim.grades.code.tex b/macros/latex/contrib/xsim/code/xsim.grades.code.tex index e8a75cf85b..bfcecf92b2 100644 --- a/macros/latex/contrib/xsim/code/xsim.grades.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.grades.code.tex @@ -100,7 +100,7 @@ % #4: code after grade requirement if != 1 \cs_new_protected:Npn \xsim_get_grade_goal:nnnn #1#2#3#4 { - \xsim_if_goal_exists:nTF {#2} + \xsim_if_goal_exist:nTF {#2} { \xsim_get_grade:nnnn {#1} diff --git a/macros/latex/contrib/xsim/code/xsim.interface.code.tex b/macros/latex/contrib/xsim/code/xsim.interface.code.tex index 3331f6278a..0c1251d113 100644 --- a/macros/latex/contrib/xsim/code/xsim.interface.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.interface.code.tex @@ -54,7 +54,7 @@ % ---------------------------------------------------------------------------- \ProvideDocumentCommand \IfExistSolutionTF {+m+m} - { \xsim_if_solution_exists:ooTF {\ExerciseType} {\ExerciseID} {#1} {#2} } + { \xsim_if_solution_exist:ooTF {\ExerciseType} {\ExerciseID} {#1} {#2} } \NewDocumentCommand \IfExistSolutionT {+m} { \IfExistSolutionTF {#1} {} } @@ -460,7 +460,7 @@ \NewDocumentCommand \ProvideExerciseTagging {m} { - \xsim_if_tag_type_exists:nTF {#1} + \xsim_if_tag_type_exist:nTF {#1} { \msg_warning:nnn {xsim} {tag-exists} {#1} } { \xsim_new_tag_type:n {#1} } } diff --git a/macros/latex/contrib/xsim/code/xsim.random.code.tex b/macros/latex/contrib/xsim/code/xsim.random.code.tex index 7cdaa0a948..7a0eeb297d 100644 --- a/macros/latex/contrib/xsim/code/xsim.random.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.random.code.tex @@ -109,7 +109,7 @@ % #3: csv list of excluded ids \cs_new_protected:Npn \xsim_print_random_list:nnn #1#2#3 { - \xsim_if_collection_exists:nTF {#1} + \xsim_if_collection_exist:nTF {#1} { \int_gincr:N \g__xsim_random_list_id_int \int_compare:nNnTF { \xsim_collection_count:n {#1} } = {0} @@ -231,7 +231,7 @@ \c__xsim_print_random_exercise_tl } { - \xsim_if_exercise_exists:VVT + \xsim_if_exercise_exist:VVT \l__xsim_tmpb_tl \l__xsim_tmpa_tl { @@ -253,7 +253,7 @@ \c__xsim_print_random_solution_tl } { - \xsim_if_solution_exists:VVT + \xsim_if_solution_exist:VVT \l__xsim_tmpb_tl \l__xsim_tmpa_tl { diff --git a/macros/latex/contrib/xsim/code/xsim.solutions.code.tex b/macros/latex/contrib/xsim/code/xsim.solutions.code.tex index 23e48d75f4..edb954e838 100644 --- a/macros/latex/contrib/xsim/code/xsim.solutions.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.solutions.code.tex @@ -80,14 +80,14 @@ % #1: type % #2: id -\prg_new_protected_conditional:Npnn \xsim_if_solution_exists:nn #1#2 {T,F,TF} +\prg_new_protected_conditional:Npnn \xsim_if_solution_exist:nn #1#2 {T,F,TF} { - \xsim_if_exists:nnnTF {#1} {#2} {solution} + \xsim_if_exist:nnnTF {#1} {#2} {solution} { \prg_return_true: } { \prg_return_false: } } -\cs_generate_variant:Nn \xsim_if_solution_exists:nnT {VV,oo} -\cs_generate_variant:Nn \xsim_if_solution_exists:nnTF {oo} +\cs_generate_variant:Nn \xsim_if_solution_exist:nnT {VV,oo} +\cs_generate_variant:Nn \xsim_if_solution_exist:nnTF {oo} % #1: type % #2: options @@ -236,7 +236,7 @@ % #4: code \cs_new_protected:Npn \xsim_if_this_solution_do:nnnn #1#2#3#4 { - \xsim_if_solution_exists:nnT {#1} {#2} + \xsim_if_solution_exist:nnT {#1} {#2} { \__xsim_printsolutions_check_conditions:nnnT {#1} {#2} {#3} {#4} } } @@ -393,7 +393,7 @@ collection/false .code:n = \__xsim_printsolutions_condition:nn {per-collection} {false} , collection/unknown .code:n = - \xsim_if_collection_exists:nT {#1} + \xsim_if_collection_exist:nT {#1} { \__xsim_printsolutions_condition:nn {per-collection} {true} \tl_set:Nn \l__xsim_printsolutions_collection_tl {#1} diff --git a/macros/latex/contrib/xsim/code/xsim.sty b/macros/latex/contrib/xsim/code/xsim.sty index 59992c37d8..a11fe99ada 100644 --- a/macros/latex/contrib/xsim/code/xsim.sty +++ b/macros/latex/contrib/xsim/code/xsim.sty @@ -29,10 +29,10 @@ \ExplSyntaxOn -\tl_const:Nn \c_xsim_date_tl {2019/10/13} +\tl_const:Nn \c_xsim_date_tl {2019/10/19} \tl_const:Nn \c_xsim_version_major_number_tl {0} \tl_const:Nn \c_xsim_version_minor_number_tl {14} -\tl_const:Nn \c_xsim_version_subrelease_tl {} +\tl_const:Nn \c_xsim_version_subrelease_tl {a} \tl_const:Nx \c_xsim_version_number_tl { \c_xsim_version_major_number_tl . diff --git a/macros/latex/contrib/xsim/code/xsim.tags.code.tex b/macros/latex/contrib/xsim/code/xsim.tags.code.tex index 52ac1b519a..e63174a0cc 100644 --- a/macros/latex/contrib/xsim/code/xsim.tags.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.tags.code.tex @@ -87,7 +87,7 @@ } % #1: tag type -\prg_new_protected_conditional:Npnn \xsim_if_tag_type_exists:n #1 {T,F,TF} +\prg_new_protected_conditional:Npnn \xsim_if_tag_type_exist:n #1 {T,F,TF} { \seq_if_in:NnTF \l__xsim_tag_types_seq {#1} { \prg_return_true: } diff --git a/macros/latex/contrib/xsim/code/xsim.templates.code.tex b/macros/latex/contrib/xsim/code/xsim.templates.code.tex index 2f167a23a4..c5c08b8d9b 100644 --- a/macros/latex/contrib/xsim/code/xsim.templates.code.tex +++ b/macros/latex/contrib/xsim/code/xsim.templates.code.tex @@ -53,7 +53,7 @@ \prop_put:cnn {l__xsim_#1_template_prop} {#2} {#3} } -\prg_new_conditional:Npnn \xsim_if_template_exists:nn #1#2 {T,F,TF} +\prg_new_conditional:Npnn \xsim_if_template_exist:nn #1#2 {T,F,TF} { \prop_if_in:cnTF {l__xsim_#1_template_prop} {#2} { \prg_return_true: } @@ -159,7 +159,7 @@ % #2: template name \cs_new_protected:Npn \xsim_use_template:nn #1#2 { - \xsim_if_template_exists:nnTF {#1} {#2} + \xsim_if_template_exist:nnTF {#1} {#2} { \__xsim_get_template:nn {#1} {#2} } { \msg_warning:nnnnn {xsim} {unknown-template} {#1} {#2} {default} diff --git a/macros/latex/contrib/xsim/doc/xsim.history b/macros/latex/contrib/xsim/doc/xsim.history index 8be4a79e36..efeac6f181 100644 --- a/macros/latex/contrib/xsim/doc/xsim.history +++ b/macros/latex/contrib/xsim/doc/xsim.history @@ -117,13 +117,15 @@ HISTORY: v0.13 2019/10/06 - experimental package option `no-files' v0.14 2019/10/13 - new exercise parameters `exercise-heading' and `solution-heading' - - new options `exercise/heading' and `solution/heading' as + - new options `exercise/heading' and `solution/heading' as interface for setting the new parameters - - new command \GetExerciseHeadingF for using the new + - new command \GetExerciseHeadingF for using the new parameters in environment templates - - change the environment template `default' to use the new + - change the environment template `default' to use the new \GetExerciseHeadingF and output a \par at the end - - make argument of \xsimsetup long - - new template `minimal' - - new option `load-style' - - new example `texwelt-23968' (long and short solutions) + - make argument of \xsimsetup long + - new template `minimal' + - new option `load-style' + - new example `texwelt-23968' (long and short solutions) + v0.14a 2019/10/19 - fix \xsim_if_exercise_exist:nnTF to obey the `no-files' + option diff --git a/macros/latex/contrib/xsim/doc/xsim_manual.pdf b/macros/latex/contrib/xsim/doc/xsim_manual.pdf index 96ec4408f9..161f44a9a1 100644 Binary files a/macros/latex/contrib/xsim/doc/xsim_manual.pdf and b/macros/latex/contrib/xsim/doc/xsim_manual.pdf differ -- cgit v1.2.3