Skip to content

Commit 3740fed

Browse files
njr2128njr2128
authored
Merge pull request #29 from cu-mkp/issue25b
#25: fa14 done and pandoc script run
2 parents 8537d48 + 026b506 commit 3740fed

File tree

35 files changed

+433
-548
lines changed

35 files changed

+433
-548
lines changed

‎content/fa14/ann/casting_carlson+katz/index.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,19 @@
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<link rel="stylesheet" type="text/css" href="">
7-
<title>Stucco | Fall 2017</title>
7+
<title>Casting | Fall 2014</title>
88
</head>
99
<body>
10-
<h1>Stucco | Fall 2017</h1>
10+
<h1>Casting | Fall 2014</h1>
1111
<h2>
1212
true
1313
<p></p>
1414
<br>
1515
<ul>
16-
<li><b><a href="">.</a></b> </li>
16+
<li><b><a href="fa14_ann_casting_carlson%2Bkatz_portrait-medal.html">Portrait Medal.</a></b> </li>
17+
<li><b><a href="fa14_ann_casting_carlson%2Bkatz_related-casting-recipes.html">Related Casting Recipes.</a></b> </li>
18+
<li><b><a href="fa14_ann_casting_carlson%2Bkatz_sand-molding-and-casting.html">Sand Molding And Casting.</a></b> </li>
19+
<li><b><a href="fa14_ann_casting_carlson%2Bkatz_index-superseded.html">Index Superseded.</a></b> </li>
1720
</ul>
1821
</body>
1922
</html>

‎content/fa14/ann/casting_rowen+landsman/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<link rel="stylesheet" type="text/css" href="">
7-
<title>Stucco | Fall 2017</title>
7+
<title>Casting | Fall 2014</title>
88
</head>
99
<body>
10-
<h1>Stucco | Fall 2017</h1>
10+
<h1>Casting | Fall 2014</h1>
1111
<h2>
1212
true
1313
<p></p>
1414
<br>
1515
<ul>
16-
<li><b><a href="">.</a></b> </li>
16+
<li><b><a href="fa14_ann_casting_rowen%2Blandsman_index-superseded.html">Index Superseded.</a></b> </li>
1717
</ul>
1818
</body>
1919
</html>

‎content/fa14/ann/gold+casting_boyd+palframan/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<link rel="stylesheet" type="text/css" href="">
7-
<title>Stucco | Fall 2017</title>
7+
<title>Gold and Casting | Fall 2014</title>
88
</head>
99
<body>
10-
<h1>Stucco | Fall 2017</h1>
10+
<h1>Gold and Casting | Fall 2014</h1>
1111
<h2>
1212
true
1313
<p></p>
1414
<br>
1515
<ul>
16-
<li><b><a href="">.</a></b> </li>
16+
<li><b><a href="fa14_ann_gold%2Bcasting_boyd%2Bpalframan_index-superseded.html">Index Superseded.</a></b> </li>
1717
</ul>
1818
</body>
1919
</html>

‎content/fa14/ann/index.html

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,25 @@
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<link rel="stylesheet" type="text/css" href="">
7-
<title>Annotations | </title>
7+
<title>Annotations | Fall 2014</title>
88
</head>
99
<body>
10-
<h1>Annotations | </h1>
11-
<p></p>
10+
<h1>Annotations | Fall 2014</h1>
11+
<p><p>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>.</p></p>
1212
<br>
13+
<ul>
14+
<li><b><a href="casting_rowen+landsman/index.html">Rowen, Landsman: Casting.</a></b> </li>
15+
<li><b><a href="wax+sands_cataldo+van-visco/index.html">Cataldo, Van-visco: Wax+sands.</a></b> </li>
16+
<li><b><a href="casting_carlson%2Bkatz/index.html">Carlson, Katz: Casting.</a></b> </li>
17+
<li><b><a href="mustard+ox+magistra_lee%2Bmellon%2Bwang/index.html">Lee, Mellon, Wang: Mustard+ox+magistra.</a></b> </li>
18+
<li><b><a href="gold+casting_boyd%2Bpalframan/index.html">Boyd, Palframan: Gold+casting.</a></b> </li>
19+
<li><b><a href="ox_wang/index.html">Wang: Ox.</a></b> </li>
20+
<li><b><a href="fa14_ann_28-october-annotation-research-plans.html">October 28 Annotation Research Plans.</a></b> </li>
21+
<li><b><a href="fa14_ann_annotation-plans.html">Annotation Plans.</a></b> </li>
22+
<li><b><a href="fa14_ann_research-annotation-plans.html">Annotation Research Plans.</a></b> </li>
23+
<li><b><a href="fa14_ann_notes-on-annotation-plans_materials.html">Notes on Annotation Plans: Materials.</a></b> </li>
24+
<li><b><a href="fa14_ann_overview-annotation-experiments.html">Overview of Annotation Experiments.</a></b> </li>
25+
<li><b><a href="fa14_ann_class-notes-fall-semester.html">Class Notes.</a></b> </li>
26+
</ul>
1327
</body>
1428
</html>

‎content/fa14/ann/mustard+ox+magistra_lee+mellon+wang/index.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,20 @@
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<link rel="stylesheet" type="text/css" href="">
7-
<title>Stucco | Fall 2017</title>
7+
<title>Mustard, Ox bones, and Magistra | Fall 2017</title>
88
</head>
99
<body>
10-
<h1>Stucco | Fall 2017</h1>
10+
<h1>Mustard, Ox bones, and Magistra | Fall 2017</h1>
1111
<h2>
1212
true
1313
<p></p>
1414
<br>
1515
<ul>
16-
<li><b><a href="">.</a></b> </li>
16+
<li><b><a href="fa14_ann_mustard%2Box%2Bmagistra_lee%2Bmellon%2Bwang_index-superseded.html">Index Superseded.</a></b> </li>
17+
<li><b><a href="fa14_ann_mustard%2Box%2Bmagistra_lee%2Bmellon%2Bwang_excellent-mustard-48r.html">Excellent Mustard 48r.</a></b> </li>
18+
<li><b><a href="fa14_ann_mustard%2Box%2Bmagistra_lee%2Bmellon%2Bwang_magistry-84r.html">Magistry 84r.</a></b> </li>
19+
<li><b><a href="fa14_ann_mustard%2Box%2Bmagistra_lee%2Bmellon%2Bwang_files-index.html">Files Index.</a></b> </li>
20+
<li><b><a href="fa14_ann_mustard%2Box%2Bmagistra_lee%2Bmellon%2Bwang_ox-bone-and-rock-salt-89r.html">Ox Bone And Rock Salt 89r.</a></b> </li>
1721
</ul>
1822
</body>
1923
</html>

‎content/fa14/ann/ox_wang/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<link rel="stylesheet" type="text/css" href="">
7-
<title>Stucco | Fall 2017</title>
7+
<title>Ox Bone | Fall 2014</title>
88
</head>
99
<body>
10-
<h1>Stucco | Fall 2017</h1>
10+
<h1>Ox Bone | Fall 2014</h1>
1111
<h2>
1212
true
1313
<p></p>
1414
<br>
1515
<ul>
16-
<li><b><a href="">.</a></b> </li>
16+
<li><b><a href="fa14_ann_ox_wang_annotation-ox-bone-and-elm-root-sand-f-84v.html">Annotation Ox Bone And Elm Root Sand F 84v.</a></b> </li>
1717
</ul>
1818
</body>
1919
</html>

‎content/fa14/ann/wax+sands_cataldo+van-visco/index.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<link rel="stylesheet" type="text/css" href="">
7-
<title>Stucco | Fall 2017</title>
7+
<title>Wax and Sands | Fall 2014</title>
88
</head>
99
<body>
10-
<h1>Stucco | Fall 2017</h1>
10+
<h1>Wax and Sands | Fall 2014</h1>
1111
<h2>
1212
true
1313
<p></p>
1414
<br>
1515
<ul>
16-
<li><b><a href="">.</a></b> </li>
16+
<li><b><a href="fa14_ann_wax%2Bsands_cataldo%2Bvan-visco_index-superseded.html">Index Superseded.</a></b> </li>
17+
<li><b><a href="fa14_ann_wax%2Bsands_cataldo%2Bvan-visco_working-with-wax-bnf-ms-fr-640-recipes.html">Working With Wax Bnf Ms Fr 640 Recipes.</a></b> </li>
18+
<li><b><a href="fa14_ann_wax%2Bsands_cataldo%2Bvan-visco_working-with-wax.html">Working With Wax.</a></b> </li>
1719
</ul>
1820
</body>
1921
</html>

‎content/fa14/fld/bilak_donna/index.html

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,14 @@
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<link rel="stylesheet" type="text/css" href="">
7-
<title>Nina Elizondo-Garza Fieldnotes | Fall 2017</title>
7+
<title>Donna Bilak Fieldnotes | Fall 2014</title>
88
</head>
99
<body>
10-
<h1>Nina Elizondo-Garza Fieldnotes | Fall 2017</h1>
11-
<p>Nina is a person. She was born at a very young age.</p>
10+
<h1>Donna Bilak Fieldnotes | Fall 2014</h1>
11+
<p></p>
1212
<br>
1313
<ul>
14-
<li><b><a href="fa17_fld_elizondo-garza_nina_hcr.html">Historical Culinary Reconstruction.</a></b> </li>
15-
<li><b><a href="fa17_fld_elizondo-garza_nina_verdigris-experiment.html">Verdigris Experiment.</a></b> </li>
16-
<li><b><a href="fa17_fld_elizondo-garza_nina_an-exploration-of-bread-making.html">An Exploration of Bread Making.</a></b> </li>
17-
<li><b><a href="fa17_fld_elizondo-garza_nina_from-madder-root-to-madder-lake.html">From Madder Root to Madder Lake.</a></b> </li>
18-
<li><b><a href="fa17_fld_elizondo-garza_nina_azurite.html">Azurite.</a></b> </li>
19-
<li><b><a href="../dongchung_tenzin/fa17_fld_dongchung_tenzin_stucco.html">Flour Stucco and Paste Glue.</a></b> </li>
20-
<li><b><a href="../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza_annotation-plans.html">Annotation Plans.</a></b> </li>
21-
<li><b><a href="../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza-stucco-fol-29r-1.html">Stucco Annotation Fieldnotes.</a></b> </li>
22-
<li><b><a href="../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza_stucco-annotation-painting-stucco.html">Stucco Annotation - Painting Stucco.</a></b> </li>
14+
<li><b><a href="fa14_fld_bilak_donna_index-superseded.html">Index Superseded.</a></b> </li>
2315
</ul>
2416
</body>
2517
</html>

‎content/fa14/fld/bilak_donna/index.md

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,17 @@
11
---
2-
title: "Nina Elizondo-Garza Fieldnotes"
2+
title: "Donna Bilak Fieldnotes"
33
output:
44
html_document:
55
template: fieldnote.html
6-
semester: "fa17"
7-
fullsemester: "Fall 2017"
8-
student: "Nina Elizondo-Garza"
6+
semester: "fa14"
7+
fullsemester: "Fall 2014"
8+
student: "Donna Bilak"
99

10-
intro: "Nina is a person. She was born at a very young age."
10+
intro: ""
1111

1212
pages:
13-
- title: "Historical Culinary Reconstruction"
14-
link: "fa17_fld_elizondo-garza_nina_hcr.html"
15-
desc: ""
16-
- title: "Verdigris Experiment"
17-
link: "fa17_fld_elizondo-garza_nina_verdigris-experiment.html"
18-
desc: ""
19-
- title: "An Exploration of Bread Making"
20-
link: "fa17_fld_elizondo-garza_nina_an-exploration-of-bread-making.html"
21-
desc: ""
22-
- title: "From Madder Root to Madder Lake"
23-
link: "fa17_fld_elizondo-garza_nina_from-madder-root-to-madder-lake.html"
24-
desc: ""
25-
- title: "Azurite"
26-
link: "fa17_fld_elizondo-garza_nina_azurite.html"
27-
desc: ""
28-
- title: "Flour Stucco and Paste Glue"
29-
link: "../dongchung_tenzin/fa17_fld_dongchung_tenzin_stucco.html"
30-
desc: ""
31-
- title: "Annotation Plans"
32-
link: "../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza_annotation-plans.html"
33-
desc: ""
34-
- title: "Stucco Annotation Fieldnotes"
35-
link: "../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza-stucco-fol-29r-1.html"
36-
desc: ""
37-
- title: "Stucco Annotation - Painting Stucco"
38-
link: "../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza_stucco-annotation-painting-stucco.html"
39-
desc: ""
13+
- title: "Index Superseded"
14+
link: "fa14_fld_bilak_donna_index-superseded.html"
15+
desc: ""
4016

4117
---

‎content/fa14/fld/boulboulle_jenny/index.html

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,14 @@
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<link rel="stylesheet" type="text/css" href="">
7-
<title>Nina Elizondo-Garza Fieldnotes | Fall 2017</title>
7+
<title>Jenny Boulboulle Fieldnotes | Fall 2014</title>
88
</head>
99
<body>
10-
<h1>Nina Elizondo-Garza Fieldnotes | Fall 2017</h1>
11-
<p>Nina is a person. She was born at a very young age.</p>
10+
<h1>Jenny Boulboulle Fieldnotes | Fall 2014</h1>
11+
<p></p>
1212
<br>
1313
<ul>
14-
<li><b><a href="fa17_fld_elizondo-garza_nina_hcr.html">Historical Culinary Reconstruction.</a></b> </li>
15-
<li><b><a href="fa17_fld_elizondo-garza_nina_verdigris-experiment.html">Verdigris Experiment.</a></b> </li>
16-
<li><b><a href="fa17_fld_elizondo-garza_nina_an-exploration-of-bread-making.html">An Exploration of Bread Making.</a></b> </li>
17-
<li><b><a href="fa17_fld_elizondo-garza_nina_from-madder-root-to-madder-lake.html">From Madder Root to Madder Lake.</a></b> </li>
18-
<li><b><a href="fa17_fld_elizondo-garza_nina_azurite.html">Azurite.</a></b> </li>
19-
<li><b><a href="../dongchung_tenzin/fa17_fld_dongchung_tenzin_stucco.html">Flour Stucco and Paste Glue.</a></b> </li>
20-
<li><b><a href="../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza_annotation-plans.html">Annotation Plans.</a></b> </li>
21-
<li><b><a href="../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza-stucco-fol-29r-1.html">Stucco Annotation Fieldnotes.</a></b> </li>
22-
<li><b><a href="../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza_stucco-annotation-painting-stucco.html">Stucco Annotation - Painting Stucco.</a></b> </li>
14+
<li><b><a href="fa14_fld_boulboulle_jenny_preparing-sandcasting-molds.html">Preparing Sandcasting Molds.</a></b> </li>
2315
</ul>
2416
</body>
2517
</html>

‎content/fa14/fld/boulboulle_jenny/index.md

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,17 @@
11
---
2-
title: "Nina Elizondo-Garza Fieldnotes"
2+
title: "Jenny Boulboulle Fieldnotes"
33
output:
44
html_document:
55
template: fieldnote.html
6-
semester: "fa17"
7-
fullsemester: "Fall 2017"
8-
student: "Nina Elizondo-Garza"
6+
semester: "fa14"
7+
fullsemester: "Fall 2014"
8+
student: "Jenny Boulboulle"
99

10-
intro: "Nina is a person. She was born at a very young age."
10+
intro: ""
1111

1212
pages:
13-
- title: "Historical Culinary Reconstruction"
14-
link: "fa17_fld_elizondo-garza_nina_hcr.html"
15-
desc: ""
16-
- title: "Verdigris Experiment"
17-
link: "fa17_fld_elizondo-garza_nina_verdigris-experiment.html"
18-
desc: ""
19-
- title: "An Exploration of Bread Making"
20-
link: "fa17_fld_elizondo-garza_nina_an-exploration-of-bread-making.html"
21-
desc: ""
22-
- title: "From Madder Root to Madder Lake"
23-
link: "fa17_fld_elizondo-garza_nina_from-madder-root-to-madder-lake.html"
24-
desc: ""
25-
- title: "Azurite"
26-
link: "fa17_fld_elizondo-garza_nina_azurite.html"
27-
desc: ""
28-
- title: "Flour Stucco and Paste Glue"
29-
link: "../dongchung_tenzin/fa17_fld_dongchung_tenzin_stucco.html"
30-
desc: ""
31-
- title: "Annotation Plans"
32-
link: "../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza_annotation-plans.html"
33-
desc: ""
34-
- title: "Stucco Annotation Fieldnotes"
35-
link: "../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza-stucco-fol-29r-1.html"
36-
desc: ""
37-
- title: "Stucco Annotation - Painting Stucco"
38-
link: "../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza_stucco-annotation-painting-stucco.html"
39-
desc: ""
13+
- title: "Preparing Sandcasting Molds"
14+
link: "fa14_fld_boulboulle_jenny_preparing-sandcasting-molds.html"
15+
desc: ""
4016

4117
---

‎content/fa14/fld/boyd_emily/index.html

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,25 @@
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<link rel="stylesheet" type="text/css" href="">
7-
<title>Nina Elizondo-Garza Fieldnotes | Fall 2017</title>
7+
<title>Emily Boyd Fieldnotes | Fall 2014</title>
88
</head>
99
<body>
10-
<h1>Nina Elizondo-Garza Fieldnotes | Fall 2017</h1>
11-
<p>Nina is a person. She was born at a very young age.</p>
10+
<h1>Emily Boyd Fieldnotes | Fall 2014</h1>
11+
<p></p>
1212
<br>
1313
<ul>
14-
<li><b><a href="fa17_fld_elizondo-garza_nina_hcr.html">Historical Culinary Reconstruction.</a></b> </li>
15-
<li><b><a href="fa17_fld_elizondo-garza_nina_verdigris-experiment.html">Verdigris Experiment.</a></b> </li>
16-
<li><b><a href="fa17_fld_elizondo-garza_nina_an-exploration-of-bread-making.html">An Exploration of Bread Making.</a></b> </li>
17-
<li><b><a href="fa17_fld_elizondo-garza_nina_from-madder-root-to-madder-lake.html">From Madder Root to Madder Lake.</a></b> </li>
18-
<li><b><a href="fa17_fld_elizondo-garza_nina_azurite.html">Azurite.</a></b> </li>
19-
<li><b><a href="../dongchung_tenzin/fa17_fld_dongchung_tenzin_stucco.html">Flour Stucco and Paste Glue.</a></b> </li>
20-
<li><b><a href="../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza_annotation-plans.html">Annotation Plans.</a></b> </li>
21-
<li><b><a href="../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza-stucco-fol-29r-1.html">Stucco Annotation Fieldnotes.</a></b> </li>
22-
<li><b><a href="../../ann/stucco_elizondo-garza/fa17_ann_stucco_elizondo-garza_stucco-annotation-painting-stucco.html">Stucco Annotation - Painting Stucco.</a></b> </li>
14+
<li><b><a href="fa14_fld_boyd_emily_manuscript-annotations-project-notes.html">Manuscript Annotations Project Notes.</a></b> </li>
15+
<li><b><a href="fa14_fld_boyd_emily_manuscript-annotations-106r-and-145r.html">Manuscript Annotations 106r And 145r.</a></b> </li>
16+
<li><b><a href="fa14_fld_boyd_emily_boyd-sand-casting-field-notes.html">Boyd Sand Casting Field Notes.</a></b> </li>
17+
<li><b><a href="fa14_fld_boyd_emily_boyd-historical-recipe-reconstruction-field-notes.html">Boyd Historical Recipe Reconstruction Field Notes.</a></b> </li>
18+
<li><b><a href="fa14_fld_boyd_emily_recipe-145r.html">Recipe 145r.</a></b> </li>
19+
<li><b><a href="fa14_fld_boyd_emily_boyd-bread-molding-reconstruction-field-notes.html">Boyd Bread Molding Reconstruction Field Notes.</a></b> </li>
20+
<li><b><a href="fa14_fld_boyd_emily_recipe-106r.html">Recipe 106r.</a></b> </li>
21+
<li><b><a href="fa14_fld_boyd_emily_manuscript-annotations-stucco-for-molding.html">Manuscript Annotations Stucco For Molding.</a></b> </li>
22+
<li><b><a href="fa14_fld_boyd_emily_index-superseded.html">Index Superseded.</a></b> </li>
23+
<li><b><a href="fa14_fld_boyd_emily_bread-molding-reconstruction.html">Bread Molding Reconstruction.</a></b> </li>
24+
<li><b><a href="fa14_fld_boyd_emily_boyd-field-notes-dental-office-gold-casting.html">Boyd Field Notes Dental Office Gold Casting.</a></b> </li>
25+
<li><b><a href="fa14_fld_boyd_emily_manuscript-annotations-jefs-orange-pigment-recipe.html">Manuscript Annotations Jefs Orange Pigment Recipe.</a></b> </li>
2326
</ul>
2427
</body>
2528
</html>

0 commit comments

Comments
 (0)