bade58d5797… — Fossil SCM

M src/default.css

+15

		--- src/default.css
		+++ src/default.css
		@@ -1867,10 +1867,25 @@
1867	1867	}
1868	1868	div.markdown span.notescope:hover,
1869	1869	div.markdown span.notescope:target {
1870	1870	border-bottom: 2px solid gold;
1871	1871	}
	1872	+
	1873	+del {
	1874	+ text-decoration: line-through;
	1875	+ background-color: #fbb;
	1876	+ color: #555;
	1877	+}
	1878	+
	1879	+ins {
	1880	+ text-decoration: none;
	1881	+ background-color: #d4fcbc;
	1882	+}
	1883	+
	1884	+mark {
	1885	+ background-color: #f4fce3;
	1886	+}
1872	1887
1873	1888	/* Objects in the "desktoponly" class are invisible on mobile */
1874	1889	@media screen and (max-width: 600px) {
1875	1890	.desktoponly {
1876	1891	display: none;
1877	1892

	--- src/default.css
	+++ src/default.css
	@@ -1867,10 +1867,25 @@
1867	}
1868	div.markdown span.notescope:hover,
1869	div.markdown span.notescope:target {
1870	border-bottom: 2px solid gold;
1871	}















1872
1873	/* Objects in the "desktoponly" class are invisible on mobile */
1874	@media screen and (max-width: 600px) {
1875	.desktoponly {
1876	display: none;
1877

	--- src/default.css
	+++ src/default.css
	@@ -1867,10 +1867,25 @@
1867	}
1868	div.markdown span.notescope:hover,
1869	div.markdown span.notescope:target {
1870	border-bottom: 2px solid gold;
1871	}
1872
1873	del {
1874	text-decoration: line-through;
1875	background-color: #fbb;
1876	color: #555;
1877	}
1878
1879	ins {
1880	text-decoration: none;
1881	background-color: #d4fcbc;
1882	}
1883
1884	mark {
1885	background-color: #f4fce3;
1886	}
1887
1888	/* Objects in the "desktoponly" class are invisible on mobile */
1889	@media screen and (max-width: 600px) {
1890	.desktoponly {
1891	display: none;
1892

M src/markdown.md

+6

		--- src/markdown.md
		+++ src/markdown.md
		@@ -58,12 +58,18 @@
58	58
59	59	## Text Style ##
60	60
61	61	> * _\italic\_
62	62	> * \_italic\_
	63	+> * subscript: \~text\~, e.g. H~2~O
	64	+> * supscript: \^text\^, e.g. E=mc^2^
	65	+> * ++\+\+inserted text\+\+++
	66	+> * --\-\-deleted text\-\---
	67	+> * ==\=\=mark\=\===
63	68	> * __\\bold\\__
64	69	> * \_\_bold\_\_
	70	+> * ~~\~\~strikethrough\~\~~~
65	71	> * ___\\\italic+bold\\\___
66	72	> * *\_\_\_italic+bold\_\_\_*
67	73	> * \``code`\`
68	74
69	75	> The \`code\` construct disables HTML markup, so one can write, for
70	76

	--- src/markdown.md
	+++ src/markdown.md
	@@ -58,12 +58,18 @@
58
59	## Text Style ##
60
61	> * _\italic\_
62	> * \_italic\_





63	> * __\\bold\\__
64	> * \_\_bold\_\_

65	> * ___\\\italic+bold\\\___
66	> * *\_\_\_italic+bold\_\_\_*
67	> * \``code`\`
68
69	> The \`code\` construct disables HTML markup, so one can write, for
70

	--- src/markdown.md
	+++ src/markdown.md
	@@ -58,12 +58,18 @@
58
59	## Text Style ##
60
61	> * _\italic\_
62	> * \_italic\_
63	> * subscript: \~text\~, e.g. H~2~O
64	> * supscript: \^text\^, e.g. E=mc^2^
65	> * ++\+\+inserted text\+\+++
66	> * --\-\-deleted text\-\---
67	> * ==\=\=mark\=\===
68	> * __\\bold\\__
69	> * \_\_bold\_\_
70	> * ~~\~\~strikethrough\~\~~~
71	> * ___\\\italic+bold\\\___
72	> * *\_\_\_italic+bold\_\_\_*
73	> * \``code`\`
74
75	> The \`code\` construct disables HTML markup, so one can write, for
76

M src/markdown_html.c

+22 -7

		--- src/markdown_html.c
		+++ src/markdown_html.c
		@@ -750,32 +750,46 @@
750	750	}
751	751	}
752	752	}
753	753	return 1;
754	754	}
	755	+
	756	+static void html_span(
	757	+ struct Blob *ob,
	758	+ struct Blob *text,
	759	+ const char *tag
	760	+){
	761	+ blob_appendf(ob, "<%s>", tag);
	762	+ blob_appendb(ob, text);
	763	+ blob_appendf(ob, "</%s>", tag);
	764	+}
755	765
756	766	static int html_double_emphasis(
757	767	struct Blob *ob,
758	768	struct Blob *text,
759	769	char c,
760	770	void *opaque
761	771	){
762		- blob_append_literal(ob, "<strong>");
763		- blob_appendb(ob, text);
764		- blob_append_literal(ob, "</strong>");
	772	+ if( c=='~' ) html_span(ob, text, "s");
	773	+ else if( c=='-' ) html_span(ob, text, "del");
	774	+ else if( c=='+' ) html_span(ob, text, "ins");
	775	+ else if( c=='=' ) html_span(ob, text, "mark");
	776	+ else if( c=='^' ) return 0;
	777	+ else html_span(ob, text, "strong");
765	778	return 1;
766	779	}
767	780
768	781	static int html_emphasis(
769	782	struct Blob *ob,
770	783	struct Blob *text,
771	784	char c,
772	785	void *opaque
773	786	){
774		- blob_append_literal(ob, "<em>");
775		- blob_appendb(ob, text);
776		- blob_append_literal(ob, "</em>");
	787	+ if( c=='~' ) html_span(ob, text, "sub");
	788	+ else if( c=='^' ) html_span(ob, text, "sup");
	789	+ else if( c=='-' \|\| c=='+' \|\| c=='=' ) return 0;
	790	+ else html_span(ob, text, "em");
777	791	return 1;
778	792	}
779	793
780	794	static int html_image(
781	795	struct Blob *ob,
		@@ -834,10 +848,11 @@
834	848	struct Blob *ob,
835	849	struct Blob *text,
836	850	char c,
837	851	void *opaque
838	852	){
	853	+ if( c!='*' && c!='_' ) return 0;
839	854	blob_append_literal(ob, "<strong><em>");
840	855	blob_appendb(ob, text);
841	856	blob_append_literal(ob, "</em></strong>");
842	857	return 1;
843	858	}
		@@ -893,11 +908,11 @@
893	908	/* low level elements */
894	909	0, /* entity */
895	910	html_normal_text,
896	911
897	912	/* misc. parameters */
898		- "_", / emph_chars */
	913	+ "+-=^_~", / emph_chars */
899	914	0 /* opaque */
900	915	};
901	916	static int invocation = -1; /* no marker for the first document */
902	917	static const char* zRU = 0; /* REQUEST_URI with escaped quotes */
903	918	MarkdownToHtml context;
904	919

	--- src/markdown_html.c
	+++ src/markdown_html.c
	@@ -750,32 +750,46 @@
750	}
751	}
752	}
753	return 1;
754	}










755
756	static int html_double_emphasis(
757	struct Blob *ob,
758	struct Blob *text,
759	char c,
760	void *opaque
761	){
762	blob_append_literal(ob, "<strong>");
763	blob_appendb(ob, text);
764	blob_append_literal(ob, "</strong>");



765	return 1;
766	}
767
768	static int html_emphasis(
769	struct Blob *ob,
770	struct Blob *text,
771	char c,
772	void *opaque
773	){
774	blob_append_literal(ob, "<em>");
775	blob_appendb(ob, text);
776	blob_append_literal(ob, "</em>");

777	return 1;
778	}
779
780	static int html_image(
781	struct Blob *ob,
	@@ -834,10 +848,11 @@
834	struct Blob *ob,
835	struct Blob *text,
836	char c,
837	void *opaque
838	){

839	blob_append_literal(ob, "<strong><em>");
840	blob_appendb(ob, text);
841	blob_append_literal(ob, "</em></strong>");
842	return 1;
843	}
	@@ -893,11 +908,11 @@
893	/* low level elements */
894	0, /* entity */
895	html_normal_text,
896
897	/* misc. parameters */
898	"_", / emph_chars */
899	0 /* opaque */
900	};
901	static int invocation = -1; /* no marker for the first document */
902	static const char* zRU = 0; /* REQUEST_URI with escaped quotes */
903	MarkdownToHtml context;
904

	--- src/markdown_html.c
	+++ src/markdown_html.c
	@@ -750,32 +750,46 @@
750	}
751	}
752	}
753	return 1;
754	}
755
756	static void html_span(
757	struct Blob *ob,
758	struct Blob *text,
759	const char *tag
760	){
761	blob_appendf(ob, "<%s>", tag);
762	blob_appendb(ob, text);
763	blob_appendf(ob, "</%s>", tag);
764	}
765
766	static int html_double_emphasis(
767	struct Blob *ob,
768	struct Blob *text,
769	char c,
770	void *opaque
771	){
772	if( c=='~' ) html_span(ob, text, "s");
773	else if( c=='-' ) html_span(ob, text, "del");
774	else if( c=='+' ) html_span(ob, text, "ins");
775	else if( c=='=' ) html_span(ob, text, "mark");
776	else if( c=='^' ) return 0;
777	else html_span(ob, text, "strong");
778	return 1;
779	}
780
781	static int html_emphasis(
782	struct Blob *ob,
783	struct Blob *text,
784	char c,
785	void *opaque
786	){
787	if( c=='~' ) html_span(ob, text, "sub");
788	else if( c=='^' ) html_span(ob, text, "sup");
789	else if( c=='-' \|\| c=='+' \|\| c=='=' ) return 0;
790	else html_span(ob, text, "em");
791	return 1;
792	}
793
794	static int html_image(
795	struct Blob *ob,
	@@ -834,10 +848,11 @@
848	struct Blob *ob,
849	struct Blob *text,
850	char c,
851	void *opaque
852	){
853	if( c!='*' && c!='_' ) return 0;
854	blob_append_literal(ob, "<strong><em>");
855	blob_appendb(ob, text);
856	blob_append_literal(ob, "</em></strong>");
857	return 1;
858	}
	@@ -893,11 +908,11 @@
908	/* low level elements */
909	0, /* entity */
910	html_normal_text,
911
912	/* misc. parameters */
913	"+-=^_~", / emph_chars */
914	0 /* opaque */
915	};
916	static int invocation = -1; /* no marker for the first document */
917	static const char* zRU = 0; /* REQUEST_URI with escaped quotes */
918	MarkdownToHtml context;
919

M src/wiki.wiki

+2 -2

		--- src/wiki.wiki
		+++ src/wiki.wiki
		@@ -63,12 +63,12 @@
63	63	<del> <dfn>
64	64	<div> <dl> <dt> <em> <font> <footer>
65	65	<ins>
66	66	<h1> <h2> <h3> <h4> <h5> <h6>
67	67	<header> <hr> <i> <img> <kbd> <li>
68		- <nav> <nobr> <nowiki> <ol> <p> <pre>
69		- <s> <samp> <section> <small> <span>
	68	+ <mark> <nav> <nobr> <nowiki> <ol> <p>
	69	+ <pre> <s> <samp> <section> <small> <span>
70	70	<strike> <strong> <sub> <sup> <table>
71	71	<tbody> <td> <tfoot> <th> <thead>
72	72	<title> <tr> <tt> <u> <ul> <var>
73	73	<verbatim>. There are two non-standard elements available:
74	74	<verbatim> and <nowiki>. No other elements are allowed.
75	75

	--- src/wiki.wiki
	+++ src/wiki.wiki
	@@ -63,12 +63,12 @@
63	<del> <dfn>
64	<div> <dl> <dt> <em> <font> <footer>
65	<ins>
66	<h1> <h2> <h3> <h4> <h5> <h6>
67	<header> <hr> <i> <img> <kbd> <li>
68	<nav> <nobr> <nowiki> <ol> <p> <pre>
69	<s> <samp> <section> <small> <span>
70	<strike> <strong> <sub> <sup> <table>
71	<tbody> <td> <tfoot> <th> <thead>
72	<title> <tr> <tt> <u> <ul> <var>
73	<verbatim>. There are two non-standard elements available:
74	<verbatim> and <nowiki>. No other elements are allowed.
75

	--- src/wiki.wiki
	+++ src/wiki.wiki
	@@ -63,12 +63,12 @@
63	<del> <dfn>
64	<div> <dl> <dt> <em> <font> <footer>
65	<ins>
66	<h1> <h2> <h3> <h4> <h5> <h6>
67	<header> <hr> <i> <img> <kbd> <li>
68	<mark> <nav> <nobr> <nowiki> <ol> <p>
69	<pre> <s> <samp> <section> <small> <span>
70	<strike> <strong> <sub> <sup> <table>
71	<tbody> <td> <tfoot> <th> <thead>
72	<title> <tr> <tt> <u> <ul> <var>
73	<verbatim>. There are two non-standard elements available:
74	<verbatim> and <nowiki>. No other elements are allowed.
75

M src/wikiformat.c

+2

		--- src/wikiformat.c
		+++ src/wikiformat.c
		@@ -216,10 +216,11 @@
216	216	MARKUP_I,
217	217	MARKUP_IMG,
218	218	MARKUP_INS,
219	219	MARKUP_KBD,
220	220	MARKUP_LI,
	221	+ MARKUP_MARK,
221	222	MARKUP_HTML5_NAV,
222	223	MARKUP_NOBR,
223	224	MARKUP_NOWIKI,
224	225	MARKUP_OL,
225	226	MARKUP_P,
		@@ -342,10 +343,11 @@
342	343	AMSK_HSPACE\|AMSK_SRC\|AMSK_VSPACE\|AMSK_WIDTH\|AMSK_STYLE },
343	344	{ "ins", MARKUP_INS, MUTYPE_FONT, AMSK_STYLE },
344	345	{ "kbd", MARKUP_KBD, MUTYPE_FONT, AMSK_STYLE },
345	346	{ "li", MARKUP_LI, MUTYPE_LI,
346	347	AMSK_TYPE\|AMSK_VALUE\|AMSK_STYLE },
	348	+ { "mark", MARKUP_MARK, MUTYPE_BLOCK, 0 },
347	349	{ "nav", MARKUP_HTML5_NAV, MUTYPE_BLOCK,
348	350	AMSK_ID\|AMSK_CLASS\|AMSK_STYLE },
349	351	{ "nobr", MARKUP_NOBR, MUTYPE_FONT, 0 },
350	352	{ "nowiki", MARKUP_NOWIKI, MUTYPE_SPECIAL, 0 },
351	353	{ "ol", MARKUP_OL, MUTYPE_LIST,
352	354

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -216,10 +216,11 @@
216	MARKUP_I,
217	MARKUP_IMG,
218	MARKUP_INS,
219	MARKUP_KBD,
220	MARKUP_LI,

221	MARKUP_HTML5_NAV,
222	MARKUP_NOBR,
223	MARKUP_NOWIKI,
224	MARKUP_OL,
225	MARKUP_P,
	@@ -342,10 +343,11 @@
342	AMSK_HSPACE\|AMSK_SRC\|AMSK_VSPACE\|AMSK_WIDTH\|AMSK_STYLE },
343	{ "ins", MARKUP_INS, MUTYPE_FONT, AMSK_STYLE },
344	{ "kbd", MARKUP_KBD, MUTYPE_FONT, AMSK_STYLE },
345	{ "li", MARKUP_LI, MUTYPE_LI,
346	AMSK_TYPE\|AMSK_VALUE\|AMSK_STYLE },

347	{ "nav", MARKUP_HTML5_NAV, MUTYPE_BLOCK,
348	AMSK_ID\|AMSK_CLASS\|AMSK_STYLE },
349	{ "nobr", MARKUP_NOBR, MUTYPE_FONT, 0 },
350	{ "nowiki", MARKUP_NOWIKI, MUTYPE_SPECIAL, 0 },
351	{ "ol", MARKUP_OL, MUTYPE_LIST,
352

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -216,10 +216,11 @@
216	MARKUP_I,
217	MARKUP_IMG,
218	MARKUP_INS,
219	MARKUP_KBD,
220	MARKUP_LI,
221	MARKUP_MARK,
222	MARKUP_HTML5_NAV,
223	MARKUP_NOBR,
224	MARKUP_NOWIKI,
225	MARKUP_OL,
226	MARKUP_P,
	@@ -342,10 +343,11 @@
343	AMSK_HSPACE\|AMSK_SRC\|AMSK_VSPACE\|AMSK_WIDTH\|AMSK_STYLE },
344	{ "ins", MARKUP_INS, MUTYPE_FONT, AMSK_STYLE },
345	{ "kbd", MARKUP_KBD, MUTYPE_FONT, AMSK_STYLE },
346	{ "li", MARKUP_LI, MUTYPE_LI,
347	AMSK_TYPE\|AMSK_VALUE\|AMSK_STYLE },
348	{ "mark", MARKUP_MARK, MUTYPE_BLOCK, 0 },
349	{ "nav", MARKUP_HTML5_NAV, MUTYPE_BLOCK,
350	AMSK_ID\|AMSK_CLASS\|AMSK_STYLE },
351	{ "nobr", MARKUP_NOBR, MUTYPE_FONT, 0 },
352	{ "nowiki", MARKUP_NOWIKI, MUTYPE_SPECIAL, 0 },
353	{ "ol", MARKUP_OL, MUTYPE_LIST,
354

Fossil SCM

Keyboard Shortcuts