'Musical symbols scale' option

XiaoMigros · XiaoMigros · commit 2eceb22634a0 · 2024-01-24T20:42:28.000+01:00
diff --git a/src/engraving/dom/mscore.h b/src/engraving/dom/mscore.h
@@ -73,8 +73,8 @@ static constexpr double SPATIUM20 = 5.0 * (DPI / 72.0);
 static constexpr double DPMM      = DPI / INCH;
 
 // NOTE: the Smufl default is actually 20pt. We use 10 for historical reasons
-// and back-compatibility, but this will be multiplied x2 during dynamic layout.
-static constexpr double DYNAMICS_DEFAULT_FONT_SIZE = 10.0;
+// and back-compatibility, but this will be multiplied x2 during layout.
+static constexpr double MUSICAL_SYMBOLS_DEFAULT_FONT_SIZE = 10.0;
 
 static constexpr int MAX_STAVES = 4;
 
diff --git a/src/engraving/dom/ottava.cpp b/src/engraving/dom/ottava.cpp
@@ -67,6 +67,7 @@ OttavaSegment::OttavaSegment(Ottava* sp, System* parent)
     : TextLineBaseSegment(ElementType::OTTAVA_SEGMENT, sp, parent, ElementFlag::MOVABLE | ElementFlag::ON_STAFF)
 {
     m_text->setTextStyleType(TextStyleType::OTTAVA);
+    m_endText->setTextStyleType(TextStyleType::OTTAVA);
 }
 
 //---------------------------------------------------------
diff --git a/src/engraving/dom/pedal.cpp b/src/engraving/dom/pedal.cpp
@@ -26,6 +26,7 @@
 #include "measure.h"
 #include "score.h"
 #include "system.h"
+#include "text.h"
 
 #include "log.h"
 
@@ -65,6 +66,17 @@ const String Pedal::STAR_SYMBOL = u"<sym>keyboardPedalUp</sym>";
 PedalSegment::PedalSegment(Pedal* sp, System* parent)
     : TextLineBaseSegment(ElementType::PEDAL_SEGMENT, sp, parent, ElementFlag::MOVABLE | ElementFlag::ON_STAFF)
 {
+    m_text->setTextStyleType(TextStyleType::PEDAL);
+    m_endText->setTextStyleType(TextStyleType::PEDAL);
+}
+
+//---------------------------------------------------------
+//   propertyDelegate
+//---------------------------------------------------------
+
+EngravingItem* PedalSegment::propertyDelegate(Pid pid)
+{
+    return TextLineBaseSegment::propertyDelegate(pid);
 }
 
 //---------------------------------------------------------
diff --git a/src/engraving/dom/pedal.h b/src/engraving/dom/pedal.h
@@ -45,6 +45,8 @@ class PedalSegment final : public TextLineBaseSegment
     PedalSegment* clone() const override { return new PedalSegment(*this); }
     Pedal* pedal() const { return toPedal(spanner()); }
 
+    EngravingItem* propertyDelegate(Pid) override;
+
     friend class Pedal;
 };
 
diff --git a/src/engraving/dom/property.cpp b/src/engraving/dom/property.cpp
@@ -311,6 +311,7 @@ static constexpr PropertyMetaData propertyList[] = {
     { Pid::FRAME_FG_COLOR,          false, "frameFgColor",          P_TYPE::COLOR,              PropertyGroup::APPEARANCE,      DUMMY_QT_TR_NOOP("propertyName", "frame foreground color") },
     { Pid::FRAME_BG_COLOR,          false, "frameBgColor",          P_TYPE::COLOR,              PropertyGroup::APPEARANCE,      DUMMY_QT_TR_NOOP("propertyName", "frame background color") },
     { Pid::SIZE_SPATIUM_DEPENDENT,  false, "sizeIsSpatiumDependent",P_TYPE::BOOL,               PropertyGroup::APPEARANCE,      DUMMY_QT_TR_NOOP("propertyName", "spatium dependent size") },
+    { Pid::MUSICAL_SYMBOLS_SCALE,   false, "musicalSymbolsScale",   P_TYPE::REAL,               PropertyGroup::TEXT,            DUMMY_QT_TR_NOOP("propertyName", "musical symbols scale") },
     { Pid::TEXT_SIZE_SPATIUM_DEPENDENT, false, "textSizeIsSpatiumDependent", P_TYPE::BOOL,      PropertyGroup::APPEARANCE,      DUMMY_QT_TR_NOOP("propertyName", "spatium dependent text size") },
     { Pid::ALIGN,                   false, "align",                 P_TYPE::ALIGN,              PropertyGroup::POSITION,        DUMMY_QT_TR_NOOP("propertyName", "align") },
     { Pid::TEXT_SCRIPT_ALIGN,       false, "align",                 P_TYPE::INT,                PropertyGroup::POSITION,        DUMMY_QT_TR_NOOP("propertyName", "text script align") },
diff --git a/src/engraving/dom/property.h b/src/engraving/dom/property.h
@@ -321,6 +321,7 @@ enum class Pid {
 
     FRAME_BG_COLOR,
     SIZE_SPATIUM_DEPENDENT,
+    MUSICAL_SYMBOLS_SCALE,
     TEXT_SIZE_SPATIUM_DEPENDENT, // for text component of textLine items
     ALIGN,
     TEXT_SCRIPT_ALIGN,
diff --git a/src/engraving/dom/textbase.cpp b/src/engraving/dom/textbase.cpp
@@ -872,15 +872,28 @@ mu::draw::Font TextFragment::font(const TextBase* t) const
     draw::Font::Type fontType = draw::Font::Type::Unknown;
     if (format.fontFamily() == "ScoreText") {
         if (t->isDynamic() || t->textStyleType() == TextStyleType::OTTAVA || t->textStyleType() == TextStyleType::HARP_PEDAL_DIAGRAM
-            || t->isStringTunings()) {
+            || t->textStyleType() == TextStyleType::TUPLET || t->textStyleType() == TextStyleType::PEDAL || t->isStringTunings()) {
             std::string fontName = engravingFonts()->fontByName(t->style().styleSt(Sid::MusicalSymbolFont).toStdString())->family();
             family = String::fromStdString(fontName);
             fontType = draw::Font::Type::MusicSymbol;
-            if (t->isDynamic()) {
-                m = DYNAMICS_DEFAULT_FONT_SIZE * t->getProperty(Pid::DYNAMICS_SIZE).toDouble() * spatiumScaling;
-                if (t->style().styleB(Sid::dynamicsOverrideFont)) {
-                    std::string fontName2 = engravingFonts()->fontByName(t->style().styleSt(Sid::dynamicsFont).toStdString())->family();
-                    family = String::fromStdString(fontName2);
+            if (!t->isStringTunings()) {
+                m = MUSICAL_SYMBOLS_DEFAULT_FONT_SIZE;
+                if (t->isDynamic()) {
+                    m *= t->getProperty(Pid::DYNAMICS_SIZE).toDouble() * spatiumScaling;
+                    if (t->style().styleB(Sid::dynamicsOverrideFont)) {
+                        std::string fontName2 = engravingFonts()->fontByName(t->style().styleSt(Sid::dynamicsFont).toStdString())->family();
+                        family = String::fromStdString(fontName2);
+                    }
+                } else {
+                    for (const auto& a : *textStyle(t->textStyleType())) {
+                        if (a.type == TextStylePropertyType::MusicalSymbolsScale) {
+                            m *= t->style().styleD(a.sid);
+                            if (t->sizeIsSpatiumDependent()) {
+                                m *= spatiumScaling;
+                            }
+                            break;
+                        }
+                    }
                 }
             }
             // We use a default font size of 10pt for historical reasons,
diff --git a/src/engraving/rendering/dev/tupletlayout.cpp b/src/engraving/rendering/dev/tupletlayout.cpp
@@ -54,6 +54,7 @@ void TupletLayout::layout(Tuplet* item, LayoutContext& ctx)
     //
     // create tuplet number if necessary
     //
+    const MStyle& style = ctx.conf().style();
     double _spatium = item->spatium();
     if (item->numberType() != TupletNumberType::NO_TEXT) {
         if (item->number() == nullptr) {
@@ -71,10 +72,21 @@ void TupletLayout::layout(Tuplet* item, LayoutContext& ctx)
         item->number()->setPropertyFlags(Pid::FONT_SIZE, item->propertyFlags(Pid::FONT_SIZE));
         item->number()->setPropertyFlags(Pid::FONT_STYLE, item->propertyFlags(Pid::FONT_STYLE));
         item->number()->setPropertyFlags(Pid::ALIGN, item->propertyFlags(Pid::ALIGN));
-        if (item->numberType() == TupletNumberType::SHOW_NUMBER) {
-            item->number()->setXmlText(String(u"%1").arg(item->ratio().numerator()));
+
+        String numberString = (item->numberType() == TupletNumberType::SHOW_NUMBER)
+                              ? String(u"%1").arg(item->ratio().numerator())
+                              : String(u"%1:%2").arg(item->ratio().numerator(), item->ratio().denominator());
+        if (style.styleB(Sid::tupletUseSymbols)) {
+            String smuflNum = String(u"");
+            for (size_t i = 0; i < numberString.size(); ++i) {
+                smuflNum.append(u"<sym>tuplet");
+                smuflNum.append(numberString.at(i).unicode());
+                smuflNum.append(u"</sym>");
+            }
+            smuflNum.replace(String(u":"), String(u"Colon"));
+            item->number()->setXmlText(smuflNum);
         } else {
-            item->number()->setXmlText(String(u"%1:%2").arg(item->ratio().numerator(), item->ratio().denominator()));
+            item->number()->setXmlText(numberString);
         }
 
         item->setIsSmall(true);
@@ -84,7 +96,7 @@ void TupletLayout::layout(Tuplet* item, LayoutContext& ctx)
                 break;
             }
         }
-        item->number()->mutldata()->setMag(item->isSmall() ? ctx.conf().styleD(Sid::smallNoteMag) : 1.0);
+        item->number()->mutldata()->setMag(item->isSmall() ? style.styleD(Sid::smallNoteMag) : 1.0);
     } else {
         if (item->number()) {
             if (item->number()->selected()) {
@@ -150,7 +162,6 @@ void TupletLayout::layout(Tuplet* item, LayoutContext& ctx)
     //
     //    calculate bracket start and end point p1 p2
     //
-    const MStyle& style = ctx.conf().style();
     double maxSlope      = style.styleD(Sid::tupletMaxSlope);
     bool outOfStaff      = style.styleB(Sid::tupletOufOfStaff);
     double vHeadDistance = style.styleMM(Sid::tupletVHeadDistance) * item->mag();
diff --git a/src/engraving/style/style.cpp b/src/engraving/style/style.cpp
@@ -371,6 +371,25 @@ void MStyle::read(XmlReader& e, compat::ReadChordListHook* readChordListHook)
             if (pedContText != "") {
                 set(Sid::pedalText, pedContText);
             }
+        } else if ((tag == "pedalFontSize"
+                    || tag == "ottavaFontSize"
+                    || tag == "tupletFontSize"
+                    || tag == "harpPedalDiagramFontSize")
+                   && m_version < 430) {
+            double _val = e.readDouble();
+            if (tag == "pedalFontSize") {
+                set(Sid::pedalFontSize, _val);
+                set(Sid::pedalMusicalSymbolsScale, (_val / MUSICAL_SYMBOLS_DEFAULT_FONT_SIZE));
+            } else if (tag == "ottavaFontSize") {
+                set(Sid::ottavaFontSize, _val);
+                set(Sid::ottavaMusicalSymbolsScale, (_val / MUSICAL_SYMBOLS_DEFAULT_FONT_SIZE));
+            } else if (tag == "tupletFontSize") {
+                set(Sid::tupletFontSize, _val);
+                set(Sid::tupletMusicalSymbolsScale, (_val / MUSICAL_SYMBOLS_DEFAULT_FONT_SIZE));
+            } else if (tag == "harpPedalDiagramFontSize") {
+                set(Sid::harpPedalDiagramFontSize, _val);
+                set(Sid::harpPedalDiagramMusicalSymbolsScale, (_val / MUSICAL_SYMBOLS_DEFAULT_FONT_SIZE));
+            }
         } else if (!readProperties(e)) {
             e.unknown();
         }
@@ -381,6 +400,10 @@ void MStyle::read(XmlReader& e, compat::ReadChordListHook* readChordListHook)
         // to INSIDE for compatibility. For files 4.2 and newer, defaults to OUTSIDE.
         set(Sid::tiePlacementChord, TiePlacement::INSIDE);
     }
+    if (m_version < 430 && !MScore::testMode) {
+        //This style didn't exist before version 4.3, so using the old look.
+        set(Sid::tupletUseSymbols, false);
+    }
 
     if (readChordListHook) {
         readChordListHook->validate();
diff --git a/src/engraving/style/styledef.cpp b/src/engraving/style/styledef.cpp
@@ -274,6 +274,7 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
     { Sid::pedalFontSize,           "pedalFontSize",           12.0 },
     { Sid::pedalLineSpacing,        "pedalLineSpacing",        1.0 },
     { Sid::pedalFontSpatiumDependent, "pedalFontSpatiumDependent", true },
+    { Sid::pedalMusicalSymbolsScale, "pedalMusicalSymbolsScale", 1.0 }, // percentage of the standard size
     { Sid::pedalFontStyle,          "pedalFontStyle",          int(FontStyle::Normal) },
     { Sid::pedalColor,              "pedalColor",              Color::BLACK },
     { Sid::pedalTextAlign,          "pedalTextAlign",          Align(AlignH::LEFT, AlignV::BASELINE) },
@@ -285,7 +286,8 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
     { Sid::pedalFrameBgColor,       "pedalFrameBgColor",       Color::transparent },
     { Sid::pedalText,               "pedalText",               String(u"<sym>keyboardPedalPed</sym>") },
     { Sid::pedalHookText,           "pedalHookText",           String() },
-    { Sid::pedalContinueText,       "pedalContinueText",       String(u"(<sym>keyboardPedalPed</sym>)") },
+    { Sid::pedalContinueText,       "pedalContinueText",
+      String(u"<sym>keyboardPedalParensLeft</sym><sym>keyboardPedalPed</sym><sym>keyboardPedalParensRight</sym>") },
     { Sid::pedalContinueHookText,   "pedalContinueHookText",   String() },
     { Sid::pedalEndText,            "pedalEndText",            String() },
     { Sid::pedalRosetteEndText,     "pedalRosetteEndText",     String(u"<sym>keyboardPedalUp</sym>") },
@@ -578,6 +580,7 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
     { Sid::ottavaFontSize,          "ottavaFontSize",          10.0 },
     { Sid::ottavaLineSpacing,       "ottavaLineSpacing",       1.0 },
     { Sid::ottavaFontSpatiumDependent, "ottavaFontSpatiumDependent", true },
+    { Sid::ottavaMusicalSymbolsScale, "ottavaMusicalSymbolsScale", 1.0 }, // percentage of the standard size
     { Sid::ottavaFontStyle,         "ottavaFontStyle",         int(FontStyle::Normal) },
     { Sid::ottavaColor,             "ottavaColor",             PropertyValue::fromValue(Color::BLACK) },
     { Sid::ottavaTextAlignAbove,    "ottavaTextAlignAbove",    Align(AlignH::LEFT, AlignV::TOP) },
@@ -620,9 +623,11 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
     { Sid::tupletFontSize,          "tupletFontSize",          9.0 },
     { Sid::tupletLineSpacing,       "tupletLineSpacing",       1.0 },
     { Sid::tupletFontSpatiumDependent, "tupletFontSpatiumDependent", true },
+    { Sid::tupletMusicalSymbolsScale, "tupletMusicalSymbolsScale", 1.0 }, // percentage of the standard size
     { Sid::tupletFontStyle,         "tupletFontStyle",         int(FontStyle::Italic) },
     { Sid::tupletColor,             "tupletColor",             PropertyValue::fromValue(Color::BLACK) },
     { Sid::tupletAlign,             "tupletAlign",             Align(AlignH::HCENTER, AlignV::VCENTER) },
+    { Sid::tupletUseSymbols,        "tupletUseSymbols",        true },
     { Sid::tupletBracketHookHeight, "tupletBracketHookHeight", Spatium(0.75) },
     { Sid::tupletOffset,            "tupletOffset",            PointF() },
     { Sid::tupletFrameType,         "tupletFrameType",         int(FrameType::NO_FRAME) },
@@ -826,6 +831,7 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
     { Sid::harpPedalDiagramFontSize,          "harpPedalDiagramFontSize",          10.0 },
     { Sid::harpPedalDiagramLineSpacing,       "harpPedalDiagramLineSpacing",       1.0 },
     { Sid::harpPedalDiagramFontSpatiumDependent, "harpPedalDiagramFontSpatiumDependent", true },
+    { Sid::harpPedalDiagramMusicalSymbolsScale, "harpPedalDiagramMusicalSymbolsScale", 1.0 }, // percentage of the standard size
     { Sid::harpPedalDiagramFontStyle,         "harpPedalDiagramFontStyle",         int(FontStyle::Normal) },
     { Sid::harpPedalDiagramColor,             "harpPedalDiagramColor",             PropertyValue::fromValue(Color::BLACK) },
     { Sid::harpPedalDiagramAlign,             "harpPedalDiagramAlign",             Align(AlignH::HCENTER, AlignV::VCENTER) },
diff --git a/src/engraving/style/styledef.h b/src/engraving/style/styledef.h
@@ -288,6 +288,7 @@ enum class Sid {
     pedalFontSize,
     pedalLineSpacing,
     pedalFontSpatiumDependent,
+    pedalMusicalSymbolsScale,
     pedalFontStyle,
     pedalColor,
     pedalTextAlign,
@@ -588,6 +589,7 @@ enum class Sid {
     ottavaFontSize,
     ottavaLineSpacing,
     ottavaFontSpatiumDependent,
+    ottavaMusicalSymbolsScale,
     ottavaFontStyle,
     ottavaColor,
     ottavaTextAlignAbove,
@@ -631,9 +633,11 @@ enum class Sid {
     tupletFontSize,
     tupletLineSpacing,
     tupletFontSpatiumDependent,
+    tupletMusicalSymbolsScale,
     tupletFontStyle,
     tupletColor,
     tupletAlign,
+    tupletUseSymbols,
     tupletBracketHookHeight,
     tupletOffset,
     tupletFrameType,
@@ -838,6 +842,7 @@ enum class Sid {
     harpPedalDiagramFontSize,
     harpPedalDiagramLineSpacing,
     harpPedalDiagramFontSpatiumDependent,
+    harpPedalDiagramMusicalSymbolsScale,
     harpPedalDiagramFontStyle,
     harpPedalDiagramColor,
     harpPedalDiagramAlign,
diff --git a/src/engraving/style/textstyle.cpp b/src/engraving/style/textstyle.cpp
@@ -236,6 +236,7 @@ const TextStyle harpPedalDiagramTextStyle { {
     { TextStylePropertyType::FontSize,             Sid::harpPedalDiagramFontSize,               Pid::FONT_SIZE },
     { TextStylePropertyType::LineSpacing,          Sid::harpPedalDiagramLineSpacing,            Pid::TEXT_LINE_SPACING },
     { TextStylePropertyType::SizeSpatiumDependent, Sid::harpPedalDiagramFontSpatiumDependent,   Pid::SIZE_SPATIUM_DEPENDENT },
+    { TextStylePropertyType::MusicalSymbolsScale,  Sid::harpPedalDiagramMusicalSymbolsScale,    Pid::MUSICAL_SYMBOLS_SCALE },
     { TextStylePropertyType::FontStyle,            Sid::harpPedalDiagramFontStyle,              Pid::FONT_STYLE },
     { TextStylePropertyType::Color,                Sid::harpPedalDiagramColor,                  Pid::COLOR },
     { TextStylePropertyType::TextAlign,            Sid::harpPedalDiagramAlign,                  Pid::ALIGN },
@@ -457,6 +458,7 @@ const TextStyle tupletTextStyle { {
     { TextStylePropertyType::FontSize,             Sid::tupletFontSize,                         Pid::FONT_SIZE },
     { TextStylePropertyType::LineSpacing,          Sid::tupletLineSpacing,                      Pid::TEXT_LINE_SPACING },
     { TextStylePropertyType::SizeSpatiumDependent, Sid::tupletFontSpatiumDependent,             Pid::SIZE_SPATIUM_DEPENDENT },
+    { TextStylePropertyType::MusicalSymbolsScale,  Sid::tupletMusicalSymbolsScale,              Pid::MUSICAL_SYMBOLS_SCALE },
     { TextStylePropertyType::FontStyle,            Sid::tupletFontStyle,                        Pid::FONT_STYLE },
     { TextStylePropertyType::Color,                Sid::tupletColor,                            Pid::COLOR },
     { TextStylePropertyType::TextAlign,            Sid::tupletAlign,                            Pid::ALIGN },
@@ -678,6 +680,7 @@ const TextStyle ottavaTextStyle { {
     { TextStylePropertyType::FontSize,             Sid::ottavaFontSize,                         Pid::BEGIN_FONT_SIZE },
     { TextStylePropertyType::LineSpacing,          Sid::ottavaLineSpacing,                      Pid::TEXT_LINE_SPACING },
     { TextStylePropertyType::SizeSpatiumDependent, Sid::ottavaFontSpatiumDependent,             Pid::SIZE_SPATIUM_DEPENDENT },
+    { TextStylePropertyType::MusicalSymbolsScale,  Sid::ottavaMusicalSymbolsScale,              Pid::MUSICAL_SYMBOLS_SCALE },
     { TextStylePropertyType::FontStyle,            Sid::ottavaFontStyle,                        Pid::BEGIN_FONT_STYLE },
     { TextStylePropertyType::Color,                Sid::ottavaColor,                            Pid::COLOR },
     { TextStylePropertyType::TextAlign,            Sid::ottavaTextAlignAbove,                   Pid::BEGIN_TEXT_ALIGN },
@@ -712,6 +715,7 @@ const TextStyle pedalTextStyle { {
     { TextStylePropertyType::FontSize,             Sid::pedalFontSize,                          Pid::BEGIN_FONT_SIZE },
     { TextStylePropertyType::LineSpacing,          Sid::pedalLineSpacing,                       Pid::TEXT_LINE_SPACING },
     { TextStylePropertyType::SizeSpatiumDependent, Sid::pedalFontSpatiumDependent,              Pid::SIZE_SPATIUM_DEPENDENT },
+    { TextStylePropertyType::MusicalSymbolsScale,  Sid::pedalMusicalSymbolsScale,               Pid::MUSICAL_SYMBOLS_SCALE },
     { TextStylePropertyType::FontStyle,            Sid::pedalFontStyle,                         Pid::BEGIN_FONT_STYLE },
     { TextStylePropertyType::Color,                Sid::pedalColor,                             Pid::COLOR },
     { TextStylePropertyType::TextAlign,            Sid::pedalTextAlign,                         Pid::BEGIN_TEXT_ALIGN },
diff --git a/src/engraving/style/textstyle.h b/src/engraving/style/textstyle.h
@@ -32,6 +32,7 @@ enum class TextStylePropertyType : char {
     FontSize,
     LineSpacing,
     SizeSpatiumDependent,
+    MusicalSymbolsScale,
     FontStyle,
     Color,
     TextAlign,
@@ -50,7 +51,7 @@ struct TextStyleProperty {
     Pid pid;
 };
 
-constexpr size_t TEXT_STYLE_SIZE = 14;
+constexpr size_t TEXT_STYLE_SIZE = 15;
 
 typedef std::array<TextStyleProperty, TEXT_STYLE_SIZE> TextStyle;
 
diff --git a/src/notation/view/widgets/editstyle.cpp b/src/notation/view/widgets/editstyle.cpp
diff --git a/src/notation/view/widgets/editstyle.ui b/src/notation/view/widgets/editstyle.ui

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ OttavaSegment::OttavaSegment(Ottava* sp, System* parent)`
`67`	`67`	`: TextLineBaseSegment(ElementType::OTTAVA_SEGMENT, sp, parent, ElementFlag::MOVABLE \| ElementFlag::ON_STAFF)`
`68`	`68`	`{`
`69`	`69`	`m_text->setTextStyleType(TextStyleType::OTTAVA);`
	`70`	`+ m_endText->setTextStyleType(TextStyleType::OTTAVA);`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`//---------------------------------------------------------`