Correct 'warning'-message if \DisplaySolutions is or is not shown. Fix …

…#91
Strauman · Nov 28, 2018 · 84b427a · 84b427a
1 parent ab4660b
commit 84b427a
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 76 deletions.
diff --git a/docs/changelog.tex b/docs/changelog.tex
@@ -70,6 +70,9 @@
     \change{Fixed bug where part problem header repeats if solution is itemize.}
     \change{Introduced the \dac\rigid command for the \dac\At functionality. Also the \dac\ClearHook for deleting a hook}
     \change{\dac\buildset now gives error if set does not exist.}
+    \change{Made \dac\HideTags cummulative.}
+    \change{Created \dac\ShowAllTags for clearing tags list}
+    \change{Raises error when pdf\TeX(or pdf\LaTeX) is not used}
 \chlogtable
 
 

diff --git a/exercisebank.sty b/exercisebank.sty
@@ -892,4 +892,5 @@ nohead/.code = {\exb@noheadArgtrue\ea\gdef\csname setlist@\exb@currentSetID @noh
 \fi
 \fi
 }
-\gdef\HideTags#1{\xdef\exb@hidetaglist{#1}}
+\gdef\HideTags#1{\xdef\exb@hidetaglist{\unexpanded\expandafter{\exb@hidetaglist},#1}}
+\gdef\ShowAllTags#1{\gdef\exb@hidetaglist{}}
diff --git a/exercisebank.zip b/exercisebank.zip
diff --git a/release/example.zip b/release/example.zip
diff --git a/release/exercisebank-doc.pdf b/release/exercisebank-doc.pdf
diff --git a/releasing/do_release.rb b/releasing/do_release.rb
diff --git a/src/envcontrol.tex b/src/envcontrol.tex
@@ -30,7 +30,7 @@
 %%      ^ This should be fixed!
 %%NB: DOC for \DisplaySolutions are moved down
 \AtBeginDocument{
-	\ifexb@DisplaySolutions\isFalse
+	\ifexb@DisplaySolutions\else
 		\@latex@warning{Hiding solutions. Show them with \string\DisplaySolutions}
 	\fi
 }

diff --git a/src/hidetags.tex b/src/hidetags.tex
@@ -11,4 +11,8 @@
 %:=\HideTags{list}
 %:Hide all exercises containing the list of tags when building a set.
 %:-
-\gdef\HideTags#1{\xdef\exb@hidetaglist{#1}}
+\gdef\HideTags#1{\xdef\exb@hidetaglist{\unexpanded\expandafter{\exb@hidetaglist},#1}}
+%:=\ShowAllTags
+%:Reset tags set by \HideTags
+%:-
+\gdef\ShowAllTags{\gdef\exb@hidetaglist{}}
diff --git a/src/main.tex b/src/main.tex
@@ -4,15 +4,19 @@
 \usepackage{lipsum}
 
 \exercisebanksetup{%
-  exercise directory=../exercises
+	exercise directory=../exercises
 }
 
 %% The \makeset{setname}{exercises,to,include} picks exercises from the exercises-folder
 %% The \exclude{setname}{1,2,3,...,9} excludes partproblems 1,...,9 from setname
 \makeset{electro}{capacitance}
 \makeset{first}{firstexercise}
-\makeset{2}{firstexercise, \exclude{secondexercise}{1,2}, \select{thirdexercise}{1,2}, \exclude{thirdexercise}{1,2}}
-% \DisplaySolutions
+% \DeclareExerciseCommand\extitle[1]{\strut{\vadjust{\vbox to 0pt{\hskip\pMarginLeft{\Large\bfseries #1}}}}%}
+\DeclareExerciseCommand\problemtitle[1]{\stepcounter{problemcounter}%
+	\strut{\vadjust{\vbox to 0pt{\hskip\pMarginLeft{\Large{\bfseries Exercice \theproblemcounter.} #1}}}}%
+}
+\DisplaySolutions
+\makeset[nohead]{2}{firstexercise, \exclude{secondexercise}{1,2}, \select{thirdexercise}{1,2}, \exclude{thirdexercise}{1,2}}
 \begin{document}
-  \buildset{2}
+	\buildset{2}
 \end{document}
diff --git a/src/packageoptions.tex b/src/packageoptions.tex
@@ -1,5 +1,6 @@
 %!TEX root = main.tex
 \makeatletter
+% \ignoreOutlineSpaces
 \edef\@isTrue{1}
 \edef\@isFalse{0}
 %:§config
@@ -34,6 +35,7 @@
 \gdef\exb@currentPoints{0}
 %:§config
 %:-
+% \obeyOutlineSpaces
 % ---- \exercisebanksetup ----- %
 \pgfkeys{
 /exbanksetup/.is family, /exbanksetup,
@@ -79,6 +81,7 @@
   F/.initial = \@isFalse,
   False/.initial = \@isFalse,
 }
+% \ignoreOutlineSpaces
 %:=\exercisebanksetup{[key/values]}
 \newcommand\exercisebanksetup[1]{
   \pgfkeys{/exbanksetup, #1}%
@@ -102,6 +105,7 @@
 \filbreak%
 \fi%
 }
+% \obeyOutlineSpaces
 
 
 %: Here is a list of the different keys and their meaning

diff --git a/src/preamble.tex b/src/preamble.tex
@@ -10,6 +10,9 @@
 \@ifundefined{ownLineNoSpacesGotIt}{
 \@latex@warning{Compilation wont work unless \string\end{problem} and \string\end{solution} are on their own lines and without any spaces. This warning can be removed by doing \string\def\string\ownLineNoSpacesGotIt{} before \@backslashchar usepackage{exercisebank}}
 }{}
+\ifcsname pdfstrcmp\endcsname\else
+\PackageError{exercisebank-@@VERSION}{Exercisebank currently only works with pdfLaTeX}{}\stop
+\fi
 %:\!begin{marker}DEPRECATED! use \refCom{exercisebanksetup} with \refKey{exercise directory} instead!\!end{marker}
 %:=\setExercisesDir{directory}
 %:\!begin{marker}\setExercisesDir is deprecated! use \refCom{exercisebanksetup} with \refKey{exercise directory} instead!\!end{marker}
@@ -26,10 +29,14 @@
 \makeatother
 
 \global\let\incl = \input
+\input{spaceIgnore}
 \input{ifs}
 \input{packages}
+% \ignoreOutlineSpaces
 \input{helpers}
+% \obeyOutlineSpaces%
 \input{packageoptions}
+% \ignoreOutlineSpaces
 \input{stopfilbreak}
 \input{i18n}
 \input{at}

diff --git a/src/spaceIgnore.tex b/src/spaceIgnore.tex
@@ -0,0 +1,29 @@
+%!TEX root = main.tex
+\makeatletter
+\def\exb@rememberCC#1{%
+	\edef\exbtmp@charcode{\the\numexpr#1}%
+	\expandafter\xdef\csname exb@remcc@\exbtmp@charcode\endcsname{\the\catcode#1}%
+}
+\def\exb@ignoreCC#1{%
+	\edef\exbtmp@charcode{\the\numexpr#1}
+	\exb@rememberCC{\exbtmp@charcode}%
+	\catcode\exbtmp@charcode=9%
+}
+\def\exb@resetCC#1{
+	\catcode#1=\csname exb@remcc@\the\numexpr#1\endcsname
+}
+% Ignores spaces that are not inline spaces
+% (newlines and tabs)
+\def\ignoreOutlineSpaces{%
+	\exb@ignoreCC{10}%   line feed (New line)
+	\exb@ignoreCC{11}%   Vertical Tab
+	\exb@ignoreCC{12}%   Form Feed
+	\exb@ignoreCC{13}%   Carriage Return
+}
+% Reset space ignore
+\def\obeyOutlineSpaces{%
+	\exb@resetCC{10}%
+	\exb@resetCC{11}%
+	\exb@resetCC{12}%
+	\exb@resetCC{13}\ignorespaces%
+}