From 787fa467df06f95091b7bb27d42fc7be0d9b594e Mon Sep 17 00:00:00 2001
From: vdhoeven <vdhoeven@64cb5145-927a-446d-8aed-2fb7b4773692>
Date: Sat, 11 Jul 2009 13:28:06 +0000
Subject: [PATCH] Improvements for Mathemagix

git-svn-id: svn://svn.savannah.gnu.org/texmacs/trunk@2745 64cb5145-927a-446d-8aed-2fb7b4773692
---
 src/TeXmacs/packages/documentation/tmdoc-markup.ts | 25 +++++++++++-----
 src/TeXmacs/packages/standard/std-fold.ts          | 33 ++++++++++++++++++----
 src/TeXmacs/progs/dynamic/dynamic-drd.scm          |  1 +
 .../mathemagix/packages/session/mathemagix.ts      |  2 +-
 4 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/src/TeXmacs/packages/documentation/tmdoc-markup.ts b/src/TeXmacs/packages/documentation/tmdoc-markup.ts
index 9815b925..f04fb16e 100644
--- a/src/TeXmacs/packages/documentation/tmdoc-markup.ts
+++ b/src/TeXmacs/packages/documentation/tmdoc-markup.ts
@@ -1,4 +1,4 @@
-<TeXmacs|1.0.6.14>
+<TeXmacs|1.0.7.2>
 
 <style|source>
 
@@ -13,11 +13,10 @@
     <src-copyright|2001--2004|Joris van der Hoeven>
 
     <\src-license>
-      This software falls under the <hlink|GNU general public
-      license, version 3 or later|$TEXMACS_PATH/LICENSE>.
-      It comes WITHOUT ANY WARRANTY WHATSOEVER.
-      You should have received a copy of the license which the software.
-      If not, see <hlink|http://www.gnu.org/licenses/gpl-3.0.html|http://www.gnu.org/licenses/gpl-3.0.html>.
+      This software falls under the <hlink|GNU general public license,
+      version 3 or later|$TEXMACS_PATH/LICENSE>. It comes WITHOUT ANY
+      WARRANTY WHATSOEVER. You should have received a copy of the license
+      which the software. If not, see <hlink|http://www.gnu.org/licenses/gpl-3.0.html|http://www.gnu.org/licenses/gpl-3.0.html>.
     </src-license>
   </src-title>>
 
@@ -57,14 +56,22 @@
     </src-comment>
   </active*>
 
-  <assign|explain|<\macro|what|body>
+  <assign|explain-header|<\macro|what>
     <\with|par-first|0fn|par-par-sep|0fn>
       <surround|<vspace*|0.5fn>|<no-page-break>|<arg|what>>
     </with>
+  </macro>>
 
+  <assign|explain-body|<\macro|body>
     <surround||<right-flush><vspace|0.5fn><no-indent*>|<with|par-left|<plus|<value|par-left>|1.5fn>|<arg|body>>>
   </macro>>
 
+  <assign|explain|<\macro|what|body>
+    <explain-header|<arg|what>>
+
+    <explain-body|<arg|body>>
+  </macro>>
+
   <assign|explain-macro-sub|<macro|x|pos|<if|<equal|<arg|pos>|0>|<indexed|<src-macro|<arg|x>>>|<src-arg|<arg|x>>>>>
 
   <assign|explain-macro|<xmacro|args|<map-args|explain-macro-sub|inline-tag|args>>>
@@ -199,6 +206,10 @@
     <quote-env|<framed-fragment|<with|par-par-sep|0fn|<mmx|<arg|x>>>>>
   </macro>>
 
+  <assign|mmx-fragment*|<\macro|x>
+    <framed-fragment|<with|par-par-sep|0fn|<mmx|<arg|x>>>>
+  </macro>>
+
   <\active*>
     <\src-comment>
       Tabular environments.
diff --git a/src/TeXmacs/packages/standard/std-fold.ts b/src/TeXmacs/packages/standard/std-fold.ts
index 4700a4f0..72871d54 100644
--- a/src/TeXmacs/packages/standard/std-fold.ts
+++ b/src/TeXmacs/packages/standard/std-fold.ts
@@ -1,4 +1,4 @@
-<TeXmacs|1.0.6.9>
+<TeXmacs|1.0.7.2>
 
 <style|<tuple|source|std>>
 
@@ -13,11 +13,10 @@
     <src-copyright|1998--2005|Joris van der Hoeven>
 
     <\src-license>
-      This software falls under the <hlink|GNU general public
-      license, version 3 or later|$TEXMACS_PATH/LICENSE>.
-      It comes WITHOUT ANY WARRANTY WHATSOEVER.
-      You should have received a copy of the license which the software.
-      If not, see <hlink|http://www.gnu.org/licenses/gpl-3.0.html|http://www.gnu.org/licenses/gpl-3.0.html>.
+      This software falls under the <hlink|GNU general public license,
+      version 3 or later|$TEXMACS_PATH/LICENSE>. It comes WITHOUT ANY
+      WARRANTY WHATSOEVER. You should have received a copy of the license
+      which the software. If not, see <hlink|http://www.gnu.org/licenses/gpl-3.0.html|http://www.gnu.org/licenses/gpl-3.0.html>.
     </src-license>
   </src-title>>
 
@@ -49,6 +48,14 @@
     </surround>
   </macro>>
 
+  <assign|render-folded-explain|<\macro|tit|body>
+    <\surround|<no-indent><vspace*|0.5fn>|<vspace|0.5fn><right-flush>>
+      <with|font-series|bold|<arg|tit>><vspace|0.5fn>
+
+      <arg|body>
+    </surround>
+  </macro>>
+
   <assign|render-folded-grouped|<\macro|button|body>
     <\with|old-color|<value|color>|color|blue>
       <tabular|<tformat|<twith|table-width|1par>|<twith|table-hmode|exact>|<cwith|1|1|2|2|cell-hpart|1>|<cwith|1|1|1|1|cell-lsep|0ln>|<cwith|1|1|1|1|cell-rsep|0ln>|<cwith|1|1|1|1|cell-bsep|0ln>|<cwith|1|1|1|1|cell-tsep|0ln>|<cwith|1|1|1|1|cell-width|20ln>|<cwith|1|1|1|1|cell-hmode|exact>|<cwith|1|1|2|2|cell-hyphen|t>|<table|<row|<cell|<subtable|<tformat|<cwith|1|-1|1|-1|cell-background|pastel
@@ -114,6 +121,18 @@
     </render-folded-env>
   </macro>>
 
+  <assign|folded-explain|<\macro|x|y>
+    <\render-folded-explain|<with|color*|<value|color>|<action|<with|color|<value|color*>|<arg|x>>|(mouse-unfold)|<arg|x>>>>
+      <hidden|<arg|y>>
+    </render-folded-explain>
+  </macro>>
+
+  <assign|unfolded-explain|<\macro|x|y>
+    <\render-folded-explain|<with|color*|<value|color>|<action|<with|color|<value|color*>|<arg|x>>|(mouse-fold)|<arg|x>>>>
+      <arg|y>
+    </render-folded-explain>
+  </macro>>
+
   <assign|folded-grouped|<\macro|x|y>
     <\render-folded-grouped|<action| |(mouse-unfold)|<arg|x>>>
       <arg|x>
@@ -142,6 +161,8 @@
 
   <drd-props|folded-env|arity|2|accessible|0|hidden|1>
 
+  <drd-props|folded-explain|arity|2|accessible|0|hidden|1>
+
   <drd-props|folded-grouped|arity|2|accessible|0|hidden|1>
 
   <drd-props|folded|arity|2|accessible|0|hidden|1>
diff --git a/src/TeXmacs/progs/dynamic/dynamic-drd.scm b/src/TeXmacs/progs/dynamic/dynamic-drd.scm
index 375a60bf..72cee77b 100644
--- a/src/TeXmacs/progs/dynamic/dynamic-drd.scm
+++ b/src/TeXmacs/progs/dynamic/dynamic-drd.scm
@@ -33,6 +33,7 @@
 (define-fold folded unfolded)
 (define-fold folded-plain unfolded-plain)
 (define-fold folded-std unfolded-std)
+(define-fold folded-explain unfolded-explain)
 (define-fold folded-env unfolded-env)
 (define-fold folded-grouped unfolded-grouped)
 
diff --git a/src/plugins/mathemagix/packages/session/mathemagix.ts b/src/plugins/mathemagix/packages/session/mathemagix.ts
index faa69c3d..2a6fc0a7 100644
--- a/src/plugins/mathemagix/packages/session/mathemagix.ts
+++ b/src/plugins/mathemagix/packages/session/mathemagix.ts
@@ -20,7 +20,7 @@
     </src-license>
   </src-title>>
 
-  <use-package|tmdoc>
+  <use-package|tmdoc-markup>
 
   <\active*>
     <\src-comment>
-- 
2.11.4.GIT