Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch multi-block-highlight Excluding Merge-Ins
This is equivalent to a diff from ee45080dd6 to 17b67a9b82
|
2015-03-07
| ||
| 12:34 | Enhance the "ln=" text highlighter to support multiple blocks of code. check-in: 259e3a0fd6 user: drh tags: trunk | |
|
2015-03-06
| ||
| 14:47 | Fix the hyperlink to sign-up for the mailing list. check-in: ad6e400459 user: drh tags: trunk | |
| 08:28 | Need to account for adjacent ranges to avoid bad data from db_column_text. Closed-Leaf check-in: 17b67a9b82 user: andybradford tags: multi-block-highlight | |
| 07:53 | Restore the topln functionality. check-in: 5758e5bace user: andybradford tags: multi-block-highlight | |
| 07:39 | Add ability to highlight more than one block of lines when using the ln= query parameter. check-in: 20c63861d8 user: andybradford tags: multi-block-highlight | |
| 04:10 | Fix misplaced </span> so it actually lands on the line that begins the <span> rather than a few lines before it begins. check-in: ee45080dd6 user: andybradford tags: trunk | |
|
2015-03-05
| ||
| 19:51 | Swap single-/double-dash convention in [fossil help help] listing to match the other commands. Use single-dash for single-letter option names and double-dash for long option names. (Truth is that either is accepted; this is merely a display issue.) check-in: 03e1850bf1 user: andygoth tags: trunk | |
Changes to src/info.c.
| ︙ | ︙ | |||
1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 |
/*
** The "z" argument is a string that contains the text of a source code
** file. This routine appends that text to the HTTP reply with line numbering.
**
** zLn is the ?ln= parameter for the HTTP query. If there is an argument,
** then highlight that line number and scroll to it once the page loads.
** If there are two line numbers, highlight the range of lines.
*/
void output_text_with_line_numbers(
const char *z,
const char *zLn
){
int iStart, iEnd; /* Start and end of region to highlight */
int n = 0; /* Current line number */
| > > | > > > > | | | | | > | > | > > > > > > > > > > > > > > > > > > > | > | 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 |
/*
** The "z" argument is a string that contains the text of a source code
** file. This routine appends that text to the HTTP reply with line numbering.
**
** zLn is the ?ln= parameter for the HTTP query. If there is an argument,
** then highlight that line number and scroll to it once the page loads.
** If there are two line numbers, highlight the range of lines.
** Multiple ranges can be highlighed by adding additional line numbers
** separated by a non-digit character (also not one of [-,.]).
*/
void output_text_with_line_numbers(
const char *z,
const char *zLn
){
int iStart, iEnd; /* Start and end of region to highlight */
int n = 0; /* Current line number */
int i = 0; /* Loop index */
int iTop = 0; /* Scroll so that this line is on top of screen. */
Stmt q;
iStart = iEnd = atoi(zLn);
db_multi_exec(
"CREATE TEMP TABLE lnos(iStart INTEGER PRIMARY KEY, iEnd INTEGER)");
if( iStart>0 ){
do{
while( fossil_isdigit(zLn[i]) ) i++;
if( zLn[i]==',' || zLn[i]=='-' || zLn[i]=='.' ){
i++;
while( zLn[i]=='.' ){ i++; }
iEnd = atoi(&zLn[i]);
while( fossil_isdigit(zLn[i]) ) i++;
}
while( fossil_isdigit(zLn[i]) ) i++;
if( iEnd<iStart ) iEnd = iStart;
db_multi_exec(
"INSERT OR REPLACE INTO lnos VALUES(%d,%d)", iStart, iEnd
);
iStart = iEnd = atoi(&zLn[i++]);
}while( zLn[i] && iStart && iEnd );
}
db_prepare(&q, "SELECT min(iStart), iEnd FROM lnos");
if( db_step(&q)==SQLITE_ROW ){
iStart = db_column_int(&q, 0);
iEnd = db_column_int(&q, 1);
iTop = iStart - 15 + (iEnd-iStart)/4;
if( iTop>iStart - 2 ) iTop = iStart-2;
}
db_finalize(&q);
@ <pre>
while( z[0] ){
n++;
db_prepare(&q,
"SELECT min(iStart), max(iEnd) FROM lnos"
" WHERE iStart <= %d AND iEnd >= %d", n, n);
if( db_step(&q)==SQLITE_ROW ){
iStart = db_column_int(&q, 0);
iEnd = db_column_int(&q, 1);
}
db_finalize(&q);
for(i=0; z[i] && z[i]!='\n'; i++){}
if( n==iTop ) cgi_append_content("<span id=\"topln\">", -1);
if( n==iStart ){
cgi_append_content("<div class=\"selectedText\">",-1);
}
cgi_printf("%6d ", n);
if( i>0 ){
char *zHtml = htmlize(z, i);
cgi_append_content(zHtml, -1);
fossil_free(zHtml);
}
if( n==iTop ) cgi_append_content("</span>", -1);
if( n==iEnd ) cgi_append_content("</div>", -1);
else cgi_append_content("\n", 1);
z += i;
if( z[0]=='\n' ) z++;
}
if( n<iEnd ) cgi_printf("</div>");
@ </pre>
if( db_int(0, "SELECT EXISTS(SELECT 1 FROM lnos)") ){
@ <script>gebi('topln').scrollIntoView(true);</script>
}
}
/*
** WEBPAGE: whatis
** WEBPAGE: artifact
**
** URL: /artifact/SHA1HASH
** URL: /artifact?ci=CHECKIN&filename=PATH
** URL: /whatis/SHA1HASH
**
** Additional query parameters:
**
** ln - show line numbers
** ln=N - highlight line number N
** ln=M-N - highlight lines M through N inclusive
** ln=M-N+Y-Z - higllight lines M through N and Y through Z (inclusive)
** verbose - show more detail in the description
**
** The /artifact page show the complete content of a file
** identified by SHA1HASH as preformatted text. The
** /whatis page shows only a description of the file.
*/
void artifact_page(void){
|
| ︙ | ︙ |