boost_mirror/boostbook
1
0
Fork 0
mirror of https://github.com/boostorg/boostbook.git synced 2025-05-09 15:03:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Daniel James 2014-03-25 21:47:20 +00:00
commit 657ca5ad1c
4 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/boostbook.xml
View File

@ -140,9 +140,9 @@ std::cout << f(5, 3) >> std::endl;
happen in the BBv2 user configuration file, happen in the BBv2 user configuration file,
<filename>user-config.jam</filename>. If you do not have a copy <filename>user-config.jam</filename>. If you do not have a copy
of this file in your home directory, you should copy the one of this file in your home directory, you should copy the one
that resides in <code>tools/build/v2</code> to your home that resides in <code>tools/build/</code> to your home
directory. Alternatively, you can edit directory. Alternatively, you can edit
<filename>tools/build/v2/user-config.jam</filename> directly or <filename>tools/build/user-config.jam</filename> directly or
a site-wide <filename>site-config.jam</filename> file.</para> a site-wide <filename>site-config.jam</filename> file.</para>
<section id="boostbook.setup.xsltproc"> <section id="boostbook.setup.xsltproc">

6
setup_boostbook.py
View File

@ -242,8 +242,8 @@ def find_user_config():
JAM_CONFIG_IN_TEMP="yes" JAM_CONFIG_IN_TEMP="yes"
print " Updating Boost.Jam configuration in %s... " % JAM_CONFIG_OUT print " Updating Boost.Jam configuration in %s... " % JAM_CONFIG_OUT
return JAM_CONFIG_OUT return JAM_CONFIG_OUT
elif os.environ.has_key( "BOOST_ROOT" ) and os.path.exists( os.path.join( os.environ[ "BOOST_ROOT" ], "tools/build/v2/user-config.jam" ) ): elif os.environ.has_key( "BOOST_ROOT" ) and os.path.exists( os.path.join( os.environ[ "BOOST_ROOT" ], "tools/build/user-config.jam" ) ):
JAM_CONFIG_IN=os.path.join( os.environ[ "BOOST_ROOT" ], "tools/build/v2/user-config.jam" ) JAM_CONFIG_IN=os.path.join( os.environ[ "BOOST_ROOT" ], "tools/build/user-config.jam" )
print " Found user-config.jam in BOOST_ROOT directory (%s)" % JAM_CONFIG_IN print " Found user-config.jam in BOOST_ROOT directory (%s)" % JAM_CONFIG_IN
JAM_CONFIG_IN_TEMP="no" JAM_CONFIG_IN_TEMP="no"
print " Writing Boost.Jam configuration to %s... " % JAM_CONFIG_OUT print " Writing Boost.Jam configuration to %s... " % JAM_CONFIG_OUT
@ -286,7 +286,7 @@ def setup_boostbook( tools_directory ):
print "done." print "done."
print "Done! Execute \"bjam --v2\" in a documentation directory to generate" print "Done! Execute \"b2\" in a documentation directory to generate"
print "documentation with BoostBook. If you have not already, you will need" print "documentation with BoostBook. If you have not already, you will need"
print "to compile Boost.Jam." print "to compile Boost.Jam."

6
setup_boostbook.sh Normal file → Executable file
View File

@ -129,8 +129,8 @@ if test -r "$HOME/user-config.jam"; then
JAM_CONFIG_IN_TEMP="yes" JAM_CONFIG_IN_TEMP="yes"
echo -n "Updating Boost.Jam configuration in $JAM_CONFIG_OUT... " echo -n "Updating Boost.Jam configuration in $JAM_CONFIG_OUT... "
elif test -r "$BOOST_ROOT/tools/build/v2/user-config.jam"; then elif test -r "$BOOST_ROOT/tools/build/user-config.jam"; then
JAM_CONFIG_IN="$BOOST_ROOT/tools/build/v2/user-config.jam"; JAM_CONFIG_IN="$BOOST_ROOT/tools/build/user-config.jam";
JAM_CONFIG_IN_TEMP="no" JAM_CONFIG_IN_TEMP="no"
echo -n "Writing Boost.Jam configuration to $JAM_CONFIG_OUT... " echo -n "Writing Boost.Jam configuration to $JAM_CONFIG_OUT... "
else else
@ -176,6 +176,6 @@ awk -f setup_boostbook.awk $JAM_CONFIG_IN > $JAM_CONFIG_OUT
rm -f setup_boostbook.awk rm -f setup_boostbook.awk
echo "done." echo "done."
echo "Done! Execute \"bjam --v2\" in a documentation directory to generate" echo "Done! Execute \"b2\" in a documentation directory to generate"
echo "documentation with BoostBook. If you have not already, you will need" echo "documentation with BoostBook. If you have not already, you will need"
echo "to compile Boost.Jam." echo "to compile Boost.Jam."

33
xsl/fo.xsl
View File

@ -312,6 +312,39 @@
</fo:inline> </fo:inline>
</xsl:template> </xsl:template>
<!-- alignment -->
<xsl:template match="phrase[@role='aligncenter']">
<fo:inline>
<fo:block text-align="center">
<xsl:apply-templates/>
</fo:block>
</fo:inline>
</xsl:template>
<xsl:template match="phrase[@role='alignleft']">
<fo:inline>
<fo:block text-align="left">
<xsl:apply-templates/>
</fo:block>
</fo:inline>
</xsl:template>
<xsl:template match="phrase[@role='alignright']">
<fo:inline>
<fo:block text-align="right">
<xsl:apply-templates/>
</fo:block>
</fo:inline>
</xsl:template>
<xsl:template match="phrase[@role='alignjustify']">
<fo:inline>
<fo:block text-align="justify">
<xsl:apply-templates/>
</fo:block>
</fo:inline>
</xsl:template>
<!-- <!--