diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake index 01a75b2b51..3518a249e1 100755 --- a/development/cmake/Install.cmake +++ b/development/cmake/Install.cmake @@ -129,7 +129,7 @@ endforeach() foreach(_imgext "png" "svgz" "gif" "xpm") - lyx_install("data" ${TOP_SRC_DIR}/lib images "*.${_imgext}" . ipa classic oxygen) + lyx_install("data" ${TOP_SRC_DIR}/lib images "*.${_imgext}" . bullets ipa classic oxygen) lyx_install("data" ${TOP_SRC_DIR}/lib images/math "*.${_imgext}" . oxygen) endforeach() lyx_install("data" ${TOP_SRC_DIR}/lib citeengines *.citeengine .) diff --git a/lib/Makefile.am b/lib/Makefile.am index d824b023fa..754dd3721a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -739,13 +739,7 @@ dist_images_DATA2X = \ images/banner@2x.png dist_images_DATA = \ - images/amssymb.png \ images/banner.png \ - images/psnfss1.png \ - images/psnfss2.png \ - images/psnfss3.png \ - images/psnfss4.png \ - images/standard.png \ $(dist_images_DATA1X) \ $(dist_images_DATA2X) \ $(dist_images_DATA3X) @@ -1614,6 +1608,190 @@ dist_imagesmath_DATA = \ images/math/Yup.svgz \ images/math/zeta.svgz +imagesbulletsdir = $(imagesdir)/bullets +dist_imagesbullets_DATA = \ + images/bullets/ast.svgz \ + images/bullets/bfendash.svgz \ + images/bullets/bigtriangledown.svgz \ + images/bullets/bigtriangleup.svgz \ + images/bullets/box.svgz \ + images/bullets/bullet.svgz \ + images/bullets/cdot.svgz \ + images/bullets/circ.svgz \ + images/bullets/clubsuit.svgz \ + images/bullets/dagger.svgz \ + images/bullets/dashv.svgz \ + images/bullets/diamondsuit.svgz \ + images/bullets/diamond.svgz \ + images/bullets/diamond2.svgz \ + images/bullets/ding100.svgz \ + images/bullets/ding101.svgz \ + images/bullets/ding102.svgz \ + images/bullets/ding103.svgz \ + images/bullets/ding104.svgz \ + images/bullets/ding105.svgz \ + images/bullets/ding106.svgz \ + images/bullets/ding107.svgz \ + images/bullets/ding108.svgz \ + images/bullets/ding109.svgz \ + images/bullets/ding110.svgz \ + images/bullets/ding111.svgz \ + images/bullets/ding112.svgz \ + images/bullets/ding113.svgz \ + images/bullets/ding114.svgz \ + images/bullets/ding115.svgz \ + images/bullets/ding116.svgz \ + images/bullets/ding117.svgz \ + images/bullets/ding118.svgz \ + images/bullets/ding119.svgz \ + images/bullets/ding120.svgz \ + images/bullets/ding121.svgz \ + images/bullets/ding122.svgz \ + images/bullets/ding162.svgz \ + images/bullets/ding163.svgz \ + images/bullets/ding164.svgz \ + images/bullets/ding165.svgz \ + images/bullets/ding166.svgz \ + images/bullets/ding167.svgz \ + images/bullets/ding168.svgz \ + images/bullets/ding169.svgz \ + images/bullets/ding170.svgz \ + images/bullets/ding171.svgz \ + images/bullets/ding212.svgz \ + images/bullets/ding213.svgz \ + images/bullets/ding217.svgz \ + images/bullets/ding219.svgz \ + images/bullets/ding220.svgz \ + images/bullets/ding221.svgz \ + images/bullets/ding222.svgz \ + images/bullets/ding223.svgz \ + images/bullets/ding224.svgz \ + images/bullets/ding225.svgz \ + images/bullets/ding226.svgz \ + images/bullets/ding227.svgz \ + images/bullets/ding228.svgz \ + images/bullets/ding229.svgz \ + images/bullets/ding230.svgz \ + images/bullets/ding231.svgz \ + images/bullets/ding232.svgz \ + images/bullets/ding233.svgz \ + images/bullets/ding234.svgz \ + images/bullets/ding235.svgz \ + images/bullets/ding236.svgz \ + images/bullets/ding237.svgz \ + images/bullets/ding238.svgz \ + images/bullets/ding239.svgz \ + images/bullets/ding241.svgz \ + images/bullets/ding242.svgz \ + images/bullets/ding243.svgz \ + images/bullets/ding245.svgz \ + images/bullets/ding248.svgz \ + images/bullets/ding250.svgz \ + images/bullets/ding251.svgz \ + images/bullets/ding252.svgz \ + images/bullets/ding253.svgz \ + images/bullets/ding254.svgz \ + images/bullets/ding34.svgz \ + images/bullets/ding36.svgz \ + images/bullets/ding37.svgz \ + images/bullets/ding38.svgz \ + images/bullets/ding39.svgz \ + images/bullets/ding40.svgz \ + images/bullets/ding41.svgz \ + images/bullets/ding42.svgz \ + images/bullets/ding43.svgz \ + images/bullets/ding44.svgz \ + images/bullets/ding45.svgz \ + images/bullets/ding47.svgz \ + images/bullets/ding49.svgz \ + images/bullets/ding50.svgz \ + images/bullets/ding51.svgz \ + images/bullets/ding52.svgz \ + images/bullets/ding53.svgz \ + images/bullets/ding54.svgz \ + images/bullets/ding55.svgz \ + images/bullets/ding56.svgz \ + images/bullets/ding57.svgz \ + images/bullets/ding58.svgz \ + images/bullets/ding59.svgz \ + images/bullets/ding60.svgz \ + images/bullets/ding61.svgz \ + images/bullets/ding62.svgz \ + images/bullets/ding63.svgz \ + images/bullets/ding64.svgz \ + images/bullets/ding65.svgz \ + images/bullets/ding66.svgz \ + images/bullets/ding67.svgz \ + images/bullets/ding68.svgz \ + images/bullets/ding69.svgz \ + images/bullets/ding70.svgz \ + images/bullets/ding71.svgz \ + images/bullets/ding72.svgz \ + images/bullets/ding74.svgz \ + images/bullets/ding75.svgz \ + images/bullets/ding76.svgz \ + images/bullets/ding77.svgz \ + images/bullets/ding78.svgz \ + images/bullets/ding79.svgz \ + images/bullets/ding80.svgz \ + images/bullets/ding81.svgz \ + images/bullets/ding82.svgz \ + images/bullets/ding83.svgz \ + images/bullets/ding84.svgz \ + images/bullets/ding85.svgz \ + images/bullets/ding86.svgz \ + images/bullets/ding87.svgz \ + images/bullets/ding88.svgz \ + images/bullets/ding89.svgz \ + images/bullets/ding90.svgz \ + images/bullets/ding91.svgz \ + images/bullets/ding92.svgz \ + images/bullets/ding93.svgz \ + images/bullets/ding94.svgz \ + images/bullets/ding95.svgz \ + images/bullets/ding96.svgz \ + images/bullets/ding97.svgz \ + images/bullets/ding98.svgz \ + images/bullets/ding99.svgz \ + images/bullets/flat.svgz \ + images/bullets/heartsuit.svgz \ + images/bullets/leadsto.svgz \ + images/bullets/lhd.svgz \ + images/bullets/natural.svgz \ + images/bullets/odot.svgz \ + images/bullets/ominus.svgz \ + images/bullets/oplus.svgz \ + images/bullets/oslash.svgz \ + images/bullets/otimes.svgz \ + images/bullets/pisymbol_psy167.svgz \ + images/bullets/pisymbol_psy168.svgz \ + images/bullets/pisymbol_psy169.svgz \ + images/bullets/pisymbol_psy170.svgz \ + images/bullets/pisymbol_psy174.svgz \ + images/bullets/pisymbol_psy183.svgz \ + images/bullets/pisymbol_psy196.svgz \ + images/bullets/pisymbol_psy197.svgz \ + images/bullets/pisymbol_psy209.svgz \ + images/bullets/pisymbol_psy215.svgz \ + images/bullets/pisymbol_psy222.svgz \ + images/bullets/pisymbol_psy224.svgz \ + images/bullets/pisymbol_psy42.svgz \ + images/bullets/pisymbol_psy45.svgz \ + images/bullets/pisymbol_psy68.svgz \ + images/bullets/rhd.svgz \ + images/bullets/rightarrow2.svgz \ + images/bullets/rightarrow.svgz \ + images/bullets/rightharpoondown.svgz \ + images/bullets/rightharpoonup.svgz \ + images/bullets/sharp.svgz \ + images/bullets/spadesuit.svgz \ + images/bullets/star.svgz \ + images/bullets/succ.svgz \ + images/bullets/triangleleft.svgz \ + images/bullets/triangleright.svgz \ + images/bullets/vdash.svgz + + imagesipadir = $(imagesdir)/ipa dist_imagesipa_DATA = \ images/ipa/ipamacro-insert_deco_bottomtiebar.svgz \ diff --git a/lib/images/amssymb.png b/lib/images/amssymb.png deleted file mode 100644 index da9fa27ae9..0000000000 Binary files a/lib/images/amssymb.png and /dev/null differ diff --git a/lib/images/bullets/ast.svgz b/lib/images/bullets/ast.svgz new file mode 100644 index 0000000000..adf5ffce5a Binary files /dev/null and b/lib/images/bullets/ast.svgz differ diff --git a/lib/images/bullets/bfendash.svgz b/lib/images/bullets/bfendash.svgz new file mode 100644 index 0000000000..4ec657f9ec Binary files /dev/null and b/lib/images/bullets/bfendash.svgz differ diff --git a/lib/images/bullets/bigtriangledown.svgz b/lib/images/bullets/bigtriangledown.svgz new file mode 100644 index 0000000000..e9d610245c Binary files /dev/null and b/lib/images/bullets/bigtriangledown.svgz differ diff --git a/lib/images/bullets/bigtriangleup.svgz b/lib/images/bullets/bigtriangleup.svgz new file mode 100644 index 0000000000..be9dc769cc Binary files /dev/null and b/lib/images/bullets/bigtriangleup.svgz differ diff --git a/lib/images/bullets/box.svgz b/lib/images/bullets/box.svgz new file mode 100644 index 0000000000..5e4efaa282 Binary files /dev/null and b/lib/images/bullets/box.svgz differ diff --git a/lib/images/bullets/bullet.svgz b/lib/images/bullets/bullet.svgz new file mode 100644 index 0000000000..c13669cb7e Binary files /dev/null and b/lib/images/bullets/bullet.svgz differ diff --git a/lib/images/bullets/cdot.svgz b/lib/images/bullets/cdot.svgz new file mode 100644 index 0000000000..18f9eee3df Binary files /dev/null and b/lib/images/bullets/cdot.svgz differ diff --git a/lib/images/bullets/circ.svgz b/lib/images/bullets/circ.svgz new file mode 100644 index 0000000000..f4ba59e42a Binary files /dev/null and b/lib/images/bullets/circ.svgz differ diff --git a/lib/images/bullets/clubsuit.svgz b/lib/images/bullets/clubsuit.svgz new file mode 100644 index 0000000000..6f3d7a5cc8 Binary files /dev/null and b/lib/images/bullets/clubsuit.svgz differ diff --git a/lib/images/bullets/dagger.svgz b/lib/images/bullets/dagger.svgz new file mode 100644 index 0000000000..feb321f707 Binary files /dev/null and b/lib/images/bullets/dagger.svgz differ diff --git a/lib/images/bullets/dashv.svgz b/lib/images/bullets/dashv.svgz new file mode 100644 index 0000000000..1b7a35a1cb Binary files /dev/null and b/lib/images/bullets/dashv.svgz differ diff --git a/lib/images/bullets/diamond.svgz b/lib/images/bullets/diamond.svgz new file mode 100644 index 0000000000..46bdd75b70 Binary files /dev/null and b/lib/images/bullets/diamond.svgz differ diff --git a/lib/images/bullets/diamond2.svgz b/lib/images/bullets/diamond2.svgz new file mode 100644 index 0000000000..58fe0ebc14 Binary files /dev/null and b/lib/images/bullets/diamond2.svgz differ diff --git a/lib/images/bullets/diamondsuit.svgz b/lib/images/bullets/diamondsuit.svgz new file mode 100644 index 0000000000..2f9830ebec Binary files /dev/null and b/lib/images/bullets/diamondsuit.svgz differ diff --git a/lib/images/bullets/ding100.svgz b/lib/images/bullets/ding100.svgz new file mode 100644 index 0000000000..fcfabaf6c8 Binary files /dev/null and b/lib/images/bullets/ding100.svgz differ diff --git a/lib/images/bullets/ding101.svgz b/lib/images/bullets/ding101.svgz new file mode 100644 index 0000000000..7d880e3581 Binary files /dev/null and b/lib/images/bullets/ding101.svgz differ diff --git a/lib/images/bullets/ding102.svgz b/lib/images/bullets/ding102.svgz new file mode 100644 index 0000000000..d4b3cb5bf3 Binary files /dev/null and b/lib/images/bullets/ding102.svgz differ diff --git a/lib/images/bullets/ding103.svgz b/lib/images/bullets/ding103.svgz new file mode 100644 index 0000000000..4f5d5f9f8c Binary files /dev/null and b/lib/images/bullets/ding103.svgz differ diff --git a/lib/images/bullets/ding104.svgz b/lib/images/bullets/ding104.svgz new file mode 100644 index 0000000000..3b8eb69080 Binary files /dev/null and b/lib/images/bullets/ding104.svgz differ diff --git a/lib/images/bullets/ding105.svgz b/lib/images/bullets/ding105.svgz new file mode 100644 index 0000000000..ad5379ae0d Binary files /dev/null and b/lib/images/bullets/ding105.svgz differ diff --git a/lib/images/bullets/ding106.svgz b/lib/images/bullets/ding106.svgz new file mode 100644 index 0000000000..a54731a337 Binary files /dev/null and b/lib/images/bullets/ding106.svgz differ diff --git a/lib/images/bullets/ding107.svgz b/lib/images/bullets/ding107.svgz new file mode 100644 index 0000000000..d065feabf3 Binary files /dev/null and b/lib/images/bullets/ding107.svgz differ diff --git a/lib/images/bullets/ding108.svgz b/lib/images/bullets/ding108.svgz new file mode 100644 index 0000000000..6c8b5d7cc6 Binary files /dev/null and b/lib/images/bullets/ding108.svgz differ diff --git a/lib/images/bullets/ding109.svgz b/lib/images/bullets/ding109.svgz new file mode 100644 index 0000000000..d859a9da7f Binary files /dev/null and b/lib/images/bullets/ding109.svgz differ diff --git a/lib/images/bullets/ding110.svgz b/lib/images/bullets/ding110.svgz new file mode 100644 index 0000000000..7ff003fe11 Binary files /dev/null and b/lib/images/bullets/ding110.svgz differ diff --git a/lib/images/bullets/ding111.svgz b/lib/images/bullets/ding111.svgz new file mode 100644 index 0000000000..22e8395ff2 Binary files /dev/null and b/lib/images/bullets/ding111.svgz differ diff --git a/lib/images/bullets/ding112.svgz b/lib/images/bullets/ding112.svgz new file mode 100644 index 0000000000..866ab1a4a9 Binary files /dev/null and b/lib/images/bullets/ding112.svgz differ diff --git a/lib/images/bullets/ding113.svgz b/lib/images/bullets/ding113.svgz new file mode 100644 index 0000000000..85a4f2cede Binary files /dev/null and b/lib/images/bullets/ding113.svgz differ diff --git a/lib/images/bullets/ding114.svgz b/lib/images/bullets/ding114.svgz new file mode 100644 index 0000000000..2d29eb42c5 Binary files /dev/null and b/lib/images/bullets/ding114.svgz differ diff --git a/lib/images/bullets/ding115.svgz b/lib/images/bullets/ding115.svgz new file mode 100644 index 0000000000..e90dcafb3b Binary files /dev/null and b/lib/images/bullets/ding115.svgz differ diff --git a/lib/images/bullets/ding116.svgz b/lib/images/bullets/ding116.svgz new file mode 100644 index 0000000000..e7393c55f2 Binary files /dev/null and b/lib/images/bullets/ding116.svgz differ diff --git a/lib/images/bullets/ding117.svgz b/lib/images/bullets/ding117.svgz new file mode 100644 index 0000000000..30125beb34 Binary files /dev/null and b/lib/images/bullets/ding117.svgz differ diff --git a/lib/images/bullets/ding118.svgz b/lib/images/bullets/ding118.svgz new file mode 100644 index 0000000000..7d43a92757 Binary files /dev/null and b/lib/images/bullets/ding118.svgz differ diff --git a/lib/images/bullets/ding119.svgz b/lib/images/bullets/ding119.svgz new file mode 100644 index 0000000000..2a12040f94 Binary files /dev/null and b/lib/images/bullets/ding119.svgz differ diff --git a/lib/images/bullets/ding120.svgz b/lib/images/bullets/ding120.svgz new file mode 100644 index 0000000000..0bb20d5b35 Binary files /dev/null and b/lib/images/bullets/ding120.svgz differ diff --git a/lib/images/bullets/ding121.svgz b/lib/images/bullets/ding121.svgz new file mode 100644 index 0000000000..24e55e24a2 Binary files /dev/null and b/lib/images/bullets/ding121.svgz differ diff --git a/lib/images/bullets/ding122.svgz b/lib/images/bullets/ding122.svgz new file mode 100644 index 0000000000..6fbfddb5e4 Binary files /dev/null and b/lib/images/bullets/ding122.svgz differ diff --git a/lib/images/bullets/ding162.svgz b/lib/images/bullets/ding162.svgz new file mode 100644 index 0000000000..b7277b131e Binary files /dev/null and b/lib/images/bullets/ding162.svgz differ diff --git a/lib/images/bullets/ding163.svgz b/lib/images/bullets/ding163.svgz new file mode 100644 index 0000000000..3ec47e2f46 Binary files /dev/null and b/lib/images/bullets/ding163.svgz differ diff --git a/lib/images/bullets/ding164.svgz b/lib/images/bullets/ding164.svgz new file mode 100644 index 0000000000..c6f9b37b60 Binary files /dev/null and b/lib/images/bullets/ding164.svgz differ diff --git a/lib/images/bullets/ding165.svgz b/lib/images/bullets/ding165.svgz new file mode 100644 index 0000000000..103cef8f15 Binary files /dev/null and b/lib/images/bullets/ding165.svgz differ diff --git a/lib/images/bullets/ding166.svgz b/lib/images/bullets/ding166.svgz new file mode 100644 index 0000000000..891eb5e323 Binary files /dev/null and b/lib/images/bullets/ding166.svgz differ diff --git a/lib/images/bullets/ding167.svgz b/lib/images/bullets/ding167.svgz new file mode 100644 index 0000000000..485885a6ef Binary files /dev/null and b/lib/images/bullets/ding167.svgz differ diff --git a/lib/images/bullets/ding168.svgz b/lib/images/bullets/ding168.svgz new file mode 100644 index 0000000000..093cab0d47 Binary files /dev/null and b/lib/images/bullets/ding168.svgz differ diff --git a/lib/images/bullets/ding169.svgz b/lib/images/bullets/ding169.svgz new file mode 100644 index 0000000000..0d9ac3c38a Binary files /dev/null and b/lib/images/bullets/ding169.svgz differ diff --git a/lib/images/bullets/ding170.svgz b/lib/images/bullets/ding170.svgz new file mode 100644 index 0000000000..7df034ada0 Binary files /dev/null and b/lib/images/bullets/ding170.svgz differ diff --git a/lib/images/bullets/ding171.svgz b/lib/images/bullets/ding171.svgz new file mode 100644 index 0000000000..890256d473 Binary files /dev/null and b/lib/images/bullets/ding171.svgz differ diff --git a/lib/images/bullets/ding212.svgz b/lib/images/bullets/ding212.svgz new file mode 100644 index 0000000000..e62cd89ce7 Binary files /dev/null and b/lib/images/bullets/ding212.svgz differ diff --git a/lib/images/bullets/ding213.svgz b/lib/images/bullets/ding213.svgz new file mode 100644 index 0000000000..eebf7b8dac Binary files /dev/null and b/lib/images/bullets/ding213.svgz differ diff --git a/lib/images/bullets/ding217.svgz b/lib/images/bullets/ding217.svgz new file mode 100644 index 0000000000..e6247441a1 Binary files /dev/null and b/lib/images/bullets/ding217.svgz differ diff --git a/lib/images/bullets/ding219.svgz b/lib/images/bullets/ding219.svgz new file mode 100644 index 0000000000..92fa7e7fc6 Binary files /dev/null and b/lib/images/bullets/ding219.svgz differ diff --git a/lib/images/bullets/ding220.svgz b/lib/images/bullets/ding220.svgz new file mode 100644 index 0000000000..e2295a42d3 Binary files /dev/null and b/lib/images/bullets/ding220.svgz differ diff --git a/lib/images/bullets/ding221.svgz b/lib/images/bullets/ding221.svgz new file mode 100644 index 0000000000..54d1c3f226 Binary files /dev/null and b/lib/images/bullets/ding221.svgz differ diff --git a/lib/images/bullets/ding222.svgz b/lib/images/bullets/ding222.svgz new file mode 100644 index 0000000000..381f8f1b8e Binary files /dev/null and b/lib/images/bullets/ding222.svgz differ diff --git a/lib/images/bullets/ding223.svgz b/lib/images/bullets/ding223.svgz new file mode 100644 index 0000000000..367cf570ff Binary files /dev/null and b/lib/images/bullets/ding223.svgz differ diff --git a/lib/images/bullets/ding224.svgz b/lib/images/bullets/ding224.svgz new file mode 100644 index 0000000000..5324e2d296 Binary files /dev/null and b/lib/images/bullets/ding224.svgz differ diff --git a/lib/images/bullets/ding225.svgz b/lib/images/bullets/ding225.svgz new file mode 100644 index 0000000000..6b58025004 Binary files /dev/null and b/lib/images/bullets/ding225.svgz differ diff --git a/lib/images/bullets/ding226.svgz b/lib/images/bullets/ding226.svgz new file mode 100644 index 0000000000..4fc1ebf1c0 Binary files /dev/null and b/lib/images/bullets/ding226.svgz differ diff --git a/lib/images/bullets/ding227.svgz b/lib/images/bullets/ding227.svgz new file mode 100644 index 0000000000..8b129d2c16 Binary files /dev/null and b/lib/images/bullets/ding227.svgz differ diff --git a/lib/images/bullets/ding228.svgz b/lib/images/bullets/ding228.svgz new file mode 100644 index 0000000000..17be288b7f Binary files /dev/null and b/lib/images/bullets/ding228.svgz differ diff --git a/lib/images/bullets/ding229.svgz b/lib/images/bullets/ding229.svgz new file mode 100644 index 0000000000..fa4e245957 Binary files /dev/null and b/lib/images/bullets/ding229.svgz differ diff --git a/lib/images/bullets/ding230.svgz b/lib/images/bullets/ding230.svgz new file mode 100644 index 0000000000..70a5d0549f Binary files /dev/null and b/lib/images/bullets/ding230.svgz differ diff --git a/lib/images/bullets/ding231.svgz b/lib/images/bullets/ding231.svgz new file mode 100644 index 0000000000..0909b5beb9 Binary files /dev/null and b/lib/images/bullets/ding231.svgz differ diff --git a/lib/images/bullets/ding232.svgz b/lib/images/bullets/ding232.svgz new file mode 100644 index 0000000000..373852ba23 Binary files /dev/null and b/lib/images/bullets/ding232.svgz differ diff --git a/lib/images/bullets/ding233.svgz b/lib/images/bullets/ding233.svgz new file mode 100644 index 0000000000..dcc74aed8a Binary files /dev/null and b/lib/images/bullets/ding233.svgz differ diff --git a/lib/images/bullets/ding234.svgz b/lib/images/bullets/ding234.svgz new file mode 100644 index 0000000000..f8653271a3 Binary files /dev/null and b/lib/images/bullets/ding234.svgz differ diff --git a/lib/images/bullets/ding235.svgz b/lib/images/bullets/ding235.svgz new file mode 100644 index 0000000000..4a2331c5ee Binary files /dev/null and b/lib/images/bullets/ding235.svgz differ diff --git a/lib/images/bullets/ding236.svgz b/lib/images/bullets/ding236.svgz new file mode 100644 index 0000000000..bb0c848392 Binary files /dev/null and b/lib/images/bullets/ding236.svgz differ diff --git a/lib/images/bullets/ding237.svgz b/lib/images/bullets/ding237.svgz new file mode 100644 index 0000000000..910fc17315 Binary files /dev/null and b/lib/images/bullets/ding237.svgz differ diff --git a/lib/images/bullets/ding238.svgz b/lib/images/bullets/ding238.svgz new file mode 100644 index 0000000000..6f07718237 Binary files /dev/null and b/lib/images/bullets/ding238.svgz differ diff --git a/lib/images/bullets/ding239.svgz b/lib/images/bullets/ding239.svgz new file mode 100644 index 0000000000..af32037df9 Binary files /dev/null and b/lib/images/bullets/ding239.svgz differ diff --git a/lib/images/bullets/ding241.svgz b/lib/images/bullets/ding241.svgz new file mode 100644 index 0000000000..5256f8bd1c Binary files /dev/null and b/lib/images/bullets/ding241.svgz differ diff --git a/lib/images/bullets/ding242.svgz b/lib/images/bullets/ding242.svgz new file mode 100644 index 0000000000..3d7bd9543a Binary files /dev/null and b/lib/images/bullets/ding242.svgz differ diff --git a/lib/images/bullets/ding243.svgz b/lib/images/bullets/ding243.svgz new file mode 100644 index 0000000000..bd465df854 Binary files /dev/null and b/lib/images/bullets/ding243.svgz differ diff --git a/lib/images/bullets/ding245.svgz b/lib/images/bullets/ding245.svgz new file mode 100644 index 0000000000..5654091027 Binary files /dev/null and b/lib/images/bullets/ding245.svgz differ diff --git a/lib/images/bullets/ding248.svgz b/lib/images/bullets/ding248.svgz new file mode 100644 index 0000000000..e947b8d91a Binary files /dev/null and b/lib/images/bullets/ding248.svgz differ diff --git a/lib/images/bullets/ding250.svgz b/lib/images/bullets/ding250.svgz new file mode 100644 index 0000000000..f3a190d28d Binary files /dev/null and b/lib/images/bullets/ding250.svgz differ diff --git a/lib/images/bullets/ding251.svgz b/lib/images/bullets/ding251.svgz new file mode 100644 index 0000000000..5b158f2fcb Binary files /dev/null and b/lib/images/bullets/ding251.svgz differ diff --git a/lib/images/bullets/ding252.svgz b/lib/images/bullets/ding252.svgz new file mode 100644 index 0000000000..993e780e87 Binary files /dev/null and b/lib/images/bullets/ding252.svgz differ diff --git a/lib/images/bullets/ding253.svgz b/lib/images/bullets/ding253.svgz new file mode 100644 index 0000000000..6050f650f8 Binary files /dev/null and b/lib/images/bullets/ding253.svgz differ diff --git a/lib/images/bullets/ding254.svgz b/lib/images/bullets/ding254.svgz new file mode 100644 index 0000000000..b4e0f7326a Binary files /dev/null and b/lib/images/bullets/ding254.svgz differ diff --git a/lib/images/bullets/ding34.svgz b/lib/images/bullets/ding34.svgz new file mode 100644 index 0000000000..61d6af562f Binary files /dev/null and b/lib/images/bullets/ding34.svgz differ diff --git a/lib/images/bullets/ding36.svgz b/lib/images/bullets/ding36.svgz new file mode 100644 index 0000000000..c988953db0 Binary files /dev/null and b/lib/images/bullets/ding36.svgz differ diff --git a/lib/images/bullets/ding37.svgz b/lib/images/bullets/ding37.svgz new file mode 100644 index 0000000000..b36a083d5f Binary files /dev/null and b/lib/images/bullets/ding37.svgz differ diff --git a/lib/images/bullets/ding38.svgz b/lib/images/bullets/ding38.svgz new file mode 100644 index 0000000000..c90083908e Binary files /dev/null and b/lib/images/bullets/ding38.svgz differ diff --git a/lib/images/bullets/ding39.svgz b/lib/images/bullets/ding39.svgz new file mode 100644 index 0000000000..e636c5afdd Binary files /dev/null and b/lib/images/bullets/ding39.svgz differ diff --git a/lib/images/bullets/ding40.svgz b/lib/images/bullets/ding40.svgz new file mode 100644 index 0000000000..e20d78505c Binary files /dev/null and b/lib/images/bullets/ding40.svgz differ diff --git a/lib/images/bullets/ding41.svgz b/lib/images/bullets/ding41.svgz new file mode 100644 index 0000000000..f0c8c6e3e1 Binary files /dev/null and b/lib/images/bullets/ding41.svgz differ diff --git a/lib/images/bullets/ding42.svgz b/lib/images/bullets/ding42.svgz new file mode 100644 index 0000000000..e873ec6868 Binary files /dev/null and b/lib/images/bullets/ding42.svgz differ diff --git a/lib/images/bullets/ding43.svgz b/lib/images/bullets/ding43.svgz new file mode 100644 index 0000000000..56b097ac04 Binary files /dev/null and b/lib/images/bullets/ding43.svgz differ diff --git a/lib/images/bullets/ding44.svgz b/lib/images/bullets/ding44.svgz new file mode 100644 index 0000000000..f6f82ae7a4 Binary files /dev/null and b/lib/images/bullets/ding44.svgz differ diff --git a/lib/images/bullets/ding45.svgz b/lib/images/bullets/ding45.svgz new file mode 100644 index 0000000000..3b6e17ff17 Binary files /dev/null and b/lib/images/bullets/ding45.svgz differ diff --git a/lib/images/bullets/ding47.svgz b/lib/images/bullets/ding47.svgz new file mode 100644 index 0000000000..59347fa92e Binary files /dev/null and b/lib/images/bullets/ding47.svgz differ diff --git a/lib/images/bullets/ding49.svgz b/lib/images/bullets/ding49.svgz new file mode 100644 index 0000000000..e053b05c10 Binary files /dev/null and b/lib/images/bullets/ding49.svgz differ diff --git a/lib/images/bullets/ding50.svgz b/lib/images/bullets/ding50.svgz new file mode 100644 index 0000000000..e97c394c97 Binary files /dev/null and b/lib/images/bullets/ding50.svgz differ diff --git a/lib/images/bullets/ding51.svgz b/lib/images/bullets/ding51.svgz new file mode 100644 index 0000000000..1ed07d4140 Binary files /dev/null and b/lib/images/bullets/ding51.svgz differ diff --git a/lib/images/bullets/ding52.svgz b/lib/images/bullets/ding52.svgz new file mode 100644 index 0000000000..8b550f38dc Binary files /dev/null and b/lib/images/bullets/ding52.svgz differ diff --git a/lib/images/bullets/ding53.svgz b/lib/images/bullets/ding53.svgz new file mode 100644 index 0000000000..1a3a533020 Binary files /dev/null and b/lib/images/bullets/ding53.svgz differ diff --git a/lib/images/bullets/ding54.svgz b/lib/images/bullets/ding54.svgz new file mode 100644 index 0000000000..3c5b4b09b3 Binary files /dev/null and b/lib/images/bullets/ding54.svgz differ diff --git a/lib/images/bullets/ding55.svgz b/lib/images/bullets/ding55.svgz new file mode 100644 index 0000000000..8ced1bcff4 Binary files /dev/null and b/lib/images/bullets/ding55.svgz differ diff --git a/lib/images/bullets/ding56.svgz b/lib/images/bullets/ding56.svgz new file mode 100644 index 0000000000..63f941328b Binary files /dev/null and b/lib/images/bullets/ding56.svgz differ diff --git a/lib/images/bullets/ding57.svgz b/lib/images/bullets/ding57.svgz new file mode 100644 index 0000000000..581c3401e0 Binary files /dev/null and b/lib/images/bullets/ding57.svgz differ diff --git a/lib/images/bullets/ding58.svgz b/lib/images/bullets/ding58.svgz new file mode 100644 index 0000000000..453af08b35 Binary files /dev/null and b/lib/images/bullets/ding58.svgz differ diff --git a/lib/images/bullets/ding59.svgz b/lib/images/bullets/ding59.svgz new file mode 100644 index 0000000000..7b5d118204 Binary files /dev/null and b/lib/images/bullets/ding59.svgz differ diff --git a/lib/images/bullets/ding60.svgz b/lib/images/bullets/ding60.svgz new file mode 100644 index 0000000000..502f73c6c2 Binary files /dev/null and b/lib/images/bullets/ding60.svgz differ diff --git a/lib/images/bullets/ding61.svgz b/lib/images/bullets/ding61.svgz new file mode 100644 index 0000000000..bc8090897a Binary files /dev/null and b/lib/images/bullets/ding61.svgz differ diff --git a/lib/images/bullets/ding62.svgz b/lib/images/bullets/ding62.svgz new file mode 100644 index 0000000000..5baabcacc2 Binary files /dev/null and b/lib/images/bullets/ding62.svgz differ diff --git a/lib/images/bullets/ding63.svgz b/lib/images/bullets/ding63.svgz new file mode 100644 index 0000000000..b2ea14e3c0 Binary files /dev/null and b/lib/images/bullets/ding63.svgz differ diff --git a/lib/images/bullets/ding64.svgz b/lib/images/bullets/ding64.svgz new file mode 100644 index 0000000000..a1c786ab09 Binary files /dev/null and b/lib/images/bullets/ding64.svgz differ diff --git a/lib/images/bullets/ding65.svgz b/lib/images/bullets/ding65.svgz new file mode 100644 index 0000000000..e08b2a7e59 Binary files /dev/null and b/lib/images/bullets/ding65.svgz differ diff --git a/lib/images/bullets/ding66.svgz b/lib/images/bullets/ding66.svgz new file mode 100644 index 0000000000..ef8568be3c Binary files /dev/null and b/lib/images/bullets/ding66.svgz differ diff --git a/lib/images/bullets/ding67.svgz b/lib/images/bullets/ding67.svgz new file mode 100644 index 0000000000..7a1e1af96c Binary files /dev/null and b/lib/images/bullets/ding67.svgz differ diff --git a/lib/images/bullets/ding68.svgz b/lib/images/bullets/ding68.svgz new file mode 100644 index 0000000000..b5078c42db Binary files /dev/null and b/lib/images/bullets/ding68.svgz differ diff --git a/lib/images/bullets/ding69.svgz b/lib/images/bullets/ding69.svgz new file mode 100644 index 0000000000..3f38b0f929 Binary files /dev/null and b/lib/images/bullets/ding69.svgz differ diff --git a/lib/images/bullets/ding70.svgz b/lib/images/bullets/ding70.svgz new file mode 100644 index 0000000000..0964eb2d2a Binary files /dev/null and b/lib/images/bullets/ding70.svgz differ diff --git a/lib/images/bullets/ding71.svgz b/lib/images/bullets/ding71.svgz new file mode 100644 index 0000000000..fe6e47d7af Binary files /dev/null and b/lib/images/bullets/ding71.svgz differ diff --git a/lib/images/bullets/ding72.svgz b/lib/images/bullets/ding72.svgz new file mode 100644 index 0000000000..6010f550e6 Binary files /dev/null and b/lib/images/bullets/ding72.svgz differ diff --git a/lib/images/bullets/ding74.svgz b/lib/images/bullets/ding74.svgz new file mode 100644 index 0000000000..e4ea1cc6c1 Binary files /dev/null and b/lib/images/bullets/ding74.svgz differ diff --git a/lib/images/bullets/ding75.svgz b/lib/images/bullets/ding75.svgz new file mode 100644 index 0000000000..c7bd1e3eb8 Binary files /dev/null and b/lib/images/bullets/ding75.svgz differ diff --git a/lib/images/bullets/ding76.svgz b/lib/images/bullets/ding76.svgz new file mode 100644 index 0000000000..e7566c3b67 Binary files /dev/null and b/lib/images/bullets/ding76.svgz differ diff --git a/lib/images/bullets/ding77.svgz b/lib/images/bullets/ding77.svgz new file mode 100644 index 0000000000..685dd2a670 Binary files /dev/null and b/lib/images/bullets/ding77.svgz differ diff --git a/lib/images/bullets/ding78.svgz b/lib/images/bullets/ding78.svgz new file mode 100644 index 0000000000..904bf79014 Binary files /dev/null and b/lib/images/bullets/ding78.svgz differ diff --git a/lib/images/bullets/ding79.svgz b/lib/images/bullets/ding79.svgz new file mode 100644 index 0000000000..2bb94a3a13 Binary files /dev/null and b/lib/images/bullets/ding79.svgz differ diff --git a/lib/images/bullets/ding80.svgz b/lib/images/bullets/ding80.svgz new file mode 100644 index 0000000000..3c3b7bc70b Binary files /dev/null and b/lib/images/bullets/ding80.svgz differ diff --git a/lib/images/bullets/ding81.svgz b/lib/images/bullets/ding81.svgz new file mode 100644 index 0000000000..67bab89580 Binary files /dev/null and b/lib/images/bullets/ding81.svgz differ diff --git a/lib/images/bullets/ding82.svgz b/lib/images/bullets/ding82.svgz new file mode 100644 index 0000000000..f2e3f60a44 Binary files /dev/null and b/lib/images/bullets/ding82.svgz differ diff --git a/lib/images/bullets/ding83.svgz b/lib/images/bullets/ding83.svgz new file mode 100644 index 0000000000..4448e99848 Binary files /dev/null and b/lib/images/bullets/ding83.svgz differ diff --git a/lib/images/bullets/ding84.svgz b/lib/images/bullets/ding84.svgz new file mode 100644 index 0000000000..0497f26254 Binary files /dev/null and b/lib/images/bullets/ding84.svgz differ diff --git a/lib/images/bullets/ding85.svgz b/lib/images/bullets/ding85.svgz new file mode 100644 index 0000000000..00af3de2c8 Binary files /dev/null and b/lib/images/bullets/ding85.svgz differ diff --git a/lib/images/bullets/ding86.svgz b/lib/images/bullets/ding86.svgz new file mode 100644 index 0000000000..763266507e Binary files /dev/null and b/lib/images/bullets/ding86.svgz differ diff --git a/lib/images/bullets/ding87.svgz b/lib/images/bullets/ding87.svgz new file mode 100644 index 0000000000..f1a2d354e9 Binary files /dev/null and b/lib/images/bullets/ding87.svgz differ diff --git a/lib/images/bullets/ding88.svgz b/lib/images/bullets/ding88.svgz new file mode 100644 index 0000000000..b0a409f103 Binary files /dev/null and b/lib/images/bullets/ding88.svgz differ diff --git a/lib/images/bullets/ding89.svgz b/lib/images/bullets/ding89.svgz new file mode 100644 index 0000000000..815dd74e5c Binary files /dev/null and b/lib/images/bullets/ding89.svgz differ diff --git a/lib/images/bullets/ding90.svgz b/lib/images/bullets/ding90.svgz new file mode 100644 index 0000000000..f39b818b1a Binary files /dev/null and b/lib/images/bullets/ding90.svgz differ diff --git a/lib/images/bullets/ding91.svgz b/lib/images/bullets/ding91.svgz new file mode 100644 index 0000000000..4d2ac75b62 Binary files /dev/null and b/lib/images/bullets/ding91.svgz differ diff --git a/lib/images/bullets/ding92.svgz b/lib/images/bullets/ding92.svgz new file mode 100644 index 0000000000..e0530be1fc Binary files /dev/null and b/lib/images/bullets/ding92.svgz differ diff --git a/lib/images/bullets/ding93.svgz b/lib/images/bullets/ding93.svgz new file mode 100644 index 0000000000..36192b140d Binary files /dev/null and b/lib/images/bullets/ding93.svgz differ diff --git a/lib/images/bullets/ding94.svgz b/lib/images/bullets/ding94.svgz new file mode 100644 index 0000000000..7cbdc44360 Binary files /dev/null and b/lib/images/bullets/ding94.svgz differ diff --git a/lib/images/bullets/ding95.svgz b/lib/images/bullets/ding95.svgz new file mode 100644 index 0000000000..b34886fe21 Binary files /dev/null and b/lib/images/bullets/ding95.svgz differ diff --git a/lib/images/bullets/ding96.svgz b/lib/images/bullets/ding96.svgz new file mode 100644 index 0000000000..c27a591ccd Binary files /dev/null and b/lib/images/bullets/ding96.svgz differ diff --git a/lib/images/bullets/ding97.svgz b/lib/images/bullets/ding97.svgz new file mode 100644 index 0000000000..6abe85499d Binary files /dev/null and b/lib/images/bullets/ding97.svgz differ diff --git a/lib/images/bullets/ding98.svgz b/lib/images/bullets/ding98.svgz new file mode 100644 index 0000000000..243bd6b143 Binary files /dev/null and b/lib/images/bullets/ding98.svgz differ diff --git a/lib/images/bullets/ding99.svgz b/lib/images/bullets/ding99.svgz new file mode 100644 index 0000000000..c4d25f05e4 Binary files /dev/null and b/lib/images/bullets/ding99.svgz differ diff --git a/lib/images/bullets/flat.svgz b/lib/images/bullets/flat.svgz new file mode 100644 index 0000000000..a6384ce8c1 Binary files /dev/null and b/lib/images/bullets/flat.svgz differ diff --git a/lib/images/bullets/heartsuit.svgz b/lib/images/bullets/heartsuit.svgz new file mode 100644 index 0000000000..2af589911e Binary files /dev/null and b/lib/images/bullets/heartsuit.svgz differ diff --git a/lib/images/bullets/leadsto.svgz b/lib/images/bullets/leadsto.svgz new file mode 100644 index 0000000000..9646cb7cae Binary files /dev/null and b/lib/images/bullets/leadsto.svgz differ diff --git a/lib/images/bullets/lhd.svgz b/lib/images/bullets/lhd.svgz new file mode 100644 index 0000000000..e5575a0045 Binary files /dev/null and b/lib/images/bullets/lhd.svgz differ diff --git a/lib/images/bullets/natural.svgz b/lib/images/bullets/natural.svgz new file mode 100644 index 0000000000..8d632c1839 Binary files /dev/null and b/lib/images/bullets/natural.svgz differ diff --git a/lib/images/bullets/odot.svgz b/lib/images/bullets/odot.svgz new file mode 100644 index 0000000000..796548e2dd Binary files /dev/null and b/lib/images/bullets/odot.svgz differ diff --git a/lib/images/bullets/ominus.svgz b/lib/images/bullets/ominus.svgz new file mode 100644 index 0000000000..1fd9533db3 Binary files /dev/null and b/lib/images/bullets/ominus.svgz differ diff --git a/lib/images/bullets/oplus.svgz b/lib/images/bullets/oplus.svgz new file mode 100644 index 0000000000..bb5da58059 Binary files /dev/null and b/lib/images/bullets/oplus.svgz differ diff --git a/lib/images/bullets/oslash.svgz b/lib/images/bullets/oslash.svgz new file mode 100644 index 0000000000..f0e8641739 Binary files /dev/null and b/lib/images/bullets/oslash.svgz differ diff --git a/lib/images/bullets/otimes.svgz b/lib/images/bullets/otimes.svgz new file mode 100644 index 0000000000..2e28f6def3 Binary files /dev/null and b/lib/images/bullets/otimes.svgz differ diff --git a/lib/images/bullets/pisymbol_psy167.svgz b/lib/images/bullets/pisymbol_psy167.svgz new file mode 100644 index 0000000000..6fcba334f4 Binary files /dev/null and b/lib/images/bullets/pisymbol_psy167.svgz differ diff --git a/lib/images/bullets/pisymbol_psy168.svgz b/lib/images/bullets/pisymbol_psy168.svgz new file mode 100644 index 0000000000..4eea711768 Binary files /dev/null and b/lib/images/bullets/pisymbol_psy168.svgz differ diff --git a/lib/images/bullets/pisymbol_psy169.svgz b/lib/images/bullets/pisymbol_psy169.svgz new file mode 100644 index 0000000000..20c5b5cbab Binary files /dev/null and b/lib/images/bullets/pisymbol_psy169.svgz differ diff --git a/lib/images/bullets/pisymbol_psy170.svgz b/lib/images/bullets/pisymbol_psy170.svgz new file mode 100644 index 0000000000..a96d6a5065 Binary files /dev/null and b/lib/images/bullets/pisymbol_psy170.svgz differ diff --git a/lib/images/bullets/pisymbol_psy174.svgz b/lib/images/bullets/pisymbol_psy174.svgz new file mode 100644 index 0000000000..a537f72cc4 Binary files /dev/null and b/lib/images/bullets/pisymbol_psy174.svgz differ diff --git a/lib/images/bullets/pisymbol_psy183.svgz b/lib/images/bullets/pisymbol_psy183.svgz new file mode 100644 index 0000000000..bcd2ac8d14 Binary files /dev/null and b/lib/images/bullets/pisymbol_psy183.svgz differ diff --git a/lib/images/bullets/pisymbol_psy196.svgz b/lib/images/bullets/pisymbol_psy196.svgz new file mode 100644 index 0000000000..c855d6b92f Binary files /dev/null and b/lib/images/bullets/pisymbol_psy196.svgz differ diff --git a/lib/images/bullets/pisymbol_psy197.svgz b/lib/images/bullets/pisymbol_psy197.svgz new file mode 100644 index 0000000000..be6d940bb3 Binary files /dev/null and b/lib/images/bullets/pisymbol_psy197.svgz differ diff --git a/lib/images/bullets/pisymbol_psy209.svgz b/lib/images/bullets/pisymbol_psy209.svgz new file mode 100644 index 0000000000..98c6028948 Binary files /dev/null and b/lib/images/bullets/pisymbol_psy209.svgz differ diff --git a/lib/images/bullets/pisymbol_psy215.svgz b/lib/images/bullets/pisymbol_psy215.svgz new file mode 100644 index 0000000000..d043c5634b Binary files /dev/null and b/lib/images/bullets/pisymbol_psy215.svgz differ diff --git a/lib/images/bullets/pisymbol_psy222.svgz b/lib/images/bullets/pisymbol_psy222.svgz new file mode 100644 index 0000000000..b5b43a2520 Binary files /dev/null and b/lib/images/bullets/pisymbol_psy222.svgz differ diff --git a/lib/images/bullets/pisymbol_psy224.svgz b/lib/images/bullets/pisymbol_psy224.svgz new file mode 100644 index 0000000000..05af56c1c6 Binary files /dev/null and b/lib/images/bullets/pisymbol_psy224.svgz differ diff --git a/lib/images/bullets/pisymbol_psy42.svgz b/lib/images/bullets/pisymbol_psy42.svgz new file mode 100644 index 0000000000..22a479cded Binary files /dev/null and b/lib/images/bullets/pisymbol_psy42.svgz differ diff --git a/lib/images/bullets/pisymbol_psy45.svgz b/lib/images/bullets/pisymbol_psy45.svgz new file mode 100644 index 0000000000..379bff83d3 Binary files /dev/null and b/lib/images/bullets/pisymbol_psy45.svgz differ diff --git a/lib/images/bullets/pisymbol_psy68.svgz b/lib/images/bullets/pisymbol_psy68.svgz new file mode 100644 index 0000000000..9e2b2924b3 Binary files /dev/null and b/lib/images/bullets/pisymbol_psy68.svgz differ diff --git a/lib/images/bullets/rhd.svgz b/lib/images/bullets/rhd.svgz new file mode 100644 index 0000000000..977083d375 Binary files /dev/null and b/lib/images/bullets/rhd.svgz differ diff --git a/lib/images/bullets/rightarrow.svgz b/lib/images/bullets/rightarrow.svgz new file mode 100644 index 0000000000..0ac334c896 Binary files /dev/null and b/lib/images/bullets/rightarrow.svgz differ diff --git a/lib/images/bullets/rightarrow2.svgz b/lib/images/bullets/rightarrow2.svgz new file mode 100644 index 0000000000..83b4d3ece0 Binary files /dev/null and b/lib/images/bullets/rightarrow2.svgz differ diff --git a/lib/images/bullets/rightharpoondown.svgz b/lib/images/bullets/rightharpoondown.svgz new file mode 100644 index 0000000000..c5951af1d4 Binary files /dev/null and b/lib/images/bullets/rightharpoondown.svgz differ diff --git a/lib/images/bullets/rightharpoonup.svgz b/lib/images/bullets/rightharpoonup.svgz new file mode 100644 index 0000000000..22a2ef624d Binary files /dev/null and b/lib/images/bullets/rightharpoonup.svgz differ diff --git a/lib/images/bullets/sharp.svgz b/lib/images/bullets/sharp.svgz new file mode 100644 index 0000000000..090b751bd8 Binary files /dev/null and b/lib/images/bullets/sharp.svgz differ diff --git a/lib/images/bullets/spadesuit.svgz b/lib/images/bullets/spadesuit.svgz new file mode 100644 index 0000000000..b7bd544b5e Binary files /dev/null and b/lib/images/bullets/spadesuit.svgz differ diff --git a/lib/images/bullets/star.svgz b/lib/images/bullets/star.svgz new file mode 100644 index 0000000000..0373f9437e Binary files /dev/null and b/lib/images/bullets/star.svgz differ diff --git a/lib/images/bullets/succ.svgz b/lib/images/bullets/succ.svgz new file mode 100644 index 0000000000..187e677641 Binary files /dev/null and b/lib/images/bullets/succ.svgz differ diff --git a/lib/images/bullets/triangleleft.svgz b/lib/images/bullets/triangleleft.svgz new file mode 100644 index 0000000000..381bf49413 Binary files /dev/null and b/lib/images/bullets/triangleleft.svgz differ diff --git a/lib/images/bullets/triangleright.svgz b/lib/images/bullets/triangleright.svgz new file mode 100644 index 0000000000..99e8aca24d Binary files /dev/null and b/lib/images/bullets/triangleright.svgz differ diff --git a/lib/images/bullets/vdash.svgz b/lib/images/bullets/vdash.svgz new file mode 100644 index 0000000000..aaad602d4f Binary files /dev/null and b/lib/images/bullets/vdash.svgz differ diff --git a/lib/images/psnfss1.png b/lib/images/psnfss1.png deleted file mode 100644 index 0211d78120..0000000000 Binary files a/lib/images/psnfss1.png and /dev/null differ diff --git a/lib/images/psnfss2.png b/lib/images/psnfss2.png deleted file mode 100644 index 7a0144266c..0000000000 Binary files a/lib/images/psnfss2.png and /dev/null differ diff --git a/lib/images/psnfss3.png b/lib/images/psnfss3.png deleted file mode 100644 index 62249314c0..0000000000 Binary files a/lib/images/psnfss3.png and /dev/null differ diff --git a/lib/images/psnfss4.png b/lib/images/psnfss4.png deleted file mode 100644 index 9c679bb82f..0000000000 Binary files a/lib/images/psnfss4.png and /dev/null differ diff --git a/lib/images/standard.png b/lib/images/standard.png deleted file mode 100644 index d420003d39..0000000000 Binary files a/lib/images/standard.png and /dev/null differ diff --git a/src/Bullet.h b/src/Bullet.h index 6a4f997acb..5fd2d2cf8b 100644 --- a/src/Bullet.h +++ b/src/Bullet.h @@ -47,6 +47,8 @@ public: Bullet & operator=(Bullet const &); /// friend bool operator==(Bullet const &, Bullet const &); + /// + static docstring const bulletEntry(int, int); protected: /// void testInvariant() const; @@ -74,8 +76,6 @@ private: void generateText() const; /// static docstring const bulletSize(int); - /// - static docstring const bulletEntry(int, int); /// int font; diff --git a/src/frontends/qt/BulletsModule.cpp b/src/frontends/qt/BulletsModule.cpp index 2dca758d12..e640feb167 100644 --- a/src/frontends/qt/BulletsModule.cpp +++ b/src/frontends/qt/BulletsModule.cpp @@ -10,12 +10,16 @@ #include +#include "Bullet.h" + #include "BulletsModule.h" #include "GuiApplication.h" #include "qt_helpers.h" +#include #include #include +#include using namespace std; @@ -23,6 +27,9 @@ namespace lyx { namespace frontend { +int const CHARMAX = 36; +int const FONTMAX = 6; + BulletsModule::BulletsModule(QWidget * parent) : QWidget(parent) { @@ -41,12 +48,12 @@ BulletsModule::BulletsModule(QWidget * parent) levelLW->addItem("4"); // insert pixmaps - setupPanel(new QListWidget(bulletpaneSW), qt_("Standard[[Bullets]]"), "standard"); - setupPanel(new QListWidget(bulletpaneSW), qt_("Maths"), "amssymb"); - setupPanel(new QListWidget(bulletpaneSW), qt_("Dings 1"), "psnfss1"); - setupPanel(new QListWidget(bulletpaneSW), qt_("Dings 2"), "psnfss2"); - setupPanel(new QListWidget(bulletpaneSW), qt_("Dings 3"), "psnfss3"); - setupPanel(new QListWidget(bulletpaneSW), qt_("Dings 4"), "psnfss4"); + setupPanel(new QListWidget(bulletpaneSW), qt_("Standard[[Bullets]]"), 0); + setupPanel(new QListWidget(bulletpaneSW), qt_("Maths"), 1, "math"); + setupPanel(new QListWidget(bulletpaneSW), qt_("Dings 1"), 2); + setupPanel(new QListWidget(bulletpaneSW), qt_("Dings 2"), 3); + setupPanel(new QListWidget(bulletpaneSW), qt_("Dings 3"), 4); + setupPanel(new QListWidget(bulletpaneSW), qt_("Dings 4"), 5); connect(levelLW, SIGNAL(currentRowChanged(int)), this, SLOT(showLevel(int))); @@ -55,8 +62,117 @@ BulletsModule::BulletsModule(QWidget * parent) } +string const bulletIcon(int f, int c) +{ + static char const * BulletPanelIcons0[CHARMAX] = { + /* standard */ + "bfendash", "vdash", "dashv", "flat", "natural", + "sharp", "ast", "star", "bullet", "circ", "cdot", + "dagger", "bigtriangleup", "bigtriangledown", "triangleleft", + "triangleright", "lhd", "rhd", "oplus", "ominus", "otimes", + "oslash", "odot", "spadesuit", "diamond", "diamond2", "box", + "diamondsuit", "heartsuit", "clubsuit", "rightarrow", "leadsto", + "rightharpoonup", "rightharpoondown", "rightarrow2", "succ" + }; + static char const * BulletPanelIcons1[CHARMAX] = { + /* amssymb */ + "Rrightarrow", "rightarrowtail", "twoheadrightarrow", "rightsquigarrow", + "looparrowright", "multimap", "boxtimes", "boxplus", "boxminus", + "boxdot", "divideontimes", "Vvdash", "lessdot", "gtrdot", "maltese", + "bigstar", "checkmark", "vdash2", "backsim", "thicksim", + "centerdot", "circleddash", "circledast", "circledcirc", + "vartriangleleft", "vartriangleright", "vartriangle", "triangledown", + "lozenge", "square", "blacktriangleleft", "blacktriangleright", "blacktriangle", + "blacktriangledown", "blacklozenge", "blacksquare" + }; + static char const * BulletPanelIcons2[CHARMAX] = { + /* psnfss1 */ + "ding108", "ding109", "ding119", "pisymbol_psy197", + "pisymbol_psy196", "pisymbol_psy183", "ding71", "ding70", + "ding118", "ding117", "pisymbol_psy224", "pisymbol_psy215", + "ding111", "ding112", "ding113", "ding114", + "pisymbol_psy68", "pisymbol_psy209", "ding120", "ding121", + "ding122", "ding110", "ding115", "ding116", + "pisymbol_psy42", "ding67", "ding66", "ding82", + "ding81", "ding228", "ding162", "ding163", + "ding166", "ding167", "ding226", "ding227" + }; + static char const * BulletPanelIcons3[CHARMAX] = { + /* psnfss2 */ + "ding37", "ding38", "ding34", "ding36", + "ding39", "ding40", "ding41", "ding42", + "ding43", "ding44", "ding45", "ding47", + "ding53", "ding54", "ding59", "ding57", + "ding62", "ding61", "ding55", "ding56", + "ding58", "ding60", "ding63", "ding64", + "ding51", "ding52", "pisymbol_psy170", "pisymbol_psy167", + "pisymbol_psy168", "pisymbol_psy169", "ding164", "ding165", + "ding171", "ding168", "ding169", "ding170" + }; + static char const * BulletPanelIcons4[CHARMAX] = { + /* psnfss3 */ + "ding65", "ding76", "ding75", "ding72", + "ding80", "ding74", "ding78", "ding77", + "ding79", "ding85", "ding90", "ding98", + "ding83", "ding84", "ding86", "ding87", + "ding88", "ding89", "ding92", "ding91", + "ding93", "ding105", "ding94", "ding99", + "ding103", "ding104", "ding106", "ding107", + "ding68", "ding69", "ding100", "ding101", + "ding102", "ding96", "ding95", "ding97" + }; + static char const * BulletPanelIcons5[CHARMAX] = { + /* psnfss4 */ + "ding223", "ding224", "ding225", "ding232", + "ding229", "ding230", "ding238", "ding237", + "ding236", "ding235", "ding234", "ding233", + "ding239", "ding241", "ding250", "ding251", + "ding49", "ding50", "ding217", "ding245", + "ding243", "ding248", "ding252", "ding253", + "ding219", "ding213", "ding221", "ding222", + "ding220", "ding212", "pisymbol_psy174", "pisymbol_psy222", + "ding254", "ding242", "ding231", "pisymbol_psy45" + }; + + static char const ** BulletPanelIcons[FONTMAX] = { + BulletPanelIcons0, BulletPanelIcons1, + BulletPanelIcons2, BulletPanelIcons3, + BulletPanelIcons4, BulletPanelIcons5 + }; + + return BulletPanelIcons[f][c]; +} + + +QPixmap getSelectedPixmap(QPixmap pixmap, QSize const icon_size) +{ + QPalette palette = QPalette(); + QColor text_color = (guiApp->isInDarkMode()) + ? palette.color(QPalette::Active, QPalette::WindowText) + : Qt::black; + QColor highlight_color = palette.color(QPalette::Active, QPalette::HighlightedText); + QColor highlight_bg = palette.color(QPalette::Active, QPalette::Highlight); + + // create a layer with black text turned to QPalette::HighlightedText + QPixmap hl_overlay(pixmap.size()); + hl_overlay.fill(highlight_color); + hl_overlay.setMask(pixmap.createMaskFromColor(text_color, Qt::MaskOutColor)); + + // Create highlighted background + QPixmap hl_background(icon_size); + hl_background.fill(highlight_bg); + + // put layers on top of existing pixmap + QPainter painter(&pixmap); + painter.drawPixmap(pixmap.rect(), hl_background); + painter.drawPixmap(pixmap.rect(), hl_overlay); + + return pixmap; +} + + void BulletsModule::setupPanel(QListWidget * lw, QString const & panelname, - string const & fname) + int const font, string const folder) { connect(lw, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(bulletSelected(QListWidgetItem *, QListWidgetItem*))); @@ -64,33 +180,36 @@ void BulletsModule::setupPanel(QListWidget * lw, QString const & panelname, // add panelname to combox bulletpaneCO->addItem(panelname); - // get pixmap with bullets - QPixmap pixmap = getPixmap("images", toqstr(fname), ".png"); - - int const w = pixmap.width() / 6; - int const h = pixmap.height() / 6; - - // apply setting to listwidget + lw->setViewMode(QListView::IconMode); + lw->setDragDropMode(QAbstractItemView::NoDragDrop); lw->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); lw->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - lw->setViewMode(QListView::IconMode); lw->setFlow(QListView::LeftToRight); - lw->setMovement(QListView::Static); + lw->setSpacing(12); lw->setUniformItemSizes(true); - lw->setGridSize(QSize(w, h)); - // the widening by 21 is needed to avoid wrapping - lw->resize(6 * w + 21, 6 * h); - bulletpaneSW->setMinimumSize(6 * w + 5, 6 * h + 6); - // get individual bullets from pixmap - for (int row = 0; row < 6; ++row) { - for (int col = 0; col < 6; ++col) { - QPixmap small(w, h); - small.fill(); - QPainter painter(&small); - painter.drawPixmap(small.rect(), pixmap, QRect(col * w, row * h, w, h)); - new QListWidgetItem(QIcon(small), "" , lw, (6 * row + col)); - } + QSize icon_size(26, 26); + lw->setIconSize(icon_size); + + // we calculate the appropriate width to fit 6 icons in a row + lw->setFixedWidth((6 * (icon_size.width() + lw->spacing())) + + (lw->frameWidth() * 2) + + lw->verticalScrollBar()->height()); + // and six rows + lw->setFixedHeight((6 * (icon_size.height() + lw->spacing())) + + (lw->frameWidth() * 2) + + lw->horizontalScrollBar()->height()); + + for (int i = 0; i < CHARMAX; ++i) { + string const iconname = bulletIcon(font, i); + // get pixmap with bullets + QPixmap pixmap = getPixmap("images/" + toqstr(folder) + "/", toqstr(iconname), "svgz"); + QIcon icon(pixmap); + icon.addPixmap(getSelectedPixmap(pixmap, icon_size), QIcon::Selected); + QListWidgetItem * lwi = new QListWidgetItem(icon, QString()); + lwi->setToolTip(toqstr(Bullet::bulletEntry(font, i))); + lwi->setSizeHint(icon_size); + lw->addItem(lwi); } // add bulletpanel to stackedwidget diff --git a/src/frontends/qt/BulletsModule.h b/src/frontends/qt/BulletsModule.h index 036de410e3..5f05f14e23 100644 --- a/src/frontends/qt/BulletsModule.h +++ b/src/frontends/qt/BulletsModule.h @@ -50,7 +50,7 @@ protected Q_SLOTS: private: void selectItem(int font, int character, bool select); void setupPanel(QListWidget * lw, QString const & panelname, - std::string const & fname); + int const font, std::string const folder = "bullets"); /// store results Bullet bullets_[4]; diff --git a/src/frontends/qt/GuiApplication.cpp b/src/frontends/qt/GuiApplication.cpp index 306ade5457..6507700b70 100644 --- a/src/frontends/qt/GuiApplication.cpp +++ b/src/frontends/qt/GuiApplication.cpp @@ -607,7 +607,8 @@ QPixmap getPixmap(QString const & path, QString const & name, QString const & ex QPixmap pixmap = QPixmap(); if (pixmap.load(fpath)) { - if (fpath.contains("math") || fpath.contains("ipa")) + if (fpath.contains("math") || fpath.contains("ipa") + || fpath.contains("bullets")) return prepareForDarkMode(pixmap); return pixmap; } diff --git a/src/frontends/qt/ui/BulletsUi.ui b/src/frontends/qt/ui/BulletsUi.ui index 06c1ff38ae..52d6faa1b6 100644 --- a/src/frontends/qt/ui/BulletsUi.ui +++ b/src/frontends/qt/ui/BulletsUi.ui @@ -1,153 +1,29 @@ - + + BulletsUi - - + + 0 0 - 415 - 321 + 414 + 380 - - - 9 - - - 6 - - - - - - 7 - 0 - 0 - 0 - + + + + + &Level: + + + levelLW - - - - &Font: - - - bulletpaneCO - - - - - - - Si&ze: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - bulletsizeCO - - - - - - - - 7 - 0 - 0 - 0 - - - - - Default - - - - - Tiny - - - - - Smallest - - - - - Smaller - - - - - Small - - - - - Normal - - - - - Large - - - - - Larger - - - - - Largest - - - - - Huge - - - - - Huger - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - false - - - - - - - &Custom bullet: - - - - - - + + + 96 16777215 @@ -155,12 +31,36 @@ - + + + + + + &Font: + + + bulletpaneCO + + + + + + + + 0 + 0 + + + + + + + - + Qt::Horizontal - + 16 271 @@ -168,27 +68,141 @@ - - - - &Level: - - - levelLW - - + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + - - - - - 0 - 0 - 0 - 0 - + + + + + + &Custom bullet: + + + + + + + false + + + + + + + Si&ze: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + bulletsizeCO + + + + + + + + 0 + 0 + + + + + Default + + + + + Tiny + + + + + Smallest + + + + + Smaller + + + + + Small + + + + + Normal + + + + + Large + + + + + Larger + + + + + Largest + + + + + Huge + + + + + Huger + + + + + + + + + + Qt::Vertical - + + + 20 + 40 + + + @@ -201,7 +215,7 @@ bulletsizeCO - qt_i18n.h + qt_i18n.h @@ -211,11 +225,11 @@ customLE setEnabled(bool) - + 203 148 - + 319 149 @@ -227,11 +241,11 @@ label_2 setDisabled(bool) - + 203 148 - + 273 19 @@ -243,11 +257,11 @@ bulletpaneCO setDisabled(bool) - + 203 148 - + 320 52 @@ -259,11 +273,11 @@ bulletpaneSW setDisabled(bool) - + 203 148 - + 320 106