New SBE area symbol: stalagmite

Signed-off-by: Rodrigo Severo <rsev@pm.me>
therion · Dec 31, 2019 · 9bd91dc · 9bd91dc
1 parent 45a9aa1
commit 9bd91dc
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 1 deletion.
diff --git a/mpost/thTrans.mp b/mpost/thTrans.mp
@@ -198,6 +198,7 @@ let a_pillar = a_pillar_SBE;
 let a_pillarwithcurtains = a_pillarwithcurtains_SBE;
 let a_stalactite = a_stalactite_SBE;
 let a_stalactitestalagmite = a_stalactitestalagmite_SBE;
+let a_stalagmite = a_stalagmite_SBE;
 
 let s_northarrow = s_northarrow_SKBB;
 let s_scalebar = s_scalebar_SKBB;

diff --git a/mpost/uSBE.mp b/mpost/uSBE.mp
@@ -1304,3 +1304,11 @@ def a_stalactitestalagmite_SBE(expr P) =
 		draw SBE_PicDraw;
 	endgroup;
 enddef;
+
+
+def a_stalagmite_SBE(expr P) =
+	T := identity;
+
+	pickup PenA;
+	thfill P withcolor (1, 0.6, 0);
+enddef;
diff --git a/tharea.cxx b/tharea.cxx
@@ -220,6 +220,7 @@ bool tharea::export_mp(class thexpmapmpxs * out)
     tharea_type_export_mp(TT_AREA_TYPE_PILLARWITHCURTAINS, SYMA_PILLARWITHCURTAINS)
     tharea_type_export_mp(TT_AREA_TYPE_STALACTITE, SYMA_STALACTITE)
     tharea_type_export_mp(TT_AREA_TYPE_STALACTITESTALAGMITE, SYMA_STALACTITESTALAGMITE)
+    tharea_type_export_mp(TT_AREA_TYPE_STALAGMITE, SYMA_STALAGMITE)
   }
   omacroid = macroid;
   if (this->context >= 0)

diff --git a/tharea.h b/tharea.h
@@ -77,6 +77,7 @@ enum {
   TT_AREA_TYPE_PILLARWITHCURTAINS,
   TT_AREA_TYPE_STALACTITE,
   TT_AREA_TYPE_STALACTITESTALAGMITE,
+  TT_AREA_TYPE_STALAGMITE,
 };
 
 
@@ -101,6 +102,7 @@ static const thstok thtt_area_types[] = {
   {"snow", TT_AREA_TYPE_SNOW},
   {"stalactite", TT_AREA_TYPE_STALACTITE},
   {"stalactite-stalagmite", TT_AREA_TYPE_STALACTITESTALAGMITE},
+  {"stalagmite", TT_AREA_TYPE_STALAGMITE},
   {"sump", TT_AREA_TYPE_SUMP},
   {"u",TT_AREA_TYPE_U},
   {"water", TT_AREA_TYPE_WATER},

diff --git a/thbook/ch02.tex b/thbook/ch02.tex
@@ -1153,7 +1153,8 @@
     |pillar|,
     |pillar-with-curtains|,
     |stalactite|,
-    |stalactite-stalagmite|.
+    |stalactite-stalagmite|,
+    |stalagmite|.
 \endarguments
 
 \comopt

diff --git a/thlang/texts.txt b/thlang/texts.txt
@@ -3703,3 +3703,22 @@ zh_CN: 石钟乳
 therion: area stalactite-stalagmite
 en: stalactite-stalagmite
 pt: estalactite-estalagmite
+
+therion: area stalagmite
+bg: сталагмит
+ca: estalagmita
+cz: stalagmit
+de: Stalagmit
+el: σταλαγμίτης
+en: stalagmite
+es: estalagmita
+fr: stalagmite
+it: stalagmite
+mi: kōhatu ki te haere ki raro
+pl: stalagmit
+pt: estalagmite
+ru: сталагмит
+sk: stalagmit
+sl: stalagmit
+sq: stalagmit
+zh_CN: 石笋
diff --git a/thsymbolset.cxx b/thsymbolset.cxx
@@ -261,6 +261,7 @@ int thsymbolset__get_id(const char * symclass, const char * symbol)
         c2(TT_AREA_TYPE_PILLARWITHCURTAINS, SYMA_PILLARWITHCURTAINS);
         c2(TT_AREA_TYPE_STALACTITE, SYMA_STALACTITE);
         c2(TT_AREA_TYPE_STALACTITESTALAGMITE, SYMA_STALACTITESTALAGMITE);
+        c2(TT_AREA_TYPE_STALAGMITE, SYMA_STALAGMITE);
       }
       break;
     case TT_SYMBOL_LINE:
@@ -730,6 +731,7 @@ int thsymbolset__get_group(int group_id, int cid) {
     group(40,SYMA_PILLARWITHCURTAINS);
     group(41,SYMA_STALACTITE);
     group(42,SYMA_STALACTITESTALAGMITE);
+    group(43,SYMA_STALAGMITE);
     egroup
 
 
@@ -1295,6 +1297,7 @@ void thsymbolset::export_pdf(class thlayout * layout, FILE * mpf, unsigned & sfi
   legend_area(SYMA_PILLARWITHCURTAINS,thT("area pillar-with-curtains",layout->lang));
   legend_area(SYMA_STALACTITE,thT("area stalactite",layout->lang));
   legend_area(SYMA_STALACTITESTALAGMITE,thT("area stalactite-stalagmite",layout->lang));
+  legend_area(SYMA_STALAGMITE,thT("area stalagmite",layout->lang));
   legend_nocliparea(SYMA_BLOCKS,thT("area blocks",layout->lang));
   legend_nocliparea(SYMA_BEDROCK,thT("area bedrock",layout->lang));