BUG fixed (#100, #102)

.gitignore

@@ -1,4 +1,6 @@
 *.pyc
+.DS_Store
+
 
 .installed.cfg
 bin
@@ -20,3 +22,9 @@ _build
 /.tox/
 .sass-cache
 /pip-selfcheck.json
+
+# used by GAM, for debugging/tracing
+/src/hieroglyph/hack.py
+
+BuroLa
+src/TDD_testslides/__Result/

docs/Makefile

@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = ../bin/sphinx-build
+SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = _build
 

docs/conf.py

@@ -41,8 +41,8 @@
     'hieroglyph',
 ]
 
-if not on_rtd:
-    extensions.append('sphinxcontrib.googleanalytics')
+#GAM#if not on_rtd:
+#GAM#    extensions.append('sphinxcontrib.googleanalytics')
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

docs/gio_slides.rst

@@ -0,0 +1,66 @@
+================
+Google IO slides
+================
+
+The theme ``slides2`` enables a modern slidedeck, based on the one Google introduced for I/O 2012;
+and still updates. It has support for mobile/touch devices too. But it not fully compatible with
+the (original) `slides` and `single-level` themas.
+
+Currently the options are partly described in the :ref:`original documentation
+<org_doc_gio_slides>` and partly here. This page is work in progress (as is the code support).
+
+Presenting
+**********
+
+For *presenter-mode*, **start** the page with the suffix `?presentme=true`; use an URL without
+page-suffix (#<no>). The keyboard option 'c' does not (yet) work.  In this mode, two windows are
+shown, typically on 2 (physical) screens: a normal one for the audience, and one with more info for
+the presenter.
+
+Note: presenter-mode and presentation-links don't work correctly. Links are (only) clickable in the
+'audience' window; they open the presentation in a new tab/window, bu no presenter-window will
+pop-up!
+
+Keyboard control
+=================
+
+.. note:: The action-keys are hardcodes in ``js/slide-deck.js``
+   (function: :js:func:`SlideDeck.prototype.onBodyKeyDown_` )
+
+Navigation
+----------
+
+============	===================================	===============
+*Action*	*Keys*					*Remarks*
+------------	-----------------------------------	---------------
+**Next**	RightArrow, Space, PgDn, DownArrow	GoTo next slide
+**Back**	LeftArrow, Backspace, PgUp, UpArrow
+============	===================================	===============
+
+
+
+Toggles
+-------
+
+============	========================	========================================================
+*Key*		*Action*			*Remarks*
+------------	------------------------	--------------------------------------------------------
+**w**		wide/narrow-screen		change width of the slide, dynamically
+**o**		overview mode			Show all slides as miniatures
+*<Enter>*	overview mode			Displays the 'overview'-class, when available
+**p**		show speaker notes		if they're on the current slide
+**f**		fullscreen viewing		when browser supports it; not on Safari)
+**h**		code highlighting		XXX
+============	========================	========================================================
+
+Keys are not case-sensitive. Most options can be toggled 'off' with **ESC** (has no effect on wide/narrow).
+
+NOTES
+*****
+
+* Each slidedeck (file) will automatically become a title- and end-slide. Both will have an icon,
+  that should be named ``title_icon.png`` and ``end_icon.png`` and should be places in the
+  ``_static/slides2/`` directory. Those images will be (css) scaled, to 128*128 pixels (by default;
+  this can be changed in CSS XXX).
+* Do **NOT** add a newline (`\n`) in the title (version/releases string). It will break the slides;
+  and shows *noting*

docs/index.rst

@@ -32,6 +32,7 @@ Hieroglyph is an extension for `Sphinx`_ which builds HTML slides from
       getting-started
       styling
       themes
+      gio_slides
       advanced
       config
       theme-creation
@@ -72,6 +73,7 @@ Related Projects
    getting-started
    styling
    themes
+   gio_slides
    advanced
    config
    theme-creation

docs/themes.rst

@@ -57,11 +57,13 @@ Hieroglyph includes some classes that for styling slides:
    from the right to left.
 
 
+.. _org_doc_gio_slides:
+
 Slides2
 =======
 
 The ``slides2`` theme was added in Hieroglyph 0.7, and as based on the
-`Google I/O 2012+`_ HTML slide templates.
+`Google I/O 2012+`_ HTML slide templates. Also see: :doc:`gio_slides`
 
 Theme Options
 -------------

setup.cfg

@@ -1,5 +1,5 @@
 [egg_info]
-tag_build = .dev
+tag_build = .dev.GAM
 
 [bdist_wheel]
 universal = 1

src/TDD_testslides/IN/all.rst

@@ -0,0 +1,140 @@
+===
+All
+===
+
+Note: For this demo the conf should contain `slide_levels = 2`
+
+H2-1 This will become a the first h1
+====================================
+
+on a new slide
+
+H2-2 This should be a new slide, again with a h2 header
+=======================================================
+
+The H2-2 line is missing!
+
+H3 But this H3 is shown instead
+-------------------------------
+
+There should be a (h3) header above this line
+
+
+H2-3 Again
+==========
+
+A new side
+
+H2-4 More missing lines
+=======================
+
+The lines H2-4 and H3-1 will be gone ...
+
+H3-1 First h3
+-------------
+
+This is shown (but not H3-1)
+
+H3-2 Second h3
+--------------
+
+This is shown (as well as H3-2, as slide title)
+
+
+
+H2-5 Now with h2+3+4
+====================
+
+Reset again (new H2 slide)
+
+H2-6 Demo
+=========
+
+Echo: H2-6 Demo
+
+H3 A h2 with an h4
+------------------
+
+Echo: H3 A h2 with an h4
+
+H4 What does happen?
+^^^^^^^^^^^^^^^^^^^^
+
+Echo: H4 What does happen?
+
+
+H2-7 slide
+==========
+
+Echo H2-7 slide
+
+.. slide:: Title
+
+   Some body 
+
+.. slide:: another slide 
+
+   With a title
+
+.. slide::
+
+   Thise `slide` slide has no title
+
+H2-8 nextslide
+==============
+
+echo H2-8 nextslide
+
+.. nextslide::
+   :increment:
+
+echo  nextslide (without title, increment)
+
+.. nextslide:: next
+
+echo  nextslide (with title: next)
+
+
+
+
+.. ifslides::
+   ..nextslide:: Title
+
+   echo DOT DOT slide COLON COLON Title
+
+
+.. slide:: another slide
+
+   echo DOT DOT slide COLON COLON another slide
+
+.. slide::
+
+   echo DOT DOT slide
+
+   Thise `slide` slide has no title
+
+H2 nextslide
+============
+
+echo H2 nextslide
+
+.. nextslide::
+   :increment:
+
+echo DOT DOT nextslide
+Text on **nextslide**
+
+
+
+
+
+
+OLD
+===
+.. notslides::
+
+   oud
+
+.. slides::
+
+  oud

src/TDD_testslides/IN/index.rst

@@ -0,0 +1,10 @@
+==============
+Hplus Bug Demo
+==============
+
+.. toctree::
+
+   mini
+   next.slide
+   all
+   levels

src/TDD_testslides/IN/levels.rst

@@ -0,0 +1,63 @@
+######
+LEVELS
+######
+
+- ## with overline, for books (titles)
+- ** with overline, for parts
+- #, for chapters
+- \*, for sections
+- =, for subsections
+- -, for sub-subsections
+- ^, for paragraphs
+- ", SPARE
+
+##
+H1
+##
+
+Books
+
+**
+H2
+**
+
+Parts
+
+H3
+##
+
+Chapters
+
+H4
+**
+
+Sections
+
+H5
+==
+
+Subsections
+
+H6
+--
+
+Sub-subsections
+
+H7
+^^
+
+Paragraphs
+
+H8
+""
+
+spare
+
+#########
+H1, Again
+#########
+
+.. nextslide::
+   :increment:
+
+Curious about slide-level and H level

src/TDD_testslides/IN/mini.rst

@@ -0,0 +1,17 @@
+====
+Mini
+====
+
+AutoSlide
+=========
+
+Use only as sub-header, not as nextslide header
+-----------------------------------------------
+
+echo h3
+
+.. nextslide::
+   :increment:
+
+This should be on a new slide, named `AutoSlide (2)`, not of the last h3
+