Merge pull request #105 from gettypubs/revisions

Revisions

Author: geealbers

Gemfile

@@ -8,8 +8,9 @@ source 'https://rubygems.org'
 # gem "tzinfo-data", platforms: [:mswin, :mingw, :jruby]
 
 gem 'middleman', '~> 4.0'
-gem 'middleman-deploy', '= 2.0.0.pre.alpha'
+gem 'middleman-deploy', '~> 2.0.0.pre.alpha'
 gem 'middleman-livereload'
+gem 'haml', '~>5.0.4'
 
 gem 'sanitize'
 gem 'epzip'

README.md

@@ -4,15 +4,87 @@ This is the repository for *Ancient Lamps in the J. Paul Getty Museum* by Jean B
 
 Some 630 lamps in the J. Paul Getty Museum represent production centers that were active across the ancient Mediterranean world between 800 B.C. and A.D. 800. Notable for their marvelous variety—from simple clay saucers that held just oil and a wick to elaborate figural lighting fixtures in bronze and precious metals—the Getty lamps display a number of unprecedented shapes and decors. Most were made in Roman workshops, which met the ubiquitous need for portable illumination in residences, public spaces, religious sanctuaries, and the grave. The omnipresent oil lamp is a font of popular imagery, illustrating myths, nature, and the activities and entertainments of daily life. Presenting a largely unpublished collection, this extensive catalogue is an invaluable resource for specialists in lychnology, art history, and archaeology alike.
 
-## Using this Repository
+## About this Repository
 
-While stable, the structure and code of this repository are very much in a prototype stage. This is the third in series of multi-format online collection catalogues using a new toolchain built with [Middleman](https://github.com/middleman/middleman), an open-source [static site generator](https://www.smashingmagazine.com/2015/11/modern-static-website-generators-next-big-thing/). (The first two were [*Ancient Terracottas from South Italy and Sicily in the J. Paul Getty Museum*](http://www.getty.edu/publications/terracottas) and [*Roman Mosaics in the J. Paul Getty Museum*](http://www.getty.edu/publications/romanmosaics).) Middleman and the other associated open-source software used here allow us to produce each format (e.g., PDF, EPUB, MOBI)  from a single set of source files. Our aim is to use open web technologies and plain-text file formats to ensure the book’s longevity and portability, while still achieving a high level of design and interactivity.
+This is the third in series of multi-format online collection catalogues using a new toolchain built with [Middleman](https://github.com/middleman/middleman), an open-source [static site generator](https://www.smashingmagazine.com/2015/11/modern-static-website-generators-next-big-thing/). (The first two were [*Ancient Terracottas from South Italy and Sicily in the J. Paul Getty Museum*](http://www.getty.edu/publications/terracottas) and [*Roman Mosaics in the J. Paul Getty Museum*](http://www.getty.edu/publications/romanmosaics).) Middleman and the other associated open-source software used here allow us to produce each format (e.g., PDF, EPUB, MOBI)  from a single set of source files. Our aim is to use open web technologies and plain-text file formats to ensure the book’s longevity and portability, while still achieving a high level of design and interactivity.
 
-[Getty Publications](http://www.getty.edu/publications/) is currently at work on more catalogues and other online publications, and we are refining our approach and rebuilding large portions of the code—all with an eye toward releasing a stable, open-source development-friendly version for broad use. Until then, making use of this existing project as the basis for new work is not recommended.
+The research presented here has been thoroughly edited and peer-reviewed and meets the same standards as all [Getty Publications](http://www.getty.edu/publications/) titles. We are dedicated to maintaining the book for years to come at the permanent URL, [http://www.getty.edu/publications/ancientlamps](http://www.getty.edu/publications/ancientlamps), and in its various formats and incarnations. For any updates to the book, we will be following something between an app and traditional book publication model. Updates will only be made in regulated chunks as formal revisions and new editions and will always be thoroughly documented here in the repository, as well as in the Revision History included with each of the book’s many formats.
 
-The content, on the other hand, is very stable. The research presented here has been thoroughly edited and peer-reviewed and meets the same standards the rest of our publications do. We are dedicated to maintaining the book for years to come at the permanent URL, [http://www.getty.edu/publications/ancientlamps](http://www.getty.edu/publications/ancientlamps), and in its various formats and incarnations. For any updates to the book, we will be following something between an app and traditional book publication model. Updates will only be made in regulated chunks as formal revisions and new editions and will always be thoroughly documented here in the repository, as well as in the Revision History included with each of the book’s many formats.
+The primary content pieces of the book can be found in the `data` and `source` directories. The master branch represents the current, published edition at all times, and the revisions branch, when present, shows changes currently under consideration. We invite you to submit suggestions or corrections via pull request on the revisions branch, by posting an issue, or by emailing us at [[email protected]](mailto:[email protected]).
+
+## Using the Code
+
+While stable, the structure and code of this particular repository are very much in a prototype stage, and making use of this existing project as the basis for new work should be done with caution. Getty Publications is currently at work on more catalogues and other online publications, and we are refining our approach and rebuilding large portions of the code—all with an eye toward releasing a stable, open-source development-friendly version for broad use. That version is called Quire and is built on the Hugo static-site generator rather than on Middleman which is used here.
+
+The following instructions are for macOS and assume you already have this project’s main dependencies installed on your machine: Ruby, RubyGems, Bundler, Node.js, and PrinceXML. Visit our [Middleman Setup Guide](#) for more information on those dependencies and for specific installation instructions.
+
+Open your Terminal and take the following steps:
+
+1. Clone this repository:
+
+    ```
+    git clone https://github.com/gettypubs/ancientlamps.git
+    ```
+
+2. Move into the repository folder:
+
+    ```
+    cd ancientlamps
+    ```
+
+3. Install the project’s required Node modules and Gems:
+
+    ```
+    npm install
+    ```
+    ```
+    bundle install
+    ```
+
+4. Run a preview of site in your browser at http://localhost:4567:
+
+    ```
+    bundle exec middleman
+    ```
+
+### Adding the Fonts
+
+The sans-serif font, Karla, and the icons font, Ionicons, used in this publication are both open license fonts and already included in the repository.
+
+The main body font used in this publication is Freight Text Pro, which requires a license to use and so is not included in this repository. To use it, you can [purchase a license](https://www.myfonts.com/fonts/garagefonts/freight-text-pro/), and add the font files into the `source/assets/fonts` directory. Otherwise the browser default serif font will be used. The following five Freight Text Pro faces are used, and we recommend including the EOT, TTF, WOFF, and WOFF2 files for each for maximum browser support.
+
+- Freight Text Pro Book
+- Freight Text Pro Book Italic
+- Freight Text Pro Book Smallcaps
+- Freight Text Pro Bold
+- Freight Text Pro Bold Italic
+
+*Warning: If you do add licensed fonts, be sure not to commit them into any git repository that be will public as this will improperly exposed the font files for misuse.*
+
+### Updating the URL
+
+For search, zooming images, and the catalogue grid to properly work, temporarily update the urls prefix in `source/assets/javascripts/application.js` to `http://localhost:4567`.
+
+The URL prefix should also be updated here and in data/book.yml when deploying to the publication to a site other than the Getty’s instance.
+
+```
+urls: {
+  search: '/search.json',
+  catalogue: '/catalogue.json',
+  plates: '/plates.json',
+  // prefix: 'http://www.getty.edu/publications/ancientlamps'
+  prefix: 'http://localhost:4567'
+},
+```
+
+### Outputting Files
+
+Build the Site: `bundle exec middleman build`
+
+Build the PDF: `bundle exec middleman build -e pdf`
+
+Build the EPUB: `bundle exec middleman build -e epub`
 
-The primary content pieces of the book can be found in the `data` and `source` directories. The master branch represents the current, published edition at all times, and the revisions branch, when present, will show changes currently under consideration. We invite you to submit suggestions or corrections via pull request on the revisions branch, by posting an issue, or by emailing us at [[email protected]](mailto:[email protected]).
 
 ## License
 

data/book.yml

@@ -154,4 +154,8 @@ revision_history:
   - date: August 1, 2017
     summary:
       - First edition
+  - date: November 21, 2018
+    summary:
+      - Reference added to entry 592
+      - Minor text corrections and bug fixes
 repository_url: https://www.github.com/gettypubs/ancientlamps

data/catalogue.yml

@@ -15601,7 +15601,7 @@
     no. 354, pl. 106; <a href='../../bibliography/#chrzanovski-zhuravlev-1998'>Chrzanovski
     and Zhuravlev 1998</a>, nos. 82–83 (<a href='../../map/#loc_226778'>Chersonesus</a>);
     similar knob-handle frr. in <a href='../../bibliography/#lightfoot-2003'>Lightfoot
-    2003</a>, nos. 103–5, pl. 3.21 and 3.40 (<a href='../../map/#loc_609302'>Amorium</a>);
+    2003</a>, pp. 33–34, nos. 103–5, pl. 3.21 and 3.40 (<a href='../../map/#loc_609302'>Amorium</a>);
     (near) <a href='../../bibliography/#stojkov-2001'>Stojkov 2001</a>, nos. 1–3,
     pl. 3."
   place: Asia Minor
@@ -17070,10 +17070,10 @@
   cat_no: 592
   condition_and_fabric: Intact. Clay between 5YR7/4 pink and 5YR6/4 light reddish
     brown, patchy remains of glaze 2.5YR6/6 light red. Powdery mica.
-  date: First century A.D.(?)
+  date: Second century A.D.(?)
   date_numeric:
-  - 1
-  - 100
+  - 101
+  - 200
   description: Moldmade. Comic actor reclining full length on his left side, cross-legged
     on a bed, his head on a pillow, his right hand touching his chin; he is wearing
     a draped tunic, forming five semicircular pronounced folds below his stomach;
@@ -17087,7 +17087,7 @@
   discussion: The lighting-device cannot stand upright; it had to be suspended.
   dor_id: 29652
   inv_no: 96.AQ.210
-  parallels: None found.
+  parallels: "A lamp of this type, probably from the same mold, is in the Metropolitan Museum of Art, inv. 17.194.1810. See <a href='../../bibliography/#froehner-1903'>Froehner 1903</a>, p. 270, no. 71."
   place: Unknown
   provenance: "– 1991, Charles Ede, Ltd. (London, England), sold to Barbara and Lawrence
     Fleischman, 1991; 1991–1996, Barbara Fleischman and Lawrence Fleischman, American,

data/references.yml

@@ -859,6 +859,10 @@
   contents: "Fremersdorf, F. 1942. “Ein Werkstattfund von Bildlampen der frühesten Kaiserzeit aus Köln.” <em>Bonner Jahrbücher</em> 148:237–48.\n"
   id: fremersdorf-1942
   name: "Fremersdorf 1942"
+-
+  contents: "Froehner, W. 1903. <em>Collection Julien Gréau</em>. <em>Verrerie antique, émaillerie et poterie appartenant à M. John Pierpont Morgan</em>. Paris.\n"
+  id: froehner-1903
+  name: "Froehner 1903"
 -
   contents: "<em>From the Parts to the Whole</em>. 2000–2. <em>Acta of the 13th International Bronze Congress, Cambridge, MA, 28 May–1 June 1996</em>, ed. C. C. Mattusch, A. Brauer, and S. E. Knudsen. 2 vols. Portsmouth, R.I.\n"
   id: from-the-parts-to-the-whole-2000-2