Skip to content

Refactor htext display #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ukscid wants to merge 22 commits into
base: github
Choose a base branch
from
Open

Refactor htext display #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
25750da
Split tag search in one proc per tag
Jan 4, 2025
b513630
Use procs for tag button, img and window
Jan 4, 2025
51dee00
Code reduced
Jan 4, 2025
d4363e0
code optimized
Jan 4, 2025
d0f3ea0
Show a board in pgn window at the position where NAG "D" or in commen…
Jan 4, 2025
8f85cab
h1 Tag optimized
Jan 4, 2025
384004e
hide/show variations with [-] / [+]
Jan 5, 2025
0ef7ab6
Add save options for hideVar and showDiagramm
Jan 5, 2025
0646bf4
code cleanup
Jan 5, 2025
ce58894
add comments and rename some variables and procs
Jan 5, 2025
329583a
Handle insert and delete of variations
Jan 7, 2025
25af09f
old tag var not needed. rename hvar to var
Jan 8, 2025
c9b56f4
The variables amountVar and hideVarValue were assigned to the calling…
Jan 8, 2025
84322d0
Text changed "hide" to "fold"
Jan 9, 2025
b3264db
adjust indentation
Jan 9, 2025
b863f5c
Process img, button and window tag same way as the other tags
Jan 10, 2025
54cd45b
remove varIndex from htext::display
Jan 10, 2025
5cda945
optimize tag evaluation with a single switch statement
Jan 10, 2025
242a1d1
implement "showboard" as tag in htext::display
Jan 11, 2025
6047a78
tag name moved in switch section and create process proc
Jan 11, 2025
12e209b
unused procs removed
Jan 11, 2025
56e2d00
use printDiagramHere for ColorFormat to print diagram
Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,6 +1656,7 @@ errorT Game::WriteMoveList(TextBuffer* tb, moveT* oldCurrentMove,
if (IsColorFormat()) {
startTable = "<br>";
endColumn = "<br>";
printDiagrams = PgnStyle & PGN_STYLE_DIAGRAM;
}

if (IsHtmlFormat() && VarDepth == 0) { tb->PrintString ("<b>"); }
Expand Down Expand Up @@ -1843,7 +1844,6 @@ errorT Game::WriteMoveList(TextBuffer* tb, moveT* oldCurrentMove,
}
tb->PrintWord (temp);
colWidth -= (int) std::strlen(temp);

}
if (IsColorFormat() && m->nagCount > 0) {
tb->PrintString ("</nag>");
Expand All @@ -1856,7 +1856,10 @@ errorT Game::WriteMoveList(TextBuffer* tb, moveT* oldCurrentMove,
}
}

if (printDiagramHere) {
if (printDiagramHere && IsColorFormat()) {
// print tag here to avoid dumping board in next if-statement
tb->PrintString ("<board>");
} else if (printDiagramHere) {
if ((PgnStyle & PGN_STYLE_COLUMN) && VarDepth == 0) {
if (! endedColumn) {
if (CurrentPos->GetToMove() == WHITE) {
Expand Down
1 change: 1 addition & 0 deletions src/game.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ enum gameFormatT {
#define PGN_STYLE_STRIP_MARKS 1024 // Strip [%mark] and [%arrow] codes.
#define PGN_STYLE_NO_NULL_MOVES 2048 // Convert null moves to comments.
#define PGN_STYLE_UNICODE 4096 // Use U+2654..U+2659 for figurine
#define PGN_STYLE_DIAGRAM 8192 // Show board diagram


void game_printNag (byte nag, char * str, bool asSymbol, gameFormatT format);
Expand Down
6 changes: 4 additions & 2 deletions src/tkscid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3294,14 +3294,14 @@ sc_game_pgn (ClientData, Tcl_Interp * ti, int argc, const char ** argv)
"-column", "-comments", "-base", "-gameNumber", "-format",
"-shortHeader", "-indentComments", "-indentVariations",
"-symbols", "-tags", "-variations", "-width", "-space",
"-markCodes", "-unicode",
"-markCodes", "-unicode", "-showDiagram",
NULL
};
enum {
OPT_COLUMN, OPT_COMMENTS, OPT_BASE, OPT_GAME_NUMBER, OPT_FORMAT,
OPT_SHORT_HDR, OPT_INDENT_COMMENTS, OPT_INDENT_VARS,
OPT_SYMBOLS, OPT_TAGS, OPT_VARS, OPT_WIDTH, OPT_SPACE,
OPT_NOMARKS, OPT_UNICODE,
OPT_NOMARKS, OPT_UNICODE, OPT_SHOWDIAGRAM,
};

const scidBaseT* base = db;
Expand Down Expand Up @@ -3392,6 +3392,8 @@ sc_game_pgn (ClientData, Tcl_Interp * ti, int argc, const char ** argv)
bitmask = PGN_STYLE_STRIP_MARKS; break;
case OPT_UNICODE:
bitmask = PGN_STYLE_UNICODE; break;
case OPT_SHOWDIAGRAM:
bitmask = PGN_STYLE_DIAGRAM; break;
default: // unreachable!
return errorResult (ti, "Invalid option.");
};
Expand Down
Loading