Kirill Simonov avatar Kirill Simonov committed 57528e1

Updated sphinxcontrib.htsqldoc to be compatible with the latest version of Sphinx.

Comments (0)

Files changed (1)

src/sphinxcontrib/htsqldoc/__init__.py

     lang = self.highlightlang
     linenos = node.rawsource.count('\n') >= \
               self.highlightlinenothreshold - 1
+    highlight_args = node.get('highlight_args', {})
     if node.has_key('language'):
         lang = node['language']
+        highlight_args['force'] = True
     if node.has_key('linenos'):
         linenos = node['linenos']
     def warner(msg):
         self.builder.warn(msg, (self.builder.current_docname, node.line))
-    self.highlighter.fmter[False].nowrap = True
-    self.highlighter.fmter[True].nowrap = True
+    self.highlighter.formatter.nowrap = True
     highlighted = self.highlighter.highlight_block(
-        node.rawsource, lang, linenos, warn=warner)
-    self.highlighter.fmter[False].nowrap = False
-    self.highlighter.fmter[True].nowrap = False
+        node.rawsource, lang, warn=warner, linenos=linenos,
+        **highlight_args)
     if highlighted.startswith('<pre>') and highlighted.endswith('</pre>\n'):
         # may happen if the language is not detected correctly
         highlighted = highlighted[5:-7]
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.