Skip to content

Commit 27c5f93

Browse files
committed
---
yaml --- r: 149866 b: refs/heads/try2 c: 7ec1eb8 h: refs/heads/master v: v3
1 parent 3a73394 commit 27c5f93

File tree

3 files changed

+9
-16
lines changed

3 files changed

+9
-16
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 7979ae53678e6d1a1f8455ee543986498afa270f
8+
refs/heads/try2: 7ec1eb8ab373ad5dfd3d9229c6f89a02424d2b82
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/docs.mk

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUSTDOC_HTML_OPTS = --markdown-css rust.css \
4646
--markdown-in-header=doc/favicon.inc --markdown-after-content=doc/footer.inc
4747

4848
PANDOC_BASE_OPTS := --standalone --toc --number-sections
49-
PANDOC_TEX_OPTS = $(PANDOC_BASE_OPTS) --include-before-body=doc/version.md \
49+
PANDOC_TEX_OPTS = $(PANDOC_BASE_OPTS) --include-before-body=doc/version.tex \
5050
--from=markdown --include-before-body=doc/footer.tex --to=latex
5151
PANDOC_EPUB_OPTS = $(PANDOC_BASE_OPTS) --to=epub
5252

@@ -100,7 +100,7 @@ endif
100100
# Rust version
101101
######################################################################
102102

103-
doc/version.md: $(MKFILE_DEPS) $(wildcard $(D)/*.*) | doc/
103+
doc/version.tex: $(MKFILE_DEPS) $(wildcard $(D)/*.*) | doc/
104104
@$(call E, version-stamp: $@)
105105
$(Q)echo "$(CFG_VERSION)" >$@
106106

@@ -112,7 +112,7 @@ doc/version_info.html: $(D)/version_info.html.template $(MKFILE_DEPS) \
112112
$(CFG_VER_HASH) | head -c 8)/;\
113113
s/STAMP/$(CFG_VER_HASH)/;" $< >$@
114114

115-
GENERATED += doc/version.md doc/version_info.html
115+
GENERATED += doc/version.tex doc/version_info.html
116116

117117
######################################################################
118118
# Docs, from rustdoc and sometimes pandoc
@@ -140,10 +140,6 @@ doc/footer.inc: $(D)/footer.inc | doc/
140140
@$(call E, cp: $@)
141141
$(Q)cp -a $< $@ 2> /dev/null
142142

143-
doc/footer.tex: $(D)/footer.tex | doc/
144-
@$(call E, cp: $@)
145-
$(Q)cp -a $< $@ 2> /dev/null
146-
147143
# The (english) documentation for each doc item.
148144

149145
define DEF_SHOULD_BUILD_PDF_DOC
@@ -167,9 +163,13 @@ doc/$(1).epub: $$(D)/$(1).md | doc/
167163
@$$(call E, pandoc: $$@)
168164
$$(CFG_PANDOC) $$(PANDOC_EPUB_OPTS) $$< --output=$$@
169165

166+
doc/footer.tex: $(D)/footer.inc | doc/
167+
@$$(call E, pandoc: $$@)
168+
$$(CFG_PANDOC) --from=html --to=latex $$< --output=$$@
169+
170170
# PDF (md =(pandoc)=> tex =(pdflatex)=> pdf)
171171
DOC_TARGETS += doc/$(1).tex
172-
doc/$(1).tex: $$(D)/$(1).md doc/footer.tex doc/version.md | doc/
172+
doc/$(1).tex: $$(D)/$(1).md doc/footer.tex doc/version.tex | doc/
173173
@$$(call E, pandoc: $$@)
174174
$$(CFG_PANDOC) $$(PANDOC_TEX_OPTS) $$< --output=$$@
175175

branches/try2/src/doc/footer.tex

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)