Lout 3.35.

git-svn-id: http://svn.savannah.nongnu.org/svn/lout/trunk@39 9365b830-b601-4143-9ba8-b4a8e2c3339c

5 files changed, 111 insertions, 22 deletions

diff --git a/include/README b/include/README
index 43bf7b1..01d9bf9 100644
--- a/include/README
+++ b/include/README
@@ -102,4 +102,4 @@ Miscellaneous source files
 
 
 Jeffrey H. Kingston
-14 November 2006
+12 April 2007
diff --git a/include/bsf b/include/bsf
index 0b40f3e..2c472a2 100644
--- a/include/bsf
+++ b/include/bsf
@@ -46,6 +46,17 @@ def @Colour @Color left col right y { {@ColourCommand col} @SetColour y }
 
 ###########################################################################
 #                                                                         #
+#  @ColouredUnderline, @ColoredUnderline                                  #
+#                                                                         #
+###########################################################################
+
+def @ColouredUnderline @ColoredUnderline left col right y {
+  {@ColourCommand col} @SetUnderlineColour @Underline y
+}
+
+
+###########################################################################
+#                                                                         #
 #   @Texture                                                              #
 #                                                                         #
 ###########################################################################
@@ -119,7 +130,7 @@ export
 
     @Date @Time @DateTimeFormat @DropCapTwo @DropCapThree @Centre @Right
     @NoDotSep @NoDotJoin @Join @Sep @DotSep @ColonSep @DotJoin @DashJoin
-    @NumSep @VStrut @ZeroWidth @ZeroHeight @OverStrike @Sup @Sub
+    @NumSep @VStrut @ZeroWidth @ZeroHeight @OverStrike @Sup @Sub @HClip @VClip
     @FullWidthRule @LocalWidthRule @Box @CurveBox @ShadowBox @BoundaryMarks
     @NumberMarker @NumberOf @TitleMarker @TitleOf
     @PageMarker @PageMark @NoLinkPageMark @PageOf @CrossLink @ExternalLink
@@ -781,6 +792,35 @@ def @BasicSetup
 	    x /gap | 0.7f @Font y
 	}
     }
+
+
+    ###########################################################################
+    #                                                                         #
+    #   @HClip and @VClip                                                     #
+    #                                                                         #
+    ###########################################################################
+
+    def @HClip
+	named shift { 0.0 }
+	right x
+    {
+       { "newpath 0 0 moveto xsize 0 lineto xsize ysize lineto 0 ysize lineto"
+	 "closepath clip gsave" // "grestore" } @Graphic
+	 {
+	   |{{shift}"rt"} @ZeroWidth {{shift}"w"} @HShift x |
+	 }
+    }
+
+    def @VClip
+	named shift { 0.0 }
+	right x
+    {
+       { "newpath 0 0 moveto xsize 0 lineto xsize ysize lineto 0 ysize lineto"
+	 "closepath clip gsave" // "grestore" } @Graphic
+	 {
+	   /{{shift}"rt"} @ZeroHeight {{shift}"w"} @VShift x /
+	 }
+    }
 
 
     ###########################################################################
diff --git a/include/diagf b/include/diagf
index cdff1a9..f9ef401 100644
--- a/include/diagf
+++ b/include/diagf
@@ -917,6 +917,7 @@ def @DiagSetup
 	   @ArrowHead @SolidArrowHead @SolidWithBarArrowHead @OpenArrowHead
 	   @HalfOpenArrowHead @SolidCurvedArrowHead @OpenCurvedArrowHead
 	   @HalfOpenCurvedArrowHead @CircleArrowHead @BoxArrowHead
+	   @ManyArrowHead
 
 	   @Link
 	   @Line @DoubleLine @Arrow @DoubleArrow @Curve @CurveArrow
@@ -5074,6 +5075,25 @@ def @DiagSetup
 	    { length @Wide width @High }
 	}
 
+	def @ManyArrowHead
+	    named width { arrowwidth }
+	    named length { arrowlength }
+	    named pathwidth { pathwidth }
+	{
+	    @InsulatedNode
+		outlinestyle { noline }
+		paint { nochange }
+		texture { solid }
+		outlinewidth { pathwidth }
+		outline {
+		  @BackEnd @Case {
+		    PostScript @Yield { pathwidth "ldiagmanyarrowhead" }
+		    PDF @Yield {}
+		  }
+		}
+	    { length @Wide width @High }
+	}
+
 	def @ArrowHead
 	    named style { arrowstyle }
 	    named width { arrowwidth }
@@ -5108,6 +5128,9 @@ def @DiagSetup
 		box            @Yield @BoxArrowHead
 				  width { width } length { length }
 				  pathwidth { pathwidth }
+		many           @Yield @ManyArrowHead
+				  width { width } length { length }
+				  pathwidth { pathwidth }
 	    }
 	}
 
diff --git a/include/diagf.lpg b/include/diagf.lpg
index 63cd684..f266960 100644
--- a/include/diagf.lpg
+++ b/include/diagf.lpg
@@ -3306,5 +3306,31 @@ ldiagdict begin
   0 0
 } def
 
+% shape and labels of the @ManyArrowHead symbol
+% <pathwidth> ldiagmanyarrowhead -
+/ldiagmanyarrowhead
+{
+  /pathwidth exch def
+  /LL [ 0 ysize 2 div pathwidth 2 div sub ] cvx def
+  /LU [ 0 ysize 2 div pathwidth 2 div add ] cvx def
+  LL
+  xsize 0
+  xsize pathwidth
+  LU
+  LL
+  []
+  LL
+  xsize LL exch pop
+  xsize LU exch pop
+  LU
+  LL
+  []
+  LL
+  xsize ysize pathwidth sub
+  xsize ysize
+  LU
+  LL
+} def
+
 end
 %%EndResource
diff --git a/include/eqf b/include/eqf
index 602c3df..3e76a97 100644
--- a/include/eqf
+++ b/include/eqf
@@ -59,8 +59,6 @@ export	"`" "``" "```" bin rel punct non vctr big small
 	triangle backslash forall exists neg
 	circle filledcircle square
 
-	"0" "1" "2" "3" "4" "5" "6" "7" "8" "9"
-
 	sum prod coprod int oint bcap bcup bvee bwedge bodot botimes
 	boplus buplus
 
@@ -105,6 +103,8 @@ export	"`" "``" "```" bin rel punct non vctr big small
 	nextcol above labove cabove rabove mabove
 	matrix pmatrix bmatrix brmatrix fmatrix cmatrix amatrix
 
+	"0" "1" "2" "3" "4" "5" "6" "7" "8" "9"
+
 def @Eq                  
     named initzunit { 1f }
     body @Body
@@ -592,24 +592,6 @@ def @Eq
 
     ###################################################################
     #                                                                 #
-    #   Group 5 (digits)                                              #
-    #                                                                 #
-    ###################################################################
-
-    def "0" { zero            }
-    def "1" { one             }
-    def "2" { two             }
-    def "3" { three           }
-    def "4" { four            }
-    def "5" { five            }
-    def "6" { six             }
-    def "7" { seven           }
-    def "8" { eight           }
-    def "9" { nine            }
-
-
-    ###################################################################
-    #                                                                 #
     #   Group 6 ("Large" operators)                                   #
     #                                                                 #
     #   Knuth's large operators automatically change size depending   #
@@ -1692,6 +1674,24 @@ def @Eq
     macro cmatrix  { matrix atleft { blceil  } atright { brceil  } }
     macro amatrix  { matrix atleft { blangle } atright { brangle } }
 
+    ###################################################################
+    #                                                                 #
+    #   Group 5 (digits)                                              #
+    #                                                                 #
+    ###################################################################
+
+    def "0" { zero            }
+    def "1" { one             }
+    def "2" { two             }
+    def "3" { three           }
+    def "4" { four            }
+    def "5" { five            }
+    def "6" { six             }
+    def "7" { seven           }
+    def "8" { eight           }
+    def "9" { nine            }
+
+
     { Slope xheight2mark nostrut } @Font { separate @SpaceGap } @Space
     initzunit @ZUnit 1f @YUnit @Body