Merge branch 'master' of github.com:wxMaxima-developers/wxmaxima

Author: daute

ChangeLog

@@ -1,4 +1,4 @@
-Current:
+19.12.0:
   * wxMaxima now uses C++11 that makes the code more readable and helps
 	finding bugs
   * If found wxMaxima now asks cppcheck to find bugs
@@ -7,6 +7,7 @@ Current:
   * For Cmake>=3.10.0 the build system now asks cppcheck to find bugs.
   * Changing the worksheet style was partially broken.
   * A big number of additional bug fixes in various places
+  * A config option that forces displaying all multiplication signs.
 
 19.11.1:
   * Improved italian translation by Marco Ciampa

data/io.github.wxmaxima_developers.wxMaxima.appdata.xml

@@ -64,6 +64,7 @@
 	  <li>Opening the config dialogue since 19.11.0 unchecked "offer known answers"</li>
 	  <li>Changing the worksheet style was partially broken</li>
 	  <li>A big number of additional small bug fixes in various places</li>
+	  <li>A config option that forces displaying all multiplication signs</li>
         </ul>
     </description>
     </release>

src/Cell.cpp

@@ -60,6 +60,7 @@ Cell::Cell(Cell *group, Configuration **config, CellPointers *cellPointers)
    m_configuration(config),
    m_cellPointers(cellPointers)
 {
+  m_isHidableMultSign = false;
   m_lastZoomFactor = -1;
   m_clientWidth_old = -1;
   m_next = NULL;
@@ -168,6 +169,8 @@ void Cell::CopyCommonData(const Cell & cell)
   m_forceBreakLine = cell.m_forceBreakLine;
   m_type = cell.m_type;
   m_textStyle = cell.m_textStyle;
+  m_isHidden = cell.m_isHidden;
+  m_isHidableMultSign = cell.m_isHidableMultSign;
 }
 
 Cell *Cell::CopyList()

src/Cell.h

@@ -822,11 +822,13 @@ class Cell
     Currently the following items fall into this category:
      - parenthesis around fractions or similar things that clearly can be recognized as atoms
      - plus signs within numbers
-     - most multiplication dots.
      - The output in folded GroupCells
    */
   bool m_isHidden;
 
+  //! True means: This is a hidable multiplication sign
+  bool m_isHidableMultSign;
+
   /*! Determine if this cell contains text that isn't code
 
     \return true, if this is a text cell, a title cell, a section, a subsection or a sub(n)section cell.

src/ConfigDialogue.cpp

@@ -374,6 +374,7 @@ void ConfigDialogue::SetProperties()
   m_getFont->SetToolTip(_("Font used for display in document."));
   m_getMathFont->SetToolTip(_("Font used for displaying math characters in document."));
   m_changeAsterisk->SetToolTip(_("Use centered dot and Minus, not Star and Hyphen"));
+  m_hidemultiplicationSign->SetToolTip(_("Hide all multiplication signs that aren't really necessary for understanding the equation"));
   m_latin2Greek->SetToolTip(_("Change the text \"alpha\" and \"beta\" to the corresponding greek letter?"));
   m_defaultPort->SetToolTip(_("The default port used for communication between Maxima and wxMaxima."));
   m_undoLimit->SetToolTip(
@@ -480,6 +481,7 @@ void ConfigDialogue::SetProperties()
   m_showLength->SetSelection(configuration->ShowLength());
   m_autosubscript->SetSelection(configuration->GetAutosubscript_Num());
   m_changeAsterisk->SetValue(configuration->GetChangeAsterisk());
+  m_hidemultiplicationSign->SetValue(configuration->HidemultiplicationSign());
   m_latin2Greek->SetValue(configuration->Latin2Greek());
   m_enterEvaluates->SetValue(configuration->EnterEvaluates());
   m_saveUntitled->SetValue(saveUntitled);
@@ -531,7 +533,7 @@ wxPanel *ConfigDialogue::CreateWorksheetPanel()
   wxPanel *panel = new wxPanel(m_notebook, -1);
 
   wxFlexGridSizer *grid_sizer = new wxFlexGridSizer(10, 2, 5, 5);
-  wxFlexGridSizer *vsizer = new wxFlexGridSizer(31, 1, 5, 5);
+  wxFlexGridSizer *vsizer = new wxFlexGridSizer(32, 1, 5, 5);
 
   wxStaticText *pw = new wxStaticText(panel, -1, _("Default plot size for new maxima sessions:"));
   wxBoxSizer *PlotWidthHbox = new wxBoxSizer(wxHORIZONTAL);
@@ -618,6 +620,9 @@ wxPanel *ConfigDialogue::CreateWorksheetPanel()
   m_changeAsterisk = new wxCheckBox(panel, -1, _("Use centered dot character for multiplication"));
   vsizer->Add(m_changeAsterisk, 0, wxALL, 5);
 
+  m_hidemultiplicationSign = new wxCheckBox(panel, -1, _("Hide multiplication signs, if possible"));
+  vsizer->Add(m_hidemultiplicationSign, 0, wxALL, 5);
+
   m_latin2Greek = new wxCheckBox(panel, -1, _("Change names of greek letters to greek letters"));
   vsizer->Add(m_latin2Greek, 0, wxALL, 5);
 
@@ -1186,6 +1191,7 @@ void ConfigDialogue::WriteSettings()
   config->Write(wxT("fixedFontTC"), m_fixedFontInTC->GetValue());
   configuration->OfferKnownAnswers(m_offerKnownAnswers->GetValue());
   configuration->SetChangeAsterisk(m_changeAsterisk->GetValue());
+  configuration->HidemultiplicationSign(m_hidemultiplicationSign->GetValue());
   configuration->Latin2Greek(m_latin2Greek->GetValue());
   configuration->EnterEvaluates(m_enterEvaluates->GetValue());
   config->Write(wxT("saveUntitled"), m_saveUntitled->GetValue());

src/ConfigDialogue.h

@@ -312,6 +312,7 @@ class ConfigDialogue : public wxPropertySheetDialog
   wxCheckBox *m_fixedFontInTC;
   wxCheckBox *m_unixCopy;
   wxCheckBox *m_changeAsterisk;
+  wxCheckBox *m_hidemultiplicationSign;
   wxCheckBox *m_latin2Greek;
   wxCheckBox *m_useJSMath;
   wxCheckBox *m_useUnicodeMaths;

src/Configuration.cpp

@@ -43,6 +43,7 @@ Configuration::Configuration(wxDC *dc) :
   m_BackgroundBrush(*wxWHITE_BRUSH)
 
 {
+  m_hidemultiplicationsign = true;
   m_autoSaveAsTempFile = false;
   m_inLispMode = false;
   m_htmlEquationFormat = mathJaX_TeX;
@@ -360,6 +361,7 @@ void Configuration::ReadConfig()
   config->Read(wxT("documentclassoptions"), &m_documentclassOptions);
   config->Read(wxT("latin2greek"), &m_latin2greek);
   config->Read(wxT("enterEvaluates"), &m_enterEvaluates);
+  config->Read(wxT("hidemultiplicationsign"), &m_hidemultiplicationsign);
 
   {
     int tmp;

src/Configuration.h

@@ -511,19 +511,29 @@ class Configuration
     redrawn.
   */
   bool GetPrinting() const
-  { return m_printing; }
-
+    { return m_printing; }
+  
   bool GetMatchParens() const
-  { return m_matchParens; }
+    { return m_matchParens; }
 
   bool GetChangeAsterisk() const
-  { return m_changeAsterisk; }
-
+    { return m_changeAsterisk; }
+  
   void SetChangeAsterisk(bool changeAsterisk)
-  {
-    wxConfig::Get()->Write(wxT("changeAsterisk"), m_changeAsterisk = changeAsterisk);
-  }
+    {
+      wxConfig::Get()->Write(wxT("changeAsterisk"), m_changeAsterisk = changeAsterisk);
+    }
+  
+  bool HidemultiplicationSign() const
+    {
+      return m_hidemultiplicationsign;
+    }
 
+  void HidemultiplicationSign(bool show)
+    {
+      wxConfig::Get()->Write(wxT("hidemultiplicationsign"), m_hidemultiplicationsign = show);
+    }
+  
   bool Latin2Greek() const
     {return m_latin2greek;}
 
@@ -910,6 +920,7 @@ class Configuration
   bool m_useUnicodeMaths;
   bool m_indentMaths;
   bool m_abortOnError;
+  bool m_hidemultiplicationsign;
   bool m_offerKnownAnswers;
   int m_defaultPort;
   wxString m_documentclass;

src/MathParser.cpp

@@ -771,7 +771,7 @@ Cell *MathParser::ParseTag(wxXmlNode *node, bool all)
       else if (tagName == wxT("h"))
       {          // Hidden cells (*)
         tmp = ParseText(node->GetChildren());
-        tmp->m_isHidden = true;
+        tmp->m_isHidableMultSign = true;
       }
       else if (tagName == wxT("p"))
       {          // Parenthesis

src/TextCell.cpp

@@ -345,7 +345,6 @@ TextCell::TextCell(const TextCell &cell):
   CopyCommonData(cell);
   m_forceBreakLine = cell.m_forceBreakLine;
   m_bigSkip = cell.m_bigSkip;
-  m_isHidden = cell.m_isHidden;
   m_lastZoomFactor = -1;
   m_fontSizeLabel = -1;
   m_displayedDigits_old = -1;
@@ -487,7 +486,7 @@ void TextCell::RecalculateWidths(int fontsize)
     m_height = m_height + 2 * MC_TEXT_PADDING;
 
     /// Hidden cells (multiplication * is not displayed)
-    if (m_isHidden)
+    if ((m_isHidden) || ((configuration->HidemultiplicationSign()) && m_isHidableMultSign))
     {
       m_height = 0;
       m_width = m_width / 4;
@@ -501,10 +500,10 @@ void TextCell::RecalculateWidths(int fontsize)
 void TextCell::Draw(wxPoint point)
 {
   Cell::Draw(point);
-  if (DrawThisCell(point) && !m_isHidden)
+  Configuration *configuration = (*m_configuration);
+  if (DrawThisCell(point) &&
+      !(m_isHidden || ((configuration->HidemultiplicationSign()) && m_isHidableMultSign)))
   {
-    
-    Configuration *configuration = (*m_configuration);
     wxDC *dc = configuration->GetDC();
 
     if (m_width == -1 || m_height == -1 || m_fontSize != m_lastCalculationFontSize)
@@ -1004,9 +1003,8 @@ wxString TextCell::ToTeX()
   text.Replace(wxT("\x2192"), mathModeStart + wxT("\\rightarrow") + mathModeEnd);
   text.Replace(wxT("\x2794"), mathModeStart + wxT("\\longrightarrow") + mathModeEnd);
 
-  // m_IsHidden is set for multiplication signs and parenthesis that
-  // don't need to be shown
-  if (m_isHidden)
+  // m_IsHidden is set for parenthesis that don't need to be shown
+  if (m_isHidden || (((*m_configuration)->HidemultiplicationSign()) && m_isHidableMultSign))
   {
     // Normally in TeX the spacing between variable names following each other directly
     // is chosen to show that this is a multiplication.
@@ -1265,7 +1263,7 @@ wxString TextCell::ToMathML()
     text = XMLescape(wxT("(") + m_userDefinedLabel + wxT(")"));
 
   // If we didn't display a multiplication dot we want to do the same in MathML.
-  if (m_isHidden)
+  if (m_isHidden || (((*m_configuration)->HidemultiplicationSign()) && m_isHidableMultSign))
   {
     text.Replace(wxT("*"), wxT("⁢"));
     text.Replace(wxT("\xB7"), wxT("⁢"));
@@ -1354,7 +1352,7 @@ wxString TextCell::ToOMML()
   wxString text = XMLescape(m_displayedText);
 
   // If we didn't display a multiplication dot we want to do the same in MathML.
-  if (m_isHidden)
+  if (m_isHidden || (((*m_configuration)->HidemultiplicationSign()) && m_isHidableMultSign))
   {
     text.Replace(wxT("*"), wxT("⁢"));
     text.Replace(wxT("\xB7"), wxT("⁢"));
@@ -1440,7 +1438,8 @@ wxString TextCell::ToXML()
 {
   wxString tag;
   wxString flags;
-  if (m_isHidden)tag = _T("h");
+  if (m_isHidden || (m_isHidableMultSign))
+    tag = _T("h");
   else
     switch (GetStyle())
     {