89 lines
3.2 KiB
Diff
89 lines
3.2 KiB
Diff
From c22ebc40669653a44638b38563bd09bc18ae079f Mon Sep 17 00:00:00 2001
|
|
From: nemunaire <pomercier@novaquark.com>
|
|
Date: Wed, 30 Jul 2014 18:52:29 +0200
|
|
Subject: [PATCH] -
|
|
|
|
---
|
|
src/Make/DocInfo.pm | 2 +-
|
|
src/Make/Make.pm | 2 +-
|
|
src/Make/Templates.pm | 10 +++++-----
|
|
src/Objects/Path.pm | 2 +-
|
|
4 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/src/Make/DocInfo.pm b/src/Make/DocInfo.pm
|
|
index 67c675a..b0cdc82 100644
|
|
--- a/src/Make/DocInfo.pm
|
|
+++ b/src/Make/DocInfo.pm
|
|
@@ -33,7 +33,7 @@ has written_in => (
|
|
|
|
has team => (
|
|
is => 'ro',
|
|
- isa => enum( [qw( acu yaka )] ),
|
|
+ isa => enum( [qw( acu yaka nemu )] ),
|
|
required => 1,
|
|
);
|
|
|
|
diff --git a/src/Make/Make.pm b/src/Make/Make.pm
|
|
index df644a8..13f7a5d 100644
|
|
--- a/src/Make/Make.pm
|
|
+++ b/src/Make/Make.pm
|
|
@@ -30,7 +30,7 @@ BEGIN {
|
|
);
|
|
%PARAMS = (
|
|
pandoc =>
|
|
- "--toc --latex-engine=$ENGINE{latex} --slide-level=3 --listings",
|
|
+ "--toc --latex-engine=$ENGINE{latex} --slide-level=1 --listings",
|
|
xelatex => '-halt-on-error',
|
|
);
|
|
|
|
diff --git a/src/Make/Templates.pm b/src/Make/Templates.pm
|
|
index c484f40..023f840 100644
|
|
--- a/src/Make/Templates.pm
|
|
+++ b/src/Make/Templates.pm
|
|
@@ -7,7 +7,7 @@ use utf8;
|
|
use open IO => 'utf8';
|
|
use open ':std';
|
|
|
|
-use constant TEMPLATE_TYPE => 'acu'; # yaka | acu
|
|
+use constant TEMPLATE_TYPE => 'nemu'; # yaka | acu
|
|
|
|
use lib '..'; # debug
|
|
|
|
@@ -38,16 +38,16 @@ my %PROJECT_INFOS;
|
|
BEGIN {
|
|
$ROOT_DIR = File::Spec->rootdir();
|
|
$TEMPLATE_DIR =
|
|
- File::Spec->catdir( $ROOT_DIR, 'sgoinfre', 'butler', 'templates',
|
|
- TEMPLATE_TYPE );
|
|
+ File::Spec->catdir( $ROOT_DIR, 'home', 'nemunaire', 'workspace',
|
|
+ 'internship_report', 'templates', TEMPLATE_TYPE );
|
|
|
|
%PARTS = (
|
|
- tutorial => [qw( std frontpage copyright_and_toc newpage MAIN motto )],
|
|
+ tutorial => [qw( std frontpage toc MAIN motto )],
|
|
subject => [
|
|
qw( std frontpage copyright_and_toc newpage obligations
|
|
advice newpage submissions directorytree newpage MAIN motto )
|
|
],
|
|
- other => [qw( std frontpage copyright_and_toc newpage MAIN motto )],
|
|
+ other => [qw( std frontpage thanks toc newpage MAIN motto )],
|
|
slides => [qw( std frontpage copyright_and_toc MAIN )],
|
|
examsubject => [ qw( std frontpage copyright_and_toc newpage
|
|
obligations submissions newpage MAIN motto ) ],
|
|
diff --git a/src/Objects/Path.pm b/src/Objects/Path.pm
|
|
index e2841c9..908387a 100644
|
|
--- a/src/Objects/Path.pm
|
|
+++ b/src/Objects/Path.pm
|
|
@@ -77,7 +77,7 @@ sub standard_for {
|
|
if ($doctype eq 'subject') { Objects::Path->new( 'subject' ) }
|
|
elsif ($doctype eq 'tutorial') { Objects::Path->new( 'tutorials' ) }
|
|
elsif ($doctype eq 'slides') { Objects::Path->new( 'slides' ) }
|
|
- elsif ($doctype eq 'other') { confess "no default path for doctype 'other'" }
|
|
+ elsif ($doctype eq 'other') { Objects::Path->new( 'report' ) }
|
|
elsif ($doctype eq 'defense') { Objects::Path->new('defenses') }
|
|
elsif ($doctype eq 'examsubject') { Objects::Path->new( 'subject' ) }
|
|
else { confess "unknown document type '$doctype'" }
|
|
--
|
|
1.8.5.5
|
|
|