-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #31 from cu-mkp/issue25c
#25: some of sp15 and pandoc script run
- Loading branch information
Showing
16 changed files
with
168 additions
and
120 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,19 @@ | ||
--- | ||
title: "" | ||
title: "Gans Annotation Fieldnotes" | ||
output: | ||
html_document: | ||
template: annotation-student.html | ||
semester: "fa17" | ||
fullsemester: "Fall 2017" | ||
semester: "sp15" | ||
fullsemester: "Spring 2015" | ||
students: | ||
- name: "Nina Elizondo-Garza" | ||
topic: "Stucco" | ||
- name: "Gans" | ||
topic: "Alabaster Sand" | ||
|
||
intro: "" | ||
|
||
pages: | ||
- title: "" | ||
link: "" | ||
desc: "" | ||
- title: "Alabaster Sand Annotation" | ||
link: "sp15_ann_alabaster-sand_gans_alabaster-sand-annotation.html" | ||
desc: "" | ||
|
||
--- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,29 @@ | ||
--- | ||
title: "" | ||
title: "Spring 2015 Annotation Fieldnotes" | ||
output: | ||
html_document: | ||
template: annotation-semester.html | ||
semester: "fa17" | ||
fullsemester: "Fall 2017" | ||
semester: "sp15" | ||
fullsemester: "Spring 2015" | ||
|
||
intro: "" | ||
intro: > | ||
Annotation fieldnotes record planning, research, and hands-on work for the students' explorations of specific entries or processes in BnF Ms. Fr. 640. The results of this work are the <a href="https://edition640.makingandknowing.org/#/essays">Research Essays</a> in <i>Secrets of Craft and Nature in Renaissance France. A Digital Critical Edition and English Translation of BnF Ms. Fr. 640</i>. | ||
pages: | ||
- title: "" | ||
link: "" | ||
desc: "" | ||
- title: "Fu, Zhang: Lifecasting" | ||
link: "lifecasting_fu%2Bzhang/index.html" | ||
desc: "" | ||
- title: "Chiostrini, Palframan: Molding A Rose" | ||
link: "molding-a-rose_chiostrini%2Bpalframan/index.html" | ||
desc: "" | ||
- title: "Gans: Alabaster Sand" | ||
link: "alabaster-sand_gans/index.html" | ||
desc: "" | ||
- title: "Durkin: Molded Sugar Fruits" | ||
link: "molded-sugar-fruits_durkin/index.html" | ||
desc: "" | ||
- title: "Class Notes" | ||
link: "sp15_ann_class-notes.html" | ||
desc: "" | ||
|
||
--- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,31 @@ | ||
--- | ||
title: "" | ||
title: "Fu and Zhang Annotation Fieldnotes" | ||
output: | ||
html_document: | ||
template: annotation-student.html | ||
semester: "fa17" | ||
fullsemester: "Fall 2017" | ||
semester: "sp15" | ||
fullsemester: "Spring 2015" | ||
students: | ||
- name: "Nina Elizondo-Garza" | ||
topic: "Stucco" | ||
- name: "Fu and Zhang" | ||
topic: "Lifecasting" | ||
|
||
intro: "" | ||
|
||
pages: | ||
- title: "" | ||
link: "" | ||
desc: "" | ||
- title: "Life Casting Beetle" | ||
link: "sp15_ann_lifecasting_fu+zhang_life-casting-beetle-.html" | ||
desc: "" | ||
- title: "Annotation Field Notes Molding Paper" | ||
link: "sp15_ann_lifecasting_fu%2Bzhang_annotation-field-notes-molding-paper.html" | ||
desc: "" | ||
- title: "Annotation Field Notes Moulding Pansies" | ||
link: "sp15_ann_lifecasting_fu%2Bzhang_annotation-field-notes-moulding-pansies-.html" | ||
desc: "" | ||
- title: "Annotation Field Notes Molding A Butterfly" | ||
link: "sp15_ann_lifecasting_fu%2Bzhang_annotation-field-notes-molding-a-butterfly.html" | ||
desc: "" | ||
- title: "Annotation Field Notes Molding Pansies" | ||
link: "sp15_ann_lifecasting_fu%2Bzhang_annotation-field-notes-molding-pansies.html" | ||
desc: "" | ||
|
||
--- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,22 @@ | ||
--- | ||
title: "" | ||
title: "Durkin Annotation Fieldnotes" | ||
output: | ||
html_document: | ||
template: annotation-student.html | ||
semester: "fa17" | ||
fullsemester: "Fall 2017" | ||
semester: "sp15" | ||
fullsemester: "Spring 2015" | ||
students: | ||
- name: "Nina Elizondo-Garza" | ||
topic: "Stucco" | ||
- name: "Durkin" | ||
topic: "Molded Sugar Fruits" | ||
|
||
intro: "" | ||
|
||
pages: | ||
- title: "" | ||
link: "" | ||
desc: "" | ||
- title: "Gans Sugar Casting" | ||
link: "sp15_ann_molded-sugar-fruits_durkin_gans-sugar-casting.html" | ||
desc: "" | ||
- title: "Molding Fruits And Animals In Sugar" | ||
link: "sp15_ann_molded-sugar-fruits_durkin_molding-fruits-and-animals-in-sugar.html" | ||
desc: "" | ||
|
||
--- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 11 additions & 8 deletions
19
content/sp15/ann/molding-a-rose_chiostrini+palframan/index.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,22 @@ | ||
--- | ||
title: "" | ||
title: "Chiostrini and Palframan Annotation Fieldnotes" | ||
output: | ||
html_document: | ||
template: annotation-student.html | ||
semester: "fa17" | ||
fullsemester: "Fall 2017" | ||
semester: "sp15" | ||
fullsemester: "Spring 2015" | ||
students: | ||
- name: "Nina Elizondo-Garza" | ||
topic: "Stucco" | ||
- name: "Chiostrini and Palframan" | ||
topic: "Molding a Rose" | ||
|
||
intro: "" | ||
|
||
pages: | ||
- title: "" | ||
link: "" | ||
desc: "" | ||
- title: "Annotation Field Notes" | ||
link: "sp15_ann_molding-a-rose_chiostrini+palframan_annotation-field-notes.html" | ||
desc: "" | ||
- title: "Molding A Rose" | ||
link: "sp15_ann_molding-a-rose_chiostrini+palframan_molding-a-rose.html" | ||
desc: "" | ||
|
||
--- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,41 +1,17 @@ | ||
--- | ||
title: "Nina Elizondo-Garza Fieldnotes" | ||
title: "Jenny Boulboulle Fieldnotes" | ||
output: | ||
html_document: | ||
template: fieldnote.html | ||
semester: "fa17" | ||
fullsemester: "Fall 2017" | ||
student: "Nina Elizondo-Garza" | ||
semester: "sp15" | ||
fullsemester: "Spring 2015" | ||
student: "Jenny Boulboulle" | ||
|
||
intro: "Nina is a person. She was born at a very young age." | ||
intro: "" | ||
|
||
pages: | ||
- title: "Historical Culinary Reconstruction" | ||
link: "fa17_fld_elizondo-garza_nina_hcr.html" | ||
desc: "" | ||
- title: "Verdigris Experiment" | ||
link: "fa17_fld_elizondo-garza_nina_verdigris-experiment.html" | ||
desc: "" | ||
- title: "An Exploration of Bread Making" | ||
link: "fa17_fld_elizondo-garza_nina_an-exploration-of-bread-making.html" | ||
desc: "" | ||
- title: "From Madder Root to Madder Lake" | ||
link: "fa17_fld_elizondo-garza_nina_from-madder-root-to-madder-lake.html" | ||
desc: "" | ||
- title: "Azurite" | ||
link: "fa17_fld_elizondo-garza_nina_azurite.html" | ||
desc: "" | ||
- title: "Flour Stucco and Paste Glue" | ||
link: "../dongchung_tenzin/fa17_fld_dongchung_tenzin_stucco.html" | ||
desc: "" | ||
- title: "Annotation Plans" | ||
link: "../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza_annotation-plans.html" | ||
desc: "" | ||
- title: "Stucco Annotation Fieldnotes" | ||
link: "../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza-stucco-fol-29r-1.html" | ||
desc: "" | ||
- title: "Stucco Annotation - Painting Stucco" | ||
link: "../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza_stucco-annotation-painting-stucco.html" | ||
desc: "" | ||
- title: "Index Superseded" | ||
link: "sp15_fld_boulboulle_jenny_index-superseded.html" | ||
desc: "" | ||
|
||
--- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.