Added \R{ref}{name} for named references
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2315 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
96eb3b0537
commit
8a97b60b30
19 changed files with 45 additions and 36 deletions
|
@ -1426,6 +1426,7 @@ static void xhtml_rdaddwc(rdstringc * rs, word * text, word * end)
|
|||
|
||||
case word_UpperXref:
|
||||
case word_LowerXref:
|
||||
case word_FreeTextXref:
|
||||
kwl = kw_lookup(keywords, text->text);
|
||||
if (kwl) {
|
||||
sect = xhtml_find_section(kwl->para);
|
||||
|
|
|
@ -145,7 +145,8 @@ enum {
|
|||
word_XrefEnd, /* (invisible; no text) */
|
||||
word_IndexRef, /* (always an invisible one) */
|
||||
word_HyperLink, /* (invisible) */
|
||||
word_HyperEnd /* (also invisible; no text) */
|
||||
word_HyperEnd, /* (also invisible; no text) */
|
||||
word_FreeTextXref /* \R */
|
||||
};
|
||||
/* aux values for attributed words */
|
||||
enum {
|
||||
|
|
|
@ -190,6 +190,7 @@ enum {
|
|||
c_i, /* visible index mark */
|
||||
c_ii, /* uncapitalised visible index mark */
|
||||
c_k, /* uncapitalised cross-reference */
|
||||
c_R, /* free text cross-reference */
|
||||
c_n, /* numbered list */
|
||||
c_nocite, /* bibliography trickery */
|
||||
c_preamble, /* document preamble text */
|
||||
|
@ -267,6 +268,9 @@ static void match_kw(token * tok)
|
|||
"K", c_K}
|
||||
, /* capitalised cross-reference */
|
||||
{
|
||||
"R", c_R}
|
||||
, /* free text cross-reference */
|
||||
{
|
||||
"U", c_U}
|
||||
, /* unnumbered-chapter heading */
|
||||
{
|
||||
|
@ -1092,6 +1096,7 @@ static void read_file(paragraph *** ret, input * in, indexdata * idx)
|
|||
break;
|
||||
case c_K:
|
||||
case c_k:
|
||||
case c_R:
|
||||
case c_W:
|
||||
case c_date:
|
||||
/*
|
||||
|
@ -1105,6 +1110,8 @@ static void read_file(paragraph *** ret, input * in, indexdata * idx)
|
|||
wd.type = word_UpperXref;
|
||||
else if (t.cmd == c_k)
|
||||
wd.type = word_LowerXref;
|
||||
else if (t.cmd == c_R)
|
||||
wd.type = word_FreeTextXref;
|
||||
else if (t.cmd == c_W)
|
||||
wd.type = word_HyperLink;
|
||||
else
|
||||
|
@ -1154,7 +1161,7 @@ static void read_file(paragraph *** ret, input * in, indexdata * idx)
|
|||
addword(wd, &idximplicit);
|
||||
}
|
||||
sfree(wdtext);
|
||||
if (wd.type == word_HyperLink) {
|
||||
if (wd.type == word_FreeTextXref || wd.type == word_HyperLink) {
|
||||
/*
|
||||
* Hyperlinks are different: they then
|
||||
* expect another left brace, to begin
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue