From: Ulya Trofimovich <skvadrik@gmail.com>
Date: Sun, 15 Nov 2015 12:56:57 +0000 (+0000)
Subject: Link to stylesheet rather than embed it.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd60fbc3960b112da6928b9497fa7267b4ea0785;p=re2c

Link to stylesheet rather than embed it.
---

diff --git a/Makefile b/Makefile
index c30bf84e..512ef2c1 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,10 @@ SRC_RST = \
     src/install/install.rst \
     src/index.rst
 
+SRC_CSS = src/css/default.css
+
+SRC_TPL = src/template.html
+
 SRC_OTH = \
     src/examples/06_braille.utf8.txt \
     src/examples/05_parsing_integers_conditions.re \
@@ -90,14 +94,17 @@ SRC_OTH = \
 OBJ_RST = $(SRC_RST:%.rst=%.html)
 
 all: $(OBJ_RST)
-	@ for f in $(SRC_OTH); do { mkdir -p "`dirname $$f`"; cp "$(VPATH)/$$f" "$$f"; } done
+	@ for f in $(SRC_OTH) $(SRC_CSS); do { mkdir -p "`dirname $$f`"; cp "$(VPATH)/$$f" "$$f"; } done
 
 -include $(SRC_RST:%.rst=%.d)
 
+# Option '--stylesheet' to 'rst2html' is used only to override dependency
+# from default stylesheet; the real stylesheet is linked in template file.
+# We have to manually insert dependency from template file.
 .rst.html:
 	@ mkdir -p "`dirname $@`"
-	@ rst2html.py --stylesheet="$(VPATH)/src/css/default.css" --template="$(VPATH)/src/template.html" --record-dependencies="$*.dd" $< $@
-	@ echo $@: `cat $*.dd` > $*.d && rm $*.dd
+	@ rst2html.py --stylesheet="$(VPATH)/$(SRC_CSS)" --template="$(VPATH)/$(SRC_TPL)" --record-dependencies="$*.dd" $< $@
+	@ echo $@: "$(VPATH)/$(SRC_TPL)" `cat $*.dd` > $*.d && rm $*.dd
 	@ echo $@
 
 clean:
diff --git a/src/template.html b/src/template.html
index 5f147506..ea12f946 100644
--- a/src/template.html
+++ b/src/template.html
@@ -1,8 +1,8 @@
 %(head_prefix)s
 %(head)s
+<link rel="stylesheet" type="text/css" href="/css/default.css" />
 <link rel="alternate" type="application/atom+xml" href="/feed/atom.xml" title="Atom 1.0" />
 <link rel="shortcut icon" href="/favicon.ico" />
-%(stylesheet)s
 %(body_prefix)s
 %(body_pre_docinfo)s
 %(docinfo)s