Removed all escaping from help system.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 5s

This commit is contained in:
Willem Cazander 2024-07-17 15:08:25 +02:00
parent c8416c42e9
commit a0141d962c
8 changed files with 80 additions and 42 deletions

View file

@ -1,44 +1,44 @@
MB_DOC_FIRE_VARIABLE_FLOW ?= \n
MB_DOC_FIRE_VARIABLE_FLOW ?= $(call mb-make-call,mb-make-space-newline)
#*** Recursive variable: MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_VARIABLE_FLOW,Flow builder of fire flow variable data.)
MB_DOC_FIRE_VARIABLE ?= \n
MB_DOC_FIRE_VARIABLE ?= $(call mb-make-call,mb-make-space-newline)
MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_VARIABLE,Flow builder of firemake variable data.)
MB_DOC_FIRE_VARIABLE_DEEP ?= \n
MB_DOC_FIRE_VARIABLE_DEEP ?= $(call mb-make-call,mb-make-space-newline)
MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_VARIABLE_DEEP,Flow builder of makefire deep variable data.)
MB_DOC_FIRE_VARIABLE_ROCK ?= \n
MB_DOC_FIRE_VARIABLE_ROCK ?= $(call mb-make-call,mb-make-space-newline)
MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_VARIABLE_ROCK,Flow builder of makefire rock variable data.)
MB_DOC_FIRE_VARIABLE_I18N ?= \n
MB_DOC_FIRE_VARIABLE_I18N ?= $(call mb-make-call,mb-make-space-newline)
MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_VARIABLE_I18N,Flow builder of makefire i18n variable data.)
MB_DOC_FIRE_FUNCTION ?= \n
MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_FUNCTION,Flow builder of firemake function data.)
MB_DOC_FIRE_FUNCTION_DEEP ?= \n
MB_DOC_FIRE_FUNCTION_DEEP ?= $(call mb-make-call,mb-make-space-newline)
MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_FUNCTION_DEEP,Flow builder of firemake deep function data.)
MB_DOC_FIRE_FUNCTION_FLOW ?= \n
MB_DOC_FIRE_FUNCTION_FLOW ?= $(call mb-make-call,mb-make-space-newline)
MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_FUNCTION_FLOW,Flow builder of firemake flow function data.)
MB_DOC_FIRE_TARGET ?= \n
MB_DOC_FIRE_TARGET ?= $(call mb-make-call,mb-make-space-newline)
MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_TARGET,Flow builder of firemake target data.)
MB_DOC_FIRE_TARGET_DEEP ?= \n
MB_DOC_FIRE_TARGET_DEEP ?= $(call mb-make-call,mb-make-space-newline)
MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_TARGET_DEEP,Flow builder of firemake deep target data.)
MB_DOC_FIRE_TARGET_RUN ?= \n
MB_DOC_FIRE_TARGET_RUN ?= $(call mb-make-call,mb-make-space-newline)
MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_TARGET_RUN,Flow builder of firemake run target data.)
MB_DOC_FIRE_TARGET_MODULE ?= \n
MB_DOC_FIRE_TARGET_MODULE ?= $(call mb-make-call,mb-make-space-newline)
MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_TARGET_MODULE,Flow builder of firemake module target data.)
MB_DOC_FIRE_TARGET_ASSERT ?= \n
MB_DOC_FIRE_TARGET_ASSERT ?= $(call mb-make-call,mb-make-space-newline)
MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_TARGET_ASSERT,Flow builder of firemake assert target data.)
MB_DOC_FIRE_TARGET_HELP ?= \n
MB_DOC_FIRE_TARGET_HELP ?= $(call mb-make-call,mb-make-space-newline)
MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_TARGET_HELP,Flow builder of firemake help data.)
MB_DOC_XML_ROOT := firemake
@ -67,12 +67,17 @@ MB_DOC_FORMAT ?= txt
#MB_DOC_FIRE_VARIABLE_DEEP += $(call mb-make-call,_mb-doc-variable4u-deep,MB_DOC_FORMAT,Output format of documention$(MB_MAKE_COMMA) only 'txt' or 'xml' is supported.)
define _mb-doc-variable-txt
$(MB_ᕽᕽᕽ   )* $(2)$(MB_MAKE_EQUALS)$(4)\n$(if $(3),\t$(3)\n)\n
$(MB_ᕽᕽᕽ   )* $(2)$(MB_MAKE_EQUALS)$(4)$(call mb-make-call,mb-make-space-newline)$\
$(MB_ᕽᕽᕽ      )$(if $(3),$(call mb-make-call,mb-make-space-tab)$(3)$(call mb-make-call,mb-make-space-newline))$\
$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-space-newline)
endef
define _mb-doc-variable-xml
$(MB_ᕽᕽᕽ   )\n\t$(call mb-make-call,mb-make-xml-open,variable,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))\n\t\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_VALUE),$(4))\n\t\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_DESC),$(3))\n\t$(call mb-make-call,mb-make-xml-close,variable)
$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-space-newline)$\
$(MB_ᕽᕽᕽ      )$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-open,variable,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))$(call mb-make-call,mb-make-space-newline)$\
$(MB_ᕽᕽᕽ         )$(if $(4),$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_VALUE),$(4))$(call mb-make-call,mb-make-space-newline))$\
$(MB_ᕽᕽᕽ         )$(if $(3),$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_DESC),$(3))$(call mb-make-call,mb-make-space-newline))$\
$(MB_ᕽᕽᕽ      )$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-close,variable)
endef
define _mb-doc-variable4u-deep
$(MB_ᕽᕽᕽ   )$(call mb-make-call,_mb-doc-variable-$(MB_DOC_FORMAT),deep,$(1),$(2),$($(1)))
@ -109,10 +114,15 @@ MB_DOC_FIRE_FUNCTION_DEEP += $(call mb-make-call,_mb-doc-function4u-deep,mb-doc-
define _mb-doc-function-txt
$(MB_ᕽᕽᕽ   )* $(2) $(if $(4),$(MB_MAKE_EQUALS) $(4))$(if $(3),\n\t$(3)\n)\n
$(MB_ᕽᕽᕽ   )* $(2) $(if $(4),$(MB_MAKE_EQUALS) $(4))$(if $(3),$(call mb-make-call,mb-make-space-newline)$(call mb-make-call,mb-make-space-tab)$(3)$(call mb-make-call,mb-make-space-newline))$\
$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-space-newline)
endef
define _mb-doc-function-xml
$(MB_ᕽᕽᕽ   )\n\t$(call mb-make-call,mb-make-xml-open,function,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))\n\t\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_ARGS),$(4))\n\t\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_DESC),$(3))\n\t$(call mb-make-call,mb-make-xml-close,function)
$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-space-newline)$\
$(MB_ᕽᕽᕽ      )$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-open,function,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))$(call mb-make-call,mb-make-space-newline)$\
$(MB_ᕽᕽᕽ         )$(if $(4),$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_ARGS),$(4))$(call mb-make-call,mb-make-space-newline))$\
$(MB_ᕽᕽᕽ         )$(if $(3),$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_DESC),$(3))$(call mb-make-call,mb-make-space-newline))$\
$(MB_ᕽᕽᕽ      )$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-close,function)
endef
define _mb-doc-function4u-deep
$(MB_ᕽᕽᕽ   )$(call mb-make-call,_mb-doc-function-$(MB_DOC_FORMAT),deep,$(1),$(2),$(3))
@ -135,11 +145,16 @@ MB_DOC_FIRE_FUNCTION_DEEP += $(call mb-make-call,_mb-doc-function4u-deep,mb-doc-
define _mb-doc-target-txt
$(MB_ᕽᕽᕽ   )* $(2)$(if $(3),\n\t$(3))\n\n
$(MB_ᕽᕽᕽ   )* $(2)$(if $(3),$(call mb-make-call,mb-make-space-newline)$(call mb-make-call,mb-make-space-tab)$(3))$(call mb-make-call,mb-make-space-newline)$\
$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-space-newline)
endef
define _mb-doc-target-xml
$(MB_ᕽᕽᕽ   )\n\t$(call mb-make-call,mb-make-xml-open,target,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))$(if $3,\n\t\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_DESC),$(3))\n\t$(call mb-make-call,mb-make-xml-close,target),\n\t$(call mb-make-call,mb-make-xml-close,target))
$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-space-newline)$\
$(MB_ᕽᕽᕽ      )$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-open,target,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))$(call mb-make-call,mb-make-space-newline)$\
$(MB_ᕽᕽᕽ         )$(if $(3),$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_DESC),$(3))$(call mb-make-call,mb-make-space-newline))$\
$(MB_ᕽᕽᕽ      )$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-close,target)
endef
# $(MB_ᕽᕽᕽ         )$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-close,target),$(call mb-make-call,mb-make-space-newline)
define mb-doc-target
$(MB_ᕽᕽᕽ   )$(eval MB_DOC_FIRE_TARGET += $$(call mb-make-call,_mb-doc-target-$$(MB_DOC_FORMAT),build,$(1),$(2)))
endef

View file

@ -2,9 +2,6 @@
MB_MAKE_COMMA := ,
$(call mb-make-call,mb-doc-variable-rock,MB_MAKE_COMMA,Expanded special char; comma.)
MB_MAKE_SPACE := $(subst ,, )
$(call mb-make-call,mb-doc-variable-rock,MB_MAKE_SPACE,Expanded special char; space.)
MB_MAKE_EQUALS := =
$(call mb-make-call,mb-doc-variable-rock,MB_MAKE_EQUALS,Expanded special char; equals.)
@ -27,18 +24,6 @@ endef
$(call mb-make-call,mb-doc-function-deep,mb-make-flag-phony,Marks an target as phony.,<target>)
define mb-make-newline
endef
$(call mb-make-call,mb-doc-function-deep,mb-make-newline,Prints a newline character.)
define mb-make-space2comma
$(MB_ᕽᕽᕽ   )$(subst $(MB_MAKE_SPACE),$(MB_MAKE_COMMA),$1)
endef
$(call mb-make-call,mb-doc-function-deep,mb-make-space2comma,Replaces all spaces witth comma's.)
define mb-make-wildcard-treewalker
$(MB_ᕽᕽᕽ   )$(foreach _dir,$(wildcard $(1)*),$(call mb-make-wildcard-treewalker,$(_dir)/,$(2)) $(filter $(subst *,%,$(2)),$(_dir)))
endef

View file

@ -0,0 +1,25 @@
define mb-make-space-newline
$(MB_ᕽᕽᕽ   )
$(MB_ᕽᕽᕽ   )
endef
$(call mb-make-call,mb-doc-function-deep,mb-make-space-newline,Prints a newline character.)
define mb-make-space-tab
$(MB_ᕽᕽᕽ   ) $(MB_ᕽᕽᕽ )
endef
$(call mb-make-call,mb-doc-function-deep,mb-make-space-tab,Prints a tab character.)
define mb-make-space-white
$(MB_ᕽᕽᕽ   )$(subst ,, )
endef
$(call mb-make-call,mb-doc-function-deep,mb-make-space-white,Prints a white space character.)
define mb-make-space-white-to-comma
$(MB_ᕽᕽᕽ   )$(subst $(call mb-make-call,mb-make-space-white),$(MB_MAKE_COMMA),$1)
endef
$(call mb-make-call,mb-doc-function-deep,mb-make-space-white-to-comma,Replaces all spaces with comma's.,<input>)

View file

@ -16,7 +16,10 @@ define _escape-xml-attr
$(MB_ᕽᕽᕽ   )$(subst ',&apos;,$(subst ",&quote;,$(subst &,&amp;,$(subst <,&lt;,$(subst >,&gt;,$(subst $(MB_MAKE_XML_CDATA_START),,$(subst $(MB_MAKE_XML_CDATA_END),,$(1))))))))
endef
define mb-make-xml-open
$(MB_ᕽᕽᕽ   )$(MB_MAKE_XML_LT)$(1)$(if $(2), $(2)$(MB_MAKE_EQUALS)"$(call mb-make-call,_escape-xml-attr,$(3))")$(if $(4), $(4)$(MB_MAKE_EQUALS)"$(call mb-make-call,_escape-xml-attr,$(5))")$(MB_MAKE_XML_GT)
$(MB_ᕽᕽᕽ   )$(MB_MAKE_XML_LT)$(1)$\
$(MB_ᕽᕽᕽ    )$(if $(2), $(2)$(MB_MAKE_EQUALS)"$(call mb-make-call,_escape-xml-attr,$(3))")$\
$(MB_ᕽᕽᕽ    )$(if $(4), $(4)$(MB_MAKE_EQUALS)"$(call mb-make-call,_escape-xml-attr,$(5))")$\
$(MB_ᕽᕽᕽ   )$(MB_MAKE_XML_GT)
endef
$(call mb-make-call,mb-doc-function-deep,mb-make-xml-open,Print xml open tag.,<tag> [attr1-name] [attr1-value] [attr2-name] [attr2-value])
@ -31,7 +34,9 @@ define _escape-xml-value
$(MB_ᕽᕽᕽ   )$(subst $(MB_MAKE_XML_CDATA_START),,$(subst $(MB_MAKE_XML_CDATA_END),,$(1)))
endef
define mb-make-xml-value
$(MB_ᕽᕽᕽ   )$(MB_MAKE_XML_CDATA_START)$(call mb-make-call,_escape-xml-value,$(1))$(MB_MAKE_XML_CDATA_END)
$(MB_ᕽᕽᕽ   )$(MB_MAKE_XML_CDATA_START)$\
$(MB_ᕽᕽᕽ    )$(call mb-make-call,_escape-xml-value,$(1))$\
$(MB_ᕽᕽᕽ   )$(MB_MAKE_XML_CDATA_END)
endef
$(call mb-make-call,mb-doc-function-deep,mb-make-xml-value,Print xml value in cdata wrapper.,<value>)

View file

@ -16,4 +16,11 @@ MB_ᕽᕽᕽ           :=
MB_ᕽᕽᕽ            :=
MB_ᕽᕽᕽ             :=
MB_ᕽᕽᕽ              :=
MB_ᕽᕽᕽ               :=
MB_ᕽᕽᕽ                :=
MB_ᕽᕽᕽ                 :=
MB_ᕽᕽᕽ                  :=
# Defines the real white space " " variable for line wrapping without white space
$(eval $$(subst ,, ) :=)