[Libreoffice-commits] core.git: starmath/inc starmath/source
dante (via logerrit)
logerrit at kemper.freedesktop.org
Mon Mar 15 06:30:41 UTC 2021
starmath/inc/node.hxx | 16 -------
starmath/inc/nodetype.hxx | 97 ++++++++++++++++++++++++++++++++++++++++++++++
starmath/source/node.cxx | 14 ------
3 files changed, 98 insertions(+), 29 deletions(-)
New commits:
commit 50ef3d86ee8567bd5c84ff9aacc966675fe401cc
Author: dante <dante19031999 at gmail.com>
AuthorDate: Tue Mar 9 19:23:35 2021 +0100
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Mar 15 07:30:00 2021 +0100
Provide node type with more analysis capabilities
Change-Id: I3b3b866a9fdf0b5d0b9f40c0ce9bddbaf2c0b1ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112235
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 8d21a63dd508..acbedccc7c2a 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -65,6 +65,7 @@
#include "token.hxx"
#include "rect.hxx"
#include "format.hxx"
+#include "nodetype.hxx"
enum class FontAttribute {
None = 0x0000,
@@ -117,21 +118,6 @@ enum class SmScaleMode
Height
};
-enum class SmNodeType
-{
-/* 0*/ Table, Brace, Bracebody, Oper, Align,
-/* 5*/ Attribute, Font, UnHor, BinHor, BinVer,
-/*10*/ BinDiagonal, SubSup, Matrix, Place, Text,
-/*15*/ Special, GlyphSpecial, Math, Blank, Error,
-/*20*/ Line, Expression, PolyLine, Root, RootSymbol,
-/*25*/ Rectangle, VerticalBrace, MathIdent
-};
-
-namespace starmathdatabase
-{
-bool isStructuralNode(SmNodeType ntype);
-}
-
class SmNode : public SmRect
{
diff --git a/starmath/inc/nodetype.hxx b/starmath/inc/nodetype.hxx
new file mode 100644
index 000000000000..f59e02895d4f
--- /dev/null
+++ b/starmath/inc/nodetype.hxx
@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+/**
+ * This file provides definition for the nodetypes.
+ * Also provides analysis of the node functions
+ */
+
+enum class SmNodeType : int_fast16_t
+{
+ Table, // tree header
+ Brace, // () [] {}
+ Bracebody, // content of () [] {}
+ Oper, // largeop
+ Align, // alignment
+ Attribute, // attributes
+ Font, // fonts
+ UnHor, // unmo
+ BinHor, // binmo
+ BinVer, // over frac
+ BinDiagonal, // slash
+ SubSup, // lsub lsup rsub rsup csub csup
+ Matrix, // binom matrix
+ Place, // <?>
+ Text, // "text"
+ Special, // %glyph
+ GlyphSpecial, // %glyph
+ Math, // operator value
+ Blank, // ~
+ Error, // Syntax error
+ Line, // a line of math untill newline
+ Expression, // { content in here }
+ PolyLine, // ^
+ Root, // root node
+ RootSymbol, // 3 of cubic root
+ Rectangle, //just structual
+ VerticalBrace, // vertical {}
+ MathIdent // identities and variables
+};
+
+namespace starmathdatabase
+{
+inline bool isStructuralNode(SmNodeType aNodeTypeName)
+{
+ return aNodeTypeName == SmNodeType::Table || aNodeTypeName == SmNodeType::Line
+ || aNodeTypeName == SmNodeType::UnHor || aNodeTypeName == SmNodeType::BinHor
+ || aNodeTypeName == SmNodeType::BinVer || aNodeTypeName == SmNodeType::BinDiagonal
+ || aNodeTypeName == SmNodeType::SubSup || aNodeTypeName == SmNodeType::Matrix
+ || aNodeTypeName == SmNodeType::Root || aNodeTypeName == SmNodeType::Expression
+ || aNodeTypeName == SmNodeType::Brace || aNodeTypeName == SmNodeType::Bracebody
+ || aNodeTypeName == SmNodeType::Oper || aNodeTypeName == SmNodeType::Align
+ || aNodeTypeName == SmNodeType::Attribute || aNodeTypeName == SmNodeType::Font;
+}
+
+inline bool isBinOperatorNode(SmNodeType aNodeTypeName)
+{
+ return aNodeTypeName == SmNodeType::BinHor || aNodeTypeName == SmNodeType::BinVer
+ || aNodeTypeName == SmNodeType::BinDiagonal || aNodeTypeName == SmNodeType::SubSup;
+}
+
+inline bool isUnOperatorNode(SmNodeType aNodeTypeName)
+{
+ return aNodeTypeName == SmNodeType::UnHor;
+}
+
+inline bool isOperatorNode(SmNodeType aNodeTypeName)
+{
+ return aNodeTypeName == SmNodeType::BinHor || aNodeTypeName == SmNodeType::BinVer
+ || aNodeTypeName == SmNodeType::BinDiagonal || aNodeTypeName == SmNodeType::SubSup
+ || aNodeTypeName == SmNodeType::UnHor || aNodeTypeName == SmNodeType::Oper;
+}
+
+inline bool isStandaloneNode(SmNodeType aNodeTypeName)
+{
+ return aNodeTypeName == SmNodeType::Text || aNodeTypeName == SmNodeType::Special
+ || aNodeTypeName == SmNodeType::GlyphSpecial || aNodeTypeName == SmNodeType::Math
+ || aNodeTypeName == SmNodeType::Blank || aNodeTypeName == SmNodeType::MathIdent;
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 3687e74e0d35..922786adf9fd 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -26,20 +26,6 @@
#include <vcl/metric.hxx>
#include <osl/diagnose.h>
-bool starmathdatabase::isStructuralNode(SmNodeType ntype)
-{
-// clang-format off
-return ntype==SmNodeType::Table || ntype==SmNodeType::Line || ntype==SmNodeType::UnHor
- || ntype==SmNodeType::BinHor || ntype==SmNodeType::BinVer
- || ntype==SmNodeType::BinDiagonal || ntype==SmNodeType::SubSup
- || ntype==SmNodeType::Matrix || ntype==SmNodeType::Root
- || ntype==SmNodeType::Expression || ntype==SmNodeType::Brace
- || ntype==SmNodeType::Bracebody || ntype==SmNodeType::Oper
- || ntype==SmNodeType::Align || ntype==SmNodeType::Attribute
- || ntype==SmNodeType::Font;
-// clang-format on
-}
-
namespace {
template<typename F>
More information about the Libreoffice-commits
mailing list