Syntax highlighting for module example code using prettify. Note: prettify is introdu...

author Chris McCormick <chris@mccormick.cx>

Sat, 25 Oct 2014 10:55:58 +0000 (18:55 +0800)

committer Chris McCormick <chris@mccormick.cx>

Sat, 25 Oct 2014 13:37:07 +0000 (21:37 +0800)
author Chris McCormick <chris@mccormick.cx>
Sat, 25 Oct 2014 10:55:58 +0000 (18:55 +0800)
committer Chris McCormick <chris@mccormick.cx>
Sat, 25 Oct 2014 13:37:07 +0000 (21:37 +0800)
diff --git a/Makefile-web b/Makefile-web

index 44ba8ead70035250401598fd54d89c0e5217a8d1..ae02619710baffc54840607bdc2895d7177bb774 100644 (file)
--- 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)
  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
  
  upload: fastcheck modcheck
         git push origin HEAD:master
@@ -20,12 +21,15 @@ modcheck:
  clean-tree:
         [ "$(WEBDEV)" ] || ! git status --porcelain | grep .
  
  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 $@
  
  
  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 $@ 
  
  $(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

index 280f04497bc1ec8c90896f142b199ad4b98b0d58..978e9b455b7e87a7a95182669bf9fd8eefc5cba5 100644 (file)
--- a/web/ccan.css
+++ b/web/ccan.css
@@ -180,3 +180,11 @@ img {
      text-align: right;
      margin-top: 0;
  }
      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

index f4af2763bc1417a3c075c14adae5973c42211966..d281df9fc24db8ae3d9e8701652338d77b2577c5 100644 (file)
--- a/web/logo.html
+++ b/web/logo.html
@@ -10,6 +10,8 @@ $url_prefix = getenv("URLPREFIX");
    <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 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'>
  <head>
  <body>
  <div class='logo'>
diff --git a/web/staticmoduleinfo.php b/web/staticmoduleinfo.php

index 8f736337c8cb63a6c575565fddbeb3dfdb4cabaf..7f388c2cb1d8d9cca2e6c87907bbec060a7ce253 100644 (file)
--- a/web/staticmoduleinfo.php
+++ b/web/staticmoduleinfo.php
@@ -96,7 +96,9 @@ if ($see_also) {
  if ($example) {
  ?>
  <h3>Example:</h3>
  if ($example) {
  ?>
  <h3>Example:</h3>
-<pre class="lang-c prettyprint prettyprinted"><?=$example?></pre>
+<pre class="prettyprint">
+<code class="language-c"><?=$example?></code>
+</pre>
  <?php
  }
  
  <?php
  }
author	Chris McCormick <chris@mccormick.cx>
	Sat, 25 Oct 2014 10:55:58 +0000 (18:55 +0800)
committer	Chris McCormick <chris@mccormick.cx>
	Sat, 25 Oct 2014 13:37:07 +0000 (21:37 +0800)
Makefile-web		patch \| blob \| history
web/ccan.css		patch \| blob \| history
web/logo.html		patch \| blob \| history
web/staticmoduleinfo.php		patch \| blob \| history