mandoc/mandoc.c - diff

Return to mandoc.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mandoc.c between version 1.78 and 1.79

version 1.78, 2014/04/08 01:37:27

version 1.79, 2014/04/20 16:46:04

Line 46 mandoc_escape(const char **end, const char **start, in

const char *local_start;

int local_sz;

char term;

enum mandoc_esc gly;

* When the caller doesn't provide return storage,

Line 75 mandoc_escape(const char **end, const char **start, in

* these, but each eventually returns a substring of the glyph

* name.

case ('('):

case '(':

gly = ESCAPE_SPECIAL;

*sz = 2;

break;

case ('['):

case '[':

gly = ESCAPE_SPECIAL;

* Unicode escapes are defined in groff as \[uXXXX] to

Line 91 mandoc_escape(const char **end, const char **start, in

gly = ESCAPE_UNICODE;

term = ']';

break;

case ('C'):

case 'C':

if ('\'' != **start)

return(ESCAPE_ERROR);

*start = ++*end;

Line 105 mandoc_escape(const char **end, const char **start, in

* Escapes taking no arguments at all.

case ('d'):

case 'd':

/* FALLTHROUGH */

case ('u'):

case 'u':

return(ESCAPE_IGNORE);

* The \z escape is supposed to output the following

* character without advancing the cursor position.

* Since we are mostly dealing with terminal mode,

* let us just skip the next character.

case ('z'):

case 'z':

return(ESCAPE_SKIPCHAR);

* Handle all triggers matching \X(xy, \Xx, and \X[xxxx], where

* 'X' is the trigger. These have opaque sub-strings.

case ('F'):

case 'F':

/* FALLTHROUGH */

case ('g'):

case 'g':

/* FALLTHROUGH */

case ('k'):

case 'k':

/* FALLTHROUGH */

case ('M'):

case 'M':

/* FALLTHROUGH */

case ('m'):

case 'm':

/* FALLTHROUGH */

case ('n'):

case 'n':

/* FALLTHROUGH */

case ('V'):

case 'V':

/* FALLTHROUGH */

case ('Y'):

case 'Y':

gly = ESCAPE_IGNORE;

/* FALLTHROUGH */

case ('f'):

case 'f':

if (ESCAPE_ERROR == gly)

gly = ESCAPE_FONT;

switch (**start) {

case ('('):

case '(':

*start = ++*end;

*sz = 2;

break;

case ('['):

case '[':

*start = ++*end;

term = ']';

break;

Line 163 mandoc_escape(const char **end, const char **start, in

* and 'Y' is any string. These have opaque sub-strings.

* The \B and \w escapes are handled in roff.c, roff_res().

case ('A'):

case 'A':

/* FALLTHROUGH */

case ('b'):

case 'b':

/* FALLTHROUGH */

case ('D'):

case 'D':

/* FALLTHROUGH */

case ('o'):

case 'o':

/* FALLTHROUGH */

case ('R'):

case 'R':

/* FALLTHROUGH */

case ('X'):

case 'X':

/* FALLTHROUGH */

case ('Z'):

case 'Z':

if ('\0' == **start)

return(ESCAPE_ERROR);

gly = ESCAPE_IGNORE;

Line 187 mandoc_escape(const char **end, const char **start, in

* These escapes are of the form \X'N', where 'X' is the trigger

* and 'N' resolves to a numerical expression.

case ('h'):

case 'h':

/* FALLTHROUGH */

case ('H'):

case 'H':

/* FALLTHROUGH */

case ('L'):

case 'L':

/* FALLTHROUGH */

case ('l'):

case 'l':

/* FALLTHROUGH */

case ('S'):

case 'S':

/* FALLTHROUGH */

case ('v'):

case 'v':

/* FALLTHROUGH */

case ('x'):

case 'x':

if (strchr("\0 %&()*+-./0123456789:<=>", **start))

return(ESCAPE_ERROR);

gly = ESCAPE_IGNORE;

Line 211 mandoc_escape(const char **end, const char **start, in

* Special handling for the numbered character escape.

* XXX Do any other escapes need similar handling?

case ('N'):

case 'N':

if ('\0' == **start)

return(ESCAPE_ERROR);

(*end)++;

Line 227 mandoc_escape(const char **end, const char **start, in

(*end)++;

return(ESCAPE_NUMBERED);

* Sizes get a special category of their own.

case ('s'):

case 's':

gly = ESCAPE_IGNORE;

/* See +/- counts as a sign. */

Line 238 mandoc_escape(const char **end, const char **start, in

(*end)++;

switch (**end) {

case ('('):

case '(':

*start = ++*end;

*sz = 2;

break;

case ('['):

case '[':

*start = ++*end;

term = ']';

break;

case ('\''):

case '\'':

*start = ++*end;

term = '\'';

break;

Line 278 mandoc_escape(const char **end, const char **start, in

if ('\0' != term) {

while (**end != term) {

switch (**end) {

case ('\0'):

case '\0':

return(ESCAPE_ERROR);

case ('\\'):

case '\\':

(*end)++;

if (ESCAPE_ERROR ==

mandoc_escape(end, NULL, NULL))

Line 302 mandoc_escape(const char **end, const char **start, in

/* Run post-processors. */

switch (gly) {

case (ESCAPE_FONT):

case ESCAPE_FONT:

if (2 == *sz) {

if ('C' == **start) {

Line 320 mandoc_escape(const char **end, const char **start, in

break;

switch (**start) {

case ('3'):

case '3':

/* FALLTHROUGH */

case ('B'):

case 'B':

gly = ESCAPE_FONTBOLD;

break;

case ('2'):

case '2':

/* FALLTHROUGH */

case ('I'):

case 'I':

gly = ESCAPE_FONTITALIC;

break;

case ('P'):

case 'P':

gly = ESCAPE_FONTPREV;

break;

case ('1'):

case '1':

/* FALLTHROUGH */

case ('R'):

case 'R':

gly = ESCAPE_FONTROMAN;

break;

}

break;

case (ESCAPE_SPECIAL):

case ESCAPE_SPECIAL:

if (1 == *sz && 'c' == **start)

gly = ESCAPE_NOSPACE;

break;

Line 372 mandoc_getarg(struct mparse *parse, char **cpp, int ln

if ('"' == *start) {

quoted = 1;

start++;

}

pairs = 0;

white = 0;

Line 391 mandoc_getarg(struct mparse *parse, char **cpp, int ln

* backslashes and backslash-t to literal tabs.

switch (cp[1]) {

case ('t'):

case 't':

cp[0] = '\t';

/* FALLTHROUGH */

case ('\\'):

case '\\':

pairs++;

cp++;

break;

case (' '):

case ' ':

/* Skip escaped blanks. */

if (0 == quoted)

cp++;

Line 541 mandoc_eos(const char *p, size_t sz)

enclosed = found = 0;

for (q = p + (int)sz - 1; q >= p; q--) {

switch (*q) {

case ('\"'):

case '\"':

/* FALLTHROUGH */

case ('\''):

case '\'':

/* FALLTHROUGH */

case (']'):

case ']':

/* FALLTHROUGH */

case (')'):

case ')':

if (0 == found)

enclosed = 1;

break;

case ('.'):

case '.':

/* FALLTHROUGH */

case ('!'):

case '!':

/* FALLTHROUGH */

case ('?'):

case '?':

found = 1;

break;

default:

CVSweb