Merge branch 'develop'

.gitignore

@@ -1,3 +1,4 @@
+.history
 api-docs
 build-output
 dist

.travis.yml

@@ -50,6 +50,8 @@ before_install:
 - git for-each-ref --format="%(refname:short) %(objectname)" 'refs/heads/' | grep $(git rev-parse HEAD) | cut -d " " -f 1
 - git checkout `git for-each-ref --format="%(refname:short) %(objectname)" 'refs/heads/' | grep $(git rev-parse HEAD) | cut -d " " -f 1 | head -n1`
 - git branch -avv
+- echo "plugins:['hypothesis']" > plugins/plugins.cson
+- cat plugins/plugins.cson
 #
 # READIUM CFI JS
 #
@@ -68,12 +70,11 @@ before_install:
 #
 - cd ../../../
 install:
-- yarn run prepare:yarn:all
+- npm run prepare:all
 before_script:
 - pwd
 script:
 - cd readium-js/readium-shared-js/readium-cfi-js
-#- yarn run prepare:yarn:all
 - npm run build
 - npm run test:travis
 - cd ../../..
@@ -91,7 +92,7 @@ script:
 - cat build-output/version.json
 after_success:
 - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ ${MODE} = "firefox" ] && npm install surge && echo "epub_content" > ./dist/cloud-reader/.surgeignore && surge --project ./dist/cloud-reader --domain readium.surge.sh'
-- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ ${MODE} = "firefox" ] && npm install firebase-tools && firebase version && firebase deploy --non-interactive --token "$FIREBASE_TOKEN" --project "project-1351855251145549090"'
+- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ ${MODE} = "firefox" ] && npm install firebase-tools && firebase deploy --non-interactive --token "$FIREBASE_TOKEN" --project "project-1351855251145549090"'
 - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ ${MODE} = "chromeApp" ] && node build-config/deployCrx.js'
 after_failure: cat ./sauce_connect.log
 env:

build-config/deployCrx.js

@@ -49,14 +49,19 @@ var deleteOldRelease = function(error, response){
     }
 
     github.repos.getReleases({owner: owner, repo: repo}, function(error, releases){
-        for (var i = 0; i < releases.length; i++){
-            if (releases[i].tag_name == version){
+        // console.log("----");
+        // console.log(releases);
+        // console.log("----");
+        for (var i = 0; i < releases.data.length; i++){
+            // console.log(releases.data[i].tag_name);
+            // console.log(version);
+            if (releases.data[i].tag_name == version){
                 break;
             }
         }
-        if (i < releases.length){
+        if (i < releases.data.length){
             console.log('found existing release, deleting');
-            github.repos.deleteRelease({owner: owner, repo: repo, id: releases[i].id}, function(error, response){
+            github.repos.deleteRelease({owner: owner, repo: repo, id: releases.data[i].id}, function(error, response){
                 if (error){
                     console.error(JSON.stringify(error));
                     return;
@@ -110,7 +115,34 @@ var createRelease = function(){
         //req.end();
     };
 
-
+    // var uploadInit = function(releaseId) {
+    //     var httpOptions = {
+    //         hostname: 'api.github.com',
+    //         port: 443,
+    //         path: '/repos/'+ owner + '/' + repo + '/releases/' + releaseId,
+    //         method: 'GET',
+    //         headers: {
+    //             'Authorization' : 'token ' + oauthToken
+    //         }
+    //     };
+    //     //console.log(httpOptions);
+
+    //     var req = https.request(httpOptions, function(res){
+    //         if (res.statusCode < 400){
+    //             console.log('release GET successful: ' + res.upload_url);
+    //         }
+    //         else{
+    //             console.log('release GET fail: ' + res.statusCode);
+    //         }
+    //         // res.on('data', (d) => {
+    //         //     process.stdout.write(d);
+    //         // });
+    //     });
+    //     req.on('error', (e) => {
+    //         console.log(e);
+    //     });
+    //     req.end();
+    // };
 
     var releaseDate = new Date().toUTCString();
     console.log("BUILD DATE/TIME: "+releaseDate);
@@ -146,10 +178,12 @@ var createRelease = function(){
             return;
         }
         console.log('release created');
-        //console.log(result);
+        // console.log(result);
 
-        var releaseId = result.id;
+        var releaseId = result.data.id;
 
+        // uploadInit(releaseId);
+
         var fileName = 'Readium.crx';
         var filePath = path.join(process.cwd(), 'dist/' + fileName);
         var contentType = 'application/x-chrome-extension';

epub_content/Hales-Motivic-Measure/EPUB/css/commonltr.css

@@ -0,0 +1,184 @@
+/*
+ | This file is part of the DITA Open Toolkit project hosted on 
+ | Sourceforge.net. See the accompanying license.txt file for 
+ | applicable licenses.
+*/
+
+/*
+ | (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved.
+ */
+
+.unresolved { background-color: skyblue; }
+.noTemplate { background-color: yellow; }
+
+.base { background-color: #ffffff; }
+
+/* Add space for top level topics */
+.nested0 { margin-top : 1em;}
+
+/* div with class=p is used for paragraphs that contain blocks, to keep the XHTML valid */
+.p {margin-top: 1em}
+
+/* Default of italics to set apart figure captions */
+.figcap { font-style: italic }
+.figdesc { font-style: normal }
+
+/* Use @frame to create frames on figures */
+.figborder { border-style: solid; padding-left : 3px; border-width : 2px; padding-right : 3px; margin-top: 1em; border-color : Silver;}
+.figsides { border-left : 2px solid; padding-left : 3px; border-right : 2px solid; padding-right : 3px; margin-top: 1em; border-color : Silver;}
+.figtop { border-top : 2px solid; margin-top: 1em; border-color : Silver;}
+.figbottom { border-bottom : 2px solid; border-color : Silver;}
+.figtopbot { border-top : 2px solid; border-bottom : 2px solid; margin-top: 1em; border-color : Silver;}
+
+/* Most link groups are created with <div>. Ensure they have space before and after. */
+.ullinks { list-style-type: none }
+.ulchildlink { margin-top: 1em; margin-bottom: 1em }
+.olchildlink { margin-top: 1em; margin-bottom: 1em }
+.linklist { margin-bottom: 1em }
+.linklistwithchild { margin-left: 1.5em; margin-bottom: 1em  }
+.sublinklist { margin-left: 1.5em; margin-bottom: 1em  }
+.relconcepts { margin-top: 1em; margin-bottom: 1em }
+.reltasks { margin-top: 1em; margin-bottom: 1em }
+.relref { margin-top: 1em; margin-bottom: 1em }
+.relinfo { margin-top: 1em; margin-bottom: 1em }
+.breadcrumb { font-size : smaller; margin-bottom: 1em }
+dt.prereq { margin-left : 20px;}
+
+/* Set heading sizes, getting smaller for deeper nesting */
+.topictitle1 { margin-top: 0pc; margin-bottom: .1em; font-size: 1.34em; }
+.topictitle2 { margin-top: 1pc; margin-bottom: .45em; font-size: 1.17em; }
+.topictitle3 { margin-top: 1pc; margin-bottom: .17em; font-size: 1.17em; font-weight: bold; }
+.topictitle4 { margin-top: .83em; font-size: 1.17em; font-weight: bold; }
+.topictitle5 { font-size: 1.17em; font-weight: bold; }
+.topictitle6 { font-size: 1.17em; font-style: italic; }
+.sectiontitle { margin-top: 1em; margin-bottom: 0em; color: black; font-size: 1.17em; font-weight: bold;}
+.section { margin-top: 1em; margin-bottom: 1em }
+.example { margin-top: 1em; margin-bottom: 1em }
+div.tasklabel { margin-top: 1em; margin-bottom: 1em; }
+h2.tasklabel, h3.tasklabel, h4.tasklabel, h5.tasklabel, h6.tasklabel { font-size: 100%; }
+
+/* All note formats have the same default presentation */
+.note { margin-top: 1em; margin-bottom : 1em;}
+.notetitle { font-weight: bold }
+.notelisttitle { font-weight: bold }
+.tip { margin-top: 1em; margin-bottom : 1em;}
+.tiptitle { font-weight: bold }
+.fastpath { margin-top: 1em; margin-bottom : 1em;}
+.fastpathtitle { font-weight: bold }
+.important { margin-top: 1em; margin-bottom : 1em;}
+.importanttitle { font-weight: bold }
+.remember { margin-top: 1em; margin-bottom : 1em;}
+.remembertitle { font-weight: bold }
+.restriction { margin-top: 1em; margin-bottom : 1em;}
+.restrictiontitle { font-weight: bold }
+.attention { margin-top: 1em; margin-bottom : 1em;}
+.attentiontitle { font-weight: bold }
+.dangertitle { font-weight: bold }
+.danger { margin-top: 1em; margin-bottom : 1em;}
+.cautiontitle { font-weight: bold }
+.caution { font-weight: bold; margin-bottom : 1em; }
+.warning { margin-top: 1em; margin-bottom : 1em;}
+.warningtitle { font-weight: bold }
+
+/* Simple lists do not get a bullet */
+ul.simple { list-style-type: none }
+
+/* Used on the first column of a table, when rowheader="firstcol" is used */
+.firstcol { font-weight : bold;}
+
+/* Various basic phrase styles */
+.bold { font-weight: bold; }
+.boldItalic { font-weight: bold; font-style: italic; }
+.italic { font-style: italic; }
+.underlined { text-decoration: underline; }
+.uicontrol { font-weight: bold; }
+.parmname { font-weight: bold; }
+.kwd { font-weight: bold; }
+.defkwd { font-weight: bold; text-decoration: underline; }
+.var { font-style : italic;}
+.shortcut { text-decoration: underline; }
+
+/* Default of bold for definition list terms */
+.dlterm { font-weight: bold; }
+
+/* Use CSS to expand lists with @compact="no" */
+.dltermexpand { font-weight: bold; margin-top: 1em; }
+*[compact="yes"]>li { margin-top: 0em;}
+*[compact="no"]>li { margin-top: .53em;}	
+.liexpand { margin-top: 1em; margin-bottom: 1em }
+.sliexpand { margin-top: 1em; margin-bottom: 1em }
+.dlexpand { margin-top: 1em; margin-bottom: 1em }
+.ddexpand { margin-top: 1em; margin-bottom: 1em }
+.stepexpand { margin-top: 1em; margin-bottom: 1em }
+.substepexpand { margin-top: 1em; margin-bottom: 1em }
+
+/* Align images based on @align on topic/image */
+div.imageleft { text-align: left }
+div.imagecenter { text-align: center }
+div.imageright { text-align: right }
+div.imagejustify { text-align: justify }
+
+/* The cell border can be turned on with
+   {border-right:solid}
+   This value creates a very thick border in Firefox (does not match other tables)
+
+   Firefox works with 
+   {border-right:solid 1pt}
+   but this causes a barely visible line in IE */
+.cellrowborder { border-left:none; border-top:none; border-right:solid 1px; border-bottom:solid 1px }
+.row-nocellborder { border-left:none; border-right:none; border-top:none; border-right: hidden; border-bottom:solid 1px}
+.cell-norowborder { border-top:none; border-bottom:none; border-left:none; border-bottom: hidden; border-right:solid 1px}
+.nocellnorowborder { border:none; border-right: hidden;border-bottom: hidden }
+
+pre.screen { padding: 5px 5px 5px 5px; border: outset; background-color: #CCCCCC; margin-top: 2px; margin-bottom : 2px; white-space: pre}
+
+span.filepath { font-family:monospace }
+
+/* OXYGEN PATCH START - EXM-18359 */
+body {
+  margin-left: 1em;
+  margin-top: 1em;
+}
+/* OXYGEN PATCH END - EXM-18359 */
+
+/* OXYGEN PATCH START - EXM-18138 */
+span.uicontrol > img {
+  padding-right: 5px;
+}
+/* OXYGEN PATCH END - EXM-18138 */
+
+/* OXYGEN PATCH START EXM-17248 - Center figure captions. */
+div.fignone p.figcap {
+  display:block;
+  text-align:left;
+  font-weight:bold;
+  padding:2px 10px 5px 10px;
+}
+
+div.fignone p.figcapcenter {
+  display:block;
+  text-align:center;
+  font-weight:bold;
+  padding:2px 10px 5px 10px;
+}
+
+div.fignone p.figcapright {
+  display:block;
+  text-align:right;
+  font-weight:bold;
+  padding:2px 10px 5px 10px;
+}
+
+div.fignone p.figcapjustify {
+  display:block;
+  text-align:justify;
+  font-weight:bold;
+  padding:2px 10px 5px 10px;
+}
+
+div.fignone img {
+  padding-top: 5px;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+/* OXYGEN PATCH END EXM-17248 */

epub_content/Hales-Motivic-Measure/EPUB/css/epub.css

@@ -0,0 +1,19 @@
+body {
+    margin: 5em 5em 5em 5em;
+    background-color: rgb(255,253,249);
+    font-family: arial, verdana, sans-serif;
+    color:black;
+}
+
+nav#toc ol {
+    list-style-type: none;
+}
+
+nav#toc ol li a {
+    text-decoration : none;
+    color:black;
+}
+
+body#titlepage {
+    text-align : center;
+}