Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix HTML capitalization in nbconvert exporter classes #3507

Merged
merged 1 commit into from Jul 2, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions IPython/nbconvert/exporters/__init__.py
@@ -1,7 +1,7 @@
from .basichtml import BasicHtmlExporter
from .basichtml import BasicHTMLExporter
from .export import *
from .exporter import Exporter
from .fullhtml import FullHtmlExporter
from .fullhtml import FullHTMLExporter
from .latex import LatexExporter
from .markdown import MarkdownExporter
from .python import PythonExporter
Expand Down
10 changes: 5 additions & 5 deletions IPython/nbconvert/exporters/basichtml.py
Expand Up @@ -16,15 +16,15 @@

from IPython.utils.traitlets import Unicode

from ..transformers.csshtmlheader import CSSHtmlHeaderTransformer
from ..transformers.csshtmlheader import CSSHTMLHeaderTransformer

from .exporter import Exporter

#-----------------------------------------------------------------------------
# Classes
#-----------------------------------------------------------------------------

class BasicHtmlExporter(Exporter):
class BasicHTMLExporter(Exporter):
"""
Exports a basic HTML document. This exporter assists with the export of
HTML. Inherit from it if you are writing your own HTML template and need
Expand All @@ -48,8 +48,8 @@ def _register_transformers(self):
"""

#Register the transformers of the base class.
super(BasicHtmlExporter, self)._register_transformers()
super(BasicHTMLExporter, self)._register_transformers()

#Register CSSHtmlHeaderTransformer transformer
self.register_transformer(CSSHtmlHeaderTransformer)
#Register CSSHTMLHeaderTransformer transformer
self.register_transformer(CSSHTMLHeaderTransformer)

8 changes: 4 additions & 4 deletions IPython/nbconvert/exporters/export.py
Expand Up @@ -18,8 +18,8 @@
from IPython.nbformat.v3.nbbase import NotebookNode

from .exporter import Exporter
from .basichtml import BasicHtmlExporter
from .fullhtml import FullHtmlExporter
from .basichtml import BasicHTMLExporter
from .fullhtml import FullHTMLExporter
from .latex import LatexExporter
from .markdown import MarkdownExporter
from .python import PythonExporter
Expand Down Expand Up @@ -146,15 +146,15 @@ def export_basic_html(nb, config=None, transformers=None, filters=None):
"""
Export a notebook object to Basic HTML
"""
return export(BasicHtmlExporter, nb, config, transformers, filters)
return export(BasicHTMLExporter, nb, config, transformers, filters)


@DocDecorator
def export_full_html(nb, config=None, transformers=None, filters=None):
"""
Export a notebook object to Full HTML
"""
return export(FullHtmlExporter, nb, config, transformers, filters)
return export(FullHTMLExporter, nb, config, transformers, filters)


@DocDecorator
Expand Down
8 changes: 4 additions & 4 deletions IPython/nbconvert/exporters/fullhtml.py
Expand Up @@ -16,14 +16,14 @@

from IPython.utils.traitlets import Unicode

from .basichtml import BasicHtmlExporter
from .basichtml import BasicHTMLExporter
from IPython.config import Config

#-----------------------------------------------------------------------------
# Classes
#-----------------------------------------------------------------------------

class FullHtmlExporter(BasicHtmlExporter):
class FullHTMLExporter(BasicHTMLExporter):
"""
Exports a full HTML document.
"""
Expand All @@ -34,6 +34,6 @@ class FullHtmlExporter(BasicHtmlExporter):

@property
def default_config(self):
c = Config({'CSSHtmlHeaderTransformer':{'enabled':True}})
c.merge(super(FullHtmlExporter,self).default_config)
c = Config({'CSSHTMLHeaderTransformer':{'enabled':True}})
c.merge(super(FullHTMLExporter,self).default_config)
return c
6 changes: 3 additions & 3 deletions IPython/nbconvert/exporters/reveal.py
Expand Up @@ -16,14 +16,14 @@
from IPython.utils.traitlets import Unicode
from IPython.config import Config

from .basichtml import BasicHtmlExporter
from .basichtml import BasicHTMLExporter
from IPython.nbconvert import transformers

#-----------------------------------------------------------------------------
# Classes
#-----------------------------------------------------------------------------

class RevealExporter(BasicHtmlExporter):
class RevealExporter(BasicHTMLExporter):
"""
Exports a Reveal slide show (.HTML) which may be rendered in a web browser.
"""
Expand All @@ -49,6 +49,6 @@ def _register_transformers(self):

@property
def default_config(self):
c = Config({'CSSHtmlHeaderTransformer':{'enabled':True}})
c = Config({'CSSHTMLHeaderTransformer':{'enabled':True}})
c.merge(super(RevealExporter,self).default_config)
return c
4 changes: 2 additions & 2 deletions IPython/nbconvert/transformers/csshtmlheader.py
Expand Up @@ -25,7 +25,7 @@
# Classes and functions
#-----------------------------------------------------------------------------

class CSSHtmlHeaderTransformer(ActivatableTransformer):
class CSSHTMLHeaderTransformer(ActivatableTransformer):
"""
Transformer used to pre-process notebook for HTML output. Adds IPython notebook
front-end CSS and Pygments CSS to HTML output.
Expand All @@ -45,7 +45,7 @@ def __init__(self, config=None, **kw):
Additional arguments
"""

super(CSSHtmlHeaderTransformer, self).__init__(config=config, **kw)
super(CSSHTMLHeaderTransformer, self).__init__(config=config, **kw)

if self.enabled :
self._regen_header()
Expand Down