From 5c1c275c377aed4ffcbb587a289004c7a1e09dab Mon Sep 17 00:00:00 2001 From: danielweck Date: Tue, 15 Sep 2015 12:55:11 +0100 Subject: [PATCH 1/9] submodule --- readium-js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readium-js b/readium-js index 33e702243..6d9b3200c 160000 --- a/readium-js +++ b/readium-js @@ -1 +1 @@ -Subproject commit 33e702243da3477d6b7d587bd319adbdfd6a0050 +Subproject commit 6d9b3200c8715ec797149a168f9d2d222ea8b281 From 7ec2471a50873d5fc929c94347942f712135858a Mon Sep 17 00:00:00 2001 From: danielweck Date: Thu, 17 Sep 2015 21:57:02 +0100 Subject: [PATCH 2/9] user interface for breadcrump / navigation history (back button) and "return to primary reading flow" (non-linar spine items) --- readium-js | 2 +- src/css/viewer.css | 122 ++++++++++++++++++++++- src/i18n/_locales/en_US/messages.json | 6 ++ src/js/EpubReader.js | 37 ++++++- src/js/Keyboard.js | 6 ++ src/templates/reader-body-page-btns.html | 69 +++++++++++++ 6 files changed, 236 insertions(+), 6 deletions(-) diff --git a/readium-js b/readium-js index 3e6c4f3b3..8b8ae841b 160000 --- a/readium-js +++ b/readium-js @@ -1 +1 @@ -Subproject commit 3e6c4f3b31025dd8e67a5b7911565fa7302d3260 +Subproject commit 8b8ae841bbeda3a11f384cd468208b64d359750a diff --git a/src/css/viewer.css b/src/css/viewer.css index 6df195cc4..15115eeef 100644 --- a/src/css/viewer.css +++ b/src/css/viewer.css @@ -224,6 +224,116 @@ html[data-theme=night-theme] .page-switch-overlay-icon { vertical-align: middle; } + + + + +/* --- */ +/* #nav-back */ + + +#nav-back-btn.page-switch-overlay-icon > span +{ + transform: scale(0.8); + -webkit-transform: scale(0.8); + -moz-transform: scale(0.8); + -ms-transform: scale(0.8); + -o-transform: scale(0.8); +} + +#nav-back-btn.page-switch-overlay-icon { + + top: 85%; + bottom: 0%; + + padding-top: 0.2em; + padding-bottom: 0.44em; +} + +#nav-back-btn { + + left: 0; + border-top-right-radius: 0.3em; + border-bottom-right-radius: 0.3em; +} + +#nav-back-btn.pageProgressionDirectionRTL { + + right: 0; + border-top-left-radius: 0.3em; + border-bottom-left-radius: 0.3em; +} + +/* #nav-back-btn:focus, */ +#nav-back-btn:hover +{ + opacity: 1.0; + color: white; + background-color: rgba(0,0,0,0.2); +} + +/* html[data-theme=night-theme] #nav-back-btn:focus, */ +html[data-theme=night-theme] #nav-back-btn:hover +{ + color: black; + background-color: rgba(255,255,255,0.2); +} + +/* --- */ +/* #nav-back-linear */ + +#nav-back-linear-btn.page-switch-overlay-icon > span +{ + transform: scale(0.7); + -webkit-transform: scale(0.7); + -moz-transform: scale(0.7); + -ms-transform: scale(0.7); + -o-transform: scale(0.7); +} + +#nav-back-linear-btn.page-switch-overlay-icon { + + top: 0%; + bottom: 85%; + + padding-top: 0.2em; + padding-bottom: 0.44em; +} + +#nav-back-linear-btn { + + left: 0; + border-top-right-radius: 0.3em; + border-bottom-right-radius: 0.3em; +} + +#nav-back-linear-btn.pageProgressionDirectionRTL { + + right: 0; + border-top-left-radius: 0.3em; + border-bottom-left-radius: 0.3em; +} + +/* #nav-back-btn:focus, */ +#nav-back-linear-btn:hover +{ + opacity: 1.0; + color: white; + background-color: rgba(0,0,0,0.2); +} + +/* html[data-theme=night-theme] #nav-back-btn:focus, */ +html[data-theme=night-theme] #nav-back-linear-btn:hover +{ + color: black; + background-color: rgba(255,255,255,0.2); +} + + + + + + #left-page-btn { left: 0; @@ -316,14 +426,22 @@ html[data-theme=night-theme] #right-page-btn:hover .hide-ui #left-page-btn, .hide-ui #right-page-btn, +.hide-ui #nav-back-btn, +.hide-ui #nav-back-linear-btn, .embedded .toc-visible #left-page-btn, -.embedded .toc-visible #right-page-btn{ +.embedded .toc-visible #right-page-btn, +.embedded .toc-visible #nav-back-btn, +.embedded .toc-visible #nav-back-linear-btn +{ -webkit-transition: opacity .2s ease-out; opacity: 0; } .hide-ui #left-page-btn:hover, -.hide-ui #right-page-btn:hover{ +.hide-ui #right-page-btn:hover, +.hide-ui #nav-back-btn:hover, +.hide-ui #nav-back-linear-btn:hover +{ -webkit-transition: opacity .2s ease-out; opacity: 1; } diff --git a/src/i18n/_locales/en_US/messages.json b/src/i18n/_locales/en_US/messages.json index aff1525e7..7f987230c 100644 --- a/src/i18n/_locales/en_US/messages.json +++ b/src/i18n/_locales/en_US/messages.json @@ -422,6 +422,12 @@ "i18n_page_next" : { "message" : "Next Page" }, + "i18n_nav_back" : { + "message" : "Navigate back" + }, + "i18n_nav_back_linear" : { + "message" : "Return to primary reading flow" + }, "i18n_page_navigation" : { "message" : "Page Navigation" }, diff --git a/src/js/EpubReader.js b/src/js/EpubReader.js index 27d1edd43..377efae69 100644 --- a/src/js/EpubReader.js +++ b/src/js/EpubReader.js @@ -94,14 +94,20 @@ Helpers){ $("#left-page-btn").unbind("click"); $("#right-page-btn").unbind("click"); + $("#nav-back-btn").unbind("click"); + $("#nav-back-linear-btn").unbind("click"); + var $pageBtnsContainer = $('#readium-page-btns'); $pageBtnsContainer.empty(); var rtl = currentPackageDocument.getPageProgressionDirection() === "rtl"; //_package.spine.isLeftToRight() $pageBtnsContainer.append(ReaderBodyPageButtons({strings: Strings, dialogs: Dialogs, keyboard: Keyboard, pageProgressionDirectionIsRTL: rtl })); + $("#left-page-btn").on("click", prevPage); $("#right-page-btn").on("click", nextPage); + $("#nav-back-btn").on("click", function() { return navBack(false); }); + $("#nav-back-linear-btn").on("click", function() { return navBack(true); }); }, openPageRequest @@ -375,6 +381,7 @@ Helpers){ _tocLinkActivated = true; + console.log("TOC nav: " + href); readium.reader.openContentUrl(href); if (embedded) { @@ -507,21 +514,41 @@ Helpers){ // https://github.com/readium/readium-js-viewer/issues/188 // See onSwipeLeft() onSwipeRight() in gesturesHandler. // See nextPage() prevPage() in this class. - var updateUI = function(pageChangeData){ - if(pageChangeData.paginationInfo.canGoLeft()) + var updateUI = function(pageChangeData) { + + if (pageChangeData.paginationInfo.canGoLeft()) $("#left-page-btn").show(); else $("#left-page-btn").hide(); - if(pageChangeData.paginationInfo.canGoRight()) + + if (pageChangeData.paginationInfo.canGoRight()) $("#right-page-btn").show(); else $("#right-page-btn").hide(); + + if (readium.reader.navigationHistoryCanBack(false)) { + $("#nav-back-btn").show(); + } else { + $("#nav-back-btn").hide(); + } + + if (pageChangeData.spineItem && readium.reader.navigationHistoryCanBack(true) && !readium.reader.spine().isValidLinearItem(pageChangeData.spineItem.index)) { + $("#nav-back-linear-btn").show(); + } else { + $("#nav-back-linear-btn").hide(); + } } var savePlace = function(){ Settings.put(ebookURL_filepath, readium.reader.bookmarkCurrentPage(), $.noop); } + var navBack = function (forceLinear) { + + readium.reader.navigationHistoryBack(forceLinear); + return false; + }; + var nextPage = function () { readium.reader.openPageRight(); @@ -580,6 +607,10 @@ Helpers){ if (!isWithinForbiddenNavKeysArea()) prevPage(); }); + + Keyboard.on(Keyboard.NavBack, 'reader', function() { return navBack(false); }); + Keyboard.on(Keyboard.NavBackLinear, 'reader', function() { return navBack(true); }); + Keyboard.on(Keyboard.PagePreviousAlt, 'reader', prevPage); Keyboard.on(Keyboard.PageNextAlt, 'reader', nextPage); diff --git a/src/js/Keyboard.js b/src/js/Keyboard.js index 1eed76cb8..e4e9e3bbe 100644 --- a/src/js/Keyboard.js +++ b/src/js/Keyboard.js @@ -392,6 +392,9 @@ define(['i18nStrings', 'keymaster', 'Settings'], function(Strings, key, Settings SettingsModalSave: Strings.settings + " - " + Strings.i18n_save_changes, SettingsModalClose: Strings.settings + " - " + Strings.i18n_close, + NavBack: Strings.i18n_nav_back, + NavBackLinear: Strings.i18n_nav_back_linear, + PagePrevious: Strings.i18n_page_previous, PageNext: Strings.i18n_page_next, PagePreviousAlt: Strings.i18n_page_previous + " (access key)", @@ -439,6 +442,9 @@ define(['i18nStrings', 'keymaster', 'Settings'], function(Strings, key, Settings SettingsModalSave: 's', //accesskey'ed SettingsModalClose: 'c', //accesskey'ed + NavBack: '9', //accesskey'ed + NavBackLinear: '0', //accesskey'ed + PagePrevious: 'left', // ALT BELOW PageNext: 'right', // ALT BELOW PagePreviousAlt: '1', //accesskey'ed diff --git a/src/templates/reader-body-page-btns.html b/src/templates/reader-body-page-btns.html index a6883f0e8..6a7f84e33 100644 --- a/src/templates/reader-body-page-btns.html +++ b/src/templates/reader-body-page-btns.html @@ -22,6 +22,8 @@ + + + + + + + + + + + From 8ae1f236b8eafaa42fe760219a7d5c1918bd0a6c Mon Sep 17 00:00:00 2001 From: danielweck Date: Thu, 17 Sep 2015 22:44:46 +0100 Subject: [PATCH 3/9] sample EPUB for non-linear spine item navigation (back-tracking to primary reading flow from ancillary documents) --- epub_content/nonLinear/META-INF/container.xml | 6 +++ epub_content/nonLinear/_1_nonLinear.xhtml | 13 +++++++ epub_content/nonLinear/_2.xhtml | 17 +++++++++ epub_content/nonLinear/_3_nonLinear.xhtml | 17 +++++++++ epub_content/nonLinear/_4.xhtml | 20 ++++++++++ epub_content/nonLinear/_5_nonLinear.xhtml | 17 +++++++++ epub_content/nonLinear/_6_nonLinear.xhtml | 17 +++++++++ epub_content/nonLinear/_7.xhtml | 14 +++++++ epub_content/nonLinear/_8.xhtml | 17 +++++++++ epub_content/nonLinear/_9_nonLinear.xhtml | 17 +++++++++ epub_content/nonLinear/mimetype | 1 + epub_content/nonLinear/nav.xhtml | 25 ++++++++++++ epub_content/nonLinear/package.opf | 38 +++++++++++++++++++ 13 files changed, 219 insertions(+) create mode 100644 epub_content/nonLinear/META-INF/container.xml create mode 100644 epub_content/nonLinear/_1_nonLinear.xhtml create mode 100644 epub_content/nonLinear/_2.xhtml create mode 100644 epub_content/nonLinear/_3_nonLinear.xhtml create mode 100644 epub_content/nonLinear/_4.xhtml create mode 100644 epub_content/nonLinear/_5_nonLinear.xhtml create mode 100644 epub_content/nonLinear/_6_nonLinear.xhtml create mode 100644 epub_content/nonLinear/_7.xhtml create mode 100644 epub_content/nonLinear/_8.xhtml create mode 100644 epub_content/nonLinear/_9_nonLinear.xhtml create mode 100644 epub_content/nonLinear/mimetype create mode 100644 epub_content/nonLinear/nav.xhtml create mode 100644 epub_content/nonLinear/package.opf diff --git a/epub_content/nonLinear/META-INF/container.xml b/epub_content/nonLinear/META-INF/container.xml new file mode 100644 index 000000000..ac46361b3 --- /dev/null +++ b/epub_content/nonLinear/META-INF/container.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/epub_content/nonLinear/_1_nonLinear.xhtml b/epub_content/nonLinear/_1_nonLinear.xhtml new file mode 100644 index 000000000..f557a174b --- /dev/null +++ b/epub_content/nonLinear/_1_nonLinear.xhtml @@ -0,0 +1,13 @@ + + + + + (1) non-linear spine items (ancillary) vs. primary reading flow + + +
+

(1) non-linear / ancillary

+
+ + diff --git a/epub_content/nonLinear/_2.xhtml b/epub_content/nonLinear/_2.xhtml new file mode 100644 index 000000000..7452c6c1f --- /dev/null +++ b/epub_content/nonLinear/_2.xhtml @@ -0,0 +1,17 @@ + + + + + (2) non-linear spine items (ancillary) vs. primary reading flow + + +
+

(2) linear / primary

+ +

+ (3) non-linear (ancillary) > +

+
+ + diff --git a/epub_content/nonLinear/_3_nonLinear.xhtml b/epub_content/nonLinear/_3_nonLinear.xhtml new file mode 100644 index 000000000..a242efeac --- /dev/null +++ b/epub_content/nonLinear/_3_nonLinear.xhtml @@ -0,0 +1,17 @@ + + + + + (3) non-linear spine items (ancillary) vs. primary reading flow + + +
+

(3) non-linear / ancillary

+ +

+ << (2) linear (primary) +

+
+ + diff --git a/epub_content/nonLinear/_4.xhtml b/epub_content/nonLinear/_4.xhtml new file mode 100644 index 000000000..103fa4a0d --- /dev/null +++ b/epub_content/nonLinear/_4.xhtml @@ -0,0 +1,20 @@ + + + + + (4) non-linear spine items (ancillary) vs. primary reading flow + + +
+

(4) linear / primary

+ +

+ (5) non-linear (ancillary) > +

+

+ (6) non-linear (ancillary) > +

+
+ + diff --git a/epub_content/nonLinear/_5_nonLinear.xhtml b/epub_content/nonLinear/_5_nonLinear.xhtml new file mode 100644 index 000000000..ddebf4250 --- /dev/null +++ b/epub_content/nonLinear/_5_nonLinear.xhtml @@ -0,0 +1,17 @@ + + + + + (5) non-linear spine items (ancillary) vs. primary reading flow + + +
+

(5) non-linear / ancillary

+ +

+ << (4) linear (primary) +

+
+ + diff --git a/epub_content/nonLinear/_6_nonLinear.xhtml b/epub_content/nonLinear/_6_nonLinear.xhtml new file mode 100644 index 000000000..5473c9af3 --- /dev/null +++ b/epub_content/nonLinear/_6_nonLinear.xhtml @@ -0,0 +1,17 @@ + + + + + (6) non-linear spine items (ancillary) vs. primary reading flow + + +
+

(6) non-linear / ancillary

+ +

+ << (4) linear (primary) +

+
+ + diff --git a/epub_content/nonLinear/_7.xhtml b/epub_content/nonLinear/_7.xhtml new file mode 100644 index 000000000..868ff404a --- /dev/null +++ b/epub_content/nonLinear/_7.xhtml @@ -0,0 +1,14 @@ + + + + + (7) non-linear spine items (ancillary) vs. primary reading flow + + +
+

(7) linear / primary

+

...

+
+ + diff --git a/epub_content/nonLinear/_8.xhtml b/epub_content/nonLinear/_8.xhtml new file mode 100644 index 000000000..9fde81cae --- /dev/null +++ b/epub_content/nonLinear/_8.xhtml @@ -0,0 +1,17 @@ + + + + + (8) non-linear spine items (ancillary) vs. primary reading flow + + +
+

(8) linear / primary

+ +

+ (9) non-linear (ancillary) > +

+
+ + diff --git a/epub_content/nonLinear/_9_nonLinear.xhtml b/epub_content/nonLinear/_9_nonLinear.xhtml new file mode 100644 index 000000000..b2fe78885 --- /dev/null +++ b/epub_content/nonLinear/_9_nonLinear.xhtml @@ -0,0 +1,17 @@ + + + + + (9) non-linear spine items (ancillary) vs. primary reading flow + + +
+

(9) non-linear / ancillary

+ +

+ << (8) linear (primary) +

+
+ + diff --git a/epub_content/nonLinear/mimetype b/epub_content/nonLinear/mimetype new file mode 100644 index 000000000..57ef03f24 --- /dev/null +++ b/epub_content/nonLinear/mimetype @@ -0,0 +1 @@ +application/epub+zip \ No newline at end of file diff --git a/epub_content/nonLinear/nav.xhtml b/epub_content/nonLinear/nav.xhtml new file mode 100644 index 000000000..ac735a4be --- /dev/null +++ b/epub_content/nonLinear/nav.xhtml @@ -0,0 +1,25 @@ + + + + + non-linear spine items + + +

non-linear spine items

+ + + diff --git a/epub_content/nonLinear/package.opf b/epub_content/nonLinear/package.opf new file mode 100644 index 000000000..ab143383f --- /dev/null +++ b/epub_content/nonLinear/package.opf @@ -0,0 +1,38 @@ + + + + urn:isbn:0123456789 + non-linear spine items (ancillary) vs. primary reading flow + en + 2015-09-17 + 2015-09-17T00:00:00Z + Readium + Readium Foundation + Copyright © 2015 Readium Foundation + + + + + + + + + + + + + + + + + + + + + + + + + From 11d8c1ab8a45744d9b9513c65539c887a28880b9 Mon Sep 17 00:00:00 2001 From: danielweck Date: Thu, 17 Sep 2015 23:30:35 +0100 Subject: [PATCH 4/9] hidden buttons => command disabled too! Fixes https://github.com/readium/readium-js-viewer/issues/188 --- src/js/EpubReader.js | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/src/js/EpubReader.js b/src/js/EpubReader.js index 377efae69..d8fcfa744 100644 --- a/src/js/EpubReader.js +++ b/src/js/EpubReader.js @@ -510,29 +510,34 @@ Helpers){ } } - //TODO: also update "previous/next page" commands status (disabled/enabled), not just button visibility. - // https://github.com/readium/readium-js-viewer/issues/188 - // See onSwipeLeft() onSwipeRight() in gesturesHandler. - // See nextPage() prevPage() in this class. + var _canGoLeft = false; + var _canGoRight = false; + var _navigationHistoryCanBack = false; + var _navigationHistoryCanBackLinear = false; + var updateUI = function(pageChangeData) { - if (pageChangeData.paginationInfo.canGoLeft()) + _canGoLeft = pageChangeData.paginationInfo.canGoLeft(); + if (_canGoLeft) $("#left-page-btn").show(); else $("#left-page-btn").hide(); - if (pageChangeData.paginationInfo.canGoRight()) + _canGoRight = pageChangeData.paginationInfo.canGoRight(); + if (_canGoRight) $("#right-page-btn").show(); else $("#right-page-btn").hide(); - if (readium.reader.navigationHistoryCanBack(false)) { + _navigationHistoryCanBack = readium.reader.navigationHistoryCanBack(false); + if (_navigationHistoryCanBack) { $("#nav-back-btn").show(); } else { $("#nav-back-btn").hide(); } - if (pageChangeData.spineItem && readium.reader.navigationHistoryCanBack(true) && !readium.reader.spine().isValidLinearItem(pageChangeData.spineItem.index)) { + _navigationHistoryCanBackLinear = readium.reader.navigationHistoryCanBack(true) && !readium.reader.spine().isValidLinearItem(pageChangeData.paginationInfo.openPages[0].spineItemIndex); + if (_navigationHistoryCanBackLinear) { $("#nav-back-linear-btn").show(); } else { $("#nav-back-linear-btn").hide(); @@ -543,21 +548,27 @@ Helpers){ Settings.put(ebookURL_filepath, readium.reader.bookmarkCurrentPage(), $.noop); } + var navBack = function (forceLinear) { - readium.reader.navigationHistoryBack(forceLinear); + if (forceLinear && _navigationHistoryCanBackLinear + || !forceLinear && _navigationHistoryCanBack) + readium.reader.navigationHistoryBack(forceLinear); + return false; }; var nextPage = function () { - - readium.reader.openPageRight(); + if (_canGoRight) + readium.reader.openPageRight(); + return false; }; var prevPage = function () { - - readium.reader.openPageLeft(); + if (_canGoLeft) + readium.reader.openPageLeft(); + return false; }; From e6f7b6b7b462a85586d626d18b5579696718aa8b Mon Sep 17 00:00:00 2001 From: danielweck Date: Thu, 17 Sep 2015 23:31:22 +0100 Subject: [PATCH 5/9] non-linear EPUB sample with multi-page content --- epub_content/epub_library.json | 5 ++++ epub_content/nonLinear/_1_nonLinear.xhtml | 29 +++++++++++++++++++++++ epub_content/nonLinear/_2.xhtml | 29 +++++++++++++++++++++++ epub_content/nonLinear/_3_nonLinear.xhtml | 29 +++++++++++++++++++++++ epub_content/nonLinear/_4.xhtml | 29 +++++++++++++++++++++++ epub_content/nonLinear/_5_nonLinear.xhtml | 29 +++++++++++++++++++++++ epub_content/nonLinear/_6_nonLinear.xhtml | 29 +++++++++++++++++++++++ epub_content/nonLinear/_7.xhtml | 29 +++++++++++++++++++++++ epub_content/nonLinear/_8.xhtml | 29 +++++++++++++++++++++++ epub_content/nonLinear/_9_nonLinear.xhtml | 29 +++++++++++++++++++++++ readium-js | 2 +- 11 files changed, 267 insertions(+), 1 deletion(-) diff --git a/epub_content/epub_library.json b/epub_content/epub_library.json index 8872ab1b8..e2ea93d3a 100644 --- a/epub_content/epub_library.json +++ b/epub_content/epub_library.json @@ -41,5 +41,10 @@ "title" : "packed EPUB", "author" : "Readium", "rootUrl" : "epub_content/internal_link.epub" + }, + { + "title" : "non-linear spine items (ancillary documents)", + "author" : "Readium", + "rootUrl" : "epub_content/nonLinear" } ] \ No newline at end of file diff --git a/epub_content/nonLinear/_1_nonLinear.xhtml b/epub_content/nonLinear/_1_nonLinear.xhtml index f557a174b..cb503e811 100644 --- a/epub_content/nonLinear/_1_nonLinear.xhtml +++ b/epub_content/nonLinear/_1_nonLinear.xhtml @@ -8,6 +8,35 @@

(1) non-linear / ancillary

+ +

SECTION 1

+

+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. +

+ + +

SECTION 2

+

+It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like). +

+ + +

SECTION 3

+

+Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32. +

+ + +

SECTION 4

+

+The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham. +

+ + +

SECTION 5

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

diff --git a/epub_content/nonLinear/_2.xhtml b/epub_content/nonLinear/_2.xhtml index 7452c6c1f..14e3c90f7 100644 --- a/epub_content/nonLinear/_2.xhtml +++ b/epub_content/nonLinear/_2.xhtml @@ -12,6 +12,35 @@

(3) non-linear (ancillary) >

+ +

SECTION 1

+

+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. +

+ + +

SECTION 2

+

+It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like). +

+ + +

SECTION 3

+

+Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32. +

+ + +

SECTION 4

+

+The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham. +

+ + +

SECTION 5

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

diff --git a/epub_content/nonLinear/_3_nonLinear.xhtml b/epub_content/nonLinear/_3_nonLinear.xhtml index a242efeac..d78f1ad5a 100644 --- a/epub_content/nonLinear/_3_nonLinear.xhtml +++ b/epub_content/nonLinear/_3_nonLinear.xhtml @@ -12,6 +12,35 @@

<< (2) linear (primary)

+ +

SECTION 1

+

+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. +

+ + +

SECTION 2

+

+It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like). +

+ + +

SECTION 3

+

+Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32. +

+ + +

SECTION 4

+

+The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham. +

+ + +

SECTION 5

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

diff --git a/epub_content/nonLinear/_4.xhtml b/epub_content/nonLinear/_4.xhtml index 103fa4a0d..0580eda73 100644 --- a/epub_content/nonLinear/_4.xhtml +++ b/epub_content/nonLinear/_4.xhtml @@ -15,6 +15,35 @@

(6) non-linear (ancillary) >

+ +

SECTION 1

+

+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. +

+ + +

SECTION 2

+

+It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like). +

+ + +

SECTION 3

+

+Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32. +

+ + +

SECTION 4

+

+The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham. +

+ + +

SECTION 5

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

diff --git a/epub_content/nonLinear/_5_nonLinear.xhtml b/epub_content/nonLinear/_5_nonLinear.xhtml index ddebf4250..def73ccdf 100644 --- a/epub_content/nonLinear/_5_nonLinear.xhtml +++ b/epub_content/nonLinear/_5_nonLinear.xhtml @@ -12,6 +12,35 @@

<< (4) linear (primary)

+ +

SECTION 1

+

+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. +

+ + +

SECTION 2

+

+It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like). +

+ + +

SECTION 3

+

+Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32. +

+ + +

SECTION 4

+

+The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham. +

+ + +

SECTION 5

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

diff --git a/epub_content/nonLinear/_6_nonLinear.xhtml b/epub_content/nonLinear/_6_nonLinear.xhtml index 5473c9af3..9c7492241 100644 --- a/epub_content/nonLinear/_6_nonLinear.xhtml +++ b/epub_content/nonLinear/_6_nonLinear.xhtml @@ -12,6 +12,35 @@

<< (4) linear (primary)

+ +

SECTION 1

+

+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. +

+ + +

SECTION 2

+

+It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like). +

+ + +

SECTION 3

+

+Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32. +

+ + +

SECTION 4

+

+The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham. +

+ + +

SECTION 5

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

diff --git a/epub_content/nonLinear/_7.xhtml b/epub_content/nonLinear/_7.xhtml index 868ff404a..58bc08779 100644 --- a/epub_content/nonLinear/_7.xhtml +++ b/epub_content/nonLinear/_7.xhtml @@ -9,6 +9,35 @@

(7) linear / primary

...

+ +

SECTION 1

+

+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. +

+ + +

SECTION 2

+

+It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like). +

+ + +

SECTION 3

+

+Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32. +

+ + +

SECTION 4

+

+The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham. +

+ + +

SECTION 5

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

diff --git a/epub_content/nonLinear/_8.xhtml b/epub_content/nonLinear/_8.xhtml index 9fde81cae..cbb0866d3 100644 --- a/epub_content/nonLinear/_8.xhtml +++ b/epub_content/nonLinear/_8.xhtml @@ -12,6 +12,35 @@

(9) non-linear (ancillary) >

+ +

SECTION 1

+

+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. +

+ + +

SECTION 2

+

+It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like). +

+ + +

SECTION 3

+

+Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32. +

+ + +

SECTION 4

+

+The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham. +

+ + +

SECTION 5

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

diff --git a/epub_content/nonLinear/_9_nonLinear.xhtml b/epub_content/nonLinear/_9_nonLinear.xhtml index b2fe78885..7ae9ea989 100644 --- a/epub_content/nonLinear/_9_nonLinear.xhtml +++ b/epub_content/nonLinear/_9_nonLinear.xhtml @@ -12,6 +12,35 @@

<< (8) linear (primary)

+ +

SECTION 1

+

+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. +

+ + +

SECTION 2

+

+It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like). +

+ + +

SECTION 3

+

+Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32. +

+ + +

SECTION 4

+

+The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham. +

+ + +

SECTION 5

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

diff --git a/readium-js b/readium-js index 8b8ae841b..2edb046ec 160000 --- a/readium-js +++ b/readium-js @@ -1 +1 @@ -Subproject commit 8b8ae841bbeda3a11f384cd468208b64d359750a +Subproject commit 2edb046ec7d35d3a6b32da0370276713426a8b7a From b676dd1400c33b3e8c3a4095b33ba14ffae74c52 Mon Sep 17 00:00:00 2001 From: danielweck Date: Tue, 8 Dec 2015 11:04:26 +0000 Subject: [PATCH 6/9] minor rewording of button label for navigation history --- src/i18n/_locales/en_US/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/_locales/en_US/messages.json b/src/i18n/_locales/en_US/messages.json index 7f987230c..8630b76d4 100644 --- a/src/i18n/_locales/en_US/messages.json +++ b/src/i18n/_locales/en_US/messages.json @@ -423,7 +423,7 @@ "message" : "Next Page" }, "i18n_nav_back" : { - "message" : "Navigate back" + "message" : "Go back in navigation history" }, "i18n_nav_back_linear" : { "message" : "Return to primary reading flow" From 15c4e1e46a01f9d62ed69f6070f2601d8fe59ccb Mon Sep 17 00:00:00 2001 From: danielweck Date: Tue, 8 Dec 2015 11:04:51 +0000 Subject: [PATCH 7/9] added page content in non linear spine items test EPUB --- epub_content/nonLinear/_1_nonLinear.xhtml | 29 ++++++++++++++++++++++ epub_content/nonLinear/_2.xhtml | 30 ++++++++++++++++++++++- epub_content/nonLinear/_3_nonLinear.xhtml | 29 ++++++++++++++++++++++ epub_content/nonLinear/_4.xhtml | 29 ++++++++++++++++++++++ epub_content/nonLinear/_5_nonLinear.xhtml | 29 ++++++++++++++++++++++ epub_content/nonLinear/_6_nonLinear.xhtml | 29 ++++++++++++++++++++++ epub_content/nonLinear/_7.xhtml | 29 ++++++++++++++++++++++ epub_content/nonLinear/_8.xhtml | 29 ++++++++++++++++++++++ epub_content/nonLinear/_9_nonLinear.xhtml | 29 ++++++++++++++++++++++ 9 files changed, 261 insertions(+), 1 deletion(-) diff --git a/epub_content/nonLinear/_1_nonLinear.xhtml b/epub_content/nonLinear/_1_nonLinear.xhtml index cb503e811..350982cca 100644 --- a/epub_content/nonLinear/_1_nonLinear.xhtml +++ b/epub_content/nonLinear/_1_nonLinear.xhtml @@ -36,6 +36,35 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t

SECTION 5

There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ +

SECTION 6

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 7

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 8

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 9

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 10

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc.

diff --git a/epub_content/nonLinear/_2.xhtml b/epub_content/nonLinear/_2.xhtml index 14e3c90f7..fe021c724 100644 --- a/epub_content/nonLinear/_2.xhtml +++ b/epub_content/nonLinear/_2.xhtml @@ -36,10 +36,38 @@ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham.

-

SECTION 5

There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ +

SECTION 6

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 7

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 8

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 9

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 10

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc.

diff --git a/epub_content/nonLinear/_3_nonLinear.xhtml b/epub_content/nonLinear/_3_nonLinear.xhtml index d78f1ad5a..5aaf02e93 100644 --- a/epub_content/nonLinear/_3_nonLinear.xhtml +++ b/epub_content/nonLinear/_3_nonLinear.xhtml @@ -40,6 +40,35 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t

SECTION 5

There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ +

SECTION 6

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 7

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 8

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 9

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 10

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc.

diff --git a/epub_content/nonLinear/_4.xhtml b/epub_content/nonLinear/_4.xhtml index 0580eda73..23daf94e6 100644 --- a/epub_content/nonLinear/_4.xhtml +++ b/epub_content/nonLinear/_4.xhtml @@ -43,6 +43,35 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t

SECTION 5

There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ +

SECTION 6

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 7

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 8

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 9

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 10

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc.

diff --git a/epub_content/nonLinear/_5_nonLinear.xhtml b/epub_content/nonLinear/_5_nonLinear.xhtml index def73ccdf..f956b7c1f 100644 --- a/epub_content/nonLinear/_5_nonLinear.xhtml +++ b/epub_content/nonLinear/_5_nonLinear.xhtml @@ -40,6 +40,35 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t

SECTION 5

There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ +

SECTION 6

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 7

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 8

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 9

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 10

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc.

diff --git a/epub_content/nonLinear/_6_nonLinear.xhtml b/epub_content/nonLinear/_6_nonLinear.xhtml index 9c7492241..e1a7f626c 100644 --- a/epub_content/nonLinear/_6_nonLinear.xhtml +++ b/epub_content/nonLinear/_6_nonLinear.xhtml @@ -40,6 +40,35 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t

SECTION 5

There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ +

SECTION 6

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 7

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 8

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 9

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 10

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc.

diff --git a/epub_content/nonLinear/_7.xhtml b/epub_content/nonLinear/_7.xhtml index 58bc08779..c86186c52 100644 --- a/epub_content/nonLinear/_7.xhtml +++ b/epub_content/nonLinear/_7.xhtml @@ -37,6 +37,35 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t

SECTION 5

There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ +

SECTION 6

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 7

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 8

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 9

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 10

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc.

diff --git a/epub_content/nonLinear/_8.xhtml b/epub_content/nonLinear/_8.xhtml index cbb0866d3..515affe8d 100644 --- a/epub_content/nonLinear/_8.xhtml +++ b/epub_content/nonLinear/_8.xhtml @@ -40,6 +40,35 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t

SECTION 5

There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ +

SECTION 6

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 7

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 8

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 9

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 10

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc.

diff --git a/epub_content/nonLinear/_9_nonLinear.xhtml b/epub_content/nonLinear/_9_nonLinear.xhtml index 7ae9ea989..55d4840f8 100644 --- a/epub_content/nonLinear/_9_nonLinear.xhtml +++ b/epub_content/nonLinear/_9_nonLinear.xhtml @@ -40,6 +40,35 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t

SECTION 5

There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ +

SECTION 6

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 7

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 8

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 9

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. +

+ + +

SECTION 10

+

+There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc.

From 335f08aded2e817db4bfa4bcca434396bc070d46 Mon Sep 17 00:00:00 2001 From: danielweck Date: Tue, 8 Dec 2015 11:17:27 +0000 Subject: [PATCH 8/9] suvbmod --- readium-js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readium-js b/readium-js index 89393cef1..4760b2104 160000 --- a/readium-js +++ b/readium-js @@ -1 +1 @@ -Subproject commit 89393cef17aedeaaf42cb2014247aa6e20c48054 +Subproject commit 4760b2104cdc41a34224d9008adfc9fa8c83d98a From 8b125d20be8fe73d611b0e6b8ef90e3dd8e25d6b Mon Sep 17 00:00:00 2001 From: danielweck Date: Thu, 25 May 2017 16:44:30 +0100 Subject: [PATCH 9/9] isubmod --- readium-js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readium-js b/readium-js index c5c92d079..73fde113d 160000 --- a/readium-js +++ b/readium-js @@ -1 +1 @@ -Subproject commit c5c92d0795f806d613ce41bb1cdf9a8717a05eb7 +Subproject commit 73fde113ded335da33774c6cf5716ee306c8c5ff