fix more links

Author: WalterBright

arrays.dd

@@ -12,7 +12,7 @@ $(SPEC_S Arrays,
 
         $(TR $(TD $(I type)[])  $(TD $(LINK2 #dynamic-arrays, Dynamic arrays)))
 
-        $(TR $(TD $(I type)[$(I type)]) $(TD $(LINK2 hash-map.html, Associative arrays)))
+        $(TR $(TD $(I type)[$(I type)]) $(TD $(LINK2 $(WEB hash-map.html)$(EBOOK #Associative Arrays), Associative arrays)))
     )
 
 <h3>$(LNAME2 pointers, Pointers)</h3>

class.dd

@@ -78,7 +78,7 @@ $(UL
         $(LI $(LINK2 #member-functions, member functions)
         $(UL
             $(LI static member functions)
-            $(LI $(LINK2 function.html#virtual-functions, Virtual Functions))
+            $(LI $(LINK2 $(WEB function.html)#virtual-functions, Virtual Functions))
             $(LI $(LINK2 #synchronized-functions, Synchronized Functions))
             $(LI $(LINK2 #constructors, Constructors))
             $(LI $(LINK2 #destructors, Destructors))
@@ -87,7 +87,7 @@ $(UL
             $(LI $(GLINK SharedStaticConstructor)s)
             $(LI $(GLINK SharedStaticDestructor)s)
             $(LI $(LINK2 #invariants, Class Invariants))
-            $(LI $(LINK2 unittest.html#unittest, Unit Tests))
+            $(LI $(LINK2 $(WEB unittest.html)#unittest, Unit Tests))
             $(LI $(LINK2 #allocators, Class Allocators))
             $(LI $(LINK2 #deallocators, Class Deallocators))
 $(V2
@@ -750,7 +750,7 @@ new(1,2) Foo(a);        // calls new(Foo.sizeof,1,2)
         )
 
         $(P See also
-        $(LINK2 memory.html#newdelete, Explicit Class Instance Allocation).
+        $(LINK2 $(WEBURL)memory.html#newdelete, Explicit Class Instance Allocation).
         )
 
 <h3>$(LNAME2 deallocators, Class Deallocators)</h3>
@@ -793,7 +793,7 @@ delete f;
         )
 
         $(P See also
-        $(LINK2 memory.html#newdelete, Explicit Class Instance Allocation).
+        $(LINK2 $(WEBURL)memory.html#newdelete, Explicit Class Instance Allocation).
         )
 
 $(V2
@@ -1075,7 +1075,7 @@ void test() {
 }
 ----
 
-<h3>$(LNAME2 anonymous, Anonymous Nested Classes)</h3>
+<h3>Anonymous Nested Classes</h3>
 
         $(P An anonymous nested class is both defined and instantiated with
         a $(I NewAnonClassExpression):

errors.dd

@@ -177,7 +177,7 @@ How does this meet our assumptions about errors?
 </dl>
 
 Using exceptions to handle errors leads to another issue - how to write
-exception safe programs. $(LINK2 exception-safe.html, Here's how).
+exception safe programs. $(LINK2 $(WEBURL)exception-safe.html, Here's how).
 
 $(COMMENT
 	$(OL 

expression.dd

@@ -519,7 +519,7 @@ $(GNAME RelExpression):
         $(LI "Exception" means the $(I Invalid Exception) is raised if one
                 of the operands is a NAN. It does not mean an exception
                 is thrown. The $(I Invalid Exception) can be checked
-                using the functions in $(LINK2 phobos/std_c_fenv.html, std.c.fenv).
+                using the functions in $(LINK2 $(WEBURL)phobos/std_c_fenv.html, std.c.fenv).
         )
         )
 
@@ -707,7 +707,7 @@ $(GNAME UnaryExpression):
     $(GLINK NewExpression)
     $(GLINK DeleteExpression)
     $(GLINK CastExpression)
-    $(LINK2 class.html#anonymous, $(I NewAnonClassExpression))
+    $(GLINK2 class, NewAnonClassExpression)
 )
 
 
@@ -1058,7 +1058,7 @@ $(V2      $(B __FILE__)
     $(GLINK AssertExpression)
     $(GLINK MixinExpression)
     $(GLINK ImportExpression)
-    $(LINK2 declaration.html#BasicTypeX, $(I BasicType)) $(B .) $(I Identifier)
+    $(LINK2 $(WEB declaration.html)#BasicTypeX, $(I BasicType)) $(B .) $(I Identifier)
     $(GLINK2 declaration, Typeof)
     $(GLINK TypeidExpression)
     $(GLINK IsExpression)
@@ -1393,8 +1393,8 @@ double test() {
 }
 -------------
 
-        When comparing with <a href="function.html#nested">nested
-        functions</a>, the $(B function) form is analogous to static
+        When comparing with $(LINK2 $(WEB function.html)#nested, nested functions),
+	the $(B function) form is analogous to static
         or non-nested functions, and the $(B delegate) form is
         analogous to non-static nested functions. In other words,
         a delegate literal can access stack variables in its enclosing
@@ -1417,7 +1417,7 @@ $(GNAME AssertExpression):
         evaluate assert expressions at all.
         The result type of an assert expression is $(TT void).
         Asserts are a fundamental part of the
-        <a href="dbc.html">Contract Programming</a>
+        $(LINK2 $(WEB dbc.html)$(EBOOK #Contract Programming), Contract Programming)
         support in D.
         )
 
@@ -1507,20 +1507,20 @@ $(V2      $(B typeid $(LPAREN)) $(GLINK Expression) $(B $(RPAREN)))
 
 $(V1
         $(P Returns an instance of class
-        $(LINK2 phobos/object.html, $(B TypeInfo))
+        $(LINK2 $(WEBURL)phobos/object.html, $(B TypeInfo))
         corresponding
         to $(I Type).
         )
 )
 $(V2
         $(P If $(I Type), returns an instance of class
-        $(LINK2 phobos/object.html, $(B TypeInfo))
+        $(LINK2 $(WEBURL)phobos/object.html, $(B TypeInfo))
         corresponding
         to $(I Type).
         )
 
         $(P If $(I Expression), returns an instance of class
-        $(LINK2 phobos/object.html, $(B TypeInfo))
+        $(LINK2 $(WEBURL)phobos/object.html, $(B TypeInfo))
         corresponding
         to the type of the $(I Expression).
         If the type is a class, it returns the $(B TypeInfo)

float.dd

@@ -177,7 +177,7 @@ $(V2
 	)
 
 	$(P These flags can be set/reset via the functions in
-	$(LINK2 phobos/std_c_fenv.html, std.c.fenv).)
+	$(LINK2 $(WEBURL)phobos/std_c_fenv.html, std.c.fenv).)
 
 <h3>Floating Point Comparisons</h3>
 
@@ -194,7 +194,7 @@ $(V2
 	!&lt;&gt;
 	and match the semantics for the 
 	NCEG extensions to C.
-	See $(LINK2 expression.html#floating_point_comparisons, Floating point comparisons).
+	See $(LINK2 $(WEB expression.html)#floating_point_comparisons, Floating point comparisons).
 	)
 
 <h3><a name="floating-point-transformations">Floating Point Transformations</a></h2>

function.dd

@@ -56,7 +56,7 @@ $(V2
         are restored to their initial state upon function entry)
         $(LI perform impure operations in statements that are in a
         $(GLINK2 version, ConditionalStatement)
-        controlled by a $(LINK2 version.html#debug, $(I DebugCondition)).)
+        controlled by a $(GLINK2 version, DebugCondition).)
         )
 
         $(P A pure function can throw exceptions.)
@@ -1630,7 +1630,7 @@ $(V2
 
         $(P $(I Safe functions) are functions that are statically checked
         to exhibit no possibility of
-        $(LINK2 glossary.html#undefined_behavior, $(I undefined behavior)).
+        $(LINK2 $(WEBURL)glossary.html#undefined_behavior, $(I undefined behavior)).
         Undefined behavior is often used as a vector for malicious
         attacks.
         )
@@ -1704,7 +1704,7 @@ $(V2
 <h2>$(LNAME2 function-attribute-inference, Function Attribute Inference)</h2>
 
         $(P $(GLINK2 expression, FunctionLiteral)s and
-        $(LINK2 template.html#function-templates, function template)s, since their function bodies
+        $(LINK2 $(WEB template.html)#function-templates, function template)s, since their function bodies
         are always present, infer the
         $(LINK2 #pure-functions, $(B pure)),
         $(LINK2 #nothrow-functions, $(B nothrow)), and

garbage.dd

@@ -129,7 +129,7 @@ $(SPEC_S Garbage Collection,
 	)
 
 	$(P These constraints are addressed by techniques outlined
-	in <a href="memory.html">Memory Management</a>.
+	in $(LINK2 $(WEBURL)memory.html, Memory Management).
 	)
 
 <h2>How Garbage Collection Works</h2>

property.dd

@@ -24,7 +24,7 @@ $(TR $(TH Property)	$(TH Description))
 $(TR $(TD $(LINK2 #init, .init))	$(TD initializer))
 $(TR $(TD $(LINK2 #sizeof, .sizeof))	$(TD size in bytes (equivalent to C's sizeof(type))))
 $(TR $(TD $(LINK2 #alignof, .alignof))	$(TD alignment size))
-$(TR $(TD $(LINK2 #mangleof, .mangleof))	$(TD string representing the $(SINGLEQUOTE mangled) representation of the type))
+$(TR $(TD .mangleof)	$(TD string representing the $(SINGLEQUOTE mangled) representation of the type))
 $(TR $(TD $(LINK2 #stringof, .stringof))	$(TD string representing the source representation of the type))
 )
 
@@ -172,8 +172,8 @@ $(SECTION2 $(LNAME2 classinfo, .classinfo) Property,
 
 	$(P $(CODE .classinfo) provides information about the dynamic type
 	of a class object.
-	$(V1 It returns a reference to type $(LINK2 phobos/object.html, object.ClassInfo).)
-	$(V2 It returns a reference to type $(LINK2 phobos/object.html#TypeInfo_Class, object.TypeInfo_Class).)
+	$(V1 It returns a reference to type $(LINK2 $(WEBURL)phobos/object.html, object.ClassInfo).)
+	$(V2 It returns a reference to type $(LINK2 $(WEBURL)phobos/object.html#TypeInfo_Class, object.TypeInfo_Class).)
 	)
 )
 

statement.dd

@@ -1159,7 +1159,7 @@ $(I ReturnStatement):
         <p>
 
         If there is an out postcondition
-        (see $(LINK2 dbc.html, Contract Programming)),
+        (see $(LINK2 $(WEB dbc.html)$(EBOOK #Contract Programming), Contract Programming)),
         that postcondition is executed
         after the $(EXPRESSION) is evaluated and before the function
         actually returns.

struct.dd

@@ -5,7 +5,7 @@ $(SPEC_S Structs & Unions,
         $(P Whereas classes are reference types, structs are value types.
         Any C struct can be exactly represented as a D struct.
         In C++ parlance, a D struct is a
-        $(LINK2 glossary.html#pod, POD (Plain Old Data)) type,
+        $(LINK2 $(WEBURL)glossary.html#pod, POD (Plain Old Data)) type,
         with a trivial constructors and destructors.
         Structs and unions are meant as simple aggregations of data, or as a way
         to paint a data structure over hardware or an external type. External
@@ -342,7 +342,7 @@ $(V2
         $(TR
         $(TD inner nesting)
         $(TD $(LINK2 #nested, YES))
-        $(TD $(LINK2 class.html#nested, YES))
+        $(TD $(LINK2 $(WEB class.html)#nested, YES))
         $(NO)
         $(NO)
         $(NO)

template-comparison.dd

@@ -265,7 +265,7 @@ return Foo_foo<char,int&gt('c',3);
 
 	$(TR
 	$(TD Compile time execution of functions)
-	$(TD $(LINK2 function.html#interpretation, Yes):
+	$(TD $(LINK2 $(WEB function.html)#interpretation, Yes):
 ---
 int factorial(int i)
 { if (i == 0)

version.dd

@@ -57,17 +57,13 @@ $(GNAME ConditionalStatement):
 
 $(GRAMMAR
 $(GNAME Condition):
-    $(LINK2 #version, $(I VersionCondition))
-    $(LINK2 #debug, $(I DebugCondition))
+    $(GLINK VersionCondition)
+    $(GLINK DebugCondition)
     $(GLINK StaticIfCondition)
 )
 
 <h2>$(LNAME2 version, Version Condition)</h2>
 
-	$(P Versions enable multiple versions of a module to be implemented
-	with a single source file.
-	)
-
 $(GRAMMAR
 $(GNAME VersionCondition):
     $(B version $(LPAREN)) $(GLINK2 lex, IntegerLiteral) $(B $(RPAREN))
@@ -76,6 +72,10 @@ $(V2
     $(B version $(LPAREN)) $(B unittest) $(B $(RPAREN)))
 )
 
+	$(P Versions enable multiple versions of a module to be implemented
+	with a single source file.
+	)
+
 	$(P The $(I VersionCondition) is satisfied if the $(I IntegerLiteral)
 	is greater than or equal to the current $(I version level),
 	or if $(I Identifier) matches a $(I version identifier).
@@ -245,12 +245,12 @@ $(V2
 	$(TR $(TD $(B LittleEndian)) $(TD Byte order, least significant first))
 	$(TR $(TD $(B BigEndian)) $(TD Byte order, most significant first))
 	$(TR $(TD $(B D_Coverage)) $(TD $(LINK2 $(WEBURL)code_coverage.html, Code coverage analysis) instrumentation (command line $(LINK2 $(WEBURL)dmd-windows.html#switches, switch) $(B -cov)) is being generated))
-	$(TR $(TD $(B D_Ddoc)) $(TD $(LINK2 ddoc.html, Ddoc) documentation (command line $(LINK2 $(WEBURL)dmd-windows.html#switches, switch) $(B -D)) is being generated))
+	$(TR $(TD $(B D_Ddoc)) $(TD $(LINK2 $(WEB ddoc.html)$(EBOOK #Embedded Documentation), Ddoc) documentation (command line $(LINK2 $(WEBURL)dmd-windows.html#switches, switch) $(B -D)) is being generated))
 	$(TR $(TD $(B D_InlineAsm_X86)) $(TD $(LINK2 $(WEB iasm.html)$(EBOOK #Inline Assembler), Inline assembler) for X86 is implemented))
 	$(TR $(TD $(B D_InlineAsm_X86_64)) $(TD $(LINK2 $(WEB iasm.html)$(EBOOK #Inline Assembler), Inline assembler) for X86-64 is implemented))
 	$(TR $(TD $(B D_LP64)) $(TD Pointers are 64 bits (command line $(LINK2 $(WEBURL)dmd-windows.html#switches, switch) $(B -m64))))
 	$(TR $(TD $(B D_PIC)) $(TD Position Independent Code (command line $(LINK2 $(WEBURL)dmd-windows.html#switches, switch) $(B -fPIC)) is being generated))
-	$(V2 $(TR $(TD $(B unittest)) $(TD $(LINK2 unittest.html, Unit tests) are enabled (command line $(LINK2 $(WEBURL)dmd-windows.html#switches, switch) $(B -unittest)))))
+	$(V2 $(TR $(TD $(B unittest)) $(TD $(LINK2 $(WEB unittest.html)$(EBOOK #Unit Tests), Unit tests) are enabled (command line $(LINK2 $(WEBURL)dmd-windows.html#switches, switch) $(B -unittest)))))
 	$(V2 $(TR $(TD $(B D_Version2)) $(TD This is a D version 2 compiler)))
 	$(TR $(TD $(B none)) $(TD Never defined; used to just disable a section of code))
 	$(TR $(TD $(B all)) $(TD Always defined; used as the opposite of $(B none)))
@@ -292,6 +292,13 @@ version(DigitalMars_funky_extension)
 
 <h2>$(LNAME2 debug, Debug Condition)</h2>
 
+$(GRAMMAR
+$(GNAME DebugCondition):
+    $(B debug)
+    $(B debug $(LPAREN)) $(GLINK2 lex, IntegerLiteral) $(B $(RPAREN))
+    $(B debug $(LPAREN)) $(I Identifier) $(B $(RPAREN))
+)
+
 	$(P Two versions of programs are commonly built,
 	a release build and a debug build.
 	The debug build includes extra error checking code,
@@ -302,13 +309,6 @@ version(DigitalMars_funky_extension)
 	with $(CODE #ifdef DEBUG) / $(CODE #endif) pairs.
 	)
 
-$(GRAMMAR
-$(GNAME DebugCondition):
-    $(B debug)
-    $(B debug $(LPAREN)) $(GLINK2 lex, IntegerLiteral) $(B $(RPAREN))
-    $(B debug $(LPAREN)) $(I Identifier) $(B $(RPAREN))
-)
-
 	$(P The $(B debug) condition is satisfied when the $(B -debug) switch is
 	thrown on the compiler.
 	)