From c02248dd1f422be47454d1febbab31ecfa413b8e Mon Sep 17 00:00:00 2001 From: Gracjan Polak Date: Sun, 17 May 2015 19:56:27 +0200 Subject: [PATCH 1/3] Move copying to better place in html manual. --- haskell-mode.texi | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/haskell-mode.texi b/haskell-mode.texi index 0355e8e64..68a25d8b7 100644 --- a/haskell-mode.texi +++ b/haskell-mode.texi @@ -37,15 +37,6 @@ Front-Cover Texts and no Back-Cover Texts. @contents @end iftex -@ifhtml -@titlepage -@title Haskell Mode -@subtitle Haskell Development Environment for Emacs - -@end titlepage -@insertcopying -@end ifhtml - @ifnottex @node Top @top Haskell Mode @@ -74,6 +65,11 @@ interpreter (e.g. GHCi). * Variable index:: @end menu +@ifhtml +@insertcopying +@end ifhtml + + @node Introduction @chapter Introduction From b8cf39a982ff6d6f6c8f72348234b7018b44e712 Mon Sep 17 00:00:00 2001 From: Gracjan Polak Date: Sun, 17 May 2015 20:00:49 +0200 Subject: [PATCH 2/3] Ensure English in manual. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fa14a9bd2..761a4c7a0 100644 --- a/Makefile +++ b/Makefile @@ -131,10 +131,10 @@ haskell-mode.info: haskell-mode.texi @rm haskell-mode-menu-order.txt haskell-mode-content-order.txt # Processing proper - $(MAKEINFO) $(MAKEINFO_FLAGS) -o $@ $< + LANG=en_US.UTF-8 $(MAKEINFO) $(MAKEINFO_FLAGS) -o $@ $< haskell-mode.html: haskell-mode.texi - $(MAKEINFO) $(MAKEINFO_FLAGS) --html --no-split -o $@ $< + LANG=en_US.UTF-8 $(MAKEINFO) $(MAKEINFO_FLAGS) --html --no-split -o $@ $< $(AUTOLOADS): $(ELFILES) haskell-mode.elc $(BATCH) \ From 21c596048af3d401ef50ef52e546211e9d7e9c58 Mon Sep 17 00:00:00 2001 From: Gracjan Polak Date: Sun, 17 May 2015 20:34:03 +0200 Subject: [PATCH 3/3] Improve html manual. Add split version of html manual, add css styling. --- Makefile | 22 ++++++++++++++++++++-- haskell-mode.css | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 haskell-mode.css diff --git a/Makefile b/Makefile index 761a4c7a0..3906c693e 100644 --- a/Makefile +++ b/Makefile @@ -133,8 +133,26 @@ haskell-mode.info: haskell-mode.texi # Processing proper LANG=en_US.UTF-8 $(MAKEINFO) $(MAKEINFO_FLAGS) -o $@ $< -haskell-mode.html: haskell-mode.texi - LANG=en_US.UTF-8 $(MAKEINFO) $(MAKEINFO_FLAGS) --html --no-split -o $@ $< +haskell-mode.html: haskell-mode.texi haskell-mode.css + LANG=en_US.UTF-8 $(MAKEINFO) $(MAKEINFO_FLAGS) --html --css-include=haskell-mode.css --no-split -o $@ $< + +html/index.html : haskell-mode.texi + if [ -e html ]; then rm -r html; fi + LANG=en_US.UTF-8 $(MAKEINFO) $(MAKEINFO_FLAGS) --html \ + --css-ref=haskell-mode.css \ + -c AFTER_BODY_OPEN="
" \ + -c SHOW_TITLE=0 \ + -o html $< + +html/haskell-mode.css : haskell-mode.css html/index.html + cp $< $@ + +html/images/haskell-mode.svg : images/haskell-mode.svg html/index.html + mkdir -p html/images + cp $< $@ + +html : html/index.html html/haskell-mode.css html/images/haskell-mode.svg + $(AUTOLOADS): $(ELFILES) haskell-mode.elc $(BATCH) \ diff --git a/haskell-mode.css b/haskell-mode.css new file mode 100644 index 000000000..0d575dd55 --- /dev/null +++ b/haskell-mode.css @@ -0,0 +1,33 @@ +@charset "UTF-8"; +@import url("http://fonts.googleapis.com/css?family=Lato:400,400italic,700,700italic&subset=latin,latin-ext"); +@import url("http://fonts.googleapis.com/css?family=Source Code Pro"); + +body {font-family: Lato, Arial, sans-serif; font-feature-settings: "kern", "liga", "clig", "calt"; font-size: 14pt; line-height: 1.35; } +body {width: 800px; margin: 0 auto;} +table.menu {width: 700px; margin-left: 50px; } +/* makeinfo 5.2 */ +div.header p {margin: 0; text-align: right;} +div.header {background-color: #9a98bd; background: linear-gradient(#CDCCDE,#A9A7CD);} +/* makeinfo 4.8 */ +div.node {background-color: #9a98bd; background: linear-gradient(#CDCCDE,#A9A7CD);} +div.node p {margin: 0; text-align: right;} +div.node hr {margin: 0;} + +div.footnote h3 {display: inline; font-size: normal;} +/* makeinfo up to 5.2 cannot pass on unicode characters without messing them up */ +a[rel="up"]:before {content: " \2191 "; /* ↑ */} +a[rel="prev"]:before {content: " \2190 "; /* ← */} +a[rel="next"]:before {content: " \2192 "; /* → */} +code, kbd, samp, pre { font-family: "Source Code Pro", Menlo, Inconsolata, monospace;} +kbd {font-style:normal} +div.background { + position: fixed; + right: 30px; + bottom: 0px; + width: 256px; + height: 256px; + opacity: 0.3; + background-image: url("images/haskell-mode.svg"); + background-repeat: no-repeat; + background-size: 256px 256px; +}