+ 
+
+
+
+
+
+
+
diff --git a/src/calibre/ebooks/oeb/display/test-cfi/marker.png b/src/calibre/ebooks/oeb/display/test-cfi/marker.png
new file mode 100644
index 0000000000..6dcc1fb7ba
Binary files /dev/null and b/src/calibre/ebooks/oeb/display/test-cfi/marker.png differ
diff --git a/src/calibre/ebooks/oeb/display/test/test.py b/src/calibre/ebooks/oeb/display/test-cfi/run.py
similarity index 76%
rename from src/calibre/ebooks/oeb/display/test/test.py
rename to src/calibre/ebooks/oeb/display/test-cfi/run.py
index e217027312..17af70bf22 100644
--- a/src/calibre/ebooks/oeb/display/test/test.py
+++ b/src/calibre/ebooks/oeb/display/test-cfi/run.py
@@ -10,16 +10,15 @@ __docformat__ = 'restructuredtext en'
import os
try:
- from calibre.utils.coffeescript import serve
+ from calibre.utils.serve_coffee import serve
except ImportError:
import init_calibre
if False: init_calibre, serve
- from calibre.utils.coffeescript import serve
-
+ from calibre.utils.serve_coffee import serve
def run_devel_server():
os.chdir(os.path.dirname(os.path.abspath(__file__)))
- serve()
+ serve(resources={'cfi.coffee':'../cfi.coffee', '/':'index.html'})
if __name__ == '__main__':
run_devel_server()
diff --git a/src/calibre/ebooks/oeb/display/test/cfi-test.coffee b/src/calibre/ebooks/oeb/display/test/cfi-test.coffee
deleted file mode 100644
index 056d24b396..0000000000
--- a/src/calibre/ebooks/oeb/display/test/cfi-test.coffee
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env coffee
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
-
-###
- Copyright 2011, Kovid Goyal Testing EPUB CFI
+ +A div with scrollbars
+Scroll down and click on some elements. Make sure to hit both + bold and not bold text as well as different points on the image
+But I must explain to you how all this mistaken
+ idea of denouncing pleasure and praising pain was born and I
+ will give you a complete account of the system, and expound the
+ actual teachings of the great explorer of the truth, the
+ master-builder of human happiness. No one rejects, dislikes, or
+ avoids pleasure itself, because it is pleasure, but because
+ those who do not know how to pursue pleasure rationally
+ encounter consequences that are extremely painful. Nor again is
+ there anyone who loves or pursues or desires to obtain
+ pain of itself, because it is pain, but because occasionally
+ circumstances occur in which toil and pain can procure him some
+ great pleasure. To take a trivial example, which of us ever
+ undertakes laborious physical exercise, except to obtain some
+ advantage from it? But who has any right to find fault with a
+ man who chooses to enjoy a pleasure that has no annoying
+ consequences, or one who avoids a pain that produces no
+ resultant pleasure? On the other hand, we denounce with
+ righteous indignation and dislike men who are so beguiled and
+ demoralized by the charms of pleasure of the moment, so blinded
+ by desire, that they cannot foresee
+
+
+
+
+
+ Some entities and comments
+Entities: & © § > some text after entities
+An invisible Comment: followed by some text
+An invalid (in HTML) CDATA: followed by some text
+Margins padding borders
+Try clicking in the margins, borders and padding. CFI + calculation should fail.
+ +But I must explain to you how all this mistaken + idea of denouncing pleasure and praising pain was born and I will + give you a complete account of the system, and expound the actual + teachings of the great explorer of the truth, the master-builder of + human happiness. No one rejects, dislikes, or avoids pleasure + itself, because it is pleasure, but because those who do not know + how to pursue pleasure rationally encounter consequences that are + extremely painful. Nor again is there anyone who loves or + pursues or desires to obtain pain of itself, because it is + pain, but because occasionally circumstances occur in which toil + and pain can procure him some great pleasure. To take a trivial + example, which of us ever undertakes laborious physical exercise, + except to obtain some advantage from it? But who has any right to + find fault with a man who chooses to enjoy a pleasure that has no + annoying consequences, or one who avoids a pain that produces no + resultant pleasure? On the other hand, we denounce with righteous + indignation and dislike men who are so beguiled and demoralized by + the charms of pleasure of the moment, so blinded by desire, that + they cannot foresee
+ +Lots of collapsed whitespace
+Try clicking the A character after the colon: A suffix
+ +Lots of nested/sibling tags
+A bunch of nested and sibling + tags, all mixed together. Click all + over this paragraph to test things.
+ +Images
+Try clicking at different points along the image. Also try changing the magnification and then hitting reload.
+
+
+ Testing CFI functionality
- - - - diff --git a/src/calibre/ebooks/oeb/parse_utils.py b/src/calibre/ebooks/oeb/parse_utils.py index f8456914b9..712427d457 100644 --- a/src/calibre/ebooks/oeb/parse_utils.py +++ b/src/calibre/ebooks/oeb/parse_utils.py @@ -70,9 +70,29 @@ def clone_element(elem, nsmap={}, in_context=True): nelem.extend(elem) return nelem -def html5_parse(data): +def node_depth(node): + ans = 0 + p = node.getparent() + while p is not None: + ans += 1 + p = p.getparent() + return ans + +def html5_parse(data, max_nesting_depth=100): import html5lib + # html5lib bug: http://code.google.com/p/html5lib/issues/detail?id=195 + data = re.sub(r'<\s*title\s*[^>]*/\s*>', '', '
<return', '
return', '
return
diff --git a/src/calibre/manual/templates/layout.html b/src/calibre/manual/templates/layout.html
index 8f35a9a6c5..88e1605f92 100644
--- a/src/calibre/manual/templates/layout.html
+++ b/src/calibre/manual/templates/layout.html
@@ -16,17 +16,17 @@
{% if not embedded %}
+ + +
{% endblock %} diff --git a/src/calibre/manual/templates/search.html b/src/calibre/manual/templates/search.html index 58901c8fb4..014ee11a65 100644 --- a/src/calibre/manual/templates/search.html +++ b/src/calibre/manual/templates/search.html @@ -33,7 +33,7 @@
-
-
+
+
{% endif %}
{% block body %} {% endblock %}
@@ -58,13 +58,14 @@
+ + +
{% endblock %} diff --git a/src/calibre/manual/templates/search.html b/src/calibre/manual/templates/search.html index 58901c8fb4..014ee11a65 100644 --- a/src/calibre/manual/templates/search.html +++ b/src/calibre/manual/templates/search.html @@ -33,7 +33,7 @@