From 567fb182927ee8ddb984205ace082be4822e3e43 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 11 Feb 2016 11:35:17 +0200 Subject: Factor intro pro/epilogues to doc/style submodule --- doc/cli.sh | 8 +++--- doc/doc-epilogue.xhtml | 1 + doc/doc-prologue.xhtml | 1 + doc/doc.html2ps | 1 + doc/intro-epilogue.xhtml | 4 --- doc/intro-prologue.xhtml | 47 ---------------------------------- doc/intro.cli | 2 ++ doc/intro.html2ps | 66 ------------------------------------------------ doc/style | 2 +- 9 files changed, 10 insertions(+), 122 deletions(-) create mode 120000 doc/doc-epilogue.xhtml create mode 120000 doc/doc-prologue.xhtml create mode 120000 doc/doc.html2ps delete mode 100644 doc/intro-epilogue.xhtml delete mode 100644 doc/intro-prologue.xhtml delete mode 100644 doc/intro.html2ps diff --git a/doc/cli.sh b/doc/cli.sh index b12cc46..65ccf63 100755 --- a/doc/cli.sh +++ b/doc/cli.sh @@ -24,14 +24,14 @@ done cli -I .. -v version="$version" -v date="$date" \ --generate-html --html-suffix .xhtml \ ---html-prologue-file intro-prologue.xhtml \ ---html-epilogue-file intro-epilogue.xhtml \ +--html-prologue-file doc-prologue.xhtml \ +--html-epilogue-file doc-epilogue.xhtml \ --link-regex '%b([-.].+)%../../build2/doc/b$1%' \ --link-regex '%bpkg([-.].+)%../../bpkg/doc/bpkg$1%' \ --output-prefix build2-toolchain- intro.cli -html2ps -f intro.html2ps:a4.html2ps -o build2-toolchain-intro-a4.ps build2-toolchain-intro.xhtml +html2ps -f doc.html2ps:a4.html2ps -o build2-toolchain-intro-a4.ps build2-toolchain-intro.xhtml ps2pdf14 -sPAPERSIZE=a4 -dOptimize=true -dEmbedAllFonts=true build2-toolchain-intro-a4.ps build2-toolchain-intro-a4.pdf -html2ps -f intro.html2ps:letter.html2ps -o build2-toolchain-intro-letter.ps build2-toolchain-intro.xhtml +html2ps -f doc.html2ps:letter.html2ps -o build2-toolchain-intro-letter.ps build2-toolchain-intro.xhtml ps2pdf14 -sPAPERSIZE=letter -dOptimize=true -dEmbedAllFonts=true build2-toolchain-intro-letter.ps build2-toolchain-intro-letter.pdf diff --git a/doc/doc-epilogue.xhtml b/doc/doc-epilogue.xhtml new file mode 120000 index 0000000..5111ca2 --- /dev/null +++ b/doc/doc-epilogue.xhtml @@ -0,0 +1 @@ +style/doc-epilogue.xhtml \ No newline at end of file diff --git a/doc/doc-prologue.xhtml b/doc/doc-prologue.xhtml new file mode 120000 index 0000000..e1fd108 --- /dev/null +++ b/doc/doc-prologue.xhtml @@ -0,0 +1 @@ +style/doc-prologue.xhtml \ No newline at end of file diff --git a/doc/doc.html2ps b/doc/doc.html2ps new file mode 120000 index 0000000..dc19855 --- /dev/null +++ b/doc/doc.html2ps @@ -0,0 +1 @@ +style/doc.html2ps \ No newline at end of file diff --git a/doc/intro-epilogue.xhtml b/doc/intro-epilogue.xhtml deleted file mode 100644 index aa5a7c3..0000000 --- a/doc/intro-epilogue.xhtml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/doc/intro-prologue.xhtml b/doc/intro-prologue.xhtml deleted file mode 100644 index 952f724..0000000 --- a/doc/intro-prologue.xhtml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - The build2 Toolchain Introduction - - - - - -

- -

- -

-

The build2 Toolchain Introduction

- -

Copyright © 2014-2016 Code - Synthesis Ltd
- Permission is granted to copy, distribute and/or modify this document - under the terms of the MIT License.

- -

Revision $version$ , $date$
- This revision of the document describes the build2 - toolchain $version$.x series and is available in the following - formats: - XHTML, - PDF/A4, - PDF/Letter, - PostScript/A4, and - PostScript/Letter.

-

- -

Table of Contents

- -$TOC$ - -

diff --git a/doc/intro.cli b/doc/intro.cli index 5224e0d..b9b8a28 100644 --- a/doc/intro.cli +++ b/doc/intro.cli @@ -3,6 +3,8 @@ // license : MIT; see accompanying LICENSE file "\name=build2-toolchain-intro" +"\subject=toolchain" +"\title=Toolchain Introduction" // TODO // diff --git a/doc/intro.html2ps b/doc/intro.html2ps deleted file mode 100644 index 1a3b352..0000000 --- a/doc/intro.html2ps +++ /dev/null @@ -1,66 +0,0 @@ -@html2ps { - option { - toc: hb; - colour: 1; - hyphenate: 1; - titlepage: 1; - } - - datefmt: "%B %Y"; - - titlepage { - content: " -

-

The `build2` Toolchain Introduction

-

-

-

-

-

-

-

-

-

-

-

Copyright © 2014-2016 Code Synthesis Ltd
- Permission is granted to copy, distribute and/or modify this document under - the terms of the MIT License.

- -

Revision $[version], $D
- This revision of the document describes the build2 toolchain - $[version].x series.

"; - } - - toc { - indent: 2em; - } - - header { - odd-right: $H; - even-left: $H; - } - - footer { - odd-left: Revision $[version], $D; - odd-center: $T; - odd-right: $N; - - even-left: $N; - even-center: $T; - even-right: Revision $[version], $D; - } -} - -body { - font-size: 12pt; - text-align: justify; - background: white; -} - -code { - font-size: 9pt; -} - -pre { - font-size: 9pt; -} diff --git a/doc/style b/doc/style index 06a3934..88bef7f 160000 --- a/doc/style +++ b/doc/style @@ -1 +1 @@ -Subproject commit 06a3934fd76a32a752062d424a6cfc98edd543ad +Subproject commit 88bef7fa19d595b64944edc38696bb1ceadba2fb -- cgit v1.1