Introduce yellow and unknown subset too.

diff --git a/Makefile b/Makefile
index a2b211f375ab0b1742ce7329462aeb47da4c76ab..5fbc6e2c7ee7f3a3b9566a4691799543bea78ffc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,20 @@ hefte-groenn.pdf: Makefile hefte-groenn.tex all-groenn.tex exercise/*.tex *.bib
        pdflatex hefte-groenn
        pdflatex hefte-groenn
 
+hefte-gul.pdf: Makefile hefte-gul.tex all-gul.tex exercise/*.tex *.bib
+       pdflatex hefte-gul
+       biber hefte-gul
+       makeindex hefte-gul
+       pdflatex hefte-gul
+       pdflatex hefte-gul
+
+hefte-ukjent.pdf: Makefile hefte-ukjent.tex all-ukjent.tex exercise/*.tex *.bib
+       pdflatex hefte-ukjent
+       biber hefte-ukjent
+       makeindex hefte-ukjent
+       pdflatex hefte-ukjent
+       pdflatex hefte-ukjent
+
 .gif.png:
        convert $^ $@
 
@@ -54,3 +68,9 @@ hefte-groenn.pdf: Makefile hefte-groenn.tex all-groenn.tex exercise/*.tex *.bib
 
 all-groenn.tex: exercise/*.tex
        for m in $$(grep -rl '% category: green' exercise/ |grep '.tex$$'|sed 's/.tex$$//'); do echo "\include{$$m}"; done > all-groenn.tex.new && mv all-groenn.tex.new all-groenn.tex
+
+all-gul.tex: exercise/*.tex
+       for m in $$(grep -rl '% category: yellow' exercise/ |grep '.tex$$'|sed 's/.tex$$//'); do echo "\include{$$m}"; done > all-gul.tex.new && mv all-gul.tex.new all-gul.tex
+
+all-ukjent.tex: exercise/*.tex
+       for m in $$(grep -rl '% category: unknown' exercise/ |grep '.tex$$'|sed 's/.tex$$//'); do echo "\include{$$m}"; done > all-ukjent.tex.new && mv all-ukjent.tex.new all-ukjent.tex

diff --git a/hefte-groenn.tex b/hefte-groenn.tex
index 5e70590e7f29d61470df0ebdcac427115ed94d1d..22411624e6f09cd3d6a054119a0bebce4de2e480 100644 (file)
--- a/hefte-groenn.tex
+++ b/hefte-groenn.tex
@@ -21,7 +21,7 @@
 
 \makeindex
 \title{Kjemi i skolen - grønt hefte}
-\date{utkast 2020}
+\date{utkast 2023}
 \author{Cato Hauge}
 %%----------------------------------------------------------%%
  %%----------------------------------------------------------%%

diff --git a/hefte-gul.tex b/hefte-gul.tex
new file mode 100644 (file)
index 0000000..03de277
--- /dev/null
+++ b/hefte-gul.tex
@@ -0,0 +1,58 @@
+\documentclass[11pt,a4paper,norsk]{book}
+\usepackage[norsk]{babel}
+\usepackage{multicol}
+\usepackage{color}
+\usepackage{enumitem}
+\usepackage{fancyhdr}
+\usepackage[refsection=section+]{biblatex}
+\usepackage{graphicx}
+\usepackage{colordvi}
+\usepackage{times}
+\usepackage[latin1]{inputenc}
+\usepackage{makeidx}
+\usepackage{xspace}
+\usepackage{varioref}
+\usepackage{minitoc}
+\usepackage{amsmath}
+\usepackage{amssymb} %Ekstra symboler
+
+\addbibresource{references.bib}
+\defbibheading{bibliography}[Referanser]{\subsubsection*{#1}\markboth{#1}{#1}}
+
+\makeindex
+\title{Kjemi i skolen - gult hefte}
+\date{utkast 2023}
+\author{Cato Hauge}
+%%----------------------------------------------------------%%
+ %%----------------------------------------------------------%%
+%\pagestyle{fancyplain}
+\pagestyle{plain}
+ \addtolength{\headwidth}{\marginparsep}
+\addtolength{\headwidth}{\marginparwidth}
+\renewcommand{\chaptermark}[1]{\markboth{#1}{}}
+\renewcommand{\subsectionmark}[1]{\markright{\thesubsection\ #1}}
+
+\lhead[\fancyplain{}{\bfseries\thepage}]{\fancyplain{}{\bfseries\rightmark}}
+\rhead[\fancyplain{}{\bfseries\leftmark}]{\fancyplain{}{\bfseries\thepage}}
+\cfoot{}
+
+
+%%----------------------------------------------------------%%
+
+%%----------------------------------------------------------%%
+\begin{document}
+\include{ourmacros}
+\setlength{\parindent}{0in}
+\setcounter{tocdepth}{2}
+
+\maketitle
+
+\makeatletter
+
+\tableofcontents
+
+\input{all-gul}
+
+\printindex
+
+\end{document}

diff --git a/hefte-ukjent.tex b/hefte-ukjent.tex
new file mode 100644 (file)
index 0000000..dd1f477
--- /dev/null
+++ b/hefte-ukjent.tex
@@ -0,0 +1,58 @@
+\documentclass[11pt,a4paper,norsk]{book}
+\usepackage[norsk]{babel}
+\usepackage{multicol}
+\usepackage{color}
+\usepackage{enumitem}
+\usepackage{fancyhdr}
+\usepackage[refsection=section+]{biblatex}
+\usepackage{graphicx}
+\usepackage{colordvi}
+\usepackage{times}
+\usepackage[latin1]{inputenc}
+\usepackage{makeidx}
+\usepackage{xspace}
+\usepackage{varioref}
+\usepackage{minitoc}
+\usepackage{amsmath}
+\usepackage{amssymb} %Ekstra symboler
+
+\addbibresource{references.bib}
+\defbibheading{bibliography}[Referanser]{\subsubsection*{#1}\markboth{#1}{#1}}
+
+\makeindex
+\title{Kjemi i skolen - ukategorisert hefte}
+\date{utkast 2023}
+\author{Cato Hauge}
+%%----------------------------------------------------------%%
+ %%----------------------------------------------------------%%
+%\pagestyle{fancyplain}
+\pagestyle{plain}
+ \addtolength{\headwidth}{\marginparsep}
+\addtolength{\headwidth}{\marginparwidth}
+\renewcommand{\chaptermark}[1]{\markboth{#1}{}}
+\renewcommand{\subsectionmark}[1]{\markright{\thesubsection\ #1}}
+
+\lhead[\fancyplain{}{\bfseries\thepage}]{\fancyplain{}{\bfseries\rightmark}}
+\rhead[\fancyplain{}{\bfseries\leftmark}]{\fancyplain{}{\bfseries\thepage}}
+\cfoot{}
+
+
+%%----------------------------------------------------------%%
+
+%%----------------------------------------------------------%%
+\begin{document}
+\include{ourmacros}
+\setlength{\parindent}{0in}
+\setcounter{tocdepth}{2}
+
+\maketitle
+
+\makeatletter
+
+\tableofcontents
+
+\input{all-ukjent}
+
+\printindex
+
+\end{document}