Changeset 718:1cb7556f2e1d in hatta-dev for hatta.py

Timestamp:

01/05/10 17:38:01 (2 years ago)

Author:

sheep@…

Branch:

default

Message:

move the pygments css to a separate stylesheet

File:

• hatta.py (modified) (5 diffs)

hatta.py

@@ -1726 +1726 @@
                                     e(self.wiki.site_name)))
         yield h.link(rel="stylesheet", type_="text/css",
+                     href=self.get_url(None, self.wiki.pygments_css))
+        yield h.link(rel="stylesheet", type_="text/css",
                      href=self.get_url(None, self.wiki.style_css))
         if special_title:
@@ -1992 +1994 @@
             return
 
-        if 'tango' in pygments.styles.STYLE_MAP:
-            style = 'tango'
-        else:
-            style = 'friendly'
-        formatter = pygments.formatters.HtmlFormatter(style=style)
+        formatter = pygments.formatters.HtmlFormatter()
         formatter.line_no = line_no
 
@@ -2410 +2408 @@
             sys.stdout.write("Hatta %s\n" % __version__)
             sys.exit()
-        if pygments is not None:
-            if 'tango' in pygments.styles.STYLE_MAP:
-                style = 'tango'
-            else:
-                style = 'friendly'
-            formatter = pygments.formatters.HtmlFormatter(style=style)
-            self.style += formatter.get_style_defs('.highlight')
         self.dead = False
         self.config = config
@@ -2487 +2478 @@
             R('/robots.txt', endpoint=self.robots_txt, methods=['GET', 'HEAD']),
             R('/+download/style.css', endpoint=self.style_css,
+              methods=['GET', 'HEAD']),
+            R('/+download/pygments.css', endpoint=self.pygments_css,
               methods=['GET', 'HEAD']),
             R('/+download/scripts.js', endpoint=self.scripts_js,
@@ -3130 +3123 @@
         return self._serve_default(request, 'style.css', self.style,
                                    'text/css')
+    def pygments_css(self, request):
+        """Serve the default pygments style"""
+
+        if pygments is None:
+            raise werkzeug.exceptions.NotFound()
+
+        pygments_style = 'tango'
+        if pygments_style not in pygments.styles.STYLE_MAP:
+            pygments_style = 'default'
+        formatter = pygments.formatters.HtmlFormatter(style=pygments_style)
+        style_defs = formatter.get_style_defs('.highlight')
+        return self._serve_default(request, 'pygments.css', style_defs,
+                                   'text/css')
 
     def favicon_ico(self, request):