From dedf3cc1564523721fd6b84f1a484f2924544f68 Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Sun, 3 Mar 2013 12:45:04 +0000 Subject: [PATCH] Use RELATIVE_LINK2 everywhere instead of $(LINK2 #anchor, Description) '#' should not be used for non-HTML generation. --- D1toD2.dd | 2 +- arrays.dd | 2 +- attribute.dd | 28 +++++------ comparison.dd | 2 +- const-faq.dd | 2 +- cpp0x.dd | 110 +++++++++++++++++++++---------------------- cppstrings.dd | 2 +- cpptod.dd | 24 +++++----- ctod.dd | 74 ++++++++++++++--------------- dcompiler.dd | 34 ++++++------- declaration.dd | 2 +- deprecate.dd | 2 +- ebook.ddoc | 6 +-- faq.dd | 2 +- latex.ddoc | 2 +- memory.dd | 4 +- migrate-to-shared.dd | 14 +++--- property.dd | 10 ++-- struct.dd | 4 +- traits.dd | 2 +- 20 files changed, 164 insertions(+), 164 deletions(-) diff --git a/D1toD2.dd b/D1toD2.dd index c84216f33c..9910a4cf41 100644 --- a/D1toD2.dd +++ b/D1toD2.dd @@ -100,5 +100,5 @@ $(ITEM immutable_string, String Literals are Immutable) Macros: TITLE=Migrating D1 Code to D2 WIKI=D1toD2 - ITEMR=$(LI $(LINK2 #$1, $+)) + ITEMR=$(LI $(RELATIVE_LINK2 $1, $+)) ITEM=

$+

diff --git a/arrays.dd b/arrays.dd index 367718dc9c..ce6016d566 100644 --- a/arrays.dd +++ b/arrays.dd @@ -302,7 +302,7 @@ a = b; // a refers to b a = b ~ c[0..0]; // a refers to a copy of b --------- - $(P Appending does not always create a copy, see $(LINK2 #resize, + $(P Appending does not always create a copy, see $(RELATIVE_LINK2 resize, setting dynamic array length) for details. ) diff --git a/attribute.dd b/attribute.dd index 1ed1815d1e..26cff720f0 100644 --- a/attribute.dd +++ b/attribute.dd @@ -8,25 +8,25 @@ $(GNAME AttributeSpecifier): $(GLINK Attribute) $(GLINK DeclarationBlock) $(GNAME Attribute): - $(LINK2 #linkage, $(I LinkageAttribute)) - $(LINK2 #align, $(I AlignAttribute)) + $(RELATIVE_LINK2 linkage, $(I LinkageAttribute)) + $(RELATIVE_LINK2 align, $(I AlignAttribute)) $(GLINK2 pragma, Pragma) - $(LINK2 #deprecated, $(D deprecated)) + $(RELATIVE_LINK2 deprecated, $(D deprecated)) $(GLINK ProtectionAttribute) $(D static) - $(LINK2 #linkage, $(D extern)) + $(RELATIVE_LINK2 linkage, $(D extern)) $(D final) $(D synchronized) - $(LINK2 #override, $(D override)) - $(LINK2 #abstract, $(D abstract)) - $(LINK2 #const, $(D const)) - $(LINK2 #auto, $(D auto)) - $(LINK2 #scope, $(D scope)) - $(LINK2 #gshared, $(D __gshared)) - $(LINK2 #shared, $(D shared)) - $(LINK2 #immutable, $(D immutable)) - $(LINK2 #inout, $(D inout)) - $(LINK2 #disable, $(D @disable)) + $(RELATIVE_LINK2 override, $(D override)) + $(RELATIVE_LINK2 abstract, $(D abstract)) + $(RELATIVE_LINK2 const, $(D const)) + $(RELATIVE_LINK2 auto, $(D auto)) + $(RELATIVE_LINK2 scope, $(D scope)) + $(RELATIVE_LINK2 gshared, $(D __gshared)) + $(RELATIVE_LINK2 shared, $(D shared)) + $(RELATIVE_LINK2 immutable, $(D immutable)) + $(RELATIVE_LINK2 inout, $(D inout)) + $(RELATIVE_LINK2 disable, $(D @disable)) $(GNAME DeclarationBlock): diff --git a/comparison.dd b/comparison.dd index 5f89244fa6..211cfa6f41 100644 --- a/comparison.dd +++ b/comparison.dd @@ -17,7 +17,7 @@ $(COMMUNITY $(B D) vs Other Languages, $(TABLE2 D Language Feature Comparison Table, $(THEAD Feature, $(LINK2 /, $(B D))) $(TROW - $(ARGS $(LINK2 #GarbageCollection, Garbage Collection)) + $(ARGS $(RELATIVE_LINK2 GarbageCollection, Garbage Collection)) $(YES1 garbage.html) ) $(TR diff --git a/const-faq.dd b/const-faq.dd index 6f1b240bcb..f54626962f 100644 --- a/const-faq.dd +++ b/const-faq.dd @@ -290,5 +290,5 @@ Macros: TITLE=const(FAQ) WIKI=constFAQ CATEGORY_FAQ=$0 - ITEMR=$(LI $(LINK2 #$1, $+)) + ITEMR=$(LI $(RELATIVE_LINK2 $1, $+)) ITEM=
$(H3 $+) diff --git a/cpp0x.dd b/cpp0x.dd index 3a55553212..d13110326e 100644 --- a/cpp0x.dd +++ b/cpp0x.dd @@ -19,67 +19,67 @@ $(COMMUNITY D and C++0x, $(SECTION3 Proposed C++0x Features, $(UL - $(LI $(LINK2 #rvalue-reference, A Proposal to Add an Rvalue Reference to the C++ Language)) - $(LI $(LINK2 #class-rvalue, Clarification of Initialization of Class Objects by rvalues)) - $(LI $(LINK2 #move-semantics, Extending Move Semantics To *this (Revision 2))) - $(LI $(LINK2 #static-assert, static_assert)) - $(LI $(LINK2 #template-aliases, Template aliases for C++)) - $(LI $(LINK2 #extern-template, Extern template)) - $(LI $(LINK2 #variadic-templates, Variadic Templates)) - $(LI $(LINK2 #variadic-template-templates, Extending Variadic Template Template Parameters)) - $(LI $(LINK2 #nullptr, A name for the null pointer: nullptr)) - $(LI $(LINK2 #strong-enums, Strongly Typed Enums)) - $(LI $(LINK2 #extended-friends, Extended friend Declarations)) - $(LI $(LINK2 #constant-expressions, Generalized Constant Expressions)) - $(LI $(LINK2 #namespace-association, Namespace Association ("Strong Using"))) - $(LI $(LINK2 #c99-preprocessor, Synchronizing the C++ preprocessor with C99)) - $(LI $(LINK2 #alignment, Adding Alignment Support to the C++ Programming Language)) - $(LI $(LINK2 #conditional, Conditionally-Supported Behavior)) - $(LI $(LINK2 #undefined-behavior, Changing Undefined Behavior into Diagnosable Errors)) - $(LI $(LINK2 #long-long, Adding the long long type to C++)) - $(LI $(LINK2 #extended-integer-types, Adding extended integer types to C++)) - $(LI $(LINK2 #delegating-ctors, Delegating Constructors)) - $(LI $(LINK2 #explicit-conversion, Explicit Conversion Operators)) - $(LI $(LINK2 #char16_t, New Character Types in C++)) - $(LI $(LINK2 #right-angle-brackets, Right Angle Brackets)) - $(LI $(LINK2 #type-deduction, Deducing the type of variable from its initializer expression)) - $(LI $(LINK2 #auto-declarations, The Syntax of auto Declarations)) - $(LI $(LINK2 #inheriting-ctors, Inheriting Constructors)) - $(LI $(LINK2 #sequence-points, A finer-grained alternative to sequence points)) - $(LI $(LINK2 #lambda, (monomorphic) Lambda expressions and closures for C++)) - $(LI $(LINK2 #__func__, Proposed addition of __func__ predefined identifier from C99)) - $(LI $(LINK2 #atomic, Atomic operations with multi-threaded environments)) - $(LI $(LINK2 #concurrency, Sequencing and the concurrency memory model)) - $(LI $(LINK2 #raw-strings, Raw String Literals)) - $(LI $(LINK2 #pod, PODs unstrung)) - $(LI $(LINK2 #exceptions, Propagating exceptions when joining threads)) - $(LI $(LINK2 #decltype, Decltype)) - $(LI $(LINK2 #sizeof, Extending sizeof)) - $(LI $(LINK2 #utf8-literals, UTF8 Literals)) - $(LI $(LINK2 #ucs-in-literals, Universal Character Names in Literals)) - $(LI $(LINK2 #defaulted, Defaulted and Deleted Functions)) - $(LI $(LINK2 #unions, Unrestricted Unions)) - $(LI $(LINK2 #library, A Multi-threading Library for Standard C++)) - $(LI $(LINK2 #abandoning, Abandoning a Process)) - $(LI $(LINK2 #return-types, New function declaration syntax for deduced return types)) - $(LI $(LINK2 #atomic-signals, Allow atomics use in signal handlers)) + $(LI $(RELATIVE_LINK2 rvalue-reference, A Proposal to Add an Rvalue Reference to the C++ Language)) + $(LI $(RELATIVE_LINK2 class-rvalue, Clarification of Initialization of Class Objects by rvalues)) + $(LI $(RELATIVE_LINK2 move-semantics, Extending Move Semantics To *this (Revision 2))) + $(LI $(RELATIVE_LINK2 static-assert, static_assert)) + $(LI $(RELATIVE_LINK2 template-aliases, Template aliases for C++)) + $(LI $(RELATIVE_LINK2 extern-template, Extern template)) + $(LI $(RELATIVE_LINK2 variadic-templates, Variadic Templates)) + $(LI $(RELATIVE_LINK2 variadic-template-templates, Extending Variadic Template Template Parameters)) + $(LI $(RELATIVE_LINK2 nullptr, A name for the null pointer: nullptr)) + $(LI $(RELATIVE_LINK2 strong-enums, Strongly Typed Enums)) + $(LI $(RELATIVE_LINK2 extended-friends, Extended friend Declarations)) + $(LI $(RELATIVE_LINK2 constant-expressions, Generalized Constant Expressions)) + $(LI $(RELATIVE_LINK2 namespace-association, Namespace Association ("Strong Using"))) + $(LI $(RELATIVE_LINK2 c99-preprocessor, Synchronizing the C++ preprocessor with C99)) + $(LI $(RELATIVE_LINK2 alignment, Adding Alignment Support to the C++ Programming Language)) + $(LI $(RELATIVE_LINK2 conditional, Conditionally-Supported Behavior)) + $(LI $(RELATIVE_LINK2 undefined-behavior, Changing Undefined Behavior into Diagnosable Errors)) + $(LI $(RELATIVE_LINK2 long-long, Adding the long long type to C++)) + $(LI $(RELATIVE_LINK2 extended-integer-types, Adding extended integer types to C++)) + $(LI $(RELATIVE_LINK2 delegating-ctors, Delegating Constructors)) + $(LI $(RELATIVE_LINK2 explicit-conversion, Explicit Conversion Operators)) + $(LI $(RELATIVE_LINK2 char16_t, New Character Types in C++)) + $(LI $(RELATIVE_LINK2 right-angle-brackets, Right Angle Brackets)) + $(LI $(RELATIVE_LINK2 type-deduction, Deducing the type of variable from its initializer expression)) + $(LI $(RELATIVE_LINK2 auto-declarations, The Syntax of auto Declarations)) + $(LI $(RELATIVE_LINK2 inheriting-ctors, Inheriting Constructors)) + $(LI $(RELATIVE_LINK2 sequence-points, A finer-grained alternative to sequence points)) + $(LI $(RELATIVE_LINK2 lambda, (monomorphic) Lambda expressions and closures for C++)) + $(LI $(RELATIVE_LINK2 __func__, Proposed addition of __func__ predefined identifier from C99)) + $(LI $(RELATIVE_LINK2 atomic, Atomic operations with multi-threaded environments)) + $(LI $(RELATIVE_LINK2 concurrency, Sequencing and the concurrency memory model)) + $(LI $(RELATIVE_LINK2 raw-strings, Raw String Literals)) + $(LI $(RELATIVE_LINK2 pod, PODs unstrung)) + $(LI $(RELATIVE_LINK2 exceptions, Propagating exceptions when joining threads)) + $(LI $(RELATIVE_LINK2 decltype, Decltype)) + $(LI $(RELATIVE_LINK2 sizeof, Extending sizeof)) + $(LI $(RELATIVE_LINK2 utf8-literals, UTF8 Literals)) + $(LI $(RELATIVE_LINK2 ucs-in-literals, Universal Character Names in Literals)) + $(LI $(RELATIVE_LINK2 defaulted, Defaulted and Deleted Functions)) + $(LI $(RELATIVE_LINK2 unions, Unrestricted Unions)) + $(LI $(RELATIVE_LINK2 library, A Multi-threading Library for Standard C++)) + $(LI $(RELATIVE_LINK2 abandoning, Abandoning a Process)) + $(LI $(RELATIVE_LINK2 return-types, New function declaration syntax for deduced return types)) + $(LI $(RELATIVE_LINK2 atomic-signals, Allow atomics use in signal handlers)) ) $(UL - $(LI $(LINK2 #local-classes, Making Local Classes more Useful)) - $(LI $(LINK2 #initializer-lists, Initializer lists)) - $(LI $(LINK2 #thread-local-storage, Thread-Local Storage)) - $(LI $(LINK2 #member-initializers, Member Initializers)) - $(LI $(LINK2 #concepts, Concepts (unified proposal))) - $(LI $(LINK2 #for-loop, Proposal for new for-loop)) - $(LI $(LINK2 #general-attributes, General Attributes for C++)) + $(LI $(RELATIVE_LINK2 local-classes, Making Local Classes more Useful)) + $(LI $(RELATIVE_LINK2 initializer-lists, Initializer lists)) + $(LI $(RELATIVE_LINK2 thread-local-storage, Thread-Local Storage)) + $(LI $(RELATIVE_LINK2 member-initializers, Member Initializers)) + $(LI $(RELATIVE_LINK2 concepts, Concepts (unified proposal))) + $(LI $(RELATIVE_LINK2 for-loop, Proposal for new for-loop)) + $(LI $(RELATIVE_LINK2 general-attributes, General Attributes for C++)) ) $(UL - $(LI $(LINK2 #extensible-literals, Extensible Literals)) - $(LI $(LINK2 #dynamic-concurrency, Dynamic initialization and concurrency)) - $(LI $(LINK2 #garbage-collection, Minimal Support for Garbage Collection and Reachability-Based Leak Detection)) - $(LI $(LINK2 #forward-enums, Forward declaration of enumerations)) + $(LI $(RELATIVE_LINK2 extensible-literals, Extensible Literals)) + $(LI $(RELATIVE_LINK2 dynamic-concurrency, Dynamic initialization and concurrency)) + $(LI $(RELATIVE_LINK2 garbage-collection, Minimal Support for Garbage Collection and Reachability-Based Leak Detection)) + $(LI $(RELATIVE_LINK2 forward-enums, Forward declaration of enumerations)) ) ) diff --git a/cppstrings.dd b/cppstrings.dd index ddb067c724..0896b17588 100644 --- a/cppstrings.dd +++ b/cppstrings.dd @@ -386,7 +386,7 @@ int main (char[][] args) template library, wccpp1 and - $(LINK2 #wccpp2, wccpp2). + $(RELATIVE_LINK2 wccpp2, wccpp2). The input file $(LINK2 http://www.gutenberg.org/files/11/old/alice30.txt, alice30.txt) is the text of "Alice in Wonderland." diff --git a/cpptod.dd b/cpptod.dd index b5860896ee..b479d929a5 100644 --- a/cpptod.dd +++ b/cpptod.dd @@ -13,18 +13,18 @@ corresponding task in D.) See also: Programming in D for C Programmers $(UL - $(LI $(LINK2 #constructors, Defining Constructors)) - $(LI $(LINK2 #baseclass, Base class initialization)) - $(LI $(LINK2 #structcmp, Comparing structs)) - $(LI $(LINK2 #typedefs, Creating a new typedef'd type)) - $(LI $(LINK2 #friends, Friends)) - $(LI $(LINK2 #operatoroverloading, Operator overloading)) - $(LI $(LINK2 #usingdeclaration, Namespace using declarations)) - $(LI $(LINK2 #raii, RAII (Resource Acquisition Is Initialization))) - $(LI $(LINK2 #properties, Properties)) - $(LI $(LINK2 #recursivetemplates, Recursive Templates)) - $(LI $(LINK2 #metatemplates, Meta Templates)) - $(LI $(LINK2 #typetraits, Type Traits)) + $(LI $(RELATIVE_LINK2 constructors, Defining Constructors)) + $(LI $(RELATIVE_LINK2 baseclass, Base class initialization)) + $(LI $(RELATIVE_LINK2 structcmp, Comparing structs)) + $(LI $(RELATIVE_LINK2 typedefs, Creating a new typedef'd type)) + $(LI $(RELATIVE_LINK2 friends, Friends)) + $(LI $(RELATIVE_LINK2 operatoroverloading, Operator overloading)) + $(LI $(RELATIVE_LINK2 usingdeclaration, Namespace using declarations)) + $(LI $(RELATIVE_LINK2 raii, RAII (Resource Acquisition Is Initialization))) + $(LI $(RELATIVE_LINK2 properties, Properties)) + $(LI $(RELATIVE_LINK2 recursivetemplates, Recursive Templates)) + $(LI $(RELATIVE_LINK2 metatemplates, Meta Templates)) + $(LI $(RELATIVE_LINK2 typetraits, Type Traits)) ) diff --git a/ctod.dd b/ctod.dd index e6f190b078..510d63dac6 100644 --- a/ctod.dd +++ b/ctod.dd @@ -25,43 +25,43 @@ $(LINK2 pretod.html, The C Preprocessor vs D). ) $(UL - $(LI $(LINK2 #sizeof, Getting the Size of a Type)) - $(LI $(LINK2 #maxmin, Get the max and min values of a type)) - $(LI $(LINK2 #types, Primitive Types)) - $(LI $(LINK2 #floating, Special Floating Point Values)) - $(LI $(LINK2 #modulus, Remainder after division of floating point numbers)) - $(LI $(LINK2 #nans, Dealing with NANs in floating point compares)) - $(LI $(LINK2 #assert, Asserts)) - $(LI $(LINK2 #arrayinit, Initializing all elements of an array)) - $(LI $(LINK2 #arrayloop, Looping through an array)) - $(LI $(LINK2 #arraycreate, Creating an array of variable size)) - $(LI $(LINK2 #strcat, String Concatenation)) - $(LI $(LINK2 #printf, Formatted printing)) - $(LI $(LINK2 #forwardfunc, Forward referencing functions)) - $(LI $(LINK2 #funcvoid, Functions that have no arguments)) - $(LI $(LINK2 #labeledbreak, Labeled break and continue statements)) - $(LI $(LINK2 #goto, Goto Statements)) - $(LI $(LINK2 #tagspace, Struct tag name space)) - $(LI $(LINK2 #stringlookup, Looking up strings)) - $(LI $(LINK2 #align, Setting struct member alignment)) - $(LI $(LINK2 #anonymous, Anonymous Structs and Unions)) - $(LI $(LINK2 #declaring, Declaring struct types and variables)) - $(LI $(LINK2 #fieldoffset, Getting the offset of a struct member)) - $(LI $(LINK2 #unioninit, Union initializations)) - $(LI $(LINK2 #structinit, Struct initializations)) - $(LI $(LINK2 #arrayinit2, Array initializations)) - $(LI $(LINK2 #stringlit, Escaped String Literals)) - $(LI $(LINK2 #ascii, Ascii vs Wide Characters)) - $(LI $(LINK2 #arrayenum, Arrays that parallel an enum)) - $(LI $(LINK2 #typedefs, Creating a new type with typedef)) - $(LI $(LINK2 #structcmp, Comparing structs)) - $(LI $(LINK2 #stringcmp, Comparing strings)) - $(LI $(LINK2 #sort, Sorting arrays)) - $(LI $(LINK2 #strings, String literals)) - $(LI $(LINK2 #traversal, Data Structure Traversal)) - $(LI $(LINK2 #ushr, Unsigned Right Shift)) - $(LI $(LINK2 #closures, Dynamic Closures)) - $(LI $(LINK2 #variadic, Variadic Function Parameters)) + $(LI $(RELATIVE_LINK2 sizeof, Getting the Size of a Type)) + $(LI $(RELATIVE_LINK2 maxmin, Get the max and min values of a type)) + $(LI $(RELATIVE_LINK2 types, Primitive Types)) + $(LI $(RELATIVE_LINK2 floating, Special Floating Point Values)) + $(LI $(RELATIVE_LINK2 modulus, Remainder after division of floating point numbers)) + $(LI $(RELATIVE_LINK2 nans, Dealing with NANs in floating point compares)) + $(LI $(RELATIVE_LINK2 assert, Asserts)) + $(LI $(RELATIVE_LINK2 arrayinit, Initializing all elements of an array)) + $(LI $(RELATIVE_LINK2 arrayloop, Looping through an array)) + $(LI $(RELATIVE_LINK2 arraycreate, Creating an array of variable size)) + $(LI $(RELATIVE_LINK2 strcat, String Concatenation)) + $(LI $(RELATIVE_LINK2 printf, Formatted printing)) + $(LI $(RELATIVE_LINK2 forwardfunc, Forward referencing functions)) + $(LI $(RELATIVE_LINK2 funcvoid, Functions that have no arguments)) + $(LI $(RELATIVE_LINK2 labeledbreak, Labeled break and continue statements)) + $(LI $(RELATIVE_LINK2 goto, Goto Statements)) + $(LI $(RELATIVE_LINK2 tagspace, Struct tag name space)) + $(LI $(RELATIVE_LINK2 stringlookup, Looking up strings)) + $(LI $(RELATIVE_LINK2 align, Setting struct member alignment)) + $(LI $(RELATIVE_LINK2 anonymous, Anonymous Structs and Unions)) + $(LI $(RELATIVE_LINK2 declaring, Declaring struct types and variables)) + $(LI $(RELATIVE_LINK2 fieldoffset, Getting the offset of a struct member)) + $(LI $(RELATIVE_LINK2 unioninit, Union initializations)) + $(LI $(RELATIVE_LINK2 structinit, Struct initializations)) + $(LI $(RELATIVE_LINK2 arrayinit2, Array initializations)) + $(LI $(RELATIVE_LINK2 stringlit, Escaped String Literals)) + $(LI $(RELATIVE_LINK2 ascii, Ascii vs Wide Characters)) + $(LI $(RELATIVE_LINK2 arrayenum, Arrays that parallel an enum)) + $(LI $(RELATIVE_LINK2 typedefs, Creating a new type with typedef)) + $(LI $(RELATIVE_LINK2 structcmp, Comparing structs)) + $(LI $(RELATIVE_LINK2 stringcmp, Comparing strings)) + $(LI $(RELATIVE_LINK2 sort, Sorting arrays)) + $(LI $(RELATIVE_LINK2 strings, String literals)) + $(LI $(RELATIVE_LINK2 traversal, Data Structure Traversal)) + $(LI $(RELATIVE_LINK2 ushr, Unsigned Right Shift)) + $(LI $(RELATIVE_LINK2 closures, Dynamic Closures)) + $(LI $(RELATIVE_LINK2 variadic, Variadic Function Parameters)) )
diff --git a/dcompiler.dd b/dcompiler.dd index c6a86656fe..c2b1e37228 100644 --- a/dcompiler.dd +++ b/dcompiler.dd @@ -15,21 +15,21 @@ $(D_S dmd - $(WINDOWS Windows)$(LINUX Linux)$(OSX Mac OS X)$(FREEBSD FreeBSD) D $(FREEBSD $(LI dmd for $(LINK2 dmd-windows.html, Windows))) $(FREEBSD $(LI dmd for $(LINK2 dmd-linux.html, Linux))) $(FREEBSD $(LI dmd for $(LINK2 dmd-osx.html, OSX))) - $(LI $(LINK2 #requirements, Requirements and Downloads)) - $(LI $(LINK2 #files, Files)) - $(LI $(LINK2 #installation, Installation)) - $(WINDOWS $(LI $(LINK2 #example, Example))) - $(LI $(LINK2 #switches, Compiler Arguments and Switches)) - $(LI $(LINK2 #linking, Linking)) - $(LI $(LINK2 #environment, Environment Variables)) - $(WINDOWS $(LI $(LINK2 #sc_ini, sc.ini Initialization File))) + $(LI $(RELATIVE_LINK2 requirements, Requirements and Downloads)) + $(LI $(RELATIVE_LINK2 files, Files)) + $(LI $(RELATIVE_LINK2 installation, Installation)) + $(WINDOWS $(LI $(RELATIVE_LINK2 example, Example))) + $(LI $(RELATIVE_LINK2 switches, Compiler Arguments and Switches)) + $(LI $(RELATIVE_LINK2 linking, Linking)) + $(LI $(RELATIVE_LINK2 environment, Environment Variables)) + $(WINDOWS $(LI $(RELATIVE_LINK2 sc_ini, sc.ini Initialization File))) $(UNIX $(LI $(DMD_CONF) Initialization File)) - $(WINDOWS $(LI $(LINK2 #problems, Common Installation Problems))) - $(LI $(LINK2 #differences, Differences between Windows and Linux versions)) - $(LI $(LINK2 #interface_files, D Interface Files)) - $(LI $(LINK2 #library, Building Libraries)) - $(LI $(LINK2 #compiling_dmd, Compiling dmd)) - $(LI $(LINK2 #compiling_phobos, Compiling Phobos)) + $(WINDOWS $(LI $(RELATIVE_LINK2 problems, Common Installation Problems))) + $(LI $(RELATIVE_LINK2 differences, Differences between Windows and Linux versions)) + $(LI $(RELATIVE_LINK2 interface_files, D Interface Files)) + $(LI $(RELATIVE_LINK2 library, Building Libraries)) + $(LI $(RELATIVE_LINK2 compiling_dmd, Compiling dmd)) + $(LI $(RELATIVE_LINK2 compiling_phobos, Compiling Phobos)) ) $(H2 $(LNAME2 requirements, Requirements and Downloads)) @@ -344,7 +344,7 @@ $(H2 $(LNAME2 switches, Compiler Arguments and Switches)) ) $(TR $(TD $(B .di)) - $(TD $(LINK2 #interface_files, D interface files)) + $(TD $(RELATIVE_LINK2 interface_files, D interface files)) ) $(TR $(TD $(B .$(OBJEXT))) @@ -480,7 +480,7 @@ $(WINDOWS ) $(SWITCH $(B -H), - generate $(LINK2 #interface_files, D interface file) + generate $(RELATIVE_LINK2 interface_files, D interface file) ) $(SWITCH $(B -Hd)$(I dir), @@ -1070,6 +1070,6 @@ Macros: TITLE=DMD Compiler for $(WINDOWS Windows)$(LINUX Linux)$(OSX OSX)$(FREEBSD FreeBSD) WIKI=DCompiler LIB=$(WINDOWS phobos.lib)$(UNIX libphobos2.a) - DMD_CONF=$(LINK2 #dmd_conf, dmd.conf) + DMD_CONF=$(RELATIVE_LINK2 dmd_conf, dmd.conf) SWITCH=$(DT $1)$(DD $+) CATEGORY_DOWNLOAD=$0 diff --git a/declaration.dd b/declaration.dd index 61d96682ce..9fb99f7640 100644 --- a/declaration.dd +++ b/declaration.dd @@ -119,7 +119,7 @@ $(MULTICOLS 5, $(D abstract) $(GLINK TypeCtor) $(D deprecated) $(D enum) - $(LINK2 #extern, $(D extern)) + $(RELATIVE_LINK2 extern, $(D extern)) $(D final) $(D nothrow) $(D override) diff --git a/deprecate.dd b/deprecate.dd index 38435bd01c..3710666450 100644 --- a/deprecate.dd +++ b/deprecate.dd @@ -678,7 +678,7 @@ $(H4 Rationale) ) Macros: - DEPLINK=$(LINK2 #$0, $0) + DEPLINK=$(RELATIVE_LINK2 $0, $0) DEPLINK2=$(LINK2 $1.html#$2, $2) DEPNAME=$(LNAME2 $0, $0) TITLE=Deprecated Features diff --git a/ebook.ddoc b/ebook.ddoc index 6f9bd68925..c8151a8894 100644 --- a/ebook.ddoc +++ b/ebook.ddoc @@ -33,7 +33,7 @@ NAVIGATION_SPEC= NAVIGATION_D= BOOKS= -TOCENTRY = $(LI $(LINK2 #$+, $+)) +TOCENTRY = $(LI $(RELATIVE_LINK2 $+, $+)) LAYOUT=

 

@@ -53,7 +53,7 @@ CONSOLE=
$0

MODDEFFILE=
$0

GLINK2=$(GLINK $2) -DDLINK=$(LINK2 #$2, $3) -DDSUBLINK=$(LINK2 #$2, $3) +DDLINK=$(RELATIVE_LINK2 $2, $3) +DDSUBLINK=$(RELATIVE_LINK2 $2, $3) DPLLINK=$(LINK2 http://dlang.org/$1, $2) NOT_EBOOK= diff --git a/faq.dd b/faq.dd index a9006ab67b..f8f52fc6fe 100644 --- a/faq.dd +++ b/faq.dd @@ -935,5 +935,5 @@ Macros: TITLE=D 2.0 FAQ WIKI=FAQ CATEGORY_FAQ=$0 - ITEMR=$(LI $(LINK2 #$1, $+)) + ITEMR=$(LI $(RELATIVE_LINK2 $1, $+)) ITEM=
$(H3 $+) diff --git a/latex.ddoc b/latex.ddoc index a3f6f5f7da..5d8b664a76 100644 --- a/latex.ddoc +++ b/latex.ddoc @@ -180,7 +180,7 @@ MODDEFFILE=\lstinline{$0} GLINK=$(LINK2 $0, $(I $0)) GLINK2=$(GLINK $2) -DDLINK=$(LINK2 #$2, $3) +DDLINK=$(RELATIVE_LINK2 $2, $3) DDLINK=$(LINK2 $1.html, $3) DDSUBLINK=$(LINK2 $2, $3) DPLLINK=$(XLINK2 http://dlang.org/$1, $2) diff --git a/memory.dd b/memory.dd index a920aabc4b..5caadbd1a9 100644 --- a/memory.dd +++ b/memory.dd @@ -23,7 +23,7 @@ $(D_S Memory Management, ) $(UL - $(LI $(LINK2 #copy-on-write, Strings (and Array) Copy-on-Write)) + $(LI $(RELATIVE_LINK2 copy-on-write, Strings (and Array) Copy-on-Write)) $(LI Real Time) $(LI Smooth Operation) $(LI Free Lists) @@ -33,7 +33,7 @@ $(D_S Memory Management, $(LI RAII (Resource Acquisition Is Initialization)) $(LI Allocating Class Instances On The Stack) $(LI Allocating Uninitialized Arrays On The Stack) - $(LI $(LINK2 #isr, Interrupt Service Routines)) + $(LI $(RELATIVE_LINK2 isr, Interrupt Service Routines)) ) $(H2 $(LNAME2 copy-on-write, Strings (and Array) Copy-on-Write)) diff --git a/migrate-to-shared.dd b/migrate-to-shared.dd index 4e3f1126e5..9eb3466e4f 100644 --- a/migrate-to-shared.dd +++ b/migrate-to-shared.dd @@ -12,13 +12,13 @@ $(D_S $(TITLE), ) $(OL - $(LI $(LINK2 #performance, Performance of TLS variables).) - $(LI $(LINK2 #vtls, Identifying TLS variables).) - $(LI $(LINK2 #immutable, Switch to Immutable).) - $(LI $(LINK2 #shared, Marking as shared).) - $(LI $(LINK2 #__gshared, Cowboying with __gshared).) - $(LI $(LINK2 #compile-errors, Compile errors).) - $(LI $(LINK2 #link-errors, Link errors).) + $(LI $(RELATIVE_LINK2 performance, Performance of TLS variables).) + $(LI $(RELATIVE_LINK2 vtls, Identifying TLS variables).) + $(LI $(RELATIVE_LINK2 immutable, Switch to Immutable).) + $(LI $(RELATIVE_LINK2 shared, Marking as shared).) + $(LI $(RELATIVE_LINK2 __gshared, Cowboying with __gshared).) + $(LI $(RELATIVE_LINK2 compile-errors, Compile errors).) + $(LI $(RELATIVE_LINK2 link-errors, Link errors).) ) $(H3 $(LNAME2 performance, Performance of TLS variables)) diff --git a/property.dd b/property.dd index 91e66fadea..6b03129a68 100644 --- a/property.dd +++ b/property.dd @@ -21,11 +21,11 @@ $(BR) $(TABLE2 Properties for All Types, $(THEAD Property, Description) -$(TROW $(LINK2 #init, $(D .init)), initializer) -$(TROW $(LINK2 #sizeof, $(D .sizeof)), size in bytes (equivalent to C's sizeof(type))) -$(TROW $(LINK2 #alignof, $(D .alignof)), alignment size) +$(TROW $(RELATIVE_LINK2 init, $(D .init)), initializer) +$(TROW $(RELATIVE_LINK2 sizeof, $(D .sizeof)), size in bytes (equivalent to C's sizeof(type))) +$(TROW $(RELATIVE_LINK2 alignof, $(D .alignof)), alignment size) $(TROW $(D .mangleof), string representing the $(SINGLEQUOTE mangled) representation of the type) -$(TROW $(LINK2 #stringof, $(D .stringof)), string representing the source representation of the type) +$(TROW $(RELATIVE_LINK2 stringof, $(D .stringof)), string representing the source representation of the type) ) $(BR) @@ -62,7 +62,7 @@ $(BR) $(TABLE2 Properties for Class Types, $(THEAD Property, Description) -$(TROW $(LINK2 #classinfo, $(D .classinfo)), Information about the dynamic type of the class) +$(TROW $(RELATIVE_LINK2 classinfo, $(D .classinfo)), Information about the dynamic type of the class) ) $(SECTION3 $(LNAME2 init, .init) Property, diff --git a/struct.dd b/struct.dd index a4d5aeeb18..63c207de9d 100644 --- a/struct.dd +++ b/struct.dd @@ -4,7 +4,7 @@ $(SPEC_S Structs and Unions, $(P Whereas classes are reference types, structs are value types. Any C struct can be exactly represented as a D struct, except non-static - $(LINK2 #nested, function-nested D structs) which access the context of + $(RELATIVE_LINK2 nested, function-nested D structs) which access the context of their enclosing scope. 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 @@ -76,7 +76,7 @@ $(SPEC_S Structs and Unions, $(UNCHECK), $(UNCHECK)) $(TROW const/immutable/shared, $(CHECK), $(CHECK), $(UNCHECK), $(UNCHECK), $(UNCHECK)) - $(TROW inner nesting, $(LINK2 #nested, $(CHECK)), $(DDSUBLINK class, + $(TROW inner nesting, $(RELATIVE_LINK2 nested, $(CHECK)), $(DDSUBLINK class, nested, $(CHECK)), $(UNCHECK), $(UNCHECK), $(UNCHECK)) ) diff --git a/traits.dd b/traits.dd index d27aa85108..018dfbae96 100644 --- a/traits.dd +++ b/traits.dd @@ -656,4 +656,4 @@ Macros: TITLE=Traits WIKI=Traits CATEGORY_SPEC=$0 - GBLINK=$(LINK2 #$0, $(B $0)) + GBLINK=$(RELATIVE_LINK2 $0, $(B $0))