diff options
| author | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-05-31 03:58:49 +0000 |
|---|---|---|
| committer | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-05-31 03:58:49 +0000 |
| commit | 33275f59b572af7025f240ef004fb54a2eecdca9 (patch) | |
| tree | 424ebcb1e908ff5eb7191b60d17639ae51e57b0e /Doc/zmacros.yo | |
| parent | d5f0dc8d075b712bfad0f5020b7d0cf6bbc8e603 (diff) | |
| download | zsh-33275f59b572af7025f240ef004fb54a2eecdca9.tar.gz zsh-33275f59b572af7025f240ef004fb54a2eecdca9.tar.xz zsh-33275f59b572af7025f240ef004fb54a2eecdca9.zip | |
Merge 21676 and 22360/22365: support version 2 of Yodl.
Diffstat (limited to 'Doc/zmacros.yo')
| -rw-r--r-- | Doc/zmacros.yo | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/Doc/zmacros.yo b/Doc/zmacros.yo index 2bab2cb57..19506d222 100644 --- a/Doc/zmacros.yo +++ b/Doc/zmacros.yo @@ -1,8 +1,12 @@ +IFDEF(INCWSLEVEL)(\ +INCWSLEVEL()\ +)(\ STARTDEF() +) DEFINEMACRO(includefile)(1)(\ TYPEOUT(Including file ARG1)\ - comment(Yodl file: ARG1)NL()\ + comment(Yodl file: ARG1)+NL()\ INCLUDEFILE(ARG1)\ ) @@ -10,23 +14,37 @@ DEFINEMACRO(def)(3)(\ DEFINEMACRO(ARG1)(ARG2)(ARG3)\ ) DEFINEMACRO(undef)(1)(\ + IFDEF(DELETEMACRO)(\ + DELETEMACRO(ARG1)\ + )(\ UNDEFINEMACRO(ARG1)\ + )\ ) DEFINEMACRO(redef)(3)(\ + IFDEF(DELETEMACRO)(\ + DELETEMACRO(ARG1)\ + )(\ UNDEFINEMACRO(ARG1)\ + )\ DEFINEMACRO(ARG1)(ARG2)(ARG3)\ ) +DEFINEMACRO(RQUOTE)(0)(CHAR(39)) DEFINEMACRO(LPAR)(0)(CHAR(40)) DEFINEMACRO(RPAR)(0)(CHAR(41)) DEFINEMACRO(PLUS)(0)(CHAR(43)) -DEFINEMACRO(NL)(0)( -) +DEFINEMACRO(DASH)(0)(ifztexi(--)ifnztexi(-)) + +DEFINEMACRO(NL)(0)(CHAR(10)) DEFINEMACRO(ifzman)(1)() DEFINEMACRO(ifnzman)(1)(ARG1) DEFINEMACRO(ifztexi)(1)() DEFINEMACRO(ifnztexi)(1)(ARG1) -ENDDEF() +IFDEF(DECWSLEVEL)(\ +DECWSLEVEL()\ +)(\ +ENDDEF()\ +)\ |