Consistency

malc committed 5 years ago

Commit bfa56ed1 parent 6dea5dd3 files · +14 −14Browse files

Unified · Split

3 files

genconfstruct.sh +5 −5
link.c +4 −4
main.ml +5 −5

@@ -18,10 +18,10 @@ and columns = · 17 unmodified lines
18	\| Cmulti of multicolumns	18	\| Cmulti of multicolumns
19	\| Csplit of splitcolumns	19	\| Csplit of splitcolumns
20	and mark =	20	and mark =
21	\| Mark_page	21	\| MarkPage
22	\| Mark_block	22	\| MarkBlock
23	\| Mark_line	23	\| MarkLine
24	\| Mark_word	24	\| MarkWord
25	and multicolumns = (multicol * pagegeom)	25	and multicolumns = (multicol * pagegeom)
26	and singlecolumn = pagegeom	26	and singlecolumn = pagegeom
27	and splitcolumns = (columncount * pagegeom)	27	and splitcolumns = (columncount * pagegeom)
@@ -117,7 +117,7 @@ f pgscale 1. · 89 unmodified lines
117	b wheelbypage false	117	b wheelbypage false
118	s stcmd "{\|echo SyncTex\|}"	118	s stcmd "{\|echo SyncTex\|}"
119	b riani false	119	b riani false
120	g paxmark mark Mark_word	120	g paxmark mark MarkWord
121	b leftscroll false	121	b leftscroll false
122	s title Utils.E.s	122	s title Utils.E.s
123	f lastvisit 0.0	123	f lastvisit 0.0

link.c+4−4

@@ -55,7 +55,7 @@ enum { FitWidth, FitProportional, FitPage }; · 54 unmodified lines
55	enum { LDfirst, LDlast };	55	enum { LDfirst, LDlast };
56	enum { LDfirstvisible, LDleft, LDright, LDdown, LDup };	56	enum { LDfirstvisible, LDleft, LDright, LDdown, LDup };
57	enum { Uuri, Utext, Utextannot, Ufileannot, Unone };	57	enum { Uuri, Utext, Utextannot, Ufileannot, Unone };
58	enum { Mark_page, Mark_block, Mark_line, Mark_word };	58	enum { MarkPage, MarkBlock, MarkLine, MarkWord };
59		59
60	struct slice {	60	struct slice {
61	int h;	61	int h;
@@ -2744,7 +2744,7 @@ ML (markunder (value ptr_v, value x_v, value y_v, value mark_v)) · 2682 unmodified lines
2744		2744
2745	ensuretext (page);	2745	ensuretext (page);
2746		2746
2747	if (mark == Mark_page) {	2747	if (mark == MarkPage) {
2748	page->fmark = page->text->first_block->u.t.first_line->first_char;	2748	page->fmark = page->text->first_block->u.t.first_line->first_char;
2749	page->lmark = page->text->last_block->u.t.last_line->last_char;	2749	page->lmark = page->text->last_block->u.t.last_line->last_char;
2750	ret_v = Val_bool (1);	2750	ret_v = Val_bool (1);
@@ -2762,7 +2762,7 @@ ML (markunder (value ptr_v, value x_v, value y_v, value mark_v)) · 11 unmodified lines
2762	continue;	2762	continue;
2763	}	2763	}
2764		2764
2765	if (mark == Mark_block) {	2765	if (mark == MarkBlock) {
2766	page->fmark = block->u.t.first_line->first_char;	2766	page->fmark = block->u.t.first_line->first_char;
2767	page->lmark = block->u.t.last_line->last_char;	2767	page->lmark = block->u.t.last_line->last_char;
2768	ret_v = Val_bool (1);	2768	ret_v = Val_bool (1);
@@ -2776,7 +2776,7 @@ ML (markunder (value ptr_v, value x_v, value y_v, value mark_v)) · 7 unmodified lines
2776	continue;	2776	continue;
2777	}	2777	}
2778		2778
2779	if (mark == Mark_line) {	2779	if (mark == MarkLine) {
2780	page->fmark = line->first_char;	2780	page->fmark = line->first_char;
2781	page->lmark = line->last_char;	2781	page->lmark = line->last_char;
2782	ret_v = Val_bool (1);	2782	ret_v = Val_bool (1);

main.ml+5−5

@@ -143,7 +143,7 @@ let paxunder x y = · 142 unmodified lines
143	else None	143	else None
144	in	144	in
145	Glutils.postRedisplay "paxunder";	145	Glutils.postRedisplay "paxunder";
146	if conf.paxmark = Mark_page	146	if conf.paxmark = MarkPage
147	then	147	then
148	List.iter (fun l ->	148	List.iter (fun l ->
149	match getopaque l.pageno with	149	match getopaque l.pageno with
@@ -4018,10 +4018,10 @@ let viewmulticlick clicks x y mask = · 3868 unmodified lines
4018	let g opaque l px py =	4018	let g opaque l px py =
4019	let mark =	4019	let mark =
4020	match clicks with	4020	match clicks with
4021	\| 2 -> Mark_word	4021	\| 2 -> MarkWord
4022	\| 3 -> Mark_line	4022	\| 3 -> MarkLine
4023	\| 4 -> Mark_block	4023	\| 4 -> MarkBlock
4024	\| _ -> Mark_page	4024	\| _ -> MarkPage
4025	in	4025	in
4026	if Ffi.markunder opaque px py mark	4026	if Ffi.markunder opaque px py mark
4027	then (	4027	then (

Consistency

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code