Skip to content

Commit

Permalink
update P0547: Assorted Object Concept Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ericniebler committed Jun 10, 2017
1 parent f05e4ff commit 565c767
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 373 deletions.
6 changes: 3 additions & 3 deletions ext/constructible/Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
DOCNO = 0547
DOCNO = 0547R1
PD = P
SOURCE = constructible.md
TARGET = $(PD)$(DOCNO)

PANDOC = pandoc

$(TARGET).html: $(SOURCE) header.html pandoc-template.html
$(PANDOC) -f markdown_github+yaml_metadata_block+citations -t html -o $@ --filter pandoc-citeproc --csl=acm-sig-proceedings.csl --number-sections --toc -s -S --template=pandoc-template --include-before-body=header.html --include-in-header=pandoc.css $<
$(PANDOC) -f markdown_github+yaml_metadata_block -t html -o $@ --number-sections --toc -s -S --template=pandoc-template --include-before-body=header.html --include-in-header=pandoc.css $<

$(TARGET).pdf: $(SOURCE)
$(PANDOC) -f markdown_github+yaml_metadata_block+citations -t latex -o $@ --filter pandoc-citeproc --csl=acm-sig-proceedings.csl --number-sections --toc -s -S $<
$(PANDOC) -f markdown_github+yaml_metadata_block -t latex -o $@ --number-sections --toc -s -S $<

header.html: header.html.in Makefile
sed 's/%%DOCNO%%/$(TARGET)/g' < $< > $@
Expand Down
Loading

1 comment on commit 565c767

@CaseyCarter
Copy link
Collaborator

@CaseyCarter CaseyCarter commented on 565c767 Jun 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This incorporates #330, #399, #381, and #387.

EDIT: I'm making this remark so github will link the issues here.)

Please sign in to comment.