mirror of
https://github.com/QB64-Phoenix-Edition/QB64pe.git
synced 2024-09-16 15:34:03 +00:00
Merge pull request #300 from QB64-Phoenix-Edition/wiki-fixes
Wiki fixes
This commit is contained in:
commit
0ce0071a00
3 changed files with 24 additions and 12 deletions
|
@ -55,6 +55,7 @@ CONST KEY_UP = 18432
|
||||||
CONST KEY_DOWN = 20480
|
CONST KEY_DOWN = 20480
|
||||||
CONST KEY_ESC = 27
|
CONST KEY_ESC = 27
|
||||||
CONST KEY_ENTER = 13
|
CONST KEY_ENTER = 13
|
||||||
|
CONST KEY_TAB = 9
|
||||||
|
|
||||||
DIM SHARED CHR_QUOTE AS STRING: CHR_QUOTE = CHR$(34)
|
DIM SHARED CHR_QUOTE AS STRING: CHR_QUOTE = CHR$(34)
|
||||||
DIM SHARED CHR_TAB AS STRING: CHR_TAB = CHR$(9)
|
DIM SHARED CHR_TAB AS STRING: CHR_TAB = CHR$(9)
|
||||||
|
|
|
@ -2432,8 +2432,8 @@ FUNCTION ide2 (ignore)
|
||||||
END IF
|
END IF
|
||||||
keep_select:
|
keep_select:
|
||||||
|
|
||||||
IF KB = 9 THEN
|
IF KB = KEY_TAB THEN
|
||||||
IF LEN(Help_Search_Str) THEN norep = 1: GOTO delsrchagain
|
IF LEN(Help_Search_Str) THEN norep = 1: GOTO searchnext
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
IF LEN(K$) = 1 AND KCONTROL = 0 THEN
|
IF LEN(K$) = 1 AND KCONTROL = 0 THEN
|
||||||
|
@ -2450,7 +2450,7 @@ FUNCTION ide2 (ignore)
|
||||||
END IF
|
END IF
|
||||||
Help_Search_Time = t#
|
Help_Search_Time = t#
|
||||||
'search for next appropriate link
|
'search for next appropriate link
|
||||||
delsrchagain:
|
searchnext:
|
||||||
ox = Help_cx
|
ox = Help_cx
|
||||||
oy = Help_cy
|
oy = Help_cy
|
||||||
IF oy > help_h THEN oy = 1
|
IF oy > help_h THEN oy = 1
|
||||||
|
@ -2682,7 +2682,7 @@ FUNCTION ide2 (ignore)
|
||||||
WikiParse a$
|
WikiParse a$
|
||||||
END IF
|
END IF
|
||||||
IF Help_LinkL THEN
|
IF Help_LinkL THEN
|
||||||
norep = 1: GOTO delsrchagain
|
norep = 1: GOTO searchnext
|
||||||
ELSE
|
ELSE
|
||||||
GOTO newpageparsed
|
GOTO newpageparsed
|
||||||
END IF
|
END IF
|
||||||
|
@ -2746,7 +2746,12 @@ FUNCTION ide2 (ignore)
|
||||||
|
|
||||||
IF INSTR(UCASE$(lnk$), "PARENTHESIS") THEN GOTO ideloop
|
IF INSTR(UCASE$(lnk$), "PARENTHESIS") THEN GOTO ideloop
|
||||||
|
|
||||||
OpenHelpLnk:
|
OpenHelpLink:
|
||||||
|
l2 = INSTR(lnk$, "#") 'local link?
|
||||||
|
IF l2 > 0 THEN
|
||||||
|
Help_Search_Str = StrReplace$(MID$(lnk$, l2 + 1), "_", " ")
|
||||||
|
lnk$ = LEFT$(lnk$, l2 - 1): Help_LinkL = -1
|
||||||
|
END IF
|
||||||
|
|
||||||
|
|
||||||
Help_Back(Help_Back_Pos).sx = Help_sx 'update position
|
Help_Back(Help_Back_Pos).sx = Help_sx 'update position
|
||||||
|
@ -2805,7 +2810,11 @@ FUNCTION ide2 (ignore)
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
GOSUB redrawitall
|
GOSUB redrawitall
|
||||||
|
IF Help_LinkL THEN
|
||||||
|
norep = 1: GOTO searchnext
|
||||||
|
ELSE
|
||||||
GOTO specialchar
|
GOTO specialchar
|
||||||
|
END IF
|
||||||
|
|
||||||
ELSE
|
ELSE
|
||||||
'No help found; Does the user want help for a SUB or FUNCTION?
|
'No help found; Does the user want help for a SUB or FUNCTION?
|
||||||
|
@ -5361,17 +5370,17 @@ FUNCTION ide2 (ignore)
|
||||||
IF menu$(m, s) = "#Contents Page" THEN
|
IF menu$(m, s) = "#Contents Page" THEN
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0
|
PCOPY 3, 0: SCREEN , , 3, 0
|
||||||
lnk$ = "QB64 Help Menu"
|
lnk$ = "QB64 Help Menu"
|
||||||
GOTO OpenHelpLnk
|
GOTO OpenHelpLink
|
||||||
END IF
|
END IF
|
||||||
IF menu$(m, s) = "Keyword #Index" THEN
|
IF menu$(m, s) = "Keyword #Index" THEN
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0
|
PCOPY 3, 0: SCREEN , , 3, 0
|
||||||
lnk$ = "Keyword Reference - Alphabetical"
|
lnk$ = "Keyword Reference - Alphabetical"
|
||||||
GOTO OpenHelpLnk
|
GOTO OpenHelpLink
|
||||||
END IF
|
END IF
|
||||||
IF menu$(m, s) = "#Keywords by Usage" THEN
|
IF menu$(m, s) = "#Keywords by Usage" THEN
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0
|
PCOPY 3, 0: SCREEN , , 3, 0
|
||||||
lnk$ = "Keyword Reference - By usage"
|
lnk$ = "Keyword Reference - By usage"
|
||||||
GOTO OpenHelpLnk
|
GOTO OpenHelpLink
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
IF menu$(m, s) = "#View Shift+F1" THEN
|
IF menu$(m, s) = "#View Shift+F1" THEN
|
||||||
|
@ -5486,7 +5495,7 @@ FUNCTION ide2 (ignore)
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0
|
PCOPY 3, 0: SCREEN , , 3, 0
|
||||||
IF uerr THEN
|
IF uerr THEN
|
||||||
lnk$ = "Update All"
|
lnk$ = "Update All"
|
||||||
GOTO OpenHelpLnk
|
GOTO OpenHelpLink
|
||||||
END IF
|
END IF
|
||||||
END IF
|
END IF
|
||||||
GOTO ideloop
|
GOTO ideloop
|
||||||
|
@ -18950,8 +18959,9 @@ FUNCTION ideupdatehelpbox
|
||||||
DO UNTIL EOF(fh)
|
DO UNTIL EOF(fh)
|
||||||
LINE INPUT #fh, l$
|
LINE INPUT #fh, l$
|
||||||
IF LEN(l$) THEN
|
IF LEN(l$) THEN
|
||||||
c = INSTR(l$, ","): l$ = RIGHT$(l$, LEN(l$) - c)
|
c = INSTR(l$, ","): l$ = MID$(l$, c + 1) ' 'we only need the page name here
|
||||||
IF Help_Recaching < 2 OR LEFT$(l$, 3) <> "_gl" THEN 'ignore _GL pages for 'qb64pe -u' (build time update)
|
c = INSTR(l$, "#"): IF c > 0 THEN l$ = LEFT$(l$, c - 1) 'but not the local link target (if any)
|
||||||
|
IF Help_Recaching < 2 OR LEFT$(l$, 3) <> "_gl" THEN ' 'ignore _GL pages for 'qb64pe -u' (build time update)
|
||||||
'Escape all invalid and other critical chars in filenames
|
'Escape all invalid and other critical chars in filenames
|
||||||
PageName2$ = ""
|
PageName2$ = ""
|
||||||
FOR i = 1 TO LEN(l$)
|
FOR i = 1 TO LEN(l$)
|
||||||
|
|
|
@ -357,6 +357,7 @@ SUB WikiParse (a$) 'Wiki page interpret
|
||||||
i = ii + LEN(wla$) 'ignore this gallery
|
i = ii + LEN(wla$) 'ignore this gallery
|
||||||
ELSE
|
ELSE
|
||||||
wla$ = StrRemove$(wla$, " "): wla$ = StrRemove$(wla$, CHR$(10))
|
wla$ = StrRemove$(wla$, " "): wla$ = StrRemove$(wla$, CHR$(10))
|
||||||
|
wla$ = StrRemove$(wla$, "File:Apix.png") 'alpha pixels image (separator only)
|
||||||
wla$ = StrReplace$(wla$, "|'''", "|*"): wla$ = StrReplace$(wla$, "'''", "'' / ")
|
wla$ = StrReplace$(wla$, "|'''", "|*"): wla$ = StrReplace$(wla$, "'''", "'' / ")
|
||||||
wla$ = StrReplace$(wla$, "File:Qb64.png|*", "'''QB64;''' ''")
|
wla$ = StrReplace$(wla$, "File:Qb64.png|*", "'''QB64;''' ''")
|
||||||
wla$ = StrReplace$(wla$, "File:Qbpe.png|*", "'''QB64-PE;''' ''")
|
wla$ = StrReplace$(wla$, "File:Qbpe.png|*", "'''QB64-PE;''' ''")
|
||||||
|
|
Loading…
Reference in a new issue