From fe6805a9cfb6f880dc0b161b647a8d97123ad2a3 Mon Sep 17 00:00:00 2001 From: Chris McCormick Date: Sat, 25 Oct 2014 18:55:58 +0800 Subject: [PATCH] Syntax highlighting for module example code using prettify. Note: prettify is introduced with an svn checkout into the web directoy. --- Makefile-web | 6 +++++- web/ccan.css | 8 ++++++++ web/logo.html | 2 ++ web/staticmoduleinfo.php | 4 +++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Makefile-web b/Makefile-web index 44ba8ead..ae026197 100644 --- 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 index 280f0449..978e9b45 100644 --- 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 index f4af2763..d281df9f 100644 --- a/web/logo.html +++ b/web/logo.html @@ -10,6 +10,8 @@ $url_prefix = getenv("URLPREFIX"); + +