Web style improvements.

Author: kpeeters

core/Algorithm.cc

@@ -777,17 +777,12 @@ Algorithm::range_vector_t::iterator Algorithm::find_arg_superset(range_vector_t&
 
 bool Algorithm::is_termlike(iterator it)
 	{
-	if(tr.is_head(it)) {
-		if(*it->name!="\\sum" && *it->name!="\\equals") return true;
-		return false;
-		}
-	else {
-		if(*tr.parent(it)->name=="\\sum" )
-			return true;
-		else if(*tr.parent(it)->name=="\\equals")
-			return true;
-		return false;
-		}
+	if(!is_factorlike(it))
+		if(*it->name!="\\sum")
+			if(it->fl.parent_rel==str_node::p_none)
+				return true;
+
+	return false;
 	}
 
 bool Algorithm::is_factorlike(iterator it)

core/Algorithm.hh

@@ -167,8 +167,14 @@ class Algorithm : public IndexClassifier {
 		static bool  compare_(const str_node&, const str_node&);
 
 
-		/// Determine structure (version-2)
+		/// Determines whether the indicated node is 'like a term in a
+		/// sum'.  This requires that the node is not a `\sum` node, not
+		/// a child of a `\prod` node, and that its parent rel is of
+		/// argument-type (p_none).
 		bool     is_termlike(iterator);
+
+		/// Determines whether the indicated node is 'like a factor in a product'.
+		/// This requires that the parent is a `\prod' node. 
 		bool     is_factorlike(iterator);
 
 		/// Take a single non-product node in a sum and wrap it in a 

core/algorithms/explicit_indices.cc

@@ -4,6 +4,7 @@
 #include "algorithms/substitute.hh"
 #include "properties/ImplicitIndex.hh"
 #include "properties/PartialDerivative.hh"
+#include "properties/Trace.hh"
 
 using namespace cadabra;
 
@@ -21,6 +22,8 @@ bool explicit_indices::can_apply(iterator st)
 	// same index names.
 
 	if(*st->name=="\\equals") return false; // switch
+	auto trace = kernel.properties.get<Trace>(st);
+	if(trace)   return false;
 	if(*st->name=="\\sum")    return true;
 	if(is_termlike(st)) {
 		if(tr.is_head(st)) return         true;
@@ -35,6 +38,8 @@ Algorithm::result_t explicit_indices::apply(iterator& it)
 	{
 	result_t res=result_t::l_no_action;
 
+	std::cerr << "apply at " << it << std::endl;
+	
 	// Ensure that we are always working on a sum, even
 	// if there is only one term.
 	if(is_termlike(it)) 
@@ -48,6 +53,9 @@ Algorithm::result_t explicit_indices::apply(iterator& it)
 
 	sibling_iterator term=tr.begin(it);
 	while(term!=tr.end(it)) {
+		iterator nxt=term;
+		++nxt;
+		
 		iterator tmp=term;
 		prod_wrap_single_term(tmp);
 		term=tmp;
@@ -77,8 +85,10 @@ Algorithm::result_t explicit_indices::apply(iterator& it)
 			}
 
 		tmp=term;
+		std::cerr << term << std::endl;
 		prod_unwrap_single_term(tmp);
-		++term;
+
+		term=nxt;
 		}
 
 	return res;

tests/explicit_implicit.cdb

@@ -50,7 +50,22 @@ def test03():
     print("Test 03 passed")
 
 test03()
-        
+
+# def test04():
+#     __cdbkernel__=create_scope()
+# {m,n,p}::Indices(spacetime, position=fixed);
+# {a,b,c,d,e,f,g,h}::Indices(spinor, position=fixed);
+# \sigma^{p}::ImplicitIndex(\sigma^{p}_{a b});
+# \tau^{p}::ImplicitIndex(\tau^{p a b});        
+# Tr{#}::Trace(indices=spinor);
+# ex:= Tr( \sigma^{m} \tau^{n} );
+# explicit_indices(_);
+#     tst:= \sigma^{m}_{a b} \tau^{n b a} - @(ex);
+#     assert(tst==0)
+#     print("Test 04 passed")
+#         
+# test04()
+
 #ex:= \chi \psi \sigma^{n} \chi;
 #explicit_indices(_);
 

web2/cadabra2/source/static/styles/cadabra-web.css

@@ -294,7 +294,9 @@ div.latex_view {
 }
 div.MathJax_Display {
     text-align: left !important;	 
-	 margin-bottom: 0px !important;
+	 margin-bottom: 5px !important;
+	 margin-top: 5px !important;
+	 margin-left: 30px;
 	 padding-bottom: 0px !important;
 }
 .mjx-chtml {
@@ -317,7 +319,7 @@ div.python > div.source {
 	 margin-bottom: 10px; 
 	 padding-bottom: 0px;
 	 margin-top: 10px;
-	 white-space: pre; 
+	 white-space: pre-wrap; 
 	 line-height: 20px;
 	 color: blue; 
 	 margin-left: 0px;