Syntax highlighting for module example code using prettify. Note: pre…

…ttify is introduced with an svn checkout into the web directoy.
rustyrussell · Oct 25, 2014 · fe6805a · fe6805a
1 parent 39ea444
commit fe6805a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/Makefile-web b/Makefile-web
@@ -8,6 +8,7 @@ WEB_SUBDIRS=$(WEBDIR)/tarballs $(WEBDIR)/junkcode $(WEBDIR)/tarballs/with-deps $
 JUNKDIRS=$(wildcard junkcode/*)
 JUNKPAGES=$(JUNKDIRS:%=$(WEBDIR)/%.html)
 JUNKBALLS=$(JUNKDIRS:%=$(WEBDIR)/%.tar.bz2)
+PRETTIFY=$(WEBDIR)/prettify/src/run_prettify.js $(WEBDIR)/prettify/src/prettify.css
 
 upload: fastcheck modcheck
 	git push origin HEAD:master
@@ -20,12 +21,15 @@ modcheck:
 clean-tree:
 	[ "$(WEBDEV)" ] || ! git status --porcelain | grep .
 
-webpages: modcheck clean-tree $(WEB_SUBDIRS) $(WEBDIR)/index.html $(WEBDIR)/upload.html $(WEBDIR)/uploader.php $(WEBDIR)/example-config.h $(WEBDIR)/ccan.png $(WEBDIR)/ccan-bg.png $(WEBDIR)/ccan.css $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(WEBDIR)/Makefile-ccan $(ALL_PAGES) junkpages
+webpages: modcheck clean-tree $(WEB_SUBDIRS) $(PRETTIFY) $(WEBDIR)/index.html $(WEBDIR)/upload.html $(WEBDIR)/uploader.php $(WEBDIR)/example-config.h $(WEBDIR)/ccan.png $(WEBDIR)/ccan-bg.png $(WEBDIR)/ccan.css $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(WEBDIR)/Makefile-ccan $(ALL_PAGES) junkpages
 
 junkpages: $(WEBDIR)/list.html $(WEBDIR)/junkcode $(JUNKPAGES) $(JUNKBALLS)
 $(WEB_SUBDIRS): $(WEBDIR)
 	mkdir -p $@
 
+$(PRETTIFY):
+	svn checkout http://google-code-prettify.googlecode.com/svn/trunk/ $(WEBDIR)/prettify
+
 $(WEBDIR)/junkcode/%.tar.bz2: junkcode/% $(WEBDIR)/junkcode
 	git ls-files -z $< | xargs -0 -x tar cvfj $@ 
 

diff --git a/web/ccan.css b/web/ccan.css
@@ -180,3 +180,11 @@ img {
     text-align: right;
     margin-top: 0;
 }
+
+pre {
+    max-width: 95%;
+    overflow: auto;
+    *overflow: scroll;
+    border: 0px !important;
+}
+
diff --git a/web/logo.html b/web/logo.html
@@ -10,6 +10,8 @@
   <link rel="stylesheet" type="text/css" href="<?=$url_prefix?>ccan.css"/>
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link href='http://fonts.googleapis.com/css?family=Raleway:300' rel='stylesheet' type='text/css'>
+  <link href='<?=$url_prefix?>prettify/src/prettify.css' rel='stylesheet' type='text/css'>
+  <script type="text/javascript" src="<?=$url_prefix?>prettify/src/run_prettify.js"></script>
 <head>
 <body>
 <div class='logo'>

diff --git a/web/staticmoduleinfo.php b/web/staticmoduleinfo.php
@@ -96,7 +96,9 @@
 if ($example) {
 ?>
 <h3>Example:</h3>
-<pre class="lang-c prettyprint prettyprinted"><?=$example?></pre>
+<pre class="prettyprint">
+<code class="language-c"><?=$example?></code>
+</pre>
 <?php
 }