Более простое включение CSS

diff --git a/all.do b/all.do
index de787d609cce9fd944f59280fdb40fc37f8a98f0..45c5ce00d1588aae600944dab099573c867590d1 100644 (file)
--- a/all.do
+++ b/all.do
@@ -1,16 +1,15 @@
 html=cryptoparty.html
 rm -f $html/*.html
 ${MAKEINFO:-makeinfo} --html \
+    --css-include style.css \
     --set-customization-variable EXTRA_HEAD='<link rev="made" href="mailto:webmaster@cryptoparty.ru">' \
-    --set-customization-variable CSS_LINES="`cat style.css`" \
     --set-customization-variable SHOW_TITLE=0 \
-    --set-customization-variable USE_ACCESSKEY=0 \
     --set-customization-variable DATE_IN_HEADER=1 \
     --set-customization-variable TOP_NODE_UP_URL=index.html \
     --set-customization-variable CLOSE_QUOTE_SYMBOL=\" \
     --set-customization-variable OPEN_QUOTE_SYMBOL=\" \
     -o $html index.texi
 ( cd static ; tar cf - . | tar xfC - ../$html )
-cp -f logo.png $html/
+cp -af logo.png $html/
 find $html -type d -exec chmod 755 {} \;
 find $html -type f -exec chmod 644 {} \;

diff --git a/style.css b/style.css
index 17f3b71cb358b255b2328e68226338fff4186fed..0d2e65ba5cd86080c50fbc98d1190060aae73e14 100644 (file)
--- a/style.css
+++ b/style.css
@@ -1,4 +1,3 @@
-<style type="text/css"><!--
 body {
     margin: auto;
     width: 80em;
@@ -8,4 +7,3 @@ h1, h2, h3, h4 { text-align: center }
 h1, h2, h3, h4, strong { color: #900090 }
 pre { background-color: #CCCCCC }
 table, th, td { border: 1px solid black ; border-collapse: collapse }
---></style>