|
323 | 323 | { strip_module(Head, M, _),
|
324 | 324 | hook_module(M, HM, head//2)
|
325 | 325 | },
|
326 |
| - HM:head(Style, Head), |
| 326 | + HM:head(Style, Head), |
327 | 327 | !.
|
328 | 328 | pagehead(_, Head) -->
|
329 | 329 | { strip_module(Head, M, _),
|
330 | 330 | hook_module(M, HM, head//1)
|
331 | 331 | },
|
332 |
| - HM:head(Head), |
| 332 | + HM:head(Head), |
333 | 333 | !.
|
334 | 334 | pagehead(_, Head) -->
|
335 | 335 | html(head(Head)).
|
|
344 | 344 | { strip_module(Body, M, _),
|
345 | 345 | hook_module(M, HM, body//2)
|
346 | 346 | },
|
347 |
| - HM:body(Style, Body), |
| 347 | + HM:body(Style, Body), |
348 | 348 | !.
|
349 | 349 | pagebody(_, Body) -->
|
350 | 350 | { strip_module(Body, M, _),
|
351 | 351 | hook_module(M, HM, body//1)
|
352 | 352 | },
|
353 |
| - HM:body(Body), |
| 353 | + HM:body(Body), |
354 | 354 | !.
|
355 | 355 | pagebody(_, Body) -->
|
356 | 356 | html(body(Body)).
|
357 | 357 |
|
358 | 358 |
|
359 | 359 | hook_module(M, M, PI) :-
|
360 |
| - current_predicate(M:PI), |
| 360 | + current_predicate(M:PI), |
361 | 361 | !.
|
362 | 362 | hook_module(_, user, PI) :-
|
363 | 363 | current_predicate(user:PI).
|
|
392 | 392 | instantiation_error(Var)
|
393 | 393 | }.
|
394 | 394 | html_expand(Term, Module) -->
|
395 |
| - do_expand(Term, Module), |
| 395 | + do_expand(Term, Module), |
396 | 396 | !.
|
397 | 397 | html_expand(Term, _Module) -->
|
398 | 398 | { print_message(error, html(expand_failed(Term))) }.
|
399 | 399 |
|
400 | 400 |
|
401 | 401 | do_expand(Token, _) --> % call user hooks
|
402 |
| - expand(Token), |
| 402 | + expand(Token), |
403 | 403 | !.
|
404 | 404 | do_expand(Fmt-Args, _) -->
|
405 | 405 | !,
|
|
744 | 744 | { uri_encoded(query_value, Value, Encoded) },
|
745 | 745 | [ Encoded ].
|
746 | 746 | attribute_value_s(Value) -->
|
747 |
| - expand_attribute_value(Value), |
| 747 | + expand_attribute_value(Value), |
748 | 748 | !.
|
749 | 749 | attribute_value_s(Fmt-Args) -->
|
750 | 750 | !,
|
|
1469 | 1469 |
|
1470 | 1470 | % TBD: Check with do_expand!
|
1471 | 1471 | html_colours(Var, classify) :-
|
1472 |
| - var(Var), |
| 1472 | + var(Var), |
1473 | 1473 | !.
|
1474 | 1474 | html_colours(\List, built_in-[built_in-Colours]) :-
|
1475 | 1475 | is_list(List),
|
|
1505 | 1505 | html_colours(_, classify).
|
1506 | 1506 |
|
1507 | 1507 | list_colours(Var, classify) :-
|
1508 |
| - var(Var), |
| 1508 | + var(Var), |
1509 | 1509 | !.
|
1510 | 1510 | list_colours([], []).
|
1511 | 1511 | list_colours([H0|T0], [H|T]) :-
|
|
1516 | 1516 | html_colours(Last, Colours).
|
1517 | 1517 |
|
1518 | 1518 | attr_colours(Var, classify) :-
|
1519 |
| - var(Var), |
| 1519 | + var(Var), |
1520 | 1520 | !.
|
1521 | 1521 | attr_colours([], classify) :- !.
|
1522 | 1522 | attr_colours(Term, list-Elements) :-
|
|
1538 | 1538 | Term =.. [Name,Value],
|
1539 | 1539 | attr_value_colour(Value, VColour).
|
1540 | 1540 | attr_colours(Name, html_attribute(Name)) :-
|
1541 |
| - atom(Name), |
| 1541 | + atom(Name), |
1542 | 1542 | !.
|
1543 | 1543 | attr_colours(Term, classify) :-
|
1544 | 1544 | compound(Term),
|
1545 |
| - compound_name_arity(Term, '.', 2), |
| 1545 | + compound_name_arity(Term, '.', 2), |
1546 | 1546 | !.
|
1547 | 1547 | attr_colours(_, error).
|
1548 | 1548 |
|
1549 | 1549 | attr_list_colours(Var, classify) :-
|
1550 |
| - var(Var), |
| 1550 | + var(Var), |
1551 | 1551 | !.
|
1552 | 1552 | attr_list_colours([], []).
|
1553 | 1553 | attr_list_colours([H0|T0], [H|T]) :-
|
|
1565 | 1565 | attr_value_colour(B, CB).
|
1566 | 1566 | attr_value_colour(encode(_), sgml_attr_function-[classify]) :- !.
|
1567 | 1567 | attr_value_colour(Atom, classify) :-
|
1568 |
| - atomic(Atom), |
| 1568 | + atomic(Atom), |
1569 | 1569 | !.
|
1570 | 1570 | attr_value_colour([_|_], classify) :- !.
|
1571 | 1571 | attr_value_colour(_Fmt-_Args, classify) :- !.
|
1572 | 1572 | attr_value_colour(Term, classify) :-
|
1573 | 1573 | compound(Term),
|
1574 |
| - compound_name_arity(Term, '.', 2), |
| 1574 | + compound_name_arity(Term, '.', 2), |
1575 | 1575 | !.
|
1576 | 1576 | attr_value_colour(_, error).
|
1577 | 1577 |
|
1578 | 1578 | location_id(ID, classify) :-
|
1579 |
| - var(ID), |
| 1579 | + var(ID), |
1580 | 1580 | !.
|
1581 | 1581 | location_id(ID, Class) :-
|
1582 | 1582 | ( catch(http_dispatch:http_location_by_id(ID, Location), _, fail)
|
|
0 commit comments