From d31011572def589f5c7926c780e0e82a3f61216d Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 23 Jul 2014 18:28:32 -0700 Subject: [PATCH] Convert admon graphics to SVG. Use a common set of SVG files for AsciiDoc / DocBook admonition graphics. Put them in a common directory. According to http://caniuse.com/svg all common browsers have had SVG support for a while now. The graphics themselves were created with Inkscape. If you would like to refine them further you are more than welcome. Use variables to assemble xsltproc commands in Autotools and Nmake while we're here. Try to update Debian rules to reflect ga92c3fb. Change-Id: If82647af27a60117c517125dff0aca81c033be72 Reviewed-on: https://code.wireshark.org/review/3206 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- cmake/modules/FindXSLTPROC.cmake | 11 +- debian/rules | 2 +- docbook/CMakeLists.txt | 14 +-- docbook/Makefile.am | 33 +++--- docbook/Makefile.common | 36 +++++-- docbook/Makefile.nmake | 41 +++++--- docbook/common_graphics/note.svg | 113 +++++++++++++++++++++ docbook/common_graphics/tip.svg | 110 ++++++++++++++++++++ docbook/common_graphics/warning.svg | 101 ++++++++++++++++++ docbook/custom_layer_pdf.xsl | 2 +- docbook/wsdg_graphics/note.png | Bin 1111 -> 0 bytes docbook/wsdg_graphics/tip.png | Bin 1176 -> 0 bytes docbook/wsdg_graphics/warning.png | Bin 1274 -> 0 bytes docbook/wsug_graphics/note.png | Bin 1111 -> 0 bytes docbook/wsug_graphics/tip.png | Bin 1176 -> 0 bytes docbook/wsug_graphics/warning.png | Bin 1274 -> 0 bytes docbook/wsug_src/WSUG_chapter_use.asciidoc | 10 +- 17 files changed, 410 insertions(+), 63 deletions(-) create mode 100644 docbook/common_graphics/note.svg create mode 100644 docbook/common_graphics/tip.svg create mode 100644 docbook/common_graphics/warning.svg delete mode 100644 docbook/wsdg_graphics/note.png delete mode 100644 docbook/wsdg_graphics/tip.png delete mode 100644 docbook/wsdg_graphics/warning.png delete mode 100644 docbook/wsug_graphics/note.png delete mode 100644 docbook/wsug_graphics/tip.png delete mode 100644 docbook/wsug_graphics/warning.png diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake index 2afc803926..f1b721ab81 100644 --- a/cmake/modules/FindXSLTPROC.cmake +++ b/cmake/modules/FindXSLTPROC.cmake @@ -68,8 +68,8 @@ MACRO(XML2HTML _guide _mode _xmlsources _gfxsources) -E make_directory ${_outdir}/${_gfxdir}/toolbar COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/${_gfxdir}/*.* ${_outdir}/${_gfxdir}/ -# COMMAND cp -# ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics/*.* ${_outdir}/${_gfxdir}/ + COMMAND cp + ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics/*.* ${_outdir}/${_gfxdir}/ COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/${_gfxdir}/toolbar/*.* ${_outdir}/${_gfxdir}/toolbar/ COMMAND cmake @@ -80,12 +80,11 @@ MACRO(XML2HTML _guide _mode _xmlsources _gfxsources) --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path ${_gfxdir}/ -# --stringparam admon.graphics.extension .svg + --stringparam admon.graphics.extension .svg --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet -# --output ${_output} ${_STYLESHEET} ${_source} COMMAND chmod @@ -119,8 +118,8 @@ MACRO(XML2PDF _output _sources _stylesheet _paper) --stringparam img.src.path ${CMAKE_CURRENT_SOURCE_DIR}/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 -# --stringparam admon.graphics.path ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics/ -# --stringparam admon.graphics.extension .svg + --stringparam admon.graphics.path ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics/ + --stringparam admon.graphics.extension .svg --nonet --output ${_output}.fo ${_stylesheet} diff --git a/debian/rules b/debian/rules index 8a7d9fd2cd..50842c52e3 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ override_dh_auto_build: # create menu icon convert image/wsicon32.png image/wsicon32.xpm # fix links in documentation - sed -i "s|$(CURDIR)/docbook|..|" obj-*/docbook/ws*g_html_chunked/* + sed -i "s|$(CURDIR)/docbook|..|" obj-*/docbook/ws*g_html_chunked/*.html override_dh_strip: dh_strip --dbg-package=wireshark-dbg diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt index 0bc6d572b7..e3c99fbccf 100644 --- a/docbook/CMakeLists.txt +++ b/docbook/CMakeLists.txt @@ -25,6 +25,12 @@ find_package( XSLTPROC ) find_package( XMLLINT ) find_package( ASCIIDOC ) +set(COMMON_GRAPHICS + common_graphics/note.svg + common_graphics/tip.svg + common_graphics/warning.svg +) + set(WSUG_FILES wsug_src/WSUG_app_files.xml wsug_src/WSUG_app_howitworks.xml @@ -149,9 +155,6 @@ set(WSUG_GRAPHICS wsug_graphics/ws-time-reference.png wsug_graphics/ws-tools-menu.png wsug_graphics/ws-view-menu.png - wsug_graphics/note.png - wsug_graphics/tip.png - wsug_graphics/warning.png wsug_graphics/toolbar/autoscroll_24.png wsug_graphics/toolbar/capture_filter_24.png wsug_graphics/toolbar/capture_interfaces_24.png @@ -185,6 +188,7 @@ set(WSUG_GRAPHICS wsug_graphics/toolbar/stock_zoom_1_24.png wsug_graphics/toolbar/stock_zoom_in_24.png wsug_graphics/toolbar/stock_zoom_out_24.png + ${COMMON_GRAPHICS} ) set(WSDG_FILES @@ -210,9 +214,7 @@ set(WSDG_GRAPHICS wsdg_graphics/ws-function-blocks.dia wsdg_graphics/ws-function-blocks.png wsdg_graphics/ws-logo.png - wsdg_graphics/note.png - wsdg_graphics/tip.png - wsdg_graphics/warning.png + ${COMMON_GRAPHICS} ) # user-guide.xml must be first in the list diff --git a/docbook/Makefile.am b/docbook/Makefile.am index 2ab4929106..8e3cfffca2 100644 --- a/docbook/Makefile.am +++ b/docbook/Makefile.am @@ -112,14 +112,11 @@ wsug_html/index.html: $(WSUG_SOURCE) wsluarm @ echo --- WSUG - HTML SINGLE PAGE --- mkdir -p wsug_html/wsug_graphics/toolbar cp $(srcdir)/wsug_graphics/*.* wsug_html/wsug_graphics + cp $(srcdir)/common_graphics/*.* wsug_html/wsug_graphics cp $(srcdir)/wsug_graphics/toolbar/* wsug_html/wsug_graphics/toolbar cp $(srcdir)/ws.css wsug_html - $(XSLTPROC) --stringparam base.dir wsug_html/ --stringparam use.id.as.filename 1 \ - --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ \ - --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 \ - --stringparam html.stylesheet ws.css \ - --path .:wsluarm_src \ - --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $< > $@ + $(XSLTPROC) --stringparam base.dir wsug_html/ $(COMMON_XSLTPROC_ARGS) \ + --path .:wsluarm_src $(SINGLE_XSLTPROC_ARGS) $< > $@ -chmod -R og+rX wsug_html # create html chunked page files @@ -129,14 +126,12 @@ wsug_html_chunked/index.html: $(WSUG_SOURCE) wsluarm @ echo --- WSUG - HTML CHUNKED --- mkdir -p wsug_html_chunked/wsug_graphics/toolbar cp $(srcdir)/wsug_graphics/*.* wsug_html_chunked/wsug_graphics + cp $(srcdir)/common_graphics/*.* wsug_html_chunked/wsug_graphics cp $(srcdir)/wsug_graphics/toolbar/* wsug_html_chunked/wsug_graphics/toolbar cp $(srcdir)/ws.css wsug_html_chunked - $(XSLTPROC) --stringparam base.dir wsug_html_chunked/ --stringparam use.id.as.filename 1 \ - --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ \ - --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 \ - --stringparam html.stylesheet ws.css \ + $(XSLTPROC) --stringparam base.dir wsug_html_chunked/ $(COMMON_XSLTPROC_ARGS) \ --path .:wsluarm_src \ - --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $< + $(CHUNKED_XSLTPROC_ARGS) $< -chmod -R og+rX wsug_html_chunked # create pdf file (through XSL-FO), portrait pages on US letter paper @@ -199,13 +194,11 @@ wsdg_html/index.html: $(WSDG_SOURCE) @ echo --- WSDG - HTML SINGLE PAGE --- mkdir -p wsdg_html/wsdg_graphics/toolbar cp $(srcdir)/wsdg_graphics/*.* wsdg_html/wsdg_graphics + cp $(srcdir)/common_graphics/*.* wsdg_html/wsdg_graphics cp $(srcdir)/wsdg_graphics/toolbar/* wsdg_html/wsdg_graphics/toolbar/ cp $(srcdir)/ws.css wsdg_html - $(XSLTPROC) --stringparam base.dir wsdg_html/ --stringparam use.id.as.filename 1 \ - --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ \ - --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 \ - --stringparam html.stylesheet ws.css \ - --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $< > $@ + $(XSLTPROC) --stringparam base.dir wsdg_html/ $(COMMON_XSLTPROC_ARGS) \ + $(SINGLE_XSLTPROC_ARGS) $< > $@ -chmod -R og+rX wsdg_html # create html chunked page files @@ -215,13 +208,11 @@ wsdg_html_chunked/index.html: $(WSDG_SOURCE) @ echo --- WSDG - HTML CHUNKED --- mkdir -p wsdg_html_chunked/wsdg_graphics/toolbar cp $(srcdir)/wsdg_graphics/*.* wsdg_html_chunked/wsdg_graphics + cp $(srcdir)/common_graphics/*.* wsdg_html_chunked/wsdg_graphics cp $(srcdir)/wsdg_graphics/toolbar/* wsdg_html_chunked/wsdg_graphics/toolbar/ cp $(srcdir)/ws.css wsdg_html_chunked - $(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ --stringparam use.id.as.filename 1 \ - --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ \ - --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 \ - --stringparam html.stylesheet ws.css \ - --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $< + $(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ $(COMMON_XSLTPROC_ARGS) \ + $(CHUNKED_XSLTPROC_ARGS) $< -chmod -R og+rX wsdg_html_chunked # create pdf file (through XSL-FO), portrait pages on US letter paper diff --git a/docbook/Makefile.common b/docbook/Makefile.common index da34e9f5a7..03b9df0cc3 100644 --- a/docbook/Makefile.common +++ b/docbook/Makefile.common @@ -1,4 +1,5 @@ # + WSUG_FILES = \ wsug_src/WSUG_app_files.xml \ wsug_src/WSUG_app_howitworks.xml \ @@ -134,9 +135,6 @@ WSUG_GRAPHICS = \ wsug_graphics/ws-tools-menu.png \ wsug_graphics/ws-time-reference.png \ wsug_graphics/ws-view-menu.png \ - wsug_graphics/note.png \ - wsug_graphics/tip.png \ - wsug_graphics/warning.png \ wsug_graphics/toolbar/autoscroll_24.png \ wsug_graphics/toolbar/capture_filter_24.png \ wsug_graphics/toolbar/capture_interfaces_24.png \ @@ -196,11 +194,13 @@ WSDG_GRAPHICS = \ wsdg_graphics/ws-function-blocks.dia \ wsdg_graphics/ws-function-blocks.png \ wsdg_graphics/ws-logo.png \ - wsdg_graphics/note.png \ - wsdg_graphics/tip.png \ - wsdg_graphics/warning.png \ wsdg_graphics/toolbar/dummy.dummy +COMMON_GRAPHICS = \ + common_graphics/note.svg \ + common_graphics/tip.svg \ + common_graphics/warning.svg + # user-guide.xml must be first in the list (to match $<) WSUG_DIST = \ user-guide.xml \ @@ -209,7 +209,8 @@ WSUG_DIST = \ custom_layer_pdf.xsl \ Makefile.common \ $(WSUG_FILES) \ - $(WSUG_GRAPHICS) + $(WSUG_GRAPHICS) \ + $(COMMON_GRAPHICS) WSUG_SOURCE = $(WSUG_DIST) $(WSUG_GENERATED_SOURCE) @@ -220,7 +221,8 @@ WSDG_DIST = \ custom_layer_pdf.xsl \ Makefile.common \ $(WSDG_FILES) \ - $(WSDG_GRAPHICS) + $(WSDG_GRAPHICS) \ + $(COMMON_GRAPHICS) WSDG_SOURCE = $(WSDG_GENERATED_SOURCE) $(WSDG_DIST) @@ -275,3 +277,21 @@ WSLUA_MODULES = \ $(top_srcdir)/epan/wslua/wslua_file.c \ $(top_srcdir)/epan/wslua/wslua_dir.c \ $(top_srcdir)/epan/wslua/wslua_util.c + +COMMON_XSLTPROC_ARGS = \ + --stringparam use.id.as.filename 1 \ + --stringparam admon.graphics 1 \ + --stringparam admon.graphics.path common_graphics/ \ + --stringparam admon.graphics.extension .svg \ + --stringparam section.autolabel 1 \ + --stringparam section.label.includes.component.label 1 \ + --stringparam html.stylesheet ws.css + +SINGLE_XSLTPROC_ARGS = \ + --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl + +CHUNKED_XSLTPROC_ARGS = \ + --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl + +HTMLHELP_XSLTPROC_ARGS = \ + --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake index eb3e9c32ff..0a55ffa326 100644 --- a/docbook/Makefile.nmake +++ b/docbook/Makefile.nmake @@ -103,9 +103,11 @@ wsug_html\index.html: $(WSUG_SOURCE) wsluarm @ echo --- WSUG - HTML SINGLE PAGE --- if not exist wsug_html\wsug_graphics\toolbar md wsug_html\wsug_graphics\toolbar cp wsug_graphics/*.* wsug_html/wsug_graphics + cp common_graphics/*.* wsug_html/wsug_graphics cp wsug_graphics/toolbar/* wsug_html/wsug_graphics/toolbar cp ws.css wsug_html - $(XSLTPROC) --stringparam base.dir wsug_html/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl user-guide.xml > $@ + $(XSLTPROC) --stringparam base.dir wsug_html/ $(COMMON_XSLTPROC_ARGS) \ + $(SINGLE_XSLTPROC_ARGS) user-guide.xml > $@ -chmod -R og+rX wsug_html # create html chunked page files @@ -115,9 +117,11 @@ wsug_html_chunked\index.html: $(WSUG_SOURCE) wsluarm @ echo --- WSUG - HTML CHUNKED --- if not exist wsug_html_chunked\wsug_graphics\toolbar md wsug_html_chunked\wsug_graphics\toolbar cp wsug_graphics/*.* wsug_html_chunked/wsug_graphics + cp common_graphics/*.* wsug_html_chunked/wsug_graphics cp wsug_graphics/toolbar/* wsug_html_chunked/wsug_graphics/toolbar cp ws.css wsug_html_chunked - $(XSLTPROC) --stringparam base.dir wsug_html_chunked/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl user-guide.xml + $(XSLTPROC) --stringparam base.dir wsug_html_chunked/ $(COMMON_XSLTPROC_ARGS) \ + $(CHUNKED_XSLTPROC_ARGS) user-guide.xml -chmod -R og+rX wsug_html_chunked # create pdf file (through XSL-FO), portrait pages on US letter paper (the default) @@ -141,9 +145,11 @@ user-guide.chm: $(WSUG_SOURCE) wsluarm !ifdef HHC_EXE @ echo --- WSUG - MICROSOFT HTML HELP --- if not exist wsug_chm\wsug_graphics\toolbar md wsug_chm\wsug_graphics\toolbar - -cp wsug_graphics/*.* wsug_chm/wsug_graphics/ - -cp wsug_graphics/toolbar/* wsug_chm/wsug_graphics/toolbar/ - $(XSLTPROC) --stringparam base.dir wsug_chm/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl user-guide.xml + -cp wsug_graphics/*.* wsug_chm/wsug_graphics + -cp common_graphics/*.* wsug_chm/wsug_graphics + -cp wsug_graphics/toolbar/* wsug_chm/wsug_graphics/toolbar + $(XSLTPROC) --stringparam base.dir wsug_chm/ $(COMMON_XSLTPROC_ARGS) \ + $(HTMLHELP_XSLTPROC_ARGS) user-guide.xml -$(HHC_EXE) htmlhelp.hhp -mv htmlhelp.chm $@ -rm -r htmlhelp.hhp @@ -183,10 +189,12 @@ wsdg_html\index.html: $(WSDG_SOURCE) @ echo --- WSDG - HTML SINGLE PAGE --- if not exist wsdg_html\wsdg_graphics md wsdg_html\wsdg_graphics if not exist wsdg_html\wsdg_graphics\toolbar md wsdg_html\wsdg_graphics\toolbar - cp wsdg_graphics/*.* wsdg_html/wsdg_graphics/ - cp wsdg_graphics/toolbar/* wsdg_html/wsdg_graphics/toolbar/ + cp wsdg_graphics/*.* wsdg_html/wsdg_graphics + cp common_graphics/*.* wsdg_html/wsdg_graphics + cp wsdg_graphics/toolbar/* wsdg_html/wsdg_graphics/toolbar cp ws.css wsdg_html - $(XSLTPROC) --stringparam base.dir wsdg_html/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl developer-guide.xml > $@ + $(XSLTPROC) --stringparam base.dir wsdg_html/ $(COMMON_XSLTPROC_ARGS) \ + $(SINGLE_XSLTPROC_ARGS) developer-guide.xml > $@ -chmod -R og+rX wsdg_html # create html chunked page files @@ -196,11 +204,12 @@ wsdg_html_chunked\index.html: $(WSDG_SOURCE) @ echo --- WSDG - HTML CHUNKED --- if not exist wsdg_html_chunked\wsdg_graphics md wsdg_html_chunked\wsdg_graphics if not exist wsdg_html_chunked\wsdg_graphics\toolbar md wsdg_html_chunked\wsdg_graphics\toolbar - cp wsdg_graphics/*.* wsdg_html_chunked/wsdg_graphics/ - cp wsdg_graphics/toolbar/* wsdg_html_chunked/wsdg_graphics/toolbar/ + cp wsdg_graphics/*.* wsdg_html_chunked/wsdg_graphics + cp common_graphics/*.* wsdg_html_chunked/wsdg_graphics + cp wsdg_graphics/toolbar/* wsdg_html_chunked/wsdg_graphics/toolbar cp ws.css wsdg_html_chunked - $(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl developer-guide.xml - -chmod -R og+rX wsdg_html_chunked + $(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ $(COMMON_XSLTPROC_ARGS) \ + $(CHUNKED_XSLTPROC_ARGS) developer-guide.xml # create pdf file (through XSL-FO), portrait pages on US letter paper (the default) # you will get lot's of errors, but that's ok @@ -224,9 +233,11 @@ developer-guide.chm: $(WSDG_SOURCE) @ echo --- WSDG - MICROSOFT HTML HELP --- if not exist wsdg_chm\wsdg_graphics md wsdg_chm\wsdg_graphics if not exist wsdg_chm\wsdg_graphics\toolbar md wsdg_chm\wsdg_graphics\toolbar - cp wsdg_graphics/*.* wsdg_chm/wsdg_graphics/ - cp wsdg_graphics/toolbar/* wsdg_chm/wsdg_graphics/toolbar/ - $(XSLTPROC) --stringparam base.dir wsdg_chm/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl developer-guide.xml + cp wsdg_graphics/*.* wsdg_chm/wsdg_graphics + cp common_graphics/*.* wsdg_chm/wsdg_graphics + cp wsdg_graphics/toolbar/* wsdg_chm/wsdg_graphics/toolbar + $(XSLTPROC) --stringparam base.dir wsdg_chm/ $(COMMON_XSLTPROC_ARGS) \ + $(HTMLHELP_XSLTPROC_ARGS) developer-guide.xml -$(HHC_EXE) htmlhelp.hhp -mv htmlhelp.chm $@ -rm -r htmlhelp.hhp diff --git a/docbook/common_graphics/note.svg b/docbook/common_graphics/note.svg new file mode 100644 index 0000000000..5d9fae792c --- /dev/null +++ b/docbook/common_graphics/note.svg @@ -0,0 +1,113 @@ + + + + + + + + + + image/svg+xml + + + Original font: DejaVu Serif + + + + + + + + + + + + + + diff --git a/docbook/common_graphics/tip.svg b/docbook/common_graphics/tip.svg new file mode 100644 index 0000000000..f53622313a --- /dev/null +++ b/docbook/common_graphics/tip.svg @@ -0,0 +1,110 @@ + + + + + + + + + + image/svg+xml + + + + Original font: DejaVu Serif + + + + + + + + + + + + + + diff --git a/docbook/common_graphics/warning.svg b/docbook/common_graphics/warning.svg new file mode 100644 index 0000000000..0c822fa2ee --- /dev/null +++ b/docbook/common_graphics/warning.svg @@ -0,0 +1,101 @@ + + + + + + + + + + image/svg+xml + + + + Original font: DejaVu Serif + + + + + + + + + + + diff --git a/docbook/custom_layer_pdf.xsl b/docbook/custom_layer_pdf.xsl index 44421e390e..b6b6ba0bd8 100644 --- a/docbook/custom_layer_pdf.xsl +++ b/docbook/custom_layer_pdf.xsl @@ -15,7 +15,7 @@ wsug_graphics/ - + diff --git a/docbook/wsdg_graphics/note.png b/docbook/wsdg_graphics/note.png deleted file mode 100644 index 3a20ba7b4ff3d45c61b2b550d002378b884a9077..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1111 zcmV-d1gQIoP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L02goo02gopb!c@a00007bV*G`2iXe? z00$Q0p>n|h00Y-aL_t(Y$EB8COdM4d$A9PUEG(8Tg+QthEw(Z7!Nw43LoK9eAy_2T z*7zd!MPhwwqp4QXRD&ipZAFR?YSNgPCVo7qF)R=F7hitnuc|)wPB_oPFv6ffFt9Z{`!TfEOiYYp zYSTJI^dAWC(M$)Y*_6H6;p%96?fnzSweypT)>VJ2?-6`ciRShfubG`HvSPboClm^T zSmlcnLPi;osNIxms2V7pjxb}LPVjI zLWva;8ESs-^G%YFkbpBjgl_sMF8%R*aVDpb>`Wp(B~{swI%6R~iJ%33ZfRS#$x{J8 z>(f&>b8-()y?F?Kvzy;L`$_f;Vvdc2!TLo2Q34ur^R`B7AJq%X94(FC@$J!Kigv%u zz0()qi8O9^b#t-zFQ#-z`!-0a5lbSl5(=|TmU&1xChy$9+fhx??!BxHbfNttU?dQ? z&CXb#Fk_RFy>7EMwnV_0=Ceym6Y`BR++0b)GcU0=;0FH)7!GAEvHm7r8}cq|aQi?pze-diuCL7-Gj8r*WpPi^>-pAkfs%6m@-i>JCFqZ;}7> z9_}}L(f(mTXmj^7a9dGa(SRc{b&;Gg0fJCaP!J{0*OfVJD=uT5>PP#AL7TMxdX?)F z4oWJ1Anu+ugy-5_0gI#phOW3sT%Am&V;Jon20hK$?yC$1lPIaE#qL-gGx=Qs_4W00 z`@z;~vNx=Opcg$Ir19JpZuk<(D5#{P^E`QZxpQ`2F`%%p5CGq#m-4Csc5Hl@&aQSY z4vdogKo-v*`UacbG4HUj8&(Pkudhyhz@=MB>^s>@`K}y_U*At!W>(Y_j#w6sMOaoM zm#dZ1+=tlmge$!F(nHB#x{a=Wdpw?308?wNWmXmi*k(ii4`4QC dfElf|`7acm7S50TEk6JN002ovPDHLkV1mS@2qORh diff --git a/docbook/wsdg_graphics/tip.png b/docbook/wsdg_graphics/tip.png deleted file mode 100644 index 2cb772353c82e0b637bc40d170eaf5066958758d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1176 zcmV;J1ZVq+P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L02goo02gopb!c@a00007bV*G`2iXe? z00syFwSMCO00bCGL_t(Y$E{RbPh3?L{?59q>X7Hn3z~iyhIyHA=(-)osO|ET!sM#n8V!8K6@=+&X5TVh{lzi zoPCnBzHhB>?QaoUgouEMAR-VE5)nr!#y@OeXWBudnZq(b3Vrj4_8wsk%~1aGr?3m55xZR;z=P zlaqJ%_V!*FWBf1-_l+_8fezMlx!nBt`1r>nk~YR9n3)>+rvgWBV&$u9YEhB=mF=mCC zw{@s<%v=$cG7+hCZ*TX)!onK>5&%?Vj)-o>@gO3y03>^Qdfql{s>~=VR7emr0x`^D zm_?KLw(WK#U5abp_pbnmi-;m3(^8_Q))WB8w(TlGDJ8op+swRcnP>gNl~6dW+E}?9 zS4+1XY+Yr;lJZgnz@kR!rx8SRU;tsUSX{Aft6f9@a-d>^owkLmwyn}mEZq-v#bPn# zKx=e%bRGZ*<=B*4NhCxR0w{Z)m#x)mMw^aZ!L?^rb)lQ={zDO`qV>vJpsCGGq;-Dt z&liJ(gR1~)&GMW&Lx5+~LMZbF+*0roL+OE}V z-vihdkxEn`nE50@)AS7hAHaGTnrYwnt0Ej%3f+#KxNO@_JDV^bi#ZpUmX?1Q85x-o zkpdCbqcw80E>8HM=^OyqzJ2@FPny7$Gs2RhWHR4SD(6bhB?ox;BBx*KzIbH9&`jr|0mNJP3- zp(lo{lsejo5lH|bm(S-jUdnq+g4Xsz9XW8APC?%4q9!~mP2lkG{ySM z?8{Z(_XF2;y-KBW@zSNPwdLi^a{zE%wCIB<$jiQ_1*hOaf)#m`Z0Mr0f8V)|u`8f#U5m0Az{tCcD0AEH%+>Tsq q{wo0iZ~(-jM@L<8RDE!kRDT1%=UqS6hAPLMu-I diff --git a/docbook/wsdg_graphics/warning.png b/docbook/wsdg_graphics/warning.png deleted file mode 100644 index ffb758808084bfb7d3166fa5ae653a93a327033a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1274 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 diff --git a/docbook/wsug_graphics/tip.png b/docbook/wsug_graphics/tip.png deleted file mode 100644 index 2cb772353c82e0b637bc40d170eaf5066958758d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1176 zcmV;J1ZVq+P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L02goo02gopb!c@a00007bV*G`2iXe? z00syFwSMCO00bCGL_t(Y$E{RbPh3?L{?59q>X7Hn3z~iyhIyHA=(-)osO|ET!sM#n8V!8K6@=+&X5TVh{lzi zoPCnBzHhB>?QaoUgouEMAR-VE5)nr!#y@OeXWBudnZq(b3Vrj4_8wsk%~1aGr?3m55xZR;z=P zlaqJ%_V!*FWBf1-_l+_8fezMlx!nBt`1r>nk~YR9n3)>+rvgWBV&$u9YEhB=mF=mCC zw{@s<%v=$cG7+hCZ*TX)!onK>5&%?Vj)-o>@gO3y03>^Qdfql{s>~=VR7emr0x`^D zm_?KLw(WK#U5abp_pbnmi-;m3(^8_Q))WB8w(TlGDJ8op+swRcnP>gNl~6dW+E}?9 zS4+1XY+Yr;lJZgnz@kR!rx8SRU;tsUSX{Aft6f9@a-d>^owkLmwyn}mEZq-v#bPn# zKx=e%bRGZ*<=B*4NhCxR0w{Z)m#x)mMw^aZ!L?^rb)lQ={zDO`qV>vJpsCGGq;-Dt z&liJ(gR1~)&GMW&Lx5+~LMZbF+*0roL+OE}V z-vihdkxEn`nE50@)AS7hAHaGTnrYwnt0Ej%3f+#KxNO@_JDV^bi#ZpUmX?1Q85x-o zkpdCbqcw80E>8HM=^OyqzJ2@FPny7$Gs2RhWHR4SD(6bhB?ox;BBx*KzIbH9&`jr|0mNJP3- zp(lo{lsejo5lH|bm(S-jUdnq+g4Xsz9XW8APC?%4q9!~mP2lkG{ySM z?8{Z(_XF2;y-KBW@zSNPwdLi^a{zE%wCIB<$jiQ_1*hOaf)#m`Z0Mr0f8V)|u`8f#U5m0Az{tCcD0AEH%+>Tsq q{wo0iZ~(-jM@L<8RDE!kRDT1%=UqS6hAPLMu-I diff --git a/docbook/wsug_graphics/warning.png b/docbook/wsug_graphics/warning.png deleted file mode 100644 index ffb758808084bfb7d3166fa5ae653a93a327033a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1274 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L02goo02gopb!c@a00007bV*G`2iXe? z00s+~yf0Y*00eqTL_t(Y$IX^oY*bYghQD>rnM*IU6j~~swoE&nnGWrA+UXsORO1Z= zfrP{a4NAg;@r77?^T|hp(I*pPqC`zhl-PJ7Q4(Ve0--BLXzS^{XD-y){b-W6cH|Q^G>3L?-LWILW&8G& z+aGutptZB>f#2&(EjBgvbMe9nTy9TKe_ziLn}JqX;IO&Z)$WYmjQx1&_mOMiaF|FW zvSfiZ90K~|0qD(S+t~rMFCB1y$l~ehpW!}YB1n0 zpPGuQj45I&O`=m%D!AUa($(PGGkWqjS~@xw1;~T;aLe``xi#e_`qXqn?d?p+*sQ_N zmmI3Jq*!jwB=~-CP##)AaG|1FZ{ynmU%fs(J)@k4lC8lcZ*;{-o0`O8G3EEx<8EC4 z4nT9bYx##fdHp&7&pi9|iS&GmWZGh1UtHWJCZd5Lj7&Pn%%^1S+N!5UFJ63iGIDKs z3R>FQ0q`}qd|2t6O5*j{;U zcgD=ltJ#z#?`@tYSZlKX;Gbv$2VSq^=%oTaI<D8?%uBfTD!Uz2V6Kk z#ELalRqd_8omc+3qLNu%2Kr)HX#sUR&R%Sw(!#zCapp~3E?>E<+FOG!RJh!p^QVXI z4+t$-LZi3-aA`>qIn!c8?L0NBvsg;NwD3IU#9*rZlmcvp|RA|TJS@%ue zLVE57^!N93;p`BuI&XWZIj~`DY)mDyy1dmF$IJ?d0#i|2;l#Dt0j2^JR$AEK7bBU` zWo+!KYHMB}a@Bh`oj-Gma5#J$5S>i`;C5FZwi_Cz5?=JrQBr84RK5=~Nt0hb>E^E^ z{iNeL5U`Zssm##f%7AECDu>ro_Z2`!x90&34GoN*J4=nn|59_KuWo!|g0!j0n>{hi z+(Pw$z1)Fx9Ys2R!cp#6=s|^<5e7ESlE`QhjYd_#@2RZu_;!t)IYoPWJKCxmcixUY z?k{q=3>KQ&6-r_l+^QacRE~jd)eLN_hE(p>v{J&VVw26jIh1J3rIG|1eV+jg4-e<> zL0zC};}gA|$KtUWk~xE)_Dq0X-PJky+pz%5{%1iHktrK{2g`BlIZ8@ba_r=pC;$Fq z^j8DG(2Z_~%^)G7N*tCvf2eY4AHSb#3KZEbEK8KbZWBY(9|!V)@$vD&Nc6^m%GG5O zPsCYaHx(cv%Q9S)QUD5s;^HE?ITL4MV*J=Gv&*ECw(Hj-vzBIf3!H_eq8Wl{D0C1V z(Tx22jt9}n$K>M_nplWTOism)A3yo=?2YJ