mirror of
https://github.com/boostorg/boost.git
synced 2025-04-05 13:35:00 +00:00
Merge Boostbook.
- Support some colour roles (thanks to Paul Bristow). - Support assignment return types in doxygen2boostbook. Fixes #9241. - Fix virtual methods in doxygen2boostbook. - Add newlines to doxygen2boostbook to make the output a tad more readable. - Improved last-revision handling. - Support noexcept and constexpr in doxygen2boostbook. - Improved boostbook for virtual and explicit methods from doxygen2boostbook. - Support `language="c++"` attribute for `code` and `programlisting` elements. - Use that to do syntax highlighting for doxygen2boostbook. [SVN r86725]
This commit is contained in:
Daniel James
parent
42ca4a2666
commit
ae84ecd65a
2 changed files with 100 additions and 46 deletions
|
|
@ -1,13 +1,17 @@
|
|||
/*=============================================================================
|
||||
Copyright (c) 2004 Joel de Guzman
|
||||
http://spirit.sourceforge.net/
|
||||
|
||||
Distributed under the Boost Software License, Version 1.0. (See accompany-
|
||||
ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
/*=============================================================================
|
||||
Copyright (c) 2004 Joel de Guzman
|
||||
http://spirit.sourceforge.net/
|
||||
|
||||
Copyright 2013 Niall Douglas additions for colors and alignment.
|
||||
Copyright 2013 Paul A. Bristow additions for more colors and alignments.
|
||||
|
||||
Distributed under the Boost Software License, Version 1.0. (See accompany-
|
||||
ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
=============================================================================*/
|
||||
|
||||
/*=============================================================================
|
||||
Body defaults
|
||||
Body defaults
|
||||
=============================================================================*/
|
||||
|
||||
body
|
||||
|
|
@ -17,7 +21,7 @@
|
|||
}
|
||||
|
||||
/*=============================================================================
|
||||
Paragraphs
|
||||
Paragraphs
|
||||
=============================================================================*/
|
||||
|
||||
p
|
||||
|
|
@ -28,7 +32,7 @@
|
|||
}
|
||||
|
||||
/*=============================================================================
|
||||
Program listings
|
||||
Program listings
|
||||
=============================================================================*/
|
||||
|
||||
/* Code on paragraphs */
|
||||
|
|
@ -58,11 +62,11 @@
|
|||
td .screen
|
||||
{
|
||||
margin: 0pc 0pc 0pc 0pc;
|
||||
padding: 0pc 0pc 0pc 0pc;
|
||||
padding: 0pc 0pc 0pc 0pc;
|
||||
}
|
||||
|
||||
/*=============================================================================
|
||||
Headings
|
||||
Headings
|
||||
=============================================================================*/
|
||||
|
||||
h1, h2, h3, h4, h5, h6
|
||||
|
|
@ -116,13 +120,13 @@
|
|||
h1 tt.computeroutput { font-size: 140% }
|
||||
h2 tt.computeroutput { font-size: 140% }
|
||||
h3 tt.computeroutput { font-size: 130% }
|
||||
h4 tt.computeroutput { font-size: 130% }
|
||||
h4 tt.computeroutput { font-size: 130% }
|
||||
h5 tt.computeroutput { font-size: 130% }
|
||||
h6 tt.computeroutput { font-size: 130% }
|
||||
|
||||
|
||||
/*=============================================================================
|
||||
Author
|
||||
Author
|
||||
=============================================================================*/
|
||||
|
||||
h3.author
|
||||
|
|
@ -131,7 +135,7 @@
|
|||
}
|
||||
|
||||
/*=============================================================================
|
||||
Lists
|
||||
Lists
|
||||
=============================================================================*/
|
||||
|
||||
li
|
||||
|
|
@ -153,7 +157,7 @@
|
|||
}
|
||||
|
||||
/*=============================================================================
|
||||
Links
|
||||
Links
|
||||
=============================================================================*/
|
||||
|
||||
a
|
||||
|
|
@ -167,7 +171,7 @@
|
|||
}
|
||||
|
||||
/*=============================================================================
|
||||
Spirit style navigation
|
||||
Spirit style navigation
|
||||
=============================================================================*/
|
||||
|
||||
.spirit-nav
|
||||
|
|
@ -187,7 +191,7 @@
|
|||
}
|
||||
|
||||
/*=============================================================================
|
||||
Copyright footer
|
||||
Copyright footer
|
||||
=============================================================================*/
|
||||
.copyright-footer
|
||||
{
|
||||
|
|
@ -202,7 +206,7 @@
|
|||
}
|
||||
|
||||
/*=============================================================================
|
||||
Table of contents
|
||||
Table of contents
|
||||
=============================================================================*/
|
||||
|
||||
div.toc
|
||||
|
|
@ -218,7 +222,7 @@
|
|||
float: right;
|
||||
padding: 0.5pc;
|
||||
}
|
||||
|
||||
|
||||
/* Code on toc */
|
||||
.toc .computeroutput { font-size: 120% }
|
||||
|
||||
|
|
@ -227,7 +231,7 @@
|
|||
.toc dl dl { margin: 0; }
|
||||
|
||||
/*=============================================================================
|
||||
Tables
|
||||
Tables
|
||||
=============================================================================*/
|
||||
|
||||
.table-title,
|
||||
|
|
@ -286,7 +290,7 @@
|
|||
}
|
||||
|
||||
/*=============================================================================
|
||||
Blurbs
|
||||
Blurbs
|
||||
=============================================================================*/
|
||||
|
||||
div.note,
|
||||
|
|
@ -309,7 +313,7 @@
|
|||
}
|
||||
|
||||
/*=============================================================================
|
||||
Variable Lists
|
||||
Variable Lists
|
||||
=============================================================================*/
|
||||
|
||||
div.variablelist
|
||||
|
|
@ -354,7 +358,7 @@
|
|||
}
|
||||
|
||||
/*=============================================================================
|
||||
Misc
|
||||
Misc
|
||||
=============================================================================*/
|
||||
|
||||
/* Title of books and articles in bibliographies */
|
||||
|
|
@ -380,7 +384,7 @@
|
|||
}
|
||||
|
||||
/*=============================================================================
|
||||
Colors
|
||||
Colors
|
||||
=============================================================================*/
|
||||
|
||||
@media screen
|
||||
|
|
@ -391,16 +395,16 @@
|
|||
}
|
||||
|
||||
/* Syntax Highlighting */
|
||||
.keyword { color: #0000AA; }
|
||||
.identifier { color: #000000; }
|
||||
.special { color: #707070; }
|
||||
.preprocessor { color: #402080; }
|
||||
.char { color: teal; }
|
||||
.comment { color: #800000; }
|
||||
.string { color: teal; }
|
||||
.number { color: teal; }
|
||||
.white_bkd { background-color: #FFFFFF; }
|
||||
.dk_grey_bkd { background-color: #999999; }
|
||||
.keyword { color: #0000AA; }
|
||||
.identifier { color: #000000; }
|
||||
.special { color: #707070; }
|
||||
.preprocessor { color: #402080; }
|
||||
.char { color: teal; }
|
||||
.comment { color: #800000; }
|
||||
.string { color: teal; }
|
||||
.number { color: teal; }
|
||||
.white_bkd { background-color: #FFFFFF; }
|
||||
.dk_grey_bkd { background-color: #999999; }
|
||||
|
||||
/* Links */
|
||||
a, a .keyword, a .identifier, a .special, a .preprocessor
|
||||
|
|
@ -572,7 +576,7 @@
|
|||
}
|
||||
|
||||
/*=============================================================================
|
||||
Images
|
||||
Images
|
||||
=============================================================================*/
|
||||
|
||||
span.inlinemediaobject img
|
||||
|
|
@ -581,36 +585,36 @@
|
|||
}
|
||||
|
||||
/*==============================================================================
|
||||
Super and Subscript: style so that line spacing isn't effected, see
|
||||
http://www.adobe.com/cfusion/communityengine/index.cfm?event=showdetails&productId=1&postId=5341
|
||||
Super and Subscript: style so that line spacing isn't effected, see
|
||||
http://www.adobe.com/cfusion/communityengine/index.cfm?event=showdetails&productId=1&postId=5341
|
||||
==============================================================================*/
|
||||
|
||||
sup,
|
||||
sub {
|
||||
height: 0;
|
||||
line-height: 1;
|
||||
vertical-align: baseline;
|
||||
position: relative;
|
||||
|
||||
height: 0;
|
||||
line-height: 1;
|
||||
vertical-align: baseline;
|
||||
position: relative;
|
||||
|
||||
}
|
||||
|
||||
/* For internet explorer: */
|
||||
|
||||
* html sup,
|
||||
* html sub {
|
||||
vertical-align: bottom;
|
||||
vertical-align: bottom;
|
||||
}
|
||||
|
||||
sup {
|
||||
bottom: 1ex;
|
||||
bottom: 1ex;
|
||||
}
|
||||
|
||||
sub {
|
||||
top: .5ex;
|
||||
top: .5ex;
|
||||
}
|
||||
|
||||
/*==============================================================================
|
||||
Indexes: pretty much the same as the TOC.
|
||||
Indexes: pretty much the same as the TOC.
|
||||
==============================================================================*/
|
||||
|
||||
.index
|
||||
|
|
@ -644,3 +648,53 @@ sub {
|
|||
font-weight: bold;
|
||||
}
|
||||
|
||||
|
||||
/*==============================================================================
|
||||
Alignment and coloring use 'role' feature, available from Quickbook 1.6 up.
|
||||
Added from Niall Douglas for role color and alignment.
|
||||
http://article.gmane.org/gmane.comp.lib.boost.devel/243318
|
||||
*/
|
||||
|
||||
/* Add text alignment (see http://www.w3schools.com/cssref/pr_text_text-align.asp) */
|
||||
span.aligncenter
|
||||
{
|
||||
display: inline-block; width: 100%; text-align: center;
|
||||
}
|
||||
span.alignright
|
||||
{
|
||||
display: inline-block; width: 100%; text-align: right;
|
||||
}
|
||||
/* alignleft is the default. */
|
||||
span.alignleft
|
||||
{
|
||||
display: inline-block; width: 100%; text-align: left;
|
||||
}
|
||||
|
||||
/* alignjustify stretches the word spacing so that each line has equal width
|
||||
within a chosen fraction of page width (here arbitrarily 20%).
|
||||
*Not* useful inside table items as the column width remains the total string width.
|
||||
Nor very useful, except to temporarily restrict the width.
|
||||
*/
|
||||
span.alignjustify
|
||||
{
|
||||
display: inline-block; width: 20%; text-align: justify;
|
||||
}
|
||||
|
||||
/* Text colors.
|
||||
Names at http://www.w3.org/TR/2002/WD-css3-color-20020219/ 4.3. X11 color keywords.
|
||||
Quickbook Usage: [role red Some red text]
|
||||
|
||||
*/
|
||||
span.red { inline-block; color: red; }
|
||||
span.green { color: green; }
|
||||
span.lime { color: #00FF00; }
|
||||
span.blue { color: blue; }
|
||||
span.navy { color: navy; }
|
||||
span.yellow { color: yellow; }
|
||||
span.magenta { color: magenta; }
|
||||
span.indigo { color: #4B0082; }
|
||||
span.cyan { color: cyan; }
|
||||
span.purple { color: purple; }
|
||||
span.gold { color: gold; }
|
||||
span.silver { color: silver; } /* lighter gray */
|
||||
span.gray { color: #808080; } /* light gray */
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit dfe3b4dfe56919f0f09bc7cb5a02d6ea34322aa7
|
||||
Subproject commit ebfbc08fce7aac9c79b82cb9286b255825e96264
|
||||
Loading…
Add table
Reference in a new issue