From d8f391e577c56cb91fe55330ad6a3a027054a6f8 Mon Sep 17 00:00:00 2001 From: Henrik Tidefelt Date: Sun, 1 Nov 2015 13:59:10 +0100 Subject: [PATCH] Let the other namespaces in! --- doc/build/html/Makefile.am | 49 +- doc/parts/bindings/3D.sxml | 6 +- doc/parts/bindings/constructors.sxml | 6 +- doc/parts/bindings/functions.sxml | 94 ++-- doc/parts/bindings/hot.sxml | 24 +- doc/parts/bindings/misc.sxml | 12 +- doc/parts/bindings/predicates.sxml | 2 +- doc/parts/bindings/simple.sxml | 126 ++--- doc/parts/bindings/syntax.sxml | 14 +- doc/parts/dynamic/graphic.sxml | 24 +- doc/parts/dynamic/handlers.sxml | 2 +- doc/parts/dynamic/misc.sxml | 4 +- doc/parts/dynamic/text.sxml | 18 +- .../Applications-Blockdraw-blockdraw.sxml | 518 ++++++++++----------- .../Applications-Blockdraw-bondgraph.sxml | 104 ++--- doc/parts/extensions/Shapes-Control-cond.sxml | 4 +- doc/parts/extensions/Shapes-Data-conssupport.sxml | 16 +- doc/parts/extensions/Shapes-Geometry-circle.sxml | 8 +- .../extensions/Shapes-Geometry-linkpaths.sxml | 8 +- .../extensions/Shapes-Geometry-pathmapping.sxml | 18 +- doc/parts/extensions/Shapes-Geometry3D-circle.sxml | 14 +- .../extensions/Shapes-Graphics-arrowheads.sxml | 8 +- .../extensions/Shapes-Graphics-metapostarrow.sxml | 6 +- .../extensions/Shapes-Graphics-shapesarrow.sxml | 4 +- .../extensions/Shapes-Layout-basic-layout.sxml | 36 +- .../extensions/Shapes-Layout-centering-X.sxml | 4 +- doc/parts/extensions/Shapes-Layout-shiftoff.sxml | 30 +- .../Shapes-Numeric-Constant-constants.sxml | 6 +- doc/parts/extensions/formats/html.xsl | 65 +-- doc/parts/extensions/index.sxml | 13 - doc/parts/formats/bindings-html.xsl | 86 ++-- doc/parts/formats/html.xsl | 68 +-- doc/parts/formats/language-elements-html.xsl | 35 +- doc/parts/man/formats/html.xsl | 11 +- doc/parts/namespace-index/formats/html.xsl | 31 +- doc/parts/namespace-toc/formats/toc.xsl | 44 +- doc/parts/namespace-toc/toc-miss.html | 19 + ...plications.sxml => Applications-Blockdraw.sxml} | 14 +- doc/parts/namespace/Applications.sxml | 9 +- doc/parts/namespace/Shapes-Geometry.sxml | 6 +- doc/parts/namespace/formats/html.xsl | 46 +- doc/parts/state-types/formats/html.xsl | 4 +- doc/parts/types/formats/html.xsl | 10 +- doc/styles/html/shapes.css | 11 + 44 files changed, 853 insertions(+), 784 deletions(-) create mode 100644 doc/parts/namespace-toc/toc-miss.html copy doc/parts/namespace/{Applications.sxml => Applications-Blockdraw.sxml} (82%) diff --git a/doc/build/html/Makefile.am b/doc/build/html/Makefile.am index b3271602..8cf827b5 100644 --- a/doc/build/html/Makefile.am +++ b/doc/build/html/Makefile.am @@ -61,20 +61,35 @@ MORE_SSIFLAGS=-dMODIFICATION_DATE=$(shell echo ${VERSION_DATE} | \ SHEXT_LIST=doc/blockdraw-tutorial-tut-prefs.shext doc/winding-rule-paths.shext SHEXT_FILES=$(addprefix example/, $(SHEXT_LIST)) -EXTRA_html_FILES = algo-tol.html namespace-index.html bindings.html dynamic.html edit.html install.html \ - man.html state-types.html states.html structure.html syntax.html types.html \ - tutorial.html interactive.html index.html \ - $(addprefix namespace/, \ - Shapes-Numeric-Math.html ) \ - $(addprefix extensions/, \ - Shapes-Geometry-circle.html \ - Shapes-Geometry3D-circle.html \ - numeric-constants.html basic-layout.html program-flow.html \ - shapesarrow.html metapostarrow.html arrowheads.html blockdraw.html \ - bondgraph.html conssupport.html \ - linkpaths.html pathmapping.html shiftoff.html centering-X.html index.html ) - -nobase_dist_html_DATA = shapes.css +EXTRA_html_FILES = \ + algo-tol.html namespace-index.html bindings.html dynamic.html edit.html install.html \ + man.html state-types.html states.html structure.html syntax.html types.html \ + tutorial.html interactive.html index.html \ + $(addprefix namespace/, \ + Shapes-Numeric-Math.html \ + Applications.html \ + Applications-Blockdraw.html \ + ) \ + $(addprefix extensions/, \ + index.html \ + Applications-Blockdraw-blockdraw.html \ + Applications-Blockdraw-bondgraph.html \ + Shapes-Control-cond.html \ + Shapes-Data-conssupport.html \ + Shapes-Geometry-circle.html \ + Shapes-Geometry-linkpaths.html \ + Shapes-Geometry-pathmapping.html \ + Shapes-Geometry3D-circle.html \ + Shapes-Graphics-arrowheads.html \ + Shapes-Graphics-metapostarrow.html \ + Shapes-Graphics-shapesarrow.html \ + Shapes-Layout-basic-layout.html \ + Shapes-Layout-centering-X.html \ + Shapes-Layout-shiftoff.html \ + Shapes-Numeric-Constant-constants.html \ + ) + +nobase_dist_html_DATA = shapes.css toc-miss.html EXTRA_nobase_dist_html = ${html_FILES} nobase_dist_noinst_DATA = ${extensionsdir}/formats/html.xsl \ @@ -82,7 +97,7 @@ nobase_dist_noinst_DATA = ${extensionsdir}/formats/html.xsl \ $(addprefix ${formatsdir}/, \ examplecode-html.xsl html.xsl language-elements-html.xsl \ man.xsl plain-book-html.xsl) \ - ${partsdir}/namespace-index/formats/toc.xsl \ + ${partsdir}/namespace-toc/formats/toc.xsl \ $(foreach part,\ $(addprefix ${partsdir}/, \ algo-tol namespace-index bindings dynamic edit man states state-types \ @@ -205,6 +220,10 @@ endif # HAVE_SAXON test -d $(@D) || ${mkdir_p} $(@D) ${INSTALL_DATA} $< $@ +toc-miss.html : ${partsdir}/namespace-toc/toc-miss.html + test -d $(@D) || ${mkdir_p} $(@D) + ${INSTALL_DATA} $< $@ + img/% : ${imagesdir}/% test -d $(@D) || ${mkdir_p} $(@D) ${INSTALL_DATA} $< $@ diff --git a/doc/parts/bindings/3D.sxml b/doc/parts/bindings/3D.sxml index 883d505b..b03904d3 100644 --- a/doc/parts/bindings/3D.sxml +++ b/doc/parts/bindings/3D.sxml @@ -21,7 +21,7 @@

The bindings that are related to are kept aside in this section, so that users not interested in graphics can safely choose not to read this section.

- + @@ -39,7 +39,7 @@ - + @@ -56,7 +56,7 @@ - + diff --git a/doc/parts/bindings/constructors.sxml b/doc/parts/bindings/constructors.sxml index 7971ed0c..12f36df5 100644 --- a/doc/parts/bindings/constructors.sxml +++ b/doc/parts/bindings/constructors.sxml @@ -21,7 +21,7 @@

This section contains simple functions that are essential for the creation of values of certain types.

- + @@ -39,7 +39,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/doc/parts/bindings/functions.sxml b/doc/parts/bindings/functions.sxml index b93d1a7f..4d73bcb5 100644 --- a/doc/parts/bindings/functions.sxml +++ b/doc/parts/bindings/functions.sxml @@ -29,7 +29,7 @@ facing: [../facing scale:true distort:true ...] - + Modulus of scalar values, norm of vectors, and length of paths @@ -159,7 +159,7 @@ facing: [../facing scale:true distort:true ...] - + @@ -179,7 +179,7 @@ facing: [../facing scale:true distort:true ...] - + @@ -202,7 +202,7 @@ facing: [../facing scale:true distort:true ...] - + @@ -225,7 +225,7 @@ facing: [../facing scale:true distort:true ...] - + @@ -239,7 +239,7 @@ facing: [../facing scale:true distort:true ...] - + @@ -256,7 +256,7 @@ facing: [../facing scale:true distort:true ...] - + @@ -279,7 +279,7 @@ facing: [../facing scale:true distort:true ...] - + @@ -306,7 +306,7 @@ facing: [../facing scale:true distort:true ...] - + @@ -329,7 +329,7 @@ facing: [../facing scale:true distort:true ...] - + @@ -364,7 +364,7 @@ is equivalent to - + @@ -409,7 +409,7 @@ is equivalent to - + @@ -453,7 +453,7 @@ is equivalent to - + @@ -482,7 +482,7 @@ is equivalent to - + @@ -501,7 +501,7 @@ is equivalent to - + @@ -517,7 +517,7 @@ is equivalent to - + @@ -546,7 +546,7 @@ is the identify for values without named parts.< - + @@ -560,7 +560,7 @@ is the identify for values without named parts.< - + @@ -638,7 +638,7 @@ is the identify for values without named parts.< - + @@ -667,7 +667,7 @@ and a span including all but the last two positions as - + @@ -694,7 +694,7 @@ and a span including all but the last two positions as - + @@ -737,7 +737,7 @@ and a span including all but the last two positions as - + @@ -781,7 +781,7 @@ and a span including all but the last two positions as - + @@ -808,7 +808,7 @@ and a span including all but the last two positions as - + @@ -824,7 +824,7 @@ and a span including all but the last two positions as - + @@ -843,7 +843,7 @@ and a span including all but the last two positions as - + @@ -876,7 +876,7 @@ and a span including all but the last two positions as - + @@ -909,7 +909,7 @@ and a span including all but the last two positions as - + @@ -942,7 +942,7 @@ and a span including all but the last two positions as - + @@ -975,7 +975,7 @@ and a span including all but the last two positions as - + @@ -1050,7 +1050,7 @@ and a span including all but the last two positions as - + @@ -1083,7 +1083,7 @@ and a span including all but the last two positions as - + @@ -1111,7 +1111,7 @@ and a span including all but the last two positions as - + @@ -1133,7 +1133,7 @@ and a span including all but the last two positions as - + @@ -1161,7 +1161,7 @@ and a span including all but the last two positions as - + @@ -1205,7 +1205,7 @@ and a span including all but the last two positions as - + @@ -1234,7 +1234,7 @@ and a span including all but the last two positions as - + @@ -1275,7 +1275,7 @@ This way, you can experiment with font families and styles in the terminal befor - + @@ -1298,7 +1298,7 @@ This way, you can experiment with font families and styles in the terminal befor - + @@ -1315,7 +1315,7 @@ This way, you can experiment with font families and styles in the terminal befor - + @@ -1333,7 +1333,7 @@ This way, you can experiment with font families and styles in the terminal befor - + @@ -1368,7 +1368,7 @@ This way, you can experiment with font families and styles in the terminal befor - + @@ -1395,7 +1395,7 @@ This way, you can experiment with font families and styles in the terminal befor - + @@ -1425,7 +1425,7 @@ This way, you can experiment with font families and styles in the terminal befor - + @@ -1466,7 +1466,7 @@ This way, you can experiment with font families and styles in the terminal befor - + @@ -1514,7 +1514,7 @@ tf: [rotate3D angle:25° dir:(1,2,3)] - + @@ -1533,7 +1533,7 @@ tf: [rotate3D angle:25° dir:(1,2,3)] - + diff --git a/doc/parts/bindings/hot.sxml b/doc/parts/bindings/hot.sxml index 93e787a2..a8db9505 100644 --- a/doc/parts/bindings/hot.sxml +++ b/doc/parts/bindings/hot.sxml @@ -21,49 +21,49 @@

States stem from hot values. The system provides a few, all of which are important because the efficiency enhancements they bring. What you find here is basically just a bunch of links to where the corresponding state types are described.

- + - + - + - + - + - + - + @@ -72,35 +72,35 @@ - + - + - + - + - + diff --git a/doc/parts/bindings/misc.sxml b/doc/parts/bindings/misc.sxml index d666f6a7..7d25072c 100644 --- a/doc/parts/bindings/misc.sxml +++ b/doc/parts/bindings/misc.sxml @@ -21,7 +21,7 @@

Standard stream objects, null objects, mathematical constants, and more…

- + @@ -43,7 +43,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -184,7 +184,7 @@ - + diff --git a/doc/parts/bindings/predicates.sxml b/doc/parts/bindings/predicates.sxml index 836bc77e..77a89ed4 100644 --- a/doc/parts/bindings/predicates.sxml +++ b/doc/parts/bindings/predicates.sxml @@ -21,7 +21,7 @@

Predicates are simple functions that test certain conditions.

- + diff --git a/doc/parts/bindings/simple.sxml b/doc/parts/bindings/simple.sxml index 54fb214e..faa126bc 100644 --- a/doc/parts/bindings/simple.sxml +++ b/doc/parts/bindings/simple.sxml @@ -21,7 +21,7 @@

These bindings give access to many named constants that either serve as special tokens in certain situations, or simply deserve a binding due to their common use or special meaning.

- + @@ -30,7 +30,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -184,7 +184,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -227,7 +227,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -243,7 +243,7 @@ - + @@ -251,7 +251,7 @@ - + @@ -259,7 +259,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -276,7 +276,7 @@ - + @@ -284,7 +284,7 @@ - + @@ -293,7 +293,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -309,7 +309,7 @@ - + @@ -317,7 +317,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -333,7 +333,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -349,7 +349,7 @@ - + @@ -357,7 +357,7 @@ - + @@ -365,7 +365,7 @@ - + @@ -373,7 +373,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -389,7 +389,7 @@ - + @@ -397,7 +397,7 @@ - + @@ -405,7 +405,7 @@ - + @@ -414,7 +414,7 @@ - + @@ -422,7 +422,7 @@ - + @@ -430,7 +430,7 @@ - + @@ -439,7 +439,7 @@ - + @@ -447,7 +447,7 @@ - + @@ -455,7 +455,7 @@ - + @@ -463,7 +463,7 @@ - + @@ -471,7 +471,7 @@ - + @@ -479,7 +479,7 @@ - + @@ -487,7 +487,7 @@ - + @@ -495,7 +495,7 @@ - + @@ -503,7 +503,7 @@ - + @@ -511,7 +511,7 @@ - + @@ -519,7 +519,7 @@ - + @@ -527,7 +527,7 @@ - + @@ -535,7 +535,7 @@ - + @@ -543,7 +543,7 @@ - + diff --git a/doc/parts/bindings/syntax.sxml b/doc/parts/bindings/syntax.sxml index 8a977569..5f4ecf64 100644 --- a/doc/parts/bindings/syntax.sxml +++ b/doc/parts/bindings/syntax.sxml @@ -23,7 +23,7 @@

The user should generally not use these functions directly.

- + @@ -57,7 +57,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -163,7 +163,7 @@ - + diff --git a/doc/parts/dynamic/graphic.sxml b/doc/parts/dynamic/graphic.sxml index 0ed9d2ec..18196916 100644 --- a/doc/parts/dynamic/graphic.sxml +++ b/doc/parts/dynamic/graphic.sxml @@ -22,7 +22,7 @@

Many of these dynamic variables can be set to a value, which means that painted objects do not specify the property for themselves, but inherit the property from the context where they appear. This feature is a low-level trick, and the effects may be (or at least seem) unpredictable.

- + 1bp ≥ 0bp @@ -32,7 +32,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -73,7 +73,7 @@ - + 10 ≥ 1 @@ -82,7 +82,7 @@ - + [dashpattern] @@ -93,7 +93,7 @@ - + [shape 1] @@ -104,7 +104,7 @@ - + [shape 1] @@ -115,7 +115,7 @@ - + @@ -123,7 +123,7 @@ - + (inherited) @@ -131,7 +131,7 @@ - + dynamic [spot (0m,0m)] Cannot be changed! diff --git a/doc/parts/dynamic/handlers.sxml b/doc/parts/dynamic/handlers.sxml index 005f802b..5e611b78 100644 --- a/doc/parts/dynamic/handlers.sxml +++ b/doc/parts/dynamic/handlers.sxml @@ -21,7 +21,7 @@

The bindings in this section provide a way of controlling the behavior in error situations; a function may call a dynamically bound function bound function when an error is detected instead of returning with a nonsense result.

- +

To be called when the intersection between two paths cannot be found.

diff --git a/doc/parts/dynamic/misc.sxml b/doc/parts/dynamic/misc.sxml index 28dc24b0..83937a36 100644 --- a/doc/parts/dynamic/misc.sxml +++ b/doc/parts/dynamic/misc.sxml @@ -21,7 +21,7 @@

Any dynamic variable not mentioned so far goes here.

- + > 0bp or = ∞ 50cm @@ -30,7 +30,7 @@ - + 1bp diff --git a/doc/parts/dynamic/text.sxml b/doc/parts/dynamic/text.sxml index e8a65ab9..8905b4f5 100644 --- a/doc/parts/dynamic/text.sxml +++ b/doc/parts/dynamic/text.sxml @@ -21,7 +21,7 @@

The bindings in this section are closely related to the text state parameters in .

- + FONT_HELVETICA @@ -29,7 +29,7 @@ - + 10bp > 0bp @@ -38,7 +38,7 @@ - + 1 > 0 @@ -47,7 +47,7 @@ - +

Text rendering mode.

@@ -60,7 +60,7 @@ - + @@ -68,7 +68,7 @@ - + 0bp @@ -77,7 +77,7 @@ - + 0bp @@ -86,7 +86,7 @@ - + 1 @@ -95,7 +95,7 @@ - + 1 diff --git a/doc/parts/extensions/Applications-Blockdraw-blockdraw.sxml b/doc/parts/extensions/Applications-Blockdraw-blockdraw.sxml index 0dee5f76..5e9c7c57 100644 --- a/doc/parts/extensions/Applications-Blockdraw-blockdraw.sxml +++ b/doc/parts/extensions/Applications-Blockdraw-blockdraw.sxml @@ -20,7 +20,7 @@ - ..Applications..Blockdraw + ..Applications..Blockdraw blockdraw

General purpose layout tools originally developed for drawing of block diagrams.

@@ -76,7 +76,7 @@

Several functions are provided to put a block at a predefined distance apart from a given block. They are non-pure functions that both add the positioned object to a destination state and return it so that it can be used for future reference. See </a> for a complete list of layout functions.</p> - <p>The reason why <value name="..Shapes..Applications..Blockdraw..sumpicture" /> is a function rather than a <named-type name="Drawable" /> is that the result is a function of the dynamic environment; both the radius size of the block, the width of the line, and the size of the summation sign, depend on dynamic bindings.</p> + <p>The reason why <value name="sumpicture" /> is a function rather than a <named-type name="Drawable" /> is that the result is a function of the dynamic environment; both the radius size of the block, the width of the line, and the size of the summation sign, depend on dynamic bindings.</p> </caption> </example-with-output> @@ -96,7 +96,7 @@ <![CDATA[<!--#include depth="0" virtual="$(BUILDDIR)$(EXAMPLES)doc/blockdraw-tutorial-labels.shape" -->]]> </source> <caption> - <p>Depending on the relative layout of blocks, a varying degree of manual effort is needed to get the connecting paths right. In this example, all paths but the feed-back path can be deduced automatically using <value name="..Shapes..Applications..Blockdraw..connect" />. The constructed path is both painted and returned. Most of the time the return value is ignored (by means of <value name="ignore" />), but it is useful when we want to place a label along the path. See <a id="extensions/blockdraw/connections" /> for the complete set of functions for the purpose of making connections.</p> + <p>Depending on the relative layout of blocks, a varying degree of manual effort is needed to get the connecting paths right. In this example, all paths but the feed-back path can be deduced automatically using <value name="connect" />. The constructed path is both painted and returned. Most of the time the return value is ignored (by means of <value name="ignore" />), but it is useful when we want to place a label along the path. See <a id="extensions/blockdraw/connections" /> for the complete set of functions for the purpose of making connections.</p> <p>Putting a label along the connection is easy. To make the source code readable, it is a good idea to bind the connection path to a variable, and then use this variable when placing the label. Special purpose functions are provided to ensure a consistent layout of labels; the user need only select a point on the path (preferably using <value name="..Shapes..Layout..mspoint" />) and a side of that point (by using the “<inline>putlabel</inline>-function” named accordingly), and how the label should be aligned.</p> <p>Putting a label at a terminal point is similar to labeling a connection, the only difference is how the point to be labeled is selected. Note that for a <value name="pointpicture" />, all connection point functions will return the same point.</p> <p>This example also shows how to place signs at connection points, and how to indicate a point where a signal splits by a small dot.</p> @@ -137,28 +137,28 @@ <title>Block size - + 0.7cm

Half the width of a long block.

 - + 0.4cm

Half the height of a long block.

 - + 0.3cm

Half the side length a small square block, and also the radius of round blocks.

 - + 0cm @@ -173,14 +173,14 @@ Line widths - + 0.8bp

The line width for connections.

 - + 0.8bp @@ -195,35 +195,35 @@ Margins - + 1.5mm

The margin to use when labels are placed above an object.

 - + 1.5mm

The margin to use when labels are placed below an object.

 - + 1mm

The margin to use when labels are placed to the left or to the right of an object.

 - + 1.5mm

The margin for signs, in the direction of the connecting path.

 - + 2mm @@ -238,35 +238,35 @@ Space between blocks - + 3mm

A very small distance.

 - + 6mm

A rather small distance.

 - + 8mm

A distance that may be used when there should be enough space for a small label between the blocks.

 - + 10mm

A rather big distance.

 - + 15mm @@ -280,7 +280,7 @@
Miscellaneous - + [scale 1] @@ -298,7 +298,7 @@ - + [stroke head:ShapesArrow ...] @@ -312,11 +312,11 @@

The function used to paint connections.

-

When called from within this extension, will always be set to . Hence, users who call directly should consider using this line width as well.

+

When called from within this extension, will always be set to . Hence, users who call directly should consider using this line width as well.

 - + @@ -330,7 +330,7 @@

The function used to paint the block border paths.

-

When called from within this extension, will always be set to . Hence, users who call directly should consider using this line width as well.

+

When called from within this extension, will always be set to . Hence, users who call directly should consider using this line width as well.

This function will be used before labels are painted, so it may be used to paint the interior of blocks with a background color.

 @@ -355,7 +355,7 @@ - + @@ -372,23 +372,23 @@ - +

This function is considered low-level and should not be used directly in standard applications.

Constructs a rectangular block, with a label positioned nicely inside.

 - - - - - + + + + + - + @@ -399,19 +399,19 @@ - +

Constructs a long rectangular block of standardized size.

-

Calls internally, which uses additional dynamic variables.

+

Calls internally, which uses additional dynamic variables.

 - + - + @@ -422,19 +422,19 @@ - +

Constructs a small square block of standardized size.

-

Calls internally, which uses additional dynamic variables.

+

Calls internally, which uses additional dynamic variables.

 - + - + @@ -445,19 +445,19 @@ - +

Constructs a long rectangular block of standardized size, tall enough to accommodate a standing fraction in the label.

-

Calls internally, which uses additional dynamic variables.

+

Calls internally, which uses additional dynamic variables.

 - + - + @@ -468,15 +468,15 @@ - + -

Like , but makes the block wider if required to accommodate the label.

+

Like , but makes the block wider if required to accommodate the label.

 - + @@ -487,15 +487,15 @@ - + -

Like , but makes the block wider if required to accommodate the label.

+

Like , but makes the block wider if required to accommodate the label.

 - + @@ -506,7 +506,7 @@ - +

Constructs a small circular block of standardized size.

 @@ -514,7 +514,7 @@ - + @@ -524,13 +524,13 @@

Returns a small circular summation block. Note that this must be a function since the result shall depend on dynamic bindings!

-

Calls internally, which uses additional dynamic variables.

+

Calls internally, which uses additional dynamic variables.

 - + @@ -538,7 +538,7 @@ - +

Returns a small circular dot to use where a signal splits. The size is chosen relative to the width of the connection strokes. Note that this must be a function since the result shall depend on dynamic bindings!

 @@ -546,7 +546,7 @@ - + @@ -554,7 +554,7 @@ - +

Returns a small circle that can be used if a signal terminal is to be emphasized. The size is chosen relative to the width of the connection strokes. Note that this must be a function since the result shall depend on dynamic bindings!

 @@ -569,7 +569,7 @@ Layout

The functions are non-pure, as they have the bad (?) habit of tacking on their return value to a . The reason is that it is almost always convenient to bind a block to a variable so that it can be referred to, and there is seldom reason not to draw it as soon as it is laid out. If one does not want the object to be drawn to any state, one may simply pass as the destination.

-

The number of functions in this section may seem overwhelming, but the reason for this is to hide degrees of freedom in order to gain in consistency of the spacing between blocks in the diagram. Except , uses typically select among function being named after two axes for the user to choose from; one distance axis (VeryNear, Near, LabelSpace, Far, VeryFar), and one direction axis (Left, Right, Below, Above). This explains 20 of the functions here. In addition, there are some low-level functions, and another four where the point on the distance axis is LabelMargin (here, the distance depends on the direction, but users typically don't use these functions anyway).

+

The number of functions in this section may seem overwhelming, but the reason for this is to hide degrees of freedom in order to gain in consistency of the spacing between blocks in the diagram. Except , uses typically select among function being named after two axes for the user to choose from; one distance axis (VeryNear, Near, LabelSpace, Far, VeryFar), and one direction axis (Left, Right, Below, Above). This explains 20 of the functions here. In addition, there are some low-level functions, and another four where the point on the distance axis is LabelMargin (here, the distance depends on the direction, but users typically don't use these functions anyway).

@@ -579,12 +579,12 @@

A selection of the layout functions. The name of the functions reflect which dynamic variable is used to determine the distance between the objects, in the direction also given by the name of the function. Note that all these functions are non-pure, as they allow the object being laid out to be added to a destination variable in addition to returning it.

Note that horizontal positioning does not care about the object's vertical extent, and vice versa. This is not only apparent in the example with the block labeled “High”, but also in the examples where the new block is a plain label centered at its leftmost baseline point.

-

The function is different from the others in that it puts the block at the origin instead of relative to another block.

+

The function is different from the others in that it puts the block at the origin instead of relative to another block.

The functions using the various label margins should only be used if this non-pure behavior is desired; labels are generally better placed using the pure functions described in .

- + @@ -606,7 +606,7 @@ - + @@ -631,18 +631,18 @@

Positions to the left of , such that the horizontal distance between the bounding boxes equals . The vertical positioning will make the origin of level with the vertical midpoint of 's bounding box.

- - - - - - + + + + + + - + @@ -663,21 +663,21 @@ -

Analogous to

+

Analogous to

- - - - - - + + + + + + - + @@ -698,21 +698,21 @@ -

Analogous to

+

Analogous to

- - - - - - + + + + + + - + @@ -733,21 +733,21 @@ -

Analogous to

+

Analogous to

- - - - - - + + + + + + - + @@ -764,14 +764,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -788,14 +788,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -812,14 +812,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -836,14 +836,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -860,14 +860,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -884,15 +884,15 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -909,14 +909,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -933,14 +933,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -957,14 +957,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -981,14 +981,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -1005,14 +1005,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -1029,15 +1029,15 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -1054,14 +1054,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -1078,14 +1078,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -1102,14 +1102,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -1126,14 +1126,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -1150,14 +1150,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -1174,15 +1174,15 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -1199,14 +1199,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -1223,14 +1223,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -1247,14 +1247,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -1271,14 +1271,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -1295,14 +1295,14 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 - + @@ -1319,9 +1319,9 @@ - + -

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

+

Calls with the distance argument given by the dynamic variable corresponding to the name of this function.

 @@ -1346,7 +1346,7 @@ - + @@ -1371,7 +1371,7 @@ - + @@ -1391,12 +1391,12 @@ -

Analogous to .

+

Analogous to .

 - + @@ -1416,12 +1416,12 @@ -

Analogous to .

+

Analogous to .

 - + @@ -1441,7 +1441,7 @@ -

Analogous to .

+

Analogous to .

 @@ -1455,7 +1455,7 @@

These functions are, for the same reason as the layout functions (see ), non-pure. One difference, though, is that instead of returning the painted path, only the object itself is returned. The reason is that the path is much more useful for further operations, such as putting labels along it.

While the most high-level functions take entire blocks as arguments and assume that there is just one connection point on each side of a block, the more low-level functions take the connection points as arguments, allowing the user to select the point using the functions in .

-

In most situations, is able to figure out the path from the blocks being connected alone, and in these cases this function should be used. In most cases when picks the wrong path, this is because it makes the connection to the wrong sides of the blocks, and then functions such as (connect the bottom side of the first block with the right of the second block) come in handy. These functions will still be insufficient if the path shall connect, say, a bottom side to another bottom side, since they cannot figure out the vertical coordinate for the horizontal part of such a path. Then the most low-level functions, such as (construct a path with is initially vertical and vertical at the end as well), are required. It is only the most low-level functions that operate on points rather than blocks.

+

In most situations, is able to figure out the path from the blocks being connected alone, and in these cases this function should be used. In most cases when picks the wrong path, this is because it makes the connection to the wrong sides of the blocks, and then functions such as (connect the bottom side of the first block with the right of the second block) come in handy. These functions will still be insufficient if the path shall connect, say, a bottom side to another bottom side, since they cannot figure out the vertical coordinate for the horizontal part of such a path. Then the most low-level functions, such as (construct a path with is initially vertical and vertical at the end as well), are required. It is only the most low-level functions that operate on points rather than blocks.

So, there were three levels of functions, and they are presented in order low to high. The listing of the functions on each level is preceded by an example..

@@ -1464,10 +1464,10 @@ ]]> -

These are the primitive functions that construct connection paths. They operate on points, and are named after the direction at the beginning and end of the constructed path, for instance constructs a path that is horizontal at the beginning and vertical at the end. If the path shall begin and end along the same axis, the user must also tell at which coordinate the beginning and end shall connect with each other. This is done using a pair of mediation and slide values; the mediation is a linear interpolation between the start (mediation is 0) and end (mediation is 1) points, and the slide is an absolute length added to the coordinate given by the slide.

+

These are the primitive functions that construct connection paths. They operate on points, and are named after the direction at the beginning and end of the constructed path, for instance constructs a path that is horizontal at the beginning and vertical at the end. If the path shall begin and end along the same axis, the user must also tell at which coordinate the beginning and end shall connect with each other. This is done using a pair of mediation and slide values; the mediation is a linear interpolation between the start (mediation is 0) and end (mediation is 1) points, and the slide is an absolute length added to the coordinate given by the slide.

 - + @@ -1484,14 +1484,14 @@ - + -

Constructs a path from to which consists of two line segments; first a vertical and then a horizontal. Besides returning the path, it is painted using with being set to , and the resulting is added to .

+

Constructs a path from to which consists of two line segments; first a vertical and then a horizontal. Besides returning the path, it is painted using with being set to , and the resulting is added to .

 - + @@ -1508,14 +1508,14 @@ - + -

Analogous to ; just exchange horizontal and vertical in the description.

+

Analogous to ; just exchange horizontal and vertical in the description.

 - + @@ -1538,15 +1538,15 @@ - +

Constructs a path from to which consists of three line segments; initially horizontal and horizontal also at the end. The horizontal coordinate of the vertical line segment in the middle is given by the and values. The mediation is relative to the horizontal coordinates of and , while the slide enters the coordinate as a term. See the example for illustration!

-

Besides returning the path, it is also painted to , just like does.

+

Besides returning the path, it is also painted to , just like does.

 - + @@ -1569,9 +1569,9 @@ - + -

Analogous to ; just exchange horizontal and vertical in the description.

+

Analogous to ; just exchange horizontal and vertical in the description.

 @@ -1584,11 +1584,11 @@ ]]> -

These are the intermediate level functions that construct connection paths. They operate on blocks, and are named after the blocks' sides at the beginning and end of the constructed path, for instance constructs a path from the right side of the first block to the bottom side of the second block. If the path shall connect to the same side of the two blocks, the user must also tell how far from the closest block the path shall turn.

-

When the underlying primitive function being used is or the mediation parameter is 0.5 and the slide zero.

+

These are the intermediate level functions that construct connection paths. They operate on blocks, and are named after the blocks' sides at the beginning and end of the constructed path, for instance constructs a path from the right side of the first block to the bottom side of the second block. If the path shall connect to the same side of the two blocks, the user must also tell how far from the closest block the path shall turn.

+

When the underlying primitive function being used is or the mediation parameter is 0.5 and the slide zero.

- + @@ -1605,17 +1605,17 @@ - +

Calls the appropriate low-level function to create a path from the top of the first block to the right side of the second block.

 - + - + @@ -1632,17 +1632,17 @@ - + -

Analogous to .

+

Analogous to .

 - + - + @@ -1659,17 +1659,17 @@ - + -

Analogous to .

+

Analogous to .

 - + - + @@ -1686,17 +1686,17 @@ - + -

Analogous to .

+

Analogous to .

 - + - + @@ -1713,17 +1713,17 @@ - + -

Analogous to .

+

Analogous to .

 - + - + @@ -1740,17 +1740,17 @@ - + -

Analogous to .

+

Analogous to .

 - + - + @@ -1767,17 +1767,17 @@ - + -

Analogous to .

+

Analogous to .

 - + - + @@ -1794,18 +1794,18 @@ - + -

Analogous to .

+

Analogous to .

 - + - + @@ -1830,17 +1830,17 @@ - +

Calls the appropriate low-level function to construct a path from the top of the first block to the bottom of the second block. The and values are simply passed on to the low-level function.

 - + - + @@ -1865,17 +1865,17 @@ - + -

Analogous to .

+

Analogous to .

 - + - + @@ -1900,17 +1900,17 @@ - + -

Analogous to .

+

Analogous to .

 - + - + @@ -1935,18 +1935,18 @@ - + -

Analogous to .

+

Analogous to .

 - + - + @@ -1966,17 +1966,17 @@ - +

Calls the appropriate low-level function to construct a path from the top of the first block to the top of the second block. The value is simply passed on to the low-level function, and the mediation value is chosen as the reasonable choice of 0 or 1.

 - + - + @@ -1996,17 +1996,17 @@ - + -

Analogous to .

+

Analogous to .

 - + - + @@ -2026,17 +2026,17 @@ - + -

Analogous to .

+

Analogous to .

 - + - + @@ -2056,13 +2056,13 @@ - + -

Analogous to .

+

Analogous to .

 - + @@ -2073,11 +2073,11 @@ ]]> -

The function makes an automatic selection among the intermediate level functions. Note that the first block's left and right sides are preferred to its bottom and top sides, and that one never obtains a path which connects to the same side of both blocks. Hence, only eight of the intermediate level functions are accessed through .

+

The function makes an automatic selection among the intermediate level functions. Note that the first block's left and right sides are preferred to its bottom and top sides, and that one never obtains a path which connects to the same side of both blocks. Hence, only eight of the intermediate level functions are accessed through .

- + @@ -2094,7 +2094,7 @@ - +

Makes an automatic selection among the intermediate level connection functions. See .

@@ -2120,7 +2120,7 @@ - + @@ -2137,7 +2137,7 @@ - +

Position to the left of , centering vertically at . For instance, =1 gives a label below , while -1 gives a label above.

 @@ -2147,7 +2147,7 @@ - + @@ -2164,9 +2164,9 @@ - + -

Analogous to .

+

Analogous to .

 @@ -2174,7 +2174,7 @@ - + @@ -2191,7 +2191,7 @@ - +

Position below , treating the label as if it had the height of an X, centering horizontally at . For instance, =1 gives a label to the left of , while -1 gives a label to the right.

 @@ -2201,7 +2201,7 @@ - + @@ -2218,7 +2218,7 @@ - +

Position above , centering horizontally at . For instance, =1 gives a label to the left of , while -1 gives a label to the right.

 diff --git a/doc/parts/extensions/Applications-Blockdraw-bondgraph.sxml b/doc/parts/extensions/Applications-Blockdraw-bondgraph.sxml index 55886f66..677b3355 100644 --- a/doc/parts/extensions/Applications-Blockdraw-bondgraph.sxml +++ b/doc/parts/extensions/Applications-Blockdraw-bondgraph.sxml @@ -20,7 +20,7 @@ - ..Applications..Blockdraw + ..Applications..Blockdraw bondgraph

Application-specific functions for bond graphs.

@@ -55,7 +55,7 @@ -

Unlike the blocks typically used with , the corresponding elements here, the junctions, do not have a visible border and their bounding boxes are not used. Instead, a circle of radius , centered at the junction's origin, defines where bonds connect with the junction. The extension also helps with other tasks, such as drawing the unusual arrowheads and putting the effort and flow labels on the correct side of the bond.

+

Unlike the blocks typically used with , the corresponding elements here, the junctions, do not have a visible border and their bounding boxes are not used. Instead, a circle of radius , centered at the junction's origin, defines where bonds connect with the junction. The extension also helps with other tasks, such as drawing the unusual arrowheads and putting the effort and flow labels on the correct side of the bond.

@@ -71,37 +71,37 @@ - +

A parallel (type 0) junction.

 - - - - + + + + - +

A serial (type 1) junction.

 - - - - + + + + - + @@ -120,16 +120,16 @@

The value should be one of the constants for non-diagonal directions defined by , and tells the direction in which the arrow by the transformer is pointing (that is, not in which direction the arrow is located relative to the transformer). The label is placed outside the arrow.

- - - - + + + + - + @@ -145,19 +145,19 @@

Constructs a gyrator junction.

-

This is almost like , but the symbol is different, and the little arrow is never drawn; is only used to control the position of relative to the gyrator.

+

This is almost like , but the symbol is different, and the little arrow is never drawn; is only used to control the position of relative to the gyrator.

 - - - - + + + + - + @@ -172,12 +172,12 @@

This function is low-level and should not be used directly in standard applications.

Centers the argument at the origin, and sets a suitable bounding box.

- + - + @@ -199,10 +199,10 @@

This function is low-level and should not be used directly in standard applications.

-

Extends by also adding a label, and possibly a small arrow between the junction mark and the label.

+

Extends by also adding a label, and possibly a small arrow between the junction mark and the label.

The value should be one of the constants for non-diagonal directions defined by .

- + @@ -219,11 +219,11 @@ ]]> -

Terminals with bonds. The terminal, positioned at the plus mark, is connected with the serial junction. The non-pure fuctions and will add the terminal label to a state and return the path for the bond. The path is then stroked with an arrowhead to indicate its extent and direction.

+

Terminals with bonds. The terminal, positioned at the plus mark, is connected with the serial junction. The non-pure fuctions and will add the terminal label to a state and return the path for the bond. The path is then stroked with an arrowhead to indicate its extent and direction.

- + @@ -248,12 +248,12 @@

The will typically be just a label, while is an existing junction.

The result is a path for the bond from to .

- + - + @@ -278,12 +278,12 @@

The will typically be just a label, while is an existing junction.

The result is a path for the bond to from .

- + - + @@ -304,7 +304,7 @@

This function is low-level and should not be used directly in standard applications.

Places near in such a position that it can be beautifully connected to .

- + @@ -320,11 +320,11 @@ ]]> -

Various means to paint a bond path. In the top row, the extent and direction of the path is indicated using a standard stroke with an arrowhead. The second row shows how may be used to produce arrowheads suited for bond graph bonds, but note that direct use of these arrowheads is considered low-level, and the user should use the convenience function illustrated in the last row instead.

+

Various means to paint a bond path. In the top row, the extent and direction of the path is indicated using a standard stroke with an arrowhead. The second row shows how may be used to produce arrowheads suited for bond graph bonds, but note that direct use of these arrowheads is considered low-level, and the user should use the convenience function illustrated in the last row instead.

- + @@ -338,16 +338,16 @@ - +

Constructs the path that shall be used for drawing the bond between junctions.

-

If terminal points are involved, the convenience functions or may produce the path instead.

+

If terminal points are involved, the convenience functions or may produce the path instead.

 - + @@ -358,7 +358,7 @@ - +

Draws a bond along the path , with undetermined causality (that is, without a causality mark).

The size of the arrowhead may be changed using , see .

@@ -367,7 +367,7 @@ - + @@ -378,7 +378,7 @@ - +

Draws a bond along the path , placing a causality mark at the head of the path.

The size of the arrowhead may be changed using , see .

@@ -387,7 +387,7 @@ - + @@ -398,7 +398,7 @@ - +

Draws a bond along the path , placing a causality mark at the tail of the path.

The size of the arrowhead may be changed using , see .

@@ -407,16 +407,16 @@ - + 4bp

The width of the half arrowhead used for bonds.

 - + - + @@ -451,10 +451,10 @@ Whole graphics state and

This function is low-level and should not be used directly in standard applications.

-

Arrowhead for bond graph junctions. All arguments but and have the same meaning as for .

+

Arrowhead for bond graph junctions. All arguments but and have the same meaning as for .

When , the half arrowhead is produced, and when , the causality mark is produced. This is like two different kinds of arrowheads combined in one function.

 - + @@ -475,7 +475,7 @@ - + @@ -496,7 +496,7 @@ - + diff --git a/doc/parts/extensions/Shapes-Control-cond.sxml b/doc/parts/extensions/Shapes-Control-cond.sxml index 7f794a3b..601e5052 100644 --- a/doc/parts/extensions/Shapes-Control-cond.sxml +++ b/doc/parts/extensions/Shapes-Control-cond.sxml @@ -20,7 +20,7 @@ - ..Shapes..Control + ..Shapes..Control cond

A multi-branch conditional structure.

@@ -48,7 +48,7 @@

At the moment, there is just one function here.

- + diff --git a/doc/parts/extensions/Shapes-Data-conssupport.sxml b/doc/parts/extensions/Shapes-Data-conssupport.sxml index ca4fbef8..262c3ce1 100644 --- a/doc/parts/extensions/Shapes-Data-conssupport.sxml +++ b/doc/parts/extensions/Shapes-Data-conssupport.sxml @@ -20,7 +20,7 @@ - ..Shapes..Data + ..Shapes..Data conssupport

Tools for working with cons-style lists (à la Scheme, for instance).

@@ -49,7 +49,7 @@

Recall the fold operations that are accessed as fields of values. This extension defines these for lists.

- + @@ -92,7 +92,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -243,7 +243,7 @@

Here are the functions that have no corresponding function for in the kernel.

- + @@ -262,7 +262,7 @@ - + @@ -303,7 +303,7 @@ - + diff --git a/doc/parts/extensions/Shapes-Geometry-circle.sxml b/doc/parts/extensions/Shapes-Geometry-circle.sxml index 9185bba1..85f64710 100644 --- a/doc/parts/extensions/Shapes-Geometry-circle.sxml +++ b/doc/parts/extensions/Shapes-Geometry-circle.sxml @@ -20,7 +20,7 @@ - ..Shapes..Geometry + ..Shapes..Geometry circle

Functions for construction of circles and circular arcs in .

@@ -59,7 +59,7 @@

Construct circle in space, of radius , centered at the origin.

The circle is approximated using four spline segments, and for positive radii, it encircles the origin counter-clockwise, starting on the positive x axis.

-

Use and to take the circle into space.

+

Use and to take the circle into space.

 @@ -87,7 +87,7 @@

Construct circular arc with counter-clockwise direction.

The center point of the circle is , and the radius of the arc is . The arc starts on the ray from to , and ends on the ray from to .

-

See also .

+

See also .

 @@ -113,7 +113,7 @@ -

Like , but creates arcs with clockwise direction.

+

Like , but creates arcs with clockwise direction.

 diff --git a/doc/parts/extensions/Shapes-Geometry-linkpaths.sxml b/doc/parts/extensions/Shapes-Geometry-linkpaths.sxml index 0f143843..752d5631 100644 --- a/doc/parts/extensions/Shapes-Geometry-linkpaths.sxml +++ b/doc/parts/extensions/Shapes-Geometry-linkpaths.sxml @@ -20,7 +20,7 @@ - ..Shapes..Geometry + ..Shapes..Geometry linkpaths

Functions for joining paths at their intersection.

@@ -49,7 +49,7 @@

The extentsion consists of just a few bindings, and we turn directly to the details of each.

- + @@ -68,7 +68,7 @@ - + @@ -78,7 +78,7 @@ -

Like, , but with more than two paths to join.

+

Like, , but with more than two paths to join.

 diff --git a/doc/parts/extensions/Shapes-Geometry-pathmapping.sxml b/doc/parts/extensions/Shapes-Geometry-pathmapping.sxml index 120e7092..8489ffa5 100644 --- a/doc/parts/extensions/Shapes-Geometry-pathmapping.sxml +++ b/doc/parts/extensions/Shapes-Geometry-pathmapping.sxml @@ -20,7 +20,7 @@ - ..Shapes..Geometry + ..Shapes..Geometry pathmapping

Functions for some non-affine path transforms.

@@ -47,7 +47,7 @@

The extentsion consists of just a few bindings, and we turn directly to the details of each.

- + @@ -74,7 +74,7 @@ - + @@ -88,14 +88,14 @@

Construct path that follows the given path at the specified distance. Uses default radii to interpolation points.

-

The implementation is an application of .

+

The implementation is an application of .

 - + - + @@ -109,13 +109,13 @@

Construct path that follows the given path at the specified distance. Determines radii to interpolation points using information from the given path.

-

The implementation is an application of .

+

The implementation is an application of .

 - + -
+
diff --git a/doc/parts/extensions/Shapes-Geometry3D-circle.sxml b/doc/parts/extensions/Shapes-Geometry3D-circle.sxml index 37459f45..01a30908 100644 --- a/doc/parts/extensions/Shapes-Geometry3D-circle.sxml +++ b/doc/parts/extensions/Shapes-Geometry3D-circle.sxml @@ -20,7 +20,7 @@ - ..Shapes..Geometry3D + ..Shapes..Geometry3D circle

Functions for construction of circular arcs in .

@@ -68,14 +68,14 @@ -

The argument should be a function accepting the same arguments as, for instance, .

+

The argument should be a function accepting the same arguments as, for instance, .

This function computes the transform that maps the plane spanned by , , and , to a plane through the origin, normal to the z direction. Using this transform in combination with , the task of constructing arcs is moved from to , where the arc is constructed using , and then the result is immersed and mapped back the the right position in .

The orientation of the intermediate representation is chosen to ensure that rotation about from the direction to to becomes counter-clockwise in .

-

The cuts of this function obtained by using or are bound to separate variables.

+

The cuts of this function obtained by using or are bound to separate variables.

 - - + + @@ -101,7 +101,7 @@ -

Uses with to construct the arc in .

+

Uses with to construct the arc in .

 @@ -127,7 +127,7 @@ -

Uses with to construct the arc in .

+

Uses with to construct the arc in .

 diff --git a/doc/parts/extensions/Shapes-Graphics-arrowheads.sxml b/doc/parts/extensions/Shapes-Graphics-arrowheads.sxml index 124a4cf2..f292f394 100644 --- a/doc/parts/extensions/Shapes-Graphics-arrowheads.sxml +++ b/doc/parts/extensions/Shapes-Graphics-arrowheads.sxml @@ -20,7 +20,7 @@ - ..Shapes..Graphics + ..Shapes..Graphics arrowheads

Functions that define arrowheads for use with .

@@ -66,7 +66,7 @@ headStroke: [stroke head:[ShapesArrow rearAngle:180° ...] ...]

These arrowheads are provided for use in .

- + @@ -111,7 +111,7 @@ headStroke: [stroke head:[ShapesArrow rearAngle:180° ...] ...]

Now we turn to the considerably trickier arrowheads. The reason things become tricky is that flat arrowheads in must have the surface normal pointing more or less towards the viewer in order for the arrowhead to be visible, and it is not always that easy to see what is a good normal direction, possibly after the objects has been transformed. Sometimes, the same object will be drawn from different angles, and then it may even be impossible to find a normal direction that suits both viewing angles. In these situations one can either use multiple arrowheads with different normals, or more general non-flat arrowheads, or resort to using (see related documentation for examples).

- + @@ -143,7 +143,7 @@ headStroke: [stroke head:[ShapesArrow rearAngle:180° ...] ...] - + diff --git a/doc/parts/extensions/Shapes-Graphics-metapostarrow.sxml b/doc/parts/extensions/Shapes-Graphics-metapostarrow.sxml index 4c74909a..18372d0c 100644 --- a/doc/parts/extensions/Shapes-Graphics-metapostarrow.sxml +++ b/doc/parts/extensions/Shapes-Graphics-metapostarrow.sxml @@ -20,7 +20,7 @@ - ..Shapes..Graphics + ..Shapes..Graphics metapostarrow

Arrowheads available through the prelude.

@@ -48,7 +48,7 @@

This arrowhead is for use in .

- + @@ -93,7 +93,7 @@

This arrowhead is for use in .

- + diff --git a/doc/parts/extensions/Shapes-Graphics-shapesarrow.sxml b/doc/parts/extensions/Shapes-Graphics-shapesarrow.sxml index b791495d..1e80f416 100644 --- a/doc/parts/extensions/Shapes-Graphics-shapesarrow.sxml +++ b/doc/parts/extensions/Shapes-Graphics-shapesarrow.sxml @@ -20,7 +20,7 @@ - ..Shapes..Graphics + ..Shapes..Graphics shapesarrow

A alternative to the arrowhead.

@@ -48,7 +48,7 @@

This arrowhead is for use in .

- + diff --git a/doc/parts/extensions/Shapes-Layout-basic-layout.sxml b/doc/parts/extensions/Shapes-Layout-basic-layout.sxml index 784b54ac..cabbe4b2 100644 --- a/doc/parts/extensions/Shapes-Layout-basic-layout.sxml +++ b/doc/parts/extensions/Shapes-Layout-basic-layout.sxml @@ -20,7 +20,7 @@ - ..Shapes..Layout + ..Shapes..Layout basic-layout

Elementary layout using bounding boxes.

@@ -48,7 +48,7 @@

These functions optimize along paths in one of the four principal directions, returning the coordinate of the optimum.

- + @@ -67,7 +67,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -131,7 +131,7 @@ Basic positioning operations - + @@ -151,7 +151,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -215,7 +215,7 @@

When positioning text relative to other elements, it often looks good if labels appear at a certain distance from the objects they label. This idea is implemented as functions using a common dynamic variable.

- + 1mm @@ -223,7 +223,7 @@ - + @@ -250,7 +250,7 @@

By mediation we refer to the specification of a value relative to a lower and upper bound. The bounds can either be very general, or the beginning and end of a path.

- + @@ -282,7 +282,7 @@ - + @@ -313,7 +313,7 @@

It is sometime useful to control the layout of an object by altering one or several of its boxes. At the moment, there are just two boxes, the bounding box and the bleed box, and for historical reasons, the short bbox refers to the bounding box.

- + @@ -332,7 +332,7 @@ - + @@ -351,7 +351,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -392,7 +392,7 @@ - + diff --git a/doc/parts/extensions/Shapes-Layout-centering-X.sxml b/doc/parts/extensions/Shapes-Layout-centering-X.sxml index 87d94b3e..3365b8b8 100644 --- a/doc/parts/extensions/Shapes-Layout-centering-X.sxml +++ b/doc/parts/extensions/Shapes-Layout-centering-X.sxml @@ -20,7 +20,7 @@ - ..Shapes..Layout + ..Shapes..Layout centering-X

Positioning of labels relative to the size of an X.

@@ -46,7 +46,7 @@ Label positioning - + diff --git a/doc/parts/extensions/Shapes-Layout-shiftoff.sxml b/doc/parts/extensions/Shapes-Layout-shiftoff.sxml index 9a4944bd..567e337b 100644 --- a/doc/parts/extensions/Shapes-Layout-shiftoff.sxml +++ b/doc/parts/extensions/Shapes-Layout-shiftoff.sxml @@ -20,7 +20,7 @@ - ..Shapes..Layout + ..Shapes..Layout shiftoff

Very basic layout tools that mimic suffix placement syntax.

@@ -49,7 +49,7 @@

The constants defined here give numeric values to directions. This is preferred over using symbols, since a miss-spelled symbol won't be detected by static analysis of the program. Note, though, that the numeric values should never be used as such; they could equally well have been defined as unique symbols.

- + @@ -57,7 +57,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -129,7 +129,7 @@

Functions for working with directions in terms of the constants defined by this extension.

- + @@ -149,7 +149,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -215,7 +215,7 @@ - + diff --git a/doc/parts/extensions/Shapes-Numeric-Constant-constants.sxml b/doc/parts/extensions/Shapes-Numeric-Constant-constants.sxml index 27e16231..d887cb8b 100644 --- a/doc/parts/extensions/Shapes-Numeric-Constant-constants.sxml +++ b/doc/parts/extensions/Shapes-Numeric-Constant-constants.sxml @@ -20,7 +20,7 @@ - ..Shapes..Numeric..Constant + ..Shapes..Numeric..Constant constants

Numeric constants.

@@ -47,7 +47,7 @@ Bindings - + @@ -56,7 +56,7 @@ - + diff --git a/doc/parts/extensions/formats/html.xsl b/doc/parts/extensions/formats/html.xsl index bc46ca55..c104e6e6 100644 --- a/doc/parts/extensions/formats/html.xsl +++ b/doc/parts/extensions/formats/html.xsl @@ -34,45 +34,30 @@ -
Alphabetical index
- -
- - - - - - -    - -
- - -
- - - - - - -    - -
- - -
- - - -
- Dependencies: - -    - - -
- -
+ + +
Alphabetical index
+
+ + + + + + + +
+
+ + +
+ Dependencies: + +    + + +
+ +
@@ -94,7 +79,7 @@ - +
Namespace:   diff --git a/doc/parts/extensions/index.sxml b/doc/parts/extensions/index.sxml index 47eda455..140196d6 100644 --- a/doc/parts/extensions/index.sxml +++ b/doc/parts/extensions/index.sxml @@ -43,18 +43,5 @@ - - - - - - - - - - - - - diff --git a/doc/parts/formats/bindings-html.xsl b/doc/parts/formats/bindings-html.xsl index e09953fe..73d3af67 100644 --- a/doc/parts/formats/bindings-html.xsl +++ b/doc/parts/formats/bindings-html.xsl @@ -153,22 +153,38 @@ + + + + + + + + + + + + + + + + - + discrete - + - + - + @@ -185,35 +201,55 @@ + + + + + + ^\.\. - + - + - - - - - - + + discrete + toc-miss.html?namespace=&kind=&name= + + + + + + + + + + + true + + + + + + @@ -266,32 +302,6 @@ - - - - - - - type - - - - - - - - - - - - - statetype - - - - - - diff --git a/doc/parts/formats/html.xsl b/doc/parts/formats/html.xsl index 5f794d3b..8b434cd0 100644 --- a/doc/parts/formats/html.xsl +++ b/doc/parts/formats/html.xsl @@ -104,12 +104,15 @@ -
- See also: - -   - -
+
+ See also: + + + + + + +
@@ -317,15 +320,32 @@ - + + discrete - types#type: + types#type: - + + + + + + + + discrete + stete-types#statetype: + + + + + + + + @@ -333,13 +353,9 @@ - - discrete - stete-types#statetype: - - - - + + + @@ -773,43 +789,43 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/doc/parts/formats/language-elements-html.xsl b/doc/parts/formats/language-elements-html.xsl index b36e6b1e..95d55a25 100644 --- a/doc/parts/formats/language-elements-html.xsl +++ b/doc/parts/formats/language-elements-html.xsl @@ -135,18 +135,24 @@ - - - - - Related by type: - - -   - - - - + + + + + + + + + + + + + + + + + + @@ -160,7 +166,10 @@ See also: -   + + + + diff --git a/doc/parts/man/formats/html.xsl b/doc/parts/man/formats/html.xsl index 92d1d87f..be8d2b76 100644 --- a/doc/parts/man/formats/html.xsl +++ b/doc/parts/man/formats/html.xsl @@ -91,9 +91,14 @@ -
- -
+
+ + + + + + +
http://www.google.com/search?btnI=I%27m%20Feeling%20Lucky&q=%22man%20page%22%20%22()%22() diff --git a/doc/parts/namespace-index/formats/html.xsl b/doc/parts/namespace-index/formats/html.xsl index 0fcf2212..06bf8aee 100644 --- a/doc/parts/namespace-index/formats/html.xsl +++ b/doc/parts/namespace-index/formats/html.xsl @@ -52,19 +52,21 @@ - - discrete - - #ns: - + + + + discrete + + #ns: + + + + + - - - - - -   + +
@@ -101,12 +103,7 @@ weak ^ - - true - - - - + weak $ diff --git a/doc/parts/namespace-toc/formats/toc.xsl b/doc/parts/namespace-toc/formats/toc.xsl index 66ce90b2..726459a8 100644 --- a/doc/parts/namespace-toc/formats/toc.xsl +++ b/doc/parts/namespace-toc/formats/toc.xsl @@ -33,7 +33,7 @@ - + @@ -43,16 +43,12 @@ - - - - - + @@ -62,13 +58,13 @@ - - + + - - + + @@ -80,7 +76,7 @@ - + @@ -90,7 +86,7 @@ - + @@ -100,7 +96,7 @@ - + @@ -110,7 +106,7 @@ - + @@ -120,7 +116,7 @@ - + @@ -130,7 +126,7 @@ - + @@ -140,8 +136,8 @@ - - + + @@ -152,8 +148,8 @@ - - + + @@ -164,8 +160,8 @@ - - + + @@ -176,8 +172,8 @@ - - + + diff --git a/doc/parts/namespace-toc/toc-miss.html b/doc/parts/namespace-toc/toc-miss.html new file mode 100644 index 00000000..077c8ef3 --- /dev/null +++ b/doc/parts/namespace-toc/toc-miss.html @@ -0,0 +1,19 @@ + + + + + Lookup-miss + + + +
+

+ Lookup-miss in table of contents +

+

+ A correct link for the binding could not be generated. +

+
+ + diff --git a/doc/parts/namespace/Applications.sxml b/doc/parts/namespace/Applications-Blockdraw.sxml similarity index 82% copy from doc/parts/namespace/Applications.sxml copy to doc/parts/namespace/Applications-Blockdraw.sxml index a81da87a..10ce33b6 100644 --- a/doc/parts/namespace/Applications.sxml +++ b/doc/parts/namespace/Applications-Blockdraw.sxml @@ -20,18 +20,24 @@ - ..Applications - <self /> + ..Applications..Blockdraw -

Namespace of the standard extensions that are not part of the language.

+

Utilities for drawing block diagrams and bond graphs.

 + + <self /> + "$(BASE)" /> "$(EXAMPLES)" /> "$(SHAPES_VERSION)" /> + + + + -

extensions in this namespace are part of the project, but not considered part of the language..

+

The two extensions in this namespace serve rather different purposes, and coexist in the same namespace for historical reasons.

 diff --git a/doc/parts/namespace/Applications.sxml b/doc/parts/namespace/Applications.sxml index a81da87a..dee5673f 100644 --- a/doc/parts/namespace/Applications.sxml +++ b/doc/parts/namespace/Applications.sxml @@ -21,17 +21,22 @@ ..Applications - <self />

Namespace of the standard extensions that are not part of the language.

 + + <self /> "$(BASE)" /> "$(EXAMPLES)" /> "$(SHAPES_VERSION)" /> + + + + -

extensions in this namespace are part of the project, but not considered part of the language..

+

extensions in this namespace are part of the project, but not considered part of the language.

 diff --git a/doc/parts/namespace/Shapes-Geometry.sxml b/doc/parts/namespace/Shapes-Geometry.sxml index f5898da3..127ba8fb 100644 --- a/doc/parts/namespace/Shapes-Geometry.sxml +++ b/doc/parts/namespace/Shapes-Geometry.sxml @@ -21,17 +21,19 @@ ..Shapes..Geometry - <self />

Geometric operations in .

 + + <self /> + "$(BASE)" /> "$(EXAMPLES)" /> "$(SHAPES_VERSION)" /> - +

The geometric objects in are coordinates and paths. This namespace is for operations within this class of objects. Once the geometric objects are painted (typically stroked or filled), they become graphical objects and are no longer under the topic of this namespace. Compare .

diff --git a/doc/parts/namespace/formats/html.xsl b/doc/parts/namespace/formats/html.xsl index 0b648d8e..ac1e7061 100644 --- a/doc/parts/namespace/formats/html.xsl +++ b/doc/parts/namespace/formats/html.xsl @@ -40,18 +40,20 @@
- - discrete - - - + + + + discrete + + + + + + + - - - - - -    + +
@@ -63,13 +65,10 @@
- - true - - - - -    + + + +
@@ -103,13 +102,10 @@
- - true - - - - -    + + + +
diff --git a/doc/parts/state-types/formats/html.xsl b/doc/parts/state-types/formats/html.xsl index f39e23f7..9b152ad4 100644 --- a/doc/parts/state-types/formats/html.xsl +++ b/doc/parts/state-types/formats/html.xsl @@ -62,7 +62,7 @@
- +    @@ -81,7 +81,7 @@
- +    diff --git a/doc/parts/types/formats/html.xsl b/doc/parts/types/formats/html.xsl index f169b4d9..c8698e19 100644 --- a/doc/parts/types/formats/html.xsl +++ b/doc/parts/types/formats/html.xsl @@ -229,7 +229,10 @@ See also: -   + + + + @@ -263,7 +266,10 @@ See also: -   + + + +   diff --git a/doc/styles/html/shapes.css b/doc/styles/html/shapes.css index 8f63feed..6ac37eca 100644 --- a/doc/styles/html/shapes.css +++ b/doc/styles/html/shapes.css @@ -240,6 +240,17 @@ pre, table.syntax, table.tokens, table.tight, table.loose, table.wide, table.typ /********************************************************* + * Horizontal spacing of elements + */ + +span.horizontal-item +{ + margin-left: 0.2em; + margin-right: 0.2em; +} + + +/********************************************************* * Special textual content */ -- 2.11.4.GIT