Merge branch 'master' into Berkeley

benjaminyzhang · Feb 8, 2016 · 06782a9 · 06782a9
2 parents c06b98e + b127edc
commit 06782a9
Show file tree

Hide file tree

Showing 24 changed files with 242 additions and 55 deletions.
diff --git a/assets/latex-base/Dissertate.cls b/assets/latex-base/Dissertate.cls
@@ -104,10 +104,17 @@
      \endlist}
 
 % Some definitions.
+\def\advisor#1{\gdef\@advisor{#1}}
+\def\coadvisorOne#1{\gdef\@coadvisorOne{#1}}
+\def\coadvisorTwo#1{\gdef\@coadvisorTwo{#1}}
+\def\committeeInternal#1{\gdef\@committeeInternal{#1}}
+\def\committeeInternalOne#1{\gdef\@committeeInternalOne{#1}}
+\def\committeeInternalTwo#1{\gdef\@committeeInternalTwo{#1}}
+\def\committeeExternal#1{\gdef\@committeeExternal{#1}}
 \def\degreeyear#1{\gdef\@degreeyear{#1}}
 \def\degreemonth#1{\gdef\@degreemonth{#1}}
+\def\degreeterm#1{\gdef\@degreeterm{#1}}
 \def\degree#1{\gdef\@degree{#1}}
-\def\advisor#1{\gdef\@advisor{#1}}
 \def\department#1{\gdef\@department{#1}}
 \def\field#1{\gdef\@field{#1}}
 \def\university#1{\gdef\@university{#1}}

diff --git a/assets/latex-base/chapters/appendixA.tex b/assets/latex-base/chapters/appendixA.tex
@@ -1,3 +1,4 @@
+%!TEX root = ../dissertation.tex
 \chapter{Some extra stuff}
 \label{AppendixA}
 

diff --git a/assets/latex-base/chapters/chapter1.tex b/assets/latex-base/chapters/chapter1.tex
@@ -1,3 +1,4 @@
+%!TEX root = ../dissertation.tex
 \begin{savequote}[75mm]
 Nulla facilisi. In vel sem. Morbi id urna in diam dignissim feugiat. Proin molestie tortor eu velit. Aliquam erat volutpat. Nullam ultrices, diam tempus vulputate egestas, eros pede varius leo.
 \qauthor{Quoteauthor Lastname}

diff --git a/assets/latex-base/chapters/chapter2.tex b/assets/latex-base/chapters/chapter2.tex
@@ -1,3 +1,4 @@
+%!TEX root = ../dissertation.tex
 \begin{savequote}[75mm]
 This is some random quote to start off the chapter.
 \qauthor{Firstname lastname}

diff --git a/assets/latex-base/chapters/chapter3.tex b/assets/latex-base/chapters/chapter3.tex
@@ -1,3 +1,4 @@
+%!TEX root = ../dissertation.tex
 \begin{savequote}[75mm]
 Nulla facilisi. In vel sem. Morbi id urna in diam dignissim feugiat. Proin molestie tortor eu velit. Aliquam erat volutpat. Nullam ultrices, diam tempus vulputate egestas, eros pede varius leo.
 \qauthor{Quoteauthor Lastname}

diff --git a/assets/latex-base/chapters/conclusion.tex b/assets/latex-base/chapters/conclusion.tex
@@ -1,3 +1,4 @@
+%!TEX root = ../dissertation.tex
 \chapter{Conclusion}
 \label{conclusion}
 

diff --git a/assets/latex-base/chapters/introduction.tex b/assets/latex-base/chapters/introduction.tex
@@ -1,3 +1,4 @@
+%!TEX root = ../dissertation.tex
 \chapter{Introduction}
 \label{introduction}
 

diff --git a/assets/latex-base/dissertation.tex b/assets/latex-base/dissertation.tex
@@ -8,18 +8,18 @@
 
 % the front matter
 \input{frontmatter/personalize}
-\maketitle
-\copyrightpage
-
+% \maketitle
+% \copyrightpage
+\frontmatter
 \setstretch{1.2}
-\abstractpage
-\tableofcontents
-%\authorlist
-\listoffigures
-\dedicationpage
-\acknowledgments
-
-\doublespacing
+% \abstractpage
+% \tableofcontents
+% %\authorlist
+% \listoffigures
+% \dedicationpage
+% \acknowledgments
+
+% \doublespacing
 
 % include each chapter...
 \setcounter{chapter}{-1}  % start chapter numbering at 0

diff --git a/assets/latex-base/endmatter/colophon.tex b/assets/latex-base/endmatter/colophon.tex
@@ -1,3 +1,4 @@
+%!TEX root = ../dissertation.tex
 \newpage
 
 % If you do want an image in the colophon:

diff --git a/assets/latex-base/frontmatter/abstract.tex b/assets/latex-base/frontmatter/abstract.tex
@@ -1,3 +1,4 @@
+%!TEX root = ../dissertation.tex
 % the abstract
 
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi commodo, ipsum sed pharetra gravida, orci magna rhoncus neque, id pulvinar odio lorem non turpis. Nullam sit amet enim. Suspendisse id velit vitae ligula volutpat condimentum. Aliquam erat volutpat. Sed quis velit. Nulla facilisi. Nulla libero. Vivamus pharetra posuere sapien. Nam consectetuer. Sed aliquam, nunc eget euismod ullamcorper, lectus nunc ullamcorper orci, fermentum bibendum enim nibh eget ipsum. Donec porttitor ligula eu dolor. Maecenas vitae nulla consequat libero cursus venenatis. Nam magna enim, accumsan eu, blandit sed, blandit a, eros.

diff --git a/assets/latex-base/frontmatter/authorlist.tex b/assets/latex-base/frontmatter/authorlist.tex
@@ -1,3 +1,4 @@
+%!TEX root = ../dissertation.tex
 \noindent The following authors contributed to Chapter 1: Albert Einstein, George Gamow and Pief Panofsky.
 
 \noindent The following authors contributed to Chapter 2: I. I. Rabi, Niels Bohr and Norman Ramsey.

diff --git a/assets/latex-base/frontmatter/dedication.tex b/assets/latex-base/frontmatter/dedication.tex
@@ -1,3 +1,4 @@
+%!TEX root = ../dissertation.tex
 % dedication text
 
 This is the dedication.
diff --git a/assets/latex-base/frontmatter/personalize.tex b/assets/latex-base/frontmatter/personalize.tex
@@ -1,10 +1,20 @@
+%!TEX root = ../dissertation.tex
 % Some details about the dissertation.
 \title{Title of the dissertation}
 \author{Firstname M. Lastname}
+
+%If you have one advisor
 \advisor{Bigname Scientist}
+
+\committeeInternalOne{Person Inside One}
+\committeeInternalTwo{Person Inside Two}
+
+%If you are coadvised
 \coadvisorOne{Delightful Researcher}
 \coadvisorTwo{Equally D. Researcher}
 \committeeInternal{Person Inside}
+
+% Everyone has an External committee member
 \committeeExternal{Person Outside}
 
 % ... about the degree.

diff --git a/assets/latex-base/frontmatter/preface.tex b/assets/latex-base/frontmatter/preface.tex
@@ -0,0 +1,4 @@
+%!TEX root = ../dissertation.tex
+% the acknowledgments section
+
+\newthought{Lorem ipsum dolor sit amet}, consectetuer adipiscing elit. Morbi commodo, ipsum sed pharetra gravida, orci magna rhoncus neque, id pulvinar odio lorem non turpis. Nullam sit amet enim. Suspendisse id velit vitae ligula volutpat condimentum. Aliquam erat volutpat. Sed quis velit. Nulla facilisi. Nulla libero. Vivamus pharetra posuere sapien. Nam consectetuer. Sed aliquam, nunc eget euismod ullamcorper, lectus nunc ullamcorper orci, fermentum bibendum enim nibh eget ipsum. Donec porttitor ligula eu dolor. Maecenas vitae nulla consequat libero cursus venenatis. Nam magna enim, accumsan eu, blandit sed, blandit a, eros.
diff --git a/assets/latex-base/frontmatter/thanks.tex b/assets/latex-base/frontmatter/thanks.tex
@@ -1,3 +1,4 @@
+%!TEX root = ../dissertation.tex
 % the acknowledgments section
 
 \newthought{Lorem ipsum dolor sit amet}, consectetuer adipiscing elit. Morbi commodo, ipsum sed pharetra gravida, orci magna rhoncus neque, id pulvinar odio lorem non turpis. Nullam sit amet enim. Suspendisse id velit vitae ligula volutpat condimentum. Aliquam erat volutpat. Sed quis velit. Nulla facilisi. Nulla libero. Vivamus pharetra posuere sapien. Nam consectetuer. Sed aliquam, nunc eget euismod ullamcorper, lectus nunc ullamcorper orci, fermentum bibendum enim nibh eget ipsum. Donec porttitor ligula eu dolor. Maecenas vitae nulla consequat libero cursus venenatis. Nam magna enim, accumsan eu, blandit sed, blandit a, eros.
diff --git a/assets/schools/Berkeley/README.md b/assets/schools/Berkeley/README.md
@@ -0,0 +1 @@
+## Generic dissertation template
diff --git a/assets/schools/Berkeley/__init__.py b/assets/schools/Berkeley/__init__.py
diff --git a/assets/schools/Berkeley/style.sty b/assets/schools/Berkeley/style.sty
@@ -0,0 +1,132 @@
+% School name and location
+\university{University of California, Berkeley}
+\universitycity{Berkeley}
+\universitystate{California}
+
+% School color found from university's graphic identity site:
+% http://brand.berkeley.edu/colors/
+
+\definecolor{SchoolColor}{rgb}{0,0.19608,0.3843} %berkeley blue
+\definecolor{chaptergrey}{rgb}{0,0.19608,0.3843} % chapter numbers
+
+\hypersetup{
+    colorlinks,
+    citecolor=SchoolColor,
+    filecolor=black,
+    linkcolor=black,
+    urlcolor=SchoolColor,
+}
+
+% Formatting guidelines found in:
+% http://www.gsas.harvard.edu/publications/form_of_the_phd_dissertation.php
+\renewcommand{\frontmatter}{
+	\input{frontmatter/personalize}
+	\maketitle
+	\copyrightpage
+	\abstractpage
+    \dedicationpage
+    \tableofcontents
+    \acknowledgments
+	% \listoffigures % optional
+    \setcounter{page}{1}
+    \pagenumbering{arabic}
+}
+
+\renewcommand{\maketitle}{
+    \thispagestyle{empty}
+    \vspace*{\fill}
+    \vspace{10pt}
+    \begin{center}
+    \Huge \textcolor{SchoolColor}{\thetitle} \normalsize \\
+    \vspace{100pt}
+    By\\
+    \theauthor\\
+    \vspace{12pt}
+    \textsc{A Dissertation submitted in partial satisfaction of the\\
+    requirements for the degree of \\ \@degree\\
+    in\\ \@department\\ in the\\  Graduate Division\\ of the\\
+    \@university\\
+    \vspace{50pt}
+    Committee in charge:\\
+    \vspace{20pt}
+    Professor \@coadvisorOne, Co-chair\\
+    Professor \@coadvisorTwo, Co-chair\\
+    Professor \@committeeInternal\\
+    Professor \@committeeExternal\\
+    \vspace{50pt}
+    \@degreeterm\ \@degreeyear}
+    \end{center} \vspace*{\fill}
+}
+
+
+%\renewcommand{\maketitle}{
+%    \thispagestyle{empty}
+%    \vspace*{\fill}
+%    \vspace{10pt}
+%    \begin{center}
+%    \Huge \textcolor{SchoolColor}{\thetitle} \normalsize \\
+%    \vspace{100pt}
+%    By\\
+%    \theauthor\\
+%    \vspace{12pt}
+%    \textsc{A Dissertation submitted in partial satisfaction of the\\
+%    requirements for the degree of \\ \@degree\\
+%    in\\ \@department\\ in the\\  Graduate Division\\ of the\\
+%    \@university\\
+%    \vspace{50pt}
+%    Committee in charge:\\
+%    \vspace{20pt}
+%    Professor \@advisor, Chair\\
+%    Professor \@committeeInternalOne\\
+%    Professor \@committeeInternalTwo\\
+%    Professor \@committeeExternal\\
+%    \vspace{50pt}
+%    \@degreeterm\ \@degreeyear}
+%    \end{center} \vspace*{\fill}
+%}
+
+\newcommand{\copyrightpage}{
+    \newpage
+    \thispagestyle{empty}
+    \vspace*{\fill}
+    \scshape \noindent \small \copyright \small 2015\hspace{3pt}-- \theauthor \\
+    \noindent all rights reserved.
+    \vspace*{\fill}
+    \newpage
+    \rm
+}
+
+\newcommand{\abstractpage}{
+    \newpage
+    \setcounter{page}{1}
+    \pagenumbering{arabic}
+    \pagestyle{fancy}
+    \lhead{Co-advisors: Professors \@coadvisorOne {\textit \&} \@coadvisorTwo}
+    \rhead{\@author}
+    \renewcommand{\headrulewidth}{0.0pt}
+    \vspace*{35pt}
+    \begin{center}
+    \Large \textcolor{SchoolColor}{\@title} \normalsize \\
+    \vspace*{20pt}
+    \scshape Abstract \\ \rm
+    \end{center}
+    \input{frontmatter/abstract}
+    \vspace*{\fill}
+    \newpage \lhead{} \rhead{}
+    \cfoot{\thepage}
+}
+
+\newcommand{\acknowledgments}{
+    \chapter*{Acknowledgments}
+    \noindent
+    \input{frontmatter/thanks}
+    \vspace*{\fill} \newpage
+}
+
+\newcommand{\dedicationpage}{
+    \setcounter{page}{1}
+    \pagenumbering{roman}
+    \newpage \thispagestyle{fancy} \vspace*{\fill}
+    \scshape \noindent \input{frontmatter/dedication}
+    \vspace*{\fill} \newpage \rm
+}
diff --git a/assets/schools/Berkeley/word.py b/assets/schools/Berkeley/word.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+from ..Generic.generic import GenericTemplate
+from docx import Document
+
+
+class Template(GenericTemplate):
+
+    def __init__(self, arg=None):
+        super(Template, self).__init__()
+        self.arg = arg
diff --git a/assets/schools/Generic/generic.py b/assets/schools/Generic/generic.py
@@ -1,3 +1,5 @@
+from __future__ import print_function
+from builtins import object
 #!/usr/bin/env python
 from docx import Document
 
@@ -8,7 +10,7 @@ def __init__(self):
         self.document = Document('../assets/word-base/dissertate.docx')
 
     def fill(self):
-        print ""
+        print("")
 
     def save(self):
         self.document.save('dissertation.docx')

diff --git a/assets/schools/NYU/NYUlogo.eps → assets/schools/NYU/resources/NYUlogo.eps b/assets/schools/NYU/NYUlogo.eps → assets/schools/NYU/resources/NYUlogo.eps
diff --git a/assets/schools/NYU/style.sty b/assets/schools/NYU/style.sty
@@ -19,6 +19,7 @@
 
 % Formatting guidelines found in:
 % http://gsas.nyu.edu/docs/IO/4474/formattingguide.pdf
+
 \renewcommand{\frontmatter}{
 	\pagenumbering{roman}
 	\input{frontmatter/personalize}
@@ -94,7 +95,7 @@
 	\thispagestyle{empty}
 	\vspace*{\fill}
 	\begin{center}
-  \includegraphics[width=45pt]{packages/images/NYUlogo.eps}
+    \includegraphics[width=45pt]{resources/NYUlogo.eps}
 	\end{center}
 	\vspace*{\fill}
 }

diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-python-docx==0.8.5
+python-docx>=0.8.5