From 0817f6c2791dedea21094117e0a1402df178e02e Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwf@cs.jhu.edu>
Date: Wed, 29 Nov 2017 03:57:08 -0500
Subject: [PATCH] Swap @thesis for @cvthesis to avoid clobbering upstream defns

In particular, I want to use @thesis for my actual thesis, as I pull its
BibTeX entry directly.

(This change originally used @guidethesis but Adin correctly notes in
https://gitlab.com/adin/mcv-academic/-/merge_requests/2 that being so
flavorful might be problematic, so use @cvthesis instead.)
---
 README.md          | 4 ++--
 academic.sty       | 4 ++--
 cv.bbx             | 4 ++--
 cv.dbx             | 4 ++--
 example/cvdata.bib | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index e4b0c8e..5eecbde 100644
--- a/README.md
+++ b/README.md
@@ -169,7 +169,7 @@ The style defines the following entries (or types of data)
   * `year`: the starting year of the project.  This field is an integer number representing the year.
   * `month`: the starting month of the project.  This field should be a month that `biblatex` can understand (that is, a number or a three letter month representation).
 
-- **Thesis**.  Refers to the theses you guided.  It supports the following fields
+- **cvthesis**.  Refers to the theses you guided.  It supports the following fields
   * `author`: the student (author) of the theses that you guided.  This field is a string.
   * `title`: the title of the thesis.  This field is a string.
   * `date`: the date of the thesis.  This field is a date from `biblatex`.
@@ -371,4 +371,4 @@ I will like to thank the community of [TeX Stack Exchange](tex-sx), which helped
 [moderncv]: https://www.ctan.org/tex-archive/macros/latex/contrib/moderncv/?lang=en
 [babel]: https://www.ctan.org/pkg/babel?lang=en
 [biblatex]: https://www.ctan.org/pkg/biblatex?lang=en
-[tex-sx]: http://tex.stackexchange.com/
\ No newline at end of file
+[tex-sx]: http://tex.stackexchange.com/
diff --git a/academic.sty b/academic.sty
index 0c51d19..c4cbb3f 100644
--- a/academic.sty
+++ b/academic.sty
@@ -227,7 +227,7 @@
       \pertype{position}
       \pertype{project}
       \pertype{course}
-      \pertype{thesis}
+      \pertype{cvthesis}
       \pertype{committee}
       \pertype{cvmisc}
       \step[fieldsource=date, match=\regexp{\A([0-9]{4}-[0-9]{2}-[0-9]{2})\Z}, replace=\regexp{$1/$1}]
@@ -376,7 +376,7 @@
 \defprint{course}{courses}
 \defprint{study}{studies}
 \defprint{position}{positions}
-\defprint{thesis}{theses}
+\defprint{cvthesis}{theses}
 \defprint[resetnumbers=true]{project}{projects}
 \defprint{cvmisc}{cvmiscs}
 \defprint[resetnumbers=true]{presentation}{presentations}
diff --git a/cv.bbx b/cv.bbx
index 299503f..4936e7f 100644
--- a/cv.bbx
+++ b/cv.bbx
@@ -89,7 +89,7 @@
 
 \DeclareBibliographyAlias{study}{cventry}
 
-\DeclareBibliographyAlias{thesis}{cventry}
+\DeclareBibliographyAlias{cvthesis}{cventry}
 
 \DeclareBibliographyAlias{cvmisc}{cventry}
 
@@ -144,7 +144,7 @@
 
 \DeclareFieldFormat[position]{title}{\mkbibbold{\usebibmacro{field-bibstring}{#1}}}
 
-\DeclareFieldFormat[thesis]{level}{\usebibmacro{field-bibstring}{#1}}
+\DeclareFieldFormat[cvthesis]{level}{\usebibmacro{field-bibstring}{#1}}
 
 
 \DeclareFieldFormat[project]{role}{\mkbibbold{\usebibmacro{field-bibstring}{#1}}}
diff --git a/cv.dbx b/cv.dbx
index 38aa278..f733eaf 100644
--- a/cv.dbx
+++ b/cv.dbx
@@ -23,7 +23,7 @@
 \DeclareDatamodelFields[type=list, datatype=literal]{dates}
 
 % Entries
-\DeclareDatamodelEntrytypes{course, cvmisc, position, project, study, thesis, presentation}
+\DeclareDatamodelEntrytypes{course, cvmisc, position, project, study, cvthesis, presentation}
 
 % Data models
 \DeclareLocalizedDatamodelEntryfields[course]{%
@@ -73,7 +73,7 @@
   note%
 }
 
-\DeclareLocalizedDatamodelEntryfields[thesis]{%
+\DeclareLocalizedDatamodelEntryfields[cvthesis]{%
   author,%
   date,%
   organization,%
diff --git a/example/cvdata.bib b/example/cvdata.bib
index 5940d5e..8047525 100644
--- a/example/cvdata.bib
+++ b/example/cvdata.bib
@@ -112,7 +112,7 @@ fancy
 
 % Theses guided
 
-@Thesis{doe2010,
+@GuideThesis{doe2010,
   author = {Doe, John Jr.},
   date={2010-01-01/2010-02-01},
   title-en = {On time traveling and paradoxes},
@@ -126,7 +126,7 @@ fancy
 }
 
 
-@Thesis{doe2011,
+@GuideThesis{doe2011,
   author = {Doe, John Jr.},
   date={2010-10-01/2011-10-21},
   title-en = {On time traveling and paradoxes II},
@@ -254,4 +254,4 @@ fancy
   keywords={international},
   eventtitle = {Time Travel Group},
   location={Somewhere around here}
-}
\ No newline at end of file
+}
-- 
2.50.1