summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès2018-04-29 23:24:36 +0200
committerLudovic Courtès2018-04-29 23:41:13 +0200
commitb87514f1863a3f6231d3ccb4e785d03a4b179b6d (patch)
tree37a08d8da1626e9032d0b88549f978f91f01e902
parentc51dc480fff9b99b2462000095cb56336b8c2410 (diff)
downloadskribilo-b87514f1863a3f6231d3ccb4e785d03a4b179b6d.tar.gz
skribilo-b87514f1863a3f6231d3ccb4e785d03a4b179b6d.tar.lz
skribilo-b87514f1863a3f6231d3ccb4e785d03a4b179b6d.zip
doc: Use the same CSS as the web site.
* web/static: Move to...
* doc/user/static: ... this.
* web/static: Turn into a symlink.
* doc/user/skribilo.css: Remove.
* doc/modules/skribilo/documentation/manual.scm: Use "static/manual.css"
instead of "skribilo.css".
* doc/user/Makefile.am (dist_html_DATA): Remove.
(nobase_dist_html_DATA): New variable.
* doc/user/static/manual.css: New file.
-rw-r--r--doc/modules/skribilo/documentation/manual.scm2
-rw-r--r--doc/user/Makefile.am14
-rw-r--r--doc/user/skribilo.css304
-rw-r--r--doc/user/static/Hack-Regular.ttf (renamed from web/static/Hack-Regular.ttf)bin399724 -> 399724 bytes
-rw-r--r--doc/user/static/LinBiolinum_Rah.ttf (renamed from web/static/LinBiolinum_Rah.ttf)bin657744 -> 657744 bytes
-rw-r--r--doc/user/static/LinLibertine_Rah.ttf (renamed from web/static/LinLibertine_Rah.ttf)bin806856 -> 806856 bytes
-rw-r--r--doc/user/static/gears-down.png (renamed from web/static/gears-down.png)bin7655 -> 7655 bytes
-rw-r--r--doc/user/static/gears-up.png (renamed from web/static/gears-up.png)bin7753 -> 7753 bytes
-rw-r--r--doc/user/static/graphy.png (renamed from web/static/graphy.png)bin166 -> 166 bytes
-rw-r--r--doc/user/static/main.css (renamed from web/static/main.css)0
-rw-r--r--doc/user/static/manual.css108
-rwxr-xr-xdoc/user/static/normalize.css (renamed from web/static/normalize.css)0
l---------web/static1
13 files changed, 122 insertions, 307 deletions
diff --git a/doc/modules/skribilo/documentation/manual.scm b/doc/modules/skribilo/documentation/manual.scm
index 93222d5..de298f7 100644
--- a/doc/modules/skribilo/documentation/manual.scm
+++ b/doc/modules/skribilo/documentation/manual.scm
@@ -133,7 +133,7 @@
    (engine-custom-set! he 'subsection-file #f)
    (engine-custom-set! he 'subsubsection-file #f)
 
-   (engine-custom-set! he 'css "skribilo.css")
+   (engine-custom-set! he 'css "static/manual.css")
 
    ;; Emit a SUI file.
    (engine-custom-set! he 'emit-sui #t))
diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
index c813c42..612ac35 100644
--- a/doc/user/Makefile.am
+++ b/doc/user/Makefile.am
@@ -32,8 +32,18 @@ skrinfodir = $(infodir)
 skrinfo_DATA = skribilo.info
 
 html_DATA = user.html user.sui
-dist_html_DATA = skribilo.css			\
-  lobster-1.4.otf junction.ttf
+nobase_dist_html_DATA =				\
+  lobster-1.4.otf junction.ttf			\
+  static/gears-down.png				\
+  static/gears-up.png				\
+  static/graphy.png				\
+  static/Hack-Regular.ttf			\
+  static/LinBiolinum_Rah.ttf			\
+  static/LinLibertine_Rah.ttf			\
+  static/main.css				\
+  static/manual.css				\
+  static/normalize.css
+
 
 if HAVE_LOUT
 BUILT_SOURCES = lout/front-page.lout
diff --git a/doc/user/skribilo.css b/doc/user/skribilo.css
deleted file mode 100644
index b74e8a3..0000000
--- a/doc/user/skribilo.css
+++ /dev/null
@@ -1,304 +0,0 @@
-/* -*- coding: utf-8 -*-
-
-   CSS style sheet for the Skribilo manual.
-
-   Copyright 2007, 2008, 2012, 2018 Ludovic Courtès <ludo@gnu.org>
-
-   Copying and distribution of this file, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-/* FIXME: This file is messy and contains loads of useless stuff.  */
-
-/* http://www.impallari.com/lobster/  */
-@font-face {
-  font-family: 'Lobster';
-  font-style: normal;
-  font-weight: normal;
-  src: local('Lobster'), url('lobster-1.4.otf') format('opentype');
-}
-
-/* http://www.theleagueofmoveabletype.com/junction */
-@font-face {
-  font-family: 'Junction';
-  src: local('Junction'), url('junction.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-}
-
-pre { font-family: monospace; text-align: left; }
-tt { font-family: monospace }
-code { font-family: monospace }
-body { margin: 1em 1.5em 1.5em 1.5em; background: #ffffff; }
-p { text-align: justify; }
-p.flushright { text-align: right }
-p.flushleft { text-align: left }
-span.sc { font-variant: small-caps }
-span.sf { font-family: sans-serif }
-
-
-body.document {
-  font-family: Lobster, sans-serif;
-  font-weight: bolder;
-}
-
-body.chapter {       /* chapter title when `:file #t' */
-  font-family: sans-serif;
-  font-weight: bolder;
-}
-body.section {       /* section title when `:file #t' */
-  font-family: sans-serif;
-  font-weight: bolder;
-}
-
-
-div.skribilo-title {
-  font-size: large;
-  text-align: right;
-  background: #ee7777; /* #dddde0; */
-  border-top-color: black;
-  border-top-style: none;
-  margin: 10px;
-  padding: 10px;
-  border-radius: 10px;
-}
-
-table.author {
-  font-family: Junction, sans-serif;
-  font-style: normal;
-  font-weight: normal;
-  text-align: right;
-}
-
-.skribilo-body {
-  font-family: Junction, sans-serif;
-  font-weight: normal;
-  font-size: normal;
-  text-align: left;
-  line-height: 1.6;
-  background: #ffffff;
-  padding: 0 5% 0 5%;
-}
-
-table.toc {
-  border-spacing: 8px;
-}
-
-.small-toc {
-  text-align: left;
-  font-size: normal;
-  font-weight: normal;
-  background: #eeeef0;
-
-  position: relative;
-  padding: 10px;
-  width: 30%;
-  margin: 30px 0 0 0;
-
-  /* XXX: `float' doesn't play well with tables.  */
-  /* float: right; */
-  /* margin: 0 0 30px 30px; */
-
-  border-width: 1px;
-  border-style: dotted;
-  border-color: #999;
-  border-radius: 5px;
-  -moz-border-radius: 2px;
-}
-
-.skribilo-ending {
-  /* The Skribilo advertising message.  */
-  font-family: sans-serif;
-  font-weight: normal;
-  font-size: small;
-  text-align: right;
-  color: #999;
-  border-top-style: dashed;
-  border-top-width: 1px;
-  border-top-color: #aaa;
-  margin: 20px 0 0 0;
-}
-
-.section-title {
-  background: #eeeef0;
-  font-family: sans-serif;
-  font-weight: bold;
-  font-size: larger;
-  text-align: right;
-}
-
-.subsection-title { font-family: Junction, sans-serif; }
-
-.code-excerpt {
-  background: #eeeef0;
-  font-family: fixed-width, Courier;
-  text-align: left;
-  margin: 20px;
-  padding: 10px 25px 10px 25px;
-  border-width: 0px;
-  align: center;
-}
-
-.skribilo-manual-prgm {				  /* for 'prgm' */
-  font-family: fixed-width, Courier;
-  text-align: left;
-}
-
-.skribilo-manual-disp {				  /* for 'disp' */
-  border-left: 1px dotted black;
-  padding-left: 1em;
-  padding-right: 1em;
-  margin-top: 1em;
-  margin-bottom: 1em;
-  margin-left: 0em;
-  margin-right: 3em;
-  line-height: 1.5;
-}
-
-.skribilo-doc-markup, .skribilo-doc-engine {
-  border-top: 1px dotted #333;
-  background: #fef7f7;
-  border-radius: 0px 0px 10px 10px;
-  padding: 15px;
-}
-
-.skribilo-api-prototype {
-  margin-bottom: 10px;
-}
-
-.skribilo-api-option-name,
-.skribilo-api-argument-name,
-.skribilo-api-engine-custom-name {
-  font-family: monospace, Courier;
-  font-size: 0.9em;
-  display: inline-block;
-  min-width: 120px;
-  vertical-align: top;
-}
-.skribilo-api-engine-custom-name {
-  min-width: 150px;
-}
-.skribilo-api-option-description,
-.skribilo-api-engine-custom-description {
-  display: inline-block;
-  max-width: 80%;
-}
-.skribilo-api-option-engines,
-.skribilo-api-engine-custom-default {
-  border-left: 1px dotted #333;
-  border-right: 1px dotted #333;
-  padding-left: 5px;
-  padding-right: 5px;
-  font-size: 0.9em;
-}
-.skribilo-api-engine-custom-default {
-  color: #333;
-}
-.skribilo-api-see-also {
-  margin-top: 15px;
-}
-/* Links.  */
-
-a { text-decoration: none; border: 0 0 0 0; border-style: none; }
-a:link { color: #333344; }
-a:hover { background: #ee7777; color: #333344; }
-a:visited { color: #443333; }
-
-
-/* Navigation tabs (currently unused) */
-
-div.navtabs-title {
-  padding: 0 0 0 0;
-  margin: 0 0 0 0;
-  border: 0 0 0 0;
-  text-align: left;
-  background: #8381de;
-}
-div.navtabs-tabs {
-  clear: left;
-  margin: 0 0 0 0;
-  border: 0 0 0 0;
-  text-align: left;
-  padding: 0 0 0 20%;
-  background: #8381de;
-}
-div.navtabs-bar {
-  margin: 0 0 0 0;
-  border: 0 0 0 0;
-  text-align: left;
-  border-top-color: black;
-  border-top-style: solid;
-  border-top-width: 1px;
-  padding: 0 0 0 20%;
-  background: #dedeff;
-}
-div.navtabs-tabs {
-  color: black;
-  border-width: 1px;
-  border-color: black;
-  border-style: dotted;
-  padding: 2px 10px 0px 10px;
-  margin: 0 1px 0 0;
-  text-decoration: none;
-  background: #dedeff;
-}
-div.navtabs-tabs {
-  background: white;
-  color: black;
-  border-width: 1px;
-  border-color: black;
-  border-style: dotted;
-  padding: 2px 10px 0px 10px;
-  margin: 0 1px 0 0;
-  text-decoration: none;
-}
-div.navtabs-tabs {
-   background: #8381de;
-}
-
-
-/* Margins */
-
-table.left-margin-menu {
-  border-radius: 10pt;
-  -moz-border-radius: 10pt;
-  background: #eee;
-  margin: 10px;
-}
-
-
-td.skribilo-left-margin {
-  border-width: 0;
-  padding: 0 10px 0 10px;
-  height: 100%;
-  background: #ffffff;
-  font-family: sans-serif, Helvetica, Arial;
-  font-size: small;
-}
-
-div.skribilo-left-margin {
-  position: fixed;
-  /* width: 10%; */
-}
-
-table.skribilo-margins {
-  border-width: 1px 0 0 0;
-  border-style: solid;
-  border-color: black;
-  margin: 0px;
-  height: 100%;
-}
-
-div.skribilo-right-margin {
-  border-width: 0 0 0 1px;
-  border-left-style: solid;
-  border-left-color: black;
-  margin: 0;
-  height: 100%;
-}
-table.skribilo-margins td.skribilo-right-margin {
-  border-bottom-width: 1px;
-  border-bottom-style: solid;
-  border-bottom-color: black;
-}
-
diff --git a/web/static/Hack-Regular.ttf b/doc/user/static/Hack-Regular.ttf
index a35ea2e..a35ea2e 100644
--- a/web/static/Hack-Regular.ttf
+++ b/doc/user/static/Hack-Regular.ttf
Binary files differdiff --git a/web/static/LinBiolinum_Rah.ttf b/doc/user/static/LinBiolinum_Rah.ttf
index 0e92fe4..0e92fe4 100644
--- a/web/static/LinBiolinum_Rah.ttf
+++ b/doc/user/static/LinBiolinum_Rah.ttf
Binary files differdiff --git a/web/static/LinLibertine_Rah.ttf b/doc/user/static/LinLibertine_Rah.ttf
index e1dc224..e1dc224 100644
--- a/web/static/LinLibertine_Rah.ttf
+++ b/doc/user/static/LinLibertine_Rah.ttf
Binary files differdiff --git a/web/static/gears-down.png b/doc/user/static/gears-down.png
index 01ecb39..01ecb39 100644
--- a/web/static/gears-down.png
+++ b/doc/user/static/gears-down.png
Binary files differdiff --git a/web/static/gears-up.png b/doc/user/static/gears-up.png
index a98936d..a98936d 100644
--- a/web/static/gears-up.png
+++ b/doc/user/static/gears-up.png
Binary files differdiff --git a/web/static/graphy.png b/doc/user/static/graphy.png
index e62346f..e62346f 100644
--- a/web/static/graphy.png
+++ b/doc/user/static/graphy.png
Binary files differdiff --git a/web/static/main.css b/doc/user/static/main.css
index 7f4fdbe..7f4fdbe 100644
--- a/web/static/main.css
+++ b/doc/user/static/main.css
diff --git a/doc/user/static/manual.css b/doc/user/static/manual.css
new file mode 100644
index 0000000..afb3fc4
--- /dev/null
+++ b/doc/user/static/manual.css
@@ -0,0 +1,108 @@
+/* -*- coding: utf-8 -*-
+
+   CSS style sheet for the Skribilo manual.
+
+   Copyright 2007, 2008, 2012, 2018 Ludovic Courtès <ludo@gnu.org>
+
+   Copying and distribution of this file, with or without modification,
+   are permitted in any medium without royalty provided the copyright
+   notice and this notice are preserved.  */
+
+@import url("main.css");
+
+pre { font-family: monospace; text-align: left; }
+
+.toc {
+  line-height: 1.8em;
+}
+
+.small-toc {
+  text-align: left;
+  font-size: normal;
+  font-weight: normal;
+  background: #f6f6fa;
+
+  position: relative;
+  padding: 10px;
+  width: 30%;
+  margin: 30px 0 0 0;
+
+  /* XXX: `float' doesn't play well with tables.  */
+  /* float: right; */
+  /* margin: 0 0 30px 30px; */
+
+  border-width: 1px;
+  border-style: dotted;
+  border-color: #999;
+  border-radius: 5px;
+  -moz-border-radius: 2px;
+}
+
+.code-excerpt {
+  background: #eeeef0;
+  font-family: fixed-width, Courier;
+  text-align: left;
+  margin: 20px;
+  padding: 10px 25px 10px 25px;
+  border-width: 0px;
+  align: center;
+}
+
+.skribilo-manual-prgm {				  /* for 'prgm' */
+  font-family: fixed-width, Courier;
+  text-align: left;
+}
+
+.skribilo-manual-disp {				  /* for 'disp' */
+  border-left: 1px dotted black;
+  padding-left: 1em;
+  padding-right: 1em;
+  margin-top: 1em;
+  margin-bottom: 1em;
+  margin-left: 0em;
+  margin-right: 3em;
+  line-height: 1.5;
+}
+
+.skribilo-doc-markup, .skribilo-doc-engine {
+  border-top: 1px dotted #333;
+  background: #fef7f7;
+  border-radius: 0px 0px 10px 10px;
+  padding: 15px;
+}
+
+.skribilo-api-prototype {
+  margin-bottom: 10px;
+}
+
+.skribilo-api-option-name,
+.skribilo-api-argument-name,
+.skribilo-api-engine-custom-name {
+  font-family: monospace, Courier;
+  font-size: 0.9em;
+  display: inline-block;
+  min-width: 120px;
+  vertical-align: top;
+}
+.skribilo-api-engine-custom-name {
+  min-width: 150px;
+}
+.skribilo-api-option-description,
+.skribilo-api-engine-custom-description {
+  display: inline-block;
+  max-width: 80%;
+}
+.skribilo-api-option-engines,
+.skribilo-api-engine-custom-default {
+  border-left: 1px dotted #333;
+  border-right: 1px dotted #333;
+  padding-left: 5px;
+  padding-right: 5px;
+  font-size: 0.9em;
+}
+.skribilo-api-engine-custom-default {
+  color: #333;
+}
+.skribilo-api-see-also {
+  margin-top: 15px;
+}
diff --git a/web/static/normalize.css b/doc/user/static/normalize.css
index 9bedce7..9bedce7 100755
--- a/web/static/normalize.css
+++ b/doc/user/static/normalize.css
diff --git a/web/static b/web/static
new file mode 120000
index 0000000..e5f3c9b
--- /dev/null
+++ b/web/static
@@ -0,0 +1 @@
+../doc/user/static
\ No newline at end of file