Updated to use eLyxer for HTML output

tjweir · Dec 8, 2010 · eadce36 · eadce36
1 parent f926865
commit eadce36
Show file tree

Hide file tree

Showing 8 changed files with 4,632 additions and 2,910 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-RSYNCFLAGS = "-rv --delete"
+RSYNCFLAGS = -rv --delete
 
 all	: master.pdf
 
@@ -9,7 +9,7 @@ html	: master.lyx
 	rm -rf master/
 	mkdir master/
 	cp -R templates/* master/
-	python elyxer.py --splitpart 1 master.lyx master/index.html
+	python elyxer.py --splitpart 1 --css "css/lyx.css" --defaultbrush "scala" --userheader htmlheader.txt --userfooter htmlfooter.txt master.lyx master/index.html
 	tar cvzf master.html.tgz master/
 
 pdf	: master.pdf
@@ -32,5 +32,5 @@ clean:
 	rm -rf master/
 
 install: pdf html
-	rsync $(RSYNC_FLAGS) master.pdf master.html.tgz lion.harpoon.me:/home/scalatools/hudson/www/exploring/downloads/
-	rsync $(RSYNC_FLAGS) master/ lion.harpoon.me:/home/scalatools/hudson/www/exploring/master/
+	rsync $(RSYNCFLAGS) master.pdf master.html.tgz lion.harpoon.me:/home/scalatools/hudson/www/exploring/downloads/
+	rsync $(RSYNCFLAGS) master/ lion.harpoon.me:/home/scalatools/hudson/www/exploring/master/
diff --git a/chap-JPA.lyx b/chap-JPA.lyx
@@ -1204,7 +1204,7 @@ LocalEMF
 
 \begin_layout Standard
 \begin_inset listings
-lstparams "breaklines=true,firstline=1,lastline=8,numbers=left,numberstyle={\tiny}"
+lstparams "breaklines=true,firstline=1,lastline=8"
 inline false
 status open
 
@@ -1488,7 +1488,7 @@ If you'll be deploying into a JEE container, such as JBoss or GlassFish,
 
 \begin_layout Standard
 \begin_inset listings
-lstparams "breaklines=true,language=XML,numbers=left,numberstyle={\tiny}"
+lstparams "breaklines=true,language=XML"
 inline false
 status open
 
@@ -3173,7 +3173,7 @@ EnumvType
 
 \begin_layout Standard
 \begin_inset listings
-lstparams "breaklines=true,firstline=3,numbers=left,numberstyle={\tiny}"
+lstparams "breaklines=true,firstline=3"
 inline false
 status open
 

diff --git a/chap-lift_architecture.lyx b/chap-lift_architecture.lyx
@@ -145,7 +145,7 @@ reference "lst:LiftFilter-setup-in-web.xml"
 
 \begin_layout Standard
 \begin_inset listings
-lstparams "language=XML,numbers=left,numberstyle={\tiny}"
+lstparams "language=XML"
 inline false
 status open
 

diff --git a/chap-template_xhtml.lyx b/chap-template_xhtml.lyx
@@ -1,4 +1,4 @@
-#LyX 1.6.5 created this file. For more info see http://www.lyx.org/
+#LyX 1.6.7 created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
@@ -1984,6 +1984,7 @@ reference "lst:A-Non-Conforming-XML"
 
 \begin_layout Standard
 \begin_inset listings
+lstparams "language=XML"
 inline false
 status open
 
@@ -2178,7 +2179,7 @@ reference "cha:AJAX-and-COMET"
 
 \begin_layout Standard
 \begin_inset listings
-lstparams "basicstyle={\footnotesize},language=Java,numbers=left,numberstyle={\tiny}"
+lstparams "language=XML"
 inline false
 status open
 
@@ -2695,6 +2696,7 @@ name "lst:Surrounding-your-page"
 
 \begin_layout Standard
 \begin_inset listings
+lstparams "language=XML"
 inline false
 status open
 
@@ -2807,6 +2809,7 @@ admin.
 
 \begin_layout Standard
 \begin_inset listings
+lstparams "language=XML"
 inline false
 status open
 
@@ -2980,6 +2983,7 @@ surround
 
 \begin_layout Standard
 \begin_inset listings
+lstparams "language=XML"
 inline false
 status open
 

diff --git a/elyxer.py b/elyxer.py
diff --git a/htmlfooter.txt b/htmlfooter.txt
@@ -0,0 +1,2 @@
+<script type="text/javascript">SyntaxHighlighter.all()</script>
+
diff --git a/htmlheader.txt b/htmlheader.txt
@@ -0,0 +1,9 @@
+<!-- scripts for highlighter -->
+<script type="text/javascript" src="scripts/shCore.js"></script>
+<script type="text/javascript" src="scripts/shBrushXml.js"></script>
+<script type="text/javascript" src="scripts/shBrushScala.js"></script>
+<script type="text/javascript" src="scripts/shBrushBash.js"></script>
+<!-- CSS for highlighter -->
+<link href="css/shCore.css" rel="stylesheet" type="text/css" />
+<link href="css/shThemeDefault.css" rel="stylesheet" type="text/css" />
+
diff --git a/templates/scripts/shBrushXml.js b/templates/scripts/shBrushXml.js
@@ -60,7 +60,7 @@
 	};
 
 	Brush.prototype	= new SyntaxHighlighter.Highlighter();
-	Brush.aliases	= ['xml', 'xhtml', 'xslt', 'html', 'XML'];
+	Brush.aliases	= ['xml', 'xhtml', 'xslt', 'html'];
 
 	SyntaxHighlighter.brushes.Xml = Brush;