Merge pull request #1803 from ONLYOFFICE/fix/ligatures

Fix/ligatures

apps/common/main/resources/less/common.less

@@ -166,6 +166,9 @@ label {
         display: block;
     }
 
+    .padding-very-small {
+        padding-bottom: 4px;
+    }
     .padding-small {
         padding-bottom: 8px;
     }

apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template

@@ -10,7 +10,7 @@
                     <div id="paragraphadv-spin-outline-level"></div>
                 </div>
             </div>
-            <div><label class="header" style="padding-bottom: 4px;"><%= scope.strIndent %></label></div>
+            <div><label class="header padding-very-small"><%= scope.strIndent %></label></div>
             <div>
                 <div class="padding-large" style="display: inline-block;margin-right: 3px;">
                  <label class="input-label"><%= scope.strIndentsLeftText %></label>
@@ -30,7 +30,7 @@
                     </div>
                 </div>
             </div>
-            <div><label class="header" style="padding-bottom: 4px;"><%= scope.strSpacing %></label></div>
+            <div><label class="header padding-very-small"><%= scope.strSpacing %></label></div>
             <div>
                 <div style="display: inline-block;margin-right: 3px;">
                     <label class="input-label"><%= scope.strIndentsSpacingBefore %></label>
@@ -119,7 +119,7 @@
 </div>
 <div id="id-adv-paragraph-font" class="settings-panel">
     <div class="inner-content" style="width: 100%;">
-        <div class="padding-small">
+        <div class="padding-very-small">
             <label class="header"><%= scope.textEffects %></label>
         </div>
         <table cols="2">
@@ -148,7 +148,7 @@
                 </td>
             </tr>
         </table>
-        <div class="padding-small">
+        <div class="padding-very-small">
             <label class="header"><%= scope.textCharacterSpacing %></label>
         </div>
         <div class="padding-large">
@@ -161,6 +161,13 @@
                 <div id="paragraphadv-spin-position"></div>
             </div>
         </div>
+        <div class="padding-very-small">
+            <label class="header"><%= scope.textOpenType %></label>
+        </div>
+        <div class="padding-large">
+            <label class="input-label"><%= scope.textLigatures %></label>
+            <div id="paragraphadv-cmb-ligatures" style="display: inline-block; vertical-align: baseline; margin-left: 5px;"></div>
+        </div>
         <div class="doc-content-color" style="outline: 1px solid #cbcbcb;">
             <div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative; margin: 0 auto;"></div>
         </div>

apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js

@@ -52,7 +52,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
     DE.Views.ParagraphSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({
         options: {
             contentWidth: 370,
-            height: 394,
+            height: 415,
             toggleGroup: 'paragraph-adv-settings-group',
             storageName: 'de-para-settings-adv-category'
         },
@@ -513,6 +513,36 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             }, this));
             this.spinners.push(this.numPosition);
 
+            this._arrLigatures = [
+                {displayValue: this.textNone, value: Asc.LigaturesType.None},
+                {displayValue: this.textStandard, value: Asc.LigaturesType.Standard},
+                {displayValue: this.textContext, value: Asc.LigaturesType.Contextual},
+                {displayValue: this.textHistorical, value: Asc.LigaturesType.Historical},
+                {displayValue: this.textDiscret, value: Asc.LigaturesType.Discretional},
+                {displayValue: this.textStandardContext, value: Asc.LigaturesType.StandardContextual},
+                {displayValue: this.textStandardHistorical, value: Asc.LigaturesType.StandardHistorical},
+                {displayValue: this.textContextHistorical, value: Asc.LigaturesType.ContextualHistorical},
+                {displayValue: this.textStandardDiscret, value: Asc.LigaturesType.StandardDiscretional},
+                {displayValue: this.textContextDiscret, value: Asc.LigaturesType.ContextualDiscretional},
+                {displayValue: this.textHistoricalDiscret, value: Asc.LigaturesType.HistoricalDiscretional},
+                {displayValue: this.textStandardContextHist, value: Asc.LigaturesType.StandardContextualHistorical},
+                {displayValue: this.textStandardContextDiscret, value: Asc.LigaturesType.StandardContextualDiscretional},
+                {displayValue: this.textStandardHistDiscret, value: Asc.LigaturesType.StandardHistoricalDiscretional},
+                {displayValue: this.textContextHistDiscret, value: Asc.LigaturesType.ContextualHistoricalDiscretional},
+                {displayValue: this.textAll, value: Asc.LigaturesType.All}
+            ];
+            this.cmbLigatures = new Common.UI.ComboBox({
+                el: $('#paragraphadv-cmb-ligatures'),
+                cls: 'input-group-nr',
+                editable: false,
+                data: this._arrLigatures,
+                style: 'width: 210px;',
+                menuStyle   : 'min-width: 210px;max-height:135px;',
+                takeFocusOnClose: true
+            });
+            this.cmbLigatures.setValue(Asc.LigaturesType.None);
+            this.cmbLigatures.on('selected', _.bind(this.onLigaturesSelect, this));
+
             // Tabs
             this.numTab = new Common.UI.MetricSpinner({
                 el: $('#paraadv-spin-tab'),
@@ -941,6 +971,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
 
                 this.cmbOutlinelevel.setValue((props.get_OutlineLvl() === undefined || props.get_OutlineLvl()===null) ? -1 : props.get_OutlineLvl());
                 this.cmbOutlinelevel.setDisabled(!!props.get_OutlineLvlStyle());
+                this.cmbLigatures.setValue((props.get_Ligatures() === undefined || props.get_Ligatures()===null) ? '' : props.get_Ligatures());
 
                 this._noApply = false;
 
@@ -1487,6 +1518,12 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             }
         },
 
+        onLigaturesSelect: function(combo, record) {
+            if (this._changedProps) {
+                this._changedProps.put_Ligatures(record.value);
+            }
+        },
+
         textTitle:      'Paragraph - Advanced Settings',
         strIndentsLeftText:     'Left',
         strIndentsRightText:    'Right',
@@ -1558,7 +1595,24 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
         strIndentsOutlinelevel: 'Outline level',
         strIndent: 'Indents',
         strSpacing: 'Spacing',
-        strSuppressLineNumbers: 'Suppress line numbers'
+        strSuppressLineNumbers: 'Suppress line numbers',
+        textOpenType: 'OpenType Features',
+        textLigatures: 'Ligatures',
+        textStandard: 'Standard only',
+        textContext: 'Contextual',
+        textHistorical: 'Historical',
+        textDiscret: 'Discretionary',
+        textStandardContext: 'Standard and Contextual',
+        textStandardHistorical: 'Standard and Historical',
+        textStandardDiscret: 'Standard and Discretionary',
+        textContextHistorical: 'Contextual and Historical',
+        textContextDiscret: 'Contextual and Discretionary',
+        textHistoricalDiscret: 'Historical and Discretionary',
+        textStandardContextHist: 'Standard, Contextual and Historical',
+        textStandardContextDiscret: 'Standard, Contextual and Discretionary',
+        textStandardHistDiscret: 'Standard, Historical and Discretionary',
+        textContextHistDiscret: 'Contextual, Historical and Discretionary',
+        textAll: 'All'
 
     }, DE.Views.ParagraphSettingsAdvanced || {}));
 });

apps/documenteditor/main/locale/en.json

@@ -2333,6 +2333,23 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Set top border only",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "No borders",
+  "DE.Views.ParagraphSettingsAdvanced.textOpenType": "OpenType Features",
+  "DE.Views.ParagraphSettingsAdvanced.textLigatures": "Ligatures",
+  "DE.Views.ParagraphSettingsAdvanced.textStandard": "Standard only",
+  "DE.Views.ParagraphSettingsAdvanced.textContext": "Contextual",
+  "DE.Views.ParagraphSettingsAdvanced.textHistorical": "Historical",
+  "DE.Views.ParagraphSettingsAdvanced.textDiscret": "Discretionary",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardContext": "Standard and Contextual",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardHistorical": "Standard and Historical",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardDiscret": "Standard and Discretionary",
+  "DE.Views.ParagraphSettingsAdvanced.textContextHistorical": "Contextual and Historical",
+  "DE.Views.ParagraphSettingsAdvanced.textContextDiscret": "Contextual and Discretionary",
+  "DE.Views.ParagraphSettingsAdvanced.textHistoricalDiscret": "Historical and Discretionary",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardContextHist": "Standard, Contextual and Historical",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardContextDiscret": "Standard, Contextual and Discretionary",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardHistDiscret": "Standard, Historical and Discretionary",
+  "DE.Views.ParagraphSettingsAdvanced.textContextHistDiscret": "Contextual, Historical and Discretionary",
+  "DE.Views.ParagraphSettingsAdvanced.textAll": "All",
   "DE.Views.RightMenu.txtChartSettings": "Chart settings",
   "DE.Views.RightMenu.txtFormSettings": "Form Settings",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Header and footer settings",

apps/presentationeditor/main/app/template/HeaderFooterDialog.template

@@ -5,7 +5,7 @@
     <tr><td class="padding-large">
         <table id="hf-dlg-tbl-datetime" cols="2" style="margin-left: 22px;">
             <tr>
-                <td colspan="2" style="padding-bottom: 4px;">
+                <td colspan="2" class="padding-very-small">
                     <div id="hf-dlg-radio-update"></div>
                 </td>
             </tr>
@@ -20,7 +20,7 @@
                 </td>
             </tr>
             <tr>
-                <td colspan="2" style="padding-bottom: 4px;">
+                <td colspan="2" class="padding-very-small">
                     <div id="hf-dlg-radio-fixed"></div>
                 </td>
             </tr>

apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template

@@ -6,7 +6,7 @@
                 <div id="paragraphadv-spin-text-alignment"></div>
             </div>
         </div>
-        <div style="padding-bottom: 4px;"><label class="header"><%= scope.strIndent %></label></div>
+        <div class="padding-very-small"><label class="header"><%= scope.strIndent %></label></div>
         <div>
             <div class="padding-large" style="display: inline-block;margin-right: 3px;">
                 <label class="input-label"><%= scope.strIndentsLeftText %></label>
@@ -26,7 +26,7 @@
                 </div>
             </div>
         </div>
-        <div style="padding-bottom: 4px;"><label class="header"><%= scope.strSpacing %></label></div>
+        <div class="padding-very-small"><label class="header"><%= scope.strSpacing %></label></div>
         <div>
             <div style="display: inline-block;margin-right: 3px;">
                 <label class="input-label"><%= scope.strIndentsSpacingBefore %></label>
@@ -55,7 +55,7 @@
 </div>
 <div id="id-adv-paragraph-font" class="settings-panel">
     <div class="inner-content" style="width: 100%;">
-        <div class="padding-small">
+        <div class="padding-very-small">
             <label class="header"><%= scope.textEffects %></label>
         </div>
         <table cols="2">
@@ -84,7 +84,7 @@
                 </td>
             </tr>
         </table>
-        <div class="padding-small">
+        <div class="padding-very-small">
             <label class="header"><%= scope.textCharacterSpacing %></label>
         </div>
         <div class="padding-large">

apps/spreadsheeteditor/main/app/template/FormatRulesEditDlg.template

@@ -91,7 +91,7 @@
                 </td>
             </tr>
         <tr class="databar">
-            <td class="" style="padding-bottom: 4px;">
+            <td class="padding-very-small">
                 <label class="header"><%= scope.textAppearance %></label>
                 </td>
             </tr>

apps/spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.template

@@ -6,7 +6,7 @@
                 <div id="paragraphadv-spin-text-alignment"></div>
             </div>
         </div>
-        <div style="padding-bottom: 4px;"><label class="header"><%= scope.strIndent %></label></div>
+        <div class="padding-very-small"><label class="header"><%= scope.strIndent %></label></div>
         <div>
             <div class="padding-large" style="display: inline-block;margin-right: 3px;">
                 <label class="input-label"><%= scope.strIndentsLeftText %></label>
@@ -26,7 +26,7 @@
                 </div>
             </div>
         </div>
-        <div style="padding-bottom: 4px;"><label class="header"><%= scope.strSpacing %></label></div>
+        <div class="padding-very-small"><label class="header"><%= scope.strSpacing %></label></div>
         <div>
             <div style="display: inline-block;margin-right: 3px;">
                 <label class="input-label"><%= scope.strIndentsSpacingBefore %></label>
@@ -55,7 +55,7 @@
 </div>
 <div id="id-adv-paragraph-font" class="settings-panel">
     <div class="inner-content" style="width: 100%;">
-        <div class="padding-small">
+        <div class="padding-very-small">
             <label class="header"><%= scope.textEffects %></label>
         </div>
         <table cols="2">
@@ -84,7 +84,7 @@
                 </td>
             </tr>
         </table>
-        <div class="padding-small">
+        <div class="padding-very-small">
             <label class="header"><%= scope.textCharacterSpacing %></label>
         </div>
         <div class="padding-large">

apps/spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.template

@@ -7,11 +7,11 @@
             </div>
         </div>
         <div class="padding-large" id="sliceradv-checkbox-header"></div>
-        <div style="padding-bottom: 4px;"><label class="header"><%= scope.strStyle %></label></div>
+        <div class="padding-very-small"><label class="header"><%= scope.strStyle %></label></div>
         <div class="padding-large">
             <div id="sliceradv-btn-style" style="width: 100%;height: 52px;"></div>
         </div>
-        <div style="padding-bottom: 4px;"><label class="header"><%= scope.strSize %></label></div>
+        <div class="padding-very-small"><label class="header"><%= scope.strSize %></label></div>
         <div>
             <div class="padding-large" style="display: inline-block; margin-right: 5px;">
                 <label class="input-label"><%= scope.strWidth %></label>
@@ -23,7 +23,7 @@
                 <div id="sliceradv-spin-height"></div>
             </div>
         </div>
-        <div style="padding-bottom: 4px;"><label class="header"><%= scope.strButtons %></label></div>
+        <div class="padding-very-small"><label class="header"><%= scope.strButtons %></label></div>
         <div>
             <div style="display: inline-block; margin-right: 5px;">
                 <label class="input-label"><%= scope.strColumns %></label>