Skip to content

Commit 6097e2f

Browse files
committed
Merge pull request #653 from gracjan/pr-improve-manual
Improve html manual
2 parents 8aef144 + 21c5960 commit 6097e2f

File tree

3 files changed

+59
-12
lines changed

3 files changed

+59
-12
lines changed

Makefile

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,28 @@ haskell-mode.info: haskell-mode.texi
131131
@rm haskell-mode-menu-order.txt haskell-mode-content-order.txt
132132

133133
# Processing proper
134-
$(MAKEINFO) $(MAKEINFO_FLAGS) -o $@ $<
134+
LANG=en_US.UTF-8 $(MAKEINFO) $(MAKEINFO_FLAGS) -o $@ $<
135+
136+
haskell-mode.html: haskell-mode.texi haskell-mode.css
137+
LANG=en_US.UTF-8 $(MAKEINFO) $(MAKEINFO_FLAGS) --html --css-include=haskell-mode.css --no-split -o $@ $<
138+
139+
html/index.html : haskell-mode.texi
140+
if [ -e html ]; then rm -r html; fi
141+
LANG=en_US.UTF-8 $(MAKEINFO) $(MAKEINFO_FLAGS) --html \
142+
--css-ref=haskell-mode.css \
143+
-c AFTER_BODY_OPEN="<div class='background'> </div>" \
144+
-c SHOW_TITLE=0 \
145+
-o html $<
146+
147+
html/haskell-mode.css : haskell-mode.css html/index.html
148+
cp $< $@
149+
150+
html/images/haskell-mode.svg : images/haskell-mode.svg html/index.html
151+
mkdir -p html/images
152+
cp $< $@
153+
154+
html : html/index.html html/haskell-mode.css html/images/haskell-mode.svg
135155

136-
haskell-mode.html: haskell-mode.texi
137-
$(MAKEINFO) $(MAKEINFO_FLAGS) --html --no-split -o $@ $<
138156

139157
$(AUTOLOADS): $(ELFILES) haskell-mode.elc
140158
$(BATCH) \

haskell-mode.css

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
@charset "UTF-8";
2+
@import url("http://fonts.googleapis.com/css?family=Lato:400,400italic,700,700italic&subset=latin,latin-ext");
3+
@import url("http://fonts.googleapis.com/css?family=Source Code Pro");
4+
5+
body {font-family: Lato, Arial, sans-serif; font-feature-settings: "kern", "liga", "clig", "calt"; font-size: 14pt; line-height: 1.35; }
6+
body {width: 800px; margin: 0 auto;}
7+
table.menu {width: 700px; margin-left: 50px; }
8+
/* makeinfo 5.2 */
9+
div.header p {margin: 0; text-align: right;}
10+
div.header {background-color: #9a98bd; background: linear-gradient(#CDCCDE,#A9A7CD);}
11+
/* makeinfo 4.8 */
12+
div.node {background-color: #9a98bd; background: linear-gradient(#CDCCDE,#A9A7CD);}
13+
div.node p {margin: 0; text-align: right;}
14+
div.node hr {margin: 0;}
15+
16+
div.footnote h3 {display: inline; font-size: normal;}
17+
/* makeinfo up to 5.2 cannot pass on unicode characters without messing them up */
18+
a[rel="up"]:before {content: " \2191 "; /* ↑ */}
19+
a[rel="prev"]:before {content: " \2190 "; /* ← */}
20+
a[rel="next"]:before {content: " \2192 "; /* → */}
21+
code, kbd, samp, pre { font-family: "Source Code Pro", Menlo, Inconsolata, monospace;}
22+
kbd {font-style:normal}
23+
div.background {
24+
position: fixed;
25+
right: 30px;
26+
bottom: 0px;
27+
width: 256px;
28+
height: 256px;
29+
opacity: 0.3;
30+
background-image: url("images/haskell-mode.svg");
31+
background-repeat: no-repeat;
32+
background-size: 256px 256px;
33+
}

haskell-mode.texi

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,6 @@ Front-Cover Texts and no Back-Cover Texts.
3737
@contents
3838
@end iftex
3939

40-
@ifhtml
41-
@titlepage
42-
@title Haskell Mode
43-
@subtitle Haskell Development Environment for Emacs
44-
45-
@end titlepage
46-
@insertcopying
47-
@end ifhtml
48-
4940
@ifnottex
5041
@node Top
5142
@top Haskell Mode
@@ -74,6 +65,11 @@ interpreter (e.g. GHCi).
7465
* Variable index::
7566
@end menu
7667

68+
@ifhtml
69+
@insertcopying
70+
@end ifhtml
71+
72+
7773
@node Introduction
7874
@chapter Introduction
7975

0 commit comments

Comments
 (0)