From 808d7b9b237baa107b39a5b100832c92d45d1cf4 Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Mon, 23 Mar 2015 11:59:17 +0000 Subject: Yearly meeting minutes written Apart from the minutes also many other documents are updated, added, or modified. Makefile-common is modified to handle PDF inclusions. The annual report is updated, the auditor's report is added as TEX and PDF, and the economical report is added as PDF. The plan for operation is also updated from suggestion to final accepted plan. --- resources/Makefile-common | 6 ++++-- resources/participants | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'resources') diff --git a/resources/Makefile-common b/resources/Makefile-common index 9ba957f..3d066b1 100644 --- a/resources/Makefile-common +++ b/resources/Makefile-common @@ -24,19 +24,21 @@ FILE = PREAMBLE = ../preamble/preamble FILES_TEX = FILES_JPG = +FILES_PDF = SEND_FILES = input = $(FILE).tex output = $(FILE).pdf preamble = $(PREAMBLE).tex files-tex = $(foreach f, $(FILES_TEX), $(f).tex) -files-jgp = $(foreach f, $(FILES_JPG), $(f).jpg) +files-jpg = $(foreach f, $(FILES_JPG), $(f).jpg) +files-pdf = $(foreach f, $(FILES_PDF), $(f).pdf) send-files = $(foreach f, $(SEND_FILES), $(f).pdf) compile: $(output) # The most general latex compilation command -$(output): $(input) $(preamble) $(files-tex) $(files-jpg) +$(output): $(input) $(preamble) $(files-tex) $(files-jpg) $(files-pdf) latex_count=5 ;\ latex_log=$$(echo $@ | sed 's/.pdf/.log/') ;\ pdflatex $< ;\ diff --git a/resources/participants b/resources/participants index 468c9eb..8b124f1 100644 --- a/resources/participants +++ b/resources/participants @@ -12,13 +12,14 @@ Dagfinn L. Hotvedt Mattias Ivarsson Stefan Kangas Jens Lideström +Lorena Llozhi Guilhem Moulin Lola Möller Leif-Jöran Olsson Taraka Rama Dan Ros\'en Stian Rødven Eide -Albin S. +Albin Söderqvist Andreas Skyman Delphine Szymczak Johan Söderberg -- cgit v1.2.3